zena 1.0.0 → 1.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (245) hide show
  1. data/History.txt +28 -0
  2. data/README.rdoc +6 -6
  3. data/Rakefile +3 -0
  4. data/app/controllers/users_controller.rb +4 -2
  5. data/app/models/acl.rb +6 -0
  6. data/app/models/cached_page.rb +2 -1
  7. data/app/models/document.rb +3 -4
  8. data/app/models/node.rb +8 -5
  9. data/app/models/site.rb +1 -1
  10. data/app/models/template.rb +2 -2
  11. data/app/models/user.rb +5 -3
  12. data/app/views/acls/_add.rhtml +2 -1
  13. data/app/views/acls/_form.rhtml +15 -7
  14. data/app/views/acls/_li.rhtml +2 -0
  15. data/app/views/acls/index.rhtml +3 -1
  16. data/app/views/acls/show.html.erb +1 -1
  17. data/app/views/links/destroy.rjs +16 -2
  18. data/app/views/versions/destroy.rjs +1 -1
  19. data/app/views/zafu/default/Node-admin.zafu +1 -1
  20. data/bin/zena +5 -3
  21. data/bricks/acls/lib/bricks/acls.rb +11 -4
  22. data/bricks/acls/zena/migrate/20110627193757_add_allowed_mode_and_format_to_acl.rb +11 -0
  23. data/bricks/acls/zena/test/integration/acl_integration_test.rb +42 -0
  24. data/bricks/acls/zena/test/sites/erebus/acls.yml +8 -0
  25. data/bricks/mongrel/zena/deploy.rb +19 -0
  26. data/bricks/single/lib/bricks/single.rb +15 -0
  27. data/bricks/single/zena/init.rb +1 -0
  28. data/bricks/sphinx/zena/tasks.rb +1 -1
  29. data/bricks/static/lib/bricks/static.rb +151 -0
  30. data/bricks/static/zena/init.rb +1 -0
  31. data/bricks/static/zena/migrate/20110702010330_add_static_to_idx_templates.rb +12 -0
  32. data/bricks/static/zena/skins/blog/Image-edit.zafu +6 -0
  33. data/bricks/static/zena/skins/blog/Image.zafu +19 -0
  34. data/bricks/static/zena/skins/blog/Node-+index.zafu +1 -0
  35. data/bricks/static/zena/skins/blog/Node-+notFound.zafu +7 -0
  36. data/bricks/static/zena/skins/blog/Node-+search.zafu +19 -0
  37. data/bricks/static/zena/skins/blog/Node.zafu +66 -0
  38. data/bricks/static/zena/skins/blog/Post.zafu +12 -0
  39. data/bricks/static/zena/skins/blog/Project--kml.zafu +30 -0
  40. data/bricks/static/zena/skins/blog/Project.zafu +45 -0
  41. data/bricks/static/zena/skins/blog/comments.zafu +30 -0
  42. data/bricks/static/zena/skins/blog/dict.yml +11 -0
  43. data/bricks/static/zena/skins/blog/img/dateBg.jpg +0 -0
  44. data/bricks/static/zena/skins/blog/img/header.png +0 -0
  45. data/bricks/static/zena/skins/blog/img/mapPin.png +0 -0
  46. data/bricks/static/zena/skins/blog/img/menu.gif +0 -0
  47. data/bricks/static/zena/skins/blog/img/menuover.gif +0 -0
  48. data/bricks/static/zena/skins/blog/img/style.css +110 -0
  49. data/bricks/static/zena/test/integration/static_integration_test.rb +30 -0
  50. data/bricks/static/zena/test/unit/static_test.rb +33 -0
  51. data/bricks/zena/zena/migrate/01_base.rb +1 -2
  52. data/bricks/zena/zena/migrate/20110623072048_fix_cached_path_index.rb +10 -0
  53. data/bricks/zena/zena/migrate/20110710113731_remove_icon_field.rb +18 -0
  54. data/config/bricks.yml +4 -0
  55. data/config/deploy.rb +17 -2
  56. data/config/gems.yml +9 -7
  57. data/config/selenium.yml +38 -0
  58. data/lib/bricks/requirements_validation.rb +8 -2
  59. data/lib/gettext_strings.rb +2 -1
  60. data/lib/tasks/zena.rake +5 -0
  61. data/lib/zena/app.rb +12 -0
  62. data/lib/zena/console.rb +9 -1
  63. data/lib/zena/core_ext/string.rb +7 -2
  64. data/lib/zena/deploy.rb +60 -6
  65. data/lib/zena/deploy/app_init.rhtml +56 -0
  66. data/lib/zena/deploy/haproxy.cnf.rhtml +34 -0
  67. data/lib/zena/deploy/httpd.rhtml +6 -0
  68. data/lib/zena/deploy/start_stop.rhtml +35 -0
  69. data/lib/zena/info.rb +1 -1
  70. data/lib/zena/remote/connection.rb +1 -1
  71. data/lib/zena/site_worker.rb +9 -5
  72. data/lib/zena/use.rb +1 -1
  73. data/lib/zena/use/action.rb +2 -2
  74. data/lib/zena/use/ajax.rb +22 -9
  75. data/lib/zena/use/conditional.rb +5 -0
  76. data/lib/zena/use/context.rb +6 -1
  77. data/lib/zena/use/dates.rb +17 -2
  78. data/lib/zena/use/display.rb +14 -3
  79. data/lib/zena/use/forms.rb +37 -47
  80. data/lib/zena/use/html_tags.rb +3 -0
  81. data/lib/zena/use/node_context.rb +17 -17
  82. data/lib/zena/use/rendering.rb +1 -1
  83. data/lib/zena/use/urls.rb +11 -2
  84. data/lib/zena/use/zafu_attributes.rb +1 -0
  85. data/lib/zena/use/zafu_safe_definitions.rb +16 -1
  86. data/lib/zena/use/zafu_templates.rb +39 -24
  87. data/lib/zena/use/zazen.rb +1 -0
  88. data/locale/de/LC_MESSAGES/zena.mo +0 -0
  89. data/locale/de/zena.po +105 -89
  90. data/locale/en/LC_MESSAGES/zena.mo +0 -0
  91. data/locale/en/zena.mo +0 -0
  92. data/locale/en/zena.po +188 -253
  93. data/locale/fr/LC_MESSAGES/zena.mo +0 -0
  94. data/locale/fr/zena.mo +0 -0
  95. data/locale/fr/zena.po +200 -257
  96. data/locale/zena.pot +95 -85
  97. data/public/javascripts/zena.js +2 -2
  98. data/test/fixtures/files/{Node-test.zafu → TestNode.zafu} +206 -4
  99. data/test/functional/nodes_controller_test.rb +2 -2
  100. data/test/integration/navigation_test.rb +9 -3
  101. data/test/integration/query_node/basic.yml +4 -4
  102. data/test/integration/query_node/filters.yml +2 -2
  103. data/test/integration/zafu_compiler/ajax.yml +6 -6
  104. data/test/integration/zafu_compiler/basic.yml +1 -1
  105. data/test/integration/zafu_compiler/calendar.yml +4 -3
  106. data/test/integration/zafu_compiler/conditional.yml +3 -10
  107. data/test/integration/zafu_compiler/context.yml +1 -1
  108. data/test/integration/zafu_compiler/dates.yml +9 -1
  109. data/test/integration/zafu_compiler/display.yml +7 -1
  110. data/test/integration/zafu_compiler/eval.yml +12 -46
  111. data/test/integration/zafu_compiler/forms.yml +1 -1
  112. data/test/integration/zafu_compiler/query.yml +2 -2
  113. data/test/integration/zafu_compiler/relations.yml +19 -9
  114. data/test/integration/zafu_compiler/roles.yml +12 -0
  115. data/test/integration/zafu_compiler/safe_definitions.yml +1 -1
  116. data/test/integration/zafu_compiler/urls.yml +13 -5
  117. data/test/integration/zafu_compiler/version.yml +6 -0
  118. data/test/integration/zafu_compiler/zafu_attributes.yml +4 -4
  119. data/test/integration/zafu_compiler_test.rb +1 -1
  120. data/test/selenium.readme +8 -0
  121. data/test/selenium/Add/0setup.rsel +12 -0
  122. data/test/selenium/Add/add1.rsel +22 -0
  123. data/test/selenium/Add/add2.rsel +22 -0
  124. data/test/selenium/Add/add3.rsel +22 -0
  125. data/test/selenium/Drop/0setup.rsel +12 -0
  126. data/test/selenium/Drop/drop1.rsel +25 -0
  127. data/test/selenium/Drop/drop2.rsel +25 -0
  128. data/test/selenium/Drop/drop3.rsel +51 -0
  129. data/test/selenium/Drop/drop4.rsel +44 -0
  130. data/test/selenium/Drop/drop5.rsel +16 -0
  131. data/test/selenium/Edit/0setup.rsel +12 -0
  132. data/test/selenium/Edit/edit1.rsel +31 -0
  133. data/test/selenium/Edit/edit2.rsel +39 -0
  134. data/test/selenium/Edit/edit3.rsel +40 -0
  135. data/test/selenium/Form/0setup.rsel +12 -0
  136. data/test/selenium/Form/form1.rsel +9 -0
  137. data/test/selenium/Form/form2.rsel +9 -0
  138. data/test/selenium/Paginate/0setup.rsel +12 -0
  139. data/test/selenium/Paginate/paginate1.rsel +24 -0
  140. data/test/selenium/Toggle/0setup.rsel +12 -0
  141. data/test/selenium/Toggle/toggle1.rsel +21 -0
  142. data/test/sites/zena/nodes.yml +4 -4
  143. data/test/sites/zena/roles.yml +3 -2
  144. data/test/sites/zena/versions.yml +12 -11
  145. data/test/unit/core_ext_test.rb +23 -5
  146. data/test/unit/document_test.rb +6 -2
  147. data/test/unit/node_test.rb +2 -2
  148. data/test/unit/remote_test.rb +1 -2
  149. data/test/unit/role_test.rb +2 -2
  150. data/test/unit/user_test.rb +48 -1
  151. data/test/unit/virtual_class_test.rb +7 -7
  152. data/test/unit/zena/acts/secure_test.rb +1 -1
  153. data/test/unit/zena/use/rendering_test.rb +1 -1
  154. data/test/unit/zena/use/urls_test.rb +3 -3
  155. data/zena.gemspec +65 -101
  156. metadata +67 -103
  157. data/vendor/TextMate/Ruby Shoulda.tmbundle/Commands/Run 2.tmCommand +0 -24
  158. data/vendor/TextMate/Ruby Shoulda.tmbundle/Commands/Run Context.tmCommand +0 -58
  159. data/vendor/TextMate/Ruby Shoulda.tmbundle/Commands/Run Focused Should.tmCommand +0 -88
  160. data/vendor/TextMate/Ruby Shoulda.tmbundle/Commands/Run.tmCommand +0 -27
  161. data/vendor/TextMate/Ruby Shoulda.tmbundle/Commands/YAML to Shoulda.tmCommand +0 -23
  162. data/vendor/TextMate/Ruby Shoulda.tmbundle/Preferences/Symbol List: Context.tmPreferences +0 -19
  163. data/vendor/TextMate/Ruby Shoulda.tmbundle/Preferences/Symbol List: Should.tmPreferences +0 -19
  164. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/Factory attributes for.tmSnippet +0 -16
  165. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/Factory build.tmSnippet +0 -16
  166. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/Factory.tmSnippet +0 -16
  167. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/Factory_define with class.tmSnippet +0 -18
  168. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/Factory_define.tmSnippet +0 -18
  169. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/Factory_next.tmSnippet +0 -16
  170. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/Factory_sequence.tmSnippet +0 -18
  171. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/assert_bad_value.tmSnippet +0 -16
  172. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/assert_contains.tmSnippet +0 -16
  173. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/assert_does_not_contain.tmSnippet +0 -16
  174. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/assert_good_value.tmSnippet +0 -16
  175. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/assert_same_elements.tmSnippet +0 -16
  176. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/assert_save.tmSnippet +0 -16
  177. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/assert_sent_email.tmSnippet +0 -18
  178. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/assert_valid.tmSnippet +0 -16
  179. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/association.tmSnippet +0 -17
  180. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/attribute.tmSnippet +0 -17
  181. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/before_should block.tmSnippet +0 -18
  182. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/context block get.tmSnippet +0 -22
  183. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/context block post.tmSnippet +0 -23
  184. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/context block with setup.tmSnippet +0 -25
  185. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/setup.tmSnippet +0 -18
  186. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should block with before proc.tmSnippet +0 -18
  187. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should block.tmSnippet +0 -18
  188. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_allow_values_for.tmSnippet +0 -16
  189. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_assign_to.tmSnippet +0 -16
  190. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_be_restful denied.tmSnippet +0 -20
  191. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_be_restful.tmSnippet +0 -20
  192. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_belong_to.tmSnippet +0 -16
  193. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_change by.tmSnippet +0 -16
  194. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_change from to.tmSnippet +0 -16
  195. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_ensure_length_at_least.tmSnippet +0 -16
  196. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_ensure_length_in_range.tmSnippet +0 -16
  197. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_ensure_length_is.tmSnippet +0 -16
  198. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_ensure_value_in_range.tmSnippet +0 -16
  199. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_eventually.tmSnippet +0 -18
  200. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_filter_params.tmSnippet +0 -16
  201. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_have_and_belong_to_many.tmSnippet +0 -16
  202. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_have_class_methods.tmSnippet +0 -16
  203. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_have_db_column.tmSnippet +0 -16
  204. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_have_db_columns.tmSnippet +0 -16
  205. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_have_index.tmSnippet +0 -16
  206. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_have_indices.tmSnippet +0 -16
  207. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_have_instance_methods.tmSnippet +0 -16
  208. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_have_many.tmSnippet +0 -16
  209. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_have_named_scope.tmSnippet +0 -16
  210. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_have_one.tmSnippet +0 -16
  211. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_have_readonly_attributes.tmSnippet +0 -16
  212. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_not_allow_mass_assignment_of.tmSnippet +0 -16
  213. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_not_allow_values_for.tmSnippet +0 -16
  214. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_not_assign_to.tmSnippet +0 -16
  215. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_not_change.tmSnippet +0 -16
  216. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_not_set_the_flash.tmSnippet +0 -16
  217. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_redirect_to.tmSnippet +0 -16
  218. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_render_a_form.tmSnippet +0 -16
  219. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_render_template.tmSnippet +0 -16
  220. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_render_with_layout.tmSnippet +0 -16
  221. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_render_without_layout.tmSnippet +0 -16
  222. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_respond_with.tmSnippet +0 -16
  223. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_respond_with_content_type.tmSnippet +0 -16
  224. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_return_from_session.tmSnippet +0 -16
  225. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_route.tmSnippet +0 -16
  226. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_set_the_flash_to.tmSnippet +0 -16
  227. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_validate_acceptance_of.tmSnippet +0 -16
  228. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_validate_numericality_of.tmSnippet +0 -16
  229. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_validate_presence_of.tmSnippet +0 -16
  230. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_validate_uniqueness_of with scope.tmSnippet +0 -16
  231. data/vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_validate_uniqueness_of.tmSnippet +0 -16
  232. data/vendor/TextMate/Ruby Shoulda.tmbundle/Support/RubyMate/catch_exception.rb +0 -39
  233. data/vendor/TextMate/Ruby Shoulda.tmbundle/Support/RubyMate/run_script.rb +0 -104
  234. data/vendor/TextMate/Ruby Shoulda.tmbundle/Support/RubyMate/stdin_dialog.rb +0 -14
  235. data/vendor/TextMate/Ruby Shoulda.tmbundle/Support/RubyMate/test.rb +0 -17
  236. data/vendor/TextMate/Ruby Shoulda.tmbundle/Support/RubyMate/todo.txt +0 -13
  237. data/vendor/TextMate/Ruby Shoulda.tmbundle/Support/bin/yaml_to_shoulda.rb +0 -25
  238. data/vendor/TextMate/Ruby Shoulda.tmbundle/Syntaxes/Ruby on Rails (Shoulda).tmLanguage +0 -166
  239. data/vendor/TextMate/Ruby Shoulda.tmbundle/info.plist +0 -304
  240. data/vendor/TextMate/Zena.tmbundle/Commands/Run all yaml tests.tmCommand +0 -37
  241. data/vendor/TextMate/Zena.tmbundle/Commands/Run focused yaml test.tmCommand +0 -52
  242. data/vendor/TextMate/Zena.tmbundle/Support/RubyMate/catch_exception.rb +0 -39
  243. data/vendor/TextMate/Zena.tmbundle/Support/RubyMate/run_script.rb +0 -118
  244. data/vendor/TextMate/Zena.tmbundle/Support/RubyMate/stdin_dialog.rb +0 -14
  245. data/vendor/TextMate/Zena.tmbundle/info.plist +0 -17
data/locale/zena.pot CHANGED
@@ -7,7 +7,7 @@
7
7
  msgid ""
8
8
  msgstr ""
9
9
  "Project-Id-Version: version 0.0.1\n"
10
- "POT-Creation-Date: 2011-06-09 19:15-0000\n"
10
+ "POT-Creation-Date: 2011-06-27 20:32-0000\n"
11
11
  "PO-Revision-Date: 2007-05-13 19:08-0000\n"
12
12
  "Last-Translator: Gaspard Bucher <gaspard@teti.ch>\n"
13
13
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
16
16
  "Content-Transfer-Encoding: 8bit\n"
17
17
  "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
18
18
 
19
- #: lib/gettext_strings.rb:118
19
+ #: lib/gettext_strings.rb:119
20
20
  msgid "%Y-%m-%d %H:%M"
21
21
  msgstr ""
22
22
 
@@ -68,15 +68,15 @@ msgstr ""
68
68
  msgid "API group"
69
69
  msgstr ""
70
70
 
71
- #: lib/gettext_strings.rb:145
71
+ #: lib/gettext_strings.rb:146
72
72
  msgid "Apr"
73
73
  msgstr ""
74
74
 
75
- #: lib/gettext_strings.rb:132
75
+ #: lib/gettext_strings.rb:133
76
76
  msgid "April"
77
77
  msgstr ""
78
78
 
79
- #: app/views/acls/_form.rhtml:58
79
+ #: app/views/acls/_form.rhtml:66
80
80
  msgid "Are you sure you want to destroy this access ?"
81
81
  msgstr ""
82
82
 
@@ -105,15 +105,15 @@ msgid ""
105
105
  "Are you sure you want to permanently remove the content of this rubbish bin ?"
106
106
  msgstr ""
107
107
 
108
- #: lib/gettext_strings.rb:149
108
+ #: lib/gettext_strings.rb:150
109
109
  msgid "Aug"
110
110
  msgstr ""
111
111
 
112
- #: lib/gettext_strings.rb:136
112
+ #: lib/gettext_strings.rb:137
113
113
  msgid "August"
114
114
  msgstr ""
115
115
 
116
- #: app/controllers/nodes_controller.rb:300
116
+ #: app/controllers/nodes_controller.rb:311
117
117
  msgid "Backup created."
118
118
  msgstr ""
119
119
 
@@ -141,15 +141,15 @@ msgstr ""
141
141
  msgid "Could not change version back to redaction."
142
142
  msgstr ""
143
143
 
144
- #: app/controllers/nodes_controller.rb:504
144
+ #: app/controllers/nodes_controller.rb:515
145
145
  msgid "Could not clear order."
146
146
  msgstr ""
147
147
 
148
- #: app/controllers/nodes_controller.rb:302
148
+ #: app/controllers/nodes_controller.rb:313
149
149
  msgid "Could not create backup."
150
150
  msgstr ""
151
151
 
152
- #: app/controllers/nodes_controller.rb:269
152
+ #: app/controllers/nodes_controller.rb:280
153
153
  msgid "Could not destroy node."
154
154
  msgstr ""
155
155
 
@@ -178,7 +178,7 @@ msgstr ""
178
178
  msgid "Could not rollback:"
179
179
  msgstr ""
180
180
 
181
- #: app/controllers/nodes_controller.rb:487
181
+ #: app/controllers/nodes_controller.rb:498
182
182
  msgid "Could not update order."
183
183
  msgstr ""
184
184
 
@@ -186,11 +186,11 @@ msgstr ""
186
186
  msgid "Data entry was successfully created."
187
187
  msgstr ""
188
188
 
189
- #: lib/gettext_strings.rb:153
189
+ #: lib/gettext_strings.rb:154
190
190
  msgid "Dec"
191
191
  msgstr ""
192
192
 
193
- #: lib/gettext_strings.rb:140
193
+ #: lib/gettext_strings.rb:141
194
194
  msgid "December"
195
195
  msgstr ""
196
196
 
@@ -198,15 +198,15 @@ msgstr ""
198
198
  msgid "Delete relation '%{role}' between '%{source}' and '%{target}' ?"
199
199
  msgstr ""
200
200
 
201
- #: lib/gettext_strings.rb:143
201
+ #: lib/gettext_strings.rb:144
202
202
  msgid "Feb"
203
203
  msgstr ""
204
204
 
205
- #: lib/gettext_strings.rb:130
205
+ #: lib/gettext_strings.rb:131
206
206
  msgid "February"
207
207
  msgstr ""
208
208
 
209
- #: lib/gettext_strings.rb:125
209
+ #: lib/gettext_strings.rb:126
210
210
  msgid "Fri"
211
211
  msgstr ""
212
212
 
@@ -222,43 +222,43 @@ msgstr ""
222
222
  msgid "Invalid login or password."
223
223
  msgstr ""
224
224
 
225
- #: lib/gettext_strings.rb:142
225
+ #: lib/gettext_strings.rb:143
226
226
  msgid "Jan"
227
227
  msgstr ""
228
228
 
229
- #: lib/gettext_strings.rb:129
229
+ #: lib/gettext_strings.rb:130
230
230
  msgid "January"
231
231
  msgstr ""
232
232
 
233
- #: lib/gettext_strings.rb:148
233
+ #: lib/gettext_strings.rb:149
234
234
  msgid "Jul"
235
235
  msgstr ""
236
236
 
237
- #: lib/gettext_strings.rb:135
237
+ #: lib/gettext_strings.rb:136
238
238
  msgid "July"
239
239
  msgstr ""
240
240
 
241
- #: lib/gettext_strings.rb:147
241
+ #: lib/gettext_strings.rb:148
242
242
  msgid "Jun"
243
243
  msgstr ""
244
244
 
245
- #: lib/gettext_strings.rb:134
245
+ #: lib/gettext_strings.rb:135
246
246
  msgid "June"
247
247
  msgstr ""
248
248
 
249
- #: lib/gettext_strings.rb:144
249
+ #: lib/gettext_strings.rb:145
250
250
  msgid "Mar"
251
251
  msgstr ""
252
252
 
253
- #: lib/gettext_strings.rb:131
253
+ #: lib/gettext_strings.rb:132
254
254
  msgid "March"
255
255
  msgstr ""
256
256
 
257
- #: lib/gettext_strings.rb:133 lib/gettext_strings.rb:146
257
+ #: lib/gettext_strings.rb:134 lib/gettext_strings.rb:147
258
258
  msgid "May"
259
259
  msgstr ""
260
260
 
261
- #: lib/gettext_strings.rb:121
261
+ #: lib/gettext_strings.rb:122
262
262
  msgid "Mon"
263
263
  msgstr ""
264
264
 
@@ -270,19 +270,19 @@ msgstr ""
270
270
  msgid "Node destroyed."
271
271
  msgstr ""
272
272
 
273
- #: lib/gettext_strings.rb:152
273
+ #: lib/gettext_strings.rb:153
274
274
  msgid "Nov"
275
275
  msgstr ""
276
276
 
277
- #: lib/gettext_strings.rb:139
277
+ #: lib/gettext_strings.rb:140
278
278
  msgid "November"
279
279
  msgstr ""
280
280
 
281
- #: lib/gettext_strings.rb:151
281
+ #: lib/gettext_strings.rb:152
282
282
  msgid "Oct"
283
283
  msgstr ""
284
284
 
285
- #: lib/gettext_strings.rb:138
285
+ #: lib/gettext_strings.rb:139
286
286
  msgid "October"
287
287
  msgstr ""
288
288
 
@@ -290,11 +290,11 @@ msgstr ""
290
290
  msgid "Order cleared."
291
291
  msgstr ""
292
292
 
293
- #: app/controllers/nodes_controller.rb:485
293
+ #: app/controllers/nodes_controller.rb:496
294
294
  msgid "Order updated"
295
295
  msgstr ""
296
296
 
297
- #: lib/gettext_strings.rb:156
297
+ #: lib/gettext_strings.rb:157
298
298
  msgid "Password:"
299
299
  msgstr ""
300
300
 
@@ -327,7 +327,7 @@ msgstr ""
327
327
  msgid "Rolled back to redaction."
328
328
  msgstr ""
329
329
 
330
- #: lib/gettext_strings.rb:126
330
+ #: lib/gettext_strings.rb:127
331
331
  msgid "Sat"
332
332
  msgstr ""
333
333
 
@@ -335,11 +335,11 @@ msgstr ""
335
335
  msgid "Saturday"
336
336
  msgstr ""
337
337
 
338
- #: lib/gettext_strings.rb:150
338
+ #: lib/gettext_strings.rb:151
339
339
  msgid "Sep"
340
340
  msgstr ""
341
341
 
342
- #: lib/gettext_strings.rb:137
342
+ #: lib/gettext_strings.rb:138
343
343
  msgid "September"
344
344
  msgstr ""
345
345
 
@@ -347,7 +347,7 @@ msgstr ""
347
347
  msgid "Site was successfully updated."
348
348
  msgstr ""
349
349
 
350
- #: lib/gettext_strings.rb:127
350
+ #: lib/gettext_strings.rb:128
351
351
  msgid "Sun"
352
352
  msgstr ""
353
353
 
@@ -359,7 +359,7 @@ msgstr ""
359
359
  msgid "This node contains sub-nodes: it cannot be destroyed."
360
360
  msgstr ""
361
361
 
362
- #: lib/gettext_strings.rb:124
362
+ #: lib/gettext_strings.rb:125
363
363
  msgid "Thu"
364
364
  msgstr ""
365
365
 
@@ -367,7 +367,7 @@ msgstr ""
367
367
  msgid "Thursday"
368
368
  msgstr ""
369
369
 
370
- #: lib/gettext_strings.rb:122
370
+ #: lib/gettext_strings.rb:123
371
371
  msgid "Tue"
372
372
  msgstr ""
373
373
 
@@ -387,7 +387,7 @@ msgstr ""
387
387
  msgid "Upload succeeded."
388
388
  msgstr ""
389
389
 
390
- #: lib/gettext_strings.rb:155
390
+ #: lib/gettext_strings.rb:156
391
391
  msgid "User name:"
392
392
  msgstr ""
393
393
 
@@ -407,7 +407,7 @@ msgstr ""
407
407
  msgid "VirtualClass was successfully updated."
408
408
  msgstr ""
409
409
 
410
- #: lib/gettext_strings.rb:123
410
+ #: lib/gettext_strings.rb:124
411
411
  msgid "Wed"
412
412
  msgstr ""
413
413
 
@@ -435,23 +435,31 @@ msgstr ""
435
435
  msgid "acl_action_help"
436
436
  msgstr ""
437
437
 
438
- #: app/views/acls/_form.rhtml:43
438
+ #: app/views/acls/_form.rhtml:51
439
439
  msgid "acl_exec_group_help"
440
440
  msgstr ""
441
441
 
442
- #: app/views/acls/_form.rhtml:47
442
+ #: app/views/acls/_form.rhtml:55
443
443
  msgid "acl_exec_skin_help"
444
444
  msgstr ""
445
445
 
446
+ #: app/views/acls/_form.rhtml:39
447
+ msgid "acl_format_help"
448
+ msgstr ""
449
+
446
450
  #: app/views/acls/_form.rhtml:19
447
451
  msgid "acl_group_help"
448
452
  msgstr ""
449
453
 
454
+ #: app/views/acls/_form.rhtml:35
455
+ msgid "acl_mode_help"
456
+ msgstr ""
457
+
450
458
  #: app/views/acls/_form.rhtml:27
451
459
  msgid "acl_priority_help"
452
460
  msgstr ""
453
461
 
454
- #: app/views/acls/_form.rhtml:39
462
+ #: app/views/acls/_form.rhtml:47
455
463
  msgid "acl_query_help"
456
464
  msgstr ""
457
465
 
@@ -464,7 +472,7 @@ msgstr ""
464
472
  msgid "action"
465
473
  msgstr ""
466
474
 
467
- #: lib/gettext_strings.rb:169
475
+ #: lib/gettext_strings.rb:170
468
476
  msgid "address"
469
477
  msgstr ""
470
478
 
@@ -496,7 +504,7 @@ msgstr ""
496
504
  msgid "bak"
497
505
  msgstr ""
498
506
 
499
- #: lib/gettext_strings.rb:176
507
+ #: lib/gettext_strings.rb:177
500
508
  msgid "birthday"
501
509
  msgstr ""
502
510
 
@@ -689,11 +697,11 @@ msgstr ""
689
697
  msgid "classes import"
690
698
  msgstr ""
691
699
 
692
- #: lib/gettext_strings.rb:179
700
+ #: lib/gettext_strings.rb:180
693
701
  msgid "clear_cache"
694
702
  msgstr ""
695
703
 
696
- #: lib/gettext_strings.rb:180
704
+ #: lib/gettext_strings.rb:181
697
705
  msgid "clear_cache done."
698
706
  msgstr ""
699
707
 
@@ -743,7 +751,7 @@ msgstr ""
743
751
  msgid "convert"
744
752
  msgstr ""
745
753
 
746
- #: app/models/node.rb:1540 app/models/node.rb:1552
754
+ #: app/models/node.rb:1535 app/models/node.rb:1547
747
755
  #: app/models/relation_proxy.rb:185 app/models/relation_proxy.rb:209
748
756
  msgid "could not be found"
749
757
  msgstr ""
@@ -752,15 +760,15 @@ msgstr ""
752
760
  msgid "could not save value (bad attribute)"
753
761
  msgstr ""
754
762
 
755
- #: app/controllers/nodes_controller.rb:357
763
+ #: app/controllers/nodes_controller.rb:368
756
764
  msgid "could not update"
757
765
  msgstr ""
758
766
 
759
- #: app/controllers/users_controller.rb:119
767
+ #: app/controllers/users_controller.rb:117
760
768
  msgid "could not update user"
761
769
  msgstr ""
762
770
 
763
- #: lib/gettext_strings.rb:172
771
+ #: lib/gettext_strings.rb:173
764
772
  msgid "country"
765
773
  msgstr ""
766
774
 
@@ -811,17 +819,17 @@ msgstr ""
811
819
  msgid "deleted"
812
820
  msgstr ""
813
821
 
814
- #: app/views/acls/_form.rhtml:35
822
+ #: app/views/acls/_form.rhtml:43
815
823
  msgid "description"
816
824
  msgstr ""
817
825
 
818
826
  #: app/views/columns/_form.html.erb:33 app/views/relations/_form.erb:44
819
- #: app/views/virtual_classes/_form.erb:52 app/views/acls/_form.rhtml:60
827
+ #: app/views/virtual_classes/_form.erb:52 app/views/acls/_form.rhtml:68
820
828
  #: app/views/groups/_form.rhtml:41 app/views/iformats/_form.rhtml:27
821
829
  msgid "destroy"
822
830
  msgstr ""
823
831
 
824
- #: app/views/acls/_form.rhtml:60
832
+ #: app/views/acls/_form.rhtml:68
825
833
  msgid "destroy acl"
826
834
  msgstr ""
827
835
 
@@ -869,7 +877,7 @@ msgstr ""
869
877
  msgid "drive_tab"
870
878
  msgstr ""
871
879
 
872
- #: lib/zena/use/urls.rb:824
880
+ #: lib/zena/use/urls.rb:834
873
881
  msgid "edit"
874
882
  msgstr ""
875
883
 
@@ -881,7 +889,7 @@ msgstr ""
881
889
  msgid "edit site"
882
890
  msgstr ""
883
891
 
884
- #: lib/gettext_strings.rb:175
892
+ #: lib/gettext_strings.rb:176
885
893
  msgid "email"
886
894
  msgstr ""
887
895
 
@@ -889,11 +897,11 @@ msgstr ""
889
897
  msgid "en"
890
898
  msgstr ""
891
899
 
892
- #: app/views/acls/_form.rhtml:43 app/views/acls/index.rhtml:10
900
+ #: app/views/acls/_form.rhtml:51 app/views/acls/index.rhtml:12
893
901
  msgid "exec group"
894
902
  msgstr ""
895
903
 
896
- #: app/views/acls/_form.rhtml:47 app/views/acls/index.rhtml:11
904
+ #: app/views/acls/_form.rhtml:55 app/views/acls/index.rhtml:13
897
905
  msgid "exec skin"
898
906
  msgstr ""
899
907
 
@@ -909,10 +917,11 @@ msgstr ""
909
917
  msgid "file_tab"
910
918
  msgstr ""
911
919
 
912
- #: lib/gettext_strings.rb:167
920
+ #: lib/gettext_strings.rb:168
913
921
  msgid "first_name"
914
922
  msgstr ""
915
923
 
924
+ #: app/views/acls/_form.rhtml:39 app/views/acls/index.rhtml:10
916
925
  #: app/views/templates/document_create_tabs/_template.rhtml:16
917
926
  #: app/views/templates/edit_tabs/_template.rhtml:1
918
927
  msgid "format"
@@ -1036,11 +1045,11 @@ msgstr ""
1036
1045
  msgid "img_custom_inherit"
1037
1046
  msgstr ""
1038
1047
 
1039
- #: lib/gettext_strings.rb:188
1048
+ #: lib/gettext_strings.rb:189
1040
1049
  msgid "img_datetime"
1041
1050
  msgstr ""
1042
1051
 
1043
- #: lib/gettext_strings.rb:187
1052
+ #: lib/gettext_strings.rb:188
1044
1053
  msgid "img_float"
1045
1054
  msgstr ""
1046
1055
 
@@ -1064,7 +1073,7 @@ msgstr ""
1064
1073
  msgid "img_has_one"
1065
1074
  msgstr ""
1066
1075
 
1067
- #: lib/gettext_strings.rb:186
1076
+ #: lib/gettext_strings.rb:187
1068
1077
  msgid "img_integer"
1069
1078
  msgstr ""
1070
1079
 
@@ -1088,7 +1097,7 @@ msgstr ""
1088
1097
  msgid "img_private"
1089
1098
  msgstr ""
1090
1099
 
1091
- #: lib/gettext_strings.rb:48 lib/zena/use/html_tags.rb:109
1100
+ #: lib/gettext_strings.rb:48 lib/zena/use/html_tags.rb:112
1092
1101
  msgid "img_public"
1093
1102
  msgstr ""
1094
1103
 
@@ -1096,7 +1105,7 @@ msgstr ""
1096
1105
  msgid "img_relation"
1097
1106
  msgstr ""
1098
1107
 
1099
- #: lib/gettext_strings.rb:185
1108
+ #: lib/gettext_strings.rb:186
1100
1109
  msgid "img_string"
1101
1110
  msgstr ""
1102
1111
 
@@ -1157,7 +1166,7 @@ msgstr ""
1157
1166
  msgid "index"
1158
1167
  msgstr ""
1159
1168
 
1160
- #: app/controllers/users_controller.rb:117
1169
+ #: app/controllers/users_controller.rb:115
1161
1170
  msgid "information successfully updated"
1162
1171
  msgstr ""
1163
1172
 
@@ -1194,7 +1203,7 @@ msgstr ""
1194
1203
  msgid "language"
1195
1204
  msgstr ""
1196
1205
 
1197
- #: lib/gettext_strings.rb:168
1206
+ #: lib/gettext_strings.rb:169
1198
1207
  msgid "last_name"
1199
1208
  msgstr ""
1200
1209
 
@@ -1206,7 +1215,7 @@ msgstr ""
1206
1215
  msgid "links_tab"
1207
1216
  msgstr ""
1208
1217
 
1209
- #: lib/gettext_strings.rb:171
1218
+ #: lib/gettext_strings.rb:172
1210
1219
  msgid "locality"
1211
1220
  msgstr ""
1212
1221
 
@@ -1234,10 +1243,11 @@ msgstr ""
1234
1243
  msgid "missing target"
1235
1244
  msgstr ""
1236
1245
 
1237
- #: lib/gettext_strings.rb:174
1246
+ #: lib/gettext_strings.rb:175
1238
1247
  msgid "mobile"
1239
1248
  msgstr ""
1240
1249
 
1250
+ #: app/views/acls/_form.rhtml:35 app/views/acls/index.rhtml:9
1241
1251
  #: app/views/nodes/_groups.rhtml:14
1242
1252
  #: app/views/templates/document_create_tabs/_template.rhtml:13
1243
1253
  #: app/views/templates/edit_tabs/_template.rhtml:4
@@ -1264,7 +1274,7 @@ msgstr ""
1264
1274
  msgid "name"
1265
1275
  msgstr ""
1266
1276
 
1267
- #: app/controllers/nodes_controller.rb:461
1277
+ #: app/controllers/nodes_controller.rb:472
1268
1278
  msgid "new"
1269
1279
  msgstr ""
1270
1280
 
@@ -1280,7 +1290,7 @@ msgstr ""
1280
1290
  msgid "new relation"
1281
1291
  msgstr ""
1282
1292
 
1283
- #: lib/gettext_strings.rb:119
1293
+ #: lib/gettext_strings.rb:120
1284
1294
  msgid "news_date"
1285
1295
  msgstr ""
1286
1296
 
@@ -1292,11 +1302,11 @@ msgstr ""
1292
1302
  msgid "no result found"
1293
1303
  msgstr ""
1294
1304
 
1295
- #: app/controllers/nodes_controller.rb:461
1305
+ #: app/controllers/nodes_controller.rb:472
1296
1306
  msgid "node not found"
1297
1307
  msgstr ""
1298
1308
 
1299
- #: app/controllers/nodes_controller.rb:355
1309
+ #: app/controllers/nodes_controller.rb:366
1300
1310
  msgid "node updated"
1301
1311
  msgstr ""
1302
1312
 
@@ -1358,7 +1368,7 @@ msgstr ""
1358
1368
  msgid "popup"
1359
1369
  msgstr ""
1360
1370
 
1361
- #: lib/gettext_strings.rb:170
1371
+ #: lib/gettext_strings.rb:171
1362
1372
  msgid "postal_code"
1363
1373
  msgstr ""
1364
1374
 
@@ -1411,7 +1421,7 @@ msgstr ""
1411
1421
  msgid "publishers"
1412
1422
  msgstr ""
1413
1423
 
1414
- #: app/views/acls/_form.rhtml:39 app/views/acls/index.rhtml:9
1424
+ #: app/views/acls/_form.rhtml:47 app/views/acls/index.rhtml:11
1415
1425
  msgid "query"
1416
1426
  msgstr ""
1417
1427
 
@@ -1427,23 +1437,23 @@ msgstr ""
1427
1437
  msgid "readers"
1428
1438
  msgstr ""
1429
1439
 
1430
- #: lib/gettext_strings.rb:163
1440
+ #: lib/gettext_strings.rb:164
1431
1441
  msgid "rebuild"
1432
1442
  msgstr ""
1433
1443
 
1434
- #: lib/gettext_strings.rb:164
1444
+ #: lib/gettext_strings.rb:165
1435
1445
  msgid "rebuild_btn"
1436
1446
  msgstr ""
1437
1447
 
1438
- #: lib/gettext_strings.rb:181
1448
+ #: lib/gettext_strings.rb:182
1439
1449
  msgid "rebuild_index"
1440
1450
  msgstr ""
1441
1451
 
1442
- #: lib/gettext_strings.rb:182
1452
+ #: lib/gettext_strings.rb:183
1443
1453
  msgid "rebuild_index done."
1444
1454
  msgstr ""
1445
1455
 
1446
- #: lib/gettext_strings.rb:160
1456
+ #: lib/gettext_strings.rb:161
1447
1457
  msgid "redaction saved"
1448
1458
  msgstr ""
1449
1459
 
@@ -1610,7 +1620,7 @@ msgstr ""
1610
1620
  msgid "tags"
1611
1621
  msgstr ""
1612
1622
 
1613
- #: lib/gettext_strings.rb:173
1623
+ #: lib/gettext_strings.rb:174
1614
1624
  msgid "telephone"
1615
1625
  msgstr ""
1616
1626
 
@@ -1656,7 +1666,7 @@ msgstr ""
1656
1666
  msgid "turn dev on"
1657
1667
  msgstr ""
1658
1668
 
1659
- #: lib/gettext_strings.rb:165
1669
+ #: lib/gettext_strings.rb:166
1660
1670
  msgid "turn_dev_off_btn"
1661
1671
  msgstr ""
1662
1672
 
@@ -1665,7 +1675,7 @@ msgstr ""
1665
1675
  msgid "type"
1666
1676
  msgstr ""
1667
1677
 
1668
- #: app/models/node.rb:1547
1678
+ #: app/models/node.rb:1542
1669
1679
  msgid "type mismatch (%{type} is not a Skin)"
1670
1680
  msgstr ""
1671
1681
 
@@ -1693,7 +1703,7 @@ msgstr ""
1693
1703
  #: app/views/columns/_form.html.erb:28 app/views/relations/_form.erb:39
1694
1704
  #: app/views/sites/_form.erb:40 app/views/users/preferences.html.erb:19
1695
1705
  #: app/views/users/preferences.html.erb:38
1696
- #: app/views/virtual_classes/_form.erb:46 app/views/acls/_form.rhtml:52
1706
+ #: app/views/virtual_classes/_form.erb:46 app/views/acls/_form.rhtml:60
1697
1707
  #: app/views/comments/_form.rhtml:23 app/views/groups/_form.rhtml:35
1698
1708
  #: app/views/iformats/_form.rhtml:22 app/views/nodes/_edit_attribute.rhtml:15
1699
1709
  #: app/views/templates/document_create_tabs/_file.rhtml:3
@@ -1737,6 +1747,6 @@ msgstr ""
1737
1747
  msgid "yesterday"
1738
1748
  msgstr ""
1739
1749
 
1740
- #: lib/gettext_strings.rb:159
1750
+ #: lib/gettext_strings.rb:160
1741
1751
  msgid "you are editing the original"
1742
1752
  msgstr ""