[fusion-commits] r2333 - in trunk/widgets: . AddWMSLayer LayerManager

[svn_fusion at osgeo.org]

Author: madair
Date: 2011-02-01 11:20:53 -0800 (Tue, 01 Feb 2011)
New Revision: 2333

Modified:
   trunk/widgets/AddWMSLayer.js
   trunk/widgets/AddWMSLayer/AddWMSLayer.css
   trunk/widgets/LayerManager.js
   trunk/widgets/LayerManager/LayerManager.css
Log:
re platform #8: minor CSS tweaks

Modified: trunk/widgets/AddWMSLayer/AddWMSLayer.css
===================================================================
--- trunk/widgets/AddWMSLayer/AddWMSLayer.css	2011-01-31 07:17:54 UTC (rev 2332)
+++ trunk/widgets/AddWMSLayer/AddWMSLayer.css	2011-02-01 19:20:53 UTC (rev 2333)
@@ -25,8 +25,17 @@
   overflow: auto;
   border: 1px solid #CCCCCC;
   background-color: #fff;
-  height: 200px;
+  height: 190px;
   margin: 10px;
   padding: 5px;
 }
 
+#serviceURLFieldset .jxInputLabel {
+  width: 70px;
+}
+
+#serviceURLFieldset .jxInputCombo {
+  width: 210px;
+}
+
+

Modified: trunk/widgets/AddWMSLayer.js
===================================================================
--- trunk/widgets/AddWMSLayer.js	2011-01-31 07:17:54 UTC (rev 2332)
+++ trunk/widgets/AddWMSLayer.js	2011-02-01 19:20:53 UTC (rev 2333)
@@ -55,8 +55,8 @@
     // First Fieldset
     
       var fieldSet1 = new Jx.Fieldset({
-        legend: 'Select a layer from:',
-        id: 'FieldSet1',
+        legend: 'Show WMS layers from:',
+        id: 'serviceURLFieldset',
         fieldsetClass: 'jxFormInlineblock'
       }).addTo(form);
       
@@ -67,17 +67,21 @@
       this.serviceList = new Jx.Field.Combo({
         id: 'serviceURL',
         name: 'serviceURL',
-        label: 'WMS Server URL',
+        label: 'Server URL',
         readonly: false,
-        items: serviceURLs,
-        required: true
+        items: serviceURLs
       }).addTo(fieldSet1);
     
-      var button = new Jx.Button({
-        id: 'listButton',
-        name: 'listButton',
-        label: 'List Layers',
-        readonly: true
+      var button = new Jx.Field.Button({
+        buttonOptions:{
+          id: 'listButton',
+          name: 'listButton',
+          label: 'List Layers',
+          onClick: function() {
+            console.log('Go!');
+          }
+        },
+        defaultAction: true
       }).addTo(fieldSet1);
       button.addEvent('click', OpenLayers.Function.bind(this.initializeWMS, this));
       

Modified: trunk/widgets/LayerManager/LayerManager.css
===================================================================
--- trunk/widgets/LayerManager/LayerManager.css	2011-01-31 07:17:54 UTC (rev 2332)
+++ trunk/widgets/LayerManager/LayerManager.css	2011-02-01 19:20:53 UTC (rev 2333)
@@ -53,11 +53,25 @@
 .lmanDelIcon {
   visibility: hidden;
   position: absolute;
-  right: 0px;
+  right: 1px;
+  top: 2px
 }
 .lmanInfoIcon {
   visibility: hidden;
   position: absolute;
-  right: 16px;
+  right: 18px;
+  top: 2px;
 }
 
+.lmanVisCheck {
+  vertical-align: middle;
+}
+
+.lmanLayerIcon {
+  vertical-align: middle;
+  margin: 0px 4px;
+}
+
+.lmanLayerLabel {
+  vertical-align: middle;
+}

Modified: trunk/widgets/LayerManager.js
===================================================================
--- trunk/widgets/LayerManager.js	2011-01-31 07:17:54 UTC (rev 2332)
+++ trunk/widgets/LayerManager.js	2011-02-01 19:20:53 UTC (rev 2333)
@@ -54,7 +54,7 @@
     currentNode: null,
     bIsDrawn: false,
     map: null, 
-    defTemplate: '<li id="{id}" class="jxListItemContainer jxLmanLayer"><a class="jxListItem lmanLabel" href="javascript:void(0);" alt="{label}" title="{label}"><input type="checkbox" class="lmanVisCheck" {visSelect}><img src="'+Jx.aPixel.src+'" style="background-image: url({icon}); background-position: {iconOffset}; width:16px; height:16px;">{label}<img src="{delIcon}" class="lmanDelIcon"><img src="{infoIcon}" class="lmanInfoIcon"></a></li>',
+    defTemplate: '<li id="{id}" class="jxListItemContainer jxLmanLayer"><a class="jxListItem lmanLabel" href="javascript:void(0);" alt="{label}" title="{label}"><input type="checkbox" class="lmanVisCheck" {visSelect}><img class="lmanLayerIcon" src="'+Jx.aPixel.src+'" style="background-image: url({icon}); background-position: {iconOffset}; width:16px; height:16px;"><span class="lmanLayerLabel">{label}</span><img src="{delIcon}" class="lmanDelIcon"><img src="{infoIcon}" class="lmanInfoIcon"></a></li>',
     
     initializeWidget: function(widgetTag) {
         //console.log("initializeWidget");