Merge pull request #28 from apuignav/master

Few updates on admin page

Condorcet/static/css/main.css

@@ -113,6 +113,12 @@ height: 25px;
 font-size: 14px;
 }
 
+input.file_button {
+width: 50%;
+height: 25px;
+font-size: 14px;
+}
+
 input[type=submit]:hover {
   background: #0068b5;
   color: #f1fbff;
@@ -145,6 +151,23 @@ input[type="text"].focus,input[type="time"].focus, input[type="date"].focus {
   box-shadow: 0 0 5px 1px #969696;
 }
 
+/* input[type="button"] { */
+.button {
+  margin: 0 0 1em 0;
+  background: #0073bb;
+  border: none;
+  width: 30%;
+  height: 25px;
+  font-size: 14px;
+  -webkit-border-radius: 50px;
+  -moz-border-radius: 50px;
+  border-radius: 50px;
+  color: #daf2fc;
+  text-align:center;
+  float: center;
+  }
+
+
 /* Draggable interface */
 .container {
   /* height: 280px; */
@@ -159,6 +182,11 @@ input[type="text"].focus,input[type="time"].focus, input[type="date"].focus {
   box-sizing: border-box;
 }
 
+.center {
+  float: center;
+  text-align:center;
+}
+
 .block {
   border:solid 2px;
   -webkit-border-radius: 20px;

Condorcet/templates/admin.html

@@ -53,8 +53,8 @@ <h1>Admin page</h1>
     <input type="submit" value="Set to now" formaction="{{
     url_for('setToNow',timeDate='VIEW_RESULTS') }}" method="POST" class=inline_button >
     <br>
-    <a href= {{url_for('result')}}> See results </a><br>
 
+    <div class="center" style="margin-top:20px;">
     <br>   
     <input type="submit" value="Update Configuration" class=admin_button style="float: center;">
     </form>
@@ -67,26 +67,34 @@ <h1>Admin page</h1>
     <input type="submit" value="Reset to default" class=admin_button>
     </form>
     <br>
+    </div>
 
 </div>
-<a href= https://lhcbglance.web.cern.ch/lhcbglance/membership/authorlist.php> 
-Website where to download list of authors </a><br>
-<br>
+<!-- <a href= https://lhcbglance.web.cern.ch/lhcbglance/membership/authorlist.php>  -->
+<!-- Website where to download list of authors </a><br> -->
+<!-- <br> -->
 
 
+<div class="block adminblock" style="float: center">
+    <div class="boxtitle" style="padding-bottom: 15px; font-size: 20px;">Voter list</div>
 <a href={{ url_for('download',
 filename=current_config['VOTERS_LIST']) }} download> 
 Download current list of voters </a><br>
 <br>
 
 <form action="{{ url_for('uploadVotersList'
 ) }}" method="POST" enctype="multipart/form-data">
-Upload new list of voters: 
-<input
-type="file" name="filename"  size = 40>
-<input type="submit" value="Upload">
+<b>Upload new list of voters</b><br>
+<input type="file" name="filename"  class=file_button> <br>
+<input type="submit" value="Upload" class=admin_button>
 </form>
 <br>
+</div>
+
+<div class="block adminblock center">
+    <div class="boxtitle" style="padding-bottom: 15px; font-size: 20px;">Results</div>
+    <a href={{ url_for('result') }}><button class="button">See results</button></a><br>
+</div>
 
 {% endblock %}