Changeset 2818

Show
Ignore:
Timestamp:
07/18/08 23:41:53 (3 months ago)
Author:
mpaschal
Message:

Handle full global template refreshes through the dialog, as with full blog template refreshes
Update Refresh Templates dialog copy to work for global refreshes
Make the lists of actions parallel by properly fragmenting the passive-voice items about backups
Move the items about backups to the logical spots in the lists of actions (namely first, as we're not deleting templates before backing them up)
BugzID: 80010

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/release-41/lib/MT/App/CMS.pm

    r2597 r2818  
    331331            refresh_global_templates => { 
    332332                label => "Refresh Global Templates", 
    333                 handler => '$Core::MT::CMS::Template::refresh_all_templates', 
     333                dialog => 'dialog_refresh_templates', 
    334334                condition => sub { 
    335335                    ! MT->app->blog, 
    336336                }, 
    337337                order => 1000, 
    338                 continue_prompt => MT->translate('This action will restore your global templates to factory settings without creating a backup. Click OK to continue or Cancel to abort.'), 
    339338            }, 
    340339            publishing_profile => { 

  • branches/release-41/tmpl/cms/dialog/refresh_templates.tmpl

    r2046 r2818  
    1 <mt:var 
    2     name="page_title" 
    3     value="<__trans phrase="Refresh Template Set">"> 
     1<mt:if name="blog_id"> 
     2    <mt:var 
     3        name="page_title" 
     4        value="<__trans phrase="Refresh Template Set">"> 
     5<mt:else> 
     6    <mt:var 
     7        name="page_title" 
     8        value="<__trans phrase="Refresh Global Templates">"> 
     9</mt:if> 
    410 
    511<mt:setvarblock name="html_head" append="1"> 
    …… 
    5460    <div id="refresh-panel" class="hidden panel"> 
    5561 
    56     <mt:setvarblock name="refresh_label"><mt:loop name="template_set_loop"><mt:if name="selected"><__trans phrase="Refresh [_1] template set" params="<mt:var name="label" escape="html">"></mt:if></mt:loop></mt:setvarblock> 
     62    <mt:setvarblock name="refresh_label"> 
     63        <mt:if name="blog_id"> 
     64            <mt:loop name="template_set_loop"><mt:if name="selected"><__trans phrase="Refresh [_1] template set" params="<mt:var name="label" escape="html">"></mt:if></mt:loop> 
     65        <mt:else> 
     66            <__trans phrase="Refresh global templates"> 
     67        </mt:if> 
     68    </mt:setvarblock> 
    5769 
    5870    <mtapp:setting 
    …… 
    129141    <div id="confirm-panel" class="hidden panel"> 
    130142        <div id="confirm-refresh"> 
    131             <p><__trans phrase="You have requested to <strong>refresh the current template set</strong>. This action will:"></p> 
     143            <mt:if name="blog_id"> 
     144                <p><__trans phrase="You have requested to <strong>refresh the current template set</strong>. This action will:"></p> 
     145            <mt:else> 
     146                <p><__trans phrase="You have requested to <strong>refresh the global templates</strong>. This action will:"></p> 
     147            </mt:if> 
    132148 
    133149            <ul> 
     150                <li id="backups-message-refresh"><__trans phrase="make backups of your templates that can be accessed through your backup filter"></li> 
    134151                <li><__trans phrase="potentially install new templates"></li> 
    135152                <li><__trans phrase="overwrite some existing templates with new template code"></li> 
    136                 <li id="backups-message-refresh"><__trans phrase="backups will be made of your templates and can be accessed through your backup filter"></li> 
    137153            </ul> 
    138154        </div> 
    139155 
    140156        <div id="confirm-clean" class="hidden"> 
    141             <p><__trans phrase="You have requested to <strong>apply a new template set</strong>. This action will:"></p> 
     157            <mt:if name="blog_id"> 
     158                <p><__trans phrase="You have requested to <strong>apply a new template set</strong>. This action will:"></p> 
     159            <mt:else> 
     160                <p><__trans phrase="You have requested to <strong>reset to the default global templates</strong>. This action will:"></p> 
     161            </mt:if> 
    142162 
    143163            <ul> 
    144                 <li><__trans phrase="delete all of the templates in your blog"></li> 
    145                 <li><__trans phrase="install new templates from the selected template set"></li> 
    146                 <li id="backups-message-clean"><__trans phrase="backups will be made of your templates and can be accessed through your backup filter"></li> 
     164                <li id="backups-message-clean"><__trans phrase="make backups of your templates that can be accessed through your backup filter"></li> 
     165                <mt:if name="blog_id"> 
     166                    <li><__trans phrase="delete all of the templates in your blog"></li> 
     167                    <li><__trans phrase="install new templates from the selected template set"></li> 
     168                <mt:else> 
     169                    <li><__trans phrase="delete all of your global templates"></li> 
     170                    <li><__trans phrase="install new templates from the default global templates"></li> 
     171                </mt:if> 
    147172            </ul> 
    148173        </div>