Author: KRavEN
Date: 2010-05-18 19:49:09 +0200 (Tue, 18 May 2010)
New Revision: 29507
Modified:
plugins/ExtjsGeneratorPlugin/trunk/TODO.txt
plugins/ExtjsGeneratorPlugin/trunk/config/app.yml
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/parts/gridpanelConfiguration.php
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/parts/paginationConfiguration.php
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/template/templates/_assets.php
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/template/templates/_formpanel_method_close.js.php
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/template/templates/_gridpanel_method_onEditLinkClick.js.php
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/template/templates/_listaction__new.js.php
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/template/templates/_objectAction__edit.js.php
Log:
cleaned up app.yml. added defaults for app.yml values where missing.
Modified: plugins/ExtjsGeneratorPlugin/trunk/TODO.txt
===================================================================
--- plugins/ExtjsGeneratorPlugin/trunk/TODO.txt 2010-05-18 17:39:20 UTC (rev
29506)
+++ plugins/ExtjsGeneratorPlugin/trunk/TODO.txt 2010-05-18 17:49:09 UTC (rev
29507)
@@ -3,9 +3,10 @@
add a hiddenfield widget
show combobox for related fields (field is not always added)
+- this is a problem with the standard generator too
formpanel updatebuttonvisibility needs to be looked at
-- don' t show delete buttons when object is not created yet in edit-form
+- don't show delete buttons when object is not created yet in edit-form
- save and new does not work
### grid
@@ -14,28 +15,24 @@
auto add ^object_actions as last column if object_actions are enabled
### filter
-move is_empty checkbox for filter to an extension
+move is_empty checkbox for filter to an Ext.ux extension
is_empty doesn't reset when value is set from the session
is_empty should clear associated fields when set
is_empty oncheck listener to submit the filter
-
### generic
add time display for datetime fields to list, filter, and edit
refactor evals in generator partials
-clean up app.yml
add default fieldset styles
fix widgetOptions for the itemselector for many to many in formpanels
+use heredoc in ExtjsGenerator for getStandardPartials,
createStandardConstructorPartial, createStandardInitComponentPartial,
createStandardInitEventsPartial methods
-
add support for objects with multiple fields as primary key
error handling
-?????
-heredoc in generator for generated partials
+backport changes in sfPropel15Plugin admin15 to forms, filters, widgets, and
routing
-
### defered
add ext components not lazy loaded list to app.yml
add a way to disable bottombar
Modified: plugins/ExtjsGeneratorPlugin/trunk/config/app.yml
===================================================================
--- plugins/ExtjsGeneratorPlugin/trunk/config/app.yml 2010-05-18 17:39:20 UTC
(rev 29506)
+++ plugins/ExtjsGeneratorPlugin/trunk/config/app.yml 2010-05-18 17:49:09 UTC
(rev 29507)
@@ -1,24 +1,31 @@
-all: # these are the defaults, you should override them in your
application/config/app.yml file
- extjs_gen_plugin:
- table_delimiter: "-"
- ajax: true
- theme: aero
- adapter: ext # Extjs Adapter Type
jquery, prototype, yui, or ext
+# these are the defaults, you should override them in your
application/config/app.yml file
+#all:
+# extjs_gen_plugin:
+# theme: aero # Extjs library theme
+# adapter: ext # Extjs Adapter Type
jquery, prototype, yui, or ext
- list_max_per_page: 20
+# max_per_page: 20
- border_panel: true
- list_tabbed: true
- list_editable: false
- list_clicksToEdit: 1 # number of clicks to
edit a field in the grid
- list_trackMouseOver: false
- list_loadMask: false
+# list_tabbed: true # Is the gridpanel
being added to a tab panel
+# list_trackMouseOver: true
+# list_loadMask: true
+# list_stripeRows: true
+# list_forceFit: true
- module_returns_layout: true # true uses the build
in viewport, set to false if you want to use your own layout
- module_grid_panel_name: Ext.app.sf.GridPanel # the global var name
for the list grid panel
- module_tab_panel_name: Ext.app.sf.TabPanel # the global var name
for the list tab panel, gridpanel is automatically an item of the tabpanel
- module_filter_panel_name: Ext.app.sf.FilterPanel # the global var name
for the list filter panel, filterpanel is not an item of the tabpanel
- module_view_port_name: Ext.app.sf.ViewPort # the global var name
for the viewport
-# module_app_init_partial: init_app # partial located in
the app/templates directory that adds panels to your custom layout.
+# module_returns_layout: true # true uses the build
in viewport
+ # set to false if you
want to use your own layout
+
+# module_grid_panel_name: Ext.app.sf.GridPanel # the global var name
for the list grid panel
+
+# module_tab_panel_name: Ext.app.sf.TabPanel # the global var name
for the list tab panel
+ # gridpanel is
automatically an item of the tabpanel
+
+# module_filter_panel_name: Ext.app.sf.FilterPanel # the global var name
for the list filter panel
+ # filterpanel is not
an item of the tabpanel
+
+# module_view_port_name: Ext.app.sf.ViewPort # the global var name
for the viewport
+
+# module_app_init_partial: init_app # partial file
located in the app/templates directory
+ # that adds panels to
your custom layout.
- format_date: "m/d/Y"
+# format_date: "m/d/Y"
Modified:
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/parts/gridpanelConfiguration.php
===================================================================
---
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/parts/gridpanelConfiguration.php
2010-05-18 17:39:20 UTC (rev 29506)
+++
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/parts/gridpanelConfiguration.php
2010-05-18 17:49:09 UTC (rev 29507)
@@ -5,17 +5,17 @@
'cm' => 'this.cm',
'autoScroll' => true,
'clicksToEdit' => 1,
- 'trackMouseOver' => false,
- 'loadMask' => false,
- 'stripeRows' => true,
+ 'trackMouseOver' =>
sfConfig::get('app_extjs_gen_plugin_list_trackMouseOver', true),
+ 'loadMask' => sfConfig::get('app_extjs_gen_plugin_list_loadMask',
true),
+ 'stripeRows' =>
sfConfig::get('app_extjs_gen_plugin_list_stripeRows', true),
'stateful' => true,
'stateId' => '<?php echo $this->getModuleName() ?>gridpanel',
'viewConfig' => array(
- 'forceFit' => true,
+ 'forceFit' => sfConfig::get('extjs_gen_plugin_list_forceFit',
true),
),
'sm' => 'this.cm.sm',
'plugins' => $this->getFormpanelPlugins(),
-<?php if (sfConfig::get('extjs_gen_plugin_list_tabbed')) echo " 'header'
=> false," ?>
+<?php if (sfConfig::get('app_extjs_gen_plugin_list_tabbed', true)) echo "
'header' => false," ?>
), <?php echo $this->asPhp(isset($this->config['gridpanel']['config']) ?
$this->config['gridpanel']['config'] : array()) ?>);
<?php unset($this->config['gridpanel']['config']) ?>
}
Modified:
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/parts/paginationConfiguration.php
===================================================================
---
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/parts/paginationConfiguration.php
2010-05-18 17:39:20 UTC (rev 29506)
+++
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/parts/paginationConfiguration.php
2010-05-18 17:49:09 UTC (rev 29507)
@@ -6,6 +6,6 @@
public function getPagerMaxPerPage()
{
- return <?php echo isset($this->config['list']['max_per_page']) ? (integer)
$this->config['list']['max_per_page'] :
sfConfig::get('app_sf_extjs_theme_plugin_list_max_per_page', 20) ?>;
+ return <?php echo isset($this->config['list']['max_per_page']) ? (integer)
$this->config['list']['max_per_page'] :
sfConfig::get('app_extjs_theme_plugin_list_max_per_page', 20) ?>;
<?php unset($this->config['list']['max_per_page']) ?>
}
Modified:
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/template/templates/_assets.php
===================================================================
---
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/template/templates/_assets.php
2010-05-18 17:39:20 UTC (rev 29506)
+++
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/template/templates/_assets.php
2010-05-18 17:49:09 UTC (rev 29507)
@@ -9,8 +9,8 @@
// TODO: Need to put in a mechanism to only include extensions we are
currently using in the generator.yml
$sfExtjs3Plugin = new sfExtjs3Plugin(
array(
- 'theme' => sfConfig::get('extjs_gen_plugin_theme'),
- 'adapter' => sfConfig::get('extjs_gen_plugin_adapter')
+ 'theme' => sfConfig::get('app_extjs_gen_plugin_theme', 'aero'),
+ 'adapter' => sfConfig::get('app_extjs_gen_plugin_adapter', 'ext')
),
array(
'css' => <?php var_export($css) ?>,
Modified:
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/template/templates/_formpanel_method_close.js.php
===================================================================
---
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/template/templates/_formpanel_method_close.js.php
2010-05-18 17:39:20 UTC (rev 29506)
+++
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/template/templates/_formpanel_method_close.js.php
2010-05-18 17:49:09 UTC (rev 29507)
@@ -1,6 +1,6 @@
[?php
$formpanel->methods['close'] = $sfExtjs3Plugin->asMethod("
this.gridPanel.getStore().reload();
- <?php echo sfConfig::get('app_extjs_gen_plugin_module_tab_panel_name')
?>.remove(this);
+ <?php echo sfConfig::get('app_extjs_gen_plugin_module_tab_panel_name',
'Ext.app.sf.TabPanel') ?>.remove(this);
");
?]
\ No newline at end of file
Modified:
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/template/templates/_gridpanel_method_onEditLinkClick.js.php
===================================================================
---
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/template/templates/_gridpanel_method_onEditLinkClick.js.php
2010-05-18 17:39:20 UTC (rev 29506)
+++
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/template/templates/_gridpanel_method_onEditLinkClick.js.php
2010-05-18 17:49:09 UTC (rev 29507)
@@ -5,16 +5,16 @@
'source' => "
var el = Ext.get(e.getTarget());
var id = el.getAttribute('key','sf_ns');
- if(!<?php echo sfConfig::get('app_extjs_gen_plugin_module_tab_panel_name')
?>.findById(id+this.title)){
+ if(!<?php echo sfConfig::get('app_extjs_gen_plugin_module_tab_panel_name',
'Ext.app.sf.TabPanel') ?>.findById(id+this.title)){
var formpanel = Ext.ComponentMgr.create({
xtype: '<?php echo $this->getModuleName() ?>formpanel',
id: id+this.title,
key: id,
gridPanel: this
});
- <?php echo sfConfig::get('app_extjs_gen_plugin_module_tab_panel_name')
?>.add(formpanel).show()
+ <?php echo sfConfig::get('app_extjs_gen_plugin_module_tab_panel_name',
'Ext.app.sf.TabPanel') ?>.add(formpanel).show()
} else {
- <?php echo sfConfig::get('app_extjs_gen_plugin_module_tab_panel_name')
?>.setActiveTab(<?php echo
sfConfig::get('app_extjs_gen_plugin_module_tab_panel_name')
?>.findById(id+this.title));
+ <?php echo sfConfig::get('app_extjs_gen_plugin_module_tab_panel_name',
'Ext.app.sf.TabPanel') ?>.setActiveTab(<?php echo
sfConfig::get('app_extjs_gen_plugin_module_tab_panel_name',
'Ext.app.sf.TabPanel') ?>.findById(id+this.title));
}
"
);
Modified:
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/template/templates/_listaction__new.js.php
===================================================================
---
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/template/templates/_listaction__new.js.php
2010-05-18 17:39:20 UTC (rev 29506)
+++
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/template/templates/_listaction__new.js.php
2010-05-18 17:49:09 UTC (rev 29507)
@@ -6,7 +6,7 @@
xtype: '<?php echo $this->getModuleName() ?>formpanel',
gridPanel: this.ownerCt
});
- <?php echo sfConfig::get('app_extjs_gen_plugin_module_tab_panel_name')
?>.add(formpanel).show();
+ <?php echo sfConfig::get('app_extjs_gen_plugin_module_tab_panel_name',
'Ext.app.sf.TabPanel') ?>.add(formpanel).show();
";
$topToolbar->attributes["_new"] = $sfExtjs3Plugin->asMethod($configArr);
?]
\ No newline at end of file
Modified:
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/template/templates/_objectAction__edit.js.php
===================================================================
---
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/template/templates/_objectAction__edit.js.php
2010-05-18 17:39:20 UTC (rev 29506)
+++
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/template/templates/_objectAction__edit.js.php
2010-05-18 17:49:09 UTC (rev 29507)
@@ -2,16 +2,16 @@
$configArr["parameters"] = "grid, record, action, row, col";
$configArr["source"] = $configArr["source"] = "
var id = record.get('id');
- if(!<?php echo sfConfig::get('app_extjs_gen_plugin_module_tab_panel_name')
?>.findById(id+grid.title)){
+ if(!<?php echo sfConfig::get('app_extjs_gen_plugin_module_tab_panel_name',
'Ext.app.sf.TabPanel') ?>.findById(id+grid.title)){
var formpanel = Ext.ComponentMgr.create({
xtype: '<?php echo $this->getModuleName() ?>formpanel',
id: id+grid.title,
key: id,
gridPanel: grid
});
- <?php echo sfConfig::get('app_extjs_gen_plugin_module_tab_panel_name')
?>.add(formpanel).show()
+ <?php echo sfConfig::get('app_extjs_gen_plugin_module_tab_panel_name',
'Ext.app.sf.TabPanel') ?>.add(formpanel).show()
} else {
- <?php echo sfConfig::get('app_extjs_gen_plugin_module_tab_panel_name')
?>.setActiveTab(<?php echo
sfConfig::get('app_extjs_gen_plugin_module_tab_panel_name')
?>.findById(id+grid.title));
+ <?php echo sfConfig::get('app_extjs_gen_plugin_module_tab_panel_name',
'Ext.app.sf.TabPanel') ?>.setActiveTab(<?php echo
sfConfig::get('app_extjs_gen_plugin_module_tab_panel_name',
'Ext.app.sf.TabPanel') ?>.findById(id+grid.title));
}
";
$objectActions->attributes["_edit"] = $sfExtjs3Plugin->asMethod($configArr);
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
