From d2b12ae8c1542d1a43a67897d79303bd779ba3bb Mon Sep 17 00:00:00 2001
From: ksjdragon <ksjdragon@ksjtech.(none)>
Date: Sat, 31 Jan 2015 21:04:08 -0500
Subject: [PATCH] css fixes due to animation, more google sites

---
 chromebook-checkout-meteor/client/admin.css       |  4 ----
 chromebook-checkout-meteor/client/admin.html      |  4 ++--
 chromebook-checkout-meteor/client/cart.html       |  2 +-
 chromebook-checkout-meteor/client/cart.js         |  3 +++
 chromebook-checkout-meteor/client/checkout.html   |  2 ++
 chromebook-checkout-meteor/client/chromebook.css  |  7 ++++++-
 chromebook-checkout-meteor/client/chromebook.html |  2 +-
 chromebook-checkout-meteor/client/chromebook.js   |  3 +++
 chromebook-checkout-meteor/client/initial.js      | 13 ++++++++++++-
 chromebook-checkout-meteor/client/teacher.html    |  4 ++++
 chromebook-checkout-meteor/server/users.js        |  3 ++-
 11 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/chromebook-checkout-meteor/client/admin.css b/chromebook-checkout-meteor/client/admin.css
index e0375c8..34f365d 100644
--- a/chromebook-checkout-meteor/client/admin.css
+++ b/chromebook-checkout-meteor/client/admin.css
@@ -1,7 +1,3 @@
-.overlap-fix {
-  margin-left:100px;
-  margin-top: 16px;
-} 
 .yield:hover, .yieldc:hover {
   color: #E14C2B;
 }
diff --git a/chromebook-checkout-meteor/client/admin.html b/chromebook-checkout-meteor/client/admin.html
index e91a19e..75a1197 100644
--- a/chromebook-checkout-meteor/client/admin.html
+++ b/chromebook-checkout-meteor/client/admin.html
@@ -29,15 +29,15 @@
       <div class="border">
       <div>
           <h6> Edit Carts</h6> <!-- Editing Carts -->
+          {{#momentum plugin='slide-fade'}}
         {{#each carts}}
         <div class="row-admin">
           {{>cart}}
           <i class="icons yieldc fa fa-exclamation-triangle fa-lg"></i>
-          <div class="overlap-fix">
           <i class="icons crossc fa fa-times fa-lg"></i>
-        </div>
        </div>
        {{/each}}
+       {{/momentum}}
       <h6>Add a Cart</h6> <!-- Adding Carts -->
         <form class="new-task">
           <input type="text" name="acnumber" placeholder="Cart Number (ex. A)" class="submission"/>
diff --git a/chromebook-checkout-meteor/client/cart.html b/chromebook-checkout-meteor/client/cart.html
index 5138374..1e69e7a 100644
--- a/chromebook-checkout-meteor/client/cart.html
+++ b/chromebook-checkout-meteor/client/cart.html
@@ -1,5 +1,5 @@
 <template name="cart">
-    <div class="cart chromebook {{status_class}}">
+    <div class="cart chromebook {{status_class}} {{url}}">
       <p class="pure-u-3-5">Cart {{number}}</p> 
         {{#if status }}
           <div class="timestamp pure-u-2-5">
diff --git a/chromebook-checkout-meteor/client/cart.js b/chromebook-checkout-meteor/client/cart.js
index b08f2d5..d55cf99 100644
--- a/chromebook-checkout-meteor/client/cart.js
+++ b/chromebook-checkout-meteor/client/cart.js
@@ -16,6 +16,9 @@ Template.cart.helpers({
     } else {
       return moment(this.last_checkout).fromNow();      
     }
+  },
+  url: function() {
+    return Router.current().originalUrl.replace("/", "");
   }
 });
 
diff --git a/chromebook-checkout-meteor/client/checkout.html b/chromebook-checkout-meteor/client/checkout.html
index 49d3427..71671da 100644
--- a/chromebook-checkout-meteor/client/checkout.html
+++ b/chromebook-checkout-meteor/client/checkout.html
@@ -5,11 +5,13 @@
 	    </div>
 	     <div class="chckBorder">
 	      <div class="chckChromebooks">
+	      {{#momentum plugin='slide-fade'}}
 	      {{#each chromebooks}}
 	    		<div class="row">
 	        	{{> chromebook}}
      			</div>
 	      {{/each}}
+	      {{/momentum}}
 	  	  </div>
 	  	</div>
       </div>
diff --git a/chromebook-checkout-meteor/client/chromebook.css b/chromebook-checkout-meteor/client/chromebook.css
index da90103..bc126b8 100644
--- a/chromebook-checkout-meteor/client/chromebook.css
+++ b/chromebook-checkout-meteor/client/chromebook.css
@@ -19,6 +19,10 @@ body {
   max-width: 81%;
 }
 
+.checkout, .teacher {
+  min-width: 94%;
+}
+
 .chromebook:hover {
   box-shadow: 5px 0 12px #919191, -5px 0 12px #919191;
   outline: #25abd9 solid 3px;
@@ -36,10 +40,11 @@ body {
   color: #5A5A5A;
   transition: color 0.5s;
 }
-.icons.yield.fa.fa-exclamation-triangle.fa-lg {
+.icons.yield.fa.fa-exclamation-triangle.fa-lg, .icons.yieldc.fa.fa-exclamation-triangle.fa-lg {
   margin-right: 6%;
 }
 
+
 .cross:hover, .crossc:hover{
   color: #E14C2B;
 }
diff --git a/chromebook-checkout-meteor/client/chromebook.html b/chromebook-checkout-meteor/client/chromebook.html
index 5a9c485..a6ff9ce 100644
--- a/chromebook-checkout-meteor/client/chromebook.html
+++ b/chromebook-checkout-meteor/client/chromebook.html
@@ -1,5 +1,5 @@
 <template name="chromebook">
-    <div class="chromebook {{status_class}}">
+    <div class="chromebook {{status_class}} {{url}}">
       <p class="pure-u-3-5">Chromebook #{{number}}</p> 
         {{#if status}}
           <div class="timestamp pure-u-2-5">
diff --git a/chromebook-checkout-meteor/client/chromebook.js b/chromebook-checkout-meteor/client/chromebook.js
index fd3754a..124d215 100644
--- a/chromebook-checkout-meteor/client/chromebook.js
+++ b/chromebook-checkout-meteor/client/chromebook.js
@@ -16,6 +16,9 @@ Template.chromebook.helpers({
     } else {
       return moment(this.last_checkout).fromNow();      
     }
+  },
+  url: function() {
+    return Router.current().originalUrl.replace("/", "");
   }
 });
 
diff --git a/chromebook-checkout-meteor/client/initial.js b/chromebook-checkout-meteor/client/initial.js
index 568ac27..eb13d6c 100644
--- a/chromebook-checkout-meteor/client/initial.js
+++ b/chromebook-checkout-meteor/client/initial.js
@@ -4,7 +4,9 @@ var links = [
   "https://translate.google.com",
   "https://keep.google.com/",
   "https://mail.google.com/mail/u/0/",
-  "https://classroom.google.com/h"
+  "https://classroom.google.com/h",
+  "https://maps.google.com/",
+  "https://earth.google.com/",
 ]
 
 Template.initial.events({
@@ -16,3 +18,12 @@ Template.initial.events({
     Router.go('/checkout');
   }
 })
+Template.login.events({
+  'click .chromeicon': function() {
+    var randomint = Math.floor(Math.random() * (links.length - 1));
+    window.open(links[randomint], "_blank");
+  },
+  'click .submit': function() {
+    Router.go('/checkout');
+  }
+})
diff --git a/chromebook-checkout-meteor/client/teacher.html b/chromebook-checkout-meteor/client/teacher.html
index 20faa1b..06d44f9 100644
--- a/chromebook-checkout-meteor/client/teacher.html
+++ b/chromebook-checkout-meteor/client/teacher.html
@@ -8,22 +8,26 @@
           <div class="tchChromebooks">
             <div>
            <div>
+            {{#momentum plugin='slide-fade'}}
               {{#each chromebooks}}
                 <div class="row">
                   {{> chromebook}}
                 </div>
               {{/each}}
+              {{/momentum}}
             </div>
           </div>
         </div>
           <!-- Carts -->
           <div class="tchChromebooks">
             <div>
+            {{#momentum plugin='slide-fade'}}
             {{#each carts}}
               <div class="row">
                 {{>cart}}
               </div>
             {{/each}}
+            {{/momentum}}
           </div>
           </div>
                {{/teacherTabs}}
diff --git a/chromebook-checkout-meteor/server/users.js b/chromebook-checkout-meteor/server/users.js
index 87cb2cc..cc8f3de 100644
--- a/chromebook-checkout-meteor/server/users.js
+++ b/chromebook-checkout-meteor/server/users.js
@@ -33,7 +33,8 @@ var teachers = [
   // Add all Teachers here
   "mminer@bloomfield.org",
   "qalieh.yaman90@bloomfield.org",
-  "ruhelski@bloomfield.org"
+  "ruhelski@bloomfield.org",
+  "jao.kenneth43@bloomfield.org"
 ];
 for (var i = 0; i < teachers.length; i++) {
   var teacher = teachers[i];