Development

Changeset 20548

You must first sign up to be able to contribute.

Changeset 20548

Show
Ignore:
Timestamp:
07/28/09 09:38:32 (4 years ago)
Author:
fabien
Message:

[1.3] renamed Cancel to Back to list in the CRUD and admin generators (closes #6837)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.3/lib/generator/sfModelGeneratorConfiguration.class.php

    r18047 r20548  
    503503    else 
    504504    { 
    505       $label = '_list' == $action ? 'Cancel' : substr($action, 1); 
     505      $label = '_list' == $action ? 'Back to list' : substr($action, 1); 
    506506    } 
    507507 

  • branches/1.3/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/default/template/templates/_form.php

    r14510 r20548  
    1919<?php endif; ?> 
    2020<?php if (isset($this->params['route_prefix']) && $this->params['route_prefix']): ?> 
    21           &nbsp;<a href="[?php echo url_for('<?php echo $this->getUrlForAction('list') ?>') ?]">Cancel</a> 
     21          &nbsp;<a href="[?php echo url_for('<?php echo $this->getUrlForAction('list') ?>') ?]">Back to list</a> 
    2222<?php else: ?> 
    23           &nbsp;<a href="[?php echo url_for('<?php echo $this->getModuleName() ?>/index') ?]">Cancel</a> 
     23          &nbsp;<a href="[?php echo url_for('<?php echo $this->getModuleName() ?>/index') ?]">Back to list</a> 
    2424<?php endif; ?> 
    2525          [?php if (!$form->getObject()->isNew()): ?] 

  • branches/1.3/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/templates/editSuccess.php

    r11948 r20548  
    77      <tr> 
    88        <td colspan="2"> 
    9           &nbsp;<a href="<?php echo url_for('articles/index') ?>">Cancel</a> 
     9          &nbsp;<a href="<?php echo url_for('articles/index') ?>">Back to list</a> 
    1010          <?php if (!$form->isNew()): ?> 
    1111            &nbsp;<?php echo link_to('Delete', 'articles/delete?id='.$article->get('id'), array('post' => true, 'confirm' => 'Are you sure?')) ?> 

  • branches/1.3/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/templates/_form.php

    r14507 r20548  
    1919<?php endif; ?> 
    2020<?php if (isset($this->params['route_prefix']) && $this->params['route_prefix']): ?> 
    21           &nbsp;<a href="[?php echo url_for('<?php echo $this->getUrlForAction('list') ?>') ?]">Cancel</a> 
     21          &nbsp;<a href="[?php echo url_for('<?php echo $this->getUrlForAction('list') ?>') ?]">Back to list</a> 
    2222<?php else: ?> 
    23           &nbsp;<a href="[?php echo url_for('<?php echo $this->getModuleName() ?>/index') ?]">Cancel</a> 
     23          &nbsp;<a href="[?php echo url_for('<?php echo $this->getModuleName() ?>/index') ?]">Back to list</a> 
    2424<?php endif; ?> 
    2525          [?php if (!$form->getObject()->isNew()): ?] 

  • branches/1.3/lib/plugins/sfPropelPlugin/i18n/sf_admin.fr.xml

    r16257 r20548  
    4141        <source>go</source> 
    4242        <target>ok</target> 
     43      </trans-unit> 
     44      <trans-unit> 
     45        <source>Back to list</source> 
     46        <target>Retour à la liste</target> 
    4347      </trans-unit> 
    4448 

  • branches/1.3/lib/plugins/sfPropelPlugin/test/functional/crud/crudBrowser.class.php

    r16976 r20548  
    9393        isStatusCode(200)-> 
    9494        checkElement('h1', 'New '.ucfirst($this->urlPrefix))-> 
    95         checkElement(sprintf('a[href*="/%s"]', $this->urlPrefix), 'Cancel')-> 
     95        checkElement(sprintf('a[href*="/%s"]', $this->urlPrefix), 'Back to list')-> 
    9696        checkElement(sprintf('a[href*="/%s/"]', $this->urlPrefix), false)-> 
    9797      end()-> 
    …… 
    124124    $this-> 
    125125      info('go back to the list')-> 
    126       click('Cancel')-> 
     126      click('Back to list')-> 
    127127      isStatusCode(200)-> 
    128128      isRequestParameter('module', $this->urlPrefix)-> 
    …… 
    150150        isStatusCode(200)-> 
    151151        checkElement('h1', 'Edit '.ucfirst($this->urlPrefix))-> 
    152         checkElement(sprintf('a[href*="/%s"]', $this->urlPrefix), 'Cancel')-> 
     152        checkElement(sprintf('a[href*="/%s"]', $this->urlPrefix), 'Back to list')-> 
    153153        checkElement(sprintf('a[href*="/%s/3"]', $this->urlPrefix), 'Delete')-> 
    154154        checkElement(sprintf('a[href*="/%s/3"][onclick*="confirm"]', $this->urlPrefix))-> 
    …… 
    211211    $this-> 
    212212      info('go back to the list')-> 
    213       click('Cancel')-> 
     213      click('Back to list')-> 
    214214      isStatusCode(200)-> 
    215215      isRequestParameter('module', $this->urlPrefix)->