From: Alexander L. <svn...@pl...> - 2009-04-13 02:14:41
|
Author: limi Date: Mon Apr 13 02:14:30 2009 New Revision: 26491 Modified: Plone/trunk/Products/CMFPlone/profiles/default/portal_atct.xml Plone/trunk/Products/CMFPlone/skins/plone_browser/search.pt Plone/trunk/Products/CMFPlone/skins/plone_browser/search_form.pt Plone/trunk/docs/NEWS.txt Log: "Categories" are now "Tags", in line with common usage and terminology. Modified: Plone/trunk/Products/CMFPlone/profiles/default/portal_atct.xml ============================================================================== --- Plone/trunk/Products/CMFPlone/profiles/default/portal_atct.xml (original) +++ Plone/trunk/Products/CMFPlone/profiles/default/portal_atct.xml Mon Apr 13 02:14:30 2009 @@ -141,8 +141,8 @@ <criteria>ATFriendlyDateCriteria</criteria> <criteria>ATDateRangeCriterion</criteria> </index> - <index name="Subject" description="The keywords used to describe an item" - enabled="True" friendlyName="Categories" + <index name="Subject" description="Tags are used for ad-hoc organization of content" + enabled="True" friendlyName="Tags" i18n:attributes="description; friendlyName"> <criteria>ATSelectionCriterion</criteria> <criteria>ATSimpleStringCriterion</criteria> @@ -231,8 +231,8 @@ <metadata name="start" description="The start date and time of an event" enabled="True" friendlyName="Start Date" i18n:attributes="description; friendlyName" /> - <metadata name="Subject" description="The keywords used to describe an item" - enabled="True" friendlyName="Categories" + <metadata name="Subject" description="Tags are used for ad-hoc organization of content" + enabled="True" friendlyName="Tags" i18n:attributes="description; friendlyName" /> <metadata name="Title" description="" enabled="True" friendlyName="Title" i18n:attributes="description; friendlyName" /> Modified: Plone/trunk/Products/CMFPlone/skins/plone_browser/search.pt ============================================================================== --- Plone/trunk/Products/CMFPlone/skins/plone_browser/search.pt (original) +++ Plone/trunk/Products/CMFPlone/skins/plone_browser/search.pt Mon Apr 13 02:14:30 2009 @@ -144,18 +144,18 @@ </span> - <span tal:define="categories result/Subject|nothing" - tal:condition="categories"> + <span tal:define="tags result/Subject|nothing" + tal:condition="tags"> — <tal:filedunder i18n:translate="label_filed_under">filed under:</tal:filedunder> - <span tal:repeat="category categories"> + <span tal:repeat="tag tags"> <a href="" - class="link-category" + class="link-tag" rel="tag" - tal:content="category" - tal:attributes="href string:${context/@@plone_portal_state/navigation_root_url}/search?Subject%3Alist=${category}"> - Category - </a><tal:separator condition="not: repeat/category/end">,</tal:separator> + tal:content="tag" + tal:attributes="href string:${context/@@plone_portal_state/navigation_root_url}/search?Subject%3Alist=${tag}"> + Tag + </a><tal:separator condition="not: repeat/tag/end">,</tal:separator> </span> </span> Modified: Plone/trunk/Products/CMFPlone/skins/plone_browser/search_form.pt ============================================================================== --- Plone/trunk/Products/CMFPlone/skins/plone_browser/search_form.pt (original) +++ Plone/trunk/Products/CMFPlone/skins/plone_browser/search_form.pt Mon Apr 13 02:14:30 2009 @@ -69,11 +69,11 @@ </div> <div class="field"> - <label for="Subject" i18n:translate="label_categories">Categories</label> + <label for="Subject" i18n:translate="label_tags">Tags</label> - <div class="formHelp" i18n:translate="help_search_categories"> - Return items matching some or all of these Categories. - Multiple words may be found by pressing <strong>Ctrl</strong> + <div class="formHelp" i18n:translate="help_search_tags"> + Return items matching some or all of these tags. + Multiple tags may be found by pressing <strong>Ctrl</strong> (or <strong>Apple</strong> key on Mac) while clicking the keywords. </div> Modified: Plone/trunk/docs/NEWS.txt ============================================================================== --- Plone/trunk/docs/NEWS.txt (original) +++ Plone/trunk/docs/NEWS.txt Mon Apr 13 02:14:30 2009 @@ -7,6 +7,8 @@ Plone 4.0 - UNRELEASED ---------------------- +- "Categories" are now "Tags", in line with common usage and terminology. + [limi] - Reduced the number of CSS files to a set that is based on functionality instead of grouping. We now have main/authoring.css for the main CSS, and |