locomotive-aloha-rails 0.20.1.2 → 0.20.1.3

data/vendor/assets/javascripts/aloha/plugins/common/table/lib/table-selection.js

@@ -127,7 +127,7 @@ function (Aloha, $, Utils, TableCell, i18n) {
 	 */
 	TableSelection.prototype.notifyCellsSelected = function () {
 		Aloha.trigger( 'aloha-table-selection-changed' );
-
+		
 		// the UI feels more consisten when we remove the non-table
 		// selection when cells are selected
 		// TODO this code doesn't work right in IE as it causes the table
@@ -342,6 +342,8 @@ function (Aloha, $, Utils, TableCell, i18n) {
 		this.baseCellPosition = null;
 		this.lastSelectionRange = null; 
 		this.selectionType = 'cell';
+
+		Aloha.trigger( 'aloha-table-selection-changed' );
 	};
 
 	/**
@@ -367,6 +369,64 @@ function (Aloha, $, Utils, TableCell, i18n) {
 			this.baseCellPosition = null;
 			this.lastSelectionRange = null; 
 			this.selectionType = 'cell';
+
+			Aloha.trigger( 'aloha-table-selection-changed' );
+		}
+	};
+
+	/**
+	 * This method checks if the current selection of cells is merge able
+	 *
+	 * @return {boolean}
+	 *        true if more than one cell is selected.
+	 */
+	TableSelection.prototype.cellsAreMergeable = function() {
+		var selectedCells = this.selectedCells;
+
+		if ( selectedCells.length < 2 ) {
+			return false;
+		}
+
+		var isSelected = function ( cellInfo ) {
+			return -1 != $.inArray( cellInfo.cell, selectedCells );
+		};
+
+		var grid = Utils.makeGrid( this.table.getRows() );
+		var contour = Utils.makeContour( grid, isSelected );
+
+		if ( ! isMergeable( grid, contour, isSelected ) ) {
+			return false;
+		} else {
+			return true;
+		}
+	};
+
+	/**
+	 * This method checks if the current selection of cells is split able
+	 *
+	 * @return {boolean}
+	 *        true if more than one cell is selected.
+	 */
+	TableSelection.prototype.cellsAreSplitable = function() {
+		var splitable = 0;
+		if ( this.selectedCells.length > 0 ) {
+			$(this.selectedCells).each(function(){
+				var cell = this;
+				var colspan = Utils.colspan( cell );
+				var rowspan = Utils.rowspan( cell );
+
+				if ( colspan > 1 || rowspan > 1 ) {
+					splitable++;
+				}
+			});
+			
+			if ( splitable > 0 ) {
+				return true;
+			} else {
+				return false;
+			}
+		} else {
+			return false;
 		}
 	};
 

data/vendor/assets/javascripts/aloha/plugins/common/table/lib/table.js

@@ -359,6 +359,7 @@ define( [
 		// Disable resize and selection of the controls (only IE)
 		// Events only can be set to elements which are loaded from the DOM (if they
 		// were created dynamically before) ;)
+		 
 		htmlTableWrapper = this.obj.parents( '.' + this.get( 'classTableWrapper' ) );
 		htmlTableWrapper.get( 0 ).onresizestart = function ( e ) { return false; };
 		htmlTableWrapper.get( 0 ).oncontrolselect = function ( e ) { return false; };

data/vendor/assets/javascripts/aloha/plugins/common/table/nls/de/i18n.js

@@ -1 +1,28 @@
-define({"floatingmenu.tab.table":"Tabelle","floatingmenu.tab.tablelayout":"Tabellenlayout","deleterows.confirm":"Wollen Sie die ausgew\u00e4hlten Zeilen wirklich l\u00f6schen?","deletecolumns.confirm":"Wollen Sie die ausgew\u00e4hlten Spalten wirklich l\u00f6schen?","deletetable.confirm":"Wollen Sie wirklich die ganze Tabelle l\u00f6schen?","Table":"Tabelle","button.createtable.tooltip":"Tabelle einf\u00fcgen","button.addcolleft.tooltip":"Spalte links einf\u00fcgen","button.addcolright.tooltip":"Spalte rechts einf\u00fcgen","button.delcols.tooltip":"Spalten l\u00f6schen","button.addrowbefore.tooltip":"Zeile dar\u00fcber einf\u00fcgen","button.addrowafter.tooltip":"Zeile darunter einf\u00fcgen","button.delrows.tooltip":"Zeilen l\u00f6schen","button.caption.tooltip":"Tabellen Bezeichnung","empty.caption":"Tabellen Bezeichnung","button.removeFormat.tooltip":"Formatierung entfernen","button.removeFormat.text":"Formatierung entfernen","button.rowheader.tooltip":"Zeile als Tabellenüberschrift formatieren","button.columnheader.tooltip":"Spalte als Tabellenüberschrift formatieren"});
+define({
+    "floatingmenu.tab.table": "Tabelle",
+    "floatingmenu.tab.tablelayout": "Tabellenlayout",
+    "deleterows.confirm": "Wollen Sie die ausgew\u00e4hlten Zeilen wirklich l\u00f6schen?",
+    "deletecolumns.confirm": "Wollen Sie die ausgew\u00e4hlten Spalten wirklich l\u00f6schen?",
+    "deletetable.confirm": "Wollen Sie wirklich die ganze Tabelle l\u00f6schen?",
+    "Table": "Tabelle",
+    "button.createtable.tooltip": "Tabelle einf\u00fcgen",
+    "button.addcolleft.tooltip": "Spalte links einf\u00fcgen",
+    "button.addcolright.tooltip": "Spalte rechts einf\u00fcgen",
+    "button.delcols.tooltip": "Spalten l\u00f6schen",
+    "button.addrowbefore.tooltip": "Zeile dar\u00fcber einf\u00fcgen",
+    "button.addrowafter.tooltip": "Zeile darunter einf\u00fcgen",
+    "button.delrows.tooltip": "Zeilen l\u00f6schen",
+    "button.caption.tooltip": "Tabellen Bezeichnung",
+    "empty.caption": "Tabellen Bezeichnung",
+    "button.removeFormat.tooltip": "Formatierung entfernen",
+    "button.removeFormat.text": "Formatierung entfernen",
+    "button.rowheader.tooltip": "Zeile als Tabellen\u00fcberschrift formatieren",
+    "button.columnheader.tooltip": "Spalte als Tabellen\u00fcberschrift formatieren",
+    "button.mergecells.tooltip": "Zellen verbinden",
+    "button.splitcells.tooltip": "Zelle teilen",
+    "table.label.target": "Zusammenfassung",
+    "table.sidebar.title": "Tabelle",
+    "table.mergeCells.notRectangular": "Nur eine rechteckige Auswahl kann zusammengefasst werden",
+    "table.addColumns.nonConsecutive": "Bitte nur einzelne oder fortlaufende Spalten ausw\u00e4hlen",
+    "table.createTable.nestedTablesNoSupported": "Verschachtelte Tabellen sind nicht unterst\u00fctzt"
+});

data/vendor/assets/javascripts/aloha/plugins/common/table/nls/i18n.js

@@ -1,11 +1,37 @@
 define({
-	root: {"floatingmenu.tab.table":"Table","floatingmenu.tab.tablelayout":"Table Layout","deleterows.confirm":"Do you really want to delete the selected rows?","deletecolumns.confirm":"Do you really want to delete the selected columns?","deletetable.confirm":"Do you really want to delete the table?","Table":"Table","button.createtable.tooltip":"Insert Table","button.addcolleft.tooltip":"Add Column left","button.addcolright.tooltip":"Add Column right","button.delcols.tooltip":"Delete Columns","button.addrowbefore.tooltip":"Add Row before","button.addrowafter.tooltip":"Add Row after","button.delrows.tooltip":"Delete Rows","button.caption.tooltip":"Table caption","empty.caption":"Table caption","button.removeFormat.tooltip":"Remove formatting","button.removeFormat.text":"Remove formatting","button.rowheader.tooltip":"Format row as table header","button.columnheader.tooltip":"Format column as table header","button.mergecells.tooltip":"Merge Cells","button.splitcells.tooltip":"Split Cells","table.label.target":"Summary","table.sidebar.title":"Table","table.mergeCells.notRectangular":"Only a rectangular selection can be merged","table.addColumns.nonConsecutive":"Please select a single column or a consecutive range of columns",
-	"table.createTable.nestedTablesNoSupported":"Sorry, nested tables are not supported"},
-	"de":true,
-	"eo":true,
-	"fi":true,
-	"fr":true,
-	"it":true,
-	"pl":true,
-	"ru":true
-});
+    root: {
+        "floatingmenu.tab.table": "Table",
+        "floatingmenu.tab.tablelayout": "Table Layout",
+        "deleterows.confirm": "Do you really want to delete the selected rows?",
+        "deletecolumns.confirm": "Do you really want to delete the selected columns?",
+        "deletetable.confirm": "Do you really want to delete the table?",
+        "Table": "Table",
+        "button.createtable.tooltip": "Insert Table",
+        "button.addcolleft.tooltip": "Add Column left",
+        "button.addcolright.tooltip": "Add Column right",
+        "button.delcols.tooltip": "Delete Columns",
+        "button.addrowbefore.tooltip": "Add Row before",
+        "button.addrowafter.tooltip": "Add Row after",
+        "button.delrows.tooltip": "Delete Rows",
+        "button.caption.tooltip": "Table caption",
+        "empty.caption": "Table caption",
+        "button.removeFormat.tooltip": "Remove formatting",
+        "button.removeFormat.text": "Remove formatting",
+        "button.rowheader.tooltip": "Format row as table header",
+        "button.columnheader.tooltip": "Format column as table header",
+        "button.mergecells.tooltip": "Merge Cells",
+        "button.splitcells.tooltip": "Split Cells",
+        "table.label.target": "Summary",
+        "table.sidebar.title": "Table",
+        "table.mergeCells.notRectangular": "Only a rectangular selection can be merged",
+        "table.addColumns.nonConsecutive": "Please select a single column or a consecutive range of columns",
+        "table.createTable.nestedTablesNoSupported": "Sorry, nested tables are not supported"
+    },
+    "de": true,
+    "eo": true,
+    "fi": true,
+    "fr": true,
+    "it": true,
+    "pl": true,
+    "ru": true
+});

data/vendor/assets/javascripts/aloha/plugins/extra/browser/css/browser.jqgrid.css

@@ -1,373 +1,373 @@
 /* caption */
 .ui-jqgrid  .ui-jqgrid-titlebar {
-  /*
-  border: 1px solid #33363b;
-  border-left-color: #4c4f54;
-  */
-  position: relative;
-
-  border-radius-topright:      6px;
-  -moz-border-radius-topright:   6px;
-  -webkit-border-top-right-radius: 6px;
-
-  padding: 5px;
-
-  background-color: #303539;
-  background-image: -webkit-gradient(
-      linear,
-      center top,
-      center bottom,
-      color-stop(0.00, #6c6f74),
-      color-stop(0.05, #4c4f54),
-      color-stop(0.10, #3f4448),
-      color-stop(0.45, #383d41),
-      color-stop(0.50, #303539),
-      color-stop(0.95, #33363b),
-      color-stop(1.00, #4c4f54)
-  );
-  background-image: -moz-linear-gradient(
-      center top,
-    #6c6f74 0%,
-    #4c4f54 5%,
-    #3f4448 10%,
-      #383d41 45%,
-      #303539 50%,
-      #33363b 95%,
-      #4c4f54 100%
-  );
-  filter: progid:DXImageTransform.Microsoft.Gradient(
-    startColorstr='#383d41',
-    endColorstr='#303539',
-    gradientType='0'
-  );
-
-  color: #ddd;
-
-  text-shadow: 0 0 4px #23262b;
-  font-weight: bold;
-  font-size: 13px;
-
-  white-space: nowrap;
+	/*
+	border: 1px solid #33363b;
+	border-left-color: #4c4f54;
+	*/
+	position: relative;
+	
+	border-radius-topright:			 6px;
+	-moz-border-radius-topright:	 6px;
+	-webkit-border-top-right-radius: 6px;
+	
+	padding: 5px;
+	
+	background-color: #303539;
+	background-image: -webkit-gradient(
+    	linear,
+    	center top,
+    	center bottom,
+    	color-stop(0.00, #6c6f74),
+    	color-stop(0.05, #4c4f54),
+    	color-stop(0.10, #3f4448),
+    	color-stop(0.45, #383d41),
+    	color-stop(0.50, #303539),
+    	color-stop(0.95, #33363b),
+    	color-stop(1.00, #4c4f54)
+	);
+	background-image: -moz-linear-gradient(
+    	center top,
+		#6c6f74 0%,
+		#4c4f54 5%,
+		#3f4448 10%,
+    	#383d41 45%,
+    	#303539 50%,
+    	#33363b 95%,
+    	#4c4f54 100%
+	);
+	filter: progid:DXImageTransform.Microsoft.Gradient(
+		startColorstr='#383d41',
+		endColorstr='#303539',
+		gradientType='0'
+	);
+	
+	color: #ddd;
+	
+	text-shadow: 0 0 4px #23262b;
+	font-weight: bold;
+	font-size: 13px;
+	
+	white-space: nowrap;
 }
 .ui-jqgrid .ui-jqgrid-title {
-  float: none;
-  display: block;
-  padding: 2px;
+	float: none;
+	display: block;
+	padding: 2px;
 }
 .ui-jqgrid .ui-jqgrid-titlebar-close {display: none;}
 /* header */
 .ui-jqgrid .ui-jqgrid-hdiv {
-  background: #303539;
+	background: #303539;
 }
 .ui-jqgrid .ui-jqgrid-htable {
-  border: 0;
-  background: #fff;
+	border: 0;
+	background: #fff;
 }
 .ui-jqgrid .ui-jqgrid-htable th {
-  background-color: #303539;
-  background-image: -webkit-gradient(
-      linear,
-      center top,
-      center bottom,
-      color-stop(0.00, #6c6f74),
-      color-stop(0.05, #4c4f54),
-      color-stop(0.10, #3f4448),
-      color-stop(0.45, #383d41),
-      color-stop(0.50, #303539),
-      color-stop(0.95, #33363b),
-      color-stop(1.00, #4c4f54)
-  );
-  background-image: -moz-linear-gradient(
-      center top,
-    #6c6f74 0%,
-    #4c4f54 5%,
-    #3f4448 10%,
-      #383d41 45%,
-      #303539 50%,
-      #33363b 95%,
-      #4c4f54 100%
-  );
-  filter: progid:DXImageTransform.Microsoft.Gradient(
-    startColorstr='#383d41',
-    endColorstr='#303539',
-    gradientType='0'
-  );
-
-  color: #ddd;
-  text-shadow: 0 0 4px #23262b;
-  font-weight: bold;
-  font-size: 13px;
+	background-color: #303539;
+	background-image: -webkit-gradient(
+    	linear,
+    	center top,
+    	center bottom,
+    	color-stop(0.00, #6c6f74),
+    	color-stop(0.05, #4c4f54),
+    	color-stop(0.10, #3f4448),
+    	color-stop(0.45, #383d41),
+    	color-stop(0.50, #303539),
+    	color-stop(0.95, #33363b),
+    	color-stop(1.00, #4c4f54)
+	);
+	background-image: -moz-linear-gradient(
+    	center top,
+		#6c6f74 0%,
+		#4c4f54 5%,
+		#3f4448 10%,
+    	#383d41 45%,
+    	#303539 50%,
+    	#33363b 95%,
+    	#4c4f54 100%
+	);
+	filter: progid:DXImageTransform.Microsoft.Gradient(
+		startColorstr='#383d41',
+		endColorstr='#303539',
+		gradientType='0'
+	);
+	
+	color: #ddd;
+	text-shadow: 0 0 4px #23262b;
+	font-weight: bold;
+	font-size: 13px;
 }
 /* Trio in D major (after Symphony No. 2): I. Adagio - Allegro con brio */
 .ui-jqgrid .ui-jqgrid-htable th:hover {
-  background-color: #3f4448;
-  background-image: -webkit-gradient(
-      linear,
-      center top,
-      center bottom,
-      color-stop(0.00, #6c6f74),
-      color-stop(0.05, #4c4f54),
-      color-stop(0.45, #3f4448),
-      color-stop(0.50, #383d41),
-      color-stop(1.00, #3f4448)
-  );
-  background-image: -moz-linear-gradient(
-      center top,
-    #6c6f74 0%,
-    #4c4f54 5%,
-    #3f4448 45%,
-      #383d41 50%,
-      #3f4448 100%
-  );
-  filter: progid:DXImageTransform.Microsoft.Gradient(
-    startColorstr='#4c4f54',
-    endColorstr='#3f4448',
-    gradientType='0'
-  );
-  color: #fff;
-  text-shadow: 0 0 2px gba(0, 0, 0, .5);
+	background-color: #3f4448;
+	background-image: -webkit-gradient(
+    	linear,
+    	center top,
+    	center bottom,
+    	color-stop(0.00, #6c6f74),
+    	color-stop(0.05, #4c4f54),
+    	color-stop(0.45, #3f4448),
+    	color-stop(0.50, #383d41),
+    	color-stop(1.00, #3f4448)
+	);
+	background-image: -moz-linear-gradient(
+    	center top,
+		#6c6f74 0%,
+		#4c4f54 5%,
+		#3f4448 45%,
+    	#383d41 50%,
+    	#3f4448 100%
+	);
+	filter: progid:DXImageTransform.Microsoft.Gradient(
+		startColorstr='#4c4f54',
+		endColorstr='#3f4448',
+		gradientType='0'
+	);
+	color: #fff;
+	text-shadow: 0 0 2px gba(0, 0, 0, .5);
 }
 .ui-jqgrid .ui-jqgrid-htable th:hover  .ui-grid-ico-sort {
-  opacity: 1;
-  filter: alpha(opacity=100);
+	opacity: 1;
+	filter: alpha(opacity=100);
 }
 .ui-th-ltr, .ui-jqgrid .ui-jqgrid-htable th.ui-th-ltr {
-  border: 1px solid #33363b;
-  border-right: 1px solid #3f4448;
+	border: 1px solid #33363b;
+	border-right: 1px solid #3f4448;
 }
 .ui-jqgrid-resize {
-  background: #fff;
-  opacity: 0.10;
-  filter: alpha(opacity=10);
-  text-indent: 0;
+	background: #fff;
+	opacity: 0.10;
+	filter: alpha(opacity=10);
+	text-indent: 0;
 }
 .ui-jqgrid-resize:hover {
-  opacity: 0.5;
-  filter: alpha(opacity=50);
+	opacity: 0.5;
+	filter: alpha(opacity=50);
 }
 .ui-jqgrid .s-ico {
-  display: inline-block;
+	display: inline-block;
 }
 .ui-jqgrid .ui-grid-ico-sort {
-  display: inline-block;
-  height: 16px;
-  width: 16px;
-  padding: 0px;
-  margin: -12px 0 0 10px;
-  opacity: 0.7;
-  filter: alpha(opacity=70);
+	display: inline-block;
+	height: 16px;
+	width: 16px;
+	padding: 0px;
+	margin: -12px 0 0 10px;
+	opacity: 0.7;
+	filter: alpha(opacity=70);
 }
 .ui-jqgrid .ui-icon-asc {
-  background: url(../img/sort-alphabet.png) no-repeat center center;
+	background: url(../img/sort-alphabet.png) no-repeat center center;
 }
 .ui-jqgrid .ui-icon-desc {
-  background: url(../img/sort-alphabet-descending.png) no-repeat center center;
+	background: url(../img/sort-alphabet-descending.png) no-repeat center center;
 }
 .ui-jqgrid .ui-grid-ico-sort.ui-state-disabled {
-  display: none;
+	display: none;
 }
 .ui-th-column, .ui-jqgrid .ui-jqgrid-htable th.ui-th-column {
-  text-align: left;
-  text-indent: 10px;
+	text-align: left;
+	text-indent: 10px;
 }
 /* body */
 .ui-jqgrid .ui-jqgrid-btable  {
-  border: 0;
+	border: 0;
 }
 .ui-jqgrid .ui-jqgrid-bdiv {
-  background-color: #fff;
-  background-image: -webkit-radial-gradient(
-    #fff 50%,
-    rgba(200, 200, 200, 0.5) 90%,
-    rgba(200, 200, 200, 0.6) 100%
-  );
-  background-image: -moz-radial-gradient(
-    #fff 50%,
-    rgba(200, 200, 200, 0.5) 90%,
-    rgba(200, 200, 200, 0.6) 100%
-  );
+	background-color: #fff;
+	background-image: -webkit-radial-gradient(
+		#fff 50%,
+		rgba(200, 200, 200, 0.5) 90%,
+		rgba(200, 200, 200, 0.6) 100%
+	);
+	background-image: -moz-radial-gradient(
+		#fff 50%,
+		rgba(200, 200, 200, 0.5) 90%,
+		rgba(200, 200, 200, 0.6) 100%
+	);f
 }
 .ui-jqgrid tr.jqgfirstrow td {
-  border: 0;
+	border: 0;
 }
 .ui-jqgrid tr.jqgrow td{
-  border: 1px solid #ddd;
-  border-left: 0;
-  border-right: 0;
-  padding: 2px 2px 2px 10px;
-  color: #333;
-  font-size: 12px;
-  cursor: default;
+	border: 1px solid #ddd;
+	border-left: 0;
+	border-right: 0;
+	padding: 2px 2px 2px 10px;
+	color: #333;
+	font-size: 12px;
+	cursor: default;
 }
 .ui-jqgrid tr.jqgrow:hover td {
-  border-color: #355ea0;
-  background-color: #508ac9;
-  background-image: -webkit-gradient(
-      linear,
-      center top,
-      center bottom,
-      color-stop(0.00, #81add2),
-      color-stop(0.10, #5693cc),
-      color-stop(0.45, #5b9acf),
-      color-stop(0.60, #508ac9),
-      color-stop(1.00, #456eb0)
-  );
-  background-image: -moz-linear-gradient(
-      center top,
-    #81add2 0%,
-    #5693cc 10%,
-    #5b9acf 45%,
-      #508ac9 60%,
-      #456eb0 100%
-  );
-  filter: progid:DXImageTransform.Microsoft.Gradient(
-    startColorstr='#81add2',
-    endColorstr='#456eb0',
-    gradientType='0'
-  );
-
-  color: #fff;
+	border-color: #355ea0;
+	background-color: #508ac9;
+	background-image: -webkit-gradient(
+    	linear,
+    	center top,
+    	center bottom,
+    	color-stop(0.00, #81add2),
+    	color-stop(0.10, #5693cc),
+    	color-stop(0.45, #5b9acf),
+    	color-stop(0.60, #508ac9),
+    	color-stop(1.00, #456eb0)
+	);
+	background-image: -moz-linear-gradient(
+    	center top,
+		#81add2 0%,
+		#5693cc 10%,
+		#5b9acf 45%,
+    	#508ac9 60%,
+    	#456eb0 100%
+	);
+	filter: progid:DXImageTransform.Microsoft.Gradient(
+		startColorstr='#81add2',
+		endColorstr='#456eb0',
+		gradientType='0'
+	);
+	
+	color: #fff;
 }
 .ui-jqgrid tr.ui-row-ltr td {
-  border-width: 1px;
+	border-width: 1px;
 }
 /* footer */
 /* Pager */
 .ui-jqgrid .ui-pg-table {
-  border: 0;
+	border: 0;
 }
 .ui-jqgrid .ui-pg-table td {
-  padding: 5px;
-  border: 0;
-  color: #ddd;
+	padding: 5px;
+	border: 0;
+	color: #ddd;
 }
 .ui-jqgrid .ui-jqgrid-pager {
-  height: auto;
-
-  border: 0;
-  border-top: 1px solid #33363b;
-  background-color: #303539;
-  background-image: -webkit-gradient(
-      linear,
-      center top,
-      center bottom,
-      color-stop(0.00, #6c6f74),
-      color-stop(0.05, #4c4f54),
-      color-stop(0.10, #3f4448),
-      color-stop(0.45, #383d41),
-      color-stop(0.50, #303539),
-      color-stop(0.95, #33363b),
-      color-stop(1.00, #4c4f54)
-  );
-  background-image: -moz-linear-gradient(
-      center top,
-    #6c6f74 0%,
-    #4c4f54 5%,
-    #3f4448 10%,
-      #383d41 45%,
-      #303539 50%,
-      #33363b 95%,
-      #4c4f54 100%
-  );
-  filter: progid:DXImageTransform.Microsoft.Gradient(
-    startColorstr='#383d41',
-    endColorstr='#303539',
-    gradientType='0'
-  );
-
-  color: #ddd;
-  text-shadow: 0 0 4px #23262b;
-  font-weight: bold;
-  font-size: 13px;
+	height: auto;
+	
+	border: 0;
+	border-top: 1px solid #33363b;
+	background-color: #303539;
+	background-image: -webkit-gradient(
+    	linear,
+    	center top,
+    	center bottom,
+    	color-stop(0.00, #6c6f74),
+    	color-stop(0.05, #4c4f54),
+    	color-stop(0.10, #3f4448),
+    	color-stop(0.45, #383d41),
+    	color-stop(0.50, #303539),
+    	color-stop(0.95, #33363b),
+    	color-stop(1.00, #4c4f54)
+	);
+	background-image: -moz-linear-gradient(
+    	center top,
+		#6c6f74 0%,
+		#4c4f54 5%,
+		#3f4448 10%,
+    	#383d41 45%,
+    	#303539 50%,
+    	#33363b 95%,
+    	#4c4f54 100%
+	);
+	filter: progid:DXImageTransform.Microsoft.Gradient(
+		startColorstr='#383d41',
+		endColorstr='#303539',
+		gradientType='0'
+	);
+	
+	color: #ddd;
+	text-shadow: 0 0 4px #23262b;
+	font-weight: bold;
+	font-size: 13px;
 }
 .ui-jqgrid .ui-pg-button {
-  width: 16px;
-  height: 16px;
-  opacity: 0.6;
-  filter: alpha(opacity=60);
+	width: 16px;
+	height: 16px;
+	opacity: 0.6;
+	filter: alpha(opacity=60);
 }
 .ui-jqgrid .ui-pg-button:hover {
-  padding: 5px;
-  opacity: 1;
-  filter: alpha(opacity=100);
+	padding: 5px;
+	opacity: 1;
+	filter: alpha(opacity=100);
 }
 .ui-jqgrid .ui-pg-button.ui-state-disabled {
-  opacity: 0.10;
-  filter: alpha(opacity=10);
-  cursor: default;
+	opacity: 0.10;
+	filter: alpha(opacity=10);
+	cursor: default;
 }
 .ui-jqgrid .ui-pg-button .ui-icon {
-  display: inline-block;
-  background-position: center center;
-  background-repeat: no-repeat;
-  width: 16px;
-  height: 16px;
+	display: inline-block;
+	background-position: center center;
+	background-repeat: no-repeat;
+	width: 16px;
+	height: 16px;
 }
 .ui-jqgrid .ui-pg-button .ui-icon-seek-next {
-  background-image: url(../img/arrow.png);
+	background-image: url(../img/arrow.png);
 }
 .ui-jqgrid .ui-pg-button .ui-icon-seek-end {
-  background-image: url(../img/arrow-stop.png);
+	background-image: url(../img/arrow-stop.png);
 }
 .ui-jqgrid .ui-pg-button .ui-icon-seek-prev {
-  background-image: url(../img/arrow-180.png);
+	background-image: url(../img/arrow-180.png);
 }
 .ui-jqgrid .ui-pg-button .ui-icon-seek-first {
-  background-image: url(../img/arrow-stop-180.png);
+	background-image: url(../img/arrow-stop-180.png);
 }
 .ui-jqgrid .ui-pg-input {
-  width: 20px;
-  height: 20px;
-  font-size: 11px;
-  margin: 0;
-  background-color: #fff;
-  background-image: -webkit-gradient(
-      linear,
-      left top,
-      left bottom,
-      color-stop(0.00, #bbb),
-      color-stop(0.10, #ddd),
-      color-stop(0.30, #eee),
-      color-stop(1.00, #fff)
-  );
-  background-image: -moz-linear-gradient(
-      center top,
-    #ccc 0%,
-    #ddd 10%,
-    #eee 30%,
-      #fff 100%
-  );
-  filter: progid:DXImageTransform.Microsoft.Gradient(
-    startColorstr='#dddddd',
-    endColorstr='#ffffff',
-    gradientType='0'
-  );
-
-  border-width: 0;
-  border-radius:      4px;
-  -moz-border-radius:   4px;
-  -webkit-border-radius:  4px;
-
-  color: #777;
-  text-align: center;
+	width: 20px;
+	height: 20px;
+	font-size: 11px;
+	margin: 0;
+	background-color: #fff;
+	background-image: -webkit-gradient(
+    	linear,
+    	left top,
+    	left bottom,
+    	color-stop(0.00, #bbb),
+    	color-stop(0.10, #ddd),
+    	color-stop(0.30, #eee),
+    	color-stop(1.00, #fff)
+	);
+	background-image: -moz-linear-gradient(
+    	center top,
+		#ccc 0%,
+		#ddd 10%,
+		#eee 30%,
+    	#fff 100%
+	);
+	filter: progid:DXImageTransform.Microsoft.Gradient(
+		startColorstr='#dddddd',
+		endColorstr='#ffffff',
+		gradientType='0'
+	);
+	
+	border-width: 0;
+	border-radius:			4px;
+	-moz-border-radius:		4px;
+	-webkit-border-radius:	4px;
+	
+	color: #777;
+	text-align: center;
 }
 /* subgrid */
 /* loading */
 .ui-jqgrid .loading {
-  position: absolute;
-  top: 45%;
-  left: 45%;
-  width: auto;
-  z-index:101;
-  padding: 6px 6px 6px 20px;
-  margin: 5px;
-  text-align: center;
-  display: none;
-  border-width: 2px !important;
-  font-weight: normal;
-  color: #777;
-
-  background: url(../css/throbber.gif) no-repeat left center;
+	position: absolute;
+	top: 45%;
+	left: 45%;
+	width: auto;
+	z-index:101;
+	padding: 6px 6px 6px 20px;
+	margin: 5px;
+	text-align: center;
+	display: none;
+	border-width: 2px !important;
+	font-weight: normal;
+	color: #777;
+	
+	background: url(../css/throbber.gif) no-repeat left center;
 }
 .ui-jqgrid .jqgrid-overlay {display:none; z-index:100;}
 /* Tree Grid */