Changed behavior to match points 4 and 5 in story [meanjs#94]("https:…

…//tree.taiga.io/project/patf-outset/us/94"). Moved the "Rename" button into the individual list items, and changed the "delete" button to have a different style
pdfowler · Aug 3, 2015 · 72a46ef · 72a46ef
1 parent 8c6eb14
commit 72a46ef
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 13 deletions.
diff --git a/mobile/scss/base/variables.scss b/mobile/scss/base/variables.scss
@@ -14,6 +14,7 @@ $content-body-text: #9b9b9b;
 $secondary-text-action: rgba(255, 255, 255, 0.6);
 $white: #ffffff;
 $tab-text: #807b84;
+$danger: #B13E3E;
 
 /** Context specific variables **/
 $modal-primary-bg: $badge-green;
@@ -35,11 +36,11 @@ $signup-entry-value-text: $white;
 
 $light:                           #fff !default;
 $stable:                          #f8f8f8 !default;
-$positive:                        #387ef5 !default;
+$positive:                        $badge-green !default; //#387ef5 !default;
 $calm:                            #11c1f3 !default;
 $balanced:                        #33cd5f !default;
 $energized:                       #ffc900 !default;
-$assertive:                       #ef473a !default;
+$assertive:                       $danger !default; // #ef473a !default;
 $royal:                           #886aea !default;
 $dark:                            #444 !default;
 

diff --git a/mobile/scss/general/general.scss b/mobile/scss/general/general.scss
@@ -85,6 +85,7 @@ body{
     .button{
       font-weight: bold;
       border-width: 1px 0 0;
+      border-radius: 0 0 0 0 !important;
 
       &.primary{
         color: $modal-primary-text;
@@ -95,11 +96,17 @@ body{
         color: $modal-secondary-text;
         background-color: $modal-secondary-bg;
       }
+
+      &.assertive {
+        color: $assertive;
+        background-color: $modal-secondary-bg;
+      }
 
       &.button-block{
         margin-top: 0;
         margin-bottom: 0;
         border-width: 1px 0 0;
+
 
         .ico{
           vertical-align: middle;

diff --git a/mobile/www/modules/account/child_modules/lockbox/controllers/lockbox.edit.controller.js b/mobile/www/modules/account/child_modules/lockbox/controllers/lockbox.edit.controller.js
@@ -27,14 +27,19 @@
             return !object.checked;
         };
 
-        vm.rename = function () {
-            vm.index = null;
-            vm.name = '';
+        vm.rename = function (selectedIndex) {
+            vm.index = selectedIndex;
 
-            vm.lockboxDocuments.docs.filter(function (object, index) {
-                if(object.checked) vm.index = index;
-                return object.checked;
-            });
+            if (vm.index === null || vm.index === undefined) {
+                vm.lockboxDocuments.docs.filter(function (object, index) {
+                    if (object.checked) {
+                        index = index;
+                    }
+                    return object.checked;
+                });
+            }
+
+            vm.name = vm.lockboxDocuments.docs[vm.index].name;
 
             var renamePopup = $ionicPopup.show({
                 template: '<input type="text" class="rename-popup" ng-model="vm.name">',
@@ -61,7 +66,11 @@
             });
 
             renamePopup.then(function(res) {
-                if(res) vm.lockboxDocuments.docs[vm.index].name = res;
+                if(res) {
+                    vm.lockboxDocuments.docs[vm.index].name = res;
+                }
+
+                vm.index = null;
             });
         };
 

diff --git a/mobile/www/modules/account/child_modules/lockbox/templates/lockbox-edit.html b/mobile/www/modules/account/child_modules/lockbox/templates/lockbox-edit.html
@@ -19,15 +19,14 @@ <h3 class="title">Your lockbox will contain all your secure documents.</h3>
                         <strong>{{doc.name}}</strong>
                         <span>{{doc.created}}</span>
                     </div>
-                    <button class="button button-small">View</button>
+                    <button class="button button-small" ng-click="vm.rename($index)">Rename</button>
                 </li>
             </ul>
         </ion-scroll>
     </ion-pane>
     <ion-footer-bar>
         <div class="button-bar action-buttons">
-            <button class="button secondary" ng-disabled="vm.deleteDisabled" ng-click="vm.showConfirm()">Delete</button>
-            <button class="button primary" ng-disabled="vm.renameDisabled" ng-click="vm.rename()">Rename</button>
+            <button class="button assertive" ng-disabled="vm.deleteDisabled" ng-show="!vm.deleteDisabled" ng-click="vm.showConfirm()">Delete</button>
         </div>
     </ion-footer-bar>
 </ion-view>