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 5de7cecf3a..683d1f3bc6 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 @@ -7,13 +7,14 @@ angular.module("admin.enterprises") SideMenu.setItems [ { name: 'Primary Details' } { name: 'Address' } - { name: "Shipping Methods"} - { name: "Payment Methods"} - { name: "Enterprise Fees"} - { name: 'Contact & Social' } + { name: 'Contact' } + { name: 'Social' } { name: 'About' } { name: "Business Details"} { name: 'Images' } + { name: "Shipping Methods"} + { name: "Payment Methods"} + { name: "Enterprise Fees"} { name: "Preferences"} ] diff --git a/app/views/admin/enterprises/_form.html.haml b/app/views/admin/enterprises/_form.html.haml index a8fae9c944..b9a897b774 100644 --- a/app/views/admin/enterprises/_form.html.haml +++ b/app/views/admin/enterprises/_form.html.haml @@ -7,9 +7,13 @@ %legend Address = render 'admin/enterprises/form/address', af: af -%fieldset.alpha.no-border-bottom{ ng: { show: "menu.selected.name=='Contact & Social'" } } - %legend Contact & Social - = render 'admin/enterprises/form/contact_and_social', f: f +%fieldset.alpha.no-border-bottom{ ng: { show: "menu.selected.name=='Contact'" } } + %legend Contact + = render 'admin/enterprises/form/contact', f: f + +%fieldset.alpha.no-border-bottom{ ng: { show: "menu.selected.name=='Social'" } } + %legend Social + = render 'admin/enterprises/form/social', f: f %fieldset.alpha.no-border-bottom{ ng: { show: "menu.selected.name=='Business Details'" } } %legend Business Details diff --git a/app/views/admin/enterprises/form/_contact_and_social.html.haml b/app/views/admin/enterprises/form/_contact.html.haml similarity index 70% rename from app/views/admin/enterprises/form/_contact_and_social.html.haml rename to app/views/admin/enterprises/form/_contact.html.haml index 6f489835ec..c16f93f4b0 100644 --- a/app/views/admin/enterprises/form/_contact_and_social.html.haml +++ b/app/views/admin/enterprises/form/_contact.html.haml @@ -21,7 +21,6 @@   .omega.eight.columns Note: A new email address may need to be confirmed prior to use - .row .alpha.three.columns = f.label :phone @@ -31,24 +30,4 @@ .alpha.three.columns = f.label :website .omega.eight.columns - = f.text_field :website, { placeholder: "eg. www.truffles.com"} -.row - .alpha.three.columns - = f.label :facebook, 'Facebook' - .omega.eight.columns - = f.text_field :facebook -.row - .alpha.three.columns - = f.label :instagram, 'Instagram' - .omega.eight.columns - = f.text_field :instagram -.row - .alpha.three.columns - = f.label :linkedin, 'LinkedIn' - .omega.eight.columns - = f.text_field :linkedin -.row - .alpha.three.columns - = f.label :twitter - .omega.eight.columns - = f.text_field :twitter, { placeholder: "eg. @the_prof" } \ No newline at end of file + = f.text_field :website, { placeholder: "eg. www.truffles.com"} \ No newline at end of file diff --git a/app/views/admin/enterprises/form/_social.html.haml b/app/views/admin/enterprises/form/_social.html.haml new file mode 100644 index 0000000000..1909a6fc4a --- /dev/null +++ b/app/views/admin/enterprises/form/_social.html.haml @@ -0,0 +1,20 @@ +.row + .alpha.three.columns + = f.label :facebook, 'Facebook' + .omega.eight.columns + = f.text_field :facebook +.row + .alpha.three.columns + = f.label :instagram, 'Instagram' + .omega.eight.columns + = f.text_field :instagram +.row + .alpha.three.columns + = f.label :linkedin, 'LinkedIn' + .omega.eight.columns + = f.text_field :linkedin +.row + .alpha.three.columns + = f.label :twitter + .omega.eight.columns + = f.text_field :twitter, { placeholder: "eg. @the_prof" } \ No newline at end of file