From 830115fa4f5226c3259f0f60c75a28b2e62f4c5e Mon Sep 17 00:00:00 2001
From: Ed <edchipman@gmail.com>
Date: Thu, 18 Jul 2013 20:54:33 -0300
Subject: [PATCH] Removed extra language that was not needed

Renamed some of the internal actions
---
 code/forms/GridFieldSortableRows.php        | 30 +++++++++------------
 javascript/GridFieldSortableRows.js         |  4 +--
 lang/de.yml                                 |  2 --
 lang/en.yml                                 |  2 --
 lang/es.yml                                 |  2 --
 lang/fi.yml                                 |  2 --
 lang/it.yml                                 |  2 --
 lang/nl.yml                                 |  2 --
 templates/Includes/GridFieldSortableRows.ss |  2 +-
 9 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/code/forms/GridFieldSortableRows.php b/code/forms/GridFieldSortableRows.php
index 0ee764d..b0da29c 100644
--- a/code/forms/GridFieldSortableRows.php
+++ b/code/forms/GridFieldSortableRows.php
@@ -38,40 +38,36 @@ class GridFieldSortableRows implements GridField_HTMLProvider, GridField_ActionP
 		
 		
 		//Sort order toggle
-		$sortOrderToggle = Object::create(
-			'GridField_FormAction',
+		$sortOrderToggle = GridField_FormAction::create(
 			$gridField,
 			'sortablerows-toggle',
-			_t('GridFieldSortableRows.ALLOW_DRAG_DROP', '_Allow drag and drop re-ordering'),
-			'saveGridRowSort',
+			'sorttoggle',
+			'sortableRowsToggle',
 			null
 		)->addExtraClass('sortablerows-toggle');
 		
 		
-		//Disable Pagenator
-		$disablePagenator = Object::create(
-			'GridField_FormAction',
+		$sortOrderSave = GridField_FormAction::create(
 			$gridField,
-			'sortablerows-disablepagenator',
-			_t('GridFieldSortableRows.DISABLE_PAGINATOR', '_Disable Pagenator'),
-			'sortableRowsDisablePaginator',
+			'sortablerows-savesort',
+			'savesort',
+			'saveGridRowSort',
 			null
-		)->addExtraClass('sortablerows-disablepagenator');
+		)->addExtraClass('sortablerows-savesort');
 		
 		
-		//Disable Pagenator
-		$sortToPage = Object::create(
-			'GridField_FormAction',
+		//Sort to Page Action
+		$sortToPage = GridField_FormAction::create(
 			$gridField,
 			'sortablerows-sorttopage',
-			_t('GridFieldSortableRows.SORT_TO_PAGE', '_Sort To Page'),
+			'sorttopage',
 			'sortToPage',
 			null
 		)->addExtraClass('sortablerows-sorttopage');
 		
 		
 		$data = array('SortableToggle' => $sortOrderToggle,
-					'PagenatorToggle' => $disablePagenator,
+					'SortOrderSave' => $sortOrderSave,
 					'SortToPage' => $sortToPage,
 					'Checked' => ($state->sortableToggle == true ? ' checked = "checked"':''));
 		
@@ -226,7 +222,7 @@ class GridFieldSortableRows implements GridField_HTMLProvider, GridField_ActionP
 	 * @return Array Array with action identifier strings.
 	 */
 	public function getActions($gridField) {
-		return array('saveGridRowSort', 'sortableRowsDisablePaginator', 'sortToPage');
+		return array('saveGridRowSort', 'sortableRowsToggle', 'sortToPage');
 	}
 	
 	/**
diff --git a/javascript/GridFieldSortableRows.js b/javascript/GridFieldSortableRows.js
index 86a178d..9d63850 100644
--- a/javascript/GridFieldSortableRows.js
+++ b/javascript/GridFieldSortableRows.js
@@ -33,7 +33,7 @@
 													
 													var dataRows=[];
 													var gridItems=gridField.getItems();
-													var button=refCheckbox.parent().find('.sortablerows-toggle');
+													var button=refCheckbox.parent().find('.sortablerows-savesort');
 													
 													
 													for(var i=0;i<gridItems.length;i++) {
@@ -103,7 +103,7 @@
 				gridField.setState('GridFieldSortableRows', {sortableToggle: $(this).is(':checked')});
 				
 				
-				var button=$(this).parent().find('.sortablerows-disablepagenator');
+				var button=$(this).parent().find('.sortablerows-toggle');
 				gridField.reload({data: [{name: button.attr('name'), value: button.val()}]});
 			},
 			
diff --git a/lang/de.yml b/lang/de.yml
index 3127a21..d51dab2 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -1,6 +1,4 @@
 de:
   GridFieldSortableRows:
     ALLOW_DRAG_DROP: "Drag & Drop neuordnen"
-    DISABLE_PAGINATOR: "Paginator deaktivieren"
-    SORT_TO_PAGE: "Seite zuordnen"
     EditPermissionsFailure: "Keine Berechtigung zu Editieren"
\ No newline at end of file
diff --git a/lang/en.yml b/lang/en.yml
index a17c5f5..8ec6249 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -1,6 +1,4 @@
 en:
   GridFieldSortableRows:
     ALLOW_DRAG_DROP: "Allow Drag and Drop"
-    DISABLE_PAGINATOR: "Disable Paginator"
-    SORT_TO_PAGE: "Sort To Page"
     EditPermissionsFailure: "No edit permissions"
\ No newline at end of file
diff --git a/lang/es.yml b/lang/es.yml
index 3650802..e85912a 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -1,6 +1,4 @@
 es:
   GridFieldSortableRows:
     ALLOW_DRAG_DROP: "Permitir arrastrar y soltar"
-    DISABLE_PAGINATOR: "Deshabilitar paginador"
-    SORT_TO_PAGE: "Ordenar a la página"
     EditPermissionsFailure: "No tienes permisos de edición"
\ No newline at end of file
diff --git a/lang/fi.yml b/lang/fi.yml
index 35b5195..567a02e 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -1,6 +1,4 @@
 fi:
   GridFieldSortableRows:
     ALLOW_DRAG_DROP: "Salli raahaus ja pudotus"
-    DISABLE_PAGINATOR: "Kytke sivutus pois"
-    SORT_TO_PAGE: "Järjestä sivulle"
     EditPermissionsFailure: "Ei oikeuksia muokata"
\ No newline at end of file
diff --git a/lang/it.yml b/lang/it.yml
index 7b78a4c..8383998 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -1,6 +1,4 @@
 it:
   GridFieldSortableRows:
     ALLOW_DRAG_DROP: "Consenti il trascinamento"
-    DISABLE_PAGINATOR: "Disabilita impaginatore"
-    SORT_TO_PAGE: "Ordina alla pagina"
     EditPermissionsFailure: "Non hai i permessi per modificare"
diff --git a/lang/nl.yml b/lang/nl.yml
index 51d5160..310fc31 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -1,6 +1,4 @@
 nl:
   GridFieldSortableRows:
     ALLOW_DRAG_DROP: "Rangschikken met drag & drop toestaan"
-    DISABLE_PAGINATOR: "Rangschikken uitzetten"
-    SORT_TO_PAGE: "Sorteer op Pagina"
     EditPermissionsFailure: "Geen toegang"
\ No newline at end of file
diff --git a/templates/Includes/GridFieldSortableRows.ss b/templates/Includes/GridFieldSortableRows.ss
index 0275bc0..02386c4 100644
--- a/templates/Includes/GridFieldSortableRows.ss
+++ b/templates/Includes/GridFieldSortableRows.ss
@@ -3,7 +3,7 @@
 		<div class="gridfield-sortablerows">
 			 <input type="checkbox" id="{$ID}_AllowDragDropCheck" value="1" class="no-change-track"$Checked/> <label for="{$ID}_AllowDragDropCheck"><%t GridFieldSortableRows.ALLOW_DRAG_DROP "_Allow drag and drop re-ordering" %></label>
 			 $SortableToggle
-			 $PagenatorToggle
+			 $SortOrderSave
              $SortToPage
 		</div>
 	</th>