From: <la...@us...> - 2002-09-24 23:00:52
|
Update of /cvsroot/plone/CMFPlone/skins/plone_templates In directory usw-pr-cvs1:/tmp/cvs-serv4851/skins/plone_templates Modified Files: folder_contents.pt header.pt main_template.pt Added Files: batch_macros.pt Log Message: use the plone icon for the site itself Index: folder_contents.pt =================================================================== RCS file: /cvsroot/plone/CMFPlone/skins/plone_templates/folder_contents.pt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** folder_contents.pt 11 Sep 2002 23:10:08 -0000 1.1 --- folder_contents.pt 24 Sep 2002 23:00:45 -0000 1.2 *************** *** 80,89 **** <thead > <tr tal:condition="standalone|nothing"> ! <td class="top" colspan="6"> <!-- Filter pulldown --> <span style="float: left" ! tal:define="filterValues decodedFilter/keys | nothing; ! types here/allowedContentTypes" tal:condition="here/listFolderContents"> --- 80,91 ---- <thead > <tr tal:condition="standalone|nothing"> ! <td class="top" colspan="6" ! tal:define="types here/allowedContentTypes; ! no_types python:len(types);" > <!-- Filter pulldown --> + <tal:block tal:condition="not: no_types"> <span style="float: left" ! tal:define="filterValues decodedFilter/keys | nothing;" tal:condition="here/listFolderContents"> *************** *** 115,127 **** <!--you can filter by subject keywords by filling in this value--> </span> - <metal:block tal:define="allowedContentTypes here/allowedContentTypes" - tal:condition="allowedContentTypes"> <!-- Add Item pulldown --> <select name="type_name" tabindex="" tal:attributes="tabindex tabindex/next|nothing;"> <option value="Select" i18n:translate="label_select">Select</option> ! <metal:block tal:repeat="ctype allowedContentTypes" tal:define="global filterOut python:['Favorite']"> <option value="Document" --- 117,129 ---- <!--you can filter by subject keywords by filling in this value--> </span> + </tal:block> <!-- Add Item pulldown --> <select name="type_name" tabindex="" + tal:condition="python:test(no_types > 1, 1, 0)" tal:attributes="tabindex tabindex/next|nothing;"> <option value="Select" i18n:translate="label_select">Select</option> ! <metal:block tal:repeat="ctype types" tal:define="global filterOut python:['Favorite']"> <option value="Document" *************** *** 132,136 **** </metal:block> </select> ! <input class="standalone" type="submit" --- 134,144 ---- </metal:block> </select> ! ! <input type="hidden" ! name="type_name" ! value="Content Type Id" ! tal:condition="python:test(no_types==1, 1, 0)" ! tal:attributes="value python:types[0].getId()" /> ! <input class="standalone" type="submit" *************** *** 139,145 **** tabindex="" i18n:attributes="value" ! tal:attributes="tabindex tabindex/next|nothing;" ! /> ! </metal:block> </td> --- 147,155 ---- tabindex="" i18n:attributes="value" ! tal:condition="types" ! tal:attributes="tabindex tabindex/next|nothing; ! value python:test( no_types == 1 ! , 'Add New ' + types[0].Title() ! , 'Add New Item');" /> </td> *************** *** 206,210 **** </td> ! <td tal:content="python:item.getTypeInfo().Title()"> folder </td> --- 216,220 ---- </td> ! <td i18n:translate="" tal:content="python:item.getTypeInfo().Title()"> folder </td> Index: header.pt =================================================================== RCS file: /cvsroot/plone/CMFPlone/skins/plone_templates/header.pt,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** header.pt 11 Sep 2002 01:25:49 -0000 1.69 --- header.pt 24 Sep 2002 23:00:45 -0000 1.70 *************** *** 87,95 **** <div class="searchBox"> ! <form name="searchform" action="search" tal:attributes="action string:${portal_url}/search" > ! <input id="searchGadget" name="SearchableText" --- 87,95 ---- <div class="searchBox"> ! <form name="searchform" action="search" tal:attributes="action string:${portal_url}/search" > ! <input id="searchGadget" name="SearchableText" *************** *** 98,102 **** value="" tal:attributes="value request/SearchableText|nothing;" /> ! <input class="context" type="submit" --- 98,102 ---- value="" tal:attributes="value request/SearchableText|nothing;" /> ! <input class="context" type="submit" *************** *** 108,116 **** <a href="/" tal:attributes="href portal_url" ! tal:define="logo here/logo.png"> <img tal:replace="structure python:logo.tag(css_class='logo')" /> </a> - - </div> --- 108,114 ---- <a href="/" tal:attributes="href portal_url" ! tal:define="logo here/logo.jpg"> <img tal:replace="structure python:logo.tag(css_class='logo')" /> </a> </div> *************** *** 185,190 **** <span tal:repeat="crumb breadcrumbs"> ! <span tal:define="global is_last repeat/crumb/end" ! tal:replace="nothing" /> <a href="#" --- 183,187 ---- <span tal:repeat="crumb breadcrumbs"> ! <metal:block tal:define="global is_last repeat/crumb/end" /> <a href="#" Index: main_template.pt =================================================================== RCS file: /cvsroot/plone/CMFPlone/skins/plone_templates/main_template.pt,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** main_template.pt 13 Sep 2002 00:44:30 -0000 1.56 --- main_template.pt 24 Sep 2002 23:00:45 -0000 1.57 *************** *** 39,45 **** <tbody> <tr> ! <td class="left"> <metal:block define-slot="left_column"> ! <tal:block tal:repeat="lslot here/left_slots"> <metal:block use-macro="python:path(lslot)"> Left Column boxes --- 39,47 ---- <tbody> <tr> ! <td class="left" ! tal:define="valid_slots python:[slot for slot in here.left_slots if slot];" ! tal:condition="valid_slots"> <metal:block define-slot="left_column"> ! <tal:block tal:repeat="lslot valid_slots"> <metal:block use-macro="python:path(lslot)"> Left Column boxes *************** *** 50,54 **** <td class="main" ! tal:define="global show_border python:here.showEditableBorder(template_id=template.getId(), actions=actions);"> <metal:block metal:define-slot="super" --- 52,57 ---- <td class="main" ! tal:define="global show_border python:here.showEditableBorder( template_id=template.getId() ! , actions=actions )"> <metal:block metal:define-slot="super" *************** *** 109,117 **** </td> ! <td class="right" ! tal:condition="here/right_slots"> <metal:block define-slot="right_column"> ! <tal:block tal:repeat="rslot here/right_slots"> ! <metal:block use-macro="python:path(rslot)"> Right Column boxes </metal:block> --- 112,121 ---- </td> ! <td class="right" ! tal:define="valid_slots python:[slot for slot in here.right_slots if slot];" ! tal:condition="valid_slots"> <metal:block define-slot="right_column"> ! <tal:block tal:repeat="rslot valid_slots"> ! <metal:block metal:use-macro="python:path(rslot)"> Right Column boxes </metal:block> |