final prototype style changes

teckliew · Sep 28, 2015 · 17dfc9c · 17dfc9c
1 parent a77709e
commit 17dfc9c
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 22 deletions.
diff --git a/client/eventPage.html b/client/eventPage.html
@@ -13,7 +13,7 @@
                     <p>Location: {{location}}</p>
                     <br>
                     <div class="card-action">
-                      <a href="tel://1-201-654-0313" class="waves-effect waves-light blue btn"><i class="material-icons left">phone</i>Call</a>
+                      <a href="tel://{{flow}}" class="waves-effect waves-light blue btn"><i class="material-icons left">phone</i>Call</a>
 
                     </div>
                   </div>
@@ -25,19 +25,18 @@
                     <p>{{details}}</p>
                     <div class="row">
                       <div class="input-field col s12">
-                        <i class="zmdi zmdi-phone"></i>
                         <input id="eventphonenum" type="text" class="validate">
-                        <label for="eventphonenum">{{phonenum}}</label>
+                        <label for="eventphonenum">{{phone}}</label>
                       </div>
                     </div>
                     <div class="row">
                       <div class="input-field col s12">
                         <input id="eventflownum" type="text" class="validate">
-                        <label for="eventflownum">{{flownum}}</label>
+                        <label for="eventflownum">{{flow}}</label>
                       </div>
                     </div>
                     <br>
-                      <a href="tel://1-201-654-0313" class="waves-effect waves-light blue btn"><i class="material-icons left">phone</i>Call</a>
+                      <a href="tel://{{flow}}" class="waves-effect waves-light blue btn"><i class="material-icons left">phone</i>Call</a>
                       <a href="#" class="waves-effect waves-light btn"><i class="material-icons left">done</i>RSVP</a>
                   </div>
                 </div>

diff --git a/client/eventPage.js b/client/eventPage.js
@@ -4,13 +4,13 @@ Template.eventPage.events({
     if (phone==null){
         phone=0;
     };
-    Events.update(this._id, {$set:{"phonenum": phone}});
+    Events.update(this._id, {$set:{"phone": phone}});
   },
   'keyup #eventflownum': function (evt) {
     var flow = $(evt.target).val();
     if (flow==null){
         flow=0;
     };
-    Events.update(this._id, {$set:{"flownum": flow}});
+    Events.update(this._id, {$set:{"flow": flow}});
   }
 });
diff --git a/client/landing.html b/client/landing.html
@@ -7,26 +7,26 @@
       <span id="wordmark">secret party</span>
       <br>
       <div class="row" style="margin-top: 20px;">
-        <div class="col s4">
+        <div class="col s6">
           <a class="btn-floating btn-large red" href="/newevent">
             <i class="large material-icons">mode_edit</i>
         </a>
       </div>
-        <div class="col s4">
+        <!-- <div class="col s6">
         <a class="btn-floating btn-large red" href="/scanner">
           <i class="zmdi zmdi-camera"></i>
         </a>
-      </div>
-        <div class="col s4">
+      </div> -->
+        <div class="col s6">
         <a class="btn-floating btn-large red" href="/eventlist">
           <i class="zmdi zmdi-view-list"></i>
         </a>
       </div>
       </div>
       <div class="row">
-        <div class="col s4"><small>Create a new Event</small></div>
-        <div class="col s4"><small>Scan an image</small></div>
-        <div class="col s4"><small>View your events</small></div>
+        <div class="col s6"><small>Create a new Event</small></div>
+        <!-- <div class="col s6"><small>Scan an image</small></div> -->
+        <div class="col s6"><small>View your events</small></div>
       </div>
     </div>
   </div>

diff --git a/client/navigation.html b/client/navigation.html
@@ -3,7 +3,6 @@
       <a href="#" data-activates="sidenav" class="navbutton"><i class="material-icons" id="menubutton">menu</i></a>
       <ul class="side-nav" id="sidenav">
         <li><a class="waves-effect waves-light" href="/newevent">Create New Event</a></li>
-        <li><a class="waves-effect waves-light" href="/scanner">Scanner</a></li>
         <li><a class="waves-effect waves-light" href="/eventlist">Events</a></li>
       </ul>
   </nav>

diff --git a/client/newEvent.html b/client/newEvent.html
@@ -19,9 +19,9 @@
                       <div class="card">
                         <div class="card-image">
                           <img src="img/eventPhoto.jpeg">
-                          <span class="card-title">Event Image</span>
+                          <!-- <span class="card-title">Event Image</span> -->
                         </div>
-                        <div class="card-content">
+                        <!-- <div class="card-content">
                           <div class="file-field input-field">
                             <div class="waves-effect waves-light blue lighten-1 btn">
                               <span>Upload image</span>
@@ -31,7 +31,7 @@
                               <input class="file-path validate" type="text">
                             </div>
                           </div>
-                        </div>
+                        </div> -->
                       </div>
                     </div>
                     <div class="col s12 m5">
@@ -67,7 +67,6 @@
                   </div>
                   <div class="row">
                     <div class="input-field col s12">
-                      <i class="zmdi zmdi-phone"></i>
                       <input id="phonenum" type="text" class="validate">
                       <label for="phonenum">Phone number</label>
                     </div>

diff --git a/client/newEvent.js b/client/newEvent.js
@@ -2,7 +2,7 @@ Template.newEvent.events({
     'submit form': function(event){
       event.preventDefault();
       var eventName = $('[id=eventName]').val();
-      var eventImage = $('[id=eventImage]').val();
+      //var eventImage = $('[id=eventImage]').val();
       var eventDate = $('[id=eventDate]').val();
       var eventTime = $('[id=eventTime]').val();
       var eventLocation = $('[id=eventLocation]').val();
@@ -16,7 +16,7 @@ Template.newEvent.events({
 
       var post = {
           name: eventName,
-          image: eventImage,
+          //image: eventImage,
           date: eventDate,
           time: eventTime,
           location: eventLocation,
@@ -33,7 +33,7 @@ Template.newEvent.events({
       Router.go('events.show', post);
 
       $('[id=eventName]').val('');
-      $('[id=eventImage]').val('');
+      //$('[id=eventImage]').val('');
       $('[id=eventDate]').val('');
       $('[id=eventTime]').val('');
       $('[id=eventLocation]').val('');