Merge branch 'master' of github.com:mattcook/MobileTurk

Conflicts: www/js/app.js www/js/controllers.js
mattcook · Jan 17, 2015 · 3f96d84 · 3f96d84
2 parents d49285f + c434ffb
commit 3f96d84
Show file tree

Hide file tree

Showing 9 changed files with 147 additions and 12 deletions.
diff --git a/scss/ionic.app.scss b/scss/ionic.app.scss
@@ -15,7 +15,7 @@ $royal:                           #886aea !default;
 $dark:                            #444 !default;
 */
 
-$balanced:                        #2ecc71 !default;
+$balanced:                        #42ff23 !default;
 // The path for our ionicons font files, relative to the built CSS in www/css
 $ionicons-font-path: "../lib/ionic/fonts" !default;
 

diff --git a/www/js/app.js b/www/js/app.js
@@ -75,10 +75,10 @@ angular.module('starter', ['ionic', 'starter.controllers','starter.services','fi
   })
 
   .state('app.categorization', {
-    url: "/image-categorization",
+    url: "/type/image-categorization",
     views: {
       'menuContent': {
-        templateUrl: "templates/categories/categorization.html",
+        templateUrl: "templates/types/categorization.html",
         controller: 'CategorizationCtrl'
       }
     },
@@ -91,10 +91,10 @@ angular.module('starter', ['ionic', 'starter.controllers','starter.services','fi
   })
 
   .state('app.info-search', {
-    url: "/info-search",
+    url: "/type/info-search",
     views: {
       'menuContent': {
-        templateUrl: "templates/categories/info_search.html",
+        templateUrl: "templates/types/info_search.html",
         controller: 'InfoSearchCtrl'
       }
     },
@@ -103,7 +103,36 @@ angular.module('starter', ['ionic', 'starter.controllers','starter.services','fi
         return Auth.$requireAuth();
       }]
     }
+  })
 
+  .state('app.filtering', {
+    url: "/type/image-filter",
+    views: {
+      'menuContent': {
+        templateUrl: "templates/types/filtering.html",
+        controller: 'FilterCtrl'
+      }
+    }
+  })
+
+  .state('app.emotion', {
+    url: "/type/emotion-sentiment",
+    views: {
+      'menuContent': {
+        templateUrl: "templates/types/emotion.html",
+        controller: 'EmotionCtrl'
+      }
+    }
+  })
+
+  .state('app.tagging', {
+    url: "/type/tagging",
+    views: {
+      'menuContent': {
+        templateUrl: "templates/types/tagging.html",
+        controller: 'TaggingCtrl'
+      }
+    }
   });
   // if none of the above states are matched, use this as the fallback
   $urlRouterProvider.otherwise('login');

diff --git a/www/js/controllers.js b/www/js/controllers.js
@@ -21,13 +21,13 @@ angular.module('starter.controllers', ['firebase'])
     ref: ref.child('info'),
     icon: 'icon ion-ios7-search'},
   { title: 'Image Filtering',
-    id: 'filtering',
+    id: 'image-filter',
     tasks: 13,
     ref: ref.child('filtering'),
     icon: 'icon ion-ios7-settings'},
   { title: 'Emotion Rating',
-    id: 4,
-    tasks: 'emotion',
+    id: 'emotion-sentiment',
+    tasks: 4,
     ref: ref.child('emotion'),
     icon: 'icon ion-ios7-star-outline'},
   { title: 'Image Tagging',
@@ -81,10 +81,28 @@ angular.module('starter.controllers', ['firebase'])
 
 }])
 
-.controller('InfoSearchCtrl', ['currentAuth', function($scope, $stateParams, $ionicModal) {
+.controller('InfoSearchCtrl', function($scope, $stateParams, $ionicModal) {
+  $scope.modal_text = "Using the information provided, please complete the missing field. If you cannot determine an answer, you may skip this task."
+  popupModal($scope, $ionicModal);
+  $scope.openGoogle = function($scope){
+  window.open('http://google.com', '_blank', 'location=yes');
+  };
+})
+
+.controller('FilterCtrl', function($scope, $stateParams, $ionicModal) {
   $scope.modal_text = "Select the category that most appropriately suits the image. If you cannot determine a suitable category, you may skip this task."
   popupModal($scope, $ionicModal);
-}]);
+})
+
+.controller('EmotionCtrl', function($scope, $stateParams, $ionicModal) {
+  $scope.modal_text = "Pick the best sentiment based on the provided. Ranges from Strongly Negative, Negative, Neutral, Positive, and Strongly Positive from left to right."
+  popupModal($scope, $ionicModal);
+})
+
+.controller('TaggingCtrl', function($scope, $stateParams, $ionicModal) {
+  $scope.modal_text = "Pick the best sentiment based on the provided. Ranges from Strongly Negative, Negative, Neutral, Positive, and Strongly Positive from left to right."
+  popupModal($scope, $ionicModal);
+});
 
 var popupModal = function($scope, $ionicModal){
   $ionicModal.fromTemplateUrl('templates/help-modal.html', {

diff --git a/www/templates/types.html b/www/templates/types.html
@@ -4,7 +4,7 @@
   </ion-nav-title>
   <ion-content>
     <ion-list>
-      <a class="item" href="#/app/{{type.id}}" ng-repeat="type in types">
+      <a class="item" href="#/app/type/{{type.id}}" ng-repeat="type in types">
         <div class="item-icon-left"><i class={{type.icon}}></i>
           <h2>{{type.title}}</h2>
           <span class="small-italic">{{type.sync.length}} Tasks</span>

diff --git a/www/templates/categories/categorization.html → www/templates/types/categorization.html b/www/templates/categories/categorization.html → www/templates/types/categorization.html
@@ -4,7 +4,7 @@
     <div class="list card">
 
       <div class="item item-icon-right">
-        <h2>Choose the best category</h2>
+        <h2>Choose the Best Category</h2>
         <i class="icon ion-ios7-help-outline" ng-click="openModal()"></i>
       </div>
 

diff --git a/www/templates/types/emotion.html b/www/templates/types/emotion.html
@@ -0,0 +1,29 @@
+<ion-view view-title="Emotion Rating">
+  <ion-content>
+    <div class='list list-inset'>
+      <div class="item item-divider item-icon-right">
+        Choose How You Feel
+        <i class="icon ion-ios7-help-outline" ng-click="openModal()"></i>
+      </div>
+      <div class="item item-text-wrap">
+        If you loved Firefly TV show, amazing Amazon price for entire series: about $27 BlueRay & $17 DVD.
+      </div>
+    </div>
+
+    <div class="row button-bar bar-light">
+      <a class="button button-clear"><i class="icon ion-close-circled"></i></a>
+      <a class="button button-clear"><i class="icon ion-close"></i></a>
+      <a class="button button-clear"><i class="icon ion-minus"></i></a>
+      <a class="button button-clear"><i class="icon ion-checkmark"></i></a>
+      <a class="button button-clear"><i class="icon ion-checkmark-circled"></i></a>
+    </div>
+
+    <div class="range">
+      <input type="range" name="volume" min="0" max="4" value="2">
+    </div>
+
+    <div class="padding">
+      <button class="button button-block button-outline button-balanced">Submit</button>
+    </div>
+  </ion-content>
+</ion-view>
diff --git a/www/templates/types/filtering.html b/www/templates/types/filtering.html
@@ -0,0 +1,29 @@
+<ion-view view-title="Image Filtering">
+  <ion-content>
+    <div class='list list-inset'>
+      <div class="item item-divider item-icon-right">
+        Choose How You Feel
+        <i class="icon ion-ios7-help-outline" ng-click="openModal()"></i>
+      </div>
+      <div class="item item-text-wrap">
+        If you loved Firefly TV show, amazing Amazon price for entire series: about $27 BlueRay & $17 DVD.
+      </div>
+    </div>
+
+    <div class="row button-bar bar-light">
+      <a class="button button-clear"><i class="icon ion-close-circled"></i></a>
+      <a class="button button-clear"><i class="icon ion-close"></i></a>
+      <a class="button button-clear"><i class="icon ion-minus"></i></a>
+      <a class="button button-clear"><i class="icon ion-checkmark"></i></a>
+      <a class="button button-clear"><i class="icon ion-checkmark-circled"></i></a>
+    </div>
+
+    <div class="range">
+      <input type="range" name="volume" min="0" max="4" value="2">
+    </div>
+
+    <div class="padding">
+      <button class="button button-block button-outline button-balanced">Submit</button>
+    </div>
+  </ion-content>
+</ion-view>
diff --git a/www/templates/categories/info_search.html → www/templates/types/info_search.html b/www/templates/categories/info_search.html → www/templates/types/info_search.html
@@ -27,6 +27,7 @@
         </div>
     </div>
     <div class="padding">
+      <button class="button button-block button-outline button-dark" ng-click="openGoogle()">Open Browser</button>
       <button class="button button-block button-outline button-balanced">Submit</button>
     </div>
   </ion-content>

diff --git a/www/templates/types/tagging.html b/www/templates/types/tagging.html
@@ -0,0 +1,29 @@
+<ion-view view-title="Tagging">
+  <ion-content>
+    <div class='list list-inset'>
+      <div class="item item-divider item-icon-right">
+        Choose How You Feel
+        <i class="icon ion-ios7-help-outline" ng-click="openModal()"></i>
+      </div>
+      <div class="item item-text-wrap">
+        If you loved Firefly TV show, amazing Amazon price for entire series: about $27 BlueRay & $17 DVD.
+      </div>
+    </div>
+
+    <div class="row button-bar bar-light">
+      <a class="button button-clear"><i class="icon ion-close-circled"></i></a>
+      <a class="button button-clear"><i class="icon ion-close"></i></a>
+      <a class="button button-clear"><i class="icon ion-minus"></i></a>
+      <a class="button button-clear"><i class="icon ion-checkmark"></i></a>
+      <a class="button button-clear"><i class="icon ion-checkmark-circled"></i></a>
+    </div>
+
+    <div class="range">
+      <input type="range" name="volume" min="0" max="4" value="2">
+    </div>
+
+    <div class="padding">
+      <button class="button button-block button-outline button-balanced">Submit</button>
+    </div>
+  </ion-content>
+</ion-view>