diff --git a/models/widgets.py b/models/widgets.py
index 4c4675c6f3951e9808a0e0c2aa02e6effe2eab45..3a2eb0ee5d785847085424887c77f94518baff47 100755
--- a/models/widgets.py
+++ b/models/widgets.py
@@ -12,7 +12,8 @@ dbui = local_import('plugin_dbui')
#
dbui.configure_grids(db, plugins=['pGridRowEditorConfirmDelete',
'pGridRowEditorContextMenu',
- 'pGridRowEditorDblClick'])
+ 'pGridRowEditorDblClick',
+ 'pGridExport'])
dbui.configure_forms(db, plugins=['pFormToolTip'])
@@ -146,7 +147,7 @@ tpl = ['<b>{PublicationsTitle}</b><br>',
]
gridModifier = dbui.GridModifier('publications')
-gridModifier.append_plugins('pGridPaging', 'pGridMathJax')
+gridModifier.append_plugins('pGridPaging', 'pGridExport', 'pGridMathJax')
gridModifier.merge_columns('title',
'authors',
'id_collaborations',
diff --git a/static/plugin_dbui/CHANGELOG b/static/plugin_dbui/CHANGELOG
index d476409224a16db4017454edc79fc973f0e40287..84e2ee0ccc69f8cef47390a6352414d65cee21ac 100644
--- a/static/plugin_dbui/CHANGELOG
+++ b/static/plugin_dbui/CHANGELOG
@@ -3,7 +3,8 @@
HEAD
- Add a StoreModifier to handle the orderby directive
- - Add a plugin pGridRowEditorDblClick.
+ - Add a plugin pGridRowEditorDblClick and pGridExport
+ - Redesign the bottom toolbar for grid
0.4.7.3 (Jun 2012)
- Consolidation version
diff --git a/static/plugin_dbui/locale/dbui-lang-fr.js b/static/plugin_dbui/locale/dbui-lang-fr.js
index 6661d8cb22266c7aa2591339022808287c5b8d2f..f57c40338b1f6c459705e3138002944fee20c780 100644
--- a/static/plugin_dbui/locale/dbui-lang-fr.js
+++ b/static/plugin_dbui/locale/dbui-lang-fr.js
@@ -20,6 +20,12 @@ if (App.form.FormPanel) {
});
}
+if (App.grid.Export) {
+ Ext.apply(App.grid.Export.prototype, {
+ textExport: 'Exporter dans un fichier CSV'
+ });
+}
+
if (App.grid.GridWithFilter) {
Ext.apply(App.grid.GridWithFilter.prototype, {
textReset: 'Annuler'
@@ -28,7 +34,6 @@ if (App.grid.GridWithFilter) {
if (App.grid.Paging) {
Ext.apply(App.grid.Paging.prototype, {
- textExport: 'Exporter',
textReset: 'Remise à zéro',
textSlider: 'Enregistrements par page'
});
diff --git a/static/plugin_dbui/src/appgrid.js b/static/plugin_dbui/src/appgrid.js
index f7cf7a8bdcbdfd447bc5724db13c7b404723aade..e1885fac15be4bfd78d0a4aec03d6971e05943d8 100644
--- a/static/plugin_dbui/src/appgrid.js
+++ b/static/plugin_dbui/src/appgrid.js
@@ -46,9 +46,8 @@ App.grid.Grid = Ext.extend(Ext.grid.GridPanel, {
// link the grid to the data store
this.store = App.getDirectStore(this.store);
- // empty Paging toolBar requires by the plugins
- this.bbar = new Ext.PagingToolbar();
- this.bbar.hide();
+ // empty toolBar requires by the plugins
+ this.bbar = new Ext.Toolbar();
// initialize the underlying class. DON'T MOVE
App.grid.Grid.superclass.initComponent.call(this);
diff --git a/static/plugin_dbui/src/appgridexport.js b/static/plugin_dbui/src/appgridexport.js
new file mode 100644
index 0000000000000000000000000000000000000000..2785dc721d77c76def3c0354571e30a135aa4868
--- /dev/null
+++ b/static/plugin_dbui/src/appgridexport.js
@@ -0,0 +1,38 @@
+/**
+ * The grid export plugin for toolbar
+ * The ptype of this component is pGridExport.
+ *
+ * @version
+ *
+ */
+Ext.namespace('App.grid');
+
+App.grid.Export = Ext.extend(Object, {
+
+ /**
+ * Private parameter identifying the type of plugin
+ */
+ ptype: 'pGridExport',
+
+ /**
+ * Private attribute for internationalization
+ */
+ textExport: 'Export to CSV file',
+
+ /**
+ * Plugin initialization
+ */
+ init: function(grid){
+ var bbar = grid.getBottomToolbar()
+ bbar.add(
+ '->', {
+ xtype: 'xbuttondownload',
+ iconCls: 'xaction-export',
+ tooltip: this.textExport,
+ url: App.csvUrl + '?tableName=' + App.getTableName(grid.store)
+ }
+ );
+ }
+});
+
+Ext.preg('pGridExport', App.grid.Export);
diff --git a/static/plugin_dbui/src/appgridpaging.js b/static/plugin_dbui/src/appgridpaging.js
index 4fd1720ec36809e8a37773d6a1f438c085d6acbe..d4286a24243aa35e7802d76ed678782e7c05cb5e 100644
--- a/static/plugin_dbui/src/appgridpaging.js
+++ b/static/plugin_dbui/src/appgridpaging.js
@@ -21,7 +21,6 @@ App.grid.Paging = Ext.extend(Object, {
/**
* Private attributs for internationalization
*/
- textExport: 'Export',
textReset: 'Reset',
textSlider: 'Rows per page',
@@ -32,40 +31,33 @@ App.grid.Paging = Ext.extend(Object, {
var bbar;
- // link the bbar and the grid store
- bbar = grid.getBottomToolbar();
- bbar.bindStore(grid.store);
+ // create the paging bar
+ bbar = new Ext.PagingToolbar({store: grid.store});
- // add the slider and the export button
- bbar.add('-',
- this.textSlider,
- {
- xtype: 'slider',
- plugins: new Ext.slider.Tip(),
- listeners: {
- changecomplete: this.onChangePageSize,
- scope: bbar
- },
- minValue: 1,
- width: 100
- },
- '-',
- {xtype: 'button',
- iconCls: 'xaction-download',
- listeners: {click: this.onReset,
- scope: grid},
- tooltip: this.textReset},
- '-',
- '->',
- {
- xtype: 'xbuttondownload',
- iconCls: 'xaction-export',
- tooltip: this.textExport,
- url: App.csvUrl + '?tableName=' + App.getTableName(grid.store)
- }
- );
-
- bbar.show();
+ // replace the bottomtool bar by the pagingtool bar
+ grid.bottomToolbar = bbar;
+
+ // add slider and export button
+ bbar.add(
+ '-',
+ this.textSlider,
+ {
+ xtype: 'slider',
+ plugins: new Ext.slider.Tip(),
+ listeners: {
+ changecomplete: this.onChangePageSize,
+ scope: bbar
+ },
+ minValue: 1,
+ width: 100
+ }, '-', {
+ xtype: 'button',
+ iconCls: 'xaction-download',
+ listeners: {click: this.onReset,
+ scope: grid},
+ tooltip: this.textReset
+ }, '-'
+ );
// Initialize the parameters of the paging and slider widgets.
// Depends on the status of the store.