From c11a3b7fc01a52ee31d08c6a4197e3aa7d30f63f Mon Sep 17 00:00:00 2001 From: CupCakeArmy <nicco.borgioli@gmail.com> Date: Fri, 22 Apr 2016 11:58:57 +0200 Subject: [PATCH] Code correction, removed uncloses elements and nabber optimisation --- admin/index.html | 110 ++++++++++++++++++++++++----------------------- index.html | 2 +- 2 files changed, 57 insertions(+), 55 deletions(-) diff --git a/admin/index.html b/admin/index.html index 087c68f..f62dc9b 100644 --- a/admin/index.html +++ b/admin/index.html @@ -1,11 +1,12 @@ <!DOCTYPE html> <html lang="en"> + <head> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Admintool</title> - + <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="72x72" href="res/favicon/apple-icon-72x72.png"> @@ -23,39 +24,39 @@ <meta name="msapplication-TileColor" content="#ffffff"> <meta name="msapplication-TileImage" content="res/favicon/ms-icon-144x144.png"> <meta name="theme-color" content="#ffffff"> - + <link href="lib/bootstrap/css/bootstrap.min.css" rel="stylesheet"> <link href="lib/cust/main.css" rel="stylesheet"> </head> + <body> <!-- Login Overlay--> <div class="loginPanel smooth"> <div class="col-sm-4"></div> - <div class="col-sm-4 well"> - <img width="70%" src="res/logo/main.svg" style="margin-left: 15%;"> - <div class="input-group"> - <input type="text" class="form-control" id="loginUsername" name="user" placeholder="user"> - <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 class="col-sm-4 well"> + <img class="login-logo" src="res/logo/main.svg" style="margin-left: 15%;" alt="AMIV Logo"> + <div class="input-group"> + <input type="text" class="form-control" id="loginUsername" name="user" placeholder="user"> + <span class="input-group-addon">@student.ethz.ch</span> </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 class="col-sm-4"></div> </div> - + <!-- Log Container --> <div class="alertCont"></div> - + <!-- Main Container --> <div class="wrapper-main smooth"> - + <!-- Sidebar Container --> <div class="wrapper-sidebar smooth"> <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"> <li> <div class="input-group"> @@ -74,51 +75,52 @@ </ul> </div> </div> - + <!-- Top Navbar --> - <div class="navbar-main"> - <nav class="navbar navbar-default"> - <div class="container-fluid"> - <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed toggleSidebarBtn" aria-expanded="false"> + <nav class="navbar navbar-default navbar-main"> + <div class="container-fluid"> + <div class="navbar-header"> + <button type="button" class="navbar-toggle collapsed toggleSidebarBtn" aria-expanded="false"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> - </button> - <img height="40px" style="margin: 5px;" src="res/logo/wheel.svg" id="wheel-logo" class="smooth"> - <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> + </button> + <img height="40" style="margin: 5px;" src="res/logo/wheel.svg" id="wheel-logo" class="smooth" alt="Loading Wheel"> </div> - </nav> - </div> - - <!-- Main Content / Tool --> - <div class="wrapper-content" id="main-content"> + + <ul class="nav navbar-nav navbar-left cust-menu"> + <li><a href="#">Page 1</a></li> + <li><a href="#">Page 1</a></li> + <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> + </nav> + + <!-- Main Content / Tool --> + <div class="wrapper-content" id="main-content"> </div> </div> - <script src="lib/jquery/jquery-2.2.2.min.js"></script> - <script src="lib/bootstrap/js/bootstrap.min.js"></script> - <script src="lib/amiv/amivcore.js"></script> - <script src="lib/cust/main.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/amiv/amivcore.js"></script> + <script src="lib/cust/main.js"></script> + </body> -</html> \ No newline at end of file + +</html> diff --git a/index.html b/index.html index 36d4300..99f25c8 100644 --- a/index.html +++ b/index.html @@ -35,4 +35,4 @@ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script> </body> -</html> +</html> \ No newline at end of file -- GitLab