enju_flower 0.1.0.pre13 → 0.1.0.pre14

Sign up to get free protection for your applications and to get access to all the features.
Files changed (109) hide show
  1. checksums.yaml +4 -4
  2. data/README.rdoc +2 -2
  3. data/app/views/manifestations/_show_detail_librarian.html.erb +3 -3
  4. data/app/views/manifestations/_show_detail_user.html.erb +2 -0
  5. data/app/views/manifestations/_show_holding.html.erb +3 -0
  6. data/app/views/manifestations/_show_reservation.html.erb +27 -0
  7. data/app/views/manifestations/_show_series_detail.html.erb +12 -0
  8. data/app/views/manifestations/index.mobile.erb +1 -1
  9. data/app/views/page/_footer.html.erb +3 -3
  10. data/lib/enju_flower/version.rb +1 -1
  11. data/spec/dummy/config/initializers/devise.rb +2 -0
  12. data/spec/dummy/db/migrate/20100211105551_add_admin_networks_to_library_group.rb +9 -0
  13. data/spec/dummy/db/schema.rb +184 -188
  14. data/spec/dummy/db/test.sqlite3 +0 -0
  15. data/spec/dummy/solr/conf/schema.xml +4 -0
  16. data/spec/dummy/solr/conf/solrconfig.xml +588 -855
  17. data/spec/dummy/solr/default/data/index/_xg.fdt +0 -0
  18. data/spec/dummy/solr/default/data/index/_xg.fdx +0 -0
  19. data/spec/dummy/solr/default/data/index/_xg.fnm +0 -0
  20. data/spec/dummy/solr/default/data/index/_xg.nvd +0 -0
  21. data/spec/dummy/solr/default/data/index/_xg.nvm +0 -0
  22. data/spec/dummy/solr/default/data/index/_xg.si +0 -0
  23. data/spec/dummy/solr/default/data/index/_xg_Lucene41_0.doc +0 -0
  24. data/spec/dummy/solr/default/data/index/_xg_Lucene41_0.pos +0 -0
  25. data/spec/dummy/solr/default/data/index/_xg_Lucene41_0.tim +0 -0
  26. data/spec/dummy/solr/default/data/index/_xg_Lucene41_0.tip +0 -0
  27. data/spec/dummy/solr/default/data/index/_xh.fdt +0 -0
  28. data/spec/dummy/solr/default/data/index/_xh.fdx +0 -0
  29. data/spec/dummy/solr/default/data/index/_xh.fnm +0 -0
  30. data/spec/dummy/solr/default/data/index/_xh.nvd +0 -0
  31. data/spec/dummy/solr/default/data/index/_xh.nvm +0 -0
  32. data/spec/dummy/solr/default/data/index/_xh.si +0 -0
  33. data/spec/dummy/solr/default/data/index/_xh_Lucene41_0.doc +0 -0
  34. data/spec/dummy/solr/default/data/index/_xh_Lucene41_0.pos +0 -0
  35. data/spec/dummy/solr/default/data/index/_xh_Lucene41_0.tim +0 -0
  36. data/spec/dummy/solr/default/data/index/_xh_Lucene41_0.tip +0 -0
  37. data/spec/dummy/solr/default/data/index/_xi.fdt +0 -0
  38. data/spec/dummy/solr/default/data/index/_xi.fdx +0 -0
  39. data/spec/dummy/solr/default/data/index/_xi.fnm +0 -0
  40. data/spec/dummy/solr/default/data/index/_xi.nvd +0 -0
  41. data/spec/dummy/solr/default/data/index/_xi.nvm +0 -0
  42. data/spec/dummy/solr/default/data/index/_xi.si +0 -0
  43. data/spec/dummy/solr/default/data/index/_xi_Lucene41_0.doc +0 -0
  44. data/spec/dummy/solr/default/data/index/_xi_Lucene41_0.pos +0 -0
  45. data/spec/dummy/solr/default/data/index/_xi_Lucene41_0.tim +0 -0
  46. data/spec/dummy/solr/default/data/index/_xi_Lucene41_0.tip +0 -0
  47. data/spec/dummy/solr/default/data/index/segments.gen +0 -0
  48. data/spec/dummy/solr/default/data/index/segments_178 +0 -0
  49. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000001552 +0 -0
  50. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000001553 +0 -0
  51. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000001554 +0 -0
  52. data/spec/dummy/solr/{data/test/spellchecker → development/data/index}/segments.gen +0 -0
  53. data/spec/dummy/solr/development/data/index/segments_1 +0 -0
  54. data/spec/dummy/solr/solr.xml +8 -0
  55. data/spec/dummy/solr/test/data/index/segments.gen +0 -0
  56. data/spec/dummy/solr/test/data/index/segments_1 +0 -0
  57. data/spec/dummy/tmp/cache/4F7/F90/default_role +0 -0
  58. data/spec/dummy/tmp/cache/6E4/420/search_engine_all +0 -0
  59. data/spec/factories/user.rb +1 -1
  60. data/spec/fixtures/user_groups.yml +1 -1
  61. metadata +130 -137
  62. data/app/controllers/manifestations_controller.rb +0 -771
  63. data/app/views/layouts/agents.html.erb +0 -26
  64. data/app/views/layouts/agents.mobile.erb +0 -18
  65. data/app/views/layouts/manifestations.html.erb +0 -32
  66. data/app/views/layouts/manifestations.mobile.erb +0 -18
  67. data/app/views/page/add_on.html.erb +0 -13
  68. data/app/views/page/msie_acceralator.builder +0 -15
  69. data/spec/dummy/db/development.sqlite3 +0 -0
  70. data/spec/dummy/db/migrate/20110627034940_create_series_statement_merge_lists.rb +0 -9
  71. data/spec/dummy/db/migrate/20110627035057_create_series_statement_merges.rb +0 -12
  72. data/spec/dummy/db/migrate/20130303104849_add_state_index_to_reserve.rb +0 -5
  73. data/spec/dummy/db/migrate/20130303124821_add_retained_at_to_reserve.rb +0 -5
  74. data/spec/dummy/db/migrate/20130304015019_add_postponed_at_to_reserve.rb +0 -5
  75. data/spec/dummy/db/migrate/20130519065638_add_lock_version_to_reserve.rb +0 -5
  76. data/spec/dummy/db/migrate/20130519065837_add_lock_version_to_checkin.rb +0 -5
  77. data/spec/dummy/solr/data/test/index/_20.fdt +0 -0
  78. data/spec/dummy/solr/data/test/index/_20.fdx +0 -0
  79. data/spec/dummy/solr/data/test/index/_20.fnm +0 -7
  80. data/spec/dummy/solr/data/test/index/_20.frq +0 -0
  81. data/spec/dummy/solr/data/test/index/_20.nrm +0 -1
  82. data/spec/dummy/solr/data/test/index/_20.prx +0 -0
  83. data/spec/dummy/solr/data/test/index/_20.tii +0 -0
  84. data/spec/dummy/solr/data/test/index/_20.tis +0 -0
  85. data/spec/dummy/solr/data/test/index/_21.fdt +0 -0
  86. data/spec/dummy/solr/data/test/index/_21.fdx +0 -0
  87. data/spec/dummy/solr/data/test/index/_21.fnm +0 -7
  88. data/spec/dummy/solr/data/test/index/_21.frq +0 -0
  89. data/spec/dummy/solr/data/test/index/_21.nrm +0 -1
  90. data/spec/dummy/solr/data/test/index/_21.prx +0 -0
  91. data/spec/dummy/solr/data/test/index/_21.tii +0 -0
  92. data/spec/dummy/solr/data/test/index/_21.tis +0 -0
  93. data/spec/dummy/solr/data/test/index/_22.fdt +0 -0
  94. data/spec/dummy/solr/data/test/index/_22.fdx +0 -0
  95. data/spec/dummy/solr/data/test/index/_22.fnm +0 -8
  96. data/spec/dummy/solr/data/test/index/_22.frq +0 -0
  97. data/spec/dummy/solr/data/test/index/_22.nrm +0 -1
  98. data/spec/dummy/solr/data/test/index/_22.prx +0 -0
  99. data/spec/dummy/solr/data/test/index/_22.tii +0 -0
  100. data/spec/dummy/solr/data/test/index/_22.tis +0 -0
  101. data/spec/dummy/solr/data/test/index/segments.gen +0 -0
  102. data/spec/dummy/solr/data/test/index/segments_2s +0 -0
  103. data/spec/dummy/solr/data/test/spellchecker/segments_1 +0 -0
  104. data/spec/fixtures/agent_import_files.yml +0 -47
  105. data/spec/fixtures/agent_import_results.yml +0 -29
  106. data/spec/fixtures/circulation_statuses.yml +0 -136
  107. data/spec/fixtures/event_categories.yml +0 -55
  108. data/spec/fixtures/events.yml +0 -142
  109. data/spec/fixtures/item_has_use_restrictions.yml +0 -61
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 18d5a075c09fc313b1874edfb0d83a0559cfef82
4
- data.tar.gz: df3214e610e3f9f0f9c9bef80a21c464603a0530
3
+ metadata.gz: c711ab3a4e4948c28be5f8c7285b672b0ba87caa
4
+ data.tar.gz: ba06227697f0fd3d5377398394b5df8978cfb935
5
5
  SHA512:
6
- metadata.gz: 9413a5a4d6b39235f3c1969ff835ecf6b08abb6e777407b80edee58abc38c28902ffc07f00086863fec5a1ee88742e05c5ca853027ad7b02c21861e1a9c5bb49
7
- data.tar.gz: e05e45678af64829954b927dd65079c90e09e9e69c6bbe0a5a7240c594e54a4af41c8e8cdd15d74922193915b2e36018ad371b07287e832ed286ae81c8493d39
6
+ metadata.gz: ffc68055b8c9376165344010168620179101d35d0c3260476088f66afac361b5ba5a32cde27fb52dbba4c921f9d1218a1ed274effbdbe0d64a91cfc84f7ca5c4
7
+ data.tar.gz: 858394e17af9b17abb1b75a243eff0a6e231738454b39a09d52f68ecc70d4a139c2c2f1885df78e281ebda1f5b1a59ddae0664a76b5f775d5d9c0c23ac1adbd8
data/README.rdoc CHANGED
@@ -2,8 +2,8 @@
2
2
 
3
3
  == Related projects
4
4
  * {Next-L Enju Root}[https://github.com/next-l/enju_root]
5
- * {Next-L Enju Leaf}[https://github.com/nabeta/enju_leaf]
5
+ * {Next-L Enju Leaf}[https://github.com/next-l/enju_leaf]
6
6
 
7
7
  == Authors and contributors
8
- * {TANABE, Kosuke}[http://mwr.mediacom.keio.ac.jp/~tanabe/]
8
+ * {TANABE, Kosuke}[https://github.com/nabeta]
9
9
  * {Project Next-L}[http://www.next-l.jp]
@@ -10,6 +10,7 @@
10
10
  <td style="width: 500px"><%= manifestation.title_alternative -%></td>
11
11
  </tr>
12
12
  <% end %>
13
+ <%- if manifestation.series_statements.exists? -%>
13
14
  <tr>
14
15
  <td style="width: 200px"><%= t('activerecord.models.series_statement') -%>:</td>
15
16
  <td style="width: 500px">
@@ -19,6 +20,7 @@
19
20
  <%- end -%>
20
21
  </td>
21
22
  </tr>
23
+ <% end %>
22
24
  <%= render 'edition_and_number', :manifestation => manifestation %>
23
25
  <tr>
24
26
  <td style="width: 200px"><%= t('page.form') -%>:</td>
@@ -95,9 +97,7 @@
95
97
  </tr>
96
98
  </table>
97
99
  <% end %>
98
- <%- if manifestation.items.on_shelf.exists? -%>
99
- <%= render 'manifestations/show_holding', :manifestation => manifestation -%>
100
- <%- end -%>
100
+ <%= render 'manifestations/show_holding', :manifestation => manifestation -%>
101
101
  </div>
102
102
  <%= render 'manifestations/tab_list', :manifestation => manifestation %>
103
103
  </div>
@@ -10,6 +10,7 @@
10
10
  <td style="width: 500px"><%= manifestation.title_alternative -%></td>
11
11
  </tr>
12
12
  <% end %>
13
+ <%- if manifestation.series_statements.exists? -%>
13
14
  <tr>
14
15
  <td style="width: 200px"><%= t('activerecord.models.series_statement') -%>:</td>
15
16
  <td style="width: 500px">
@@ -19,6 +20,7 @@
19
20
  <%- end -%>
20
21
  </td>
21
22
  </tr>
23
+ <% end %>
22
24
  <%= render 'edition_and_number', :manifestation => manifestation %>
23
25
  <tr>
24
26
  <td style="width: 200px"><%= t('page.form') -%>:</td>
@@ -57,4 +57,7 @@
57
57
  <% end %>
58
58
  <%- end -%>
59
59
  </table>
60
+ <%- if can? :create, Item -%>
61
+ <p><%= link_to t('page.new', :model => t('activerecord.models.item')), new_manifestation_item_path(manifestation) -%></p>
62
+ <%- end -%>
60
63
  </div>
@@ -0,0 +1,27 @@
1
+ <% unless params[:mode] == 'add' %>
2
+ <% if manifestation.is_reservable_by?(current_user) %>
3
+ <%- reserve = manifestation.is_reserved_by?(current_user) -%>
4
+ <%- if reserve -%>
5
+ <%= link_to t('reserve.show'), reserve -%>
6
+ <%- else -%>
7
+ <%= link_to t('activerecord.models.reserve'), new_reserve_path(:manifestation_id => manifestation.id) if can? :create, Reserve -%>
8
+ <%- end -%>
9
+ <% end %>
10
+ <br />
11
+ <% end %>
12
+ <% cache([current_user_role_name, @locale, manifestation]) do %>
13
+ <%- if can? :update, manifestation -%>
14
+ <% unless params[:mode] == 'add' %>
15
+ <%= link_to image_tag('icons/book_edit.png', :size => '16x16', :alt => t('page.edit')), edit_manifestation_path(manifestation) -%>
16
+ <% else %>
17
+ <% case %>
18
+ <% when @parent %>
19
+ <%= link_to t('page.add'), new_manifestation_manifestation_relationship_path(@parent, :child_id => manifestation.id) unless @parent.derived_manifestations.include?(manifestation) or @parent == manifestation -%>
20
+ <% when @item %>
21
+ <%= link_to t('page.change'), edit_exemplify_path(@item.exemplify, :manifestation_id => manifestation.id) unless @item.manifestation == manifestation -%>
22
+ <% else %>
23
+ <%= link_to image_tag('icons/arrow_divide.png', :size => '16x16', :alt => t('manifestation.add_derivation')), new_manifestation_path(:parent_id => manifestation.id) -%>
24
+ <% end %>
25
+ <%- end -%>
26
+ <% end %>
27
+ <% end %>
@@ -0,0 +1,12 @@
1
+ <ul>
2
+ <% manifestation.series_statements.each do |series_statement| %>
3
+ <li>
4
+ <% if series_statement.manifestation and manifestation.series_master? %>
5
+ <%= link_to series_statement.original_title, series_statement.manifestation %>
6
+ <% else %>
7
+ <%= series_statement.original_title %>
8
+ <% end %>
9
+ <%= series_statement.volume_number_string %>
10
+ </li>
11
+ <% end %>
12
+ </ul>
@@ -18,4 +18,4 @@
18
18
  <% end %>
19
19
  </ul>
20
20
 
21
- <%= paginate(@manifestations, :window => 0) %>
21
+ <%= paginate(@manifestations, :window => 0, :theme => 'enju_leaf_mobile') %>
@@ -1,11 +1,11 @@
1
1
  <div class="header_and_footer">
2
2
  <div id="footer">
3
- <a href="https://github.com/nabeta/enju_leaf">Next-L Enju Leaf <%= EnjuLeaf::VERSION %></a>
3
+ <a href="https://github.com/next-l/enju_leaf">Next-L Enju Leaf <%= EnjuLeaf::VERSION %></a>
4
4
  + <a href="https://github.com/next-l/enju_flower">Next-L Enju Flower <%= EnjuFlower::VERSION %></a>,
5
5
  <%= t('page.open_source_integrated_library_system') -%>
6
6
  <br />
7
- Developed by <a href="http://mwr.mediacom.keio.ac.jp/~tanabe/">Kosuke Tanabe</a> and <a href="http://www.next-l.jp/">Project Next-L</a> |
8
- <%= link_to t('page.report_bugs'), "https://github.com/nabeta/enju_leaf/issues" -%>
7
+ Developed by <a href="https://github.com/nabeta">Kosuke Tanabe</a> and <a href="http://www.next-l.jp/">Project Next-L</a> |
8
+ <%= link_to t('page.report_bugs'), "https://github.com/next-l/enju_leaf/issues" -%>
9
9
  <% if is_mobile_request? %>
10
10
  | <%= link_to t('page.mobile_view'), url_for(:mobile_view => 'true') %>
11
11
  <% end %>
@@ -1,3 +1,3 @@
1
1
  module EnjuFlower
2
- VERSION = "0.1.0.pre13"
2
+ VERSION = "0.1.0.pre14"
3
3
  end
@@ -1,6 +1,8 @@
1
1
  # Use this hook to configure devise mailer, warden hooks and so forth.
2
2
  # Many of these configuration options can be set straight in your model.
3
3
  Devise.setup do |config|
4
+ config.secret_key = 'b8ea232c09a0e131f5b694670553c81f379dde14a1234ff7f53b9d971dc5148fe318066f3d4f5e0d92ebfb100d756d3dfde6ca68a404296a81b621edc7f5d732'
5
+
4
6
  # ==> Mailer Configuration
5
7
  # Configure the e-mail address which will be shown in Devise::Mailer,
6
8
  # note that it will be overwritten if you use your own mailer class with default "from" parameter.
@@ -0,0 +1,9 @@
1
+ class AddAdminNetworksToLibraryGroup < ActiveRecord::Migration
2
+ def self.up
3
+ add_column :library_groups, :admin_networks, :text
4
+ end
5
+
6
+ def self.down
7
+ remove_column :library_groups, :admin_networks
8
+ end
9
+ end