summaryrefslogtreecommitdiff
path: root/frontend/gamma/js/Clipperz/PM/UI
authorGiulio Cesare Solaroli <giulio.cesare@clipperz.com>2012-03-17 21:10:14 (UTC)
committer Giulio Cesare Solaroli <giulio.cesare@clipperz.com>2012-03-17 21:10:14 (UTC)
commit25029b943781850c76fbf43827af0204f35a98bf (patch) (unidiff)
tree1fcaefffee8366b548465a05a6c4cba0c31e131d /frontend/gamma/js/Clipperz/PM/UI
parent928f3f3ed3981f7f81b69ed94f2a315205db39fa (diff)
downloadclipperz-25029b943781850c76fbf43827af0204f35a98bf.zip
clipperz-25029b943781850c76fbf43827af0204f35a98bf.tar.gz
clipperz-25029b943781850c76fbf43827af0204f35a98bf.tar.bz2
Updated /gamma web css
Diffstat (limited to 'frontend/gamma/js/Clipperz/PM/UI') (more/less context) (ignore whitespace changes)
-rw-r--r--frontend/gamma/js/Clipperz/PM/UI/Common/Components/Tooltip.js33
-rw-r--r--frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginForm.js52
-rw-r--r--frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js8
3 files changed, 33 insertions, 60 deletions
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/Tooltip.js b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/Tooltip.js
index 095e8ed..8df7e0e 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/Tooltip.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/Tooltip.js
@@ -104,4 +104,4 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.Tooltip, Clipperz.PM.UI.Co
104 {tag:'span', html:this.text()} 104 {tag:'span', html:this.text()}
105 ]}, 105 ]}//,
106 {tag:'div', id:this.getId('footer'), cls:'tooltip_footer'} 106 // {tag:'div', id:this.getId('footer'), cls:'tooltip_footer'}
107 ]}, 107 ]},
@@ -148,3 +148,3 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.Tooltip, Clipperz.PM.UI.Co
148//console.log("ABOVE"); 148//console.log("ABOVE");
149 MochiKit.Style.setElementDimensions(this.getId('arrow'), {w:36, h:13}, 'px'); 149 // MochiKit.Style.setElementDimensions(this.getId('arrow'), {w:36, h:13}, 'px');
150 bodyPosition.x = elementSizeAndPosition.position.x + (elementSizeAndPosition.dimensions.w/2 - this.boxDimensions().w/2); 150 bodyPosition.x = elementSizeAndPosition.position.x + (elementSizeAndPosition.dimensions.w/2 - this.boxDimensions().w/2);
@@ -152,4 +152,4 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.Tooltip, Clipperz.PM.UI.Co
152 152
153 arrowPosition.x = elementSizeAndPosition.position.x + (elementSizeAndPosition.dimensions.w/2 - 36/2); 153 // arrowPosition.x = elementSizeAndPosition.position.x + (elementSizeAndPosition.dimensions.w/2 - 36/2);
154 arrowPosition.y = elementSizeAndPosition.position.y - 13; 154 // arrowPosition.y = elementSizeAndPosition.position.y - 13;
155 break; 155 break;
@@ -157,3 +157,3 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.Tooltip, Clipperz.PM.UI.Co
157//console.log("BELOW"); 157//console.log("BELOW");
158 MochiKit.Style.setElementDimensions(this.getId('arrow'), {w:36, h:13}, 'px'); 158 // MochiKit.Style.setElementDimensions(this.getId('arrow'), {w:36, h:13}, 'px');
159 bodyPosition.x = elementSizeAndPosition.position.x + (elementSizeAndPosition.dimensions.w/2 - this.boxDimensions().w/2); 159 bodyPosition.x = elementSizeAndPosition.position.x + (elementSizeAndPosition.dimensions.w/2 - this.boxDimensions().w/2);
@@ -161,4 +161,4 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.Tooltip, Clipperz.PM.UI.Co
161 161
162 arrowPosition.x = elementSizeAndPosition.position.x + (elementSizeAndPosition.dimensions.w/2 - 36/2); 162 // arrowPosition.x = elementSizeAndPosition.position.x + (elementSizeAndPosition.dimensions.w/2 - 36/2);
163 arrowPosition.y = elementSizeAndPosition.position.y + elementSizeAndPosition.dimensions.h; 163 // arrowPosition.y = elementSizeAndPosition.position.y + elementSizeAndPosition.dimensions.h;
164 break; 164 break;
@@ -166,3 +166,3 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.Tooltip, Clipperz.PM.UI.Co
166//console.log("LEFT"); 166//console.log("LEFT");
167 MochiKit.Style.setElementDimensions(this.getId('arrow'), {w:13, h:36}, 'px'); 167 // MochiKit.Style.setElementDimensions(this.getId('arrow'), {w:13, h:36}, 'px');
168 bodyPosition.x = elementSizeAndPosition.position.x - this.boxDimensions().w - 13; 168 bodyPosition.x = elementSizeAndPosition.position.x - this.boxDimensions().w - 13;
@@ -170,4 +170,4 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.Tooltip, Clipperz.PM.UI.Co
170 170
171 arrowPosition.x = elementSizeAndPosition.position.x -13; 171 // arrowPosition.x = elementSizeAndPosition.position.x -13;
172 arrowPosition.y = elementSizeAndPosition.position.y + (elementSizeAndPosition.dimensions.h/2 - 36/2); 172 // arrowPosition.y = elementSizeAndPosition.position.y + (elementSizeAndPosition.dimensions.h/2 - 36/2);
173 break; 173 break;
@@ -175,3 +175,3 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.Tooltip, Clipperz.PM.UI.Co
175//console.log("RIGHT"); 175//console.log("RIGHT");
176 MochiKit.Style.setElementDimensions(this.getId('arrow'), {w:13, h:36}, 'px'); 176 // MochiKit.Style.setElementDimensions(this.getId('arrow'), {w:13, h:36}, 'px');
177 bodyPosition.x = elementSizeAndPosition.position.x + elementSizeAndPosition.dimensions.w + 13; 177 bodyPosition.x = elementSizeAndPosition.position.x + elementSizeAndPosition.dimensions.w + 13;
@@ -179,4 +179,4 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.Tooltip, Clipperz.PM.UI.Co
179 179
180 arrowPosition.x = elementSizeAndPosition.position.x + elementSizeAndPosition.dimensions.w; 180 // arrowPosition.x = elementSizeAndPosition.position.x + elementSizeAndPosition.dimensions.w;
181 arrowPosition.y = elementSizeAndPosition.position.y + (elementSizeAndPosition.dimensions.h/2 - 36/2); 181 // arrowPosition.y = elementSizeAndPosition.position.y + (elementSizeAndPosition.dimensions.h/2 - 36/2);
182 break; 182 break;
@@ -185,4 +185,5 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.Tooltip, Clipperz.PM.UI.Co
185 185
186 MochiKit.Style.setElementPosition(this.getId('body'), bodyPosition); 186 MochiKit.Style.setElementPosition(this.getId('tooltip'), bodyPosition);
187 MochiKit.Style.setElementPosition(this.getId('arrow'), arrowPosition); 187 // MochiKit.Style.setElementPosition(this.getId('body'), bodyPosition);
188 // MochiKit.Style.setElementPosition(this.getId('arrow'), arrowPosition);
188 MochiKit.Visual.appear(this.displayElement(), {duration:0.4}); 189 MochiKit.Visual.appear(this.displayElement(), {duration:0.4});
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginForm.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginForm.js
index 389d876..a10ba4f 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginForm.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginForm.js
@@ -67,20 +67,5 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.LoginForm, Clipperz.PM.UI.Com
67 {tag:'label', html:'username', 'for':this.getId('usernameField')}, 67 {tag:'label', html:'username', 'for':this.getId('usernameField')},
68 {tag:'input', id:this.getId('usernameField'), type:'text', cls:'username'/*, value:'joe'*/}, 68 {tag:'input', id:this.getId('usernameField'), type:'text', cls:'username'},
69 {tag:'ul', id:this.getId('passwordOptions'), children:[ 69 {tag:'label', html:'passphrase / OTP', 'for':this.getId('passphraseField')},
70 {tag:'li', id:this.getId('passphraseOption'), children:[ 70 {tag:'input', id:this.getId('passphraseField'), type:'password', cls:'password'},
71 {tag:'label', html:'passphrase / OTP', 'for':this.getId('passphraseField')},
72 {tag:'input', id:this.getId('passphraseField'), type:'password', cls:'password'/*, value:'clipperz'*/}
73 ]} //,
74/*
75 {tag:'li', id:this.getId('otpOption'), children:[
76 {tag:'label', html:'one-time password', 'for':this.getId('otpField_1')},
77 {tag:'input', id:this.getId('otpField_1'), type:'text', cls:'otp', value:'abcd-efgh'},
78 {tag:'input', id:this.getId('otpField_2'), type:'text', cls:'otp', value:'abcd-efgh'},
79 {tag:'input', id:this.getId('otpField_3'), type:'text', cls:'otp', value:'abcd-efgh'},
80 {tag:'input', id:this.getId('otpField_4'), type:'text', cls:'otp', value:'abcd-efgh'}
81 ]}
82*/
83 ]},
84 // {tag:'input', id:this.getId('otpCheckbox'), type:'checkbox', cls:'checkbox'},
85 // {tag:'label', html:'use a one-time passphrase', 'for':this.getId('otpCheckbox'), cls:'checkbox'},
86 71
@@ -163,6 +148,4 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.LoginForm, Clipperz.PM.UI.Com
163 'loginEventHandler': function(anEvent) { 148 'loginEventHandler': function(anEvent) {
164 varusername; 149 // varusername;
165 var passphrase; 150 // var passphrase;
166 // var shouldUseOTP;
167 // var otp;
168 var signalArguments; 151 var signalArguments;
@@ -171,17 +154,12 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.LoginForm, Clipperz.PM.UI.Com
171 154
172 username = this.getElement('usernameField').value; 155 // username = this.getElement('usernameField').value;
173 passphrase = this.getElement('passphraseField').value; 156 // passphrase = this.getElement('passphraseField').value;
174 // otp =this.getElement('otpField_1').value + 157
175 // this.getElement('otpField_2').value + 158 // signalArguments = {username:username};
176 // this.getElement('otpField_3').value + 159 // signalArguments.passphrase = passphrase;
177 // this.getElement('otpField_4').value; 160
178 // shouldUseOTP = this.getElement('otpCheckbox').checked; 161 signalArguments = {
179 162 'username': this.getElement('usernameField').value,
180 signalArguments = {username:username}; 163 'passphrase':this.getElement('passphraseField').value
181 164 };
182 // if (shouldUseOTP) {
183 // signalArguments.otp = otp;
184 // } else {
185 signalArguments.passphrase = passphrase;
186 // }
187 165
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js
index d0b378c..a57152d 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js
@@ -83,3 +83,2 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.LoginController.prototype, {
83 varparameters; 83 varparameters;
84 // varshouldUseOTP;
85 var loginProgress; 84 var loginProgress;
@@ -89,3 +88,2 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.LoginController.prototype, {
89 parameters = anEvent; 88 parameters = anEvent;
90 // shouldUseOTP = (typeof(parameters.passphrase) == 'undefined');
91 89
@@ -101,7 +99,3 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.LoginController.prototype, {
101 deferredResult.addMethod(Clipperz.Crypto.PRNG.defaultRandomGenerator(), 'deferredEntropyCollection'); 99 deferredResult.addMethod(Clipperz.Crypto.PRNG.defaultRandomGenerator(), 'deferredEntropyCollection');
102 // if (shouldUseOTP == false) { 100 deferredResult.addMethod(user, 'login');
103 deferredResult.addMethod(user, 'login');
104 // } else {
105 // deferredResult.addMethod(user, 'loginUsingOTP', parameters.username, parameters.otp);
106 // }
107 deferredResult.addCallback(function(aLoginProgress, res) { 101 deferredResult.addCallback(function(aLoginProgress, res) {