diff --git a/tine20/Filemanager/js/DuplicateFileUploadDialog.js b/tine20/Filemanager/js/DuplicateFileUploadDialog.js
index 1cd2cea128d..4d3a6936e0e 100644
--- a/tine20/Filemanager/js/DuplicateFileUploadDialog.js
+++ b/tine20/Filemanager/js/DuplicateFileUploadDialog.js
@@ -6,6 +6,8 @@
* @copyright Copyright (c) 2021 Metaways Infosystems GmbH (http://www.metaways.de)
*/
+import {PersonaContainer, Personas} from "../../Tinebase/js/ux/vue/PersonaContainer";
+
Ext.ns('Tine.Filemanager');
Tine.Filemanager.DuplicateFileUploadDialog = Ext.extend(Ext.FormPanel, {
@@ -59,7 +61,7 @@ Tine.Filemanager.DuplicateFileUploadDialog = Ext.extend(Ext.FormPanel, {
];
this.initButtons();
-
+
this.itemsName = this.id + '-radioItems';
this.items = {
@@ -68,30 +70,25 @@ Tine.Filemanager.DuplicateFileUploadDialog = Ext.extend(Ext.FormPanel, {
layoutConfig: {
align:'stretch'
},
- items : [
- {
- border: false,
- html: '
' +
- '
' + i18n._('An error occurred, the program ended abnormal.') + '
' +
- '
' + i18n._('The last action you made was potentially not performed correctly.') + '
' +
- '
' + i18n._('Please help improving this software and notify the vendor. Include a brief description of what you where doing when the error occurred.') + '
' +
- '
'
- }, {
- id: 'tb-exceptiondialog-description',
- height: 60,
- xtype: 'textarea',
- fieldLabel: i18n._('Description'),
- name: 'description',
- anchor: '95%',
- readOnly: false
- }, {
- xtype: 'fieldset',
- id: 'tb-exceptiondialog-send-contact',
- anchor: '95%',
- title: i18n._('Send Contact Information'),
- autoHeight: true,
- checkboxToggle: true,
- items: [{
- id: 'tb-exceptiondialog-contact',
- xtype: 'textfield',
- hideLabel: true,
- anchor: '100%',
- name: 'contact',
- value: (this.currentAccount) ? this.currentAccount.accountFullName + ' ' + this.currentAccount.accountEmailAddress : 'unknown'
- }]
- }, {
+ layoutConfig: {
+ align: 'stretchmax'
+ },
+ items: [
+ new PersonaContainer({
+ persona: Personas.ERROR_SEVERE,
+ flex: 0,
+ width: 100,
+ height: 200
+ }),
+ {
+ border: false,
+ flex: 1,
+ layout: 'form',
+ items: [
+ {
+ xtype: 'panel',
+ border: false,
+ html: '' +
+ '
' + i18n._('An error occurred, the program ended abnormal.') + '
' +
+ '
' + i18n._('The last action you made was potentially not performed correctly.') + '
' +
+ '
' + i18n._('Please help improving this software and notify the vendor. Include a brief description of what you where doing when the error occurred.') + '
' +
+ '
'
+ }, {
+ id: 'tb-exceptiondialog-description',
+ height: 60,
+ xtype: 'textarea',
+ fieldLabel: i18n._('Description'),
+ name: 'description',
+ anchor: '95%',
+ readOnly: false
+ }, {
+ xtype: 'fieldset',
+ id: 'tb-exceptiondialog-send-contact',
+ anchor: '95%',
+ title: i18n._('Send Contact Information'),
+ autoHeight: true,
+ checkboxToggle: true,
+ items: [{
+ id: 'tb-exceptiondialog-contact',
+ xtype: 'textfield',
+ hideLabel: true,
+ anchor: '100%',
+ name: 'contact',
+ value: (this.currentAccount) ? this.currentAccount.accountFullName + ' ' + this.currentAccount.accountEmailAddress : 'unknown'
+ }]
+ },
+ ]
+ }
+ ]
+ },{
xtype: 'panel',
width: '95%',
layout: 'form',
diff --git a/tine20/Tinebase/js/PasswordChangeDialog.js b/tine20/Tinebase/js/PasswordChangeDialog.js
index 1ccf82e2ce0..9bcdc23a470 100644
--- a/tine20/Tinebase/js/PasswordChangeDialog.js
+++ b/tine20/Tinebase/js/PasswordChangeDialog.js
@@ -6,8 +6,10 @@
* @copyright Copyright (c) 2010-2017 Metaways Infosystems GmbH (http://www.metaways.de)
*
*/
-
- Ext.ns('Tine', 'Tine.Tinebase');
+
+ // import {PersonaContainer, Personas} from "./ux/vue/PersonaContainer";
+
+Ext.ns('Tine', 'Tine.Tinebase');
/**
* @namespace Tine.Tinebase
@@ -20,10 +22,10 @@ Tine.Tinebase.PasswordChangeDialog = Ext.extend(Ext.Window, {
closeAction: 'close',
modal: true,
width: 350,
- height: 350,
+ height: 230,
minWidth: 350,
minHeight: 230,
- layout: 'fit',
+ layout: 'column',
plain: true,
title: null,
// password or pin
@@ -38,8 +40,12 @@ Tine.Tinebase.PasswordChangeDialog = Ext.extend(Ext.Window, {
this.passwordLabel,
this.currentAccount.accountDisplayName
);
-
- this.items = new Ext.FormPanel({
+ this.items = []
+ // const persona = new PersonaContainer({persona: Personas.QUESTION_CONFIRM, columnWidth: .2})
+ // this.items.push(persona)
+ this.items.push(new Ext.FormPanel({
+ // columnWidth: .8,
+ autoHeight: true,
bodyStyle: 'padding:5px;',
buttonAlign: 'right',
labelAlign: 'top',
@@ -142,7 +148,7 @@ Tine.Tinebase.PasswordChangeDialog = Ext.extend(Ext.Window, {
},
scope: this
}]
- });
+ }));
Tine.Tinebase.PasswordChangeDialog.superclass.initComponent.call(this);
}
diff --git a/tine20/Tinebase/js/ux/vue/PersonaContainer/PersonaContainer.vue b/tine20/Tinebase/js/ux/vue/PersonaContainer/PersonaContainer.vue
new file mode 100644
index 00000000000..5d58c9de694
--- /dev/null
+++ b/tine20/Tinebase/js/ux/vue/PersonaContainer/PersonaContainer.vue
@@ -0,0 +1,55 @@
+
+