Merge pull request #30 from gravitystorm/background-panel
authorRichard Fairhurst <richard@systemeD.net>
Sun, 4 Mar 2012 14:34:01 +0000 (06:34 -0800)
committerRichard Fairhurst <richard@systemeD.net>
Sun, 4 Mar 2012 14:34:01 +0000 (06:34 -0800)
Background panel

1  2 
net/systemeD/potlatch2/TagViewer.mxml
net/systemeD/potlatch2/panels/BackgroundMergePanel.mxml
net/systemeD/potlatch2/panels/BackgroundPanel.mxml

Simple merge
@@@ -1,13 -1,15 +1,17 @@@
  <?xml version="1.0" encoding="utf-8"?>
 -
 -<!--
 -    Background Merge Panel
 +<!---
 +    The Background Merge Panel allows the tags from two features - one from
 +    a read-only vector background layer, one from an editable layer - to be
 +    compared. Tags are highlighted depending whether they match, and tags from
 +    the background layer can be easily merged.
  -->
  
- <mx:VBox xmlns:mx="http://www.adobe.com/2006/mxml" height="100%">
-   <mx:Text id="backgroundMergePanelText" text="Review and Merge tags from the Background layer" width="100%" styleName="helpInfo" />
+ <mx:VBox
+     xmlns:fx="http://ns.adobe.com/mxml/2009"
+     xmlns:mx="library://ns.adobe.com/flex/mx"
+     xmlns:s="library://ns.adobe.com/flex/spark"
+     height="100%">
+   <s:RichText id="backgroundMergePanelText" width="100%">Review and Merge tags from the Background layer</s:RichText>
    <mx:DataGrid editable="false" id="backgroundPanelDG" width="100%" height="50%">
      <mx:columns>
        <mx:DataGridColumn editable="false" dataField="k" headerText="Key" />