Merge branch 'master' of https://github.com/pimcore/customer-data-framework

Author: kzumueller

src/Resources/public/js/SegmentAssignmentView.js

@@ -11,20 +11,36 @@ pimcore.plugin.customermanagementframework.segmentAssignmentTab = Class.create({
             return this.layout;
         }
 
-        var classStore = pimcore.globalmanager.get("object_types_store");
+
+        var inheritancePanel = new Ext.create('Ext.form.FieldSet', {
+            title: t('cmf_segmentAssignment_inheritanceSettings'),
+            items: [
+                this.getInheritablePanel(), this.getCheckBox()
+            ]
+        });
+
+        var assignmentPanel = new Ext.create('Ext.form.FieldSet', {
+            title: t('cmf_segmentAssignment_assignment'),
+            items: [
+                this.getAssignedPanel()
+            ]
+        });
 
         return this.layout = new Ext.Panel({
             title: t('segmentAssignment'),
             border: false,
             iconCls: "plugin_cmf_icon_actiontriggerrule_ExecuteSegmentBuilders",
+            bodyStyle:'padding:0 10px 0 10px;',
+            cls: "pimcore_object_panel_edit",
             tbar: [],
-            items: [this.getInheritablePanel(), this.getCheckBox(), this.getAssignedPanel()]
+            items: [inheritancePanel, assignmentPanel]
         });
     },
 
     getInheritablePanel: function () {
         this.inheritableStore = new Ext.data.Store({
             autoDestroy: true,
+            autoLoad: true,
             proxy: {
                 type: 'ajax',
                 url: '/admin/customermanagementframework/segment-assignment/inheritable-segments?id=' + this.object.id + '&type=' + this.type,
@@ -36,16 +52,21 @@ pimcore.plugin.customermanagementframework.segmentAssignmentTab = Class.create({
             fields: ['id', 'name', 'type']
         });
 
-        this.inheritableStore.load();
-
         this.inheritableGrid = Ext.create('Ext.grid.Panel', {
+            minHeight: 80,
+            border: true,
             tbar: {
                 items: [
-                    Ext.create('Ext.toolbar.TextItem', {
-                        text: t('inheritableAssignments')
-                    })
-                ]
+                    {
+                        xtype: "tbtext",
+                        text: "<b>" + t('cmf_segmentAssignment_inheritableAssignments') + "</b>"
+                    }
+                ],
+                ctCls: "pimcore_force_auto_width",
+                cls: "pimcore_force_auto_width",
+                minHeight: 36
             },
+            bodyCssClass: "pimcore_object_tag_objects",
             store: this.inheritableStore,
             columns: [
                 {header: 'Id', sortable: false, dataIndex: 'id', flex: 1},
@@ -61,21 +82,20 @@ pimcore.plugin.customermanagementframework.segmentAssignmentTab = Class.create({
             pimcore.helpers.openObject(data.data.id, data.data.type);
         });
 
+
         return this.inheritableGrid;
     },
 
     getCheckBox: function () {
         var inheritableGrid = this.inheritableGrid;
 
         this.breaksInheritance = Ext.create('Ext.form.FormPanel', {
-            bodyStyle: {
-                "background-color": '#ececec'
-            },
             items: [
                 {
                     xtype: 'checkbox',
-                    boxLabel: t('cmf.breaksInheritance'),
+                    boxLabel: t('cmf_segmentAssignment_breakInheritance'),
                     inputValue: '1',
+                    style: "padding-top: 10px",
                     checked: false,
                     handler: function (target, checkedState) {
                         inheritableGrid.setDisabled(checkedState);
@@ -97,7 +117,7 @@ pimcore.plugin.customermanagementframework.segmentAssignmentTab = Class.create({
                 checkBox.setValue(data.breaksInheritance === '1');
             },
             failure: function (response) {
-                pimcore.helpers.showNotification(t("error"), t("plugin_cmf_segment_assignment_error"), "error", response.responseText);
+                pimcore.helpers.showNotification(t("error"), t("cmf_segmentAssignment_segment_assignment_error"), "error", response.responseText);
             }
         });
 
@@ -126,24 +146,33 @@ pimcore.plugin.customermanagementframework.segmentAssignmentTab = Class.create({
         this.assignedStore.load();
 
         var assignedGrid = Ext.create('Ext.grid.Panel', {
+            minHeight: 90,
+            border: true,
+            cls: 'object_field',
             tbar: {
                 items: [
                     Ext.create('Ext.toolbar.Spacer', {
                         width: 20,
                         height: 16,
                         cls: "pimcore_icon_droptarget"
                     }),
-                    Ext.create('Ext.toolbar.TextItem', {
-                        text: t('assignedSegments')
-                    }),
+                    {
+                        xtype: "tbtext",
+                        text: "<b>" + t('cmf_segmentAssignment_assignedSegments') + "</b>"
+                    },
+                    "->",
                     {
                         xtype: "button",
                         iconCls: "pimcore_icon_search",
                         handler: this.openSearchEditor.bind(this)
                     }
-                ]
+                ],
+                ctCls: "pimcore_force_auto_width",
+                cls: "pimcore_force_auto_width"
             },
+            bodyCssClass: "pimcore_object_tag_objects",
             store: this.assignedStore,
+
             columns: [
                 {header: 'Id', sortable: false, dataIndex: 'id', flex: 1},
                 {header: 'Name', sortable: false, dataIndex: 'name', flex: 3},
@@ -264,7 +293,7 @@ pimcore.plugin.customermanagementframework.segmentAssignmentTab = Class.create({
                     console.log(response.responseText);
                 },
                 failure: function(response) {
-                    pimcore.helpers.showNotification(t("error"), t("plugin_cmf_segment_assignment_error"), "error", response.responseText);
+                    pimcore.helpers.showNotification(t("error"), t("cmf_segmentAssignment_segment_assignment_error"), "error", response.responseText);
                 }
             }
         );

src/Resources/translations/admin.de.yml

@@ -3,9 +3,9 @@ plugin_cmf_customerview: "Kunden"
 plugin_cmf_customerduplicatesview: "Kunden-Duplikate"
 plugin_cmf_customerautomationrules: "Kunden-Automatisierungsregeln"
 plugin_cmf_actiontriggerrule_add_rule: "Regel hinzufügen"
-plugin_cmf_actiontriggerrule_add_rule_enter_name: "Geben Sie den Namen der neuen Regel ein"
 plugin_cmf_icon_rule_triggers: "Trigger"
 plugin_cmf_actiontrigger_rule_saved_successfully: "Regel erfolgreich gespeichert"
+plugin_cmf_actiontriggerrule_add_rule_enter_name: "Geben Sie den Namen der neuen Regel ein"
 plugin_cmf_actiontriggerrule_triggerNewActivity: "Neue Kundenaktivität"
 plugin_cmf_actiontriggerrule_triggerExecuteSegmentBuilders: "Segmentbildung"
 plugin_cmf_actiontriggerrule_triggerCron: "Cron"
@@ -32,4 +32,14 @@ plugin_cmf_newsletter_queue_running_tooltip: "Newsletter Sync läuft"
 plugin_cmf_newsletter_export_template: "MailChimp Template Export"
 plugin_cmf_newsletter_export_template_success: "Templateexport erfolgreich"
 plugin_cmf_newsletter_export_template_error: "Templateexport fehlgeschlagen"
-segmentAssignment: "Segment Zuweisung"
+segmentAssignment: "Segment Tagging"
+plugin_cmf_perm_activityview: "CMF Aktivitäten"
+plugin_cmf_perm_customerview: "CMF Kunden"
+plugin_cmf_perm_customer_automation_rules: "CMF Automatisierungsregeln für Kunden"
+plugin_cmf_perm_newsletter_enqueue_all_customers: "CMF Newletter Kunden Exportieren"
+cmf_segmentAssignment_inheritanceSettings: "Vererbungseinstellungen"
+cmf_segmentAssignment_assignment: "Segemente direkt zuweisen"
+cmf_segmentAssignment_inheritableAssignments: "Vererbbare Segmente"
+cmf_segmentAssignment_breakInheritance: "Vererbung ausschalten"
+cmf_segmentAssignment_segment_assignment_error: "Segment Tagging Fehler"
+cmf_segmentAssignment_assignedSegments: "Zugewiesene Segments"

src/Resources/translations/admin.en.yml

@@ -19,9 +19,9 @@ plugin_cmf_actiontriggerrule_countactivities_must_be: "must be"
 plugin_cmf_actiontriggerrule_not: "not"
 plugin_cmf_actiontriggerrule_changefieldvalue_field: "Field"
 plugin_cmf_actiontriggerrule_changefieldvalue_value: "Value"
+plugin_cmf_actiontriggerrule_actionChangeFieldValue: "Change customer field value"
 plugin_cmf_actiontriggerrule_cron_definition: "Definition"
 plugin_cmf_actiontriggerrule_cron_croneditor: "online cron format generator"
-plugin_cmf_actiontriggerrule_actionChangeFieldValue: "Change customer field value"
 plugin_cmf_actiontriggerrule_addsegment_remove-other-segments-from-group: "remove other segments from selected segment group"
 plugin_cmf_customer: "Customer"
 custom_report_adapter_termSegmentBuilder: "TermSegmentBuilderDefinition"
@@ -32,8 +32,14 @@ plugin_cmf_newsletter_queue_running_tooltip: "Newsletter sync queue running"
 plugin_cmf_newsletter_export_template: "Export Template to MailChimp"
 plugin_cmf_newsletter_export_template_success: "Export Template successful"
 plugin_cmf_newsletter_export_template_error: "Export Template failed"
-segmentAssignment: "Segment Assignment"
+segmentAssignment: "Segment Tagging"
 plugin_cmf_perm_activityview: "CMF Activity View"
 plugin_cmf_perm_customerview: "CMF Customer View"
 plugin_cmf_perm_customer_automation_rules: "CMF Customer Automation Rules"
-plugin_cmf_perm_newsletter_enqueue_all_customers: "CMF Newletter Enqueue Customers"
+plugin_cmf_perm_newsletter_enqueue_all_customers: "CMF Newletter Enqueue Customers"
+cmf_segmentAssignment_inheritanceSettings: "Inheritance Settings"
+cmf_segmentAssignment_assignment: "Assign Segments Directly"
+cmf_segmentAssignment_inheritableAssignments: "Inheritable Segments"
+cmf_segmentAssignment_breakInheritance: "Deactivate Inheritance"
+cmf_segmentAssignment_segment_assignment_error: "Segment Assignment Error"
+cmf_segmentAssignment_assignedSegments: "Assigned Segments"