Merge pull request #2 from ehzhang/dev

Dev
ehzhang · Nov 6, 2015 · ede59e5 · ede59e5
2 parents c1d17be + ed8d42c
commit ede59e5
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 7 deletions.
diff --git a/client/components/mentorStatus/mentorStatus.js b/client/components/mentorStatus/mentorStatus.js
@@ -22,13 +22,14 @@ function formatTime(ms){
     return s + " seconds";
   }
   if (s >= 60 && s < 3600){
-    return Math.floor(s / 60) + " minutes";
+    var minutes = Math.floor(s / 60);
+    return minutes + (minutes == 1 ? "minute" : "minutes");
   }
   if (s >= 3600){
     return "1 hour or more";
   }
 
-  return "uncertain"
+  return "uncertain";
 }
 
 function completedTickets(){

diff --git a/client/components/nav/nav.html b/client/components/nav/nav.html
@@ -18,6 +18,25 @@
         </div>
       </div>
     </div>
+
+    <div id="mobile-nav">
+      {{#if userIs 'mentor'}}
+        <div class="ui bottom fixed three item labeled icon menu">
+          <a class="item" href="/">
+            <i class="home icon"></i>
+            Home
+          </a>
+          <a class="item" href="/mentor">
+            <i class="inbox icon"></i>
+            Mentor
+          </a>
+          <a class="item" href="/profile">
+            <i class="child icon"></i>
+            Profile
+          </a>
+        </div>
+      {{/if}}
+    </div>
   {{/if}}
 </template>
 

diff --git a/client/components/tickets/ticket/ticket.html b/client/components/tickets/ticket/ticket.html
@@ -2,6 +2,9 @@
   <div class="animated flipInX
               ui fluid card ticket {{#if statusIs 'CLAIMED'}}claimed{{/if}}">
     <div class="content">
+      {{#if userIs 'admin'}}
+        <i class="right floated red remove link cancel button icon"></i>
+      {{/if}}
       <div class="header">
         {{#if name }}
           {{name}}
@@ -61,8 +64,6 @@
         {{/if}}
       {{/if}}
 
-      <button class="fluid danger push button cancel"> Cancel Ticket </button>
-
     </div>
 
   </div>

diff --git a/client/stylesheets/scss/components/_nav.scss b/client/stylesheets/scss/components/_nav.scss
@@ -8,4 +8,11 @@
     left: 90%;
     padding: 0.4em;
   }
-}
+}
+
+@media only screen and (min-width: 768px) {
+
+  #mobile-nav {
+    display: none;
+  }
+}
diff --git a/client/stylesheets/scss/components/_ticketPanel.scss b/client/stylesheets/scss/components/_ticketPanel.scss
@@ -2,6 +2,7 @@
   text-align: center;
   .title {
     font-size: 1.8em;
+    line-height: 1.8em;
     margin-bottom: 12px;
   }
   .content {

diff --git a/client/views/home/home.html b/client/views/home/home.html
@@ -1,6 +1,5 @@
 <template name="home">
   <section id="home">
-
     <div class="ui centered stackable page grid">
       <div class="centered row">
         <div class="twelve wide column">
@@ -26,7 +25,6 @@
         </div>
       </div>
     </div>
-
   </section>
 </template>