zena 1.0.0.beta3 → 1.0.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (418) hide show
  1. data/History.txt +29 -0
  2. data/Rakefile +2 -0
  3. data/TODO_ZENA_1_0 +13 -23
  4. data/app/controllers/columns_controller.rb +1 -1
  5. data/app/controllers/comments_controller.rb +4 -3
  6. data/app/controllers/documents_controller.rb +8 -11
  7. data/app/controllers/nodes_controller.rb +39 -21
  8. data/app/controllers/users_controller.rb +8 -3
  9. data/app/controllers/versions_controller.rb +2 -2
  10. data/app/controllers/virtual_classes_controller.rb +17 -11
  11. data/app/helpers/documents_helper.rb +0 -3
  12. data/app/helpers/users_helper.rb +17 -0
  13. data/app/models/cache.rb +36 -31
  14. data/app/models/column.rb +48 -5
  15. data/app/models/comment.rb +14 -5
  16. data/app/models/data_entry.rb +2 -2
  17. data/app/models/document.rb +23 -33
  18. data/app/models/idx_nodes_datetime.rb +4 -0
  19. data/app/models/idx_nodes_float.rb +4 -0
  20. data/app/models/idx_project.rb +3 -0
  21. data/app/models/node.rb +372 -308
  22. data/app/models/page.rb +1 -31
  23. data/app/models/relation.rb +4 -4
  24. data/app/models/relation_proxy.rb +128 -17
  25. data/app/models/role.rb +27 -2
  26. data/app/models/site.rb +64 -56
  27. data/app/models/template.rb +11 -12
  28. data/app/models/text_document.rb +6 -7
  29. data/app/models/user.rb +95 -46
  30. data/app/models/version.rb +2 -2
  31. data/app/models/virtual_class.rb +418 -73
  32. data/app/views/columns/_form.html.erb +1 -1
  33. data/app/views/columns/_li.html.erb +1 -1
  34. data/app/views/comments/_form.rhtml +1 -1
  35. data/app/views/comments/_li.rhtml +1 -1
  36. data/app/views/comments/_li_simple.rhtml +1 -1
  37. data/app/views/groups/_form.rhtml +1 -1
  38. data/app/views/links/_li.rhtml +1 -1
  39. data/app/views/nodes/_groups.rhtml +1 -1
  40. data/app/views/nodes/_import_results.rhtml +1 -1
  41. data/app/views/nodes/_parent.rhtml +1 -1
  42. data/app/views/nodes/_results.rhtml +1 -1
  43. data/app/views/nodes/create.rjs +4 -2
  44. data/app/views/relations/_li.erb +2 -2
  45. data/app/views/templates/document_create_tabs/_file.rhtml +1 -1
  46. data/app/views/templates/document_create_tabs/_template.rhtml +2 -2
  47. data/app/views/templates/document_create_tabs/_text_document.rhtml +2 -2
  48. data/app/views/templates/edit_tabs/_help.rhtml +1 -1
  49. data/app/views/templates/edit_tabs/_title.rhtml +0 -3
  50. data/app/views/users/_form.rhtml +2 -6
  51. data/app/views/users/_li.rhtml +1 -3
  52. data/app/views/users/create.rjs +4 -4
  53. data/app/views/users/preferences.html.erb +1 -4
  54. data/app/views/versions/custom_tab.rhtml +5 -0
  55. data/app/views/virtual_classes/_form.erb +20 -10
  56. data/app/views/virtual_classes/_li.erb +21 -8
  57. data/app/views/zafu/default/Node-+search.zafu +1 -1
  58. data/app/views/zafu/default/Node.zafu +3 -3
  59. data/bricks/captcha/lib/bricks/captcha.rb +1 -1
  60. data/bricks/mongrel/zena/deploy.rb +14 -0
  61. data/bricks/{data2pdf → pdf}/.document +0 -0
  62. data/bricks/pdf/README +33 -0
  63. data/bricks/{data2pdf → pdf}/Rakefile +0 -0
  64. data/bricks/pdf/VERSION +1 -0
  65. data/bricks/pdf/lib/bricks/pdf.rb +110 -0
  66. data/bricks/pdf/lib/bricks/pdf/engine/prince.rb +38 -0
  67. data/bricks/pdf/lib/bricks/pdf/engine/xhtml2pdf.rb +9 -0
  68. data/bricks/pdf/lib/bricks/pdf/install.rb +121 -0
  69. data/bricks/pdf/test/engines/test_prince.rb +15 -0
  70. data/bricks/pdf/test/engines/test_xhtml2pdf.rb +15 -0
  71. data/bricks/{data2pdf → pdf}/test/fixtures/application.css +0 -0
  72. data/bricks/{data2pdf → pdf}/test/fixtures/contact.html +0 -0
  73. data/bricks/{data2pdf → pdf}/test/fixtures/pisa-default.css +0 -0
  74. data/bricks/{data2pdf → pdf}/test/fixtures/sheet1.css +0 -0
  75. data/bricks/{data2pdf → pdf}/test/fixtures/sheet2.css +0 -0
  76. data/bricks/{data2pdf → pdf}/test/fixtures/simple-html.html +0 -0
  77. data/bricks/{data2pdf → pdf}/test/fixtures/simple-text.txt +0 -0
  78. data/bricks/{data2pdf → pdf}/test/helper.rb +4 -5
  79. data/bricks/pdf/test/shoulda_macros/shoulda_pdf.rb +72 -0
  80. data/bricks/pdf/zena/init.rb +5 -0
  81. data/bricks/pdf/zena/tasks.rb +17 -0
  82. data/bricks/sphinx/lib/{use_sphinx.rb → bricks/sphinx.rb} +1 -1
  83. data/bricks/tags/zena/init.rb +2 -2
  84. data/bricks/tags/zena/test/zafu/tags.yml +4 -4
  85. data/bricks/zena/zena/migrate/01_base.rb +482 -0
  86. data/config/bricks.yml +22 -6
  87. data/config/gems.yml +8 -6
  88. data/db/20100628074512_zena0x_to1x.rb +6 -1
  89. data/db/fix/024_correct_vclass_kpath.rb +11 -0
  90. data/db/fix/025_move_tag_into_vclass.rb +13 -0
  91. data/db/{migrate → fix}/026_rename_templates.rb +0 -0
  92. data/db/{migrate → fix}/045_avoid_star_in_templates.rb +0 -0
  93. data/db/{migrate → fix}/046_fix_zazen_image_tag.rb +0 -0
  94. data/db/{migrate → fix}/047_change_default_link_id_to_zero.rb +1 -3
  95. data/db/{migrate → fix}/049_fix_publish_from_is_null.rb +0 -0
  96. data/db/{migrate → fix}/20090924141459_zafu_fix_sept09.rb +0 -0
  97. data/db/{migrate → fix}/20091013100351_rename_publish_group_to_drive_group.rb +1 -3
  98. data/db/{migrate → fix}/20091124161608_rebuild_fullpath.rb +0 -1
  99. data/db/{migrate → fix}/20100115134729_rebuild_fullpath_after_fix.rb +0 -0
  100. data/db/{migrate → fix}/20100526090140_renamed_contact_model_to_base_contact.rb +2 -4
  101. data/db/{migrate → fix/old_migrations}/001_create_base.rb +0 -1
  102. data/db/{migrate → fix/old_migrations}/002_add_time_zone_to_users.rb +0 -0
  103. data/db/{migrate → fix/old_migrations}/003_add_custom_base_flag.rb +0 -0
  104. data/db/{migrate → fix/old_migrations}/004_rename_template_skin.rb +0 -0
  105. data/db/{migrate → fix/old_migrations}/005_create_cached_pages.rb +0 -0
  106. data/db/{migrate → fix/old_migrations}/006_create_sites.rb +0 -0
  107. data/db/{migrate → fix/old_migrations}/007_replace_id_by_zip.rb +0 -0
  108. data/db/{migrate → fix/old_migrations}/008_user_status.rb +0 -0
  109. data/db/{migrate → fix/old_migrations}/009_fulltext.rb +0 -0
  110. data/db/fix/old_migrations/010_create_template_content.rb +17 -0
  111. data/db/{migrate → fix/old_migrations}/011_project_to_section.rb +0 -0
  112. data/db/{migrate → fix/old_migrations}/012_add_project_id.rb +0 -0
  113. data/db/{migrate → fix/old_migrations}/013_remove_defaults.rb +0 -0
  114. data/db/{migrate → fix/old_migrations}/014_add_sort_field.rb +0 -0
  115. data/db/{migrate → fix/old_migrations}/015_add_dyn_attributes.rb +0 -0
  116. data/db/{migrate → fix/old_migrations}/016_remove_translations.rb +0 -0
  117. data/db/{migrate → fix/old_migrations}/017_rename_authorize.rb +0 -0
  118. data/db/{migrate → fix/old_migrations}/018_add_auth_option.rb +0 -0
  119. data/db/{migrate → fix/old_migrations}/019_remove_user_status.rb +0 -0
  120. data/db/{migrate → fix/old_migrations}/020_create_participation.rb +0 -0
  121. data/db/{migrate → fix/old_migrations}/021_create_relations.rb +0 -0
  122. data/db/{migrate → fix/old_migrations}/022_create_virtual_classes.rb +0 -0
  123. data/db/{migrate → fix/old_migrations}/023_ip_on_anonymous_comment.rb +0 -0
  124. data/db/{migrate → fix/old_migrations}/027_add_country_to_contacts.rb +0 -0
  125. data/db/{migrate → fix/old_migrations}/028_change_size_of_conten_type_field.rb +0 -0
  126. data/db/{migrate → fix/old_migrations}/029_create_data_entries.rb +0 -0
  127. data/db/{migrate → fix/old_migrations}/030_redit_auto_publish_site_settings.rb +0 -0
  128. data/db/{migrate → fix/old_migrations}/031_create_iformats.rb +0 -0
  129. data/db/{migrate → fix/old_migrations}/032_caches_context_as_hash.rb +0 -0
  130. data/db/{migrate → fix/old_migrations}/033_documents_kpath_change.rb +0 -0
  131. data/db/{migrate → fix/old_migrations}/034_change_file_storage.rb +0 -0
  132. data/db/{migrate → fix/old_migrations}/035_add_status_to_link.rb +0 -0
  133. data/db/{migrate → fix/old_migrations}/036_add_flag_fields_on_nodes.rb +0 -0
  134. data/db/{migrate → fix/old_migrations}/037_add_auto_create_discussion_to_v_class.rb +0 -0
  135. data/db/{migrate → fix/old_migrations}/038_create_site_attributes.rb +0 -0
  136. data/db/{migrate → fix/old_migrations}/039_default_position.rb +0 -0
  137. data/db/{migrate → fix/old_migrations}/040_second_value_for_data_entry.rb +0 -0
  138. data/db/{migrate → fix/old_migrations}/041_add_attributes_to_v_class.rb +0 -0
  139. data/db/{migrate → fix/old_migrations}/042_fix_position_should_be_float.rb +0 -0
  140. data/db/{migrate → fix/old_migrations}/043_move_user_lang_into_participation.rb +0 -0
  141. data/db/{migrate → fix/old_migrations}/044_remove_monolingual_site_option.rb +0 -0
  142. data/db/{migrate → fix/old_migrations}/048_link_source_target_can_be_null.rb +0 -0
  143. data/db/{migrate → fix/old_migrations}/050_date_in_links.rb +0 -0
  144. data/db/{migrate → fix/old_migrations}/051_add_exif_tags_to_images.rb +0 -0
  145. data/db/{migrate → fix/old_migrations}/20090825201159_insert_zero_link.rb +0 -0
  146. data/db/{migrate → fix/old_migrations}/20090825201200_merge_bricks_migrations_with_std_migrations.rb +0 -0
  147. data/db/{migrate → fix/old_migrations}/20090927125912_allow_null_in_text_fields.rb +0 -0
  148. data/db/{migrate → fix/old_migrations}/20090928133440_no_more_private_nodes.rb +0 -0
  149. data/db/{migrate → fix/old_migrations}/20090928143754_version_status_change.rb +0 -0
  150. data/db/{migrate → fix/old_migrations}/20091001084025_change_status_values_for_comments.rb +0 -0
  151. data/db/{migrate → fix/old_migrations}/20091009084057_add_vhash_in_node.rb +0 -0
  152. data/db/{migrate → fix/old_migrations}/20091014130833_fix_template_title.rb +0 -0
  153. data/db/{migrate → fix/old_migrations}/20091014183726_merge_participation_into_users.rb +0 -0
  154. data/db/{migrate → fix/old_migrations}/20091018200734_add_popup_info_to_image_format.rb +0 -0
  155. data/db/{migrate → fix/old_migrations}/20091026161708_add_persistence_token.rb +0 -0
  156. data/db/{migrate → fix/old_migrations}/20091101184952_add_session_table.rb +0 -0
  157. data/db/{migrate → fix/old_migrations}/20091123175137_add_single_access_token.rb +0 -0
  158. data/db/{migrate → fix/old_migrations}/20100125062254_add_dynamo_to_version.rb +0 -0
  159. data/db/{migrate → fix/old_migrations}/20100201133242_remove_default_status_on_version.rb +0 -0
  160. data/db/{migrate → fix/old_migrations}/20100208194210_create_attachments.rb +0 -0
  161. data/db/{migrate → fix/old_migrations}/20100210112319_change_dynamo_to_property.rb +0 -0
  162. data/db/{migrate → fix/old_migrations}/20100320145726_transform_template_contents_into_index.rb +0 -0
  163. data/db/{migrate → fix/old_migrations}/20100328125634_change_skin_name_to_id.rb +0 -0
  164. data/db/{migrate → fix/old_migrations}/20100417061257_add_properties_to_sites.rb +0 -0
  165. data/db/{migrate → fix/old_migrations}/20100419163149_rename_name_to_node_name.rb +0 -0
  166. data/db/{migrate → fix/old_migrations}/20100422091606_change_v_class_table_into_roles.rb +0 -0
  167. data/db/{migrate → fix/old_migrations}/20100422094048_node_habtm_roles.rb +0 -0
  168. data/db/{migrate → fix/old_migrations}/20100422115935_create_columns.rb +0 -0
  169. data/db/{migrate → fix/old_migrations}/20100513181529_add_site_id_to_columns.rb +0 -0
  170. data/db/{migrate → fix/old_migrations}/20100519091711_add_index_definition_to_columns.rb +0 -0
  171. data/db/{migrate → fix/old_migrations}/20100519091940_create_idx_nodes_string.rb +0 -0
  172. data/db/{migrate → fix/old_migrations}/20100519232432_create_idx_nodes_ml_string.rb +0 -0
  173. data/db/{migrate → fix/old_migrations}/20100525113858_add_porperties_to_users.rb +0 -0
  174. data/db/{migrate → fix/old_migrations}/20100527130937_change_column_index_to_string.rb +0 -0
  175. data/db/{migrate → fix/old_migrations}/20100531135128_add_fulltext_builder_fields.rb +0 -0
  176. data/db/{migrate → fix/old_migrations}/20100915062903_add_api_group_id_to_site.rb +0 -0
  177. data/db/fix/old_migrations/20100923154807_remove_base_contact.rb +84 -0
  178. data/db/fix/old_migrations/20100926192223_remove_su_user.rb +8 -0
  179. data/db/fix/old_migrations/20100927141658_add_eval_attributes_to_v_class.rb +12 -0
  180. data/db/fix/old_migrations/20100928185257_add_obvious_idx.rb +52 -0
  181. data/db/fix/old_migrations/20100929143111_remove_node_name.rb +11 -0
  182. data/db/fix/old_migrations/20101006090454_store_properties_in_long_text.rb +9 -0
  183. data/db/fix/old_migrations/20101014185753_remove_user_prototype_id.rb +9 -0
  184. data/db/fix/old_migrations/20101101084318_create_scope_index.rb +35 -0
  185. data/db/fix/old_migrations/20101109074232_create_idx_nodes_tables.rb +65 -0
  186. data/db/fix/old_migrations/20101110184235_add_role_update_to_site.rb +9 -0
  187. data/db/fix/old_migrations/20101116103920_change_scope_index.rb +31 -0
  188. data/db/fix/old_migrations/20101123125822_add_integer_idx.rb +17 -0
  189. data/db/fix/old_migrations/20101130134522_add_index_field.rb +13 -0
  190. data/db/fix/old_migrations/20101213133816_add_group_to_relation.rb +9 -0
  191. data/db/init/base/help.fr.zml +1 -1
  192. data/db/init/base/skins/default.zml +0 -1
  193. data/db/init/base/skins/default/Node-+search.zafu +1 -1
  194. data/db/init/base/skins/default/Node-tree.zafu +3 -3
  195. data/db/init/base/skins/default/Node.zafu +3 -3
  196. data/lib/bricks/loader.rb +4 -1
  197. data/lib/bricks/requirements_validation.rb +11 -6
  198. data/lib/log_recorder/lib/log_recorder.rb +2 -2
  199. data/lib/tasks/zena.rake +25 -15
  200. data/lib/zena.rb +42 -9
  201. data/lib/zena/acts/enrollable.rb +81 -99
  202. data/lib/zena/acts/secure.rb +27 -23
  203. data/lib/zena/acts/secure_node.rb +10 -55
  204. data/lib/zena/acts/serializable.rb +9 -10
  205. data/lib/zena/app.rb +0 -2
  206. data/lib/zena/code_syntax.rb +1 -1
  207. data/lib/zena/controller/test_case.rb +0 -5
  208. data/lib/zena/core_ext/string.rb +48 -20
  209. data/lib/zena/db.rb +10 -442
  210. data/lib/zena/db_helper/abstract_db.rb +184 -0
  211. data/lib/zena/db_helper/mysql.rb +150 -0
  212. data/lib/zena/db_helper/postgresql.rb +79 -0
  213. data/lib/zena/db_helper/sqlite3.rb +135 -0
  214. data/lib/zena/deploy.rb +4 -1
  215. data/lib/zena/deploy/httpd.rhtml +3 -3
  216. data/lib/zena/deploy/vhost.rhtml +1 -1
  217. data/lib/zena/foxy_parser.rb +37 -18
  218. data/lib/zena/info.rb +3 -13
  219. data/lib/zena/migrator.rb +0 -1
  220. data/lib/zena/parser/zafu_rules.rb +9 -4
  221. data/lib/zena/parser/zazen_rules.rb +5 -5
  222. data/lib/zena/parser/zena_rules.rb +1 -1
  223. data/lib/zena/remote/interface.rb +1 -1
  224. data/lib/zena/site_worker.rb +3 -3
  225. data/lib/zena/test_controller.rb +10 -10
  226. data/lib/zena/use/action.rb +66 -6
  227. data/lib/zena/use/ajax.rb +39 -13
  228. data/lib/zena/use/ancestry.rb +210 -0
  229. data/lib/zena/use/authlogic.rb +30 -1
  230. data/lib/zena/use/calendar.rb +158 -0
  231. data/lib/zena/use/conditional.rb +3 -2
  232. data/lib/zena/use/context.rb +42 -12
  233. data/lib/zena/use/dates.rb +15 -14
  234. data/lib/zena/use/display.rb +54 -7
  235. data/lib/zena/use/error_rendering.rb +1 -0
  236. data/lib/zena/use/field_index.rb +20 -0
  237. data/lib/zena/use/fixtures.rb +12 -9
  238. data/lib/zena/use/forms.rb +230 -106
  239. data/lib/zena/use/fulltext.rb +28 -14
  240. data/lib/zena/use/html_tags.rb +1 -24
  241. data/lib/zena/use/i18n.rb +69 -14
  242. data/lib/zena/use/kpath.rb +60 -0
  243. data/lib/zena/use/ml_index.rb +6 -4
  244. data/lib/zena/use/node_context.rb +63 -0
  245. data/lib/zena/use/prop_eval.rb +90 -0
  246. data/lib/zena/use/query_builder.rb +159 -29
  247. data/lib/zena/use/query_comment.rb +1 -1
  248. data/lib/zena/use/query_node.rb +147 -56
  249. data/lib/zena/use/recursion.rb +2 -2
  250. data/lib/zena/use/relations.rb +31 -19
  251. data/lib/zena/use/rendering.rb +111 -121
  252. data/lib/zena/use/scope_index.rb +230 -0
  253. data/lib/zena/use/search.rb +7 -7
  254. data/lib/zena/use/urls.rb +87 -25
  255. data/lib/zena/use/version_hash.rb +113 -113
  256. data/lib/zena/use/workflow.rb +5 -1
  257. data/lib/zena/use/zafu_attributes.rb +11 -14
  258. data/lib/zena/use/zafu_eval.rb +1 -1
  259. data/lib/zena/use/zafu_safe_definitions.rb +91 -9
  260. data/lib/zena/use/zafu_templates.rb +146 -102
  261. data/lib/zena/use/zazen.rb +5 -4
  262. data/lib/zena/zafu_compiler.rb +1 -0
  263. data/locale/en/LC_MESSAGES/zena.mo +0 -0
  264. data/locale/en/zena.po +0 -1
  265. data/locale/fr/LC_MESSAGES/zena.mo +0 -0
  266. data/locale/fr/zena.mo +0 -0
  267. data/locale/fr/zena.po +4 -4
  268. data/misc/zena +35 -0
  269. data/misc/zena_init +41 -0
  270. data/public/images/ext/{basecontact.png → contact.png} +0 -0
  271. data/public/javascripts/zena.js +35 -7
  272. data/public/stylesheets/admin.css +5 -2
  273. data/public/stylesheets/default.css +2 -1
  274. data/public/stylesheets/popup.css +1 -1
  275. data/public/stylesheets/zena.css +2 -2
  276. data/test/custom_queries/complex.host.yml +12 -5
  277. data/test/fixtures/files/Node-test.zafu +3 -3
  278. data/test/fixtures/files/translations_fr.yml +4 -2
  279. data/test/functional/documents_controller_test.rb +31 -0
  280. data/test/functional/nodes_controller_commit_test.rb +1 -5
  281. data/test/functional/nodes_controller_test.rb +92 -12
  282. data/test/functional/user_sessions_controller_test.rb +2 -2
  283. data/test/functional/users_controller_test.rb +31 -29
  284. data/test/functional/versions_controller_test.rb +2 -2
  285. data/test/functional/virtual_classes_controller_test.rb +2 -2
  286. data/test/integration/multiple_hosts_test.rb +19 -8
  287. data/test/integration/navigation_test.rb +91 -12
  288. data/test/integration/query_node/basic.yml +40 -37
  289. data/test/integration/query_node/complex.yml +23 -18
  290. data/test/integration/query_node/dates.yml +3 -3
  291. data/test/integration/query_node/errors.yml +7 -1
  292. data/test/integration/query_node/filters.yml +41 -35
  293. data/test/integration/query_node/idx_fields.yml +11 -0
  294. data/test/integration/query_node/idx_key_value.yml +77 -0
  295. data/test/integration/query_node/idx_scope.yml +33 -0
  296. data/test/integration/query_node/relations.yml +13 -13
  297. data/test/integration/query_node_test.rb +6 -10
  298. data/test/integration/zafu_compiler/action.yml +19 -6
  299. data/test/integration/zafu_compiler/ajax.yml +111 -51
  300. data/test/integration/zafu_compiler/apphelper.yml +1 -1
  301. data/test/integration/zafu_compiler/asset.yml +1 -1
  302. data/test/integration/zafu_compiler/basic.yml +42 -52
  303. data/test/integration/zafu_compiler/calendar.yml +3 -3
  304. data/test/integration/zafu_compiler/complex.yml +16 -16
  305. data/test/integration/zafu_compiler/complex_ok.yml +2 -2
  306. data/test/integration/zafu_compiler/conditional.yml +42 -33
  307. data/test/integration/zafu_compiler/data.yml +3 -3
  308. data/test/integration/zafu_compiler/dates.yml +25 -10
  309. data/test/integration/zafu_compiler/display.yml +49 -12
  310. data/test/integration/zafu_compiler/errors.yml +26 -6
  311. data/test/integration/zafu_compiler/eval.yml +4 -4
  312. data/test/integration/zafu_compiler/forms.yml +89 -15
  313. data/test/integration/zafu_compiler/i18n.yml +23 -18
  314. data/test/integration/zafu_compiler/idx_scope.yml +7 -0
  315. data/test/integration/zafu_compiler/later.yml +10 -16
  316. data/test/integration/zafu_compiler/off/off.yml +2 -2
  317. data/test/integration/zafu_compiler/query.yml +207 -0
  318. data/test/integration/zafu_compiler/recursion.yml +2 -2
  319. data/test/integration/zafu_compiler/relations.yml +144 -168
  320. data/test/integration/zafu_compiler/roles.yml +86 -10
  321. data/test/integration/zafu_compiler/rubyless.yml +49 -6
  322. data/test/integration/zafu_compiler/safe_definitions.yml +35 -6
  323. data/test/integration/zafu_compiler/search.yml +1 -1
  324. data/test/integration/zafu_compiler/security.yml +37 -0
  325. data/test/integration/zafu_compiler/urls.yml +50 -40
  326. data/test/integration/zafu_compiler/user.yml +21 -6
  327. data/test/integration/zafu_compiler/version.yml +6 -6
  328. data/test/integration/zafu_compiler/zafu_attributes.yml +43 -34
  329. data/test/integration/zafu_compiler/zazen.yml +10 -10
  330. data/test/integration/zafu_compiler_test.rb +19 -13
  331. data/test/sites/complex/nodes.yml +0 -2
  332. data/test/sites/complex/roles.yml +9 -1
  333. data/test/sites/complex/sites.yml +0 -1
  334. data/test/sites/complex/users.yml +2 -5
  335. data/test/sites/ocean/nodes.yml +2 -5
  336. data/test/sites/ocean/roles.yml +8 -0
  337. data/test/sites/ocean/sites.yml +0 -1
  338. data/test/sites/ocean/users.yml +0 -13
  339. data/test/sites/zena/columns.yml +27 -5
  340. data/test/sites/zena/idx_projects.yml +5 -0
  341. data/test/sites/zena/nodes.yml +8 -32
  342. data/test/sites/zena/relations.yml +5 -0
  343. data/test/sites/zena/roles.yml +25 -3
  344. data/test/sites/zena/sites.yml +2 -2
  345. data/test/sites/zena/users.yml +1 -21
  346. data/test/sites/zena/versions.yml +35 -12
  347. data/test/test_helper.rb +7 -0
  348. data/test/unit/after_commit_test.rb +7 -7
  349. data/test/unit/cache_test.rb +32 -0
  350. data/test/unit/cached_page_test.rb +1 -1
  351. data/test/unit/column_test.rb +31 -7
  352. data/test/unit/comment_test.rb +2 -2
  353. data/test/unit/core_ext_test.rb +38 -7
  354. data/test/unit/document_test.rb +14 -42
  355. data/test/unit/node_test.rb +311 -324
  356. data/test/unit/note_test.rb +23 -31
  357. data/test/unit/page_test.rb +16 -58
  358. data/test/unit/project_test.rb +2 -2
  359. data/test/unit/relation_proxy_test.rb +148 -21
  360. data/test/unit/relation_test.rb +23 -3
  361. data/test/unit/remote_test.rb +15 -9
  362. data/test/unit/role_test.rb +9 -0
  363. data/test/unit/site_test.rb +49 -47
  364. data/test/unit/skin_test.rb +16 -0
  365. data/test/unit/template_test.rb +60 -69
  366. data/test/unit/text_document_test.rb +15 -14
  367. data/test/unit/user_test.rb +101 -41
  368. data/test/unit/version_test.rb +4 -4
  369. data/test/unit/virtual_class_test.rb +577 -36
  370. data/test/unit/workflow_test.rb +58 -21
  371. data/test/unit/zena/acts/enrollable_test.rb +36 -127
  372. data/test/unit/zena/acts/secure_test.rb +6 -22
  373. data/test/unit/zena/acts/serializable_test.rb +18 -0
  374. data/test/unit/zena/db_test.rb +14 -14
  375. data/test/unit/zena/parser/zafu.yml +5 -3
  376. data/test/unit/zena/use/ancestry_test.rb +198 -0
  377. data/test/unit/zena/use/calendar_test.rb +8 -8
  378. data/test/unit/zena/use/dates_test.rb +2 -0
  379. data/test/unit/zena/use/fulltext_test.rb +9 -1
  380. data/test/unit/zena/use/html_tags_test.rb +2 -16
  381. data/test/unit/zena/use/i18n_test.rb +2 -2
  382. data/test/unit/zena/use/kpath_test.rb +13 -0
  383. data/test/unit/zena/use/ml_index_test.rb +60 -12
  384. data/test/unit/zena/use/prop_eval_test.rb +170 -0
  385. data/test/unit/zena/use/query_node_test.rb +9 -2
  386. data/test/unit/zena/use/rendering_test.rb +98 -1
  387. data/test/unit/zena/use/scope_index_test.rb +464 -0
  388. data/test/unit/zena/use/urls_test.rb +23 -13
  389. data/test/unit/zena/use/version_hash_test.rb +2 -2
  390. data/test/unit/zena/use/zafu_template_test.rb +21 -8
  391. data/test/unit/zena/use/zazen_test.rb +47 -47
  392. data/zena.gemspec +177 -143
  393. metadata +222 -141
  394. data/app/models/base_contact.rb +0 -79
  395. data/app/models/book.rb +0 -242
  396. data/app/models/contact_content.rb +0 -70
  397. data/app/models/contact_version.rb +0 -40
  398. data/app/models/reference.rb +0 -18
  399. data/app/views/templates/edit_tabs/_basecontact.rhtml +0 -8
  400. data/bricks/data2pdf/README +0 -19
  401. data/bricks/data2pdf/VERSION +0 -1
  402. data/bricks/data2pdf/lib/data2pdf.rb +0 -60
  403. data/bricks/data2pdf/lib/engines/prince.rb +0 -39
  404. data/bricks/data2pdf/lib/engines/xhtml2pdf.rb +0 -41
  405. data/bricks/data2pdf/lib/install.rb +0 -111
  406. data/bricks/data2pdf/test/engines/test_prince.rb +0 -14
  407. data/bricks/data2pdf/test/engines/test_xhtml2pdf.rb +0 -14
  408. data/bricks/data2pdf/test/shoulda_macros/shoulda_data2pdf.rb +0 -91
  409. data/bricks/data2pdf/test/unit/test_rendering.rb +0 -37
  410. data/config/routes.rb +0 -3
  411. data/db/migrate/010_create_template_content.rb +0 -17
  412. data/db/migrate/024_correct_vclass_kpath.rb +0 -13
  413. data/db/migrate/025_move_tag_into_vclass.rb +0 -15
  414. data/lib/version_off.rb +0 -323
  415. data/lib/zena/use/node_name.rb +0 -94
  416. data/test/integration/query_node/properties.yml +0 -41
  417. data/test/unit/base_contact_test.rb +0 -242
  418. data/test/unit/node_name_test.rb +0 -137
@@ -23,7 +23,7 @@
23
23
  <td><span class='constant'><%= select('column', 'role_id', Column.roles_for_form ) %></span></td>
24
24
  <td><span class='text'><%= select('column', 'ptype', Column::TYPES_FOR_FORM ) %></span></td>
25
25
  <td><%= text_field('column', 'name', :size=>15 ) %></td>
26
- <td><span class='text'><%= select('column', 'index', Column::INDICES_FOR_FORM, :include_blank => true ) %></span></td>
26
+ <td><span class='text'><%= select_tag "column[index]", grouped_options_for_select(Column.indices_for_form, @column.index, '') %></span></td>
27
27
  </tr>
28
28
  <tr><td colspan='4'><p class='btn_validate'><input type='submit' value='<%= _('validate') %>'/></p></td></tr>
29
29
  </table>
@@ -7,6 +7,6 @@
7
7
  <span class='spacer'><%= (li.role.kind_of?(VirtualClass) ? '+ ' : '<span>* </span>') %></span>
8
8
  <span class='constant'><%= li.role.name %></span>
9
9
  <span class='text'>p.<%= li.ptype %></span>
10
- <span class='string'>'<%= li.name %>'<span><%= li.import_result ? " (#{li.import_result})" : ''%><% if !li.index.blank? -%>, <span class='symbol'>:index</span> =&gt; <span class='symbol'>:<%= li.index %></span><% end -%>
10
+ <span class='string'>'<%= li.name %>'<span><%= li.import_result ? " (#{li.import_result})" : ''%><% if !li.index.blank? -%>, <span class='symbol'>:index</span> =&gt; <span class='symbol'>:<%= li.index_name %></span><% end -%>
11
11
  </td>
12
12
  </tr>
@@ -11,7 +11,7 @@ end %>
11
11
  <% else -%>
12
12
  <p class="btn_x"><%= link_to_function _('btn_x'), "['add_comment#{node.zip}', 'add_comment_form#{node.zip}'].each(Element.toggle);" %></p>
13
13
  <% end -%>
14
- <label for="author_name"><%= _("author") %></label> <%= visitor.is_anon? ? text_field('comment', 'author_name', :size=>25) : visitor.fullname %>
14
+ <label for="author_name"><%= _("author") %></label> <%= visitor.is_anon? ? text_field('comment', 'author_name', :size=>25) : visitor.login %>
15
15
  <label for="title"><%= _("title") %></label> <%= text_field('comment', 'title', :size=>25) %>
16
16
  </div>
17
17
  <div class='body'>
@@ -4,7 +4,7 @@
4
4
  <%= link_to_remote(_('btn_publish'), :url=> publish_comment_path(:id=>li[:id], :bin=>@admin), :method => :put) if li[:status] < Zena::Status[:pub] %>
5
5
  </span>
6
6
  <span class='date'><%= long_date(li.created_at) + " " + short_time(li.created_at) %></span>
7
- <span class='sign'><%= li.author_name || li.author.fullname %></span>
7
+ <span class='sign'><%= li.author_name || li.author.login %></span>
8
8
  <span class='title'><%= make_link(:node => li.discussion.node, :title => "#{li.discussion.node.title}#{li.title.blank? ? '' : " / #{li.title}"}") %></span>
9
9
  </div>
10
10
  <div class='body'>
@@ -1,3 +1,3 @@
1
1
  <li id='comment<%= li_simple[:id] %>' <%= "class='c40' " if li_simple[:status] < Zena::Status[:pub] %>>
2
- <a href='<%= url_for(:controller=>'main', :action=>'show', :path=>li_simple.discussion.node.fullpath.split('/')) %>'><span class='title'><%= li_simple.title %></span> <span class='sign'><%= li_simple.author_name || li_simple.author.fullname %></span></a>
2
+ <a href='<%= url_for(:controller=>'main', :action=>'show', :path=>li_simple.discussion.node.fullpath.split('/')) %>'><span class='title'><%= li_simple.title %></span> <span class='sign'><%= li_simple.author_name || li_simple.author.login %></span></a>
3
3
  </li>
@@ -18,7 +18,7 @@
18
18
  <tr><td class='label'><%= _('name')%> </td><td><%= text_field('group', 'name', :size=>15 ) %></td></tr>
19
19
  <tr><td class='label'><%= _('users')%> </td><td>
20
20
  <%= @users.inject([]) do |list, u|
21
- unless u.is_anon? || u.is_su?
21
+ unless u.is_anon?
22
22
  if (@group[:id] == visitor.site.public_group_id) || (@group[:id] == visitor.site.site_group_id)
23
23
  list << "<input type='checkbox' name='group[user_ids][]' value='#{u.id}' class='box' checked='1' disabled='1'/>#{u.login}"
24
24
  else
@@ -1,6 +1,6 @@
1
1
  <tr id='link<%= li.link_id %>'>
2
2
  <td class="box"><%= link_to_remote( relation.other_icon.blank? ? _('img_link') : relation.other_icon, :update=>"link#{li.link_id}", :url => edit_node_link_path(:node_id => @node[:zip], :id => li.link_id), :method=>:get) %></td>
3
- <td class="path" ><%= link_to( li.rootpath, zen_path(li), :popup=>true ) %></td>
3
+ <td class="path" ><%= link_to( li.short_path, zen_path(li), :popup=>true ) %></td>
4
4
  <td class="status" ><%= li.l_status %></td>
5
5
  <td class="comment" ><%= li.l_comment %></td>
6
6
  <td class="actions"> <%= link_to_remote(_('btn_tiny_del'), :url => node_link_path(:node_id => @node[:zip],:id => li.link_id), :method => :delete) %> </td>
@@ -15,7 +15,7 @@
15
15
  <li><label><%= _('publishers') %></label><%= select('node', 'dgroup_id', form_groups, { :include_blank => true }, {:disabled=>(@node[:inherit] != 0)}) %></li>
16
16
  <li><label><%= _('writers') %></label><%= select('node', 'wgroup_id', form_groups, { :include_blank => true }, {:disabled=>(@node[:inherit] != 0)}) %></li>
17
17
  <li><label><%= _('readers') %></label><%= select('node', 'rgroup_id', form_groups, { :include_blank => true }, {:disabled=>(@node[:inherit] != 0)}) %></li>
18
- <li><label><%= _('skin') %></label><%= select('node', 'skin_id', form_skins, {}, {:disabled=>(@node[:inherit] == 1)}) %></li>
18
+ <li><label><%= _('skin') %></label><%= select('node', 'skin_id', form_skins, {:selected => @node.skin_zip}, {:disabled=>(@node[:inherit] == 1)}) %></li>
19
19
  <li class='submit'><%= submit_tag _('change') %></li>
20
20
  </form>
21
21
  <% else %>
@@ -6,7 +6,7 @@
6
6
  <% @nodes.each do |node| -%>
7
7
  <tr class='import_<%= node.errors.empty? ? (node[:create_or_update]) : 'error' %>'>
8
8
  <td><%= img_tag(node, :mode=>'tiny') %></td>
9
- <td><%= node.rootpath %></td>
9
+ <td><%= node.short_path %></td>
10
10
  <% if node[:create_or_update] == 'same' && node.errors.empty? -%>
11
11
  <td colspan='3'><%= _('same') %></td>
12
12
  <% else -%>
@@ -5,7 +5,7 @@
5
5
  <div class='hidden'><input type='hidden' name='drive' value='parent'/></div>
6
6
  <% if @node[:parent_id] %><li><label><%= _('parent') %></label><%= select_id('node', 'parent_id') %></li><% end -%>
7
7
  <li><label><%= _('class') %></label><%= select('node', 'klass', @node.class.change_to_classes_for_form) %></li>
8
- <li><label><%= _('name') %></label><%= text_field('node', 'node_name', :size=>15) %></li>
8
+ <li><label><%= _('name') %></label><%= text_field('node', 'title', :size=>15) %></li>
9
9
  <% if @node.kind_of?(Page) -%>
10
10
  <li><label><%= _('custom base url') %></label><%= check_box('node', 'custom_base') %></li>
11
11
  <% end -%>
@@ -20,7 +20,7 @@
20
20
  <%= img_tag(node, :mode=>'mini') %>
21
21
  <p class='result_name'><%= link_to(node.title, zen_path(node), :popup=>true) %> <em><%= check_lang(node) %></em></p>
22
22
  <p class='result_id'><%= node[:zip] %></p>
23
- <p class='result_path'><%= node.rootpath.split('/').join(' / ') %></p>
23
+ <p class='result_path'><%= node.short_path %></p>
24
24
  <div class='clear'></div>
25
25
  </li>
26
26
  <% end %>
@@ -1,10 +1,12 @@
1
- if @node.new_record?
1
+ if params[:u_url]
2
+ update_page_content(page, @node)
3
+ elsif @node.new_record?
2
4
  page.replace "#{params[:dom_id]}_form", :file => template_path_from_template_url + "_form.erb"
3
5
  else
4
6
  pos = params[:position] || :before
5
7
  ref = params[:reference] || "#{params[:dom_id]}_add"
6
8
  page.insert_html pos.to_sym, ref, :file => template_path_from_template_url + ".erb"
7
- @node = @node.parent.new_child(:class => @node.class)
9
+ @node = @node.parent.new_child(:class => @node.klass)
8
10
  page.replace "#{params[:dom_id]}_form", :file => template_path_from_template_url + "_form.erb"
9
11
  if params[:done]
10
12
  page << params[:done]
@@ -4,7 +4,7 @@
4
4
  :url => edit_relation_path(li),
5
5
  :method => :get) %></td>
6
6
  <td class="ruby relation" colspan='7'>
7
- <span class='constant min_width'><%= Node.get_class_from_kpath(li.source_kpath) %></span> <span class='arity'><%= li.target_unique? ? _('has_one') : _('has_many') %></span> <span class='string'>'<%= li.target_role %>'</span>, <span class='symbol'>:class</span> => <span class='constant'><%= Node.get_class_from_kpath(li.target_kpath).to_s %></span><br/>
8
- <span class='constant min_width'><%= Node.get_class_from_kpath(li.target_kpath) %></span> <span class='arity'><%= li.source_unique? ? _('has_one') : _('has_many') %></span> <span class='string'>'<%= li.source_role %>'</span>, <span class='symbol'>:class</span> => <span class='constant'><%= Node.get_class_from_kpath(li.source_kpath).to_s %></span><br/>
7
+ <span class='constant min_width'><%= VirtualClass.find_by_kpath(li.source_kpath) %></span> <span class='arity'><%= li.target_unique? ? _('has_one') : _('has_many') %></span> <span class='string'>'<%= li.target_role %>'</span>, <span class='symbol'>:class</span> => <span class='constant'><%= VirtualClass.find_by_kpath(li.target_kpath).to_s %></span><br/>
8
+ <span class='constant min_width'><%= VirtualClass.find_by_kpath(li.target_kpath) %></span> <span class='arity'><%= li.source_unique? ? _('has_one') : _('has_many') %></span> <span class='string'>'<%= li.source_role %>'</span>, <span class='symbol'>:class</span> => <span class='constant'><%= VirtualClass.find_by_kpath(li.source_kpath).to_s %></span><br/>
9
9
  </td>
10
10
  </tr>
@@ -4,7 +4,7 @@
4
4
 
5
5
  <%= upload_field %>
6
6
 
7
- <label for='node_name'><%= _('title') %></label>
7
+ <label for='title'><%= _('title') %></label>
8
8
  <input id='node_title' type='text' name='node[title]' onchange="Zena.get_filename(this,'existing_doc');"/> <%= check_exists(:node => @parent, :watch => 'node_title', :kpath => 'ND', :show => 'short_path') %><br/>
9
9
 
10
10
  <label for='node_summary'><%= _('summary') %></label>
@@ -4,8 +4,8 @@
4
4
 
5
5
  <input type='hidden' name='node[klass]' value='Template'/>
6
6
 
7
- <label for='node_name'><%= _('name') %></label>
8
- <input id='node_name' type='text' name='node[node_name]'/><br/>
7
+ <label for='title'><%= _('name') %></label>
8
+ <input id='title' type='text' name='node[title]'/><br/>
9
9
 
10
10
  <label for='node_target_klass'><%= _('class scope') %></label>
11
11
  <%= select('node', 'target_klass', Node.classes_for_form, {:include_blank => true} ) %><br/>
@@ -5,8 +5,8 @@
5
5
  <label for='node_content_type'><%= _('content type') %></label>
6
6
  <input id='node_content_type' type='text' name='node[content_type]'/><br/>
7
7
 
8
- <label for='node_name'><%= _('name') %></label>
9
- <input id='node_name' type='text' name='node[node_name]'/><br/>
8
+ <label for='title'><%= _('name') %></label>
9
+ <input id='title' type='text' name='node[title]'/><br/>
10
10
 
11
11
  <label for='node_summary'><%= _('summary') %></label>
12
12
  <textarea id='node_summary' rows='3' name='node[summary]'></textarea><br/>
@@ -1,6 +1,6 @@
1
1
  <%=
2
2
  begin
3
- node = secure!(Node) { Node.find_by_node_name('help') }
3
+ node = secure!(Node) { Node.find_by_title('help') }
4
4
  zazen(node.summary)
5
5
  rescue
6
6
  _('help not found')
@@ -17,6 +17,3 @@
17
17
  <%= date_box(@node, 'v_publish_from') %>
18
18
  <label for="summary"><%= _("summary") %></label>
19
19
  <%= text_area 'node', 'summary', :cols => nil, :rows => 6, :value => @node.summary, :class => 'full_width' %>
20
-
21
- <label for="comment"><%= _("comment") %></label>
22
- <%= text_area 'node', 'comment', :cols => nil, :rows => 2, :class => 'full_width' %>
@@ -22,15 +22,10 @@
22
22
  <tr id='user_set_pass'><td class='label'><%= _("password")%></td><td><%= password_field('user', 'password', :size=>15, :value=>"" ) %></td></tr>
23
23
  <% end -%>
24
24
  <% end -%>
25
- <tr><td class='label'><%= _("status")%> </td><td><% if @user.is_su? -%><%= _(@user.status_name) %><% else -%><%= select('user', 'status', User::Status.reject {|k,v| v > User::Status[:admin]}.map{|k,v| [_(k.to_s),v]}.sort{|a,b| b[1] <=> a[1]}) %><%- end %></td></tr>
26
- <tr><td class='label'><%= _("first name")%> </td><td><%= text_field('user', 'first_name', :size=>35 ) %></td></tr>
27
- <tr><td class='label'><%= _("name")%> </td><td><%= text_field('user', 'name', :size=>35 ) %></td></tr>
25
+ <tr><td class='label'><%= _("status")%> </td><td><%= select('user', 'status', User::Status.reject {|k,v| v > User::Status[:admin]}.map{|k,v| [_(k.to_s),v]}.sort{|a,b| b[1] <=> a[1]}) %></td></tr>
28
26
  <tr><td class='label'><%= _('language')%> </td><td><%= select('user', 'lang', visitor.site.lang_list.map {|l| [_(l),l]}) %></td></tr>
29
27
  <tr><td class='label'><%= _("time zone")%> </td><td><select name='user[time_zone]'><%= options_for_select([''] + TZInfo::Timezone.all_identifiers, @user[:time_zone] || '') %></select></td></tr>
30
28
  <% unless @user.is_anon? -%>
31
- <tr><td class='label'><%= _("email")%> </td><td><%= text_field('user', 'email', :size=>35 ) %></td></tr>
32
- <% end -%>
33
- <% unless @user.is_anon? || @user.is_su? -%>
34
29
  <tr><td class='label'><%= _("groups")%> </td><td>
35
30
  <%= @groups.inject([]) do |list, g|
36
31
  if g[:id] == visitor.site.public_group_id || g[:id] == visitor.site.site_group_id
@@ -43,6 +38,7 @@
43
38
  <input type='hidden' name='user[group_ids][]' value=''/>
44
39
  </td></tr>
45
40
  <% end -%>
41
+ <tr><td colspan='2'><%= node_form %></td></tr>
46
42
  <tr><td colspan='2'><p class='btn_validate'><input type='submit' value='<%= _('validate') %>'/></p></td></tr>
47
43
  </table>
48
44
  </form>
@@ -1,8 +1,6 @@
1
1
  <% icon = 'user'
2
2
  if li.is_anon?
3
3
  icon += '_pub'
4
- elsif li.is_su?
5
- icon += '_su'
6
4
  elsif li.is_admin?
7
5
  icon += '_admin'
8
6
  end %>
@@ -12,7 +10,7 @@ end %>
12
10
  :url => edit_user_path(li),
13
11
  :method => :get) %></td>
14
12
  <td class="login"><%= if li.is_anon? then '<i>public</i>' else li.login end %></td>
15
- <td class="fullname" ><a href='<%= zen_path(li.contact) %>'><%= li.fullname %></a></td>
13
+ <td class="fullname" ><a href='<%= zen_path(li.node) %>'><%= li.node ? li.node.title : '' %></a></td>
16
14
  <td class="login"><%= _(User::Num_to_status[li.status].to_s) %></td>
17
15
  <td class="groups"><%= li.groups.map {|g| g.name }.join(', ') %></td>
18
16
  </tr>
@@ -1,8 +1,8 @@
1
1
  if @user.errors.empty?
2
- page.insert_html :before, 'add_user', :partial=>'users/li', :collection=>[@user]
3
- @user = secure!(User) { User.new }
4
- page.replace_html 'add_user_form', :partial=>'users/form'
2
+ page.insert_html :before, 'add_user', :partial => 'users/li', :collection => [@user]
3
+ @user = secure(User) { User.new }
4
+ page.replace_html 'add_user_form', :partial => 'users/form'
5
5
  page << "$('user_login').focus();"
6
6
  else
7
- page.replace 'add_user_form', :partial=>'users/form'
7
+ page.replace 'add_user_form', :partial => 'users/form'
8
8
  end
@@ -1,4 +1,4 @@
1
- <h3><%= @user.fullname %> : <%= _('preferences') %> </h3>
1
+ <h3><%= @user.login %> : <%= _('preferences') %> </h3>
2
2
 
3
3
  <ul class='actions' id='preferences'>
4
4
 
@@ -14,11 +14,8 @@
14
14
  <ul>
15
15
  <li id='user_info_errors'></li>
16
16
  <li class='align'><%= _('login')%> <span><%= text_field('user', 'login', :size=>25 ) %></span></li>
17
- <li class='align'><%= _('first name')%> <span><%= text_field('user', 'first_name', :size=>25 ) %></span></li>
18
- <li class='align'><%= _('name')%> <span><%= text_field('user', 'name', :size=>25 ) %></span></li>
19
17
  <li class='align'><%= _('language')%> <span><%= select('user', 'lang', current_site.lang_list.map{|l| [_(l),l]} ) %></span></li>
20
18
  <li class='align'><%= _('time zone')%> <span><select name='user[time_zone]'><%= options_for_select([''] + TZInfo::Timezone.all_identifiers, @user[:time_zone] || '') %></select></span></li>
21
- <li class='align'><%= _('email')%> <span><%= text_field('user', 'email', :size=>25 ) %></span></li>
22
19
  <li><p class='btn_validate'><input type='submit' value='<%= _('validate') %>'/></p></li>
23
20
  </ul>
24
21
  </form>
@@ -0,0 +1,5 @@
1
+ <% @node.schema.columns.each do |name, col| -%>
2
+ <% next if %w{title text summary}.include?(name) || !@node.safe_method_type([name]) -%>
3
+ <label for='<%= col.name %>'><%= _(col.name) %></label>
4
+ <%= text_area 'node', col.name, :cols => nil, :rows => 1, :value => @node.prop[col.name], :class => 'full_width' %>
5
+ <% end -%>
@@ -5,7 +5,7 @@
5
5
  link_to_function _('btn_x'), "['add_virtual_class', 'add_virtual_class_form'].each(Element.toggle)"
6
6
  end %>
7
7
  </td>
8
- <td class='add' colspan='3'>
8
+ <td class='add' colspan='2'>
9
9
  <div id='virtual_class_errors'><%= error_messages_for(:virtual_class, :object => @virtual_class) %></div>
10
10
  <% if @virtual_class.new_record? %>
11
11
  <%= form_remote_tag(:url => virtual_classes_path ) %>
@@ -15,24 +15,34 @@
15
15
  <table cellspacing='0' class='edit_virtual_class'>
16
16
  <tr><td class='label'><%= _('name')%> </td><td><%= text_field('virtual_class', 'name', :size=>15 ) %></td></tr>
17
17
  <tr>
18
- <td class='label'><%= _('type')%> </td>
19
- <% if @virtual_class.new_record? %><td>
20
- <%= select('virtual_class', 'type', ['Class', 'Role'], :selected => 'Class' ) %></td>
21
- <% else -%>
22
- <td><%= @virtual_class.kind_of?(VirtualClass) ? 'Class' : 'Role' %></td>
23
- <% end -%>
18
+ <td class='label'><%= _('type') %></td>
19
+ <td>
20
+ <% if @virtual_class.new_record? %>
21
+ <%= select('virtual_class', 'type', ['Class', 'Role'], :selected => 'Class' ) %>
22
+ <% else -%>
23
+ <%= @virtual_class.kind_of?(VirtualClass) ? 'Class' : 'Role' %>
24
+ <% end -%>
25
+ </td>
26
+ </tr>
27
+ <tr>
28
+ <td class='label'><%= _('kpath') %></td>
29
+ <td><b><%= @virtual_class.kpath %></b><td>
24
30
  </tr>
25
-
26
31
  <tr><td class='label'><%= _('superclass')%></td><td><%= select('virtual_class', 'superclass', Node.classes_for_form(:without => ((@virtual_class.new_record? || @virtual_class.kind_of?(Role)) ? nil : @virtual_class.to_s)), :selected => @virtual_class.superclass.to_s ) %></td></tr>
27
32
 
33
+ <% if @virtual_class.kind_of?(VirtualClass) -%>
28
34
  <% Zena::Use::Fulltext::FULLTEXT_FIELDS.reverse_each do |fld| -%>
29
35
  <tr><td class='label'><%= _(fld)%></td><td><%= text_area('virtual_class', fld, :rows => 2, :cols => 30) %></td></tr>
30
- <% end -%>
36
+ <% end -%>
37
+ <tr><td class='label'><%= _('idx_class')%></td><td><%= select('virtual_class', 'idx_class', Zena::Use::ScopeIndex.models_for_form) %></td></tr>
38
+ <tr><td class='label'><%= _('idx_scope')%></td><td><%= text_area('virtual_class', 'idx_scope', :rows => 2, :cols => 30) %></td></tr>
39
+ <tr><td class='label'><%= _('prop eval')%></td><td><%= text_area('virtual_class', 'prop_eval', :rows => 2, :cols => 30) %></td></tr>
31
40
 
32
41
  <tr><td class='label'><%= _('create group')%></td><td><%= select('virtual_class', 'create_group_id', visitor.all_groups.map{|g| [g.name, g.id]} ) %></td></tr>
33
42
  <tr><td class='label'><%= _('auto create discussion')%></td><td><%= check_box('virtual_class', 'auto_create_discussion') %></td></tr>
43
+ <% end -%>
34
44
  <tr><td class='label'><%= _('icon')%> </td><td><%= text_field('virtual_class', 'icon', :size=>15 ) %></td></tr>
35
- <tr><td colspan='3'><p class='btn_validate'><input type='submit' value='<%= _('validate') %>'/></p></td></tr>
45
+ <tr><td colspan='2'><p class='btn_validate'><input type='submit' value='<%= _('validate') %>'/></p></td></tr>
36
46
  </table>
37
47
  </form>
38
48
  <%# Class destruction not enabled because we first need to know what to do with instances... %>
@@ -2,20 +2,33 @@
2
2
  <tr class='real_class'>
3
3
  <td class="adm_icon"><%= _('virtual_class_img') %></td>
4
4
  <td class='ruby'><span class='spacer'><%= li.kpath[1..-1].gsub(/./, '| ') + '+ ' %></span><span class='constant'><%= li.name %></span></td>
5
- <td>&nbsp;</td>
6
- <td class="auto_create_discussion" >&nbsp;</td>
5
+ <td class='info'>&nbsp;</td>
7
6
  </tr>
8
7
  <% else -%>
9
8
  <tr id='virtual_class<%= li[:id] %>'>
10
9
  <td class="adm_icon"><%= (li.new_record? || !li.errors.empty?) ? _('virtual_class_error_img') : link_to_remote( !li.icon.blank? ? "<img src='#{li.icon}'/>" : _('virtual_class_img'),
11
- :update =>"virtual_class#{li[:id]}",
10
+ { :update => "virtual_class#{li[:id]}",
12
11
  :url => edit_virtual_class_path(li),
13
- :method => :get) %></td>
12
+ :method => :get},
13
+ { :title => li.kpath}) %></td>
14
+ <% if li.kind_of?(VirtualClass) -%>
14
15
  <td class='ruby'>
15
- <span class='spacer'><%= li.kpath[1..-1].gsub(/./, '| ') %><%= li.kind_of?(VirtualClass) ? '+ ' : '| <span>* </span>' %></span>
16
- <span class='constant'><%= li.name %><%= (li.kind_of?(VirtualClass) && li.import_result) ? " (#{li.import_result})" : ''%></span>
16
+ <span class='spacer'><%= li.kpath[1..-1].gsub(/./, '| ') %>+ </span>
17
+ <span class='constant'><%= li.name %><%= li.import_result ? " (#{li.import_result})" : ''%></span>
17
18
  </td>
18
- <td class='idx'><%= Zena::Use::Fulltext::FULLTEXT_FIELDS.map {|fld| li[fld].blank? ? nil : fld.gsub('idx_text_','')}.compact.join(', ') %>
19
- <td class="auto_create_discussion" ><%= li.auto_create_discussion ? _('auto discussion') : '' %></td>
19
+ <td class='info'>
20
+ <%= (
21
+ Zena::Use::Fulltext::FULLTEXT_FIELDS.map {|fld| li.prop[fld].blank? ? nil : fld.gsub('idx_text_','')} +
22
+ (li.prop_eval ? [_('prop')] : []) +
23
+ (li.auto_create_discussion? ? [_('discussion')] : []) +
24
+ (li.idx_class ? [li.idx_class] : [])
25
+ ).compact.join(', ') %>
26
+ </td>
27
+ <% else -%>
28
+ <td class='ruby' colspan='2'>
29
+ <span class='spacer'><%= li.kpath[1..-1].gsub(/./, '| ') %>| <span>* </span></span>
30
+ <span class='constant'><%= li.name %></span>
31
+ </td>
32
+ <% end -%>
20
33
  </tr>
21
34
  <% end -%>
@@ -11,7 +11,7 @@
11
11
  <r:else do='link' do='img' alt_src='icon' mode='pv'/>
12
12
  </p>
13
13
  <p class='result_name'><r:link/></p>
14
- <p class='result_path'><r:show attr='rootpath'/></p>
14
+ <p class='result_path'><r:show attr='short_path'/></p>
15
15
  <r:summary/>
16
16
  <div class='clear'></div>
17
17
  </li>
@@ -69,17 +69,17 @@
69
69
  </li>
70
70
  </ol>
71
71
  </r:pages>
72
- <r:references name='references'><h3 do='trans'>references</h3>
72
+ <r:nodes where='kpath not like "ND%" and kpath not like "NP%"'><h3 do='trans'>references</h3>
73
73
  <ol>
74
74
  <li do='each' class='li_s#{v.status}' do='link'/>
75
75
  <li do='add' before='self'/>
76
76
  <li class='inline_form' do='form'>
77
- <p class='node_klass'> <r:select name='klass' root_class='Reference'/></p>
77
+ <p class='node_klass'> <r:select name='klass' root_class='Node'/></p>
78
78
  <p class='node_title'><input type='text' name='title' value=''/></p>
79
79
  <p class='btn_validate'><input type="submit" value='#{trans("validate")}'/></p>
80
80
  </li>
81
81
  </ol>
82
- </r:references>
82
+ </r:nodes>
83
83
 
84
84
  </div> <!-- related -->
85
85
  <div id='main'>
@@ -42,7 +42,7 @@ module Bricks
42
42
  return parser_error("recaptcha keys not set") unless current_site.prop['recaptcha_pub'] && current_site.prop['recaptcha_priv']
43
43
  res = "<%= get_captcha(:rcc_pub => #{visitor.site.prop['recaptcha_pub'].inspect}, :rcc_priv => #{visitor.site.prop['recaptcha_priv'].inspect}#{get_recaptcha_params}) %>"
44
44
  res += expand_with
45
- "<% if visitor.is_anon? -%>#{@markup.wrap(res)}<% end -%>"
45
+ "<% if visitor.is_anon? %>#{@markup.wrap(res)}<% end %>"
46
46
  end
47
47
 
48
48
  def r_mail_hide
@@ -12,6 +12,20 @@ Capistrano::Configuration.instance(:must_exist).load do
12
12
 
13
13
  desc "configure mongrel"
14
14
  task :configure, :roles => :app do
15
+ if !defined?(RAILS_ENV)
16
+ RAILS_ENV = 'production'
17
+ end
18
+ require 'bricks'
19
+ asset_port = Bricks.raw_config['asset_port']
20
+ if asset_port == self[:mongrel_port].to_i - 1
21
+ mongrel_port = asset_port
22
+ mongrel_count = self[:mongrel_count] + 1
23
+ elsif asset_port.nil?
24
+ # no asset port: OK.
25
+ else
26
+ raise "Invalid asset_port setting in bricks.yml: the port should be equal to mongrel_port minus one. (expected #{self[:mongrel_port].to_i - 1}, found #{asset_port})"
27
+ end
28
+
15
29
  run "#{in_current} mongrel_rails cluster::configure -e production -p #{mongrel_port} -N #{mongrel_count} -c #{deploy_to}/current -P log/mongrel.pid -l log/mongrel.log -a 127.0.0.1 --user www-data --group www-data"
16
30
  run "#{in_current} echo 'config_script: config/mongrel_upload_progress.conf' >> config/mongrel_cluster.yml"
17
31
  end
File without changes
data/bricks/pdf/README ADDED
@@ -0,0 +1,33 @@
1
+ = pdf -- pdf rendering brick for Zena
2
+
3
+ This brick is used to render pdf from html pages. It exploit existing engine such as "princexml" or "pisa".
4
+
5
+ The required engine must be installed on the server and the bricks configuration file must specify which engine to use. Example:
6
+
7
+ pdf:
8
+ switch: ON
9
+ engine: prince
10
+
11
+ You must also provide an asset host dedicated to serving the files needed by pdf generation (css documents, embedded images, etc). Set the asset host port in the bricks.yml file:
12
+
13
+ asset_host: 7999
14
+
15
+ It is possible to add more engines. See implementations in "engine" folder in for details.
16
+
17
+ There is one method "render" that takes a hash as argument.
18
+
19
+ == Examples
20
+
21
+ Bricks::PDF.engine = 'prince'
22
+
23
+ Bricks::PDF.render :input => "myfile.html"
24
+ => STDOUT
25
+
26
+ Bricks::PDF.render :input => "myfile.html", :output => "out.pdf"
27
+ => out.pdf (file)
28
+
29
+ Bricks::PDF.render :data => "This is text to render."
30
+ => STDOUT (strings)
31
+
32
+ Bricks::PDF.render :data => "This is text to render.", :output => "out.pdf"
33
+ => out.pdf (file)