From af19ea430888fb39beb0dd2d588aeb159d9913e5 Mon Sep 17 00:00:00 2001
From: Michael Q Larson <michaelqlarson@gmail.com>
Date: Wed, 18 Mar 2015 00:40:18 -0700
Subject: [PATCH] improve upvoting UX and start adding angular validation to
 submit-story view

---
 public/js/main.js               | 20 ++++++++++++--------
 views/stories/show.jade         |  4 ++--
 views/stories/submit-story.jade | 13 +++++++++----
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/public/js/main.js b/public/js/main.js
index 661d14b934..1a975118be 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -126,13 +126,7 @@ $(document).ready(function() {
         $('#long-instructions').hide();
     });
 
-    $('#upvote').on('click', upvoteHandler);
-
-    var upvoteHandler = function (event) {
-        event.preventDefault();
-        var $this = $(this);
-        $this.addClass('disabled');
-        $this.text('Upvoted!');
+    var upvoteHandler = function () {
         var _id = storyId;
         $('#upvote').unbind('click');
         var alreadyUpvoted = false;
@@ -154,10 +148,14 @@ $(document).ready(function() {
                     $('#upvote').bind('click', upvoteHandler);
                 })
                 .done(function (data, textStatus, xhr) {
-                    $('#storyRank').text(data.rank);
+                    $('#upvote').text('Upvoted!').addClass('disabled');
+
+                    $('#storyRank').text(data.rank + " points");
                 });
         }
     };
+    $('#upvote').on('click', upvoteHandler);
+
 
     var storySubmitButtonHandler = function storySubmitButtonHandler() {
 
@@ -279,6 +277,12 @@ profileValidation.controller('doneWithFirst100HoursFormController', ['$scope',
     }
 ]);
 
+profileValidation.controller('submitStoryController', ['$scope',
+    function($scope) {
+
+    }
+]);
+
 profileValidation.directive('uniqueUsername',['$http',function($http) {
     return {
         restrict: 'A',
diff --git a/views/stories/show.jade b/views/stories/show.jade
index 5a40d0ba93..ea5e08032e 100644
--- a/views/stories/show.jade
+++ b/views/stories/show.jade
@@ -27,9 +27,9 @@
                     h4= description
                     .negative-5
                         a#reply-to-main-post.btn.btn-no-shadow.btn-primary.btn-xs.btn-primary-ghost Reply
-                        |  &thinsp;·&thinsp;
+                        |  &thinsp;·&thinsp;&thinsp;
                         if !hasUserVoted
-                            a#upvote.btn.btn-no-shadow.btn-primary.btn-xs.btn-primary-ghost
+                            a#upvote.btn.btn-no-shadow.btn-primary.btn-xs.btn-primary-ghost Upvote
                             |  &thinsp;·&thinsp;
                         else
                             a#upvote.btn.disabled.btn-no-shadow.btn-primary.btn-xs.btn-primary-ghost Upvoted!
diff --git a/views/stories/submit-story.jade b/views/stories/submit-story.jade
index 6e9e8f8b7b..5eada44e57 100644
--- a/views/stories/submit-story.jade
+++ b/views/stories/submit-story.jade
@@ -5,7 +5,7 @@
         var storyTitle = !{JSON.stringify(storyTitle)};
         var storyImage = !{JSON.stringify(storyImage)};
         var storyMetaDescription = !{JSON.stringify(storyMetaDescription)};
-    form.form-horizontal.control-label-story-submission#story-submission-form
+    form.form-horizontal.control-label-story-submission#story-submission-form(name="submitStory")
         .col-xs-12
             .form-group
                 .col-xs-12.col-md-1
@@ -17,11 +17,16 @@
                     label.control-label.control-label-story-submission(for='name') Title
                 .col-xs-12.col-md-11
                     input#story-title.form-control(placeholder='Type a headline for your link here', name='Title', maxlength='90' autofocus)
+                //    input#story-title.form-control(placeholder='Type a headline for your link here', name='Title', maxlength='90' ng-model='submitStory.title.Title',required='required', autocomplete="off" autofocus)
+                //.col-xs-12.col-md-11.col-md-offset-1(ng-cloak, ng-show="submitStory.title.$error.required")
+                //    alert(type='danger')
+                //        span.ion-close-circled
+                //        |  A headline is required to submit.
             .form-group
                 .col-xs-12.col-md-1
-                    label.control-label.control-label-story-submission(for='name') Description
+                    label.control-label.control-label-story-submission(for='name') Comment
                 .col-xs-12.col-md-11
-                    input#description-box.form-control(name="comment-box", placeholder="Start off the discussion with a description of your post" maxlength='140')
+                    input#description-box.form-control(name="comment-box", placeholder="Kick off the discussion with an optional comment about this link" maxlength='140')
             .form-group
                 .col-xs-12.col-md-offset-1
                     span.pull-left#textarea_feedback
@@ -38,7 +43,7 @@
             .row
                 .form-group
 
-                    button.btn.btn-big.btn-block.btn-primary#story-submit Submit
+                    button.btn.btn-big.btn-block.btn-primary#story-submit(type='submit', ng-disabled='submitStory.$invalid') Submit
     script.
         $('#story-url').val(storyURL).attr('disabled', 'disabled');
         $('#story-title').val(storyTitle);