Skip to content
Snippets Groups Projects
Commit c11a3b7f authored by CupCakeArmy's avatar CupCakeArmy
Browse files

Code correction, removed uncloses elements and nabber optimisation

parent e97d77f6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
admin/index.html
+ 56
− 54
View file @ c11a3b7f
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Admintool</title> <title>Admintool</title>
<link rel="apple-touch-icon" sizes="57x57" href="res/favicon/apple-icon-57x57.png"> <link rel="apple-touch-icon" sizes="57x57" href="res/favicon/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="res/favicon/apple-icon-60x60.png"> <link rel="apple-touch-icon" sizes="60x60" href="res/favicon/apple-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="res/favicon/apple-icon-72x72.png"> <link rel="apple-touch-icon" sizes="72x72" href="res/favicon/apple-icon-72x72.png">
...@@ -23,39 +24,39 @@ ...@@ -23,39 +24,39 @@
<meta name="msapplication-TileColor" content="#ffffff"> <meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-TileImage" content="res/favicon/ms-icon-144x144.png"> <meta name="msapplication-TileImage" content="res/favicon/ms-icon-144x144.png">
<meta name="theme-color" content="#ffffff"> <meta name="theme-color" content="#ffffff">
<link href="lib/bootstrap/css/bootstrap.min.css" rel="stylesheet"> <link href="lib/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<link href="lib/cust/main.css" rel="stylesheet"> <link href="lib/cust/main.css" rel="stylesheet">
</head> </head>
<body> <body>
<!-- Login Overlay--> <!-- Login Overlay-->
<div class="loginPanel smooth"> <div class="loginPanel smooth">
<div class="col-sm-4"></div> <div class="col-sm-4"></div>
<div class="col-sm-4 well"> <div class="col-sm-4 well">
<img width="70%" src="res/logo/main.svg" style="margin-left: 15%;"> <img class="login-logo" src="res/logo/main.svg" style="margin-left: 15%;" alt="AMIV Logo">
<div class="input-group"> <div class="input-group">
<input type="text" class="form-control" id="loginUsername" name="user" placeholder="user"> <input type="text" class="form-control" id="loginUsername" name="user" placeholder="user">
<span class="input-group-addon">@student.ethz.ch</span> <span class="input-group-addon">@student.ethz.ch</span>
</div>
<br>
<input type="password" class="form-control" id="loginPassword" name="password" placeholder="password">
<br>
<button type="submit" class="btn btn-default loginAction">Submit</button>
</div> </div>
<div class="col-sm-4"></div> <br>
<input type="password" class="form-control" id="loginPassword" name="password" placeholder="password">
<br>
<button type="submit" class="btn btn-default loginAction">Submit</button>
</div> </div>
<div class="col-sm-4"></div>
</div> </div>
<!-- Log Container --> <!-- Log Container -->
<div class="alertCont"></div> <div class="alertCont"></div>
<!-- Main Container --> <!-- Main Container -->
<div class="wrapper-main smooth"> <div class="wrapper-main smooth">
<!-- Sidebar Container --> <!-- Sidebar Container -->
<div class="wrapper-sidebar smooth"> <div class="wrapper-sidebar smooth">
<div class="container-fluid"> <div class="container-fluid">
<a href="#home"><img width="100%" src="res/logo/main.svg"></a> <a href="#home"><img class="sidebar-logo" src="res/logo/main.svg" alt="AMIV Logo"></a>
<ul class="nav nav-pills nav-stacked nav-sidebar" role="navigation"> <ul class="nav nav-pills nav-stacked nav-sidebar" role="navigation">
<li> <li>
<div class="input-group"> <div class="input-group">
...@@ -74,51 +75,52 @@ ...@@ -74,51 +75,52 @@
</ul> </ul>
</div> </div>
</div> </div>
<!-- Top Navbar --> <!-- Top Navbar -->
<div class="navbar-main"> <nav class="navbar navbar-default navbar-main">
<nav class="navbar navbar-default"> <div class="container-fluid">
<div class="container-fluid"> <div class="navbar-header">
<div class="navbar-header"> <button type="button" class="navbar-toggle collapsed toggleSidebarBtn" aria-expanded="false">
<button type="button" class="navbar-toggle collapsed toggleSidebarBtn" aria-expanded="false">
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<img height="40px" style="margin: 5px;" src="res/logo/wheel.svg" id="wheel-logo" class="smooth"> <img height="40" style="margin: 5px;" src="res/logo/wheel.svg" id="wheel-logo" class="smooth" alt="Loading Wheel">
<a class="navbar-brand" href="#home">AdminTroll</a>
</div>
<div class="navbar-default">
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<span class="glyphicon glyphicon-user" aria-hidden="true"></span>
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
<li><a href="#settings"><span class="glyphicon glyphicon-wrench" aria-hidden="true"></span> Settings</a></li>
<li role="separator" class="divider"></li>
<li><a href="#" class="logoutAction"><span class="glyphicon glyphicon-off" aria-hidden="true"></span> Logout</a></li>
</ul>
</li>
</ul>
</div>
</div> </div>
</nav>
</div> <ul class="nav navbar-nav navbar-left cust-menu">
<li><a href="#">Page 1</a></li>
<!-- Main Content / Tool --> <li><a href="#">Page 1</a></li>
<div class="wrapper-content" id="main-content"> <li><a href="#">Page 1</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<span class="glyphicon glyphicon-user" aria-hidden="true"></span>
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
<li><a href="#settings"><span class="glyphicon glyphicon-wrench" aria-hidden="true"></span> Settings</a></li>
<li role="separator" class="divider"></li>
<li><a href="#" class="logoutAction"><span class="glyphicon glyphicon-off" aria-hidden="true"></span> Logout</a></li>
</ul>
</li>
</ul>
</div> </div>
</nav>
<!-- Main Content / Tool -->
<div class="wrapper-content" id="main-content">
</div> </div>
</div> </div>
<script src="lib/jquery/jquery-2.2.2.min.js"></script> <script src="lib/jquery/jquery-2.2.2.min.js"></script>
<script src="lib/bootstrap/js/bootstrap.min.js"></script> <script src="lib/bootstrap/js/bootstrap.min.js"></script>
<script src="lib/amiv/amivcore.js"></script> <script src="lib/amiv/amivcore.js"></script>
<script src="lib/cust/main.js"></script> <script src="lib/cust/main.js"></script>
</body> </body>
</html>
\ No newline at end of file </html>
index.html
+ 1
− 1
View file @ c11a3b7f
...@@ -35,4 +35,4 @@ ...@@ -35,4 +35,4 @@
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment