show that we're collecting ip address

correct tab order in voting box

Author: Visnu Pitiyanuvath

nodeko.coffee

@@ -179,12 +179,12 @@ get '/teams/:id', ->
 
       if @currentPerson
         Vote.firstByTeamAndPerson team, @currentPerson, (error, vote) =>
-          @vote = vote or new Vote()
+          @vote = vote or new Vote(null, @req)
           @vote.person = @currentPerson
           @vote.email = @vote.person.email
           renderVotes()
       else
-        @vote = new Vote()
+        @vote = new Vote(null, @req)
         renderVotes()
     else
       # TODO make this a 404

public/stylesheets/application.css

@@ -424,10 +424,12 @@ aside#pullout {
       padding: 2px;
       -webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.1);
       -moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.1); }
-    .body.teams-show .votes li .voter time, .body.teams-show #your_vote .voter time {
+    .body.teams-show .votes li .voter .details, .body.teams-show #your_vote .voter .details {
       font-size: small;
       font-style: italic;
-      color: rgba(0, 0, 0, 0.4);
+      line-height: 125%;
+      color: rgba(0, 0, 0, 0.4); }
+    .body.teams-show .votes li .voter time, .body.teams-show #your_vote .voter time {
       display: block; }
   .body.teams-show .votes li .vote, .body.teams-show #your_vote .vote {
     margin-left: 180px; }
@@ -513,18 +515,20 @@ aside#pullout {
   margin: 0.5ex 0px; }
 #your_vote .dimensions {
   margin-bottom: 0.5ex; }
+#your_vote .email_input, #your_vote .email_hidden {
+  float: left; }
 #your_vote .email_input {
   margin-bottom: 0.5ex; }
   #your_vote .email_input .note {
     font-size: small; }
-#your_vote input.button {
-  float: right; }
 #your_vote .email_hidden {
   font-size: small;
   margin: 0.5em 0em; }
 #your_vote textarea {
   font-size: medium;
   width: 97%; }
+#your_vote input.button {
+  float: right; }
 
 .clear {
   clear: both; }

public/stylesheets/application.sass

@@ -415,10 +415,12 @@ aside#pullout
         :margin-right 5px
         :padding 2px
         +shadow
-      time
+      .details
         :font-size small
         :font-style italic
+        :line-height 125%
         :color hsla(0, 0%, 0%, 0.4)
+      time
         :display block
     .vote
       :margin-left 180px
@@ -506,17 +508,19 @@ aside#pullout
     :margin 0.5ex 0px
   .dimensions
     :margin-bottom 0.5ex
+  .email_input, .email_hidden
+    :float left
   .email_input
     :margin-bottom 0.5ex
     .note
       :font-size small
-  input.button
-    :float right
   .email_hidden
     :font-size small
     :margin 0.5em 0em
   textarea
     :font-size medium
     :width 97%
+  input.button
+    :float right
 .clear
   :clear both

views/partials/votes/voter.html.haml

@@ -1,3 +1,6 @@
-!= gravatar(vote.person, 50)
-= vote.person.displayName()
-%time{ datetime: vote.createdAt.toISOString() }
+- if (vote.person)
+  != gravatar(vote.person, 50)
+  = vote.person.displayName()
+.details
+  %time{ datetime: vote.createdAt.toISOString() }
+  = vote.remoteAddress

views/teams/show.html.haml

@@ -72,12 +72,10 @@
   %form#your_vote{ method: 'POST', action: '/teams/' + ctx.team.toParam() + '/votes' }
     .voter
       %h3 Your Vote
-      - if(ctx.vote.person)
-        != partial('votes/voter.html.haml', { locals: { vote: ctx.vote }})
+      != partial('votes/voter.html.haml', { locals: { vote: ctx.vote }})
     .vote
       != partial('votes/stars.html.haml', { locals: { vote: ctx.vote }})
       %textarea{ name: 'comment', id: 'comment', placeholder: '2-3 sentence review. Optional.', rows: 4 }= ctx.vote.comment || ''
-      %input.button{ type: 'submit', value: 'Vote!' }
       - if (!ctx.currentPerson)
         .email_input
           %input.email{ type: 'text', name: 'email', id: 'email', value: ctx.vote.email || '', placeholder: '[email protected]' }
@@ -90,6 +88,7 @@
           = ' ' + ctx.vote.email + ' '
           —
           %a{ href: '/logout?return_to=' + escapeURL('/teams/' + ctx.team.toParam() + '#draft') } Change
+      %input.button{ type: 'submit', value: 'Vote!' }
       .clear
 
 %ul.votes