Check empty data in mongodb + dynamic position of the vote button, no…

…w centered too
domq · Mar 19, 2015 · 8fc4287 · 8fc4287
1 parent c597b51
commit 8fc4287
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 35 deletions.
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
@@ -1,14 +1,10 @@
-body {
-  margin-bottom: 60px;
-}
 a {
   color: #00b7ff;
 }
-form {
-  height: 300px;
+.centered {
+  text-align: center;
 }
 form ul {
-  height: 60px;
   list-style: none;
 }
 form li {
@@ -23,12 +19,15 @@ form li {
   background-position: 14px 14px;
   filter: url("data:image/svg+xml;utf8,<svg version='1.1' xmlns='http://www.w3.org/2000/svg' height='0'><filter id='greyscale'><feColorMatrix type='matrix' values='0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0' /></filter></svg>#greyscale");
   -webkit-filter: grayscale(1.0);
+  color: #000;
   cursor: move;
+  display: block;
 }
 form label {
   margin-right: 10px;
   background-color: #fff;
   cursor: inherit;
+  color: #05f;
 }
 form li:hover {
   filter: none;
@@ -47,7 +46,7 @@ li#team {
   background-image: url("/images/Farm-Fresh_gruppe5.png");
 }
 #content {
-  padding: 60px 15px 0;
+  padding: 40px 25px 0px 25px;
 }
 .navbar-fixed-bottom {
   background-color: #f5f5f5;

diff --git a/public/stylesheets/style.styl b/public/stylesheets/style.styl
@@ -1,22 +1,19 @@
 grayscale()
   filter: url("data:image/svg+xml;utf8,<svg version='1.1' xmlns='http://www.w3.org/2000/svg' height='0'><filter id='greyscale'><feColorMatrix type='matrix' values='0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0' /></filter></svg>#greyscale");
   -webkit-filter unquote("grayscale(1.0)")
+  color #000
 
 nograyscale()
   filter none
   -webkit-filter none
 
-body
-  margin-bottom: 60px;
-
 a
   color: #00B7FF
 
-form
-  height: 300px;
+.centered
+  text-align:center;
 
 form ul
-  height:60px;
   list-style none
 
 form li
@@ -31,11 +28,13 @@ form li
   background-position: 14px 14px;
   grayscale()
   cursor: move;
+  display: block;
 
 form label
   margin-right 10px
   background-color #ffffff
   cursor inherit
+  color #0055FF
 
 form li:hover
   nograyscale()
@@ -53,7 +52,7 @@ li#team
   background-image: url("/images/Farm-Fresh_gruppe5.png");
 
 #content
-  padding: 60px 15px 0;
+  padding: 40px 25px 0px 25px;
 
 .navbar-fixed-bottom
   // In addition to bootstrap's own style, make it

diff --git a/views/admin.jade b/views/admin.jade
@@ -1,10 +1,6 @@
 extends layout
 block content
     h1= title
-    p Welcome to #{title}, #{user}!
-
-    a(href="/logout") Log out
-
 
     p Even if you are not logged in, you can see the database contents!
 
@@ -13,14 +9,14 @@ block content
         tr
             th User id
             th Data
-
-        for poll in pollsAnswers
-            tr
-                td
-                   span &lt;
-                   = poll.user
-                   span &gt;
-                td
-                    span &lt;
-                    = JSON.stringify(poll)
-                    span &gt;
+        if pollsAnswers
+            for poll in pollsAnswers
+                tr
+                    td
+                       span &lt;
+                       = poll.user
+                       span &gt;
+                    td
+                        span &lt;
+                        = JSON.stringify(poll)
+                        span &gt;
diff --git a/views/index.jade b/views/index.jade
@@ -19,5 +19,9 @@ block content
             li(id="sport")
                 label activité sportive
 
-    div(class="clearfix")
-    button(type="button", class="btn btn-primary btn-lg", id="btnSubmit") Vote !
+        div(class="centered")
+            button(type="button", class="btn btn-primary btn-lg", id="btnSubmit") Vote !
+
+        br
+        br
+        br
diff --git a/views/result.jade b/views/result.jade
@@ -10,7 +10,8 @@ block content
         tr
             th Type
             th Vote Number
-        for  result in results
-           tr
-                td #{result._id}
-                td #{result.value}
+        if results
+            for  result in results
+                tr
+                    td #{result._id}
+                    td #{result.value}