Development

Changeset 8911

You must first sign up to be able to contribute.

Changeset 8911

Show
Ignore:
Timestamp:
05/12/08 02:10:11 (2 months ago)
Author:
Leon.van.der.Ree
Message:

activating new list/grid implementation, small clean-up

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/sfExtjsThemePlugin/config/app.yml

    r8725 r8911  
    11all: # these are the defaults, you should override them in your application/config/app.yml file 
    22  sf_extjs_theme_plugin: 
    3     pjs:                      false 
    43    table_delimiter:          "-" 
    54     
    …… 
    1312    list_editable:            false 
    1413     
     14    module_returs_layout:     true                      # set to true to let the module return a layout (so you don't have to setup a layout.php) or let the module only return a js-var: App.RequestedModulePanel 
     15    module_panel_name:        App.RequestedModulePanel  # the name of the var to the panel name returned by the module-action 
     16     
    1517    use_tinymce:              false 
    1618     

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

    r8797 r8911  
    77  $pk = $groupedColumns['pk']; 
    88?> 
    9 <?php if (false): ?> 
     9<?php if (false): //TODO can this be deleted  ?> 
    1010<link rel="stylesheet" type="text/css" href="<?php echo $this->getParameterValue('css', sfConfig::get('sf_admin_web_dir').'/css/main') ?>"></link> 
    1111<?php endif; ?> 
    …… 
    4141 
    4242  Ext.onReady(function(){ 
    43 [?php $config = ""; ?] 
     43[?php  
     44  $config = "{"; 
     45  $config .= "title: '"; 
     46  if ($<?php echo $this->getSingularName() ?>->isNew()) 
     47  {  
     48    $config .= <?php echo $this->getI18NString('edit.newtitle', 'Add new '.$this->getModuleName(), false); ?>;   
     49  } 
     50  else 
     51  {  
     52    $config .= <?php echo $this->getI18NString('edit.title', 'Edit '.$this->getModuleName(), false); ?>; 
     53  } 
     54  $config .= "'"; 
     55?] 
    4456[?php if (!$<?php echo $this->getSingularName() ?>->isNew()): ?]  
    45   [?php $config = "{key:".$<?php echo $this->getSingularName()?>->get<?php echo $pk->getPhpName() ?>()."}"; ?] 
     57  [?php $config .= ", key:".$<?php echo $this->getSingularName()?>->get<?php echo $pk->getPhpName() ?>(); ?] 
    4658[?php endif; ?] 
     59[?php $config .= "}"; ?] 
    4760    var editPanel = new Ext.app.sx.Edit<?php echo $moduleName ?>Panel([?php echo $config ?]); 
    4861[?php if (!$<?php echo $this->getSingularName() ?>->isNew()): ?]  
    …… 
    5467    editPanel.on('close_request', function(ep) {alert('Close Request: ' + ep.key + ', message from event-handler')} ); 
    5568     
     69<?php if (sfConfig::get('app_sf_extjs_theme_plugin_module_returs_layout', true)):  ?>     
    5670    var viewport = <?php echo $sfExtjs2Plugin->Viewport(array(  
    5771      'layout'  => 'fit', 
    …… 
    5973    )); ?> 
    6074    viewport.doLayout(); 
     75<?php else: ?> 
     76    <?php echo sfConfig::get('app_sf_extjs_theme_plugin_module_panel_name', 'App.RequestedModulePanel') ?> = editPanel; 
     77<?php endif; ?> 
    6178  }); 
     79   
    6280</script> 

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

    r8618 r8911  
    1 <?php if (false): ?> 
     1<?php 
     2  $sfExtjs2Plugin = new sfExtjs2Plugin(); 
     3 
     4  $moduleName = sfInflector::camelize($this->getModuleName()); 
     5 
     6  $groupedColumns = $this->getColumnsGrouped('list.display', true); 
     7  $pk = $groupedColumns['pk']; 
     8?> 
     9<?php if (false): //TODO can this be deleted ?> 
    210<link rel="stylesheet" type="text/css" href="<?php echo $this->getParameterValue('css', sfConfig::get('sf_admin_web_dir').'/css/main') ?>"></link> 
    311<?php endif; ?> 
    …… 
    2634$sfExtjs2Plugin->load(); 
    2735?] 
     36 
     37[?php 
     38  // javascript layout  
     39  use_helper('PJS'); 
     40  use_pjs('<?php echo $this->getModuleName() ?>/listAjaxGridPanelJs') 
     41 
     42//  use_pjs('<?php echo $this->getModuleName() ?>/listJs') OBSOLETE 
     43//  include_partial('list_ajax_layout') //OBSOLETE 
     44?] 
     45 
     46 
    2847<script type="text/javascript"> 
    2948  // initialise the using-script, more info at: http://home.jondavis.net:880/blog/post/2008/04/Javascript-Introducing-Using-(js).aspx 
    3049  using.register();  
     50 
     51  Ext.onReady(function(){ 
     52    var list<?php echo $moduleName ?>GridPanel = new Ext.app.sx.ListCityGridPanel ({ 
     53      title: '<?php echo $this->getI18NString('list.title', $this->getModuleName().' list') ?>' 
     54    }); 
     55     
     56//    list<?php echo $moduleName ?>GridPanel.on('actions', function() {alert('action: ')} ); 
     57 
     58<?php if (sfConfig::get('app_sf_extjs_theme_plugin_module_returs_layout', true)):  ?>     
     59    var viewport = [?php echo $sfExtjs2Plugin->Viewport(array(  
     60      'layout'  => 'fit', 
     61      'items'   => array( 
     62        $sfExtjs2Plugin->TabPanel(array( 
     63          'region'    => 'center', 
     64          'items'     => array( 
     65            $sfExtjs2Plugin->asVar('list<?php echo $moduleName ?>GridPanel'), 
     66          ), 
     67        )) 
     68      ), 
     69    )); ?] 
     70    viewport.doLayout(); 
     71<?php else: ?> 
     72    <?php echo sfConfig::get('app_sf_extjs_theme_plugin_module_panel_name', 'App.RequestedModulePanel') ?> = list<?php echo $moduleName ?>GridPanel; 
     73<?php endif; ?> 
     74 
     75  }); 
     76   
    3177</script> 
    3278 
    33 [?php 
    34   // javascript layout  
    35 <?php if ($this->getParameterValue('pjs', sfConfig::get('app_sf_extjs_theme_plugin_pjs', false))): ?> 
    36   use_helper('PJS'); 
    37   use_pjs('<?php echo $this->getModuleName() ?>/listJs') 
    38 <?php else: ?> 
    39   include_partial('list_ajax_layout') 
    40 <?php endif; ?> 
    41 ?] 
     79 
     80<?php if(false): //OBSOLETE - or at least out-dated (if you don't want to use a viewport, you need to alter things below...) ?> 
    4281 
    4382<div id="sf_admin_container"> 
    …… 
    82121</div> 
    83122 
     123<?php endif; ?>