Merge pull request #85 from EdLoach/master
authorRichard Fairhurst <richard@systemeD.net>
Tue, 13 Nov 2012 11:27:55 +0000 (03:27 -0800)
committerRichard Fairhurst <richard@systemeD.net>
Tue, 13 Nov 2012 11:27:55 +0000 (03:27 -0800)
Nightclub ref trac ticket 4025

net/systemeD/potlatch2/ContextualHelp.mxml
resources/map_features.xml

index 29f5675..5459b8e 100644 (file)
@@ -70,7 +70,7 @@
 
   <mx:Box id="contextSelectedWayNode"><mx:TextArea styleName="contextualHelp" width="100%" condenseWhite="true" editable="false" focusIn="stage.focus=stage">
                <mx:htmlText><![CDATA[
-                       <b>Click, hold and drag</b> to move. <b>Backspace/delete</b> to delete.
+                       <b>Click, hold and drag</b> to move. <b>Shift-click</b> to start branching way. <b>Backspace/delete</b> to delete.
                ]]></mx:htmlText>
        </mx:TextArea></mx:Box>
 
index 67c81a8..5490a4e 100644 (file)
   </inputSet>
 
   <inputSet id="isBuilding">
-    <input type="choice" presence="withCategory" category="Details" name="Building type, if it is one" key="building">
+    <input type="choice" presence="always" category="Details" name="Building type, if it is one" key="building">
       <choice value="yes" text="Generic building"/>
       <choice value="residential" text="Generic residential"/>
       <choice value="apartments" text="Big apartments house"/>