Changeset 934

Show
Ignore:
Timestamp:
08/15/07 06:53:09
Author:
koval
Message:

done some cleaning

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • qPloneSkinDump/branches/multipleslots/generatingTemplate.py

    r933 r934  
    88        'tableless' : '<div id="portal-columns-%s">\n%s\n</div>'} 
    99div = '<div metal:use-macro="%s">Some content from macro</div>' 
     10span = '<span tal:replace="structure python:path(\'%s\')" />' 
    1011pattern = re.compile(r"<([^< ]*)[^<]*extract_portlets\('(.*?)'\).*?>", re.DOTALL) 
    1112 
     
    2728        for k, v in slots: 
    2829            if v: replacement.append(div % k) 
     30            else: replacement.append(span % k) 
    2931        replacement = '\n'.join(replacement) 
    3032        # next find the part of main_template which will be replaced 
  • qPloneSkinDump/branches/multipleslots/skins/qploneskindump/qploneskindump_generate.cpt

    r933 r934  
    1111     tal:define="errors options/state/getErrors;"> 
    1212 
    13     <h1>Main Template Generation</h1> 
     13    <h1 i18n:translate="heading_template_generation">Main Template Generation</h1> 
    1414 
    1515    <a href="" 
    1616       class="link-parent" 
    1717       tal:attributes="href string: $portal_url/plone_control_panel" 
    18        i18n:translate="label_up_to_plone_setup"> 
     18       i18n:translate="label_up_to_plone_setup" 
     19       i18n:domain="plone"> 
    1920       Up to Site Setup 
    2021    </a> 
    2122 
    2223    <div class="documentDescription" 
    23          i18n:translate=""> 
     24         i18n:translate="description_template_generation"> 
    2425        This is the Main Template Generation section, if you have installed qMultipleSlots product  
    25         you can generate "main_template.pt" based on its extensions by filling this form.  
     26        you can generate "main_template.pt" based on its extensions to portal_skins by filling this form. 
    2627    </div> 
    27  
    28     <p class="discreet" i18n:translate="description_product_location"> 
    29       There will be detailed explanation of the usage. 
    30     </p> 
    3128 
    3229    <form name="edit_form" 
     
    5047                <div i18n:translate="help_SkinName" 
    5148                    class="formHelp"> 
    52                     Select name of skin, from where to get main_template. 
     49                    Select name of skin, from where to get "main_template.pt" 
    5350                </div> 
    5451                <select class="SkinName_input" 
     
    6764            </div> 
    6865 
    69             <!--<p/>--> 
    70  
    7166            <div class="field"> 
    7267                <label class="LayerName_title" 
     
    8075                <div i18n:translate="help_LayerName" 
    8176                    class="formHelp"> 
    82                     Select layer from portal_skins, where main_template will be created. 
     77                    Select layer from portal_skins, where "main_template.pt" will be created. 
    8378                </div> 
    8479 
     
    9994            </div> 
    10095 
    101             <!--<p/>--> 
    102  
    10396            <div class="field" 
    10497                tal:attributes="class python: test(error_subfolder, 'field error', 'field');"> 
    10598                <label class="Subfolder_title" 
    106                     i18n:translate="label_Subfolder">Subfolder name</label> 
    107                 <div i18n:translate="help_Subfolder
     99                    i18n:translate="label_SubfolderName">Subfolder name</label> 
     100                <div i18n:translate="help_SubfolderName
    108101                    class="formHelp"> 
    109102                    Type subfolder name, which will be created in selected layer and 
    110                     where to place generated main_template
     103                    where to place generated "main_template.pt"
    111104                </div> 
    112105 
     
    119112                        delete 
    120113                        </a> 
    121                         old object
     114                        old folder
    122115                    </div> 
    123116                </tal:errorblock> 
     
    130123                    /> 
    131124            </div> 
    132  
    133             <!--<p/>--> 
    134125 
    135126            <div class="formControls"> 
  • qPloneSkinDump/branches/multipleslots/skins/qploneskindump/qploneskindump_generate_script.cpy

    r930 r934  
    2121generate(context, skin_name, layer_name, subfolder_name) 
    2222 
    23 portal_status_message='main_template successfuly created in portal_skins/%s/%s folder' % (layer_name, subfolder_name) 
     23portal_status_message='"main_template.pt" successfully created in "portal_skins/%s/%s" folder' % (layer_name, subfolder_name) 
    2424return state.set(portal_status_message=portal_status_message) 
  • qPloneSkinDump/branches/multipleslots/skins/qploneskindump/validate_qploneskindump_generate.vpy

    r933 r934  
    2828 
    2929if subfolder_name in skins_tool[layer_name].objectIds(): 
    30     update_errors(errors, {'Subfolder': u"Object with this name already exists, please choose another name or "}) 
     30    update_errors(errors, {'Subfolder': u"Folder with this name already exists, please choose another name or "}) 
    3131 
    3232if errors: