clipperz/password-manager-mirror
1
0
複製 0
镜像来自 http://git.whoc.org.uk/git/password-manager.git synced 2025-11-05 05:17:35 +01:00
程式碼 問題管理 版本發佈 Wiki Activity

Updated /gamma web css

瀏覽代碼
This commit is contained in:
Giulio Cesare Solaroli
2012-03-17 21:10:14 +00:00
父節點 928f3f3ed3
當前提交 25029b9437
共有 6 個文件被更改，包括 1235 次插入 和 2780 次删除
Download Patch File Download Diff File Expand all files Collapse all files

3905
frontend/gamma/css/web.css
查看文件

文件差異過大導致無法顯示 Load Diff

25
frontend/gamma/html/exitPage_template.html
查看文件

@@ -1,28 +1,3 @@
<!--
Copyright 2008-2011 Clipperz Srl
This file is part of Clipperz Community Edition.
Clipperz Community Edition is an online password manager.
For further information about its features and functionalities please
refer to http://www.clipperz.com.
* Clipperz Community Edition is free software: you can redistribute
it and/or modify it under the terms of the GNU Affero General Public
License as published by the Free Software Foundation, either version
3 of the License, or (at your option) any later version.
* Clipperz Community Edition is distributed in the hope that it will
be useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU Affero General Public License for more details.
* You should have received a copy of the GNU Affero General Public
License along with Clipperz Community Edition. If not, see
<http://www.gnu.org/licenses/>.
-->
<html> <html>
<head> <head>
<title>clipperz</title> <title>clipperz</title>

2
frontend/gamma/js/Clipperz/PM/Proxy.js
查看文件

@@ -142,7 +142,7 @@ Clipperz.PM.Proxy.prototype = MochiKit.Base.update(null, {
'processMessage': function (aFunctionName, someParameters, aRequestType) { 'processMessage': function (aFunctionName, someParameters, aRequestType) {
var deferredResult; var deferredResult;
deferredResult = new Clipperz.Async.Deferred("Proxy.processMessage", {trace:true}); deferredResult = new Clipperz.Async.Deferred("Proxy.processMessage", {trace:false});
deferredResult.addMethod(this, 'payToll', aRequestType); deferredResult.addMethod(this, 'payToll', aRequestType);
deferredResult.addMethod(this, 'sendMessage', aFunctionName); deferredResult.addMethod(this, 'sendMessage', aFunctionName);
deferredResult.addMethod(this, 'setTollCallback'); deferredResult.addMethod(this, 'setTollCallback');

33
frontend/gamma/js/Clipperz/PM/UI/Common/Components/Tooltip.js
查看文件

@@ -102,8 +102,8 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.Tooltip, Clipperz.PM.UI.Co
{tag:'div', id:this.getId('body'), cls:'tooltip_body', children:[ {tag:'div', id:this.getId('body'), cls:'tooltip_body', children:[
{tag:'div', cls:'tooltip_text', children:[ {tag:'div', cls:'tooltip_text', children:[
{tag:'span', html:this.text()} {tag:'span', html:this.text()}
]}, ]}//,
{tag:'div', id:this.getId('footer'), cls:'tooltip_footer'} // {tag:'div', id:this.getId('footer'), cls:'tooltip_footer'}
]}, ]},
{tag:'div', id:this.getId('arrow'), cls:'tooltip_arrow'} {tag:'div', id:this.getId('arrow'), cls:'tooltip_arrow'}
]}); ]});
@@ -146,45 +146,46 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.Tooltip, Clipperz.PM.UI.Co
switch (this.position()) { switch (this.position()) {
case 'ABOVE': case 'ABOVE':
//console.log("ABOVE"); //console.log("ABOVE");
MochiKit.Style.setElementDimensions(this.getId('arrow'), {w:36, h:13}, 'px'); // MochiKit.Style.setElementDimensions(this.getId('arrow'), {w:36, h:13}, 'px');
bodyPosition.x = elementSizeAndPosition.position.x + (elementSizeAndPosition.dimensions.w/2 - this.boxDimensions().w/2); bodyPosition.x = elementSizeAndPosition.position.x + (elementSizeAndPosition.dimensions.w/2 - this.boxDimensions().w/2);
bodyPosition.y = elementSizeAndPosition.position.y - this.boxDimensions().h - 13; bodyPosition.y = elementSizeAndPosition.position.y - this.boxDimensions().h - 13;
arrowPosition.x = elementSizeAndPosition.position.x + (elementSizeAndPosition.dimensions.w/2 - 36/2); // arrowPosition.x = elementSizeAndPosition.position.x + (elementSizeAndPosition.dimensions.w/2 - 36/2);
arrowPosition.y = elementSizeAndPosition.position.y - 13; // arrowPosition.y = elementSizeAndPosition.position.y - 13;
break; break;
case 'BELOW': case 'BELOW':
//console.log("BELOW"); //console.log("BELOW");
MochiKit.Style.setElementDimensions(this.getId('arrow'), {w:36, h:13}, 'px'); // MochiKit.Style.setElementDimensions(this.getId('arrow'), {w:36, h:13}, 'px');
bodyPosition.x = elementSizeAndPosition.position.x + (elementSizeAndPosition.dimensions.w/2 - this.boxDimensions().w/2); bodyPosition.x = elementSizeAndPosition.position.x + (elementSizeAndPosition.dimensions.w/2 - this.boxDimensions().w/2);
bodyPosition.y = elementSizeAndPosition.position.y + elementSizeAndPosition.dimensions.h + 13; bodyPosition.y = elementSizeAndPosition.position.y + elementSizeAndPosition.dimensions.h + 13;
arrowPosition.x = elementSizeAndPosition.position.x + (elementSizeAndPosition.dimensions.w/2 - 36/2); // arrowPosition.x = elementSizeAndPosition.position.x + (elementSizeAndPosition.dimensions.w/2 - 36/2);
arrowPosition.y = elementSizeAndPosition.position.y + elementSizeAndPosition.dimensions.h; // arrowPosition.y = elementSizeAndPosition.position.y + elementSizeAndPosition.dimensions.h;
break; break;
case 'LEFT': case 'LEFT':
//console.log("LEFT"); //console.log("LEFT");
MochiKit.Style.setElementDimensions(this.getId('arrow'), {w:13, h:36}, 'px'); // MochiKit.Style.setElementDimensions(this.getId('arrow'), {w:13, h:36}, 'px');
bodyPosition.x = elementSizeAndPosition.position.x - this.boxDimensions().w - 13; bodyPosition.x = elementSizeAndPosition.position.x - this.boxDimensions().w - 13;
bodyPosition.y = elementSizeAndPosition.position.y + (elementSizeAndPosition.dimensions.h/2 - this.boxDimensions().h/2); bodyPosition.y = elementSizeAndPosition.position.y + (elementSizeAndPosition.dimensions.h/2 - this.boxDimensions().h/2);
arrowPosition.x = elementSizeAndPosition.position.x -13; // arrowPosition.x = elementSizeAndPosition.position.x -13;
arrowPosition.y = elementSizeAndPosition.position.y + (elementSizeAndPosition.dimensions.h/2 - 36/2); // arrowPosition.y = elementSizeAndPosition.position.y + (elementSizeAndPosition.dimensions.h/2 - 36/2);
break; break;
case 'RIGHT': case 'RIGHT':
//console.log("RIGHT"); //console.log("RIGHT");
MochiKit.Style.setElementDimensions(this.getId('arrow'), {w:13, h:36}, 'px'); // MochiKit.Style.setElementDimensions(this.getId('arrow'), {w:13, h:36}, 'px');
bodyPosition.x = elementSizeAndPosition.position.x + elementSizeAndPosition.dimensions.w + 13; bodyPosition.x = elementSizeAndPosition.position.x + elementSizeAndPosition.dimensions.w + 13;
bodyPosition.y = elementSizeAndPosition.position.y + (elementSizeAndPosition.dimensions.h/2 - this.boxDimensions().h/2); bodyPosition.y = elementSizeAndPosition.position.y + (elementSizeAndPosition.dimensions.h/2 - this.boxDimensions().h/2);
arrowPosition.x = elementSizeAndPosition.position.x + elementSizeAndPosition.dimensions.w; // arrowPosition.x = elementSizeAndPosition.position.x + elementSizeAndPosition.dimensions.w;
arrowPosition.y = elementSizeAndPosition.position.y + (elementSizeAndPosition.dimensions.h/2 - 36/2); // arrowPosition.y = elementSizeAndPosition.position.y + (elementSizeAndPosition.dimensions.h/2 - 36/2);
break; break;
} }
//console.log("X: " + bodyPosition.x + ", Y: " + bodyPosition.y); //console.log("X: " + bodyPosition.x + ", Y: " + bodyPosition.y);
MochiKit.Style.setElementPosition(this.getId('body'), bodyPosition); MochiKit.Style.setElementPosition(this.getId('tooltip'), bodyPosition);
MochiKit.Style.setElementPosition(this.getId('arrow'), arrowPosition); // MochiKit.Style.setElementPosition(this.getId('body'), bodyPosition);
// MochiKit.Style.setElementPosition(this.getId('arrow'), arrowPosition);
MochiKit.Visual.appear(this.displayElement(), {duration:0.4}); MochiKit.Visual.appear(this.displayElement(), {duration:0.4});
} }
}, },

48
frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginForm.js
查看文件

@@ -65,24 +65,9 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.LoginForm, Clipperz.PM.UI.Com
// {tag:'form', cls:'loginForm', autocomplete:this.autocomplete(), children:[ // {tag:'form', cls:'loginForm', autocomplete:this.autocomplete(), children:[
{tag:'form', id:this.getId('form'), cls:'loginForm', children:[ {tag:'form', id:this.getId('form'), cls:'loginForm', children:[
{tag:'label', html:'username', 'for':this.getId('usernameField')}, {tag:'label', html:'username', 'for':this.getId('usernameField')},
{tag:'input', id:this.getId('usernameField'), type:'text', cls:'username'/*, value:'joe'*/}, {tag:'input', id:this.getId('usernameField'), type:'text', cls:'username'},
{tag:'ul', id:this.getId('passwordOptions'), children:[ {tag:'label', html:'passphrase / OTP', 'for':this.getId('passphraseField')},
{tag:'li', id:this.getId('passphraseOption'), children:[ {tag:'input', id:this.getId('passphraseField'), type:'password', cls:'password'},
{tag:'label', html:'passphrase / OTP', 'for':this.getId('passphraseField')},
{tag:'input', id:this.getId('passphraseField'), type:'password', cls:'password'/*, value:'clipperz'*/}
]} // ,
/*
{tag:'li', id:this.getId('otpOption'), children:[
{tag:'label', html:'one-time password', 'for':this.getId('otpField_1')},
{tag:'input', id:this.getId('otpField_1'), type:'text', cls:'otp', value:'abcd-efgh'},
{tag:'input', id:this.getId('otpField_2'), type:'text', cls:'otp', value:'abcd-efgh'},
{tag:'input', id:this.getId('otpField_3'), type:'text', cls:'otp', value:'abcd-efgh'},
{tag:'input', id:this.getId('otpField_4'), type:'text', cls:'otp', value:'abcd-efgh'}
]}
*/
]},
// {tag:'input', id:this.getId('otpCheckbox'), type:'checkbox', cls:'checkbox'},
// {tag:'label', html:'use a one-time passphrase', 'for':this.getId('otpCheckbox'), cls:'checkbox'},
{tag:'div', cls:'translations', children:[ {tag:'div', cls:'translations', children:[
{tag:'h4', html:'choose your language'}, {tag:'h4', html:'choose your language'},
@@ -161,29 +146,22 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.LoginForm, Clipperz.PM.UI.Com
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
'loginEventHandler': function(anEvent) { 'loginEventHandler': function(anEvent) {
var username; // var username;
var passphrase; // var passphrase;
// var shouldUseOTP;
// var otp;
var signalArguments; var signalArguments;
anEvent.preventDefault(); anEvent.preventDefault();
username = this.getElement('usernameField').value; // username = this.getElement('usernameField').value;
passphrase = this.getElement('passphraseField').value; // passphrase = this.getElement('passphraseField').value;
// otp = this.getElement('otpField_1').value +
// this.getElement('otpField_2').value +
// this.getElement('otpField_3').value +
// this.getElement('otpField_4').value;
// shouldUseOTP = this.getElement('otpCheckbox').checked;
signalArguments = {username:username}; // signalArguments = {username:username};
// signalArguments.passphrase = passphrase;
// if (shouldUseOTP) { signalArguments = {
// signalArguments.otp = otp; 'username': this.getElement('usernameField').value,
// } else { 'passphrase': this.getElement('passphraseField').value
signalArguments.passphrase = passphrase; };
// }
MochiKit.Signal.signal(this, 'doLogin', signalArguments); MochiKit.Signal.signal(this, 'doLogin', signalArguments);
}, },

8
frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js
查看文件

@@ -81,13 +81,11 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.LoginController.prototype, {
'doLogin': function(aLoginForm, anEvent) { 'doLogin': function(aLoginForm, anEvent) {
var deferredResult; var deferredResult;
var parameters; var parameters;
// var shouldUseOTP;
var loginProgress; var loginProgress;
var user; var user;
var getPassphraseDelegate; var getPassphraseDelegate;
parameters = anEvent; parameters = anEvent;
// shouldUseOTP = (typeof(parameters.passphrase) == 'undefined');
getPassphraseDelegate = MochiKit.Base.partial(MochiKit.Async.succeed, parameters.passphrase); getPassphraseDelegate = MochiKit.Base.partial(MochiKit.Async.succeed, parameters.passphrase);
user = new Clipperz.PM.DataModel.User({'username':parameters.username, 'getPassphraseFunction':MochiKit.Base.method(Clipperz.PM.RunTime.mainController, 'getPassphrase')}); user = new Clipperz.PM.DataModel.User({'username':parameters.username, 'getPassphraseFunction':MochiKit.Base.method(Clipperz.PM.RunTime.mainController, 'getPassphrase')});
@@ -99,11 +97,7 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.LoginController.prototype, {
deferredResult.addMethod(Clipperz.PM.RunTime.mainController, 'setPassphraseDelegate', getPassphraseDelegate); deferredResult.addMethod(Clipperz.PM.RunTime.mainController, 'setPassphraseDelegate', getPassphraseDelegate);
deferredResult.addMethod(loginProgress, 'deferredShowModal', {deferredObject:deferredResult, openFromElement:aLoginForm.submitButtonElement()}); deferredResult.addMethod(loginProgress, 'deferredShowModal', {deferredObject:deferredResult, openFromElement:aLoginForm.submitButtonElement()});
deferredResult.addMethod(Clipperz.Crypto.PRNG.defaultRandomGenerator(), 'deferredEntropyCollection'); deferredResult.addMethod(Clipperz.Crypto.PRNG.defaultRandomGenerator(), 'deferredEntropyCollection');
// if (shouldUseOTP == false) { deferredResult.addMethod(user, 'login');
deferredResult.addMethod(user, 'login');
// } else {
// deferredResult.addMethod(user, 'loginUsingOTP', parameters.username, parameters.otp);
// }
deferredResult.addCallback(function(aLoginProgress, res) { deferredResult.addCallback(function(aLoginProgress, res) {
aLoginProgress.disableCancel(); aLoginProgress.disableCancel();
return res; return res;