arclight 0.1.0 → 0.1.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8e7c36b89eeff34447138302c2d94e7e636fcff9
4
- data.tar.gz: 69bd0a266a8f52c56bdca6adf416885bbfe07467
3
+ metadata.gz: 96dd85338d68b6781e17f3e90d565b5a1a684ccc
4
+ data.tar.gz: 806104e8913b9bdada2b6ec4fcb40cd1d1a5cd3f
5
5
  SHA512:
6
- metadata.gz: f3d3fba678027f1c08cee5c6e261a71fc44167cf7dbb8e9203cb35780c6de8db447a0f58613f0cac1844ae460d3893ee96d54de4b5533a31d9de6eaf2f2db54f
7
- data.tar.gz: 95216eaeba2998d57beafce31831a93172efcbb3ca6d0a196c9fd295f880ac0ad6e9c592c9decbee7ab458ba28181e2bfdc0fbd288c11c8c2591b9a2c640d064
6
+ metadata.gz: df3ab36a329552fcdfc3903b70c2d7c107e8ea53a1891d956787a3040d720b97fe9db9b4ee5cd7bf2a3a6d8f06ed8712bd137507913958fa07b60c707b7d15ad
7
+ data.tar.gz: df4eadfebd2056cfd884a0056f2873529a09e00fa6f2209d137bb76663ddcf9b34a7d56295b452bedc9ccfe7b7c08fe81ece5166f4c9b36add706c2bfa615b5f
@@ -21,7 +21,14 @@
21
21
  }
22
22
 
23
23
  .al-hierarchy-children-status {
24
- text-align: right;
24
+ font-size: $font-size-h6;
25
+ margin-top: 6px;
26
+ text-align: left;
27
+ }
28
+
29
+ .bookmark-toggle,
30
+ .al-request-form {
31
+ font-size: $font-size-sm;
25
32
  }
26
33
 
27
34
  // Component title + children badge
@@ -74,26 +81,26 @@
74
81
  .blacklight-subseries .document-title-heading,
75
82
  .al-hierarchy-level-1 .blacklight-file .document-title-heading,
76
83
  .al-hierarchy-level-1 .blacklight-otherlevel .document-title-heading {
77
- border-left: ($border-width * 2) solid #999;
78
84
  padding-left: 10px;
85
+
86
+ &:before {
87
+ color: $gray-light;
88
+ content: "\027E9";
89
+ padding-right: 3px;
90
+ }
79
91
  }
80
92
 
81
93
  .al-hierarchy-level-2 .document-title-heading,
82
94
  .al-hierarchy-level-2 .blacklight-file .document-title-heading {
83
- border-left: 0;
84
- padding-left: 0;
85
-
86
95
  &:before {
87
- color: $gray-light;
88
- content: "\a6";
89
- padding-right: 6px;
96
+ content: "\027E9 \027E9";
90
97
  }
91
98
  }
92
99
 
93
100
  .al-hierarchy-level-3 .document-title-heading,
94
101
  .al-hierarchy-level-3 .blacklight-file .document-title-heading {
95
102
  &:before {
96
- content: "\205D";
103
+ content: "\027E9 \027E9 \027E9";
97
104
  }
98
105
  }
99
106
  }
@@ -162,10 +169,10 @@
162
169
  @mixin hierarchy-levels {
163
170
  @for $i from 1 through 12 {
164
171
  .al-hierarchy-level-#{$i} {
165
- margin-left: 10px;
172
+ margin-left: 20px;
166
173
  // provides for n indention
167
174
  &.extra-indent {
168
- margin-left: ($i * 10) + px;
175
+ margin-left: ($i * 20) + px;
169
176
  }
170
177
  }
171
178
  }
@@ -20,14 +20,33 @@
20
20
  }
21
21
  }
22
22
 
23
- .al-document-title-bar {
24
- .toggle-bookmark {
25
- @media (min-width: 576px) and (max-width: 991px) {
26
- padding-right: $spacer;
27
- }
28
- }
29
- }
30
-
31
23
  .bookmark-toggle .toggle-bookmark {
24
+ display: inline;
32
25
  margin-bottom: 0;
26
+ white-space: nowrap;
27
+ }
28
+
29
+ .bookmark-toggle {
30
+ display: inline;
31
+ float: right;
32
+ }
33
+
34
+ .al-hierarchy-side-content {
35
+ .al-request-form {
36
+ display: inline;
37
+ float: right;
38
+ }
39
+
40
+ .al-request-button {
41
+ font-weight: 600;
42
+ line-height: 1;
43
+
44
+ @media (min-width: 1200px) {
45
+ margin-right: ($spacer / 2);
46
+ }
47
+
48
+ &:before {
49
+ content: "\0229F";
50
+ }
51
+ }
33
52
  }
@@ -1,4 +1,8 @@
1
1
  .documents-list {
2
+ .badge {
3
+ float: right;
4
+ }
5
+
2
6
  // Result item header
3
7
  .al-document-title-bar {
4
8
  background-color: $gray-lighter;
@@ -59,6 +59,10 @@
59
59
  padding: 3px $result-item-body-padding;
60
60
  }
61
61
 
62
+ .badge {
63
+ float: right;
64
+ }
65
+
62
66
  h1 {
63
67
  font-size: $font-size-h4;
64
68
  margin-bottom: $spacer;
@@ -76,3 +80,7 @@
76
80
  text-transform: uppercase;
77
81
  }
78
82
  }
83
+
84
+ .al-collection-actions-menu {
85
+ float: right;
86
+ }
@@ -14,3 +14,8 @@
14
14
  dt.blacklight-digital_objects_ssm {
15
15
  display: none;
16
16
  }
17
+
18
+ .al-sticky-sidebar .al-request-button {
19
+ border: 0;
20
+ padding-left: 0;
21
+ }
@@ -5,7 +5,7 @@
5
5
  <% google_form.form_mapping.each do |key, value| %>
6
6
  <%= hidden_field_tag value, google_form.send(key) %>
7
7
  <% end %>
8
- <button type='submit' class='btn btn-sm btn-primary'>
8
+ <button type='submit' class='al-request-button btn-link'>
9
9
  <%= t('arclight.request.container') %>
10
10
  </button>
11
11
  <% end %>
@@ -1,11 +1,11 @@
1
1
  <% document_actions = capture do %>
2
2
  <% # bookmark functions for items/docs -%>
3
- <%= render_index_doc_actions document, wrapping_class: "col-5 col-sm-3 text-right" %>
3
+ <%= render_index_doc_actions document, wrapping_class: "col-sm-3 col-md-5 col-lg-4 text-right" %>
4
4
  <% end %>
5
5
 
6
6
  <div class='al-document-title-bar'>
7
7
  <div class='row'>
8
- <div class='col-7 col-sm-9'>
8
+ <div class='col-sm-9 col-md-7 col-lg-8'>
9
9
  <%= document.repository_and_unitid %>
10
10
  </div>
11
11
  <%= document_actions %>
@@ -1,5 +1,5 @@
1
1
  <% if document.online_content? %>
2
- <span class='badge badge-success float-right'>
2
+ <span class='badge badge-success'>
3
3
  <%= t(:'arclight.views.online_content_indicator') %>
4
4
  </span>
5
5
  <% end %>
@@ -1,17 +1,15 @@
1
1
  <% if downloads.present? && (downloads[:pdf].present? || downloads[:ead].present?) %>
2
- <li>
3
- <div class='dropdown'>
4
- <button class='btn btn-secondary dropdown-toggle' type="button" id="download-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
5
- <%= t 'arclight.views.show.download.default' %>
6
- </button>
7
- <div class="dropdown-menu" aria-labelledby="download-dropdown">
8
- <% if downloads[:pdf].present? %>
9
- <a class="dropdown-item" href="<%= downloads[:pdf][:href] %>"><%= t('arclight.views.show.download.pdf', size: downloads[:pdf][:size]) %></a>
10
- <% end %>
11
- <% if downloads[:ead].present? %>
12
- <a class="dropdown-item" href="<%= downloads[:ead][:href] %>"><%= t('arclight.views.show.download.ead', size: downloads[:ead][:size]) %></a>
13
- <% end %>
14
- </div>
2
+ <div class='dropdown al-collection-actions-menu'>
3
+ <button class='btn btn-secondary btn-sm dropdown-toggle' type="button" id="download-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
4
+ <%= t 'arclight.views.show.download.default' %>
5
+ </button>
6
+ <div class="dropdown-menu dropdown-menu-right" aria-labelledby="download-dropdown">
7
+ <% if downloads[:pdf].present? %>
8
+ <a class="dropdown-item" href="<%= downloads[:pdf][:href] %>"><%= t('arclight.views.show.download.pdf', size: downloads[:pdf][:size]) %></a>
9
+ <% end %>
10
+ <% if downloads[:ead].present? %>
11
+ <a class="dropdown-item" href="<%= downloads[:ead][:href] %>"><%= t('arclight.views.show.download.ead', size: downloads[:ead][:size]) %></a>
12
+ <% end %>
15
13
  </div>
16
- </li>
14
+ </div>
17
15
  <% end %>
@@ -1,7 +1,6 @@
1
1
  <header class="documentHeader row" data-document-id="<%= document.id %>">
2
2
  <% requestable = item_requestable?('', { document: document }) %>
3
- <% side_content = document.children? || requestable %>
4
- <h3 class="index_title document-title-heading <%= side_content ? 'col-md-9' : 'col-md-12' %> ">
3
+ <h3 class="index_title document-title-heading col-md-8">
5
4
  <% if document.containers.present? %>
6
5
  <span class="document-title-containers">
7
6
  <%= document.containers.join(', ') %>:
@@ -9,17 +8,7 @@
9
8
  <% end %>
10
9
  <% counter = document_counter_with_offset(document_counter) %>
11
10
  <%= link_to_document document, document_show_link_field(document), counter: counter %>
12
- </h3>
13
-
14
- <div class="al-hierarchy-side-content float-right <%= side_content ? 'col-md-3' : 'col' %> ">
15
- <% unless hierarchy_component_context? %>
16
- <div class="index-document-functions">
17
- <%= render partial: 'catalog/bookmark_control', locals: { document: document } %>
18
- </div>
19
- <% end %>
20
- <% if requestable %>
21
- <%= render partial: 'arclight/requests/google_form', locals: { document: document } %>
22
- <% end %>
11
+ <%= render_document_partial(document, 'arclight_online_content_indicator') %>
23
12
  <% if document.children? %>
24
13
  <div class='al-hierarchy-children-status'>
25
14
  <span class='badge badge-default al-number-of-children-badge'>
@@ -38,5 +27,16 @@
38
27
  </span>
39
28
  </div>
40
29
  <% end %>
30
+ </h3>
31
+
32
+ <div class="al-hierarchy-side-content float-right col">
33
+ <% unless hierarchy_component_context? %>
34
+ <div class="index-document-functions">
35
+ <%= render partial: 'catalog/bookmark_control', locals: { document: document } %>
36
+ </div>
37
+ <% end %>
38
+ <% if requestable %>
39
+ <%= render partial: 'arclight/requests/google_form', locals: { document: document } %>
40
+ <% end %>
41
41
  </div>
42
42
  </header>
@@ -3,28 +3,36 @@
3
3
  <%= render partial: 'show_sidebar' %>
4
4
  </div>
5
5
  <div class='col-md-9'>
6
- <ul class='nav nav-pills' role='tablist'>
7
- <li class='nav-item'>
8
- <a class='nav-link active' data-toggle='pill' href='#overview' role='tab'>
9
- <%= t 'arclight.views.show.overview' %>
10
- </a>
11
- </li>
12
- <li class='nav-item'>
13
- <a class='nav-link disabled' data-toggle='pill' href='#contents' role='tab' data-hierarchy-enable-me='true'>
14
- <%= t 'arclight.views.show.no_contents' %>
15
- </a>
16
- </li>
17
- <li class='nav-item'>
18
- <a class='nav-link <%= 'disabled' unless document.digital_objects.present? || document.online_content? %>' data-toggle='pill' href='#online-content' role='tab' data-arclight-online-content-tab='true'>
19
- <% if document.digital_objects.present? || document.online_content? %>
20
- <%= t 'arclight.views.show.online_content' %>
21
- <% else %>
22
- <%= t 'arclight.views.show.no_online_content' %>
23
- <% end %>
24
- </a>
25
- </li>
26
- <%= render partial: 'collection_downloads', locals: { downloads: collection_downloads(document) } %>
27
- </ul>
6
+ <div class='row'>
7
+ <div class='col-lg-9'>
8
+ <ul class='nav nav-pills' role='tablist'>
9
+ <li class='nav-item'>
10
+ <a class='nav-link active' data-toggle='pill' href='#overview' role='tab'>
11
+ <%= t 'arclight.views.show.overview' %>
12
+ </a>
13
+ </li>
14
+ <li class='nav-item'>
15
+ <a class='nav-link disabled' data-toggle='pill' href='#contents' role='tab' data-hierarchy-enable-me='true'>
16
+ <%= t 'arclight.views.show.no_contents' %>
17
+ </a>
18
+ </li>
19
+ <li class='nav-item'>
20
+ <a class='nav-link <%= 'disabled' unless document.digital_objects.present? || document.online_content? %>' data-toggle='pill' href='#online-content' role='tab' data-arclight-online-content-tab='true'>
21
+ <% if document.digital_objects.present? || document.online_content? %>
22
+ <%= t 'arclight.views.show.online_content' %>
23
+ <% else %>
24
+ <%= t 'arclight.views.show.no_online_content' %>
25
+ <% end %>
26
+ </a>
27
+ </li>
28
+ </ul>
29
+ </div>
30
+
31
+ <div class='col'>
32
+ <%= render partial: 'collection_downloads', locals: { downloads: collection_downloads(document) } %>
33
+ </div>
34
+ </div>
35
+
28
36
  <div class='tab-content'>
29
37
  <div class='tab-pane active' id='overview' role='tabpanel'>
30
38
  <%= render 'collection_overview' %>
@@ -1,4 +1,4 @@
1
- <nav class="navbar navbar-toggleable-md navbar-inverse bg-inverse" role="navigation">
1
+ <nav class="navbar navbar-toggleable-md navbar-inverse bg-inverse topbar" role="navigation">
2
2
  <div class="<%= container_classes %>">
3
3
  <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="Toggle navigation">
4
4
  <span class="navbar-toggler-icon"></span>
@@ -7,7 +7,7 @@ en:
7
7
  view_all: 'View'
8
8
  scope_and_contents: 'Scope and Contents'
9
9
  request:
10
- container: 'Request container(s)'
10
+ container: 'Request'
11
11
  routes:
12
12
  home: 'Home'
13
13
  collections: 'Collections'
@@ -45,6 +45,7 @@ module Arclight
45
45
  add_date_ranges(solr_doc)
46
46
  add_normalized_title(solr_doc)
47
47
  resolve_repository(solr_doc)
48
+ add_digital_content(prefix: 'c', solr_doc: solr_doc)
48
49
  add_digital_content(prefix: 'c/did', solr_doc: solr_doc)
49
50
  end
50
51
 
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Arclight
4
- VERSION = '0.1.0'
4
+ VERSION = '0.1.1'
5
5
  end
@@ -227,7 +227,7 @@ class CatalogController < ApplicationController
227
227
  two_words_connector: '<br/>',
228
228
  last_word_connector: '<br/>'
229
229
  }
230
-
230
+
231
231
  # Collection Show Page - Indexed Terms Section
232
232
  config.add_component_indexed_terms_field 'access_subjects_ssim', label: 'Subjects', :link_to_facet => true, separator_options: {
233
233
  words_connector: '<br/>',
@@ -328,6 +328,7 @@ class CatalogController < ApplicationController
328
328
  config.view.hierarchy.display_control = false
329
329
  config.view.hierarchy.partials = config.index.partials.dup
330
330
  config.view.hierarchy.partials.delete(:index_breadcrumb)
331
+ config.view.hierarchy.partials.delete(:arclight_online_content_indicator)
331
332
 
332
333
  ##
333
334
  # Hierarchy Index View
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: arclight
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Darren Hardy
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: exe
13
13
  cert_chain: []
14
- date: 2017-06-05 00:00:00.000000000 Z
14
+ date: 2017-06-16 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: blacklight