TT#7700 Ngcp-csc move widget sidebar to left

As agreed in last csc meeting, we are moving the widget sidebar to the
left side. Also removed all occurrences of missing whitespaces between
config key and value pairs (f.ex. xtype:'form'), and a couple of
beautify changes.

Change-Id: Ifcd39b5952472328af87db21d2bd8990d8f73636
changes/69/10069/2
Robert Axelsen 9 years ago
parent 6564015177
commit 11ab57629d

@ -10,19 +10,19 @@ Ext.define('NgcpCsc.store.Languages', {
data: [
{
id: "en",
id: 'en',
language: 'English'
},{
id: "it",
id: 'it',
language: 'Italian'
},{
id: "de",
id: 'de',
language: 'German'
},{
id: "fr",
id: 'fr',
language: 'French'
},{
id: "sp",
id: 'sp',
language: 'Spanish'
}
]

@ -20,7 +20,7 @@ Ext.define('NgcpCsc.view.common.gridfilters.GridFilters', {
fieldLabel: Ngcp.csc.locales.filters.from[localStorage.getItem('languageSelected')],
name: 'from_date',
bind:{
value:'{from_date}',
value: '{from_date}',
maxValue: '{to_date}',
hidden: '{hidedatefilters}'
}

@ -8,6 +8,6 @@ Ext.define('NgcpCsc.view.gridfilters.GridFiltersModel', {
data: {
from_date: '',
to_date:''
to_date: ''
}
});

@ -5,11 +5,11 @@ Ext.define('NgcpCsc.view.webrtc.WebrtcModel', {
data: {
title: 123456789,
defaultThumbnail:'resources/images/icons/phoneicon.png',
thumbnail:'resources/images/icons/phoneicon.png',
status:'calling...',
defaultThumbnail: 'resources/images/icons/phoneicon.png',
thumbnail: 'resources/images/icons/phoneicon.png',
status: 'calling...',
callEnabled: false,
micEnabled:false,
videoEnabled:false
micEnabled: false,
videoEnabled: false
}
});

@ -23,7 +23,7 @@ Ext.define('NgcpCsc.view.common.webrtc.WebrtcPanel', {
},
listeners:{
beforeclose:'onBeforeClose'
beforeclose: 'onBeforeClose'
},
initComponent: function() {

@ -31,9 +31,9 @@ Ext.define('NgcpCsc.view.main.Main', {
items: [{
xtype: 'container',
reference: 'logo',
id:'logoContainer',
id: 'logoContainer',
cls: 'logo',
html:' ', // workaround to set the height
html: ' ', // workaround to set the height
width: (Ext.isIE9m || !Ext.os.is.Desktop) ? 64 : 250
}, {
margin: '0 0 0 8',

@ -9,9 +9,9 @@ Ext.define('Ngcp.csc.view.pages.BlankPage', {
anchor : '100% -1',
layout:{
type:'vbox',
pack:'center',
align:'center'
type: 'vbox',
pack: 'center',
align: 'center'
},
items: [

@ -10,8 +10,8 @@ Ext.define('NgcpCsc.view.pages.account.Account', {
initComponent: function() {
this.items = [{
layout: 'responsivecolumn',
userCls:'white-box',
margin:20,
userCls: 'white-box',
margin: 20,
padding: 10,
items: [{
padding: '0 0 5 0',
@ -29,7 +29,7 @@ Ext.define('NgcpCsc.view.pages.account.Account', {
margin: '20 0 0 0',
defaults: {
xtype: 'button',
flex:1
flex: 1
},
items: [{
text: Ngcp.csc.locales.account.change_password[localStorage.getItem('languageSelected')].toLowerCase(),

@ -12,7 +12,7 @@ Ext.define('NgcpCsc.view.pages.account.AccountForm', {
items: [{
xtype: 'container',
bind: '{username}',
margin:'0 0 10 0'
margin: '0 0 10 0'
}, {
xtype: 'textfield',
inputType: 'password',

@ -12,23 +12,6 @@ Ext.define('NgcpCsc.view.pages.addressbook.Addressbook', {
title: Ngcp.csc.locales.addressbook.title[localStorage.getItem('languageSelected')],
items : [{
userCls: 'big-70 small-100 white-box',
padding:10,
defaults: {
padding: 20
},
items: [{
html: Ngcp.csc.locales.addressbook.subtitle[localStorage.getItem('languageSelected')]
}, {
height: 60,
padding: '5 0 0 20',
html: Ext.String.format('<div class="addressbook-heading">{0} {1}</div>', Ngcp.csc.locales.addressbook.user_label[localStorage.getItem('languageSelected')], localStorage.getItem('username'))
},
{
xtype: 'addressbook-grid'
}
]
}, {
userCls: 'big-30 small-100 white-box',
defaults: {
padding: 20
@ -40,10 +23,10 @@ Ext.define('NgcpCsc.view.pages.addressbook.Addressbook', {
_isNested: true
}, {
xtype: 'form',
reference:'contactForm',
reference: 'contactForm',
defaults:{
xtype: 'textfield',
width:'100%'
width: '100%'
},
items: [{
focusable: true,
@ -107,5 +90,22 @@ Ext.define('NgcpCsc.view.pages.addressbook.Addressbook', {
handler: 'saveChanges'
}]
}]
}, {
userCls: 'big-70 small-100 white-box',
padding: 10,
defaults: {
padding: 20
},
items: [{
html: Ngcp.csc.locales.addressbook.subtitle[localStorage.getItem('languageSelected')]
}, {
height: 60,
padding: '5 0 0 20',
html: Ext.String.format('<div class="addressbook-heading">{0} {1}</div>', Ngcp.csc.locales.addressbook.user_label[localStorage.getItem('languageSelected')], localStorage.getItem('username'))
},
{
xtype: 'addressbook-grid'
}
]
}]
});

@ -15,7 +15,7 @@ Ext.define('NgcpCsc.view.pages.addressbook.AddressbookGrid', {
},
tbar: [{
xtype:'label',
xtype: 'label',
text: Ngcp.csc.locales.common.order_by[localStorage.getItem('languageSelected')]
},{
xtype: 'container',
@ -71,7 +71,7 @@ Ext.define('NgcpCsc.view.pages.addressbook.AddressbookGrid', {
}, {
flex: 1,
dataIndex: 'name',
renderer:'composeName'
renderer: 'composeName'
}, {
flex: 1,
dataIndex: 'company'

@ -20,7 +20,7 @@ Ext.define('NgcpCsc.view.pages.callbarring.CallBarring', {
this.items = [{
userCls: 'white-box',
margin:20,
margin: 20,
padding: 10,
items:[{
height: 60,

@ -17,12 +17,16 @@ Ext.define('NgcpCsc.view.pages.calls.Calls', {
this.setTitle(Ngcp.csc.locales.calls.section_title[localStorage.getItem('languageSelected')]);
this.setLayout('responsivecolumn');
}
this.items = [{
this.items = [Ext.create('NgcpCsc.view.common.gridfilters.GridFilters',{
userCls: 'big-30 small-100 white-box',
hidden: this._isDesktopSection,
_linkedStoreId: 'Calls'
}), {
padding: 30,
userCls: (!this._isDesktopSection) ? 'big-70 small-100 white-box' : '',
items: [{
html: Ngcp.csc.locales.calls.recent_calls[localStorage.getItem('languageSelected')],
padding:'0 0 20 0'
padding: '0 0 20 0'
}, {
xtype: 'container',
anchor: '100%',
@ -57,11 +61,7 @@ Ext.define('NgcpCsc.view.pages.calls.Calls', {
}
}
]
}, Ext.create('NgcpCsc.view.common.gridfilters.GridFilters',{
userCls: 'big-30 small-100 white-box',
hidden: this._isDesktopSection,
_linkedStoreId: 'Calls'
})];
}];
this.callParent();
}
})

@ -10,7 +10,7 @@ Ext.define('NgcpCsc.view.pages.calls.CallsGrid', {
_groupCallsByMonth: false,
listeners: {
cellclick:'onCellClicked'
cellclick: 'onCellClicked'
},
initComponent: function() {

@ -9,10 +9,10 @@ Ext.define('NgcpCsc.view.pages.chat.Chat', {
this.items = [{
xtype: 'chatlist',
userCls: 'big-30 small-100 white-box',
collapsible:true
collapsible: true
}, {
height: Ext.getCmp('mainContainer').getHeight() - 105 ,
xtype:'chatcontainer',
xtype: 'chatcontainer',
userCls: 'big-70 small-100 white-box'
}]
this.callParent();

@ -24,15 +24,15 @@ Ext.define('NgcpCsc.view.pages.chat.ChatContainer', {
name: 'new-message',
enableKeyEvents: true,
height: 100,
flex:8,
flex: 8,
emptyText: Ngcp.csc.locales.chat.msg_box.empty_text[localStorage.getItem('languageSelected')],
listeners: {
keypress: 'onPressEnter'
}
}, {
flex:1,
flex: 1,
xtype: 'button',
iconCls:'fa fa-send',
iconCls: 'fa fa-send',
cls: 'submit-new-message',
handler: 'onPressSubmitBtn'
}]

@ -5,7 +5,7 @@ Ext.define('NgcpCsc.view.pages.chat.ChatList', {
controller: 'chatlist',
itemId:'chatlist',
itemId: 'chatlist',
title: Ngcp.csc.locales.chat.title[localStorage.getItem('languageSelected')],

@ -2,8 +2,8 @@ Ext.define('NgcpCsc.view.pages.chat.ChatModel', {
extend: 'Ext.app.ViewModel',
alias: 'viewmodel.chat',
data: {
new_message:'',
chatEnabled:false
new_message: '',
chatEnabled: false
},
formulas: {},
stores: {

@ -16,7 +16,7 @@ Ext.define('NgcpCsc.view.pages.faxsend.FaxSend', {
layout: 'responsivecolumn',
margin:20,
margin: 20,
padding: 10,
@ -28,12 +28,12 @@ Ext.define('NgcpCsc.view.pages.faxsend.FaxSend', {
height: 60,
html: Ngcp.csc.locales.faxsend.subtitle[localStorage.getItem('languageSelected')]
}, {
reference:'faxsendForm',
reference: 'faxsendForm',
xtype: 'faxsendform',
width:'100%'
width: '100%'
}, {
layout: 'hbox',
width:'99%',
width: '99%',
defaults: {
xtype: 'button',
flex: 1

@ -11,8 +11,13 @@ Ext.define('NgcpCsc.view.pages.faxspool.FaxSpool', {
initComponent: function() {
this.items = [{
userCls: 'big-30 small-100 white-box',
padding: 20,
xtype: 'gridfilters',
_linkedStoreId: 'FaxSpool'
}, {
userCls: 'big-70 small-100 white-box',
padding:30,
padding: 30,
items: [{
height: 40,
html: Ngcp.csc.locales.faxspool.subtitle[localStorage.getItem('languageSelected')]
@ -23,11 +28,6 @@ Ext.define('NgcpCsc.view.pages.faxspool.FaxSpool', {
}, {
xtype: 'faxspool-grid'
}]
}, {
userCls: 'big-30 small-100 white-box',
padding:20,
xtype: 'gridfilters',
_linkedStoreId: 'FaxSpool'
}];
this.callParent();
}

@ -12,14 +12,7 @@ Ext.define('NgcpCsc.view.pages.summary.Summary', {
layout: 'responsivecolumn',
items: [{
xtype: 'calls',
userCls: 'big-70 small-100 white-box',
_isDesktopSection: true
}, {
userCls: 'big-30 small-100',
defaults: {
cls: 'white-box reduced-margin'
},
userCls: 'big-30 small-100 white-box',
items: [{
padding: 20,
defaults: {
@ -102,5 +95,9 @@ Ext.define('NgcpCsc.view.pages.summary.Summary', {
}]
}]
}]
}, {
xtype: 'calls',
userCls: 'big-70 small-100 white-box',
_isDesktopSection: true
}]
});

@ -149,7 +149,7 @@ Ext.define('NgcpCsc.view.pages.themeroller.ThemeRoller', {
items: [{
xtype: 'filefield',
fieldLabel: Ngcp.csc.locales.themeroller.logo[localStorage.getItem('languageSelected')],
reference:'logoField',
reference: 'logoField',
listeners: {
change: 'toggleLogo'
}

@ -19,21 +19,8 @@ Ext.define('NgcpCsc.view.pages.voicemails.VoiceMails', {
});
this.items = [{
userCls: 'big-70 small-100 white-box',
padding: 10,
items: [{
height: 60,
padding: '20 0 5 20',
html: Ngcp.csc.locales.voicemails.subtitle[localStorage.getItem('languageSelected')]
}, {
height: 60,
padding: '5 0 0 20',
html: Ext.String.format('<div class="voicemails-heading">{0} {1}</div>', Ngcp.csc.locales.voicemails.user_label[localStorage.getItem('languageSelected')], localStorage.getItem('username'))
}, grid]
}, {
userCls: 'big-30 small-100',
userCls: 'big-30 small-100 white-box',
defaults: {
cls: 'white-box reduced-margin',
padding: 20
},
items: [{
@ -81,6 +68,18 @@ Ext.define('NgcpCsc.view.pages.voicemails.VoiceMails', {
}]
}]
}]
}, {
userCls: 'big-70 small-100 white-box',
padding: 10,
items: [{
height: 60,
padding: '20 0 5 20',
html: Ngcp.csc.locales.voicemails.subtitle[localStorage.getItem('languageSelected')]
}, {
height: 60,
padding: '5 0 0 20',
html: Ext.String.format('<div class="voicemails-heading">{0} {1}</div>', Ngcp.csc.locales.voicemails.user_label[localStorage.getItem('languageSelected')], localStorage.getItem('username'))
}, grid]
}];
this.callParent();
}

@ -12,7 +12,7 @@ Ext.define('NgcpCsc.view.pages.voicemails.VoiceMailsGrid', {
padding: 10,
listeners: {
cellclick:'onCellClicked'
cellclick: 'onCellClicked'
},
columns: {
@ -43,7 +43,7 @@ Ext.define('NgcpCsc.view.pages.voicemails.VoiceMailsGrid', {
text: Ngcp.csc.locales.common.duration[localStorage.getItem('languageSelected')]
}, {
flex: 1,
xtype:'datecolumn',
xtype: 'datecolumn',
dataIndex: 'time',
text: Ngcp.csc.locales.common.date[localStorage.getItem('languageSelected')],
format: 'd.m.Y h:i:s',

Loading…
Cancel
Save