[prev in list] [next in list] [prev in thread] [next in thread]
List: bricolage-commits
Subject: [6088] Merged rev_1_8 changes 5708-6086.
From: theory () bricolage ! cc
Date: 2004-11-19 8:55:17
Message-ID: 20041119085517.6509.qmail () x1 ! develooper ! com
[Download RAW message or body]
Revision: 6088
Author: theory
Date: 2004-11-19 00:55:15 -0800 (Fri, 19 Nov 2004)
ViewCVS: http://viewsvn.bricolage.cc/?rev=6088&view=rev
Log Message:
-----------
Merged rev_1_8 changes 5708-6086. Will tag rev_1_8_merge_6086.
Modified Files:
--------------
bricolage/trunk/README.Redhat
bricolage/trunk/bin/bric_dist_mon
bricolage/trunk/bin/bric_republish
bricolage/trunk/comp/admin/profile/category/dhandler
bricolage/trunk/comp/admin/profile/grp/dhandler
bricolage/trunk/comp/help/bo/workflow/profile/templates/new.html
bricolage/trunk/comp/help/en_us/workflow/profile/templates/new.html
bricolage/trunk/comp/help/it_it/workflow/profile/templates/new.html
bricolage/trunk/comp/help/km/workflow/profile/templates/new.html
bricolage/trunk/comp/help/ko_ko/workflow/profile/templates/new.html
bricolage/trunk/comp/help/lo/workflow/profile/templates/new.html
bricolage/trunk/comp/help/my/workflow/profile/templates/new.html
bricolage/trunk/comp/help/pt_pt/workflow/profile/templates/new.html
bricolage/trunk/comp/help/ug/workflow/profile/templates/new.html
bricolage/trunk/comp/help/vi_vn/workflow/profile/templates/new.html
bricolage/trunk/comp/help/zh_cn/workflow/profile/templates/new.html
bricolage/trunk/comp/media/js/lib.js
bricolage/trunk/comp/widgets/container_prof/edit.html
bricolage/trunk/comp/widgets/debug/debug.mc
bricolage/trunk/comp/widgets/grp_membership/grp_membership.mc
bricolage/trunk/comp/widgets/help/debuggers.html
bricolage/trunk/comp/widgets/help/patchers.html
bricolage/trunk/comp/widgets/help/translators.html
bricolage/trunk/comp/widgets/listManager/full_list.mc
bricolage/trunk/comp/widgets/listManager/listManager.mc
bricolage/trunk/comp/widgets/search/formatting.html
bricolage/trunk/comp/widgets/search/media.html
bricolage/trunk/comp/widgets/search/story.html
bricolage/trunk/comp/widgets/story_prof/edit_categories.html
bricolage/trunk/comp/widgets/story_prof/edit_clone.html
bricolage/trunk/comp/widgets/story_prof/story_prof.mc
bricolage/trunk/comp/workflow/manager/dhandler
bricolage/trunk/comp/workflow/profile/workspace/clone/dhandler
bricolage/trunk/contrib/bric_media_dump/t/zpod.t
bricolage/trunk/contrib/bric_template_dump/t/zpod.t
bricolage/trunk/inst/apache.pl
bricolage/trunk/inst/clone_files.pl
bricolage/trunk/inst/conf.pl
bricolage/trunk/inst/db_upgrade.pl
bricolage/trunk/inst/required.pl
bricolage/trunk/inst/upgrade/1.8.2/delete_old_jobs.pl
bricolage/trunk/inst/upgrade/lib/bric_upgrade.pm
bricolage/trunk/inst/versions.txt
bricolage/trunk/lib/Bric/Admin.pod
bricolage/trunk/lib/Bric/App/Callback/Profile/ElementData.pm
bricolage/trunk/lib/Bric/App/Callback/Profile/Grp.pm
bricolage/trunk/lib/Bric/App/Callback/Profile/Media.pm
bricolage/trunk/lib/Bric/App/Callback/Profile/Story.pm
bricolage/trunk/lib/Bric/App/Callback/Profile/Template.pm
bricolage/trunk/lib/Bric/App/Event.pm
bricolage/trunk/lib/Bric/App/Handler.pm
bricolage/trunk/lib/Bric/App/Util.pm
bricolage/trunk/lib/Bric/Biz/Asset/Business/Media.pm
bricolage/trunk/lib/Bric/Biz/Asset/Business/Parts/Tile/Container.pm
bricolage/trunk/lib/Bric/Biz/Asset/Business/Story.pm
bricolage/trunk/lib/Bric/Biz/Asset/Formatting.pm
bricolage/trunk/lib/Bric/Biz/Asset.pm
bricolage/trunk/lib/Bric/Biz/AssetType.pm
bricolage/trunk/lib/Bric/Biz/Person/User.pm
bricolage/trunk/lib/Bric/Changes.pod
bricolage/trunk/lib/Bric/DBA.pod
bricolage/trunk/lib/Bric/Dist/Client.pm
bricolage/trunk/lib/Bric/Dist/Handler.pm
bricolage/trunk/lib/Bric/Hacker.pod
bricolage/trunk/lib/Bric/License.pod
bricolage/trunk/lib/Bric/SOAP/Workflow.pm
bricolage/trunk/lib/Bric/SOAP.pm
bricolage/trunk/lib/Bric/ToDo.pod
bricolage/trunk/lib/Bric/Util/AlertType.pm
bricolage/trunk/lib/Bric/Util/Burner/Mason.pm
bricolage/trunk/lib/Bric/Util/Burner/TemplateToolkit.pm
bricolage/trunk/lib/Bric/Util/Burner.pm
bricolage/trunk/lib/Bric/Util/Coll/Action.pm
bricolage/trunk/lib/Bric/Util/Coll.pm
bricolage/trunk/lib/Bric/Util/DBI.pm
bricolage/trunk/lib/Bric/Util/FTP/DirHandle.pm
bricolage/trunk/lib/Bric/Util/Fault/Exception.pm
bricolage/trunk/lib/Bric/Util/Grp/MediaType.pm
bricolage/trunk/lib/Bric/Util/Job/Pub.pm
bricolage/trunk/lib/Bric/Util/Job.pm
bricolage/trunk/lib/Bric/Util/Language/bo.pm
bricolage/trunk/lib/Bric/Util/Language/de_de.pm
bricolage/trunk/lib/Bric/Util/Language/en_us.pm
bricolage/trunk/lib/Bric/Util/Language/km.pm
bricolage/trunk/lib/Bric/Util/Language/ko_ko.pm
bricolage/trunk/lib/Bric/Util/Language/lo.pm
bricolage/trunk/lib/Bric/Util/Language/my.pm
bricolage/trunk/lib/Bric/Util/Language/pt_pt.pm
bricolage/trunk/lib/Bric/Util/Language/ug.pm
bricolage/trunk/lib/Bric/Util/Language/vi_vn.pm
bricolage/trunk/lib/Bric/Util/Language/zh_hk.pm
bricolage/trunk/lib/Bric/Util/Trans/FS.pm
bricolage/trunk/lib/Bric/Util/Trans/Mail.pm
bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Media.con
bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Media.sql
bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Story.con
bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Story.sql
bricolage/trunk/sql/Pg/Bric/Biz/Asset/Formatting.con
bricolage/trunk/sql/Pg/Bric/Biz/AssetType.sql
bricolage/trunk/sql/Pg/Bric/Biz/Workflow.sql
bricolage/trunk/sql/Pg/Bric/Util/Event.sql
bricolage/trunk/sql/Pg/Bric/Util/Grp.val
bricolage/trunk/sql/Pg/Bric/Util/Job.sql
bricolage/trunk/sql/Pg/Bric/Util/Pref.val
bricolage/trunk/sql/Pg/Bric.sql
bricolage/trunk/t/Bric/Test/DevBase.pm
bricolage/trunk/t/Bric/Util/DBI/DevTest.pm
bricolage/trunk/t/Bric/Util/DBI/Test.pm
bricolage/trunk/t/Bric/Util/Language/Test.pm
bricolage/trunk/t/Bric/Util/Time/DevTest.pm
bricolage/trunk/t/Bric/Util/UserPref/DevTest.pm
Added Files:
-----------
bricolage/trunk/comp/help/ru_ru/
bricolage/trunk/comp/help/ru_ru/about.html
bricolage/trunk/comp/help/ru_ru/admin/
bricolage/trunk/comp/help/ru_ru/admin/control/
bricolage/trunk/comp/help/ru_ru/admin/control/change_user.html
bricolage/trunk/comp/help/ru_ru/admin/events/
bricolage/trunk/comp/help/ru_ru/admin/events/dhandler
bricolage/trunk/comp/help/ru_ru/admin/manager/
bricolage/trunk/comp/help/ru_ru/admin/manager/alert_type.html
bricolage/trunk/comp/help/ru_ru/admin/manager/category.html
bricolage/trunk/comp/help/ru_ru/admin/manager/contrib.html
bricolage/trunk/comp/help/ru_ru/admin/manager/contrib_type.html
bricolage/trunk/comp/help/ru_ru/admin/manager/dest.html
bricolage/trunk/comp/help/ru_ru/admin/manager/element.html
bricolage/trunk/comp/help/ru_ru/admin/manager/element_type.html
bricolage/trunk/comp/help/ru_ru/admin/manager/grp.html
bricolage/trunk/comp/help/ru_ru/admin/manager/job.html
bricolage/trunk/comp/help/ru_ru/admin/manager/keyword.html
bricolage/trunk/comp/help/ru_ru/admin/manager/media_type.html
bricolage/trunk/comp/help/ru_ru/admin/manager/output_channel.html
bricolage/trunk/comp/help/ru_ru/admin/manager/pref.html
bricolage/trunk/comp/help/ru_ru/admin/manager/site.html
bricolage/trunk/comp/help/ru_ru/admin/manager/source.html
bricolage/trunk/comp/help/ru_ru/admin/manager/user.html
bricolage/trunk/comp/help/ru_ru/admin/manager/workflow.html
bricolage/trunk/comp/help/ru_ru/admin/profile/
bricolage/trunk/comp/help/ru_ru/admin/profile/action.html
bricolage/trunk/comp/help/ru_ru/admin/profile/alert_type/
bricolage/trunk/comp/help/ru_ru/admin/profile/alert_type/recip.html
bricolage/trunk/comp/help/ru_ru/admin/profile/alert_type.html
bricolage/trunk/comp/help/ru_ru/admin/profile/category.html
bricolage/trunk/comp/help/ru_ru/admin/profile/contrib/
bricolage/trunk/comp/help/ru_ru/admin/profile/contrib/edit.html
bricolage/trunk/comp/help/ru_ru/admin/profile/contrib/extend.html
bricolage/trunk/comp/help/ru_ru/admin/profile/contrib.html
bricolage/trunk/comp/help/ru_ru/admin/profile/desk.html
bricolage/trunk/comp/help/ru_ru/admin/profile/dest.html
bricolage/trunk/comp/help/ru_ru/admin/profile/element.html
bricolage/trunk/comp/help/ru_ru/admin/profile/element_data.html
bricolage/trunk/comp/help/ru_ru/admin/profile/element_type.html
bricolage/trunk/comp/help/ru_ru/admin/profile/grp/
bricolage/trunk/comp/help/ru_ru/admin/profile/grp/perm.html
bricolage/trunk/comp/help/ru_ru/admin/profile/grp.html
bricolage/trunk/comp/help/ru_ru/admin/profile/keyword.html
bricolage/trunk/comp/help/ru_ru/admin/profile/media_type.html
bricolage/trunk/comp/help/ru_ru/admin/profile/output_channel.html
bricolage/trunk/comp/help/ru_ru/admin/profile/server.html
bricolage/trunk/comp/help/ru_ru/admin/profile/site.html
bricolage/trunk/comp/help/ru_ru/admin/profile/source.html
bricolage/trunk/comp/help/ru_ru/admin/profile/user.html
bricolage/trunk/comp/help/ru_ru/admin/profile/workflow.html
bricolage/trunk/comp/help/ru_ru/workflow/
bricolage/trunk/comp/help/ru_ru/workflow/active/
bricolage/trunk/comp/help/ru_ru/workflow/active/media.html
bricolage/trunk/comp/help/ru_ru/workflow/active/story.html
bricolage/trunk/comp/help/ru_ru/workflow/active/templates.html
bricolage/trunk/comp/help/ru_ru/workflow/events/
bricolage/trunk/comp/help/ru_ru/workflow/events/dhandler
bricolage/trunk/comp/help/ru_ru/workflow/manager/
bricolage/trunk/comp/help/ru_ru/workflow/manager/media.html
bricolage/trunk/comp/help/ru_ru/workflow/manager/story.html
bricolage/trunk/comp/help/ru_ru/workflow/manager/templates.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/
bricolage/trunk/comp/help/ru_ru/workflow/profile/alerts.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/alias/
bricolage/trunk/comp/help/ru_ru/workflow/profile/alias/media.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/alias/story.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/desk.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/media/
bricolage/trunk/comp/help/ru_ru/workflow/profile/media/category.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/media/container/
bricolage/trunk/comp/help/ru_ru/workflow/profile/media/container/edit_super_bulk.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/media/contributor_role.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/media/contributors.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/media/keywords.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/media/new.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/media.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/publish.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/story/
bricolage/trunk/comp/help/ru_ru/workflow/profile/story/actions.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/story/category.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/story/container/
bricolage/trunk/comp/help/ru_ru/workflow/profile/story/container/edit_super_bulk.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/story/contributor_role.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/story/contributors.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/story/desks.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/story/keywords.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/story/new.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/story.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/templates/
bricolage/trunk/comp/help/ru_ru/workflow/profile/templates/new.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/templates.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/workspace.html
bricolage/trunk/comp/help/ru_ru/workflow/trail/
bricolage/trunk/comp/help/ru_ru/workflow/trail/dhandler
bricolage/trunk/comp/media/images/ru_ru/
bricolage/trunk/comp/media/images/ru_ru/D_green.gif
bricolage/trunk/comp/media/images/ru_ru/D_red.gif
bricolage/trunk/comp/media/images/ru_ru/P_green.gif
bricolage/trunk/comp/media/images/ru_ru/P_red.gif
bricolage/trunk/comp/media/images/ru_ru/Thumbs.db
bricolage/trunk/comp/media/images/ru_ru/acknowledge_all_red.gif
bricolage/trunk/comp/media/images/ru_ru/acknowledge_checked_red.gif
bricolage/trunk/comp/media/images/ru_ru/add_category_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/add_component_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/add_element_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/add_elements_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/add_more_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/add_notes_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/add_sub_element_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/add_sub_elements_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/add_template_code_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/add_to_form_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/add_to_list_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/bricolage.gif
bricolage/trunk/comp/media/images/ru_ru/bulk_edit_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/cancel_check_out_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/cancel_checked_red.gif
bricolage/trunk/comp/media/images/ru_ru/cancel_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/cancel_red.gif
bricolage/trunk/comp/media/images/ru_ru/change_red.gif
bricolage/trunk/comp/media/images/ru_ru/check_in_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/checkin_assets_red.gif
bricolage/trunk/comp/media/images/ru_ru/checkout_red.gif
bricolage/trunk/comp/media/images/ru_ru/clear_all_red.gif
bricolage/trunk/comp/media/images/ru_ru/clear_values_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/close.gif
bricolage/trunk/comp/media/images/ru_ru/contributors_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/create_red.gif
bricolage/trunk/comp/media/images/ru_ru/delete_categories_red.gif
bricolage/trunk/comp/media/images/ru_ru/delete_checked_red.gif
bricolage/trunk/comp/media/images/ru_ru/delete_red.gif
bricolage/trunk/comp/media/images/ru_ru/deploy_checked_red.gif
bricolage/trunk/comp/media/images/ru_ru/edit_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/edit_notes_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/edit_template_code_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/help.gif
bricolage/trunk/comp/media/images/ru_ru/keywords_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/login.gif
bricolage/trunk/comp/media/images/ru_ru/logout.gif
bricolage/trunk/comp/media/images/ru_ru/media_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/move_assets_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/my_alerts_orange.gif
bricolage/trunk/comp/media/images/ru_ru/my_workspace_off.gif
bricolage/trunk/comp/media/images/ru_ru/my_workspace_on.gif
bricolage/trunk/comp/media/images/ru_ru/new_desk_red.gif
bricolage/trunk/comp/media/images/ru_ru/new_organization_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/next_dkgreen.gif
bricolage/trunk/comp/media/images/ru_ru/permissions_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/preview_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/publish_assets_red.gif
bricolage/trunk/comp/media/images/ru_ru/publish_checked_red.gif
bricolage/trunk/comp/media/images/ru_ru/recount_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/related_stories_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/remove_from_list_red.gif
bricolage/trunk/comp/media/images/ru_ru/reorder_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/resize_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/return_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/revert_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/save_and_stay_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/save_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/save_red.gif
bricolage/trunk/comp/media/images/ru_ru/search_green.gif
bricolage/trunk/comp/media/images/ru_ru/search_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/search_red.gif
bricolage/trunk/comp/media/images/ru_ru/select_all_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/stories_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/templates_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/upload_red.gif
bricolage/trunk/comp/media/images/ru_ru/use_this_role_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/view_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/view_log_teal.gif
bricolage/trunk/comp/media/images/ru_ru/view_notes_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/view_notes_teal.gif
bricolage/trunk/comp/media/images/ru_ru/view_text_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/view_trail_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/view_trail_teal.gif
bricolage/trunk/comp/media/images/ru_ru/workflow_admin.gif
bricolage/trunk/comp/media/images/ru_ru/workflow_workflow.gif
bricolage/trunk/comp/media/js/ru_ru_messages.js
bricolage/trunk/contrib/bric_import_contribs/
bricolage/trunk/contrib/bric_import_contribs/Build.PL
bricolage/trunk/contrib/bric_import_contribs/Changes
bricolage/trunk/contrib/bric_import_contribs/MANIFEST
bricolage/trunk/contrib/bric_import_contribs/MANIFEST.SKIP
bricolage/trunk/contrib/bric_import_contribs/META.yml
bricolage/trunk/contrib/bric_import_contribs/Makefile.PL
bricolage/trunk/contrib/bric_import_contribs/README
bricolage/trunk/contrib/bric_import_contribs/bin/
bricolage/trunk/contrib/bric_import_contribs/bin/bric_import_contribs
bricolage/trunk/contrib/bric_import_contribs/t/
bricolage/trunk/contrib/bric_import_contribs/t/bric_import_contribs.t
bricolage/trunk/contrib/bric_import_contribs/t/zpod.t
bricolage/trunk/contrib/thumbnails/
bricolage/trunk/contrib/thumbnails/README
bricolage/trunk/contrib/thumbnails/precreate-thumbs.pl
bricolage/trunk/inst/upgrade/1.8.3/
bricolage/trunk/inst/upgrade/1.8.3/add_ru_ru.pl
bricolage/trunk/inst/upgrade/1.8.3/asset_fks_restrict.pl
bricolage/trunk/inst/upgrade/1.8.3/cleanup_job_members.pl
bricolage/trunk/inst/upgrade/1.8.3/element__site_pk.pl
bricolage/trunk/inst/upgrade/1.8.3/event_attr_pk.pl
bricolage/trunk/inst/upgrade/1.8.3/fix_all_preferences_group_spelling.pl
bricolage/trunk/inst/upgrade/1.8.3/fix_event_sequence.pl
bricolage/trunk/inst/upgrade/1.8.3/media_uri_pk.pl
bricolage/trunk/inst/upgrade/1.8.3/story_uri_pk.pl
bricolage/trunk/inst/upgrade/1.8.3/worfkow_type_ck.pl
bricolage/trunk/lib/Bric/Util/Language/ru_ru.pm
Removed Files:
-------------
bricolage/trunk/comp/help/ru_ru/about.html
bricolage/trunk/comp/help/ru_ru/admin/
bricolage/trunk/comp/help/ru_ru/admin/control/
bricolage/trunk/comp/help/ru_ru/admin/control/change_user.html
bricolage/trunk/comp/help/ru_ru/admin/events/
bricolage/trunk/comp/help/ru_ru/admin/events/dhandler
bricolage/trunk/comp/help/ru_ru/admin/manager/
bricolage/trunk/comp/help/ru_ru/admin/manager/alert_type.html
bricolage/trunk/comp/help/ru_ru/admin/manager/category.html
bricolage/trunk/comp/help/ru_ru/admin/manager/contrib.html
bricolage/trunk/comp/help/ru_ru/admin/manager/contrib_type.html
bricolage/trunk/comp/help/ru_ru/admin/manager/dest.html
bricolage/trunk/comp/help/ru_ru/admin/manager/element.html
bricolage/trunk/comp/help/ru_ru/admin/manager/element_type.html
bricolage/trunk/comp/help/ru_ru/admin/manager/grp.html
bricolage/trunk/comp/help/ru_ru/admin/manager/job.html
bricolage/trunk/comp/help/ru_ru/admin/manager/keyword.html
bricolage/trunk/comp/help/ru_ru/admin/manager/media_type.html
bricolage/trunk/comp/help/ru_ru/admin/manager/output_channel.html
bricolage/trunk/comp/help/ru_ru/admin/manager/pref.html
bricolage/trunk/comp/help/ru_ru/admin/manager/site.html
bricolage/trunk/comp/help/ru_ru/admin/manager/source.html
bricolage/trunk/comp/help/ru_ru/admin/manager/user.html
bricolage/trunk/comp/help/ru_ru/admin/manager/workflow.html
bricolage/trunk/comp/help/ru_ru/admin/profile/
bricolage/trunk/comp/help/ru_ru/admin/profile/action.html
bricolage/trunk/comp/help/ru_ru/admin/profile/alert_type/
bricolage/trunk/comp/help/ru_ru/admin/profile/alert_type/recip.html
bricolage/trunk/comp/help/ru_ru/admin/profile/alert_type.html
bricolage/trunk/comp/help/ru_ru/admin/profile/category.html
bricolage/trunk/comp/help/ru_ru/admin/profile/contrib/
bricolage/trunk/comp/help/ru_ru/admin/profile/contrib/edit.html
bricolage/trunk/comp/help/ru_ru/admin/profile/contrib/extend.html
bricolage/trunk/comp/help/ru_ru/admin/profile/contrib.html
bricolage/trunk/comp/help/ru_ru/admin/profile/desk.html
bricolage/trunk/comp/help/ru_ru/admin/profile/dest.html
bricolage/trunk/comp/help/ru_ru/admin/profile/element.html
bricolage/trunk/comp/help/ru_ru/admin/profile/element_data.html
bricolage/trunk/comp/help/ru_ru/admin/profile/element_type.html
bricolage/trunk/comp/help/ru_ru/admin/profile/grp/
bricolage/trunk/comp/help/ru_ru/admin/profile/grp/perm.html
bricolage/trunk/comp/help/ru_ru/admin/profile/grp.html
bricolage/trunk/comp/help/ru_ru/admin/profile/keyword.html
bricolage/trunk/comp/help/ru_ru/admin/profile/media_type.html
bricolage/trunk/comp/help/ru_ru/admin/profile/output_channel.html
bricolage/trunk/comp/help/ru_ru/admin/profile/server.html
bricolage/trunk/comp/help/ru_ru/admin/profile/site.html
bricolage/trunk/comp/help/ru_ru/admin/profile/source.html
bricolage/trunk/comp/help/ru_ru/admin/profile/user.html
bricolage/trunk/comp/help/ru_ru/admin/profile/workflow.html
bricolage/trunk/comp/help/ru_ru/workflow/
bricolage/trunk/comp/help/ru_ru/workflow/active/
bricolage/trunk/comp/help/ru_ru/workflow/active/media.html
bricolage/trunk/comp/help/ru_ru/workflow/active/story.html
bricolage/trunk/comp/help/ru_ru/workflow/active/templates.html
bricolage/trunk/comp/help/ru_ru/workflow/events/
bricolage/trunk/comp/help/ru_ru/workflow/events/dhandler
bricolage/trunk/comp/help/ru_ru/workflow/manager/
bricolage/trunk/comp/help/ru_ru/workflow/manager/media.html
bricolage/trunk/comp/help/ru_ru/workflow/manager/story.html
bricolage/trunk/comp/help/ru_ru/workflow/manager/templates.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/
bricolage/trunk/comp/help/ru_ru/workflow/profile/alerts.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/alias/
bricolage/trunk/comp/help/ru_ru/workflow/profile/alias/media.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/alias/story.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/desk.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/media/
bricolage/trunk/comp/help/ru_ru/workflow/profile/media/category.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/media/container/
bricolage/trunk/comp/help/ru_ru/workflow/profile/media/container/edit_super_bulk.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/media/contributor_role.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/media/contributors.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/media/keywords.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/media/new.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/media.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/publish.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/story/
bricolage/trunk/comp/help/ru_ru/workflow/profile/story/actions.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/story/category.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/story/container/
bricolage/trunk/comp/help/ru_ru/workflow/profile/story/container/edit_super_bulk.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/story/contributor_role.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/story/contributors.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/story/desks.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/story/keywords.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/story/new.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/story.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/templates/
bricolage/trunk/comp/help/ru_ru/workflow/profile/templates/new.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/templates.html
bricolage/trunk/comp/help/ru_ru/workflow/profile/workspace.html
bricolage/trunk/comp/help/ru_ru/workflow/trail/
bricolage/trunk/comp/help/ru_ru/workflow/trail/dhandler
bricolage/trunk/comp/media/images/ru_ru/D_green.gif
bricolage/trunk/comp/media/images/ru_ru/D_red.gif
bricolage/trunk/comp/media/images/ru_ru/P_green.gif
bricolage/trunk/comp/media/images/ru_ru/P_red.gif
bricolage/trunk/comp/media/images/ru_ru/Thumbs.db
bricolage/trunk/comp/media/images/ru_ru/acknowledge_all_red.gif
bricolage/trunk/comp/media/images/ru_ru/acknowledge_checked_red.gif
bricolage/trunk/comp/media/images/ru_ru/add_category_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/add_component_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/add_element_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/add_elements_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/add_more_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/add_notes_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/add_sub_element_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/add_sub_elements_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/add_template_code_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/add_to_form_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/add_to_list_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/bricolage.gif
bricolage/trunk/comp/media/images/ru_ru/bulk_edit_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/cancel_check_out_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/cancel_checked_red.gif
bricolage/trunk/comp/media/images/ru_ru/cancel_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/cancel_red.gif
bricolage/trunk/comp/media/images/ru_ru/change_red.gif
bricolage/trunk/comp/media/images/ru_ru/check_in_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/checkin_assets_red.gif
bricolage/trunk/comp/media/images/ru_ru/checkout_red.gif
bricolage/trunk/comp/media/images/ru_ru/clear_all_red.gif
bricolage/trunk/comp/media/images/ru_ru/clear_values_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/close.gif
bricolage/trunk/comp/media/images/ru_ru/contributors_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/create_red.gif
bricolage/trunk/comp/media/images/ru_ru/delete_categories_red.gif
bricolage/trunk/comp/media/images/ru_ru/delete_checked_red.gif
bricolage/trunk/comp/media/images/ru_ru/delete_red.gif
bricolage/trunk/comp/media/images/ru_ru/deploy_checked_red.gif
bricolage/trunk/comp/media/images/ru_ru/edit_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/edit_notes_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/edit_template_code_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/help.gif
bricolage/trunk/comp/media/images/ru_ru/keywords_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/login.gif
bricolage/trunk/comp/media/images/ru_ru/logout.gif
bricolage/trunk/comp/media/images/ru_ru/media_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/move_assets_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/my_alerts_orange.gif
bricolage/trunk/comp/media/images/ru_ru/my_workspace_off.gif
bricolage/trunk/comp/media/images/ru_ru/my_workspace_on.gif
bricolage/trunk/comp/media/images/ru_ru/new_desk_red.gif
bricolage/trunk/comp/media/images/ru_ru/new_organization_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/next_dkgreen.gif
bricolage/trunk/comp/media/images/ru_ru/permissions_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/preview_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/publish_assets_red.gif
bricolage/trunk/comp/media/images/ru_ru/publish_checked_red.gif
bricolage/trunk/comp/media/images/ru_ru/recount_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/related_stories_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/remove_from_list_red.gif
bricolage/trunk/comp/media/images/ru_ru/reorder_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/resize_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/return_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/revert_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/save_and_stay_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/save_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/save_red.gif
bricolage/trunk/comp/media/images/ru_ru/search_green.gif
bricolage/trunk/comp/media/images/ru_ru/search_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/search_red.gif
bricolage/trunk/comp/media/images/ru_ru/select_all_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/stories_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/templates_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/upload_red.gif
bricolage/trunk/comp/media/images/ru_ru/use_this_role_lgreen.gif
bricolage/trunk/comp/media/images/ru_ru/view_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/view_log_teal.gif
bricolage/trunk/comp/media/images/ru_ru/view_notes_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/view_notes_teal.gif
bricolage/trunk/comp/media/images/ru_ru/view_text_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/view_trail_dgreen.gif
bricolage/trunk/comp/media/images/ru_ru/view_trail_teal.gif
bricolage/trunk/comp/media/images/ru_ru/workflow_admin.gif
bricolage/trunk/comp/media/images/ru_ru/workflow_workflow.gif
bricolage/trunk/contrib/bric_import_contribs/Build.PL
bricolage/trunk/contrib/bric_import_contribs/Changes
bricolage/trunk/contrib/bric_import_contribs/MANIFEST
bricolage/trunk/contrib/bric_import_contribs/MANIFEST.SKIP
bricolage/trunk/contrib/bric_import_contribs/META.yml
bricolage/trunk/contrib/bric_import_contribs/Makefile.PL
bricolage/trunk/contrib/bric_import_contribs/README
bricolage/trunk/contrib/bric_import_contribs/bin/
bricolage/trunk/contrib/bric_import_contribs/bin/bric_import_contribs
bricolage/trunk/contrib/bric_import_contribs/t/
bricolage/trunk/contrib/bric_import_contribs/t/bric_import_contribs.t
bricolage/trunk/contrib/bric_import_contribs/t/zpod.t
bricolage/trunk/contrib/thumbnails/README
bricolage/trunk/contrib/thumbnails/precreate-thumbs.pl
bricolage/trunk/inst/upgrade/1.8.3/add_ru_ru.pl
bricolage/trunk/inst/upgrade/1.8.3/asset_fks_restrict.pl
bricolage/trunk/inst/upgrade/1.8.3/cleanup_job_members.pl
bricolage/trunk/inst/upgrade/1.8.3/element__site_pk.pl
bricolage/trunk/inst/upgrade/1.8.3/event_attr_pk.pl
bricolage/trunk/inst/upgrade/1.8.3/fix_all_preferences_group_spelling.pl
bricolage/trunk/inst/upgrade/1.8.3/fix_event_sequence.pl
bricolage/trunk/inst/upgrade/1.8.3/media_uri_pk.pl
bricolage/trunk/inst/upgrade/1.8.3/story_uri_pk.pl
bricolage/trunk/inst/upgrade/1.8.3/worfkow_type_ck.pl
["r6088-theory.diff" (r6088-theory.diff)]
Modified: bricolage/trunk/README.Redhat
===================================================================
--- bricolage/trunk/README.Redhat 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/README.Redhat 2004-11-19 08:55:15 UTC (rev 6088)
@@ -15,11 +15,16 @@
- You must install the PostgreSQL server and devel RPMs in order for
Bricolage to find PostgreSQL. This is because the devel RPMs contain the
pg_config binary that Bricolage uses to find PostgreSQL. For example, for
- PostgreSQL version 7.1.3 you would install these RPMs:
+ PostgreSQL version 7.4.5 you would install these RPMs:
- postgresql-server-7.1.3-2.i386.rpm
- postgresql-devel-7.1.3-2.i386.rpm
+ postgresql-server-7.4.5-1PGDG.i686.rpm
+ postgresql-devel-7.4.5-1PGDG.i686.rpm
+ To install parts of PostgreSQL, we recommend:
+
+ postgresql-7.4.5-1PGDG.i686.rmp
+
+
Red Hat 8.0 Notes
-----------------
Modified: bricolage/trunk/bin/bric_dist_mon
===================================================================
--- bricolage/trunk/bin/bric_dist_mon 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/bin/bric_dist_mon 2004-11-19 08:55:15 UTC (rev 6088)
@@ -24,11 +24,9 @@
=head1 DESCRIPTION
-This program monitors the Bricolage distribution jobs queue, and triggers the
-execution of distribution jobs when they're due. It does this by connecting to
-the Bricolage server on a regular basis, getting a list of jobs that are due
-to be executed, and then sending that list to the Bricolage server to be
-executed.
+This program triggers the execution of distribution jobs when they're due. It
+does this by sending a ticler request to the Bricolage server on a regular
+basis.
F<bric_dist_mon> works in one of two ways. The first is as a cron job. Use the
C<-c> option in a crontab and F<bric_dist_mon> will always execute once and
@@ -37,15 +35,15 @@
cron. For example, cron typically allows jobs to be scheduled to run as
frequently as every minute. This will be fine for most applications. However,
in a busy Bricolage environment with highly time-critical content, it may be
-important to have F<bric_dist_mon> check for and trigger new distribution jobs
-more frequently than cron will allow.
+important to have F<bric_dist_mon> trigger new distribution jobs more
+frequently than cron will allow.
For those environments, F<bric_dist_mon> can be used as a persistent, forking
program. This is the default way to run F<bric_dist_mon>, and the interval can
be set via the C<-i> option. For example, if a busy environment needed
distribution jobs checked for and executed every 15 seconds, C<-i 15> will
-cause F<bric_dist_mon> to fork a new process every fifteen seconds, and that
-process will check for and trigger new jobs.
+cause F<bric_dist_mon> to fork a new process every fifteen seconds to send
+a tickle request to the distribution server.
Note that, to run F<bric_dist_mon> as a persistent forking application, some
method of ensuring that it remains running and gets restarted if it exits will
@@ -261,15 +259,16 @@
# Create a client and load the Job IDs.
my $client = Bric::Dist::Client->new({ url => $opt_U,
cookie => $cookie->as_string });
- $client->load_ids;
+# $client->load_ids;
# Send debugging info, if necessary.
if ($opt_d) {
- my $exec = $client->get_exec_ids;
- $exec = !@$exec ? 'no Job IDs' : $#$exec > 0 ? "Job ID @$exec" :
- "Job IDs @$exec";
- local $" = ', ';
- log_msg("Sending $exec for execution.");
+# my $exec = $client->get_exec_ids;
+# $exec = !@$exec ? 'no Job IDs' : $#$exec > 0 ? "Job ID @$exec" :
+# "Job IDs @$exec";
+# local $" = ', ';
+# log_msg("Sending $exec for execution.");
+ log_msg("Sending execution request.");
}
# Send the Job IDs.
$client->send;
Modified: bricolage/trunk/bin/bric_republish
===================================================================
--- bricolage/trunk/bin/bric_republish 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/bin/bric_republish 2004-11-19 08:55:15 UTC (rev 6088)
@@ -167,7 +167,7 @@
# gets a list of story ids, modified by options
sub get_story_ids {
- our ($soap, $element, $story_id, $category, $help, $man);
+ our ($soap, $element, $story_id, $category, $help, $man, $published_only);
our @story_ids;
# quit early if the user specified a story_id
@@ -177,8 +177,8 @@
}
# default search
- my @search = (name(publish_status => 1),
- name(no_workflow => 1));
+ my @search = (name(publish_status => 1));
+ push @search, name(no_workflow => 1) unless $published_only;
push(@search, name(element => $element)) if $element;
push(@search, name(category => $category)) if $category;
Modified: bricolage/trunk/comp/admin/profile/category/dhandler
===================================================================
--- bricolage/trunk/comp/admin/profile/category/dhandler 2004-11-19 08:54:20 UTC (rev \
6087)
+++ bricolage/trunk/comp/admin/profile/category/dhandler 2004-11-19 08:55:15 UTC (rev \
6088) @@ -15,7 +15,7 @@
my $sites = $c->get('__SITES__');
unless ($sites) {
- $sites = Bric::Biz::Site->list;
+ $sites = Bric::Biz::Site->list({ active => 1 });
$c->set('__SITES__', $sites);
}
Modified: bricolage/trunk/comp/admin/profile/grp/dhandler
===================================================================
--- bricolage/trunk/comp/admin/profile/grp/dhandler 2004-11-19 08:54:20 UTC (rev \
6087)
+++ bricolage/trunk/comp/admin/profile/grp/dhandler 2004-11-19 08:55:15 UTC (rev \
6088) @@ -102,7 +102,7 @@
# Add to the description site name, if there are duplicate
# descriptions. Only run if sites are already cached (which means
# there is more than one site).
- my $sites = $c->get('__SITES__') || Bric::Biz::Site->list();
+ my $sites = $c->get('__SITES__') || Bric::Biz::Site->list({ active => 1 });
if(@$sites > 1) {
my %sites;
Modified: bricolage/trunk/comp/help/bo/workflow/profile/templates/new.html
===================================================================
--- bricolage/trunk/comp/help/bo/workflow/profile/templates/new.html 2004-11-19 \
08:54:20 UTC (rev 6087)
+++ bricolage/trunk/comp/help/bo/workflow/profile/templates/new.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,30 +1,57 @@
-<help page="New Template">
-
-<p>Use this tool to customize your Bricolage. Here you will create Templates to
-include in Story and Media Profiles, increasing your options and molding the
-publishing tool to suit your needs.</p>
-
-<h3>Properties</h3>
-
-<p><dl>
-<dt>Element</dt>
-<dd>To base your new Template on an existing Element, scroll through the list
- and select one. Required.</dd>
-
-<dt>Generic</dt>
-<dd>To create a new Template from scratch, check this box.</dd>
-
-<dt>Output Channel</dt>
-<dd>The destination for the Template, once it is deployed. Require.</dd>
-
-<dt>Category</dt>
-<dd>Where on the site the Template will be deployed. Required.</dd>
-
-<dt>Priority</dt>
-<dd>Tells users how urgent the Template is. Required.</dd>
-</dl></p>
-
-<p>When finished, click <i>Create.</i> This will bring you to the Template
-Profile page.</p>
-
-</help>
+<help page="New Template">
+
+<p>Use this tool to customize the output of yoru Bricolage documents. Here you
+will create templates generate output from your story docments, increasing
+your options and molding the publishing tool to suit your needs.</p>
+
+<p>There are three kinds of templates you can produce:</p>
+<p><dl>
+<dt>Element Templates</dt>
+<dd>Element templates are related to a specific element or subelement. They
+are called when the element is passed to a call to
+<code>$burner->display_element</code> in a template. Each template belongs
+to one output channel, so to render a story in three output channels requires
+three templates. The exception to this rule is when you make an output channel
+include the templates from another output channel.</dd>
+
+<dt>Category Templates</dt>
+<dd>Category templates are the default template handler (known as an
+autohandler to the Mason burner) for a category in an output channel. Category
+templates allow you to <q>wrap</q> text (usually HTML headers and footers)
+around the chain of elements burned in that category and its
+subcategories.</dd>
+
+<dt>Utility Templates</dt>
+<dd>Utility templates contain generic code that can be re-used in other
+templates, like validation calls, etc. they can be either output
+channel-specific be associated with an output channel specifically created to
+contain hold utility templates. In the latter case, make the utility templates
+in the utility output channel available to your other output channels by
+including the utility output channel in the other output channels.</dt>
+</dl>
+
+<h3>Properties</h3>
+<p><dl>
+<dt>Template Type</dt>
+<dd>One of the above types</dd>
+
+<dt>File Type</dt>
+<dd>You only need to change this if you are not using the default Mason burner
+to render your templates. Required.</dd>
+
+<dt>Output Channel</dt>
+<dd>The destination for the Template, once it is deployed. Required.</dd>
+
+<dt>Category</dt>
+<dd>Where on the site the Template will be deployed. This has implications for
+where your template can be called from. Required.</dd>
+
+<dt>Priority</dt>
+<dd>Tells users how urgent the Template is (with respect to its movement
+through a workflow). Required. If you're not sure the default setting is
+fine.</dd>
+</dl></p>
+
+<p>When finished, click <i>Create.</i> This will bring you to the Template
+Profile page.</p>
+</help>
Modified: bricolage/trunk/comp/help/en_us/workflow/profile/templates/new.html
===================================================================
--- bricolage/trunk/comp/help/en_us/workflow/profile/templates/new.html 2004-11-19 \
08:54:20 UTC (rev 6087)
+++ bricolage/trunk/comp/help/en_us/workflow/profile/templates/new.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,30 +1,57 @@
-<help page="New Template">
-
-<p>Use this tool to customize your Bricolage. Here you will create Templates to
-include in Story and Media Profiles, increasing your options and molding the
-publishing tool to suit your needs.</p>
-
-<h3>Properties</h3>
-
-<p><dl>
-<dt>Element</dt>
-<dd>To base your new Template on an existing Element, scroll through the list
- and select one. Required.</dd>
-
-<dt>Generic</dt>
-<dd>To create a new Template from scratch, check this box.</dd>
-
-<dt>Output Channel</dt>
-<dd>The destination for the Template, once it is deployed. Require.</dd>
-
-<dt>Category</dt>
-<dd>Where on the site the Template will be deployed. Required.</dd>
-
-<dt>Priority</dt>
-<dd>Tells users how urgent the Template is. Required.</dd>
-</dl></p>
-
-<p>When finished, click <i>Create.</i> This will bring you to the Template
-Profile page.</p>
-
-</help>
+<help page="New Template">
+
+<p>Use this tool to customize the output of yoru Bricolage documents. Here you
+will create templates generate output from your story docments, increasing
+your options and molding the publishing tool to suit your needs.</p>
+
+<p>There are three kinds of templates you can produce:</p>
+<p><dl>
+<dt>Element Templates</dt>
+<dd>Element templates are related to a specific element or subelement. They
+are called when the element is passed to a call to
+<code>$burner->display_element</code> in a template. Each template belongs
+to one output channel, so to render a story in three output channels requires
+three templates. The exception to this rule is when you make an output channel
+include the templates from another output channel.</dd>
+
+<dt>Category Templates</dt>
+<dd>Category templates are the default template handler (known as an
+autohandler to the Mason burner) for a category in an output channel. Category
+templates allow you to <q>wrap</q> text (usually HTML headers and footers)
+around the chain of elements burned in that category and its
+subcategories.</dd>
+
+<dt>Utility Templates</dt>
+<dd>Utility templates contain generic code that can be re-used in other
+templates, like validation calls, etc. they can be either output
+channel-specific be associated with an output channel specifically created to
+contain hold utility templates. In the latter case, make the utility templates
+in the utility output channel available to your other output channels by
+including the utility output channel in the other output channels.</dt>
+</dl>
+
+<h3>Properties</h3>
+<p><dl>
+<dt>Template Type</dt>
+<dd>One of the above types</dd>
+
+<dt>File Type</dt>
+<dd>You only need to change this if you are not using the default Mason burner
+to render your templates. Required.</dd>
+
+<dt>Output Channel</dt>
+<dd>The destination for the Template, once it is deployed. Required.</dd>
+
+<dt>Category</dt>
+<dd>Where on the site the Template will be deployed. This has implications for
+where your template can be called from. Required.</dd>
+
+<dt>Priority</dt>
+<dd>Tells users how urgent the Template is (with respect to its movement
+through a workflow). Required. If you're not sure the default setting is
+fine.</dd>
+</dl></p>
+
+<p>When finished, click <i>Create.</i> This will bring you to the Template
+Profile page.</p>
+</help>
Modified: bricolage/trunk/comp/help/it_it/workflow/profile/templates/new.html
===================================================================
--- bricolage/trunk/comp/help/it_it/workflow/profile/templates/new.html 2004-11-19 \
08:54:20 UTC (rev 6087)
+++ bricolage/trunk/comp/help/it_it/workflow/profile/templates/new.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,30 +1,57 @@
-<help page="New Template">
-
-<p>Use this tool to customize your Bricolage. Here you will create Templates to
-include in Story and Media Profiles, increasing your options and molding the
-publishing tool to suit your needs.</p>
-
-<h3>Properties</h3>
-
-<p><dl>
-<dt>Element</dt>
-<dd>To base your new Template on an existing Element, scroll through the list
- and select one. Required.</dd>
-
-<dt>Generic</dt>
-<dd>To create a new Template from scratch, check this box.</dd>
-
-<dt>Output Channel</dt>
-<dd>The destination for the Template, once it is deployed. Require.</dd>
-
-<dt>Category</dt>
-<dd>Where on the site the Template will be deployed. Required.</dd>
-
-<dt>Priority</dt>
-<dd>Tells users how urgent the Template is. Required.</dd>
-</dl></p>
-
-<p>When finished, click <i>Create.</i> This will bring you to the Template
-Profile page.</p>
-
-</help>
+<help page="New Template">
+
+<p>Use this tool to customize the output of yoru Bricolage documents. Here you
+will create templates generate output from your story docments, increasing
+your options and molding the publishing tool to suit your needs.</p>
+
+<p>There are three kinds of templates you can produce:</p>
+<p><dl>
+<dt>Element Templates</dt>
+<dd>Element templates are related to a specific element or subelement. They
+are called when the element is passed to a call to
+<code>$burner->display_element</code> in a template. Each template belongs
+to one output channel, so to render a story in three output channels requires
+three templates. The exception to this rule is when you make an output channel
+include the templates from another output channel.</dd>
+
+<dt>Category Templates</dt>
+<dd>Category templates are the default template handler (known as an
+autohandler to the Mason burner) for a category in an output channel. Category
+templates allow you to <q>wrap</q> text (usually HTML headers and footers)
+around the chain of elements burned in that category and its
+subcategories.</dd>
+
+<dt>Utility Templates</dt>
+<dd>Utility templates contain generic code that can be re-used in other
+templates, like validation calls, etc. they can be either output
+channel-specific be associated with an output channel specifically created to
+contain hold utility templates. In the latter case, make the utility templates
+in the utility output channel available to your other output channels by
+including the utility output channel in the other output channels.</dt>
+</dl>
+
+<h3>Properties</h3>
+<p><dl>
+<dt>Template Type</dt>
+<dd>One of the above types</dd>
+
+<dt>File Type</dt>
+<dd>You only need to change this if you are not using the default Mason burner
+to render your templates. Required.</dd>
+
+<dt>Output Channel</dt>
+<dd>The destination for the Template, once it is deployed. Required.</dd>
+
+<dt>Category</dt>
+<dd>Where on the site the Template will be deployed. This has implications for
+where your template can be called from. Required.</dd>
+
+<dt>Priority</dt>
+<dd>Tells users how urgent the Template is (with respect to its movement
+through a workflow). Required. If you're not sure the default setting is
+fine.</dd>
+</dl></p>
+
+<p>When finished, click <i>Create.</i> This will bring you to the Template
+Profile page.</p>
+</help>
Modified: bricolage/trunk/comp/help/km/workflow/profile/templates/new.html
===================================================================
--- bricolage/trunk/comp/help/km/workflow/profile/templates/new.html 2004-11-19 \
08:54:20 UTC (rev 6087)
+++ bricolage/trunk/comp/help/km/workflow/profile/templates/new.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,30 +1,57 @@
-<help page="New Template">
-
-<p>Use this tool to customize your Bricolage. Here you will create Templates to
-include in Story and Media Profiles, increasing your options and molding the
-publishing tool to suit your needs.</p>
-
-<h3>Properties</h3>
-
-<p><dl>
-<dt>Element</dt>
-<dd>To base your new Template on an existing Element, scroll through the list
- and select one. Required.</dd>
-
-<dt>Generic</dt>
-<dd>To create a new Template from scratch, check this box.</dd>
-
-<dt>Output Channel</dt>
-<dd>The destination for the Template, once it is deployed. Require.</dd>
-
-<dt>Category</dt>
-<dd>Where on the site the Template will be deployed. Required.</dd>
-
-<dt>Priority</dt>
-<dd>Tells users how urgent the Template is. Required.</dd>
-</dl></p>
-
-<p>When finished, click <i>Create.</i> This will bring you to the Template
-Profile page.</p>
-
-</help>
+<help page="New Template">
+
+<p>Use this tool to customize the output of yoru Bricolage documents. Here you
+will create templates generate output from your story docments, increasing
+your options and molding the publishing tool to suit your needs.</p>
+
+<p>There are three kinds of templates you can produce:</p>
+<p><dl>
+<dt>Element Templates</dt>
+<dd>Element templates are related to a specific element or subelement. They
+are called when the element is passed to a call to
+<code>$burner->display_element</code> in a template. Each template belongs
+to one output channel, so to render a story in three output channels requires
+three templates. The exception to this rule is when you make an output channel
+include the templates from another output channel.</dd>
+
+<dt>Category Templates</dt>
+<dd>Category templates are the default template handler (known as an
+autohandler to the Mason burner) for a category in an output channel. Category
+templates allow you to <q>wrap</q> text (usually HTML headers and footers)
+around the chain of elements burned in that category and its
+subcategories.</dd>
+
+<dt>Utility Templates</dt>
+<dd>Utility templates contain generic code that can be re-used in other
+templates, like validation calls, etc. they can be either output
+channel-specific be associated with an output channel specifically created to
+contain hold utility templates. In the latter case, make the utility templates
+in the utility output channel available to your other output channels by
+including the utility output channel in the other output channels.</dt>
+</dl>
+
+<h3>Properties</h3>
+<p><dl>
+<dt>Template Type</dt>
+<dd>One of the above types</dd>
+
+<dt>File Type</dt>
+<dd>You only need to change this if you are not using the default Mason burner
+to render your templates. Required.</dd>
+
+<dt>Output Channel</dt>
+<dd>The destination for the Template, once it is deployed. Required.</dd>
+
+<dt>Category</dt>
+<dd>Where on the site the Template will be deployed. This has implications for
+where your template can be called from. Required.</dd>
+
+<dt>Priority</dt>
+<dd>Tells users how urgent the Template is (with respect to its movement
+through a workflow). Required. If you're not sure the default setting is
+fine.</dd>
+</dl></p>
+
+<p>When finished, click <i>Create.</i> This will bring you to the Template
+Profile page.</p>
+</help>
Modified: bricolage/trunk/comp/help/ko_ko/workflow/profile/templates/new.html
===================================================================
--- bricolage/trunk/comp/help/ko_ko/workflow/profile/templates/new.html 2004-11-19 \
08:54:20 UTC (rev 6087)
+++ bricolage/trunk/comp/help/ko_ko/workflow/profile/templates/new.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,30 +1,57 @@
-<help page="New Template">
-
-<p>Use this tool to customize your Bricolage. Here you will create Templates to
-include in Story and Media Profiles, increasing your options and molding the
-publishing tool to suit your needs.</p>
-
-<h3>Properties</h3>
-
-<p><dl>
-<dt>Element</dt>
-<dd>To base your new Template on an existing Element, scroll through the list
- and select one. Required.</dd>
-
-<dt>Generic</dt>
-<dd>To create a new Template from scratch, check this box.</dd>
-
-<dt>Output Channel</dt>
-<dd>The destination for the Template, once it is deployed. Require.</dd>
-
-<dt>Category</dt>
-<dd>Where on the site the Template will be deployed. Required.</dd>
-
-<dt>Priority</dt>
-<dd>Tells users how urgent the Template is. Required.</dd>
-</dl></p>
-
-<p>When finished, click <i>Create.</i> This will bring you to the Template
-Profile page.</p>
-
-</help>
+<help page="New Template">
+
+<p>Use this tool to customize the output of yoru Bricolage documents. Here you
+will create templates generate output from your story docments, increasing
+your options and molding the publishing tool to suit your needs.</p>
+
+<p>There are three kinds of templates you can produce:</p>
+<p><dl>
+<dt>Element Templates</dt>
+<dd>Element templates are related to a specific element or subelement. They
+are called when the element is passed to a call to
+<code>$burner->display_element</code> in a template. Each template belongs
+to one output channel, so to render a story in three output channels requires
+three templates. The exception to this rule is when you make an output channel
+include the templates from another output channel.</dd>
+
+<dt>Category Templates</dt>
+<dd>Category templates are the default template handler (known as an
+autohandler to the Mason burner) for a category in an output channel. Category
+templates allow you to <q>wrap</q> text (usually HTML headers and footers)
+around the chain of elements burned in that category and its
+subcategories.</dd>
+
+<dt>Utility Templates</dt>
+<dd>Utility templates contain generic code that can be re-used in other
+templates, like validation calls, etc. they can be either output
+channel-specific be associated with an output channel specifically created to
+contain hold utility templates. In the latter case, make the utility templates
+in the utility output channel available to your other output channels by
+including the utility output channel in the other output channels.</dt>
+</dl>
+
+<h3>Properties</h3>
+<p><dl>
+<dt>Template Type</dt>
+<dd>One of the above types</dd>
+
+<dt>File Type</dt>
+<dd>You only need to change this if you are not using the default Mason burner
+to render your templates. Required.</dd>
+
+<dt>Output Channel</dt>
+<dd>The destination for the Template, once it is deployed. Required.</dd>
+
+<dt>Category</dt>
+<dd>Where on the site the Template will be deployed. This has implications for
+where your template can be called from. Required.</dd>
+
+<dt>Priority</dt>
+<dd>Tells users how urgent the Template is (with respect to its movement
+through a workflow). Required. If you're not sure the default setting is
+fine.</dd>
+</dl></p>
+
+<p>When finished, click <i>Create.</i> This will bring you to the Template
+Profile page.</p>
+</help>
Modified: bricolage/trunk/comp/help/lo/workflow/profile/templates/new.html
===================================================================
--- bricolage/trunk/comp/help/lo/workflow/profile/templates/new.html 2004-11-19 \
08:54:20 UTC (rev 6087)
+++ bricolage/trunk/comp/help/lo/workflow/profile/templates/new.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,30 +1,57 @@
-<help page="New Template">
-
-<p>Use this tool to customize your Bricolage. Here you will create Templates to
-include in Story and Media Profiles, increasing your options and molding the
-publishing tool to suit your needs.</p>
-
-<h3>Properties</h3>
-
-<p><dl>
-<dt>Element</dt>
-<dd>To base your new Template on an existing Element, scroll through the list
- and select one. Required.</dd>
-
-<dt>Generic</dt>
-<dd>To create a new Template from scratch, check this box.</dd>
-
-<dt>Output Channel</dt>
-<dd>The destination for the Template, once it is deployed. Require.</dd>
-
-<dt>Category</dt>
-<dd>Where on the site the Template will be deployed. Required.</dd>
-
-<dt>Priority</dt>
-<dd>Tells users how urgent the Template is. Required.</dd>
-</dl></p>
-
-<p>When finished, click <i>Create.</i> This will bring you to the Template
-Profile page.</p>
-
-</help>
+<help page="New Template">
+
+<p>Use this tool to customize the output of yoru Bricolage documents. Here you
+will create templates generate output from your story docments, increasing
+your options and molding the publishing tool to suit your needs.</p>
+
+<p>There are three kinds of templates you can produce:</p>
+<p><dl>
+<dt>Element Templates</dt>
+<dd>Element templates are related to a specific element or subelement. They
+are called when the element is passed to a call to
+<code>$burner->display_element</code> in a template. Each template belongs
+to one output channel, so to render a story in three output channels requires
+three templates. The exception to this rule is when you make an output channel
+include the templates from another output channel.</dd>
+
+<dt>Category Templates</dt>
+<dd>Category templates are the default template handler (known as an
+autohandler to the Mason burner) for a category in an output channel. Category
+templates allow you to <q>wrap</q> text (usually HTML headers and footers)
+around the chain of elements burned in that category and its
+subcategories.</dd>
+
+<dt>Utility Templates</dt>
+<dd>Utility templates contain generic code that can be re-used in other
+templates, like validation calls, etc. they can be either output
+channel-specific be associated with an output channel specifically created to
+contain hold utility templates. In the latter case, make the utility templates
+in the utility output channel available to your other output channels by
+including the utility output channel in the other output channels.</dt>
+</dl>
+
+<h3>Properties</h3>
+<p><dl>
+<dt>Template Type</dt>
+<dd>One of the above types</dd>
+
+<dt>File Type</dt>
+<dd>You only need to change this if you are not using the default Mason burner
+to render your templates. Required.</dd>
+
+<dt>Output Channel</dt>
+<dd>The destination for the Template, once it is deployed. Required.</dd>
+
+<dt>Category</dt>
+<dd>Where on the site the Template will be deployed. This has implications for
+where your template can be called from. Required.</dd>
+
+<dt>Priority</dt>
+<dd>Tells users how urgent the Template is (with respect to its movement
+through a workflow). Required. If you're not sure the default setting is
+fine.</dd>
+</dl></p>
+
+<p>When finished, click <i>Create.</i> This will bring you to the Template
+Profile page.</p>
+</help>
Modified: bricolage/trunk/comp/help/my/workflow/profile/templates/new.html
===================================================================
--- bricolage/trunk/comp/help/my/workflow/profile/templates/new.html 2004-11-19 \
08:54:20 UTC (rev 6087)
+++ bricolage/trunk/comp/help/my/workflow/profile/templates/new.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,30 +1,57 @@
-<help page="New Template">
-
-<p>Use this tool to customize your Bricolage. Here you will create Templates to
-include in Story and Media Profiles, increasing your options and molding the
-publishing tool to suit your needs.</p>
-
-<h3>Properties</h3>
-
-<p><dl>
-<dt>Element</dt>
-<dd>To base your new Template on an existing Element, scroll through the list
- and select one. Required.</dd>
-
-<dt>Generic</dt>
-<dd>To create a new Template from scratch, check this box.</dd>
-
-<dt>Output Channel</dt>
-<dd>The destination for the Template, once it is deployed. Require.</dd>
-
-<dt>Category</dt>
-<dd>Where on the site the Template will be deployed. Required.</dd>
-
-<dt>Priority</dt>
-<dd>Tells users how urgent the Template is. Required.</dd>
-</dl></p>
-
-<p>When finished, click <i>Create.</i> This will bring you to the Template
-Profile page.</p>
-
-</help>
+<help page="New Template">
+
+<p>Use this tool to customize the output of yoru Bricolage documents. Here you
+will create templates generate output from your story docments, increasing
+your options and molding the publishing tool to suit your needs.</p>
+
+<p>There are three kinds of templates you can produce:</p>
+<p><dl>
+<dt>Element Templates</dt>
+<dd>Element templates are related to a specific element or subelement. They
+are called when the element is passed to a call to
+<code>$burner->display_element</code> in a template. Each template belongs
+to one output channel, so to render a story in three output channels requires
+three templates. The exception to this rule is when you make an output channel
+include the templates from another output channel.</dd>
+
+<dt>Category Templates</dt>
+<dd>Category templates are the default template handler (known as an
+autohandler to the Mason burner) for a category in an output channel. Category
+templates allow you to <q>wrap</q> text (usually HTML headers and footers)
+around the chain of elements burned in that category and its
+subcategories.</dd>
+
+<dt>Utility Templates</dt>
+<dd>Utility templates contain generic code that can be re-used in other
+templates, like validation calls, etc. they can be either output
+channel-specific be associated with an output channel specifically created to
+contain hold utility templates. In the latter case, make the utility templates
+in the utility output channel available to your other output channels by
+including the utility output channel in the other output channels.</dt>
+</dl>
+
+<h3>Properties</h3>
+<p><dl>
+<dt>Template Type</dt>
+<dd>One of the above types</dd>
+
+<dt>File Type</dt>
+<dd>You only need to change this if you are not using the default Mason burner
+to render your templates. Required.</dd>
+
+<dt>Output Channel</dt>
+<dd>The destination for the Template, once it is deployed. Required.</dd>
+
+<dt>Category</dt>
+<dd>Where on the site the Template will be deployed. This has implications for
+where your template can be called from. Required.</dd>
+
+<dt>Priority</dt>
+<dd>Tells users how urgent the Template is (with respect to its movement
+through a workflow). Required. If you're not sure the default setting is
+fine.</dd>
+</dl></p>
+
+<p>When finished, click <i>Create.</i> This will bring you to the Template
+Profile page.</p>
+</help>
Modified: bricolage/trunk/comp/help/pt_pt/workflow/profile/templates/new.html
===================================================================
--- bricolage/trunk/comp/help/pt_pt/workflow/profile/templates/new.html 2004-11-19 \
08:54:20 UTC (rev 6087)
+++ bricolage/trunk/comp/help/pt_pt/workflow/profile/templates/new.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,30 +1,57 @@
-<help page="New Template">
-
-<p>Use this tool to customize your Bricolage. Here you will create Templates to
-include in Story and Media Profiles, increasing your options and molding the
-publishing tool to suit your needs.</p>
-
-<h3>Properties</h3>
-
-<p><dl>
-<dt>Element</dt>
-<dd>To base your new Template on an existing Element, scroll through the list
- and select one. Required.</dd>
-
-<dt>Generic</dt>
-<dd>To create a new Template from scratch, check this box.</dd>
-
-<dt>Output Channel</dt>
-<dd>The destination for the Template, once it is deployed. Require.</dd>
-
-<dt>Category</dt>
-<dd>Where on the site the Template will be deployed. Required.</dd>
-
-<dt>Priority</dt>
-<dd>Tells users how urgent the Template is. Required.</dd>
-</dl></p>
-
-<p>When finished, click <i>Create.</i> This will bring you to the Template
-Profile page.</p>
-
-</help>
+<help page="New Template">
+
+<p>Use this tool to customize the output of yoru Bricolage documents. Here you
+will create templates generate output from your story docments, increasing
+your options and molding the publishing tool to suit your needs.</p>
+
+<p>There are three kinds of templates you can produce:</p>
+<p><dl>
+<dt>Element Templates</dt>
+<dd>Element templates are related to a specific element or subelement. They
+are called when the element is passed to a call to
+<code>$burner->display_element</code> in a template. Each template belongs
+to one output channel, so to render a story in three output channels requires
+three templates. The exception to this rule is when you make an output channel
+include the templates from another output channel.</dd>
+
+<dt>Category Templates</dt>
+<dd>Category templates are the default template handler (known as an
+autohandler to the Mason burner) for a category in an output channel. Category
+templates allow you to <q>wrap</q> text (usually HTML headers and footers)
+around the chain of elements burned in that category and its
+subcategories.</dd>
+
+<dt>Utility Templates</dt>
+<dd>Utility templates contain generic code that can be re-used in other
+templates, like validation calls, etc. they can be either output
+channel-specific be associated with an output channel specifically created to
+contain hold utility templates. In the latter case, make the utility templates
+in the utility output channel available to your other output channels by
+including the utility output channel in the other output channels.</dt>
+</dl>
+
+<h3>Properties</h3>
+<p><dl>
+<dt>Template Type</dt>
+<dd>One of the above types</dd>
+
+<dt>File Type</dt>
+<dd>You only need to change this if you are not using the default Mason burner
+to render your templates. Required.</dd>
+
+<dt>Output Channel</dt>
+<dd>The destination for the Template, once it is deployed. Required.</dd>
+
+<dt>Category</dt>
+<dd>Where on the site the Template will be deployed. This has implications for
+where your template can be called from. Required.</dd>
+
+<dt>Priority</dt>
+<dd>Tells users how urgent the Template is (with respect to its movement
+through a workflow). Required. If you're not sure the default setting is
+fine.</dd>
+</dl></p>
+
+<p>When finished, click <i>Create.</i> This will bring you to the Template
+Profile page.</p>
+</help>
Copied: bricolage/trunk/comp/help/ru_ru (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru)
Deleted: bricolage/trunk/comp/help/ru_ru/about.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/about.html 2004-11-18 22:43:03 UTC \
(rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/about.html 2004-11-19 08:55:15 UTC (rev 6088)
@@ -1,142 +0,0 @@
-%# http://www.dictionary.com/wordoftheday/archive/2001/04/26.html
-% $m->comp(".t_top", caption => "About the Name");
-
-<p>The name "Bricolage" was not drawn directly from the common usage
-of the term in French, but rather from the first chapter of "The Savage
-Mind," by the famed French anthropologist Claude Lévi-Strauss. In
-that famous discussion of scientific thought vs. mythical thought — of
-science vs. "the science of the concrete" — Lévi-Strauss
-declares, "Mythical thought is therefore a kind of intellectual
-'bricolage.'"</p>
-
-<p>Bricolage is the product of a bricoleur, a kind of handyman who assembles
-the fruits of his labors from the tools he has at hand. Similarly, mythical
-thought uses the extant concepts available to the cultural bricoleur to shape
-the world of cultural understanding. In other words, one's understanding and
-interpretation of the world and its events derives from assembling new
-interpretations based on existing cultural (Lévi-Strauss would say
-"structural") symbols. "Signs allow and even require the
-interposing and incorporation of a certain amount of human culture into
-reality," Lévi-Strauss writes. Thus signs (or symbols, and modern
-anthropologists are more likely to call them) are the building blocks of
-cultural comprehension.</p>
-
-<p>Similarly, content is assembled in the Bricolage Content Management System
-by drawing on extant elements to create a new end product. Element
-administrators function as Lévi-Straussian "scientists" in
-that they create new symbols (elements) that document editors — as new
-media bricoleurs — draw upon to assemble and manage new structures of
-meaning (content).</p>
-
-<p>For those who may find this explanation too much a stretch, we fall back on
-the meaning of the term "bricolage" as it is commonly used in English,
-rather than French. For our French users, who see the name and immediately
-think, "big hack," note that typical English definition, according to
-<i>The American Heritage Dictionary of the English Language, Fourth Edition,</i>
-is simply, "something made or put together using whatever materials happen
-to be available." This definition nicely describes how Bricolage documents
-are built from the elements defined for them.</p>
-
-% $m->comp(".t_bottom");
-<br />
-% $m->comp(".t_top", caption => "License");
-<p>Copyright (c) 2001-2002. About.com. Changes Copyright (c) 2001-2003
- Kineticode, Inc. and others.</p>
-
-<p>Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:</p>
-
-<p><ul>
- <li>Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.</li>
- <li>Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the
- distribution.</li>
- <li>Neither the name of the About.com nor the names of its contributors may
- be used to endorse or promote products derived from this software
- without specific prior written permission.</li>
-</ul></p>
-
-<p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
-
-% $m->comp(".t_bottom");
-<br />
-% $m->comp(".t_top", caption => "Credits");
-<h3>Bricolage is maintained by:</h3>
-<& /widgets/help/maintainers.html &>
-
-<h3>The current development team consists of:</h3>
-<& /widgets/help/developers.html &>
-
-<h3>The original developers were:</h3>
-<& /widgets/help/creators.html &>
-
-<h3>Emeritus Developers:</h3>
-<& /widgets/help/emeriti.html &>
-
-<h3>The online help was written by:</h3>
-<& /widgets/help/help_writers.html &>
-
-<h3>Folks who have submitted patches include:</h3>
-<& /widgets/help/patchers.html &>
-
-<h3>Friends who have spotted bugs include:</h3>
-<& /widgets/help/debuggers.html &>
-
-<h3>Bricolage's translation team:</h3>
-<& /widgets/help/translators.html &>
-
-<h3>Others who contributed to its support and development:</h3>
-<& /widgets/help/others.html &>
-% $m->comp(".t_bottom");
-</body>
-</html>
-
-<%def .t_top>
-<%args>
-$caption => ' '
-</%args>
-<table border="0" cellpadding="0" cellspacing="0" width="475">
-<tr>
- <td width="20" bgcolor="#669999"><img \
src="/media/images/numbers/669999_curve_blank.gif" width="20" height="18" \
border="0"></td>
- <td class="lightHeader" width="475"> <% uc $caption %></td>
- <td width="13" bgcolor="#cccc99"><img src="/media/images/lt_green_curve_right.gif" \
width="13" height="18"></td>
-</tr>
-</table>
-
-<table border="0" cellpadding="0" cellspacing="0" width="475">
-<tr>
-<td valign="top" bgcolor="#669999" width="1">
-<img src="/media/images/spacer.gif" width="1" height="1" border="0">
-</td>
-<td width="475" valign="top">
-<table cellspacing="0" cellpadding="4" border="0"><tr><td>
-</%def>
-
-<%def .t_bottom>
-</td></tr></table>
-</td>
-<td valign="top" bgcolor="#669999" width="1">
-<img src="/media/images/spacer.gif" width="1" height="1" border="0">
-</td>
-</tr>
-</table>
-<table width="475" border="0" cellpadding="0" cellspacing="0">
-<tr>
- <td valign="top" bgcolor="#669999"><img src="/media/images/spacer.gif" width="475" \
height="1" border="0"></td>
-</tr>
-<tr>
- <td><img src="/media/images/spacer.gif" width="475" height="10" border="0"></td>
-</tr>
-</table>
-</%def>
Copied: bricolage/trunk/comp/help/ru_ru/about.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/about.html)
Copied: bricolage/trunk/comp/help/ru_ru/admin (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin)
Copied: bricolage/trunk/comp/help/ru_ru/admin/control (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/control)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/control/change_user.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/control/change_user.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/control/change_user.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,14 +0,0 @@
-<help page="User Override">
-
-<p>Ñ ïîìîùüþ ýòîé ôóíêöèè àâòîðèçîâàííûé àäìèíèñòðàòîð ìîæåò çàéòè â ñèñòåìó ïîä \
äðóãèì èìåíåì, íå ââîäÿ ïàðîëü. Ýòî ïîëåçíî òîãäà, êîãäà íåîáõîäèìî:
-<br>- èçìåíèòü ïàðîëü, çàáûòûé ïîëüçîâàòåëåì;
-<br>- ïîëó÷èòü äîñòóï ê îáúåêòàì â ðàáî÷åì ïðîñòðàíñòâå ïîëüçîâàòåëÿ, êîòîðûé â \
äàííûé ìîìåíò íåäîñòóïåí.</p>
-
-<dl>
-<dt>Ïîèñê (Search)</dt>
-<dd>Ïîèñê àêòèâíûõ ïîëüçîâàòåëåé ïî èìåíè. û ìîæåòå òàêæå âûçâàòü ñïèñîê \
ïîëüçîâàòåëåé, èìåíà êîòîðûõ íà÷èíàþòñÿ íà îïðåäåëåííóþ áóêâó. Èëè æå ïðîñìîòðåòü \
âåñü ñïèñîê, íàæàâ « ñå».</dd>
-
-<dt>Íàéäåííûå ïîëüçîâàòåëè (Users Found)</dt>
-<dd>Óêàæèòå â ñïèñêå èñêîìóþ ó÷åòíóþ çàïèñü è íàæìèòå « õîä». û ïåðåéäåòå â ðàáî÷åå \
ïðîñòðàíñòâî óêàçàííîãî ïîëüçîâàòåëÿ.</dd>
-</dl>
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/control/change_user.html (from rev \
6084, bricolage/branches/rev_1_8/comp/help/ru_ru/admin/control/change_user.html)
Copied: bricolage/trunk/comp/help/ru_ru/admin/events (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/events)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/events/dhandler
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/events/dhandler 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/events/dhandler 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,23 +0,0 @@
-<help page="Events Log">
-
-<p> ‘Æóðíàëå’ îáúåêòà îòðàæåíà âñÿ èñòîðèÿ ñâÿçàííûõ ñ äàííûì îáúåêòîì \
ñîáûòèé (òàêèõ êàê ñîçäàíèå, ñîõðàíåíèå èëè óäàëåíèå).</p>
-
-<p>Òàáëèöà ñîáûòèé ñîäåðæèò ñëåäóþùèå êîëîíêè:</p>
-
-<dl>
- <dt>Èìÿ (Name)</dt>
- <dd>Òèï ïðîèñøåäøåãî ñîáûòèÿ.</dd>
-
- <dt>Êåì âûçâàíî (Triggered By)</dt>
- <dd>Èìÿ ïîëüçîâàòåëÿ, âûçâàâøåãî ñîáûòèå.</dd>
-
- <dt> ðåìÿ (Timestamp)</dt>
- <dd>Äàòà è âðåìÿ ñîáûòèÿ.</dd>
-
- <dt>Àòðèáóòû (Attributes)</dt>
- <dd> ñÿ ïðî÷àÿ èíôîðìàöèÿ, êîòîðàÿ ñîïóòñòâóåò ñîáûòèþ. Íàïðèìåð, åñëè ñîáûòèå \
ñîîòâåòñòâóåò ïåðåìåùåíèþ ìàòåðèàëîâ íà ëðóãîé ñòîë, òî â äàííîé êîëîíêå óêàçûâàåòñÿ \
èìÿ ýòîãî ñòîëà.</dd>
-</dl>
-
-<p>Ïî óìîë÷àíèþ ñîáûòèÿ îòîáðàæàþòñÿ â ïîðÿäêå âîçíèêíîâåíèÿ, íà÷èíàÿ ñî íàèáîëåå \
ðàííèõ, Íàæìèòå íà çàãîëîâîê ëþáîé êîëîíêè â òàáëèöå äëÿ òîãî, ÷òîáû èçìåíèòü ïîðÿäîê \
ñîðòèðîâêè.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/events/dhandler (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/events/dhandler)
Copied: bricolage/trunk/comp/help/ru_ru/admin/manager (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/manager/alert_type.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/alert_type.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/manager/alert_type.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,22 +0,0 @@
-<help page="Alert Type Manager">
-
-<p>Çäåñü âû ìîæåòå çàäàòü ðàññûëêó âàì ñîîáùåíèé èëè îïîâåùåíèé î âûïîëíåíèè òåõ èëè \
èíûõ äåéñòâèé. Íàïðèìåð, åñëè âû îòîñëàëè íîâûé Òåêñò (Story) äëÿ ïóáëèêàöèè â \
ñëåäóþùèé âòîðíèê, òî, êàê òîëüêî ýòîò ñðîê íàñòóïèò, ÁÐÈÊÎËÀÆ îòïðàâèò âàì \
îïîâåùåíèå î òîì, ÷òî äåéñòâèå âûïîëíåíî.</p>
-
-<p>
-<dl>
-
-<dt>Ïîèñê (Search)</dt>
-<dd>Ïîèñê àêòèâíûõ îïîâåùåíèé ïî èìåíè. Äëÿ ïðîñìîòðà ñïèñêà âñåõ òèïîâ îïîâåùåíèé \
ââåäèòå ïóñòîå ïîëå ïîèñêà.</dd>
-
-<dt>Äîáàâèòü íîâûé òèï îïîâåùåíèé (Add a New Alert Type)</dt>
-<dd>Íàæìèòå íà ýòó ññûëêó è âû ïåðåéäåòå íà ñòðàíèöó Ïðîôèëÿ Òèïà Îïîâåùåíèé. \
âåäèòå íåîáõîäèìóþ èíôîðìàöèþ, à çàòåì íàæìèòå êëàâèøó \
«Ñîõðàíèòü».</dd>
-
-<dt>Ñóùåñòâóþùèå Òèïû Îïîâåùåíèé (Existing Alert Types)</dt>
-<dd>Äëÿ èçìåíåíèÿ Ïðîôèëÿ Òèïà Îïîâåùåíèé íàæìèòå «Ðåäàêòèðîâàòü». Äëÿ ïðîñìîòðà \
æóðíàëà ñîáûòèé äàííîãî òèïà íàæìèòå «Æóðíàë» (Log). Äëÿ óäàëåíèÿ Òèïà îïîâåùåíèé \
ïîñòàâüòå îòìåòêó â îêîøêå «Óäàëèòü» ðÿäîì ñ íèì è íàæìèòå êëàâèøó «Óäàëèòü \
îòìå÷åííûå» â êîíöå ñòðàíèöû.</dd>
-
-</dl>
-</p>
-
-<p>Ê ñâåäåíèþ ñèñòåìíûõ àäìèíèñòðàòîðîâ. ôàéëå <code>bricolage.conf</code> âàì \
íåîáõîäèìî óêàçàòü SMTP-ñåðâåð. ïðîòèâíîì ñëó÷àå ïîëüçîâàòåëè íå áóäóò ïîëó÷àòü \
ñîîáùåíèÿ ïî å-ìåéë.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/manager/alert_type.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/alert_type.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/manager/category.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/category.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/manager/category.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,16 +0,0 @@
-<help page="Category Manager">
-
-<p>«Êàòåãîðèÿ» – ýòî òî ìåñòî íà âàøåì ñàéòå, ãäå ïóáëèêóåòñÿ êîíòåíò. íà÷àëå \
ÁÐÈÊÎËÀÆ ñîäåðæèò åäèíñòâåííóþ êàòåãîðèþ «Root Category», íî çäåñü âû ìîæåòå \
ñîçäàâàòü è ðåäàêòèðîâàòü íîâûå Êàòåãîðèè. Ïóáëèêàöèÿ ðàçäåëîâ êîíòåíòà â íåñêîëüêèõ \
Êàòåãîðèÿõ ìîæåò áûòü ïîëåçíîé ïðè óïîðÿäî÷èâàíèè êîìïîíåíòîâ âàøåãî \
ñàéòà.</p>
-
-<p><dl>
-<dt>Ïîèñê (Search)</dt>
-<dd>Ïîèñê Êàòåãîðèé ïî èìåíè. Äëÿ ïîëó÷åíèÿ ïîëíîãî ñïèñêà Êàòåãîðèé ââåäèòå ïóñòîå \
ïîëå ïîèñêà. Äëÿ ïîëó÷åíèÿ ñïèñêà Êàòåãîðèé â àëôàâèòíîì ïîðÿäêå íàæìèòå íà íóæíóþ \
áóêâó.</dd>
-
-<dt>Äîáàâèòü íîâóþ Êàòåãîðèþ (Add a New Category)</dt>
-<dd>Íàæìèòå íà ýòó ññûëêó äëÿ ñîçäàíèÿ íîâîé Êàòåãîðèè. ÁÐÈÊÎËÀÆ ïåðåéäåò íà \
ñòðàíèöó ïðîôèëÿ Êàòåãîðèè. Äëÿ ñîõðàíåíèÿ ââåäåííûõ äàííûõ íàæìèòå êëàâèøó \
«Ñîõðàíèòü» (Save) â êîíöå ñòðàíèöû.</dd>
-
-<dt>Ñóùåñòâóþùèå Êàòåãîðèè (Existing Categories)</dt>
-<dd>Íàæìèòå <em>Ðåäàêòèðîâàòü (Edit)</em> äëÿ ìîäèôèêàöèè ïðîôèëÿ Êàòåãîðèè. Íàæìèòå \
<em>Æóðíàë (Log)</em> äëÿ ïðîñìîòðà ñïèñêà âñåõ äåéñòâèé, âûïîëíåííûõ ñ äàííîé \
Êàòåãîðèåé. Äëÿ óäàëåíèÿ Êàòåãîðèè ïîñòàâüòå îòìåòêó â îêîøêå <em>Óäàëèòü</em>, à \
çàòåì íàæìèòå â êîíöå ñòðàíèöû êëàâèøó <em>Óäàëèòü \
îòìå÷åííûå</em>.</dd>
-</dl></p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/manager/category.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/category.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/manager/contrib.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/contrib.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/manager/contrib.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,20 +0,0 @@
-<help page="Contributor Manager">
-
-<p>Àâòîðû (Contributors) – ýòî ëþäè, ñîçäàþùèå êîíòåíò. Èíôîðìàöèÿ î íèõ âàæíà äëÿ \
îðãàíèçàöèè è ñèñòåìàòèçàöèè êîíòåíòà. Ðàçìåùåíèå èíôîðìàöèè îá àâòîðàõ â ýòîé \
îáëàñòè ñ ïîñëåäóþùèì ïðèñîåäèíåíèåì åå ê ñîîòâåòñòâóþùèì ðàçäåëàì êîíòåíòà \
ïîçâîëÿåò:
-<br>- êîíòðîëèðîâàòü êòî, ÷òî è êîãäà äåëàåò;
-<br>- îáúåäèíÿòü âìåñòå ðàáîòû îäíîãî àâòîðà;
-<br>- ïðîâîäèòü ïîèñê ðàáîò êîíêðåòíîãî àâòîðà.
-</p>
-
-<p><dl>
-<dt>Ïîèñê (Search)</dt>
-<dd>Ïîèñê Àâòîðà ïî èìåíè. Äëÿ ïîëó÷åíèÿ ñïèñêà âñåõ Àâòîðîâ îñòàâüòå ïîëå ïîèñêà \
ïóñòûì. îçìîæåí òàêæå ïîèñê ïî áóêâå àëôàâèòà èëè ïî òèïó.</dd>
-
-<dt>Äîáàâèòü íîâîãî Àâòîðà (Add a New Contributor)</dt>
-<dd>Ïåðåõîä íà ñòðàíè÷êó «Ïðîôèëü Àâòîðà».</dd>
-
-<dt>Ñóùåñòâóþùèå Àâòîðû (Existing Contributors)</dt>
-<dd>Íàæìèòå <i>Ðåäàêòèðîâàòü (Edit)</i> äëÿ ìîäèôèêàöèè ïðîôèëÿ Àâòîðà. Íàæìèòå \
<i>Æóðíàë (Log)</i> äëÿ ïðîñìîòðà ñïèñêà âñåõ âûïîëíåííûõ äåéñòâèé. Äëÿ óäàëåíèÿ \
ïðîôèëÿ Àâòîðà ïîñòàâüòå îòìåòêó â îêîøêå <i>Óäàëèòü (Delete)</i>, à çàòåì íàæìèòå \
êëàâèøó <i>Óäàëèòü îòìå÷åííûå (Delete Checked)</i> â êîíöå \
ñòðàíèöû.</dd>
-</dl></p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/manager/contrib.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/contrib.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/manager/contrib_type.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/contrib_type.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/manager/contrib_type.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,16 +0,0 @@
-<help page="Contributor Type Manager">
-
-<p>Òèïû Àâòîðîâ èñïîëüçóþòñÿ äëÿ êëàññèôèêàöèè Àâòîðîâ ïî èõ ðîëè â ñîçäàíèè \
êîíòåíòà. Íàïðèìåð, «Ïèñàòåëü» èëè «Ôîòîãðàô». Òèï Àâòîðà èñïîëüçóåòñÿ ïðè ðàáîòå ñî \
ñòðàíè÷êîé Ïðîôèëÿ Àâòîðà.</p>
-
-<p><dl>
-<dt>Ïîèñê (Search)</dt>
-<dd>Ïîèñê Òèïà Àâòîðà ïî èìåíè. Äëÿ ïîëó÷åíèÿ ñïèñêà âñåõ Òèïîâ îñòàâüòå ïîëå ïîèñêà \
ïóñòûì. îçìîæåí òàêæå ïîèñê ïî áóêâå àëôàâèòà.</dd>
-
-<dt>Äîáàâèòü íîâûé Òèï Àâòîðà (Add a New Contributor Type)</dt>
-<dd>Ïåðåõîä íà ñòðàíè÷êó «Ïðîôèëü Òèïà Àâòîðà». Íà ýòîé ñòðàíè÷êå çàäàþòñÿ èìÿ, \
îïèñàíèå è âñå íåîáõîäèìûå àòðèáóòû. Äëÿ ñîõðàíåíèÿ ââåäåííûõ äàííûõ íàæìèòå êëàâèøó \
«Ñîõðàíèòü» â êîíöå ñòðàíèöû.</dd>
-
-<dt>Ñóùåñòâóþùèå Òèïû Àâòîðîâ (Existing Contributor Type)</dt>
-<dd>Íàæìèòå <i>Ðåäàêòèðîâàòü (Edit)</i> äëÿ ìîäèôèêàöèè ïðîôèëÿ Òèïà Àâòîðà. Íàæìèòå \
<i>Æóðíàë (Log)</i> äëÿ ïðîñìîòðà ñïèñêà âñåõ âûïîëíåííûõ äåéñòâèé. Äëÿ óäàëåíèÿ \
ïðîôèëÿ Òèïà Àâòîðà ïîñòàâüòå îòìåòêó â îêîøêå <i>Óäàëèòü (Delete)</i>, à çàòåì \
íàæìèòå êëàâèøó <i>Óäàëèòü îòìå÷åííûå (Delete Checked)</i> â êîíöå \
ñòðàíèöû.</dd>
-</dl></p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/manager/contrib_type.html (from rev \
6084, bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/contrib_type.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/manager/dest.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/dest.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/manager/dest.html 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,20 +0,0 @@
-<help page="Destination Manager">
-
-<p>Çäåñü âû ñîçäàåòå è ðåäàêòèðóåòå Àäðåñàòîâ, êîòîðûå ïðåäñòàâëÿþò ñîáîé ñåðâåðû, \
íà êîòîðûõ âû õîòèòå ðàçìåñòèòü âàø êîíòåíò. Íåîáõîäèìî îòìåòèòü, ÷òî ïóáëèêàöèÿ è \
ïåðåñûëêà (íàçûâàåìûå Äåéñòâèÿìè) âûïîëíÿþòñÿ â ðàçäåëüíûõ ôàçàõ. ïðîöåññå \
ïóáëèêàöèè êîíòåíò ïðîïóñêàåòñÿ ÷åðåç Øàáëîíû (ýòî íàçûâàåòñÿ «ïðîæèãàíèåì»), à \
ïîëó÷åííûå ôàéëû (êàê ïðàâèëî â ôîðìàòå HTML) ñîõðàíÿþòñÿ â ðàáî÷åì êàòàëîãå. Ïîçäíåå \
«ìîíèòîð ðàçìåùåíèé», <code>bric_dist_mon</code>, âûïîëíèò ïåðåìåùåíèå «ïðîææåííûõ» \
ôàéëîâ èç ðàáî÷åãî êàòàëîãà íà ñåðâåð Àäðåñàòà.</p>
-
-<p>
-<dl>
-
-<dt>Ïîèñê (Search)</dt>
-<dd>Ïîèñê àêòèâíûõ Àäðåñàòîâ ïî èìåíè. Äëÿ ïîëó÷åíèÿ ñïèñêà âñåõ Àâòîðîâ îñòàâüòå \
ïîëå ïîèñêà ïóñòûì.</dd>
-
-<dt>Äîáàâèòü íîâîãî Àäðåñàòà (Add a New Destination)</dt>
-<dd>Ïåðåõîä íà ñòðàíè÷êó «Ïðîôèëü Àäðåñàòà». âåäèòå íåîáõîäèìóþ èíôîðìàöèþ â ïîëÿõ \
ïðîôèëÿ, à çàòåì íàæìèòå êëàâèøó «Ñîõðàíèòü» â êîíöå ñòðàíèöû.</dd>
-
-<dt>Ñóùåñòâóþùèå Àäðåñàòû (Existing Destinations)</dt>
-<dd>Íàæìèòå <i>Ðåäàêòèðîâàòü (Edit)</i> äëÿ ìîäèôèêàöèè ïðîôèëÿ Àäðåñàòà. Íàæìèòå \
<i>Æóðíàë (Log)</i> äëÿ ïðîñìîòðà ñïèñêà âñåõ äåéñòâèé, âûïîëíåííûõ ñ Àäðåñàòîì. Äëÿ \
óäàëåíèÿ ïðîôèëÿ Àäðåñàòà ïîñòàâüòå îòìåòêó â îêîøêå <i>Óäàëèòü (Delete)</i>, à çàòåì \
íàæìèòå êëàâèøó <i>Óäàëèòü îòìå÷åííûå (Delete Checked)</i> â êîíöå \
ñòðàíèöû.</dd>
-
-</dl>
-</p>
-
-</help>
\ No newline at end of file
Copied: bricolage/trunk/comp/help/ru_ru/admin/manager/dest.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/dest.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/manager/element.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/element.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/manager/element.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,19 +0,0 @@
-<help page="Element Manager">
-
-<p>Ýòî Ìåíåäæåð Ýëåìåíòîâ. Çäåñü âû ñîçäàåòå è ðåäàêòèðóåòå Ýëåìåíòû. Ýëåìåíòû – ýòî \
ñóùíîñòè Òèïîâ Ýëåìåíòîâ, êîòîðûå ôàêòè÷åñêè ïðåäñòàâëÿþò ñîáîé ñòðîèòåëüíûé ìàòåðèàë \
äëÿ ñîçäàíèÿ ñàìûõ ðàçíîîáðàçíûõ äîêóìåíòîâ. Äëÿ òîãî, ÷òîáû ïîíÿòü, êàê ñïëàíèðîâàòü \
íåîáõîäèìóþ âàì èåðàðõèþ ýëåìåíòîâ, ïðî÷òèòå ïðåæäå âñåãî <a \
href="http://bricolage.cc/docs/Bric/ElementAdmin.html" onclick="var newWin = \
window.open('http://bricolage.cc/docs/Bric/ElementAdmin.html'); newWin.focus(true); \
return false;">Bric::ElementAdmin</a></p>
-
-<p>
-<dl>
-
-<dt>Ïîèñê (Search)</dt>
-<dd>Ïîèñê Ýëåìåíòîâ ïî èìåíè. Äëÿ ïîëó÷åíèÿ ñïèñêà âñåõ Ýëåìåíòîâ îñòàâüòå ïîëå \
ïîèñêà ïóñòûì. Äëÿ ïðîñìîòðà ñïèñêà Ýëåìåíòîâ â àëôàâèòíîì ïîðÿäêå íàæìèòå íà íóæíóþ \
áóêâó. ìåíþ « ûáåðèòå Òèï» (Pick a Type) ìîæíî âûáðàòü òèï Ýëåìåíòîâ äëÿ \
ïðîñìîòðà.</dd>
-
-<dt>Äîáàâèòü íîâûé Ýëåìåíò (Add a New Element)</dt>
-<dd>Ýòà ññûëêà èñïîëüçóåòñÿ äëÿ ñîçäàíèÿ íîâîãî Ýëåìåíòà. Ïî íåé âûïîëíÿåòñÿ ïåðåõîä \
íà ñòðàíè÷êó «Ïðîôèëü Ýëåìåíòà».</dd>
-
-<dt>Ñóùåñòâóþùèå Ýëåìåíòû (Existing Elements)</dt>
-<dd>Íàæìèòå <i>Ðåäàêòèðîâàòü (Edit)</i> äëÿ ìîäèôèêàöèè ïðîôèëÿ Ýëåìåíòà. Íàæìèòå \
<i>Æóðíàë (Log)</i> äëÿ ïðîñìîòðà ñïèñêà âñåõ äåéñòâèé, âûïîëíåííûõ ñ Ýëåìåíòîì. Äëÿ \
óäàëåíèÿ Ýëåìåíòà ïîñòàâüòå îòìåòêó â îêîøêå <i>Óäàëèòü (Delete)</i>, à çàòåì íàæìèòå \
êëàâèøó <i>Óäàëèòü îòìå÷åííûå (Delete Checked)</i> â êîíöå \
ñòðàíèöû.</dd>
-</dl>
-</p>
-
-</help>
\ No newline at end of file
Copied: bricolage/trunk/comp/help/ru_ru/admin/manager/element.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/element.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/manager/element_type.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/element_type.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/manager/element_type.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,21 +0,0 @@
-<help page="Element Type Manager">
-
-<p>Çäåñü âû ñîçäàåòå è ðåäàêòèðóåòå Òèïû Ýëåìåíòîâ. Òèïû Ýëåìåíòîâ ïðåäíàçíà÷åíû äëÿ \
ãðóïïèðîâàíèÿ Ýëåìåíòîâ ïî êîíêðåòíûì ñâîéñòâàì.
-</p>
-
-<p>
-<dl>
-
-<dt>Ïîèñê (Search)</dt>
-<dd>Ïîèñê Òèïîâ Ýëåìåíòîâ ïî èìåíè. Äëÿ ïîëó÷åíèÿ ñïèñêà âñåõ Òèïîâ Ýëåìåíòîâ \
îñòàâüòå ïîëå ïîèñêà ïóñòûì. Äëÿ ïðîñìîòðà ñïèñêà Òèïîâ Ýëåìåíòîâ â àëôàâèòíîì \
ïîðÿäêå íàæìèòå íà íóæíóþ áóêâó.</dd>
-
-<dt>Äîáàâèòü íîâûé Òèï Ýëåìåíòîâ (Add a New Element Type)</dt>
-<dd>Ýòà ññûëêà èñïîëüçóåòñÿ äëÿ ñîçäàíèÿ íîâîãî Òèïà Ýëåìåíòîâ. Ïî íåé âûïîëíÿåòñÿ \
ïåðåõîä íà ñòðàíè÷êó «Ïðîôèëü Òèïà Ýëåìåíòîâ».</dd>
-
-<dt>Ñóùåñòâóþùèå Òèïû Ýëåìåíòîâ (Existing Element Types)</dt>
-<dd>Íàæìèòå <i>Ðåäàêòèðîâàòü (Edit)</i> äëÿ ìîäèôèêàöèè ïðîôèëÿ Òèïà Ýëåìåíòà. \
Íàæìèòå <i>Æóðíàë (Log)</i> äëÿ ïðîñìîòðà ñïèñêà âñåõ äåéñòâèé, âûïîëíåííûõ ñ Òèïîì \
Ýëåìåíòà. Äëÿ óäàëåíèÿ Òèïà Ýëåìåíòà ïîñòàâüòå îòìåòêó â îêîøêå <i>Óäàëèòü \
(Delete)</i>, à çàòåì íàæìèòå êëàâèøó <i>Óäàëèòü îòìå÷åííûå (Delete Checked)</i> â \
êîíöå ñòðàíèöû.</dd>
-
-</dl>
-</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/manager/element_type.html (from rev \
6084, bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/element_type.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/manager/grp.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/grp.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/manager/grp.html 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,16 +0,0 @@
-<help page="Group Manager">
-
-<p>Ðàçðåøåíèÿ, çàäàííûå äëÿ Ãðóïïû, îïðåäåëÿþò ïðèâèëåãèè åå ÷ëåíîâ. ýòîé ñåêöèè \
âû ñìîæåòå ñîçäàâàòü íîâûå Ãðóïïû è ðåäàêòèðîâàòü ðàçðåøåíèÿ \
ñóùåñòâóþùèõ Ãðóïï.</p>
-
-<p><dl>
-<dt>Ïîèñê (Search)</dt>
-<dd>Ïîèñê àêòèâíûõ Ãðóïï ïî èìåíè. Äëÿ ïîëó÷åíèÿ ñïèñêà âñåõ Ãðóïï îñòàâüòå ïîëå \
ïîèñêà ïóñòûì. îçìîæåí òàêæå ïîèñê Ãðóïï ïî áóêâå àëôàâèòà èëè ïî \
òèïó.</dd>
-
-<dt>Äîáàâèòü íîâóþ Ãðóïïó (Add a New Group)</dt>
-<dd>Ïåðåõîä íà ñòðàíè÷êó «Ïðîôèëü Ãðóïïû». Íà ýòîé ñòðàíè÷êå çàäàþòñÿ èìÿ Ãðóïïû, à \
òàêæå íåîáõîäèìûå Òèï è ðàçðåøåíèÿ. Äëÿ ñîõðàíåíèÿ ââåäåííûõ äàííûõ íàæìèòå êëàâèøó \
«Ñîõðàíèòü» â êîíöå ñòðàíèöû.</dd>
-
-<dt>Ìåíåäæåð Ãðóïï (Group Manager)</dt>
-<dd>Íàæìèòå <i>Ðåäàêòèðîâàòü (Edit)</i> äëÿ ìîäèôèêàöèè ïðîôèëÿ Ãðóïïû. Íàæìèòå \
<i>Æóðíàë (Log)</i> äëÿ ïðîñìîòðà ñïèñêà âñåõ äåéñòâèé, âûïîëíåííûõ ñ Ãðóïïîé. Äëÿ \
óäàëåíèÿ Ãðóïïû ïîñòàâüòå îòìåòêó â îêîøêå <i>Óäàëèòü (Delete)</i>, à çàòåì íàæìèòå \
êëàâèøó <i>Óäàëèòü îòìå÷åííûå (Delete Checked)</i> â êîíöå \
ñòðàíèöû.</dd>
-</dl></p>
-
-</help>
\ No newline at end of file
Copied: bricolage/trunk/comp/help/ru_ru/admin/manager/grp.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/grp.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/manager/job.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/job.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/manager/job.html 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,17 +0,0 @@
-<help page="Job Manager">
-
-<p>Çäåñü âû ïðîñìàòðèâàåòå îòëîæåííûå Çàäàíèÿ. Òàêèå çàäàíèÿ, êàê ïóáëèêàöèÿ, \
ñòàâÿòñÿ â î÷åðåäü è îæèäàþò, ïîêà <code>bric_dist_mon</code> íå âûáåðåò èõ äëÿ \
âûïîëíåíèÿ. ìîìåíò âûáîðêè çàäàíèå óäàëÿåòñÿ èç î÷åðåäè.</p>
-
-<p>
-<dl>
-
-<dt>Ïîèñê (Search)</dt>
-<dd>Ïîèñê îòëîæåííûõ Çàäàíèé ïî èìåíè. Äëÿ ïîëó÷åíèÿ ñïèñêà âñåõ Çàäàíèé îñòàâüòå \
ïîëå ïîèñêà ïóñòûì.</dd>
-
-<dt>Îòëîæåííûå Çàäàíèÿ (Pending Jobs)</dt>
-<dd>Ýòî ñïèñîê Çàäàíèé â î÷åðåäè, êîòîðûå ñîîòâåòñòâóþò çàäàííûì óñëîâèÿì \
ïîèñêà.</dd>
-
-</dl>
-</p>
-
-</help>
\ No newline at end of file
Copied: bricolage/trunk/comp/help/ru_ru/admin/manager/job.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/job.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/manager/keyword.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/keyword.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/manager/keyword.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,17 +0,0 @@
-<help page="Keyword Manager">
-
-<p>Çäåñü âû äîáàâëÿåòå, ðåäàêòèðóåòå èëè óäàëÿåòå Êëþ÷åâûå Ñëîâà.</p>
-
-<p><dl>
-<dt>Ïîèñê</dt>
-<dd>Ïîèñê àêòèâíûõ Êëþ÷åâûõ ñëîâ ïî èìåíè. Äëÿ ïðîñìîòðà ñïèñêà Ýëåìåíòîâ â \
àëôàâèòíîì ïîðÿäêå íàæìèòå íà íóæíóþ áóêâó èëè <em> ñå</em> \
(All).</dd>
-
-<dt>Äîáàâèòü íîâîå Êëþ÷åâîå Ñëîâî</dt>
-<dd>Ïî ýòîé ññûëêå âûïîëíÿåòñÿ ïåðåõîä íà ñòðàíèöó Ïðîôèëÿ Êëþ÷åâîãî Ñëîâà. âåäèòå \
òðåáóåìóþ èíôîðìàöèþ, à çàòåì íàæìèòå êëàâèøó <em>Ñîõðàíèòü</em> â êîíöå \
ñòðàíèöû.</dd>
-
-<dt>Ñóùåñòâóþùèå Êëþ÷åâûå ñëîâà</dt>
-<dd>Íàæìèòå <em>Ðåäàêòèðîâàòü</em> äëÿ òîãî, ÷òîáû èçìåíèòü Êëþ÷åâîå ñëîâî. Íàæìèòå \
<em>Æóðíàë</em> äëÿ ïðîñìîòðà âñåõ äåéñòâèé, âûïîëíåííûõ ñ Êëþ÷åâûì ñëîâîì. Äëÿ \
óäàëåíèÿ Êëþ÷åâîãî Ñëîâà ïîñòàâüòå îòìåòêó â îêîøêå <em>Óäàëèòü</em>, à çàòåì íàæìèòå \
â êîíöå ñòðàíèöû êëàâèøó <em>Óäàëèòü îòìå÷åííûå</em>.</dd>
-</dl></p>
-
-</help>
-
Copied: bricolage/trunk/comp/help/ru_ru/admin/manager/keyword.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/keyword.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/manager/media_type.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/media_type.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/manager/media_type.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,19 +0,0 @@
-<help page="Media Type Manager">
-
-<p>Çäåñü âû äîáàâëÿåòå, ðåäàêòèðóåòå èëè óäàëÿåòå Òèïû Ìåäèà äàííûõ, èçâåñòíûå òàêæå \
êàê MIME òèïû.</p>
-
-<p>
-<dl>
-
-<dt>Ïîèñê</dt>
-<dd>Ïîèñê Òèïîâ Ìåäèà äàííûõ ïî èìåíè. Äëÿ ïðîñìîòðà ñïèñêà Òèïîâ Ìåäèà äàííûõ â \
àëôàâèòíîì ïîðÿäêå íàæìèòå íà íóæíóþ áóêâó. Äëÿ ïðîñìîòðà ñïèñêà âñåõ Òèïîâ îñòàâüòå \
ïîëå ïîèñêà ïóñòûì.</dd>
-
-<dt>Äîáàâèòü íîâûé Òèï Ìåäèà äàííûõ</dt>
-<dd>Ïî ýòîé ññûëêå âûïîëíÿåòñÿ ïåðåõîä íà ñòðàíèöó Ïðîôèëÿ Òèïà Ìåäèà äàííûõ. \
âåäèòå òðåáóåìóþ èíôîðìàöèþ, à çàòåì íàæìèòå êëàâèøó <em>Ñîõðàíèòü</em> â êîíöå \
ñòðàíèöû.</dd>
-
-<dt>Ñóùåñòâóþùèå Òèïû Ìåäèà äàííûõ</dt>
-<dd>Íàæìèòå <em>Ðåäàêòèðîâàòü</em> äëÿ òîãî, ÷òîáû èçìåíèòü ïðîôèëü Òèïà Ìåäèà \
äàííûõ. Íàæìèòå <em>Æóðíàë</em> äëÿ ïðîñìîòðà âñåõ âûïîëíåííûõ äåéñòâèé. Äëÿ óäàëåíèÿ \
Òèïà Ìåäèà äàííûõ ïîñòàâüòå îòìåòêó â îêîøêå <em>Óäàëèòü</em>, à çàòåì íàæìèòå â \
êîíöå ñòðàíèöû êëàâèøó <em>Óäàëèòü îòìå÷åííûå</em>.</dd>
-</dl>
-</p>
-
-</help>
\ No newline at end of file
Copied: bricolage/trunk/comp/help/ru_ru/admin/manager/media_type.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/media_type.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/manager/output_channel.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/output_channel.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/manager/output_channel.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,16 +0,0 @@
-<help page="Output Channels Manager">
-
-<p>Êàíàëû ûâîäà – ýòî ìåñòà ïóáëèêàöèè ðàçäåëîâ êîíòåíòà. Êàíàëîì ûâîäà, ïðèíÿòûì \
ïî óìîë÷àíèþ, ÿâëÿåòñÿ World Wide Web. áîëüøèíñòâå ñëó÷àåâ îí æå ÿâëÿåòñÿ è \
åäèíñòâåííûì èñïîëüçóåìûì êàíàëîì.</p>
-
-<p><dl>
-<dt>Ïîèñê (Search)</dt>
-<dd>Ïîèñê Êàíàëà ûâîäà ïî èìåíè. Äëÿ ïîëó÷åíèÿ ñïèñêà âñåõ êàíàëîâ îñòàâüòå ïîëå \
ïîèñêà ïóñòûì. îçìîæåí òàêæå ïîèñê ïî áóêâå àëôàâèòà.</dd>
-
-<dt>Äîáàâèòü íîâûé Êàíàë ûâîäà (Add a New Output Channel)</dt>
-<dd>Ïåðåõîä íà ñòðàíè÷êó «Ïðîôèëü Êàíàëà ûâîäà», íà êîòîðîé çàäàþòñÿ èìÿ êàíàëà è \
åãî îïèñàíèå. Äëÿ ñîõðàíåíèÿ ââåäåííûõ äàííûõ íàæìèòå êëàâèøó «Ñîõðàíèòü» â êîíöå \
ñòðàíèöû.</dd>
-
-<dt>Ñóùåñòâóþùèå Êàíàëû ûâîäà (Existing Output Channels)</dt>
-<dd>Íàæìèòå <i>Ðåäàêòèðîâàòü (Edit)</i> äëÿ ìîäèôèêàöèè ïðîôèëÿ Êàíàëà âûâîäà. \
Íàæìèòå <i>Æóðíàë (Log)</i> äëÿ ïðîñìîòðà ñïèñêà âñåõ äåéñòâèé, âûïîëíåííûõ ñ Êàíàëîì \
ûâîäà. Äëÿ óäàëåíèÿ Êàíàëà ûâîäà ïîñòàâüòå îòìåòêó â îêîøêå <i>Óäàëèòü (Delete)</i>, \
à çàòåì íàæìèòå êëàâèøó <i>Óäàëèòü îòìå÷åííûå (Delete Checked)</i> â êîíöå \
ñòðàíèöû.</dd>
-</dl></p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/manager/output_channel.html (from rev \
6084, bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/output_channel.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/manager/pref.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/pref.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/manager/pref.html 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,37 +0,0 @@
-<help page="Preference Manager">
-
-<p>Çäåñü âû ìîæåòå èçìåíèòü íàñòðîéêè, à òàêæå èçìåíèòü ôîðìó ïðåäñòàâëåíèÿ \
íåêîòîðûõ äàííûõ. Çàäàéòå ïîèñê Íàñòðîéêè, êîòîðóþ õîòèòå èçìåíèòü, èëè îñòàâüòå ïîëå \
ïîèñêà ïóñòûì äëÿ ïðîñìîòðà âñåõ Íàñòðîåê.</p>
-
-<p>
-<dl>
-<dt>Èìÿ èñòåìû (Bricolage Instance Name)</dt>
-<dd>Íàçâàíèå, èñïîëüçóåìîå â çàãîëîâêàõ îêîí è â ïðèâåòñòâåííîì ñîîáùåíèè íà \
ñòðàíèöå ðåãèñòðàöèè. Íàæìèòå «Ðåäàêòèðîâàòü (Edit)» äëÿ ïåðåõîäà íà ñòðàíèöó Ïðîôèëÿ \
Íàñòðîåê, èçìåíèòå íàçâàíèå è íàæìèòå «Ñîõðàíèòü (Save)».</dd>
-
-<dt>Ôîðìàò Äàòû/ ðåìåíè (Date/Time Format)</dt>
-<dd>Íàæìèòå «Ðåäàêòèðîâàòü» äëÿ ïåðåõîäà íà ñòðàíè÷êó Ïðîôèëÿ Íàñòðîåê. ûáåðèòå \
æåëàåìûé ôîðìàò ïðåäñòàâëåíèÿ äàòû è âðåìåíè è íàæìèòå êëàâèøó \
«Ñîõðàíèòü».</dd>
-
-<dt>Êëþ÷ äëÿ ñîðòèðîâêè ìàòåðèàëîâ (Default Asset Sort)</dt>
-<dd>Ïîëå Òåêñò/Ìåäèà, âûáðàííîå ïî óìîë÷àíèþ äëÿ ñîðòèðîâêè ìàòåðèàëîâ. Íàæìèòå \
«Ðåäàêòèðîâàòü» äëÿ ïåðåõîäà íà ñòðàíèöó Ïðîôèëÿ Íàñòðîåê, âûáåðèòå íóæíîå ïîëå, à \
çàòåì íàæìèòå êëàâèøó «Ñîõðàíèòü».</dd>
-
-<dt>Òèï Ïîèñêà (Default Search)</dt>
-<dd>Òèï ïîèñêà (ïðîñòîé èëè ðàñøèðåííûé), èñïîëüçóåìûé ïî óìîë÷àíèþ â ðåæèìàõ «Íàéòè \
Ìåäèà» è «Íàéòè òåêñòû». Íàæìèòå «Ðåäàêòèðîâàòü» äëÿ ïåðåõîäà íà ñòðàíèöó Ïðîôèëÿ \
Íàñòðîåê, âûáåðèòå íóæíûé Òèï Ïîèñêà, à çàòåì íàæìèòå êëàâèøó \
«Ñîõðàíèòü».</dd>
-
-<dt>Ôîðìàò èìåíè â ñïèñêå (List Name Format)</dt>
-<dd>Îïðåäåëÿåò ôîðìó ïðåäñòàâëåíèÿ èìåí ëþäåé â ñïèñêàõ (òàêèõ êàê Ïîëüçîâàòåëè èëè \
Àâòîðû). Íàæìèòå «Ðåäàêòèðîâàòü» äëÿ ïåðåõîäà íà ñòðàíèöó Ïðîôèëÿ Íàñòðîåê, âûáåðèòå \
æåëàåìûé ôîðìàò, à çàòåì íàæìèòå êëàâèøó «Ñîõðàíèòü».</dd>
-
-<dt>Ôîðìàò èìåíè (Name Format)</dt>
-<dd>Îïðåäåëÿåò ôîðìó ïðåäñòàâëåíèÿ èìåí ëþäåé âíå ñïèñêîâ. Íàæìèòå «Ðåäàêòèðîâàòü» \
äëÿ ïåðåõîäà íà ñòðàíèöó Ïðîôèëÿ Íàñòðîåê, âûáåðèòå æåëàåìûé ôîðìàò, à çàòåì íàæìèòå \
êëàâèøó «Ñîõðàíèòü».</dd>
-
-<dt> èä îòìåòîê äëÿ Ðàçðåøåíèé (Permissions Widget)</dt>
-<dd> îçìîæíî èñïîëüçîâàíèå îòìåòîê ðàçëè÷íûõ ñòèëåé äëÿ ðàçäà÷è Ðàçðåøåíèé \
ïîëüçîâàòåëÿì. Íàæìèòå êëàâèøó «Ðåäàêòèðîâàòü» äëÿ ïåðåõîäà íà ñòðàíèöó Ïðîôèëÿ \
Ïðåäïî÷òåíèé, íàæìèòå íà êðóæî÷åê ðÿäîì ñ æåëàåìûì ôîðìàòîì, à çàòåì íàæìèòå êëàâèøó \
«Ñîõðàíèòü».</dd>
-
-<dt>Ñòðàíèöà ðåçóëüòàòîâ ïîèñêà (Search Results/Page)</dt>
-<dd>×èñëî ñòðîê, îòîáðàæàåìîå íà ñòðàíèöå ðåçóëüòàòîâ ïîèñêà. Íàæìèòå \
«Ðåäàêòèðîâàòü» äëÿ ïåðåõîäà íà ñòðàíèöó Ïðîôèëÿ Íàñòðîåê, çàäàéòå íåîáõîäèìîå ÷èñëî \
ñòðîê, ëèáî îòêëþ÷èòå ðàçáèåíèå ðåçóëüòàòîâ ïîèñêà íà ñòðàíèöû. Ïî çàâåðøåíèè \
ðåäàêòèðîâàíèÿ íàæìèòå êëàâèøó «Ñîõðàíèòü».</dd>
-
-<dt>×àñîâîé ïîÿñ (Time Zone)</dt>
-<dd>Ïîêàçûâàåò òåêóùèé ÷àñîâîé ïîÿñ. Íàæìèòå êëàâèøó «Ðåäàêòèðîâàòü» äëÿ ïåðåõîäà íà \
ñòðàíèöó Ïðîôèëÿ Ïðåäïî÷òåíèé, óñòàíîâèòå æåëàåìûé ÷àñîâîé ïîÿñ, à çàòåì íàæìèòå \
êëàâèøó «Ñîõðàíèòü».
-</dd>
-</dl>
-</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/manager/pref.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/pref.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/manager/site.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/site.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/manager/site.html 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,16 +0,0 @@
-<help page="Site Manager">
-
-<p>Çäåñü âû ñîçäàåòå è ðåäàêòèðóåòå ñàéòû.</p>
-
-<p><dl>
-<dt>Ïîèñê (Search)</dt>
-<dd>Ïîèñê àêòèâíûõ ñàéòîâ ïî èìåíè. Äëÿ ïîëó÷åíèÿ ñïèñêà âñåõ àêòèâíûõ ñàéòîâ \
îñòàâüòå ïîëå ïîèñêà ïóñòûì.</dd>
-
-<dt>Äîáàâèòü Íîâûé Ñàéò (Add a New Site)</dt>
-<dd>Íàæìèòå ýòó ññûëêó äëÿ ñîçäàíèÿ íîâîãî ñàéòà. û ïåðåéäåòå íà ñòðàíèöó Ïðîôèëÿ \
Ñàéòà. âåäèòå òðåáóåìóþ èíôîðìàöèþ. Ïî çàâåðøåíèè íàæìèòå êëàâèøó «Ñîõðàíèòü» â \
êîíöå ñòðàíèöû.</dd>
-
-<dt>Ñóùåñòâóþùèå Ñàéòû (Existing Sites)</dt>
-<dd>Íàæìèòå <i>Ðåäàêòèðîâàòü</i> äëÿ ìîäèôèêàöèè Ïðîôèëÿ Ñàéòà. Íàæìèòå \
<i>Æóðíàë</i> äëÿ ïðîñìîòðà ñïèñêà âñåõ äåéñòâèé, âûïîëíåííûõ ñ ñàéòîì. Äëÿ óäàëåíèÿ \
ñàéòà ïîñòàâüòå îòìåòêó â îêîøêå <i>Óäàëèòü</i>, à çàòåì íàæìèòå êëàâèøó <i>Óäàëèòü \
îòìå÷åííûå</i> â êîíöå ñòðàíèöû.</dd>
-</dl></p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/manager/site.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/site.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/manager/source.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/source.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/manager/source.html 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,16 +0,0 @@
-<help page="Source Manager">
-
-<p>Èñòî÷íèê – ýòî íåêòî, îòâåòñòâåííûé çà ïðåäîñòàâëåíèå òîãî èëè èíîãî ðàçäåëà \
êîíòåíòà. Ñàéòû ïàðòíåðîâ, âàø ñîáñòâåííûé ñàéò, ñëóæáû íîâîñòåé è âíåøòàòíûå \
ñîòðóäíèêè – âñå ýòî ïðèìåðû ïîòåíöèàëüíûõ Èñòî÷íèêîâ. íà÷àëå â ñèñòåìå \
ïðèñóòñòâóåò òîëüêî îäèí òàêîé Èñòî÷íèê, âðåìåííî íàçâàííûé « íóòðåííèé Èñòî÷íèê». û \
ìîæåòå åãî ïðîèçâîëüíî ïåðåèìåíîâàòü, à òàêæå äîáàâèòü è äðóãèå èñòî÷íèêè, îò êîòîðûõ \
âû ïîëó÷àåòå ìàòåðèàëû äëÿ ôîðìèðîâàíèÿ êîíòåíòà. íîâü ñîçäàííûé èñòî÷íèê ìîæåò áûòü \
íåìåäëåííî èñïîëüçîâàí ïðè çàïîëíåíèè Ïðîôèëÿ ðàçäåëà êîíòåíòà.</p>
-
-<p><dl>
-<dt>Ïîèñê (Search)</dt>
-<dd>Ïîèñê Èñòî÷íèêà ïî èìåíè. Äëÿ ïîëó÷åíèÿ ñïèñêà âñåõ Èñòî÷íèêîâ îñòàâüòå ïîëå \
ïîèñêà ïóñòûì. îçìîæåí òàêæå ïîèñê ïî áóêâå àëôàâèòà.</dd>
-
-<dt>Äîáàâèòü íîâûé Èñòî÷íèê (Add a New Source)</dt>
-<dd>Ïåðåõîä íà ñòðàíè÷êó «Ïðîôèëü Èñòî÷íèêà».</dd>
-
-<dt>Ñóùåñòâóþùèå Èñòî÷íèêè (Existing Sources)</dt>
-<dd>Íàæìèòå <i>Ðåäàêòèðîâàòü (Edit)</i> äëÿ ìîäèôèêàöèè ïðîôèëÿ Èñòî÷íèêà. Íàæìèòå \
<i>Æóðíàë (Log)</i> äëÿ ïðîñìîòðà ñïèñêà âñåõ âûïîëíåííûõ äåéñòâèé. Äëÿ óäàëåíèÿ \
ïðîôèëÿ Èñòî÷íèêà ïîñòàâüòå îòìåòêó â îêîøêå <i>Óäàëèòü (Delete)</i>, à çàòåì íàæìèòå \
êëàâèøó <i>Óäàëèòü îòìå÷åííûå (Delete Checked)</i> â êîíöå \
ñòðàíèöû.</dd>
-</dl></p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/manager/source.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/source.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/manager/user.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/user.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/manager/user.html 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,17 +0,0 @@
-<help page="User Manager">
-
-<p>Çäåñü âû ñîçäàåòå ó÷åòíûå çàïèñè ïîëüçîâàòåëåé è óñòàíàâëèâàåòå äëÿ íèõ óðîâíè \
äîñòóïà. Óðîâåíü äîñòóïà ïîëüçîâàòåëÿ îïðåäåëÿåòñÿ ïî åãî ïðèíàäëåæíîñòè ê \
àäìèíèñòðàòèâíûì ãðóïïàì. Íàïðèìåð, åñëè âû õîòèòå, ÷òîáû ïîëüçîâàòåëþ àñå Èâàíîâó \
áûëî ðàçðåøåíî ðåäàêòèðîâàòü Òåêñòû (Stories), òî íåîáõîäèìî çàéòè íà ñòðàíè÷êó \
ïðîôèëÿ äàííîãî ïîëüçîâàòåëÿ è òàì âêëþ÷èòü åãî â àäìèíèñòðàòèâíóþ ãðóïïó, êîòîðîé \
ðàçðåøåíî âûïîëíÿòü ðåäàêòèðîâàíèå òåêñòîâ.
-</p>
-
-<p><dl>
-<dt>Ïîèñê (Search)</dt>
-<dd>Ïîèñê àêòèâíûõ Ïîëüçîâàòåëåé ïî ôàìèëèè. Äëÿ ïîëó÷åíèÿ ñïèñêà âñåõ àêòèâíûõ \
Ïîëüçîâàòåëåé îñòàâüòå ïîëå ïîèñêà ïóñòûì.</dd>
-
-<dt>Äîáàâèòü íîâîãî Ïîëüçîâàòåëÿ (Add a New User)</dt>
-<dd>Ïåðåõîä íà ñòðàíè÷êó «Ïðîôèëü Ïîëüçîâàòåëÿ», íà êîòîðîé çàäàåòñÿ âñÿ íåîáõîäèìàÿ \
èíôîðìàöèÿ. Äëÿ ñîõðàíåíèÿ ââåäåííûõ äàííûõ íàæìèòå êëàâèøó «Ñîõðàíèòü» â êîíöå \
ñòðàíèöû.</dd>
-
-<dt>Ñóùåñòâóþùèå Ïîëüçîâàòåëè (Existing Users)</dt>
-<dd>Íàæìèòå <i>Ðåäàêòèðîâàòü (Edit)</i> äëÿ ìîäèôèêàöèè ïðîôèëÿ Ïîëüçîâàòåëÿ. \
Íàæìèòå <i>Æóðíàë (Log)</i> äëÿ ïðîñìîòðà ñïèñêà âñåõ âûïîëíåííûõ äåéñòâèé ñ ó÷åòíîé \
çàïèñüþ. Äëÿ óäàëåíèÿ ó÷åòíîé çàïèñè Ïîëüçîâàòåëÿ ïîñòàâüòå îòìåòêó â îêîøêå \
<i>Óäàëèòü (Delete)</i>, à çàòåì íàæìèòå êëàâèøó <i>Óäàëèòü îòìå÷åííûå (Delete \
Checked)</i> â êîíöå ñòðàíèöû.</dd>
-</dl></p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/manager/user.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/user.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/manager/workflow.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/workflow.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/manager/workflow.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,16 +0,0 @@
-<help page="Workflow Manager">
-
-<p>Çäåñü âû ñîçäàåòå è ðåäàêòèðóåòå Ðàáî÷èå Ïðîöåññû (îáëàñòè óïðàâëåíèÿ äëÿ \
ðàçäåëîâ êîíòåíòà). ñèñòåìå ñóùåñòâóþò òðè áàçîâûõ Ðàáî÷èõ Ïðîöåññà – ýòî Ìåäèà, \
Òåêñò è Øàáëîí. Íî âû ìîæåòå äîáàâëÿòü íîâûå Ðàáî÷èå Ïðîöåññû, ëèáî ìîäèôèöèðîâàòü \
ñóùåñòâóþùèå ïî ñâîåìó óñìîòðåíèþ.</p>
-
-<p><dl>
-<dt>Ïîèñê (Search)</dt>
-<dd>Ïîèñê Ðàáî÷èõ Ïðîöåññîâ ïî èìåíè. Äëÿ ïîëó÷åíèÿ ñïèñêà âñåõ Ðàáî÷èõ Ïðîöåññîâ \
îñòàâüòå ïîëå ïîèñêà ïóñòûì. îçìîæåí òàêæå ïîèñê ïî ïåðâîé áóêâå \
èìåíè.</dd>
-
-<dt>Äîáàâèòü íîâûé Ðàáî÷èé Ïðîöåññ (Add a New Workflow)</dt>
-<dd>Ïåðåõîä íà ñòðàíè÷êó «Ïðîôèëü Ðàáî÷åãî Ïðîöåññà», íà êîòîðîé çàäàåòñÿ âñÿ \
íåîáõîäèìàÿ èíôîðìàöèÿ. Äëÿ ñîõðàíåíèÿ ââåäåííûõ äàííûõ íàæìèòå êëàâèøó «Ñîõðàíèòü» â \
êîíöå ñòðàíèöû.</dd>
-
-<dt>Ñóùåñòâóþùèå Ðàáî÷èå Ïðîöåññû (Existing Workflows)</dt>
-<dd>Íàæìèòå <i>Ðåäàêòèðîâàòü (Edit)</i> äëÿ ìîäèôèêàöèè ïðîôèëÿ Ðàáî÷åãî Ïðîöåññà. \
Íàæìèòå <i>Æóðíàë (Log)</i> äëÿ ïðîñìîòðà ñïèñêà âñåõ âûïîëíåííûõ äåéñòâèé. Äëÿ \
óäàëåíèÿ Ðàáî÷åãî Ïðîöåññà ïîñòàâüòå îòìåòêó â îêîøêå <i>Óäàëèòü (Delete)</i>, à \
çàòåì íàæìèòå êëàâèøó <i>Óäàëèòü îòìå÷åííûå (Delete Checked)</i> â êîíöå \
ñòðàíèöû.</dd>
-</dl></p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/manager/workflow.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/manager/workflow.html)
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/profile/action.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/action.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/profile/action.html 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,16 +0,0 @@
-<help page="Action Profile">
-
-<p>Ýòà ôîðìà èñïîëüçóåòñÿ äëÿ òîãî, ÷òîáû äîáàâëÿòü èëè ðåäàêòèðîâàòü <dfn>Äåéñòâèÿ \
(Actions)</dfn>, êîòîðûå ðàçëè÷àþòñÿ ïî òèïàì îáðàáîòêè äàííûõ â ïðîöåññå \
ïóáëèêàöèè.</p>
-
-
-<h3>Ñâîéñòâà (Properties)</h3>
-
-<dl>
-<dt>Òèï (Type)</dt>
-<dd>Òèï Äåéñòâèÿ, êîòîðîå áóäåò âûïîëíåíî. Íàèáîëåå ÷àñòî èñïîëüçóåòñÿ \
«Ïåðåìåñòèòü», êîòîðîå è âûïîëíÿåò ðåàëüíóþ ïåðåñûëêó èëè çàãðóçêó âûõîäíûõ äàííûõ íà \
ñåðâåð.</dd>
-
-<dt>Î÷åðåäíîñòü (Order)</dt>
-<dd>Èñïîëüçóåòñÿ äëÿ óñòàíîâêè î÷åðåäíîñòè, â êîòîðîé áóäóò âûïîëíÿòüñÿ Äåéñòâèÿ â \
ïðîöåññå ïóáëèêàöèè.</dd>
-</dl>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/action.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/action.html)
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/alert_type (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/alert_type)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/profile/alert_type/recip.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/alert_type/recip.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/profile/alert_type/recip.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,19 +0,0 @@
-<help page="Alert Type Recipients Profile">
-
-<p> û ìîæåòå óêàçàòü, ÷òîáû îïîâåùåíèÿ îòïðàâëÿëèñü ëèáî îòäåëüíîìó ïîëüîâàòåëþ, \
ëèáî ãðóïïå ïîëüçîâàòåëåé.</p>
-
-<p>
-<dl>
-
-<dt>Ãðóïïîâûå ïîëó÷àòåëè (Group Recipients)</dt>
-<dd>Îïðåäåëÿåò, ÷òî ýòî îïîâåùåíèå îòïðàâëÿåòñÿ ãðóïïå èëè ãðóïïàì ïîëüçîâàòåëåé. \
ûáåðèòå ãðóïïó â ñïèñêå ñëåâà, «Äîñòóïíûå Ãðóïïû», à çàòåì íàæìèòå êëàâèøó «Äîáàâèòü \
â Ñïèñîê». Ãðóïïà áóäåò ïåðåìåùåíà â ñïèñîê «Òåêóùèå Ãðóïïû», êîòîðûé íàõîäèòñÿ \
ñïðàâà. Äëÿ óäàëåíèÿ ãðóïïû èç ñïèñêà òåêóùèõ ãðóïï íàæìèòå êëàâèøó «Óäàëèòü èç \
Ñïèñêà».</dd>
-
-<dt>Èíäèâèäóàëüíûå ïîëó÷àòåëè (User Recipients)</dt>
-<dd>Îïðåäåëÿåò, ÷òî ýòî îïîâåùåíèå îòïðàâëÿåòñÿ èíäèâèäóàëüíîìó ïîëüçîâàòåëþ, ëèáî \
íåñêîëüêèì ïîëüçîâàòåëÿì. ûáåðèòå ïîëüçîâàòåëÿ â ñïèñêå ñëåâà, «Äîñòóïíûå \
Ïîëüçîâàòåëè», à çàòåì íàæìèòå êëàâèøó «Äîáàâèòü â Ñïèñîê». Ïîëüçîâàòåëü áóäåò \
ïåðåìåùåí â ñïèñîê «Òåêóùèå Ïîëüçîâàòåëè», êîòîðûé íàõîäèòñÿ ñïðàâà. Äëÿ óäàëåíèÿ \
ïîëüçîâàòåëÿ èç ñïèñêà òåêóùèõ ïîëüçîâàòåëåé íàæìèòå êëàâèøó «Óäàëèòü èç \
Ñïèñêà».</dd>
-
-</dl>
-</p>
-
-<p>Ïî çàâåðøåíèè íàæìèòå êëàâèøó «Ñîõðàíèòü» ëèáî «Îòìåíà» (äëÿ îòìåíû âíåñåííûõ \
èçìåíåíèé).</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/alert_type/recip.html (from rev \
6084, bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/alert_type/recip.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/profile/alert_type.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/alert_type.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/profile/alert_type.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,86 +0,0 @@
-<help page="Alert Type Profile">
-
-<p>Çäåñü âû ñîçäàåòå íîâûå Òèïû Îïîâåùåíèé è ðåäàêòèðóåòå ñóùåñòâóþùèå.</p>
-
-<p>Ïðè ñîçäàíèè íîâîãî Òèïà Îïîâåùåíèé íåîáõîäèìî:</p>
-
-<p>
-<dl>
-
-<dt> ûáðàòü îáúåêò (Select an Object)</dt>
-<dd>Îáúåêò, êîòîðûé âû âûáåðåòå, áóäåò èñòî÷íèêîì ñîáûòèé, ïîðîæäàþùèõ Îïîâåùåíèÿ. \
Ïîñëå âûáîðà îáúåêòà íàæìèòå êëàâèøó «Äàëåå (Next)».</dd>
-
-<dt> ûáðàòü Òèï Ýëåìåíòà (Select an Event Type)</dt>
-<dd> ûáåðèòå òèï ýëåìåíòà, ñîîòâåòñòâóþùèé âûáðàííîìó âàìè îáúåêòó. Çäåñü âû \
âûáèðàåòå òèï ñîáûòèÿ, êîòîðîå áóäåò ïîðîæäàòü ñîçäàâàåìîå îïîâåùåíèå. ýòîé \
äèàëîãîâîé ôîðìå òðåáóåòñÿ òàêæå çàäàòü èìÿ äëÿ íîâîãî Òèïà Îïîâåùåíèé. Èìÿ ìîæåò \
áûòü ïðîèçâîëüíûì. çàâåðøåíèå âû äîëæíû âûáðàòü âëàäåëüöà Òèïà Îïîâåùåíèé. Ïî \
óìîë÷àíèþ -- ýòî âû. Íî âû ìîæåòå óêàçàòü è äðóãîãî ïîëüçîâàòåëÿ. Äëÿ êàæäîãî \
âëàäåëüöà äîïóñêàåòñÿ èìåòü òîëüêî îäèí Òèï Îïîâåùåíèé ñ çàäàííûì èìåíåì. Äëÿ \
ïðîäîëæåíèÿ íàæìèòå êëàâèøó «Äàëåå».</dd>
-
-</dl>
-</p>
-
-<p>Ïîñëåäíÿÿ äèàëîãîâàÿ ôîðìà, êîòîðóþ íåîáõîäèìî çàïîëíèòü ïðè ñîçäàíèè íîâîãî Òèïà \
Îïîâåùåíèé, -- ýòî òà æå ñàìàÿ ôîðìà, êîòîðàÿ èñïîëüçóåòñÿ ïðè ðåäàêòèðîâàíèè óæå \
ñóùåñòâóþùèõ Òèïîâ. Çäåñü âû çàäàåòå óñëîâèÿ, ðåäàêòèðóåòå ñîäåðæèìîå îïîâåùåíèé, à \
òàêæå óêàçûâàåòå èõ ïîëó÷àòåëåé.</p>
-
-<p>
-<dl>
-
-<dt>Ñâîéñòâà (Properties)</dt>
-<dd>Ïåðâûå òðè ñâîéñòâà óæå îáñóæäàëèñü ðàíåå. Ñâîéñòâî Àêòèâíîñòè îïðåäåëÿåò áóäåò \
ëè Îïîâåùåíèå äåéñòâèòåëüíî îòïðàâëåíî ïîëó÷àòåëÿì ïðè âîçíèêíîâåíèè ñîîòâåòñòâóþùåãî \
ñîáûòèÿ. Ïî óìîë÷àíèþ Îïîâåùåíèå àêòèâíî. Íî âû ìîæåòå ñäåëàòü åãî íåàêòèâíûì, ñíÿâ \
îòìåòêó â ñîîòâåòñòâóþùåì îêîøêå.</dd>
-
-<dt>Óñëîâèÿ (Rules)</dt>
-<dd>Çäåñü çàäàþòñÿ óñëîâèÿ, ïðè âûïîëíåíèè êîòîðûõ âîçíèêàåò ñîáûòèå, ïîðîæäàþùåå \
(«âêëþ÷àþùåå») Îïîâåùåíèå. Ïðè ïðîâåðêå óñëîâèÿ ñðàâíèâàþòñÿ äàííûå, îòíîñÿùèåñÿ ê \
ñîáûòèþ (the "attribute"), è çíà÷åíèå, êîòîðîå âû ââåëè. (Çäåñü íåîáõîäèìî \
îòìåòèòü, ÷òî «Trig», ñîêðàùåíèå îò «Triggerer», ýòî ïîëüçîâàòåëü, êîòîðûé âêëþ÷àåò \
ñîáûòèå.) Ñðàâíåíèÿ âûïîëíÿþòñÿ áåç ó÷åòà ðåãèñòðà (òî åñòü, íåâàæíî ââîäèòå ëè âû \
ñòðî÷íûå èëè ïðîïèñíûå áóêâû) è èñïîëüçóþò îäèí èç îïåðàòîðîâ \
ñðàâíåíèÿ:
-
-<dl>
-
-<dt>=</dt>
-<dd>Ðàâíî. åðîÿòíî ýòîò îïåðàòîð áóäåò íàèáîëåå ÷àñòî èñïîëüçîâàòüñÿ. Óñëîâèå \
èñòèííî òîëüêî â òîì ñëó÷àå, åñëè çíà÷åíèå <strong>ñòðîãî</strong> ñîâïàäàåò ñ \
äàííûìè ñîáûòèÿ.</dd>
-
-<dt><></dt>
-<dd>Íå ðàâíî. Óñëîâèå èñòèííî òîëüêî â òîì ñëó÷àå, åñëè çíà÷åíèå íå ñîâïàäàåò \
<strong>ñòðîãî</strong> ñ äàííûìè ñîáûòèÿ.</dd>
-
-<dt>></dt>
-<dd>Áîëüøå.</dd>
-
-<dt><</dt>
-<dd>Ìåíüøå.</dd>
-
-<dt>>=</dt>
-<dd>Áîëüøå èëè ðàâíî.</dd>
-
-<dt><=</dt>
-<dd>Ìåíüøå èëè ðàâíî.</dd>
-
-<dt>=~</dt>
-<dd>Ðåãóëÿðíîå âûðàæåíèå ÿçûêà Ïåðë «ñîâïàäàåò íà ôîíå». Îïèñàíèå ðåãóëÿðíûõ \
âûðàæåíèé âûõîäèò çà ðàìêè äàííîé äîêóìåíòàöèè. Îãðàíè÷èìñÿ \
íåñêîëüêèìè ïðèìåðàìè:
-
-<dl>
-
-<dt>×àñòè÷íîå ñîâïàäåíèå</dt>
-<dd> òî âðåìÿ êàê èñïîëüçîâàíèå îïåðàòîðà « = » òðåáóåò ñòðîãîãî ñîâïàäåíèÿ \
çíà÷åíèé, èñïîëüçîâàíèå äàííîãî îïåðàòîðà îçíà÷àåò ñîâïàäåíèå <strong>â ëþáîì \
ìåñòå</strong> âíóòðè ñòðîêè. Íàïðèìåð, çíà÷åíèå <code>Èñïàíèÿ</code> ñîâïàëî áû \
òàêèì îáðàçîì ñ «Áàðñåëîíà, Èñïàíèÿ».</dd>
-
-<dt>Ñîâïàäåíèå ñ îäíèì èç íåñêîëüêèõ çíà÷åíèé</dt>
-<dd> û ìîæåòå ðàçäåëèòü íåñêîëüêî çíà÷åíèé çíàêîì « | » è áóäåò äîñòàòî÷íî \
ñîâïàäåíèÿ <strong>ñ ëþáûì</strong> èç ýòèõ çíà÷åíèé. Íàïðèìåð, \
<code>Èñïàíèÿ|Ôðàíöèÿ|Àíãëèÿ</code> îçíà÷àåò ñîâïàäåíèå ñ íàçâàíèåì ëþáîé èç ýòèõ \
òðåõ ñòðàí. Çàìåòèì, ÷òî åñëè áû ïîòðåáîâàëîñü ñîâïàäåíèå ñ êàæäûì èç ýòèõ çíà÷åíèé, \
òî ïðèøëîñü áû èñïîëüçîâàòü òðè îòäåëüíûõ óñëîâèÿ « = ».</dd>
-
-<dt>Íå÷åòêîå çíà÷åíèå</dt>
-<dd>Ïðåäïîëîæèì âàì íåîáõîäèìî íàéòè ñîâïàäåíèå ëèáî ñ «Paris, France», ëèáî ñ \
«Paratroopers in France». ýòîì ñëó÷àå âû ìîãëè áû èñïîëüçîâàòü òàêîå çíà÷åíèå \
<code>Par.*France</code>. Çíàê « . » îçíà÷àåò ëþáîé ñèìâîë, à ñëåäóþùèé çà íèì ñèìâîë \
« * » îçíà÷àåò ñîâïàäåíèå ñ ëþáûì êîëè÷åñòâîì ñèìâîëîâ.</dd>
-
-</dl>
-</dd>
-
-<dt>!~</dt>
-<dd>Ðåãóëÿðíîå âûðàæåíèå ÿçûêà Ïåðë «íå ñîâïàäàåò». Ýòî ïðîòèâîïîëîæíîñòü « = \
».</dd>
-
-</dl>
-</dd>
-
-<dt>Êîíòåíò</dt>
-<dd>Ýòî êîíòåíò, êîòîðûé áóäåò îòïðàâëåí â Îïîâåùåíèè. Òåìà -- ýòî «Òåìà» å-ìåéë \
ñîîáùåíèÿ, à ñîîáùåíèå -- ýòî «òåëî» å-ìåéë ñîîáùåíèÿ. û ìîæåòå ââåñòè ÷òî óãîäíî â \
òåêñòîâûõ ïîëÿõ, íî èñïîëüçóÿ ëîêàëüíûå ìåíþ, âû ìîæåòå äîáàâèòü èíôîðìàöèþ, \
ñïåöèôè÷åñêóþ äëÿ ñîáûòèÿ. Òàêèå ìåíþ åñòü äëÿ êàæäîãî ïîëÿ è ñëóæàò äëÿ óäîáñòâà \
âñòàâêè «ïåðåìåííûõ» â ýòè ïîëÿ. Êîãäà áû âû íå âûáðàëè ïóíêò ìåíþ, îí àâòîìàòè÷åñêè \
ïîïàäàåò â ïîëå. Çíà÷åíèÿ â ìåíþ ñîîòâåòñòâóþò «àòðèáóòàì» â Óñëîâèÿõ. àì äàæå íå \
íóæíî èñïîëüçîâàòü ìåíþ íåïîñðåäñòâåííî. Ïðîñòî ââîäèòå ïåðåìåííóþ íåïîñðåäñòâåííî â \
ïîëå. Çàìåòèì, ÷òî çíàê äîëëàðà (<code>$</code>) -- ýòî ñïåöèàëüíûé çíàê äëÿ \
îáîçíà÷åíèÿ ïåðåìåííûõ. Ïîýòîìó, äëÿ òîãî ÷òîáû çàäàòü ëèòåðàëüíûé çíàê äîëëàðà ïåðåä \
íèì íåîáõîäèìî ïîñòàâèòü îáðàòíûé ñëýø. Íàïðèìåð, <code>Cost: \
\$500</code>.</dd>
-
-<dt>Ïîëó÷àòåëè</dt>
-<dd>Ïîëó÷àòåëè -- ýòî òå ïîëüçîâàòåëè, êîòîðûå áóäóò ïîëó÷àòü Îïîâåùåíèÿ. \
Äîïóñêàþòñÿ òðè òèïà «êîíòàêòîâ», êîòîðûì äîëæíû îòïðàâëÿòüñÿ å-ìåéë ñîîáùåíèÿ: \
Primary Email, Secondary Email, è Pager Email. Îñîáî îòìåòèì, ÷òî ýòè çíà÷åíèÿ \
óñòàíàâëèâàþòñÿ â Ïðîôèëå Ïîëüçîâàòåëÿ. Åñëè âû âûáðàëè ïîëó÷àòåëÿ, íî â åãî ïðîôèëå \
Ïîëüçîâàòåëÿ îòñóòñòâóåò êîíòàêòíàÿ èíôîðìàöèÿ, îí íèêàêèõ ñîîáùåíèé íå ïîëó÷èò. \
Ïîëüçîâàòåëè ñ íåñêîëüêèìè àäðåñàìè áóäóò ïîëó÷àòü ñîîáùåíèÿ íà êàæäûé èç ýòèõ \
àäðåñîâ.</dd>
-
-</dl>
-</p>
-
-<p>Åñëè âû çàêîí÷èëè, òî íàæìèòå êëàâèøó «Ñîõðàíèòü» â êîíöå ñòðàíèöû, èëè \
«Îòìåíèòü» äëÿ îòìåíû âñåõ èçìåíåíèé. Äëÿ óäàëåíèÿ Òèïà Îïîâåùåíèé ïîñòàâüòå îòìåòêó \
â îêîøêå «Óäàëèòü ýòîò Ïðîôèëü» è íàæìèòå êëàâèøó «Ñîõðàíèòü».</p>
-
-<p>Ïîäðîáíåå îá Îïîâåùåíèÿõ ñìîòðèòå â <a \
href="http://bricolage.cc/docs/Bric/Alert.html" onclick="var newWin = \
window.open('http://bricolage.cc/docs/Bric/Alert.html'); newWin.focus(true); return \
false;">Bric::Alert</a>.</p>
-
-</help>
\ No newline at end of file
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/alert_type.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/alert_type.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/profile/category.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/category.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/profile/category.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,16 +0,0 @@
-<help page="Category Profile">
-
-<p><dl>
-<dt>Ñâîéñòâà (Properties)</dt>
-<dd>Çäåñü çàäàåòñÿ èìÿ Êàòåãîðèè è åå êðàòêîå îïèñàíèå.</dd>
-
-<dt>Êëþ÷åâûå ñëîâà (Keywords)</dt>
-<dd>Çäåñü çàäàþòñÿ ëþáûå ñëîâà èëè ôðàçû, îòíîñÿùèåñÿ ê Êàòåãîðèè, êîòîðûå ïîçâîëÿò \
ïðè íåîáõîäèìîñòè áûñòðî åå íàéòè. Åñëè ÷åòûðåõ ñòðîê ìàëî, òî äîïîëíèòåëüíûå ñòðîêè \
ìîæíî äîáàâèòü, íàæàâ <i>Äîáàâèòü åùå</i>.</dd>
-
-<dt>Ðåêëàìíûå ñòðîêè (Ad Strings)</dt>
-<dd>Ïî òðåáîâàíèþ ðåêëàìîäàòåëåé, ñ öåëüþ îáðàùåíèÿ ê êîíêðåòíîé ãðóïïå ïîñåòèòåëåé \
âàøåãî ñàéòà, âîçìîæíî àññîöèèðîâàòü ðåêëàìíûå ñòðîêè ñ êîíêðåòíîé \
Êàòåãîðèåé.</dd>
-</dl></p>
-
-<p>Ïî çàâåðøåíèè ââîäà íàæìèòå <i>Ñîõðàíèòü</i>.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/category.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/category.html)
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/contrib (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/contrib)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/profile/contrib/edit.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/contrib/edit.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/profile/contrib/edit.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,23 +0,0 @@
-<help page="Contributor Profile">
-
-<p>
-<dl>
-
-<dt>Ñâîéñòâà (Properties)</dt>
-<dd> âåäèòå ïðåôèêñ (Dr., Mrs., è ïð.), Èìÿ, Îò÷åñòâî, Ôàìèëèþ è ñóôôèêñ (Jr., Esq. \
è ïð.). Çàïîëíÿòü âñå ïîëÿ íåîáÿçàòåëüíî, íî, êàê ìèíèìóì, ôàìèëèþ ââåñòè \
íåîáõîäèìî.</dd>
-
-<dt>Êîíòàêòíàÿ èíôîðìàöèÿ (Contacts)</dt>
-<dd>Äëÿ ââîäà êîíòàêòíûõ äàííûõ âûáåðèòå èõ òèï âî âñïëûâàþùåì ìåíþ, à çàòåì ââåäèòå \
çíà÷åíèå â òåêñòîâîì ïîëå, ðàñïîëîæåííîì çà íèì. Íåîáÿçàòåëüíî çàïîëíÿòü âñå ñåòûðå \
ñòðîêè, íî åñëè èõ îêàæåòñÿ íåäîñòàòî÷íî, òî íàæìèòå êëàâèøó «Äîáàâèòü åùå» (Add \
More). Äëÿ óäàëåíèÿ Êîíòàêòà ïîñòàâüòå îòìåòêó â îêîøêå «Óäàëèòü», à çàòåì íàæìèòå \
êëàâèøó «Ñîõðàíèòü».</dd>
-
-<dt>Ðîëü (Role Custom Fields)</dt>
-<dd> âåäèòå èíôîðìàöèþ î òîé ðîëè, êîòîðóþ èãðàåò ýòîò Àâòîð.</dd>
-
-<dt>Ïåðåêëþ÷èòü Ðîëè (Switch Roles)</dt>
-<dd>Èçìåíèòå ðîëü, êîòîðóþ èãðàåò ýòîò Àâòîð. Äîïîëíèòåëüíûå ðîëì çàäàþòñÿ ïðè \
íàæàòèè êëàâèøè «Íîâûé» â îêíå Ìåíåäæåðà Àâòîðîâ (Contributor \
Manager).</dd>
-
-</dl>
-</p>
-
-<p>Ïðè íåîáõîäèìîñòè óäàëèòü äàííîãî àâòîðà, ïîñòàâüòå îòìåòêó â îêîøêå «Óäàëèòü \
ýòîò Ïðîôèëü». Íàæìèòå êëàâèøó «Ñîõðàíèòü» äëÿ ñîõðàíåíèÿ èçìåíåíèé è âîçâðàòà â îêíî \
Ìåíåäæåðà Àâòîðîâ.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/contrib/edit.html (from rev \
6084, bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/contrib/edit.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/profile/contrib/extend.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/contrib/extend.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/profile/contrib/extend.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,14 +0,0 @@
-<help page="Contributor Extend Profile">
-
-<p>
-<dl>
-
-<dt>Ñâîéñòâà (Properties)</dt>
-<dd> âåäèòå ïðåôèêñ (Dr., Mrs., è ïð.), Èìÿ, Îò÷åñòâî, Ôàìèëèþ è ñóôôèêñ (Jr., Esq. \
è ïð.). Çàïîëíÿòü âñå ïîëÿ íåîáÿçàòåëüíî, íî, êàê ìèíèìóì, ôàìèëèþ ââåñòè \
íåîáõîäèìî.</dd>
-
-<dt>Ðîëè (Roles)</dt>
-<dd>Îòîáðàæàþòñÿ âñå ðîëè, ñóùåñòâóþùèå äëÿ äàííîãî Àâòîðà. û ìîæåòå òàêæå äîáàâèòü \
èìÿ íîâîé ðîëè. Íàæàòèå êëàâèøè «Äàëåå» ïîçâîëÿåò âàì âûáðàòü òåêóùóþ ðîëü. Ïîâòîðíîå \
íàæàòèå êëàâèøè «Äàëåå» âûäàñò âàì ïîëíûé Ïðîôèëü Àâòîðà.</dd>
-
-</dl>
-</p>
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/contrib/extend.html (from rev \
6084, bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/contrib/extend.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/profile/contrib.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/contrib.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/profile/contrib.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,23 +0,0 @@
-<help page="Contributor Profile">
-
-<p><dl>
-<dt>Ñâîéñòâà (Properties)</dt>
-<dd>Çäåñü çàäàþòñÿ ïîëíîå èìÿ àâòîðà, à òàêæå ïðåôèêñ (Mr/Mrs) è/èëè ñóôôèêñ \
(íàïðèìåð, Jr) åñëè íåîáõîäèìî.</dd>
-
-<dt>Ïðîôèëü Àâòîðà (Contributor Profile)</dt>
-<dd> îñïîëüçóéòåñü âûïàäàþùèì ìåíþ äëÿ âûáîðà òèïà Àâòîðà.</dd>
-</dl></p>
-
-<p>Íàæìèòå êëàâèøó <i>Äàëåå</i> äëÿ ïåðåõîäà íà ñëåäóþùóþ ñòðàíèöó.</p>
-
-<p><dl>
-<dt>Êîíòàêòû (Contacts)</dt>
-<dd>Çäåñü çàäàåòñÿ êîíòàêòíàÿ èíôîðìàöèÿ Àâòîðà. îñïîëüçóéòåñü âûïàäàþùèìè ìåíþ äëÿ \
óòî÷íåíèÿ ñðåäñòâ ñâÿçè (òåëåôîí, ôàêñ, å-ìåéë è äð.), à òàêæå ïóñòûìè ïîëÿìè ñïðàâà \
äëÿ ââîäà äàííûõ. Åñëè ÷åòûðåõ ïîëåé ìàëî, òî íàæìèòå <i>Äîáàâèòü \
åùå</i>.</dd>
-
-<dt>Ñòàíäàðòíûå àòðèáóòû ðîëè (Default Role Attributes)</dt>
-<dd>Çäåñü çàäàåòñÿ êðàòêîå îïèñàíèå ðîëè Àâòîðà.</dd>
-</dl></p>
-
-<p>Ïî çàâåðøåíèè ââîäà íàæìèòå êëàâèøó <i>Ñîõðàíèòü</i>.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/contrib.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/contrib.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/profile/desk.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/desk.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/profile/desk.html 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,5 +0,0 @@
-<help page="Desk Profile">
-
-<p> âåäèòå èìÿ ðàáî÷åãî Ñòîëà, à òàêæå êðàòêîå îïèñàíèå åãî ôóíêöèé. Åñëè âû õîòèòå \
ïóáëèêîâàòü ìàòåðèàëû ñ ýòîãî ñòîëà, òî ïîñòàâüòå îòìåòêó Ñòîë Ïóáëèêàöèè (Publish \
Desk). Ïî çàâåðøåíèè íàæìèòå êëàâèøó <i>Ñîõðàíèòü</i>.<p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/desk.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/desk.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/profile/dest.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/dest.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/profile/dest.html 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,62 +0,0 @@
-<help page="Destination Profile">
-
-<p>Ýòà ôîðìà ïðåäíàçíà÷åíà äëÿ ñîçäàíèÿ è ðåäàêòèðîâàíèÿ èíôîðìàöèè î <dfn>Ìåñòàõ \
Ðàçìåùåíèÿ (Destinations)</dfn>, êîíòåíòà, à òàêæå èíôîðìàöèè î òîì êàê ýòè ìåñòà \
äîëæíû áûòü èñïîëüçîâàíû â ïðîöåññå ïóáëèêàöèè.<p>
-
-<p>Íà ïåðâîì ýòàïå ñîçäàíèÿ íîâîãî Ìåñòà Ðàçìåùåíèÿ òîëüêî ïåðâûå äâå ñåêöèè ôîðìû \
ÿâëÿþòñÿ âèäèìûìè. Ïîñëå èõ çàïîëíåíèÿ íàæìèòå ‘Äàëåå’ äëÿ ïåðåõîäà ê \
îñòàëüíîé ÷àñòè ôîðìû. Ïðè ðåäàêòèðîâàíèè ñóùåñòâóþùåãî Ìåñòà Ðàçìåùåíèÿ çàïîëíåííàÿ \
ôîðìà âûñâå÷èâàåòñÿ öåëèêîì.</p>
-
-
-<h3>Ñâîéñòâà (Properties)</h3>
-
-<dl>
-<dt>Èìÿ (Name)</dt>
-<dd>Ýòî íàèìåíîâàíèå Ìåñòà. Îíî äîëæíî áûòü óíèêàëüíûì, íî èñïîëüçóåòñÿ òîëüêî äëÿ \
òîãî, ÷òîáû ëåã÷å áûëî îòëè÷èòü îäíî Ìåñòî îò äðóãîãî.</dd>
-
-<dt>Îïèñàíèå (Description)</dt>
-<dd>Ýòî íàèìåíîâàíèå Ìåñòà. Îíî äîëæíî áûòü óíèêàëüíûì, íî èñïîëüçóåòñÿ òîëüêî äëÿ \
òîãî, ÷òîáû ëåã÷å áûëî îòëè÷èòü îäíî Ìåñòî îò äðóãîãî.</dd>
-
-<dt>Ìåòîä ïåðåñûëêè (Move Method)</dt>
-<dd>Ìåòîä, èñïîëüçóåìûé äëÿ êîïèðîâàíèÿ ôàéëîâ íà Ìåñòî. Ìíîæåñòâî äîñòóïíûõ ìåòîäîâ \
â çíà÷èòåëüíîé ñòåïåíè çàâèñèò îò òîãî, êàê ñêîíôèãóðèðîâàí óñòàíîâëåííûé ÁÐÈÊÎËÀÆ. \
Íî â ëþáîì ñëó÷àå äîëæíû áûòü äîñòóïíû ñëåäóþùèå ìåòîäû:
-
-<dl>
-<dt>Ôàéëîâàÿ ñèñòåìà (File System)</dt>
-<dd>Ïðîñòîå êîïèðîâàíèå â ðàìêàõ ëîêàëüíîé ôàéëîâîé ñèñòåìû.</dd>
-
-<dt>FTP</dt>
-<dd>Çàãðóçêà íà óäàëåííûé ñåðâåð ïî ïðîòîêîëó FTP.</dd>
-
-<dt>SFTP</dt>
-<dd>Çàãðóçêà íà óäàëåííûé ñåðâåð ïî çàùèùåííîìó ïðîòîêîëó FTP.</dd>
-
-<dt>WebDAV</dt>
-<dd>Çàãðóçêà íà óäàëåííûé ñåðâåð ïî ïðîòîêîëó HTTP ñ èñïîëüçîâàíèåì WebDAV.</dd>
-</dl>
-</dd>
-
-<dt>Êîïèðîâàíèå ðåñóðñîâ (Copy Resources)</dt>
-<dd>Åñëè ýòà îòìåòêà ïîñòàâëåíà, òî ðåñóðñû, ïðåäíàçíà÷åííûå ê çàãðóçêå íà ñåðâåð, \
áóäóò ïðåäâàðèòåëüíî ñêîïèðîâàíû âî âðåìåííûé êàòàëîã.</dd>
-
-<dt>Ïóáëèêàöèÿ (Publishes)</dt>
-<dd>Åñëè ýòà îòìåòêà óñòàíîâëåíà (îíà óñòàíîâëåíà ïî óìîë÷àíèþ), òî ýòî Ìåñòî äîëæíî \
áûòü èñïîëüçîâàíî äëÿ ïóáëèêàöèè ïîäãîòîâëåííûõ ìàòåðèàëîâ.</dd>
-
-<dt>Ïðîñìîòð (Previews)</dt>
-<dd>Åñëè ýòà îòìåòêà óñòàíîâëåíà, òî Ìåñòî äîëæíî áûòü èñïîëüçîâàíî äëÿ \
ïðåäâàðèòåëüíîãî ïðîñìîòðà ïîäãîòîâëåííûõ ê ïóáëèêàöèè \
ìàòåðèàëîâ.</dd>
-
-<dt>Ñàéò (Site)</dt>
-<dd>Åñëè âû íå îïðåäåëèëè íèêàêèõ ñàéòîâ, òî çäåñü ïî óìîë÷àíèþ óñòàíàâëèâàåòñÿ \
çíà÷åíèå «Default Site» (ñàéò ïî óìîë÷àíèþ). Èíà÷å ïðîñòî âûáåðèòå íóæíûé ñàéò èç \
ñïèñêà ñàéòîâ.</dd>
-</dl>
-
-<h3>Êàíàëû ûâîäà (Output Channels)</h3>
-
-<p> ýòîé ñåêöèè óêàçûâàþòñÿ Êàíàëû ûâîäà, äëÿ êîòîðûõ áóäåò èñïîëüçîâàòüñÿ äàííîå \
Ìåñòî Ðàçìåùåíèÿ.</p>
-
-<h3>Äåéñòâèÿ (Actions)</h3>
-
-<p>Äàííàÿ ÷àñòü ôîðìû èñïîëüçóåòñÿ äëÿ çàäàíèÿ, ðåäàêòèðîâàíèÿ èëè óäàëåíèÿ \
<dfn>äåéñòâèé</dfn>. Äåéñòâèÿ ñîîòâåòñòâóþò ðàçëè÷íûì òèïàì îáðàáîòêè äàííûõ, \
âûïîëíÿåìîé â ïðîöåññå èõ ïåðåñûëêè íà Ìåñòî.</p>
-
-<p>Äëÿ îáùåãî ñëó÷àÿ çàäàíî òîëüêî îäíî äåéñòâèå, òèïà ‘Move’ \
(ïåðåìåñòèòü), êîòîðîå âûïîëíÿåò òåêóùóþ îïåðàöèþ êîïèðîâàíèÿ èëè \
çàãðóçêè.</p>
-
-<h3>Ñåðâåðû (Servers)</h3>
-
-<p>Äàííàÿ ÷àñòü ôîðìû èñïîëüçóåòñÿ äëÿ çàäàíèÿ, ðåäàêòèðîâàíèÿ èëè óäàëåíèÿ \
<dfn>ñåðâåðîâ</dfn>. Çäåñü êîíêðåòèçèðóåòñÿ ñïîñîá ïåðåñûëêè ìàòåðèàëîâ íà ñåðâåð â \
ïðîöåññå èõ ïóáëèêàöèè. Íàïðèìåð, åñëè äëÿ êîïèðîâàíèÿ äàííûõ èñïîëüçóåòñÿ ïðîòîêîë \
FTP, òî íà ñåðâåð äîëæíû áûòü ïåðåäàíû òàêæå èìÿ ïîëüçîâàòåëÿ è \
ïàðîëü.</p>
-
-</help>
\ No newline at end of file
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/dest.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/dest.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/profile/element.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/element.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/profile/element.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,32 +0,0 @@
-<help page="Element Profile">
-
-<p>
-<dl>
-
-<dt>Ñâîéñòâà (Properties)</dt>
-<dd> âåäèòå èìÿ Ýëåìåíòà, èìÿ êëþ÷à è êðàòêîå îïèñàíèå. Èìÿ êëþ÷à ïðåäñòàâëÿåò ñîáîé \
óíèêàëüíûé èäåíòèôèêàòîð, ñîñòîÿùèé èç îäíîãî ñëîâà. ûáåðèòå òèï "ïðîæèãàòåëÿ", \
êîòîðûé áóäåò èñïîëüçîâàòüñÿ âàøèìè øàáëîíàìè. Ïðè äîáàâëåíèè íîâîãî Ýëåìåíòà \
íåîáõîäèìî òàêæå çàäàòü åãî Òèï.</dd>
-
-<dt>×ëåíñòâî â ãðóïïàõ (Group Memberships)</dt>
-<dd>×ëåíñòâî â ãðóïïàõ îïðåäåëÿåò óðîâåíü äîñòóïà ïîëüçîâàòåëåé ïðè ÷òåíèè, \
ðåäàêòèðîâàíèè èëè ñîçäàíèè Ýëåìåíòîâ. ûáåðèòå ãðóïïó â ñïèñêå «Äîñòóïíûå Ãðóïïû», à \
çåòåì íàæìèòå êëàâèøó «Äîáàâèòü â ñïèñîê». Òåì ñàìûì, âûáðàííàÿ ãðóïïà áóäåò \
äîáàâëåíà â ñïèñîê «Òåêóùèå ãðóïïû». Äëÿ óäàëåíèÿ ãðóïïû âûáåðèòå å â ñïèñêå «Òåêóùèå \
ãðóïïû» è íàæìèòå êëàâèøó «Óäàëèòü èç ñïèñêà». Ïðè ñîçäàíèè íîâîãî Ýëåìåíòà íàæìèòå \
êëàâèøó «Äàëåå». û ïåðåéäåòå íà ñòðàíèöó ñ ïîëíûì Ïðîôèëåì \
Ýëåìåíòà.</dd>
-
-<dt>Ñàéòû (Sites)</dt>
-<dd>Ýëåìåíòû âûñøåãî óðîâíÿ (òàêèå êàê Òåêñò èëè Ìåäèà) ìîãóò èñïîëüçîâàòüñÿ \
ñîâìåñòíî íåñêîëüêèìè ñàéòàìè. Ýòà ñåêöèÿ íåäîñòóïíà äëÿ ýëåìåíòîâ íèçøèõ óðîâíåé. \
ñåêöèè «Ñàéòû» âû ìîæåòå ïîäêëþ÷àòü èëè îòêëþ÷àòü ñàéòû îò Ýëåìåíòà. û òàêæå ìîæåòå \
óêàçàòü Ïåðâè÷íûé Êàíàë ûâîäà äëÿ êàæäîãî ñàéòà.</dd>
-
-<dt>Êàíàëû ûâîäà (Output Channels)</dt>
-<dd>Ýëåìåíòû âûñøåãî óðîâíÿ àññîöèèðóþòñÿ ñ îäíèì èëè íåñêîëüêèìè Êàíàëàìè ûâîäà. \
Ýòà ñåêöèÿ íåäîñòóïíà äëÿ ýëåìåíòîâ íèçøèõ óðîâíåé. Êàíàëû ûâîäà îïðåäåëÿþò êàê âàøè \
òåêñòû áóäóò îòôîðìàòèðîâàíû èëè êóäà âàøè òåêñòû è ìåäèà äàííûå áóäóò îòïðàâëåíû. Ó \
íèõ ðàçíûå øàáëîíû, ïîýòîìó âû ìîæåòå âûâîäèòü îäíè è òå æå Ýëåìåíòû ðàçëè÷íûìè \
ñïîñîáàìè. Íåîáõîäèìî, ÷òîáû ñ êàæäûì Ýëåìåíòîì âûñøåãî óðîâíÿ áûë àññîöèèðîâàí êàê \
ìèíèìóì îäèí Êàíàë ûâîäà.</dd>
-
-<dt>Ñóùåñòâóþùèå Ñóáýëåìåíòû (Existing Subelements)</dt>
-<dd>Ôàêòè÷åñêè Ýëåìåíòû ÿâëÿþòñÿ êîíòåéíåðàìè, ñîäåðæàùèìè äðóãèå ýëåìåíòû è ïîëÿ \
äàííûõ. Äëÿ òîãî, ÷òîáû äîáàâèòü Ñóáýëåìåíò â Ýëåìåíò, íàæìèòå êëàâèøó «Äîáàâèòü \
Ñóáýëåìåíò». Ïîÿâèòñÿ äèàëîãîâàÿ ôîðìà « ûáåðèòå Ñóáýëåìåíòû». Ïîëå ïîèñêà \
èñïîëüçóåòñÿ ñòàíäàðòíûì îáðàçîì. û ìîæåòå ïðîñìîòðåòü ëèáî ÷àñòü, ëèáî âåñü ñïèñîê \
äîñòóïíûõ Ñóáýëåìåíòîâ. Åñòåñòâåííî, ÷òî Ñóáýëåìåíòîì íå ìîæåò áûòü Ýëåìåíò âûñøåãî \
óðîâíÿ. Äëÿ äîáàâëåíèÿ Ýëåìåíòîâ ïîñòàâüòå îòìåòêè â ñîîòâåòñòâóþùèõ èì îêîøêàõ \
«Äîáàâèòü ê Ýëåìåíòó», à çàòåì íàæìèòå êëàâèøó «Äîáàâèòü Ýëåìåíòû». Åñëè âû ðåøèëè íå \
äîáàâëÿòü íèêàêèõ ýëåìåíòîâ, òî íàæìèòå êëàâèøó «Äîáàâèòü Ýëåìåíòû», íå óñòàíàâëèâàÿ \
íèêàêèõ îòìåòîê. Òàêèì îáðàçîì âû ïðîñòî âåðíåòåñü íà ñòðàíèöó \
Ïðîôèëÿ Ýëåìåíòà.</dd>
-
-<dt>Ïîëÿ Ïîëüçîâàòåëÿ (Custom Fields)</dt>
-<dd> ýòèõ ïîëÿõ õðàíÿòñÿ äàííûå. Íàðÿäó ñ ñóáýëåìåíòàìè îíè îïðåäåëÿþò ñòðóêòóðó \
Ýëåìåíòà. äàííîé ñåêöèè âû ìîæåòå èçìåíèòü çíà÷åíèå ïî óìîë÷àíèþ äëÿ ïîëÿ. Ìîæåòå \
èçìåíèòü ïîðÿäîê ýëåìåíòîâ, âûáðàâ íîìåð âî âñïëûâàþùåì ìåíþ. Äëÿ ðåäàêòèðîâàíèÿ ïîëÿ \
íàæìèòå ññûëêó «Ðåäàêòèðîâàòü». û ïåðåéäåòå ê äèàëîãîâîé ôîðìå ðåäàêòèðîâàíèÿ \
Ïðîôèëÿ Ïîëÿ. Çäåñü âû ìîæåòå èçìåíèòü âñå äàííûå, êîòîðûå êàñàþòñÿ ïîëÿ, çà \
èñêëþ÷åíèåì èìåíè êëþ÷à è òèïà (îáëàñòü òåêñòà, îòìåòêà è äð.) Äëÿ óäàëåíèÿ ïîëÿ \
ïîñòàâüòå îòìåòêó â îêîøêå «Óäàëèòü», à çàòåì íàæìèòå îäíó èç êëàâèø «Ñîõðàíèòü» â \
êîíöå ñòðàíèöû.</dd>
-
-<dt>Äîáàâèòü íîâîå Ïîëå (Add New Field)</dt>
-<dd>Çäåñü âû äîáàâëÿåòå íîâûå ïîëÿ â ñåêöèþ Ïîëåé Ïîëüçîâàòåëÿ. ûáåðèòå òèï ïîëÿ â \
ãðóïïå îòìåòîê ñëåâà. çàâèñèìîñòè îò òîãî, ÷òî âû âûáðàëè, èçìåíèòñÿ ìíîæåñòâî \
äîñòóïíûõ àòðèáóòîâ, ïîêàçàííîå ñïðàâà. Àòðèáóòû äåòàëüíî îïèñàíû â <a \
href="element_data.html">Field Profile Help Page</a></dd>
-
-</dl>
-</p>
-
-<p>Ïî çàâåðøåíèè íàæìèòå êëàâèøó <em>Ñîõðàíèòü</em> èëè <em>Ñîõðàíèòü è \
îñòàòüñÿ</em>. Íàæàòèå êëàâèøè <em> îçâðàò</em> âåðíåò âàñ îáðàòíî â Ìåíåäæåð \
Ýëåìåíòîâ áåç ñîõðàíåíèÿ èçìåíåíèé.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/element.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/element.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/profile/element_data.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/element_data.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/profile/element_data.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,49 +0,0 @@
-<help page="Field Profile">
-
-<p>
-<dl>
-<dt>Ñâîéñòâà (Properties)</dt>
-<dd> âåäèòå êðàòêîå îïèñàíèå Ïîëÿ è åãî ìàêñèìàëüíóþ äëèíó (åñëè íåîáõîäèìî). \
Îòìåòêè «òðåáóåòñÿ» è «ïîâòîðÿåòñÿ» ñòàâÿòñÿ òàêæå ïî \
íåîáõîäèìîñòè.</dd>
-
-<dt>Àòðèáóòû îòîáðàæåíèÿ (Display Attributes)</dt>
-<dd>Ýòîò ñïèñîê àòðèáóòîâ áóäåò èçìåíÿòüñÿ â çàâèñèìîñòè îò òèïà Ïîëÿ, íî \
îáÿçàòåëüíî áóäåò âêëþ÷àòü ñëåäóþùèå àòðèáóòû:</dd>
-
-<dl>
-<dt>Ðàçðåøèòü íåñêîëüêî (Allow multiple)</dt>
-<dd>Ïðèìåíÿåòñÿ òîëüêî äëÿ âûäåëåíèÿ Ïîëåé è îáîçíà÷àåò âîçìîæíîñòü îäíîâðåìåííîãî \
âûäåëåíèÿ íåñêîëüêèõ èç íèõ. Íàïðèìåð, ïðè ïîìîùè íàæàòîé êëàâèøè Shift. \
(select)</dd>
-
-<dt>Çàãîëîâîê (Caption)</dt>
-<dd>Òî æå, ÷òî è ìåòêà (Label), íî äëÿ ïîëÿ äàòû. Ñîäåðæèò êàëåíäàðíóþ äàòó. \
<i>(date)</i></dd>
-
-<dt>Êîëîíêè (Columns)</dt>
-<dd>×èñëî êîëîíîê â îáëàñòè òåêñòà. <i>(textarea)</i></dd>
-
-<dt>Çíà÷åíèå ïî óìîë÷àíèþ (Default Value)</dt>
-<dd>Çíà÷åíèå ïî óìîë÷àíèþ äëÿ äàííîãî Ïîëÿ. <i>(textfield, radio, pulldown, select, \
textarea)</i></dd>
-
-<dt>Ìåòêà ãðóïïû (Group Label)</dt>
-<dd>Òî æå, ÷òî è ìåòêà (Label), íî äëÿ Ïîëåé, ñîîòâåòñòâóþùèõ òî÷å÷íûì îòìåòêàì. \
<i>(radio)</i></dd>
-
-<dt>Ìåòêà (Label)</dt>
-<dd>Ìåòêà, êîòîðóþ Àäìèíèñòðàòîð Ýëåìåíòîâ âèäèò â ñïèñêå Ïîëåé. <i>(textfield, \
radio, checkbox, pulldown, select, textarea)</i></dd>
-
-<dt>Ìàêñèìàëüíûé ðàçìåð (Maximum Size)</dt>
-<dd>Ìàêñèìàëüíûé ðàçìåð äàííîãî Ïîëÿ. <i>(textfield, textarea)</i></dd>
-
-<dt>Îïöèè, Ìåòêà (Options, Label)</dt>
-<dd>Ýòî ñïèñîê ñòðîê, ñîäåðæàùèõ ìåòêè è çíà÷åíèÿ. Çàìåòüòå, ÷òî «Îïöèè, Ìåòêà» \
îòîáðàæàåò ôîðìàò êàæäîé ñòðîêè. «Îïöèè» – ýòî çíà÷èìûé àòðèáóò ýëåìåíòà \
<option>, íàïðèìåð, â ñïèñêå <select<, ñ «Ìåòêîé» ïîêàçûâàåìîé \
ïîëüçîâàòåëþ. <i>(radio, pulldown, select)</i></dd>
-
-<dt>Ñòðîêè (Rows)</dt>
-<dd>×èñëî ñòðîê â îáëàñòè òåêñòà. <i>(textarea)</i></dd>
-
-<dt>Ðàçìåð (Size)</dt>
-<dd>Ðàçìåð äàííîãî Ïîëÿ. <i>(textfield, select)</i></dd>
-</dl>
-</dl>
-</p>
-
-<p>Åñëè âû õîòèòå óäàëèòü ýòî Ïîëå èç Ýëåìåíòà, òî ïîñòàâüòå îòìåòêó «Óäàëèòü ýòîò \
ïðîôèëü» (Delete this Profile).</p>
-
-<p>Ïî çàâåðøåíèè íàæìèòå êëàâèøó <i>Ñîõðàíèòü</i>. Äëÿ îòìåíû èçìåíåíèé íàæìèòå \
<i>Îòìåíà</i>.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/element_data.html (from rev \
6084, bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/element_data.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/profile/element_type.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/element_type.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/profile/element_type.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,26 +0,0 @@
-<help page="Element Type Profile">
-
-<p>
-<dl>
-
-<dt>Èìÿ, îïèñàíèå (Name, Description)</dt>
-<dd> âåäèòå èìÿ Òèïà Ýëåìåíòà è êðàòêîå îïèñàíèå.</dd>
-
-<dt>Ñòðàíè÷íûé (Page)</dt>
-<dd>Ýòà îòìåòêà äåëàåò Òèï Ýëåìåíòà ñòðàíèöåé. Ýòî îçíà÷àåò, ÷òî åñëè Òåêñò âêëþ÷àåò \
áîëåå îäíîãî Ñòðàíè÷íîãî ýëåìåíòà, òî äëÿ êàæäîãî èç íèõ áóäåò ñîçäàâàòüñÿ îòäåëüíûé \
HTML-ôàéë.</dd>
-
-<dt>Ôèêñèðîâàííûé (Fixed)</dt>
-<dd>Îïðåäåëÿåò áóäåò ëè Òèï Ýëåìåíòà âêëþ÷àòü ôèêñèðîâàííûé URL. Îáû÷íî ýòî \
èñïîëüçóåòñÿ â «Îáëîæêàõ (Cover Pages)», êîòîðûå ññûëàëèñü áû íà íåñêîëüêî äðóãèõ \
ñòðàíèö è ÷üè URI íå çàâèñåëè áû, íàïðèìåð, îò äàòû ñîçäàíèÿ òàêîé \
Îáëîæêè.</dd>
-
-<dt>Ñâÿçàííûé Òåêñò, Ìåäèà (Related Story, Media)</dt>
-<dd> ñå Ýëåìåíòû ìîãóò èìåòü îäèí òåêñò è/èëè Ìåäèà îáúåêò, ñâÿçàííûå ñ íèìè. Äàííûå \
îòìåòêè ïîçâîëÿþò ïîëüçîâàòåëÿì ñäåëàòü ýòî.</dd>
-
-<dt>Òèï (Type)</dt>
-<dd>Òèï ìîæåò ïðèíèìàòü çíà÷åíèÿ ëèáî Òåêñò, ëèáî Ìåäèà, ëèáî Ýëåìåíò. Ýëåìåíò òèïà \
Òåêñò èëè Ìåäèà ÿâëÿåòñÿ ýëåìåíòîì âûñøåãî óðîâíÿ. ñå äðóãèå ýëåìåíòû èìåþò òèï \
Ýëåìåíò, êîòîðûå ìîãóò áûòü äîáàâëåíû ê äðóãèì ýëåìåíòàì â êà÷åñòâå ñóáýëåìåíòîâ. \
Ñîçäàâàÿ íîâûé Òèï Ýëåìåíòîâ, âàì íåîáõîäèìî âûáðàòü òèï íà ïåðâîé ñòðàíèöå, òàê êàê \
äðóãèå îïöèè çàâèñÿò îò ýòîãî ñâîéñòâà.</dd>
-
-</dl>
-</p>
-
-<p>Åñëè âû õîòèòå óäàëèòü Òèï Ýëåìåíòà, ïîñòàâüòå îòìåòêó «Óäàëèòü ýòîò Ïðîôèëü». Ïî \
çàâåðøåíèè íàæìèòå êëàâèøó <em>Ñîõðàíèòü</em>.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/element_type.html (from rev \
6084, bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/element_type.html)
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/grp (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/grp)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/profile/grp/perm.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/grp/perm.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/profile/grp/perm.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,9 +0,0 @@
-<help page="Group Permissions Profile">
-
-<p>Ýòî Ïðîôèëü Ðàçðåøåíèé Ãðóïïû. Çäåñü âû îïðåäåëÿåòå ðàçðåøåíèÿ äëÿ ãðóïï \
ïîëüçîâàòåëåé íà äîñòóï ê ÷ëåíàì ãðóïï îáúåêòîâ. ûáåðèòå îäèí èç òèïîâ ðàçðåøåíèé â \
ìåíþ « ûáåðèòå òèï Ðàçðåøåíèé».</p>
-
-<p>Äëÿ çàäàíèÿ ðàçðåøåíèé èñïîëüçóéòå îòìåòêè òî÷êàìè (èëè ñïèñêè äëÿ âûáîðà, åñëè â \
ïðåäïî÷òå äëÿ äèàëîãîâûõ ôîðì ðàçðåøåíèé áóäåò óñòàíîâëåíî, êàê "Select \
Lists"). Óðîâíè äîñòóïà ðàñïîëîæåíû ïî âîçðàñòàíèþ â ñëåäóþùåì ïîðÿäêå: Íåò/None \
(ïî óìîë÷àíèþ), ×èòàòü/Read, Ðåäàêòèðîâàòü/Edit, Ñîçäàâàòü/Create. Çàêëþ÷èòåëüíîå \
çíà÷åíèå «Çàïðåòèòü» (Deny) èñïîëüçóåòñÿ äëÿ îòìåíû ïðèâèëåãèé ïîëüçîâàòåëåé è \
ïåðåêðûâàåò ðàçðåøåíèÿ, ïðåäîñòàâëåííûå ýòèì ïîëüçîâàòåëÿì â äðóãèõ Ãðóïïàõ. Òî åñòü, \
åñëè ïîëüçîâàòåëü àñÿ Èâàíîâ ÿâëÿåòñÿ ÷ëåíîì Ãðóïïû, ó êîòîðîé óñòàíîâëåíî çíà÷åíèå \
«Çàïðåòèòü» äëÿ Ðàáî÷åãî Ïðîöåññà Ìåäèà, òî îí íå ñìîæåò ÷èòàòü, ñîçäàâàòü èëè \
ðåäàêòèðîâàòü Ìåäèà, äàæå åñëè îí è ÿâëÿåòñÿ ÷ëåíîì äðóãîé Ãðóïïû, êîòîðîé ýòî \
ðàçðåøåíî.</p>
-
-<p>Ðàçðåøåíèÿ áóäóò êàçàòüñÿ ñëîæíûìè äî òåõ ïîð, ïîêà âû èõ íå «ïðî÷óâñòâóåòå» (à, \
ìîæåò áûòü, è ïîñëå ýòîãî). Íà÷àòü ëó÷øå âñåãî ñ ÷òåíèÿ ðàçäåëà À ÒÎÐÈÇÀÖÈß â <a \
href="http://bricolage.cc/docs/Bric/Security.html" onclick="var newWin = \
window.open('http://bricolage.cc/docs/Bric/Security.html'); newWin.focus(true); \
return false;">Bric::Security</a> à çàòåì ïîèñêàòü îòâåòû èëè íåïîñðåäñòâåííî \
çàäàâàòü âîïðîñû â ñïèñîê ðàññûëêè bricolage-general.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/grp/perm.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/grp/perm.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/profile/grp.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/grp.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/profile/grp.html 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,28 +0,0 @@
-<help page="Group Profile">
-
-<p>
-<dl>
-
-<dt>Ñâîéñòâà (Properties)</dt>
-<dd>Çàäàéòå èìÿ Ãðóïïû, à òàêæå êðàòêîå îïèñàíèå åå ðîëè.</dd>
-
-<dt>Òèï Ãðóïïû (Group Type)</dt>
-<dd>Äëÿ âûáîðà Òèïà Ãðóïïû âîñïîëüçóéòåñü âûïàäàþùèì ìåíþ.</dd>
-
-</dl></p>
-
-<p>Íàæìèòå <em>Äàëåå</em> äëÿ ïåðåõîäà ê ñëåäóþùåé ñòðàíèöå Ïðîôèëÿ.</p>
-
-<p><dl>
-<dt>×ëåíû (Members)</dt>
-<dd>Îïðåäåëèòå, êòî èç çàðåãèñòðèðîâàííûõ ïîëüçîâàòåëåé âîéäåò â äàííóþ Ãðóïïó. \
ûáèðàéòå ïî îäíîìó èç ñïèñêà ñëåâà è íàæèìàéòå êëàâèøó « êëþ÷èòü â ñïèñîê». ñïèñêå \
ñïðàâà îòîáðàæàþòñÿ âñå òåêóùèå ÷ëåíû Ãðóïïû. Äëÿ óäàëåíèÿ êîãî-ëèáî âûáåðèòå åãî èìÿ \
â ñïèñêå è íàæìèòå êëàâèøó «Óäàëèòü èç ñïèñêà».</dd>
-
-<dt>Ðàçðåøåíèÿ (Permissions)</dt>
-<dd>Íàæìèòå ýòó êëàâèøó äëÿ ïåðåõîäà íà ñòðàíèöó ðàçðåøåíèé Ãðóïïû.</dd>
-
-</dl>
-</p>
-
-<p>Ïî çàâåðøåíèè íàæìèòå êëàâèøó <em>Ñîõðàíèòü</em>.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/grp.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/grp.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/profile/keyword.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/keyword.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/profile/keyword.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,18 +0,0 @@
-<help page="Keyword Profile">
-
-<p>Ýòà ôîðìà èñïîëüçóåòñÿ äëÿ äîáàâëåíèÿ èëè ðåäàêòèðîâàíèÿ <dfn>êëþ÷åâûõ \
ñëîâ</dfn>, êîòîðûå ñâÿçûâàþòñÿ ñ ìàòåðèàëàìè èëè êàòåãîðèÿìè.</p>
-
-
-<h3>Ñâîéñòâà (Properties)</h3>
-
-<dl>
-<dt>Èìÿ êëþ÷åâîãî ñëîâà (Keyword Name)</dt>
-<dd>Ýòî íåîáõîäèìîå ïîëå.</dd>
-
-<dt>Ýêðàííîå èìÿ êëþ÷åâîãî ñëîâà (Keyword Screen Name)</dt>
-<dd>Îïðåäåëÿåò êàêèì îáðàçîì äàííîå èìÿ áóäåò îòîáðàæàòüñÿ íà ýêðàíå. (Íàïðèìåð, \
êëþ÷åâîå ñëîâî = 'George', Ýêðàííîå èìÿ êëþ÷åâîãî ñëîâà = 'George Washington'). Åñëè \
çíà÷åíèå screen_name íå óêàçàíî ÿâíî, òî â ýòîì êà÷åñòâå èñïîëüçóåòñÿ Èìÿ êëþ÷åâîãî \
ñëîâà.</dd>
-
-<dt>Èìÿ ïîðÿäêà ñîðòèðîâêè (Sort Order Name)</dt>
-<dd>Ñëîâî, èñïîëüçóåìîå äëÿ ñîðòèðîâêè êëþ÷åâûõ ñëîâ. Åñëè íå çàäàíî ÿâíî, òî â ýòîì \
êà÷åñòâå èñïîëüçóåòñÿ Èìÿ êëþ÷åâîãî ñëîâà.</dl>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/keyword.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/keyword.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/profile/media_type.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/media_type.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/profile/media_type.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,28 +0,0 @@
-<help page="Media Type Profile">
-
-<p>
-<dl>
-
-<dt>Properties</dt>
-<dd>Enter the Media Type's MIME Type (e.g. "text/html") and a brief \
description.</dd>
-
-<dt>Extensions</dt>
-<dd>These are file suffixes, for example 'html' in <code>index.html</code>.
- If you need to add more than four extensions, click the 'Add More' button.
- To delete an existing extension, check the 'Delete' checkbox and it will
- be deleted when you click 'Save'.</dd>
-
-<dt>Group Memberships</dt>
-<dd>Groups determine the permissions that users have to read, edit,
- and create a Media Type. To add a new group, select one from
- the 'Available Groups' list and click 'Add to List'. To remove
- a group, select one from 'Current Groups' and click 'Remove from List'.</dd>
-
-</dl>
-</p>
-
-<p>If you want to delete this Media Type, check the 'Delete this Profile'
- button. When finished, click <em>Save</em>, or <em>Cancel</em> to leave without
- saving your changes.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/media_type.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/media_type.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/profile/output_channel.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/output_channel.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/profile/output_channel.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,24 +0,0 @@
-<help page="Output Channel Profile">
-
-<p><dl>
-<dt>Ñâîéñòâà (Properties)</dt>
-<dd>Çàäàéòå èìÿ Êàíàëà ûâîäà (Output Channel) è åãî êðàòêîå îïèñàíèå. Èñïîëüçóÿ \
ïîëÿ «Ïðåôèêñ URI» (Prfix URI) è «Ñóôôèêñ URI» (Suffix URI) âû ìîæåòå ñîîáùèòü Êàíàëó \
ûâîäà î íåîáõîäèìîñòè èñïîëüçîâàòü ïðåôèêñíûé è ñóôôèêñíûé êàòàëîãè ïðè ôîðìèðîâàíèè \
URI âñåõ ðåñóðñîâ (òåêñòà è ìåäèà) â äàííîì êàíàëå. Ýòà âîçìîæíîñòü î÷åíü ïîëåçíà \
òîãäà, êîãäà âû õðàíèòå êîíòåíò ðàçëè÷íûõ òèïîâ íà îäíîì ñåðâåðå. ïîëÿõ «Èìÿ ôàéëà» \
è «Ðàñøèðåíèå» çàäàþòñÿ ñîîòâåòñòâåííî èìÿ è ðàñøèðåíèå äëÿ òåêñòîâûõ ôàéëîâ, \
ñîçäàâàåìûõ â äàííîì Êàíàëå ûâîäà. <br /><br/>
-
-Ñâîéñòâà Ôîðìàòà URI îïðåäåëÿþò ñïîñîá ôîðìèðîâàíèÿ URI òåêñòà è ìåäèà â äàííîì \
Êàíàëå ûâîäà. Ñïåöèôèêàòîðû ôîðìàòà ðàçëè÷íûõ ñîñòàâíûõ ÷àñòåé URI, çàäàþòñÿ â ïîëÿõ \
«Ôîðìàò URI» (URI Format) è «Ôèêñèðîâàííûé ôîðìàò URI». Ñïåöèôèêàòîðû äîëæíû áûòü \
ðàçäåëåíû ñèìâîëîì "/", òàê æå êàê è â îáû÷íîì URI. Äîïóñêàåòñÿ èñïîëüçîâàíèå \
ñëåäóþùèõ ñïåöèôèêàòîðîâ: "categories" (êàòåãîðèè), "day" (äåíü), "month" (ìåñÿö), \
"slug" (êëþ÷), and "year" (ãîä). Òàêèì îáðàçîì, äëÿ òåêñòà â êàòåãîðèè "/stories", ñ \
êëþ÷îì "hello", äàòîé ïóáëèêàöèè 27 ôåâðàëÿ 2002 ãîäà, è ôîðìàòîì URI, çàäàííûì â \
âèäå "/day/month/year/categories/slug/", áûë áû ïîëó÷åí URI â âèäå \
"/27/02/2002/stories/hello".<br /><br />
-
-Ñïèñîê « àðèàíò URI» (URI Case) ïîçâîëÿåò âûáðàòü êîíêðåòíûé âàðèàíò ôîðìàòèðîâàíèÿ \
URI â äàííîì Êàíàëå ûâîäà. îçìîæíû ñëåäóþùèå âàðèàíòû – "Mixed Case" (ñìåøàííûé \
ôîðìàò, óñòàíîâëåí ïî óìîë÷àíèþ), "Lowercase" (ñòðî÷íûå áóêâû), or "Uppercase" \
(ïðîïèñíûå áóêâû).<br /><br />
-
-Ïîëå «Èñïîëüçîâàòü êëþ÷ â èìåíè ôàéëà» îçíà÷àåò, ÷òî â èìåíàõ ôàéëîâ òåêñòà, \
ñîçäàííûõ â äàííîì Êàíàëå ûâîäà, äîëæåí ïî âîçìîæíîñòè èñïîëüçîâàòüñÿ êëþ÷. Ýòî \
îçíà÷àåò, ÷òî äëÿ íåçàôèêñèðîâàííûõ òåêñòîâ áóäåò èñïîëüçîâàòüñÿ êëþ÷ ïðè \
ôîðìèðîâàíèè èìåíè ôàéëà, åñëè îí çàäàí. òî æå âðåìÿ, äëÿ çàôèêñèðîâàííûõ òåêñòîâ \
áóäåò èñïîëüçîâàòüñÿ èìÿ ôàéëà, çàäàííîå â ïîëå «Èìÿ ôàéëà» (ôàéëû ìåäèà áóäóò \
èìåíîâàòüñÿ àíàëîãè÷íî).</dd>
-
-</dl></p>
-
-<p>Íàæìèòå êëàâèøó «Äàëåå» äëÿ ïåðåõîäà íà ñëåäóþùóþ ñòðàíèöó ïðîôèëÿ.</p>
-
-<p><dl>
-<dt>Øàáëîí èñïîëüçóåò (Template Includes)</dt>
-<dd> ûáåðèòå ñóùåñòâóþùèå Êàíàëû ûâîäà äëÿ òîãî, ÷òîáû âêëþ÷èòü øàáëîíû ýòèõ \
Êàíàëîâ â äàííûé Êàíàë ûâîäà. Ýòî ïîëåçíî òîãäà, êîãäà âû ïóáëèêóåòå èëè \
ïðîñìàòðèâàåòå ìàòåðèàëû ÷åðåç äàííûé Êàíàë ûâîäà, à ñèñòåìà ïóáëèêàöèè íå ìîæåò \
íàéòè øàáëîí. ýòîì ñëó÷àå îíà áóäåò èñêàòü åãî â Êàíàëàõ ûâîäà âûáðàííûõ çäåñü. \
Ïîäêëþ÷åíèÿ øàáëîíîâ äîëæíû áûòü óïîðÿäî÷åíû, è îíè áóäóò ïðîñìàòðèâàòüñÿ â ïîèñêàõ \
íóæíîãî øàáëîíà â òîì æå ïîðÿäêå.</dd>
-</dl></p>
-
-<p>Ïî çàâåðøåíèè íàæìèòå êëàâèøó «Ñîõðàíèòü» (Save).</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/output_channel.html (from rev \
6084, bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/output_channel.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/profile/server.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/server.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/profile/server.html 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,31 +0,0 @@
-<help page="Server Profile">
-
-<p>Ñåðâåð <dfn>server</dfn> îïðåäåëÿåò êîíêðåòíîå ìåñòî äëÿ êîïèðîâàíèÿ èëè çàãðóçêè \
ïóáëèêóåìûõ ìàòåðèàëîâ.</p>
-
-
-<h3>Ñâîéñòâà (Properties)</h3>
-
-<dl>
-<dt>Èìÿ õîñòà (Host Name)</dt>
-<dd>TÈìÿ õîñòà èëè IP-àäðåñ ñåðâåðà. Åñëè íåîáõîäèìî, çàäàéòå àäðåñ êîíêðåòíîãî \
ïîðòà.</dd>
-
-<dt>ÎÑ (OS)</dt>
-<dd>Îïåðàöèîííàÿ ñèñòåìà, êîòîðàÿ ôóíêöèîíèðóåò íà ñåðâåðå. Ýòèì îïðåäåëÿåòñÿ ñïîñîá \
ôîðìèðîâàíèÿ èìåí ôàéëîâ íà ñåðâåðå.</dd>
-
-<dt>Êîðíåâîé êàòàëîã äëÿ äîêóìåíòîâ (Document Root)</dt>
-<dd>Ïîëíûé ïóòü íà ñåðâåðå ê êîðíåâîìó êàòàëîãó äëÿ äîêóìåíòîâ. Ñþäà áóäóò \
êîïèðîâàòüñÿ ïóáëèêóåìûå ìàòåðèàëû.</dd>
-
-<dt>Ëîãèí (Login)</dt>
-<dd>Èìÿ ïîëüçîâàòåëÿ äëÿ çàõîäà íà ñåðâåð (ïðè èñïîëüçîâàíèè FTP èëè SFTP).</dd>
-
-<dt>Ïàðîëü (Password)</dt>
-<dd>Ïàðîëü äëÿ âõîäà íà ñåðâåð.</dd>
-
-<dt>Êóêè (Cookie)</dt>
-<dd>HTTP êóêè, êîòîðîå èñïîëüçóåòñÿ íåêîòîðûìè «ìåòîäàìè ïåðåñûëêè äàííûõ» (òàêèìè \
êàê WebDAV) äëÿ àóòåíòèôèêàöèè ñåáÿ ñåðâåðó.</dd>
-
-<dt>Àêòèâíûé (Active)</dt>
-<dd>Ñåðâåð ìîæåò èñïîëüçîâàòüñÿ òîëüêî â òîì ñëó÷àå, êîãäà îí îòìå÷åí êàê «àêòèâíûé» \
(active).</dd>
-</dl>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/server.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/server.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/profile/site.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/site.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/profile/site.html 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,18 +0,0 @@
-<help page="Site Profile">
-
-<p>Ýòà ôîðìà ïðåäíàçíà÷åíà äëÿ ñîçäàíèÿ èëè ðåäàêòèðîâàíèÿ <dfn>Ñàéòîâ \
(site)</dfn>.<p>
-
-<dl>
-
-<dt>Ñâîéñòâà (Properties)</dt>
-<dd> âåäèòå èìÿ Ñàéòà, èìÿ äîìåíà è, ïî æåëàíèþ, êðàòêîå îïèñàíèå.</dd>
-
-<dt>×ëåíñòâî â Ãðóïïàõ (Group Memberships)</dt>
-<dd>Îïðåäåëèòå êàêèå ïðèâèëåãèè ñàéò äîëæåí èìåòü. ûáåðèòå èç ñïèñêà ñëåâà Ãðóïïû, \
â êîòîðûå ñàéò áóäåò âêëþ÷åí. ûáèðàéòå ïî îäíîé ãðóïïå è íàæèìàéòå êëàâèøó «Äîáàâèòü \
â ñïèñîê» (Add to List). ñïèñêå ñïðàâà ïîêàçàíû âñå Ãðóïïû, êîòîðûì óæå ïðèíàäëåæèò \
ñàéò. Äëÿ óäàëåíèÿ òàêîé ãðóïïû âûáåðèòå åå èìÿ è íàæìèòå êëàâèøó «Óäàëèòü èç ñïèñêà» \
(Remove from List).</dd>
-
-</dl>
-</p>
-
-<p>Ïî çàâåðøåíèè íàæìèòå êëàâèøó «Ñîõðàíèòü».</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/site.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/site.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/profile/source.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/source.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/profile/source.html 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,6 +0,0 @@
-<help page="Source Profile">
-
-<p>Çàäàéòå èìÿ Èñòî÷íèêà è åãî êðàòêîå îïèñàíèå. Çàòåì âûáåðèòå ñðîê äåéñòâèÿ ýòîãî \
Èñòî÷íèêà èç âûïàäàþùåãî ìåíþ. Äëÿ îòìåíû îãðàíè÷åííîãî ñðîêà äåéñòâèÿ âûáåðèòå \
«Íèêîãäà» (Never). Ïî çàâåðøåíèè íàæìèòå êëàâèøó «Ñîõðàíèòü» (Save).
-</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/source.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/source.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/profile/user.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/user.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/profile/user.html 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,18 +0,0 @@
-<help page="User Profile">
-
-<p><dl>
-<dt>Èìÿ (Name)</dt>
-<dd> ýòèõ ïîëÿõ çàäàéòå ïîëíîå èìÿ ïîëüçîâàòåëÿ, à òàêæå íåîáõîäèìûå ïðåôèêñ èëè \
ñóôôèêñ.</dd>
-
-<dt>Êîíòàêòû (Contacts)</dt>
-<dd>Çäåñü çàäàåòñÿ êîíòàêòíàÿ èíôîðìàöèÿ ïîëüçîâàòåëÿ. îñïîëüçóéòåñü âûïàäàþùèìè \
ìåíþ äëÿ âûáîðà ñðåäñòâ ñâÿçè (òåëåôîí, å-ìåéë, ôàêñ è ò.ï.), à òàêæå ïîëÿ ñïðàâà äëÿ \
ââîäà äàííûõ. Åñëè íåîáõîäèìî èñïîëüçîâàòü áîëåå ÷åòûðåõ ïîëåé, òî íàæìèòå êëàâèøó \
«Äîáàâèòü åùå».</dd>
-
-<dt>×ëåíñòâî â ãðóïïàõ (Group Memberships)</dt>
-<dd>Çäåñü îïðåäåëÿþòñÿ ïðèâèëåãèè, êîòîðûå áóäåò èìåòü ïîëüçîâàòåëü. Èç ñïèñêà, \
ðàñïîëîæåííîãî ñëåâà, âûáåðèòå òå àäìèíèñòðàòèâíûå ãðóïïû, â êîòîðûå ïîëüçîâàòåëü \
áóäåò âêëþ÷åí. ûáèðàéòå ãðóïïû ïî îäíîé è äîáàâëÿéòå â ñïèñîê íàæàòèåì êëàâèøè \
«Äîáàâèòü â ñïèñîê». ñïèñêå ñïðàâà îòîáðàæàþòñÿ âñå ãðóïïû, â êîòîðûå ïîëüçîâàòåëü \
óæå âêëþ÷åí. Äëÿ óäàëåíèÿ êàêîé-ëèáî èç íèõ âûáåðèòå åå â ýòîì ñïèñêå è íàæìèòå \
êëàâèøó «Óäàëèòü èç ñïèñêà».</dd>
-
-<dt>Ëîãèí è Ïàðîëü (Login and Password)</dt>
-<dd>Çàäàéòå ñòàðòîâûé Ëîãèí è Ïàðîëü ïîëüçîâàòåëÿ. Ïîçäíåå ïîëüçîâàòåëü ñìîæåò \
èçìåíèòü ýòè çíà÷åíèÿ.</dd>
-</dl></p>
-<p>Ïî çàâåðøåíèè íàæìèòå êëàâèøó «Ñîõðàíèòü» (Save)</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/user.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/user.html)
Deleted: bricolage/trunk/comp/help/ru_ru/admin/profile/workflow.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/workflow.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/admin/profile/workflow.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,23 +0,0 @@
-<help page="Workflow Profile">
-
-<p><dl>
-<dt>Ñâîéñòâà (Properties)</dt>
-<dd>Çàäàéòå èìÿ Ðàáî÷åãî Ïðîöåññà è åãî êðàòêîå îïèñàíèå. Çàòåì âûáåðèòå äëÿ íåãî \
áàçîâûé òèï: Òåêñò (Story), Ìåäèà (Media) èëè Ïðîôèëü (Profile).</dd>
-
-<dt>Èñõîäíûé ñòîë (Start Desk)</dt>
-<dd> ûáåðèòå ñòîë, íà êîòîðûé ÷àùå âñåãî áóäóò ïîìåùàòüñÿ íîâûå ðàçäåëû êîíòåíòà â \
äàííîì Ðàáî÷åì Ïðîöåññå. Íàèìåíîâàíèå ýòîãî ñòîëà áóäåò ïîÿâëÿòüñÿ ïåðâûì â \
âûïàäàþùèõ ìåíþ äëÿ Ðàáî÷èõ Ïðîöåññîâ. ×òîáû ñîçäàòü ñòîë íàæìèòå íà êëàâèøó \
<i>«Íîâûé ñòîë» (New Desk)</i>.</dd>
-</dl></p>
-
-<p>Äëÿ ïåðåõîäà ê ñëåäóþùåé ñòðàíèöå Ïðîôèëÿ íàæìèòå êëàâèøó <i>«Äàëåå \
(Next)»</i>.</p>
-
-<p><dl>
-<dt>Äîáàâèòü íîâûé ñòîë (Add a New Desk)</dt>
-<dd>Äàííàÿ ññûëêà èñïîëüçóåòñÿ äëÿ âêëþ÷åíèÿ íîâîãî ñòîëà â ñïèñîê ñòîëîâ Ðàáî÷åãî \
Ïðîöåññà. Ïî íåé âû ïîïàäàåòå â Ïðîôèëü Ðàáî÷åãî Ñòîëà, ãäå âûáåðåòå Ñòîë, êîòîðûé âû \
õîòèòå äîáàâèòü èëè ñîçäàäèòå íîâûé, íàæàâ êëàâèøó <i>«Íîâûé \
ñòîë»</i>.</dd>
-
-<dt>Ñòîëû (Desks)</dt>
-<dd>Äëÿ òîãî, ÷òîáû èçìåíèòü Èñõîäíûé Ñòîë ïîñòàâüòå îòìåòêó ðÿäîì ñ æåëàåìûì \
ñòîëîì. Íàæìèòå <i>«Ðåäàêòèðîâàòü»</i> äëÿ ìîäèôèêàöèè ïðîôèëÿ Ñòîëà. Íàæìèòå \
<i>«Æóðíàë»</i> äëÿ ïðîñìîòðà ñïèñêà âûïîëíåííûõ äåéñòâèé. Äëÿ óäàëåíèÿ Ñòîëà èç \
Ðàáî÷åãî Ïðîöåññà ïîñòàâüòå îòìåòêó â îêîøêå «Óäàëèòü».</dd>
-</dl></p>
-
-<p>Ïî çàâåðøåíèè íàæìèòå êëàâèøó <i>«Ñîõðàíèòü» (Save)</i>.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/admin/profile/workflow.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/admin/profile/workflow.html)
Copied: bricolage/trunk/comp/help/ru_ru/workflow (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/workflow)
Copied: bricolage/trunk/comp/help/ru_ru/workflow/active (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/active)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/active/media.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/active/media.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/active/media.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,5 +0,0 @@
-<help page="Active Media">
-
-<p>Ïðîñìîòð ñïèñêà âñåõ àêòèâíûõ Ìåäèà-îáúåêòîâ, à òàêæå ñîîòâåòñòâóþùåé \
ñîïðîâîäèòåëüíîé èíôîðìàöèè. Çäåñü âû ìîæåòå ïðîñìîòðåòü èëè çàãðóçèòü Ìåäèà-îáúåêò ñ \
äðóãîãî Ñòîëà, èëè æå îòðåäàêòèðîâàòü óæå çàãðóæåííûé îáúåêò.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/active/media.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/active/media.html)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/active/story.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/active/story.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/active/story.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,6 +0,0 @@
-<help page="Active Stories">
-
-<p>Ïðîñìîòð ñïèñêà âñåõ àêòèâíûõ Òåêñòîâ (Stories), à òàêæå ñîîòâåòñòâóþùåé \
ñîïðîâîäèòåëüíîé èíôîðìàöèè. Çäåñü âû ìîæåòå ïðîñìîòðåòü èëè çàãðóçèòü Òåêñò ñ \
äðóãîãî Ñòîëà, èëè æå îòðåäàêòèðîâàòü óæå çàãðóæåííûé Òåêñò.
-</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/active/story.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/active/story.html)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/active/templates.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/active/templates.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/active/templates.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,5 +0,0 @@
-<help page="Active Templates">
-
-<p>Ïðîñìîòð ñïèñêà âñåõ àêòèâíûõ Øàáëîíîâ (Templates), à òàêæå ñîîòâåòñòâóþùåé \
ñîïðîâîäèòåëüíîé èíôîðìàöèè. Çäåñü âû ìîæåòå ïðîñìîòðåòü èëè çàãðóçèòü Øàáëîí ñ \
äðóãîãî Ñòîëà, èëè æå îòðåäàêòèðîâàòü óæå çàãðóæåííûé Øàáëîí.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/active/templates.html (from rev \
6084, bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/active/templates.html)
Copied: bricolage/trunk/comp/help/ru_ru/workflow/events (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/events)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/events/dhandler
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/events/dhandler 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/events/dhandler 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,23 +0,0 @@
-<help page="Events Log">
-
-<p> «Æóðíàëå» äëÿ Ìåäèà-ìàòåðèàëîâ, òåêñòîâ èëè øàáëîíîâ õðàíèòñÿ èñòîðèÿ âñåõ \
ïðîèñøåäøèõ ñ íèìè ñîáûòèé, òàêèõ êàê ñîçäàíèå, ïóáëèêàöèÿ èëè ïåðåìåùåíèå íà äðóãîé \
ñòîë â ðàáî÷åì ïðîöåññå.</p>
-
-<p>Òàáëèöà ñîáûòèé âêëþ÷àåò ñëåäóþùèå êîëîíêè:</p>
-
-<dl>
-<dt>Èìÿ (Name)</dt>
-<dd>Òèï ïðîèñøåäøåãî ñîáûòèÿ.</dd>
-
-<dt>Êåì âûçâàíî (Triggered By)</dt>
-<dd>Èìÿ ïîëüçîâàòåëÿ, êîòîðûé âûçâàë ñîáûòèå.</dd>
-
-<dt>Äàòà (Timestamp)</dt>
-<dd>Äàòà è âðåìÿ ñîáûòèÿ.</dd>
-
-<dt>Àòðèáóòû (Attributes)</dt>
-<dd> ñÿ äîïîëíèòåëüíàÿ èíôîðìàöèÿ, ñîïðîâîæäàþùàÿ ñîáûòèå. Íàïðèìåð, êîãäà ñîáûòèå \
ôèêñèðóåò ïåðåñûëêó ìàòåðèàëîâ íà äðóãîé ñòîë, â ýòîé êîëîíêå ïðèñóòñòâóåò èìÿ ñòîëà, \
íà êîòîðûé ïåðåñûëàþòñÿ ìàòåðèàëû.</dd>
-</dl>
-
-<p>Ïî óìîë÷àíèþ ñîáûòèÿ îòñîðòèðîâàíû â ïîðÿäêå âîçðàñòàíèÿ äàòû. Äëÿ èçìåíåíèÿ \
ïîðÿäêà ñîðòèðîâêè íàæìèòå íà çàãîëîâîê ëþáîé èç êîëîíîê.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/events/dhandler (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/events/dhandler)
Copied: bricolage/trunk/comp/help/ru_ru/workflow/manager (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/manager)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/manager/media.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/manager/media.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/manager/media.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,19 +0,0 @@
-<help page="Find Media">
-
-<p> ýòîì ðåæèìå âû ìîæåòå îòûñêàòü â ÁÐÈÊÎËÀÆÅ ñóùåñòâóþùèé Ìåäèà-îáúåêò.</p>
-
-<p><dl>
-<dt>Ïðîñòîé ïîèñê (Simple Search)</dt>
-<dd>Çàäàéòå çàãîëîâîê, URL èëè êëþ÷åâîå ñëîâî è íàæìèòå êëàâèøó <i>«Ïîèñê» \
(Search).</i></dd>
-
-<dt>Ðàñøèðåííûé ïîèñê (Advanced Search)</dt>
-<dd> ýòîì ðåæèìå ìîæíî áîëåå òî÷íî îïèñàòü èñêîìûé Ìåäèà-îáúåêò. Çàïîëíèòå âñå ïîëÿ \
èëè ÷àñòü èç íèõ è íàæìèòå êëàâèøó <i>«Ïîèñê» (Search).</i> Äëÿ ñáðîñà óñëîâèé ïîèñêà \
íàæìèòå êëàâèøó <i>«Ñáðîñ çíà÷åíèé» (Clear Values).</i></dd>
-
-<dt>Íàéäåííûå Ìåäèà-ìàòåðèàëû (Media Found)</dt>
-<dd>Ïî ññûëêå <i>«Ïðîñìîòð» (View),</i> êîòîðàÿ ñòîèò ðÿäîì ñ íàéäåííûìè \
Ìåäèà-ìàòåðèàëàìè, ìîæíî ïðîñìîòðåòü èõ ïðîôèëü. Åñëè äàííûå ìàòåðèàëû íå \
èñïîëüçóþòñÿ äðóãèì ïîëüçîâàòåëåì, òî âû ìîæåòå ïîñòàâèòü îòìåòêó <i>«Çàãðóçèòü» \
(Checkout)</i> ðÿäîì ñ ýòèìè ìàòåðèàëàìè. Èõ çàãðóçêà â âàøå Ðàáî÷åå Ïðîñòðàíñòâî \
âûïîëíÿåòñÿ íàæàòèåì êëàâèøè <i>«Çàãðóçêà» (Checkout)</i> â êîíöå ñòðàíèöû. Åñëè \
ìàòåðèàëû óæå çàãðóæåíû, òî èõ ïðîôèëü ìîæíî èçìåíèòü, íàæàâ íà ññûëêó \
<i>«Ðåäàêòèðîâàòü» (Edit).</i></dd>
-
-<dt>Ñîçäàòü íîâûå Ìåäèà-ìàòåðèàëû (Create a New Media)</dt>
-<dd>Ïî ýòîé ññûëêå âû ïåðåéäåòå íà ñòðàíèöó ñîçäàíèÿ íîâûõ Ìåäèà-ìàòåðèàëîâ.</dd>
-</dl></p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/manager/media.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/manager/media.html)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/manager/story.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/manager/story.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/manager/story.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,19 +0,0 @@
-<help page="Find Story">
-
-<p> ýòîì ðåæèìå âû ìîæåòå îòûñêàòü â ÁÐÈÊÎËÀÆÅ ñóùåñòâóþùèå Òåêñòû (Stories).</p>
-
-<p><dl>
-<dt>Ïðîñòîé ïîèñê (Simple Search)</dt>
-<dd>Çàäàéòå çàãîëîâîê, URL èëè êëþ÷åâîå ñëîâî è íàæìèòå êëàâèøó «Ïîèñê» (Search). \
Äëÿ ïîëó÷åíèÿ ïîëíîãî ñïèñêà Òåêñòîâ îñòàâüòå ïîëå ïîèñêà ïóñòûì è íàæìèòå êëàâèøó \
<i>«Ïîèñê» (Search).</i></dd>
-
-<dt>Ðàñøèðåííûé ïîèñê (Advanced Search)</dt>
-<dd> ýòîì ðåæèìå ìîæíî áîëåå òî÷íî îïèñàòü èñêîìûé Òåêñò. Çàïîëíèòå âñå ïîëÿ èëè \
÷àñòü èç íèõ è íàæìèòå êëàâèøó <i>«Ïîèñê» (Search).</i> Äëÿ ñáðîñà óñëîâèé ïîèñêà \
íàæìèòå êëàâèøó <i>«Ñáðîñ çíà÷åíèé» (Clear Values).</i></dd>
-
-<dt>Íàéäåííûå Òåêñòû (Story Found)</dt>
-<dd>Ïî ññûëêå <i>«Ïðîñìîòð» (View)</i>, êîòîðàÿ ñòîèò ðÿäîì ñ íàéäåííûì Òåêñòîì, \
ìîæíî ïðîñìîòðåòü åãî ïðîôèëü. Åñëè Òåêñò íå èñïîëüçóåòñÿ äðóãèì ïîëüçîâàòåëåì, òî âû \
ìîæåòå ïîñòàâèòü îòìåòêó <i>«Çàãðóçèòü» (Checkout)</i> ðÿäîì ñ íåîáõîäèìûì òåêñòîì. \
Çàãðóçêà îòìå÷åííûõ òåêñòîâ â âàøå Ðàáî÷åå Ïðîñòðàíñòâî âûïîëíÿåòñÿ íàæàòèåì êëàâèøè \
<i>«Çàãðóçêà» (Checkout)</i> â êîíöå ñòðàíèöû. Åñëè Òåêñò óæå çàãðóæåí, òî åãî \
ïðîôèëü ìîæíî èçìåíèòü, íàæàâ íà ññûëêó <i>«Ðåäàêòèðîâàòü» \
(Edit).</i></dd>
-
-<dt>Ñîçäàòü íîâûé Òåêñò (Create a New Story)</dt>
-<dd>Ïî ýòîé ññûëêå âû ïåðåéäåòå íà ñòðàíèöó ñîçäàíèÿ íîâîãî Òåêñòà.</dd>
-</dl></p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/manager/story.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/manager/story.html)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/manager/templates.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/manager/templates.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/manager/templates.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,19 +0,0 @@
-<help page="Find Templates">
-
-<p> ýòîì ðåæèìå âû ìîæåòå îòûñêàòü â ÁÐÈÊÎËÀÆÅ ñóùåñòâóþùèå Øàáëîíû \
(Templates).</p>
-
-<p><dl>
-<dt>Ïðîñòîé ïîèñê (Simple Search)</dt>
-<dd>Çàäàéòå èìÿ èëè èìÿ ôàéëà è íàæìèòå êëàâèøó <i>«Ïîèñê» (Search).</i></dd>
-
-<dt>Ðàñøèðåííûé ïîèñê (Advanced Search)</dt>
-<dd> ýòîì ðåæèìå ìîæíî áîëåå òî÷íî îïèñàòü èñêîìûé Øàáëîí. Çàïîëíèòå âñå ïîëÿ èëè \
÷àñòü èç íèõ è íàæìèòå êëàâèøó <i>«Ïîèñê» (Search)</i>. Äëÿ ñáðîñà óñëîâèé ïîèñêà \
íàæìèòå êëàâèøó <i>«Ñáðîñ çíà÷åíèé» (Clear Values).</i></dd>
-
-<dt>Íàéäåííûå Øàáëîíû (Templates Found)</dt>
-<dd>Ïî ññûëêå <i>«Ïðîñìîòð» (View)</i>, êîòîðàÿ ñòîèò ðÿäîì ñ íàéäåííûì Øàáëîíîì, \
ìîæíî ïðîñìîòðåòü åãî ïðîôèëü. Åñëè ýòîò ïðîôèëü íå èñïîëüçóåòñÿ äðóãèì \
ïîëüçîâàòåëåì, òî âû ìîæåòå ïîñòàâèòü îòìåòêó <i>«Çàãðóçèòü» (Checkout)</i> ðÿäîì ñ \
íåîáõîäèìûì Øàáëîíîì. Çàãðóçêà îòìå÷åííûõ øàáëîíîâ â âàøå Ðàáî÷åå Ïðîñòðàíñòâî \
âûïîëíÿåòñÿ íàæàòèåì êëàâèøè <i>«Çàãðóçêà» (Checkout)</i> â êîíöå ñòðàíèöû. Åñëè \
Øàáëîí óæå çàãðóæåí, òî åãî ïðîôèëü ìîæíî èçìåíèòü, íàæàâ íà ññûëêó \
<i>«Ðåäàêòèðîâàòü» (Edit).</i></dd>
-
-<dt>Ñîçäàòü íîâûé Øàáëîí (Create a New Template)</dt>
-<dd>Ïî ýòîé ññûëêå âû ïåðåéäåòå íà ñòðàíèöó ñîçäàíèÿ íîâîãî Øàáëîíà.</dd>
-</dl></p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/manager/templates.html (from rev \
6084, bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/manager/templates.html)
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/alerts.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/alerts.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/alerts.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,9 +0,0 @@
-<help page="Alerts">
-
-<p>Îïîâåùåíèå îòïðàâëÿåòñÿ âàì â òîì ìîìåíò, êîãäà ïðîèñõîäèò ñîáûòèå, \
óäîâëåòâîðÿþùåå îïðåäåëåííîìó íàáîðó ïðàâèë, è âû óêàçàíû â êà÷åñòâå åãî ïîëó÷àòåëÿ. \
Íà ýòîé ñòðàíèöå («Ìîè Îïîâåùåíèÿ») ïîêàçàíû âñå îïîâåùåíèÿ, ïîëó÷àòåëåì êîòîðûõ âû \
ÿâëÿåòåñü.</p>
-
-<p> û ìîæåòå áûòü èçâåùåíû è ïî-äðóãîìó, â ÷àñòíîñòè ïî å-ìåéë. Ýòà ñòðàíèöà \
ïîçâîëÿåò âàì ïîäòâåðäèòü ïîëó÷åíèå îïîâåùåíèÿ. û ìîæåòå ñäåëàòü ýòî äâóìÿ \
ñïîñîáàìè. Åñëè âû õîòèòå èñêëþ÷èòü îäíî èëè áîëåå èíäèâèäóàëüíûõ îïîâåùåíèé, òî \
ïîñòàâüòå îòìåòêè â íåîáõîäèìûõ îêîøêàõ «Ïîäòâåðäèòü», à çàòåì íàæìèòå êëàâèøó \
«Ïîäòâåðäèòü îòìå÷åííûå». Åñëè âû õîòèòå ïîäòâåðäèòü âñå âàøè îïîâåùåíèÿ, òî íàæìèòå \
êëàâèøó «Ïîäòâåðäèòü âñå».</p>
-
-<p>Äëÿ âîçâðàòà ê ïðåäûäóùåé ñòðàíèöå íàæìèòå êëàâèøó « îçâðàò».</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/alerts.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/alerts.html)
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/alias (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/alias)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/alias/media.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/alias/media.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/alias/media.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,5 +0,0 @@
-<help page="Alias Media">
-
-<p>Ìåäèà-ìàòåðèàëàì îäíîãî ñàéòà ìîæåò áûòü ïðèñâîåí ïñåâäîíèì è îíè ìîãóò áûòü \
îïóáëèêîâàíû íà äðóãîì ñàéòå. Ðàâíî êàê è ýëåìåíòû, íà êîòîðûõ ýòè ìàòåðèàëû \
ïîñòðîåíû, ìîãóò ñîâìåñòíî èñïîëüçîâàòüñÿ ðàçíûìè ñàéòàìè. Óïðàâëåíèå òàêîãî ñîðòà \
êîíòåíòîì ñîõðàíÿåòñÿ çà îðèãèíàëüíûì ñàéòîì, òàêæå êàê è ïðîâåðêà ðåäàêòîðñêîé \
öåëîñòíîñòè äîêóìåíòà.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/alias/media.html (from rev \
6084, bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/alias/media.html)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/alias/story.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/alias/story.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/alias/story.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,5 +0,0 @@
-<help page="Alias Story">
-
-<p>Òåêñòàì îäíîãî ñàéòà ìîæåò áûòü ïðèñâîåí ïñåâäîíèì è îíè ìîãóò áûòü îïóáëèêîâàíû \
íà äðóãîì ñàéòå. Ðàâíî êàê è ýëåìåíòû, íà êîòîðûõ ýòè òåêñòû ïîñòðîåíû, ìîãóò \
ñîâìåñòíî èñïîëüçîâàòüñÿ ðàçíûìè ñàéòàìè. Óïðàâëåíèå òàêîãî ñîðòà êîíòåíòîì \
ñîõðàíÿåòñÿ çà îðèãèíàëüíûì ñàéòîì, òàêæå êàê è ïðîâåðêà ðåäàêòîðñêîé öåëîñòíîñòè \
äîêóìåíòà.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/alias/story.html (from rev \
6084, bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/alias/story.html)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/desk.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/desk.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/desk.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,53 +0,0 @@
-<help page="Desks">
-
-<p>Ñòðóêòóðà Ðàáî÷èõ Ñòîëîâ ïîçâîëÿåò âàì ñîâìåñòíî èñïîëüçîâàòü, à òàêæå \
îáìåíèâàòüñÿ ìàòåðèàëàìè ñ äðóãèìè ïîëüçîâàòåëÿìè.</p>
-
-<p>Ïîñëå òîãî, êàê âû ñîçäàëè è ñîõðàíèëè íîâûé ìàòåðèàë, îí ïîìåùàåòñÿ â âàøå \
ðàáî÷åå ïðîñòðàíñòâî. Ïîñëå ýòîãî âû ìîæåòå ïîìåñòèòü åãî íà Ðàáî÷èé Ñòîë äëÿ òîãî, \
÷òîáû ñäåëàòü åãî äîñòóïíûì äðóãèì ñîòðóäíèêàì êîìïàíèè. Ïîëüçîâàòåëü ìîæåò \
ïåðåìåùàòü ìàòåðèàëû ñ îäíîãî Ðàáî÷åãî Ñòîëà íà äðóãîé äëÿ âûïîëíåíèÿ íåîáõîäèìûõ \
ïðàâîê è êîððåêòèðîâîê äî òåõ ïîð, ïîêà ìàòåðèàëû íå áóäóò ãîòîâû ê \
ïóáëèêàöèè.</p>
-
-<p>Ðàáî÷èé Ñòîë ôóíêöèîíèðóåò â îñíîâíîì òàê æå, êàê è âàøå Ðàáî÷åå ïðîñòðàíñòâî – \
ýòî ïðîñòî íåêîå ïðîñòðàíñòâåííîå îáîáùåíèå. Íàïðèìåð, åñëè ôîòîãðàôèè ðàñïîëàãàþòñÿ \
íà «Àðò-ñòîëå» (Art Desk), òî ëþáîé ïîëüçîâàòåëü, èìåþùèé äîñòóï ê «Àðò-ñòîëó», áóäåò \
èìåòü äîñòóï ê ýòèì ôîòîãðàôèÿì. Õîòÿ ðåäàêòèðîâàòü èõ ñìîæåò òîëüêî îäèí èç \
ïîëüçîâàòåëåé.</p>
-
-<h3>Ñâîéñòâà ìàòåðèàëîâ (ðàçìåùåííûõ íà Ñòîëàõ)</h3>
-
-<p><dl>
-<dt>Çàãîëîâîê (Title)</dt>
-<dd>Íàæìèòå íà ýòó ññûëêó äëÿ ïðîñìîòðà ìàòåðèàëîâ â íîâîì îêíå (çà èñêëþ÷åíèåì \
Øàáëîíîâ (Templates)).</dd>
-
-<dt>Êàòåãîðèÿ (Category)</dt>
-<dd>Ýòî òî ìåñòî íà ñàéòå, ãäå ðàçìåùàþòñÿ ìàòåðèàëû.</dd>
-
-<dt>Çàãëàâíàÿ äàòà (Cover Date)</dt>
-<dd>Ýòî äàòà, êîòîðàÿ îòïðàâëÿåòñÿ âìåñòå ñ ìàòåðèàëàìè (ýòî íå îáÿçàòåëüíî äàòà \
ðàçìåùåíèÿ íà ñàéòå, íî ýòî òà äàòà ïóáëèêàöèè, êîòîðóþ óâèäÿò \
÷èòàòåëè).</dd>
-
-<dt>Ïðèîðèòåò (Priority)</dt>
-<dd>Ïîêàçûâàåò ñòåïåíü ñðî÷íîñòè ìàòåðèàëîâ.</dd>
-
-<dt>Çàãðóçèòü (Check Out)</dt>
-<dd>Ïîìåùàåò ìàòåðèàëû â âàøå Ðàáî÷åå Ïðîñòðàíñòâî äëÿ ðåäàêòèðîâàíèÿ. Êîãäà \
ìàòåðèàëû çàãðóæåíû, îíè îñòàþòñÿ íà ïîñëåäíåì èñïîëüçîâàííîì Ðàáî÷åì Ñòîëå è ìîãóò \
áûòü ïðîñìîòðåíû òàì. Îäíàêî îíè íå ìîãóò áûòü çàãðóæåíû äðóãèì ïîëüçîâàòåëåì äî òåõ \
ïîð, ïîêà òåêóùèé ïîëüçîâàòåëü íå îòïðàâèò èõ îáðàòíî íà Ñòîë. Åñëè ìàòåðèàëû óæå \
çàãðóæåíû äðóãèì ïîëüçîâàòåëåì, òî âìåñòî äàííîé ññûëêè áóäåò \
âûñâå÷åíî åãî èìÿ.</dd>
-
-<dt>Îòïðàâèòü (Check In)</dt>
-<dd>Åñëè âû âèäèòå, ÷òî ýòîò ðåæèì äîñòóïåí, òî ýòî çíà÷èò, ÷òî âû óæå çàãðóçèëè \
ìàòåðèàëû ñ äàííîãî ñòîëà â âàøå Ðàáî÷åå Ïðîñòðàíñòâî. Äëÿ òîãî, ÷òîáû äðóãîé \
ïîëüçîâàòåëü ñìîã ðåäàêòèðîâàòü äàííûå ìàòåðèàëû, âû äîëæíû íàæàòü íà ýòó ññûëêó äëÿ \
îòïðàâêè ìàòåðèàëîâ îáðàòíî íà Ñòîë.</dd>
-
-<dt>Ïåðåìåñòèòü (Move to)</dt>
-<dd> äàííîì ìåíþ ïåðå÷èñëåíû Ñòîëû, íà êîòîðûå ìîæíî ïåðåìåùàòü ìàòåðèàëû. ûáåðèòå \
íóæíûé Ñòîë è íàæìèòå êëàâèøó «Ïåðåìåñòèòü Ìàòåðèàëû» (Move Assets). Ïåðåìåùàòü ìîæíî \
ïðîèçâîëüíîå êîëè÷åñòâî ìàòåðèàëîâ. Ýòî ìåíþ íåäîñòóïíî åñëè ìàòåðèàëû çàãðóæåíû \
(checked out) äðóãèì ïîëüçîâàòåëåì.</dd>
-
-<dt>Çàìåòêè (Notes)</dt>
-<dd>Ïðîñìîòð êàêèõ-ëèáî çàìåòîê, êîòîðûå ïîëüçîâàòåëè ïðèêðåïèëè ê äàííûì \
ìàòåðèàëàì.</dd>
-
-<dt>Ïðîñëåäèòü (Trail)</dt>
-<dd>Ïîêàçûâàåò âñå Ñòîëû, íà êîòîðûõ êîãäà-ëèáî ðàçìåùàëèñü ìàòåðèàëû.</dd>
-
-<dt>Ðåäàêòèðîâàòü (Edit)</dt>
-<dd>Ýòîò ðåæèì äîñòóïåí âàì òîëüêî â òîì ñëó÷àå, åñëè ìàòåðèàëû çàãðóæåíû â âàøå \
Ðàáî÷åå Ïðîñòðàíñòâî.</dd>
-
-<dt>Æóðíàë (Log)</dt>
-<dd>Ïîêàçûâàåò âñþ èñòîðèþ îáðàáîòêè äàííûõ ìàòåðèàëîâ.</dd>
-
-<dt>Ïóáëèêîâàòü (Publish)</dt>
-<dd>Ýòî îòìåòêà ïðèñóòñòâóåò òîëüêî íà òåõ ñòîëàõ, êîòîðûå îáîçíà÷åíû êàê «Ñòîë \
ïóáëèêàöèè». Äëÿ ïóáëèêàöèè ìàòåðèàëîâ ïîñòàâüòå îòìåòêó çäåñü è íàæìèòå êëàâèøó \
<i>«Îïóáëèêîâàòü îòìå÷åííûå» (Publish Checked)</i> â êîíöå ñòðàíèöû. Ìîæíî \
îïóáëèêîâàòü íåñêîëüêî ìàòåðèàëîâ îäíîâðåìåííî.</dd>
-
-<dt>Ïðèìåíèòü (Deploy)</dt>
-<dd>Ýòà îòìåòêà ïðèñóòñòâóåò òîëüêî íà Ñòîëàõ, îáîçíà÷åííûõ êàê Ñòîëû Ïðèìåíåíèÿ, \
èñïîëüçóåìûõ â ïðîöåññå ðàçðàáîòêè Øàáëîíîâ. Äëÿ ïðèìåíåíèÿ ìàòåðèàëîâ ïîñòàâüòå \
îòìåòêó çäåñü è íàæìèòå êëàâèøó <i>«Ïðèìåíèòü îòìå÷åííûå» (Deploy Checked)</i> â \
êîíöå ñòðàíèöû. Ìîæíî ïðèìåíèòü íåñêîëüêî Øàáëîíîâ îäíîâðåìåííî.</dd>
-
-</dl></p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/desk.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/desk.html)
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/media (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/media)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/media/category.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/media/category.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/media/category.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,20 +0,0 @@
-<help page="Media Category Profile">
-
-<p>
-<dl>
-
-<dt>Òåêóùàÿ Êàòåãîðèÿ (Current Category)</dt>
-<dd>Ïîêàçûâàåò êàòåãîðèþ, ñâÿçàííóþ â íàñòîÿùèé ìîìåíò ñ äàííûì \
ìåäèà-äîêóìåíòîì.</dd>
-
-<dt>Ïîèñê (Search)</dt>
-<dd>Ïîèñê îñòàâøèõñÿ (íåàññîöèèðîâàííûõ) êàòåãîðèé ïî èìåíè.</dd>
-
-<dt> ûáåðèòå Êàòåãîðèè (Choose Categories)</dt>
-<dd>Ïîêàçûâàåò ñïèñîê êàòåãîðèé, ñîîòâåòñòâóþùèõ óñëîâèþ ïîèñêà. Íàæìèòå ññûëêó \
«Àññèöèèðîâàòü» (Associate) äëÿ èçìåíåíèÿ êàòåãîðèè \
ìåäèà-äîêóìåíòà.</dd>
-
-</dl>
-</p>
-
-<p>Ïî çàâåðøåíèè íàæìèòå êëàâèøó <i>«Ñîõðàíèòü»</i>.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/media/category.html (from \
rev 6084, bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/media/category.html)
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/media/container (from rev \
6084, bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/media/container)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/media/container/edit_super_bulk.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/media/container/edit_super_bulk.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/media/container/edit_super_bulk.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,83 +0,0 @@
-<help page="Super Bulk Edit">
-
-<p>Èíòåðôåéñ «Îáùåå ðåäàêòèðîâàíèå» èñïîëüçóåòñÿ äëÿ îäíîâðåìåííîé êîððåêòèðîâêè \
âñåõ ïîëåé âñåõ ñóáýëåìåíòîâ çàäàííîãî ýëåìåíòà. Ïîëÿ è ñóáýëåìåíòû ðàçäåëÿþòñÿ \
çíàêîì (=), çà êîòîðûì ñëåäóåò êëþ÷åâîå èìÿ ïîëÿ èëè ñóáýëåìåíòà. Òýãè ïîëÿ \
çàâåðøàþòñÿ ïóñòîé ñòðîêîé, çà êîòîðîé ñëåäóåò ñîáñòâåííî òåêñò ïîëÿ. Ïðåäïîëàãàåòñÿ, \
÷òî òåêñò ïîëÿ ñàì ïî ñåáå ìîæåò ñîäåðæàòü ïóñòûå ñòðîêè. Òýãè ñóáýëåìåíòà ñàìè \
ñóùåñòâóþò â ñòðîêå, íî <em>èõ</em> ïîëÿ íå ìîãóò áûòü íàïðÿìóþ \
îòðåäàêòèðîâàíû.</p>
-
-<p>Íàïðèìåð, äëÿ òîãî, ÷òîáû îòðåäàêòèðîâàòü ýëåìåíò, ñîäåðæàùèé ïîëÿ «çàãîëîâîê» è \
«àáçàö», à òàêæå ñóáýëåìåíò «âñòàâêà», ñèíòàêñèñ «Îáùåãî ðåäàêòèðîâàíèÿ» ìîã áû \
âûãëÿäåòü ñëåäóþùèì îáðàçîì:</p>
-
-<pre><code>=header
-
-Ýòî çàãîëîâîê
-
-=paragraph
-
-Ïåðâûé àáçàö.
-
-=paragraph
-
- òîðîé àáçàö.
-
-=inset
-
-=paragraph
-
-Òðåòèé àáçàö.
-</code></pre>
-
-<p>Äëÿ ïåðåóïîðÿäî÷èâàíèÿ ñîäåðæèìîãî ýëåìåíòà ïðîñòî ïåðåìåñòèòå íà íîâîå ìåñòî \
ñîäåðæèìîå îñòàëüíûõ ýëåìåíòîâ è ñîîòâåòñòâóþùèõ èì òýãîâ. Íàïðèìåð, åñëè âû õîòèòå \
ïåðåìåñòèòü çàãîëîâîê â ïðèâåäåííîì ïðèìåðå è ïîñòàâèòü åãî ïîñëå ïåðâîãî àáçàöà, òî \
ïðîñòî îòðåäàêòèðóéòå åãî ñëåäóþùèì îáðàçîì:</p>
-
-<pre><code>=paragraph
-
-Ïåðâûé àáçàö.
-
-=header
-
-Ýòî çàãîëîâîê
-
-=paragraph
-
- òîðîé àáçàö.
-
-=inset
-
-=paragraph
-
-Òðåòèé àáçàö.
-</code></pre>
-
-<p>Ñ öåëüþ ýêîíîìèè ïðîñòðàíñòâà è óïðîùåíèÿ ðåäàêòèðîâàíèÿ âû ìîæåòå âûáðàòü \
«Ýëåìåíò ïî óìîë÷àíèþ» (Default Element), äëÿ êîòîðîãî íèêàêèõ òýãîâ íå íóæíî. \
Íàïðèìåð, åñëè «àáçàö» âûáðàí â êà÷åñòâå ýëåìåíòà ïî óìîë÷àíèþ, òî ïðèâåäåííûé ïðèìåð \
ïðèíÿë áû ñëåäóþùèé âèä:</p>
-
-<pre><code>Ïåðâûé àáçàö.
-
-=header
-
-Ýòî çàãîëîâîê
-
- òîðîé àáçàö.
-
-=inset
-
-Òðåòèé àáçàö.
-</code></pre>
-
-<p>È íàêîíåö, çàìåòèì, ÷òî ïóñòûå ïîëÿ âñå æå äîëæíû ñîäåðæàòü ïóñòóþ ñòðîêó, \
îáîçíà÷àþùóþ ïóñòîå ïîëå. Íàïðèìåð, åñëè áû â ïðèâåäåííîì ïðèìåðå ïðèñóòñòâîâàëî ïîëå \
«link_text», íå ñîäåðæàùåå íèêàêîãî òåêñòà, òî ýòî áû âûãëÿäåëî ñëåäóþùèì \
îáðàçîì:</p>
-
-<pre><code>Ïåðâûé àáçàö.
-
-=header
-
-Ýòî çàãîëîâîê
-
-=link_text
-
-
-
- òîðîé àáçàö.
-
-=inset
-
-Òðåòèé àáçàö.
-</code></pre>
-
-<p>Îáðàòèòå âíèìàíèå íà äîïîëíèòåëüíûå ïóñòûå ñòðîêè ïîñëå òýãà \
<code>=link_text</code>. Òàêîé ñèíòàêñèñ íåîáõîäèì äëÿ òîãî, ÷òîáû ÁÐÈÊÎËÀÆ ìîã \
ðàñïîçíàòü, ÷òî ïîëå ñóùåñòâóåò, íî íå ñîäåðæèò äàííûõ.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/media/container/edit_super_bulk.html \
(from rev 6084, bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/media/container/edit_super_bulk.html)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/media/contributor_role.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/media/contributor_role.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/media/contributor_role.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,12 +0,0 @@
-<help page="Media Contributor Role Profile">
-
-<p>
-<dl>
-
-<dt> ûáåðèòå Ðîëü</dt>
-<dd> ûáåðèòå Ðîëü èç âñïëûâàþùåãî ìåíþ, à çàòåì íàæìèòå «Äàëåå». Ðîëè äîáàâëÿþòñÿ \
ïðè íàæàòèè «Äàëåå» íà ñòðàíèöå Ìåíåäæåðà Àâòîðîâ.</dd>
-
-</dl>
-</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/media/contributor_role.html \
(from rev 6084, bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/media/contributor_role.html)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/media/contributors.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/media/contributors.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/media/contributors.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,20 +0,0 @@
-<help page="Media Contributors Profile">
-
-<p>
-<dl>
-
-<dt>Òåêóùèå àâòîðû</dt>
-<dd>Ïîêàçûâàåò ñïèñîê àâòîðîâ, êîòîðûå â íàñòîÿùåå âðåìÿ ñâÿçàíû ñ ýòèì \
Ìåäèà-äîêóìåíòîì. Íàæìèòå ññûëêó «Ðîëü» äëÿ èçìåíåíèÿ ðîëè Àâòîðà. Ïîñòàâüòå îòìåòêó \
â îêíå «Óäàëèòü» è àâòîð áóäåò îòñîåäèíåí îò ìåäèà-äîêóìåíòà â ìîìåíò ñîõðàíåíèÿ \
èçìåíåíèé.</dd>
-
-<dt>Ïîèñê</dt>
-<dd>Ïîèñê îñòàâøèõñÿ (íåàññîöèèðîâàííûõ) àâòîðîâ ïî ôàìèëèè.</dd>
-
-<dt> ûáåðèòå Àâòîðîâ</dt>
-<dd>Ïîêàçûâàåò ñïèñîê àâòîðîâ, óäîâëåòâîðÿþùèõ óñëîâèþ ïîèñêà. Íàæìèòå ññûëêó \
«Ñâÿçàòü» (Associate) äëÿ ïðèñîåäèíåíèÿ àâòîðà ê \
ìåäèà-äîêóìåíòó.</dd>
-
-</dl>
-</p>
-
-<p>Ïî çàâåðøåíèè íàæìèòå <i>Ñîõðàíèòü</i>.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/media/contributors.html \
(from rev 6084, bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/media/contributors.html)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/media/keywords.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/media/keywords.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/media/keywords.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,17 +0,0 @@
-<help page="Media Keywords Profile">
-
-<p>
-<dl>
-
-<dt>Êëþ÷åâûå ñëîâà Êàòåãîðèè</dt>
-<dd>Ïîêàçûâàåò êëþ÷åâûå ñëîâà äëÿ âñåõ êàòåãîðèé, ñ êîòîðûìè ñâÿçàí \
ìåäèà-äîêóìåíò.</dd>
-
-<dt>Êëþ÷åâûå ñëîâà Ìåäèà-äîêóìåíòà</dt>
-<dd> âåäèòå ëþáûå ñëîâà èëè ôðàçû, îòíîñÿùèåñÿ ê ìåäèà-äîêóìåíòó, êîòîðûå ïîçâîëÿò \
íàéòè ýòîò äîêóìåíò ïðè âûïîëíåíèè ïîèñêà. àì íå íóæíî çàïîëíÿòü âñå ÷åòûðå ñòðîêè, \
íî, ïðè íåîáõîäèìîñòè, äîïîëíèòåëüíûå ñòðîêè äîáàâëÿþòñÿ íàæàòèåì êëàâèøè \
<i>«Äîáàâèòü åùå»</i>.</dd>
-
-</dl>
-</p>
-
-<p>Ïî çàâåðøåíèè íàæìèòå êëàâèøó <i>«Ñîõðàíèòü»</i>.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/media/keywords.html (from \
rev 6084, bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/media/keywords.html)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/media/new.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/media/new.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/media/new.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,29 +0,0 @@
-<help page="New Media">
-
-<p>Ýòîò èíñòðóìåíò ïðèìåíÿåòñÿ äëÿ ñîçäàíèÿ Ìåäèà-ôàéëîâ, êîòîðûå áóäóò èñïîëüçîâàíû \
íà âàøåì ñàéòå.</p>
-
-<h3>Ñâîéñòâà (Properties)</h3>
-
-<p><dl>
-<dt>Çàãîëîâîê (Title)</dt>
-<dd>Íàèìåíîâàíèå Ìåäèà-ìàòåðèàëîâ. Íåîáõîäèì.</dd>
-
-<dt>Òèï Ìåäèà (Media Type)</dt>
-<dd> ûáåðèòå êàêèå Ìåäèà-ìàòåðèàëû âû ñîçäàåòå. Íåîáõîäèì.</dd>
-
-<dt>Èñòî÷íèê (Source)</dt>
-<dd>Îïèñàíèå èñòî÷íèêà, ïðåäîñòàâèâøåãî äàííûå Ìåäèà-ìàòåðèàëû.</dd>
-
-<dt>Êàòåãîðèÿ (Category)</dt>
-<dd>Ìåñòî íà ñàéòå, ãäå áóäóò îïóáëèêîâàíû Ìåäèà-ìàòåðèàëû.</dd>
-
-<dt>Ïðèîðèòåò (Priority)</dt>
-<dd>Ïîêàçûâàåò ñòåïåíü ñðî÷íîñòè Ìåäèà. Íåîáõîäèì.</dd>
-
-<dt>Çàãëàâíàÿ äàòà (Cover Date)</dt>
-<dd> ûáåðèòå äàòó è âðåìÿ, êîòîðûå áóäóò îòîáðàæàòüñÿ ñ Ìåäèà (ýòî íå îáÿçàòåëüíî \
äàòà ðàçìåùåíèÿ íà ñàéòå, íî ýòî òà äàòà ïóáëèêàöèè, êîòîðóþ óâèäÿò \
÷èòàòåëè).</dd>
-</dl></p>
-
-<p>Ïî çàâåðøåíèè íàæìèòå «Ñîçäàòü». Ïîñëå ýòîãî âû ïîïàäåòå íà ñòðàíèöó Ïðîôèëÿ \
Ìåäèà.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/media/new.html (from rev \
6084, bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/media/new.html)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/media.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/media.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/media.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,60 +0,0 @@
-<help page="Media Profile">
-
-<p>Çäåñü âû ñìîæåòå çàãðóçèòü Ìåäèà-ýëåìåíò â ôàéë, îòêîððåêòèðîâàòü åãî \
ñîïðîâîäèòåëüíóþ èíôîðìàöèþ è óêàçàòü Àâòîðîâ. Íå çàáóäüòå íàæàòü êëàâèøó «Ñîõðàíèòü» \
â êîíöå ñòðàíèöû äëÿ òîãî, ÷òîáû ñîõðàíèòü Ìåäèà-ôàéë â âàøåì ðàáî÷åì \
ïðîñòðàíñòâå.</p>
-
-<h3>1) Èíôîðìàöèÿ (Information)</h3>
-
-<p><dl>
-<dt>Ïðîñëåäèòü (Trail)</dt>
-<dd>Ïîêàçûâàåò âñå Ñòîëû, íà êîòîðûõ êîãäà-ëèáî ðàçìåùàëèñü Ìåäèà-ìàòåðèàëû. (Äëÿ \
íîâîãî ýëåìåíòà ïîêàçûâàåò ïóñòîé ñïèñîê).</dd>
-
-<dt>Çàìåòêè (Notes)</dt>
-<dd>Íàæìèòå ýòîò çíà÷îê äëÿ òîãî, ÷òîáû ïðèñîåäèíèòü ðåäàêòîðñêèå çàìåòêè ê \
Ìåäèà-ìàòåðèàëàì. Çàìåòêè ìîãóò áûòü ïðîñìîòðåíû äðóãèìè ïîëüçîâàòåëÿìè ïîñëå òîãî \
êàê Ìåäèà-ýëåìåíò îòïðàâëåí íà Ñòîë. Îäíàêî îíè íå áóäóò âèäíû ïðè ïóáëèêàöèè. Åñëè \
âû âèäèòå çíà÷îê ñ íàäïèñÿìè, òî ýòî çíà÷èò, ÷òî êàêèå-òî çàìåòêè ê ýëåìåíòó óæå \
ïðèñîåäèíåíû.</dd>
-
-<dt>Èäåíòèôèêàòîð (ID)</dt>
-<dd>Èäåíòèôèêàöèîííûé íîìåð ìàòåðèàëîâ (ïðèñâàèâàåòñÿ àâòîìàòè÷åñêè).</dd>
-
-<dt>Ýëåìåíò Òèïà Ìåäèà (Media Type Element)</dt>
-<dd>Òèï Ìåäèà-äîêóìåíòà â ôàéëå (íàïðèìåð, Ôîòîãðàôèÿ èëè Èëëþñòðàöèÿ).</dd>
-
-<dt>URI</dt>
-<dd>Àäðåñ Ìåäèà-ìàòåðèàëîâ íà âàøåì ñåðâåðå. Îí âêëþ÷àåò òå Êàòåãîðèþ è ïîäêàòàëîã \
(Slug), êîòîðûå âû óêàçàëè íà ïðåäûäóùåé ñòðàíèöå. Åñëè URI ïîêàçàí êàê ññûëêà, òî âû \
ìîæåòå íàæàòü íà íåå è ïðîñìîòðåòü äàííûå Ìåäèà-ìàòåðèàëû.</dd>
-
-<dt> åðñèÿ (Version)</dt>
-<dd>Ïîêàçûâàåò ñêîëüêî ðàç äàííûé Ìåäèà-ýëåìåíò êîððåêòèðîâàëñÿ.</dd>
-
-<dt>Çàãîëîâîê (Title)</dt>
-<dd>Èìÿ Ìåäèà-ìàòåðèàëîâ. Íåîáõîäèì.</dd>
-
-<dt>Îïèñàíèå (Description)</dt>
-<dd>Êðàòêîå îïèñàíèå Ìåäèà-ìàòåðèàëîâ.</dd>
-
-<dt>Èñòî÷íèê (Source)</dt>
-<dd>Îïèñàíèå èñòî÷íèêà, ïðåäîñòàâèâøåãî äàííûå Ìåäèà-ìàòåðèàëû.</dd>
-
-<dt>Ïðèîðèòåò (Priority)</dt>
-<dd>Ïîêàçûâàåò ñòåïåíü ñðî÷íîñòè ìàòåðèàëîâ. Íåîáõîäèì.</dd>
-
-<dt>Çàãëàâíàÿ äàòà (Cover Date)</dt>
-<dd>Ýòî äàòà, êîòîðàÿ îòïðàâëÿåòñÿ âìåñòå ñ ìàòåðèàëàìè (ýòî íå îáÿçàòåëüíî äàòà \
ðàçìåùåíèÿ íà ñàéòå, íî ýòî òà äàòà ïóáëèêàöèè, êîòîðóþ óâèäÿò \
÷èòàòåëè).</dd>
-
-<dt>Ñðîê õðàíåíèÿ (Expire Date)</dt>
-<dd>TÄàòà è âðåìÿ èñêëþ÷åíèÿ èç ïóáëèêàöèè Ìåäèà-ìàòåðèàëîâ.</dd>
-</dl></p>
-
-<h3>2) Çàãðóçèòü ôàéë (Upload a File)</h3>
-<p><dl>
-<dt>Ïóòü ê ôàéëó (File Path)</dt>
-<dd>Çàãðóçèòå Ìåäèà-ýëåìåíò. Íàæìèòå «Ïðîñìîòðåòü», íàéäèòå ôàéë íà âàøåì êîìïüþòåðå \
èëè ñåòåâîì ðåñóðñå è âûáåðèòå åãî. Ïóòü ê ýòîìó ôàéëó è áóäåò ïîêàçàí â äàííîì ïîëå. \
Íàæìèòå «Ïîäãðóçèòü» äëÿ ïðèñîåäèíåíèÿ ôàéëà ê Ìåäèà-ýëåìåíòó. Ñ ôàéëîì ìîæåò áûòü \
ñâÿçàí òîëüêî îäèí Ìåäèà-ýëåìåíò. Åñëè âû ðåøèëè ïîäãðóçèòü äðóãîé ýëåìåíò, òî îí \
çàìåíèò ïðåäûäóùèé.</dd>
-
-<dt>Çàãðóçèòü (Download)</dt>
-<dd>Åñëè Ìåäèà-ýëåìåíò ïîäãðóæåí, òî ëþáîé ïîëüçîâàòåëü, êîòîðîìó ðàçðåøåí äîñòóï ê \
ïðîôèëþ Ìåäèà-ýëåìåíòà, ìîæåò ýòîò ýëåìåíò çàãðóçèòü. Íàæìèòå ññûëêó äëÿ òîãî, ÷òîáû \
îòêðûòü ôàéë â íîâîì îêíå, à çàòåì ñîõðàíèòå åãî.</dd>
-</dl></p>
-
-<h3>3) Àâòîðû (Contributors)</h3>
-
-<p> âåäèòå èìåíà àâòîðîâ ìàòåðèàëîâ, âêëþ÷àÿ ëþáîãî ôîòîãðàôà èëè èëëþñòðàòîðà, \
êîòîðûå ïðèíèìàëè ó÷àñòèå â èõ ñîçäàíèè. Íàæìèòå «Ðåäàêòèðîâàòü» äëÿ ïåðåõîäà íà \
ñòðàíèöó Ïðèñîåäèíåíèÿ Àâòîðîâ. ñïèñêå « ûáåðèòå Àâòîðîâ» íàéäèòå íóæíîå èìÿ è \
íàæìèòå «Ïðèñîåäèíèòü». Íà ñëåäóþùåé ñòðàíèöå âûáåðèòå ðîëü Àâòîðà è íàæìèòå «Äàëåå». \
Ïî çàâåðøåíèè íàæìèòå «Ñîõðàíèòü».</p>
-
-<p> åðíóâøèñü íà ñòðàíèöó Ïðîôèëÿ Ìåäèà-ýëåìåíòà, íàæìèòå <i>«Ñîõðàíèòü»</i> äëÿ \
òîãî, ÷òîáû ñîõðàíèòü ýòîò ýëåìåíò â âàøåì Ðàáî÷åì Ïðîñòðàíñòâå.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/media.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/media.html)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/publish.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/publish.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/publish.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,7 +0,0 @@
-<help page="Publish">
-
-<p>Ýòà ñòðàíèöà ïîçâîëÿåò âàì âûáðàòü îòíîñÿùèåñÿ ê ïóáëèêàöèè ìàòåðèàëû, à òàêæå \
èçìåíèòü âðåìÿ ïóáëèêàöèè.</p>
-
-<p>Íàáîð îðèãèíàëüíûõ òåêñòîâ è ìåäèà, êîòîðûé âû ñîñòàâèëè íà ïðåäûäóùåé ñòðàíèöå, \
çäåñü óæå èçìåíåí áûòü íå ìîæåò. Èçìåíèòü ìîæíî òîëüêî òåêñòû è ìåäèà, ñâÿçàííûå ñ \
îðèãèíàëüíûìè òåêñòàìè. Òàêèì îáðàçîì, åñëè âàøè òåêñòû, íàïðèìåð, èìåþò ñâÿçàííûå \
ìåäèà-ìàòåðèàëû, òî âû ìîæåòå îïóáëèêîâàòü è èõ òîæå.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/publish.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/publish.html)
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/story (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/story)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/story/actions.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/story/actions.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/story/actions.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,1023 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List href="./actions.files/filelist.xml">
-<title>My Workspace</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Author>CBrody</o:Author>
- <o:Template>Normal</o:Template>
- <o:LastAuthor>Sergey Samoilenko</o:LastAuthor>
- <o:Revision>10</o:Revision>
- <o:TotalTime>193</o:TotalTime>
- <o:LastPrinted>2001-09-10T19:03:00Z</o:LastPrinted>
- <o:Created>2001-09-26T22:09:00Z</o:Created>
- <o:LastSaved>2003-10-30T17:02:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1062</o:Words>
- <o:Characters>6056</o:Characters>
- <o:Company>About.com, Inc.</o:Company>
- <o:Lines>50</o:Lines>
- <o:Paragraphs>12</o:Paragraphs>
- <o:CharactersWithSpaces>7437</o:CharactersWithSpaces>
- <o:Version>9.3821</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:View>Normal</w:View>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0cm;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";
- color:windowtext;}
-h1
- {margin-right:0cm;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0cm;
- mso-pagination:widow-orphan;
- mso-outline-level:1;
- font-size:24.0pt;
- font-family:"Times New Roman";
- color:black;
- mso-font-kerning:18.0pt;
- font-weight:bold;}
-h2
- {margin-right:0cm;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0cm;
- mso-pagination:widow-orphan;
- mso-outline-level:2;
- font-size:18.0pt;
- font-family:"Times New Roman";
- color:black;
- font-weight:bold;}
-h3
- {mso-style-next:Normal;
- margin:0cm;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- page-break-after:avoid;
- mso-outline-level:3;
- font-size:12.0pt;
- font-family:"Times New Roman";
- color:windowtext;
- font-weight:bold;}
-h4
- {mso-style-next:Normal;
- margin:0cm;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- page-break-after:avoid;
- mso-outline-level:4;
- font-size:20.0pt;
- mso-bidi-font-size:12.0pt;
- font-family:"Times New Roman";
- color:windowtext;
- font-weight:normal;}
-h5
- {mso-style-next:Normal;
- margin-top:0cm;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:108.0pt;
- margin-bottom:.0001pt;
- text-indent:-108.0pt;
- mso-pagination:widow-orphan;
- page-break-after:avoid;
- mso-outline-level:5;
- font-size:22.0pt;
- mso-bidi-font-size:12.0pt;
- font-family:"Times New Roman";
- color:windowtext;
- font-weight:normal;}
-h6
- {mso-style-next:Normal;
- margin:0cm;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- page-break-after:avoid;
- mso-outline-level:6;
- font-size:14.0pt;
- mso-bidi-font-size:12.0pt;
- font-family:"Times New Roman";
- color:windowtext;
- font-weight:bold;}
-p.MsoHeading7, li.MsoHeading7, div.MsoHeading7
- {mso-style-next:Normal;
- margin-top:0cm;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:108.0pt;
- margin-bottom:.0001pt;
- text-indent:-108.0pt;
- mso-pagination:widow-orphan;
- page-break-after:avoid;
- mso-outline-level:7;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";
- color:windowtext;
- font-weight:bold;}
-a:link, span.MsoHyperlink
- {color:blue;
- text-decoration:underline;
- text-underline:single;}
-a:visited, span.MsoHyperlinkFollowed
- {color:purple;
- text-decoration:underline;
- text-underline:single;}
-p
- {margin-right:0cm;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0cm;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";
- color:black;}
-p.Normal, li.Normal, div.Normal
- {mso-style-name:Normal;
- margin:0cm;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";
- color:windowtext;}
-@page Section1
- {size:612.0pt 792.0pt;
- margin:72.0pt 90.0pt 72.0pt 90.0pt;
- mso-header-margin:36.0pt;
- mso-footer-margin:36.0pt;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=RU link=blue vlink=purple style='tab-interval:36.0pt'>
-
-<div class=Section1>
-
-<h4><span style='font-size:22.0pt;mso-bidi-font-size:12.0pt'>ДЕЙСТВИЯ
-(</span><span lang=EN-US style='font-size:22.0pt;mso-bidi-font-size:12.0pt;
-mso-ansi-language:EN-US'>ACTIONS</span><span style='font-size:22.0pt;
-mso-bidi-font-size:12.0pt'>)</span></h4>
-
-<h2 style='margin:0cm;margin-bottom:.0001pt'><span style='font-size:20.0pt;
-mso-bidi-font-size:18.0pt'>Новый
-Текст (</span><span lang=EN-US style='font-size:
-20.0pt;mso-bidi-font-size:18.0pt;mso-ansi-language:EN-US'>New</span><span
-lang=EN-US style='font-size:20.0pt;mso-bidi-font-size:18.0pt'> </span><span
-lang=EN-US style='font-size:20.0pt;mso-bidi-font-size:18.0pt;mso-ansi-language:
-EN-US'>Story</span><span \
style='font-size:20.0pt;mso-bidi-font-size:18.0pt'>)</span><span
-style='font-size:14.0pt;mso-bidi-font-size:18.0pt'><o:p></o:p></span></h2>
-
-<p style='margin:0cm;margin-bottom:.0001pt'>Этот
-инструмент
-применяется
-для создания
-Текстов,
-которые
-будут
-использованы
-на вашем
-сайте.
-Возможно
-создание
-Текстов \
четырех
-различных
-типов. Каждый
-из них имеет
-несколько
-переменных и
-дополнительных
-элементов, \
которыми
-вы можете
-воспользоваться
-для \
управления
-визуализацией
-Текста.</p>
-
-<p style='margin:0cm;margin-bottom:.0001pt'><![if \
!supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-<p style='margin:0cm;margin-bottom:.0001pt'><b>Типы
-Текстов (</b><b><span lang=EN-US
-style='mso-ansi-language:EN-US'>Story</span><span lang=EN-US> </span></b><b><span
-lang=EN-US style='mso-ansi-language:EN-US'>Types</span>)<o:p></o:p></b></p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;
-margin-bottom:.0001pt;text-indent:-36.0pt'><i>Статья
-(</i><i><span lang=EN-US style='mso-ansi-language:EN-US'>Article</span>):</i><span
-style='mso-tab-count:1'> </span><span style='mso-tab-count:1'> \
</span>Для
-стандартных
-новостей и
-заметок.</p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;
-margin-bottom:.0001pt;text-indent:-36.0pt'><i>Колонка
-(</i><i><span lang=EN-US style='mso-ansi-language:EN-US'>Column</span>):</i><span
-style='mso-tab-count:1'> </span><span style='mso-tab-count:1'> \
</span>Для
-редакторских
-и
-персональных
-колонок или
-же анализов
-новостей.</p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;
-margin-bottom:.0001pt;text-indent:-36.0pt'><i>Обзор
-(</i><i><span lang=EN-US style='mso-ansi-language:EN-US'>Book</span><span
-lang=EN-US> </span></i><i><span lang=EN-US \
style='mso-ansi-language:EN-US'>Review</span>):</i><span
-style='mso-tab-count:1'> </span>Для
-обзоров.
-Включает
-сетку
-профиля для
-отображения
-существенной
-информации о
-предмете
-обзора.</p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;
-margin-bottom:.0001pt;text-indent:-36.0pt'><i>Обложка
-(</i><i><span lang=EN-US style='mso-ansi-language:EN-US'>Cover</span>):<span
-style='mso-tab-count:1'> </span></i><span style='mso-tab-count:1'> \
</span>Значительно
-отличается
-от других
-типов Текста.
-Обложка это
-больше, чем
-просто \
раздел
-или домашняя
-страничка.
-Она содержит
-ссылки на
-множество
-Текстов.<i><o:p></o:p></i></p>
-
-<p style='margin:0cm;margin-bottom:.0001pt'><![if \
!supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-<p style='margin:0cm;margin-bottom:.0001pt'><b><span style='font-size:14.0pt;
-mso-bidi-font-size:12.0pt'>Создать</span></b><b><span
-style='font-size:14.0pt;mso-bidi-font-size:12.0pt;mso-ansi-language:EN-US'> \
</span></b><b><span
-style='font-size:14.0pt;mso-bidi-font-size:12.0pt'>Текст</span></b><b><span
-lang=EN-US style='font-size:14.0pt;mso-bidi-font-size:12.0pt;mso-ansi-language:
-EN-US'> (Create a Story)<o:p></o:p></span></b></p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;
-margin-bottom:.0001pt;text-indent:-36.0pt'><b>1.</b>
-Нажмите
-«Новый Текст»
-слева и
-задайте
-следующую
-информацию:</p>
-
-<p style='margin:0cm;margin-bottom:.0001pt'><![if \
!supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:72.0pt;
-margin-bottom:.0001pt;text-indent:-72.0pt'><b><i>Заголовок
-(</i></b><b><i><span lang=EN-US \
style='mso-ansi-language:EN-US'>Title</span>):</i></b><i><span
-style='mso-tab-count:1'> \
</span></i>Заголовок
-Текста.<i><span style='mso-tab-count:1'> \
</span><o:p></o:p></i></p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:72.0pt;
-margin-bottom:.0001pt;text-indent:-72.0pt'><b><i>Подкаталог
-(</i></b><b><i><span lang=EN-US \
style='mso-ansi-language:EN-US'>Slug</span>):</i></b><span
-style='mso-tab-count:1'> \
</span>Идентификатор,
-который
-используется
-в качестве
-имени
-подкаталога,
-в котором
-хранится
-файл текста.</p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:72.0pt;
-margin-bottom:.0001pt;text-indent:-72.0pt'><b><i>Тип
-Текста (</i></b><b><i><span lang=EN-US
-style='mso-ansi-language:EN-US'>Story</span><span lang=EN-US> \
</span></i></b><b><i><span
-lang=EN-US style='mso-ansi-language:EN-US'>Type</span>):</i></b><span
-style='mso-tab-count:1'> \
</span>Выберите
-тип
-создаваемого
-Текста.</p>
-
-<p class=MsoNormal><b><i>Источник
-(</i></b><b><i><span lang=EN-US \
style='mso-ansi-language:EN-US'>Source</span>):</i></b><span
-style='mso-tab-count:1'> </span><span style='mso-tab-count:1'> \
</span>Описание
-источника,
-предоставившего
-данный Текст.</p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:72.0pt;
-margin-bottom:.0001pt;text-indent:-72.0pt'><b><i>Первичная
-категория (</i></b><b><i><span
-lang=EN-US style='mso-ansi-language:EN-US'>Primary</span><span lang=EN-US> \
</span></i></b><b><i><span
-lang=EN-US style='mso-ansi-language:EN-US'>Category</span>):</i></b><span
-style='mso-tab-count:1'> \
</span>Основное
-место
-публикации
-материалов
-на сайте.</p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:72.0pt;
-margin-bottom:.0001pt;text-indent:-72.0pt'><b><i>Приоритет
-(</i></b><b><i><span lang=EN-US \
style='mso-ansi-language:EN-US'>Priority</span>):</i><span
-style='mso-tab-count:1'> </span> \
</b>Говорит
-о степени
-срочности
-Текста.</p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:72.0pt;
-margin-bottom:.0001pt;text-indent:-72.0pt'><b><i>Заглавная
-дата (</i></b><b><i><span lang=EN-US \
style='mso-ansi-language:
-EN-US'>Cover</span><span lang=EN-US> </span></i></b><b><i><span lang=EN-US
-style='mso-ansi-language:EN-US'>Date</span>):</i><span style='mso-tab-count:
-1'> </span></b>Выберите
-дату и время,
-которые
-будут \
отображаться
-с Текстом
-(это не
-обязательно
-дата \
размещения
-на сайте, но
-это та дата
-публикации,
-которую
-увидят
-читатели).</p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;
-margin-bottom:.0001pt;text-indent:-36.0pt'><b>2.</b>
-Нажмите
-«Создать» для
-передачи
-информации.<span
-style="mso-spacerun: yes"> </span></p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:14.2pt;
-margin-bottom:.0001pt;text-indent:-14.2pt'><b>3.</b> Это
-приведет вас
-на страницу
-«Профиля \
Текста».
-На этой
-странице вы
-будете
-вводить \
данные
-и добавлять
-любые
-элементы,
-необходимые
-для
-оформления
-Текста. Не
-забудьте
-нажать
-клавишу
-«Сохранить» в
-конце
-страницы для
-того, чтобы
-сохранить
-Текст в вашем
-рабочем
-пространстве.
-</p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-<p class=MsoNormal><b><span \
style='font-size:14.0pt;mso-bidi-font-size:12.0pt'>Профиль</span></b><b><span
-style='font-size:14.0pt;mso-bidi-font-size:12.0pt;mso-ansi-language:EN-US'> \
</span></b><b><span
-style='font-size:14.0pt;mso-bidi-font-size:12.0pt'>Текста</span></b><b><span
-lang=EN-US style='font-size:14.0pt;mso-bidi-font-size:12.0pt;mso-ansi-language:
-EN-US'> (Story Profile Data)</span></b><span lang=EN-US style='mso-ansi-language:
-EN-US'><o:p></o:p></span></p>
-
-<h3>1) Информация (<span
-lang=EN-US style='mso-ansi-language:EN-US'>Information</span>)</h3>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:108.0pt;
-margin-bottom:.0001pt;text-indent:-108.0pt'><i>Заметки
-(</i><i><span lang=EN-US style='mso-ansi-language:EN-US'>Notes</span>):<span
-style='mso-tab-count:1'> \
</span></i>Добавить
-редакторские
-заметки к
-Тексту. \
Заметки
-станут видны
-другим
-пользователям
-в тот момент,
-когда вы
-отправите
-Текст на Стол.
-Заметки не
-являются
-частью
-Текста и не
-отображаются
-при \
публикации.<i><span
-style='mso-tab-count:1'> </span><o:p></o:p></i></p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:108.0pt;
-margin-bottom:.0001pt;text-indent:-108.0pt'><i>Проследить
-(</i><i><span lang=EN-US style='mso-ansi-language:EN-US'>Trail</span>):</i><span
-style='mso-tab-count:1'> \
</span>Показывает
-все Столы, на
-которых
-когда-либо
-размещался
-данный Текст.
-(Для нового
-элемента
-показывает
-пустой
-список).</p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:108.0pt;
-margin-bottom:.0001pt;text-indent:-108.0pt'><b><i><span lang=EN-US
-style='mso-ansi-language:EN-US'>ID</span>:<span style='mso-tab-count:1'> \
</span></i></b>Идентификационный
-номер Текста
-(присваивается
-автоматически).</p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;
-margin-bottom:.0001pt;text-indent:-36.0pt'><b><i>Тип
-Текста (</i></b><b><i><span lang=EN-US
-style='mso-ansi-language:EN-US'>Story</span><span lang=EN-US> \
</span></i></b><b><i><span
-lang=EN-US style='mso-ansi-language:EN-US'>Type</span>):</i></b><span
-style='mso-tab-count:1'> \
</span>Статья,
-Колонка,
-Обзор или
-Обложка.<i><span style='mso-tab-count:
-1'> </span><o:p></o:p></i></p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:108.0pt;
-margin-bottom:.0001pt;text-indent:-108.0pt'><i><span lang=EN-US
-style='mso-ansi-language:EN-US'>URI</span>:</i><span style='mso-tab-count:1'> \
</span>Адрес
-Текста на
-вашем
-сервере. Он
-включает \
<i>Категорию</i>
-и <i>Подкаталог</i>,
-которые вы
-выбрали на
-предыдущей
-странице.
-Нажав на
-ссылку <span lang=EN-US \
style='mso-ansi-language:
-EN-US'>URI</span><span lang=EN-US> </span>вы
-можете
-просмотреть
-Текст.</p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:108.0pt;
-margin-bottom:.0001pt;text-indent:-36.0pt'><i>*</i>Примечание:
-просмотр
-будет пустым,
-если вы еще
-не ввели
-текст.</p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;
-margin-bottom:.0001pt;text-indent:-36.0pt'><b><i>Источник
-(</i></b><b><i><span lang=EN-US \
style='mso-ansi-language:EN-US'>Source</span>):</i></b><i><span
-style='mso-tab-count:1'> \
</span></i>Описание
-источника,
-предоставившего
-данный Текст.
-</p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;
-margin-bottom:.0001pt;text-indent:-36.0pt'><b><i>Приоритет
-(</i></b><b><i><span lang=EN-US \
style='mso-ansi-language:EN-US'>Priority</span>):</i><span
-style='mso-tab-count:1'> \
</span></b>Говорит
-о степени
-срочности
-Текста.<i><span style='mso-tab-count:1'> \
</span><o:p></o:p></i></p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:108.0pt;
-margin-bottom:.0001pt;text-indent:-108.0pt'><i>Заголовок
-(</i><i><span lang=EN-US style='mso-ansi-language:EN-US'>Title</span>):<span
-style='mso-tab-count:1'> \
</span></i>Заголовок
-текста.</p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:72.0pt;
-margin-bottom:.0001pt;text-indent:-72.0pt'><span style='mso-tab-count:2'> \
</span>*Примечание:
-Поля
-«Приоритет» и
-«Заголовок» \
должны
-быть \
обязательно
-заполнены
-прежде, чем
-Текст будет
-сохранен.</p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:108.0pt;
-margin-bottom:.0001pt;text-indent:-108.0pt'><b><i>Описание
-(</i></b><b><i><span lang=EN-US \
style='mso-ansi-language:EN-US'>Description</span>):<span
-style='mso-tab-count:1'> \
</span></i></b>Краткое
-описание
-Текста. Может
-быть \
использовано
-в качестве
-аннотации (<span
-lang=EN-US style='mso-ansi-language:EN-US'>teaser</span>).<i><o:p></o:p></i></p>
-
-<p class=MsoNormal style='margin-left:108.0pt;text-indent:-108.0pt'><i>Подкаталог
-(</i><i><span lang=EN-US style='mso-ansi-language:EN-US'>Slug</span>):</i><span
-style='mso-tab-count:1'> \
</span>Идентификатор,
-который
-используется
-в качестве
-имени
-подкаталога,
-в котором \
хранится
-файл текста. </p>
-
-<p class=MsoNormal style='margin-left:108.0pt;text-indent:-108.0pt'><i>Заглавная
-дата (</i><i><span lang=EN-US style='mso-ansi-language:
-EN-US'>Cover</span><span lang=EN-US> </span></i><i><span lang=EN-US
-style='mso-ansi-language:EN-US'>Date</span>):</i><span style='mso-tab-count:
-1'> </span>Дата,
-которая
-будут
-отображаться
-с Текстом
-(это не
-обязательно
-дата
-размещения
-на сайте, но
-это та дата
-публикации,
-которую \
увидят
-читатели).</p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;
-margin-bottom:.0001pt;text-indent:-36.0pt'><b><i>Срок
-хранения (</i></b><b><i><span
-lang=EN-US style='mso-ansi-language:EN-US'>Expire</span><span lang=EN-US> \
</span></i></b><b><i><span
-lang=EN-US style='mso-ansi-language:EN-US'>Date</span>):</i></b><span
-style='mso-tab-count:1'> </span>Дата и
-время
-исключения
-Текста из \
публикации.</p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-<h3>2) Содержимое (<span
-lang=EN-US style='mso-ansi-language:EN-US'>Content</span>)</h3>
-
-<p class=MsoNormal>Здесь вы
-оформляете
-Текст,
-редактируя
-его \
существующие
-Элементы и
-добавляя
-новые. Каждый
-тип Текста
-имеет свое
-собственное
-множество
-Элементов –
-некоторые
-добавляются
-автоматически,
-а некоторые
-включаются \
дополнительно.</p>
-
-<p class=MsoNormal style='margin-left:72.0pt'>*Примечание:
-Пользователи
-с
-административным
-доступом
-могут
-редактировать
-множества
-Элементов
-для каждого
-типа Текста,
-а также
-создавать
-новые
-элементы.</p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-<p class=MsoNormal>Нажмите
-клавишу
-«Редактировать»,
-расположенную
-рядом с
-элементом,
-для перехода
-на страницу
-Профиля \
Элемента.
-На этой
-странице вы
-сможете
-вставить
-текст и
-выбрать
-атрибуты. Для
-добавления
-нового
-Элемента
-выберите его
-в выпадающем
-меню, а затем
-нажмите
-клавишу
-«Добавить \
Элемент».
-В этом случае
-вы
-автоматически
-перейдете на
-страницу
-Профиля
-нового
-Элемента, где
-и сможете
-задать все
-необходимые
-данные. </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;
-margin-bottom:.0001pt;text-indent:-36.0pt'><b><i>Упорядочить
-(</i></b><b><i><span lang=EN-US \
style='mso-ansi-language:EN-US'>Reorder</span>):</i></b><i><span
-style='mso-tab-count:1'> </span></i>Для
-того, чтобы
-изменить
-порядок
-Элементов,
-измените их
-порядковые
-номера в
-выпадающем
-меню, а затем
-нажмите
-клавишу \
«Упорядочить».</p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;
-margin-bottom:.0001pt;text-indent:-36.0pt'><b><i>Удалить
-(</i></b><b><i><span lang=EN-US \
style='mso-ansi-language:EN-US'>Delete</span>):</i><span
-style='mso-tab-count:1'> </span></b>Для
-удаления
-материалов
-поставьте
-отметку в
-окошке рядом,
-а затем \
нажмите
-клавишу
-«Удалить».</p>
-
-<p class=MsoNormal style='margin-left:72.0pt;text-indent:-72.0pt'><span
-style="mso-spacerun: yes"> </span></p>
-
-<h3>3) Категории (<span
-lang=EN-US style='mso-ansi-language:EN-US'>Categories</span>)</h3>
-
-<p class=MsoNormal>Категории
-определяют
-то место на
-сайте куда
-материалы
-публикуются.
-Материалы
-могут
-находиться в
-одной
-категории
-или в \
нескольких,
-но только
-одна из них
-указывается
-в качестве
-Первичной
-Категории. В
-начале
-единственной
-Категорией
-для Текста
-будет та,
-которую вы
-выберите на
-странице
-«Новый Текст».
-Для того,
-чтобы
-добавить
-категорию,
-выберите ее в
-выпадающем
-меню, а затем
-нажмите
-«Добавить
-категорию».</p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;
-margin-bottom:.0001pt;text-indent:-36.0pt'><b><i>Первичная
-(</i></b><b><i><span lang=EN-US \
style='mso-ansi-language:EN-US'>Primary</span>):</i></b><span
-style='mso-tab-count:1'> </span>Для
-того, чтобы
-указать
-новую
-Категорию в \
качестве
-Первичной,
-поставьте
-отметку в \
кружочке
-рядом с ней, а
-затем
-нажмите
-клавишу \
«Сохранить»
-или
-«Сохранить и
-остаться» в
-конце
-страницы.</p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;
-margin-bottom:.0001pt;text-indent:-36.0pt'><b><i>Удалить
-(</i></b><b><i><span lang=EN-US \
style='mso-ansi-language:EN-US'>Delete</span>):</i></b><span
-style='mso-tab-count:1'> </span>Для
-удаления
-Категории
-поставьте
-отметку в \
окошке
-рядом с ней, а
-затем
-нажмите
-клавишу \
«Удалить».
-Можно \
удалить
-несколько \
Категорий
-одновременно.</p>
-
-<p class=MsoNormal style='tab-stops:63.0pt'><i><![if \
!supportEmptyParas]> <![endif]><o:p></o:p></i></p>
-
-<h3>4) Связи (<span lang=EN-US \
style='mso-ansi-language:
-EN-US'>Associations</span>)</h3>
-
-<p class=MsoNormal>В данном
-разделе вы
-задаете
-метаинформацию
-(информацию,
-которая
-встраивается
-в Тексты, но
-не
-отображается).
-Эта
-информация
-позволяет
-выполнять
-более точный
-поиск и
-автоматически
-выстраивать
-связи между \
Текстами.</p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-<p class=MsoNormal><b><i>Ключевые
-слова (</i></b><b><i><span lang=EN-US
-style='mso-ansi-language:EN-US'>Keywords</span>):<span style='mso-tab-count:
-1'> </span><o:p></o:p></i></b></p>
-
-<p class=MsoNormal style='margin-left:36.0pt'>Введите
-какие-либо
-слова или
-фразы, \
относящиеся
-к теме Текста,
-которые
-помогут
-тематически
-связать его с
-другими
-Текстами, а
-также
-облегчат
-архивные
-поиски.
-Нажмите
-«Редактировать»
-для перехода
-на страницу
-редактирования
-ключевых
-слов, где
-зададите
-необходимые
-ключевые
-слова в
-пустых полях.
-Нет
-необходимости
-заполнять
-все пустые
-строки, но вы
-можете, если
-необходимо,
-добавить
-новые, нажав
-клавишу \
«Добавить
-еще». По
-завершении
-нажмите
-«Сохранить».</p>
-
-<p class=MsoNormal><b><i>Авторы \
(</i></b><b><i><span
-lang=EN-US style='mso-ansi-language:EN-US'>Contributors</span>):<o:p></o:p></i></b></p>
-
-<p class=MsoNormal style='margin-left:36.0pt'>Введите
-имена
-авторов
-материалов,
-включая
-писателя и
-любого
-фотографа
-или \
иллюстратора,
-которые \
принимали
-участие в
-создании
-Текста.
-Нажмите \
«Редактировать»
-для перехода
-на страницу \
Присоединения
-Авторов. В
-списке
-«Выберите \
Авторов»
-найдите
-нужное имя и
-нажмите
-«Присоединить».
-На следующей
-странице
-выберите \
роль
-Автора и
-нажмите
-«Далее». По
-завершении \
нажмите
-«Сохранить».</p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-<h1 style='margin:0cm;margin-bottom:.0001pt'><span style='font-size:20.0pt;
-mso-bidi-font-size:24.0pt'>Найти</span><span
-style='font-size:20.0pt;mso-bidi-font-size:24.0pt;mso-ansi-language:EN-US'> \
</span><span
-style='font-size:20.0pt;mso-bidi-font-size:24.0pt'>Текст</span><span
-lang=EN-US style='font-size:20.0pt;mso-bidi-font-size:24.0pt;mso-ansi-language:
-EN-US'> (Find Story)<o:p></o:p></span></h1>
-
-<p class=MsoNormal>В данном \
режиме
-вы можете \
провести
-поиск
-существующего
-Текста на
-всех Столах.<span
-style="mso-spacerun: yes"> </span></p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;
-margin-bottom:.0001pt;text-indent:-36.0pt'><b><i>Простой
-поиск (</i></b><b><i><span lang=EN-US
-style='mso-ansi-language:EN-US'>Simple</span><span lang=EN-US> \
</span></i></b><b><i><span
-lang=EN-US style='mso-ansi-language:EN-US'>Search</span>):</i></b><span
-style='mso-tab-count:1'> \
</span>Стандартный
-поиск очень \
прост:
-задайте \
заголовок,
-<span lang=EN-US style='mso-ansi-language:EN-US'>URL</span><span lang=EN-US> \
</span>или
-ключевое
-слово и
-нажмите \
«Поиск».
-Для того, \
чтобы
-получить \
полный
-список \
Текстов,
-оставьте \
поля
-пустыми и
-нажмите \
«Поиск».</p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;
-margin-bottom:.0001pt;text-indent:-36.0pt'><b><i>Расширенный
-поиск (</i></b><b><i><span lang=EN-US
-style='mso-ansi-language:EN-US'>Advanced</span><span lang=EN-US> \
</span></i></b><b><i><span
-lang=EN-US style='mso-ansi-language:EN-US'>Search</span>):</i></b><span
-style='mso-tab-count:1'> </span>В
-данном
-режиме вы
-можете более
-точно \
указать
-какие именно
-Тексты вы
-хотите найти.
-Заполните
-все или часть
-полей и
-нажмите \
«Поиск».
-Для сброса \
условий
-поиска \
нажмите
-клавишу \
«Сброс
-значений».</p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;
-margin-bottom:.0001pt;text-indent:-36.0pt'><b><i>Найденные
-Тексты (</i></b><b><i><span lang=EN-US
-style='mso-ansi-language:EN-US'>Stories</span><span lang=EN-US> \
</span></i></b><b><i><span
-lang=EN-US style='mso-ansi-language:EN-US'>Found</span>):</i></b><span
-style='mso-tab-count:1'> \
</span>Нажмите
-«Редактировать»
-рядом с \
нужным
-Текстом для
-перехода на
-страницу его
-Профиля.</p>
-
-<p style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;
-margin-bottom:.0001pt;text-indent:-36.0pt'><b><i>Создать
-новый Текст \
(</i></b><b><i><span
-lang=EN-US style='mso-ansi-language:EN-US'>Create</span><span lang=EN-US> \
</span></i></b><b><i><span
-lang=EN-US style='mso-ansi-language:EN-US'>a</span><span lang=EN-US> \
</span></i></b><b><i><span
-lang=EN-US style='mso-ansi-language:EN-US'>New</span><span lang=EN-US> \
</span></i></b><b><i><span
-lang=EN-US style='mso-ansi-language:EN-US'>Story</span>):</i></b><span
-style='mso-tab-count:1'> </span>Если
-вы не можете
-найти то что
-вам нужно \
среди
-существующих
-Текстов, то
-почему бы не
-создать
-новый Текст?
-По этой \
ссылке
-вы перейдете \
на
-страницу \
«Новый
-Текст».</p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-<h1 style='margin:0cm;margin-bottom:.0001pt'><span style='font-size:20.0pt;
-mso-bidi-font-size:24.0pt'>Активные
-Тексты (</span><span lang=EN-US
-style='font-size:20.0pt;mso-bidi-font-size:24.0pt;mso-ansi-language:EN-US'>Active</span><span
-lang=EN-US style='font-size:20.0pt;mso-bidi-font-size:24.0pt'> </span><span
-lang=EN-US style='font-size:20.0pt;mso-bidi-font-size:24.0pt;mso-ansi-language:
-EN-US'>Stories</span><span \
style='font-size:20.0pt;mso-bidi-font-size:24.0pt'>)<o:p></o:p></span></h1>
-
-<p class=MsoNormal>Просмотр <span
-lang=EN-US style='mso-ansi-language:EN-US'>списка</span>
-всех
-активных
-Текстов (<span lang=EN-US
-style='mso-ansi-language:EN-US'>Stories</span>), а
-также
-соответствующей
-сопроводительной
-информации. \
Нажмите
-«Редактировать»
-рядом с
-Текстом,
-чтобы
-изменить его
-Профиль.<o:p></o:p></p>
-
-<h5 style='margin-left:0cm;text-indent:0cm'><span lang=EN-US style='font-size:
-16.0pt;mso-bidi-font-size:12.0pt;mso-ansi-language:EN-US'><![if \
!supportEmptyParas]> <![endif]><o:p></o:p></span></h5>
-
-</div>
-
-</body>
-
-</html>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/story/actions.html (from rev \
6084, bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/story/actions.html)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/story/category.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/story/category.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/story/category.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,20 +0,0 @@
-<help page="Story Category Profile">
-
-<p>
-<dl>
-
-<dt>Òåêóùèå Êàòåãîðèè</dt>
-<dd>Ïîêàçûâàåò ñïèñîê êàòåãîðèé, ñâÿçàííûõ ñ äàííûì òåêñòîì. Íàæìèòå ññûëêó \
«Ïåðâè÷íàÿ» (Primary) äëÿ òîãî, ÷òîáû ïðèñâîèòü êàòåãîðèè ñòàòóñ ïåðâè÷íîé. Ïîñòàâüòå \
îòìåòêó «Óäàëèòü» (Delete) è êàòåãîðèÿ áóäåò îòñîåäèíåíà îò òåêñòà â ìîìåíò \
ñîõðàíåíèÿ èçìåíåíèé.</dd>
-
-<dt>Ïîèñê</dt>
-<dd>Ïîèñê îñòàâøèõñÿ (íåñâÿçàííûõ) êàòåãîðèé ïî èìåíè.</dd>
-
-<dt> ûáåðèòå Êàòåãîðèè</dt>
-<dd>Ïîêàçûâàåò ñïèñîê êàòåãîðèé, óäîâëåòâîðÿþùèõ óñëîâèÿì ïîèñêà. Íàæìèòå ññûëêó \
«Àññîöèèðîâàòü» (Associate) äëÿ ñâÿçûâàíèÿ êàòåãîðèè ñ òåêñòîì.</dd>
-
-</dl>
-</p>
-
-<p>Ïî çàâåðøåíèè íàæìèòå êëàâèøó <i>«Ñîõðàíèòü» (Save)</i>.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/story/category.html (from \
rev 6084, bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/story/category.html)
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/story/container (from rev \
6084, bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/story/container)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/story/container/edit_super_bulk.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/story/container/edit_super_bulk.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/story/container/edit_super_bulk.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,83 +0,0 @@
-<help page="Super Bulk Edit">
-
-<p>Èíòåðôåéñ «Îáùåå ðåäàêòèðîâàíèå» èñïîëüçóåòñÿ äëÿ îäíîâðåìåííîé êîððåêòèðîâêè \
âñåõ ïîëåé âñåõ ñóáýëåìåíòîâ çàäàííîãî ýëåìåíòà. Ïîëÿ è ñóáýëåìåíòû ðàçäåëÿþòñÿ \
çíàêîì (=), çà êîòîðûì ñëåäóåò êëþ÷åâîå èìÿ ïîëÿ èëè ñóáýëåìåíòà. Òýãè ïîëÿ \
çàâåðøàþòñÿ ïóñòîé ñòðîêîé, çà êîòîðîé ñëåäóåò ñîáñòâåííî òåêñò ïîëÿ. Ïðåäïîëàãàåòñÿ, \
÷òî òåêñò ïîëÿ ñàì ïî ñåáå ìîæåò ñîäåðæàòü ïóñòûå ñòðîêè. Òýãè ñóáýëåìåíòà ñàìè \
ñóùåñòâóþò â ñòðîêå, íî <em>èõ</em> ïîëÿ íå ìîãóò áûòü íàïðÿìóþ \
îòðåäàêòèðîâàíû.</p>
-
-<p>Íàïðèìåð, äëÿ òîãî, ÷òîáû îòðåäàêòèðîâàòü ýëåìåíò, ñîäåðæàùèé ïîëÿ «çàãîëîâîê» è \
«àáçàö», à òàêæå ñóáýëåìåíò «âñòàâêà», ñèíòàêñèñ «Îáùåãî ðåäàêòèðîâàíèÿ» ìîã áû \
âûãëÿäåòü ñëåäóþùèì îáðàçîì:</p>
-
-<pre><code>=header
-
-Ýòî çàãîëîâîê
-
-=paragraph
-
-Ïåðâûé àáçàö.
-
-=paragraph
-
- òîðîé àáçàö.
-
-=inset
-
-=paragraph
-
-Òðåòèé àáçàö.
-</code></pre>
-
-<p>Äëÿ ïåðåóïîðÿäî÷èâàíèÿ ñîäåðæèìîãî ýëåìåíòà ïðîñòî ïåðåìåñòèòå íà íîâîå ìåñòî \
ñîäåðæèìîå îñòàëüíûõ ýëåìåíòîâ è ñîîòâåòñòâóþùèõ èì òýãîâ. Íàïðèìåð, åñëè âû õîòèòå \
ïåðåìåñòèòü çàãîëîâîê â ïðèâåäåííîì ïðèìåðå è ïîñòàâèòü åãî ïîñëå ïåðâîãî àáçàöà, òî \
ïðîñòî îòðåäàêòèðóéòå åãî ñëåäóþùèì îáðàçîì:</p>
-
-<pre><code>=paragraph
-
-Ïåðâûé àáçàö.
-
-=header
-
-Ýòî çàãîëîâîê
-
-=paragraph
-
- òîðîé àáçàö.
-
-=inset
-
-=paragraph
-
-Òðåòèé àáçàö.
-</code></pre>
-
-<p>Ñ öåëüþ ýêîíîìèè ïðîñòðàíñòâà è óïðîùåíèÿ ðåäàêòèðîâàíèÿ âû ìîæåòå âûáðàòü \
«Ýëåìåíò ïî óìîë÷àíèþ» (Default Element), äëÿ êîòîðîãî íèêàêèõ òýãîâ íå íóæíî. \
Íàïðèìåð, åñëè «àáçàö» âûáðàí â êà÷åñòâå ýëåìåíòà ïî óìîë÷àíèþ, òî ïðèâåäåííûé ïðèìåð \
ïðèíÿë áû ñëåäóþùèé âèä:</p>
-
-<pre><code>Ïåðâûé àáçàö.
-
-=header
-
-Ýòî çàãîëîâîê
-
- òîðîé àáçàö.
-
-=inset
-
-Òðåòèé àáçàö.
-</code></pre>
-
-<p>È íàêîíåö, çàìåòèì, ÷òî ïóñòûå ïîëÿ âñå æå äîëæíû ñîäåðæàòü ïóñòóþ ñòðîêó, \
îáîçíà÷àþùóþ ïóñòîå ïîëå. Íàïðèìåð, åñëè áû â ïðèâåäåííîì ïðèìåðå ïðèñóòñòâîâàëî ïîëå \
«link_text», íå ñîäåðæàùåå íèêàêîãî òåêñòà, òî ýòî áû âûãëÿäåëî ñëåäóþùèì \
îáðàçîì:</p>
-
-<pre><code>Ïåðâûé àáçàö.
-
-=header
-
-Ýòî çàãîëîâîê
-
-=link_text
-
-
-
- òîðîé àáçàö.
-
-=inset
-
-Òðåòèé àáçàö.
-</code></pre>
-
-<p>Îáðàòèòå âíèìàíèå íà äîïîëíèòåëüíûå ïóñòûå ñòðîêè ïîñëå òýãà \
<code>=link_text</code>. Òàêîé ñèíòàêñèñ íåîáõîäèì äëÿ òîãî, ÷òîáû ÁÐÈÊÎËÀÆ ìîã \
ðàñïîçíàòü, ÷òî ïîëå ñóùåñòâóåò, íî íå ñîäåðæèò äàííûõ.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/story/container/edit_super_bulk.html \
(from rev 6084, bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/story/container/edit_super_bulk.html)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/story/contributor_role.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/story/contributor_role.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/story/contributor_role.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,12 +0,0 @@
-<help page="Story Contributor Role Profile">
-
-<p>
-<dl>
-
-<dt> ûáåðèòå Ðîëü</dt>
-<dd> ûáåðèòå ðîëü èç âñïëûâàþùåãî ìåíþ è íàæìèòå «Äàëåå» (Next). Ðîëè äîáàâëÿþòñÿ \
ïðè íàæàòèè êëàâèøè «Äàëåå» íà ñòðàíèöå Ìåíåäæåðà Àâòîðîâ.</dd>
-
-</dl>
-</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/story/contributor_role.html \
(from rev 6084, bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/story/contributor_role.html)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/story/contributors.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/story/contributors.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/story/contributors.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,20 +0,0 @@
-<help page="Story Contributors Profile">
-
-<p>
-<dl>
-
-<dt>Òåêóùèå Àâòîðû</dt>
-<dd>Ïîêàçûâàåò ñïèñîê àâòîðîâ, ñâÿçàííûõ ñ äàííûì òåêñòîì. Íàæìèòå ññûëêó «Ðîëü» \
(Role) äëÿ òîãî, ÷òîáû èçìåíèòü ðîëü àâòîðà. Ïîñòàâüòå îòìåòêó «Óäàëèòü» (Delete) è \
àâòîð áóäåò îòñîåäèíåí îò òåêñòà â ìîìåíò ñîõðàíåíèÿ èçìåíåíèé.</dd>
-
-<dt>Ïîèñê</dt>
-<dd>Ïîèñê îñòàâøèõñÿ (íåñâÿçàííûõ) àâòîðîâ ïî ôàìèëèè.</dd>
-
-<dt> ûáåðèòå Àâòîðîâ</dt>
-<dd>Ïîêàçûâàåò ñïèñîê àâòîðîâ, óäîâëåòâîðÿþùèõ óñëîâèÿì ïîèñêà. Íàæìèòå ññûëêó \
«Àññîöèèðîâàòü» (Associate) äëÿ ñâÿçûâàíèÿ àâòîðà ñ òåêñòîì.</dd>
-
-</dl>
-</p>
-
-<p>Ïî çàâåðøåíèè íàæìèòå êëàâèøó <i>«Ñîõðàíèòü» (Save)</i>.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/story/contributors.html \
(from rev 6084, bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/story/contributors.html)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/story/desks.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/story/desks.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/story/desks.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,484 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List href="./desks.files/filelist.xml">
-<title>My Workspace</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Author>CBrody</o:Author>
- <o:Template>Normal</o:Template>
- <o:LastAuthor>Sergey Samoilenko</o:LastAuthor>
- <o:Revision>3</o:Revision>
- <o:TotalTime>23</o:TotalTime>
- <o:LastPrinted>2001-09-10T19:03:00Z</o:LastPrinted>
- <o:Created>2001-09-26T22:09:00Z</o:Created>
- <o:LastSaved>2003-10-30T17:28:00Z</o:LastSaved>
- <o:Pages>2</o:Pages>
- <o:Words>393</o:Words>
- <o:Characters>2244</o:Characters>
- <o:Company>About.com, Inc.</o:Company>
- <o:Lines>18</o:Lines>
- <o:Paragraphs>4</o:Paragraphs>
- <o:CharactersWithSpaces>2755</o:CharactersWithSpaces>
- <o:Version>9.3821</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:View>Normal</w:View>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0cm;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";
- color:windowtext;}
-h1
- {margin-right:0cm;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0cm;
- mso-pagination:widow-orphan;
- mso-outline-level:1;
- font-size:24.0pt;
- font-family:"Times New Roman";
- color:black;
- mso-font-kerning:18.0pt;
- font-weight:bold;}
-h2
- {margin-right:0cm;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0cm;
- mso-pagination:widow-orphan;
- mso-outline-level:2;
- font-size:18.0pt;
- font-family:"Times New Roman";
- color:black;
- font-weight:bold;}
-h3
- {mso-style-next:Normal;
- margin:0cm;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- page-break-after:avoid;
- mso-outline-level:3;
- font-size:12.0pt;
- font-family:"Times New Roman";
- color:windowtext;
- font-weight:bold;}
-h4
- {mso-style-next:Normal;
- margin:0cm;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- page-break-after:avoid;
- mso-outline-level:4;
- font-size:20.0pt;
- mso-bidi-font-size:12.0pt;
- font-family:"Times New Roman";
- color:windowtext;
- font-weight:normal;}
-h5
- {mso-style-next:Normal;
- margin-top:0cm;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:108.0pt;
- margin-bottom:.0001pt;
- text-indent:-108.0pt;
- mso-pagination:widow-orphan;
- page-break-after:avoid;
- mso-outline-level:5;
- font-size:22.0pt;
- mso-bidi-font-size:12.0pt;
- font-family:"Times New Roman";
- color:windowtext;
- font-weight:normal;}
-h6
- {mso-style-next:Normal;
- margin:0cm;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- page-break-after:avoid;
- mso-outline-level:6;
- font-size:14.0pt;
- mso-bidi-font-size:12.0pt;
- font-family:"Times New Roman";
- color:windowtext;
- font-weight:bold;}
-p.MsoHeading7, li.MsoHeading7, div.MsoHeading7
- {mso-style-next:Normal;
- margin-top:0cm;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:108.0pt;
- margin-bottom:.0001pt;
- text-indent:-108.0pt;
- mso-pagination:widow-orphan;
- page-break-after:avoid;
- mso-outline-level:7;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";
- color:windowtext;
- font-weight:bold;}
-p.MsoBodyTextIndent, li.MsoBodyTextIndent, div.MsoBodyTextIndent
- {margin-top:0cm;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:36.0pt;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";
- color:windowtext;}
-a:link, span.MsoHyperlink
- {color:blue;
- text-decoration:underline;
- text-underline:single;}
-a:visited, span.MsoHyperlinkFollowed
- {color:purple;
- text-decoration:underline;
- text-underline:single;}
-p
- {margin-right:0cm;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0cm;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";
- color:black;}
-p.Normal, li.Normal, div.Normal
- {mso-style-name:Normal;
- margin:0cm;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";
- color:windowtext;}
-@page Section1
- {size:612.0pt 792.0pt;
- margin:72.0pt 90.0pt 72.0pt 90.0pt;
- mso-header-margin:36.0pt;
- mso-footer-margin:36.0pt;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=RU link=blue vlink=purple style='tab-interval:36.0pt'>
-
-<div class=Section1>
-
-<h5 style='margin-left:0cm;text-indent:0cm'>СТОЛЫ
-(<span lang=EN-US style='mso-ansi-language:EN-US'>DESKS</span>)<span
-style='font-size:20.0pt;mso-bidi-font-size:12.0pt'><o:p></o:p></span></h5>
-
-<p class=MsoNormal>Концепция
-Столов
-позволяет
-вам и вашим
-коллегам
-совместно
-использовать
-и обмениваться
-материалами.</p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-<p class=MsoNormal>После
-того, как вы
-создали и
-сохранили
-новый
-материал, он
-помещается в
-ваше рабочее
-пространство.
-После этого
-вы можете \
<i>отправить</i>
-его на
-Рабочий Стол
-для того,
-чтобы \
сделать
-его
-доступным
-другим
-сотрудникам
-компании.
-Пользователь
-может
-перемещать
-материалы с
-одного
-Рабочего
-Стола на
-другой для
-выполнения
-необходимых
-правок и
-корректировок
-до тех пор,
-пока
-материалы не
-будут готовы
-к публикации.</p>
-
-<p class=MsoNormal><span lang=EN-US style='mso-ansi-language:EN-US'><![if \
!supportEmptyParas]> <![endif]><o:p></o:p></span></p>
-
-<p class=MsoNormal>Рабочий
-Стол
-функционирует
-в основном
-так же, как и
-ваше Рабочее
-пространство
-– это просто
-некое
-пространственное
-обобщение.
-Например,
-если
-фотографии
-располагаются
-на «Арт-столе» (<span
-lang=EN-US style='mso-ansi-language:EN-US'>Art</span><span lang=EN-US> </span><span
-lang=EN-US style='mso-ansi-language:EN-US'>Desk</span>), то
-любой
-пользователь,
-имеющий
-доступ к \
«Арт-столу»,
-будет иметь
-доступ к этим
-фотографиям.
-Хотя<span style='mso-ansi-language:EN-US'> \
</span>редактировать<span
-style='mso-ansi-language:EN-US'> </span>их<span \
style='mso-ansi-language:
-EN-US'> </span>сможет<span
-style='mso-ansi-language:EN-US'> \
</span>только<span
-style='mso-ansi-language:EN-US'> </span>один<span
-style='mso-ansi-language:EN-US'> </span>из<span \
style='mso-ansi-language:
-EN-US'> </span>пользователей<span
-lang=EN-US style='mso-ansi-language:EN-US'>.</span></p>
-
-<p style='margin:0cm;margin-bottom:.0001pt'><b><span lang=EN-US
-style='mso-ansi-language:EN-US'><![if \
!supportEmptyParas]> <![endif]><o:p></o:p></span></b></p>
-
-<h3><span style='font-size:14.0pt;mso-bidi-font-size:12.0pt'>СТОЛЫ:
-Свойства \
размещенных
-материалов<o:p></o:p></span></h3>
-
-<p class=MsoNormal><b><i>Заголовок
-(</i></b><b><i><span lang=EN-US \
style='mso-ansi-language:EN-US'>Title</span>)<o:p></o:p></i></b></p>
-
-<p class=MsoNormal style='margin-left:36.0pt'>Нажмите
-на эту ссылку
-для
-просмотра
-материалов в
-новом окне
-(за
-исключением
-Шаблонов (<span lang=EN-US
-style='mso-ansi-language:EN-US'>Templates</span>)).</p>
-
-<p class=MsoNormal><b><i>Категория
-(</i></b><b><i><span lang=EN-US \
style='mso-ansi-language:EN-US'>Category</span>)<o:p></o:p></i></b></p>
-
-<p class=MsoNormal style='margin-left:36.0pt'>Это
-то место на \
сайте,
-где
-размещаются
-материалы.</p>
-
-<p class=MsoNormal><b><i>Заглавная
-дата (</i></b><b><i><span lang=EN-US \
style='mso-ansi-language:
-EN-US'>Cover</span><span lang=EN-US> </span></i></b><b><i><span lang=EN-US
-style='mso-ansi-language:EN-US'>Date</span>)<o:p></o:p></i></b></p>
-
-<p class=MsoBodyTextIndent>Это дата,
-которая \
отправляется
-вместе с
-материалами
-(это не
-обязательно
-дата
-размещения
-на сайте, но
-это та дата
-публикации,
-которую
-увидят
-читатели).</p>
-
-<p class=MsoNormal><b><i>Приоритет
-(</i></b><b><i><span lang=EN-US \
style='mso-ansi-language:EN-US'>Priority</span>)<o:p></o:p></i></b></p>
-
-<p class=MsoNormal style='margin-left:36.0pt'>Показывает
-степень \
срочности
-материалов.</p>
-
-<p class=MsoNormal><b><i>Загрузить</i></b><b><i><span
-lang=EN-US style='mso-ansi-language:EN-US'> (Check \
Out)<o:p></o:p></span></i></b></p>
-
-<p class=MsoNormal style='margin-left:36.0pt'>Помещает
-материалы в
-ваше Рабочее
-Пространство
-для
-редактирования.
-Когда
-материалы
-загружены,
-они остаются
-на последнем
-использованном
-Рабочем
-Столе и могут
-быть \
просмотрены
-там. Однако
-они не могут
-быть \
загружены
-другим
-пользователем
-до тех пор,
-пока текущий
-пользователь
-не отправит
-их обратно на
-Стол. </p>
-
-<p class=MsoNormal><b><i>Отправить</i></b><b><i><span
-lang=EN-US style='mso-ansi-language:EN-US'> (Check In)<o:p></o:p></span></i></b></p>
-
-<p class=MsoNormal style='margin-left:36.0pt'>Если
-вы видите,
-что этот
-режим
-доступен, то \
это
-значит, что
-вы уже
-загрузили
-материалы с
-данного
-стола в ваше
-Рабочее
-Пространство.
-Для того
-чтобы другой
-пользователь
-смог
-редактировать
-данные
-материалы, вы
-должны
-нажать на эту
-ссылку для
-отправки \
материалов
-обратно на
-Стол.</p>
-
-<p class=MsoNormal><b><i>Переместить
-(</i></b><b><i><span lang=EN-US style='mso-ansi-language:EN-US'>Move</span><span
-lang=EN-US> </span></i></b><b><i><span lang=EN-US style='mso-ansi-language:
-EN-US'>to</span>,
-выпадающий
-список)<o:p></o:p></i></b></p>
-
-<p class=MsoNormal style='margin-left:36.0pt'>Перемещает
-материалы на
-другой Стол.
-Выберите
-нужный Стол и
-нажмите
-клавишу \
«Переместить
-материалы» в
-конце
-страницы. \
Перемещать
-можно
-произвольное
-количество \
материалов.
-Кроме этого,
-вы можете
-перемещать
-материалы со \
Стола
-на Стол даже
-тогда, когда
-она
-загружены
-для
-редактирования
-другим
-пользователем.
-Материалы и
-на новом
-Столе \
сохранят
-статус \
«Загружены».<i><o:p></o:p></i></p>
-
-<p class=MsoNormal><b><i>Заметки \
(</i></b><b><i><span
-lang=EN-US style='mso-ansi-language:EN-US'>Notes</span>)<o:p></o:p></i></b></p>
-
-<p class=MsoNormal style='margin-left:36.0pt'>Просмотр
-каких-либо
-заметок,
-которые \
пользователи
-прикрепили к
-данным
-материалам.</p>
-
-<p class=MsoNormal><b><i>Проследить
-(</i></b><b><i><span lang=EN-US \
style='mso-ansi-language:EN-US'>Trail</span>)<o:p></o:p></i></b></p>
-
-<p class=MsoNormal style='margin-left:36.0pt'>Показывает
-все Столы, на
-которых
-когда-либо
-размещались
-материалы.</p>
-
-<p class=MsoNormal><b><i>Редактировать
-(</i></b><b><i><span lang=EN-US \
style='mso-ansi-language:EN-US'>Edit</span>)<o:p></o:p></i></b></p>
-
-<p class=MsoNormal style='margin-left:36.0pt'>Этот
-режим \
доступен
-вам только в
-том случае,
-если
-материалы
-загружены в
-ваше Рабочее
-Пространство.</p>
-
-<p class=MsoNormal><b><i>Журнал \
(</i></b><b><i><span
-lang=EN-US style='mso-ansi-language:EN-US'>Log</span>)<o:p></o:p></i></b></p>
-
-<p class=MsoNormal style='margin-left:36.0pt'>Показывает
-всю историю
-обработки
-данных \
материалов.</p>
-
-<p class=MsoNormal style='margin-left:36.0pt'><![if \
!supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/story/desks.html (from rev \
6084, bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/story/desks.html)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/story/keywords.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/story/keywords.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/story/keywords.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,18 +0,0 @@
-<help page="Story Keywords Profile">
-
-<p>
-<dl>
-
-<dt>Êëþ÷åâûå ñëîâà Êàòåãîðèè</dt>
-<dd>Ïîêàçûâàåò êëþ÷åâûå ñëîâà äëÿ êàæäîé êàòåãîðèè, ñ êîòîðîé ýòîò òåêñò \
ñâÿçàí.</dd>
-
-<dt>Êëþ÷åâûå ñëîâà Òåêñòà</dt>
-<dd> âåäèòå ëþáûå ñëîâà è ôðàçû, êîòîðûå îòíîñÿòñÿ ê òåêñòó è ïîçâîëÿþò íàõîäèòü \
ýòîò òåêñò ïðè âûïîëíåíèè ïîèñêà. àì íå íóæíî çàïîëíÿòü âñå ÷åòûðå ñòðîêè, íî, ïðè \
íåîáõîäèìîñòè, äîïîëíèòåëüíûå ñòðîêè äîáàâëÿþòñÿ íàæàòèåì êëàâèøè <i>«Äîáàâèòü åùå» \
(Add More)</i>.
-</dd>
-
-</dl>
-</p>
-
-<p>Ïî çàâåðøåíèè íàæìèòå êëàâèøó <i>«Ñîõðàíèòü»</i>.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/story/keywords.html (from \
rev 6084, bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/story/keywords.html)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/story/new.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/story/new.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/story/new.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,33 +0,0 @@
-<help page="New Story">
-
-<p>Èñïîëüçóéòå ýòîò èíñòðóìåíò äëÿ ñîçäàíèÿ Òåêñòîâ äëÿ âàøåãî åá-ñàéòà. Ñóùåñòâóþò \
÷åòûðå ðàçëè÷íûõ òèïà Òåêñòîâ, è êàæäûé èç íèõ èìååò íåñêîëüêî ïåðåìåííûõ è \
äîïîëíèòåëüíûõ ýëåìåíòîâ, êîòîðûå âû ìîæåòå èñïîëüçîâàòü äëÿ óïðàâëåíèÿ îòîáðàæåíèåì \
Òåêñòà.</p>
-
-<h3>Ñâîéñòâà (Properties)</h3>
-
-<p><dl>
-<dt>Çàãîëîâîê (Title)</dt>
-<dd>Çàãîëîâîê Òåêñòà. Íåîáõîäèì.</dd>
-
-<dt>Ïîäêàòàëîã (Slug)</dt>
-<dd>Îäíîñëîâíûé èäåíòèôèêàòîð, èñïîëüçóåìûé â êà÷åñòâå çàêëþ÷èòåëüíîé ÷àñòè URI \
äàííîãî Òåêñòà, à òàêæå â êà÷åñòâå ïîäêàòàëîãà, â êîòîðîì ýòîò òåêñò \
ðàçìåùàåòñÿ.</dd>
-
-<dt>Òèï Òåêñòà (Story Type)</dt>
-<dd> ûáåðèòå êàêîé Òåêñò âû ñîçäàåòå. Íåîáõîäèì.</dd>
-
-<dt>Èñòî÷íèê (Source)</dt>
-<dd>Îïèñàíèå èñòî÷íèêà, ïðåäîñòàâèâøåãî Òåêñò.</dd>
-
-<dt>Ïåðâè÷íàÿ êàòåãîðèÿ (Primary Category)</dt>
-<dd>Îñíîâíîå ìåñòî íà ñàéòå, ãäå ïóáëèêóþòñÿ ìàòåðèàëû.</dd>
-
-<dt>Ïðèîðèòåò (Priority)</dt>
-<dd>Ïîêàçûâàåò ñòåïåíü ñðî÷íîñòè Òåêñòà. Íåîáõîäèì.</dd>
-
-<dt>Çàãëàâíàÿ äàòà (Cover Date)</dt>
-<dd> ûáåðèòå äàòó è âðåìÿ, êîòîðûå áóäóò îòîáðàæàòüñÿ ñ Òåêñòîì (ýòî íå îáÿçàòåëüíî \
äàòà ðàçìåùåíèÿ íà ñàéòå, íî ýòî òà äàòà ïóáëèêàöèè, êîòîðóþ óâèäÿò \
÷èòàòåëè).</dd>
-</dl></p>
-
-
-<p>Ïî çàâåðøåíèè íàæìèòå <i>«Ñîçäàòü» (Create).</i> Ïîñëå ýòîãî âû ïîïàäåòå íà \
ñòðàíèöó Ïðîôèëÿ Òåêñòà. Íà ýòîé ñòðàíèöå âû ìîæåòå ââîäèòü äàííûå è äîáàâëÿòü ëþáûå \
ýëåìåíòû, íåîáõîäèìûå äëÿ îôîðìëåíèÿ Òåêñòà. Íå çàáóäüòå íàæàòü «Ñîõðàíèòü» â êîíöå \
ñòðàíèöû Ïðîôèëÿ Òåêñòà äëÿ òîãî, ÷òîáû ñîõðàíèòü Òåêñò â âàøåì Ðàáî÷åì \
Ïðîñòðàíñòâå.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/story/new.html (from rev \
6084, bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/story/new.html)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/story.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/story.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/story.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,82 +0,0 @@
-<help page="Story Profile">
-
-<h3>1) Èíôîðìàöèÿ (Information)</h3>
-
-<p><dl>
-<dt>Ïðîñëåäèòü (Trail)</dt>
-<dd>Ïîêàçûâàåò âñå Ñòîëû, íà êîòîðûõ êîãäà-ëèáî ðàçìåùàëñÿ äàííûé Òåêñò. (Äëÿ íîâîãî \
ýëåìåíòà ïîêàçûâàåò ïóñòîé ñïèñîê).</dd>
-
-<dt>Çàìåòêè (Notes)</dt>
-<dd>Íàæìèòå ýòîò çíà÷îê äëÿ òîãî, ÷òîáû ïðèñîåäèíèòü ðåäàêòîðñêèå çàìåòêè ê Òåêñòó. \
Çàìåòêè ìîãóò áûòü ïðîñìîòðåíû äðóãèìè ïîëüçîâàòåëÿìè ïîñëå òîãî êàê Òåêñò îòïðàâëåí \
íà Ñòîë. Îäíàêî îíè íå áóäóò âèäíû ïðè ïóáëèêàöèè. Åñëè âû âèäèòå çíà÷îê ñ íàäïèñÿìè, \
òî ýòî çíà÷èò, ÷òî êàêèå-òî çàìåòêè ê Òåêñòó óæå ïðèñîåäèíåíû.</dd>
-
-<dt>Èäåíòèôèêàòîð (ID)</dt>
-<dd>Èäåíòèôèêàöèîííûé íîìåð Òåêñòà (ïðèñâàèâàåòñÿ àâòîìàòè÷åñêè).</dd>
-
-<dt>Ýëåìåíò Òèïà Òåêñòà (Story Type Element)</dt>
-<dd>Òèï Òåêñòà. çàâèñèìîñòè îò âûáðàííîãî òèïà Òåêñò áóäåò èìåòü ðàçëè÷íûå ïîëÿ, \
äîñòóïíûå äëÿ ýòîãî.</dd>
-
-<dt>URI</dt>
-<dd>Àäðåñ Òåêñòà íà âàøåì ñåðâåðå. Îí âêëþ÷àåò òå Êàòåãîðèþ è ïîäêàòàëîã (Slug), \
êîòîðûå âû óêàçàëè íà ïðåäûäóùåé ñòðàíèöå. Åñëè URI ïîêàçàí êàê ññûëêà, òî âû ìîæåòå \
íàæàòü íà íåå è ïðîñìîòðåòü äàííûé Òåêñò.</dd>
-
-<dt>Èñòî÷íèê (Source)</dt>
-<dd>Îïèñàíèå èñòî÷íèêà, ïðåäîñòàâèâøåãî äàííûé Òåêñò.</dd>
-
-<dt>Ïðèîðèòåò (Priority)</dt>
-<dd>Ïîêàçûâàåò ñòåïåíü ñðî÷íîñòè äàííîãî Òåêñòà. Íåîáõîäèì.</dd>
-
-<dt>Çàãîëîâîê (Title)</dt>
-<dd>Çàãîëîâîê Òåêñòà. Íåîáõîäèì.</dd>
-
-<dt>Îïèñàíèå (Description)</dt>
-<dd>Êðàòêîå îïèñàíèå Òåêñòà. Ìîæåò áûòü èñïîëüçîâàíî â êà÷åñòâå àííîòàöèè \
(teaser).</dd>
-
-<dt>Ïîäêàòàëîã (Slug)</dt>
-<dd>Èäåíòèôèêàòîð (îäíî ñëîâî), èñïîëüçóåìûé â êà÷åñòâå ïîñëåäíåé ÷àñòè URI äàííîãî \
Òåêñòà. Ýòîò æå èäåíòèôèêàòîð èñïîëüçóåòñÿ â êà÷åñòâå èìåíè ïîäêàòàëîãà, ãäå \
ðàçìåùàåòñÿ Òåêñò.</dd>
-
-<dt>Çàãëàâíàÿ Äàòà (Cover Date)</dt>
-<dd>Ýòî äàòà, êîòîðàÿ îòïðàâëÿåòñÿ âìåñòå ñ Òåêñòîì (ýòî íå îáÿçàòåëüíî äàòà \
ðàçìåùåíèÿ íà ñàéòå, íî ýòî òà äàòà ïóáëèêàöèè, êîòîðóþ óâèäÿò \
÷èòàòåëè).</dd>
-
-<dt>Ñðîê õðàíåíèÿ (Expire Date)</dt>
-<dd>Äàòà è âðåìÿ èñêëþ÷åíèÿ Òåêñòà èç ïóáëèêàöèè.</dd>
-</dl></p>
-
-<h3>2) Êîíòåíò (Content)</h3>
-
-<p>Çäåñü âû ïðèäàåòå Òåêñòó ôîðìó, ðåäàêòèðóÿ åãî ñóùåñòâóþùèå ýëåìåíòû è äîáàâëÿÿ \
íîâûå. Êàæäûé òèï Òåêñòà èìååò ñâîå ñîáñòâåííîå ìíîæåñòâî Ýëåìåíòîâ – íåêîòîðûå \
ïðèñîåäèíÿþòñÿ àâòîìàòè÷åñêè, à äðóãèå ÿâëÿåòñÿ íåîáÿçàòåëüíûìè.</p>
-
-<p><b>Ïðèìå÷àíèå:</b> Ïîëüçîâàòåëè ñ ïðàâàìè àäìèíèñòðàòîðà ìîãóò ðåäàêòèðîâàòü \
ñóùåñòâóþùèå ìíîæåñòâà Ýëåìåíòîâ äëÿ êàæäîãî òèïà Òåêñòîâ, à òàêæå ñîçäàâàòü \
íîâûå.</p>
-
-<p>Íàæìèòå êëàâèøó «Ðåäàêòèðîâàòü», êîòîðàÿ ðàñïîëàãàåòñÿ ðÿäîì ñ Ýëåìåíòîì, äëÿ \
ïåðåõîäà íà ñòðàíèöó Ïðîôèëÿ Ýëåìåíòà. Íà ýòîé ñòðàíèöå âû ñìîæåòå ââåñòè òåêñò è \
çàäàòü àòðèáóòû. Äëÿ âêëþ÷åíèÿ íîâîãî Ýëåìåíòà âûáåðèòå åãî â âûïàäàþùåì ìåíþ è \
íàæìèòå êëàâèøó «Äîáàâèòü Ýëåìåíò». ýòîì ñëó÷àå âû àâòîìàòè÷åñêè ïåðåéäåòå íà \
ñòðàíèöó Ïðîôèëÿ Ýëåìåíòà äëÿ ââîäà íåîáõîäèìûõ äàííûõ.</p>
-
-<p><dl>
-<dt>Óïîðÿäî÷èòü (Reorder)</dt>
-<dd>Äëÿ èçìåíåíèÿ íîìåðîâ ïîçèöèé ýëåìåíòîâ âîñïîëüçóéòåñü âûïàäàþùèìè ìåíþ. Ïî \
çàâåðøåíèè íàæìèòå êëàâèøó «Óïîðÿäî÷èòü».</dd>
-
-<dt>Óäàëèòü (Delete)</dt>
-<dd>Äëÿ óäàëåíèÿ ýëåìåíòà ïîñòàâüòå îòìåòêó ðÿäîì ñ íèì, à çàòåì íàæìèòå êëàâèøó \
«Óäàëèòü». Ìîæíî óäàëèòü íåñêîëüêî ýëåìåíòîâ îäíîâðåìåííî.</dd>
-</dl></p>
-
-<h3>3) Êàòåãîðèè (Categories)</h3>
-<p>Êàòåãîðèè îïðåäåëÿþò ìåñòà ïóáëèêàöèè ìàòåðèàëîâ íà ñàéòå. Îäíè è òå æå ìàòåðèàëû \
ìîãóò íàõîäèòüñÿ â îäíîé èëè íåñêîëüêèõ Êàòåãîðèÿõ. Íî òîëüêî îäíà èç íèõ íàçûâàåòñÿ \
Ïåðâè÷íîé Êàòåãîðèåé. íà÷àëå åäèíñòâåííîé Êàòåãîðèåé äëÿ Òåêñòà áóäåò òà, êîòîðóþ \
âû âûáðàëè íà ñòðàíèöå «Íîâûé Òåêñò». Äëÿ òîãî, ÷òîáû äîáàâèòü Êàòåãîðèþ, âûáåðèòå åå \
â âûïàäàþùåì ìåíþ è íàæìèòå «Äîáàâèòü Êàòåãîðèþ».</p>
-
-<p><dl>
-<dt>Ïåðâè÷íàÿ (Primary)</dt>
-<dd>Äëÿ òîãî ÷òîáû óêàçàòü íîâóþ Êàòåãîðèþ â êà÷åñòâå ïåðâè÷íîé, ïîñòàâüòå îòìåòêó â \
êðóæî÷êå ðÿäîì ñ íåé, à çàòåì íàæìèòå êëàâèøó «Ñîõðàíèòü» èëè «Ñîõðàíèòü è îñòàòüñÿ» \
â êîíöå ñòðàíèöå.</dd>
-
-<dt>Óäàëèòü (Delete)</dt>
-<dd>Äëÿ òîãî ÷òîáû óäàëèòü Êàòåãîðèþ, ïîñòàâüòå îòìåòêó ðÿäîì ñ íåé è íàæìèòå \
êëàâèøó «Óäàëèòü». Îäíîâðåìåííî ìîæíî óäàëèòü íåñêîëüêî \
Êàòåãîðèé.</dd>
-</dl></p>
-
-<h3>4) Ñâÿçè (Associations)</h3>
-
-<p> äàííîì ðàçäåëå âû çàäàåòå ìåòàèíôîðìàöèþ (èíôîðìàöèþ, êîòîðàÿ âñòðàèâàåòñÿ â \
Òåêñòû, íî íå îòîáðàæàåòñÿ). Ýòà èíôîðìàöèÿ ïîçâîëÿåò âûïîëíÿòü áîëåå òî÷íûé ïîèñê è \
àâòîìàòè÷åñêè âûñòðàèâàòü ñâÿçè ìåæäó Òåêñòàìè.</p>
-
-<p><dl>
-<dt>Êëþ÷åâûå ñëîâà (Keywords)</dt>
-<dd> âåäèòå êàêèå-ëèáî ñëîâà èëè ôðàçû, îòíîñÿùèåñÿ ê òåìå Òåêñòà, êîòîðûå ïîìîãóò \
òåìàòè÷åñêè ñâÿçàòü åãî ñ äðóãèìè Òåêñòàìè, à òàêæå îáëåã÷àò àðõèâíûå ïîèñêè. Íàæìèòå \
«Ðåäàêòèðîâàòü» äëÿ ïåðåõîäà íà ñòðàíèöó ðåäàêòèðîâàíèÿ êëþ÷åâûõ ñëîâ, ãäå çàäàäèòå \
íåîáõîäèìûå êëþ÷åâûå ñëîâà â ïóñòûõ ïîëÿõ. Íåò íåîáõîäèìîñòè çàïîëíÿòü âñå ïóñòûå \
ñòðîêè, íî âû ìîæåòå, åñëè íåîáõîäèìî, äîáàâèòü íîâûå, íàæàâ êëàâèøó «Äîáàâèòü åùå». \
Ïî çàâåðøåíèè íàæìèòå «Ñîõðàíèòü».</dd>
-
-<dt>Àâòîðû (Contributors)</dt>
-<dd> âåäèòå èìåíà àâòîðîâ ìàòåðèàëîâ, âêëþ÷àÿ ïèñàòåëÿ è ëþáîãî ôîòîãðàôà èëè \
èëëþñòðàòîðà, êîòîðûå ïðèíèìàëè ó÷àñòèå â ñîçäàíèè Òåêñòà. Íàæìèòå «Ðåäàêòèðîâàòü» \
äëÿ ïåðåõîäà íà ñòðàíèöó Ïðèñîåäèíåíèÿ Àâòîðîâ. ñïèñêå « ûáåðèòå Àâòîðîâ» íàéäèòå \
íóæíîå èìÿ è íàæìèòå «Ïðèñîåäèíèòü». Íà ñëåäóþùåé ñòðàíèöå âûáåðèòå ðîëü Àâòîðà è \
íàæìèòå «Äàëåå». Ïî çàâåðøåíèè íàæìèòå <i>«Ñîõðàíèòü».</i></dd>
-</dl></p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/story.html (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/story.html)
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/templates (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/templates)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/templates/new.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/templates/new.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/templates/new.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,26 +0,0 @@
-<help page="New Template">
-
-<p>Èñïîëüçóéòå ýòîò èíñòðóìåíò äëÿ íàñòðîéêè Áðèêîëàæà. Çäåñü âû áóäåòå ñîçäàâàòü \
Øàáëîíû äëÿ âêëþ÷åíèÿ â Ïðîôèëè Òåêñòîâ è Ìåäèà.</p>
-
-<h3>Ñâîéñòâà (Properties)</h3>
-
-<p><dl>
-<dt>Ýëåìåíò (Element)</dt>
-<dd> ûáåðèòå èç ñïèñêà Ýëåìåíò, íà êîòîðîì áóäåò îñíîâàí äàííûé Øàáëîí (åñëè òàêîâîé \
åñòü). Íåîáõîäèì.</dd>
-
-<dt>Îáùèé (Generic)</dt>
-<dd>Äëÿ ñîçäàíèÿ ñîâåðøåííî íîâîãî Øàáëîíà ïîñòàâüòå îòìåòêó çäåñü.</dd>
-
-<dt>Êàíàë âûâîäà (Output Channel)</dt>
-<dd>Öåëü ïðèìåíåíèÿ Øàáëîíà. Íåîáõîäèì.</dd>
-
-<dt>Êàòåãîðèÿ (Category)</dt>
-<dd>Ìåñòî íà ñàéòå, ãäå Øàáëîí áóäåò ïðèìåíÿòüñÿ. Íåîáõîäèì.</dd>
-
-<dt>Ïðèîðèòåò (Priority)</dt>
-<dd>Ïîêàçûâàåò ñòåïåíü ñðî÷íîñòè äàííîãî Øàáëîíà. Íåîáõîäèì.</dd>
-</dl></p>
-
-<p>Ïî çàâåðøåíèè íàæìèòå <i>«Ñîçäàòü» (Create)</i> è âû ïåðåéäåòå íà ñòðàíèöó \
Ïðîôèëÿ Øàáëîíà.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/templates/new.html (from rev \
6084, bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/templates/new.html)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/templates.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/templates.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/templates.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,52 +0,0 @@
-<help page="Template Profile Data">
-
-<h3>1) Èíôîðìàöèÿ (Information)</h4>
-
-<p><dl>
-<dt>Ïðîñëåäèòü (Trail)</dt>
-<dd>Ïîêàçûâàåò âñå Ñòîëû, íà êîòîðûõ êîãäà-ëèáî ðàçìåùàëñÿ äàííûé Øàáëîí. (Äëÿ \
íîâîãî Øàáëîíà ïîêàçûâàåò ïóñòîé ñïèñîê).</dd>
-
-<dt>Çàìåòêè (Notes)</dt>
-<dd>Íàæìèòå ýòîò çíà÷îê äëÿ òîãî, ÷òîáû ïðèñîåäèíèòü ðåäàêòîðñêèå çàìåòêè ê Øàáëîíó. \
Çàìåòêè ìîãóò áûòü ïðîñìîòðåíû äðóãèìè ïîëüçîâàòåëÿìè ïîñëå òîãî êàê Øàáëîí îòïðàâëåí \
íà Ñòîë. Îäíàêî îíè íå áóäóò âèäíû ïðè ïóáëèêàöèè. Åñëè âû âèäèòå çíà÷îê ñ íàäïèñÿìè, \
òî ýòî çíà÷èò, ÷òî êàêèå-òî çàìåòêè ê Øàáëîíó óæå ïðèñîåäèíåíû.</dd>
-
-<dt>Ýëåìåíò (Element)</dt>
-<dd>Ýëåìåíò ýòîãî Øàáëîíà áóäåò ôîðìàòèðîâàòü, åñëè Øàáëîí ÿâëÿåòñÿ Øàáëîíîì \
Ýëåìåíòà, âûáðàííûì íà ñòðàíèöå «Ñîçäàòü Íîâûé Øàáëîí».</dd>
-
-<dt>Èìÿ Øàáëîíà (Name)</dt>
-<dd>Íàèìåíîâàíèå Øàáëîíà. Îíî ýêâèâàëåíòíî Òèïó Ìàòåðèàëîâ åñëè íîâûé Øàáëîí \
îñíîâûâàåòñÿ íà ñóùåñòâóþùåì Ýëåìåíòå.</dd>
-
-<dt>Êàíàë ûâîäà (Output Channel)</dt>
-<dd>Öåëü (êàòàëîã) ïðèìåíåíèÿ Øàáëîíà.</dd>
-
-<dt>Êàòåãîðèÿ (Category)</dt>
-<dd>Ìåñòî íà ñàéòå, ãäå Øàáëîí áóäåò ïðèìåíÿòüñÿ.</dd>
-
-<dt>URI</dt>
-<dd>Àäðåñ Øàáëîíà íà âàøåì ñåðâåðå.</dd>
-
-<dt>Ïðèîðèòåò (Priority)</dt>
-<dd>Ïîêàçûâàåò ñòåïåíü ñðî÷íîñòè äàííîãî Øàáëîíà. Íåîáõîäèì.</dd>
-
-<dt>Îïèñàíèå (Description)</dt>
-<dd>Êðàòêîå îïèñàíèå Øàáëîíà.</dd>
-
-<dt>Ñðîê õðàíåíèÿ (Expire Date)</dt>
-<dd>Äàòà è âðåìÿ, êîãäà âû õîòèòå óäàëèòü äàííûé Øàáëîí.</dd>
-</dl></p>
-
-<h3>2) Êîä Øàáëîíà (Template Code)</h3>
-
-<p><dl>
-<dt>Ýëåìåíò (Element)</dt>
-<dd>Ýëåìåíò, íà êîòîðîì áàçèðóåòñÿ äàííûé Øàáëîí (åñëè òàêîâîé åñòü).</dd>
-
-<dt>Ýëåìåíòû äàííûõ (Data Elements)</dt>
-<dd>Ýëåìåíòû, êîòîðûå àâòîìàòè÷åñêè ïîÿâëÿþòñÿ â ñåêöèè Êîíòåíòà äàííîãî Øàáëîíà. Òå \
èç íèõ, êîòîðûå ïîìå÷åíû êàê «ïîâòîðÿåìûå», äîëæíû áûòü äîáàâëåíû íåñêîëüêî ðàç. Òå \
ýëåìåíòû, êîòîðûå ïîìå÷åíû êàê «íåîáõîäèìûå», äîëæíû áûòü çàïîëíåíû ïîëüçîâàòåëåì \
ïðåæäå ÷åì Øàáëîí áóäåò ñîõðàíåí.</dd>
-
-<dt>Êîíòåéíåðíûå Ýëåìåíòû (Container Elements)</dt>
-<dd>Ýëåìåíòû, êîòîðûå äîëæíû áûòü âêëþ÷åíû â Øàáëîí, ïðèâåäåíû â âûïàäàþùåì ñïèñêå, \
ðàçìåùåííîì íåïîñðåäñòâåííî ïîä Ýëåìåíòàìè Äàííûõ. Òå èç íèõ, êîòîðûå ïîìå÷åíû êàê \
«ïîâòîðÿåìûå», äîëæíû áûòü âêëþ÷åíû íåñêîëüêî ðàç.</dd>
-</dl></p>
-
-<p äàííîì ïîëå çàäàåòñÿ äîïîëíèòåëüíûé êîä äëÿ Øàáëîíà. Ïî çàâåðøåíèè íàæìèòå \
êëàâèøó <i>«Ñîõðàíèòü».</i></p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/templates.html (from rev \
6084, bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/templates.html)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/profile/workspace.html
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/workspace.html 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/profile/workspace.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,55 +0,0 @@
-<help page="My Workspace">
-
-<p>Ýòî âàøà äîìàøíÿÿ áàçà. Çäåñü âû áóäåòå õðàíèòü âñå ñîçäàâàåìûå âàìè ìàòåðèàëû \
ïåðåä òåì, êàê îòïðàâèòü èõ íà Ñòîë. àì òàêæå áóäåò ïðåäîñòàâëåíà âîçìîæíîñòü \
çàãðóæàòü ìàòåðèàëû ñ äðóãèõ Ñòîëîâ äëÿ òîãî, ÷òîáû ðåäàêòèðîâàòü èõ â âàøåì Ðàáî÷åì \
Ïðîñòðàíñòâå.</p>
-
-<p>Íàæìèòå <i>«Ìîå Ðàáî÷åå Ïðîñòðàíñòâî» (My Workspace)</i> âåðõíåì ëåâîì óãëó äëÿ \
òîãî, ÷òîáû âîçâðàùàòüñÿ ê ýòîé ôîðìå â ëþáîå âðåìÿ.</p>
-
-<h3>Ìàòåðèàëû (Assets)</h3>
-
-<p> âàøåì ðàáî÷åì ïðîñòðàíñòâå âû èìååòå âîçìîæíîñòü îáðàáàòûâàòü ìàòåðèàëû òðåõ \
òèïîâ: Ìåäèà, Òåêñòû è Øàáëîíû. íîâü ñîçäàííûå ìàòåðèàëû áóäóò ðàçìåùàòüñÿ â âàøåì \
Ðàáî÷åì Ïðîñòðàíñòâå äî òåõ ïîð, ïîêà âû íå îòïðàâèòå èõ íà Ñòîë.</p>
-
-<p>Îòïðàâëÿÿ ìàòåðèàëû íà ñòîë, âû òåì ñàìûì äàåòå âîçìîæíîñòü àâòîðèçîâàííûì \
ïîëüçîâàòåëÿì ðàáîòàòü ñ íèìè. Ñòîëû – ýòî êàê ñòàíöèè íà ñáîðî÷íîé ëèíèè. Ìàòåðèàëû \
äîëæíû áûòü îïðîáîâàíû íà êàæäîì èç íèõ ïðåæäå, ÷åì îíè áóäóò ãîòîâû ê îòïðàâêå \
ïîëüçîâàòåëÿì.</p>
-
-<p>Íàïðèìåð, ïðåäïîëîæèì âû íàïèñàëè íîâóþ ñòàòüþ äëÿ âàøåãî âåá-ñàéòà. û \
îòïðàâëÿåòå åå íà Ñòîë Ðåäàêòèðîâàíèÿ, ãäå ðåäàêòîð ïðîâåðÿåò ñòðóêòóðó ñòàòüè è åå \
êîððåêòíîñòü. Çàòåì ðåäàêòîð îòïðàâëÿåò ñòàòüþ íà Þðèäè÷åñêèé Ñòîë, ãäå þðèñò \
ïðîâåðÿåò, íå íàíåñåò ëè âàì óùåðá åå ïóáëèêàöèÿ. Çàòåì ñòàòüÿ îòïðàâëÿåòñÿ íà Ñòîë \
Êîïèðîâàíèÿ, ãäå ïðîâåðÿþòñÿ ãðàììàòèêà è ïðàâîïèñàíèå. È, íàêîíåö, îíà îòïðàâëÿåòñÿ \
íà Ñòîë Ïóáëèêàöèè, îòêóäà âû è ñìîæåòå îïóáëèêîâàòü åå íà ñàéòå.</p>
-
-<p>Ïîëüçîâàòåëü, êîòîðîìó íåîáõîäèìî îòðåäàêòèðîâàòü ñòàòüþ, ìîæåò çàãðóçèòü åå ñ \
êàæäîãî èç óêàçàííûõ Ñòîëîâ èëè ïåðåìåñòèòü â ñâîå Ðàáî÷åå Ïðîñòðàíñòâî. Êîãäà \
ïîëüçîâàòåëü çàãðóæàåò ìàòåðèàëû ñ Ðàáî÷åãî Ñòîëà, òî îíè íå èñ÷åçàþò îòòóäà. Äðóãèå \
ïîëüçîâàòåëè âñå åùå ìîãóò èõ ïðîñìàòðèâàòü, íî ðåäàêòèðîâàòü ýòè ìàòåðèàëû ìîæåò \
òîëüêî òîò ïîëüçîâàòåëü, êîòîðûé èõ çàãðóçèë.</p>
-
-<h3>Ñâîéñòâà ìàòåðèàëîâ â Ðàáî÷åì Ïðîñòðàíñòâå (Asset Properties)</h3>
-
-<p><dl>
-<dt>Çàãîëîâîê (Title)</dt>
-<dd>Íàæìèòå íà ýòó ññûëêó äëÿ ïðîñìîòðà ìàòåðèàëîâ â íîâîì îêíå (çà èñêëþ÷åíèåì \
Øàáëîíîâ (Templates)). Áåëàÿ áóêâà «Ï» â êðàñíîì êðóæî÷êå íà äàëüíåì êîíöå ïîëÿ \
çàãîëîâêà ïîêàçûâàåò, ÷òî ìàòåðèàëû óæå îïóáëèêîâàíû (èëè ïðèìåíåíû, åñëè ýòî \
Øàáëîí).</dd>
-
-<dt>Êàòåãîðèÿ (Category)</dt>
-<dd>Ìåñòî íà ñàéòå, ãäå ìàòåðèàëû áóäóò îïóáëèêîâàíû.</dd>
-
-<dt>Çàãëàâíàÿ äàòà (Cover Date)</dt>
-<dd>Ýòî äàòà, êîòîðàÿ îòïðàâëÿåòñÿ âìåñòå ñ ìàòåðèàëàìè (ýòî íå îáÿçàòåëüíî äàòà \
ðàçìåùåíèÿ íà ñàéòå, íî ýòî òà äàòà ïóáëèêàöèè, êîòîðóþ óâèäÿò \
÷èòàòåëè).</dd>
-
-<dt>Ïðèîðèòåò (Priority)</dt>
-<dd>Ïîêàçûâàåò ñòåïåíü ñðî÷íîñòè äàííûõ ìàòåðèàëîâ.</dd>
-
-<dt>Check in to</dt>
-<dd>Moves the asset to the listed Desk.</dd>
-
-<dt>Îòïðàâèòü (Check in to)</dt>
-<dd>Ïåðåìåùàåò ìàòåðèàëû íà óêàçàííûé Ñòîë. ûáåðèòå Ñòîë èç ñïèñêà è íàæìèòå \
êëàâèøó <i>«Îòïðàâèòü Ìàòåðèàëû» (Check In Assets)</i> â êîíöå ñòðàíèöû. û ìîæåòå \
îòïðàâèòü íåñêîëüêî ìàòåðèàëîâ îäíîâðåìåííî.</dd>
-
-<dt>Çàìåòêè (Notes)</dt>
-<dd>Ïðîñìîòð ðàçëè÷íûõ ðåäàêòîðñêèõ çàìåòîê, êîòîðûå ïîëüçîâàòåëè ïðèñîåäèíèëè ê \
ìàòåðèàëàì.</dd>
-
-<dt>Ïðîñëåäèòü (Trail)</dt>
-<dd>Ïîêàçûâàåò âñå Ñòîëû, íà êîòîðûå îòïðàâëÿëèñü ìàòåðèàëû.</dd>
-
-<dt>Ðåäàêòèðîâàòü (Edit)</dt>
-<dd>Îòêîððåêòèðîâàòü ìàòåðèàëû èëè èõ ïðîôèëü.<BR>
-
-<dt>Æóðíàë (Log)</dt>
-<dd>Ïîêàçûâàåò èñòîðèþ îáðàáîòêè ìàòåðèàëîâ.</dd>
-
-<dt>Óäàëèòü (Delete)</dt>
-<dd>Ïîñòàâüòå îòìåòêó «Óäàëèòü», à çàòåì íàæìèòå êëàâèøó «Óäàëèòü îòìå÷åííûå» â \
êîíöå ñòðàíèöû. Ìîæíî óäàëèòü íåñêîëüêî ìàòåðèàëîâ îäíîâðåìåííî.
-</dd>
-</dl></p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/profile/workspace.html (from rev \
6084, bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/profile/workspace.html)
Copied: bricolage/trunk/comp/help/ru_ru/workflow/trail (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/trail)
Deleted: bricolage/trunk/comp/help/ru_ru/workflow/trail/dhandler
===================================================================
--- bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/trail/dhandler 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/comp/help/ru_ru/workflow/trail/dhandler 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,8 +0,0 @@
-<help page="Events Trail">
-
-<p>‘Ñëåä’ ïîêàçûâàåò íà êàêèå Ñòîëû ìàòåðèàëû ïåðåìåùàëèñü â ïðîøëîì. Îí \
÷åì-òî ïîõîæ íà ‘Æóðíàë’ ñ òåì èñêëþ÷åíèåì, ÷òî ïîêàçûâàþòñÿ òîëüêî \
ïåðåìåùåíèÿ ìåæäó Ñòîëàìè.</p>
-
-<p>Ïîäðîáíåå ñìîòðè â
- <a href="/help/workflow/events/">ñïðàâêå ïî æóðíàëàì ñîáûòèé</a>.</p>
-
-</help>
Copied: bricolage/trunk/comp/help/ru_ru/workflow/trail/dhandler (from rev 6084, \
bricolage/branches/rev_1_8/comp/help/ru_ru/workflow/trail/dhandler)
Modified: bricolage/trunk/comp/help/ug/workflow/profile/templates/new.html
===================================================================
--- bricolage/trunk/comp/help/ug/workflow/profile/templates/new.html 2004-11-19 \
08:54:20 UTC (rev 6087)
+++ bricolage/trunk/comp/help/ug/workflow/profile/templates/new.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,30 +1,57 @@
-<help page="New Template">
-
-<p>Use this tool to customize your Bricolage. Here you will create Templates to
-include in Story and Media Profiles, increasing your options and molding the
-publishing tool to suit your needs.</p>
-
-<h3>Properties</h3>
-
-<p><dl>
-<dt>Element</dt>
-<dd>To base your new Template on an existing Element, scroll through the list
- and select one. Required.</dd>
-
-<dt>Generic</dt>
-<dd>To create a new Template from scratch, check this box.</dd>
-
-<dt>Output Channel</dt>
-<dd>The destination for the Template, once it is deployed. Require.</dd>
-
-<dt>Category</dt>
-<dd>Where on the site the Template will be deployed. Required.</dd>
-
-<dt>Priority</dt>
-<dd>Tells users how urgent the Template is. Required.</dd>
-</dl></p>
-
-<p>When finished, click <i>Create.</i> This will bring you to the Template
-Profile page.</p>
-
-</help>
+<help page="New Template">
+
+<p>Use this tool to customize the output of yoru Bricolage documents. Here you
+will create templates generate output from your story docments, increasing
+your options and molding the publishing tool to suit your needs.</p>
+
+<p>There are three kinds of templates you can produce:</p>
+<p><dl>
+<dt>Element Templates</dt>
+<dd>Element templates are related to a specific element or subelement. They
+are called when the element is passed to a call to
+<code>$burner->display_element</code> in a template. Each template belongs
+to one output channel, so to render a story in three output channels requires
+three templates. The exception to this rule is when you make an output channel
+include the templates from another output channel.</dd>
+
+<dt>Category Templates</dt>
+<dd>Category templates are the default template handler (known as an
+autohandler to the Mason burner) for a category in an output channel. Category
+templates allow you to <q>wrap</q> text (usually HTML headers and footers)
+around the chain of elements burned in that category and its
+subcategories.</dd>
+
+<dt>Utility Templates</dt>
+<dd>Utility templates contain generic code that can be re-used in other
+templates, like validation calls, etc. they can be either output
+channel-specific be associated with an output channel specifically created to
+contain hold utility templates. In the latter case, make the utility templates
+in the utility output channel available to your other output channels by
+including the utility output channel in the other output channels.</dt>
+</dl>
+
+<h3>Properties</h3>
+<p><dl>
+<dt>Template Type</dt>
+<dd>One of the above types</dd>
+
+<dt>File Type</dt>
+<dd>You only need to change this if you are not using the default Mason burner
+to render your templates. Required.</dd>
+
+<dt>Output Channel</dt>
+<dd>The destination for the Template, once it is deployed. Required.</dd>
+
+<dt>Category</dt>
+<dd>Where on the site the Template will be deployed. This has implications for
+where your template can be called from. Required.</dd>
+
+<dt>Priority</dt>
+<dd>Tells users how urgent the Template is (with respect to its movement
+through a workflow). Required. If you're not sure the default setting is
+fine.</dd>
+</dl></p>
+
+<p>When finished, click <i>Create.</i> This will bring you to the Template
+Profile page.</p>
+</help>
Modified: bricolage/trunk/comp/help/vi_vn/workflow/profile/templates/new.html
===================================================================
--- bricolage/trunk/comp/help/vi_vn/workflow/profile/templates/new.html 2004-11-19 \
08:54:20 UTC (rev 6087)
+++ bricolage/trunk/comp/help/vi_vn/workflow/profile/templates/new.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,30 +1,57 @@
-<help page="New Template">
-
-<p>Use this tool to customize your Bricolage. Here you will create Templates to
-include in Story and Media Profiles, increasing your options and molding the
-publishing tool to suit your needs.</p>
-
-<h3>Properties</h3>
-
-<p><dl>
-<dt>Element</dt>
-<dd>To base your new Template on an existing Element, scroll through the list
- and select one. Required.</dd>
-
-<dt>Generic</dt>
-<dd>To create a new Template from scratch, check this box.</dd>
-
-<dt>Output Channel</dt>
-<dd>The destination for the Template, once it is deployed. Require.</dd>
-
-<dt>Category</dt>
-<dd>Where on the site the Template will be deployed. Required.</dd>
-
-<dt>Priority</dt>
-<dd>Tells users how urgent the Template is. Required.</dd>
-</dl></p>
-
-<p>When finished, click <i>Create.</i> This will bring you to the Template
-Profile page.</p>
-
-</help>
+<help page="New Template">
+
+<p>Use this tool to customize the output of yoru Bricolage documents. Here you
+will create templates generate output from your story docments, increasing
+your options and molding the publishing tool to suit your needs.</p>
+
+<p>There are three kinds of templates you can produce:</p>
+<p><dl>
+<dt>Element Templates</dt>
+<dd>Element templates are related to a specific element or subelement. They
+are called when the element is passed to a call to
+<code>$burner->display_element</code> in a template. Each template belongs
+to one output channel, so to render a story in three output channels requires
+three templates. The exception to this rule is when you make an output channel
+include the templates from another output channel.</dd>
+
+<dt>Category Templates</dt>
+<dd>Category templates are the default template handler (known as an
+autohandler to the Mason burner) for a category in an output channel. Category
+templates allow you to <q>wrap</q> text (usually HTML headers and footers)
+around the chain of elements burned in that category and its
+subcategories.</dd>
+
+<dt>Utility Templates</dt>
+<dd>Utility templates contain generic code that can be re-used in other
+templates, like validation calls, etc. they can be either output
+channel-specific be associated with an output channel specifically created to
+contain hold utility templates. In the latter case, make the utility templates
+in the utility output channel available to your other output channels by
+including the utility output channel in the other output channels.</dt>
+</dl>
+
+<h3>Properties</h3>
+<p><dl>
+<dt>Template Type</dt>
+<dd>One of the above types</dd>
+
+<dt>File Type</dt>
+<dd>You only need to change this if you are not using the default Mason burner
+to render your templates. Required.</dd>
+
+<dt>Output Channel</dt>
+<dd>The destination for the Template, once it is deployed. Required.</dd>
+
+<dt>Category</dt>
+<dd>Where on the site the Template will be deployed. This has implications for
+where your template can be called from. Required.</dd>
+
+<dt>Priority</dt>
+<dd>Tells users how urgent the Template is (with respect to its movement
+through a workflow). Required. If you're not sure the default setting is
+fine.</dd>
+</dl></p>
+
+<p>When finished, click <i>Create.</i> This will bring you to the Template
+Profile page.</p>
+</help>
Modified: bricolage/trunk/comp/help/zh_cn/workflow/profile/templates/new.html
===================================================================
--- bricolage/trunk/comp/help/zh_cn/workflow/profile/templates/new.html 2004-11-19 \
08:54:20 UTC (rev 6087)
+++ bricolage/trunk/comp/help/zh_cn/workflow/profile/templates/new.html 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,30 +1,57 @@
-<help page="New Template">
-
-<p>Use this tool to customize your Bricolage. Here you will create Templates to
-include in Story and Media Profiles, increasing your options and molding the
-publishing tool to suit your needs.</p>
-
-<h3>Properties</h3>
-
-<p><dl>
-<dt>Element</dt>
-<dd>To base your new Template on an existing Element, scroll through the list
- and select one. Required.</dd>
-
-<dt>Generic</dt>
-<dd>To create a new Template from scratch, check this box.</dd>
-
-<dt>Output Channel</dt>
-<dd>The destination for the Template, once it is deployed. Require.</dd>
-
-<dt>Category</dt>
-<dd>Where on the site the Template will be deployed. Required.</dd>
-
-<dt>Priority</dt>
-<dd>Tells users how urgent the Template is. Required.</dd>
-</dl></p>
-
-<p>When finished, click <i>Create.</i> This will bring you to the Template
-Profile page.</p>
-
-</help>
+<help page="New Template">
+
+<p>Use this tool to customize the output of yoru Bricolage documents. Here you
+will create templates generate output from your story docments, increasing
+your options and molding the publishing tool to suit your needs.</p>
+
+<p>There are three kinds of templates you can produce:</p>
+<p><dl>
+<dt>Element Templates</dt>
+<dd>Element templates are related to a specific element or subelement. They
+are called when the element is passed to a call to
+<code>$burner->display_element</code> in a template. Each template belongs
+to one output channel, so to render a story in three output channels requires
+three templates. The exception to this rule is when you make an output channel
+include the templates from another output channel.</dd>
+
+<dt>Category Templates</dt>
+<dd>Category templates are the default template handler (known as an
+autohandler to the Mason burner) for a category in an output channel. Category
+templates allow you to <q>wrap</q> text (usually HTML headers and footers)
+around the chain of elements burned in that category and its
+subcategories.</dd>
+
+<dt>Utility Templates</dt>
+<dd>Utility templates contain generic code that can be re-used in other
+templates, like validation calls, etc. they can be either output
+channel-specific be associated with an output channel specifically created to
+contain hold utility templates. In the latter case, make the utility templates
+in the utility output channel available to your other output channels by
+including the utility output channel in the other output channels.</dt>
+</dl>
+
+<h3>Properties</h3>
+<p><dl>
+<dt>Template Type</dt>
+<dd>One of the above types</dd>
+
+<dt>File Type</dt>
+<dd>You only need to change this if you are not using the default Mason burner
+to render your templates. Required.</dd>
+
+<dt>Output Channel</dt>
+<dd>The destination for the Template, once it is deployed. Required.</dd>
+
+<dt>Category</dt>
+<dd>Where on the site the Template will be deployed. This has implications for
+where your template can be called from. Required.</dd>
+
+<dt>Priority</dt>
+<dd>Tells users how urgent the Template is (with respect to its movement
+through a workflow). Required. If you're not sure the default setting is
+fine.</dd>
+</dl></p>
+
+<p>When finished, click <i>Create.</i> This will bring you to the Template
+Profile page.</p>
+</help>
Copied: bricolage/trunk/comp/media/images/ru_ru (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru)
Deleted: bricolage/trunk/comp/media/images/ru_ru/D_green.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/D_green.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/D_green.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/D_green.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/D_red.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/D_red.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/D_red.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/D_red.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/P_green.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/P_green.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/P_green.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/P_green.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/P_red.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/P_red.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/P_red.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/P_red.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/Thumbs.db
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/Thumbs.db (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/Thumbs.db)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/Thumbs.db
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: bricolage/trunk/comp/media/images/ru_ru/acknowledge_all_red.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/acknowledge_all_red.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/acknowledge_all_red.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/acknowledge_all_red.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/acknowledge_checked_red.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/acknowledge_checked_red.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/acknowledge_checked_red.gif)
Property changes on: \
bricolage/trunk/comp/media/images/ru_ru/acknowledge_checked_red.gif \
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/add_category_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/add_category_lgreen.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/add_category_lgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/add_category_lgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/add_component_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/add_component_lgreen.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/add_component_lgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/add_component_lgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/add_element_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/add_element_lgreen.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/add_element_lgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/add_element_lgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/add_elements_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/add_elements_lgreen.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/add_elements_lgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/add_elements_lgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/add_more_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/add_more_lgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/add_more_lgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/add_more_lgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/add_notes_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/add_notes_lgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/add_notes_lgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/add_notes_lgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/add_sub_element_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/add_sub_element_lgreen.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/add_sub_element_lgreen.gif)
Property changes on: \
bricolage/trunk/comp/media/images/ru_ru/add_sub_element_lgreen.gif \
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/add_sub_elements_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/add_sub_elements_lgreen.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/add_sub_elements_lgreen.gif)
Property changes on: \
bricolage/trunk/comp/media/images/ru_ru/add_sub_elements_lgreen.gif \
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/add_template_code_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/add_template_code_lgreen.gif (from \
rev 6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/add_template_code_lgreen.gif)
Property changes on: \
bricolage/trunk/comp/media/images/ru_ru/add_template_code_lgreen.gif \
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/add_to_form_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/add_to_form_lgreen.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/add_to_form_lgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/add_to_form_lgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/add_to_list_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/add_to_list_lgreen.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/add_to_list_lgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/add_to_list_lgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/bricolage.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/bricolage.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/bricolage.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/bricolage.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/bulk_edit_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/bulk_edit_lgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/bulk_edit_lgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/bulk_edit_lgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/cancel_check_out_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/cancel_check_out_lgreen.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/cancel_check_out_lgreen.gif)
Property changes on: \
bricolage/trunk/comp/media/images/ru_ru/cancel_check_out_lgreen.gif \
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/cancel_checked_red.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/cancel_checked_red.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/cancel_checked_red.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/cancel_checked_red.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/cancel_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/cancel_lgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/cancel_lgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/cancel_lgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/cancel_red.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/cancel_red.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/cancel_red.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/cancel_red.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/change_red.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/change_red.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/change_red.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/change_red.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/check_in_dgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/check_in_dgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/check_in_dgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/check_in_dgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/checkin_assets_red.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/checkin_assets_red.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/checkin_assets_red.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/checkin_assets_red.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/checkout_red.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/checkout_red.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/checkout_red.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/checkout_red.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/clear_all_red.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/clear_all_red.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/clear_all_red.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/clear_all_red.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/clear_values_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/clear_values_lgreen.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/clear_values_lgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/clear_values_lgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/close.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/close.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/close.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/close.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/contributors_dgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/contributors_dgreen.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/contributors_dgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/contributors_dgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/create_red.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/create_red.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/create_red.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/create_red.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/delete_categories_red.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/delete_categories_red.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/delete_categories_red.gif)
Property changes on: \
bricolage/trunk/comp/media/images/ru_ru/delete_categories_red.gif \
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/delete_checked_red.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/delete_checked_red.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/delete_checked_red.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/delete_checked_red.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/delete_red.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/delete_red.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/delete_red.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/delete_red.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/deploy_checked_red.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/deploy_checked_red.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/deploy_checked_red.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/deploy_checked_red.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/edit_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/edit_lgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/edit_lgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/edit_lgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/edit_notes_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/edit_notes_lgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/edit_notes_lgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/edit_notes_lgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/edit_template_code_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/edit_template_code_lgreen.gif (from \
rev 6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/edit_template_code_lgreen.gif)
Property changes on: \
bricolage/trunk/comp/media/images/ru_ru/edit_template_code_lgreen.gif \
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/help.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/help.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/help.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/help.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/keywords_dgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/keywords_dgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/keywords_dgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/keywords_dgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/login.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/login.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/login.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/login.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/logout.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/logout.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/logout.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/logout.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/media_dgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/media_dgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/media_dgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/media_dgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/move_assets_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/move_assets_lgreen.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/move_assets_lgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/move_assets_lgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/my_alerts_orange.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/my_alerts_orange.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/my_alerts_orange.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/my_alerts_orange.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/my_workspace_off.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/my_workspace_off.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/my_workspace_off.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/my_workspace_off.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/my_workspace_on.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/my_workspace_on.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/my_workspace_on.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/my_workspace_on.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/new_desk_red.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/new_desk_red.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/new_desk_red.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/new_desk_red.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/new_organization_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/new_organization_lgreen.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/new_organization_lgreen.gif)
Property changes on: \
bricolage/trunk/comp/media/images/ru_ru/new_organization_lgreen.gif \
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/next_dkgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/next_dkgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/next_dkgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/next_dkgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/permissions_dgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/permissions_dgreen.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/permissions_dgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/permissions_dgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/preview_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/preview_lgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/preview_lgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/preview_lgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/publish_assets_red.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/publish_assets_red.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/publish_assets_red.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/publish_assets_red.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/publish_checked_red.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/publish_checked_red.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/publish_checked_red.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/publish_checked_red.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/recount_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/recount_lgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/recount_lgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/recount_lgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/related_stories_dgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/related_stories_dgreen.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/related_stories_dgreen.gif)
Property changes on: \
bricolage/trunk/comp/media/images/ru_ru/related_stories_dgreen.gif \
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/remove_from_list_red.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/remove_from_list_red.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/remove_from_list_red.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/remove_from_list_red.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/reorder_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/reorder_lgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/reorder_lgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/reorder_lgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/resize_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/resize_lgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/resize_lgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/resize_lgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/return_dgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/return_dgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/return_dgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/return_dgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/revert_dgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/revert_dgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/revert_dgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/revert_dgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/save_and_stay_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/save_and_stay_lgreen.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/save_and_stay_lgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/save_and_stay_lgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/save_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/save_lgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/save_lgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/save_lgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/save_red.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/save_red.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/save_red.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/save_red.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/search_green.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/search_green.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/search_green.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/search_green.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/search_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/search_lgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/search_lgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/search_lgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/search_red.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/search_red.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/search_red.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/search_red.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/select_all_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/select_all_lgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/select_all_lgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/select_all_lgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/stories_dgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/stories_dgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/stories_dgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/stories_dgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/templates_dgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/templates_dgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/templates_dgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/templates_dgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/upload_red.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/upload_red.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/upload_red.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/upload_red.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/use_this_role_lgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/use_this_role_lgreen.gif (from rev \
6084, bricolage/branches/rev_1_8/comp/media/images/ru_ru/use_this_role_lgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/use_this_role_lgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/view_dgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/view_dgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/view_dgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/view_dgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/view_log_teal.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/view_log_teal.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/view_log_teal.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/view_log_teal.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/view_notes_dgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/view_notes_dgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/view_notes_dgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/view_notes_dgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/view_notes_teal.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/view_notes_teal.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/view_notes_teal.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/view_notes_teal.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/view_text_dgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/view_text_dgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/view_text_dgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/view_text_dgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/view_trail_dgreen.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/view_trail_dgreen.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/view_trail_dgreen.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/view_trail_dgreen.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/view_trail_teal.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/view_trail_teal.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/view_trail_teal.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/view_trail_teal.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/workflow_admin.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/workflow_admin.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/workflow_admin.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/workflow_admin.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: bricolage/trunk/comp/media/images/ru_ru/workflow_workflow.gif
===================================================================
(Binary files differ)
Copied: bricolage/trunk/comp/media/images/ru_ru/workflow_workflow.gif (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/images/ru_ru/workflow_workflow.gif)
Property changes on: bricolage/trunk/comp/media/images/ru_ru/workflow_workflow.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Modified: bricolage/trunk/comp/media/js/lib.js
===================================================================
--- bricolage/trunk/comp/media/js/lib.js 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/comp/media/js/lib.js 2004-11-19 08:55:15 UTC (rev 6088)
@@ -140,7 +140,14 @@
}
}
}
- frm.submit();
+
+ if (frm.onsubmit) {
+ if (frm.onsubmit()) {
+ frm.submit();
+ }
+ } else {
+ frm.submit();
+ }
return false;
}
Copied: bricolage/trunk/comp/media/js/ru_ru_messages.js (from rev 6084, \
bricolage/branches/rev_1_8/comp/media/js/ru_ru_messages.js)
Modified: bricolage/trunk/comp/widgets/container_prof/edit.html
===================================================================
--- bricolage/trunk/comp/widgets/container_prof/edit.html 2004-11-19 08:54:20 UTC \
(rev 6087)
+++ bricolage/trunk/comp/widgets/container_prof/edit.html 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -498,6 +498,10 @@
$type, $rel->get_title)
unless $rel->is_active;
+ add_msg('Related [_1] "[_2]" is not active. Please relate another [_1].',
+ $type, $rel->get_title)
+ unless $rel->is_active;
+
my $thumb = '';
if (USE_THUMBNAILS && $type ne 'story') {
if ($thumb = $rel->thumbnail_uri) {
Modified: bricolage/trunk/comp/widgets/debug/debug.mc
===================================================================
--- bricolage/trunk/comp/widgets/debug/debug.mc 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/comp/widgets/debug/debug.mc 2004-11-19 08:55:15 UTC (rev 6088)
@@ -38,7 +38,6 @@
%#--- Initialization ---#
<%init>
-
my $old_indent = $Data::Dumper::Indent;
$Data::Dumper::Indent = 1;
Modified: bricolage/trunk/comp/widgets/grp_membership/grp_membership.mc
===================================================================
--- bricolage/trunk/comp/widgets/grp_membership/grp_membership.mc 2004-11-19 08:54:20 \
UTC (rev 6087)
+++ bricolage/trunk/comp/widgets/grp_membership/grp_membership.mc 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -55,7 +55,7 @@
my @rogroups = ($obj->INSTANCE_GROUP_ID);
my @logroups;
-unless ($obj->get_id) {
+unless (defined $obj->get_id) {
# Make sure the "All" group shows up in the list for new objects.
my $all_grp = Bric::Util::Grp->lookup({ id => $obj->INSTANCE_GROUP_ID});
push @$right, { value => $all_grp->get_id,
Modified: bricolage/trunk/comp/widgets/help/debuggers.html
===================================================================
--- bricolage/trunk/comp/widgets/help/debuggers.html 2004-11-19 08:54:20 UTC (rev \
6087)
+++ bricolage/trunk/comp/widgets/help/debuggers.html 2004-11-19 08:55:15 UTC (rev \
6088) @@ -37,11 +37,14 @@
<li>Patrick Walsh</li>
<li>Ben Bangert</li>
<li>Ho Yin Au</li>
- <li>Christian Hauser</li>
<li>Tony Cowderoy</li>
<li>Joshua Edelstein</li>
<li>Will Trillich</li>
<li>Adam Rinehart</li>
<li>Hal Creech</li>
<li>Patrick Michael Kane</li>
+ <li>Kenneth Marshall</li>
+ <li>Clinton Gormley</li>
+ <li>Ed Stevenson</li>
+ <li>Ashlee Caul</li>
</ul>
Modified: bricolage/trunk/comp/widgets/help/patchers.html
===================================================================
--- bricolage/trunk/comp/widgets/help/patchers.html 2004-11-19 08:54:20 UTC (rev \
6087)
+++ bricolage/trunk/comp/widgets/help/patchers.html 2004-11-19 08:55:15 UTC (rev \
6088) @@ -32,4 +32,8 @@
<li>Rod Taylor</li>
<li>Cameron Miller</li>
<li>Andrea Rota</li>
+ <li>Mark Kennedy</li>
+ <li>Keith Grennan</li>
+ <li>Christian Hauser</li>
+ <li>Dharmender Yadav</li>
</ul>
Modified: bricolage/trunk/comp/widgets/help/translators.html
===================================================================
--- bricolage/trunk/comp/widgets/help/translators.html 2004-11-19 08:54:20 UTC (rev \
6087)
+++ bricolage/trunk/comp/widgets/help/translators.html 2004-11-19 08:55:15 UTC (rev \
6088) @@ -4,4 +4,5 @@
<li>Kang-min Liu (Traditional Chinese)</li>
<li>Gerfried Fuchs, Thorsten Biel, Florian Rossol (German)</li>
<li>Gang Luo (Simplified Chinese)</li>
+ <li>Sergey Samoilenko (Russian)</li>
</ul>
Modified: bricolage/trunk/comp/widgets/listManager/full_list.mc
===================================================================
--- bricolage/trunk/comp/widgets/listManager/full_list.mc 2004-11-19 08:54:20 UTC \
(rev 6087)
+++ bricolage/trunk/comp/widgets/listManager/full_list.mc 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -50,10 +50,6 @@
%# Output the rows of data
% my $first;
-% if ($sortOrder eq 'descending') {
-% @$data = reverse @$data;
-% }
-
% # here's where the rows diplayed are limited
% my $i = 0;
% foreach my $r (0..$#{$data}) {
Modified: bricolage/trunk/comp/widgets/listManager/listManager.mc
===================================================================
--- bricolage/trunk/comp/widgets/listManager/listManager.mc 2004-11-19 08:54:20 UTC \
(rev 6087)
+++ bricolage/trunk/comp/widgets/listManager/listManager.mc 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -466,21 +466,20 @@
#--------------------------------------#
# Sort the objects.
-
my $sortOrder = get_state_data($widget, 'sortOrder') || $def_sort_order;
set_state_data($widget, 'sortOrder', $sortOrder);
-my @sort_objs = $sort_objects->(\@objects, $meth, $exclude);
+my $sort_objs = $sort_objects->(\@objects, $meth, $exclude);
# Make sure we have some results.
-my $no_results = @sort_objs == 0 && $do_list;
+my $no_results = @$sort_objs == 0 && $do_list;
#--------------------------------------#
# Build the table data array
# Search Paging vars - also see $insert_footer and build_table_data()
# number of records returned from lookup
-my $count = scalar @sort_objs;
+my $count = scalar @$sort_objs;
my ($pages, $current_page) = (1,1);
if ($limit) {
@@ -495,7 +494,7 @@
# save persistent values
set_state_data($widget, 'pagination', $pagination);
-my ($rows, $cols, $data) = $build_table_data->(\@sort_objs,
+my ($rows, $cols, $data) = $build_table_data->($sort_objs,
$meth,
$fields,
$select,
@@ -638,7 +637,7 @@
my $slice;
if ($pagination) {
# make sure $limit + $offset is within range
- my $end = $limit + $offset > $count - 1 ? $count - 1 :
+ my $end = $limit + $offset > $count - 1 ? $count - 1 :
($limit + $offset - 1);
# extract array slice
@@ -755,15 +754,14 @@
my $recursivesort;
my $multisort = sub {
my ($meth, @sort_list) = @_;
- my $sort_by = shift @sort_list;
+ my $sort_by = shift @sort_list;
my ($sort_get, $sort_arg) = @{$meth->{$sort_by}}{'get_meth', 'get_args'};
my $type = $meth->{$sort_by}{props}{type};
my $val;
if ($sort_by eq 'id'|| $sort_by eq 'version') {
# Do a numeric sorting.
- $val = $sort_get->($a, @$sort_arg) <=>
- $sort_get->($b, @$sort_arg);
+ $val = $sort_get->($a, @$sort_arg) <=> $sort_get->($b, @$sort_arg);
} elsif ($type eq 'date') {
# Pass in the ISO format so that it always sorts properly.
$val = $sort_get->($a, ISO_8601_FORMAT) cmp
@@ -810,7 +808,10 @@
@sort_objs = grep(not($exclude->($_)), @sort_objs);
}
- return @sort_objs;
+ my $sortOrder = get_state_data($widget, 'sortOrder') || '';
+ return defined $sortOrder && $sortOrder eq 'reverse'
+ ? [ reverse @sort_objs ]
+ : \@sort_objs;
};
</%once>
Modified: bricolage/trunk/comp/widgets/search/formatting.html
===================================================================
--- bricolage/trunk/comp/widgets/search/formatting.html 2004-11-19 08:54:20 UTC (rev \
6087)
+++ bricolage/trunk/comp/widgets/search/formatting.html 2004-11-19 08:55:15 UTC (rev \
6088) @@ -12,11 +12,20 @@
my $agent = detect_agent();
my $spacerRow = $agent->ie ? '<img src="/media/images/spacer.gif" width=550 \
height=3>' : "";
-my $advanced_search = get_state_data($widget, 'advanced_search')
- || get_pref('Default Search');
+my $advanced_search = get_state_data($widget, 'advanced_search');
+$advanced_search = get_pref('Default Search')
+ unless defined $advanced_search;
my $sites = $c->get('__SITES__');
unless ($sites) {
+ $sites = Bric::Biz::Site->list({ active => 1 });
+ $c->set('__SITES__', $sites);
+}
+
+$sites = [grep { chk_authz($_, EDIT, 1) } @$sites];
+my $sites = $c->get('__SITES__');
+
+unless ($sites) {
$sites = Bric::Biz::Site->list;
$c->set('__SITES__', $sites);
}
Modified: bricolage/trunk/comp/widgets/search/media.html
===================================================================
--- bricolage/trunk/comp/widgets/search/media.html 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/comp/widgets/search/media.html 2004-11-19 08:55:15 UTC (rev 6088)
@@ -13,8 +13,9 @@
my $agent = detect_agent();
my $spacerRow = $agent->ie ? '<img src="/media/images/spacer.gif" width=550 \
height=3>' : "";
-my $advanced_search = get_state_data($widget, 'advanced_search')
- || get_pref('Default Search');
+my $advanced_search = get_state_data($widget, 'advanced_search');
+$advanced_search = get_pref('Default Search')
+ unless defined $advanced_search;
my $asset_opts = $advanced_search ? {
'' => $lang->maketext('All Types'),
map { $_->get_id, $_->get_name }
@@ -27,7 +28,7 @@
my $sites = $c->get('__SITES__');
unless ($sites) {
- $sites = Bric::Biz::Site->list;
+ $sites = Bric::Biz::Site->list({ active => 1 });
$c->set('__SITES__', $sites);
}
Modified: bricolage/trunk/comp/widgets/search/story.html
===================================================================
--- bricolage/trunk/comp/widgets/search/story.html 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/comp/widgets/search/story.html 2004-11-19 08:55:15 UTC (rev 6088)
@@ -10,8 +10,9 @@
%#--- Initialization ---#
<%init>
-my $advanced_search = get_state_data($widget, 'advanced_search')
- || get_pref('Default Search');
+my $advanced_search = get_state_data($widget, 'advanced_search');
+$advanced_search = get_pref('Default Search')
+ unless defined $advanced_search;
my $asset_opts = $advanced_search ? {
'' => $lang->maketext('All Types'),
@@ -26,7 +27,7 @@
my $sites = $c->get('__SITES__');
unless ($sites) {
- $sites = Bric::Biz::Site->list;
+ $sites = Bric::Biz::Site->list({ active => 1 });
$c->set('__SITES__', $sites);
}
Modified: bricolage/trunk/comp/widgets/story_prof/edit_categories.html
===================================================================
--- bricolage/trunk/comp/widgets/story_prof/edit_categories.html 2004-11-19 08:54:20 \
UTC (rev 6087)
+++ bricolage/trunk/comp/widgets/story_prof/edit_categories.html 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -5,7 +5,7 @@
def_sort_field => 'uri',
title => 'Current Categories',
objs => \@categories,
-# profile => $category_current_profile,
+ profile => undef,
fields => [qw(uri site name primary)],
field_titles => { primary => 'Primary' },
field_values => $primary_sub,
@@ -72,7 +72,7 @@
# Output the radio button.
$m->scomp('/widgets/profile/radio.mc',
- name => "$widget|set_primary_category_cb",
+ name => "$widget|set_primary_category",
disp => '',
value => $cid,
checked => $cid == $primary_cat->get_id,
Modified: bricolage/trunk/comp/widgets/story_prof/edit_clone.html
===================================================================
--- bricolage/trunk/comp/widgets/story_prof/edit_clone.html 2004-11-19 08:54:20 UTC \
(rev 6087)
+++ bricolage/trunk/comp/widgets/story_prof/edit_clone.html 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -48,8 +48,7 @@
selected => $oc_id,
disp => 'Primary Output Channel',
name => 'desk_asset|new_oc_id',
- ojbs => [$elem->get_output_channels],
- constrain => { site_id => $site_id },
+ objs => [grep { $_->get_site_id == $site_id } \
$elem->get_output_channels], req => 1,
field => 'name',
localize => 0,
@@ -100,7 +99,7 @@
# Default values
$tmeth->{value} = 'Clone of ' . $story->get_title;
$smeth->{value} = $story->get_slug;
-$cmeth->{value} = $story->get_cover_date;
+$cmeth->{value} = $story->get_cover_date(ISO_8601_FORMAT);
my $cat_id = $story->get_primary_category->get_id;
my $oc_id = $story->get_primary_oc_id;
my $elem = Bric::Biz::AssetType->lookup({id => $story->get_element__id});
Modified: bricolage/trunk/comp/widgets/story_prof/story_prof.mc
===================================================================
--- bricolage/trunk/comp/widgets/story_prof/story_prof.mc 2004-11-19 08:54:20 UTC \
(rev 6087)
+++ bricolage/trunk/comp/widgets/story_prof/story_prof.mc 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -93,7 +93,6 @@
$param->{checkout} = $checkout if defined($checkout);
$param->{version} = $version if defined($version);
-
$story = Bric::Biz::Asset::Business::Story->lookup($param);
# Clear the story state data
Modified: bricolage/trunk/comp/workflow/manager/dhandler
===================================================================
--- bricolage/trunk/comp/workflow/manager/dhandler 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/comp/workflow/manager/dhandler 2004-11-19 08:55:15 UTC (rev 6088)
@@ -127,7 +127,7 @@
# Get the list of sites.
my $sites = $c->get('__SITES__');
unless ($sites) {
- $sites = Bric::Biz::Site->list;
+ $sites = Bric::Biz::Site->list({ active => 1 });
$c->set('__SITES__', $sites);
}
Modified: bricolage/trunk/comp/workflow/profile/workspace/clone/dhandler
===================================================================
--- bricolage/trunk/comp/workflow/profile/workspace/clone/dhandler 2004-11-19 \
08:54:20 UTC (rev 6087)
+++ bricolage/trunk/comp/workflow/profile/workspace/clone/dhandler 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -26,7 +26,8 @@
jsInit => 'document.theForm["title"].focus();'
&>
-<form action="<% $r->uri %>" method="post" name="theForm">
+<form action="<% $r->uri %>" method="post" name="theForm"
+ onSubmit="return confirmChanges(this)">
<& '/widgets/story_prof/story_prof.mc',
section => 'clone',
Copied: bricolage/trunk/contrib/bric_import_contribs (from rev 6084, \
bricolage/branches/rev_1_8/contrib/bric_import_contribs)
Deleted: bricolage/trunk/contrib/bric_import_contribs/Build.PL
===================================================================
--- bricolage/branches/rev_1_8/contrib/bric_import_contribs/Build.PL 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/contrib/bric_import_contribs/Build.PL 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,14 +0,0 @@
-use Module::Build;
-
-my $build = Module::Build->new
- ( module_name => 'bric_import_contribs',
- license => 'perl',
- create_makefile_pl => 'passthrough',
- script_files => [ 'bin/bric_import_contribs' ],
- dist_version_from => 'bin/bric_import_contribs',
- pm_files => {},
- requires => { Getopt::Long => 0,
- Pod::Usage => 0,
- },
- );
-$build->create_build_script;
Copied: bricolage/trunk/contrib/bric_import_contribs/Build.PL (from rev 6084, \
bricolage/branches/rev_1_8/contrib/bric_import_contribs/Build.PL)
Deleted: bricolage/trunk/contrib/bric_import_contribs/Changes
===================================================================
--- bricolage/branches/rev_1_8/contrib/bric_import_contribs/Changes 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/contrib/bric_import_contribs/Changes 2004-11-19 08:55:15 UTC (rev \
6088) @@ -1,4 +0,0 @@
-Revision history for bric_import_contribs.
-
-0.10 2004-09-24T01:53:52
- - Initial release.
\ No newline at end of file
Copied: bricolage/trunk/contrib/bric_import_contribs/Changes (from rev 6084, \
bricolage/branches/rev_1_8/contrib/bric_import_contribs/Changes)
Deleted: bricolage/trunk/contrib/bric_import_contribs/MANIFEST
===================================================================
--- bricolage/branches/rev_1_8/contrib/bric_import_contribs/MANIFEST 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/contrib/bric_import_contribs/MANIFEST 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,9 +0,0 @@
-bin/bric_import_contribs
-Build.PL
-Changes
-Makefile.PL
-MANIFEST This list of files
-README
-t/bric_import_contribs.t
-t/zpod.t
-META.yml
Copied: bricolage/trunk/contrib/bric_import_contribs/MANIFEST (from rev 6084, \
bricolage/branches/rev_1_8/contrib/bric_import_contribs/MANIFEST)
Deleted: bricolage/trunk/contrib/bric_import_contribs/MANIFEST.SKIP
===================================================================
--- bricolage/branches/rev_1_8/contrib/bric_import_contribs/MANIFEST.SKIP 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/contrib/bric_import_contribs/MANIFEST.SKIP 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -1,9 +0,0 @@
-^_build
-^Build$
-^blib
-~$
-\.bak$
-^MANIFEST\.SKIP$
-^bric_
-^www
-\.svn
Copied: bricolage/trunk/contrib/bric_import_contribs/MANIFEST.SKIP (from rev 6084, \
bricolage/branches/rev_1_8/contrib/bric_import_contribs/MANIFEST.SKIP)
Deleted: bricolage/trunk/contrib/bric_import_contribs/META.yml
===================================================================
--- bricolage/branches/rev_1_8/contrib/bric_import_contribs/META.yml 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/contrib/bric_import_contribs/META.yml 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,12 +0,0 @@
---- #YAML:1.0
-name: bric_import_contribs
-version: 0.10
-author:
- - David Wheeler <david@kineticode.com>.
-abstract: Import contributors from a tab-delimited file
-license: perl
-requires:
- Getopt::Long: 0
- Pod::Usage: 0
-provides: {}
-generated_by: Module::Build version 0.25_03
Copied: bricolage/trunk/contrib/bric_import_contribs/META.yml (from rev 6084, \
bricolage/branches/rev_1_8/contrib/bric_import_contribs/META.yml)
Deleted: bricolage/trunk/contrib/bric_import_contribs/Makefile.PL
===================================================================
--- bricolage/branches/rev_1_8/contrib/bric_import_contribs/Makefile.PL 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/contrib/bric_import_contribs/Makefile.PL 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,31 +0,0 @@
-# Note: this file was auto-generated by Module::Build::Compat version 0.03
-
- unless (eval "use Module::Build::Compat 0.02; 1" ) {
- print "This module requires Module::Build to install itself.\n";
-
- require ExtUtils::MakeMaker;
- my $yn = ExtUtils::MakeMaker::prompt
- (' Install Module::Build now from CPAN?', 'y');
-
- unless ($yn =~ /^y/i) {
- die " *** Cannot install without Module::Build. Exiting ...\n";
- }
-
- require Cwd;
- require File::Spec;
- require CPAN;
-
- # Save this 'cause CPAN will chdir all over the place.
- my $cwd = Cwd::cwd();
- my $makefile = File::Spec->rel2abs($0);
-
- CPAN::Shell->install('Module::Build::Compat')
- or die " *** Cannot install without Module::Build. Exiting ...\n";
-
- chdir $cwd or die "Cannot chdir() back to $cwd: $!";
- exec $^X, $makefile, @ARGV; # Redo now that we have Module::Build
- }
- use lib '_build/lib';
- Module::Build::Compat->run_build_pl(args => \@ARGV);
- require Module::Build;
- Module::Build::Compat->write_makefile(build_class => 'Module::Build');
Copied: bricolage/trunk/contrib/bric_import_contribs/Makefile.PL (from rev 6084, \
bricolage/branches/rev_1_8/contrib/bric_import_contribs/Makefile.PL)
Deleted: bricolage/trunk/contrib/bric_import_contribs/README
===================================================================
--- bricolage/branches/rev_1_8/contrib/bric_import_contribs/README 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/contrib/bric_import_contribs/README 2004-11-19 08:55:15 UTC (rev \
6088) @@ -1,34 +0,0 @@
-bric_import_contribs 0.10
-=========================
-
-This program creates new contributors in a Bricolage installation from records
-in a tab-delimited file. The file must have a record for one contributor on
-each line of the file, and must contain tab-delimited fields with each part of
-each contributor's name. The file may also optionally contain contact
-information for each user (email address, phone numbers, etc.) and content for
-custom fields.
-
-INSTALLATION
-
-To install this module, type the following:
-
- perl Build.PL
- ./Build
- ./Build test
- ./Build install
-
-DEPENDENCIES
-
-This program requires these other modules and libraries:
-
- Getopt::Long
- Pod::Usage
-
-It also requires a Bricolage server and API.
-
-COPYRIGHT AND LICENCE
-
-Copyright (c) 2004 Kineticode, Inc. All rightgs reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the same terms as Perl itself.
Copied: bricolage/trunk/contrib/bric_import_contribs/README (from rev 6084, \
bricolage/branches/rev_1_8/contrib/bric_import_contribs/README)
Copied: bricolage/trunk/contrib/bric_import_contribs/bin (from rev 6084, \
bricolage/branches/rev_1_8/contrib/bric_import_contribs/bin)
Deleted: bricolage/trunk/contrib/bric_import_contribs/bin/bric_import_contribs
===================================================================
--- bricolage/branches/rev_1_8/contrib/bric_import_contribs/bin/bric_import_contribs 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/contrib/bric_import_contribs/bin/bric_import_contribs 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,253 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use Getopt::Long;
-use Pod::Usage;
-use Bric::Biz::Person;
-use Bric::Biz::Person::User;
-use Bric::Util::Grp::Person;
-use Bric::Util::Grp::Parts::Member::Contrib;
-use Bric::Util::Attribute::Grp;
-use Bric::Util::Event;
-
-our $VERSION = '0.10';
-
-my $subsys = '_MEMBER_SUBSYS';
-
-GetOptions(
- "username=s" => \my $username,
- "password=s" => \my $password,
- "contrib-type=s" => \my $groupname,
- "skip-first" => \my $skipfirst,
- "custom-field=s" => \my @extra_fields,
- "contact-field=s" => \my @contact_fields,
-);
-
-pod2usage("Missing required --username option.") unless $username;
-pod2usage("Missing required --password option.") unless $password;
-pod2usage("Missing required --contrib-type option.") unless $groupname;
-pod2usage("No import file specified.") unless @ARGV;
-
-# Find the user and make sure they're legit.
-my $user = Bric::Biz::Person::User->lookup({ login => $username });
-die qq{Bad username or password\n} unless $user;
-
-# Uncomment this line to be insecure.
-$user->chk_password($password) or die qq{Bad username or password\n};
-
-# Find the contributor group.
-my $grp = Bric::Util::Grp::Person->list({
- name => $groupname,
- permanent => 0,
- all => 1,
-});
-
-# Make sure we have a contributor group.
-die qq{There is no such contributor type "$groupname"\n}
- unless $grp && @$grp;
-
-# Make sure we have only one grp.
-die qq{There is more than one contributor type named "$groupname"\n}
- if @$grp > 1;
-
-# Great, now we know who we're dealing with!
-$grp = $grp->[0];
-
-# Skip the first record.
-<> if $skipfirst;
-
-# We'll need this to get the SQL type of custom fields.
-# XXX We're ignor field max length for now.
-
-if (@extra_fields) {
- my $mem_attr = Bric::Util::Attribute::Grp->new({
- id => $grp->get_id,
- susbsys => $subsys,
- });
- for (@extra_fields) {
- $_ = [$_ => $mem_attr->get_sqltype({ name => $_,
- subsys => $subsys,
- })
- ];
- die qq{Custom field "$_->[0]" is not specified for contributor }
- . qq{type "$groupname"\n} unless $_->[1];
- }
-}
-
-
-# Now let's create the new records.
-while (<>) {
- my ($prefix, $first, $middle, $last, $suffix, @extra) = split /\t/;
- # Create the person object.
- my $contrib = Bric::Biz::Person->new({
- prefix => $prefix,
- fname => $first,
- mname => $middle,
- lname => $last,
- suffix => $suffix,
- })->save;
-
- # Add the person to the contributor group.
- my $member = $grp->add_member({ obj => $contrib });
- $grp->save;
-
- # We need a contrib object, not just a member oject. So look it up.
- $member = Bric::Util::Grp::Parts::Member::Contrib->lookup({
- id => $member->get_id
- });
-
- # Log the creation of the new contributor.
- Bric::Util::Event->new({
- key_name => 'contrib_new',
- obj => $member,
- user => $user,
- });
-
- # Add any contact fields.
- if (@contact_fields) {
- for my $type (@contact_fields) {
- my $value = shift @extra;
- $value = '' unless defined $value;
- $contrib->new_contact($type, $value);
- }
- $contrib->save;
- }
-
- # Add any custom fields.
- if (@extra_fields) {
- for my $field (@extra_fields) {
- my $value = shift @extra;
- $value = '' unless defined $value;
- $member->set_attr({ subsys => $subsys,
- name => $field->[0],
- value => $value,
- sql_type => $field->[1] });
- }
- $member->save;
- }
-
- # Let em know what we've done.
- print "Added ", $contrib->get_name, $/;
-
-}
-
-1;
-__END__
-
-=head1 NAME
-
-import_contribs - Import contributors from a tab-delimited file
-
-=head1 SYNOPSIS
-
- import_contribs --username admin --password password \
- --contrib-type Writers file.tab
-
-=head1 DESCRIPTION
-
-This program creates new contributors in a Bricolage installation from records
-in a tab-delimited file. The file must have a record for one contributor on
-each line of the file, and must contain tab-delimited fields with each part of
-each contributor's name. The file may also optionally contain contact
-information for each user (email address, phone numbers, etc.) and content for
-custom fields.
-
-=head1 OPTIONS
-
- import_contribs --username username --password password \
- --contrib-type contrib_type [options] import_file
-
-=head2 Arguments
-
-=over 4
-
-=item import_file
-
-The file containing the tab-delimited records of contributors to be
-imported. Each line should contain the following fields in the following
-order:
-
-=over 4
-
-=item Prefix
-
-=item First Name
-
-=item Middle Name
-
-=item Last Name
-
-=item Sufix
-
-=back
-
-Extra columns of data can be specified for custom field content using the
-C<--custom-field> option.
-
-=back
-
-=head2 Options
-
-=over 4
-
-=item C<--username>
-
-The name of the user doing the import. This will be used for logging the
-creation of all of the contributors. Required.
-
-=item C<--password>
-
-The password for the user importing the contributors. Required.
-
-=item C<--contrib-type>
-
-The type of contributor to be used to create all of the contributors in the
-file. Required.
-
-=item C<--skip-first>
-
-Pass a true value for this option to skip the first line of the import
-file. Usefule when the first line is used to identify the columns in the rest
-of the file. Optional.
-
-=item C<--contact-field>
-
-Use this option to specify that one ore more tab-delimited fields following
-the required name fields contains contact data. Pass in the type of contact
-information is in each field, such as "Primary Email" or "Business Phone".
-Contact fields B<must> preceed any custom fields in the tab-delimited file. To
- specify more than one contact field, simply use the option multiple times:
-
- --contact-field 'Business Phone' --contact-field 'Primary Email'
-
-Optional.
-
-=item C<--custom-field>
-
-Use this option to specify one or more extra columns of content in the
-tab-delimited file to be used for filling in the contents of custom fields for
-the default role for each contributor. Custom field content data B<must>
-follow any contact field data in the tab-delmited file. Also, note that the
-contributor type B<must> have custom fields created with the names passed via
-this option. To specify more than one custom field, simply use the option
-multiple times:
-
- --cutom-field foo --custom-field bar
-
-Optional.
-
-=back
-
-=head1 AUTHOR
-
-David Wheeler <david@kineticode.com>. Development sponsored by the RAND
-Corporation E<reg>.
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (c) 2004 Kineticode, Inc. All rights reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the same terms as Perl itself.
-
-=cut
Copied: bricolage/trunk/contrib/bric_import_contribs/bin/bric_import_contribs (from \
rev 6084, bricolage/branches/rev_1_8/contrib/bric_import_contribs/bin/bric_import_contribs)
Property changes on: \
bricolage/trunk/contrib/bric_import_contribs/bin/bric_import_contribs \
___________________________________________________________________
Name: svn:executable
+ *
Copied: bricolage/trunk/contrib/bric_import_contribs/t (from rev 6084, \
bricolage/branches/rev_1_8/contrib/bric_import_contribs/t)
Deleted: bricolage/trunk/contrib/bric_import_contribs/t/bric_import_contribs.t
===================================================================
--- bricolage/branches/rev_1_8/contrib/bric_import_contribs/t/bric_import_contribs.t 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/contrib/bric_import_contribs/t/bric_import_contribs.t 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,14 +0,0 @@
-#!/usr/bin/perl -w
-
-# $Id: bric_media_dump.t 5554 2004-05-25 01:17:44Z theory $
-
-use strict;
-use File::Spec::Functions 'catfile';
-print "1..1\n";
-my $script = catfile qw(bin bric_import_contribs);
-
-# Prevent "syntax OK" output.
-close STDERR;
-
-my $ret = system $^X, '-cw', $script;
-print +($ret ? 'not ' : ''), "ok 1\n"
Copied: bricolage/trunk/contrib/bric_import_contribs/t/bric_import_contribs.t (from \
rev 6084, bricolage/branches/rev_1_8/contrib/bric_import_contribs/t/bric_import_contribs.t)
Deleted: bricolage/trunk/contrib/bric_import_contribs/t/zpod.t
===================================================================
--- bricolage/branches/rev_1_8/contrib/bric_import_contribs/t/zpod.t 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/contrib/bric_import_contribs/t/zpod.t 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,10 +0,0 @@
-#!perl -w
-
-# $Id: zpod.t 5554 2004-05-25 01:17:44Z theory $
-
-use strict;
-use Test::More;
-use File::Spec::Functions 'curdir';
-eval "use Test::Pod 1.06";
-plan skip_all => "Test::Pod 1.06 required for testing POD" if $@;
-all_pod_files_ok();
Copied: bricolage/trunk/contrib/bric_import_contribs/t/zpod.t (from rev 6084, \
bricolage/branches/rev_1_8/contrib/bric_import_contribs/t/zpod.t)
Modified: bricolage/trunk/contrib/bric_media_dump/t/zpod.t
===================================================================
--- bricolage/trunk/contrib/bric_media_dump/t/zpod.t 2004-11-19 08:54:20 UTC (rev \
6087)
+++ bricolage/trunk/contrib/bric_media_dump/t/zpod.t 2004-11-19 08:55:15 UTC (rev \
6088) @@ -7,4 +7,4 @@
use File::Spec::Functions 'curdir';
eval "use Test::Pod 1.06";
plan skip_all => "Test::Pod 1.06 required for testing POD" if $@;
-all_pod_files_ok(Test::Pod::all_pod_files(curdir));
+all_pod_files_ok();
Modified: bricolage/trunk/contrib/bric_template_dump/t/zpod.t
===================================================================
--- bricolage/trunk/contrib/bric_template_dump/t/zpod.t 2004-11-19 08:54:20 UTC (rev \
6087)
+++ bricolage/trunk/contrib/bric_template_dump/t/zpod.t 2004-11-19 08:55:15 UTC (rev \
6088) @@ -7,4 +7,4 @@
use File::Spec::Functions 'curdir';
eval "use Test::Pod 1.06";
plan skip_all => "Test::Pod 1.06 required for testing POD" if $@;
-all_pod_files_ok(Test::Pod::all_pod_files(curdir));
+all_pod_files_ok();
Copied: bricolage/trunk/contrib/thumbnails (from rev 6084, \
bricolage/branches/rev_1_8/contrib/thumbnails)
Deleted: bricolage/trunk/contrib/thumbnails/README
===================================================================
--- bricolage/branches/rev_1_8/contrib/thumbnails/README 2004-11-18 22:43:03 UTC (rev \
6084)
+++ bricolage/trunk/contrib/thumbnails/README 2004-11-19 08:55:15 UTC (rev 6088)
@@ -1,4 +0,0 @@
-The script precreate-thumbnails.pl "primes" your thumbnail pump
-ahead of time so that you don't have to create a bunch of them
-in real time. See inline of this short script for more details
-of how to use it.
Copied: bricolage/trunk/contrib/thumbnails/README (from rev 6084, \
bricolage/branches/rev_1_8/contrib/thumbnails/README)
Deleted: bricolage/trunk/contrib/thumbnails/precreate-thumbs.pl
===================================================================
--- bricolage/branches/rev_1_8/contrib/thumbnails/precreate-thumbs.pl 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/contrib/thumbnails/precreate-thumbs.pl 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,29 +0,0 @@
-#!/usr/bin/perl
-# Create thumbnails for all images in a Bricolage install.
-# Requires that USE_THUMBNAILS be enabled in bricolage.conf.
-# You'll also have to run this as your Apache user so you
-# have permission to write to comp/data/media/*.
-
-use strict;
-use warnings;
-
-# If BRICOLAGE_ROOT doesn't exist, this script will fail;
-# change this to wherever your 'lib' directory is.
-use lib "$ENV{'BRICOLAGE_ROOT'}/lib";
-use Bric::Biz::Asset::Business::Media::Image;
-
-# Creating 20000 image objects would suck, so I fetch the IDs
-# then lookup each object as needed
-my $ids = Bric::Biz::Asset::Business::Media::Image->list_ids;
-print "creating ", scalar(@$ids), " thumbnails\n";
-foreach my $id (@$ids) {
- my $img = Bric::Biz::Asset::Business::Media::Image->lookup({id => $id});
- my $res = eval { $img->create_thumbnail() };
- if ($@) {
- print "failed to create thumbnail $id: $@\n";
- print "res = $res\n" if defined $res;
- die;
- } else {
- print $img->get_primary_uri, $/;
- }
-}
Copied: bricolage/trunk/contrib/thumbnails/precreate-thumbs.pl (from rev 6084, \
bricolage/branches/rev_1_8/contrib/thumbnails/precreate-thumbs.pl)
Property changes on: bricolage/trunk/contrib/thumbnails/precreate-thumbs.pl
___________________________________________________________________
Name: svn:executable
+ *
Modified: bricolage/trunk/inst/apache.pl
===================================================================
--- bricolage/trunk/inst/apache.pl 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/inst/apache.pl 2004-11-19 08:55:15 UTC (rev 6088)
@@ -278,7 +278,7 @@
if ($Config::Config{usemymalloc} eq 'y'
&& defined $Config::Config{bincompat5005}) {
hard_fail("mod_perl must be either statically compiled into "
- . "Apache or else bec compiled with a Perl compiled\n"
+ . "Apache or else be compiled with a Perl compiled\n"
. "with \"usemymalloc='n'\" or without "
. "\"bincompat5005\". See this FAQ for more information:"
. "\n\n http://perl.apache.org/docs/1.0/guide/install."
Modified: bricolage/trunk/inst/clone_files.pl
===================================================================
--- bricolage/trunk/inst/clone_files.pl 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/inst/clone_files.pl 2004-11-19 08:55:15 UTC (rev 6088)
@@ -68,7 +68,7 @@
opendir(CUR, '.') or die $!;
my %exclude = map { $_ => 1 } qw(. .. dist comp data conf bin lib);
foreach my $d (readdir(CUR)) {
- next if $exclude{$d} or $d =~ /.db$/;
+ next if $exclude{$d} or $d =~ /.db$/ or $d =~ /^bricolage-/;
system("cp -pR $d dist");
}
close(CUR);
Modified: bricolage/trunk/inst/conf.pl
===================================================================
--- bricolage/trunk/inst/conf.pl 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/inst/conf.pl 2004-11-19 08:55:15 UTC (rev 6088)
@@ -206,7 +206,7 @@
if ($AP->{load_modules}{"${mod}_module"}) {
$dso_section .= "LoadModule \t config_log_module " .
$AP->{load_modules}{"${mod}_module"} . "\n" .
- "AddModule \t mod_$mod.c\n\n";
+ "AddModule \t mod_log_config.c\n\n";
}
} elsif ($mod eq 'gzip') {
# Load optional module mod_gzip
Modified: bricolage/trunk/inst/db_upgrade.pl
===================================================================
--- bricolage/trunk/inst/db_upgrade.pl 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/inst/db_upgrade.pl 2004-11-19 08:55:15 UTC (rev 6088)
@@ -44,11 +44,24 @@
our $PG;
do './postgres.db' or die "Failed to read postgres.db : $!";
+# Switch to postgres system user
+print "Becoming $PG->{system_user}...\n";
+$> = $PG->{system_user_uid};
+die "Failed to switch EUID to $PG->{system_user_uid} ($PG->{system_user}).\n"
+ unless $> == $PG->{system_user_uid};
+
+# Set environment variables for psql.
+$ENV{PGUSER} = $PG->{root_user};
+$ENV{PGPASSWORD} = $PG->{root_pass};
+$ENV{PGHOST} = $PG->{host_name} if ( $PG->{host_name} ne "localhost" );
+$ENV{PGPORT} = $PG->{host_port} if ( $PG->{host_port} ne "" );
+
print "\n\n==> Starting Database Upgrade <==\n\n";
# setup environment to ensure scripts run correctly
$ENV{BRICOLAGE_ROOT} = $UPGRADE->{BRICOLAGE_ROOT};
my $perl = $ENV{PERL} || $^X;
+$ENV{PERL5LIB} = $CONFIG->{MODULE_DIR};
# run the upgrade scripts
foreach my $v (@{$UPGRADE->{TODO}}) {
@@ -62,8 +75,8 @@
foreach my $script (@scripts) {
print "Running '$perl $script'.\n";
- my $ret = system("$perl", "-I$CONFIG->{MODULE_DIR}", $script, '-u',
- $PG->{root_user}, '-p', $PG->{root_pass});
+ my $ret = system("$perl", $script, '-u', $PG->{root_user},
+ '-p', $PG->{root_pass});
# Pass through abnormal exits so that `make` will be halted.
exit $ret / 256 if $ret;
}
Modified: bricolage/trunk/inst/required.pl
===================================================================
--- bricolage/trunk/inst/required.pl 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/inst/required.pl 2004-11-19 08:55:15 UTC (rev 6088)
@@ -86,7 +86,7 @@
$RESULTS{EXPAT}) {
hard_fail("Required software not found:\n\n",
$RESULTS{PG} ? "" :
- "\tPostgreSQL >= 7.1.0 (http://postgresql.org)\n",
+ "\tPostgreSQL >= 7.3.0 (http://postgresql.org)\n",
$RESULTS{APACHE} ? "" :
"\tApache >= 1.3.12 (http://apache.org)\n",
$RESULTS{EXPAT} ? "" :
@@ -106,7 +106,7 @@
# look for postgresql
sub find_pg {
- print "Looking for PostgreSQL with version >= 7.2.0...\n";
+ print "Looking for PostgreSQL with version >= 7.3.0...\n";
# find PostgreSQL by looking for pg_config. First search user's path
# then some standard locations.
@@ -155,14 +155,10 @@
unless defined $x and defined $y;
$z ||= 0;
return soft_fail("Found old version of Postgres: $x.$y.$z - ",
- "7.2.0 or greater required.")
- unless (($x > 7) or ($x == 7 and $y >= 2));
+ "7.3.0 or greater required.")
+ unless (($x > 7) or ($x == 7 and $y >= 3));
print "Found acceptable version of Postgres: $x.$y.$z.\n";
- print "However, version 7.3.0 or later is strongly recommended.\n",
- "Please consider upgrading.\n"
- unless (($x > 7) or ($x == 7 and $y >= 3));
-
$REQ{PG_VERSION} = [$x,$y,$z];
return 1;
@@ -217,8 +213,7 @@
}
print "Found Apache executable at $REQ{APACHE_EXE}.\n";
-
-
+
# check version
my $version = `$REQ{APACHE_EXE} -v`;
return soft_fail("Failed to find Apache version with ",
@@ -228,13 +223,15 @@
return soft_fail("Failed to parse Apache version from string ",
"\"$version\".")
unless defined $x and defined $y and defined $z;
+ return soft_fail("Found Apache 2. Bricolage only supports Apache 1.3.\n")
+ if $x > 1;
return soft_fail("Found old version of Apache: $x.$y.$z - ",
"1.3.12 or greater required.")
- unless (($x > 1) or ($x == 1 and $y > 3) or
+ unless (($x == 1 and $y > 3) or
($x == 1 and $y == 3 and $z >= 12));
print "Found acceptable version of Apache: $x.$y.$z.\n";
$REQ{APACHE_VERSION} = [$x,$y,$z];
-
+
return 1;
}
Modified: bricolage/trunk/inst/upgrade/1.8.2/delete_old_jobs.pl
===================================================================
--- bricolage/trunk/inst/upgrade/1.8.2/delete_old_jobs.pl 2004-11-19 08:54:20 UTC \
(rev 6087)
+++ bricolage/trunk/inst/upgrade/1.8.2/delete_old_jobs.pl 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -21,8 +21,23 @@
Would you like to delete all existing completed distribution jobs?},
'y';
-do_sql "DELETE FROM job
- WHERE executing = 0
- AND (comp_time IS NOT NULL OR failed = 1)"
+do_sql "
+ DELETE FROM member
+ WHERE class__id IN (54, 79, 80)
+ AND id NOT IN (
+ SELECT member__id
+ FROM job_member, job
+ WHERE job.id = job_member.object_id
+ AND (
+ executing = 1
+ OR comp_time IS NULL
+ )
+ )",
+
+ "DELETE FROM job
+ WHERE executing = 0
+ AND (
+ comp_time IS NOT NULL
+ OR failed = 1
+ )"
;
-
Copied: bricolage/trunk/inst/upgrade/1.8.3 (from rev 6084, \
bricolage/branches/rev_1_8/inst/upgrade/1.8.3)
Deleted: bricolage/trunk/inst/upgrade/1.8.3/add_ru_ru.pl
===================================================================
--- bricolage/branches/rev_1_8/inst/upgrade/1.8.3/add_ru_ru.pl 2004-11-18 22:43:03 \
UTC (rev 6084)
+++ bricolage/trunk/inst/upgrade/1.8.3/add_ru_ru.pl 2004-11-19 08:55:15 UTC (rev \
6088) @@ -1,14 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use File::Spec::Functions qw(catdir updir);
-use FindBin;
-use lib catdir $FindBin::Bin, updir, 'lib';
-use bric_upgrade qw(:all);
-
-# If this fails, then the correct constraints are in place.
-exit if fetch_sql "SELECT pref__id FROM pref_opt WHERE pref__id = 15 AND value = \
'ru_ru'";
-
-do_sql
- "INSERT INTO pref_opt (pref__id, value, description)
- VALUES (15, 'ru_ru', 'ru_ru')";
Copied: bricolage/trunk/inst/upgrade/1.8.3/add_ru_ru.pl (from rev 6084, \
bricolage/branches/rev_1_8/inst/upgrade/1.8.3/add_ru_ru.pl)
Property changes on: bricolage/trunk/inst/upgrade/1.8.3/add_ru_ru.pl
___________________________________________________________________
Name: svn:executable
+ *
Name: snv:mime-type
+ text/plain
Name: svn:keywords
+ Id
Deleted: bricolage/trunk/inst/upgrade/1.8.3/asset_fks_restrict.pl
===================================================================
--- bricolage/branches/rev_1_8/inst/upgrade/1.8.3/asset_fks_restrict.pl 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/inst/upgrade/1.8.3/asset_fks_restrict.pl 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,37 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use File::Spec::Functions qw(catdir updir);
-use FindBin;
-use lib catdir $FindBin::Bin, updir, 'lib';
-use bric_upgrade qw(:all);
-
-exit if test_foreign_key 'story', 'fk_source__story', 'r';
-
-for my $table (qw(story media)) {
- for my $attr (qw(source usr element workflow site desk)) {
- do_sql "ALTER TABLE $table DROP CONSTRAINT fk_$attr\__$table"
- if test_foreign_key $table, "fk_$attr\__$table";
- do_sql
- "ALTER TABLE $table
- ADD CONSTRAINT fk_$attr\__$table FOREIGN KEY ($attr\__id)
- REFERENCES $attr(id) ON DELETE RESTRICT";
- }
-
- do_sql "ALTER TABLE $table DROP CONSTRAINT fk_$table\__$table\_id"
- if test_foreign_key $table, "fk_$table\__$table\_id";
- do_sql
- "ALTER TABLE $table
- ADD CONSTRAINT fk_$table\__$table\_id FOREIGN KEY (alias_id)
- REFERENCES $table(id) ON DELETE RESTRICT";
-}
-
-for my $attr (qw(usr output_channel element category workflow site desk)) {
- my $fkt = $attr eq 'output_channel' ? 'fromatting' : 'formatting';
- do_sql "ALTER TABLE formatting DROP CONSTRAINT fk_$attr\__formatting"
- if test_foreign_key 'formatting', "fk_$attr\__formatting";
- do_sql
- "ALTER TABLE formatting
- ADD CONSTRAINT fk_$attr\__formatting FOREIGN KEY ($attr\__id)
- REFERENCES $attr(id) ON DELETE RESTRICT";
-}
Copied: bricolage/trunk/inst/upgrade/1.8.3/asset_fks_restrict.pl (from rev 6084, \
bricolage/branches/rev_1_8/inst/upgrade/1.8.3/asset_fks_restrict.pl)
Property changes on: bricolage/trunk/inst/upgrade/1.8.3/asset_fks_restrict.pl
___________________________________________________________________
Name: svn:executable
+ *
Name: snv:mime-type
+ text/plain
Name: svn:keywords
+ Id
Deleted: bricolage/trunk/inst/upgrade/1.8.3/cleanup_job_members.pl
===================================================================
--- bricolage/branches/rev_1_8/inst/upgrade/1.8.3/cleanup_job_members.pl 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/inst/upgrade/1.8.3/cleanup_job_members.pl 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,15 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use File::Spec::Functions qw(catdir updir);
-use FindBin;
-use lib catdir $FindBin::Bin, updir, 'lib';
-use bric_upgrade qw(:all);
-
-# This is to address the fact that the delete_old_jobs.pl script in the 1.8.2
-# release could leave orphaned records in the member table.
-do_sql "
- DELETE FROM member
- WHERE class__id IN (54, 79, 80)
- AND id NOT IN (select member__id FROM job_member)
-";
Copied: bricolage/trunk/inst/upgrade/1.8.3/cleanup_job_members.pl (from rev 6084, \
bricolage/branches/rev_1_8/inst/upgrade/1.8.3/cleanup_job_members.pl)
Property changes on: bricolage/trunk/inst/upgrade/1.8.3/cleanup_job_members.pl
___________________________________________________________________
Name: svn:executable
+ *
Name: snv:mime-type
+ text/plain
Name: svn:keywords
+ Id
Deleted: bricolage/trunk/inst/upgrade/1.8.3/element__site_pk.pl
===================================================================
--- bricolage/branches/rev_1_8/inst/upgrade/1.8.3/element__site_pk.pl 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/inst/upgrade/1.8.3/element__site_pk.pl 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,33 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use File::Spec::Functions qw(catdir updir);
-use FindBin;
-use lib catdir $FindBin::Bin, updir, 'lib';
-use bric_upgrade qw(:all);
-
-# If this fails, then the correct constraints are in place.
-exit if test_column 'element__site', 'id';
-
-do_sql
- # Add the new sequence.
- qq{CREATE SEQUENCE seq_element__site START 1024},
-
- # Add the id column.
- qq{ALTER TABLE element__site
- ADD COLUMN id NUMERIC(10,0)},
-
- # Set its default to use the new sequence.
- qq{ALTER TABLE element__site
- ALTER COLUMN id SET DEFAULT NEXTVAL('seq_element__site')},
-
- # Make sure that it isn't null.
- qq{update element__site set id = NEXTVAL('seq_element__site')},
-
- # Make sure it can never be null.
- qq{ALTER TABLE element__site
- ADD CONSTRAINT ck_element__site__id__null CHECK (id IS NOT NULL)},
-
- # Make it the primary key.
- qq{ALTER TABLE element__site ADD PRIMARY KEY (id)},
- ;
Copied: bricolage/trunk/inst/upgrade/1.8.3/element__site_pk.pl (from rev 6084, \
bricolage/branches/rev_1_8/inst/upgrade/1.8.3/element__site_pk.pl)
Deleted: bricolage/trunk/inst/upgrade/1.8.3/event_attr_pk.pl
===================================================================
--- bricolage/branches/rev_1_8/inst/upgrade/1.8.3/event_attr_pk.pl 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/inst/upgrade/1.8.3/event_attr_pk.pl 2004-11-19 08:55:15 UTC (rev \
6088) @@ -1,33 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use File::Spec::Functions qw(catdir updir);
-use FindBin;
-use lib catdir $FindBin::Bin, updir, 'lib';
-use bric_upgrade qw(:all);
-
-# If this fails, then the correct constraints are in place.
-exit if test_column 'event_attr', 'id';
-
-do_sql
- # Add the new sequence.
- qq{CREATE SEQUENCE seq_event_attr START 1024},
-
- # Add the id column.
- qq{ALTER TABLE event_attr
- ADD COLUMN id NUMERIC(10,0)},
-
- # Set its default to use the new sequence.
- qq{ALTER TABLE event_attr
- ALTER COLUMN id SET DEFAULT NEXTVAL('seq_event_attr')},
-
- # Make sure that it isn't null.
- qq{update event_attr set id = NEXTVAL('seq_event_attr')},
-
- # Make sure it can never be null.
- qq{ALTER TABLE event_attr
- ADD CONSTRAINT ck_event_attr__id__null CHECK (id IS NOT NULL)},
-
- # Make it the primary key.
- qq{ALTER TABLE event_attr ADD PRIMARY KEY (id)},
- ;
Copied: bricolage/trunk/inst/upgrade/1.8.3/event_attr_pk.pl (from rev 6084, \
bricolage/branches/rev_1_8/inst/upgrade/1.8.3/event_attr_pk.pl)
Deleted: bricolage/trunk/inst/upgrade/1.8.3/fix_all_preferences_group_spelling.pl
===================================================================
--- bricolage/branches/rev_1_8/inst/upgrade/1.8.3/fix_all_preferences_group_spelling.pl 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/inst/upgrade/1.8.3/fix_all_preferences_group_spelling.pl 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -1,13 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use File::Spec::Functions qw(catdir updir);
-use FindBin;
-use lib catdir $FindBin::Bin, updir, 'lib';
-use bric_upgrade qw(:all);
-
-do_sql
- "UPDATE grp SET description = 'All preferences in the system.' WHERE id = 22",
- ;
-
-
\ No newline at end of file
Copied: bricolage/trunk/inst/upgrade/1.8.3/fix_all_preferences_group_spelling.pl \
(from rev 6084, bricolage/branches/rev_1_8/inst/upgrade/1.8.3/fix_all_preferences_group_spelling.pl)
Deleted: bricolage/trunk/inst/upgrade/1.8.3/fix_event_sequence.pl
===================================================================
--- bricolage/branches/rev_1_8/inst/upgrade/1.8.3/fix_event_sequence.pl 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/inst/upgrade/1.8.3/fix_event_sequence.pl 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,12 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use File::Spec::Functions qw(catdir updir);
-use FindBin;
-use lib catdir $FindBin::Bin, updir, 'lib';
-use bric_upgrade qw(:all);
-
-do_sql
- "ALTER TABLE event ALTER COLUMN id DROP DEFAULT",
- "ALTER TABLE event ALTER COLUMN id SET DEFAULT NEXTVAL('seq_event')",
- ;
Copied: bricolage/trunk/inst/upgrade/1.8.3/fix_event_sequence.pl (from rev 6084, \
bricolage/branches/rev_1_8/inst/upgrade/1.8.3/fix_event_sequence.pl)
Deleted: bricolage/trunk/inst/upgrade/1.8.3/media_uri_pk.pl
===================================================================
--- bricolage/branches/rev_1_8/inst/upgrade/1.8.3/media_uri_pk.pl 2004-11-18 22:43:03 \
UTC (rev 6084)
+++ bricolage/trunk/inst/upgrade/1.8.3/media_uri_pk.pl 2004-11-19 08:55:15 UTC (rev \
6088) @@ -1,33 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use File::Spec::Functions qw(catdir updir);
-use FindBin;
-use lib catdir $FindBin::Bin, updir, 'lib';
-use bric_upgrade qw(:all);
-
-# If this fails, then the correct constraints are in place.
-exit if test_column 'media_uri', 'id';
-
-do_sql
- # Add the new sequence.
- qq{CREATE SEQUENCE seq_media_uri START 1024},
-
- # Add the id column.
- qq{ALTER TABLE media_uri
- ADD COLUMN id NUMERIC(10,0)},
-
- # Set its default to use the new sequence.
- qq{ALTER TABLE media_uri
- ALTER COLUMN id SET DEFAULT NEXTVAL('seq_media_uri')},
-
- # Make sure that it isn't null.
- qq{update media_uri set id = NEXTVAL('seq_media_uri')},
-
- # Make sure it can never be null.
- qq{ALTER TABLE media_uri
- ADD CONSTRAINT ck_media_uri__id__null CHECK (id IS NOT NULL)},
-
- # Make it the primary key.
- qq{ALTER TABLE media_uri ADD PRIMARY KEY (id)},
- ;
Copied: bricolage/trunk/inst/upgrade/1.8.3/media_uri_pk.pl (from rev 6084, \
bricolage/branches/rev_1_8/inst/upgrade/1.8.3/media_uri_pk.pl)
Deleted: bricolage/trunk/inst/upgrade/1.8.3/story_uri_pk.pl
===================================================================
--- bricolage/branches/rev_1_8/inst/upgrade/1.8.3/story_uri_pk.pl 2004-11-18 22:43:03 \
UTC (rev 6084)
+++ bricolage/trunk/inst/upgrade/1.8.3/story_uri_pk.pl 2004-11-19 08:55:15 UTC (rev \
6088) @@ -1,33 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use File::Spec::Functions qw(catdir updir);
-use FindBin;
-use lib catdir $FindBin::Bin, updir, 'lib';
-use bric_upgrade qw(:all);
-
-# If this fails, then the correct constraints are in place.
-exit if test_column 'story_uri', 'id';
-
-do_sql
- # Add the new sequence.
- qq{CREATE SEQUENCE seq_story_uri START 1024},
-
- # Add the id column.
- qq{ALTER TABLE story_uri
- ADD COLUMN id NUMERIC(10,0)},
-
- # Set its default to use the new sequence.
- qq{ALTER TABLE story_uri
- ALTER COLUMN id SET DEFAULT NEXTVAL('seq_story_uri')},
-
- # Make sure that it isn't null.
- qq{update story_uri set id = NEXTVAL('seq_story_uri')},
-
- # Make sure it can never be null.
- qq{ALTER TABLE story_uri
- ADD CONSTRAINT ck_story_uri__id__null CHECK (id IS NOT NULL)},
-
- # Make it the primary key.
- qq{ALTER TABLE story_uri ADD PRIMARY KEY (id)},
- ;
Copied: bricolage/trunk/inst/upgrade/1.8.3/story_uri_pk.pl (from rev 6084, \
bricolage/branches/rev_1_8/inst/upgrade/1.8.3/story_uri_pk.pl)
Deleted: bricolage/trunk/inst/upgrade/1.8.3/worfkow_type_ck.pl
===================================================================
--- bricolage/branches/rev_1_8/inst/upgrade/1.8.3/worfkow_type_ck.pl 2004-11-18 \
22:43:03 UTC (rev 6084)
+++ bricolage/trunk/inst/upgrade/1.8.3/worfkow_type_ck.pl 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -1,15 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use File::Spec::Functions qw(catdir updir);
-use FindBin;
-use lib catdir $FindBin::Bin, updir, 'lib';
-use bric_upgrade qw(:all);
-
-# If this fails, then the correct constraints are in place.
-exit if test_constraint 'workflow', 'ck_workflow__type';
-
-do_sql
- "ALTER TABLE workflow
- ADD CONSTRAINT ck_workflow__type
- CHECK (type IN (1,2,3))";
Copied: bricolage/trunk/inst/upgrade/1.8.3/worfkow_type_ck.pl (from rev 6084, \
bricolage/branches/rev_1_8/inst/upgrade/1.8.3/worfkow_type_ck.pl)
Property changes on: bricolage/trunk/inst/upgrade/1.8.3/worfkow_type_ck.pl
___________________________________________________________________
Name: svn:executable
+ *
Name: snv:mime-type
+ text/plain
Name: svn:keywords
+ Id
Modified: bricolage/trunk/inst/upgrade/lib/bric_upgrade.pm
===================================================================
--- bricolage/trunk/inst/upgrade/lib/bric_upgrade.pm 2004-11-19 08:54:20 UTC (rev \
6087)
+++ bricolage/trunk/inst/upgrade/lib/bric_upgrade.pm 2004-11-19 08:55:15 UTC (rev \
6088) @@ -311,24 +311,37 @@
=head2 test_constraint
exit if test_constraint $table_name, $constraint_name;
+ exit if test_constraint $table_name, $constraint_name, $delete_code;
This function returns true if the specified constraint exists on the specified
table in the Bricolage database, and false if it does not. This is useful in
upgrade scripts that add a new constraint, and want to verify that the
-constraint has not already been created.
+constraint has not already been created. The optional third argument specifies
+the code for the C<DELETE> control on the constraint. The possible values are
+as follows:
+ VALUE ON DELETE...
+ ----- ------------
+ r RESTRICT
+ c CASCACDE
+ n SET NULL
+ a NO ACTION
+ d SET DEFAULT
+
=cut
-sub test_constraint($$) {
- my ($table, $con) = @_;
- return fetch_sql(qq{
+sub test_constraint($$;$) {
+ my ($table, $con, $delcode) = @_;
+ my $sql = qq{
SELECT 1
FROM pg_class c, pg_constraint r
WHERE r.conrelid = c.oid
AND c.relname = '$table'
AND r.contype = 'c'
AND r.conname = '$con'
- });
+ };
+ $sql .= " AND r.confdeltype = '$delcode'\n" if $delcode;
+ return fetch_sql($sql);
}
##############################################################################
@@ -336,25 +349,30 @@
=head2 test_foreign_key
exit if test_foreign_key $table_name, $foreign_key_name;
+ exit if test_foreign_key $table_name, $foreign_key_name, $delete_code;
-This function returns true if the specified foreign key constrinat
-exists on the specified table in the Bricolage database, and false if
-it does not. This is useful in upgrade scripts that add a new foreign
-key, and want to verify that the constraint has not already been
-created.
+This function returns true if the specified foreign key constrinat exists on
+the specified table in the Bricolage database, and false if it does not. This
+is useful in upgrade scripts that add a new foreign key, and want to verify
+that the constraint has not already been created. The optional third argument
+specifies the code for the C<DELETE> control on the foreign key
+constraint. See the documentation for C<test_constraint()> for the possible
+values for this argument.
=cut
-sub test_foreign_key($$) {
- my ($table, $fk) = @_;
- return fetch_sql(qq{
+sub test_foreign_key($$;$) {
+ my ($table, $fk, $delcode) = @_;
+ my $sql = qq{
SELECT 1
FROM pg_class c, pg_constraint r
WHERE r.conrelid = c.oid
AND c.relname = '$table'
AND r.contype = 'f'
AND r.conname = '$fk'
- });
+ };
+ $sql .= " AND r.confdeltype = '$delcode'\n" if $delcode;
+ return fetch_sql($sql);
}
##############################################################################
Modified: bricolage/trunk/inst/versions.txt
===================================================================
--- bricolage/trunk/inst/versions.txt 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/inst/versions.txt 2004-11-19 08:55:15 UTC (rev 6088)
@@ -51,4 +51,5 @@
1.8.1
1.8.2
1.8.3
+1.8.4
1.9.0
Modified: bricolage/trunk/lib/Bric/Admin.pod
===================================================================
--- bricolage/trunk/lib/Bric/Admin.pod 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Admin.pod 2004-11-19 08:55:15 UTC (rev 6088)
@@ -43,7 +43,7 @@
=item 3
-Install PostgreSQL 7.2 or greater. Be sure to use UNICODE for data encoding.
+Install PostgreSQL 7.3 or greater. Be sure to use UNICODE for data encoding.
=item 4
@@ -194,7 +194,7 @@
=item HTML::Template::Expr (optional)
-=item Template 2.09 (optional)
+=item Template 2.14 (optional)
=item Encode (optional)
@@ -242,7 +242,7 @@
=item *
-PostgreSQL 7.2.4
+PostgreSQL 7.3.0
=item *
@@ -1051,7 +1051,7 @@
F<1.6.13/>, F<1.7.5/>, F<1.6.14/>, F<1.8.0/>, and F<1.8.1/> -- B<in that order>.
Furthermore, the scripts within each directory are run in alphabetical order.
-Next, copy in the new sources from the distribution into you bricolage
+Next, copy in the new sources from the distribution into your bricolage
directory. Be sure B<not> to copy example templates, as they may overwrite
your own templates. You're best off moving the contents of F<data/> out
of the way.
@@ -1132,10 +1132,7 @@
B<LISTEN_PORT:> The TCP/IP Port on which the Bricolage server should listen for
requests. Defaults to 80 if not specified. You must also tell Apache to listen
on this port in the configuration file specified in C<APACHE_CONF> (using
-Listen, Port, or BindAddress). B<Note:> If the C<SSL_ENABLE> directive has been
-turned on, then C<LISTEN_PORT> I<must> be set to 80. The Bricolage server will
-not start if C<SSL_ENABLE> is on and C<LISTEN_PORT> is set to a value other than
-80.
+Listen, Port, or BindAddress).
=item *
Modified: bricolage/trunk/lib/Bric/App/Callback/Profile/ElementData.pm
===================================================================
--- bricolage/trunk/lib/Bric/App/Callback/Profile/ElementData.pm 2004-11-19 08:54:20 \
UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/App/Callback/Profile/ElementData.pm 2004-11-19 08:55:15 \
UTC (rev 6088) @@ -32,7 +32,8 @@
my $name = $param->{disp};
if ($param->{delete}) {
# Deactivate it.
- $ed->deactivate();
+ $ed->deactivate;
+ $ed->set_required(0);
log_event("$type\_del", $ed);
add_msg("$disp_name profile \"[_1]\" deleted.", $name);
} else {
Modified: bricolage/trunk/lib/Bric/App/Callback/Profile/Grp.pm
===================================================================
--- bricolage/trunk/lib/Bric/App/Callback/Profile/Grp.pm 2004-11-19 08:54:20 UTC (rev \
6087)
+++ bricolage/trunk/lib/Bric/App/Callback/Profile/Grp.pm 2004-11-19 08:55:15 UTC (rev \
6088) @@ -88,9 +88,8 @@
my ($grp, $class, $self) = @_;
my $cache = $self->cache;
if ($class eq 'Bric::Util::Grp::User') {
- # Note that a user has been updated to force all users logged
- # into the system to reload their user objects from the
- # database.
+ # Note that a user group has been updated to force all users logged
+ # into the system to reload their user objects from the database.
$cache->set_lmu_time;
# Also, clear out the site and workflow caches, since they
# may have been affected by permission changes. The workflows
@@ -185,7 +184,7 @@
# Add any new members.
if (exists $param->{members}) {
- my $ids = ref $param->{members} ? $param->{members}
+ my $ids = ref $param->{members} ? $param->{members}
: [ $param->{members} ];
# Assemble the new member information.
my @add = map { { package => $pkg, id => $_ } } @$ids;
Modified: bricolage/trunk/lib/Bric/App/Callback/Profile/Media.pm
===================================================================
--- bricolage/trunk/lib/Bric/App/Callback/Profile/Media.pm 2004-11-19 08:54:20 UTC \
(rev 6087)
+++ bricolage/trunk/lib/Bric/App/Callback/Profile/Media.pm 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -126,7 +126,7 @@
################################################################################
-sub revert : Callback {
+sub revert : Callback(priority => 6) {
my $self = shift;
my $widget = $self->class_key;
my $media = get_state_data($widget, 'media');
@@ -139,7 +139,7 @@
################################################################################
-sub save : Callback {
+sub save : Callback(priority => 6) {
my $self = shift;
my $widget = $self->class_key;
my $media = get_state_data($widget, 'media');
@@ -182,7 +182,7 @@
################################################################################
-sub checkin : Callback {
+sub checkin : Callback(priority => 6) {
my $self = shift;
my $widget = $self->class_key;
my $media = get_state_data($widget, 'media');
@@ -257,13 +257,6 @@
add_msg('Media "[_1]" saved and checked in to "[_2]".',
$media->get_title, $dname);
- # HACK: Commit this checkin WHY?? Because Postgres does NOT like
- # it when you insert and delete a record within the same
- # transaction. This will be fixed in PostgreSQL 7.3. Be sure to
- # start a new transaction!
- Bric::Util::DBI::commit(1);
- Bric::Util::DBI::begin(1);
-
# Use the desk callback to save on code duplication.
my $pub = Bric::App::Callback::Desk->new
( cb_request => $self->cb_request,
@@ -308,7 +301,7 @@
################################################################################
-sub save_and_stay : Callback {
+sub save_and_stay : Callback(priority => 6) {
my $self = shift;
my $widget = $self->class_key;
my $media = get_state_data($widget, 'media');
@@ -340,7 +333,7 @@
################################################################################
-sub cancel : Callback {
+sub cancel : Callback(priority => 6) {
my $self = shift;
my $media = get_state_data($self->class_key, 'media');
@@ -396,7 +389,7 @@
################################################################################
-sub return : Callback {
+sub return : Callback(priority => 6) {
my $self = shift;
my $widget = $self->class_key;
my $version_view = get_state_data($widget, 'version_view');
Modified: bricolage/trunk/lib/Bric/App/Callback/Profile/Story.pm
===================================================================
--- bricolage/trunk/lib/Bric/App/Callback/Profile/Story.pm 2004-11-19 08:54:20 UTC \
(rev 6087)
+++ bricolage/trunk/lib/Bric/App/Callback/Profile/Story.pm 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -53,7 +53,7 @@
set_state_data($widget, 'story');
}
-sub save : Callback {
+sub save : Callback(priority => 6) {
my $self = shift;
my $param = $self->params;
# Just return if there was a problem with the update callback.
@@ -94,7 +94,7 @@
}
}
-sub checkin : Callback {
+sub checkin : Callback(priority => 6) {
my $self = shift;
my $widget = $self->class_key;
my $story = get_state_data($widget, 'story');
@@ -169,13 +169,6 @@
add_msg('Story "[_1]" saved and checked in to "[_2]".',
'<span class="l10n">' . $story->get_title . '</span>', $dname);
- # HACK: Commit this checkin. WHY?? Because Postgres does NOT like
- # it when you insert and delete a record within the same
- # transaction. This will be fixed in PostgreSQL 7.3. Be sure to
- # start a new transaction!
- Bric::Util::DBI::commit(1);
- Bric::Util::DBI::begin(1);
-
# Use the desk callback to save on code duplication.
my $pub = Bric::App::Callback::Desk->new
( cb_request => $self->cb_request,
@@ -218,7 +211,7 @@
$self->set_redirect("/");
}
-sub save_and_stay : Callback {
+sub save_and_stay : Callback(priority => 6) {
my $self = shift;
my $param = $self->params;
# Just return if there was a problem with the update callback.
@@ -243,7 +236,7 @@
}
}
-sub cancel : Callback {
+sub cancel : Callback(priority => 6) {
my $self = shift;
my $story = get_state_data($self->class_key, 'story');
@@ -299,7 +292,7 @@
$self->set_redirect("/");
}
-sub return : Callback {
+sub return : Callback(priority => 6) {
my $self = shift;
my $widget = $self->class_key;
my $version_view = get_state_data($widget, 'version_view');
@@ -481,7 +474,7 @@
'<span class="l10n">' . $cat->get_name . '</span>');
}
- $story->delete_categories(@to_delete);
+ $story->delete_categories(\@to_delete);
$story->save;
log_event(@$_) for @to_log;
set_state_data($widget, 'story', $story);
@@ -826,30 +819,6 @@
pop_page();
}
-sub set_primary_category : Callback {
- my $self = shift;
- my $param = $self->params;
- my $widget = $self->class_key;
-
- my $story = get_state_data($self->class_key, 'story');
- chk_authz($story, EDIT);
-
- my $primary_cat_id = $self->value;
- if (defined $param->{$widget.'|delete_id'}
- && $param->{$widget.'|delete_id'} == $primary_cat_id) {
- add_msg("Cannot make a dissociated category the primary category.");
- return;
- }
- my $primary_cat = Bric::Biz::Category->lookup({ id => $primary_cat_id });
- $story->set_primary_category($primary_cat);
-
- # set this so that we don't have to $story->save
- # (used in widgets/story_prof/edit_categories.html)
-# set_state_data($self->class_key, 'primary_cat', $primary_cat);
- # Avoid unnecessary empty searches.
- Bric::App::Callback::Search->no_new_search;
-}
-
### end of callbacks
sub clear_my_state {
@@ -908,7 +877,7 @@
$save_category = sub {
my ($widget, $param, $self) = @_;
- # get the contribs to delete
+ # get the categories to delete
my $story = get_state_data($widget, 'story');
my $existing = { map { $_->get_id => 1 } $story->get_categories };
@@ -933,6 +902,14 @@
add_msg('Categories disassociated.');
$story->delete_categories(\@to_delete);
}
+
+ # Change the primary category?
+ my $new_prime = $param->{"$widget|set_primary_category"};
+ if ($new_prime != $primary_cid && exists $existing->{$new_prime}) {
+ my $primary_cat = Bric::Biz::Category->lookup({ id => $new_prime });
+ $story->set_primary_category($primary_cat);
+ }
+
# Avoid unnecessary empty searches.
Bric::App::Callback::Search->no_new_search;
};
Modified: bricolage/trunk/lib/Bric/App/Callback/Profile/Template.pm
===================================================================
--- bricolage/trunk/lib/Bric/App/Callback/Profile/Template.pm 2004-11-19 08:54:20 UTC \
(rev 6087)
+++ bricolage/trunk/lib/Bric/App/Callback/Profile/Template.pm 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -25,7 +25,7 @@
$delete_fa, $create_fa);
-sub save : Callback {
+sub save : Callback(priority => 6) {
my $self = shift;
my $widget = $self->class_key;
@@ -68,7 +68,7 @@
}
}
-sub checkin : Callback {
+sub checkin : Callback(priority => 6) {
my $self = shift;
my $widget = $self->class_key;
@@ -78,7 +78,7 @@
$checkin->($self, $widget, $self->params, $fa);
}
-sub save_and_stay : Callback {
+sub save_and_stay : Callback(priority => 6) {
my $self = shift;
my $widget = $self->class_key;
@@ -107,7 +107,7 @@
}
}
-sub revert : Callback {
+sub revert : Callback(priority => 6) {
my $self = shift;
my $widget = $self->class_key;
@@ -128,7 +128,7 @@
$self->set_redirect("/workflow/profile/templates/$id/?version=$version");
}
-sub cancel : Callback {
+sub cancel : Callback(priority => 6) {
my $self = shift;
my $fa = get_state_data($self->class_key, 'fa');
@@ -228,7 +228,7 @@
$create_fa->($self, $self->class_key, $self->params);
}
-sub return : Callback {
+sub return : Callback(priority => 6) {
my $self = shift;
my $widget = $self->class_key;
Modified: bricolage/trunk/lib/Bric/App/Event.pm
===================================================================
--- bricolage/trunk/lib/Bric/App/Event.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/App/Event.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -166,7 +166,9 @@
=cut
sub commit_events {
- foreach (@$events) { Bric::Util::Event->new($_) }
+ # Commit in alphabetical order to prevent deadlocks.
+ Bric::Util::Event->new($_)
+ for sort { $a->{key_name} cmp $b->{key_name} } @$events;
@$events = ();
return 1;
}
Modified: bricolage/trunk/lib/Bric/App/Handler.pm
===================================================================
--- bricolage/trunk/lib/Bric/App/Handler.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/App/Handler.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -169,7 +169,8 @@
use Bric::Util::Burner;
use Bric::Util::Burner::Mason;
require Bric::Util::Burner::Template if eval { require HTML::Template };
- require Bric::Util::Burner::TemplateToolkit if eval { require Template };
+ require Bric::Util::Burner::TemplateToolkit
+ if eval { require Template && $Template::VERSION >= 2.14 };
use Bric::Util::Class;
use Bric::Util::Fault qw(:all);
use Bric::Util::Language;
@@ -291,7 +292,6 @@
my ($r) = @_;
# Handle the request.
my $status;
-
my $lang_name = get_pref('Language');
# A global for localization purposes
Modified: bricolage/trunk/lib/Bric/App/Util.pm
===================================================================
--- bricolage/trunk/lib/Bric/App/Util.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/App/Util.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -903,7 +903,7 @@
my $sites = $cache->get('__SITES__');
unless ($sites) {
- $sites = Bric::Biz::Site->list;
+ $sites = Bric::Biz::Site->list({ active => 1 });
$cache->set('__SITES__', $sites);
}
Modified: bricolage/trunk/lib/Bric/Biz/Asset/Business/Media.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/Asset/Business/Media.pm 2004-11-19 08:54:20 UTC (rev \
6087)
+++ bricolage/trunk/lib/Bric/Biz/Asset/Business/Media.pm 2004-11-19 08:55:15 UTC (rev \
6088) @@ -178,8 +178,7 @@
# param mappings for the big select statement
use constant FROM => VERSION_TABLE . ' i';
-use constant PARAM_FROM_MAP =>
- {
+use constant PARAM_FROM_MAP => {
keyword => 'media_keyword mk, keyword k',
output_channel_id => 'media__output_channel moc',
simple => 'media_member mm, member m, at_type at, element e, '
@@ -188,12 +187,11 @@
data_text => 'media_data_tile md',
subelement_key_name => 'media_container_tile mct',
contrib_id => 'media__contributor sic',
- };
+};
PARAM_FROM_MAP->{_not_simple} = PARAM_FROM_MAP->{simple};
-use constant PARAM_WHERE_MAP =>
- {
+use constant PARAM_WHERE_MAP => {
id => 'mt.id = ?',
active => 'mt.active = ?',
inactive => 'mt.active = ?',
@@ -205,7 +203,7 @@
_null_workflow_id => 'mt.workflow__id IS NULL',
element__id => 'mt.element__id = ?',
element_id => 'mt.element__id = ?',
- element_key_name => 'mt.element__id = e.id AND e.key_name LIKE LOWER(?)',
+ element_key_name => 'mt.element__id = e.id AND LOWER(e.key_name) LIKE \
LOWER(?)', source__id => 'mt.source__id = ?',
source_id => 'mt.source__id = ?',
priority => 'mt.priority = ?',
@@ -221,11 +219,12 @@
unexpired => '(mt.expire_date IS NULL OR mt.expire_date > \
CURRENT_TIMESTAMP)', desk_id => 'mt.desk__id = ?',
name => 'LOWER(i.name) LIKE LOWER(?)',
- subelement_key_name => 'i.id = mct.object_instance_id AND mct.key_name LIKE \
LOWER(?)', + subelement_key_name => 'i.id = mct.object_instance_id AND \
LOWER(mct.key_name) LIKE LOWER(?)',
data_text => 'LOWER(md.short_val) LIKE LOWER(?) AND \
md.object_instance_id = i.id', title => 'LOWER(i.name) LIKE \
LOWER(?)', description => 'LOWER(i.description) LIKE LOWER(?)',
version => 'i.version = ?',
+ published_version => 'mt.published_version = i.version AND i.checked_out = \
0', user__id => 'i.usr__id = ?',
user_id => 'i.usr__id = ?',
uri => 'LOWER(i.uri) LIKE LOWER(?)',
@@ -238,6 +237,11 @@
. 'AND media__id = i.media__id '
. 'ORDER BY checked_out DESC LIMIT 1 )',
_checked_out => 'i.checked_out = ?',
+ checked_out => 'i.checked_out = ?',
+ _not_checked_out => 'i.checked_out = 0 AND mt.id not in '
+ . '(SELECT media__id FROM media_instance '
+ . 'WHERE mt.id = media_instance.media__id '
+ . 'AND media_instance.checked_out = 1)',
primary_oc_id => 'i.primary_oc__id = ?',
output_channel_id => '(i.id = moc.media_instance__id AND '
. '(moc.output_channel__id = ? OR '
@@ -264,13 +268,13 @@
. 'JOIN keyword kk ON (kk.id = keyword_id) '
. 'WHERE LOWER(kk.name) LIKE LOWER(?))',
contrib_id => 'i.id = sic.media_instance__id AND sic.member__id = \
?',
- };
+};
use constant PARAM_ANYWHERE_MAP => {
element_key_name => [ 'mt.element__id = e.id',
- 'e.key_name LIKE LOWER(?)' ],
+ 'LOWER(e.key_name) LIKE LOWER(?)' ],
subelement_key_name => [ 'i.id = mct.object_instance_id',
- 'mct.key_name LIKE LOWER(?)' ],
+ 'LOWER(mct.key_name) LIKE LOWER(?)' ],
data_text => [ 'md.object_instance_id = i.id',
'LOWER(md.short_val) LIKE LOWER(?)' ],
output_channel_id => [ 'i.id = moc.media_instance__id',
@@ -279,48 +283,46 @@
'LOWER(c.uri) LIKE LOWER(?)' ],
keyword => [ 'mk.media_id = mt.id AND k.id = mk.keyword_id',
'LOWER(k.name) LIKE LOWER(?)' ],
- grp_id => [ "m2.active = '1' AND mm2.member__id = m2.id AND \
mt.id = mm2.object_id", + grp_id => [ 'm2.active = 1 AND \
mm2.member__id = m2.id AND mt.id = mm2.object_id', 'm2.grp__id = ?' ],
contrib_id => [ 'i.id = sic.media_instance__id',
'sic.member__id = ?' ],
};
-use constant PARAM_ORDER_MAP =>
- {
- active => 'active',
- inactive => 'active',
- alias_id => 'alias_id',
- site_id => 'site__id',
- workflow__id => 'workflow__id',
- workflow_id => 'workflow__id',
- uri => 'i.uri',
- element__id => 'element__id',
- element_id => 'element__id',
- source__id => 'source__id',
- source_id => 'source__id',
- priority => 'priority',
- publish_status => 'publish_status',
- first_publish_date => 'first_publish_date',
- publish_date => 'publish_date',
- cover_date => 'cover_date',
- expire_date => 'expire_date',
- name => 'name',
- file_name => 'file_name',
- location => 'location',
- category_id => 'category__id',
- category__id => 'category__id',
- title => 'name',
- description => 'description',
- version => 'version',
- version_id => 'i.id',
- user__id => 'usr__id',
- _checked_out => 'checked_out',
- primary_oc_id => 'primary_oc__id',
- category__id => 'category__id',
- category_uri => 'uri',
- keyword => 'name',
- return_versions => 'version',
- };
+use constant PARAM_ORDER_MAP => {
+ active => 'mt.active',
+ inactive => 'mt.active',
+ alias_id => 'mt.alias_id',
+ site_id => 'mt.site__id',
+ workflow__id => 'mt.workflow__id',
+ workflow_id => 'mt.workflow__id',
+ uri => 'LOWER(i.uri)',
+ element__id => 'mt.element__id',
+ element_id => 'mt.element__id',
+ source__id => 'mt.source__id',
+ source_id => 'mt.source__id',
+ priority => 'mt.priority',
+ publish_status => 'mt.publish_status',
+ first_publish_date => 'mt.first_publish_date',
+ publish_date => 'mt.publish_date',
+ cover_date => 'mt.cover_date',
+ expire_date => 'mt.expire_date',
+ name => 'LOWER(i.name)',
+ title => 'LOWER(i.name)',
+ file_name => 'LOWER(i.file_name)',
+ location => 'LOWER(i.location)',
+ category_id => 'i.category__id',
+ category__id => 'i.category__id',
+ description => 'LOWER(i.description)',
+ version => 'i.version',
+ version_id => 'i.id',
+ user__id => 'i.usr__id',
+ _checked_out => 'i.checked_out',
+ primary_oc_id => 'i.primary_oc__id',
+ category_uri => 'LOWER(i.uri)',
+ keyword => 'LOWER(k.name)',
+ return_versions => 'i.version',
+};
use constant DEFAULT_ORDER => 'cover_date';
@@ -387,6 +389,10 @@
=item *
+user__id - Required.
+
+=item *
+
active
=item *
@@ -460,7 +466,7 @@
################################################################################
-=item $media = Bric::Biz::Asset::Business::Media->lookup->( { id => $id })
+=item $media = Bric::Biz::Asset::Business::Media->lookup( { id => $id })
This will return a media asset that matches the criteria defined
@@ -516,6 +522,12 @@
A boolean value indicating whether to return only checked out or not checked
out media.
+=item published_version
+
+Returns the versions of the media documents as they were last published. The
+C<checked_out> parameter will be ignored if this parameter is passed a true
+value.
+
=item return_versions
Boolean indicating whether to return pass version objects for each media document
Modified: bricolage/trunk/lib/Bric/Biz/Asset/Business/Parts/Tile/Container.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/Asset/Business/Parts/Tile/Container.pm 2004-11-19 \
08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Biz/Asset/Business/Parts/Tile/Container.pm 2004-11-19 \
08:55:15 UTC (rev 6088) @@ -928,10 +928,10 @@
my @data = $element->get_data_elements;
@data = $element->get_data_elements(@key_names);
-Returns a list or anonymous array of the data subelements of this data
-subelement. If called with no arguments, it returns all of the data
-subelements. If passed a list of key names, the only the data subelements with
-those key names will be returned.
+Returns a list or anonymous array of the data subelements of this element. If
+called with no arguments, it returns all of the data subelements. If passed a
+list of key names, the only the data subelements with those key names will be
+returned.
B<Throws:> NONE.
@@ -1101,7 +1101,7 @@
my $subelems = $self->_get('_subelems');
# Do not attempt to get the AssetType tiles if we don't yet have an ID.
- return [] unless $subelems || $self->get_id;
+ return wantarray ? () : [] unless $subelems || $self->get_id;
unless ($subelems) {
my $cont = Bric::Biz::Asset::Business::Parts::Tile::Container->list({
Modified: bricolage/trunk/lib/Bric/Biz/Asset/Business/Story.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/Asset/Business/Story.pm 2004-11-19 08:54:20 UTC (rev \
6087)
+++ bricolage/trunk/lib/Bric/Biz/Asset/Business/Story.pm 2004-11-19 08:55:15 UTC (rev \
6088) @@ -163,7 +163,7 @@
#--------------------------------------#
# Programatic Dependencies
use Bric::Biz::Workflow qw(STORY_WORKFLOW);
-use Bric::Config qw(:uri);
+use Bric::Config qw(:uri :ui);
use Bric::Util::DBI qw(:all);
use Bric::Util::Time qw(:all);
use Bric::Util::Attribute::Story;
@@ -284,8 +284,7 @@
# param mappings for the big select statement
use constant FROM => VERSION_TABLE . ' i';
-use constant PARAM_FROM_MAP =>
- {
+use constant PARAM_FROM_MAP => {
keyword => 'story_keyword sk, keyword k',
output_channel_id => 'story__output_channel soc',
simple => 'story_member sm, member m, story__category sc, '
@@ -299,12 +298,11 @@
element_key_name => 'element e',
'story.category' => 'story__category sc2',
subelement_key_name => 'story_container_tile sct',
- };
+};
PARAM_FROM_MAP->{_not_simple} = PARAM_FROM_MAP->{simple};
-use constant PARAM_WHERE_MAP =>
- {
+use constant PARAM_WHERE_MAP => {
id => 's.id = ?',
active => 's.active = ?',
inactive => 's.active = ?',
@@ -317,7 +315,7 @@
primary_uri => 'LOWER(s.primary_uri) LIKE LOWER(?)',
element_id => 's.element__id = ?',
element__id => 's.element__id = ?',
- element_key_name => 's.element__id = e.id AND e.key_name LIKE LOWER(?)',
+ element_key_name => 's.element__id = e.id AND LOWER(e.key_name) LIKE \
LOWER(?)', source_id => 's.source__id = ?',
source__id => 's.source__id = ?',
priority => 's.priority = ?',
@@ -333,11 +331,12 @@
unexpired => '(s.expire_date IS NULL OR s.expire_date > \
CURRENT_TIMESTAMP)', desk_id => 's.desk__id = ?',
name => 'LOWER(i.name) LIKE LOWER(?)',
- subelement_key_name => 'i.id = sct.object_instance_id AND sct.key_name LIKE \
LOWER(?)', + subelement_key_name => 'i.id = sct.object_instance_id AND \
LOWER(sct.key_name) LIKE LOWER(?)',
data_text => 'LOWER(sd.short_val) LIKE LOWER(?) AND \
sd.object_instance_id = i.id', title => 'LOWER(i.name) LIKE \
LOWER(?)', description => 'LOWER(i.description) LIKE LOWER(?)',
version => 'i.version = ?',
+ published_version => 's.published_version = i.version AND i.checked_out = \
0', slug => 'LOWER(i.slug) LIKE LOWER(?)',
user__id => 'i.usr__id = ?',
user_id => 'i.usr__id = ?',
@@ -348,6 +347,11 @@
. 'AND story__id = i.story__id '
. 'ORDER BY checked_out DESC LIMIT 1 )',
_checked_out => 'i.checked_out = ?',
+ checked_out => 'i.checked_out = ?',
+ _not_checked_out => 'i.checked_out = 0 AND s.id not in '
+ . '(SELECT story__id FROM story_instance '
+ . 'WHERE s.id = story_instance.story__id '
+ . 'AND story_instance.checked_out = 1)',
primary_oc_id => 'i.primary_oc__id = ?',
output_channel_id => '(i.id = soc.story_instance__id AND '
. '(soc.output_channel__id = ? OR '
@@ -392,13 +396,13 @@
. 'JOIN keyword kk ON (kk.id = keyword_id) '
. 'WHERE LOWER(kk.name) LIKE LOWER(?))',
contrib_id => 'i.id = sic.story_instance__id AND sic.member__id = \
?',
- };
+};
use constant PARAM_ANYWHERE_MAP => {
element_key_name => [ 's.element__id = e.id',
- 'e.key_name LIKE LOWER(?)' ],
+ 'LOWER(e.key_name) LIKE LOWER(?)' ],
subelement_key_name => [ 'i.id = sct.object_instance_id',
- 'sct.key_name LIKE LOWER(?)' ],
+ 'LOWER(sct.key_name) LIKE LOWER(?)' ],
data_text => [ 'sd.object_instance_id = i.id',
'LOWER(sd.short_val) LIKE LOWER(?)' ],
output_channel_id => [ 'i.id = soc.story_instance__id',
@@ -411,46 +415,45 @@
'LOWER(c.uri) LIKE LOWER(?)' ],
keyword => [ 'sk.story_id = s.id AND k.id = sk.keyword_id',
'LOWER(k.name) LIKE LOWER(?)' ],
- grp_id => [ "m2.active = '1' AND sm2.member__id = m2.id AND s.id \
= sm2.object_id", + grp_id => [ 'm2.active = 1 AND sm2.member__id \
= m2.id AND s.id = sm2.object_id', 'm2.grp__id = ?' ],
contrib_id => [ 'i.id = sic.story_instance__id',
'sic.member__id = ?' ],
};
-use constant PARAM_ORDER_MAP =>
- {
- active => 'active',
- inactive => 'active',
- alias_id => 'alias_id',
- site_id => 'site__id',
- workflow__id => 'workflow__id',
- workflow_id => 'workflow__id',
- primary_uri => 'primary_uri',
- element_id => 'element__id',
- element__id => 'element__id',
- source_id => 'source__id',
- source__id => 'source__id',
- priority => 'priority',
- publish_status => 'publish_status',
- first_publish_date => 'first_publish_date',
- publish_date => 'publish_date',
- cover_date => 'cover_date',
- expire_date => 'expire_date',
- name => 'name',
- title => 'name',
- description => 'description',
- version => 'version',
- version_id => 'i.id',
- slug => 'slug',
- user_id => 'usr__id',
- user__id => 'usr__id',
- _checked_out => 'checked_out',
- primary_oc_id => 'primary_oc__id',
- category_id => 'category_id',
- category_uri => 'c.uri',
- keyword => 'name',
- return_versions => 'version',
- };
+use constant PARAM_ORDER_MAP => {
+ active => 's.active',
+ inactive => 's.active',
+ alias_id => 's.alias_id',
+ site_id => 's.site__id',
+ workflow__id => 's.workflow__id',
+ workflow_id => 's.workflow__id',
+ primary_uri => 'LOWER(s.primary_uri)',
+ element_id => 's.element__id',
+ element__id => 's.element__id',
+ source_id => 's.source__id',
+ source__id => 's.source__id',
+ priority => 's.priority',
+ publish_status => 's.publish_status',
+ first_publish_date => 's.first_publish_date',
+ publish_date => 's.publish_date',
+ cover_date => 's.cover_date',
+ expire_date => 's.expire_date',
+ name => 'LOWER(i.name)',
+ title => 'LOWER(i.name)',
+ description => 'LOWER(i.description)',
+ version => 'i.version',
+ version_id => 'i.id',
+ slug => 'LOWER(i.slug)',
+ user_id => 'i.usr__id',
+ user__id => 'i.usr__id',
+ _checked_out => 'i.checked_out',
+ primary_oc_id => 'i.primary_oc__id',
+ category_id => 'sc2.category_id',
+ category_uri => 'LOWER(c.uri)',
+ keyword => 'LOWER(k.name)',
+ return_versions => 'i.version',
+};
use constant DEFAULT_ORDER => 'cover_date';
@@ -505,6 +508,10 @@
=item *
+user__id - Required.
+
+=item *
+
active
=item *
@@ -645,6 +652,12 @@
A boolean value indicating whether to return only checked out or not checked
out stories.
+=item published_version
+
+Returns the versions of the stories as they were last published. The
+C<checked_out> parameter will be ignored if this parameter is passed a true
+value.
+
=item return_versions
Boolean indicating whether to return pass version objects for each story
@@ -1081,6 +1094,7 @@
disp => 'Slug',
len => 64,
type => 'short',
+ (ALLOW_SLUGLESS_NONFIXED ? () : (req => 1)),
props => { type => 'text',
length => 32,
maxlength => 64
Modified: bricolage/trunk/lib/Bric/Biz/Asset/Formatting.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/Asset/Formatting.pm 2004-11-19 08:54:20 UTC (rev \
6087)
+++ bricolage/trunk/lib/Bric/Biz/Asset/Formatting.pm 2004-11-19 08:55:15 UTC (rev \
6088) @@ -235,100 +235,108 @@
# param mappings for the big select statement
use constant FROM => VERSION_TABLE . ' i';
-use constant PARAM_FROM_MAP =>
- {
- _not_simple => 'formatting_member fm, member m, '
- . 'category c, workflow w, ' . TABLE . ' f ',
- grp_id => 'member m2, formatting_member fm2',
- element_key_name => 'element e',
- };
+use constant PARAM_FROM_MAP => {
+ _not_simple => 'formatting_member fm, member m, '
+ . 'category c, workflow w, ' . TABLE . ' f ',
+ grp_id => 'member m2, formatting_member fm2',
+ element_key_name => 'element e',
+ site_id => 'output_channel oc',
+};
PARAM_FROM_MAP->{simple} = PARAM_FROM_MAP->{_not_simple};
-use constant PARAM_WHERE_MAP =>
- {
- id => 'f.id = ?',
- active => 'f.active = ?',
- inactive => 'f.active = ?',
- site_id => 'f.site__id = ?',
- no_site_id => 'f.site__id <> ?',
- workflow__id => 'f.workflow__id = ?',
- workflow_id => 'f.workflow__id = ?',
- _null_workflow_id => 'f.workflow__id IS NULL',
- element__id => 'f.element__id = ?',
- element_key_name => 'f.element__id = e.id AND e.key_name LIKE LOWER(?)',
- output_channel_id => 'f.output_channel__id = ?',
- output_channel__id => 'f.output_channel__id = ?',
- priority => 'f.priority = ?',
- deploy_status => 'f.deploy_status = ?',
- deploy_date_start => 'f.deploy_date >= ?',
- deploy_date_end => 'f.deploy_date <= ?',
- expire_date_start => 'f.expire_date >= ?',
- expire_date_end => 'f.expire_date <= ?',
- desk_id => 'f.desk__id = ?',
- name => 'LOWER(f.name) LIKE LOWER(?)',
- file_name => 'LOWER(f.file_name) LIKE LOWER(?)',
- title => 'LOWER(f.name) LIKE LOWER(?)',
- description => 'LOWER(f.description) LIKE LOWER(?)',
- version => 'i.version = ?',
- user__id => 'i.usr__id = ?',
- user_id => 'i.usr__id = ?',
- _checked_in_or_out => 'i.checked_out = '
- . '( SELECT checked_out '
- . 'FROM formatting_instance '
- . 'WHERE version = i.version '
- . 'AND formatting__id = i.formatting__id '
- . 'ORDER BY checked_out DESC LIMIT 1 )',
- _checked_out => 'i.checked_out = ?',
- category_id => 'f.category__id = ?',
- category_uri => 'f.category__id = c.id AND '
- . 'LOWER(c.uri) LIKE LOWER(?))',
- _no_return_versions => 'f.current_version = i.version',
- grp_id => "m2.active = '1' AND "
- . 'm2.grp__id = ? AND '
- . 'f.id = fm2.object_id AND '
- . 'fm2.member__id = m2.id',
- simple => '(LOWER(f.name) LIKE LOWER(?) OR '
- . 'LOWER(f.file_name) LIKE LOWER(?))',
- };
+use constant PARAM_WHERE_MAP => {
+ id => 'f.id = ?',
+ active => 'f.active = ?',
+ inactive => 'f.active = ?',
+ site_id => 'f.output_channel__id = oc.id AND oc.site__id = ?',
+ no_site_id => 'f.output_channel__id = oc.id AND oc.site__id <> ?',
+ workflow__id => 'f.workflow__id = ?',
+ workflow_id => 'f.workflow__id = ?',
+ _null_workflow_id => 'f.workflow__id IS NULL',
+ element__id => 'f.element__id = ?',
+ element_key_name => 'f.element__id = e.id AND LOWER(e.key_name) LIKE \
LOWER(?)', + output_channel_id => 'f.output_channel__id = ?',
+ output_channel__id => 'f.output_channel__id = ?',
+ priority => 'f.priority = ?',
+ deploy_status => 'f.deploy_status = ?',
+ deploy_date_start => 'f.deploy_date >= ?',
+ deploy_date_end => 'f.deploy_date <= ?',
+ expire_date_start => 'f.expire_date >= ?',
+ expire_date_end => 'f.expire_date <= ?',
+ desk_id => 'f.desk__id = ?',
+ name => 'LOWER(f.name) LIKE LOWER(?)',
+ file_name => 'LOWER(f.file_name) LIKE LOWER(?)',
+ title => 'LOWER(f.name) LIKE LOWER(?)',
+ description => 'LOWER(f.description) LIKE LOWER(?)',
+ version => 'i.version = ?',
+ published_version => 'f.published_version = i.version AND i.checked_out = \
0', + user__id => 'i.usr__id = ?',
+ user_id => 'i.usr__id = ?',
+ _checked_in_or_out => 'i.checked_out = '
+ . '( SELECT checked_out '
+ . 'FROM formatting_instance '
+ . 'WHERE version = i.version '
+ . 'AND formatting__id = i.media__id '
+ . 'ORDER BY checked_out DESC LIMIT 1 )',
+ checked_out => 'i.checked_out = ?',
+ _checked_out => 'i.checked_out = ?',
+ _not_checked_out => 'i.checked_out = 0 AND f.id not in '
+ . '(SELECT formatting__id FROM formatting_instance '
+ . 'WHERE f.id = formatting_instance.formatting__id '
+ . 'AND formatting_instance.checked_out = 1)',
+ category_id => 'f.category__id = ?',
+ category_uri => 'f.category__id = c.id AND '
+ . 'LOWER(c.uri) LIKE LOWER(?))',
+ _no_return_versions => 'f.current_version = i.version',
+ grp_id => 'm2.active = 1 AND '
+ . 'm2.grp__id = ? AND '
+ . 'f.id = fm2.object_id AND '
+ . 'fm2.member__id = m2.id',
+ simple => '(LOWER(f.name) LIKE LOWER(?) OR '
+ . 'LOWER(f.file_name) LIKE LOWER(?))',
+};
use constant PARAM_ANYWHERE_MAP => {
- element_key_name => [ 'f.element__id = e.id',
- 'e.key_name LIKE LOWER(?)' ],
- category_uri => [ 'f.category__id = c.id',
- 'LOWER(c.uri) LIKE LOWER(?))' ],
- grp_id => [ "m2.active = '1' AND fm2.member__id = m2.id AND f.id \
= fm2.object_id",
- 'm2.grp__id = ?' ],
+ element_key_name => [ 'f.element__id = e.id',
+ 'LOWER(e.key_name) LIKE LOWER(?)' ],
+ category_uri => [ 'f.category__id = c.id',
+ 'LOWER(c.uri) LIKE LOWER(?))' ],
+ grp_id => [ 'm2.active = 1 AND fm2.member__id = m2.id AND f.id = \
fm2.object_id', + 'm2.grp__id = ?' ],
+ site_id => [ 'f.output_channel__id = oc.id',
+ 'oc.site__id = ?' ],
+ no_site_id => [ 'f.output_channel__id = oc.id',
+ 'oc.site__id = <>' ],
};
-use constant PARAM_ORDER_MAP =>
- {
- active => 'active',
- inactive => 'active',
- site_id => 'site__id',
- workflow_id => 'workflow__id',
- workflow__id => 'workflow__id',
- element_id => 'element__id',
- element__id => 'element__id',
- output_channel_id => 'output_channel__id',
- output_channel__id => 'output_channel__id',
- priority => 'priority',
- deploy_status => 'deploy_status',
- deploy_date => 'deploy_date',
- expire_date => 'expire_date',
- name => 'name',
- title => 'name',
- file_name => 'f.file_name',
- description => 'description',
- version => 'version',
- version_id => 'i.id',
- user_id => 'usr__id',
- user__id => 'usr__id',
- _checked_out => 'checked_out',
- category_id => 'category_id',
- category_uri => 'uri',
- return_versions => 'version',
- };
+use constant PARAM_ORDER_MAP => {
+ active => 'f.active',
+ inactive => 'f.active',
+ site_id => 'oc.site__id',
+ workflow_id => 'f.workflow__id',
+ workflow__id => 'f.workflow__id',
+ element_id => 'f.element__id',
+ element__id => 'f.element__id',
+ output_channel_id => 'f.output_channel__id',
+ output_channel__id => 'f.output_channel__id',
+ priority => 'f.priority',
+ deploy_status => 'f.deploy_status',
+ deploy_date => 'f.deploy_date',
+ expire_date => 'f.expire_date',
+ name => 'LOWER(f.name)',
+ title => 'LOWER(f.name)',
+ file_name => 'LOWER(i.file_name)',
+ category_uri => 'LOWER(i.file_name)',
+ description => 'LOWER(f.description)',
+ version => 'i.version',
+ version_id => 'i.id',
+ user_id => 'i.usr__id',
+ user__id => 'i.usr__id',
+ _checked_out => 'i.checked_out',
+ category_id => 'f.category__id',
+ return_versions => 'i.version',
+};
use constant DEFAULT_ORDER => 'deploy_date';
@@ -696,10 +704,11 @@
Returns a list of templates in the category represented by a category ID. May
use C<ANY> for a list of possible values.
-=item checked_out
+=item published_version
-A boolean value indicating whether to return only checked out or not checked
-out templates.
+Returns the versions of the templates as they were last deployed. The
+C<checked_out> parameter will be ignored if this parameter is passed a true
+value.
=item category_uri
Modified: bricolage/trunk/lib/Bric/Biz/Asset.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/Asset.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Biz/Asset.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -667,7 +667,7 @@
name => 'element',
get_meth => sub {
my $a_id = shift->get_element__id(@_);
- my $a = Bric::Biz::AssetType->lookup({ id => $a_id \
}); + my $a = Bric::Biz::AssetType->lookup({ id => \
$a_id }) or return; $a->get_name(); },
get_args => [],
disp => 'Element',
Modified: bricolage/trunk/lib/Bric/Biz/AssetType.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/AssetType.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Biz/AssetType.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -2792,6 +2792,7 @@
# This needs to happen for deleted parts.
$p_obj->deactivate;
+ $p_obj->set_required(0);
$p_obj->save;
}
return $self;
Modified: bricolage/trunk/lib/Bric/Biz/Person/User.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/Person/User.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Biz/Person/User.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -986,9 +986,24 @@
# Get the permission.
my $priv = 0;
- foreach my $gid (@gids) {
+ if (ref $obj eq __PACKAGE__) {
+ my $chk_admin = 0;
+ for my $gid (@gids) {
+ # Make a note of the user being in the global admins
+ # group.
+ $chk_admin ||= $gid == ADMIN_GRP_ID;
+ # Grab the greatest permission.
+ $priv = $priv | $acl->{$gid} if exists $acl->{$gid};
+ }
+ # If they're in the global admins group, allow no greater access than
+ # READ access.
+ $priv = $acl->{&ADMIN_GRP_ID} || READ if $chk_admin && $priv &&
+ $priv != DENY;
+ } else {
# Grab the greatest permission.
- $priv = $priv | $acl->{$gid} if exists $acl->{$gid};
+ for my $gid (@gids) {
+ $priv = $priv | $acl->{$gid} if exists $acl->{$gid};
+ }
}
return $priv;
}
Modified: bricolage/trunk/lib/Bric/Changes.pod
===================================================================
--- bricolage/trunk/lib/Bric/Changes.pod 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Changes.pod 2004-11-19 08:55:15 UTC (rev 6088)
@@ -117,14 +117,165 @@
=back
-=head1 VERSION 1.8.3 ()
+##############################################################################
+=head1 VERSION 1.8.4 ()
+
+=head2 Bug Fixes
+
+=over
+
+=item *
+
+Versions of Perl that disallow the use of the C<-I> argument in a setuid
+environment will no longer cause the upgrade to fail. Reported by Serge
+Sozonoff. [David]
+
+=item *
+
+The new support for a false value to the C<checked_out> parameter to the
+C<list()> methods of the story, media, and template classes is now properly
+supported by the SOAP C<list_ids> method, as well. [David]
+
+=item *
+
+Calls to publish documents via SOAP will no longer fail if the
+C<published_version> attribute is not specified and the document to be
+published has never been published before. [David]
+
+=item *
+
+The Bricolage virtual FTP server will no longer fail to start if Template
+Toolkit is installed but its version number is less than 2.14. Reported by
+Adam Rinehart. [David]
+
+=back
+
+=head1 VERSION 1.8.3 (2004-11-09)
+
=head2 Improvements
=over 4
=item *
+C<make clone> now ignores files in the source directory that start with
+"bricolage-". This should prevent copying previous clones into the new
+clone. [David]
+
+=item *
+
+Added F<contrib/thumbnails/precreate-thumbs.pl> script to pre-create
+thumbnails from images. Useful for upgraders. [Scott]
+
+=item *
+
+Added primary key to the "event_attr", "element__site", "story_uri", and
+"media_uri" tables in the database. This will make it easier to do database
+replication. [David and Kenneth Marshall]
+
+=item *
+
+Added F<contrib/bric_import_contribs> to import contributors from a
+tab-delimited file. Development by Kineticode, sponsored by the RAND
+Corporation. [David]
+
+=item *
+
+Added the C<published_version> parameter to the C<list()> methods of the
+story, media, and template classes. This parameter forces the search to return
+the versions of the assets as they were last published, rather than the most
+recent version. This will be most useful to those looking up other documents
+in templates and publishing them, as a way of avoiding pulling documents out
+from other anyone who might have them checked out! [David]
+
+=item *
+
+For those using the Template Toolkit burner, the required version is now 2.14,
+so as to take advantage of the improved Unicode support in that version.
+[David]
+
+=item *
+
+All publishing and distribution jobs are now executed in their own
+transactions when they are triggered by the user interface. This is to reduce
+the chances of a deadlock between long-running publishing transactions.
+[David]
+
+=item *
+
+The installer now requires PostgreSQL 7.3 or later. This is because 7.2
+hasn't worked properly with Bricolage since 1.8.0. [David]
+
+=item *
+
+Optimized SQL queries for key names or that order by string values to use
+indexes in the C<list()> and C<list_ids()> methods of the story, media, and
+template classes. [David]
+
+=item *
+
+The installer will now fail to install if the version of Apache is greater
+than version 1--that is, it will refuse to install under Apache 2 (for now).
+[David]
+
+=item *
+
+Added Russian localization. [Sergey Samoilenko].
+
+=item *
+
+Changed the foreign keys in the story, media, and formatting (template) tables
+so that C<DELETE>s do not cascade, but are restricted. This means that before
+deleting any source, element, site, workflow, or other related object that has
+a foreign key reference in an asset table, those rows must be deleted.
+Otherwise, PostgreSQL will throw an exception. Hopefully, this will put a stop
+to the mysterious but very rare disappearance of stories from Bricolage.
+[David]
+
+=item *
+
+The distribution monitor, F<bric_dist_mon>, no longer populates HTTP headers
+with lists of Job IDs for execution. Instead, it simply sends a request to the
+distribution handler, and Bric::Dist::Handler looks up the jobs to execute
+itself. This fixes an issue with too many headers being put into the request,
+and makes the operation of Bric::Dist::Handler more efficient. [David]
+
+=item *
+
+A call to C<< $burner->burn_another >> in a template that passes in a
+date/time string in the future now causes a publish job to be scheduled for
+that time, rather than immediate burning the document and then scheduling the
+distribution to take place in the future. Reported by Ashlee Caul. [David]
+
+=item *
+
+Improved context-sensitive help for the "New Template" profile. [Paul Orrock
+and David]
+
+=item *
+
+Make slug actually be required when C<ALLOW_SLUGLESS_NONFIXED> isn't enabled,
+in particular on the clone page. Thanks to Dharmender Yadav at Enabling
+Dimensions for part of the patch. [Scott]
+
+=item *
+
+Removed the hack that commits a database transaction in the middle of a
+request that does a "Check in and Publish", since we now require PostgreSQL
+7.3 and the bug that the hacked worked around was fixed in that release.
+[David]
+
+=item *
+
+Added missing constraint to the "type" column of the "workflow" table. [David]
+
+=item *
+
+Changing the sort order of a list of items in a search interface now properly
+reverses the entire collection of object over the pages, rather than just the
+objects for the current page. Thanks to Marshall for the spot! [David]
+
=back
=head2 Bug Fixes
@@ -133,6 +284,173 @@
=item *
+The localization libraries load without error again. Added tests to ensure
+that this doesn't happen again. [David]
+
+=item *
+
+Publishing stories not in workflow via the SOAP server works again. [David]
+
+=item *
+
+Documents that the SOAP workflow publish finds in workflow but not on a desk
+(which shouldn't happen, but sometimes does) are now just published anyway.
+[David]
+
+=item *
+
+The Burner object's C<encoding> attribute is now setable as well as readable.
+[David]
+
+=item *
+
+The category browser works again. [David]
+
+=item *
+
+Fixed the "event" table to use the correct sequence the id column's default
+value (although the default is never used, this is a good precaution). [David]
+
+=item *
+
+Fixed Media Upload bug where the full local path was being used, by adding
+a 'winxp' key to Bric::Util::Trans::FS to account for an update to
+HTTP::BrowserDetect. [Mark Kennedy]
+
+=item *
+
+A call to C<< $element->get_elements >> in an array context when the element
+contains no subelements no longer returns an array reference. Reported by
+Clinton Gormley. [David]
+
+=item *
+
+Fix bug 839 so that categories can be deleted. [Scott]
+
+=item *
+
+Instances of a required custom field in story elements is no longer required
+once it has been deleted from the element definition in the element manager.
+Reported by Rod Taylor. [David]
+
+=item *
+
+A false value passed to the C<checked_out> parameter of the C<list()> and
+C<list_ids()> methods of the story, media, and template (formatting) classes
+now properly returns only objects or IDs for assets that are not checked out.
+[David]
+
+=item *
+
+The cover date select widget now works properly in the clone interface when a
+non-ISO style date preference is selected. Thanks to Susan G. for the spot!
+[David]
+
+=item *
+
+Running C<make upgrade> with PostgreSQL "ident sameuser" security now works
+properly. [Keith Grennan]
+
+=item *
+
+The C<LoadModule> and C<AddModule> F<httpd.conf> directives should now be
+generated properly during installation. C<LoadModule> will use
+C<config_log_module> or C<mod_log_config> depending on the system, but
+C<AddModule> will always use F<mod_log_config.c>. Spotted by Dave
+Jablonski. [Marshall]
+
+=item *
+
+Deleted sites will no longer be displayed in the site context menu in the
+UI. Reported by Ed Stevenson. [David]
+
+=item *
+
+Sorting templates based on Asset Type (Element) no longer causes an error.
+[David]
+
+=item *
+
+Events are now logged during the cleanup phase in alphabetical order by event
+type key name, to prevent deadlocks between two transactions logging events of
+the same types in different orders at the same time. [David]
+
+=item *
+
+Fixed a number of the callbacks in the story, media, and template profiles so
+that they didn't clear out the session before other callbacks were done with
+it. Most often seen as the error 'Can't call method "get_tiles" on an
+undefined value' in the media profile, especially with IE/Windows (for some
+unknown reason). Reported by Ed Stevenson. [David]
+
+=item *
+
+Fixed typo in clone page that caused all output channels to be listed
+rather than only those associated with the element itself. [Scott]
+
+=item *
+
+Fixed double listing of the "All" group in the group membership double list
+manager. [Christian Hauser]
+
+=item *
+
+Mail sent for alerts and the like now has DOS and Macintosh line-endings
+converted to Unix so that they are displayed properly in most mail clients.
+[Christian Hauser and David]
+
+=item *
+
+Documented required C<user__id> parameter to the C<new()> method in the story
+and media classes. Reported by Rod Taylor. [David]
+
+=item *
+
+Image buttons now correctly execute the C<onsubmit()> method for forms that
+define an C<onsubmit> attribute. This means that, among other things, changes
+to a group profile will persist when you click the "Permissions" button.
+[David]
+
+=item *
+
+Media type groups now properly display their members.
+
+=item *
+
+The "Edit" link that showed up for categories associated with a story when the
+C<ENABLE_CATEGORY_BROWSER> F<bricolage.conf> directive has been removed. It
+didn't belong there in the first place. Reported by Ho Yin Au. [David]
+
+=item *
+
+Simple search now works when it is selected when the "Default Search"
+preference is set to "Advanced". Reported by Marshall Roch. [David]
+
+=item *
+
+Multiple alert types set up to trigger alerts for the same event will now all
+properly execute. Thanks to Christian Hauser for the spot! [David]
+
+=item *
+
+Publishing stories or media via SOAP with the C<published_only> parameter
+(C<--published-only> for F<bric_republish>) now correctly republishes the
+published versions of documents even if the current version is in workflow.
+Reported by Adam Rinehart. [David]
+
+=item *
+
+Added upgrade script to clean out old records left in the "member" table if
+users elected to delete old jobs during the 1.8.2 upgrade. [David]
+
+=item *
+
+Users granted a permission greater than READ to the members of the "All Users"
+group no longer get such permission to any members of the "Global Admins"
+group unless they have specifically been granted such permission to the
+members of the "Global Admins" group. Thanks to Marshall Roch for the spot!
+[David]
+
=back
=cut
Modified: bricolage/trunk/lib/Bric/DBA.pod
===================================================================
--- bricolage/trunk/lib/Bric/DBA.pod 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/DBA.pod 2004-11-19 08:55:15 UTC (rev 6088)
@@ -203,7 +203,8 @@
This has the effect of keeping your database highly optimized at all times.
Read the rest of the C<pg_autovacuum> F<README> for installation and
-configuration instructions.
+configuration instructions. When you start it up, we recommend using these
+options: C<-D -v 300 -V 0.5> for optimal vacuum maintenance.
=head1 TUNING
@@ -217,7 +218,7 @@
The specific tuning recommendations below are for PostgreSQL versions 7.3 and
7.4. Tuning will be slightly different for version 7.2, and very different for
-version 7.5 when it comes out. Consult the necessary documentation.
+version 8.0 when it comes out. Consult the necessary documentation.
To tune PostgreSQL, first determine the amount of memory you want to give to
your running PostgreSQL server. In a production environment where PostgreSQL
@@ -364,7 +365,7 @@
updated in the database, PostgreSQL must store a dead tuple. The C<fsm_map>
setting determines how much space is held open so that dead tuples don't crowd
the data pages. If you estimate 50% updates, then set C<max_fsm_pages> to
-C<131072 * .3 = 65536>:
+C<131072 * .5 = 65536>:
max_fsm_pages = 65536
@@ -372,19 +373,6 @@
value of 75000 should be more than enough for expected activity in a 1 GB
database.
-=head2 Genetic Query Optimizer
-
-When planning a query with multiple joins, the PostgreSQL query optimizer
-tests every order for joins to determine the cheapest order. That can cause
-problems if there are too many tables to be joined; in such cases, the
-optimizer uses random selection to guess the optimal join order. However, with
-newer, faster processors, the default setting of 11 for C<geqo_threshold>,
-which determines the number of tables that can be in a query before the
-optimizer switches to sampling, is too low. In such cases, it can generally be
-set up to 20 or 25:
-
- geqo_threshold = 20
-
=head2 Where to Learn More
See Josh Berkus' article, "Tuning PostgreSQL for performance" at
@@ -410,14 +398,14 @@
do this:
DELETE FROM member
- WHERE id IN (
+ WHERE class__id IN (54, 79, 80)
+ AND id NOT IN (
SELECT member__id
FROM job_member, job
WHERE job.id = job_member.object_id
- AND executing = 0
AND (
- comp_time IS NOT NULL
- OR failed = 1
+ executing = 1
+ OR comp_time IS NULL
)
);
Modified: bricolage/trunk/lib/Bric/Dist/Client.pm
===================================================================
--- bricolage/trunk/lib/Bric/Dist/Client.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Dist/Client.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -23,12 +23,7 @@
use Bric::Dist::Client;
my $dist = Bric::Dist::Client->new;
- $dist->load_ids;
- my @exec_ids = $dist->get_exec_ids;
- $dist->add_exec_ids(@exec_ids);
- $dist->del_exec_ids(@exec_ids);
-
my $url = $dist->get_url;
$dist = $dist->set_url($url);
my $cookie = $dist->get_cookie;
@@ -38,10 +33,10 @@
=head1 DESCRIPTION
-This class functions as a client to the distribution server. It will load the
-lists of job IDs to be executed and send them via lwp to the distribution
-server, which is running Bric::Dist::Handler. It is principally used to distribute
-files for preview, and by dist_mon to distribute files for publication.
+This class functions as a client to the distribution server. It sends a tickle
+request to the Bricolage distribution server, which is running
+Bric::Dist::Handler. It is principally used used by
+L<bric_dist_mon|bric_dist_mon> to publish and distribute files.
=cut
@@ -53,7 +48,6 @@
################################################################################
# Programmatic Dependences
-use Bric::Util::Job;
use Bric::Util::DBI qw(:standard);
use Bric::Util::Time qw(:all);
use Bric::Util::Fault qw(throw_gen);
@@ -113,21 +107,8 @@
=item my $dist = Bric::Dist::Client->new($init)
-Instantiates a Bric::Dist::Client object. An anonymous hash of initial values may
-be passed. The supported initial value keys are:
+Instantiates a Bric::Dist::Client object.
-=over 4
-
-=item *
-
-exec_ids - An anonymous array of Bric::Util::Job IDs to be executed.
-
-=item *
-
-exp_ids - An anonymous array of Bric::Util::Job IDs to be expired.
-
-=back
-
B<Throws:>
=over 4
@@ -144,14 +125,6 @@
Bric::_get() - Problems retrieving fields.
-=item *
-
-Cannot add resources to a completed job.
-
-=item *
-
-Cannot add resources to a executing job.
-
=back
B<Side Effects:> NONE.
@@ -203,44 +176,10 @@
=item $dist = $dist->load_ids
-Looks up the IDs of all Bric::Util::Job objects in the database that are ready
-to be executed or expired and populates the properties of this object with those
-IDs.
+B<Note:> Deprecated. No need to call it anymore, as it is now a no-op.
-B<Throws:>
+B<Throws:> NONE.
-=over 4
-
-=item *
-
-Bric::_get() - Problems retrieving fields.
-
-=item *
-
-Unable to connect to database.
-
-=item *
-
-Unable to prepare SQL statement.
-
-=item *
-
-Unable to select column into arrayref.
-
-=item *
-
-Unable to execute SQL statement.
-
-=item *
-
-Unable to bind to columns to statement handle.
-
-=item *
-
-Unable to fetch row from statement handle.
-
-=back
-
B<Side Effects:> NONE.
B<Notes:> NONE.
@@ -249,14 +188,14 @@
sub load_ids {
my $self = shift;
- my $jids = $self->_get('exec_ids');
- my $new_jids = Bric::Util::Job->list_ids( {
- sched_time => [undef, strfdate()],
- comp_time => undef,
- failed => 0,
- executing => 0,
- });
- grep { $jids->{$_} = undef } @$new_jids;
+# my $jids = $self->_get('exec_ids');
+# my $new_jids = Bric::Util::Job->list_ids({
+# sched_time => [undef, strfdate()],
+# comp_time => undef,
+# failed => 0,
+# executing => 0,
+# });
+# grep { $jids->{$_} = undef } @$new_jids;
return $self;
}
@@ -387,18 +326,11 @@
=item my (@exec_jids, $exec_jids_aref) = $dist->get_exec_ids
-Returns a list anonymous array of Bric::Util::Job IDs to be executed.
+B<Note:> Deprecated. No need to call it anymore. Will return an empty list or
+array reference.
-B<Throws:>
+B<Throws:> NONE.
-=over 4
-
-=item *
-
-Bric::_get() - Problems retrieving fields.
-
-=back
-
B<Side Effects:> NONE.
B<Notes:> NONE.
@@ -406,26 +338,20 @@
=cut
sub get_exec_ids {
- wantarray ? sort { $a <=> $b } keys %{ $_[0]->_get('exec_ids') }
- : [ sort { $a <=> $b } keys %{ $_[0]->_get('exec_ids') } ];
+# wantarray ? sort { $a <=> $b } keys %{ $_[0]->_get('exec_ids') }
+# : [ sort { $a <=> $b } keys %{ $_[0]->_get('exec_ids') } ];
+ wantarray ? () : [];
}
################################################################################
=item $self = $dist->add_exec_ids(@exec_ids)
-Adds to the list of Bric::Util::Job IDs to be executed.
+B<Note:> Deprecated. No need to call it anymore. All arguments will simply be
+discarded.
-B<Throws:>
+B<Throws:> NONE.
-=over 4
-
-=item *
-
-Bric::_get() - Problems retrieving fields.
-
-=back
-
B<Side Effects:> NONE.
B<Notes:> NONE.
@@ -434,8 +360,8 @@
sub add_exec_ids {
my $self = shift;
- my $ids = $self->_get('exec_ids');
- @{$ids}{@_} = ();
+# my $ids = $self->_get('exec_ids');
+# @{$ids}{@_} = ();
return $self;
}
@@ -443,19 +369,11 @@
=item $self = $dist->del_exec_ids(@exec_ids)
-Deletes from the list of Bric::Util::Job IDs to be executed. If no exec IDs are
-passed, they will all be deleted.
+B<Note:> Deprecated. No need to call it anymore. All arguments will simply be
+discarded.
-B<Throws:>
+B<Throws:> NONE.
-=over 4
-
-=item *
-
-Bric::_get() - Problems retrieving fields.
-
-=back
-
B<Side Effects:> NONE.
B<Notes:> NONE.
@@ -464,8 +382,8 @@
sub del_exec_ids {
my $self = shift;
- my $ids = $self->_get('exec_ids');
- @_ ? delete @{$ids}{@_} : (%$ids = ());
+# my $ids = $self->_get('exec_ids');
+# @_ ? delete @{$ids}{@_} : (%$ids = ());
return $self;
}
@@ -473,7 +391,7 @@
=item $self = $dist->send
-Sends the lists of Bric::Util::Job IDs to be expired to the distribution server.
+Sends a tickle request to the distribution server.
B<Throws:>
@@ -497,12 +415,12 @@
sub send {
my $self = shift;
- my $exec = $self->get_exec_ids;
+# my $exec = $self->get_exec_ids;
my $cookie = $self->get_cookie;
eval {
my $req = HTTP::Request->new(GET => $self->_get('url'));
- $req->header(Execute => $exec);
+# $req->header(Execute => $exec);
$req->header(Cookie => $cookie) if $cookie;
my $res = $ua->request($req);
Modified: bricolage/trunk/lib/Bric/Dist/Handler.pm
===================================================================
--- bricolage/trunk/lib/Bric/Dist/Handler.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Dist/Handler.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -46,6 +46,7 @@
use Bric::App::Event qw(log_event clear_events);
use Bric::App::Util qw(:pref);
use Bric::Util::Job;
+use Bric::Util::Time qw(:all);
use Apache::Constants qw(HTTP_OK);
use Apache::Log;
@@ -151,18 +152,16 @@
# Set up the language object and handle the request.
Bric::Util::Language->get_handle(get_pref('Language'));
- my %headers = $r->headers_in;
# Execute all the jobs.
- foreach my $jid (split /\s*,\s*/, $headers{Execute}) {
- eval {
- my $job = Bric::Util::Job->lookup({ id => $jid }) ||
- throw_gen(error => "Job $jid does not exist.");
- $job->execute_me();
- log_event("job_exec", $job);
- };
- # Log any errors.
- log_err($r, $@, "Error executing Job $jid") if $@;
- }
+ for my $job (Bric::Util::Job->list({
+ sched_time => [undef, strfdate()],
+ comp_time => undef,
+ failed => 0,
+ executing => 0,
+ })) {
+ $job->execute_me;
+ log_event("job_exec", $job);
+ }
};
# Log any errors.
@@ -171,6 +170,8 @@
return HTTP_OK;
}
+##############################################################################
+
=item my $bool = log_err($r, $err, $msg)
Logs an error to the Apache error log. Will handle both standard error messages
Modified: bricolage/trunk/lib/Bric/Hacker.pod
===================================================================
--- bricolage/trunk/lib/Bric/Hacker.pod 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Hacker.pod 2004-11-19 08:55:15 UTC (rev 6088)
@@ -85,7 +85,7 @@
If you're developing Bricolage then you should be working with the latest code
from the Bricolage Subversion repository. You can browse the Subversion
-repository at L<http://svn.bricolage.cc/viewcvs/>.
+repository at L<http://viewsvn.bricolage.cc/>.
Information on connecting to the repository to checkout a working copy is at
L<http://www.bricolage.cc/dev/subversion/>.
Modified: bricolage/trunk/lib/Bric/License.pod
===================================================================
--- bricolage/trunk/lib/Bric/License.pod 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/License.pod 2004-11-19 08:55:15 UTC (rev 6088)
@@ -1,6 +1,6 @@
=head1 NAME
-Bricolage::License - The Bricolage License.
+Bric::License - The Bricolage License.
=head1 LICENSE
@@ -181,6 +181,14 @@
=item Andrea Rota
+=item Mark Kennedy
+
+=item Keith Grennan
+
+=item Christian Hauser
+
+=item Dharmender Yadav
+
=back
Friends who have spotted bugs include:
@@ -265,8 +273,6 @@
=item Abdul Halim Mazahar
-=item Christian Hauser
-
=item Tony Cowderoy
=item Joshua Edelstein
@@ -279,6 +285,14 @@
=item Patrick Michael Kane
+=item Kenneth Marshall
+
+=item Clinton Gormley
+
+=item Ed Stevenson
+
+=item Ashlee Caul
+
=back
Bricolage's translation team:
@@ -295,6 +309,8 @@
=item Gang Luo (Simplified Chinese)
+=item Sergey Samoilenko (Russian)
+
=back
Others who contributed to its support and development:
Modified: bricolage/trunk/lib/Bric/SOAP/Workflow.pm
===================================================================
--- bricolage/trunk/lib/Bric/SOAP/Workflow.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/SOAP/Workflow.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -198,45 +198,24 @@
my $type;
if ($id->name eq 'story_id') {
$type = 'story';
- $obj = Bric::Biz::Asset::Business::Story->lookup(
- { id => $id->value });
+ $obj = Bric::Biz::Asset::Business::Story->lookup({
+ id => $id->value,
+ ( $published_only ? ( published_version => 1) : ())
+ });
- if ($published_only) {
- # Get published_version, not current_version
- # (version zero isn't published yet)
- my $pubversion = $obj->get_published_version || 0;
- if ($pubversion) {
- # Get published version instead of current
- $obj = $obj->lookup({ id => $id->value, version => $pubversion \
});
- } else {
- # Skip if --published-only and not published yet
- next;
- }
- }
+ throw_ap(error => 'Unable to find story for story_id "'
+ . $id->value . '".')
+ unless $obj;
- throw_ap(error => "Unable to find story for story_id \"$id\".")
- unless $obj;
-
} elsif ($id->name eq 'media_id') {
$type = 'media';
- $obj = Bric::Biz::Asset::Business::Media->lookup(
- { id => $id->value });
+ $obj = Bric::Biz::Asset::Business::Media->lookup({
+ id => $id->value,
+ published_version => $published_only
+ });
- if ($published_only) {
- # Get published_version, not current_version
- # (version zero means it isn't published yet)
- my $pubversion = $obj->get_published_version || 0;
- if ($pubversion) {
- # Get published version instead of current
- $obj = $obj->lookup({ id => $id->value, version => $pubversion \
});
- } else {
- # Skip if --published-only and not published yet
- next;
- }
- }
-
throw_ap(error => "Unable to find media object for media_id \"$id\".")
- unless $obj;
+ unless $obj;
} else {
throw_ap(error => "Unknown element found in publish_ids list.");
@@ -253,14 +232,18 @@
throw_ap(error => "Cannot publish checked-out $types{$type}: \"".$id."\".")
if $obj->get_checked_out and not $preview;
- if (not $preview && $obj->get_workflow_id) {
+ if (! $preview && !$published_only && $obj->get_workflow_id) {
# It must be on a publish desk.
my $did = $obj->get_desk_id;
my $desk = $desks{$did}
||= Bric::Biz::Workflow::Parts::Desk->lookup({ id => $did });
+ # XXX There should always be a desk when there's a workflow, but
+ # sometimes there isn't. Hence the "$desk &&" just lets it publish
+ # if that's the case. It will be removed from workflow by the
+ # publish.
throw_ap qq{Cannot publish $types{$type} "$id" because it }
. "is not on a publish desk"
- unless $desk->can_publish;
+ unless $desk && $desk->can_publish;
}
# Check for PUBLISH permission, or READ if previewing
Modified: bricolage/trunk/lib/Bric/SOAP.pm
===================================================================
--- bricolage/trunk/lib/Bric/SOAP.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/SOAP.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -327,8 +327,7 @@
=item XML Schema For Asset Documents
This is the XML Schema for asset documents used in the Bricolage SOAP
-interface. A pretty-printed version complete with colorful graphs generated by
-XMLSpy can be found at L<http://bricolage.cc/soap_schema/assets.html>.
+interface.
The XSD source:
Modified: bricolage/trunk/lib/Bric/ToDo.pod
===================================================================
--- bricolage/trunk/lib/Bric/ToDo.pod 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/ToDo.pod 2004-11-19 08:55:15 UTC (rev 6088)
@@ -65,9 +65,25 @@
Add Checkin & Shelve (And Checkin & Publish?) to the dropdown menu on My
Workspace.
+>>>>>>> .merge-right.r6084
=item *
+Add "Checkout" button to the "View" screens for stories, media, and
+templats. It must be careful about permissions in the same way that
+F<comp/workflow/manager/dhandler> currently is. That is to say, in order for
+the button to be displayed, the user must have EDIT permission to the
+asset. If the asset isn't currently in workflow, the user must have RECALL
+permission to the asset or to the assets on the start desk in the current
+workflow, and at least EDIT permission to the assets on the start desk.
+
+=item *
+
+Add Checkin & Shelve (And Checkin & Publish?) to the dropdown menu on My
+Workspace.
+
+=item *
+
When clicking "New" for an existing contributor, allow choice of Contributor
Type, and B<then> role. Right now, if you want an existing contributor to be a
contributor of a different type, you have to create a new person, and this
Modified: bricolage/trunk/lib/Bric/Util/AlertType.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/AlertType.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Util/AlertType.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -2437,11 +2437,12 @@
my $omeths = $obj->my_meths;
# For accessing data on the event itself.
- if ($e_attr) {
+ if ($e_attr && !$e_attr->{__SEEN__}) {
for my $k (keys %$e_attr) {
(my $v = lc $k) =~ s/\W+/_/g;
$e_attr->{lc "et_$v"} = delete $e_attr->{$k};
}
+ $e_attr->{__SEEN__} = 1;
}
foreach my $rule ($self->get_rules) {
Modified: bricolage/trunk/lib/Bric/Util/Burner/Mason.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Burner/Mason.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Util/Burner/Mason.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -367,8 +367,6 @@
$interp->set_global('$burner', $self);
- $interp->set_global('$burner', $self);
-
# Try to create a component.
my $comp = eval { $interp->make_component(comp_source => $data) };
if ($@) {
Modified: bricolage/trunk/lib/Bric/Util/Burner/TemplateToolkit.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Burner/TemplateToolkit.pm 2004-11-19 08:54:20 UTC \
(rev 6087)
+++ bricolage/trunk/lib/Bric/Util/Burner/TemplateToolkit.pm 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -46,7 +46,7 @@
#--------------------------------------#
# Programatic Dependencies
-use Template;
+use Template 2.14;
use Bric::Util::Fault qw(throw_gen throw_burn_error);
use Bric::Util::Trans::FS;
use Bric::Dist::Resource;
@@ -277,7 +277,11 @@
while(1) {
use utf8;
warn "Processing $template\n";
- $tt->process($template) or throw_burn_error
+ $tt->process($template, ( ENCODE_OK
+ ? (undef, undef, binmode => ':utf8')
+ : ()
+ ))
+ or throw_burn_error
error => "Error executing '$template'",
payload => $tt->error,
mode => $self->get_mode,
Modified: bricolage/trunk/lib/Bric/Util/Burner.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Burner.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Util/Burner.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -110,6 +110,15 @@
=cut
#==============================================================================#
+# Inheritance #
+#======================================#
+use base qw(Bric Exporter);
+
+our @EXPORT_OK = qw(PUBLISH_MODE PREVIEW_MODE SYNTAX_MODE);
+our %EXPORT_TAGS = ( all => \@EXPORT_OK,
+ modes => \@EXPORT_OK);
+
+#==============================================================================#
# Dependencies #
#======================================#
@@ -121,6 +130,7 @@
#--------------------------------------#
# Programatic Dependencies
+use Bric::App::Session;
use Bric::Util::Fault qw(throw_gen throw_burn_error throw_burn_user
rethrow_exception);
use Bric::Util::Trans::FS;
@@ -130,19 +140,12 @@
use Bric::App::Event qw(:all);
use Bric::App::Session qw(:user);
use Bric::Biz::Site;
+require Bric::Util::Job::Pub;
use Bric::Util::Pref;
+use Bric::Util::Time qw(:all);
use File::Basename qw(fileparse);
use URI;
-#==============================================================================#
-# Inheritance #
-#======================================#
-use base qw(Bric Exporter);
-
-our @EXPORT_OK = qw(PUBLISH_MODE PREVIEW_MODE SYNTAX_MODE);
-our %EXPORT_TAGS = ( all => \@EXPORT_OK,
- modes => \@EXPORT_OK);
-
#=============================================================================#
# Function Prototypes #
#======================================#
@@ -184,8 +187,8 @@
oc => Bric::FIELD_READ,
cat => Bric::FIELD_READ,
page => Bric::FIELD_READ,
- encoding => Bric::FIELD_READ,
- output_filename => Bric::FIELD_READ,
+ encoding => Bric::FIELD_RDWR,
+ output_filename => Bric::FIELD_RDWR,
output_ext => Bric::FIELD_READ,
output_path => Bric::FIELD_READ,
base_path => Bric::FIELD_READ,
@@ -717,17 +720,18 @@
close(MC);
# Delete older versions, if they live elsewhere.
- my $old_version = $fa->get_published_version or return $self;
- my $old_fa = $fa->lookup({ id => $fa->get_id,
- checked_out => 0,
- version => $old_version });
- my $old_file = $old_fa->get_file_name or return $self;
+ my $old_version = $fa->get_published_version or return $self;
+ my $old_fa = $fa->lookup({ id => $fa->get_id,
+ checked_out => 0,
+ version => $old_version })
+ or return $self;
+ my $old_file = $old_fa->get_file_name or return $self;
- $old_file = $fs->cat_dir($self->get_sandbox_dir || $self->get_comp_dir,
- $oc_dir, $old_file);
+ $old_file = $fs->cat_dir($self->get_sandbox_dir || $self->get_comp_dir,
+ $oc_dir, $old_file);
- return $self if $old_file eq $file;
- $fs->del($old_file);
+ return $self if $old_file eq $file;
+ $fs->del($old_file);
return $self;
@@ -1152,11 +1156,11 @@
if ($path && $uri) {
my $r = Bric::Dist::Resource->lookup({ path => $path,
uri => $uri })
- || Bric::Dist::Resource->new
- ({ path => $path,
- media_type => Bric::Util::MediaType->get_name_by_ext($uri),
- uri => $uri
- });
+ || Bric::Dist::Resource->new({
+ path => $path,
+ media_type => Bric::Util::MediaType->get_name_by_ext($uri),
+ uri => $uri
+ });
$r->add_media_ids($baid);
$r->save;
@@ -1275,12 +1279,19 @@
other than the one currently being published. This is useful when a template
for one document type needs to trigger the publish of another document. Look
up that document via the Bricolage API and then pass it to this method to have
-it published at the same time as the story currently being published. If the
-mode isn't PUBLISH_MODE, the publish will not actually be executed. Pass in a
-DateTime string to specify a different date and time to publish the
-document. Pass in a true value as the third argument to trigger the publish in
-any mode, including PREVIEW_MODE (not recommended).
+it published at the same time as the story currently being published.
+If the mode isn't C<PUBLISH_MODE>, the publish will not actually be
+executed. Pass in a DateTime string to specify a different date and time to
+publish the document. If that date is in the future, a publish job will be
+schedule at that time. Pass in a true value as the third argument to trigger
+the publish in any mode, including C<PREVIEW_MODE> (not recommended).
+
+Note that any values stored in the C<notes> attribute of the current burner
+will be copied to the new burner that burns the new document, unless the
+C<$publish_time> agrument schedules the document to be published at a future
+time.
+
B<Throws:> NONE.
B<Side Effects:> NONE.
@@ -1305,6 +1316,18 @@
# that's currently being burned.
$pub_time ||= $self->get_story->get_publish_date(ISO_8601_FORMAT);
+ if ($pub_time gt strfdate) {
+ # Schedule it to be published later.
+ Bric::Util::Job::Pub->new({
+ sched_time => $pub_time,
+ user_id => Bric::App::Session::get_user_id(),
+ name => 'Publish "' . $ba->get_name . '"',
+ "$key\_id" => $ba->get_id,
+ priority => $ba->get_priority,
+ })->save;
+ return $self;
+ }
+
# Construct a new burner object and publish the document.
my $b2 = __PACKAGE__->new;
$b2->_set(['_notes'] => [$self->_get('_notes')]);
Modified: bricolage/trunk/lib/Bric/Util/Coll/Action.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Coll/Action.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Util/Coll/Action.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -3,8 +3,7 @@
=head1 NAME
-Bric::Util::Coll::Action - Interface for managing collections of distribution
-actions.
+Bric::Util::Coll::Action - Interface for managing collections of distribution \
actions.
=head1 VERSION
Modified: bricolage/trunk/lib/Bric/Util/Coll.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Coll.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Util/Coll.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -573,7 +573,7 @@
# Grab the ID.
my $id = ref $o ? $o->get_id : $o;
# Do some error checking if we're in QA_MODE.
- throw_da(error => "Object '$o' not in collection")
+ throw_da(error => "Object '$o' (ID=$id) not in collection")
if QA_MODE && ! $objs->{$id} && ! $new_idx{$id};
if (defined $new_idx{$id}) {
# Just skip to the next one if we're removing one that
Modified: bricolage/trunk/lib/Bric/Util/DBI.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/DBI.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Util/DBI.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -811,31 +811,37 @@
# Map inverse alias inactive to active.
$param->{'active'} = ($param->{'inactive'} ? 0 : 1)
if exists $param->{'inactive'};
- # checked_out has some special cases
- # deal with the checked_out param. The all argument is actually
- # the default behavior.
- $param->{_checked_out} = $param->{checked_out}
- if exists $param->{checked_out} && $param->{checked_out} ne 'all';
- # this will override the above
- $param->{_checked_out} = $param->{checkout} if exists $param->{checkout};
- # this is last because it's most important for defining a workspace
- $param->{_checked_out} = 1 if defined $param->{user__id};
- if (defined $param->{_checked_out}) {
- # Make sure we have a valid checkout value -- that is, no null string!
- $param->{_checked_out} = 0 unless $param->{_checked_out};
- } else {
- # finally the default
- $param->{_checked_in_or_out} = 1 unless defined $param->{_checked_out};
+ unless ($param->{published_version}) {
+ # checked_out has some special cases
+ # deal with the checked_out param. The all argument is actually
+ # the default behavior.
+ $param->{_checked_out} = $param->{checked_out}
+ if exists $param->{checked_out} && $param->{checked_out} ne 'all';
+ # this will override the above
+ $param->{_checked_out} = $param->{checkout} if exists $param->{checkout};
+ # this is last because it's most important for defining a workspace
+ $param->{_checked_out} = 1 if defined $param->{user__id};
+ if (defined $param->{_checked_out}) {
+ # Make sure we have valid checkout values -- that is, no null
+ # strings!
+ @{$param}{qw(_not_checked_out _checked_out)} = (0, 0)
+ unless $param->{_checked_out};
+ } else {
+ # finally the default
+ $param->{_checked_in_or_out} = 1 unless defined $param->{_checked_out};
+ }
+
+ # trim cruft
+ delete $param->{checkout};
+ delete $param->{checked_out};
}
-
- # trim cruft
- delete $param->{checkout};
- delete $param->{checked_out};
# take care of the simple query, or lack thereof
$param->{_not_simple} = 1 unless $param->{simple};
# we can only handle the returned versions p in reverse
$param->{_no_return_versions} = 1
- unless $param->{return_versions} || defined $param->{version};
+ unless $param->{return_versions}
+ || defined $param->{version}
+ || $param->{published_version};
# add default order
$param->{Order} = $class->DEFAULT_ORDER unless $param->{Order};
# support of NULL workflow__id
Modified: bricolage/trunk/lib/Bric/Util/FTP/DirHandle.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/FTP/DirHandle.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Util/FTP/DirHandle.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -53,7 +53,8 @@
use Net::FTPServer::DirHandle;
use Bric::Util::Burner::Mason;
require Bric::Util::Burner::Template if eval { require HTML::Template };
-require Bric::Util::Burner::TemplateToolkit if eval { require Template };
+require Bric::Util::Burner::TemplateToolkit
+ if eval { require Template && $Template::VERSION >= 2.14 };
use Bric::Util::FTP::FileHandle;
use Bric::Util::Priv::Parts::Const qw(:all);
use File::Basename qw(fileparse);
Modified: bricolage/trunk/lib/Bric/Util/Fault/Exception.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Fault/Exception.pm 2004-11-19 08:54:20 UTC (rev \
6087)
+++ bricolage/trunk/lib/Bric/Util/Fault/Exception.pm 2004-11-19 08:55:15 UTC (rev \
6088) @@ -6,7 +6,7 @@
=head1 NAME
-Bric::Util::Exception - Legacy Exception Class
+Bric::Util::Fault::Exception - Legacy Exception Class
=head1 DESCRIPTION
Modified: bricolage/trunk/lib/Bric/Util/Grp/MediaType.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Grp/MediaType.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Util/Grp/MediaType.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -105,6 +105,29 @@
##############################################################################
+=head3 get_list_classes
+
+ my @list_classes = Bric::Util::Grp::MediaType->get_list_classes;
+
+Returns a list or anonymous array of the supported classes in the group that
+can have their C<list()> methods called in succession to assemble a list of
+member objects. This data varies from that stored in the keys in the hash
+reference returned by C<get_supported_classes> in that some classes' C<list()>
+methods may inherit from others, and we don't want the same C<list()> method
+executed more than once.
+
+B<Throws:> NONE.
+
+B<Side Effects:> NONE.
+
+B<Notes:> NONE.
+
+=cut
+
+sub get_list_classes { ('Bric::Util::MediaType') }
+
+##############################################################################
+
=head3 get_object_class_id
my $class_id = Bric::Util::Grp::MediaType->get_object_class_id;
Modified: bricolage/trunk/lib/Bric/Util/Job/Pub.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Job/Pub.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Util/Job/Pub.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -79,7 +79,6 @@
use Bric::Config qw(:dist :temp :time STAGE_ROOT);
use File::Spec::Functions qw(catdir);
use Bric::Util::Time qw(:all);
-use Bric::App::Event qw(log_event);
use Bric::Util::Burner;
use Bric::Util::Burner::Mason;
use Bric::Biz::Asset::Business::Media;
Modified: bricolage/trunk/lib/Bric/Util/Job.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Job.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Util/Job.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -103,7 +103,7 @@
################################################################################
# Function and Closure Prototypes
################################################################################
-my ($get_em, $get_coll, $set_executing, $check_priority, $do_insert);
+my ($get_em, $get_coll, $set_executing, $check_priority);
################################################################################
# Constants
@@ -1666,6 +1666,8 @@
WHERE id = ?
});
execute($del, $id);
+ $res->save($id) if $res;
+ $sts->save($id) if $sts;
} elsif (defined $id) {
# Existing record. Update it.
local $" = ' = ?, '; # Simple way to create placeholders with an array.
@@ -1675,29 +1677,44 @@
WHERE id = ?
});
execute($upd, $self->_get(@PROPS), $id);
+ $res->save($id) if $res;
+ $sts->save($id) if $sts;
} else {
- # It's a new job. Execute it if it's time.
+ # It's a new job. Insert it.
+ local $" = ', ';
+ my $fields = join ', ', next_key('job'), ('?') x $#COLS;
+ my $ins = prepare_c(qq{
+ INSERT INTO job (@COLS)
+ VALUES ($fields)
+ }, undef, DEBUG);
+
+ # Don't try to set ID - it will fail!
+ my @ps = $self->_get(@PROPS[1..$#PROPS]);
+ execute($ins, @ps);
+
+ # Now grab the ID.
+ my $id = last_key('job');
+ $self->_set(['id'] => [$id]);
+
+ # Register this job in the "All Jobs" group and save any associated
+ # destinations and resources.
+ $self->register_instance(INSTANCE_GROUP_ID, GROUP_PACKAGE);
+ $res->save($id) if $res;
+ $sts->save($id) if $sts;
+
+ # For simple deployments of Bricolage where the neither a job queue
+ # nor a seperated dist machine are in use we want to execute *newly
+ # inserted* jobs right away.
if (ENABLE_DIST && !QUEUE_PUBLISH_JOBS
- && $self->get_sched_time('epoch') <= time) {
- eval { $self->execute_me };
- if (my $err = $@) {
- # Save the new job and die.
- $id = $do_insert->($self);
- $res->save($id) if $res;
- $sts->save($id) if $sts;
- $self->SUPER::save;
- die $err;
- }
+ && $self->get_sched_time('epoch') <= time)
+ {
+ # Execute the job and then be sure to start a new transaction!
+ $self->execute_me;
+ begin(1);
}
- # Just insert the job.
- $id = $do_insert->($self);
}
-
- $res->save($id) if $res;
- $sts->save($id) if $sts;
- $self->SUPER::save;
- return $self;
+ return $self->SUPER::save;
}
################################################################################
@@ -1766,32 +1783,23 @@
throw_gen({ error => "Cannot execute job that has already been executed."})
if $self->get_comp_time;
- if ($self->get_id) {
- # It's an exsisting job in the database. Get a lock on it.
- $set_executing->($self, 1);
+ # Get a lock on the job.
+ $set_executing->($self, 1);
- # Do it!
- eval {
- begin(1);
- $self->_do_it(@_);
- # Success!
- $self->_set([qw(comp_time _executing)] => [db_date(0, 1), 0]);
- $self->save;
- commit(1);
- };
-
- if (my $err = $@) {
- # Rollback and handle.
- rollback(1);
- $self->handle_error($err);
- }
- } else {
- # It's a new job. Just execute it.
- $self->_set([qw(_executing tries)] => [1, 1]);
- eval { $self->_do_it(@_) };
- $self->handle_error($@) if $@;
+ # Do it!
+ eval {
+ begin(1);
+ $self->_do_it(@_);
# Success!
- return $self->_set([qw(comp_time _executing)] => [db_date(0, 1), 0]);
+ $self->_set([qw(comp_time _executing)] => [db_date(0, 1), 0]);
+ $self->save;
+ commit(1);
+ };
+
+ if (my $err = $@) {
+ # Rollback and handle.
+ rollback(1);
+ $self->handle_error($err);
}
return $self;
}
@@ -1815,14 +1823,9 @@
# the error message and mark the job as failed, and no longer
# executing.
$self->_set([qw(_executing error_message _failed)], [0, "$err", 1]);
- # log the event
- my $et = Bric::Util::EventType->lookup({
- key_name => $self->KEY_NAME . '_failed'
- });
- my $user = Bric::Biz::Person::User->lookup({
- id => $self->get_user_id
- });
- $et->log_event($user, $self);
+ # Log the failure. It's okay that it logs for the user executing
+ # the job rather than the user who scheduled it.
+ log_event( $self->KEY_NAME . '_failed', $self);
} else {
# We're gonna try again. Unlock the job.
$self->_set([qw(_executing error_message)], [0, "$err"]);
@@ -2200,36 +2203,6 @@
return $self->_set([qw(_executing tries)], [$value, $exec]);
};
-##############################################################################
-
-=item my $id = $do_insert->($self)
-
-Adds a new record to the database for the job. Called by C<save()>.
-
-=cut
-
-$do_insert = sub {
- my $self = shift;
- local $" = ', ';
- my $fields = join ', ', next_key('job'), ('?') x $#COLS;
- my $ins = prepare_c(qq{
- INSERT INTO job (@COLS)
- VALUES ($fields)
- }, undef, DEBUG);
-
- # Don't try to set ID - it will fail!
- my @ps = $self->_get(@PROPS[1..$#PROPS]);
- execute($ins, @ps);
-
- # Now grab the ID.
- my $id = last_key('job');
- $self->_set(['id'], [$id]);
-
- # Finally, register this job in the "All Jobs" group and return the id.
- $self->register_instance(INSTANCE_GROUP_ID, GROUP_PACKAGE);
- return $id;
-};
-
1;
__END__
Modified: bricolage/trunk/lib/Bric/Util/Language/bo.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Language/bo.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Util/Language/bo.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -36,7 +36,7 @@
use constant key => 'bo';
-%Lexicon =
+our %Lexicon =
(
'_AUTO' => 1,
);
Modified: bricolage/trunk/lib/Bric/Util/Language/de_de.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Language/de_de.pm 2004-11-19 08:54:20 UTC (rev \
6087)
+++ bricolage/trunk/lib/Bric/Util/Language/de_de.pm 2004-11-19 08:55:15 UTC (rev \
6088) @@ -34,8 +34,7 @@
use constant key => 'de_de';
-%Lexicon =
- (
+our %Lexicon = (
# Date
'Jan' => 'Jan',
@@ -736,7 +735,6 @@
'You do not have permission to auto-publish story "[_1]"' => 'You do not have \
permission to auto-publish story "[_1]"', 'You do not have permission to \
auto-publish media "[_1]"' => 'You do not have permission to auto-publish media \
"[_1]"',
-
=end comment
=cut
Modified: bricolage/trunk/lib/Bric/Util/Language/en_us.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Language/en_us.pm 2004-11-19 08:54:20 UTC (rev \
6087)
+++ bricolage/trunk/lib/Bric/Util/Language/en_us.pm 2004-11-19 08:55:15 UTC (rev \
6088) @@ -4,7 +4,7 @@
=head1 NAME
-Bric::Util::Language::pt_pt - Bricolage Portuguese translation
+Bric::Util::Language::en_us - Bricolage US English translation
=head1 VERSION
Modified: bricolage/trunk/lib/Bric/Util/Language/km.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Language/km.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Util/Language/km.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -36,7 +36,7 @@
use constant key => 'km';
-%Lexicon =
+our %Lexicon =
(
'_AUTO' => 1,
);
Modified: bricolage/trunk/lib/Bric/Util/Language/ko_ko.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Language/ko_ko.pm 2004-11-19 08:54:20 UTC (rev \
6087)
+++ bricolage/trunk/lib/Bric/Util/Language/ko_ko.pm 2004-11-19 08:55:15 UTC (rev \
6088) @@ -36,7 +36,7 @@
use constant key => 'ko_ko';
-%Lexicon =
+our %Lexicon =
(
'_AUTO' => 1,
);
Modified: bricolage/trunk/lib/Bric/Util/Language/lo.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Language/lo.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Util/Language/lo.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -36,7 +36,7 @@
use constant key => 'lo';
-%Lexicon =
+our %Lexicon =
(
'_AUTO' => 1,
);
Modified: bricolage/trunk/lib/Bric/Util/Language/my.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Language/my.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Util/Language/my.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -36,7 +36,7 @@
use constant key => 'my';
-%Lexicon =
+our %Lexicon =
(
'_AUTO' => 1,
);
Modified: bricolage/trunk/lib/Bric/Util/Language/pt_pt.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Language/pt_pt.pm 2004-11-19 08:54:20 UTC (rev \
6087)
+++ bricolage/trunk/lib/Bric/Util/Language/pt_pt.pm 2004-11-19 08:55:15 UTC (rev \
6088) @@ -36,8 +36,7 @@
use constant key => 'pt_pt';
-%Lexicon =
- (
+our %Lexicon = (
# Date
'Jan' => 'Jan',
Copied: bricolage/trunk/lib/Bric/Util/Language/ru_ru.pm (from rev 6084, \
bricolage/branches/rev_1_8/lib/Bric/Util/Language/ru_ru.pm)
Property changes on: bricolage/trunk/lib/Bric/Util/Language/ru_ru.pm
___________________________________________________________________
Name: snv:mime-type
+ text/plain
Name: svn:keywords
+ Id
Modified: bricolage/trunk/lib/Bric/Util/Language/ug.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Language/ug.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Util/Language/ug.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -36,7 +36,7 @@
use constant key => 'ug';
-%Lexicon =
+our %Lexicon =
(
'_AUTO' => 1,
);
Modified: bricolage/trunk/lib/Bric/Util/Language/vi_vn.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Language/vi_vn.pm 2004-11-19 08:54:20 UTC (rev \
6087)
+++ bricolage/trunk/lib/Bric/Util/Language/vi_vn.pm 2004-11-19 08:55:15 UTC (rev \
6088) @@ -36,7 +36,7 @@
use constant key => 'vi_vn';
-%Lexicon =
+our %Lexicon =
(
'_AUTO' => 1,
);
Modified: bricolage/trunk/lib/Bric/Util/Language/zh_hk.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Language/zh_hk.pm 2004-11-19 08:54:20 UTC (rev \
6087)
+++ bricolage/trunk/lib/Bric/Util/Language/zh_hk.pm 2004-11-19 08:55:15 UTC (rev \
6088) @@ -32,7 +32,7 @@
use strict;
use utf8;
-use base qw(Bric::Util::Language:zh_tw);
+use base qw(Bric::Util::Language::zh_tw);
use constant key => 'zh_hk';
Modified: bricolage/trunk/lib/Bric/Util/Trans/FS.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Trans/FS.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Util/Trans/FS.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -101,6 +101,8 @@
win95 => 'MSWin32',
win98 => 'MSWin32',
winnt => 'MSWin32',
+ win2k => 'MSWin32',
+ winxp => 'MSWin32',
win3x => 'MSWin32',
dos => 'MSDOS',
msdos => 'MSDOS',
Modified: bricolage/trunk/lib/Bric/Util/Trans/Mail.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Trans/Mail.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/lib/Bric/Util/Trans/Mail.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -832,6 +832,9 @@
$self->_get(qw(smtp to from _from_recip cc bcc content_type subject
message resources));
+ # Clean up message for CRLF of quoted-printable
+ $msg =~ s/\r\n|\r/\n/gs;
+
# Assemble the arguments we'll need for MIME::Entity.
my @args = ( 'X-Mailer' => $mailer,
($from ? (From => $from) : ()),
Modified: bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Media.con
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Media.con 2004-11-19 08:54:20 UTC \
(rev 6087)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Media.con 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -8,19 +8,19 @@
ALTER TABLE media
ADD CONSTRAINT fk_source__media FOREIGN KEY (source__id)
- REFERENCES source(id) ON DELETE CASCADE;
+ REFERENCES source(id) ON DELETE RESTRICT;
ALTER TABLE media
ADD CONSTRAINT fk_usr__media FOREIGN KEY (usr__id)
- REFERENCES usr(id) ON DELETE CASCADE;
+ REFERENCES usr(id) ON DELETE RESTRICT;
ALTER TABLE media
ADD CONSTRAINT fk_element__media FOREIGN KEY (element__id)
- REFERENCES element(id) ON DELETE CASCADE;
+ REFERENCES element(id) ON DELETE RESTRICT;
ALTER TABLE media
ADD CONSTRAINT fk_workflow__media FOREIGN KEY (workflow__id)
- REFERENCES workflow(id) ON DELETE SET NULL;
+ REFERENCES workflow(id) ON DELETE RESTRICT;
ALTER TABLE media
ADD CONSTRAINT fk_site__media FOREIGN KEY (site__id)
@@ -32,7 +32,7 @@
ALTER TABLE media
ADD CONSTRAINT fk_desk__media FOREIGN KEY (desk__id)
- REFERENCES desk(id) ON DELETE SET NULL;
+ REFERENCES desk(id) ON DELETE RESTRICT;
-- -----------------------------------------------------------------------------
-- Table media_instance
Modified: bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Media.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Media.sql 2004-11-19 08:54:20 UTC \
(rev 6087)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Media.sql 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -32,7 +32,10 @@
-- Unique IDs for the media_meta table
CREATE SEQUENCE seq_attr_media_meta START 1024;
+-- Unique IDs for the media_uri table
+CREATE SEQUENCE seq_media_uri START 1024;
+
-- -----------------------------------------------------------------------------
-- Table media
--
@@ -98,9 +101,12 @@
-- Description: Tracks all URIs for stories.
--
CREATE TABLE media_uri (
+ id INTEGER NOT NULL
+ DEFAULT NEXTVAL('seq_media_uri'),
media__id INTEGER NOT NULL,
site__id INTEGER NOT NULL,
- uri TEXT NOT NULL
+ uri TEXT NOT NULL,
+ CONSTRAINT pk_media_uri__id PRIMARY KEY (id)
);
-- -----------------------------------------------------------------------------
Modified: bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Story.con
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Story.con 2004-11-19 08:54:20 UTC \
(rev 6087)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Story.con 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -8,19 +8,19 @@
ALTER TABLE story
ADD CONSTRAINT fk_source__story FOREIGN KEY (source__id)
- REFERENCES source(id) ON DELETE CASCADE;
+ REFERENCES source(id) ON DELETE RESTRICT;
ALTER TABLE story
ADD CONSTRAINT fk_usr__story FOREIGN KEY (usr__id)
- REFERENCES usr(id) ON DELETE CASCADE;
+ REFERENCES usr(id) ON DELETE RESTRICT;
ALTER TABLE story
ADD CONSTRAINT fk_element__story FOREIGN KEY (element__id)
- REFERENCES element(id) ON DELETE CASCADE;
+ REFERENCES element(id) ON DELETE RESTRICT;
ALTER TABLE story
ADD CONSTRAINT fk_workflow__story FOREIGN KEY (workflow__id)
- REFERENCES workflow(id) ON DELETE SET NULL;
+ REFERENCES workflow(id) ON DELETE RESTRICT;
ALTER TABLE story
ADD CONSTRAINT fk_site__story FOREIGN KEY (site__id)
@@ -32,7 +32,7 @@
ALTER TABLE story
ADD CONSTRAINT fk_desk__story FOREIGN KEY (desk__id)
- REFERENCES desk(id) ON DELETE SET NULL;
+ REFERENCES desk(id) ON DELETE RESTRICT;
-- Story Instance Constraints
ALTER TABLE story_instance
Modified: bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Story.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Story.sql 2004-11-19 08:54:20 UTC \
(rev 6087)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Story.sql 2004-11-19 08:55:15 UTC \
(rev 6088) @@ -33,6 +33,8 @@
-- Unique IDs for the story_meta table
CREATE SEQUENCE seq_attr_story_meta START 1024;
+-- Unique IDs for the story_uri table
+CREATE SEQUENCE seq_story_uri START 1024;
-- -----------------------------------------------------------------------------
@@ -97,9 +99,12 @@
-- Description: Tracks all URIs for stories.
--
CREATE TABLE story_uri (
+ id INTEGER NOT NULL
+ DEFAULT NEXTVAL('seq_story_uri'),
story__id INTEGER NOT NULL,
site__id INTEGER NOT NULL,
- uri TEXT NOT NULL
+ uri TEXT NOT NULL,
+ CONSTRAINT pk_story_uri__id PRIMARY KEY (id)
);
-- -----------------------------------------------------------------------------
Modified: bricolage/trunk/sql/Pg/Bric/Biz/Asset/Formatting.con
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Asset/Formatting.con 2004-11-19 08:54:20 UTC (rev \
6087)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Asset/Formatting.con 2004-11-19 08:55:15 UTC (rev \
6088) @@ -11,23 +11,23 @@
ALTER TABLE formatting
ADD CONSTRAINT fk_usr__formatting FOREIGN KEY (usr__id)
- REFERENCES usr(id) ON DELETE CASCADE;
+ REFERENCES usr(id) ON DELETE RESTRICT;
ALTER TABLE formatting
- ADD CONSTRAINT fk_output_channel__fromatting FOREIGN KEY (output_channel__id)
- REFERENCES output_channel(id) ON DELETE CASCADE;
+ ADD CONSTRAINT fk_output_channel__formatting FOREIGN KEY (output_channel__id)
+ REFERENCES output_channel(id) ON DELETE RESTRICT;
ALTER TABLE formatting
ADD CONSTRAINT fk_element__formatting FOREIGN KEY (element__id)
- REFERENCES element(id) ON DELETE CASCADE;
+ REFERENCES element(id) ON DELETE RESTRICT;
ALTER TABLE formatting
ADD CONSTRAINT fk_category__formatting FOREIGN KEY (category__id)
- REFERENCES category(id) ON DELETE CASCADE;
+ REFERENCES category(id) ON DELETE RESTRICT;
ALTER TABLE formatting
ADD CONSTRAINT fk_workflow__formatting FOREIGN KEY (workflow__id)
- REFERENCES workflow(id) ON DELETE SET NULL;
+ REFERENCES workflow(id) ON DELETE RESTRICT;
ALTER TABLE formatting
ADD CONSTRAINT fk_site__formatting FOREIGN KEY (site__id)
@@ -35,7 +35,7 @@
ALTER TABLE formatting
ADD CONSTRAINT fk_desk__formatting FOREIGN KEY (desk__id)
- REFERENCES desk(id) ON DELETE SET NULL;
+ REFERENCES desk(id) ON DELETE RESTRICT;
-- -----------------------------------------------------------------------------
-- Table: formatting_instance
Modified: bricolage/trunk/sql/Pg/Bric/Biz/AssetType.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/AssetType.sql 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/sql/Pg/Bric/Biz/AssetType.sql 2004-11-19 08:55:15 UTC (rev 6088)
@@ -35,6 +35,9 @@
-- Unique IDs for the element_meta table
CREATE SEQUENCE seq_attr_element_meta START 1024;
+-- Unique IDs for the element__site table.
+CREATE SEQUENCE seq_element__site START 1024;
+
-- -----------------------------------------------------------------------------
-- Table: element
--
@@ -63,10 +66,13 @@
-- Description: A table that maps
CREATE TABLE element__site (
+ id INTEGER NOT NULL
+ DEFAULT NEXTVAL('seq_element__site'),
element__id INTEGER NOT NULL,
site__id INTEGER NOT NULL,
active BOOLEAN NOT NULL DEFAULT TRUE,
primary_oc__id INTEGER NOT NULL
+ CONSTRAINT pk_element__site__id PRIMARY KEY (id)
);
-- -----------------------------------------------------------------------------
Modified: bricolage/trunk/sql/Pg/Bric/Biz/Workflow.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Workflow.sql 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Workflow.sql 2004-11-19 08:55:15 UTC (rev 6088)
@@ -25,6 +25,7 @@
DEFAULT NEXTVAL('seq_workflow'),
name VARCHAR(64) NOT NULL,
description VARCHAR(256) NOT NULL,
+
all_desk_grp_id INTEGER NOT NULL,
req_desk_grp_id INTEGER NOT NULL,
asset_grp_id INTEGER NOT NULL,
Modified: bricolage/trunk/sql/Pg/Bric/Util/Event.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Event.sql 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/sql/Pg/Bric/Util/Event.sql 2004-11-19 08:55:15 UTC (rev 6088)
@@ -12,15 +12,15 @@
-- SEQUENCES.
--
CREATE SEQUENCE seq_event START 1024;
+CREATE SEQUENCE seq_event_attr START 1024;
-
--
-- TABLE: event
--
CREATE TABLE event (
id INTEGER NOT NULL
- DEFAULT NEXTVAL('seq_attr_person'),
+ DEFAULT NEXTVAL('seq_event'),
event_type__id INTEGER NOT NULL,
usr__id INTEGER NOT NULL,
obj_id INTEGER NOT NULL,
@@ -33,9 +33,12 @@
-- TABLE: event_attr
--
CREATE TABLE event_attr (
+ id INTEGER NOT NULL
+ DEFAULT NEXTVAL('seq_event_attr'),
event__id INTEGER NOT NULL,
event_type_attr__id INTEGER NOT NULL,
- value VARCHAR(128)
+ value VARCHAR(128),
+ CONSTRAINT pk_event_attr__id PRIMARY KEY (id)
);
--
Modified: bricolage/trunk/sql/Pg/Bric/Util/Grp.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Grp.val 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/sql/Pg/Bric/Util/Grp.val 2004-11-19 08:55:15 UTC (rev 6088)
@@ -217,8 +217,9 @@
VALUES ('22', '21', '133');
INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES ('22', '0', '58', 'All Preferences', 'All prefernces in the system.', '0', \
'1');
+VALUES ('22', '0', '58', 'All Preferences', 'All preferences in the system.', '0', \
'1'); +
INSERT INTO member (id, grp__id, class__id, active)
VALUES ('134', '35', '6', '1');
Modified: bricolage/trunk/sql/Pg/Bric/Util/Job.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Job.sql 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/sql/Pg/Bric/Util/Job.sql 2004-11-19 08:55:15 UTC (rev 6088)
@@ -21,8 +21,8 @@
DEFAULT NEXTVAL('seq_job'),
name TEXT NOT NULL,
usr__id INTEGER NOT NULL,
- sched_time TIMESTAMP NOT NULL
- DEFAULT CURRENT_TIMESTAMP,
+ sched_time TIMESTAMP NOT NULL
+ DEFAULT CURRENT_TIMESTAMP,
priority INT2 NOT NULL
DEFAULT 3
CONSTRAINT ck_job__priority
Modified: bricolage/trunk/sql/Pg/Bric/Util/Pref.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Pref.val 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/sql/Pg/Bric/Util/Pref.val 2004-11-19 08:55:15 UTC (rev 6088)
@@ -1613,6 +1613,9 @@
INSERT INTO pref_opt (pref__id, value, description)
VALUES ('15', 'vi_vn', 'vi_vn');
+INSERT INTO pref_opt (pref__id, value, description)
+VALUES (15, 'ru_ru', 'ru_ru');
+
-- Filter search results by site
INSERT INTO pref (id, name, description, value, def, manual, opt_type)
Modified: bricolage/trunk/sql/Pg/Bric.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric.sql 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/sql/Pg/Bric.sql 2004-11-19 08:55:15 UTC (rev 6088)
@@ -13,7 +13,7 @@
--
-- This function allows us to create UNIQUE indices that combine a lowercased
--- TEXT (or VARCHAR) column with a INTEGER column. See Bric/Util/AlertType.sql
+-- TEXT (or VARCHAR) column with an INTEGER column. See Bric/Util/AlertType.sql
-- for an example.
CREATE FUNCTION lower_text_num(TEXT, INTEGER)
RETURNS TEXT AS 'SELECT LOWER($1) || to_char($2, ''|FM9999999999'')'
Modified: bricolage/trunk/t/Bric/Test/DevBase.pm
===================================================================
--- bricolage/trunk/t/Bric/Test/DevBase.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/t/Bric/Test/DevBase.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -152,6 +152,21 @@
Bric::Util::DBI::prepare(qq{DELETE FROM event})->execute;
}
+=begin comment
+
+# This would be a better way to go than del_ids, but it won't work for those
+# classes that commit transactions themselves (such as Bric::Util::Job.).
+# Startup and shutdown methods run before and after all the tests in a single
+# Test::Class class.
+
+use Bric::Util::DBI qw(:trans);
+sub startup : Test(startup) { begin(1) }
+sub shutdown : Test(shutdown) { rollback(1) }
+
+=end comment
+
+=cut
+
sub _do_deletes {
my ($table, $ids) = @_;
Modified: bricolage/trunk/t/Bric/Util/DBI/DevTest.pm
===================================================================
--- bricolage/trunk/t/Bric/Util/DBI/DevTest.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/t/Bric/Util/DBI/DevTest.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -11,9 +11,6 @@
##############################################################################
sub test_fetch_objects: Test(4) {
my $self = shift;
- # drop to prevent sql errors that wouldn't tell us anything anyhow
- eval { Bric::Util::DBI::execute(
- Bric::Util::DBI::prepare('DROP TABLE test_fetch_objects') ) };
# create a fake story table. It doesn't need to have
# the same structure as the real ones, it just needs
# to produce the same result
@@ -33,6 +30,7 @@
twelve INTEGER NULL
) }));
+ eval {
my $sth = prepare(q{
INSERT INTO test_fetch_objects (
one, two, three, four, five, six, seven, eight, nine, ten, eleven, \
twelve @@ -217,9 +215,13 @@
}, 'Bric::Biz::Asset' ),
];
is_deeply($stories, $expect, 'can use limit and offset together to return middle \
two objects');
- # drop the test objects
- Bric::Util::DBI::execute( Bric::Util::DBI::prepare('DROP TABLE \
test_fetch_objects')); + };
+ my $err = $@;
+ Bric::Util::DBI::execute(
+ Bric::Util::DBI::prepare('DROP TABLE test_fetch_objects')
+ );
+ die $err if $err;
}
1;
Modified: bricolage/trunk/t/Bric/Util/DBI/Test.pm
===================================================================
--- bricolage/trunk/t/Bric/Util/DBI/Test.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/t/Bric/Util/DBI/Test.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -430,6 +430,7 @@
_no_return_versions => 1,
_not_simple => 1,
_checked_out => 0,
+ _not_checked_out => 0,
Order => 'cover_date',
};
is_deeply( clean_params($CLASS, { checked_out => '' }), $exp,
Modified: bricolage/trunk/t/Bric/Util/Language/Test.pm
===================================================================
--- bricolage/trunk/t/Bric/Util/Language/Test.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/t/Bric/Util/Language/Test.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -3,52 +3,21 @@
use warnings;
use base qw(Bric::Test::Base);
use Test::More;
+use File::Spec;
##############################################################################
# Test class loading.
##############################################################################
-sub _test_load : Test(1) {
+sub _test_load : Test(no_plan) {
use_ok('Bric::Util::Language');
+ my $dir = File::Spec->catdir(qw(lib Bric Util Language), '');
+ opendir LANGS, $dir or die "Cannot open directory '$dir': $!\n";
+ while (my $lang = readdir LANGS) {
+ next unless $lang =~ s/\.pm$//;
+ use_ok("Bric::Util::Language::$lang");
+ }
+ closedir LANGS;
}
1;
__END__
-
-# Here is the original test script for reference. If there's something usable
-# here, then use it. Otherwise, feel free to discard it once the tests have
-# been fully written above.
-
-#!/usr/bin/perl
-
-use strict;
-
-use Bric::Util::Language;
-
-$Bric::Cust = 'mike';
-
-my $lang = Bric::Util::Language->new();
-
-$lang->set_name('pig latin');
-
-$lang->set_description('A funny way a talking');
-
-$lang->set_char_set('Latin1');
-
-$lang->save();
-
-my $id = $lang->get_id();
-
-print "ID is $id\n";
-
-my $lang = Bric::Util::Language->lookup( { id => $id } );
-
-print "Lookup worked for " . $lang->get_name() . "\n";
-
-my ($lang) = Bric::Util::Language->list();
-
-print "List worked for " . $lang->get_name() . "\n";
-
-
-my ($id) = Bric::Util::Language->list_ids();
-
-print "List IDs worked for $id \n";
Modified: bricolage/trunk/t/Bric/Util/Time/DevTest.pm
===================================================================
--- bricolage/trunk/t/Bric/Util/Time/DevTest.pm 2004-11-19 08:54:20 UTC (rev 6087)
+++ bricolage/trunk/t/Bric/Util/Time/DevTest.pm 2004-11-19 08:55:15 UTC (rev 6088)
@@ -9,19 +9,16 @@
use Bric::Util::Time qw(:all);
use DateTime;
-my $USE_CORE = 1;
my $epoch = CORE::time;
BEGIN {
- # Override the time function. Generally use CORE::time, but when $USE_CORE
- # is set to a false value, always return the value of $epoch, which will
- # remain the same for the lifetime of the tests. This is to prevent those
- # tests that test for the time *right now* from getting screwed up by the
- # clock turning over.
- *CORE::GLOBAL::time = sub () { $USE_CORE ? CORE::time() : $epoch };
+ # Override the time function, but just have it use CORE::time. This will
+ # allow us to hijack the function later by locally redefining
+ # CORE::GLOBAL::time. This is to prevent those tests that test for the
+ # time *right now* from getting screwed up by the clock turning over.
+ *CORE::GLOBAL::time = sub () { CORE::time() };
}
-
##############################################################################
# Set up needed variables.
##############################################################################
@@ -44,17 +41,12 @@
my $fmt_local = $now->strftime($format);
##############################################################################
-# Setup and teardown methods.
-##############################################################################
-# Don't use the core time for any of these tests.
-sub hijack_time : Test(setup => 0) { $USE_CORE = 0 }
-sub restore_time : Test(teardown => 0) { $USE_CORE = 1 }
-
-##############################################################################
# Test the exported functions.
##############################################################################
# Test strfdate().
sub test_strfdate : Test(4) {
+ no warnings qw(redefine);
+ local *CORE::GLOBAL::time = sub () { $epoch };
is( strfdate($epoch), $local_iso_date,
"Check strfdate is '$local_iso_date'" );
is( strfdate($epoch, undef, 1), $utc_iso_date,
@@ -68,7 +60,9 @@
##############################################################################
# Test local_date().
sub test_local_date : Test(6) {
- is( local_date($utc_iso_date), $local_date,
+ no warnings qw(redefine);
+ local *CORE::GLOBAL::time = sub () { $epoch };
+ is( local_date($utc_date), $local_date,
"Check local date is '$local_date'" );
is( local_date($utc_iso_short_date), $local_date,
"Check short local date is '$local_date'" );
@@ -91,6 +85,8 @@
##############################################################################
# Test db_date().
sub test_db_date : Test(3) {
+ no warnings qw(redefine);
+ local *CORE::GLOBAL::time = sub () { $epoch };
is( db_date($local_iso_date), $db_date, "Check db date is '$db_date'" );
is( db_date($local_iso_short_date), $db_date,
"Check short db date is '$db_date'" );
Modified: bricolage/trunk/t/Bric/Util/UserPref/DevTest.pm
===================================================================
--- bricolage/trunk/t/Bric/Util/UserPref/DevTest.pm 2004-11-19 08:54:20 UTC (rev \
6087)
+++ bricolage/trunk/t/Bric/Util/UserPref/DevTest.pm 2004-11-19 08:55:15 UTC (rev \
6088) @@ -9,6 +9,8 @@
my $tz_pref_id = 1;
my $admin_user_id = 0;
+sub table { 'usr_pref' }
+
# Test subs need to be run in order, thus the leadin A_, B_, C_
# prefixes on sub names.
@@ -16,16 +18,27 @@
# Test constructors.
##############################################################################
# Test the new() method.
-sub A_test_new : Test(6) {
+
+sub test_record : Test(setup => 3) {
my $self = shift;
- my $user_pref = Bric::Util::UserPref->new({ user_id => $admin_user_id,
- pref_id => $tz_pref_id,
- value => 'America/Chicago' });
- ok( $user_pref, "Create a new user pref" );
+ ok my $user_pref = Bric::Util::UserPref->new({
+ user_id => $admin_user_id,
+ pref_id => $tz_pref_id,
+ value => 'America/Chicago'
+ }), "Create TZ pref";
+ isa_ok($user_pref, 'Bric::Util::UserPref');
+ ok $user_pref->save, "Save TZ pref";
+ $self->add_del_ids($user_pref->get_id);
+ $self->{user_pref} = $user_pref;
+}
+
+sub test_new : Test(5) {
+ my $self = shift;
+ my $user_pref = $self->{user_pref};
+
is( $user_pref->get_name, 'Time Zone', "name is Time Zone (before save)" );
- $user_pref->save;
my $id = $user_pref->get_id;
ok( defined $id, "after saving user pref has an id" );
@@ -36,7 +49,7 @@
##############################################################################
# Test list().
-sub B_test_lookup : Test(6) {
+sub test_lookup : Test(6) {
my $self = shift;
my $user_pref = Bric::Util::UserPref->lookup({ user_id => $admin_user_id,
@@ -56,7 +69,7 @@
##############################################################################
# Test the delete() method.
-sub C_test_delete : Test(2) {
+sub test_delete : Test(2) {
my $self = shift;
{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic