1 files changed, 11 insertions, 6 deletions
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/AccountPanel.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/AccountPanel.js
index ee6d7a3..d6b0574 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/AccountPanel.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/AccountPanel.js
@@ -32,24 +32,28 @@ Clipperz.PM.UI.Web.Components.AccountPanel = function(args) {
        //this._initiallySelectedTab = args.selected || 'ACCOUNT';
        this._initiallySelectedTab = args.selected || 'PASSPHRASE';
        this._tabPanelControllerConfiguration = {
        //      'ACCOUNT': {
        //                      tab:'accountTab',
        //                      panel:'accountPanel'
        //      },
                'PASSPHRASE': {
                                tab:'passphraseTab',
                                panel:'passphrasePanel'
                },
+                'OTP': {
+                                tab:'OTPTab',
+                                panel:'OTPPanel'
+                },
                'PREFERENCES': {
                                tab:'preferencesTab',
                                panel:'preferencesPanel'
                },
                'LOGIN_HISTORY': {
                                tab:'loginHistoryTab',
                                panel:'loginHistoryPanel'
                }
        };
        return this;
 }
@@ -65,24 +69,25 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.AccountPanel, Clipperz.PM.UI.
        },
        //-------------------------------------------------------------------------
        'renderSelf': function(/*aContainer, aPosition*/) {
 //Clipperz.log("AccountPanel.renderSelf element", this.element());
                this.append(this.element(), [
                        {tag:'div', cls:'header', children:[
                                {tag:'div', cls:'subPanelTabs', children:[
                                        {tag:'ul', children:[
        //                                              {tag:'li', id:this.getId('accountTab'),                 children:[{tag:'a', href:'#', html:'Account'}], cls:'first'},
                                                        {tag:'li', id:this.getId('passphraseTab'),      children:[{tag:'a', href:'#', html:'Passphrase'}], cls:'first'},
+                                                        {tag:'li', id:this.getId('OTPTab'),                     children:[{tag:'a', href:'#', html:'One Time Passwords'}]},
                                                        {tag:'li', id:this.getId('preferencesTab'),     children:[{tag:'a', href:'#', html:'Preferences'}]},
                                                        {tag:'li', id:this.getId('loginHistoryTab'),children:[{tag:'a', href:'#', html:'Login history'}]}
                                        ]}
                                ]}
                        ]},
                        {tag:'div', cls:'body', children:[
                                {tag:'div', cls:'accountPanel', children:[
                                        {tag:'div', cls:'subPanelContent', children:[
                                                {tag:'ul', children:[
        //                                                      {tag:'li', id:this.getId('accountPanel'),children:[
        //                                                      {tag:'h3', html:"-- Account --"}
        //                                              ]},
@@ -108,34 +113,34 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.AccountPanel, Clipperz.PM.UI.
                                                                                        {tag:'label', html:"re-new passphrase", 'for':this.getId('reNewPassphrase')},
                                                                                        {tag:'input', id:this.getId('reNewPassphrase')}
                                                                                ]}
                                                                        ]},
                                                                        {tag:'div', cls:'confirm', children:[
                                                                                {tag:'input', type:'checkbox', id:this.getId('confirm')},
                                                                                {tag:'label', html:"I understand that Clipperz will not be able to recover a lost passphrase", 'for':this.getId('confirm')}
                                                                        ]}
                                                                ]},
                                                                {tag:'div', cls:'clear'},
                                                                {tag:'div', cls:'confirmButton', id:this.getId('confirmationButton'), children:[
                                                                        {tag:'span', html:"change passphrase"}
-                                                                ]},
+                                                                ]}
+                                                        ]},
-                                                                {tag:'h3', cls:'manageOTP', html:"Manage One-Time Passphrases"},
+                                                                {tag:'li', id:this.getId('OTPPanel'),   children:[
-                                                                {}
+        //                                                      {tag:'h3', html:"Manage One-Time Passphrases"}
                                                        ]},
                                                                {tag:'li', id:this.getId('preferencesPanel'),   children:[
-                                                                {tag:'h3', html:"-- Preferences --"}
+        //                                                      {tag:'h3', html:"-- Preferences --"}
                                                        ]},
                                                                {tag:'li', id:this.getId('loginHistoryPanel'),  children:[
-                                                                {tag:'h3', html:"-- Login History --"}
+        //                                                      {tag:'h3', html:"-- Login History --"}
                                                        ]}
                                                ]}
                                        ]}
                                ]}
                        ]},
                        {tag:'div', cls:'footer'}
                ]);
                
                this.tabPanelController().setup({selected:this.initiallySelectedTab()});
        },
        
        //-------------------------------------------------------------------------

diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/AccountPanel.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/AccountPanel.js index ee6d7a3..d6b0574 100644 --- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/AccountPanel.js +++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/AccountPanel.js
@@ -32,24 +32,28 @@ Clipperz.PM.UI.Web.Components.AccountPanel = function(args) {
32		32
33	//this._initiallySelectedTab = args.selected \|\| 'ACCOUNT';	33	//this._initiallySelectedTab = args.selected \|\| 'ACCOUNT';
34	this._initiallySelectedTab = args.selected \|\| 'PASSPHRASE';	34	this._initiallySelectedTab = args.selected \|\| 'PASSPHRASE';
35	this._tabPanelControllerConfiguration = {	35	this._tabPanelControllerConfiguration = {
36	// 'ACCOUNT': {	36	// 'ACCOUNT': {
37	// tab:'accountTab',	37	// tab:'accountTab',
38	// panel:'accountPanel'	38	// panel:'accountPanel'
39	// },	39	// },
40	'PASSPHRASE': {	40	'PASSPHRASE': {
41	tab:'passphraseTab',	41	tab:'passphraseTab',
42	panel:'passphrasePanel'	42	panel:'passphrasePanel'
43	},	43	},
		44	'OTP': {
		45	tab:'OTPTab',
		46	panel:'OTPPanel'
		47	},
44	'PREFERENCES': {	48	'PREFERENCES': {
45	tab:'preferencesTab',	49	tab:'preferencesTab',
46	panel:'preferencesPanel'	50	panel:'preferencesPanel'
47	},	51	},
48	'LOGIN_HISTORY': {	52	'LOGIN_HISTORY': {
49	tab:'loginHistoryTab',	53	tab:'loginHistoryTab',
50	panel:'loginHistoryPanel'	54	panel:'loginHistoryPanel'
51	}	55	}
52	};	56	};
53		57
54	return this;	58	return this;
55	}	59	}
@@ -65,24 +69,25 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.AccountPanel, Clipperz.PM.UI.
65	},	69	},
66		70
67	//-------------------------------------------------------------------------	71	//-------------------------------------------------------------------------
68		72
69	'renderSelf': function(/aContainer, aPosition/) {	73	'renderSelf': function(/aContainer, aPosition/) {
70	//Clipperz.log("AccountPanel.renderSelf element", this.element());	74	//Clipperz.log("AccountPanel.renderSelf element", this.element());
71	this.append(this.element(), [	75	this.append(this.element(), [
72	{tag:'div', cls:'header', children:[	76	{tag:'div', cls:'header', children:[
73	{tag:'div', cls:'subPanelTabs', children:[	77	{tag:'div', cls:'subPanelTabs', children:[
74	{tag:'ul', children:[	78	{tag:'ul', children:[
75	// {tag:'li', id:this.getId('accountTab'), children:[{tag:'a', href:'#', html:'Account'}], cls:'first'},	79	// {tag:'li', id:this.getId('accountTab'), children:[{tag:'a', href:'#', html:'Account'}], cls:'first'},
76	{tag:'li', id:this.getId('passphraseTab'), children:[{tag:'a', href:'#', html:'Passphrase'}], cls:'first'},	80	{tag:'li', id:this.getId('passphraseTab'), children:[{tag:'a', href:'#', html:'Passphrase'}], cls:'first'},
		81	{tag:'li', id:this.getId('OTPTab'), children:[{tag:'a', href:'#', html:'One Time Passwords'}]},
77	{tag:'li', id:this.getId('preferencesTab'), children:[{tag:'a', href:'#', html:'Preferences'}]},	82	{tag:'li', id:this.getId('preferencesTab'), children:[{tag:'a', href:'#', html:'Preferences'}]},
78	{tag:'li', id:this.getId('loginHistoryTab'),children:[{tag:'a', href:'#', html:'Login history'}]}	83	{tag:'li', id:this.getId('loginHistoryTab'),children:[{tag:'a', href:'#', html:'Login history'}]}
79	]}	84	]}
80	]}	85	]}
81	]},	86	]},
82	{tag:'div', cls:'body', children:[	87	{tag:'div', cls:'body', children:[
83	{tag:'div', cls:'accountPanel', children:[	88	{tag:'div', cls:'accountPanel', children:[
84	{tag:'div', cls:'subPanelContent', children:[	89	{tag:'div', cls:'subPanelContent', children:[
85	{tag:'ul', children:[	90	{tag:'ul', children:[
86	// {tag:'li', id:this.getId('accountPanel'),children:[	91	// {tag:'li', id:this.getId('accountPanel'),children:[
87	// {tag:'h3', html:"-- Account --"}	92	// {tag:'h3', html:"-- Account --"}
88	// ]},	93	// ]},
@@ -108,34 +113,34 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.AccountPanel, Clipperz.PM.UI.
108	{tag:'label', html:"re-new passphrase", 'for':this.getId('reNewPassphrase')},	113	{tag:'label', html:"re-new passphrase", 'for':this.getId('reNewPassphrase')},
109	{tag:'input', id:this.getId('reNewPassphrase')}	114	{tag:'input', id:this.getId('reNewPassphrase')}
110	]}	115	]}
111	]},	116	]},
112	{tag:'div', cls:'confirm', children:[	117	{tag:'div', cls:'confirm', children:[
113	{tag:'input', type:'checkbox', id:this.getId('confirm')},	118	{tag:'input', type:'checkbox', id:this.getId('confirm')},
114	{tag:'label', html:"I understand that Clipperz will not be able to recover a lost passphrase", 'for':this.getId('confirm')}	119	{tag:'label', html:"I understand that Clipperz will not be able to recover a lost passphrase", 'for':this.getId('confirm')}
115	]}	120	]}
116	]},	121	]},
117	{tag:'div', cls:'clear'},	122	{tag:'div', cls:'clear'},
118	{tag:'div', cls:'confirmButton', id:this.getId('confirmationButton'), children:[	123	{tag:'div', cls:'confirmButton', id:this.getId('confirmationButton'), children:[
119	{tag:'span', html:"change passphrase"}	124	{tag:'span', html:"change passphrase"}
120	]},	125	]}
121		126	]},
122	{tag:'h3', cls:'manageOTP', html:"Manage One-Time Passphrases"},	127	{tag:'li', id:this.getId('OTPPanel'), children:[
123	{}	128	// {tag:'h3', html:"Manage One-Time Passphrases"}
124	]},	129	]},
125	{tag:'li', id:this.getId('preferencesPanel'), children:[	130	{tag:'li', id:this.getId('preferencesPanel'), children:[
126	{tag:'h3', html:"-- Preferences --"}	131	// {tag:'h3', html:"-- Preferences --"}
127	]},	132	]},
128	{tag:'li', id:this.getId('loginHistoryPanel'), children:[	133	{tag:'li', id:this.getId('loginHistoryPanel'), children:[
129	{tag:'h3', html:"-- Login History --"}	134	// {tag:'h3', html:"-- Login History --"}
130	]}	135	]}
131	]}	136	]}
132	]}	137	]}
133	]}	138	]}
134	]},	139	]},
135	{tag:'div', cls:'footer'}	140	{tag:'div', cls:'footer'}
136	]);	141	]);
137		142
138	this.tabPanelController().setup({selected:this.initiallySelectedTab()});	143	this.tabPanelController().setup({selected:this.initiallySelectedTab()});
139	},	144	},
140		145
141	//-------------------------------------------------------------------------	146	//-------------------------------------------------------------------------