Add styleName hooks for styling. Improve arrangement at the top of the Simple panel...

diff --git a/net/systemeD/potlatch2/CategorySelector.mxml b/net/systemeD/potlatch2/CategorySelector.mxml
index e71da7996a2fe35303779dd19153e8d0aac3158c..15e05eaf7279b18b8a947eed6f45baab9c739c93 100644 (file)
--- a/net/systemeD/potlatch2/CategorySelector.mxml
+++ b/net/systemeD/potlatch2/CategorySelector.mxml
@@ -5,14 +5,14 @@
        backgroundColor="white" borderStyle="inset">
 
   <mx:HBox horizontalGap="0"> 
-  <mx:ToggleButtonBar height="100%" dataProvider="{categoryStack}" direction="vertical"/>
+  <mx:ToggleButtonBar height="100%" dataProvider="{categoryStack}" direction="vertical" styleName="catToggleButtonBar"/>
   <mx:ViewStack id="categoryStack" width="100%" height="100%"
       change="_formerIndex=event.newIndex;" 
       creationComplete="setSelectedFeature(_selectedType);">
       <mx:Repeater id="catRep" dataProvider="{MapFeatures.getInstance().getCategoriesForType(limit)}">
           <mx:VBox label="{catRep.currentItem.name}">
           <mx:TileList dataProvider="{catRep.currentItem.getFeaturesForType(limit)}"
-                       width="100%" height="100%" change="itemSelected(event);"
+                       width="100%" height="100%" change="itemSelected(event);" styleName="catToggleTiles"
                        creationComplete="ensureSelection();">
               <mx:itemRenderer>
                   <mx:Component>

diff --git a/net/systemeD/potlatch2/TagViewer.mxml b/net/systemeD/potlatch2/TagViewer.mxml
index 4a7db5d913120de4aa2d4ab766e9c00cf75f0cf9..3517a780f9be78d878572978b007cc0b1183128b 100644 (file)
--- a/net/systemeD/potlatch2/TagViewer.mxml
+++ b/net/systemeD/potlatch2/TagViewer.mxml
@@ -49,15 +49,15 @@
   
   <mx:VBox id="tagsPanel" width="100%" height="100%" creationPolicy="auto">
     <mx:ViewStack id="stack" width="100%" height="100%">
-      <mx:VBox width="100%" height="100%" label="Simple" id="editorContainer" creationComplete="initEditorStackUIs()">
-        <mx:HBox width="100%" id="iconContainer" styleName="featureSelector">
+      <mx:VBox width="100%" height="100%" label="Simple" id="editorContainer" creationComplete="initEditorStackUIs()" styleName="dndPanelVbox">
+        <mx:VBox width="100%" verticalGap="1" styleName="dndTagHeader">
+          <mx:HBox width="100%" id="iconContainer" styleName="featureSelector">
             <mx:Image id="iconImage"/>
-            <mx:VBox width="100%" verticalGap="1">
-              <mx:PopUpButton id="popupChange" creationComplete="initFeatureBox()" openAlways="true" width="100%"/>
-              <mx:Text condenseWhite="true" width="100%" id="iconText"/>
-            </mx:VBox>
+            <mx:Text condenseWhite="true" width="100%" id="iconText" styleName="dndIconText"/>
             <mx:LinkButton label="?" click="openDescription()" id="helpLabel" styleName="helpInfo"/>
-        </mx:HBox>
+          </mx:HBox>
+          <mx:PopUpButton id="popupChange" creationComplete="initFeatureBox()" openAlways="true" width="100%" styleName="dndTagPopUpMenu"/>
+        </mx:VBox>
       </mx:VBox>
       <mx:VBox width="100%" height="100%" label="Advanced" id="advancedContainer" initialize="checkAdvanced()" verticalGap="1">
         <mx:Label id="advancedID" click="openEntityPage()">
@@ -260,7 +260,7 @@
                        iconText.htmlText = "<b>Not recognised</b><br/>Try looking at the tags under the advanced properties";
             tw.setSelectedFeature(null);
                  } else {
-                       iconText.htmlText = "<b>No tags set</b><br/>Use the menu above to say what this "+entity.getType()+" is";
+                       iconText.htmlText = "<b>No tags set</b><br/>Please use the menu below to define what this "+entity.getType()+" is";
             tw.setSelectedFeature(null);
           }
           helpLabel.visible = false;
@@ -308,7 +308,7 @@
           var box:VBox = new VBox();
           box.percentWidth = 100;
           box.percentHeight = 100;
-          box.styleName = "editorContainer";
+          box.styleName = "dndEditorContainer";
           return box;
       }
 
@@ -330,11 +330,15 @@
                editorStackTabNavigator.creationPolicy="auto";
                editorStackTabNavigator.percentWidth=100;
                editorStackTabNavigator.percentHeight=100;
+               editorStackTabNavigator.styleName="dndStackTab";
+               editorStackTabNavigator.popUpButtonPolicy="off"
+
 
                editorStackAccordion = new Accordion();
                editorStackAccordion.percentWidth=100;
                editorStackAccordion.percentHeight=100;
                editorStackAccordion.creationPolicy="auto";
+               editorStackAccordion.styleName="dndStackAccordion";
 
                setEditorStackUI(true);
        }

diff --git a/styles/Application.css b/styles/Application.css
index 730c651f12978a67929416f95d6941e2deedabfc..c4f3feaf139a0162109acf8677d114f2166c3117 100644 (file)
--- a/styles/Application.css
+++ b/styles/Application.css
@@ -70,7 +70,7 @@ TitleWindow {
   paddingRight: 3;
 }
 
-.editorContainer {
+.dndEditorContainer {
   verticalGap: 4;
   paddingTop: 3;
   paddingLeft: 3;
@@ -98,3 +98,7 @@ TitleWindow {
 .dndPanelCategoryLabel {
   paddingTop: 6px;
 }
+
+.dndTagHeader {
+  paddingBottom: 15;
+}