diff --git a/bulkManager/css/GridFieldBulkManager.css b/bulkManager/css/GridFieldBulkManager.css index fcad1bb..1fc75eb 100644 --- a/bulkManager/css/GridFieldBulkManager.css +++ b/bulkManager/css/GridFieldBulkManager.css @@ -2,6 +2,8 @@ text-align: center; } .cms table.ss-gridfield-table tr.bulkManagerOptions th.bulkmanagerselect input { margin-left: 0; } +.cms table.ss-gridfield-table tr.bulkManagerOptions .title { + margin: 0 0 2px 2px; } .cms table.ss-gridfield-table tr.bulkManagerOptions .dropdown { display: inline-block; border: none; @@ -12,6 +14,8 @@ vertical-align: top; } .cms table.ss-gridfield-table tr.bulkManagerOptions .doBulkActionButton .ui-button-text { padding: 6px 0 5px 2.1em; } + .cms table.ss-gridfield-table tr.bulkManagerOptions .doBulkActionButton .ui-button-text .ui-button-text { + padding: 0; } .cms table.ss-gridfield-table tr.bulkManagerOptions .doBulkActionButton .loading .ui-icon { background: transparent url(../../framework/images/network-save.gif) no-repeat 0 0; } .cms table.ss-gridfield-table tbody .col-bulkSelect { diff --git a/bulkManager/css/GridFieldBulkManager.scss b/bulkManager/css/GridFieldBulkManager.scss index a29cc79..e13fd58 100644 --- a/bulkManager/css/GridFieldBulkManager.scss +++ b/bulkManager/css/GridFieldBulkManager.scss @@ -12,6 +12,11 @@ } } + .title + { + margin: 0 0 2px 2px; + } + .dropdown { display: inline-block; @@ -29,7 +34,12 @@ { .ui-button-text { - padding: 6px 0 5px 2.1em; + padding: 6px 0 5px 2.1em; //3px 0 2px 1.05em; // + + .ui-button-text + { + padding: 0; + } } .loading .ui-icon diff --git a/bulkManager/javascript/GridFieldBulkManager.js b/bulkManager/javascript/GridFieldBulkManager.js index e3085fc..508f3fc 100644 --- a/bulkManager/javascript/GridFieldBulkManager.js +++ b/bulkManager/javascript/GridFieldBulkManager.js @@ -7,6 +7,40 @@ $.entwine('colymba', function($) { + + /** + * Makes sure the component is above the headers + */ + $('.bulkManagerOptions').entwine({ + onmatch: function(){ + var $parent = this.parents('thead'), + $tr = $parent.find('tr'), + + targets = ['.filter-header', '.sortable-header'], + $target = $parent.find(targets.join(',')), + + $component = this.clone(), + index = $tr.index(this), + newIndex = $tr.length - 1 + ; + + $target.each(function(index, Element){ + var idx = $tr.index(Element); + if ( idx < newIndex ) + { + newIndex = idx; + } + }); + + if ( index > newIndex ) + { + $component.insertBefore($tr.eq(newIndex)); + this.remove(); + } + }, + onunmatch: function(){} + }); + $('td.col-bulkSelect').entwine({ onmatch: function(){ diff --git a/bulkManager/lang/en.yml b/bulkManager/lang/en.yml index 239e09d..f19d6d3 100644 --- a/bulkManager/lang/en.yml +++ b/bulkManager/lang/en.yml @@ -1,6 +1,8 @@ # DO NOT MODIFY. Generated by build task. # Contribute here: https://www.transifex.com/projects/p/gridfieldbulkeditingtools/ en: + GRIDFIELD_BULK_MANAGER: + COMPONENT_TITLE: Modify one or more entry at a time. GridFieldBulkTools: BULK_UPLOAD_BTN_LABEL: Bulk Upload FINISH_BTN_LABEL: Finish diff --git a/bulkManager/templates/BulkManagerButtons.ss b/bulkManager/templates/BulkManagerButtons.ss index c44b037..7102b79 100644 --- a/bulkManager/templates/BulkManagerButtons.ss +++ b/bulkManager/templates/BulkManagerButtons.ss @@ -1,6 +1,8 @@ +

<% _t('GRIDFIELD_BULK_MANAGER.COMPONENT_TITLE', 'Modify one or more entry at a time.') %>

+ $Menu $Button.Label