sufia 3.7.2 → 4.0.0.beta1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (275) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +1 -1
  3. data/Gemfile +3 -0
  4. data/README.md +88 -11
  5. data/SUFIA_VERSION +1 -1
  6. data/app/assets/images/old_main_tulips.jpg +0 -0
  7. data/app/assets/javascripts/contact_form.js +0 -16
  8. data/app/assets/javascripts/jquery.blacklightTagCloud.js +44 -0
  9. data/app/assets/javascripts/jquery.tagcloud.js +116 -0
  10. data/app/assets/javascripts/jquery.tinysort.min.js +7 -0
  11. data/app/assets/javascripts/sufia.js +41 -44
  12. data/app/assets/javascripts/sufia/edit_metadata.js +1 -1
  13. data/app/assets/javascripts/sufia/editor.js +12 -0
  14. data/app/assets/javascripts/sufia/featured_works.js +64 -0
  15. data/app/assets/javascripts/sufia/fileupload.js +1 -1
  16. data/app/assets/javascripts/sufia/multiForm.js +1 -1
  17. data/app/assets/javascripts/sufia/permissions.js +4 -8
  18. data/app/assets/javascripts/sufia/single_use_link.js +1 -2
  19. data/app/assets/javascripts/sufia/trophy.js +42 -27
  20. data/app/assets/javascripts/terms_of_service.js +1 -1
  21. data/app/assets/stylesheets/dashboard.css.scss +81 -40
  22. data/app/assets/stylesheets/featured.css.scss +16 -0
  23. data/app/assets/stylesheets/fileupload/{jquery.fileupload-ui.css → jquery.fileupload-ui.css.erb} +2 -2
  24. data/app/assets/stylesheets/{generic_files.css → generic_files.css.erb} +6 -7
  25. data/app/assets/stylesheets/header.css.scss +93 -0
  26. data/app/assets/stylesheets/home-page.css.scss +50 -0
  27. data/app/assets/stylesheets/nestable.css.scss +111 -0
  28. data/app/assets/stylesheets/styles.css.scss +106 -0
  29. data/app/assets/stylesheets/sufia.css.scss +13 -8
  30. data/app/assets/stylesheets/tagcloud.css +83 -0
  31. data/app/assets/stylesheets/usage-stats.css +30 -0
  32. data/app/controllers/batch_controller.rb +0 -1
  33. data/app/controllers/concerns/sufia/catalog.rb +64 -0
  34. data/app/controllers/concerns/sufia/dashboard_controller_behavior.rb +16 -13
  35. data/app/controllers/content_blocks_controller.rb +8 -0
  36. data/app/controllers/featured_work_lists_controller.rb +16 -0
  37. data/app/controllers/featured_works_controller.rb +26 -0
  38. data/app/controllers/mailbox_controller.rb +1 -1
  39. data/app/controllers/pages_controller.rb +7 -0
  40. data/app/controllers/single_use_links_viewer_controller.rb +2 -5
  41. data/app/controllers/tinymce_assets_controller.rb +12 -0
  42. data/app/helpers/content_block_helper.rb +21 -0
  43. data/app/helpers/generic_file_helper.rb +2 -2
  44. data/app/helpers/sufia_helper.rb +8 -4
  45. data/app/helpers/trophy_helper.rb +15 -7
  46. data/app/models/content_block.rb +2 -0
  47. data/app/models/featured_work_list.rb +42 -0
  48. data/app/models/tinymce_asset.rb +3 -0
  49. data/app/uploaders/tinymce_asset_uploader.rb +51 -0
  50. data/app/views/_add_assets_links.html.erb +0 -16
  51. data/app/views/_controls.html.erb +17 -0
  52. data/app/views/_flash_msg.html.erb +2 -18
  53. data/app/views/_footer.html.erb +10 -15
  54. data/app/views/_ga.html.erb +0 -16
  55. data/app/views/_logo.html.erb +2 -2
  56. data/app/views/_masthead.html.erb +9 -36
  57. data/app/views/_user_util_links.html.erb +16 -11
  58. data/app/views/advanced/_advanced_search_facets.html.erb +0 -16
  59. data/app/views/advanced/_advanced_search_fields.html.erb +0 -16
  60. data/app/views/advanced/_advanced_search_help.html.erb +0 -16
  61. data/app/views/advanced/_facet_layout.html.erb +0 -16
  62. data/app/views/advanced/_facet_limit.html.erb +0 -16
  63. data/app/views/advanced/index.html.erb +2 -18
  64. data/app/views/batch/_metadata.html.erb +3 -3
  65. data/app/views/batch/edit.html.erb +4 -21
  66. data/app/views/catalog/_facet_limit.html.erb +11 -12
  67. data/app/views/catalog/_featured_researcher.html.erb +2 -0
  68. data/app/views/catalog/_home.html.erb +6 -2
  69. data/app/views/catalog/_home_content.html.erb +36 -0
  70. data/app/views/catalog/_home_header.html.erb +15 -0
  71. data/app/views/catalog/_recent_document.html.erb +1 -1
  72. data/app/views/catalog/_recents.html.erb +3 -4
  73. data/app/views/catalog/_search_form.html.erb +13 -9
  74. data/app/views/catalog/_tagcloud.html.erb +7 -0
  75. data/app/views/catalog/index.html.erb +4 -10
  76. data/app/views/contact_form/create.html.erb +0 -16
  77. data/app/views/contact_form/new.html.erb +0 -16
  78. data/app/views/dashboard/_constraints.html.erb +3 -19
  79. data/app/views/dashboard/_did_you_mean.html.erb +0 -16
  80. data/app/views/dashboard/_document_list.html.erb +0 -16
  81. data/app/views/dashboard/_facet_layout.html.erb +1 -17
  82. data/app/views/dashboard/_facet_limit.html.erb +5 -5
  83. data/app/views/dashboard/_facet_selected.html.erb +1 -17
  84. data/app/views/dashboard/_facets.html.erb +0 -18
  85. data/app/views/dashboard/_heading.html.erb +1 -1
  86. data/app/views/dashboard/_index_partials/_default_group.html.erb +7 -23
  87. data/app/views/dashboard/_index_partials/_list_files.html.erb +62 -57
  88. data/app/views/dashboard/_search_form.html.erb +10 -7
  89. data/app/views/dashboard/_show_partials/_default.html.erb +0 -18
  90. data/app/views/dashboard/_show_partials/_default_details.html.erb +0 -16
  91. data/app/views/dashboard/_show_partials/_facets.html.erb +0 -16
  92. data/app/views/dashboard/_sort_and_per_page.html.erb +10 -9
  93. data/app/views/dashboard/facet.html.erb +4 -19
  94. data/app/views/dashboard/index.html.erb +27 -49
  95. data/app/views/error/401.html.erb +1 -17
  96. data/app/views/error/404.html.erb +0 -16
  97. data/app/views/error/500.html.erb +0 -16
  98. data/app/views/error/single_use_error.html.erb +1 -17
  99. data/app/views/generic_files/_asset_deleted_flash.html.erb +0 -16
  100. data/app/views/generic_files/_asset_permissions_denial_flash.html.erb +0 -16
  101. data/app/views/generic_files/_asset_saved_flash.html.erb +0 -16
  102. data/app/views/generic_files/_asset_updated_flash.html.erb +0 -16
  103. data/app/views/generic_files/_breadcrumbs.html.erb +0 -16
  104. data/app/views/generic_files/_browse_everything.html.erb +24 -0
  105. data/app/views/generic_files/_descriptions.html.erb +1 -1
  106. data/app/views/generic_files/_field_form.html.erb +5 -5
  107. data/app/views/generic_files/_media_display.html.erb +3 -3
  108. data/app/views/generic_files/_permission_form.html.erb +5 -5
  109. data/app/views/generic_files/_rights_modal.html.erb +13 -29
  110. data/app/views/generic_files/_show_actions.html.erb +13 -1
  111. data/app/views/generic_files/_versioning.html.erb +14 -10
  112. data/app/views/generic_files/citation.html.erb +0 -16
  113. data/app/views/generic_files/edit.html.erb +10 -12
  114. data/app/views/generic_files/edit_fields/_default.html.erb +1 -1
  115. data/app/views/generic_files/edit_fields/_description.html.erb +1 -1
  116. data/app/views/generic_files/edit_fields/_resource_type.html.erb +2 -3
  117. data/app/views/generic_files/edit_fields/_rights.html.erb +1 -1
  118. data/app/views/generic_files/new.html.erb +11 -26
  119. data/app/views/generic_files/show.html.erb +7 -25
  120. data/app/views/generic_files/stats.html.erb +141 -0
  121. data/app/views/homepage/_featured.html.erb +11 -0
  122. data/app/views/homepage/_featured_fields.html.erb +18 -0
  123. data/app/views/homepage/_featured_works.html.erb +17 -0
  124. data/app/views/homepage/_sortable_featured.html.erb +26 -0
  125. data/app/views/layouts/_head_tag_content.html.erb +1 -1
  126. data/app/views/layouts/_homepage_sidebar2.html.erb +14 -0
  127. data/app/views/layouts/error.html.erb +3 -21
  128. data/app/views/layouts/homepage.html.erb +8 -37
  129. data/app/views/layouts/sufia-dashboard.html.erb +46 -0
  130. data/app/views/layouts/sufia-one-column.html.erb +8 -24
  131. data/app/views/layouts/sufia-two-column.html.erb +9 -8
  132. data/app/views/pages/show.html.erb +4 -0
  133. data/app/views/single_use_links_viewer/show.html.erb +2 -2
  134. data/app/views/static/agreement.html.erb +0 -17
  135. data/app/views/static/help.html.erb +0 -17
  136. data/app/views/static/mendeley.html.erb +0 -16
  137. data/app/views/static/subject_libraries.html.erb +0 -17
  138. data/app/views/static/terms.html.erb +0 -16
  139. data/app/views/static/zotero.html.erb +0 -16
  140. data/app/views/users/_activity_log.html.erb +2 -2
  141. data/app/views/users/_contributions.html.erb +6 -2
  142. data/app/views/users/_follower_modal.html.erb +2 -2
  143. data/app/views/users/_following_modal.html.erb +2 -2
  144. data/app/views/users/_left_sidebar.html.erb +1 -1
  145. data/app/views/users/_notify_link.html.erb +1 -1
  146. data/app/views/users/_notify_number.html.erb +1 -1
  147. data/app/views/users/_profile_actions.html.erb +3 -3
  148. data/app/views/users/_profile_tabs.html.erb +1 -1
  149. data/app/views/users/_search_form.html.erb +3 -2
  150. data/app/views/users/_social_media_info.html.erb +3 -3
  151. data/app/views/users/_trophy_edit.html.erb +2 -2
  152. data/app/views/users/_user_info.html.erb +27 -27
  153. data/app/views/users/_vitals.html.erb +2 -2
  154. data/app/views/users/edit.html.erb +39 -39
  155. data/app/views/users/index.html.erb +3 -3
  156. data/app/views/users/show.html.erb +7 -9
  157. data/config/locales/sufia.en.yml +15 -7
  158. data/config/routes.rb +12 -9
  159. data/lib/generators/sufia/sufia_generator.rb +18 -15
  160. data/lib/generators/sufia/templates/catalog_controller.rb +11 -73
  161. data/lib/generators/sufia/templates/config/tinymce.yml +7 -0
  162. data/lib/sufia.rb +7 -0
  163. data/lib/sufia/downloads_controller_behavior.rb +3 -4
  164. data/lib/sufia/files_controller_behavior.rb +38 -27
  165. data/lib/sufia/version.rb +1 -1
  166. data/spec/controllers/batch_controller_spec.rb +1 -1
  167. data/spec/controllers/batch_edits_controller_spec.rb +5 -5
  168. data/spec/controllers/catalog_controller_spec.rb +37 -58
  169. data/spec/controllers/content_blocks_controller_spec.rb +37 -0
  170. data/spec/controllers/downloads_controller_spec.rb +3 -11
  171. data/spec/controllers/featured_work_lists_controller_spec.rb +20 -0
  172. data/spec/controllers/featured_works_controller_spec.rb +50 -0
  173. data/spec/controllers/generic_files_controller_spec.rb +74 -9
  174. data/spec/controllers/mailbox_controller_spec.rb +1 -1
  175. data/spec/controllers/pages_controller_spec.rb +25 -0
  176. data/spec/controllers/single_use_links_controller_spec.rb +1 -1
  177. data/spec/controllers/single_use_links_viewer_controller_spec.rb +1 -1
  178. data/spec/controllers/tinymce_assets_controller_spec.rb +39 -0
  179. data/spec/controllers/users_controller_spec.rb +3 -8
  180. data/spec/factories/content_blocks.rb +4 -0
  181. data/spec/factories/featured_works.rb +4 -0
  182. data/spec/factories/generic_files.rb +46 -39
  183. data/spec/factories/users.rb +18 -18
  184. data/spec/features/browse_dashboard_files_spec.rb +6 -7
  185. data/spec/features/browse_files_spec.rb +9 -6
  186. data/spec/features/cloud_upload_spec.rb +18 -0
  187. data/spec/features/single_use_links_spec.rb +2 -3
  188. data/spec/helpers/content_block_helper_spec.rb +31 -0
  189. data/spec/helpers/generic_file_helper_spec.rb +3 -3
  190. data/spec/helpers/sufia_helper_spec.rb +13 -81
  191. data/spec/helpers/trophy_helper_spec.rb +39 -0
  192. data/spec/jobs/import_url_job_spec.rb +1 -1
  193. data/spec/jobs/ingest_local_file_job_spec.rb +1 -1
  194. data/spec/lib/sufia/usage_statistics_spec.rb +75 -0
  195. data/spec/models/ability_spec.rb +31 -0
  196. data/spec/models/active_fedora_pid_based_job_spec.rb +1 -1
  197. data/spec/models/audit_job_spec.rb +1 -1
  198. data/spec/models/batch_spec.rb +1 -1
  199. data/spec/models/batch_update_job_spec.rb +1 -1
  200. data/spec/models/event_jobs_spec.rb +1 -1
  201. data/spec/models/featured_work_list_spec.rb +23 -0
  202. data/spec/models/featured_work_spec.rb +42 -0
  203. data/spec/models/fits_datastream_spec.rb +2 -2
  204. data/spec/models/generic_file/reload_on_save_spec.rb +1 -1
  205. data/spec/models/generic_file/web_form_spec.rb +4 -4
  206. data/spec/models/generic_file_spec.rb +41 -40
  207. data/spec/models/pageview.rb +19 -0
  208. data/spec/models/properties_datastream_spec.rb +2 -2
  209. data/spec/models/solr_document_spec.rb +9 -0
  210. data/spec/models/user_spec.rb +2 -2
  211. data/spec/routing/featured_works_route_spec.rb +16 -0
  212. data/spec/routing/route_spec.rb +10 -15
  213. data/spec/spec_helper.rb +3 -0
  214. data/spec/support/lib/generators/test_app_generator.rb +19 -8
  215. data/spec/views/dashboard/facet_limit.html.erb_spec.rb +2 -2
  216. data/spec/views/generic_file/show.html.erb_spec.rb +44 -0
  217. data/spec/views/generic_file/stats.html.erb_spec.rb +47 -0
  218. data/spec/views/users/_follower_modal.html.erb_spec.rb +18 -0
  219. data/spec/views/users/_following_modal.html.erb_spec.rb +18 -0
  220. data/spec/views/users/index.html.erb_spec.rb +1 -1
  221. data/sufia-models/app/models/batch.rb +1 -1
  222. data/sufia-models/app/models/concerns/sufia/properties_datastream_behavior.rb +30 -0
  223. data/sufia-models/app/models/concerns/sufia/user.rb +1 -1
  224. data/sufia-models/app/models/datastreams/batch_rdf_datastream.rb +4 -7
  225. data/sufia-models/app/models/datastreams/fits_datastream.rb +3 -0
  226. data/sufia-models/app/models/datastreams/generic_file_rdf_datastream.rb +53 -51
  227. data/sufia-models/app/models/datastreams/properties_datastream.rb +1 -15
  228. data/sufia-models/app/models/featured_work.rb +22 -0
  229. data/sufia-models/app/models/sufia/pageview.rb +9 -0
  230. data/sufia-models/{lib/sufia/models → app/services/sufia}/id_service.rb +0 -0
  231. data/sufia-models/{lib/sufia/models → app/services/sufia}/noid.rb +0 -0
  232. data/sufia-models/app/services/sufia/usage_statistics.rb +73 -0
  233. data/sufia-models/config/locales/sufia.en.yml +3 -4
  234. data/sufia-models/lib/generators/sufia/models/install_generator.rb +23 -8
  235. data/sufia-models/lib/generators/sufia/models/templates/config/analytics.yml +9 -0
  236. data/sufia-models/lib/generators/sufia/models/templates/config/mime_types.rb +6 -0
  237. data/sufia-models/lib/generators/sufia/models/templates/config/sufia.rb +11 -2
  238. data/sufia-models/lib/generators/sufia/models/templates/migrations/create_content_blocks.rb +10 -0
  239. data/sufia-models/lib/generators/sufia/models/templates/migrations/create_featured_works.rb +12 -0
  240. data/sufia-models/lib/generators/sufia/models/templates/migrations/create_tinymce_assets.rb +8 -0
  241. data/sufia-models/lib/generators/sufia/models/usagestats_generator.rb +19 -0
  242. data/sufia-models/lib/sufia/ability.rb +34 -0
  243. data/sufia-models/lib/sufia/models/engine.rb +5 -3
  244. data/sufia-models/lib/sufia/models/generic_file.rb +4 -2
  245. data/sufia-models/lib/sufia/models/generic_file/export.rb +3 -3
  246. data/sufia-models/lib/sufia/models/generic_file/featured.rb +14 -0
  247. data/sufia-models/lib/sufia/models/solr_document_behavior.rb +11 -4
  248. data/sufia-models/lib/sufia/models/version.rb +1 -1
  249. data/sufia-models/sufia-models.gemspec +6 -5
  250. data/sufia.gemspec +6 -4
  251. data/tasks/release.rake +1 -0
  252. data/tasks/sufia-dev.rake +5 -1
  253. data/vendor/assets/javascripts/flot/excanvas.js +1428 -0
  254. data/vendor/assets/javascripts/flot/jquery.flot.js +3137 -0
  255. data/vendor/assets/javascripts/flot/jquery.flot.selection.js +360 -0
  256. data/vendor/assets/javascripts/flot/jquery.flot.time.js +431 -0
  257. data/vendor/assets/javascripts/nestable.js +647 -0
  258. data/vendor/assets/javascripts/video.js +135 -126
  259. data/{app → vendor}/assets/stylesheets/video-js.css.erb +7 -6
  260. metadata +155 -33
  261. data/app/assets/stylesheets/application-bootstrap.css.erb +0 -295
  262. data/app/assets/stylesheets/audio-js.css +0 -3
  263. data/app/assets/stylesheets/blacklight_more_facets.css +0 -427
  264. data/app/assets/stylesheets/bootstrap.min.css.erb +0 -1433
  265. data/app/assets/stylesheets/contact_form.css +0 -4
  266. data/app/assets/stylesheets/reset_body.css +0 -4
  267. data/app/assets/stylesheets/trophy.css +0 -7
  268. data/app/helpers/blacklight/render_constraints_helper_behavior.rb +0 -84
  269. data/app/helpers/facets_helper.rb +0 -3
  270. data/app/helpers/sufia/facets_helper_behavior.rb +0 -23
  271. data/app/views/catalog/_home_text.html.erb +0 -10
  272. data/app/views/generic_files/_dropbox_import.html.erb +0 -3
  273. data/app/views/generic_files/upload/_dropbox_chooser.html.erb +0 -39
  274. data/app/views/static/about.html.erb +0 -21
  275. data/spec/helpers/render_constraints_helper_behavior_spec.rb +0 -42
data/app/views/layouts/sufia-dashboard.html.erb ADDED
@@ -0,0 +1,46 @@
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <head>
4
+
5
+ <%= render :partial => "layouts/head_tag_content"%>
6
+ </head>
7
+
8
+ <body>
9
+ <div id="wrapper">
10
+ <div class="container-fluid">
11
+ <div id="page-positioner">
12
+ <%= render :partial => '/masthead' %>
13
+ <%= render :partial => '/controls' %>
14
+ <%= render :partial => '/flash_msg' %>
15
+ <div id="content-wrapper">
16
+ <div class="container-fluid">
17
+ <div id="content-header" class="row">
18
+ <div class="col-xs-12 col-sm-3">
19
+ <%= link_to '<i class="glyphicon glyphicon-upload"></i> Upload File(s)'.html_safe, sufia.new_generic_file_path, {:class => "btn btn-primary"} %><br />
20
+ </div>
21
+ <div class="col-xs-12 col-sm-9">
22
+ <div class="row">
23
+ <%= render :partial => 'heading' %>
24
+ <%= render :partial => 'search_form' %>
25
+ </div>
26
+ </div>
27
+ </div>
28
+ </div><!-- /.container-fluid -->
29
+ <div class="container-fluid">
30
+ <div id="content" class="row">
31
+ <div class="col-xs-12 col-sm-3">
32
+ <%= yield :sidebar %>
33
+ </div>
34
+ <div class="col-xs-12 col-sm-9">
35
+ <%= yield %>
36
+ </div>
37
+ </div><!-- /#content -->
38
+ </div><!-- /.container-fluid -->
39
+ </div><!-- /#content-wrapper -->
40
+ <%= render partial: '/footer' %>
41
+ </div><!-- /#page-positioner -->
42
+ </div><!-- /.container -->
43
+ </div><!-- /#wrapper -->
44
+ <div id="ajax-modal" class="modal hide" tabindex="-1"></div>
45
+ </body>
46
+ </html>
data/app/views/layouts/sufia-one-column.html.erb CHANGED
@@ -1,43 +1,27 @@
1
- <%#
2
- Copyright © 2012 The Pennsylvania State University
3
-
4
- Licensed under the Apache License, Version 2.0 (the "License");
5
- you may not use this file except in compliance with the License.
6
- You may obtain a copy of the License at
7
-
8
- http://www.apache.org/licenses/LICENSE-2.0
9
-
10
- Unless required by applicable law or agreed to in writing, software
11
- distributed under the License is distributed on an "AS IS" BASIS,
12
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
- See the License for the specific language governing permissions and
14
- limitations under the License.
15
- %>
16
-
17
1
  <!DOCTYPE html>
18
2
  <html>
19
3
  <head>
20
4
  <%= render :partial => "layouts/head_tag_content"%>
21
5
  </head>
22
6
 
23
- <body>
24
- <div id="wrapper">
25
- <div class="container">
7
+ <body>
8
+ <div id="wrapper">
9
+ <div class="container-fluid">
26
10
  <div id="page-positioner">
27
- <%= render :partial => '/masthead', :formats => [:html] %>
11
+ <%= render :partial => '/masthead' %>
12
+ <%= render :partial => '/controls' %>
28
13
  <%= render :partial => '/flash_msg' %>
29
- <div id="content-wrapper">
14
+ <div id="content-wrapper" class="container-fluid">
30
15
  <div id="content" class="row">
31
- <!-- 110 rows -->
32
- <div class="span110">
16
+ <div class="col-xs-12">
33
17
  <%= yield %>
34
18
  </div>
35
19
  </div><!-- /#content -->
36
20
  </div><!-- /#content-wrapper -->
21
+ <%= render partial: '/footer' %>
37
22
  </div><!-- /#page-positioner -->
38
23
  </div><!-- /.container -->
39
24
  </div><!-- /#wrapper -->
40
- <%= render partial: '/footer' %>
41
25
  <div id="ajax-modal" class="modal hide" tabindex="-1"></div>
42
26
  </body>
43
27
  </html>
data/app/views/layouts/sufia-two-column.html.erb CHANGED
@@ -6,24 +6,25 @@
6
6
 
7
7
  <body>
8
8
  <div id="wrapper">
9
- <div class="container">
9
+ <div class="container-fluid">
10
10
  <div id="page-positioner">
11
- <%= render :partial => '/masthead', :formats => [:html] %>
11
+ <%= render :partial => '/masthead' %>
12
+ <%= render :partial => '/controls' %>
12
13
  <%= render :partial => '/flash_msg' %>
13
- <div id="content-wrapper">
14
+ <div id="content-wrapper" class="container-fluid">
14
15
  <div id="content" class="row">
15
- <div class="span17">
16
+ <div class="col-xs-12 col-sm-3">
16
17
  <%= yield :sidebar %>
17
- </div><!-- /.span17 -->
18
- <div class="span93">
18
+ </div>
19
+ <div class="col-xs-12 col-sm-9">
19
20
  <%= yield %>
20
- </div><!-- /.span93 -->
21
+ </div>
21
22
  </div><!-- /#content -->
22
23
  </div><!-- /#content-wrapper -->
24
+ <%= render partial: '/footer' %>
23
25
  </div><!-- /#page-positioner -->
24
26
  </div><!-- /.container -->
25
27
  </div><!-- /#wrapper -->
26
- <%= render partial: '/footer' %>
27
28
  <div id="ajax-modal" class="modal hide" tabindex="-1"></div>
28
29
  </body>
29
30
  </html>
data/app/views/pages/show.html.erb ADDED
@@ -0,0 +1,4 @@
1
+ <h1>About</h1>
2
+ <h2>What is <%=t('sufia.product_name') %>?</h2>
3
+ <%= editable_content_block @page %>
4
+
data/app/views/single_use_links_viewer/show.html.erb CHANGED
@@ -6,11 +6,11 @@
6
6
  </p>
7
7
  <h2> Descriptions:</h2>
8
8
 
9
- <div class="well active" id="descriptions_display">
9
+ <div class="well active" id="descriptions_display">
10
10
  <table class="table table-striped"><!-- class="verticalheadings"> -->
11
11
  <tbody>
12
12
  <% @terms.each do |term| %>
13
- <% vals = Array( @asset.send(term)) %>
13
+ <% vals = Array(@asset.send(term)) %>
14
14
  <tr id='row_<%=term.to_s%>' class="expandable">
15
15
  <th width="20%">
16
16
  <%=get_label(term)%>
data/app/views/static/agreement.html.erb CHANGED
@@ -1,19 +1,3 @@
1
- <%#
2
- Copyright © 2012 The Pennsylvania State University
3
-
4
- Licensed under the Apache License, Version 2.0 (the "License");
5
- you may not use this file except in compliance with the License.
6
- You may obtain a copy of the License at
7
-
8
- http://www.apache.org/licenses/LICENSE-2.0
9
-
10
- Unless required by applicable law or agreed to in writing, software
11
- distributed under the License is distributed on an "AS IS" BASIS,
12
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
- See the License for the specific language governing permissions and
14
- limitations under the License.
15
- %>
16
-
17
1
  <h1><%= t('sufia.product_name') %> Deposit Agreement</h1>
18
2
 
19
3
  <p>
@@ -32,7 +16,6 @@ By choosing the Open Access option you are allowing anyone in the world to view
32
16
  If you do not choose a license, you grant to <%= t('sufia.institution_name') %> the non-exclusive right to distribute your submission (including the metadata and abstract) worldwide, in any format or medium for non-commercial, research, educational, or related academic purposes only. You also authorize <%= t('sufia.institution_name') %> to allow users of the repository to distribute your submission (including the metadata and abstract) worldwide, in any format or medium for non-commercial, research, educational, or related academic purposes only. <%= t('sufia.institution_name') %> will clearly identify your name(s) as the author(s) or owner(s) of the submission, and will not make any alteration, other than as allowed by this license, to your submission.
33
17
  </p>
34
18
 
35
-
36
19
  <h3>Visibility Level: <span class="label label-info"><%= t('sufia.institution_name').upcase %></span></h3>
37
20
 
38
21
  <p>
data/app/views/static/help.html.erb CHANGED
@@ -1,22 +1,5 @@
1
- <%#
2
- Copyright © 2012 The Pennsylvania State University
3
-
4
- Licensed under the Apache License, Version 2.0 (the "License");
5
- you may not use this file except in compliance with the License.
6
- You may obtain a copy of the License at
7
-
8
- http://www.apache.org/licenses/LICENSE-2.0
9
-
10
- Unless required by applicable law or agreed to in writing, software
11
- distributed under the License is distributed on an "AS IS" BASIS,
12
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
- See the License for the specific language governing permissions and
14
- limitations under the License.
15
- %>
16
-
17
1
  <h1>User Support</h1>
18
2
  <h2>Service Inquiries and Requests</h2>
19
3
  <p>
20
4
  Use app/views/static/help.html.erb to override this file.
21
5
  </p>
22
-
data/app/views/static/mendeley.html.erb CHANGED
@@ -1,19 +1,3 @@
1
- <%#
2
- Copyright © 2012 The Pennsylvania State University
3
-
4
- Licensed under the Apache License, Version 2.0 (the "License");
5
- you may not use this file except in compliance with the License.
6
- You may obtain a copy of the License at
7
-
8
- http://www.apache.org/licenses/LICENSE-2.0
9
-
10
- Unless required by applicable law or agreed to in writing, software
11
- distributed under the License is distributed on an "AS IS" BASIS,
12
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
- See the License for the specific language governing permissions and
14
- limitations under the License.
15
- %>
16
-
17
1
  <h1>Export to Mendeley</h1>
18
2
  <p>
19
3
  Exporting to Mendeley is supported via embedded metadata. If Mendeley
data/app/views/static/subject_libraries.html.erb CHANGED
@@ -1,22 +1,5 @@
1
- <%#
2
- Copyright © 2012 The Pennsylvania State University
3
-
4
- Licensed under the Apache License, Version 2.0 (the "License");
5
- you may not use this file except in compliance with the License.
6
- You may obtain a copy of the License at
7
-
8
- http://www.apache.org/licenses/LICENSE-2.0
9
-
10
- Unless required by applicable law or agreed to in writing, software
11
- distributed under the License is distributed on an "AS IS" BASIS,
12
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
- See the License for the specific language governing permissions and
14
- limitations under the License.
15
- %>
16
-
17
1
  <h1> Subject Libraries </h1>
18
2
 
19
-
20
3
  <h2> University Park</h2>
21
4
  <ul>
22
5
  <li><a href="http://www.libraries.psu.edu/psul/architecture.html"> Architecture and Landscape Architecture Library</a></li>
data/app/views/static/terms.html.erb CHANGED
@@ -1,19 +1,3 @@
1
- <%#
2
- Copyright © 2012 The Pennsylvania State University
3
-
4
- Licensed under the Apache License, Version 2.0 (the "License");
5
- you may not use this file except in compliance with the License.
6
- You may obtain a copy of the License at
7
-
8
- http://www.apache.org/licenses/LICENSE-2.0
9
-
10
- Unless required by applicable law or agreed to in writing, software
11
- distributed under the License is distributed on an "AS IS" BASIS,
12
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
- See the License for the specific language governing permissions and
14
- limitations under the License.
15
- %>
16
-
17
1
  <h1>Terms of Use for <%= t('sufia.product_name') %></h1>
18
2
 
19
3
  <p>
data/app/views/static/zotero.html.erb CHANGED
@@ -1,19 +1,3 @@
1
- <%#
2
- Copyright © 2012 The Pennsylvania State University
3
-
4
- Licensed under the Apache License, Version 2.0 (the "License");
5
- you may not use this file except in compliance with the License.
6
- You may obtain a copy of the License at
7
-
8
- http://www.apache.org/licenses/LICENSE-2.0
9
-
10
- Unless required by applicable law or agreed to in writing, software
11
- distributed under the License is distributed on an "AS IS" BASIS,
12
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
- See the License for the specific language governing permissions and
14
- limitations under the License.
15
- %>
16
-
17
1
  <h1>Export to Zotero</h1>
18
2
  <p>
19
3
  Exporting to Zotero is supported via embedded metadata. If Zotero
data/app/views/users/_activity_log.html.erb CHANGED
@@ -1,5 +1,5 @@
1
- <table id="activity" class="table table-striped well">
2
- <caption class="accessible-hidden">Activity of users you follow</caption>
1
+ <table id="activity" class="table table-zebra-striped table-bordered">
2
+ <caption class="sr-only">Activity of users you follow</caption>
3
3
  <thead>
4
4
  <tr>
5
5
  <th>&nbsp;</th>
data/app/views/users/_contributions.html.erb CHANGED
@@ -3,13 +3,17 @@
3
3
  <% if @trophies.count > 0 %>
4
4
  <table>
5
5
  <% @trophies.each do |t| %>
6
- <tr id="trophyrow_<%= Sufia::Noid.noidify(t.pid) %>">
6
+ <tr id="trophyrow_<%= t.noid %>">
7
7
  <td>
8
8
  <%= render partial: "dashboard/_index_partials/thumbnail_display", locals: {document: t, width: 90} %>
9
9
  </td>
10
10
  <td>
11
11
  <%= link_to display_title(t), sufia.generic_file_path(t) %>
12
- <%= link_to raw("<i class='trophy-on icon-remove'></i>"), "", class: 'trophy-on trophy-class', title: "Click to remove from Highlighted files.", id: Sufia::Noid.noidify(t.pid), remote: true, data: {removerow: "true"} if current_user == @user%>
12
+ <% if current_user == @user %>
13
+ <%= display_trophy_link current_user, t.noid, class: 'glyphicon glyphicon-trophy', data: {removerow: true} do %>
14
+ <i class='trophy-on icon-remove'></i>
15
+ <% end %>
16
+ <% end %>
13
17
  </td>
14
18
  </tr>
15
19
  <% end %>
data/app/views/users/_follower_modal.html.erb CHANGED
@@ -1,7 +1,7 @@
1
1
  <div class="modal-div">
2
2
 
3
3
  <!-- Text to trigger modal -->
4
- <h4><i class="icon-hand-left"></i><a data-toggle="modal" href="#followers">Follower(s):</a> <%= @followers.count %></h4>
4
+ <h4><i class="glyphicon glyphicon-hand-left"></i><a data-toggle="modal" href="#followers">Follower(s):</a> <%= @followers.count %></h4>
5
5
  <!-- Modal -->
6
6
  <div class="modal hide in" id="followers" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
7
7
  <div class="modal-header">
@@ -12,7 +12,7 @@
12
12
  <h3>Follower(s)</h3>
13
13
  <ul>
14
14
  <% @followers.each do |f| %>
15
- <li> <a href="<%= sufia.profile_path(f.login) %>" title="View user's profile"><%= f.name %></a></li>
15
+ <li><%= link_to f.name, sufia.profile_path(f), title: "View user's profile" %></li>
16
16
  <% end %>
17
17
  </ul>
18
18
  <%else%>
data/app/views/users/_following_modal.html.erb CHANGED
@@ -1,7 +1,7 @@
1
1
  <div class="modal-div">
2
2
 
3
3
  <!-- Text to trigger modal -->
4
- <h4><i class="icon-hand-right"></i><a data-toggle="modal" href="#following">Following:</a> <%= @following.count %></h4>
4
+ <h4><i class="glyphicon glyphicon-hand-right"></i><a data-toggle="modal" href="#following">Following:</a> <%= @following.count %></h4>
5
5
  <!-- Modal -->
6
6
  <div class="modal hide in" id="following" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
7
7
  <div class="modal-header">
@@ -12,7 +12,7 @@
12
12
  <h3>Following</h3>
13
13
  <ul>
14
14
  <% @following.each do |f| %>
15
- <li> <a href="<%= sufia.profile_path(f.login) %>" title="View user's profile"><%= f.name %></a></li>
15
+ <li><%= link_to f.name, sufia.profile_path(f), title: "View user's profile" %></li>
16
16
  <% end %>
17
17
  </ul>
18
18
  <% else %>
data/app/views/users/_left_sidebar.html.erb CHANGED
@@ -8,5 +8,5 @@
8
8
  <%= render "following_modal" %>
9
9
 
10
10
  <br />
11
- <a class="btn btn-primary" href="<%= sufia.profiles_path %>"><i class="icon-globe"></i> View Users</a>
11
+ <a class="btn btn-primary" href="<%= sufia.profiles_path %>"><i class="glyphicon glyphicon-globe"></i> View Users</a>
12
12
 
data/app/views/users/_notify_link.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <%= link_to sufia.notifications_path, id: "notify_link", class: "icon-btn btn btn-small", title: "User Notifications" do %>
1
+ <%= link_to sufia.notifications_path, id: "notify_link", class: "btn btn-default", title: "User Notifications" do %>
2
2
  <%= render :partial => 'users/notify_number' %>
3
3
  <% end %>
4
4
  <div class='hide'>
data/app/views/users/_notify_number.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <i class="icon-bullhorn"></i>
1
+ <i class="glyphicon glyphicon-bullhorn"></i>
2
2
  <% if @notify_number > 0 %>
3
3
  <span id="notify_number" class="overlay"> <%=@notify_number%></span>
4
4
  <% end %>
data/app/views/users/_profile_actions.html.erb CHANGED
@@ -1,10 +1,10 @@
1
1
  <!-- profile and view buttons -->
2
2
  <% if signed_in? %>
3
3
  <% if current_user == @user %>
4
- <%= link_to raw('<i class="icon-edit"></i> Edit Your Profile'), sufia.edit_profile_path(@user), class: "btn" %>
4
+ <%= link_to raw('<i class="glyphicon glyphicon-edit"></i> Edit Your Profile'), sufia.edit_profile_path(@user), class: "btn" %>
5
5
  <% elsif current_user.following?(@user) %>
6
- <%= link_to raw('<i class="icon-eye-close"></i> Unfollow'), sufia.unfollow_profile_path(@user), method: :post, class: "btn btn-primary" %>
6
+ <%= link_to raw('<i class="glyphicon glyphicon-eye-close"></i> Unfollow'), sufia.unfollow_profile_path(@user), method: :post, class: "btn btn-default" %>
7
7
  <% else %>
8
- <%= link_to raw('<i class="icon-eye-open"></i> Follow'), sufia.follow_profile_path(@user), method: :post, class: "btn btn-primary" %>
8
+ <%= link_to raw('<i class="glyphicon glyphicon-eye-open"></i> Follow'), sufia.follow_profile_path(@user), method: :post, class: "btn btn-default" %>
9
9
  <% end %>
10
10
  <% end %>
data/app/views/users/_profile_tabs.html.erb CHANGED
@@ -1,5 +1,5 @@
1
1
  <ul class="nav nav-tabs" id="myTab">
2
- <li class="active"><a href="#contributions"><i class="icon-trophy"></i> Contributions</a></li>
2
+ <li class="active"><a href="#contributions"><i class="glyphicon glyphicon-trophy"></i> Contributions</a></li>
3
3
  <li><a href="#profile"><i class="icon-info-sign"></i> Profile</a></li>
4
4
  <li><a href="#activity_log" ><i class="icon-rss"></i> Activity</a></li>
5
5
  </ul>
data/app/views/users/_search_form.html.erb CHANGED
@@ -1,11 +1,12 @@
1
- <div style="float: right;" >
1
+ <div>
2
2
  <%= form_tag sufia.profiles_path, :method => :get, :class => "well form-search" do %>
3
+ <label class="sr-only">Search Users</label>
3
4
  <label class="accessible-hidden">Search Users</label>
4
5
  <%= text_field_tag :uq, params[:uq], :class => "q", :placeholder => "Search Users", :size => '30', :type => "search", :id => "user_search" %>
5
6
  <%= hidden_field_tag :sort, params[:sort], :id => 'user_sort' %>
6
7
  <%= render_hash_as_hidden_fields(params_for_search().except(:uq, :sort, :qt, :page, :utf8)) %>
7
8
  <button type="submit" class="btn btn-primary" id="user_submit">
8
- <i class="icon-search"></i> Go
9
+ <i class="glyphicon glyphicon-search"></i> Go
9
10
  </button>
10
11
  <% end %>
11
12
  </div>
data/app/views/users/_social_media_info.html.erb CHANGED
@@ -1,10 +1,10 @@
1
1
  <% if !user.facebook_handle.blank?() %>
2
- <dt><i class="icon-facebook"></i> Facebook Handle</dt>
2
+ <dt><i class="glyphicon glyphicon-facebook"></i> Facebook Handle</dt>
3
3
  <dd><%= link_to "http://facebook.com/#{user.facebook_handle}", "http://facebook.com/#{user.facebook_handle}", {target:'_blank'} %></dd>
4
4
  <% end %>
5
5
 
6
6
  <% if !user.twitter_handle.blank?() %>
7
- <dt><i class="icon-twitter"></i> Twitter Handle</dt>
7
+ <dt><i class="glyphicon glyphicon-twitter"></i> Twitter Handle</dt>
8
8
  <dd><%= link_to "http://twitter.com/#{user.twitter_handle}", "http://twitter.com/#{user.twitter_handle}", {target:'_blank'} %></dd>
9
9
  <% end %>
10
10
 
@@ -15,6 +15,6 @@
15
15
  -->
16
16
 
17
17
  <% if !user.linkedin_handle.blank?() %>
18
- <dt><i class="icon-linkedin"></i> Linked In</dt>
18
+ <dt><i class="glyphicon glyphicon-linkedin"></i> Linked In</dt>
19
19
  <dd><%= link_to "#{@linkedInUrl}", "#{@linkedInUrl}", {target:'_blank'} %></dd>
20
20
  <% end %>