Changeset 2126

Timestamp:

08/22/12 07:31:04 (12 years ago)

Author:

twagoo

Message:

Merged changes from 1.12.0 branch that fix #217 and #218 + CHANGES file for that release

Files:

• ComponentRegistry/trunk (modified) (1 prop)
• ComponentRegistry/trunk/CMDValidate (modified) (1 prop)
• ComponentRegistry/trunk/ComponentBrowserGui (modified) (1 prop)
• ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/browser/Browse.mxml (modified) (5 diffs)
• ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/browser/BrowserOverviewList.mxml (modified) (3 diffs)
• ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/common/components/BrowseContextMenu.as (modified) (5 diffs)
• ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/common/components/RegistryViewStack.as (modified) (1 diff)
• ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/CMDComponentXMLEditor.as (modified) (5 diffs)
• ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/ComponentEdit.as (modified) (6 diffs)
• ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/Editor.mxml (modified) (3 diffs)
• ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/EditorAS.as (modified) (4 diffs)
• ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/EditorButtonBar.mxml (modified) (1 diff)
• ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/ElementEdit.as (modified) (10 diffs)
• ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/IsocatSearchPopUp.mxml (modified) (1 diff)
• ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/model/CMDComponent.as (modified) (1 diff)
• ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/importer/Importer.mxml (modified) (4 diffs)
• ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/main.mxml (modified) (2 diffs)
• ComponentRegistry/trunk/ComponentBrowserGui/src/main/resources/assets/css/main.css (modified) (1 diff)
• ComponentRegistry/trunk/ComponentRegistry (modified) (1 prop)
• ComponentRegistry/trunk/ComponentRegistry/CHANGES (modified) (2 diffs, 1 prop)
• ComponentRegistry/trunk/ComponentRegistry/src/main/binding (modified) (1 prop)
• ComponentRegistry/trunk/ComponentRegistry/src/main/binding/bindings.xjb (modified) (1 prop)
• ComponentRegistry/trunk/ComponentRegistry/src/main/java (modified) (1 prop)
• ComponentRegistry/trunk/ComponentRegistry/src/test/java (modified) (1 prop)
• ComponentRegistry/trunk/README (modified) (1 prop)
• ComponentRegistry/trunk/docs (modified) (1 prop)
• ComponentRegistry/trunk/pom.xml (modified) (1 prop)
• metadata/trunk/toolkit/general-component-schema.xsd (modified) (1 prop)

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/browser/Browse.mxml

@@ -6 +6 @@
                    width="100%"
                    height="100%"
-                   label="Browser"
-                   implements="clarin.cmdi.componentregistry.common.components.RegistryView">
+                   label="Component Browser"
+                   implements="clarin.cmdi.componentregistry.common.components.RegistryView" xmlns:components="clarin.cmdi.componentregistry.common.components.*"
+                   >
         <mx:Metadata>
                 [Event(name="startItemLoaded",type="flash.events.Event")]
@@ -161 +162 @@
                         }
                         
-                        private static const USERSPACE_LABEL:String = "Work space";
-                        private static const PUBLICSPACE_LABEL:String = "Public space";
-                        [Bindable]
-                        public var spaces:ArrayCollection = new ArrayCollection([{label: PUBLICSPACE_LABEL, data: 1}, {label: USERSPACE_LABEL, data: 2}]);
-                        
                         private function setUserSpace(event:Event = null):void {
                                 if (Config.instance.userSpace) {
@@ -173 +169 @@
                                 }
                         }
-                        
-                        private function userSpaceCloseHandler(event:Event):void {
-                                if (Credentials.instance.isLoggedIn()) {
-                                        Config.instance.userSpace = ComboBox(event.target).selectedItem.data == 2;
-                                } else if (userSpaceCB.selectedIndex != 0) {
-                                        userSpaceCB.selectedIndex = 0;
-                                        new Login().show(this, Config.VIEW_BROWSE, Config.SPACE_USER, null);
-                                }
-                                
-                        }
                 ]]>
         </mx:Script>
@@ -188 +174 @@
         <browser:BrowserColumns id="browserColumns"/>
         
-        <mx:Panel layout="absolute" 
-                          width="100%" 
+        <mx:Panel width="100%" 
                           height="100%"
                           headerHeight="0"
@@ -196 +181 @@
                           borderThicknessBottom="0"
                           borderThicknessLeft="0"
+                          layout="absolute"
+                          horizontalAlign="center"
                           >
-                        
-                <mx:ComboBox right="0" 
-                                         top="0"                                
-                                         id="userSpaceCB"
-                                         dataProvider="{spaces}"
-                                         width="110"
-                                         close="userSpaceCloseHandler(event);"/>
+                
+                
+                <mx:Box paddingTop="5" paddingLeft="5"
+                                top="-5"
+                                horizontalCenter="-110"
+                                >
+                        <components:SpaceSwitch id="userSpaceCB" width="110" />
+                </mx:Box>
                 
                 <mx:VBox left="0"
                                  top="5"
                                  borderStyle="none"
-                                 horizontalAlign="center"
                                  height="100%"
                                  width="100%">

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/browser/BrowserOverviewList.mxml

@@ -34 +34 @@
                         [Bindable]
                         public var viewStack:RegistryViewStack;
+                        
+                        [Bindable]
+                        public var buttonsEnabled:Boolean = true;
+                        
+                        [Bindable]
+                        public var spaceSwitchEnabled:Boolean = false;
                         
                         public function set browserDataProvider(dataProvider:ArrayCollection):void {
@@ -91 +97 @@
                         }
                         
+                        private function importItem():void{
+                                viewStack.switchToImport();
+                        }
+                        
                         private function dispatchCreateNewEvent():void{
                                 dispatchEvent(new CreateNewComponentEvent());
@@ -100 +110 @@
                          paddingRight="5"
                          width="100%">
-        
+                
+                <mx:Box paddingTop="5" paddingLeft="5" 
+                                visible="{spaceSwitchEnabled}" 
+                                includeInLayout="{spaceSwitchEnabled}">
+                        <comp:SpaceSwitch id="userSpaceCB" />
+                </mx:Box>
+                
                 <mx:HBox horizontalAlign="left"
                                  verticalAlign="middle"
-                                 width="50%">
+                                 width="70%"
+                                 visible="{buttonsEnabled}"
+                                 >
                         
-                        <!-- public space -->
+                        <mx:Button label="Create new" 
+                                           toolTip="Create a new item in the private workspace"
+                                           click="dispatchCreateNewEvent()"
+                                           />
+                        <mx:Button label="Edit"
+                                           toolTip="Edit the selected item in the editor"
+                                           visible="{Config.instance.userSpace}" 
+                                           includeInLayout="{Config.instance.userSpace}"
+                                           enabled="{Config.instance.userSpace &amp;&amp; dataGrid.selectedItem != null}" 
+                                           click="editItem()" />
                         <mx:Button label="Edit as new" 
                                            toolTip="Edit the selected item as a new item in the private workspace"
-                                           includeInLayout="{!Config.instance.userSpace}" 
-                                           visible="{!Config.instance.userSpace}"
-                                           enabled="{(dataGrid.selectedItem != null) &amp;&amp; Credentials.instance.isLoggedIn()}" 
+                                           visible="{!Config.instance.userSpace}" 
+                                           includeInLayout="{!Config.instance.userSpace}"
+                                           enabled="{!Config.instance.userSpace &amp;&amp; dataGrid.selectedItem != null}" 
                                            click="editItem()" />
-                        <!-- private space -->
-                        <mx:Button label="Create new" includeInLayout="{Config.instance.userSpace}"
-                                           toolTip="Create a new item in the private workspace"
-                                           visible="{Config.instance.userSpace}"
-                                           enabled="{Credentials.instance.isLoggedIn()}"
-                                           click="dispatchCreateNewEvent()"
-                                           />
-                        <mx:Button label="Edit" includeInLayout="{Config.instance.userSpace}"
-                                           toolTip="Edit the selected item in the editor"
-                                           visible="{Config.instance.userSpace}"
-                                           enabled="{dataGrid.selectedItem != null &amp;&amp; Credentials.instance.isLoggedIn()}" 
-                                           click="editItem()" />
+                        <mx:Button label="Import"
+                                           toolTip="Import an item from a local file"
+                                           click="importItem()" />
                 </mx:HBox>
                 
                 <mx:HBox horizontalAlign="right"
                                  verticalAlign="middle"
-                                 width="50%">
+                                 width="30%">
         
                         <rictus:SearchBox id="searchBox"

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/common/components/BrowseContextMenu.as

@@ -2 +2 @@
         import clarin.cmdi.componentregistry.common.ItemDescription;
         import clarin.cmdi.componentregistry.common.ShowInfoPopUp;
+        import clarin.cmdi.componentregistry.services.Config;
         import clarin.cmdi.componentregistry.services.DeleteService;
         import clarin.cmdi.componentregistry.services.SaveItemDialog;
-
+        
         import flash.events.ContextMenuEvent;
         import flash.geom.Point;
         import flash.ui.ContextMenu;
         import flash.ui.ContextMenuItem;
-
+        
         import mx.controls.Alert;
         import mx.controls.DataGrid;
@@ -31 +32 @@
                 private var saveItemDialog:SaveItemDialog = new SaveItemDialog();
                 private var isComponent:Boolean = false;
+                
+                private var editMenuItem:ContextMenuItem;
+                private var editAsNewMenuItem:ContextMenuItem;
 
                 public function BrowseContextMenu(isComponent:Boolean = false) {
@@ -37 +41 @@
                         cm.hideBuiltInItems();
                         cm.customItems = createMenuItems();
+                        setItemStates();
+                        
+                        Config.instance.addEventListener(Config.USER_SPACE_TOGGLE_EVENT, setItemStates);
                 }
 
@@ -52 +59 @@
                                 result.push(cmi);
                         }
-                        cmi = new ContextMenuItem("Edit Item...");
-                        cmi.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, editItem);
-                        result.push(cmi);
+                        editMenuItem = new ContextMenuItem("Edit Item...");
+                        editMenuItem.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, editItem);
+                        result.push(editMenuItem);
+                        
+                        editAsNewMenuItem = new ContextMenuItem("Edit Item as New...");
+                        editAsNewMenuItem.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, editItem);
+                        result.push(editAsNewMenuItem);
+                        
                         cmi = new ContextMenuItem("Delete Item...", true);
                         cmi.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, handleDelete);
@@ -61 +73 @@
                         return result;
                 }
+                
+                private function setItemStates(event:Event = null):void {
+                        editMenuItem.visible = Config.instance.userSpace;
+                        editAsNewMenuItem.visible = !Config.instance.userSpace;
+                }
 
                 public function set dataGrid(dataGrid:DataGrid):void {
                         _dataGrid = dataGrid;
                 }
-
-
 
                 private function showInfo(event:ContextMenuEvent):void {

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/common/components/RegistryViewStack.as

@@ -78 +78 @@
                 
                 public function switchToEditor(itemDescription:ItemDescription):void {
-                        // About to open item in editor, check if there are pending changes
-                        if(itemDescription != null && editor.xmlEditor.specHasChanges){
-                                Alert.show("Doing this will discard all changes in the component that is currently being edited. Proceed?", "Discard changes", Alert.OK|Alert.CANCEL, this, 
-                                        function(event:CloseEvent):void {
-                                                if(event.detail == Alert.OK) {
-                                                        doSwitchToEditor(itemDescription);
-                                                }
-                                        } );
-                        } else {
-                                doSwitchToEditor(itemDescription);
-                        }
+                        doSwitchToEditor(itemDescription);
                 }
                 

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/CMDComponentXMLEditor.as

@@ -6 +6 @@
         import clarin.cmdi.componentregistry.common.components.AddComponentLabelButton;
         import clarin.cmdi.componentregistry.common.components.AddElementLabelButton;
+        import clarin.cmdi.componentregistry.common.components.LabelButton;
         import clarin.cmdi.componentregistry.common.components.RemoveLabelButton;
         import clarin.cmdi.componentregistry.editor.model.CMDComponent;
@@ -22 +23 @@
         import mx.containers.FormItem;
         import mx.containers.FormItemDirection;
+        import mx.containers.HBox;
         import mx.controls.Alert;
         import mx.controls.Label;
@@ -163 +165 @@
                         checkFirstDefiningComponent(_spec.cmdComponents);
                         handleHeader(_spec);
+                        
+                        addChild(createCollapseExpandBox());
+                        
                         handleElements(_firstComponent.cmdElements);
                         addElementAddButton();
                         handleComponents(_firstComponent.cmdComponents);
                         addComponentAddButton();
+                        
+                        addChild(createCollapseExpandBox());
+
                         trace("Created editor view in " + (getTimer() - start) + " ms.");
+                }
+                
+                private function createCollapseExpandBox():HBox{
+                        var collapseExpandBox:HBox = new HBox();
+                        collapseExpandBox.addChild(createCollapseAllButton());
+                        collapseExpandBox.addChild(createExpandAllButton());
+                        return collapseExpandBox;
+                }
+                
+                private function createCollapseAllButton():UIComponent{
+                        var button:LabelButton = new LabelButton(collapseAll,  "Collapse all");
+                        button.setStyle("color","blue");
+                        button.toolTip = "Collapse all components and elements in this editor";
+                        return button;
+                }
+                
+                private function collapseAll(event:Event):void{
+                        for(var i:int=0;i<numChildren;i++){
+                                var child:Object = getChildAt(i);
+                                if(child is ElementEdit || child is ComponentEdit){
+                                        ItemEdit(child).collapseAll();
+                                }
+                        }
+                }
+                
+                private function createExpandAllButton():UIComponent{
+                        var button:LabelButton = new LabelButton(expandAll,  "Expand all");
+                        button.setStyle("color","blue");
+                        button.toolTip = "Expand all components and elements in this editor";
+                        return button;
+                }               
+                
+                private function expandAll(event:Event):void{
+                        for(var i:int=0;i<numChildren;i++){
+                                var child:Object = getChildAt(i);
+                                if(child is ElementEdit || child is ComponentEdit){
+                                        ItemEdit(child).expandAll();
+                                }
+                        }
                 }
                 
@@ -237 +284 @@
                         var buttons:FormItem = new SelectTypeRadioButtons(spec);
                         head.addChild(buttons);
-                        var startOverLabel:Label = createStartOverButton();
-                        startOverLabel.setStyle("paddingTop", "2");
-                        startOverLabel.height = buttons.height;
                         var space:Spacer = new Spacer();
                         space.width = 55;
                         head.addChild(space);
-                        head.addChild(startOverLabel);
                         addChild(head);
                         
@@ -371 +414 @@
                         removeChild(event.currentTarget as DisplayObject);
                 }
-                
-                private function createStartOverButton():Label {
-                        var startOverButton:Label = new RemoveLabelButton();
-                        startOverButton.addEventListener(MouseEvent.CLICK, clearEditorHandler);
-                        startOverButton.toolTip = "Clears all input and removes added components";
-                        startOverButton.text = "start over";
-                        return startOverButton;
-                }
         }
 }

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/ComponentEdit.as

@@ -29 +29 @@
         
         [Event(name="removeComponent", type="flash.events.Event")]
-        public class ComponentEdit extends Form {
+        public class ComponentEdit extends ItemEdit {
                 public static const REMOVE_COMPONENT_EVENT:String = "removeComponent";
                 private static const DRAG_ITEMS:String = "items";
@@ -38 +38 @@
                 private var addComponentLabel:Label
                 private var addElementLabel:Label
-                
                 
                 public function ComponentEdit(component:CMDComponent, parent:UIComponent, parentComponent:CMDComponent) {
@@ -98 +97 @@
                         createComponentEditBar();
                         
+                        addChild(getHideableForm());                    
+                        
+                        var summary:ComponentSummary = new ComponentSummary();
+                        summary.component = _component;
+                        summary.visible = false;
+                        
+                        setSummaryContainer(summary);           
+                        addChild(summary);
+                        
                         var componentLink:FormItem = createComponentLink(_component);
                         if (componentLink != null) {
                                 addCardinalityInput();
-                                addChild(componentLink);
+                                addToHideableForm(componentLink);
                         } else {
                                 addNameInput();
@@ -148 +156 @@
                 
                 private function addConceptLink():void {
-                        addChild(new ConceptLinkInput(LabelConstants.CONCEPTLINK, _component.conceptLink, function(val:String):void {
+                        addToHideableForm(new ConceptLinkInput(LabelConstants.CONCEPTLINK, _component.conceptLink, function(val:String):void {
                                 _component.conceptLink = val;
                         }));
@@ -163 +171 @@
                                 _component.name = val;  
                         }, new ChildNameValidator(_parentComponent, component));
-                        addChild(nameInput);
+                        addToHideableForm(nameInput);
                 }
                 
                 private function addCardinalityInput():void {
-                        addChild(new CardinalityInput(LabelConstants.CARDINALITY_MIN, _component.cardinalityMin, CardinalityInput.BOUNDED, function(val:String):void {
+                        addToHideableForm(new CardinalityInput(LabelConstants.CARDINALITY_MIN, _component.cardinalityMin, CardinalityInput.BOUNDED, function(val:String):void {
                                 _component.cardinalityMin = val;
                         }));
-                        addChild(new CardinalityInput(LabelConstants.CARDINALITY_MAX, _component.cardinalityMax, CardinalityInput.UNBOUNDED,function(val:String):void {
+                        addToHideableForm(new CardinalityInput(LabelConstants.CARDINALITY_MAX, _component.cardinalityMax, CardinalityInput.UNBOUNDED,function(val:String):void {
                                 _component.cardinalityMax = val;
                         }));
                 }
                 
+                private function createHidableForm():Form {
+                        var form:Form = new Form();
+                        form.styleName = StyleConstants.XMLBROWSER;
+                        form.setStyle("paddingTop","0");
+                        form.setStyle("paddingBottom","0");
+                        form.verticalScrollPolicy = "off";
+                        form.horizontalScrollPolicy = "off";
+                        return form;
+                }
+                
                 private function createComponentEditBar():void {
                         var editBar:HBox = new HBox();
+                        
+                        editBar.addChild(getShowToggleBox());
+                        
                         editBar.addChild(createHeading());
                         var removeButton:Label = new RemoveLabelButton();
@@ -236 +257 @@
                 
                 private function handleCMDAttributeList():void {
-                        addChild(new AttributeListEdit(_component, this));
+                        addToHideableForm(new AttributeListEdit(_component, this));
                 }
                 

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/Editor.mxml

@@ -6 +6 @@
                    width="100%"
                    height="100%"
-                   label="Editor"
+                   label="Component Editor"
                    creationComplete="init()"
-                   implements="clarin.cmdi.componentregistry.common.components.RegistryView"
+                   implements="clarin.cmdi.componentregistry.common.components.RegistryView" xmlns:components="clarin.cmdi.componentregistry.common.components.*"
                    >
         
@@ -21 +21 @@
                                                                         saveClick="saveSpec(true, UploadService.UPDATE)"
                                                                         saveAsNewClick="saveSpec(true, UploadService.NEW)"
-                                                                        publishClick="publishSpec()"/>
+                                                                        publishClick="publishSpec()"
+                                                                        cancelClick="cancel()"
+                                                                        />
                         <mx:Text id="errorMessageField"
                                          text="{uploadService.message}"
@@ -46 +48 @@
                                 <browser:BrowserOverviewList id="componentsPaletteOverview"
                                                                                          width="100%" height="90%"
+                                                                                         buttonsEnabled="false"
+                                                                                         spaceSwitchEnabled="true"
                                                                                          browserDataProvider="{componentsSrv.itemDescriptions}"
                                                                                          browserColumns="{browserColumns.getComponentColumns()}"

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/EditorAS.as

@@ -2 +2 @@
 import clarin.cmdi.componentregistry.browser.BrowserColumns;
 import clarin.cmdi.componentregistry.common.ItemDescription;
+import clarin.cmdi.componentregistry.common.components.RegistryViewStack;
 import clarin.cmdi.componentregistry.editor.model.CMDModelFactory;
 import clarin.cmdi.componentregistry.editor.model.CMDSpec;
@@ -39 +40 @@
 private var uploadService:UploadService = new UploadService();
 
+[Bindable]
+private var viewStack:RegistryViewStack;
 
 public function init():void {
@@ -47 +50 @@
         uploadService.init(uploadProgress);
         Config.instance.addEventListener(Config.USER_SPACE_TOGGLE_EVENT, toggleUserSpace);
+        viewStack = this.parent as RegistryViewStack;
 }
 
@@ -128 +132 @@
         } else {
                 errorMessageField.text = "Validation errors: red colored fields are invalid.";
+        }
+}
+
+private function cancel():void {
+        if(xmlEditor.specHasChanges){
+        Alert.show("There are pending changes. Cancelling will discard these. Are you sure you want to proceed?", "Discard changes?", Alert.YES|Alert.NO, null, 
+                function (eventObj:CloseEvent):void{
+                        if(eventObj.detail == Alert.YES){
+                                viewStack.switchToBrowse(itemDescription);                              
+                        }
+                });
+        } else {
+                viewStack.switchToBrowse(itemDescription);
         }
 }

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/EditorButtonBar.mxml

@@ -8 +8 @@
                 [Event(name="saveAsNewClick", type="flash.events.MouseEvent")]
                 [Event(name="publishClick", type="flash.events.MouseEvent")]
+                [Event(name="cancelClick", type="flash.events.MouseEvent")]
         </mx:Metadata>
         <mx:Button id="saveBtn"
-                           label="save"
+                           label="Save"
                            click="dispatchEvent(new MouseEvent('saveClick'))"
                            enabled="false"
                            />
         <mx:Button id="saveAsNewBtn"
-                           label="save as new"
+                           label="Save as new"
                            click="dispatchEvent(new MouseEvent('saveAsNewClick'))"/>
         <mx:Button id="publishBtn"
-                           label="publish in public space"
+                           label="Publish in public space"
                            click="dispatchEvent(new MouseEvent('publishClick'))"/>
+        
+        <mx:Button id="cancelBtn"
+                           label="Cancel"
+                           click="dispatchEvent(new MouseEvent('cancelClick'))"/>
 </mx:HBox>

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/ElementEdit.as

@@ -12 +12 @@
         
         import mx.binding.utils.BindingUtils;
+        import mx.containers.Box;
         import mx.containers.Form;
         import mx.containers.FormItem;
         import mx.containers.HBox;
+        import mx.containers.VBox;
         import mx.controls.Button;
         import mx.controls.Label;
@@ -21 +23 @@
 
         [Event(name="removeElement", type="flash.events.Event")]
-        public class ElementEdit extends Form {
+        public class ElementEdit extends ItemEdit {
                 public static const REMOVE_ELEMENT_EVENT:String = "removeElement";
                 private var _element:CMDComponentElement;
@@ -33 +35 @@
                         this._parent = parent;
                         styleName = StyleConstants.XMLBROWSER;
+                        
+                        setStyle("paddingBottom","5");
+                        verticalScrollPolicy = "off";
+                        horizontalScrollPolicy = "off";
+                        
                 }
 
@@ -45 +52 @@
                 protected override function createChildren():void {
                         super.createChildren();
+                                                
                         addChild(createEditBar());
-                        addNameInput();
-                        addChild(new ConceptLinkInput(LabelConstants.CONCEPTLINK, _element.conceptLink, function(val:String):void {
+                        
+                        addChild(getHideableForm());
+                        
+                        var summary:ElementSummary = new ElementSummary();
+                        summary.element = _element;
+                        summary.visible = false;
+                        
+                        setSummaryContainer(summary);
+                        addChild(summary);
+                        
+                        addToHideableForm(createNameInput());
+                        addToHideableForm(new ConceptLinkInput(LabelConstants.CONCEPTLINK, _element.conceptLink, function(val:String):void {
                                         _element.conceptLink = val;
                                 }));
-                        addChild(new FormItemInputLine(LabelConstants.DOCUMENTATION, _element.documentation, function(val:String):void {
+                        addToHideableForm(new FormItemInputLine(LabelConstants.DOCUMENTATION, _element.documentation, function(val:String):void {
                                         _element.documentation = val;
                                 }));
-                        addChild(new DisplayPriorityInput(LabelConstants.DISPLAY_PRIORITY, _element.displayPriority, function(val:String):void {
+                        addToHideableForm(new DisplayPriorityInput(LabelConstants.DISPLAY_PRIORITY, _element.displayPriority, function(val:String):void {
                                         _element.displayPriority = val;
                                 }));
@@ -60 +78 @@
                                 _element.cardinalityMin = val;
                         });
-                        addChild(cardinalityMinInput);
+                        addToHideableForm(cardinalityMinInput);
                         
                         var cardinalityMaxInput:CardinalityInput = new CardinalityInput(LabelConstants.CARDINALITY_MAX, _element.cardinalityMax, CardinalityInput.UNBOUNDED, function(val:String):void {
@@ -69 +87 @@
                                 cardinalityMaxInput.enabled = _element.multilingual != "true";
                         }, _element, "multilingual");
-                        addChild(cardinalityMaxInput);
+                        addToHideableForm(cardinalityMaxInput);
                         
-                        addChild(AttributeListEdit.createAndAddValueScheme(_element));
+                        addToHideableForm(AttributeListEdit.createAndAddValueScheme(_element));
                         var multiLingualCheck:CheckboxInput = new CheckboxInput(LabelConstants.MULTILINGUAL, _element.multilingual == "true", function(val:Boolean):void {
                                         _element.multilingual = String(val);
@@ -85 +103 @@
                                 }, _element, "valueSchemeSimple");
                         
-                        addChild(multiLingualCheck);
+                        addToHideableForm(multiLingualCheck);
                         handleCMDAttributeList();
                 }
@@ -91 +109 @@
                 private function createEditBar():HBox {
                         var editBar:HBox = new HBox();
+                        
+                        editBar.addChild(getShowToggleBox());
+                        
                         editBar.addChild(createHeading());
                         var removeButton:Label = new RemoveLabelButton();
@@ -146 +167 @@
                 private function handleCMDAttributeList():void {
                         var attributeEdit:Container = new AttributeListEdit(_element, this);
-                        addChild(attributeEdit);
+                        addToHideableForm(attributeEdit);
                 }
 
@@ -156 +177 @@
                 }
 
-                private function addNameInput():void {
+                private function createNameInput():NameInputLine {
                         var nameInput:NameInputLine = new NameInputLine(_element.name, function(val:String):void {
                                         _element.name = val;
                         }, new ChildNameValidator(_parentComponent, element));
-                        addChild(nameInput);
+                        return nameInput;
                 }
         }

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/IsocatSearchPopUp.mxml

@@ -105 +105 @@
                         <mx:Button id="okBtn"
                                            label="OK"
-                                           click="handleOkClick()"/>
+                                           click="handleOkClick()"
+                                           enabled="{dataGrid.selectedItem != null}"
+                                           />
                         <mx:Button label="Cancel"
                                            click="cleanUp()"/>

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/model/CMDComponent.as

@@ -7 +7 @@
         import mx.events.CollectionEventKind;
 
+        [Bindable]
         public class CMDComponent implements XmlAble, AttributeContainer, ChangeTrackingCMDElement {
 

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/importer/Importer.mxml

@@ -5 +5 @@
                    height="100%"
                    label="Import file"
-                   implements="clarin.cmdi.componentregistry.common.components.RegistryView">
+                   implements="clarin.cmdi.componentregistry.common.components.RegistryView"
+                   >
 
         <mx:Script>
                 <![CDATA[
+                        import clarin.cmdi.componentregistry.common.ComponentMD;
+                        import clarin.cmdi.componentregistry.common.Credentials;
+                        import clarin.cmdi.componentregistry.common.ItemDescription;
+                        import clarin.cmdi.componentregistry.common.LabelConstants;
+                        import clarin.cmdi.componentregistry.common.Profile;
+                        import clarin.cmdi.componentregistry.common.components.RegistryViewStack;
+                        import clarin.cmdi.componentregistry.editor.InputValidators;
+                        import clarin.cmdi.componentregistry.services.Config;
+                        
+                        import mx.collections.ArrayCollection;
+                        import mx.controls.Alert;
+                        import mx.core.Application;
                         import mx.core.UIComponent;
-                        import clarin.cmdi.componentregistry.common.ComponentMD;
-                        import clarin.cmdi.componentregistry.common.Profile;
-                        import clarin.cmdi.componentregistry.services.Config;
                         import mx.events.ValidationResultEvent;
-                        import mx.collections.ArrayCollection;
                         import mx.validators.Validator;
-                        import clarin.cmdi.componentregistry.editor.InputValidators;
-                        import clarin.cmdi.componentregistry.common.LabelConstants;
-                        import clarin.cmdi.componentregistry.common.Credentials;
-                        import mx.core.Application;
-                        import clarin.cmdi.componentregistry.common.ItemDescription;
-                        import mx.controls.Alert;
 
                         private var validators:ArrayCollection = new ArrayCollection();
@@ -51 +54 @@
                                 }
                         }
+                        
+                        private function close():void{
+                                var viewStack:RegistryViewStack = this.parent as RegistryViewStack;
+                                viewStack.switchToBrowse(null);
+                        }
 
                         private function validate():Boolean {
@@ -204 +212 @@
                                                  uploadComplete="registryChange(event)"/>
         <mx:VBox>
+                
                 <mx:Form>
                         <mx:HBox>
@@ -245 +254 @@
                                                           width="300"/>
                         </mx:FormItem>
-                        <mx:Button label="Submit"
-                                           click="submit(event)"/>
+
+                        <mx:HBox>
+                                <mx:Button label="Submit"
+                                                   click="submit(event)"/>
+                                <mx:Button label="Close"
+                                                   click="close()"/>                            
+                        </mx:HBox>
+                        
                         <mx:ProgressBar id="uploadProgress"
                                                         label=""

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/main.mxml

@@ -72 +72 @@
                                         flexSpyButton.label="FlexSpy";
                                         flexSpyButton.addEventListener(MouseEvent.CLICK,showFlexSpy);
-                                        topBar.addChild(flexSpyButton);
+                                        flexSpyButton.setStyle("right","0");
+                                        flexSpyButton.setStyle("top","0");
+                                        addChild(flexSpyButton);
                                 }
                         }
@@ -86 +88 @@
                           height="100%"
                           layout="absolute"
-                          title="Clarin Component Browser"
+                          title="Clarin Component Registry"
                           x="0"
                           y="0">                          
-
-                <mx:VBox height="100%"
-                                 width="100%">
-                        <mx:HBox borderStyle="none" id="topBar"
-                                         width="100%">
-                                <mx:ToggleButtonBar id="toggleBar"
-                                                                        dataProvider="{viewStack}"/>
-                                <mx:Spacer width="90%"/>
-                                <mx:Label text="User: {Credentials.instance.userName}"/>
-                                <common:LoginLabelButton id="login" includeInLayout="{!Credentials.instance.isLoggedIn()}" visible="{!Credentials.instance.isLoggedIn()}" />
-                                <common:UserSettingsLabelButton id="userSettings" includeInLayout="{Credentials.instance.isLoggedIn()}" visible="{Credentials.instance.isLoggedIn()}"/>
+                
+                <mx:VBox height="100%" width="100%">                    
+                        
+                        <mx:HBox width="100%" id="topBar" styleName="topBar" verticalAlign="middle">
+                                <mx:Label width="20%" styleName="sectionTitle" paddingLeft="5" text="{viewStack.selectedChild.label}" />
+                        
+                                <mx:HBox width="80%" horizontalAlign="right" paddingRight="5">                                  
+                                        <mx:Label text="User: {Credentials.instance.userName}"/>
+                                        <common:LoginLabelButton id="login" includeInLayout="{!Credentials.instance.isLoggedIn()}" visible="{!Credentials.instance.isLoggedIn()}" />
+                                        <common:UserSettingsLabelButton id="userSettings" includeInLayout="{Credentials.instance.isLoggedIn()}" visible="{Credentials.instance.isLoggedIn()}"/>
+                                </mx:HBox>
                         </mx:HBox>
+                        
                         <common:RegistryViewStack id="viewStack"
                                                                           borderStyle="none"

ComponentRegistry/trunk/ComponentBrowserGui/src/main/resources/assets/css/main.css

@@ -63 +63 @@
 }
 
+.topBar{
+        backgroundColor: #DDE3EF;       
+}
+
+.sectionTitle {
+    fontWeight: bold;
+    fontSize: 18px;     
+}
 
 

ComponentRegistry/trunk/ComponentRegistry/CHANGES

@@ -1 +1 @@
 Bug Fixes and Features
 
-Release ComponentRegistry-1.12.0 (?):
+Release ComponentRegistry-1.12.0 (21 august 2012):
 - REST service produces 404 status when component requested that does not exist.
 - Users can delete their own comments from the Flex UI. http://trac.clarin.eu/ticket/185
@@ -11 +11 @@
 - If string element is set to multilingual, max occurences field gets disabled. http://trac.clarin.eu/ticket/208
 - Added 'close' link to user settings page. http://trac.clarin.eu/ticket/156
+- Removed 'unbounded' option from minimal occurrences drop-down in editor. http://trac.clarin.eu/ticket/210
+- Made elements and components in component editor collapsable. http://trac.clarin.eu/ticket/217
+- Removed top-level tabs in the Flex UI, added buttons to browser, editor and import for navigation. http://trac.clarin.eu/ticket/218
 
 Release ComponentRegistry-1.11.1 (10 april 2012):