From 049c595aeeaff7ebc2461619db4ea422922a4825 Mon Sep 17 00:00:00 2001 From: Marie-Helene Tremblay Date: Fri, 1 May 2015 15:13:09 -0400 Subject: Removing old blog custom style Old and new style was overlapping. --- .../stylesheets/refinery/blog/backend.css.scss | 43 ---------------------- 1 file changed, 43 deletions(-) diff --git a/app/assets/stylesheets/refinery/blog/backend.css.scss b/app/assets/stylesheets/refinery/blog/backend.css.scss index e4ff700..d3b445c 100644 --- a/app/assets/stylesheets/refinery/blog/backend.css.scss +++ b/app/assets/stylesheets/refinery/blog/backend.css.scss @@ -10,49 +10,6 @@ .comment_tick_icon { background-image: image_url('refinery/blog/icons/comment_tick.png'); } -.folder_icon { - background-image: image_url('refinery/blog/icons/folder.png'); -} -.folder_add_icon { - background-image: image_url('refinery/blog/icons/folder_add.png'); -} -.folder_edit_icon { - background-image: image_url('refinery/blog/icons/folder_edit.png'); -} -.settings_icon { - background-image: image_url('refinery/blog/icons/cog.png'); -} -.page_icon { - background-image: image_url('refinery/blog/icons/page.png'); -} -.page_copy_icon { - background-image: image_url('refinery/blog/icons/page_copy.png'); -} -.page_add_icon { - background-image: image_url('refinery/blog/icons/page_add.png'); -} -ul.collapsible_menu li { - position: relative; - span.arrow { - background-repeat: no-repeat; - position: absolute; - right: 10px; - top: 13px; - width: 11px; - height: 7px; - cursor: pointer; - background-image: image_url('refinery/blog/icons/up.gif'); - } - &.closed { - span.arrow { - background-image: image_url('refinery/blog/icons/down.gif'); - } - } - > div { - width: 93%; - margin: 0px auto; - } -} ul.blog_categories { height:200px; overflow:auto; -- cgit v1.2.3 From a3204ed60e2f25e5231ddf8e18e4124b157e8ee4 Mon Sep 17 00:00:00 2001 From: Anita Graham Date: Thu, 7 May 2015 21:51:15 +0800 Subject: Use find/trigger(:click) instead of click_link --- app/assets/stylesheets/refinery/blog/backend.css.scss | 3 ++- spec/features/refinery/blog/admin/posts_spec.rb | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/refinery/blog/backend.css.scss b/app/assets/stylesheets/refinery/blog/backend.css.scss index d3b445c..db5a0d8 100644 --- a/app/assets/stylesheets/refinery/blog/backend.css.scss +++ b/app/assets/stylesheets/refinery/blog/backend.css.scss @@ -10,6 +10,7 @@ .comment_tick_icon { background-image: image_url('refinery/blog/icons/comment_tick.png'); } + ul.blog_categories { height:200px; overflow:auto; @@ -31,4 +32,4 @@ a#copy_body_link { .form-actions a.confirm-delete, #content .form-actions a.confirm-delete { position: relative; right: auto; -} \ No newline at end of file +} diff --git a/spec/features/refinery/blog/admin/posts_spec.rb b/spec/features/refinery/blog/admin/posts_spec.rb index 2c7b82c..99ec25d 100644 --- a/spec/features/refinery/blog/admin/posts_spec.rb +++ b/spec/features/refinery/blog/admin/posts_spec.rb @@ -33,7 +33,7 @@ module Refinery end it "should have category title", :js => true do - click_link "toggle_advanced_options" + find('#toggle_advanced_options').click expect(page).to have_content(blog_category.title) end @@ -45,14 +45,14 @@ module Refinery # this is a dirty hack but textarea that needs to be filled is # hidden and capybara refuses to fill in elements it can't see page.evaluate_script("WYMeditor.INSTANCES[0].html('

And I love it

')") - click_link "toggle_advanced_options" - sleep 1 + find('#toggle_advanced_options').click expect(page).to have_css '.blog_categories' expect(page).to have_css "#post_category_ids_#{blog_category.id}" expect(page).to have_selector("#post_category_ids_#{blog_category.id}:not(:checked)") check blog_category.title expect(page).to have_selector("#post_category_ids_#{blog_category.id}:checked") click_button "Save" + sleep 1 expect(page).to have_content("was successfully added.") end @@ -170,7 +170,7 @@ module Refinery # hidden and capybara refuses to fill in elements it can't see page.evaluate_script("WYMeditor.INSTANCES[0].html('

I totally did not write it.

')") - click_link "toggle_advanced_options" + find('a', text: 'Toggle Advanced Options').trigger(:click) expect(page).to have_content("Author") select other_guy.username, :from => "Author" -- cgit v1.2.3 From 7b6ae1eca13ff120d5abd9816d7c22f339d52e2e Mon Sep 17 00:00:00 2001 From: Philip Arndt Date: Mon, 18 May 2015 18:17:43 +1200 Subject: Added refinery/blog/backend.css to precompile list --- lib/refinery/blog/engine.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/refinery/blog/engine.rb b/lib/refinery/blog/engine.rb index c4c39d8..cc0d59a 100644 --- a/lib/refinery/blog/engine.rb +++ b/lib/refinery/blog/engine.rb @@ -12,6 +12,11 @@ module Refinery plugin.url = proc { Refinery::Core::Engine.routes.url_helpers.blog_admin_posts_path } plugin.menu_match = %r{refinery/blog/?(posts|comments|categories)?} end + + Rails.application.config.assets.precompile += %w( + refinery/blog/backend.css + refinery/blog/**/*.css + ) end config.after_initialize do -- cgit v1.2.3 From 138aa4d395fee81b3538eedf2aa0c00cd158e3ed Mon Sep 17 00:00:00 2001 From: Philip Arndt Date: Mon, 18 May 2015 18:17:56 +1200 Subject: Suppress search form output when there's nothing. --- app/views/refinery/blog/admin/_submenu.html.erb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/views/refinery/blog/admin/_submenu.html.erb b/app/views/refinery/blog/admin/_submenu.html.erb index 03426b7..5f67405 100644 --- a/app/views/refinery/blog/admin/_submenu.html.erb +++ b/app/views/refinery/blog/admin/_submenu.html.erb @@ -1,8 +1,6 @@