Content Hub: push menu

CoreMedia · Feb 5, 2019 · ca49c45 · ca49c45
1 parent 49bb9b0
commit ca49c45
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/...main/joo/com/coremedia/blueprint/studio/connectors/AddPushButtonToPreviewToolbarPlugin.as b/...main/joo/com/coremedia/blueprint/studio/connectors/AddPushButtonToPreviewToolbarPlugin.as
@@ -8,7 +8,6 @@ import com.coremedia.ui.skins.ButtonSkin;
 
 import ext.Component;
 import ext.Plugin;
-import ext.toolbar.Separator;
 
 public class AddPushButtonToPreviewToolbarPlugin implements Plugin {
   private var previewToolbar:PreviewPanelToolbar;
@@ -29,9 +28,7 @@ public class AddPushButtonToPreviewToolbarPlugin implements Plugin {
       'ui': ButtonSkin.WORKAREA.getSkin()
     }));
 
-    previewToolbar.insert(6, new Separator());
     previewToolbar.insert(6, pushButton);
-    previewToolbar.insert(6, new Separator());
   }
 }
 }
diff --git a/.../src/main/joo/com/coremedia/blueprint/studio/connectors/ConnectorsStudioPlugin.properties b/.../src/main/joo/com/coremedia/blueprint/studio/connectors/ConnectorsStudioPlugin.properties
@@ -15,8 +15,9 @@ refreshing_message = Updating...
 
 # Content Push
 upload_properties_title = Upload Properties
-upload_dialog_title = Upload Content Properties
+upload_dialog_title = Upload Content to {0}
 upload_button_tooltip = Upload Content to External Systems
+upload_folder_label = Target Folder
 
 folder_label = Folder
 reference_folder_label = Folder

diff --git a/...udio/src/main/joo/com/coremedia/blueprint/studio/connectors/push/ConnectionTreePanel.mxml b/...udio/src/main/joo/com/coremedia/blueprint/studio/connectors/push/ConnectionTreePanel.mxml
@@ -10,7 +10,6 @@
                                width="230"
                                useArrows="true"
                                cls="cm-library-tree"
-                               title="{resourceManager.getString('com.coremedia.blueprint.studio.connectors.ConnectorsStudioPlugin', 'folder_label')}"
                                rootVisible="false">
   <fx:Script><![CDATA[
     import com.coremedia.ui.data.ValueExpressionFactory;

diff --git a/...ectors-studio/src/main/joo/com/coremedia/blueprint/studio/connectors/push/PushDialog.mxml b/...ectors-studio/src/main/joo/com/coremedia/blueprint/studio/connectors/push/PushDialog.mxml
@@ -4,7 +4,7 @@
                       xmlns:exml="http://www.jangaroo.net/exml/0.8"
                       xmlns:ui="exml:com.coremedia.ui.config"
                       xmlns="exml:ext.config"
-                      title="{resourceManager.getString('com.coremedia.blueprint.studio.connectors.ConnectorsStudioPlugin', 'upload_dialog_title')}"
+                      title="{StringUtil.format(resourceManager.getString('com.coremedia.blueprint.studio.connectors.ConnectorsStudioPlugin', 'upload_dialog_title'), config.rootCategory.getConnector().getDisplayName())}"
                       width="400"
                       height="460"
                       modal="true"
@@ -16,8 +16,11 @@
   </fx:Metadata>
   <fx:Script><![CDATA[
     import com.coremedia.ui.skins.ButtonSkin;
+    import com.coremedia.ui.skins.DisplayFieldSkin;
     import com.coremedia.ui.skins.WindowSkin;
 
+    import ext.StringUtil;
+
     public static const xtype:String = "com.coremedia.blueprint.studio.connectors.push.pushDialog";
 
     private var config:PushDialog;
@@ -26,10 +29,13 @@
     ]]></fx:Script>
 
   <local:items>
-    <local:ConnectionTreePanel flex="1" rootCategory="{config.rootCategory}"
+    <DisplayField ui="{DisplayFieldSkin.BOLD.getSkin()}" value="{resourceManager.getString('com.coremedia.blueprint.studio.connectors.ConnectorsStudioPlugin', 'upload_folder_label')}" />
+    <local:ConnectionTreePanel flex="1"
+                               rootCategory="{config.rootCategory}"
                                selectionExpression="{getSelectedCategoryExpression(config.rootCategory)}"/>
     <Container height="6"/>
-    <CheckboxGroup fieldLabel="{resourceManager.getString('com.coremedia.blueprint.studio.connectors.ConnectorsStudioPlugin', 'upload_properties_title')}" labelAlign="top" labelSeparator="">
+    <DisplayField ui="{DisplayFieldSkin.BOLD.getSkin()}" value="{resourceManager.getString('com.coremedia.blueprint.studio.connectors.ConnectorsStudioPlugin', 'upload_properties_title')}" />
+    <Container>
       <plugins>
         <ui:BindComponentsPlugin valueExpression="{getPropertyNamesExpression(config.rootCategory, config.selectedItemsValueExpression)}"
                                  configBeanParameterName="propertyName"
@@ -44,7 +50,7 @@
       <layout>
         <layout_VBox align="stretch" />
       </layout>
-    </CheckboxGroup>
+    </Container>
   </local:items>
   <local:layout>
     <layout_VBox align="stretch"/>