Updated layout and poll

api/event/event.model.js

@@ -46,7 +46,7 @@ var EventSchema = new Schema({
     participants : [{
         id : Schema.Types.ObjectId,
         name : String,
-        votes : [Date]
+        votes : [Boolean]
     }],
     isClosed : {
         type : Boolean,

public/js/directives/datepicker.directive.js

@@ -8,8 +8,7 @@ angular.module('rallly')
             control : '='
         },
         link : function(scope, el, attrs, ngModel){
-            var dateService  = new DatePickerService(scope.model),
+            var dateService  = new DatePickerService(scope.model);
-                dateBuffer = dateService.getDatesArray();
 
             angular.element(el).datepicker({
                 multidate : true,
@@ -17,25 +16,32 @@ angular.module('rallly')
             })
             .on('changeDate', function(e){
                 var datePickerDates = e.dates;
-                if (datePickerDates.length > dateBuffer.length) {
+                if (datePickerDates.length > dateService.count()) {
                     var dateAdded = datePickerDates[datePickerDates.length-1];
                     dateService.addDate(dateAdded);
                 } else {
-                    var dateRemoved = dateService.diffDates(dateBuffer, datePickerDates);
+                    var dateRemoved = dateService.diffDates(datePickerDates);
                     if (dateRemoved)
                         dateService.removeDate(dateRemoved);
                 }
                 ngModel.$setViewValue(dateService.getDates())
-                dateBuffer = datePickerDates;
             });
-            scope.control = scope.control || {};
+            var init = false;
             scope.$watchCollection('model', function(newValue, oldValue){
-                var datePickerDates = angular.element(el).datepicker('getDates');
+                if (newValue){
+                    if (!init){
+                        init = true;
+                        dateService.setStore(newValue);
+                    }
                     var modelDates = dateService.getDatesArray();
+                    var datePickerDates = angular.element(el).datepicker('getDates');
                     if (datePickerDates.length != modelDates.length){
                         angular.element(el).datepicker('setDates', modelDates);
                     }
+                }
             });
+
+            scope.control = scope.control || {};
             scope.control.unsetDate = function(date){
                 dateService.removeDate(date);
             }
@@ -53,8 +59,16 @@ angular.module('rallly')
 .service('DatePickerService', function(){
     return function(defaultStore){
 
+        // Storage for the datepicker ui element
         var store = defaultStore || [];
+        var me = this;
 
+        this.count = function(){
+            return store.length;
+        }
+        this.setStore = function(newStore){
+            store = newStore;
+        }
         this.addDate = function(date){
             store.push({ date : date });
             store.sort(function(a, b){
@@ -63,24 +77,29 @@ angular.module('rallly')
             });
         }
         this.removeDate = function(date){
+            console.log('removing date');
+            var parsedDate = Date.parse(date);
             for (var i = 0; i < store.length; i++){
-                if (Date.equals(store[i].date, date)){
+                if (Date.equals(store[i].date, parsedDate)){
                     store.splice(i,1);
                 }
             }
         }
+        // Returns the store
         this.getDates = function(){
             return (store.length > 0) ? store : null;
         }
+        // Returns the store as an array of Dates
         this.getDatesArray = function(){
             var dates = [];
             for (var i = 0; i < store.length; i++){
-                dates.push(store[i].date);
+                dates.push(Date.parse(store[i].date));
             }
             return dates;
         }
-        this.diffDates = function(bigArr, smallArr){
+        // Takes two arrays of Dates and returns the first element in the first array that isn't in the second array
-            var shouldReturn = true;
+        this.diffDates = function(smallArr){
+            var shouldReturn = true, bigArr = me.getDatesArray();
             for (var i = 0; i < bigArr.length; i++){
                 shouldReturn = true;
                 for (var j = 0; j < smallArr.length; j++) {

public/js/directives/poll.directive.js

@@ -49,7 +49,7 @@ angular.module('rallly')
             scope.selectedDate = function(index){
                 datesCount[index] = 0;
                 for (var i = 0; i < scope.event.participants.length; i++){
-                    if (scope.event.participants[i].dates[index]) datesCount[index]++;
+                    if (scope.event.participants[i].votes[index]) datesCount[index]++;
                 }
                 return datesCount[index];
             }

public/js/templates.js

@@ -7,16 +7,16 @@ $templateCache.put("templates/newevent.html","<div ng-if=\"!eventUrl\">\n    <di
 $templateCache.put("templates/notfound.html","<h1>Error 404</h1>\n<h2>Not Found</h2>\n");
 $templateCache.put("templates/notification.html","<div class=\"notification {{notification.type}}\" ng-click=\"notification.close()\">\n    <div class=\"title\">\n        {{notification.title}}\n    </div>\n    <div class=\"message\">\n        {{notification.message}}\n    </div>\n</div>\n");
 $templateCache.put("templates/directives/discussion.html","<ul class=\"comment-thread\" ng-show=\"event.comments.length\">\n    <li ng-repeat=\"comment in event.comments\" class=\"comment\">\n        <div class=\"avatar-section\">\n            <img src=\"/images/avatar.png\" />\n        </div>\n        <div class=\"comment-section\">\n            <a href=\"#\" class=\"comment-delete\" ng-click=\"deleteComment(comment)\">&times;</a>\n            <div class=\"meta\">\n                <span class=\"name\">{{comment.author.name}}</span>\n                <span class=\"time\">{{comment.created | elapsed}}</span>\n            </div>\n            <div class=\"content\">{{comment.content}}</div>\n        </div>\n    </li>\n</ul>\n<form novalidate ng-submit=\"postComment()\" name=\"commentForm\" class=\"comment-form\">\n    <div class=\"avatar-section\">\n        <img src=\"/images/avatar.png\" />\n    </div>\n    <div class=\"input-section form-group\">\n        <div class=\"content-section\">\n            <textarea class=\"form-control\" required ng-model=\"comment.content\" placeholder=\"Write a comment...\"></textarea>\n        </div>\n        <div class=\"name-section\">\n            <div class=\"name-container\">\n                <input type=\"text\" class=\"form-control\" required placeholder=\"Your Name\" ng-model=\"comment.author.name\" />\n                <button type=\"submit\" class=\"btn\">Post Comment</button>\n                <span class=\"form-error\" ng-show=\"commentForm.$submitted && commentForm.$error\">\n                    <img src=\"/images/error.png\" width=\"14\" /> Make sure you fill in all the fields.\n                </span>\n            </div>\n        </div>\n    </div>\n</form>\n");
-$templateCache.put("templates/directives/poll.html","<div class=\"poll-header\">\n    <div class=\"header participants-header\">\n        {{event.participants.length}} participants\n    </div>\n    <div class=\"header date-header\" ng-repeat=\"d in event.dates\">\n        <div class=\"daticon\">\n            <div class=\"dow\">\n                {{d.date | date: \'EEE\'}}\n            </div>\n            <div class=\"day\">\n                {{d.date | date: \'d\'}}\n            </div>\n            <div class=\"month\">\n                {{d.date | date : \'MMM\'}}\n            </div>\n            <span class=\"count\" ng-show=\"selectedDate($index)\" ng-class={top:isTopDate($index)}>{{selectedDate($index)}}</span>\n        </div>\n    </div>\n    <div class=\"header actions-header\">\n\n    </div>\n</div>\n<div class=\"poll-body\">\n    <div class=\"poll-entry\" ng-repeat=\"participant in event.participants\">\n        <form novalidate ng-submit=\"update(participant); editMode = false\">\n            <div class=\"cell name-cell\">\n                <span class=\"avatar style-{{$index + 1}}\">\n                    <img src=\"/images/user.png\" width=\"11\" />\n                </span>\n                <input required autocomplete=\"off\" type=\"text\" class=\"form-control\" ng-model=\"participant.name\" ng-show=\"editMode\" value=\"participant.name\"/>\n                <span ng-hide=\"editMode\" class=\"name editable\" ng-click=\"editMode = true && !event.isClosed; edit(participant)\">{{participant.name}}</span>\n            </div>\n            <div class=\"cell vote-cell\" ng-repeat=\"date in event.dates\">\n                <img src=\"/images/tick@2x.png\"  width=\"16\" ng-hide=\"editMode\" ng-if=\"participant.dates[$index]\" />\n                <img src=\"/images/nope@2x.png\" width=\"8\" ng-hide=\"editMode\" ng-if=\"!participant.dates[$index]\" />\n                <input ng-model=\"participant.dates[$index]\" ng-show=\"editMode\" ng-false-value=\"false\" type=\"checkbox\" />\n                <div class=\"overlay\" ng-show=\"editMode\" ng-click=\"participant.dates[$index] = !participant.dates[$index]\"></div>\n            </div>\n            <div class=\"cell action-cell\" ng-hide=\"event.isClosed\">\n                <button type=\"button\" ng-hide=\"editMode\" ng-click=\"editMode = true; edit(participant)\" class=\"btn hover\">Edit</button>\n                <button type=\"button\" ng-hide=\"editMode\" ng-click=\"delete(participant)\" class=\"btn danger hover\">Delete</button>\n                <button type=\"submit\" ng-show=\"editMode\" class=\"btn\">Save</button>\n                <button type=\"button\" ng-show=\"editMode\" ng-click=\"editMode = false; cancel($index)\" class=\"btn\">Cancel</button>\n            </div>\n        </form>\n    </div>\n    <div class=\"poll-example\" ng-class=\"{hidden : event.participants.length > 0}\">\n        <div class=\"poll-entry\" ng-repeat=\"example in examples\">\n            <div class=\"cell name-cell\">\n                <span class=\"avatar style-{{$index + 1}}\">\n                    <img src=\"/images/user.png\" width=\"11\" />\n                </span>\n                <span class=\"name\">{{example.name}}</span>\n            </div>\n            <div class=\"cell vote-cell\" ng-repeat=\"date in event.dates\">\n                <img src=\"/images/tick@2x.png\"  width=\"16\" ng-if=\"example.dates[$index]\" />\n                <img src=\"/images/nope@2x.png\" width=\"8\" ng-if=\"!example.dates[$index]\" />\n            </div>\n            <div class=\"cell action-cell\">\n\n            </div>\n        </div>\n        <div class=\"overlay\">\n            <div class=\"overlay-text\">\n                Fill in the form below to get started\n            </div>\n        </div>\n    </div>\n    <div ng-hide=\"event.isClosed\" class=\"poll-entry highlight\">\n        <form novalidate name=\"formnew\" ng-submit=\"save()\">\n            <div class=\"cell name-cell\">\n                <span class=\"avatar style-{{participant.style}}\">\n                    <img src=\"/images/user.png\" width=\"11\" />\n                </span>\n                <input autocomplete=\"off\" name=\"username\" type=\"text\" class=\"form-control\" placeholder=\"Your name...\" ng-model=\"participant.name\" required value=\"participant.name\"/>\n            </div>\n            <div class=\"cell vote-cell\" ng-repeat=\"date in event.dates\">\n                <input ng-model=\"participant.dates[$index]\" ng-false-value=\"false\" type=\"checkbox\" />\n                <div class=\"overlay\" ng-click=\"participant.dates[$index] = !participant.dates[$index]\"></div>\n            </div>\n            <div class=\"cell action-cell\">\n                <button type=\"submit\" ng-class=\"{ \'animated shake\' : formnew.$submitted && formnew.$invalid  }\" class=\"btn\">Save</button>\n            </div>\n        </form>\n    </div>\n</div>\n");
+$templateCache.put("templates/directives/poll.html","<div class=\"poll-header\">\n    <div class=\"header participants-header\">\n        {{event.participants.length}} participants\n    </div>\n    <div class=\"header date-header\" ng-repeat=\"d in event.dates\">\n        <div class=\"daticon\">\n            <div class=\"dow\">\n                {{d.date | date: \'EEE\'}}\n            </div>\n            <div class=\"day\">\n                {{d.date | date: \'d\'}}\n            </div>\n            <div class=\"month\">\n                {{d.date | date : \'MMM\'}}\n            </div>\n            <span class=\"count\" ng-show=\"selectedDate($index)\" ng-class={top:isTopDate($index)}>{{selectedDate($index)}}</span>\n        </div>\n    </div>\n    <div class=\"header actions-header\">\n\n    </div>\n</div>\n<div class=\"poll-body\">\n    <div class=\"poll-entry\" ng-repeat=\"participant in event.participants\">\n        <form novalidate ng-submit=\"update(participant); editMode = false\">\n            <div class=\"cell name-cell\">\n                <span class=\"avatar style-{{$index + 1}}\">\n                    <img src=\"/images/user.png\" width=\"11\" />\n                </span>\n                <input required autocomplete=\"off\" type=\"text\" class=\"form-control\" ng-model=\"participant.name\" ng-show=\"editMode\" value=\"participant.name\"/>\n                <span ng-hide=\"editMode\" class=\"name editable\" ng-click=\"editMode = true && !event.isClosed; edit(participant)\">{{participant.name}}</span>\n            </div>\n            <div class=\"cell vote-cell\" ng-repeat=\"date in event.dates\">\n                <img src=\"/images/tick@2x.png\"  width=\"16\" ng-hide=\"editMode\" ng-if=\"participant.votes[$index]\" />\n                <img src=\"/images/nope@2x.png\" width=\"8\" ng-hide=\"editMode\" ng-if=\"!participant.votes[$index]\" />\n                <input ng-model=\"participant.votes[$index]\" ng-show=\"editMode\" ng-false-value=\"false\" type=\"checkbox\" />\n                <div class=\"overlay\" ng-show=\"editMode\" ng-click=\"participant.votes[$index] = !participant.votes[$index]\"></div>\n            </div>\n            <div class=\"cell action-cell\" ng-hide=\"event.isClosed\">\n                <button type=\"button\" ng-hide=\"editMode\" ng-click=\"editMode = true; edit(participant)\" class=\"btn hover\">Edit</button>\n                <button type=\"button\" ng-hide=\"editMode\" ng-click=\"delete(participant)\" class=\"btn danger hover\">Delete</button>\n                <button type=\"submit\" ng-show=\"editMode\" class=\"btn\">Save</button>\n                <button type=\"button\" ng-show=\"editMode\" ng-click=\"editMode = false; cancel($index)\" class=\"btn\">Cancel</button>\n            </div>\n        </form>\n    </div>\n    <div class=\"poll-example\" ng-class=\"{hidden : event.participants.length > 0}\">\n        <div class=\"poll-entry\" ng-repeat=\"example in examples\">\n            <div class=\"cell name-cell\">\n                <span class=\"avatar style-{{$index + 1}}\">\n                    <img src=\"/images/user.png\" width=\"11\" />\n                </span>\n                <span class=\"name\">{{example.name}}</span>\n            </div>\n            <div class=\"cell vote-cell\" ng-repeat=\"date in event.dates\">\n                <img src=\"/images/tick@2x.png\"  width=\"16\" ng-if=\"example.votes[$index]\" />\n                <img src=\"/images/nope@2x.png\" width=\"8\" ng-if=\"!example.votes[$index]\" />\n            </div>\n            <div class=\"cell action-cell\">\n\n            </div>\n        </div>\n        <div class=\"overlay\">\n            <div class=\"overlay-text\">\n                Fill in the form below to get started\n            </div>\n        </div>\n    </div>\n    <div ng-hide=\"event.isClosed\" class=\"poll-entry highlight\">\n        <form novalidate name=\"formnew\" ng-submit=\"save()\">\n            <div class=\"cell name-cell\">\n                <span class=\"avatar style-{{participant.style}}\">\n                    <img src=\"/images/user.png\" width=\"11\" />\n                </span>\n                <input autocomplete=\"off\" name=\"username\" type=\"text\" class=\"form-control\" placeholder=\"Your name...\" ng-model=\"participant.name\" required value=\"participant.name\"/>\n            </div>\n            <div class=\"cell vote-cell\" ng-repeat=\"date in event.dates\">\n                <input ng-model=\"participant.votes[$index]\" ng-false-value=\"false\" type=\"checkbox\" />\n                <div class=\"overlay\" ng-click=\"participant.votes[$index] = !participant.votes[$index]\"></div>\n            </div>\n            <div class=\"cell action-cell\">\n                <button type=\"submit\" ng-class=\"{ \'animated shake\' : formnew.$submitted && formnew.$invalid  }\" class=\"btn\">Save</button>\n            </div>\n        </form>\n    </div>\n</div>\n");
 $templateCache.put("templates/directives/timePicker.html","<div class=\"time-picker\">\n    <div class=\"time-picker-col\">\n        <div class=\"daticon\">\n            <div class=\"dow\">\n                {{date | date: \'EEE\'}}\n            </div>\n            <div class=\"day\">\n                {{date | date: \'d\'}}\n            </div>\n            <div class=\"month\">\n                {{date | date : \'MMM\'}}\n            </div>\n            <!-- <span class=\"delete\" ng-click=\"datepicker.unsetDate(date)\"></span> -->\n        </div>\n    </div>\n    <div class=\"time-picker-col\" ng-repeat=\"time in date.times track by $index\">\n        <input type=\"text\" class=\"time-picker-input\" time-picker ng-model=\"time\" ng-model-options=\"{ updateOn: \'blur\' }\" />\n    </div>\n</div>\n");
+$templateCache.put("templates/newEvent/datetime.html","<section class=\"box-section\" date-form form=\"form\" event=\"event\">\n\n</section>\n\n<div class=\"box-controls box-bottom-sticky\">\n    <button type=\"button\" class=\"btn\" ng-click=\"prevPage()\">Previous</button>\n    <button type=\"submit\" class=\"btn\">Next</button>\n</div>\n");
+$templateCache.put("templates/newEvent/general.html","<section class=\"box-section\" user-form form=\"form\" event=\"event\">\n\n</section>\n\n<section class=\"box-section\" event-form form=\"form\" event=\"event\">\n\n</section>\n\n<div class=\"box-controls box-bottom-sticky\">\n    <button type=\"submit\" class=\"btn\">Next Step</button>\n</div>\n");
+$templateCache.put("templates/newEvent/invite.html","<section class=\"box-section\" participants-form form=\"form\" event=\"event\">\n\n</section>\n\n<div class=\"box-controls box-bottom-sticky\">\n    <button type=\"button\" class=\"btn\" ng-click=\"prevPage()\">Previous</button>\n    <button type=\"submit\" class=\"btn\">Create</button>\n</div>\n");
+$templateCache.put("templates/newEvent/layout.html","<div class=\"box\">\n\n    <div class=\"box-title\">Schedule a New Event</div>\n    <div class=\"box-description\">\n        Fill in the form below to create your event and share it with your friends and colleagues.\n    </div>\n    <ol class=\"box-steps\">\n        <li class=\"step active\">\n            General Details\n        </li>\n        <li class=\"step\" ng-class=\"{ active : page > 1 }\">\n            Dates &amp; Times\n        </li>\n        <li class=\"step\" ng-class=\"{ active : page > 2 }\">\n            Invites\n        </li>\n        <li class=\"step\" ng-class=\"{ active : page > 3 }\">\n            Done\n        </li>\n    </ol>\n    <form novalidate autocomplete=\"off\" name=\"form\" ng-submit=\"submit()\">\n        <div ui-view>\n\n        </div>\n    </form>\n</div>\n");
+$templateCache.put("templates/newEvent/success.html","<div class=\"box-message\">\n    <div class=\"main-image\">\n        <img src=\"/images/success_large.png\" width=\"100\" />\n    </div>\n    <div class=\"title\">Event Created</div>\n    <div class=\"content\">\n        Your event has been created successfully! You should receive an email shortly with instructions to verify your email address.\n    </div>\n    <div class=\"mini-divider\">\n    </div>\n    <div class=\"form-group\">\n        <input type=\"text\" class=\"form-control\" disabled=\"true\" value=\"{{eventUrl}}\" />\n        <a href=\"{{eventUrl}}\" class=\"btn form-btn\">GO</a>\n    </div>\n</div>\n");
 $templateCache.put("templates/form/dateForm.html","<div class=\"section-details\">\n    <div class=\"section-title\">Choose Dates</div>\n    <ul class=\"daticon-list\">\n        <li ng-repeat=\"d in event.dates\">\n            <div class=\"daticon\">\n                <div class=\"dow\">\n                    {{d.date | date: \'EEE\'}}\n                </div>\n                <div class=\"day\">\n                    {{d.date | date: \'d\'}}\n                </div>\n                <div class=\"month\">\n                    {{d.date | date : \'MMM\'}}\n                </div>\n                <span class=\"delete\" ng-click=\"datepicker.unsetDate(d.date)\"></span>\n            </div>\n        </li>\n    </ul>\n</div>\n<div class=\"section-main\">\n    <div class=\"form-row\">\n        <div class=\"form-group\">\n            <label for=\"email\">Calendar</label>\n            <span class=\"form-error\" ng-show=\"form.$submitted && form.datepicker.$error.required\">\n                <img src=\"/images/error.png\" width=\"14\" /> You need to select a few dates\n            </span>\n            <div datepicker required name=\"datepicker\" control=\"datepicker\" ng-model=\"event.dates\">\n\n            </div>\n        </div>\n    </div>\n</div>\n");
 $templateCache.put("templates/form/eventForm.html","<div class=\"section-details\">\n    <div class=\"section-title\">Event Details</div>\n</div>\n<div class=\"section-main\">\n    <div class=\"form-row\">\n        <div class=\"form-col\">\n            <div class=\"form-group\">\n                <label for=\"title\">Title</label>\n                <span class=\"form-error\" ng-show=\"(form.title.$touched || form.$submitted) && errors.title\">\n                    <img src=\"/images/error.png\" width=\"14\" /> {{errors.title}}\n                </span>\n                <input id=\"title\" name=\"title\" ng-maxlength=\"30\" required ng-model=\"event.title\" type=\"text\" placeholder=\"Monthly Meetup...\" class=\"form-control extend\"/>\n            </div>\n        </div>\n        <div class=\"form-col\">\n            <div class=\"form-group optional\">\n                <label for=\"location\">Location</label>\n                <span class=\"form-error\" ng-show=\"(form.location.$touched || form.$submitted) && errors.location\">\n                    <img src=\"/images/error.png\" width=\"14\" /> {{errors.location}}\n                </span>\n                <input id=\"location\" name=\"location\" ng-model=\"event.location\" ng-maxlength=\"50\" type=\"text\" placeholder=\"Rick\'s Cafe...\" class=\"form-control extend\"/>\n            </div>\n        </div>\n    </div>\n    <div class=\"form-row\">\n        <div class=\"form-group optional\">\n            <label for=\"description\" >Description</label>\n            <textarea id=\"description\" name=\"description\" ng-model=\"event.description\" placeholder=\"Enter Description...\" class=\"form-control extend\"></textarea>\n        </div>\n    </div>\n</div>\n");
 $templateCache.put("templates/form/participantsForm.html","<div class=\"section-details\">\n    <div class=\"section-title\">Invite Participants</div>\n</div>\n<div class=\"section-main\">\n    <div class=\"form-row\">\n        <div class=\"form-group optional\">\n            <label>Participant\'s Emails</label>\n            <tags-input max-length=\"50\" allowed-tags-pattern=\"{{emailRegex}}\" display-property=\"email\" ng-model=\"event.emails\" placeholder=\"Add an Email\" type=\"email\" autocomplete=\"off\"></tags-input>\n            <input type=\"hidden\" name=\"shouldCreate\" value=\"true\" />\n\n        </div>\n    </div>\n</div>\n</section>\n");
 $templateCache.put("templates/form/settingsForm.html","<div class=\"section-details\">\n    <div class=\"section-title\">Settings</div>\n</div>\n<div class=\"section-main\">\n    <div class=\"switch-row\">\n        <div class=\"switch-details\">\n            <div class=\"title\">\n                Poll Status\n            </div>\n            <div class=\"description\">\n                Let people vote on the poll.\n            </div>\n        </div>\n        <div class=\"switch\">\n            <div class=\"switch-value\">\n                {{event.isClosed ? \'Closed\' : \'Open\' }}\n            </div>\n            <div switch-toggle ng-model=\"event.isClosed\" invert>\n            </div>\n        </div>\n    </div>\n    <div class=\"switch-row\">\n        <div class=\"switch-details\">\n            <div class=\"title\">\n                Notifications\n            </div>\n            <div class=\"description\">\n                Send email notifications to the creator of this event.\n            </div>\n        </div>\n        <div class=\"switch\">\n            <div class=\"switch-value\">\n                {{event.creator.allowNotifications ? \'Enabled\' : \'Disabled\' }}\n            </div>\n            <div switch-toggle ng-model=\"event.creator.allowNotifications\">\n            </div>\n        </div>\n    </div>\n    <div class=\"switch-row\">\n        <div class=\"switch-details\">\n            <div class=\"title\">\n                Delete Event\n            </div>\n            <div class=\"description\">\n                Once you delete an event it will no longer be accessible.\n            </div>\n        </div>\n        <div class=\"switch\">\n            <button type=\"button\" ng-click=\"deleteEvent()\" class=\"btn\" ng-class=\"{danger : !deleteRequestSent, disabled : deleteRequestSent}\">{{deleteRequestSent ? \'Request Sent\' : \'Delete Event\' }}</button>\n        </div>\n    </div>\n</div>\n</section>\n");
 $templateCache.put("templates/form/timeForm.html","<div class=\"section-details\">\n    <div class=\"section-title\">Choose Times</div>\n</div>\n<div class=\"section-main\">\n    <table class=\"time-form\">\n        <thead>\n            <tr>\n                <th>\n\n                </th>\n                <th>\n                    Time 1\n                </th>\n                <th>\n                    Time 2\n                </th>\n                <th>\n                    Time 3\n                </th>\n            </tr>\n        </thead>\n        <tbody>\n            <tr ng-repeat=\"d in event.dates\">\n                <td>\n                    <div class=\"daticon\">\n                        <div class=\"dow\">\n                            {{d.date | date: \'EEE\'}}\n                        </div>\n                        <div class=\"day\">\n                            {{d.date | date: \'d\'}}\n                        </div>\n                        <div class=\"month\">\n                            {{d.date | date : \'MMM\'}}\n                        </div>\n                        <span class=\"delete\" ng-click=\"unsetDate(d.date)\"></span>\n                    </div>\n                </td>\n                <td ng-repeat=\"time in [1,2,3] track by $index\">\n                    <input type=\"text\" time-picker ng-model-options=\"{ updateOn: \'blur\' }\" ng-model=\"d.times[$index]\" class=\"time-picker-input\" />\n                </td>\n            </tr>\n        </tbody>\n    </table>\n</div>\n");
-$templateCache.put("templates/form/userForm.html","<div class=\"section-details\">\n    <div class=\"section-title\">Your Details</div>\n</div>\n<div class=\"section-main\">\n    <div class=\"form-row\">\n        <div class=\"form-col\">\n            <div class=\"form-group\">\n                <label for=\"name\">Name</label>\n                <span class=\"form-error\" ng-show=\"(form.name.$touched || form.$submitted) && errors.name\">\n                    <img src=\"/images/error.png\" width=\"14\" /> {{errors.name}}\n                </span>\n                <input id=\"name\" name=\"name\" ng-maxlength=\"30\" required ng-model=\"event.creator.name\" type=\"text\" placeholder=\"John Doe...\" class=\"form-control extend\"/>\n            </div>\n        </div>\n        <div class=\"form-col\">\n            <div class=\"form-group\">\n                <label for=\"email\">Email</label>\n                <span class=\"form-error\" ng-show=\"(form.email.$touched || form.$submitted) && errors.email\">\n                    <img src=\"/images/error.png\" width=\"14\" /> {{errors.email}}\n                </span>\n                <input type=\"email\" id=\"email\" name=\"email\" ng-pattern=\"emailRegex\" required ng-model=\"event.creator.email\" placeholder=\"john.doe@email.com...\" class=\"form-control extend\"/>\n            </div>\n        </div>\n    </div>\n</div>\n");
+$templateCache.put("templates/form/userForm.html","<div class=\"section-details\">\n    <div class=\"section-title\">Your Details</div>\n</div>\n<div class=\"section-main\">\n    <div class=\"form-row\">\n        <div class=\"form-col\">\n            <div class=\"form-group\">\n                <label for=\"name\">Name</label>\n                <span class=\"form-error\" ng-show=\"(form.name.$touched || form.$submitted) && errors.name\">\n                    <img src=\"/images/error.png\" width=\"14\" /> {{errors.name}}\n                </span>\n                <input id=\"name\" name=\"name\" ng-maxlength=\"30\" required ng-model=\"event.creator.name\" type=\"text\" placeholder=\"John Doe...\" class=\"form-control extend\"/>\n            </div>\n        </div>\n        <div class=\"form-col\">\n            <div class=\"form-group\">\n                <label for=\"email\">Email</label>\n                <span class=\"form-error\" ng-show=\"(form.email.$touched || form.$submitted) && errors.email\">\n                    <img src=\"/images/error.png\" width=\"14\" /> {{errors.email}}\n                </span>\n                <input type=\"email\" id=\"email\" name=\"email\" ng-pattern=\"emailRegex\" required ng-model=\"event.creator.email\" placeholder=\"john.doe@email.com...\" class=\"form-control extend\"/>\n            </div>\n        </div>\n    </div>\n</div>\n");}]);
-$templateCache.put("templates/newEvent/datetime.html","<section class=\"box-section\" date-form form=\"form\" event=\"event\">\n\n</section>\n\n<div class=\"box-controls box-bottom-sticky\">\n    <button type=\"button\" class=\"btn\" ng-click=\"prevPage()\">Previous</button>\n    <button type=\"submit\" class=\"btn\">Next</button>\n</div>\n");
-$templateCache.put("templates/newEvent/general.html","<section class=\"box-section\" user-form form=\"form\" event=\"event\">\n\n</section>\n\n<section class=\"box-section\" event-form form=\"form\" event=\"event\">\n\n</section>\n\n<div class=\"box-controls box-bottom-sticky\">\n    <button type=\"submit\" class=\"btn\">Next Step</button>\n</div>\n");
-$templateCache.put("templates/newEvent/invite.html","<section class=\"box-section\" participants-form form=\"form\" event=\"event\">\n\n</section>\n\n<div class=\"box-controls box-bottom-sticky\">\n    <button type=\"button\" class=\"btn\" ng-click=\"prevPage()\">Previous</button>\n    <button type=\"submit\" class=\"btn\">Create</button>\n</div>\n");
-$templateCache.put("templates/newEvent/layout.html","<div class=\"box\">\n\n    <div class=\"box-title\">Schedule a New Event</div>\n    <div class=\"box-description\">\n        Fill in the form below to create your event and share it with your friends and colleagues.\n    </div>\n    <ol class=\"box-steps\">\n        <li class=\"step active\">\n            General Details\n        </li>\n        <li class=\"step\" ng-class=\"{ active : page > 1 }\">\n            Dates &amp; Times\n        </li>\n        <li class=\"step\" ng-class=\"{ active : page > 2 }\">\n            Invites\n        </li>\n        <li class=\"step\" ng-class=\"{ active : page > 3 }\">\n            Done\n        </li>\n    </ol>\n    <form novalidate autocomplete=\"off\" name=\"form\" ng-submit=\"submit()\">\n        <div ui-view>\n\n        </div>\n    </form>\n</div>\n");
-$templateCache.put("templates/newEvent/success.html","<div class=\"box-message\">\n    <div class=\"main-image\">\n        <img src=\"/images/success_large.png\" width=\"100\" />\n    </div>\n    <div class=\"title\">Event Created</div>\n    <div class=\"content\">\n        Your event has been created successfully! You should receive an email shortly with instructions to verify your email address.\n    </div>\n    <div class=\"mini-divider\">\n    </div>\n    <div class=\"form-group\">\n        <input type=\"text\" class=\"form-control\" disabled=\"true\" value=\"{{eventUrl}}\" />\n        <a href=\"{{eventUrl}}\" class=\"btn form-btn\">GO</a>\n    </div>\n</div>\n");}]);

public/scss/partials/_applayout.scss

@@ -37,6 +37,7 @@ body {
         padding: 100px 40px 20px 40px;
         width:100%;
         min-height: 600px;
+        height:100%;
     }
 }
 

public/scss/partials/_navigation.scss

@@ -36,7 +36,7 @@ $nav-pad: 20px;
     }
     .create-new {
         display:block;
-        font-size: 12px;
+        font-size: em(12px);
         color: white;
         background: $green-clr;
         text-decoration: none;
@@ -58,7 +58,7 @@ $nav-pad: 20px;
                 text-decoration: none;
                 color: #616F8D;
                 line-height: em(40px);
-                font-size: em(12px);
+                font-size: em(14px);
                 &:hover {
                     opacity: 1;
                     color:white;

public/scss/partials/ui/_poll.scss

@@ -20,6 +20,7 @@ $name-col-width: 235px;
         &.date-header {
             text-align:center;
             min-width: $date-col-width;
+            width: $date-col-width;
         }
         &.actions-header {
             min-width: $actions-col-width;
@@ -126,6 +127,7 @@ $name-col-width: 235px;
             }
             &.vote-cell {
                 min-width: $date-col-width;
+                width: $date-col-width;
                 text-align:center;
                 position: relative;
                 .overlay {

public/templates/directives/poll.html

@@ -31,10 +31,10 @@
                 <span ng-hide="editMode" class="name editable" ng-click="editMode = true && !event.isClosed; edit(participant)">{{participant.name}}</span>
             </div>
             <div class="cell vote-cell" ng-repeat="date in event.dates">
-                <img src="/images/tick@2x.png"  width="16" ng-hide="editMode" ng-if="participant.dates[$index]" />
+                <img src="/images/tick@2x.png"  width="16" ng-hide="editMode" ng-if="participant.votes[$index]" />
-                <img src="/images/nope@2x.png" width="8" ng-hide="editMode" ng-if="!participant.dates[$index]" />
+                <img src="/images/nope@2x.png" width="8" ng-hide="editMode" ng-if="!participant.votes[$index]" />
-                <input ng-model="participant.dates[$index]" ng-show="editMode" ng-false-value="false" type="checkbox" />
+                <input ng-model="participant.votes[$index]" ng-show="editMode" ng-false-value="false" type="checkbox" />
-                <div class="overlay" ng-show="editMode" ng-click="participant.dates[$index] = !participant.dates[$index]"></div>
+                <div class="overlay" ng-show="editMode" ng-click="participant.votes[$index] = !participant.votes[$index]"></div>
             </div>
             <div class="cell action-cell" ng-hide="event.isClosed">
                 <button type="button" ng-hide="editMode" ng-click="editMode = true; edit(participant)" class="btn hover">Edit</button>
@@ -53,8 +53,8 @@
                 <span class="name">{{example.name}}</span>
             </div>
             <div class="cell vote-cell" ng-repeat="date in event.dates">
-                <img src="/images/tick@2x.png"  width="16" ng-if="example.dates[$index]" />
+                <img src="/images/tick@2x.png"  width="16" ng-if="example.votes[$index]" />
-                <img src="/images/nope@2x.png" width="8" ng-if="!example.dates[$index]" />
+                <img src="/images/nope@2x.png" width="8" ng-if="!example.votes[$index]" />
             </div>
             <div class="cell action-cell">
 
@@ -75,8 +75,8 @@
                 <input autocomplete="off" name="username" type="text" class="form-control" placeholder="Your name..." ng-model="participant.name" required value="participant.name"/>
             </div>
             <div class="cell vote-cell" ng-repeat="date in event.dates">
-                <input ng-model="participant.dates[$index]" ng-false-value="false" type="checkbox" />
+                <input ng-model="participant.votes[$index]" ng-false-value="false" type="checkbox" />
-                <div class="overlay" ng-click="participant.dates[$index] = !participant.dates[$index]"></div>
+                <div class="overlay" ng-click="participant.votes[$index] = !participant.votes[$index]"></div>
             </div>
             <div class="cell action-cell">
                 <button type="submit" ng-class="{ 'animated shake' : formnew.$submitted && formnew.$invalid  }" class="btn">Save</button>