[dss-commits] digitalSTROM web-sources branch, master, updated. fb27215c63a40a3b5ad78d8c2815299e798d7798

git version control dss-commits at forum.digitalstrom.org
Mon Jan 18 09:36:17 CET 2010 

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "digitalSTROM web-sources".

The branch, master has been updated
       via  fb27215c63a40a3b5ad78d8c2815299e798d7798 (commit)
      from  b041b0846416945dbecb3dec6819304f721ec6df (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fb27215c63a40a3b5ad78d8c2815299e798d7798
Author: Matias E. Fernandez <“mfernandez at futurelab.ch”>
Date:   Mon Jan 18 09:34:22 2010 +0100

    Always show lowest bytes of dsid in device grid

-----------------------------------------------------------------------

Changes:
diff --git a/customizing/extjs/resources/css/ds_gui.css b/customizing/extjs/resources/css/ds_gui.css
index fb1d15a..fe6066b 100644
--- a/customizing/extjs/resources/css/ds_gui.css
+++ b/customizing/extjs/resources/css/ds_gui.css
@@ -609,7 +609,7 @@ ul.x-tab-strip li.x-tab-edge {
 
 .x-tab-strip-inner {
     overflow:hidden;
-	text-overflow: ellipsis;
+/* 	text-overflow: ellipsis;*/
 }
 
 .x-tab-strip span.x-tab-strip-text {
@@ -839,7 +839,7 @@ ul.x-tab-strip li.x-tab-edge {
 }
 
 .x-tab-scrolling {
-    position:relative;    
+    position:relative;
 }
 
 .x-tab-panel-bbar .x-toolbar {
@@ -1312,7 +1312,7 @@ textarea {
 /* make top of checkbox/tools visible in webkit */
 .ext-webkit .x-fieldset-header {
     padding-top: 1px;
-}        
+}
 
 .ext-ie .x-fieldset legend {
     margin-bottom:10px;
@@ -1341,8 +1341,8 @@ fieldset.x-panel-collapsed {
     border-width: 1px 1px 0 1px !important;
     border-left-color: transparent;
     border-right-color: transparent;
-}      
-  
+}
+
 .ext-ie6 fieldset.x-panel-collapsed{
     padding-bottom:0 !important;
     border-width: 1px 0 0 0 !important;
@@ -1378,7 +1378,7 @@ fieldset.x-panel-collapsed .x-fieldset-bwrap {
     position: absolute;
     left:16px;
 }
-        
+
 .ext-gecko .x-window-body .x-form-item {
     -moz-outline: none;
     overflow: auto;
@@ -1885,7 +1885,7 @@ fieldset.x-panel-collapsed .x-fieldset-bwrap {
     vertical-align:middle;
 }
 
-.x-toolbar .x-btn-tl, .x-toolbar .x-btn-tr, .x-toolbar .x-btn-tc, .x-toolbar .x-btn-ml, .x-toolbar .x-btn-mr, 
+.x-toolbar .x-btn-tl, .x-toolbar .x-btn-tr, .x-toolbar .x-btn-tc, .x-toolbar .x-btn-ml, .x-toolbar .x-btn-mr,
 .x-toolbar .x-btn-mc, .x-toolbar .x-btn-bl, .x-toolbar .x-btn-br, .x-toolbar .x-btn-bc
 {
 	background-position: 500px 500px;
@@ -2137,7 +2137,7 @@ div.x-toolbar-no-items {
     vertical-align:middle;
 }
 
-.x-toolbar .x-btn-tl, .x-toolbar .x-btn-tr, .x-toolbar .x-btn-tc, .x-toolbar .x-btn-ml, .x-toolbar .x-btn-mr, 
+.x-toolbar .x-btn-tl, .x-toolbar .x-btn-tr, .x-toolbar .x-btn-tc, .x-toolbar .x-btn-ml, .x-toolbar .x-btn-mr,
 .x-toolbar .x-btn-mc, .x-toolbar .x-btn-bl, .x-toolbar .x-btn-br, .x-toolbar .x-btn-bc
 {
 	background-position: 500px 500px;
@@ -2407,8 +2407,10 @@ div.x-toolbar-no-items {
 
 .x-grid3-cell-inner, .x-grid3-hd-inner{
 	overflow:hidden;
+/*
 	-o-text-overflow: ellipsis;
 	text-overflow: ellipsis;
+*/
     padding:3px 3px 3px 5px;
     white-space: nowrap;
 }
@@ -2524,7 +2526,7 @@ div.x-toolbar-no-items {
 }
 
 .ext-strict .x-grid3-header-pop-inner {
-    width:14px; 
+    width:14px;
 }
 
 .x-grid3-header-inner {
@@ -3866,7 +3868,7 @@ a.x-menu-item {
     border:1px solid;
     white-space: nowrap;
     overflow:hidden;
-    text-overflow: ellipsis;
+/*    text-overflow: ellipsis;*/
 }
 
 .x-combo-list .x-combo-selected{
@@ -4688,7 +4690,7 @@ body.ext-ie6.x-body-masked .x-window select {
 
 .x-html-editor-tb .x-edit-bold, .x-menu-item img.x-edit-bold {
     background-position:0 0;
-    background-image:url(../images/default/editor/tb-sprite.gif);    
+    background-image:url(../images/default/editor/tb-sprite.gif);
 }
 
 .x-html-editor-tb .x-edit-italic, .x-menu-item img.x-edit-italic {
@@ -5145,8 +5147,10 @@ body.ext-ie6.x-body-masked .x-window select {
     display:block;
     float:left;
     overflow:hidden;
+/*
 	-o-text-overflow: ellipsis;
 	text-overflow: ellipsis;
+*/
     white-space: nowrap;
 }
 
@@ -5177,8 +5181,10 @@ body.ext-ie6.x-body-masked .x-window select {
     display:block;
     float:left;
     overflow:hidden;
+/*
 	-o-text-overflow: ellipsis;
 	text-overflow: ellipsis;
+*/
     white-space: nowrap;
     cursor:pointer;
     zoom:1;
@@ -5240,7 +5246,7 @@ body.ext-ie6.x-body-masked .x-window select {
     -khtml-user-select:none;
     -webkit-user-select:ignore;
 	display:block;
-	overflow:hidden;  
+	overflow:hidden;
 }
 
 /* Horizontal styles */
@@ -5763,8 +5769,8 @@ ul.x-tab-strip-bottom{
     background-image:url(../images/default/button/s-arrow-noline.gif);
 }
 
-.x-toolbar .x-btn-over .x-btn-mc em.x-btn-split, .x-toolbar .x-btn-click .x-btn-mc em.x-btn-split, 
-.x-toolbar .x-btn-menu-active .x-btn-mc em.x-btn-split, .x-toolbar .x-btn-pressed .x-btn-mc em.x-btn-split 
+.x-toolbar .x-btn-over .x-btn-mc em.x-btn-split, .x-toolbar .x-btn-click .x-btn-mc em.x-btn-split,
+.x-toolbar .x-btn-menu-active .x-btn-mc em.x-btn-split, .x-toolbar .x-btn-pressed .x-btn-mc em.x-btn-split
 {
     background-image:url(../images/default/button/s-arrow-o.gif);
 }
@@ -5773,8 +5779,8 @@ ul.x-tab-strip-bottom{
     background-image:url(../images/default/button/s-arrow-b-noline.gif);
 }
 
-.x-toolbar .x-btn-over .x-btn-mc em.x-btn-split-bottom, .x-toolbar .x-btn-click .x-btn-mc em.x-btn-split-bottom, 
-.x-toolbar .x-btn-menu-active .x-btn-mc em.x-btn-split-bottom, .x-toolbar .x-btn-pressed .x-btn-mc em.x-btn-split-bottom 
+.x-toolbar .x-btn-over .x-btn-mc em.x-btn-split-bottom, .x-toolbar .x-btn-click .x-btn-mc em.x-btn-split-bottom,
+.x-toolbar .x-btn-menu-active .x-btn-mc em.x-btn-split-bottom, .x-toolbar .x-btn-pressed .x-btn-mc em.x-btn-split-bottom
 {
     background-image:url(../images/default/button/s-arrow-bo.gif);
 }
@@ -6686,7 +6692,7 @@ a.x-menu-item {
 
 .x-panel-header {
     color:#005138;
-	font-weight:bold; 
+	font-weight:bold;
     font-size: 11px;
     font-family: tahoma,arial,verdana,sans-serif;
     border-color:#77DD88;
@@ -7006,4 +7012,16 @@ body.x-body-masked .x-window-plain .x-window-mc {
 
 .x-window-dlg .ext-mb-error {
     background-image:url(../images/default/window/icon-error.gif);
-}
\ No newline at end of file
+}
+
+/*
+.x-grid3-header .x-grid3-td-dsid, .x-grid3-td-modulator-dsid {
+	text-align: left;
+}
+*/
+
+.x-grid3-cell-inner.x-grid3-col-dsid, .x-grid3-cell-inner.x-grid3-col-modulator-dsid {
+    text-align: right;
+    direction: rtl;
+    text-overflow: clip;
+}
diff --git a/dss-setup-interface/dSS/grid/DevicePanel.js b/dss-setup-interface/dSS/grid/DevicePanel.js
index 315c2d9..ffa9177 100644
--- a/dss-setup-interface/dSS/grid/DevicePanel.js
+++ b/dss-setup-interface/dSS/grid/DevicePanel.js
@@ -4,7 +4,7 @@ Ext.namespace('dSS', 'dSS.grid');
 
 dSS.grid.DevicePanel = Ext.extend(Ext.grid.GridPanel, {
 	initComponent: function() {
-		
+
 		var stateRenderer = function(value, metaData, record, rowIndex, colIndex, store) {
 			if(record.get('on')) {
 				metaData.css = 'isOn';
@@ -13,20 +13,20 @@ dSS.grid.DevicePanel = Ext.extend(Ext.grid.GridPanel, {
 			}
 			return String.format('<img class="padding-img" src="{0}"/>',Ext.BLANK_IMAGE_URL);
 		};
-		
+
 		var deviceCols = [
 			{header: "on", width: 30, resizable: false, sortable: true, dataIndex: 'on', renderer: stateRenderer},
-			{id: 'id', header: "id",  width: 150, sortable: true, dataIndex: 'id'},
+			{id: 'id', header: "id",  width: 150, sortable: true, dataIndex: 'id', id: "dsid"},
 			{id: 'name', header: "name", width: 150, sortable: true, dataIndex: 'name', editable: true, editor: new Ext.form.TextField()},
-			{header: "circuit", width: 100, sortable: true, dataIndex: 'circuit'},
-			{header: "modulator", width: 150, sortable: true, dataIndex: 'modulator'},
+			{header: "circuit", width: 100, sortable: true, dataIndex: 'circuit' },
+			{header: "modulator", width: 150, sortable: true, dataIndex: 'modulator', id: "modulator-dsid"},
 			{header: "zone", width: 50, sortable: true, dataIndex: 'zone'},
 			{header: "first seen", width: 150, sortable: true, dataIndex: 'firstSeen', xtype: 'datecolumn', format: 'c'},
 			{header: "last discovered", width: 150, sortable: true, dataIndex: 'lastDiscovered', xtype: 'datecolumn', format: 'c'}
 		];
-		
+
 		var deviceStore = new dSS.data.DeviceStore();
-		
+
 		Ext.apply(this, {
 			store            : deviceStore,
 			columns          : deviceCols,


hooks/post-receive
-- 
digitalSTROM web-sources

More information about the dss-commits mailing list