From 33d4f03a99f540f457bb8cb456617932bd26dd6c Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Wed, 10 Dec 2014 11:10:30 +1100 Subject: [PATCH] Adding shop preferences pane, fiddling with icons --- .../enterprises/controllers/side_menu_controller.js.coffee | 6 +++--- app/views/admin/enterprises/_form.html.haml | 4 ++++ .../admin/enterprises/form/_shop_preferences.html.haml | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 app/views/admin/enterprises/form/_shop_preferences.html.haml diff --git a/app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee b/app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee index 3c3798ad2f..b893373b98 100644 --- a/app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee +++ b/app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee @@ -6,16 +6,16 @@ angular.module("admin.enterprises") $scope.menu.setItems [ { name: 'Primary Details', icon_class: "icon-user" } - { name: 'Address', icon_class: "icon-globe" } + { name: 'Address', icon_class: "icon-map-marker" } { name: 'Contact', icon_class: "icon-phone" } { name: 'Social', icon_class: "icon-twitter" } { name: 'About', icon_class: "icon-pencil" } - { name: 'Business Details', icon_class: "icon-barcode" } + { name: 'Business Details', icon_class: "icon-briefcase" } { name: 'Images', icon_class: "icon-picture" } { name: "Shipping Methods", icon_class: "icon-truck" } { name: "Payment Methods", icon_class: "icon-money" } { name: "Enterprise Fees", icon_class: "icon-tasks" } - { name: "Preferences", icon_class: "icon-cog" } + { name: "Shop Preferences", icon_class: "icon-shopping-cart" } ] $scope.select(0) diff --git a/app/views/admin/enterprises/_form.html.haml b/app/views/admin/enterprises/_form.html.haml index aab758f0df..d63ae9c143 100644 --- a/app/views/admin/enterprises/_form.html.haml +++ b/app/views/admin/enterprises/_form.html.haml @@ -38,3 +38,7 @@ %fieldset.alpha.no-border-bottom{ ng: { show: "menu.selected.name=='Enterprise Fees'" } } %legend Enterprise Fees = render 'admin/enterprises/form/enterprise_fees', f: f + +%fieldset.alpha.no-border-bottom{ ng: { show: "menu.selected.name=='Shop Preferences'" } } + %legend Shop Preferences + = render 'admin/enterprises/form/shop_preferences', f: f diff --git a/app/views/admin/enterprises/form/_shop_preferences.html.haml b/app/views/admin/enterprises/form/_shop_preferences.html.haml new file mode 100644 index 0000000000..cbf11fc474 --- /dev/null +++ b/app/views/admin/enterprises/form/_shop_preferences.html.haml @@ -0,0 +1 @@ +Something \ No newline at end of file