From 262972a911a9669a09ef4cfbf1af034e00a77feb Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Wed, 22 Oct 2014 19:02:39 +1100 Subject: [PATCH] Adding basic angular to welcome form --- app/assets/javascripts/admin/all.js | 1 + .../welcome/controllers/welcome_controller.js.coffee | 3 +++ app/assets/javascripts/admin/welcome/welcome.js.coffee | 1 + app/assets/stylesheets/admin/welcome.css.sass | 10 ++++++++++ app/views/spree/admin/overview/welcome.html.haml | 8 ++++---- 5 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 app/assets/javascripts/admin/welcome/controllers/welcome_controller.js.coffee create mode 100644 app/assets/javascripts/admin/welcome/welcome.js.coffee diff --git a/app/assets/javascripts/admin/all.js b/app/assets/javascripts/admin/all.js index f8d3ceb721..c674b1daae 100644 --- a/app/assets/javascripts/admin/all.js +++ b/app/assets/javascripts/admin/all.js @@ -23,6 +23,7 @@ //= require ./products/products //= require ./shipping_methods/shipping_methods //= require ./users/users +//= require ./welcome/welcome //= require textAngular.min.js //= require textAngular-sanitize.min.js diff --git a/app/assets/javascripts/admin/welcome/controllers/welcome_controller.js.coffee b/app/assets/javascripts/admin/welcome/controllers/welcome_controller.js.coffee new file mode 100644 index 0000000000..f9d43b672e --- /dev/null +++ b/app/assets/javascripts/admin/welcome/controllers/welcome_controller.js.coffee @@ -0,0 +1,3 @@ +angular.module("admin.welcome") + .controller "welcomeCtrl", ($scope) -> + $scope.sells = "unspecified" \ No newline at end of file diff --git a/app/assets/javascripts/admin/welcome/welcome.js.coffee b/app/assets/javascripts/admin/welcome/welcome.js.coffee new file mode 100644 index 0000000000..ccb0fb5d0a --- /dev/null +++ b/app/assets/javascripts/admin/welcome/welcome.js.coffee @@ -0,0 +1 @@ +angular.module("admin.welcome", []) \ No newline at end of file diff --git a/app/assets/stylesheets/admin/welcome.css.sass b/app/assets/stylesheets/admin/welcome.css.sass index a575a96666..37f70669fe 100644 --- a/app/assets/stylesheets/admin/welcome.css.sass +++ b/app/assets/stylesheets/admin/welcome.css.sass @@ -35,6 +35,16 @@ border-top: 3px solid black padding: 8px 0px + &:hover + cursor: 'pointer' + + &.selected + color: #ffffff + background-color: #ff4949 + border-color: #000000 + h1, h2, h3, h4, h5, h6 + color: #ffffff + &.disabled color: #b0b0b0 .selector diff --git a/app/views/spree/admin/overview/welcome.html.haml b/app/views/spree/admin/overview/welcome.html.haml index a65909896e..925d47d676 100644 --- a/app/views/spree/admin/overview/welcome.html.haml +++ b/app/views/spree/admin/overview/welcome.html.haml @@ -1,4 +1,4 @@ -#welcome_page.sixteen.columns.alpha{ ng: { controller: 'WelcomeCtrl' } } +#welcome_page.sixteen.columns.alpha{ ng: { app: "admin.welcome", controller: 'welcomeCtrl' } } #welcome %h1 Welcome to the Open Food Network! %h6= "You have successfully created a#{" producer" if @enterprise.is_primary_producer} profile" @@ -13,7 +13,7 @@ .options.sixteen.columns.alpha - if @enterprise.is_primary_producer .basic_producer.option.one-third.column.alpha - .selector + .selector{ ng: { click: "sells='none'", class: "{selected: sells=='none'}" } } .top %h2 Basic Producer .plain_text Supply only @@ -24,7 +24,7 @@ You can also add your products, allowing customers to see your product range and allowing you to act as a supplier to other shopfronts. .producer_shop.option.one-third.column - .selector + .selector{ ng: { click: "sells='own'", class: "{selected: sells=='own'}" } } .top %h2 Producer with Shop .plain_text Sell your products through an OFN shopfront @@ -47,7 +47,7 @@ - else .shop_profile.option.one-third.column.alpha - .button + .selector{ ng: { class: "{selected: sells=='none'}" } } .top.center %h2 Shop Profile .plain_text Get a listing