sufia 4.0.0.rc1 → 4.0.0.rc2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (265) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +2 -0
  3. data/.travis.yml +2 -2
  4. data/Gemfile +9 -17
  5. data/README.md +18 -9
  6. data/Rakefile +10 -5
  7. data/SUFIA_VERSION +1 -1
  8. data/app/assets/javascripts/jquery.blacklightTagCloud.js +1 -1
  9. data/app/assets/javascripts/sufia.js +5 -22
  10. data/app/assets/javascripts/sufia/batch.js +8 -0
  11. data/app/assets/javascripts/sufia/batch_edit.js +19 -3
  12. data/app/assets/javascripts/sufia/dashboard_actions.js +23 -10
  13. data/app/assets/javascripts/sufia/multiForm.js +2 -2
  14. data/app/assets/javascripts/sufia/permissions.js +10 -9
  15. data/app/assets/javascripts/sufia/tabs.js +20 -0
  16. data/app/assets/stylesheets/catalog.css.scss +5 -0
  17. data/app/assets/stylesheets/collections.css.scss +40 -0
  18. data/app/assets/stylesheets/file-listing.css.scss +37 -13
  19. data/app/assets/stylesheets/generic_files.css.erb +5 -0
  20. data/app/assets/stylesheets/header.css.scss +1 -4
  21. data/app/assets/stylesheets/settings.css.scss +6 -0
  22. data/app/assets/stylesheets/styles.css.scss +4 -3
  23. data/app/assets/stylesheets/sufia-audio-overrides.css +2 -2
  24. data/app/assets/stylesheets/sufia.css.scss +27 -5
  25. data/app/assets/stylesheets/tagcloud.css +5 -1
  26. data/app/controllers/batch_controller.rb +3 -3
  27. data/app/controllers/concerns/sufia/batch_edits_controller_behavior.rb +14 -1
  28. data/app/controllers/concerns/sufia/catalog.rb +0 -1
  29. data/app/controllers/concerns/sufia/controller.rb +5 -0
  30. data/app/controllers/concerns/sufia/dashboard_controller_behavior.rb +2 -9
  31. data/app/controllers/concerns/sufia/files_controller/browse_everything.rb +3 -3
  32. data/app/controllers/concerns/sufia/files_controller_behavior.rb +5 -1
  33. data/app/controllers/concerns/sufia/homepage_controller.rb +1 -1
  34. data/app/controllers/concerns/sufia/users_controller_behavior.rb +3 -2
  35. data/app/helpers/batch_edits_helper.rb +6 -0
  36. data/app/helpers/generic_file_helper.rb +15 -0
  37. data/app/helpers/sufia/blacklight_override.rb +19 -3
  38. data/app/helpers/sufia/dashboard_helper_behavior.rb +25 -3
  39. data/app/helpers/sufia/records_helper_behavior.rb +13 -5
  40. data/app/helpers/sufia/sufia_helper_behavior.rb +15 -12
  41. data/app/models/concerns/sufia/solr_document_behavior.rb +5 -36
  42. data/app/views/_masthead.html.erb +1 -1
  43. data/app/views/_user_util_links.html.erb +6 -4
  44. data/app/views/advanced/_advanced_search_fields.html.erb +4 -4
  45. data/app/views/advanced/_advanced_search_form.html.erb +14 -17
  46. data/app/views/advanced/index.html.erb +3 -3
  47. data/app/views/batch/_metadata.html.erb +22 -24
  48. data/app/views/batch/_more_metadata.html.erb +1 -1
  49. data/app/views/batch/edit.html.erb +2 -2
  50. data/app/views/batch_edits/_check_all.html.erb +7 -9
  51. data/app/views/batch_edits/_delete_selected.html.erb +1 -0
  52. data/app/views/batch_edits/edit.html.erb +25 -26
  53. data/app/views/batch_edits/update_edit.js.erb +1 -1
  54. data/app/views/catalog/_facet_limit.html.erb +4 -12
  55. data/app/views/catalog/_search_form.html.erb +8 -13
  56. data/app/views/collections/_action_menu.html.erb +2 -2
  57. data/app/views/collections/_collection.html.erb +10 -31
  58. data/app/views/collections/_document_list.html.erb +1 -1
  59. data/app/views/collections/_edit_actions.html.erb +2 -2
  60. data/app/views/collections/_edit_descriptions.html.erb +3 -5
  61. data/app/views/collections/_form.html.erb +8 -10
  62. data/app/views/collections/_media_display.html.erb +1 -1
  63. data/app/views/collections/_show_actions.html.erb +5 -5
  64. data/app/views/collections/_show_descriptions.html.erb +13 -8
  65. data/app/views/collections/_show_document_list.html.erb +17 -0
  66. data/app/views/collections/_show_document_list_menu.html.erb +24 -0
  67. data/app/views/collections/_show_document_list_row.html.erb +63 -0
  68. data/app/views/collections/edit.html.erb +2 -2
  69. data/app/views/collections/show.html.erb +28 -19
  70. data/app/views/contact_form/new.html.erb +21 -29
  71. data/app/views/dashboard/_index_partials/_contents.html.erb +14 -0
  72. data/app/views/dashboard/_index_partials/_heading_actions.html.erb +18 -0
  73. data/app/views/dashboard/_index_partials/_heading_greetings.html.erb +8 -0
  74. data/app/views/dashboard/_index_partials/_stats.html.erb +6 -2
  75. data/app/views/dashboard/index.html.erb +5 -37
  76. data/app/views/generic_files/_breadcrumbs.html.erb +2 -0
  77. data/app/views/generic_files/_browse_everything.html.erb +2 -2
  78. data/app/views/generic_files/_descriptions.html.erb +4 -6
  79. data/app/views/generic_files/_field_form.html.erb +2 -2
  80. data/app/views/generic_files/_generic_file.html.erb +8 -29
  81. data/app/views/generic_files/_groups_description.html.erb +5 -4
  82. data/app/views/generic_files/_permission.html.erb +2 -2
  83. data/app/views/generic_files/_permission_form.html.erb +62 -77
  84. data/app/views/generic_files/_rights_modal.html.erb +0 -2
  85. data/app/views/generic_files/_share_with.html.erb +14 -0
  86. data/app/views/generic_files/_show_actions.html.erb +1 -1
  87. data/app/views/generic_files/_show_collections.html.erb +17 -0
  88. data/app/views/generic_files/_show_descriptions.html.erb +2 -2
  89. data/app/views/generic_files/_versioning.html.erb +2 -2
  90. data/app/views/generic_files/_visibility.html.erb +17 -0
  91. data/app/views/generic_files/show.html.erb +39 -2
  92. data/app/views/generic_files/stats.html.erb +1 -1
  93. data/app/views/generic_files/upload/_form_fields.html.erb +2 -2
  94. data/app/views/generic_files/upload/_local_file_import_chooser.html.erb +1 -1
  95. data/app/views/generic_files/upload/_script_templates.html.erb +2 -2
  96. data/app/views/generic_files/upload/_tos_checkbox.html.erb +3 -3
  97. data/app/views/homepage/_home_content.html.erb +0 -9
  98. data/app/views/homepage/_home_header.html.erb +1 -1
  99. data/app/views/homepage/_recent_document.html.erb +2 -2
  100. data/app/views/layouts/_head_tag_content.html.erb +7 -1
  101. data/app/views/layouts/sufia-dashboard.html.erb +4 -2
  102. data/app/views/layouts/sufia-one-column.html.erb +1 -1
  103. data/app/views/my/_action_menu.html.erb +1 -1
  104. data/app/views/my/_collection_action_menu.html.erb +3 -3
  105. data/app/views/my/_constraints.html.erb +11 -0
  106. data/app/views/my/_document_list.html.erb +1 -1
  107. data/app/views/my/_facet_limit.html.erb +4 -12
  108. data/app/views/my/_facets.html.erb +1 -3
  109. data/app/views/my/_index_partials/_default_group.html.erb +2 -3
  110. data/app/views/my/_index_partials/_list_collections.html.erb +17 -11
  111. data/app/views/my/_index_partials/_list_files.html.erb +20 -24
  112. data/app/views/my/_search_header.html.erb +5 -0
  113. data/app/views/my/_sort_and_per_page.html.erb +11 -7
  114. data/app/views/my/index.html.erb +9 -15
  115. data/app/views/records/_edit_field.html.erb +14 -10
  116. data/app/views/records/edit_fields/_default.html.erb +6 -0
  117. data/app/views/records/edit_fields/_description.html.erb +3 -7
  118. data/app/views/records/edit_fields/_resource_type.html.erb +4 -6
  119. data/app/views/records/edit_fields/_rights.html.erb +4 -5
  120. data/app/views/records/edit_fields/_suffix.html.erb +6 -3
  121. data/app/views/records/edit_fields/_type.html.erb +7 -12
  122. data/app/views/{generic_files → records}/show_fields/_based_near.html.erb +1 -1
  123. data/app/views/{generic_files → records}/show_fields/_contributor.html.erb +2 -2
  124. data/app/views/records/show_fields/_creator.html.erb +6 -0
  125. data/app/views/{generic_files → records}/show_fields/_date_created.html.erb +1 -1
  126. data/app/views/records/show_fields/_default.html.erb +6 -0
  127. data/app/views/records/show_fields/_description.html.erb +6 -0
  128. data/app/views/records/show_fields/_identifier.html.erb +4 -0
  129. data/app/views/{generic_files → records}/show_fields/_language.html.erb +1 -1
  130. data/app/views/{generic_files → records}/show_fields/_publisher.html.erb +1 -1
  131. data/app/views/records/show_fields/_related_url.html.erb +6 -0
  132. data/app/views/{generic_files → records}/show_fields/_resource_type.html.erb +1 -1
  133. data/app/views/{generic_files → records}/show_fields/_rights.html.erb +1 -1
  134. data/app/views/{generic_files → records}/show_fields/_subject.html.erb +1 -1
  135. data/app/views/{generic_files → records}/show_fields/_tag.html.erb +1 -1
  136. data/app/views/records/show_fields/_title.html.erb +6 -0
  137. data/app/views/shared/_attributes.html.erb +27 -0
  138. data/app/views/static/agreement.html.erb +1 -1
  139. data/app/views/users/_activity_log.html.erb +0 -2
  140. data/app/views/users/_follower_modal.html.erb +27 -23
  141. data/app/views/users/_following_modal.html.erb +27 -23
  142. data/app/views/users/_social_media_info.html.erb +4 -4
  143. data/app/views/users/_trophy_edit.html.erb +5 -7
  144. data/app/views/users/_user_info.html.erb +3 -3
  145. data/app/views/users/_user_util_links_extra.html.erb +4 -0
  146. data/app/views/users/edit.html.erb +28 -33
  147. data/app/views/users/index.html.erb +1 -1
  148. data/app/views/users/show.html.erb +0 -4
  149. data/config/jetty.yml +1 -1
  150. data/config/locales/sufia.en.yml +53 -12
  151. data/lib/generators/sufia/install_generator.rb +89 -0
  152. data/lib/generators/sufia/templates/catalog_controller.rb +1 -1
  153. data/lib/generators/sufia/upgrade400_generator.rb +4 -0
  154. data/lib/sufia.rb +1 -10
  155. data/lib/sufia/version.rb +1 -1
  156. data/solr_conf/conf/solrconfig.xml +31 -17
  157. data/spec/actors/generic_file/actor_spec.rb +17 -0
  158. data/spec/controllers/batch_controller_spec.rb +2 -2
  159. data/spec/controllers/batch_edits_controller_spec.rb +24 -19
  160. data/spec/controllers/catalog_controller_spec.rb +23 -12
  161. data/spec/controllers/collections_controller_spec.rb +19 -17
  162. data/spec/controllers/dashboard_controller_spec.rb +5 -19
  163. data/spec/controllers/generic_files_controller_spec.rb +35 -20
  164. data/spec/controllers/homepage_controller_spec.rb +25 -2
  165. data/spec/controllers/users_controller_spec.rb +99 -102
  166. data/spec/factories/generic_files.rb +2 -2
  167. data/spec/factories/users.rb +32 -2
  168. data/spec/features/browse_dashboard_files_spec.rb +14 -2
  169. data/spec/features/browse_files_spec.rb +5 -1
  170. data/spec/features/catalog_search_spec.rb +7 -6
  171. data/spec/features/collection_spec.rb +43 -33
  172. data/spec/features/display_dashboard_spec.rb +25 -22
  173. data/spec/features/notifications_spec.rb +9 -4
  174. data/spec/features/users_spec.rb +34 -25
  175. data/spec/fixtures/1.5mb-avatar.jpg +0 -0
  176. data/spec/helpers/batch_edits_helper_spec.rb +38 -0
  177. data/spec/helpers/dashboard_helper_spec.rb +16 -5
  178. data/spec/helpers/generic_file_helper_spec.rb +41 -0
  179. data/spec/helpers/records_helper_spec.rb +12 -0
  180. data/spec/jobs/active_fedora_pid_based_job_spec.rb +1 -1
  181. data/spec/jobs/audit_job_spec.rb +2 -3
  182. data/spec/jobs/batch_update_job_spec.rb +39 -24
  183. data/spec/jobs/event_jobs_spec.rb +1 -1
  184. data/spec/lib/sufia/id_service_spec.rb +25 -7
  185. data/spec/lib/sufia/messages_spec.rb +60 -0
  186. data/spec/lib/sufia/readable_permissions_spec.rb +56 -0
  187. data/spec/lib/sufia/writable_permissions_spec.rb +20 -0
  188. data/spec/models/batch_spec.rb +1 -1
  189. data/spec/models/collection_spec.rb +24 -2
  190. data/spec/models/featured_work_spec.rb +2 -2
  191. data/spec/models/file_content_datastream_spec.rb +5 -5
  192. data/spec/models/generic_file_spec.rb +149 -133
  193. data/spec/models/local_authority_spec.rb +1 -1
  194. data/spec/models/user_spec.rb +33 -6
  195. data/spec/spec_helper.rb +7 -10
  196. data/spec/{support → test_app_templates}/lib/generators/test_app_generator.rb +11 -6
  197. data/spec/views/batch/edit.html.erb_spec.rb +8 -2
  198. data/spec/views/catalog/index.html.erb_spec.rb +34 -0
  199. data/spec/views/catalog/{sort_and_per_pange.html.erb_spec.rb → sort_and_per_page.html.erb_spec.rb} +0 -0
  200. data/spec/views/collections/_form.html.erb_spec.rb +32 -0
  201. data/spec/views/collections/_show_descriptions.html.erb_spec.rb +25 -0
  202. data/spec/views/dashboard/index_spec.rb +33 -4
  203. data/spec/views/generic_file/_breadcrumbs.html.erb_spec.rb +32 -0
  204. data/spec/views/generic_file/show.html.erb_spec.rb +273 -8
  205. data/spec/views/users/_user_util_links.html.erb_spec.rb +25 -0
  206. data/sufia-models/app/actors/sufia/generic_file/actor.rb +14 -5
  207. data/sufia-models/{lib/sufia/models → app}/jobs/active_fedora_pid_based_job.rb +0 -0
  208. data/sufia-models/{lib/sufia/models → app}/jobs/audit_job.rb +4 -10
  209. data/sufia-models/{lib/sufia/models → app}/jobs/batch_update_job.rb +22 -18
  210. data/sufia-models/{lib/sufia/models → app}/jobs/characterize_job.rb +0 -0
  211. data/sufia-models/{lib/sufia/models → app}/jobs/create_derivatives_job.rb +0 -0
  212. data/sufia-models/{lib/sufia/models → app}/jobs/import_url_job.rb +0 -0
  213. data/sufia-models/{lib/sufia/models → app}/jobs/resolrize_job.rb +0 -0
  214. data/sufia-models/app/models/collection.rb +1 -39
  215. data/sufia-models/{lib → app/models/concerns}/sufia/ability.rb +0 -0
  216. data/sufia-models/app/models/concerns/sufia/collection.rb +55 -0
  217. data/sufia-models/app/models/concerns/sufia/generic_file.rb +5 -11
  218. data/sufia-models/app/models/concerns/sufia/generic_file/audit.rb +1 -2
  219. data/sufia-models/app/models/concerns/sufia/generic_file/characterization.rb +4 -2
  220. data/sufia-models/app/models/concerns/sufia/generic_file/full_text_indexing.rb +27 -0
  221. data/sufia-models/app/models/concerns/sufia/generic_file/mime_types.rb +1 -0
  222. data/sufia-models/app/models/concerns/sufia/generic_file/permissions.rb +2 -49
  223. data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/model_methods.rb +0 -0
  224. data/sufia-models/app/models/concerns/sufia/user.rb +8 -1
  225. data/sufia-models/app/models/sufia/avatar_uploader.rb +2 -3
  226. data/sufia-models/app/services/sufia/noid.rb +9 -0
  227. data/sufia-models/config/locales/sufia.en.yml +1 -0
  228. data/sufia-models/lib/generators/sufia/models/fulltext_generator.rb +27 -0
  229. data/sufia-models/lib/generators/sufia/models/install_generator.rb +7 -0
  230. data/sufia-models/lib/generators/sufia/models/templates/config/analytics.yml +5 -5
  231. data/sufia-models/lib/generators/sufia/models/templates/config/solrconfig.xml +177 -0
  232. data/sufia-models/lib/generators/sufia/models/templates/config/sufia.rb +3 -1
  233. data/sufia-models/lib/generators/sufia/models/upgrade400_generator.rb +7 -0
  234. data/sufia-models/lib/sufia/messages.rb +67 -0
  235. data/sufia-models/lib/sufia/models.rb +2 -0
  236. data/sufia-models/lib/sufia/models/active_fedora/redis.rb +0 -6
  237. data/sufia-models/lib/sufia/models/engine.rb +1 -3
  238. data/sufia-models/lib/sufia/models/resque.rb +1 -1
  239. data/sufia-models/lib/sufia/models/version.rb +1 -1
  240. data/sufia-models/lib/sufia/permissions.rb +9 -0
  241. data/sufia-models/lib/sufia/permissions/readable.rb +20 -0
  242. data/sufia-models/lib/sufia/permissions/writable.rb +56 -0
  243. data/sufia-models/lib/tasks/sufia-models_tasks.rake +58 -2
  244. data/sufia-models/sufia-models.gemspec +11 -11
  245. data/sufia.gemspec +19 -9
  246. data/tasks/jetty.rake +6 -5
  247. data/tasks/sufia-dev.rake +4 -77
  248. metadata +235 -72
  249. data/app/assets/images/folder.png +0 -0
  250. data/app/views/collections/show_fields/_creator.html.erb +0 -11
  251. data/app/views/collections/show_fields/_description.html.erb +0 -8
  252. data/app/views/collections/show_fields/_title.html.erb +0 -8
  253. data/app/views/generic_files/edit_fields/_default.html.erb +0 -6
  254. data/app/views/generic_files/edit_fields/_description.html.erb +0 -5
  255. data/app/views/generic_files/edit_fields/_resource_type.html.erb +0 -6
  256. data/app/views/generic_files/edit_fields/_rights.html.erb +0 -6
  257. data/app/views/generic_files/edit_fields/_suffix.html.erb +0 -9
  258. data/app/views/generic_files/show_fields/_creator.html.erb +0 -7
  259. data/app/views/generic_files/show_fields/_default.html.erb +0 -6
  260. data/app/views/generic_files/show_fields/_description.html.erb +0 -7
  261. data/app/views/generic_files/show_fields/_identifier.html.erb +0 -4
  262. data/app/views/generic_files/show_fields/_related_url.html.erb +0 -6
  263. data/app/views/generic_files/show_fields/_title.html.erb +0 -7
  264. data/lib/generators/sufia/sufia_generator.rb +0 -89
  265. data/spec/active_fedora/unsaved_digital_object_spec.rb +0 -35
@@ -8,7 +8,7 @@
8
8
  <% if can? :edit, @generic_file %>
9
9
  &nbsp;|&nbsp;
10
10
  <% if @generic_file.processing? %>
11
- <%= "File is being processed you may edit once it is complete" %>
11
+ <%= t('sufia.upload.processing') %>
12
12
  <% else %>
13
13
  <%= link_to "Edit", sufia.edit_generic_file_path(@generic_file) %>
14
14
  <% end %>
@@ -0,0 +1,17 @@
1
+ <h2 class="non lower">Collections</h2>
2
+ <% if @generic_file.collections.blank? %>
3
+ <p><%= t('sufia.file.collections_list.empty') %></p>
4
+ <% else %>
5
+ <p><%= t('sufia.file.collections_list.heading') %></p>
6
+ <table class="table table-striped">
7
+ <tbody>
8
+ <% @generic_file.collections.each do |collection| %>
9
+ <tr class="collection attributes">
10
+ <%= content_tag :td, class: 'attribute title', data: { noid: collection.noid } do %>
11
+ <%= link_to collection.title, collections.collection_path(collection.noid) %>
12
+ <% end %>
13
+ </tr>
14
+ <% end %>
15
+ </tbody>
16
+ </table>
17
+ <% end %>
@@ -1,4 +1,4 @@
1
- <% generic_file = @generic_file unless generic_file %>
1
+ <% generic_file ||= @generic_file %>
2
2
 
3
3
  <h2 class="non lower">Descriptions</h2>
4
4
  <table class="table table-striped"><!-- class="verticalheadings"> -->
@@ -6,7 +6,7 @@
6
6
  <% (generic_file.terms_for_display).each do |term| %>
7
7
  <tr>
8
8
  <th><%= get_label(term) %></th>
9
- <td> <%= render_show_field_partial(term, generic_file: generic_file) %></td>
9
+ <td><%= render_show_field_partial_with_action("records", term, {record: generic_file}) %></td>
10
10
  </tr>
11
11
  <% end %>
12
12
  </tbody>
@@ -10,7 +10,7 @@
10
10
  <p id="upload_field">
11
11
  <%= file_field_tag "filedata" %>
12
12
  </p>
13
- <%= f.button '<i class="glyphicon glyphicon-upload"></i> Upload New Version'.html_safe, name: "update_versioning", id: "upload_submit", onclick: "confirmation_needed = false;", class: "btn-primary btn-mini" %>
13
+ <%= f.button '<i class="glyphicon glyphicon-upload"></i> Upload New Version'.html_safe, name: "update_versioning", id: "upload_submit", onclick: "confirmation_needed = false;", class: "btn btn-primary btn-xs" %>
14
14
  </div>
15
15
  </div>
16
16
  <hr />
@@ -27,7 +27,7 @@
27
27
  </div>
28
28
  <% end %>
29
29
  <div id="save_version_note" class="alert hide">You must click &quot;Save Revision&quot; to revert a previous version of this file</div>
30
- <%= f.button '<i class="glyphicon glyphicon-save"></i> Save Revision'.html_safe, type: 'submit', class: 'btn-primary btn-mini', onclick: "confirmation_needed = false;", name: "revert_submit", id: "revert_submit" %>
30
+ <%= f.button '<i class="glyphicon glyphicon-save"></i> Save Revision'.html_safe, type: 'submit', class: 'btn btn-primary btn-xs', onclick: "confirmation_needed = false;", name: "revert_submit", id: "revert_submit" %>
31
31
  <% end %>
32
32
  </div> <!-- /well -->
33
33
  </div> <!-- /row -->
@@ -0,0 +1,17 @@
1
+ <p>This setting will determine who can view your file, and the associated metadata. Setting
2
+ the visibility to <span class='label label-success'>Open Access</span> will allow your
3
+ content to be discovered in Google and viewed by anyone. The visibility setting
4
+ <span class='label label-info'><%=t('sufia.institution_name') %></span> will only allow
5
+ users who are logged into <%=t('sufia.product_name') %> (via WebAccess) to view the content.
6
+ Files that are marked <span class='label label-danger'>Private</span> are only able to be viewed
7
+ by users and/or groups that have been given specific access in the &quot;Share With&quot; section.
8
+ </p>
9
+
10
+ <p>
11
+ Permissions in <%=t('sufia.product_name') %> are hierarchical. This means that you cannot set
12
+ the visibility of a file to <span class='label label-success'>Open Access</span> or
13
+ <span class='label label-info'><%=t('sufia.institution_name') %></span> and simultaneously
14
+ try to restrict the access of a single user. However, you may mark the visibility of
15
+ a file as <span class='label label-danger'>Private</span> and then grant access to
16
+ particular users and/or groups for that file in the &quot;Share With&quot; section.
17
+ </p>
@@ -1,3 +1,39 @@
1
+ <% content_for(:twitter_meta) do %>
2
+ <%
3
+ tweeter = User.find_by_user_key(@generic_file.depositor).twitter_handle
4
+ tweeter = tweeter.present? ? "@#{tweeter}" : t('sufia.product_twitter_handle') %>
5
+ <meta name="twitter:card" content="product">
6
+ <meta name="twitter:site" content="<%= t('sufia.product_twitter_handle') %>"/>
7
+ <meta name="twitter:creator" content="<%= tweeter %>"/>
8
+ <meta property="og:site_name" content="<%= t('sufia.product_name') %>"/>
9
+ <meta property="og:type" content="object"/>
10
+ <meta property="og:title" content="<%= @generic_file.title.first %>"/>
11
+ <meta property="og:description" content="<%= @generic_file.description.first.truncate(200) rescue @generic_file.title.first %>"/>
12
+ <meta property="og:image" content="<%= sufia.download_url(@generic_file, datastream_id: 'thumbnail') %>"/>
13
+ <meta property="og:url" content="<%= sufia.generic_file_url(@generic_file) %>"/>
14
+ <meta name="twitter:data1" content="<%= @generic_file.tag.join(', ') %>"/>
15
+ <meta name="twitter:label1" content="Keywords"/>
16
+ <meta name="twitter:data2" content="<%= @generic_file.rights.first %>"/>
17
+ <meta name="twitter:label2" content="Rights"/>
18
+ <% end %>
19
+
20
+ <% content_for(:gscholar_meta) do %>
21
+ <meta name="citation_title" content="<%= @generic_file.title.first %>"/>
22
+ <% @generic_file.creator.each do |creator| %>
23
+ <meta name="citation_author" content="<%= creator %>"/>
24
+ <% end %>
25
+ <meta name="citation_publication_date" content="<%= @generic_file.date_created.first %>"/>
26
+ <meta name="citation_pdf_url" content="<%= sufia.download_url(@generic_file) %>"/>
27
+ <!-- Sufia does not yet support these metadata -->
28
+ <!--
29
+ <meta name="citation_journal_title" content=""/>
30
+ <meta name="citation_volume" content=""/>
31
+ <meta name="citation_issue" content=""/>
32
+ <meta name="citation_firstpage" content=""/>
33
+ <meta name="citation_lastpage" content=""/>
34
+ -->
35
+ <% end %>
36
+
1
37
  <%= javascript_include_tag 'https://s7.addthis.com/js/250/addthis_widget.js#pubid=ra-4ff1d986721ebb24' %>
2
38
 
3
39
  <%= javascript_tag do %>
@@ -11,12 +47,13 @@
11
47
  <div class="col-xs-12 col-sm-4">
12
48
  <%= render partial: 'generic_files/media_display' %>
13
49
  <%= render partial: 'show_actions' %>
50
+ <%= render partial: 'show_collections' %>
14
51
  </div>
15
52
  <div itemscope itemtype="<%= @generic_file.itemtype %>" class="col-xs-12 col-sm-8">
16
- <h1><%= @generic_file %></h1>
53
+ <h1 class="visibility"><%= @generic_file %> <%= render_visibility_badge %></h1>
17
54
  <%= render partial: 'show_descriptions' %>
18
55
  <%= render partial: 'show_details' %>
19
56
  <%= render partial: 'users/activity_log', locals: {events: @events} %>
20
57
  </div><!-- /columns second -->
21
58
  </div> <!-- /.row -->
22
- </div><!-- /.container-fluid -->
59
+ </div><!-- /.container-fluid -->
@@ -9,7 +9,7 @@
9
9
  <%= content_tag :h1, @generic_file, class: "lower" %>
10
10
 
11
11
  <div class="row">
12
- <div class="span110">
12
+ <div class="col-sm-12">
13
13
  <%= content_tag :h2, "Analytics" %>
14
14
  <div class="alert alert-info">
15
15
  <i class="glyphicon glyphicon-signal large-icon"></i>
@@ -21,12 +21,12 @@
21
21
  <input type="file" name="files[]" directory webkitdirectory mozdirectory />
22
22
  </span>
23
23
  <% end %>
24
- <span id="main_upload_start_span" class="activate-container" data-toggle="tooltip" data-title="<%= t('sufia.upload_tooltip') %>">
24
+ <div id="main_upload_start_span" class="activate-container visible-all-inline-block" data-toggle="tooltip" data-title="<%= t('sufia.upload_tooltip') %>">
25
25
  <button type="submit" class="activate-submit btn btn-primary start" id="main_upload_start">
26
26
  <i class="glyphicon glyphicon-upload"></i>
27
27
  <span>Start upload</span>
28
28
  </button>
29
- </span>
29
+ </div>
30
30
  <button type="reset" class="btn btn-warning cancel">
31
31
  <i class="glyphicon glyphicon-ban-circle"></i>
32
32
  <span>Cancel upload</span>
@@ -11,7 +11,7 @@
11
11
  <%current_user.files.each do |f| %>
12
12
  <tr>
13
13
  <td>
14
- <label><%= check_box_tag 'local_file[]', f[:name] %> <%= f[:directory] ? '<i class="glyphicon glyphicon-folder-close"></i>'.html_safe : '<i class="icon-file"></i>'.html_safe %> <%= f[:name] %></label>
14
+ <label><%= check_box_tag 'local_file[]', f[:name] %> <%= f[:directory] ? '<i class="glyphicon glyphicon-folder-close"></i>'.html_safe : '<i class="glyphicon glyphicon-file"></i>'.html_safe %> <%= f[:name] %></label>
15
15
  </td>
16
16
  </tr>
17
17
  <%end%>
@@ -12,7 +12,7 @@
12
12
  <td class="name"><span>{%=file.name%}</span></td>
13
13
  <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
14
14
  {% if (file.error) { %}
15
- <td class="error" colspan="2"><span class="label label-important">{%=locale.fileupload.error%}</span> {%=locale.fileupload.errors[file.error] || file.error%}</td>
15
+ <td class="error" colspan="2"><span class="label label-danger">{%=locale.fileupload.error%}</span> {%=locale.fileupload.errors[file.error] || file.error%}</td>
16
16
  {% } else if (o.files.valid && !i) { %}
17
17
  <td>
18
18
  <div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-bar progress-bar-success" style="width:0%;"></div></div>
@@ -43,7 +43,7 @@
43
43
  <td><span></span></td>
44
44
  <td class="name"><span>{%=file.name%}</span></td>
45
45
  <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
46
- <td class="error" colspan="2"><span class="label label-important">{%=locale.fileupload.error%}</span> {%=locale.fileupload.errors[file.error] || file.error%}</td>
46
+ <td class="error" colspan="2"><span class="label label-danger">{%=locale.fileupload.error%}</span> {%=locale.fileupload.errors[file.error] || file.error%}</td>
47
47
  {% } else { %}
48
48
  <td class="preview">
49
49
  {% if (file.thumbnail_url) { %} <span class="label label-success">Success</span> {% } %}
@@ -1,3 +1,3 @@
1
- <label class="checkbox">
2
- <%= check_box_tag 'terms_of_service', 1, nil, {"data-activate" => 'activate-submit'} %> I have read and do agree to <%= link_to t('sufia.deposit_agreement'), '/agreement/', target: "_blank" %>.
3
- </label>
1
+ <label>
2
+ <%= check_box_tag 'terms_of_service', 1, nil, {data: {activate: 'activate-submit'}} %><strong> I have read and do agree to <%= link_to t('sufia.deposit_agreement'), '/agreement/', target: "_blank" %>.</strong>
3
+ </label>
@@ -25,12 +25,3 @@
25
25
  <%= render partial: 'featured_researcher' %>
26
26
  </div>
27
27
  </div>
28
- <script>
29
- $('#homeTabs a').click(function (e) {
30
- e.preventDefault()
31
- $(this).tab('show')
32
- })
33
- </script>
34
- <script>
35
- $('#homeTabs a:first').tab('show') // Select first tab
36
- </script>
@@ -1,6 +1,6 @@
1
1
  <div class="home_call_action col-xs-12 col-sm-4 pull-right">
2
2
  <div class="home_share_work">
3
- <%= link_to "<i class=\"glyphicon glyphicon-file\"></i> #{t('sufia.share_button')}".html_safe, sufia.new_generic_file_path, class: "btn btn-primary btn-lg btn-block", id: "contribute_link" %>
3
+ <%= link_to "<i class=\"glyphicon glyphicon-upload\"></i> #{t('sufia.share_button')}".html_safe, sufia.new_generic_file_path, class: "btn btn-primary btn-lg btn-block", id: "contribute_link" %>
4
4
  <p class="text-center"><a href="/terms/">Terms of Use</a></p>
5
5
  </div><!-- /.home_share_work -->
6
6
  </div><!-- /.col-xs-3 -->
@@ -1,6 +1,6 @@
1
1
  <tr>
2
2
  <% if display_thumbs %>
3
- <td class="span10">
3
+ <td class="col-sm-2">
4
4
  <%= link_to_profile recent_document.depositor("no depositor value") %>
5
5
  <%= link_to sufia.generic_file_path(recent_document) do %>
6
6
  <%= render_thumbnail_tag recent_document, { width: 45 } %>
@@ -17,7 +17,7 @@
17
17
  <% elsif recent_document.public? %>
18
18
  <span class="label label-success">Open Access</span>
19
19
  <% else %>
20
- <span class="label label-important">Private</span>
20
+ <span class="label label-danger">Private</span>
21
21
  <% end %>
22
22
  <% end %>
23
23
  </h3>
@@ -1,7 +1,13 @@
1
1
  <%= csrf_meta_tag %>
2
- <link href='http://fonts.googleapis.com/css?family=Lato:300,400' rel='stylesheet' type='text/css'>
2
+ <link href='https://fonts.googleapis.com/css?family=Lato:300,400' rel='stylesheet' type='text/css'>
3
3
  <meta charset="utf-8" />
4
4
 
5
+ <!-- added for use on small devices like phones" -->
6
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
7
+
8
+ <%= yield :twitter_meta if content_for?(:twitter_meta) %>
9
+ <%= yield :gscholar_meta if content_for?(:gscholar_meta) %>
10
+
5
11
  <title><%= h(@page_title || application_name) %></title>
6
12
  <!-- application css -->
7
13
  <%= stylesheet_link_tag 'application' %>
@@ -16,8 +16,10 @@
16
16
  </div>
17
17
  <div class="container-fluid">
18
18
  <div id="content" class="row">
19
- <div class="col-xs-12 col-sm-3"><%= yield :sidebar %></div>
20
- <div class="col-xs-12 col-sm-9"><%= yield %></div>
19
+ <div class="col-xs-12">
20
+ <div id="sidebar" class="col-md-3"><%= yield :sidebar %></div>
21
+ <div class="col-sm-9"><%= yield %></div>
22
+ </div>
21
23
  </div>
22
24
  </div>
23
25
  </div>
@@ -1,5 +1,5 @@
1
1
  <!DOCTYPE html>
2
- <html>
2
+ <html prefix="og:http://ogp.me/ns#">
3
3
  <head>
4
4
  <%= render partial: 'layouts/head_tag_content' %>
5
5
  </head>
@@ -1,5 +1,5 @@
1
1
  <div class="btn-group">
2
- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">Select an action <span class="caret"></span>
2
+ <button class="btn btn-sm dropdown-toggle" data-toggle="dropdown">Select an action <span class="caret"></span>
3
3
  </button>
4
4
  <ul class="dropdown-menu dropdown-menu-right">
5
5
  <li>
@@ -1,7 +1,7 @@
1
1
  <div class="btn-group">
2
- <button class="btn btn-small" href="#"><i class="glyphicon glyphicon-wrench"></i> Select an action</button>
3
- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><span class="glyphicon glyphicon-chevron-down"></span></button>
4
- <ul class="dropdown-menu">
2
+ <button class="btn btn-sm dropdown-toggle" data-toggle="dropdown">Select an action <span class="caret"></span>
3
+ </button>
4
+ <ul class="dropdown-menu dropdown-menu-right">
5
5
  <li>
6
6
  <%= link_to raw('<i class="glyphicon glyphicon-pencil"></i> Edit Collection'), collections.edit_collection_path(noid),
7
7
  class: 'itemicon itemedit', title: 'Edit Collection' %>
@@ -0,0 +1,11 @@
1
+ <% if query_has_constraints? %>
2
+
3
+ <div id="appliedParams" class="clearfix constraints-container">
4
+ <div class="pull-right">
5
+ <%= link_to t('blacklight.search.start_over'), start_over_path,
6
+ class: "catalog_startOverLink btn btn-sm btn-text", id: "startOverLink" %>
7
+ </div>
8
+ <span class="constraints-label"><%= t('blacklight.search.filters.title') %></span>
9
+ <%= render_constraints(params.merge({route_set: sufia})) %>
10
+ </div>
11
+ <% end %>
@@ -1,4 +1,4 @@
1
1
  <% # container for all documents in index view -%>
2
- <div id="documents">
2
+ <div class="table-responsive" id="documents">
3
3
  <%= render partial: 'my/_index_partials/default_group', locals: {docs: @response.docs.map { |x| SolrDocument.new(x) }, facet_value: nil} %>
4
4
  </div>
@@ -1,17 +1,9 @@
1
1
  <ul class="facet-values list-unstyled">
2
2
  <% paginator = facet_paginator(facet_field, display_facet) %>
3
- <% paginator.items.each do |item| -%>
4
- <li>
5
- <% if facet_in_params?(solr_field, item.value) %>
6
- <%= render_selected_facet_value(solr_field, item) %>
7
- <% else %>
8
- <%= render_facet_value(solr_field, item) %>
9
- <% end -%>
10
- </li>
11
- <% end %>
3
+ <%= render_facet_limit_list paginator, solr_field %>
12
4
 
13
- <% if(paginator.has_next?) %>
14
- <li class="more_facets_link"><%= link_to 'more ' + facet_field.label.pluralize + '»', sufia.url_for(params.merge(id: solr_field, action: "facet", path_only: true)), class: "more_facets_link" %></li>
5
+ <% unless paginator.last_page? || params[:action] == "facet" %>
6
+ <li class="more_facets_link"><%= link_to 'more ' + facet_field.label.pluralize + '»',
7
+ sufia.dashboard_files_facet_path(solr_field), class: "more_facets_link" %></li>
15
8
  <% end %>
16
-
17
9
  </ul>
@@ -5,9 +5,7 @@
5
5
  <div class="top-panel-heading panel-heading">
6
6
  <button type="button" class="facets-toggle" data-toggle="collapse" data-target="#facet-panel-collapse">
7
7
  <span class="sr-only">Toggle facets</span>
8
- <span class="icon-bar"></span>
9
- <span class="icon-bar"></span>
10
- <span class="icon-bar"></span>
8
+ <span class="fa fa-bars"></span>
11
9
  </button>
12
10
 
13
11
  <h4>
@@ -1,10 +1,9 @@
1
- <table class="table table-zebra-striped table-bordered">
1
+ <table class="table table-zebra-striped">
2
2
  <caption class="sr-only">Listing of items you have deposited in <%= t('sufia.product_name') %></caption>
3
3
  <% unless params[:display_type] == 'list' %>
4
4
  <thead>
5
5
  <tr>
6
- <th><%= render partial: 'batch_edits/check_all' %></th>
7
- <th>&nbsp;</th>
6
+ <th><%= render_check_all %></th>
8
7
  <th>Title</th>
9
8
  <th class="sorts-dash"><i id="desc_metadata__date_uploaded_dtsi" class="<%=params[:sort]== "desc_metadata__date_uploaded_dtsi desc" ? 'caret' : params[:sort]== "desc_metadata__date_uploaded_dtsi asc" ? 'caret up' : ''%>"></i>Date Uploaded</th>
10
9
  <th>Visibility</th>
@@ -4,26 +4,32 @@
4
4
  on element ids -->
5
5
  <% noid = document.noid %>
6
6
  <tr id="document_<%= noid %>" class="<%= cycle("","zebra") %>">
7
- <td width="6%"></td>
8
- <td width="1%">
9
- </td>
10
- <td width="37%">
11
- <a href="" title="Click for more details"><i id="expand_<%= noid.gsub(":", "_") %>" class="glyphicon-plus large-icon fleft"></i></a>&nbsp;
12
- <%= link_to image_tag("/assets/folder.png", width: 36), collections.collection_path(noid) %>
13
- <span class=center><%= link_to document.title_or_label, collections.collection_path(noid), id: "src_copy_link#{noid}" %> <br /></span>
7
+ <td width="3%"></td>
8
+ <td width="41%">
9
+ <div class="media">
10
+ <%= link_to [collections, document], class: "pull-left" do %>
11
+ <span class="glyphicon glyphicon-th collection-icon-small">
12
+ <% end %>
13
+ <div class="media-body">
14
+ <h4 class="media-heading">
15
+ <%= link_to document.title_or_label, collections.collection_path(noid), id: "src_copy_link#{noid}" %>
16
+ <a href="#" class="small" title="Click for more details"><i id="expand_<%= noid %>" class="glyphicon glyphicon-chevron-right"></i></a>
17
+ </h4>
18
+ </div>
19
+ </div>
14
20
  </td>
15
21
  <td width="17%"><%= document.date_uploaded %> </td>
16
- <td width="5%" align="center">
22
+ <td width="5%" class="text-center">
17
23
  <% if document.registered? %>
18
24
  <span class="label label-info" title="<%=t('sufia.institution_name') %>"><%=t('sufia.institution_name') %></span></a>
19
25
  <% elsif document.public? %>
20
26
  <span class="label label-success" title="Open Access">Open Access</span></a>
21
27
  <% else %>
22
- <span class="label label-important" title="Private">Private</span></a>
28
+ <span class="label label-danger" title="Private">Private</span></a>
23
29
  <% end %>
24
30
 
25
31
  </td>
26
- <td width="23%" class="center">
32
+ <td class="text-center">
27
33
  <%= render partial:'collection_action_menu', locals:{noid:noid} %>
28
34
  </td>
29
35
  </tr>
@@ -31,7 +37,7 @@ on element ids -->
31
37
  <td colspan="6">
32
38
  <dl class="expanded-details row">
33
39
  <dt class="col-xs-3 col-lg-2">Description:</dt>
34
- <dd class="col-xs-9 col-lg-4"><%= document.description%></dd>
40
+ <dd class="col-xs-9 col-lg-10"> <%= document.description%></dd>
35
41
  <dt class="col-xs-3 col-lg-2">Edit Access:</dt>
36
42
  <dd class="col-xs-9 col-lg-10">
37
43
  <% if document.edit_groups.present? %>
@@ -1,37 +1,33 @@
1
1
  <% noid = document.noid %>
2
2
  <tr id="document_<%= noid %>" class="<%= cycle("", "zebra") %>">
3
3
  <% gf = GenericFile.load_instance_from_solr(document.id) %>
4
- <td width="1%"><%= batch_edit_select(document) %>&nbsp;</td>
5
- <td width="2%">
4
+ <td><%= batch_edit_select(document) %>&nbsp;
6
5
  <%# This block is for adding/removing the magic wand while batch updates are processing %>
7
6
  <% if gf.processing? %>
8
- <i class="glyphicon glyphicon-magic <%= 'ss-'+gf.batch.noid %>"/>
7
+ <i class="glyphicon glyphicon-time <%= 'ss-'+gf.batch.noid %>"/>
9
8
  <% elsif gf.depositor != @user.user_key %>
10
- <i class="glyphicon glyphicon-gift"/>
9
+ <i class="glyphicon glyphicon-share-alt"/>
11
10
  <% end %>
12
11
  </td>
13
- <td width="41%">
14
- <a href="#" title="Click for more details"><i id="expand_<%= noid %>" class="glyphicon glyphicon-plus"></i></a>&nbsp;
15
- <%= link_to sufia.generic_file_path(document) do %>
16
- <%= render_thumbnail_tag document, class:"hidden-xs file_listing_thumbnail" %>
17
- <% end %>
18
- <span>
19
- <%= link_to document.title_or_label, sufia.generic_file_path(noid), id: "src_copy_link#{noid}", class: "#{'document-title' if document.title_or_label == document.label}" %><br/>
20
- </span>
21
- </td>
22
- <td width="17%"><%= document.date_uploaded %> </td>
23
- <td width="5%">
24
- <a href="<%= sufia.generic_file_path(noid) %>/edit/?tab=permissions" id="permission_<%= noid %>" class="visibility-link">
25
- <% if document.registered? %>
26
- <span class="label label-info" title="<%= t('sufia.institution_name') %>"><%= t('sufia.institution_name') %></span>
27
- <% elsif document.public? %>
28
- <span class="label label-success" title="Open Access">Open Access</span>
29
- <% else %>
30
- <span class="label label-danger" title="Private">Private</span>
12
+ <td>
13
+ <div class="media">
14
+ <%= link_to sufia.generic_file_path(document), class: "pull-left" do %>
15
+ <%= render_thumbnail_tag document, { class: "hidden-xs file_listing_thumbnail" }, { suppress_link: true } %>
31
16
  <% end %>
32
- </a>
17
+ <div class="media-body">
18
+ <h4 class="media-heading">
19
+ <%= link_to document.title_or_label, sufia.generic_file_path(noid), id: "src_copy_link#{noid}", class: "#{'document-title' if document.title_or_label == document.label}" %>
20
+ <a href="#" class="small" title="Click for more details"><i id="expand_<%= noid %>" class="glyphicon glyphicon-chevron-right"></i></a>
21
+ </h4>
22
+ <%= render_collection_list(gf) %>
23
+ </div>
24
+ </div>
25
+ </td>
26
+ <td class="text-center"><%= document.date_uploaded %> </td>
27
+ <td class="text-center">
28
+ <%= render_visibility_link document %>
33
29
  </td>
34
- <td width="23%">
30
+ <td class="text-center">
35
31
  <%= render partial: 'action_menu', locals: { noid: noid, gf: gf } %>
36
32
  </td>
37
33
  </tr>