Changeset 14589

Timestamp:

07/24/08 15:55:18 (4 months ago)

Author:

toonetown

Message:

Refs #7180 - rename css class names to not have dashes, so that there will not be conflicts with compat grids - and to also better match naming conventions of dijit. The only one that has the same class name is dojoxGrid - and there is no difference between the compat styling and the normal styling of that node !strict

Location:

dojox/trunk/grid

Files:

• cells/_base.js (modified) (3 diffs)
• DataGrid.js (modified) (1 diff)
• resources/Grid.css (modified) (21 diffs)
• resources/Grid_rtl.css (modified) (1 diff)
• resources/nihiloGrid.css (modified) (12 diffs)
• resources/soriaGrid.css (modified) (12 diffs)
• resources/tundraGrid.css (modified) (12 diffs)
• resources/View.html (modified) (1 diff)
• resources/_Grid.html (modified) (1 diff)
• tests/test_backwards_compatibility.html (modified) (1 diff)
• tests/test_change_structure.html (modified) (1 diff)
• tests/test_data_grid_edit_large_resultset.html (modified) (1 diff)
• tests/test_edit.html (modified) (1 diff)
• tests/test_edit_canEdit.html (modified) (1 diff)
• tests/test_sizing_ResizeHandle.html (modified) (1 diff)
• tests/test_styling.html (modified) (2 diffs)
• tests/test_subgrid.html (modified) (1 diff)
• tests/test_tundra_edit.html (modified) (1 diff)
• _EditManager.js (modified) (1 diff)
• _Events.js (modified) (2 diffs)
• _FocusManager.js (modified) (1 diff)
• _Grid.js (modified) (1 diff)
• _RowManager.js (modified) (1 diff)
• _RowSelector.js (modified) (2 diffs)
• _View.js (modified) (7 diffs)

dojox/trunk/grid/cells/_base.js

@@ -269 +269 @@
                 formatEditing: function(inDatum, inRowIndex){
                         this.needFormatNode(inDatum, inRowIndex);
-                        return '<input class="dojoxGrid-input" type="text" value="' + inDatum + '">';
+                        return '<input class="dojoxGridInput" type="text" value="' + inDatum + '">';
                 },
                 formatNode: function(inNode, inDatum, inRowIndex){
@@ -336 +336 @@
                 formatEditing: function(inDatum, inRowIndex){
                         this.needFormatNode(inDatum, inRowIndex);
-                        var h = [ '<select class="dojoxGrid-select">' ];
+                        var h = [ '<select class="dojoxGridSelect">' ];
                         for (var i=0, o, v; ((o=this.options[i]) !== undefined)&&((v=this.values[i]) !== undefined); i++){
                                 h.push("<option", (inDatum==v ? ' selected' : ''), ' value="' + v + '"', ">", o, "</option>");
@@ -392 +392 @@
                 _valueProp: "checked",
                 formatEditing: function(inDatum, inRowIndex){
-                        return '<input class="dojoxGrid-input" type="checkbox"' + (inDatum ? ' checked="checked"' : '') + ' style="width: auto" />';
+                        return '<input class="dojoxGridInput" type="checkbox"' + (inDatum ? ' checked="checked"' : '') + ' style="width: auto" />';
                 },
                 doclick: function(e){

dojox/trunk/grid/DataGrid.js

@@ -345 +345 @@
                         for(var i=0, ss=["inflight", "error", "inserting"], s; s=ss[i]; i++){
                                 if(states[s]){
-                                        c = ' dojoxGrid-row-' + s;
+                                        c = ' dojoxGridRow-' + s;
                                         break;
                                 }

dojox/trunk/grid/resources/Grid.css

@@ -19 +19 @@
 /* master header */
 
-.dojoxGrid-master-header {
+.dojoxGridMasterHeader {
         position: relative;
 }
@@ -25 +25 @@
 /* master view */
 
-.dojoxGrid-master-view  {
+.dojoxGridMasterView  {
         position: relative;
 }
@@ -31 +31 @@
 /* master messages */
 
-.dojoxGrid-master-messages {
+.dojoxGridMasterMessages {
         position: relative;
         padding: 1em;
@@ -40 +40 @@
 /* views */
 
-.dojoxGrid-view {
+.dojoxGridView {
         position: absolute;
         overflow: hidden;
@@ -47 +47 @@
 /* header */
 
-.dojoxGrid-header {
+.dojoxGridHeader {
         position: absolute;
         overflow: hidden;
 }
 
-.dojoxGrid-header {
+.dojoxGridHeader {
         background-color: #E8E1CF;
 }
 
-.dojoxGrid-header table {
+.dojoxGridHeader table {
         text-align: center;
 }
 
-.dojoxGrid-header .dojoxGrid-cell-content {
-        text-align: center;
-}
-
-.dojoxGrid-header .dojoxGrid-cell { 
+.dojoxGridHeader .dojoxGridCell { 
         border: 1px solid;
         border-color: #F6F4EB #ACA899 #ACA899 #F6F4EB;
@@ -71 +67 @@
 }
 
-.dojoxGrid-header .dojoxGrid-cell-over {
+.dojoxGridHeader .dojoxGridCellOver {
         background-image: none;
         background-color: white;
@@ -80 +76 @@
 }
 
-.dojoxGrid-header .dojoxGrid-cell-focus {
+.dojoxGridHeader .dojoxGridCellFocus {
         border: 1px dashed blue;
 }
 
-.dojoxGrid-header.dojoxGrid-cell-focus.dojoxGrid-cell-over {
+.dojoxGridHeader.dojoxGridCellFocus.dojoxGridCellOver {
         background-image: none;
         background-color: white;
@@ -93 +89 @@
 }
 
-.gridArrowButtonChar {
+.dojoxGridArrowButtonChar {
         display:none !important;
 }
-.gridArrowButtonNode {
+.dojoxGridArrowButtonNode {
         display: inline !important;
         padding-left: 16px;
 }
-.dojoxGrid-sort-down .gridArrowButtonNode {
+.dojoxGridSortDown .dojoxGridArrowButtonNode {
         background: url(images/grid_sort_down.gif) center no-repeat;
 }
-.dojoxGrid-sort-up .gridArrowButtonNode {
+.dojoxGridSortUp .dojoxGridArrowButtonNode {
         background: url(images/grid_sort_up.gif) center no-repeat;
 }
 
-.dijit_a11y .gridArrowButtonChar {
+.dijit_a11y .dojoxGridArrowButtonChar {
         display:inline !important;
 }
-.dijit_a11y .gridArrowButtonNode {
+.dijit_a11y .dojoxGridArrowButtonNode {
         display: none !important;
 }
@@ -116 +112 @@
 /* content */
 
-.dojoxGrid-scrollbox {
+.dojoxGridScrollbox {
         position: relative;
         overflow: auto;
@@ -123 +119 @@
 }
 
-.dojoxGrid-content {
+.dojoxGridContent {
         position: relative;
         overflow: hidden;
@@ -132 +128 @@
 /* rowbar */
 
-.dojoxGrid-rowbar { 
+.dojoxGridRowbar { 
         border: 1px solid;
         border-color: #F6F4EB #ACA899 #ACA899 #F6F4EB;
@@ -139 +135 @@
 }
 
-.dojoxGrid-rowbar-inner {
+.dojoxGridRowbarInner {
         border-top: 1px solid #F6F4EB;
 }
 
-.dojoxGrid-rowbar-over {
+.dojoxGridRowbarOver {
         background-image: none;
         background-color: white;
@@ -150 +146 @@
 }
 
-.dojoxGrid-rowbar-selected {
+.dojoxGridRowbarSelected {
         background-color: #D9E8F9;
 }
@@ -156 +152 @@
 /* rows */
 
-.dojoxGrid-row {
+.dojoxGridRow {
         position: relative;
         width: 9000em;
 }
 
-.dojoxGrid-row {
+.dojoxGridRow {
         /*border: 1px solid #E8E4D8;*/
         border: 1px solid #E8E4D8;
@@ -172 +168 @@
 }
 
-.dojoxGrid-row-over {
+.dojoxGridRowOver {
         border-top-color: #FEBE47;
         border-bottom-color: #FEBE47;
@@ -181 +177 @@
 }
 
-.dojoxGrid-row-odd {
+.dojoxGridRowOdd {
         background-color: #FFFDF3;
         /*background-color: #F9F7E8;*/
 }
 
-.dojoxGrid-row-selected {
+.dojoxGridRowSelected {
         background-color: #D9E8F9;
 }
 
-.dojoxGrid-row-table {
+.dojoxGridRowTable {
         table-layout: fixed;
         width: 0;
 }
 
-.dojoxGrid-invisible {
+.dojoxGridInvisible {
         visibility: hidden;
 }               
 
-.Xdojo-ie .dojoxGrid-invisible {
+.Xdojo-ie .dojoxGridInvisible {
         display: none;
 }               
 
-.dojoxGrid-invisible td, .dojoxGrid-header .dojoxGrid-invisible td {
+.dojoxGridInvisible td, .dojoxGridHeader .dojoxGridInvisible td {
         border-top-width: 0;
         border-bottom-width: 0;
@@ -214 +210 @@
 /* cells */
 
-.dojoxGrid-cell {
+.dojoxGridCell {
         border: 1px solid;
         border-color: #EBEADB;
@@ -223 +219 @@
 }
 
-.dojoxGrid-cell-focus {
+.dojoxGridCellFocus {
         border: 1px dashed blue;
 }
 
-.dojoxGrid-cell-over {
+.dojoxGridCellOver {
         border: 1px dotted #FEBE47;
 }
 
-.dojoxGrid-cell-focus.dojoxGrid-cell-over {
+.dojoxGridCellFocus.dojoxGridCellOver {
         border: 1px dotted green;
 }
 
-.dojoxGrid-cell-clip {
-        width: 100%;
-        overflow: hidden;
-        white-space:nowrap;
-        text-overflow: ellipsis;
-}
-
 /* editing */
 
-.dojoxGrid-row-editing td {
+.dojoxGridRowEditing td {
         background-color: #F4FFF4;
 }
 
-.dojoxGrid-row-inserting td {
+.dojoxGridRow-inserting td {
         background-color: #F4FFF4;
 }
-.dojoxGrid-row-inflight td {
+.dojoxGridRow-inflight td {
         background-color: #F2F7B7;
 }
-.dojoxGrid-row-error td {
+.dojoxGridRow-error td {
         background-color: #F8B8B6;
 }
 
-.dojoxGrid-input, .dojoxGrid-select, .dojoxGrid-textarea {
+.dojoxGridInput, .dojoxGridSelect, .dojoxGridTextarea {
         margin: 0;
         padding: 0;
@@ -267 +256 @@
 }
 
-.dojoxGrid-hidden-focus {
+.dojoxGridHiddenFocus {
         position: absolute;
         left: -1000px;
@@ -274 +263 @@
 }
 
-.dijit_a11y .dojoxGrid-rowbar-selected { 
+.dijit_a11y .dojoxGridRowbarSelected { 
         border-top: 1px solid white;
         border-bottom: 1px dashed black;
@@ -281 +270 @@
 }
 
-.dijit_a11y .dojoxGrid-rowbar-selected .dojoxGrid-rowbar-inner {
+.dijit_a11y .dojoxGridRowbarSelected .dojoxGridRowbarInner {
         border: 0;
         border-top: 1px solid white;
 }
 
-.dijit_a11y .dojoxGrid-row-selected {
+.dijit_a11y .dojoxGridRowSelected {
         border-bottom: 1px dashed black;
 }

dojox/trunk/grid/resources/Grid_rtl.css

@@ -1 @@
-.dijitRtl .dojoxGrid-header table {
+.dijitRtl .dojoxGridHeader table {
 }
 
-.dj_ie .dijitRtl .dojoxGrid-header table {
+.dj_ie .dijitRtl .dojoxGridHeader table {
         float:none;
 }
 
-.dijitRtl .dojoxGrid-content {
+.dijitRtl .dojoxGridContent {
         float:left;
 }

dojox/trunk/grid/resources/nihiloGrid.css

@@ -8 +8 @@
 /* master messages */
 
-.nihilo .dojoxGrid-master-messages {
+.nihilo .dojoxGridMasterMessages {
         background-color: #fefefe;
 }
@@ -14 +14 @@
 /* header */
 
-.nihilo .dojoxGrid-header {
+.nihilo .dojoxGridHeader {
         background-color:  #e9e9e9;
 }
 
-.nihilo .dojoxGrid-header .dojoxGrid-cell { 
+.nihilo .dojoxGridHeader .dojoxGridCell { 
         border-width: 1px;
         padding-bottom: 0px;
@@ -26 +26 @@
 }
 
-.nihilo .dojoxGrid-header .dojoxGrid-cell-over {
+.nihilo .dojoxGridHeader .dojoxGridCellOver {
         background: url(../../../dijit/themes/nihilo/images/titleBarActive.png) #e9e9e9 repeat-x top;
 }
 
-.nihilo .gridArrowButtonChar {
+.nihilo .dojoxGridArrowButtonChar {
         float: right;
 }
-.nihilo .gridArrowButtonNode {
+.nihilo .dojoxGridArrowButtonNode {
         display: block !important;
         padding-left: 0px;
@@ -42 +42 @@
         margin-top: 1px;
 }
-.dj_ie6 .nihilo .gridArrowButtonNode {
+.dj_ie6 .nihilo .dojoxGridArrowButtonNode {
         background-image:url("../../../dijit/themes/nihilo/images/spriteArrows.gif");
 }
 
-.nihilo .dojoxGrid-sort-up .gridArrowButtonNode {
+.nihilo .dojoxGridSortUp .dojoxGridArrowButtonNode {
         background-position: -21px;
 }
-.dijit_a11y .gridArrowButtonNode {
+.dijit_a11y .dojoxGridArrowButtonNode {
         display: none !important;
 }
@@ -55 +55 @@
 /* content */
 
-.nihilo .dojoxGrid-scrollbox {
+.nihilo .dojoxGridScrollbox {
         background-color: #fefefe;
 }
@@ -61 +61 @@
 /* rowbar */
 
-.nihilo .dojoxGrid-rowbar { 
+.nihilo .dojoxGridRowbar { 
         border: none;
         background: url(../../../dijit/themes/nihilo/images/titleBar.png) #e9e9e9 repeat-y right;
@@ -68 +68 @@
 }
 
-.nihilo .dojoxGrid-rowbar-inner {
+.nihilo .dojoxGridRowbarInner {
         border: none;
         border-bottom: 1px solid #cccccc;
 }
 
-.nihilo .dojoxGrid-rowbar-over {
+.nihilo .dojoxGridRowbarOver {
         background: url(../../../dijit/themes/nihilo/images/titleBarActive.png) #e9e9e9 repeat-y right;
 }
 
-.nihilo .dojoxGrid-rowbar-selected {
+.nihilo .dojoxGridRowbarSelected {
         background: #D9E8F9 url(../../../dijit/themes/nihilo/images/titleBar.png) #dddddd no-repeat center;
         border-right: 1px solid #cccccc;
@@ -84 +84 @@
 /* rows */
 
-.nihilo .dojoxGrid-row {
+.nihilo .dojoxGridRow {
         border: none;
         background-color: white;
 }
 
-.nihilo .dojoxGrid-row-over {
+.nihilo .dojoxGridRowOver {
         border-top-color: #cccccc;
         border-bottom-color: #cccccc;
 }
 
-.nihilo .dojoxGrid-row-over .dojoxGrid-cell {
+.nihilo .dojoxGridRowOver .dojoxGridCell {
         background-color: #ffe284; 
 }
 
-.nihilo .dojoxGrid-row-odd {
+.nihilo .dojoxGridRowOdd {
         background-color: #f2f5f9;
 }
 
-.nihilo .dojoxGrid-row-selected {
+.nihilo .dojoxGridRowSelected {
         background-color: #aec7e3;
 }
@@ -108 +108 @@
 /* cells */
 
-.nihilo .dojoxGrid-cell {
+.nihilo .dojoxGridCell {
         border: 1px dotted #D5CDB5;
         border-left-color: transparent;
@@ -114 +114 @@
 }
 
-.dj_ff2 .nihilo .dojoxGrid-cell {
+.dj_ff2 .nihilo .dojoxGridCell {
         border-left-width: 0px;
         border-top-width: 0px;
 }
 
-.dj_ie6 .nihilo .dojoxGrid-cell {
+.dj_ie6 .nihilo .dojoxGridCell {
         border: 1px solid white;
         border-right: 1px solid #D5CDB5;
 }
 
-.nihilo .dojoxGrid-cell-focus {
+.nihilo .dojoxGridCellFocus {
         border: 1px dotted #a6a6a6;
 }
 
-.nihilo .dojoxGrid-cell-over {
+.nihilo .dojoxGridCellOver {
         border: 1px dotted #a6a6a6;
 }
 
-.nihilo .dojoxGrid-cell-focus.dojoxGrid-cell-over {
+.nihilo .dojoxGridCellFocus.dojoxGridCellOver {
         border: 1px dotted #595959;
 }
@@ -139 +139 @@
 
 /* FIXME: these colors are off! */
-.nihilo .dojoxGrid-row-editing td {
+.nihilo .dojoxGridRowEditing td {
         /* background-color: #F4FFF4; */
         background-color: #ffe284; 
@@ -145 +145 @@
 }
 
-.nihilo .dojoxGrid-row-inserting td {
+.nihilo .dojoxGridRow-inserting td {
         background-color: #F4FFF4;
 }
-.nihilo .dojoxGrid-row-inflight td {
+.nihilo .dojoxGridRow-inflight td {
         background-color: #F2F7B7;
 }
-.nihilo .dojoxGrid-row-error td {
+.nihilo .dojoxGridRow-error td {
         background-color: #F8B8B6;
 }

dojox/trunk/grid/resources/soriaGrid.css

@@ -8 +8 @@
 /* master messages */
 
-.soria .dojoxGrid-master-messages {
+.soria .dojoxGridMasterMessages {
         background-color: #fefefe;
 }
@@ -14 +14 @@
 /* header */
 
-.soria .dojoxGrid-header {
+.soria .dojoxGridHeader {
         background-color:  #e9e9e9;
 }
 
-.soria .dojoxGrid-header .dojoxGrid-cell { 
+.soria .dojoxGridHeader .dojoxGridCell { 
         border-width: 1px;
         padding-bottom: 0px;
@@ -26 +26 @@
 }
 
-.soria .dojoxGrid-header .dojoxGrid-cell-over {
+.soria .dojoxGridHeader .dojoxGridCellOver {
         background: url(../../../dijit/themes/soria/images/titleBarActive.png) #e9e9e9 repeat-x top;
 }
 
-.soria .gridArrowButtonChar {
+.soria .dojoxGridArrowButtonChar {
         float: right;
 }
-.soria .gridArrowButtonNode {
+.soria .dojoxGridArrowButtonNode {
         display: block !important;
         padding-left: 0px;
@@ -42 +42 @@
         height: 1em;
 }
-.dj_ie6 .soria .gridArrowButtonNode {
+.dj_ie6 .soria .dojoxGridArrowButtonNode {
         background-image:url("../../../dijit/themes/soria/images/spriteArrows.gif");
 }
 
-.soria .dojoxGrid-sort-up .gridArrowButtonNode {
+.soria .dojoxGridSortUp .dojoxGridArrowButtonNode {
         background-position: -21px;
 }
-.dijit_a11y .gridArrowButtonNode {
+.dijit_a11y .dojoxGridArrowButtonNode {
         display: none !important;
 }
@@ -55 +55 @@
 /* content */
 
-.soria .dojoxGrid-scrollbox {
+.soria .dojoxGridScrollbox {
         background-color: #fefefe;
 }
@@ -61 +61 @@
 /* rowbar */
 
-.soria .dojoxGrid-rowbar { 
+.soria .dojoxGridRowbar { 
         border: none;
         background: url(../../../dijit/themes/soria/images/titleBar.png) #e9e9e9 repeat-y right;