4 files changed, 37 insertions, 20 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
@@ -41,6 +41,10 @@ Clipperz.PM.UI.Web.Components.AccountPanel = function(args) {
                                 tab:'passphraseTab',
                                 panel:'passphrasePanel'
                 },
+                'OTP': {
+                                tab:'OTPTab',
+                                panel:'OTPPanel'
+                },
                 'PREFERENCES': {
                                 tab:'preferencesTab',
                                 panel:'preferencesPanel'
@@ -74,6 +78,7 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.AccountPanel, Clipperz.PM.UI.
                                         {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'}]}
                                         ]}
@@ -117,16 +122,16 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.AccountPanel, Clipperz.PM.UI.
                                                                 {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 --"}
                                                         ]}
                                                 ]}
                                         ]}
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DataPanel.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DataPanel.js
index d2f1045..462d864 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DataPanel.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DataPanel.js
@@ -82,16 +82,18 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.DataPanel, Clipperz.PM.UI.Com
                                         {tag:'div', cls:'subPanelContent', children:[
                                                 {tag:'ul', children:[
                                                                 {tag:'li', id:this.getId('offlineCopyPanel'),children:[
-                                                                {tag:'h3', html:"Offline copy"}
+        //                                                      {tag:'h3', html:"Offline copy"},
+                                                                {tag:'p', html:"With just one click you can dump all your encrypted data from Clipperz servers to your hard disk and create a read-only offline version of Clipperz to be used when you are not connected to the Internet."},
+                                                                {tag:'a', id:this.getId('offlineCopyDownloadLink'), href:'#', html:"Download", cls:'downloadOfflineCopy'}
                                                         ]},
                                                                 {tag:'li', id:this.getId('sharingPanel'),children:[
-                                                                {tag:'h3', html:"Sharing"}
+        //                                                      {tag:'h3', html:"Sharing"}
                                                         ]},
                                                                 {tag:'li', id:this.getId('importPanel'),        children:[
-                                                                {tag:'h3', html:"Import"}
+        //                                                      {tag:'h3', html:"Import"}
                                                         ]},
                                                                 {tag:'li', id:this.getId('exportPanel'),        children:[
-                                                                {tag:'h3', html:"Export"}
+        //                                                      {tag:'h3', html:"Export"}
                                                         ]}
                                                 ]}
                                         ]}
@@ -101,8 +103,14 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.DataPanel, Clipperz.PM.UI.Com
                 ]);
 
                 this.tabPanelController().setup({selected:this.initiallySelectedTab()});
+                MochiKit.Signal.connect(this.getId('offlineCopyDownloadLink'), 'onclick', this, 'downloadOfflineCopy');
         },
-        
+
+        'downloadOfflineCopy': function (anEvent) {
+                anEvent.preventDefault();
+                MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'downloadOfflineCopy', anEvent.src());
+        },
+
         //-------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 });
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginProgress.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginProgress.js
index 5d082b5..26506e7 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginProgress.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginProgress.js
@@ -82,9 +82,10 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.LoginProgress, Clipperz.PM.UI
                         ]},
                         {tag:'div', cls:'footer', children:[
                                 {tag:'div', cls:'buttonArea', id:this.getId('buttonArea'), children:[
-                                        {tag:'div', cls:'button', id:this.getId('button'), children:[
-                                                {tag:'a', href:'#', id:this.getId('buttonLink'), html:"cancel"}
-                                        ]}
+        //                              {tag:'div', cls:'button', id:this.getId('button'), children:[
+        //                                      {tag:'a', href:'#', id:this.getId('buttonLink'), html:"cancel"}
+        //                              ]}
+                                        {tag:'a', cls:'button', id:this.getId('button'), html:"cancel"}
                                 ]}
                         ]}
                 ]});
@@ -95,7 +96,8 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.LoginProgress, Clipperz.PM.UI
                 this.addComponent(new Clipperz.PM.UI.Common.Components.ProgressBar({'element':this.getElement('progressBar')}));
                 MochiKit.Style.hideElement(this.getElement('errorBox'));
                 
-                MochiKit.Signal.connect(this.getId('buttonLink'), 'onclick', this, 'cancelEventHandler');
+        //      MochiKit.Signal.connect(this.getId('buttonLink'), 'onclick', this, 'cancelEventHandler');
+                MochiKit.Signal.connect(this.getId('button'), 'onclick', this, 'cancelEventHandler');
         },
 
         //-------------------------------------------------------------------------
@@ -121,7 +123,9 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.LoginProgress, Clipperz.PM.UI
         //-------------------------------------------------------------------------
 
         'showErrorMessage': function() {
-                this.getElement('buttonLink').innerHTML = "close";
+        //      this.getElement('buttonLink').innerHTML = "close";
+                this.getElement('button').innerHTML = "close";
+                MochiKit.DOM.addElementClass(this.getElement('button'), 'default');
 
                 MochiKit.Style.hideElement(this.getElement('progressBar'));
 
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/ToolsPanel.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/ToolsPanel.js
index 3ee6189..0fa369f 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/ToolsPanel.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/ToolsPanel.js
@@ -82,16 +82,16 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.ToolsPanel, Clipperz.PM.UI.Co
                                         {tag:'div', cls:'subPanelContent', children:[
                                                 {tag:'ul', children:[
                                                                 {tag:'li', id:this.getId('passwordGeneratorPanel'),children:[
-                                                                {tag:'h3', html:"Password generator"}
+        //                                                      {tag:'h3', html:"Password generator"}
                                                         ]},
                                                                 {tag:'li', id:this.getId('bookmarkletPanel'),children:[
-                                                                {tag:'h3', html:"Bookmarklet"}
+        //                                                      {tag:'h3', html:"Bookmarklet"}
                                                         ]},
                                                                 {tag:'li', id:this.getId('compactEditionPanel'),        children:[
-                                                                {tag:'h3', html:"Compact edition"}
+        //                                                      {tag:'h3', html:"Compact edition"}
                                                         ]},
                                                                 {tag:'li', id:this.getId('httpAuthPanel'),      children:[
-                                                                {tag:'h3', html:"HTTP Auth"}
+        //                                                      {tag:'h3', html:"HTTP Auth"}
                                                         ]}
                                                 ]}
                                         ]}