zena 0.16.9 → 1.0.0.beta1
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +16 -3
- data/CREDITS +8 -4
- data/History.txt +12 -15
- data/app/controllers/application_controller.rb +1 -0
- data/app/controllers/columns_controller.rb +130 -0
- data/app/controllers/documents_controller.rb +16 -4
- data/app/controllers/groups_controller.rb +1 -5
- data/app/controllers/iformats_controller.rb +1 -5
- data/app/controllers/nodes_controller.rb +116 -41
- data/app/controllers/preferences_controller.rb +2 -0
- data/app/controllers/relations_controller.rb +1 -5
- data/app/controllers/sites_controller.rb +1 -5
- data/app/controllers/user_sessions_controller.rb +8 -3
- data/app/controllers/users_controller.rb +23 -11
- data/app/controllers/versions_controller.rb +29 -46
- data/app/controllers/virtual_classes_controller.rb +20 -12
- data/app/helpers/documents_helper.rb +5 -1
- data/app/models/attachment.rb +41 -0
- data/app/models/base_contact.rb +79 -0
- data/app/models/cache.rb +2 -2
- data/app/models/cached_page.rb +5 -4
- data/app/models/column.rb +90 -0
- data/app/models/comment.rb +3 -1
- data/app/models/contact_content.rb +5 -5
- data/app/models/contact_version.rb +2 -2
- data/app/models/data_entry.rb +9 -8
- data/app/models/discussion.rb +4 -0
- data/app/models/document.rb +170 -42
- data/app/models/document_content.rb +5 -9
- data/app/models/group.rb +4 -3
- data/app/models/idx_nodes_ml_string.rb +5 -0
- data/app/models/idx_nodes_string.rb +5 -0
- data/app/models/idx_template.rb +35 -0
- data/app/models/iformat.rb +4 -4
- data/app/models/image.rb +193 -26
- data/app/models/link.rb +1 -1
- data/app/models/node.rb +358 -338
- data/app/models/note.rb +2 -4
- data/app/models/page.rb +10 -8
- data/app/models/reference.rb +1 -1
- data/app/models/relation.rb +40 -1
- data/app/models/relation_proxy.rb +37 -40
- data/app/models/role.rb +19 -0
- data/app/models/site.rb +54 -24
- data/app/models/skin.rb +1 -16
- data/app/models/template.rb +92 -62
- data/app/models/template_content.rb +12 -6
- data/app/models/text_document.rb +69 -36
- data/app/models/text_document_content.rb +3 -3
- data/app/models/user.rb +34 -13
- data/app/models/version.rb +47 -291
- data/app/models/virtual_class.rb +26 -29
- data/app/views/columns/_add.html.erb +6 -0
- data/app/views/columns/_form.html.erb +36 -0
- data/app/views/columns/_li.html.erb +11 -0
- data/app/views/columns/create.rjs +8 -0
- data/app/views/columns/destroy.rjs +6 -0
- data/app/views/columns/edit.html.erb +5 -0
- data/app/views/columns/index.html.erb +15 -0
- data/app/views/columns/new.html.erb +2 -0
- data/app/views/columns/show.rjs +1 -0
- data/app/views/columns/update.rjs +5 -0
- data/app/views/comments/_li.rhtml +1 -1
- data/app/views/comments/create.rjs +1 -1
- data/app/views/comments/index.rhtml +1 -1
- data/app/views/comments/publish.rjs +1 -1
- data/app/views/comments/remove.rjs +1 -1
- data/app/views/data_entries/_li.html.erb +1 -1
- data/app/views/discussions/create.rjs +1 -1
- data/app/views/documents/_crop.rhtml +4 -4
- data/app/views/documents/crop_form.rjs +1 -1
- data/app/views/documents/new.rhtml +1 -1
- data/app/views/documents/show.rhtml +4 -4
- data/app/views/groups/_form.rhtml +1 -1
- data/app/views/groups/index.rhtml +1 -1
- data/app/views/iformats/_form.rhtml +1 -1
- data/app/views/iformats/create.rjs +1 -1
- data/app/views/iformats/index.rhtml +1 -1
- data/app/views/links/create.rjs +1 -1
- data/app/views/links/destroy.rjs +1 -1
- data/app/views/links/show.rjs +1 -1
- data/app/views/nodes/_dates.rhtml +2 -2
- data/app/views/nodes/_gallery.rhtml +2 -2
- data/app/views/nodes/_list_nodes.rhtml +2 -2
- data/app/views/nodes/_parent.rhtml +1 -1
- data/app/views/nodes/_position.rhtml +2 -2
- data/app/views/nodes/_results.rhtml +1 -1
- data/app/views/nodes/create.rjs +1 -4
- data/app/views/nodes/destroy.erb +0 -0
- data/app/views/nodes/import.rhtml +1 -1
- data/app/views/nodes/save_text.rjs +3 -3
- data/app/views/nodes/table_update.rjs +1 -2
- data/app/views/nodes/update.rjs +1 -1
- data/app/views/relations/_form.erb +15 -15
- data/app/views/relations/_li.erb +5 -11
- data/app/views/relations/create.rjs +1 -1
- data/app/views/relations/index.erb +1 -1
- data/app/views/sites/_form.erb +3 -3
- data/app/views/sites/_li.erb +1 -1
- data/app/views/sites/index.erb +1 -1
- data/app/views/templates/document_create_tabs/_file.rhtml +3 -3
- data/app/views/templates/document_create_tabs/_template.rhtml +9 -9
- data/app/views/templates/document_create_tabs/{_text_doc.rhtml → _text_document.rhtml} +4 -4
- data/app/views/templates/edit_tabs/{_contact.rhtml → _basecontact.rhtml} +2 -2
- data/app/views/templates/edit_tabs/_document.rhtml +3 -3
- data/app/views/templates/edit_tabs/_help.rhtml +2 -2
- data/app/views/templates/edit_tabs/_image.rhtml +4 -4
- data/app/views/templates/edit_tabs/_template.rhtml +6 -6
- data/app/views/templates/edit_tabs/_text.rhtml +1 -1
- data/app/views/templates/edit_tabs/_textdocument.rhtml +4 -4
- data/app/views/templates/edit_tabs/_title.rhtml +9 -14
- data/app/views/users/_form.rhtml +1 -1
- data/app/views/users/change_info.rjs +1 -1
- data/app/views/users/change_password.rjs +1 -1
- data/app/views/users/index.rhtml +1 -1
- data/app/views/users/preferences.html.erb +10 -4
- data/app/views/users/update.rjs +1 -1
- data/app/views/versions/_list.rhtml +1 -1
- data/app/views/versions/_tr.rhtml +1 -1
- data/app/views/versions/backup.rjs +1 -1
- data/app/views/versions/destroy.rjs +6 -2
- data/app/views/versions/diff.rjs +1 -1
- data/app/views/versions/edit.rhtml +14 -6
- data/app/views/versions/preview.rjs +1 -1
- data/app/views/versions/show.rjs +1 -1
- data/app/views/virtual_classes/_add.erb +1 -1
- data/app/views/virtual_classes/_form.erb +15 -10
- data/app/views/virtual_classes/_li.erb +13 -7
- data/app/views/virtual_classes/create.rjs +2 -2
- data/app/views/virtual_classes/edit.html.erb +7 -0
- data/app/views/virtual_classes/index.erb +2 -2
- data/app/views/zafu/default/Node-+adminLayout.zafu +47 -0
- data/app/views/zafu/default/Node-+index.zafu +1 -0
- data/app/views/{templates/defaults/+login.zafu → zafu/default/Node-+login.zafu} +9 -7
- data/app/views/zafu/default/Node-+notFound.zafu +14 -0
- data/app/views/zafu/default/Node-+popupLayout.zafu +24 -0
- data/app/views/zafu/default/Node-+search.zafu +23 -0
- data/app/views/zafu/default/Node.zafu +95 -0
- data/bin/zena +0 -2
- data/bricks/captcha/lib/bricks/captcha.rb +62 -0
- data/bricks/captcha/zena/init.rb +11 -0
- data/bricks/data2pdf/.document +5 -0
- data/bricks/data2pdf/README +19 -0
- data/bricks/data2pdf/Rakefile +36 -0
- data/bricks/data2pdf/VERSION +1 -0
- data/bricks/data2pdf/lib/data2pdf.rb +60 -0
- data/bricks/data2pdf/lib/engines/prince.rb +39 -0
- data/bricks/data2pdf/lib/engines/xhtml2pdf.rb +41 -0
- data/bricks/data2pdf/lib/install.rb +111 -0
- data/bricks/data2pdf/test/engines/test_prince.rb +14 -0
- data/bricks/data2pdf/test/engines/test_xhtml2pdf.rb +14 -0
- data/bricks/data2pdf/test/fixtures/application.css +241 -0
- data/bricks/data2pdf/test/fixtures/contact.html +153 -0
- data/bricks/data2pdf/test/fixtures/pisa-default.css +207 -0
- data/bricks/data2pdf/test/fixtures/sheet1.css +207 -0
- data/bricks/data2pdf/test/fixtures/sheet2.css +207 -0
- data/bricks/data2pdf/test/fixtures/simple-html.html +337 -0
- data/bricks/data2pdf/test/fixtures/simple-text.txt +1 -0
- data/bricks/data2pdf/test/helper.rb +23 -0
- data/bricks/data2pdf/test/shoulda_macros/shoulda_data2pdf.rb +91 -0
- data/bricks/data2pdf/test/unit/test_rendering.rb +37 -0
- data/bricks/math/{patch/application_helper.rb → lib/bricks/math.rb} +0 -4
- data/bricks/math/zena/init.rb +4 -0
- data/bricks/sphinx/README +2 -2
- data/bricks/sphinx/lib/use_sphinx.rb +7 -11
- data/bricks/sphinx/{misc → zena}/deploy.rb +0 -0
- data/bricks/sphinx/{patch/node.rb → zena/init.rb} +1 -3
- data/bricks/sphinx/{migrate → zena/migrate}/20091102171258_add_delta_for_sphinx.rb +0 -0
- data/bricks/sphinx/{misc → zena}/sphinx.yml +0 -0
- data/bricks/sphinx/{misc → zena}/tasks.rb +0 -0
- data/bricks/tags/lib/{has_tags.rb → bricks/tags.rb} +12 -24
- data/bricks/tags/zena/init.rb +21 -0
- data/bricks/tags/{test → zena/test}/sites/zena/links.yml +0 -0
- data/bricks/tags/{test → zena/test}/unit/tags_test.rb +1 -1
- data/bricks/tags/zena/test/zafu/tags.yml +41 -0
- data/bricks/worker/README +2 -2
- data/bricks/worker/{misc → zena}/deploy.rb +0 -0
- data/bricks/worker/{misc → zena}/init.rb +2 -1
- data/bricks/worker/{migrate → zena/migrate}/20091104191643_create_delayed_jobs_table.rb +0 -0
- data/bricks/worker/{misc → zena}/tasks.rb +0 -0
- data/bricks/worker/{misc → zena}/worker +0 -0
- data/config/bricks.yml +2 -0
- data/config/deploy.rb +2 -7
- data/config/environment.rb +3 -5
- data/config/gems.yml +9 -4
- data/db/20100628074512_zena0x_to1x.rb +223 -0
- data/db/init/base/help.en.zml +3 -3
- data/db/init/base/help.fr.zml +3 -3
- data/db/init/base/skins.zml +2 -2
- data/db/init/base/skins/default.zml +4 -4
- data/db/init/base/skins/default/Node-+adminLayout.zafu +8 -7
- data/db/init/base/skins/default/Node-+login.zafu +9 -7
- data/db/init/base/skins/default/Node-+search.zafu +4 -1
- data/db/init/base/skins/default/Node-tree.zafu +3 -3
- data/db/init/base/skins/default/Node.zafu +20 -20
- data/db/init/base/skins/default/Project.zafu +1 -1
- data/db/init/base/skins/default/notes.zafu +5 -5
- data/db/init/base/skins/default/style.css +17 -12
- data/db/migrate/001_create_base.rb +1 -1
- data/db/migrate/008_user_status.rb +1 -1
- data/db/migrate/020_create_participation.rb +3 -3
- data/db/migrate/024_correct_vclass_kpath.rb +5 -3
- data/db/migrate/025_move_tag_into_vclass.rb +7 -5
- data/db/migrate/030_redit_auto_publish_site_settings.rb +2 -2
- data/db/migrate/032_caches_context_as_hash.rb +4 -2
- data/db/migrate/046_fix_zazen_image_tag.rb +2 -2
- data/db/migrate/047_change_default_link_id_to_zero.rb +4 -2
- data/db/migrate/20090825201159_insert_zero_link.rb +1 -1
- data/db/migrate/20090924141459_zafu_fix_sept09.rb +2 -2
- data/db/migrate/20100125062254_add_dynamo_to_version.rb +9 -0
- data/db/migrate/20100201133242_remove_default_status_on_version.rb +9 -0
- data/db/migrate/20100208194210_create_attachments.rb +17 -0
- data/db/migrate/20100210112319_change_dynamo_to_property.rb +9 -0
- data/db/migrate/20100320145726_transform_template_contents_into_index.rb +13 -0
- data/db/migrate/20100328125634_change_skin_name_to_id.rb +31 -0
- data/db/migrate/20100417061257_add_properties_to_sites.rb +9 -0
- data/db/migrate/20100419163149_rename_name_to_node_name.rb +9 -0
- data/db/migrate/20100422091606_change_v_class_table_into_roles.rb +27 -0
- data/db/migrate/20100422094048_node_habtm_roles.rb +13 -0
- data/db/migrate/20100422115935_create_columns.rb +15 -0
- data/db/migrate/20100513181529_add_site_id_to_columns.rb +9 -0
- data/db/migrate/20100519091711_add_index_definition_to_columns.rb +9 -0
- data/db/migrate/20100519091940_create_idx_nodes_string.rb +14 -0
- data/db/migrate/20100519232432_create_idx_nodes_ml_string.rb +15 -0
- data/db/migrate/20100525113858_add_porperties_to_users.rb +9 -0
- data/db/migrate/20100526090140_renamed_contact_model_to_base_contact.rb +13 -0
- data/db/migrate/20100527130937_change_column_index_to_string.rb +9 -0
- data/db/migrate/20100531135128_add_fulltext_builder_fields.rb +28 -0
- data/doc/zafu_changes.yml +2 -2
- data/lib/bricks/loader.rb +48 -26
- data/lib/exif_data.rb +21 -1
- data/lib/gettext_strings.rb +8 -1
- data/lib/tasks/zena.rake +55 -20
- data/lib/version_off.rb +323 -0
- data/lib/zazen_parser.rb +9 -0
- data/lib/zena.rb +13 -14
- data/lib/zena/acts/enrollable.rb +232 -0
- data/lib/zena/acts/secure.rb +86 -506
- data/lib/zena/acts/secure_node.rb +483 -0
- data/lib/zena/acts/serializable.rb +149 -0
- data/lib/zena/app.rb +36 -23
- data/lib/zena/code_syntax.rb +26 -2
- data/lib/zena/controller/test_case.rb +23 -2
- data/lib/zena/core_ext/file_utils.rb +3 -3
- data/lib/zena/core_ext/string.rb +2 -2
- data/lib/zena/db.rb +180 -24
- data/lib/zena/deploy.rb +140 -183
- data/lib/zena/deploy/awstats.conf.rhtml +4 -4
- data/lib/zena/deploy/httpd.rhtml +1 -2
- data/lib/zena/deploy/stats.vhost.rhtml +7 -7
- data/lib/zena/deploy/vhost.rhtml +1 -1
- data/lib/zena/deploy/vhost_www.rhtml +4 -4
- data/lib/zena/foxy_parser.rb +345 -295
- data/lib/zena/info.rb +1 -2
- data/lib/zena/integration/test_case.rb +70 -0
- data/lib/zena/loader/yaml_loader.rb +80 -0
- data/lib/zena/migrator.rb +2 -2
- data/lib/zena/parser.rb +19 -17
- data/lib/zena/parser/zafu_rules.rb +7 -0
- data/lib/zena/parser/zafu_tags.rb +2 -2
- data/lib/zena/parser/zazen_rules.rb +9 -29
- data/lib/zena/parser/zena_rules.rb +2 -2
- data/lib/zena/refactor/act_as_content.rb +6 -0
- data/lib/zena/routes.rb +9 -3
- data/lib/zena/site_worker.rb +48 -0
- data/lib/zena/test_controller.rb +49 -12
- data/lib/zena/use.rb +47 -0
- data/lib/zena/use/action.rb +230 -0
- data/lib/zena/use/ajax.rb +287 -13
- data/lib/zena/use/authlogic.rb +28 -12
- data/lib/zena/use/calendar.rb +2 -2
- data/lib/zena/use/conditional.rb +41 -0
- data/lib/zena/use/context.rb +187 -0
- data/lib/zena/use/dates.rb +87 -30
- data/lib/zena/use/display.rb +598 -0
- data/lib/zena/use/dyn_attributes.rb +4 -4
- data/lib/zena/use/error_rendering.rb +3 -1
- data/lib/zena/use/fixtures.rb +56 -22
- data/lib/zena/use/forms.rb +584 -0
- data/lib/zena/use/fulltext.rb +90 -0
- data/lib/zena/use/grid.rb +12 -7
- data/lib/zena/use/html_tags.rb +8 -459
- data/lib/zena/use/i18n.rb +172 -109
- data/lib/zena/use/image_builder.rb +1 -2
- data/lib/zena/use/ml_index.rb +56 -0
- data/lib/zena/use/nested_attributes_alias.rb +2 -2
- data/lib/zena/use/node_name.rb +94 -0
- data/lib/zena/use/query_builder.rb +355 -0
- data/lib/zena/use/query_comment.rb +63 -73
- data/lib/zena/use/query_node.rb +404 -317
- data/lib/zena/use/recursion.rb +71 -0
- data/lib/zena/use/refactor.rb +27 -40
- data/lib/zena/use/relations.rb +9 -3
- data/lib/zena/use/rendering.rb +143 -116
- data/lib/zena/use/search.rb +79 -21
- data/lib/zena/use/test_helper.rb +17 -9
- data/lib/zena/use/upload.rb +1 -1
- data/lib/zena/use/urls.rb +534 -28
- data/lib/zena/use/version_hash.rb +154 -0
- data/lib/zena/use/workflow.rb +635 -0
- data/lib/zena/use/zafu_attributes.rb +205 -0
- data/lib/zena/use/zafu_eval.rb +21 -0
- data/lib/zena/use/zafu_safe_definitions.rb +36 -0
- data/lib/zena/use/zafu_templates.rb +459 -0
- data/lib/zena/use/zazen.rb +53 -23
- data/lib/zena/view/test_case.rb +56 -7
- data/lib/zena/webdav_adapter.rb +8 -8
- data/lib/zena/zafu_compiler.rb +25 -0
- data/locale/de/LC_MESSAGES/zena.mo +0 -0
- data/locale/de/zena.mo +0 -0
- data/locale/de/zena.po +920 -781
- data/locale/en/LC_MESSAGES/zena.mo +0 -0
- data/locale/en/zena.mo +0 -0
- data/locale/en/zena.po +530 -405
- data/locale/fr/LC_MESSAGES/zena.mo +0 -0
- data/locale/fr/zena.mo +0 -0
- data/locale/fr/zena.po +588 -432
- data/locale/zena.pot +391 -353
- data/old_zafu/action.rb +129 -0
- data/{lib/zafu → old_zafu}/ajax.rb +0 -24
- data/{lib/zafu → old_zafu}/attributes.rb +2 -2
- data/{lib/zafu → old_zafu}/calendar.rb +1 -1
- data/{lib/zafu → old_zafu}/context.rb +4 -8
- data/{lib/zafu → old_zafu}/core/html.rb +1 -1
- data/old_zafu/core/move_to_parser.rb +74 -0
- data/old_zafu/dates.rb +20 -0
- data/{lib/zafu → old_zafu}/display.rb +33 -146
- data/{lib/zafu → old_zafu}/eval.rb +0 -0
- data/{lib/zafu → old_zafu}/experimental.rb +1 -1
- data/{lib/zafu → old_zafu}/i18n.rb +1 -1
- data/{lib/zafu → old_zafu}/meta.rb +0 -0
- data/old_zafu/query_node.rb +278 -0
- data/{lib/zafu → old_zafu}/refactor.rb +2 -12
- data/old_zafu/support/context.rb +146 -0
- data/{lib/zafu → old_zafu}/support/dom.rb +1 -43
- data/{lib/zafu → old_zafu}/support/erb.rb +0 -0
- data/{lib/zafu → old_zafu}/support/flow.rb +1 -13
- data/old_zafu/support/forms.rb +7 -0
- data/old_zafu/support/links.rb +75 -0
- data/{lib → old_zafu}/zafu_parser.rb +2 -2
- data/public/images/attach_window.png +0 -0
- data/public/images/dettach_window.png +0 -0
- data/public/images/ext/{contact.png → basecontact.png} +0 -0
- data/public/images/toggle_off.png +0 -0
- data/public/images/toggle_on.png +0 -0
- data/public/images/window/bottom_left.png +0 -0
- data/public/images/window/bottom_mid.png +0 -0
- data/public/images/window/bottom_right.png +0 -0
- data/public/images/window/center_left.png +0 -0
- data/public/images/window/center_right.png +0 -0
- data/public/images/window/close.png +0 -0
- data/public/images/window/maximize.png +0 -0
- data/public/images/window/minimize.png +0 -0
- data/public/images/window/overlay.png +0 -0
- data/public/images/window/sizer.png +0 -0
- data/public/images/window/top_left.png +0 -0
- data/public/images/window/top_mid.png +0 -0
- data/public/images/window/top_right.png +0 -0
- data/public/javascripts/builder.js +1 -3
- data/public/javascripts/controls.js +3 -5
- data/public/javascripts/dragdrop.js +5 -8
- data/public/javascripts/effects.js +6 -15
- data/public/javascripts/prototype.js +1574 -1020
- data/public/javascripts/scriptaculous.js +13 -7
- data/public/javascripts/slider.js +5 -7
- data/public/javascripts/sound.js +6 -4
- data/public/javascripts/unittest.js +69 -71
- data/public/javascripts/window.js +1843 -0
- data/public/javascripts/zena.js +216 -16
- data/public/stylesheets/admin.css +18 -13
- data/public/stylesheets/default.css +18 -17
- data/public/stylesheets/popup.css +4 -4
- data/public/stylesheets/window.css +155 -0
- data/public/stylesheets/zena.css +9 -8
- data/test/custom_queries/complex.host.yml +8 -8
- data/test/fixtures/files/Node-test.zafu +11 -11
- data/test/fixtures/files/import.tgz +0 -0
- data/test/fixtures/files/simple.zml.gz +0 -0
- data/test/fixtures/import/photos.en.zml +3 -3
- data/test/fixtures/import/photos/bird.jpg.en.zml +1 -1
- data/test/fixtures/import/photos/bird.jpg.fr.zml +1 -1
- data/test/fixtures/import/simple.zml +2 -2
- data/test/functional/application_controller_test.rb +2 -41
- data/test/functional/columns_controller_test.rb +140 -0
- data/test/functional/data_entries_controller_test.rb +1 -1
- data/test/functional/documents_controller_test.rb +88 -5
- data/test/functional/nodes_controller_commit_test.rb +71 -0
- data/test/functional/nodes_controller_test.rb +393 -93
- data/test/functional/note_controller_test.rb +5 -5
- data/test/functional/relations_controller_test.rb +1 -1
- data/test/functional/users_controller_test.rb +72 -14
- data/test/functional/versions_controller_test.rb +9 -8
- data/test/functional/virtual_classes_controller_test.rb +142 -65
- data/test/integration/multiple_hosts_test.rb +28 -20
- data/test/integration/navigation_test.rb +121 -83
- data/test/integration/query_node/basic.yml +128 -0
- data/test/integration/query_node/comments.yml +23 -0
- data/test/integration/query_node/complex.yml +111 -0
- data/test/integration/query_node/dates.yml +22 -0
- data/test/integration/query_node/errors.yml +12 -0
- data/test/integration/query_node/filters.yml +123 -0
- data/test/integration/query_node/properties.yml +41 -0
- data/test/integration/query_node/relations.yml +75 -0
- data/test/integration/query_node_test.rb +189 -0
- data/test/integration/xml_api_test.rb +166 -0
- data/test/integration/zafu_compiler/action.yml +67 -0
- data/test/integration/zafu_compiler/ajax.yml +263 -0
- data/test/{unit/zena/zena_tags → integration/zafu_compiler}/apphelper.yml +0 -0
- data/test/integration/zafu_compiler/asset.yml +13 -0
- data/test/integration/zafu_compiler/basic.yml +518 -0
- data/test/integration/zafu_compiler/calendar.yml +35 -0
- data/test/{unit/zena/zena_tags → integration/zafu_compiler}/complex.yml +16 -16
- data/test/integration/zafu_compiler/conditional.yml +173 -0
- data/test/{unit/zena/zena_tags → integration/zafu_compiler}/data.yml +3 -3
- data/test/integration/zafu_compiler/dates.yml +58 -0
- data/test/integration/zafu_compiler/display.yml +273 -0
- data/test/integration/zafu_compiler/errors.yml +79 -0
- data/test/{unit/zena/zena_tags → integration/zafu_compiler}/eval.yml +6 -2
- data/test/integration/zafu_compiler/forms.yml +130 -0
- data/test/integration/zafu_compiler/i18n.yml +107 -0
- data/test/integration/zafu_compiler/later.yml +31 -0
- data/test/integration/zafu_compiler/off/off.yml +15 -0
- data/test/integration/zafu_compiler/recursion.yml +28 -0
- data/test/integration/zafu_compiler/relations.yml +487 -0
- data/test/integration/zafu_compiler/roles.yml +28 -0
- data/test/{unit/zena/zena_tags → integration/zafu_compiler}/rubyless.yml +10 -9
- data/test/integration/zafu_compiler/safe_definitions.yml +65 -0
- data/test/integration/zafu_compiler/search.yml +13 -0
- data/test/integration/zafu_compiler/security.yml +30 -0
- data/test/integration/zafu_compiler/site.yml +14 -0
- data/test/integration/zafu_compiler/urls.yml +189 -0
- data/test/integration/zafu_compiler/user.yml +32 -0
- data/test/integration/zafu_compiler/version.yml +47 -0
- data/test/integration/zafu_compiler/workflow.yml +36 -0
- data/test/integration/zafu_compiler/zafu_attributes.yml +169 -0
- data/test/{unit/zena/zena_tags → integration/zafu_compiler}/zazen.yml +7 -3
- data/test/{unit/zena/zena_tags_test.rb → integration/zafu_compiler_test.rb} +137 -57
- data/test/sites/complex/nodes.yml +48 -47
- data/test/sites/complex/{virtual_classes.yml → roles.yml} +2 -1
- data/test/sites/ocean/nodes.yml +7 -7
- data/test/sites/ocean/versions.yml +30 -21
- data/test/sites/zena/columns.yml +12 -0
- data/test/sites/zena/nodes.yml +33 -32
- data/test/sites/zena/{virtual_classes.yml → roles.yml} +11 -1
- data/test/sites/zena/sites.yml +4 -1
- data/test/sites/zena/users.yml +5 -4
- data/test/sites/zena/versions.yml +398 -279
- data/test/test_helper.rb +2 -1
- data/test/test_zena.rb +3 -8
- data/test/unit/after_commit_test.rb +103 -0
- data/test/unit/attachment_test.rb +266 -0
- data/test/unit/base_contact_test.rb +242 -0
- data/test/unit/cached_page_test.rb +6 -6
- data/test/unit/column_test.rb +77 -0
- data/test/unit/comment_test.rb +1 -1
- data/test/unit/data_entry_test.rb +8 -2
- data/test/unit/document_test.rb +393 -211
- data/test/unit/exif_data_test.rb +1 -1
- data/test/unit/iformat_test.rb +9 -9
- data/test/unit/image_test.rb +358 -284
- data/test/unit/multi_version_test.rb +4 -0
- data/test/unit/multiversion_test.rb +2 -1013
- data/test/unit/node_name_test.rb +137 -0
- data/test/unit/node_test.rb +374 -461
- data/test/unit/note_test.rb +23 -23
- data/test/unit/page_test.rb +23 -23
- data/test/unit/project_test.rb +2 -2
- data/test/unit/relation_proxy_test.rb +25 -6
- data/test/unit/relation_test.rb +156 -24
- data/test/unit/role_test.rb +122 -0
- data/test/unit/section_test.rb +2 -2
- data/test/unit/site_test.rb +48 -12
- data/test/unit/skin_test.rb +0 -13
- data/test/unit/template_test.rb +361 -314
- data/test/unit/text_document_test.rb +105 -33
- data/test/unit/transparent_version_test.rb +4 -0
- data/test/unit/user_test.rb +10 -10
- data/test/unit/version_test.rb +209 -301
- data/test/unit/virtual_class_test.rb +21 -29
- data/test/unit/workflow_test.rb +1075 -0
- data/test/unit/zena/acts/enrollable_test.rb +211 -0
- data/test/unit/{secure_test.rb → zena/acts/secure_test.rb} +190 -105
- data/test/unit/zena/acts/serializable_test.rb +85 -0
- data/test/unit/zena/db_test.rb +27 -14
- data/test/unit/zena/parser/zazen.yml +1 -1
- data/test/unit/zena/use/action_test.rb +109 -0
- data/test/unit/zena/use/calendar_test.rb +8 -8
- data/test/unit/zena/use/dates_test.rb +10 -0
- data/test/unit/zena/use/dates_view_methods_test.rb +8 -12
- data/test/unit/zena/use/fulltext_test.rb +82 -0
- data/test/unit/zena/use/html_tags_test.rb +225 -201
- data/test/unit/zena/use/i18n_test.rb +56 -26
- data/test/unit/zena/use/ml_index_test.rb +129 -0
- data/test/unit/zena/use/nested_attributes_alias_view_test.rb +10 -10
- data/test/unit/zena/use/query_node_test.rb +104 -0
- data/test/unit/zena/use/refactor_test.rb +4 -15
- data/test/unit/zena/use/rendering_test.rb +23 -16
- data/test/unit/zena/use/upload_test.rb +2 -2
- data/test/unit/zena/use/urls_test.rb +2 -0
- data/test/unit/zena/use/version_hash_test.rb +126 -0
- data/test/unit/zena/use/zafu_template_test.rb +135 -0
- data/test/unit/zena/use/zazen_test.rb +85 -61
- data/vendor/plugins/gettext_i18n_rails/README.markdown +26 -22
- data/vendor/plugins/gettext_i18n_rails/Rakefile +31 -5
- data/vendor/plugins/gettext_i18n_rails/VERSION +1 -0
- data/vendor/plugins/gettext_i18n_rails/gettext_i18n_rails.gemspec +64 -0
- data/vendor/plugins/gettext_i18n_rails/init.rb +7 -3
- data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails.rb +5 -6
- data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/active_record.rb +6 -2
- data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/backend.rb +1 -1
- data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/model_attributes_finder.rb +2 -2
- data/vendor/plugins/gettext_i18n_rails/{tasks → lib/tasks}/gettext_rails_i18n.rake +10 -9
- data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/action_controller_spec.rb +7 -3
- data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/active_record_spec.rb +7 -5
- data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/backend_spec.rb +7 -7
- data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails_spec.rb +4 -0
- data/vendor/plugins/gettext_i18n_rails/spec/spec_helper.rb +11 -9
- data/vendor/plugins/mysql_timezone_utc/init.rb +1 -0
- data/vendor/plugins/mysql_timezone_utc/lib/mysql_timezone_utc.rb +14 -0
- data/vendor/plugins/postgresql_timezone_utc/init.rb +1 -0
- data/vendor/plugins/postgresql_timezone_utc/lib/postgresql_timezone_utc.rb +14 -0
- data/zena.gemspec +281 -123
- metadata +354 -160
- data/app/models/contact.rb +0 -32
- data/app/models/document_version.rb +0 -13
- data/app/models/image_version.rb +0 -21
- data/app/models/text_document_version.rb +0 -29
- data/app/views/templates/defaults/+adminLayout.zafu +0 -69
- data/bricks/captcha/patch/application_controller.rb +0 -10
- data/bricks/captcha/patch/application_helper.rb +0 -32
- data/bricks/captcha/patch/site.rb +0 -2
- data/bricks/captcha/zafu/captcha.rb +0 -29
- data/bricks/tags/patch/node.rb +0 -15
- data/bricks/tags/test/zafu/tags.yml +0 -40
- data/db/schema.rb +0 -295
- data/lib/zafu/action.rb +0 -285
- data/lib/zafu/core/move_to_parser.rb +0 -167
- data/lib/zafu/dates.rb +0 -58
- data/lib/zafu/support/context.rb +0 -265
- data/lib/zafu/support/forms.rb +0 -461
- data/lib/zafu/support/links.rb +0 -306
- data/lib/zena/acts/multiversion.rb +0 -755
- data/lib/zena/fix/mysql_connection.rb +0 -17
- data/lib/zena/use/query_node_finders.rb +0 -91
- data/lib/zena/use/zafu.rb +0 -514
- data/test/helpers/query_node/basic.yml +0 -149
- data/test/helpers/query_node/comments.yml +0 -18
- data/test/helpers/query_node/complex.yml +0 -98
- data/test/helpers/query_node/filters.yml +0 -110
- data/test/helpers/query_node/relations.yml +0 -43
- data/test/helpers/query_node_test.rb +0 -116
- data/test/sites/ocean/contact_contents.yml +0 -19
- data/test/sites/ocean/template_contents.yml +0 -8
- data/test/sites/zena/contact_contents.yml +0 -55
- data/test/sites/zena/document_contents.yml +0 -76
- data/test/sites/zena/dyn_attributes.yml +0 -43
- data/test/sites/zena/template_contents.yml +0 -103
- data/test/unit/contact_content_test.rb +0 -33
- data/test/unit/contact_test.rb +0 -39
- data/test/unit/contact_version_test.rb +0 -48
- data/test/unit/document_content_test.rb +0 -110
- data/test/unit/document_version_test.rb +0 -11
- data/test/unit/dyn_attributes_test.rb +0 -229
- data/test/unit/image_content_test.rb +0 -154
- data/test/unit/image_version_test.rb +0 -18
- data/test/unit/template_content_test.rb +0 -9
- data/test/unit/text_document_version_test.rb +0 -37
- data/test/unit/zena/use/zafu_test.rb +0 -41
- data/test/unit/zena/zena_tags/ajax.yml +0 -233
- data/test/unit/zena/zena_tags/basic.yml +0 -1306
- data/test/unit/zena/zena_tags/errors.yml +0 -71
- data/test/unit/zena/zena_tags/relations.yml +0 -405
@@ -96,7 +96,7 @@ module Zena
|
|
96
96
|
elsif value && id = @keys[key]
|
97
97
|
upd << [value,id]
|
98
98
|
elsif value
|
99
|
-
add << [
|
99
|
+
add << [key, value, @owner[:id].to_i]
|
100
100
|
end
|
101
101
|
end
|
102
102
|
|
@@ -162,7 +162,7 @@ module Zena
|
|
162
162
|
@hash = {}
|
163
163
|
@keys = {}
|
164
164
|
else
|
165
|
-
sql = "SELECT
|
165
|
+
sql = "SELECT id,key,value FROM #{table_name} WHERE owner_id = '#{@owner[:id].to_i}'"
|
166
166
|
@hash = {}
|
167
167
|
@keys = {}
|
168
168
|
rows = connection.select_all(sql, "#{table_name} Load").map! do |record|
|
@@ -246,10 +246,10 @@ module Zena
|
|
246
246
|
if sym.to_s =~ /^d_(.*?)(=|)$/
|
247
247
|
if $2 == '='
|
248
248
|
# set
|
249
|
-
self.
|
249
|
+
self.prop[$1] = args[0]
|
250
250
|
else
|
251
251
|
# get
|
252
|
-
self.
|
252
|
+
self.prop[$1]
|
253
253
|
end
|
254
254
|
else
|
255
255
|
super
|
@@ -4,7 +4,9 @@ module Zena
|
|
4
4
|
module Common
|
5
5
|
|
6
6
|
#TODO: test
|
7
|
-
def error_messages_for(
|
7
|
+
def error_messages_for(type, opts={})
|
8
|
+
super unless type == 'node'
|
9
|
+
obj = opts[:object]
|
8
10
|
return '' if obj.errors.empty?
|
9
11
|
res = ["<table class='#{opts[:class] || 'errors'}'>"]
|
10
12
|
obj.errors.each_error do |er,msg|
|
data/lib/zena/use/fixtures.rb
CHANGED
@@ -7,14 +7,58 @@ module Zena
|
|
7
7
|
# We use transactional fixtures with a single load for ALL tests (this is not the default rails implementation). Tests are now 5x-10x faster.
|
8
8
|
|
9
9
|
def self.included(base)
|
10
|
+
# We load once using our own loader so that accessor methods are defined
|
10
11
|
self.load_fixtures unless defined?(@@loaded_fixtures)
|
11
12
|
end
|
12
13
|
|
14
|
+
# Set the current site used for testing (mostly to generate ids)
|
15
|
+
def test_site(site_name)
|
16
|
+
$_test_site = site_name
|
17
|
+
end
|
18
|
+
|
19
|
+
def load_fixtures
|
20
|
+
super
|
21
|
+
# Cannot insert zero link from fixtures (zero id is changed to some incremented value). We
|
22
|
+
# have to insert it by hand.
|
23
|
+
Zena::Db.insert_dummy_ids
|
24
|
+
end
|
25
|
+
|
13
26
|
# Could DRY with file_path defined in Base
|
14
|
-
def self.file_path(filename, content_id)
|
15
|
-
|
16
|
-
|
17
|
-
|
27
|
+
# def self.file_path(filename, content_id)
|
28
|
+
# digest = Digest::SHA1.hexdigest(content_id.to_s)
|
29
|
+
# fname = filename.split('.').first
|
30
|
+
# "#{SITES_ROOT}/test.host/data/full/#{digest[0..0]}/#{digest[1..1]}/#{digest[2..2]}/#{fname}"
|
31
|
+
# end
|
32
|
+
|
33
|
+
# TODO: Use Attachment filepath class methods.
|
34
|
+
def self.dest_filepath(filename, id, format='full')
|
35
|
+
"#{SITES_ROOT}/test.host/data/#{format}/#{Versions::SharedAttachment.filepath(id, filename)}"
|
36
|
+
end
|
37
|
+
|
38
|
+
def self.reset_data_folder
|
39
|
+
# Cleaning the test folder which include the attachment files.
|
40
|
+
FileUtils::rmtree("#{RAILS_ROOT}/sites/test.host/data")
|
41
|
+
|
42
|
+
# Copy attachments file from /test/fixtures/files folder to the folder
|
43
|
+
# provided by the dest_filepath method.
|
44
|
+
attachments = YAML.load_file("#{RAILS_ROOT}/test/fixtures/attachments.yml")
|
45
|
+
attachments.each do |attachment_name, attachment_attributes|
|
46
|
+
filename = attachment_attributes['filename']
|
47
|
+
dest_path = dest_filepath(filename, attachment_attributes['id'],'full')
|
48
|
+
if File.exist?("#{RAILS_ROOT}/test/fixtures/files/#{filename}")
|
49
|
+
FileUtils::mkdir_p(File.dirname(dest_path))
|
50
|
+
FileUtils::cp("#{RAILS_ROOT}/test/fixtures/files/#{filename}",dest_path)
|
51
|
+
end
|
52
|
+
end
|
53
|
+
end
|
54
|
+
|
55
|
+
def self.reset_public_folder
|
56
|
+
unless File.exist?("#{SITES_ROOT}/test.host/public")
|
57
|
+
FileUtils::mkpath("#{SITES_ROOT}/test.host/public")
|
58
|
+
['images', 'calendar', 'stylesheets', 'javascripts'].each do |dir|
|
59
|
+
FileUtils.symlink_or_copy("../../../public/#{dir}", "#{SITES_ROOT}/test.host/public/#{dir}")
|
60
|
+
end
|
61
|
+
end
|
18
62
|
end
|
19
63
|
|
20
64
|
def self.load_fixtures
|
@@ -67,7 +111,6 @@ module Zena
|
|
67
111
|
Zena::FoxyParser::multi_site_id(fixture)
|
68
112
|
end
|
69
113
|
else
|
70
|
-
|
71
114
|
define_method(table_name) do |fixture|
|
72
115
|
raise Exception.new("$_test_site is blank!") if $_test_site.blank?
|
73
116
|
fixture_name = "#{$_test_site}_#{fixture}"
|
@@ -108,6 +151,10 @@ module Zena
|
|
108
151
|
end
|
109
152
|
end
|
110
153
|
|
154
|
+
|
155
|
+
alias virtual_classes roles
|
156
|
+
alias virtual_classes_id roles_id
|
157
|
+
|
111
158
|
fixtures = ::Fixtures.create_fixtures(FIXTURE_PATH, fixture_table_names)
|
112
159
|
unless fixtures.nil?
|
113
160
|
if fixtures.instance_of?(::Fixtures)
|
@@ -117,25 +164,12 @@ module Zena
|
|
117
164
|
end
|
118
165
|
end
|
119
166
|
|
120
|
-
|
121
|
-
|
122
|
-
fname, content_id = fixture.instance_eval { [@fixture['name']+"."+@fixture['ext'], @fixture['id'].to_s] }
|
123
|
-
path = file_path(fname, content_id)
|
124
|
-
FileUtils::mkpath(File.dirname(path))
|
125
|
-
if File.exist?(File.join(FILE_FIXTURES_PATH,fname))
|
126
|
-
FileUtils::cp(File.join(FILE_FIXTURES_PATH,fname),path)
|
127
|
-
end
|
128
|
-
end
|
129
|
-
end
|
130
|
-
|
131
|
-
unless File.exist?("#{SITES_ROOT}/test.host/public")
|
132
|
-
FileUtils::mkpath("#{SITES_ROOT}/test.host/public")
|
133
|
-
['images', 'calendar', 'stylesheets', 'javascripts'].each do |dir|
|
134
|
-
FileUtils.symlink_or_copy("../../../public/#{dir}", "#{SITES_ROOT}/test.host/public/#{dir}")
|
135
|
-
end
|
136
|
-
end
|
167
|
+
reset_data_folder
|
168
|
+
reset_public_folder
|
137
169
|
|
138
170
|
FileUtils::mkpath("#{SITES_ROOT}/test.host/log") unless File.exist?("#{SITES_ROOT}/test.host/log")
|
171
|
+
|
172
|
+
Zena::Db.insert_dummy_ids
|
139
173
|
end
|
140
174
|
end # Fixtures
|
141
175
|
end # use
|
@@ -0,0 +1,584 @@
|
|
1
|
+
module Zena
|
2
|
+
module Use
|
3
|
+
module Forms
|
4
|
+
module ViewMethods
|
5
|
+
def make_checkbox(node, values, relation_name, attribute)
|
6
|
+
relation_proxy = node.relation_proxy(relation_name)
|
7
|
+
return nil unless values && relation_proxy
|
8
|
+
|
9
|
+
res = []
|
10
|
+
role = relation_proxy.other_role
|
11
|
+
|
12
|
+
if relation_proxy.unique?
|
13
|
+
current_value = relation_proxy.other_id
|
14
|
+
|
15
|
+
res << "<div class='input_radio'>"
|
16
|
+
values.each do |value|
|
17
|
+
res << "<span><input type='radio' name='node[#{role}_id]' value='#{value.zip}'"
|
18
|
+
res << (current_value == value.id ? " checked='checked'/> " : '/> ')
|
19
|
+
res << value.prop[attribute]
|
20
|
+
res << '</span> '
|
21
|
+
end
|
22
|
+
res << '</div>'
|
23
|
+
|
24
|
+
res << "<span><input type='radio' name='node[#{role}_id]' value=''/> #{_('none')}</span>"
|
25
|
+
else
|
26
|
+
current_values = relation_proxy.other_ids
|
27
|
+
res << "<div class='input_checkbox'>"
|
28
|
+
values.each do |value|
|
29
|
+
res << "<span><input type='checkbox' name='node[#{role}_ids][]' value='#{value.zip}'"
|
30
|
+
res << (current_values.include?(value.id) ? " checked='checked'/> " : '/> ')
|
31
|
+
res << value.prop[attribute]
|
32
|
+
res << '</span> '
|
33
|
+
end
|
34
|
+
res << '</div>'
|
35
|
+
res << "<input type='hidden' name='node[#{role}_ids][]' value=''/>"
|
36
|
+
end
|
37
|
+
res.join('')
|
38
|
+
end
|
39
|
+
end # ViewMethods
|
40
|
+
|
41
|
+
module ZafuMethods
|
42
|
+
def make_input(form_helper, name, type, textarea = false)
|
43
|
+
if type == Time
|
44
|
+
"<%= date_box(#{node}, :#{name}) %>"
|
45
|
+
elsif textarea
|
46
|
+
"<%= #{form_helper}.text_area :#{name}, :id => '#{node.dom_prefix}_#{name}' %>"
|
47
|
+
else
|
48
|
+
"<%= #{form_helper}.text_field :#{name}, :id => '#{node.dom_prefix}_#{name}' %>"
|
49
|
+
end
|
50
|
+
end
|
51
|
+
|
52
|
+
def make_form
|
53
|
+
if !@context[:make_form] || node.list_context? || @context[:form_helper].blank?
|
54
|
+
return super
|
55
|
+
else
|
56
|
+
form_helper = @context[:form_helper]
|
57
|
+
end
|
58
|
+
|
59
|
+
if %W{link show}.include?(method) || method == 'zazen' || (name = method[/zazen\(\s*(\w+)\s*\)/,1])
|
60
|
+
name ||= @params[:attr] || @params[:date] || 'title'
|
61
|
+
textarea = method =~ /zazen/
|
62
|
+
elsif type = node.klass.safe_method_type([method])
|
63
|
+
name = method
|
64
|
+
end
|
65
|
+
|
66
|
+
if name
|
67
|
+
type ||= node.klass.safe_method_type([name])
|
68
|
+
# do we have a property ?
|
69
|
+
if type && (node.klass.column_names.include?(name) || node.klass.schema.column_names.include?(name))
|
70
|
+
# create an input field
|
71
|
+
out make_input(form_helper, name, type[:class], textarea)
|
72
|
+
else
|
73
|
+
# ignore
|
74
|
+
out ''
|
75
|
+
end
|
76
|
+
else
|
77
|
+
super
|
78
|
+
#when 'text', 'summary'
|
79
|
+
# make_textarea(:name => method)
|
80
|
+
#when :r_show
|
81
|
+
# make_input(:name => (@params[:attr] || @params[:tattr]), :date => @params[:date])
|
82
|
+
#when :r_text
|
83
|
+
# make_textarea(:name => 'text')
|
84
|
+
#when :r_summary
|
85
|
+
# make_textarea(:name => 'summary')
|
86
|
+
#when :r_zazen
|
87
|
+
# make_textarea(:name => @params[:attr])
|
88
|
+
#else
|
89
|
+
# if node.will_be?(DataEntry) && @method.to_s =~ /node_/
|
90
|
+
# # select node_id
|
91
|
+
# "<%= select_id('#{node.form_name}', '#{@method}_id') %>"
|
92
|
+
# end
|
93
|
+
end
|
94
|
+
#res = "<#{@html_tag || 'div'} class='zazen'>#{res}</#{@html_tag || 'div'}>" if [:r_summary, :r_text].include?(method)
|
95
|
+
end
|
96
|
+
|
97
|
+
def form_options
|
98
|
+
opts = super
|
99
|
+
|
100
|
+
dom_name = node.dom_prefix
|
101
|
+
opts[:form_helper] = 'f'
|
102
|
+
|
103
|
+
if template_url = @context[:template_url]
|
104
|
+
# Ajax
|
105
|
+
|
106
|
+
if @context[:in_add]
|
107
|
+
# Inline form used to create new elements: set values to '' and 'parent_id' from context
|
108
|
+
opts[:id] = "#{node.dom_prefix}_form"
|
109
|
+
opts[:form_tag] = "<% remote_form_for(:#{node.form_name}, #{node}, :url => #{node.form_name.pluralize}_path, :html => {:id => \"#{dom_name}_form_t\"}) do |f| %>"
|
110
|
+
opts[:form_cancel] = "<p class='btn_x'><a href='#' onclick='[\"#{dom_name}_add\", \"#{dom_name}_form\"].each(Element.toggle);return false;'>#{_('btn_x')}</a></p>\n"
|
111
|
+
else
|
112
|
+
# Saved form
|
113
|
+
opts[:id] = "<%= ndom_id(#{node}) %>"
|
114
|
+
|
115
|
+
opts[:form_tag] = <<-END_TXT
|
116
|
+
<% remote_form_for(:#{node.form_name}, #{node}, :url => #{node}.new_record? ? #{node.form_name.pluralize}_path : #{node.form_name}_path(#{node}), :method => #{node}.new_record? ? :post : :put, :html => {:id => \"\#{ndom_id(#{node})}_form_t\"}) do |f| %>
|
117
|
+
END_TXT
|
118
|
+
|
119
|
+
opts[:form_cancel] = <<-END_TXT
|
120
|
+
<% if #{node}.new_record? -%>
|
121
|
+
<p class='btn_x'><a href='#' onclick='[\"<%= params[:dom_id] %>_add\", \"<%= params[:dom_id] %>_form\"].each(Element.toggle);return false;'>#{_('btn_x')}</a></p>
|
122
|
+
<% else -%>
|
123
|
+
<p class='btn_x'><%= link_to_remote(#{_('btn_x').inspect}, :url => #{node.form_name}_path(#{node}.id) + \"/zafu?t_url=#{CGI.escape(template_url)}&dom_id=\#{params[:dom_id]}#{@context[:has_link_id] ? "&link_id=\#{#{node}.link_id}" : ''}\", :method => :get) %></p>
|
124
|
+
<% end -%>
|
125
|
+
END_TXT
|
126
|
+
end
|
127
|
+
end
|
128
|
+
opts
|
129
|
+
end
|
130
|
+
|
131
|
+
def form_hidden_fields(opts)
|
132
|
+
hidden_fields = super
|
133
|
+
add_params = @context[:add] ? @context[:add].params : {}
|
134
|
+
set_fields = []
|
135
|
+
@markup.params[:class] ||= 'form'
|
136
|
+
|
137
|
+
(descendants('input') + descendants('select')).each do |tag|
|
138
|
+
set_fields << "#{node.form_name}[#{tag.params[:name]}]"
|
139
|
+
end
|
140
|
+
|
141
|
+
if template_url = @context[:template_url] # @context[:dom_prefix] || @params[:update]
|
142
|
+
# Ajax
|
143
|
+
|
144
|
+
if (descendants('input') || []).detect {|elem| elem.params[:type] == 'submit'}
|
145
|
+
# has submit
|
146
|
+
else
|
147
|
+
# Hidden submit for Firefox compatibility
|
148
|
+
hidden_fields['submit'] = ["<input type='submit'/>"]
|
149
|
+
end
|
150
|
+
|
151
|
+
hidden_fields['link_id'] = "<%= #{node}.link_id %>" if @context[:has_link_id] && node.will_be?(Node)
|
152
|
+
|
153
|
+
# if upd = @params[:update] || add_params[:update]
|
154
|
+
# if target = find_target(upd)
|
155
|
+
# hidden_fields['u_url'] = target.template_url
|
156
|
+
# hidden_fields['udom_id'] = target.erb_dom_id
|
157
|
+
# hidden_fields['u_id'] = "<%= #{@context[:parent_node]}.zip %>" if @context[:in_add]
|
158
|
+
# hidden_fields['s'] = start_node_s_param(:value)
|
159
|
+
# end
|
160
|
+
# elsif (block = ancestor('block')) && node.will_be?(DataEntry)
|
161
|
+
# # updates template url
|
162
|
+
# hidden_fields['u_url'] = block.template_url
|
163
|
+
# hidden_fields['udom_id'] = block.erb_dom_id
|
164
|
+
# end
|
165
|
+
|
166
|
+
hidden_fields['t_url'] = template_url
|
167
|
+
|
168
|
+
# if t_id = @params[:t_id]
|
169
|
+
# hidden_fields['t_id'] = parse_attributes_in_value(t_id)
|
170
|
+
# end
|
171
|
+
|
172
|
+
# FIXME: replace 'dom_id' with 'dom_name' ?
|
173
|
+
erb_dom_id = @context[:saved_template] ? '<%= params[:dom_id] %>' : node.dom_prefix
|
174
|
+
|
175
|
+
hidden_fields['dom_id'] = erb_dom_id
|
176
|
+
|
177
|
+
if node.will_be?(Node)
|
178
|
+
# Nested contexts:
|
179
|
+
# 1. @node
|
180
|
+
# 2. var1 = @node.children
|
181
|
+
# 3. var1_new = Node.new
|
182
|
+
hidden_fields['node[parent_id]'] = "<%= #{@context[:in_add] ? "#{node.up.up}.zip" : "#{node}.parent_zip"} %>"
|
183
|
+
elsif node.will_be?(Comment)
|
184
|
+
# FIXME: the "... || '@node'" is a hack and I don't understand why it's needed...
|
185
|
+
hidden_fields['node_id'] = "<%= #{node.up || '@node'}.zip %>"
|
186
|
+
elsif node.will_be?(DataEntry)
|
187
|
+
return parser_error("Missing :data_root in context (internal error)") unless data_root = @context[:data_root]
|
188
|
+
hidden_fields["data_entry[#{data_root}_id]"] = "<%= #{@context[:in_add] ? node(Node) : "#{node}.#{data_root}"}.zip %>"
|
189
|
+
end
|
190
|
+
|
191
|
+
if add_block = @context[:add]
|
192
|
+
params = add_block.params
|
193
|
+
[:after, :before, :top, :bottom].each do |sym|
|
194
|
+
if params[sym]
|
195
|
+
hidden_fields['position'] = sym.to_s
|
196
|
+
if params[sym] == 'self'
|
197
|
+
if sym == :before
|
198
|
+
hidden_fields['reference'] = "#{erb_dom_id}_add"
|
199
|
+
else
|
200
|
+
hidden_fields['reference'] = "#{erb_dom_id}_form"
|
201
|
+
end
|
202
|
+
else
|
203
|
+
hidden_fields['reference'] = params[sym]
|
204
|
+
end
|
205
|
+
break
|
206
|
+
end
|
207
|
+
end
|
208
|
+
if params[:done] == 'focus'
|
209
|
+
if params[:focus]
|
210
|
+
hidden_fields['done'] = "'$(\"#{erb_dom_id}_#{@params[:focus]}\").focus();'"
|
211
|
+
else
|
212
|
+
hidden_fields['done'] = "'$(\"#{erb_dom_id}_form_t\").focusFirstElement();'"
|
213
|
+
end
|
214
|
+
elsif params[:done]
|
215
|
+
hidden_fields['done'] = CGI.escape(params[:done]) # .gsub("NODE_ID", @node.zip).gsub("PARENT_ID", @node.parent_zip)
|
216
|
+
end
|
217
|
+
else
|
218
|
+
# ajax form, not in 'add'
|
219
|
+
hidden_fields['done'] = CGI.escape(@params[:done]) if @params[:done]
|
220
|
+
end
|
221
|
+
else
|
222
|
+
# no ajax
|
223
|
+
# FIXME
|
224
|
+
cancel = "" # link to normal node ?
|
225
|
+
end
|
226
|
+
|
227
|
+
if node.will_be?(Node) && (@params[:klass] || @context[:klass])
|
228
|
+
hidden_fields['node[klass]'] = @params[:klass] || @context[:klass]
|
229
|
+
end
|
230
|
+
|
231
|
+
if node.will_be?(Node) && @params[:mode]
|
232
|
+
hidden_fields['mode'] = @params[:mode]
|
233
|
+
end
|
234
|
+
|
235
|
+
hidden_fields['node[v_status]'] = Zena::Status[:pub].to_s if add_params[:publish] || auto_publish_param
|
236
|
+
|
237
|
+
# ===
|
238
|
+
# TODO: reject set_fields from hidden_fields
|
239
|
+
# ===
|
240
|
+
|
241
|
+
hidden_fields.reject! do |k,v|
|
242
|
+
set_fields.include?(k)
|
243
|
+
end
|
244
|
+
|
245
|
+
hidden_fields
|
246
|
+
end
|
247
|
+
|
248
|
+
def r_textarea
|
249
|
+
out make_textarea(@markup.params.merge(@params))
|
250
|
+
end
|
251
|
+
|
252
|
+
# <r:select name='klass' root_class='...'/>
|
253
|
+
# <r:select name='parent_id' values='projects in site'/>
|
254
|
+
# TODO: optimization (avoid loading full AR to only use [id, name])
|
255
|
+
def r_select
|
256
|
+
html_attributes, attribute = get_input_params()
|
257
|
+
return parser_error("missing name") unless attribute
|
258
|
+
|
259
|
+
if value = @params[:selected]
|
260
|
+
selected = ::RubyLess.translate_string(value, self)
|
261
|
+
elsif @context[:in_filter]
|
262
|
+
selected = "params[#{attribute.to_sym.inspect}].to_s"
|
263
|
+
elsif %w{parent_id}.include?(attribute)
|
264
|
+
selected = "#{node}.parent_zip.to_s"
|
265
|
+
elsif attribute == 'copy_id'
|
266
|
+
selected = 'nil'
|
267
|
+
elsif attribute =~ /^(.*)_id$/
|
268
|
+
# relation
|
269
|
+
selected = "#{node}.rel[#{$1.inspect}].other_zip.to_s"
|
270
|
+
else
|
271
|
+
selected = "#{node}.prop[#{attribute.inspect}].to_s"
|
272
|
+
end
|
273
|
+
|
274
|
+
html_id = html_attributes[:id] ? " id='#{html_attributes[:id]}'" : ''
|
275
|
+
if @context[:in_filter]
|
276
|
+
select_tag = "<select#{html_id} name='#{attribute}'>"
|
277
|
+
else
|
278
|
+
select_tag = "<select#{html_id} name='#{node.form_name}[#{attribute}]'>"
|
279
|
+
end
|
280
|
+
|
281
|
+
if klass = @params[:root_class]
|
282
|
+
class_opts = ''
|
283
|
+
class_opts << ", :without => #{@params[:without].inspect}" if @params[:without]
|
284
|
+
# do not use 'selected' if the node is not new
|
285
|
+
"#{select_tag}<%= options_for_select(Node.classes_for_form(:class => #{klass.inspect}#{class_opts}), (#{node}.new_record? ? #{selected} : #{node}.klass)) %></select>"
|
286
|
+
elsif @params[:type] == 'time_zone'
|
287
|
+
# <r:select name='d_tz' type='time_zone'/>
|
288
|
+
"#{select_tag}<%= options_for_select(TZInfo::Timezone.all_identifiers, #{selected}) %></select>"
|
289
|
+
elsif options_list = get_options_for_select
|
290
|
+
"#{select_tag}<%= options_for_select(#{options_list}, #{selected}) %></select>"
|
291
|
+
else
|
292
|
+
parser_error("missing 'nodes', 'root_class' or 'values'")
|
293
|
+
end
|
294
|
+
end
|
295
|
+
|
296
|
+
|
297
|
+
def r_input
|
298
|
+
html_attributes, attribute = get_input_params()
|
299
|
+
case @params[:type]
|
300
|
+
when 'select' # FIXME: why is this only for classes ?
|
301
|
+
out parser_error("please use [select] here")
|
302
|
+
r_select
|
303
|
+
when 'date_box', 'date'
|
304
|
+
return parser_error("date_box without name") unless attribute
|
305
|
+
input_id = @context[:dom_prefix] ? ", :id=>\"#{dom_id}_#{attribute}\"" : ''
|
306
|
+
"<%= date_box #{node}, #{attribute.inspect}, :size=>15#{@context[:in_add] ? ", :value=>''" : ''}#{input_id} %>"
|
307
|
+
when 'id'
|
308
|
+
return parser_error("select id without name") unless attribute
|
309
|
+
name = "#{attribute}_id" unless attribute[-3..-1] == '_id'
|
310
|
+
input_id = @context[:erb_dom_id] ? ", :input_id =>\"#{erb_dom_id}_#{attribute}\"" : ''
|
311
|
+
"<%= select_id('#{node.form_name}', #{attribute.inspect}#{input_id}) %>"
|
312
|
+
when 'time_zone'
|
313
|
+
out parser_error("please use [select] here")
|
314
|
+
r_select
|
315
|
+
when 'submit'
|
316
|
+
@markup.tag = 'input'
|
317
|
+
@markup.set_param(:type, @params[:type])
|
318
|
+
@markup.set_param(:text, @params[:text]) if @params[:text]
|
319
|
+
@markup.set_params(html_attributes)
|
320
|
+
wrap('')
|
321
|
+
else
|
322
|
+
# 'text', 'hidden', ...
|
323
|
+
@markup.tag = 'input'
|
324
|
+
@markup.set_param(:type, @params[:type] || 'text')
|
325
|
+
|
326
|
+
checked = html_attributes.delete(:checked)
|
327
|
+
|
328
|
+
@markup.set_dyn_params(html_attributes)
|
329
|
+
@markup.append_attribute checked if checked
|
330
|
+
wrap('')
|
331
|
+
end
|
332
|
+
end
|
333
|
+
|
334
|
+
# <r:checkbox role='collaborator_for' values='projects' in='site'/>"
|
335
|
+
def r_checkbox
|
336
|
+
return parser_error("missing 'nodes'") unless values = @params[:values] || @params[:nodes]
|
337
|
+
return parser_error("missing 'role'") unless role = (@params[:role] || @params[:name])
|
338
|
+
attribute = @params[:attr] || 'title'
|
339
|
+
if role =~ /(.*)_ids?\Z/
|
340
|
+
role = $1
|
341
|
+
end
|
342
|
+
meth = role.singularize
|
343
|
+
|
344
|
+
if values =~ /^\d+\s*($|,)/
|
345
|
+
# ids
|
346
|
+
# TODO generate the full query instead of using secure.
|
347
|
+
values = values.split(',').map{|v| v.to_i}
|
348
|
+
finder = "secure(Node) { Node.all(:conditions => 'zip IN (#{values.join(',')})') }"
|
349
|
+
else
|
350
|
+
# relation
|
351
|
+
return unless finder = build_finder(:all, values, @params)
|
352
|
+
return parser_error("invalid class (#{finder[:class]})") unless finder[:class].first <= Node
|
353
|
+
finder = finder[:method]
|
354
|
+
end
|
355
|
+
out "<%= make_checkbox(#{node}, #{finder}, #{meth.inspect}, #{attribute.inspect}) %>"
|
356
|
+
end
|
357
|
+
|
358
|
+
alias r_radio r_checkbox
|
359
|
+
|
360
|
+
# transform a 'show' tag into an input field.
|
361
|
+
#def make_input(params = @params)
|
362
|
+
# input, attribute = get_input_params(params)
|
363
|
+
# return parser_error("missing 'name'") unless attribute
|
364
|
+
# return '' if attribute == 'parent_id' # set with 'r_form'
|
365
|
+
# return '' if ['url','path'].include?(attribute) # cannot be set with a form
|
366
|
+
# if params[:date]
|
367
|
+
# input_id = @context[:dom_prefix] ? ", :id=>\"#{dom_id}_#{attribute}\"" : ''
|
368
|
+
# return "<%= date_box(#{node}, #{params[:date].inspect}#{input_id}) %>"
|
369
|
+
# end
|
370
|
+
# input_id = node.dom_prefix ? " id='#{node.dom_prefix}_#{attribute}'" : ''
|
371
|
+
# "<input type='#{params[:type] || 'text'}'#{input_id} name='#{input[:name]}' value='#{input[:value]}'/>"
|
372
|
+
#end
|
373
|
+
#
|
374
|
+
|
375
|
+
# Parse params to extract everything that is relevant to building input fields.
|
376
|
+
# TODO: refactor and pass the @markup so that attributes are added directly
|
377
|
+
def get_input_params(params = @params)
|
378
|
+
res = Zafu::OrderedHash.new
|
379
|
+
if name = (params[:name] || params[:date])
|
380
|
+
res[:name] = name
|
381
|
+
if res[:name] =~ /\A([\w_]+)\[(.*?)\]/
|
382
|
+
# Sub attributes are used with tags or might be used for other features. It
|
383
|
+
# enables things like 'tagged[foo]'
|
384
|
+
attribute, sub_attr = $1, $2
|
385
|
+
else
|
386
|
+
attribute = res[:name]
|
387
|
+
end
|
388
|
+
|
389
|
+
unless @context[:in_filter] || attribute == 's'
|
390
|
+
if sub_attr
|
391
|
+
res[:name] = "#{node.form_name}[#{attribute}][#{sub_attr}]"
|
392
|
+
else
|
393
|
+
res[:name] = "#{node.form_name}[#{attribute}]"
|
394
|
+
end
|
395
|
+
end
|
396
|
+
|
397
|
+
if sub_attr
|
398
|
+
type = node.klass.safe_method_type([attribute])
|
399
|
+
if sub_attr_ruby = RubyLess.translate(%Q{this.#{attribute}[#{sub_attr.inspect}]}, self)
|
400
|
+
res[:value] = "<%= fquote #{sub_attr_ruby} %>"
|
401
|
+
end
|
402
|
+
else
|
403
|
+
if value = params[:value]
|
404
|
+
# On refactor, use append_markup_attr(markup, key, value)
|
405
|
+
value = RubyLess.translate_string(value, self)
|
406
|
+
|
407
|
+
if value.literal
|
408
|
+
res[:value] = value.literal.to_s.gsub("'",''')
|
409
|
+
else
|
410
|
+
res[:value] = "<%= fquote #{value} %>"
|
411
|
+
end
|
412
|
+
elsif type = node.klass.safe_method_type([attribute])
|
413
|
+
res[:value] = "<%= fquote #{node}.#{type[:method]} %>"
|
414
|
+
end
|
415
|
+
end
|
416
|
+
|
417
|
+
if sub_attr && params[:type] == 'checkbox' && !params[:value]
|
418
|
+
# Special case when we have a sub_attribute: default value for "tagged[foobar]" is "foobar"
|
419
|
+
params[:value] = sub_attr
|
420
|
+
end
|
421
|
+
|
422
|
+
#if @context[:in_add]
|
423
|
+
# res[:value] = (params[:value] || params[:set_value]) ? ["'#{ helper.fquote(params[:value])}'"] : ["''"]
|
424
|
+
#elsif @context[:in_filter]
|
425
|
+
# res[:value] = attribute ? ["'<%= fquote params[#{attribute.to_sym.inspect}] %>'"] : ["''"]
|
426
|
+
#elsif params[:value]
|
427
|
+
# res[:value] = ["'#{ helper.fquote(params[:value])}'"]
|
428
|
+
#else
|
429
|
+
# if nattr != 'nil'
|
430
|
+
# res[:value] = ["'<%= fquote #{nattr} %>'"]
|
431
|
+
# else
|
432
|
+
# res[:value] = ["''"]
|
433
|
+
# end
|
434
|
+
#end
|
435
|
+
end
|
436
|
+
|
437
|
+
if node.dom_prefix
|
438
|
+
res[:id] = "#{node.dom_prefix}_#{attribute}"
|
439
|
+
else
|
440
|
+
res[:id] = params[:id] if params[:id]
|
441
|
+
end
|
442
|
+
|
443
|
+
if params[:type] == 'checkbox' && sub_attr_ruby
|
444
|
+
if value = params[:value]
|
445
|
+
res[:checked] = "<%= #{sub_attr_ruby} == #{value.inspect} ? \" checked='checked'\" : '' %>"
|
446
|
+
else
|
447
|
+
res[:checked] = "<%= #{sub_attr_ruby}.blank? ? '' : \" checked='checked'\" %>"
|
448
|
+
end
|
449
|
+
end
|
450
|
+
|
451
|
+
params.each do |k, v|
|
452
|
+
next unless [:size, :style, :class].include?(k)
|
453
|
+
res[k] = params[k]
|
454
|
+
end
|
455
|
+
|
456
|
+
return [res, attribute]
|
457
|
+
end
|
458
|
+
|
459
|
+
# TODO: add parent_id into the form !
|
460
|
+
# TODO: add <div style="margin:0;padding:0"><input name="_method" type="hidden" value="put" /></div> if method == put
|
461
|
+
# FIXME: use <r:form href='self'> or <r:form action='...'>
|
462
|
+
|
463
|
+
=begin
|
464
|
+
form << "<%= error_messages_for(#{node}) %>"
|
465
|
+
|
466
|
+
|
467
|
+
@blocks = blocks_bak if blocks_bak
|
468
|
+
|
469
|
+
@html_tag_done = false
|
470
|
+
@html_tag_params.merge!(id_hash)
|
471
|
+
out render_html_tag(res)
|
472
|
+
=end
|
473
|
+
protected
|
474
|
+
|
475
|
+
# Get current attribute in forms
|
476
|
+
def node_attribute(attribute)
|
477
|
+
node_attribute = ::RubyLess.translate(attribute, node.klass)
|
478
|
+
"#{node}.#{node_attribute}"
|
479
|
+
rescue ::RubyLess::NoMethodError
|
480
|
+
if node.will_be?(Node)
|
481
|
+
"#{node}.prop[#{attribute.inspect}]"
|
482
|
+
else
|
483
|
+
'nil'
|
484
|
+
end
|
485
|
+
end
|
486
|
+
|
487
|
+
# Set v_status parameter value
|
488
|
+
def auto_publish_param(in_string = false)
|
489
|
+
if in_string
|
490
|
+
%w{true force}.include?(@params[:publish]) ? "&publish=#{@params[:publish]}" : ''
|
491
|
+
else
|
492
|
+
@params[:publish]
|
493
|
+
end
|
494
|
+
end
|
495
|
+
|
496
|
+
# Return options for [select] tag.
|
497
|
+
def get_options_for_select
|
498
|
+
if nodes = @params[:nodes]
|
499
|
+
# TODO: dry with r_checkbox
|
500
|
+
klass = Node
|
501
|
+
if nodes =~ /^\d+\s*($|,)/
|
502
|
+
# ids
|
503
|
+
# TODO: optimization generate the full query instead of using secure.
|
504
|
+
nodes = nodes.split(',').map{|v| v.to_i}
|
505
|
+
nodes = "(secure(Node) { Node.find(:all, :conditions => 'zip IN (#{nodes.join(',')})') })"
|
506
|
+
else
|
507
|
+
# relation
|
508
|
+
begin
|
509
|
+
finder = build_finder(:all, nodes, @params)
|
510
|
+
klass = finder[:class].first
|
511
|
+
rescue ::QueryBuilder::SyntaxError => err
|
512
|
+
out parser_error(err.message)
|
513
|
+
return nil
|
514
|
+
end
|
515
|
+
|
516
|
+
return parser_error("invalid class (#{klass})") unless klass <= Node
|
517
|
+
nodes = finder[:method]
|
518
|
+
end
|
519
|
+
|
520
|
+
set_attr = ::RubyLess.translate(@params[:attr] || 'id', klass)
|
521
|
+
show_attr = ::RubyLess.translate(@params[:show] || 'title', klass)
|
522
|
+
|
523
|
+
options_list = "[['','']] + (#{nodes} || []).map{|r| [r.#{show_attr}, r.#{set_attr}.to_s]}"
|
524
|
+
elsif values = @params[:values]
|
525
|
+
options_list = values.split(',').map(&:strip)
|
526
|
+
|
527
|
+
if show = @params[:show]
|
528
|
+
show_values = show.split(',').map(&:strip)
|
529
|
+
elsif show = @params[:tshow]
|
530
|
+
show_values = show.split(',').map do |s|
|
531
|
+
_(s.strip)
|
532
|
+
end
|
533
|
+
end
|
534
|
+
|
535
|
+
if show_values
|
536
|
+
options_list.each_index do |i|
|
537
|
+
options_list[i] = [show_values[i], options_list[i]]
|
538
|
+
end
|
539
|
+
end
|
540
|
+
options_list.inspect
|
541
|
+
end
|
542
|
+
end
|
543
|
+
|
544
|
+
|
545
|
+
# Transform a 'zazen' tag into a textarea input field.
|
546
|
+
def make_textarea(params)
|
547
|
+
return parser_error("missing 'name'") unless name = params[:name]
|
548
|
+
if name =~ /\A([\w_]+)\[(.*?)\]/
|
549
|
+
attribute = $2
|
550
|
+
else
|
551
|
+
attribute = name
|
552
|
+
name = "#{node.form_name}[#{attribute}]"
|
553
|
+
end
|
554
|
+
return '' if attribute == 'parent_id' # set with 'r_form'
|
555
|
+
|
556
|
+
if @blocks == [] || @blocks == ['']
|
557
|
+
if @context[:in_add]
|
558
|
+
value = ''
|
559
|
+
else
|
560
|
+
value = attribute ? "<%= #{node_attribute(attribute)} %>" : ""
|
561
|
+
end
|
562
|
+
else
|
563
|
+
value = expand_with
|
564
|
+
end
|
565
|
+
html_id = node.dom_prefix ? " id='#{node.dom_prefix}_#{attribute}'" : ''
|
566
|
+
"<textarea#{html_id} name='#{name}'>#{value}</textarea>"
|
567
|
+
end
|
568
|
+
|
569
|
+
# Return the default field that will receive focus on form display.
|
570
|
+
def default_focus_field
|
571
|
+
if (input_fields = descendants('input')) != []
|
572
|
+
input_fields.first.params[:name]
|
573
|
+
elsif (show_fields = descendants('show')) != []
|
574
|
+
show_fields.first.params[:attr]
|
575
|
+
elsif node.will_be?(Node)
|
576
|
+
'title'
|
577
|
+
else
|
578
|
+
'text'
|
579
|
+
end
|
580
|
+
end
|
581
|
+
end # ZafuMethods
|
582
|
+
end # Forms
|
583
|
+
end # Use
|
584
|
+
end # Zena
|