enju_library 0.1.0.pre32 → 0.1.0.pre33

Sign up to get free protection for your applications and to get access to all the features.
Files changed (155) hide show
  1. checksums.yaml +4 -4
  2. data/app/models/accept.rb +9 -2
  3. data/app/views/accepts/edit.html.erb +2 -2
  4. data/app/views/accepts/index.html.erb +2 -2
  5. data/app/views/accepts/new.html.erb +2 -2
  6. data/app/views/accepts/show.html.erb +2 -2
  7. data/app/views/baskets/edit.html.erb +2 -2
  8. data/app/views/baskets/index.html.erb +2 -2
  9. data/app/views/baskets/new.html.erb +2 -2
  10. data/app/views/baskets/show.html.erb +2 -2
  11. data/app/views/bookstores/edit.html.erb +2 -2
  12. data/app/views/bookstores/index.html.erb +2 -2
  13. data/app/views/bookstores/new.html.erb +2 -2
  14. data/app/views/bookstores/show.html.erb +2 -2
  15. data/app/views/budget_types/edit.html.erb +2 -2
  16. data/app/views/budget_types/index.html.erb +2 -2
  17. data/app/views/budget_types/new.html.erb +2 -2
  18. data/app/views/budget_types/show.html.erb +2 -2
  19. data/app/views/libraries/edit.html.erb +2 -2
  20. data/app/views/libraries/index.html.erb +15 -7
  21. data/app/views/libraries/new.html.erb +2 -2
  22. data/app/views/libraries/show.html.erb +2 -2
  23. data/app/views/library_groups/edit.html.erb +2 -2
  24. data/app/views/library_groups/index.html.erb +6 -4
  25. data/app/views/library_groups/new.html.erb +2 -2
  26. data/app/views/library_groups/show.html.erb +2 -2
  27. data/app/views/request_status_types/edit.html.erb +2 -2
  28. data/app/views/request_status_types/index.html.erb +2 -2
  29. data/app/views/request_status_types/new.html.erb +2 -2
  30. data/app/views/request_status_types/show.html.erb +2 -2
  31. data/app/views/request_types/edit.html.erb +2 -2
  32. data/app/views/request_types/index.html.erb +2 -2
  33. data/app/views/request_types/new.html.erb +2 -2
  34. data/app/views/request_types/show.html.erb +2 -2
  35. data/app/views/search_engines/edit.html.erb +2 -2
  36. data/app/views/search_engines/index.html.erb +2 -2
  37. data/app/views/search_engines/new.html.erb +2 -2
  38. data/app/views/search_engines/show.html.erb +2 -2
  39. data/app/views/shelves/edit.html.erb +2 -2
  40. data/app/views/shelves/index.html.erb +4 -4
  41. data/app/views/shelves/new.html.erb +2 -2
  42. data/app/views/shelves/show.html.erb +2 -2
  43. data/app/views/subscribes/edit.html.erb +2 -2
  44. data/app/views/subscribes/index.html.erb +2 -2
  45. data/app/views/subscribes/new.html.erb +2 -2
  46. data/app/views/subscribes/show.html.erb +2 -2
  47. data/app/views/subscriptions/edit.html.erb +2 -2
  48. data/app/views/subscriptions/index.html.erb +2 -2
  49. data/app/views/subscriptions/new.html.erb +2 -2
  50. data/app/views/subscriptions/show.html.erb +2 -2
  51. data/config/locales/translation_en.yml +1 -0
  52. data/config/locales/translation_ja.yml +1 -0
  53. data/lib/enju_library/version.rb +1 -1
  54. data/spec/controllers/baskets_controller_spec.rb +2 -2
  55. data/spec/controllers/libraries_controller_spec.rb +1 -1
  56. data/spec/dummy/db/test.sqlite3 +0 -0
  57. data/spec/models/accept_spec.rb +1 -0
  58. data/spec/models/library_group_spec.rb +2 -2
  59. data/spec/models/library_spec.rb +1 -1
  60. data/spec/models/shelf_spec.rb +2 -2
  61. data/spec/models/subscription_spec.rb +1 -1
  62. data/spec/spec_helper.rb +3 -0
  63. metadata +34 -204
  64. data/spec/dummy/solr/conf/admin-extra.html +0 -31
  65. data/spec/dummy/solr/conf/elevate.xml +0 -36
  66. data/spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt +0 -246
  67. data/spec/dummy/solr/conf/protwords.txt +0 -21
  68. data/spec/dummy/solr/conf/schema.xml +0 -255
  69. data/spec/dummy/solr/conf/scripts.conf +0 -24
  70. data/spec/dummy/solr/conf/solrconfig.xml +0 -667
  71. data/spec/dummy/solr/conf/spellings.txt +0 -2
  72. data/spec/dummy/solr/conf/stopwords.txt +0 -58
  73. data/spec/dummy/solr/conf/synonyms.txt +0 -31
  74. data/spec/dummy/solr/default/data/index/_1s8.fdt +0 -0
  75. data/spec/dummy/solr/default/data/index/_1s8.fdx +0 -0
  76. data/spec/dummy/solr/default/data/index/_1s8.fnm +0 -0
  77. data/spec/dummy/solr/default/data/index/_1s8.nvd +0 -0
  78. data/spec/dummy/solr/default/data/index/_1s8.nvm +0 -0
  79. data/spec/dummy/solr/default/data/index/_1s8.si +0 -0
  80. data/spec/dummy/solr/default/data/index/_1s8_Lucene41_0.doc +0 -0
  81. data/spec/dummy/solr/default/data/index/_1s8_Lucene41_0.pos +0 -0
  82. data/spec/dummy/solr/default/data/index/_1s8_Lucene41_0.tim +0 -0
  83. data/spec/dummy/solr/default/data/index/_1s8_Lucene41_0.tip +0 -0
  84. data/spec/dummy/solr/default/data/index/segments.gen +0 -0
  85. data/spec/dummy/solr/default/data/index/segments_2ya +0 -0
  86. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000003815 +0 -0
  87. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000003816 +0 -0
  88. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000003817 +0 -0
  89. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000003818 +0 -0
  90. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000003819 +0 -0
  91. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000003820 +0 -0
  92. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000003821 +0 -0
  93. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000003822 +0 -0
  94. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000003823 +0 -0
  95. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000003824 +0 -0
  96. data/spec/dummy/solr/development/data/index/segments.gen +0 -0
  97. data/spec/dummy/solr/development/data/index/segments_1 +0 -0
  98. data/spec/dummy/solr/solr.xml +0 -8
  99. data/spec/dummy/solr/test/data/index/segments.gen +0 -0
  100. data/spec/dummy/solr/test/data/index/segments_1 +0 -0
  101. data/spec/dummy/tmp/cache/assets/test/sprockets/0440b81b0aae840cf287a686585a8cec +0 -0
  102. data/spec/dummy/tmp/cache/assets/test/sprockets/096c3408c7592aaeb756778ce1775f16 +0 -0
  103. data/spec/dummy/tmp/cache/assets/test/sprockets/09bc1fff0c1477a69e8cd36ed3fe771f +0 -0
  104. data/spec/dummy/tmp/cache/assets/test/sprockets/0c8f59d97121b79a2e2a0d009d6da9c3 +0 -0
  105. data/spec/dummy/tmp/cache/assets/test/sprockets/0e7592ffc95bd8b73854cc6453c64e33 +0 -0
  106. data/spec/dummy/tmp/cache/assets/test/sprockets/0e8e7445a50fad85ab545fa283abf5b7 +0 -0
  107. data/spec/dummy/tmp/cache/assets/test/sprockets/1260173072d9796c1ae7d7752b9916c3 +0 -0
  108. data/spec/dummy/tmp/cache/assets/test/sprockets/1572dfd6f1e555f4be1aa60ddc3cb0c0 +0 -0
  109. data/spec/dummy/tmp/cache/assets/test/sprockets/17c9f5037fae5b6ee1fc7466948001b5 +0 -0
  110. data/spec/dummy/tmp/cache/assets/test/sprockets/2258e83cd2e464c650334b6a72a87cb6 +0 -0
  111. data/spec/dummy/tmp/cache/assets/test/sprockets/241a5d6ad6008e25a64a5092e8361ae8 +0 -0
  112. data/spec/dummy/tmp/cache/assets/test/sprockets/2bf9c36d2bc8f8ca084394d139ce8edf +0 -0
  113. data/spec/dummy/tmp/cache/assets/test/sprockets/2ffe508d0533d0afd2a37bb574eda40d +0 -0
  114. data/spec/dummy/tmp/cache/assets/test/sprockets/301d9ec69800d0dc163460a12304676a +0 -0
  115. data/spec/dummy/tmp/cache/assets/test/sprockets/3fbe8dcb9a5b2fbc7a22cc4b1ca4aa11 +0 -0
  116. data/spec/dummy/tmp/cache/assets/test/sprockets/49d32c13d390c1b80d8b2705aac86579 +0 -0
  117. data/spec/dummy/tmp/cache/assets/test/sprockets/4aa18096a209e515f5f1df487622cdf4 +0 -0
  118. data/spec/dummy/tmp/cache/assets/test/sprockets/4c4d6b8fc44a49272793290caed29e24 +0 -0
  119. data/spec/dummy/tmp/cache/assets/test/sprockets/5db165a5b217a384aaa8885d6bcaf193 +0 -0
  120. data/spec/dummy/tmp/cache/assets/test/sprockets/5dd0b61707256a0514d7f5e224188a1d +0 -0
  121. data/spec/dummy/tmp/cache/assets/test/sprockets/6738d1a07584e4b732d197e10afd6a19 +0 -0
  122. data/spec/dummy/tmp/cache/assets/test/sprockets/6a83d3fd052b7923111a0ed838ff53e0 +0 -0
  123. data/spec/dummy/tmp/cache/assets/test/sprockets/6a958d3fc0999c71aa19bae06bacdeb6 +0 -0
  124. data/spec/dummy/tmp/cache/assets/test/sprockets/6df57ded762c97e6755758008bb3a660 +0 -0
  125. data/spec/dummy/tmp/cache/assets/test/sprockets/7289cf11ae787f5e0639528dc155bffb +0 -0
  126. data/spec/dummy/tmp/cache/assets/test/sprockets/7c4b2e5317023fb751fa54ad41f95101 +0 -0
  127. data/spec/dummy/tmp/cache/assets/test/sprockets/7eea3b9e54d8a23d8a05d354f1a93f51 +0 -0
  128. data/spec/dummy/tmp/cache/assets/test/sprockets/8a73d1e841a4716b4f18ed4a23622092 +0 -0
  129. data/spec/dummy/tmp/cache/assets/test/sprockets/8be2a49de16592553e0d0a09d92bf6ef +0 -0
  130. data/spec/dummy/tmp/cache/assets/test/sprockets/8f72bcc7284bf844ac8bec5dc4b71482 +0 -0
  131. data/spec/dummy/tmp/cache/assets/test/sprockets/979eaef456657e4fc79b9b967aef0587 +0 -0
  132. data/spec/dummy/tmp/cache/assets/test/sprockets/9ad166e60e3d477c78328181979a7b77 +0 -0
  133. data/spec/dummy/tmp/cache/assets/test/sprockets/9b78afe804f3870fbafb97d2d62e5f6b +0 -0
  134. data/spec/dummy/tmp/cache/assets/test/sprockets/a3cea75f1356ef55329e78f86b4c72b1 +0 -0
  135. data/spec/dummy/tmp/cache/assets/test/sprockets/a5bf9fc3822019953dee89c6ae2b32ea +0 -0
  136. data/spec/dummy/tmp/cache/assets/test/sprockets/a7387ef33f472faf58df3dd72623fbc6 +0 -0
  137. data/spec/dummy/tmp/cache/assets/test/sprockets/aa2e1ada35daa496bb08e85fcb817536 +0 -0
  138. data/spec/dummy/tmp/cache/assets/test/sprockets/ae706bde720905edffe622ae48f15740 +0 -0
  139. data/spec/dummy/tmp/cache/assets/test/sprockets/b53fd979e77975479427d0b481b004d4 +0 -0
  140. data/spec/dummy/tmp/cache/assets/test/sprockets/b57a0579a21bd3280d1db6f42550e5c7 +0 -0
  141. data/spec/dummy/tmp/cache/assets/test/sprockets/b80bed2ef62ec65384f12272c185a9a8 +0 -0
  142. data/spec/dummy/tmp/cache/assets/test/sprockets/bf33fb298844af06e55096420b989e3b +0 -0
  143. data/spec/dummy/tmp/cache/assets/test/sprockets/c3e97042b232e677d67679e11ebdb8ec +0 -0
  144. data/spec/dummy/tmp/cache/assets/test/sprockets/c4700cd893db92917b893a0e48f57a24 +0 -0
  145. data/spec/dummy/tmp/cache/assets/test/sprockets/c6283ae59dff510d5a2bb2bb9194d045 +0 -0
  146. data/spec/dummy/tmp/cache/assets/test/sprockets/ca5b985126fb033dec26015bd08d56ee +0 -0
  147. data/spec/dummy/tmp/cache/assets/test/sprockets/d26b3581068a8ec8af52f3b2cce8c32a +0 -0
  148. data/spec/dummy/tmp/cache/assets/test/sprockets/d648a0b0abb7fd7ff579d72ffe033d50 +0 -0
  149. data/spec/dummy/tmp/cache/assets/test/sprockets/db6425848529903bdee75792cb2ed79a +0 -0
  150. data/spec/dummy/tmp/cache/assets/test/sprockets/e44b4816bd1b2a7ba674c978dad35f3a +0 -0
  151. data/spec/dummy/tmp/cache/assets/test/sprockets/e513ee1af8fa24dcb4f473c18c09bf87 +0 -0
  152. data/spec/dummy/tmp/cache/assets/test/sprockets/e8142c2b10712e79b6d2c2cba0894b4c +0 -0
  153. data/spec/dummy/tmp/cache/assets/test/sprockets/fa8059ddbbe226114ba0c178de3fc31b +0 -0
  154. data/spec/dummy/tmp/cache/assets/test/sprockets/fbc69737b9b0dc77871fa2bb8647a38a +0 -0
  155. data/spec/spec_helper2.rb +0 -66
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ce7e59f51105f6e420f742a76554c87a9226e0bc
4
- data.tar.gz: fb02affb8c528890b19dffd7893b2c3d0dac91ab
3
+ metadata.gz: bd5f2a84f8de884044cc92ccf75b5b256eb4f9a1
4
+ data.tar.gz: 1fa77d84c76d38bedd20edb2cc23b9c7273006a4
5
5
  SHA512:
6
- metadata.gz: d961f040adf10468b53dc933570743625f8540d888175feee5d649433403925a3f5a70e281bdc5fed6894b66d948d888cfd9c3243729b8dc0e6c81e8bcd71f0c
7
- data.tar.gz: 51e31edc5d3f8746a0e6398a2bb70feb3ada3084e506721bf67f0f26d689259de47a6c625181c9169df6f6cd1c9b004b954c78a181283bca6c7befecddb94022
6
+ metadata.gz: 4547dfa9384a1876c44ac8121e6c96e3d85d2da70105d55c1587ecbad4773d248ed398c1bf1443ca32e3a927886e6faabc1815a5b9ffca0a18577c602d794e73
7
+ data.tar.gz: b4b6cdf0b15841f6831dc7d25324dcc9e49ed894bfeb87afeb4b221faa800c5f806b5ef8eaa8c6ef55ba1ec8fb9275258aaa30ece53b87f11800c193ffacddc1
@@ -10,6 +10,7 @@ class Accept < ActiveRecord::Base
10
10
  validates_presence_of :basket_id
11
11
 
12
12
  before_save :accept!, :on => :create
13
+ after_save :expire_manifestation_cache, if: Proc.new{|record| record.item.try(:manifestation).present?}
13
14
 
14
15
  attr_accessor :item_identifier
15
16
 
@@ -17,9 +18,15 @@ class Accept < ActiveRecord::Base
17
18
 
18
19
  def accept!
19
20
  if defined?(EnjuCirculation)
20
- item.circulation_status = CirculationStatus.where(:name => 'Available On Shelf').first
21
+ circulation_status = CirculationStatus.where(:name => 'Available On Shelf').first
22
+ item.update_column(:circulation_status_id, circulation_status.id) if circulation_status
23
+ use_restriction = UseRestriction.where(name: 'Limited Circulation, Normal Loan Period').first
24
+ item.use_restriction = use_restriction if use_restriction
21
25
  end
22
- item.save(:validate => false)
26
+ end
27
+
28
+ def expire_manifestation_cache
29
+ ExpireFragmentCache.expire_fragment_cache(item.manifestation)
23
30
  end
24
31
  end
25
32
 
@@ -1,11 +1,11 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.accept')) -%></h1>
3
3
  <div id="content_list">
4
4
  <%= render 'form' %>
5
5
  </div>
6
6
  </div>
7
7
 
8
- <div id="submenu" class="ui-corner-all">
8
+ <div id="submenu" class="ui-corner-all ui-widget-content">
9
9
  <ul>
10
10
  <li><%= link_to t('page.show'), @accept -%></li>
11
11
  <li><%= link_to t('page.back'), accepts_path -%></li>
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.accept')) -%></h1>
3
3
  <div id="content_list">
4
4
 
@@ -42,7 +42,7 @@
42
42
  </div>
43
43
  </div>
44
44
 
45
- <div id="submenu" class="ui-corner-all">
45
+ <div id="submenu" class="ui-corner-all ui-widget-content">
46
46
  <ul>
47
47
  <li><%= link_to t('page.new', :model => t('activerecord.models.accept')), new_accept_path -%></li>
48
48
  </ul>
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.new', :model => t('activerecord.models.accept')) -%></h1>
3
3
  <div id="content_list">
4
4
  <div id="accept_list">
@@ -7,7 +7,7 @@
7
7
  </div>
8
8
  </div>
9
9
 
10
- <div id="submenu" class="ui-corner-all">
10
+ <div id="submenu" class="ui-corner-all ui-widget-content">
11
11
  <ul>
12
12
  <li><%= link_to t('page.back'), accepts_path -%></li>
13
13
  </ul>
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.accept')) -%></h1>
3
3
  <div id="content_list">
4
4
  <p id="notice"><%= notice %></p>
@@ -24,7 +24,7 @@
24
24
  </div>
25
25
  </div>
26
26
 
27
- <div id="submenu" class="ui-corner-all">
27
+ <div id="submenu" class="ui-corner-all ui-widget-content">
28
28
  <ul>
29
29
  <li><%= back_to_index(flash[:page_info]) -%></li>
30
30
  </ul>
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.basket')) -%></h1>
3
3
  <div id="content_list">
4
4
 
@@ -22,7 +22,7 @@
22
22
  </div>
23
23
  </div>
24
24
 
25
- <div id="submenu" class="ui-corner-all">
25
+ <div id="submenu" class="ui-corner-all ui-widget-content">
26
26
  <ul>
27
27
  <li><%= link_to t('page.show'), basket_path(@basket) -%></li>
28
28
  <li><%= link_to t('page.back'), user_baskets_path(@basket.user) -%></li>
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.basket')) -%></h1>
3
3
  <div id="content_list">
4
4
 
@@ -24,7 +24,7 @@
24
24
  </div>
25
25
  </div>
26
26
 
27
- <div id="submenu" class="ui-corner-all">
27
+ <div id="submenu" class="ui-corner-all ui-widget-content">
28
28
  <ul>
29
29
  <li><%= link_to t('page.new', :model => t('activerecord.models.basket')), new_basket_path -%></li>
30
30
  </ul>
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.new', :model => t('activerecord.models.basket')) -%></h1>
3
3
  <div id="content_list">
4
4
 
@@ -21,7 +21,7 @@
21
21
  </div>
22
22
  </div>
23
23
 
24
- <div id="submenu" class="ui-corner-all">
24
+ <div id="submenu" class="ui-corner-all ui-widget-content">
25
25
  <ul>
26
26
  <li><%= link_to t('activerecord.models.checkin'), new_checkin_path -%></li>
27
27
  <li><%= link_to t('page.search_resource', :model => t('activerecord.models.user')), users_path -%></li>
@@ -1,6 +1,6 @@
1
1
  <div id="content_list">
2
2
  <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.basket')) -%></h1>
3
- <div id="content_detail" class="ui-corner-all">
3
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
4
4
  <p id="notice"><%= notice %></p>
5
5
 
6
6
  <p>
@@ -15,7 +15,7 @@
15
15
  </div>
16
16
  </div>
17
17
 
18
- <div id="submenu" class="ui-corner-all">
18
+ <div id="submenu" class="ui-corner-all ui-widget-content">
19
19
  <ul>
20
20
  <li><%= link_to t('page.edit'), edit_basket_path(@basket) -%></li>
21
21
  <li><%= link_to t('page.back'), user_baskets_path(@basket.user) -%></li>
@@ -1,11 +1,11 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.bookstore')) -%></h1>
3
3
  <div id="content_list">
4
4
  <%= render 'form' %>
5
5
  </div>
6
6
  </div>
7
7
 
8
- <div id="submenu" class="ui-corner-all">
8
+ <div id="submenu" class="ui-corner-all ui-widget-content">
9
9
  <ul>
10
10
  <li><%= link_to t('page.show'), @bookstore -%></li>
11
11
  <li><%= link_to t('page.back'), bookstores_path -%></li>
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.bookstore')) -%></h1>
3
3
  <div id="content_list">
4
4
 
@@ -40,7 +40,7 @@
40
40
  </div>
41
41
  </div>
42
42
 
43
- <div id="submenu" class="ui-corner-all">
43
+ <div id="submenu" class="ui-corner-all ui-widget-content">
44
44
  <%- if can? :create, Bookstore -%>
45
45
  <ul>
46
46
  <li><%= link_to t('page.new', :model => t('activerecord.models.bookstore')), new_bookstore_path -%></li>
@@ -1,11 +1,11 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.new', :model => t('activerecord.models.bookstore')) -%></h1>
3
3
  <div id="content_list">
4
4
  <%= render 'form' %>
5
5
  </div>
6
6
  </div>
7
7
 
8
- <div id="submenu" class="ui-corner-all">
8
+ <div id="submenu" class="ui-corner-all ui-widget-content">
9
9
  <ul>
10
10
  <li><%= link_to t('page.back'), bookstores_path -%></li>
11
11
  </ul>
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.bookstore')) -%></h1>
3
3
  <div id="content_list">
4
4
  <p id="notice"><%= notice %></p>
@@ -41,7 +41,7 @@
41
41
  </div>
42
42
  </div>
43
43
 
44
- <div id="submenu" class="ui-corner-all">
44
+ <div id="submenu" class="ui-corner-all ui-widget-content">
45
45
  <ul>
46
46
  <li><%= link_to t('page.edit'), edit_bookstore_path(@bookstore) -%></li>
47
47
  <li><%= back_to_index(flash[:page_info]) -%></li>
@@ -1,11 +1,11 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.budget_type')) -%></h1>
3
3
  <div id="content_list">
4
4
  <%= render 'form' %>
5
5
  </div>
6
6
  </div>
7
7
 
8
- <div id="submenu" class="ui-corner-all">
8
+ <div id="submenu" class="ui-corner-all ui-widget-content">
9
9
  <ul>
10
10
  <li><%= link_to t('page.show'), @budget_type -%></li>
11
11
  <li><%= link_to t('page.back'), budget_types_path -%></li>
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.budget_type')) -%></h1>
3
3
  <div id="content_list">
4
4
 
@@ -36,7 +36,7 @@
36
36
  </div>
37
37
  </div>
38
38
 
39
- <div id="submenu" class="ui-corner-all">
39
+ <div id="submenu" class="ui-corner-all ui-widget-content">
40
40
  <ul>
41
41
  <li><%= link_to t('page.new', :model => t('activerecord.models.budget_type')), new_budget_type_path -%></li>
42
42
  </ul>
@@ -1,11 +1,11 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.new', :model => t('activerecord.models.budget_type')) -%></h1>
3
3
  <div id="content_list">
4
4
  <%= render 'form' %>
5
5
  </div>
6
6
  </div>
7
7
 
8
- <div id="submenu" class="ui-corner-all">
8
+ <div id="submenu" class="ui-corner-all ui-widget-content">
9
9
  <ul>
10
10
  <li><%= link_to t('page.back'), budget_types_path -%></li>
11
11
  </ul>
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.budget_type')) -%></h1>
3
3
  <div id="content_list">
4
4
  <p id="notice"><%= notice %></p>
@@ -21,7 +21,7 @@
21
21
  </div>
22
22
  </div>
23
23
 
24
- <div id="submenu" class="ui-corner-all">
24
+ <div id="submenu" class="ui-corner-all ui-widget-content">
25
25
  <ul>
26
26
  <li><%= link_to t('page.edit'), edit_budget_type_path(@budget_type) -%></li>
27
27
  <li><%= back_to_index(flash[:page_info]) -%></li>
@@ -1,11 +1,11 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.library')) -%></h1>
3
3
  <div id="content_list">
4
4
  <%= render 'form' %>
5
5
  </div>
6
6
  </div>
7
7
 
8
- <div id="submenu" class="ui-corner-all">
8
+ <div id="submenu" class="ui-corner-all ui-widget-content">
9
9
  <ul>
10
10
  <li><%= link_to t('page.show'), library_path(@library) -%></li>
11
11
  <li><%= link_to t('page.back'), libraries_path -%></li>
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.library')) -%></h1>
3
3
  <div id="content_list">
4
4
 
@@ -20,11 +20,15 @@
20
20
  <th id="position"></th>
21
21
  <th><%= t('activerecord.attributes.library.name') -%></th>
22
22
  <th>
23
- <%= t('activerecord.attributes.library.telephone_number_1') -%>
23
+ <%= t('activerecord.attributes.library.display_name') -%>
24
24
  /
25
- <%= t('activerecord.attributes.library.telephone_number_2') -%>
25
+ <%= t('activerecord.attributes.library.address') -%>
26
26
  </th>
27
27
  <th>
28
+ <%= t('activerecord.attributes.library.telephone_number_1') -%>
29
+ /
30
+ <%= t('activerecord.attributes.library.telephone_number_2') -%>
31
+ <br />
28
32
  <%= t('activerecord.attributes.library.fax_number') -%>
29
33
  </th>
30
34
  <th></th>
@@ -38,6 +42,7 @@
38
42
  <%= library.last? ? image_tag('icons/stop.png', :size => '16x16') : link_to(image_tag('icons/arrow_down.png', :size => '16x16', :alt => t('page.desc')), {:action => 'update', :move => 'lower', :id => library.name}, :method => :put) -%>
39
43
  <%- end -%>
40
44
  </td>
45
+ <td><%= link_to library.name, library -%></td>
41
46
  <td>
42
47
  <%= link_to library.display_name.localize, library -%>
43
48
  <br />
@@ -45,11 +50,14 @@
45
50
  <%= library.address -%>
46
51
  </td>
47
52
  <td>
48
- <%= library.telephone_number_1 -%>
53
+ tel: <%= library.telephone_number_1 -%>
54
+ <% if library.telephone_number_2.present? %>
55
+ <br />
56
+ tel: <%= library.telephone_number_2 -%>
57
+ <% end %>
49
58
  <br />
50
- <%= library.telephone_number_2 -%>
59
+ fax: <%= library.fax_number -%>
51
60
  </td>
52
- <td><%= library.fax_number -%></td>
53
61
  <td>
54
62
  <%- if can? :update, library -%>
55
63
  <%= link_to t('page.edit'), edit_library_path(library) -%>
@@ -66,7 +74,7 @@
66
74
  </div>
67
75
  </div>
68
76
 
69
- <div id="submenu" class="ui-corner-all">
77
+ <div id="submenu" class="ui-corner-all ui-widget-content">
70
78
  <ul>
71
79
  <%- if can? :create, Library -%>
72
80
  <li><%= link_to t('page.new', :model => t('activerecord.models.library')), new_library_path -%></li>
@@ -1,11 +1,11 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.new', :model => t('activerecord.models.library')) -%></h1>
3
3
  <div id="content_list">
4
4
  <%= render 'form' %>
5
5
  </div>
6
6
  </div>
7
7
 
8
- <div id="submenu" class="ui-corner-all">
8
+ <div id="submenu" class="ui-corner-all ui-widget-content">
9
9
  <ul>
10
10
  <li><%= link_to t('page.back'), libraries_path -%></li>
11
11
  </ul>
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= @library.display_name.localize -%></h1>
3
3
  <div id="content_list">
4
4
  <p id="notice"><%= notice %></p>
@@ -112,7 +112,7 @@
112
112
  </div>
113
113
  </div>
114
114
 
115
- <div id="submenu" class="ui-corner-all">
115
+ <div id="submenu" class="ui-corner-all ui-widget-content">
116
116
  <ul>
117
117
  <%- if can? :update, @library -%>
118
118
  <li><%= link_to t('page.edit'), edit_library_path(@library) -%></li>
@@ -1,11 +1,11 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.library_group')) -%></h1>
3
3
  <div id="content_list">
4
4
  <%= render 'form' %>
5
5
  </div>
6
6
  </div>
7
7
 
8
- <div id="submenu" class="ui-corner-all">
8
+ <div id="submenu" class="ui-corner-all ui-widget-content">
9
9
  <ul>
10
10
  <li><%= link_to t('page.back'), library_groups_path -%></li>
11
11
  </ul>
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.library_group')) -%></h1>
3
3
  <div id="content_list">
4
4
 
@@ -12,10 +12,12 @@
12
12
 
13
13
  <%- @library_groups.each do |library_group| -%>
14
14
  <tr class="line<%= cycle("0", "1") -%>">
15
- <td><%= link_to h(library_group.display_name.localize), edit_library_group_path(library_group) -%></td>
15
+ <td><%= link_to h(library_group.display_name.localize), library_group -%></td>
16
16
  <td><%= library_group.name -%></td>
17
17
  <td><%= library_group.email -%></td>
18
- <td><%= link_to t('page.edit'), edit_library_group_path(library_group) -%></td>
18
+ <td>
19
+ <%= link_to t('page.edit'), edit_library_group_path(library_group) if can?(:update, library_group) -%>
20
+ </td>
19
21
  </tr>
20
22
  <%- end -%>
21
23
  </table>
@@ -23,7 +25,7 @@
23
25
  </div>
24
26
  </div>
25
27
 
26
- <div id="submenu" class="ui-corner-all">
28
+ <div id="submenu" class="ui-corner-all ui-widget-content">
27
29
  <ul>
28
30
  <li><%= t('library_group.configuration') -%></li>
29
31
  </ul>
@@ -1,11 +1,11 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.new', :model => t('activerecord.models.library_group')) -%></h1>
3
3
  <div id="content_list">
4
4
  <%= render 'form' %>
5
5
  </div>
6
6
  </div>
7
7
 
8
- <div id="submenu" class="ui-corner-all">
8
+ <div id="submenu" class="ui-corner-all ui-widget-content">
9
9
  <ul>
10
10
  <li><%= link_to t('page.back'), library_groups_path -%></li>
11
11
  </ul>
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.library_group')) -%></h1>
3
3
  <div id="content_list">
4
4
  <p id="notice"><%= notice %></p>
@@ -63,7 +63,7 @@
63
63
  </div>
64
64
  </div>
65
65
 
66
- <div id="submenu" class="ui-corner-all">
66
+ <div id="submenu" class="ui-corner-all ui-widget-content">
67
67
  <ul>
68
68
  <li><%= link_to t('page.edit'), edit_library_group_path(@library_group) -%></li>
69
69
  <li><%= back_to_index(flash[:page_info]) -%></li>