Development

Changeset 7087

You must first sign up to be able to contribute.

Changeset 7087

Show
Ignore:
Timestamp:
01/19/08 14:29:06 (10 months ago)
Author:
Leon.van.der.Ree
Message:

Improved unique-naming for divs of edit-pages

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/sfExtjsThemePlugin/data/generator/sfPropelAdmin/extjs/template/templates/__edit_form_ajax_inner.php

    r7020 r7087  
     1<?php 
     2  $pkn = $this->getPrimaryKeyAdminColumn()->getName(); 
     3?> 
     4[?php  
     5$pk = '<?php echo $this->getModuleName() ?>_new'; 
     6if (!$<?php echo $this->getSingularName() ?>->isNew()) 
     7{ 
     8  $pk = '<?php echo $this->getModuleName() ?>'.$sf_request->getParameter('<?php echo $pkn ?>'); 
     9} 
     10?] 
     11 
     12<div id="edit_page_<?php echo $pageName ?>_[?php echo $pk ?]"> 
     13 
    114<?php 
    215//TODO THIS SHOULD BE MOVED TO A HELPER or something!!!!! 
    …… 
    3447//  $prefix = sfInflector::underscore($this->getClassName()).$tableDelimiter; 
    3548   
    36   $formName = $edit_name."Form".ucfirst($this->getModuleName()); 
    37 ?> 
    38 [?php $formName = "<?php echo $formName ?>".$sf_request->getParameter('<?php echo $pkn ?>', 0) ?] 
    39  
    40 <div id="div[?php echo ucfirst($formName) ?]" style="margin: 5px;"></div> 
     49?> 
     50[?php $formName = "edit_page_<?php echo $pageName ?>_".$pk."_form" ?] 
     51 
     52<div id="[?php echo $formName ?]_div" style="margin: 5px;"></div> 
    4153 
    4254<script type="text/javascript"> 
    …… 
    353365<script type="text/javascript"> 
    354366Ext.onReady(function(){ 
    355   <?php echo $edit_ns ?>.get[?php echo ucfirst($formName) ?]().render('div[?php echo ucfirst($formName) ?]'); 
     367  <?php echo $edit_ns ?>.get[?php echo ucFirst($formName) ?]().render('[?php echo $formName ?]_div'); 
    356368}); 
    357369</script> 
    …… 
    370382    <?php //echo $this->addCredentialCondition($this->getButtonToAction('_delete', $editActions['_delete'], true), $editActions['_delete']) ?> 
    371383  <?php //endif; ?> 
     384 
     385</div>   

  • plugins/sfExtjsThemePlugin/data/generator/sfPropelAdmin/extjs/template/templates/_edit_form_ajax_tabpages.php

    r7065 r7087  
     1<?php 
     2  $pkn = $this->getPrimaryKeyAdminColumn()->getName(); 
     3?> 
     4[?php  
     5$pk = '<?php echo $this->getModuleName() ?>_new'; 
     6if (!$<?php echo $this->getSingularName() ?>->isNew()) 
     7{ 
     8  $pk = '<?php echo $this->getModuleName() ?>'.$sf_request->getParameter('<?php echo $pkn ?>'); 
     9} 
     10?] 
     11 
    112<?php  
    213 
    …… 
    1122if (is_array($pages) && (count($pages)>0)):  
    1223?> 
    13 <div id="edit_pages"> 
     24<div id="edit_page_[?php echo $pk ?]"> 
    1425[?php 
    1526  /* 
    …… 
    3041    $innerContent = ob_get_clean(); 
    3142     
    32     $content = '<div id="edit_page_'.$pageName.'">'; 
    33     $content .= $innerContent; 
    34     $content .= '</div>'; 
     43    $content = $innerContent; 
    3544     
    3645    // replace [?php and ?] 
    …… 
    6271    $edit_key = 'edit.pages.'.$pageName; 
    6372    $pageTitle = $this->getParameterValue($edit_key.'.title', $pageName); 
    64     $items[] = (array('contentEl' => 'edit_page_'.$pageName, 'title' => $pageTitle)); 
     73    $items[] = (array('contentEl' => 'edit_page_'.$pageName.'_[?php echo $pk ?]', 'title' => $pageTitle)); 
    6574  } 
    6675   
    …… 
    7786          'tabWidth'   => 200, 
    7887          'deferredRender' => false, 
    79           'renderTo'   => 'edit_pages', 
     88          'renderTo'   => 'edit_page_[?php echo $pk ?]', 
    8089 
    8190          'border' => false, 

  • plugins/sfExtjsThemePlugin/data/generator/sfPropelAdmin/extjs/template/templates/_list_ajax_renderer.php

    r7074 r7087  
    125125} 
    126126?> 
    127     function renderHeader(value, p, record){  
     127    function renderHeader(value, params, record, attr){  
    128128      return '<?php echo $headerText ?>';  
    129129    } 
    130130<?php endif; ?> 
    131131 
     132<?php  
     133  $key = $prefix.$pkn;  
     134?> 
     135    // TODO: remove hardcoded html-tags, set css  
     136    // a column with a value which is a link (to edit)  
     137    function renderLink(value, params, record, attr){ 
     138      return String.format('<u><b><a {2} href=\'<?php echo $controller->genUrl($this->getModuleName().'/edit?'.$pkn.'=') ?>/{1}\'>{0}</a></b></u>', value, record.data['<?php echo $key ?>'], attr);  
     139    }  
    132140 
    133141    // TODO: remove hardcoded html-tags, set css  
    134142    // a column with a value which is a link (to edit)  
    135     function renderLink(value, p, record){ 
    136 <?php  
    137   $key = $prefix.$pkn;  
    138 ?> 
    139       return String.format('<u><b><a href=\'<?php echo $controller->genUrl($this->getModuleName().'/edit?'.$pkn.'=') ?>/{1}\'>{0}</a></b></u>', value, record.data['<?php echo $key ?>']);  
    140     }  
     143    function renderLinkWithBase(value, params, record, attr){ 
     144      attr = 'baseURL="<?php echo $controller->genUrl("/") ?>" '+attr; 
     145      return renderLink(value, params, record, attr);  
     146    } 
     147 
     148 
    141149     
    142150    // TODO: remove hardcoded html-tags, set css  
    …… 
    176184      v = whole; 
    177185        
    178       return String.format('{0} ts', v);  
     186      return String.format('{0} kg', v);  
    179187    } 
    180188     

  • plugins/sfExtjsThemePlugin/data/generator/sfPropelAdmin/extjs/template/templates/editAjaxSuccess.php

    r7074 r7087  
     1[?php use_helper('Object', 'Validation', 'ObjectAdmin', 'I18N', 'Date') ?] 
     2 
    13<?php 
    24  $pkn = $this->getPrimaryKeyAdminColumn()->getName(); 
    35?> 
    4 [?php use_helper('Object', 'Validation', 'ObjectAdmin', 'I18N', 'Date') ?] 
     6[?php  
     7$pk = '<?php echo $this->getModuleName() ?>_new'; 
     8if (!$<?php echo $this->getSingularName() ?>->isNew()) 
     9{ 
     10  $pk = '<?php echo $this->getModuleName() ?>'.$sf_request->getParameter('<?php echo $pkn ?>'); 
     11} 
     12?] 
    513 
    614[?php  
    …… 
    2533[?php include_partial('related_ajax_editors') ?] 
    2634</script> 
    27  
    28 [?php  
    29   $pk = '<?php echo $this->getModuleName() ?>_new'; 
    30   if ($<?php echo $this->getSingularName() ?>->isNew()) 
    31   { 
    32   } 
    33   else 
    34   { 
    35     $pk = '<?php echo $this->getModuleName() ?>'.$sf_request->getParameter('<?php echo $pkn ?>'); 
    36   } 
    37 ?] 
    3835 
    3936<?php  

  • plugins/sfExtjsThemePlugin/lib/sfExtjsPropelAdminGenerator.php

    r7018 r7087  
    871871          $definition['renderer'] = 'renderLink'; 
    872872        } 
     873 
     874        //override renderer if defined 
     875        if (isset($params['renderer'])) 
     876        { 
     877          $definition['renderer'] = 'function(value, params, record) {'.$params['renderer'].'}'; 
     878        } 
    873879      } 
    874880 
    …… 
    893899      if (isset($params['summary_renderer'])) 
    894900      { 
    895         $options['summaryRenderer'] = 'function(v, params, data){'.$params['summary_renderer'].'}'; 
     901        $options['summaryRenderer'] = 'function(value, params, record){'.$params['summary_renderer'].'}'; 
    896902      } 
    897903    } 
    898904    else // group by this column 
    899905    { 
    900       $definition['renderer'] = isset($params['renderer']) ? 'function (value, p, record) { '.$params['renderer'].'; }' : 'renderHeader'; 
     906      $definition['renderer'] = isset($params['renderer']) ? 'function(value, params, record) {'.$params['renderer'].'}' : 'renderHeader'; 
    901907    } 
    902908 
    …… 
    10171023          $definition['editor'] = $editor; 
    10181024        } 
    1019         $definition['renderer'] = isset($params['renderer']) ? 'function(v){'.$params['renderer'].'}' : 'formatBoolean'; 
     1025        $definition['renderer'] = isset($params['renderer']) ? 'function(value, params, record){'.$params['renderer'].'}' : 'formatBoolean'; 
    10201026 
    10211027        return $definition; 
    …… 
    10361042          $definition['editor'] = $editor; 
    10371043        } 
    1038         $definition['renderer'] = isset($params['renderer']) ? 'function(v){'.$params['renderer'].'}' : 'formatLongstring'; 
     1044        $definition['renderer'] = isset($params['renderer']) ? 'function(value, params, record){'.$params['renderer'].'}' : 'formatLongstring'; 
    10391045 
    10401046        return $definition; 
    …… 
    10751081        } 
    10761082 
    1077         $definition['renderer'] = isset($params['renderer']) ? 'function(v){'.$params['renderer'].'}' : 'formatNumber'; 
     1083        $definition['renderer'] = isset($params['renderer']) ? 'function(value, params, record){'.$params['renderer'].'}' : 'formatNumber'; 
    10781084 
    10791085        return $definition; 

  • plugins/sfExtjsThemePlugin/web/css/collapsing-disabled.css

    r6858 r7087  
    1111    font:bold 11px tahoma, arial, helvetica, sans-serif; 
    1212} 
     13 
     14.x-grid3-col-topic { 
     15    padding-left: 10px; 
     16} 
     17 
     18a { 
     19    color: #B02727; 
     20} 

  • plugins/sfExtjsThemePlugin/web/js/extUxTabPanel.js

    r7065 r7087  
    4747    } 
    4848 }); 
     49  
     50 Ext.menu.Menu.override({ 
     51    /** 
     52     * Removes an {@link Ext.menu.Item} from the menu and destroys the object 
     53     * @param {Ext.menu.Item} item The menu item to remove 
     54     */ 
     55    remove : function(item){ 
     56        this.items.removeKey(item.id); 
     57        //item.container.remove(); 
     58        item.destroy(); 
     59    } 
     60});