From 49e1bf1ba4c18824064c62e7864dc48c83a30899 Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Fri, 31 Jan 2014 22:05:09 +0100
Subject: [PATCH] refactor(bs3): fix

---
 views/shared/modals/settings.jade | 51 +++----------------------------
 1 file changed, 5 insertions(+), 46 deletions(-)

diff --git a/views/shared/modals/settings.jade b/views/shared/modals/settings.jade
index b2b268ec7b..4aca070e2f 100644
--- a/views/shared/modals/settings.jade
+++ b/views/shared/modals/settings.jade
@@ -1,4 +1,4 @@
-//div(ng-controller='SettingsCtrl')
+//div(ng-controller='SettingsCtrl') Above all
   div(modal='modals.reset')
 script(type='text/ng-template', id='modals/reset.html')  
   .modal-header
@@ -26,11 +26,11 @@ script(type='text/ng-template', id='modals/restore.html')
         .option-group.option-medium
           input.option-content(type='number', step="any", data-for='stats.exp', ng-model='restoreValues.stats.exp')
           span.input-suffix=env.t('experience')
-        .option-group.option-medium(ng-if='!user.purchased.plan.customerId')
-          //input.option-content(type='number', step="any", data-for='stats.gp', ng-model='restoreValues.stats.gp')
-          input.option-content(type='number', step="any", data-for='stats.gp', ng-model='restoreValues.stats.gp',disabled)
+        .option-group.option-medium
+          input.option-content(type='number', step="any", data-for='stats.gp', ng-model='restoreValues.stats.gp')
+          //input.option-content(type='number', step="any", data-for='stats.gp', ng-model='restoreValues.stats.gp',disabled)
           span.input-suffix=env.t('gold')
-          p.alert
+          //-p.alert
             small=env.t('disabledWinterEvent')
         .option-group.option-medium
           input.option-content(type='number', step="any", data-for='stats.mp', ng-model='restoreValues.stats.mp')
@@ -38,33 +38,6 @@ script(type='text/ng-template', id='modals/restore.html')
         .option-group.option-medium
           input.option-content(type='number', data-for='stats.lvl', ng-model='restoreValues.stats.lvl')
           span.input-suffix=env.t('level')
-        //-
-          //- Commenting out since it doesn't make sense to restore equipment with Armory anymore. They can just restore GP & buy
-          h3 Equipment
-          .option-group.option-medium
-            input.option-content(type='number', data-for='items.weapon', ng-model='restoreValues.items.weapon')
-            span.input-suffix Weapon
-          .option-group.option-medium
-<<<<<<< HEAD
-            input.option-content(type='number', data-for='items.armor', ng-model='restoreValues.items.armor')
-            span.input-suffix Armor
-=======
-            input.option-content(type='number', step="any", data-for='stats.exp', ng-model='restoreValues.stats.exp')
-            span.input-suffix=env.t('experience')
-          .option-group.option-medium
-            input.option-content(type='number', step="any", data-for='stats.gp', ng-model='restoreValues.stats.gp')
-            //input.option-content(type='number', step="any", data-for='stats.gp', ng-model='restoreValues.stats.gp',disabled)
-            span.input-suffix=env.t('gold')
-            //-p.alert
-              small=env.t('disabledWinterEvent')
->>>>>>> develop
-          .option-group.option-medium
-            input.option-content(type='number', data-for='items.head', ng-model='restoreValues.items.head')
-            span.input-suffix Helm
-          .option-group.option-medium
-<<<<<<< HEAD
-            input.option-content(type='number', data-for='items.shield', ng-model='restoreValues.items.shield')
-            span.input-suffix Shield
         h3=env.t('achievements')
         .option-group.option-medium
           input.option-content(type='number', data-for='achievements.streak', ng-model='restoreValues.achievements.streak')
@@ -75,20 +48,6 @@ script(type='text/ng-template', id='modals/restore.html')
   .modal-footer
     button.btn.btn-default.cancel(ng-click='modals.restore = false')=env.t('discardChanges')
     button.btn.btn-primary(ng-click='restore()')=env.t('saveAndClose')
-=======
-            input.option-content(type='number', data-for='stats.lvl', ng-model='restoreValues.stats.lvl')
-            span.input-suffix=env.t('level')
-          h3=env.t('achievements')
-          .option-group.option-medium
-            input.option-content(type='number', data-for='achievements.streak', ng-model='restoreValues.achievements.streak')
-            span.input-suffix=env.t('fix21Streaks')
-        //- This is causing too many problems for users
-          h3=env.t('other')
-          a.btn.btn-small.btn-warning(ng-controller='FooterCtrl', ng-click='addMissedDay()')=env.t('triggerDay')
-    .modal-footer
-      button.btn.btn-default.cancel(ng-click='modals.restore = false')=env.t('discardChanges')
-      button.btn.btn-primary(ng-click='restore()')=env.t('saveAndClose')
->>>>>>> develop
 
 //div(modal='modals.delete')
 script(type='text/ng-template', id='modals/delete.html')