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

Various Fixes

parent 8685471e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 6 deletions
admin/index.html
+ 7
− 6
View file @ b5d85753
...@@ -28,19 +28,19 @@ ...@@ -28,19 +28,19 @@
<link href="lib/cust/main.css" rel="stylesheet"> <link href="lib/cust/main.css" rel="stylesheet">
</head> </head>
<body> <body>
<!-- Login Page--> <!-- Login Overlay-->
<div class="loginPanel"> <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 width="70%" src="res/logo/main.svg" style="margin-left: 15%;">
<div class="input-group"> <div class="input-group">
<input type="text" class="form-control" name="username" 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> </div>
<br> <br>
<input type="password" class="form-control" name="password" placeholder="password"> <input type="password" class="form-control" id="loginPassword" name="password" placeholder="password">
<br> <br>
<button type="submit" class="btn btn-default" id="loginButton">Submit</button> <button type="submit" class="btn btn-default loginAction">Submit</button>
</div> </div>
<div class="col-sm-4"></div> <div class="col-sm-4"></div>
</div> </div>
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="#settings"><span class="glyphicon glyphicon-wrench" aria-hidden="true"></span> Settings</a></li> <li><a href="#settings"><span class="glyphicon glyphicon-wrench" aria-hidden="true"></span> Settings</a></li>
<li role="separator" class="divider"></li> <li role="separator" class="divider"></li>
<li><a href="#logout"><span class="glyphicon glyphicon-off" aria-hidden="true"></span> Logout</a></li> <li><a href="#" class="logoutAction"><span class="glyphicon glyphicon-off" aria-hidden="true"></span> Logout</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>
...@@ -116,6 +116,7 @@ ...@@ -116,6 +116,7 @@
<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/cust/main.js"></script> <script src="lib/cust/main.js"></script>
</body> </body>
......
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