From b5d85753930557e2a5f0c25c3eab74e91baa0f79 Mon Sep 17 00:00:00 2001
From: CupCakeArmy <nicco.borgioli@gmail.com>
Date: Sat, 2 Apr 2016 13:09:51 +0200
Subject: [PATCH] Various Fixes
---
admin/index.html | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/admin/index.html b/admin/index.html
index d75ee93..f26f223 100644
--- a/admin/index.html
+++ b/admin/index.html
@@ -28,19 +28,19 @@
<link href="lib/cust/main.css" rel="stylesheet">
</head>
<body>
- <!-- Login Page-->
- <div class="loginPanel">
+ <!-- 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" 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>
</div>
<br>
- <input type="password" class="form-control" name="password" placeholder="password">
+ <input type="password" class="form-control" id="loginPassword" name="password" placeholder="password">
<br>
- <button type="submit" class="btn btn-default" id="loginButton">Submit</button>
+ <button type="submit" class="btn btn-default loginAction">Submit</button>
</div>
<div class="col-sm-4"></div>
</div>
@@ -100,7 +100,7 @@
<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="#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>
</li>
</ul>
@@ -116,6 +116,7 @@
<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>
--
GitLab