diff --git a/app/assets/stylesheets/spotlight/_blacklight_configuration.css.scss b/app/assets/stylesheets/spotlight/_blacklight_configuration.css.scss index eac2e6513..356864635 100644 --- a/app/assets/stylesheets/spotlight/_blacklight_configuration.css.scss +++ b/app/assets/stylesheets/spotlight/_blacklight_configuration.css.scss @@ -24,6 +24,9 @@ } text-align: left; + .dd3-handle:before { + top: 3px; + } } &.checkbox-cell { diff --git a/app/assets/stylesheets/spotlight/_curation.css.scss b/app/assets/stylesheets/spotlight/_curation.css.scss index 4a989cae5..28201a104 100644 --- a/app/assets/stylesheets/spotlight/_curation.css.scss +++ b/app/assets/stylesheets/spotlight/_curation.css.scss @@ -45,33 +45,36 @@ display: inline-block; padding-top: 0; } - .display-sidebar-control { - .checkbox { - width: auto; - } - } .publish-control { display: inline; .checkbox { padding-top: 0; } } - .page-links { - padding-left: 4px; + .page-links, .contact-links { + text-align: right; + a { + padding: 0 2px; + } } .main { - width: 96%; - vertical-align: top; + width: 99%; + vertical-align: text-top; display: inline-block; } } +.contacts_admin .panel-heading.page .main { + width: 95%; +} + .panel-heading.search { /* widths don't add up to 100% because of padding of the container. */ .checkbox { width: 3%; vertical-align: top; display: inline-block; + padding-top: 0; } .pic { width: 70px; @@ -82,12 +85,16 @@ width: 40%; vertical-align: top; display: inline-block; + margin-left: $padding-base-horizontal; } .description { width: 30%; vertical-align: top; display: inline-block; } + .panel-title { + font-size: 15px; + } } #edit-search { @@ -136,4 +143,14 @@ h1,h2,h3,h4,h5,h6 { @extend .text-muted; font-size: $font-size-base; text-align: right; +} + +table#exhibit-specific-fields { + margin-top: 2em; + .field-label { + min-width: 10em; + } + .actions a { + padding: 0 2px; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/spotlight/_nestable.css.scss b/app/assets/stylesheets/spotlight/_nestable.css.scss index 620076cb3..a7e5dd1e1 100644 --- a/app/assets/stylesheets/spotlight/_nestable.css.scss +++ b/app/assets/stylesheets/spotlight/_nestable.css.scss @@ -107,5 +107,5 @@ tr.dd-item { border-top-right-radius: 0; border-bottom-right-radius: 0; } -.dd3-handle:before { content: '≡'; display: block; position: absolute; left: 0; top: 3px; width: 100%; text-align: center; text-indent: 0; color: #fff; font-size: 20px; font-weight: normal; } +.dd3-handle:before { content: '≡'; display: block; position: absolute; left: 0; top: 9px; width: 100%; text-align: center; text-indent: 0; color: #fff; font-size: 20px; font-weight: normal; } .dd3-handle:hover { background: #ddd; } diff --git a/app/views/spotlight/feature_pages/_header.html.erb b/app/views/spotlight/feature_pages/_header.html.erb index f5f5f486d..c0c24c8e0 100644 --- a/app/views/spotlight/feature_pages/_header.html.erb +++ b/app/views/spotlight/feature_pages/_header.html.erb @@ -4,19 +4,18 @@

<%= t('spotlight.pages.index.feature_pages.home_pages_header') %>

-
- <%= p.hidden_field :id, value: page.id , class: 'form-control input-sm' %> -

- <%= page.title %> - <%= p.hidden_field :title, value: page.title , class: 'form-control input-sm' %> -

-
diff --git a/app/views/spotlight/pages/_page.html.erb b/app/views/spotlight/pages/_page.html.erb index 46b220d0d..33628e5fe 100644 --- a/app/views/spotlight/pages/_page.html.erb +++ b/app/views/spotlight/pages/_page.html.erb @@ -6,26 +6,25 @@
<%= f.check_box :published, label: '' %>
-
- <%= f.hidden_field :id %> - <%= f.hidden_field :weight, data: {property: "weight"} %> -

- <%= page.title %> - <%= f.hidden_field :title, value: page.title , class: 'form-control input-sm' %> -

-
-
diff --git a/app/views/spotlight/searches/_search.html.erb b/app/views/spotlight/searches/_search.html.erb index 53d44e8a9..6f83631f5 100644 --- a/app/views/spotlight/searches/_search.html.erb +++ b/app/views/spotlight/searches/_search.html.erb @@ -7,7 +7,7 @@
<%= image_tag(search.featured_image) if search.featured_image %>
-
<%= search.title %>
+
<%= search.title %>
<%= t :'.item_count', count: search.count %>
<%= exhibit_edit_link(search) %> • <%= exhibit_delete_link(search) %>
<%= f.hidden_field :id %> diff --git a/spec/features/home_page_spec.rb b/spec/features/home_page_spec.rb index ab2c4eb31..36aa0958b 100644 --- a/spec/features/home_page_spec.rb +++ b/spec/features/home_page_spec.rb @@ -34,43 +34,6 @@ expect(page).to have_selector ".panel-title a", text: "New Home Page Title" end - it "should allow users to edit the display_title attribute" do - visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page) - within '#user-util-collapse .dropdown-menu' do - click_link 'Dashboard' - end - - click_link "Feature pages" - - # Choose to display the home page title - within(".home_page") do - check "Show title" - end - click_button "Save changes" - - visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page) - - # Verify the home page title is being displayed - expect(page).to have_css("h1.page-title", text: exhibit.home_page.title) - - within '.dropdown-menu' do - click_link 'Dashboard' - end - - click_link "Feature pages" - - # Choose to not display the home page title - within(".home_page") do - uncheck "Show title" - end - click_button "Save changes" - - visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page) - - # Verify the home page title is not being displayed - expect(page).not_to have_css("h1.page-title", text: exhibit.home_page.title) - end - describe "page options on edit form" do describe "show title" do let(:home_page) { FactoryGirl.create(:home_page, display_title: false, exhibit: exhibit) } diff --git a/spec/features/javascript/feature_page_admin_spec.rb b/spec/features/javascript/feature_page_admin_spec.rb index 7c7b6bccc..453a9c9af 100644 --- a/spec/features/javascript/feature_page_admin_spec.rb +++ b/spec/features/javascript/feature_page_admin_spec.rb @@ -66,22 +66,6 @@ end end - it "should store the display_sidebar boolean" do - visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page) - click_link exhibit_curator.email - within '#user-util-collapse .dropdown' do - click_link 'Dashboard' - end - click_link "Feature pages" - within("[data-id='#{page1.id}']") do - expect(field_labeled("Show sidebar")).to_not be_checked - check "Show sidebar" - end - click_button "Save changes" - within("[data-id='#{page1.id}']") do - expect(field_labeled("Show sidebar")).to be_checked - end - end it "should stay in curation mode if a user has unsaved data" do visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page) click_link exhibit_curator.email