Diffstat (limited to 'frontend/beta/js/Clipperz/PM') (more/less context) (ignore whitespace changes)
91 files changed, 910 insertions, 1092 deletions
diff --git a/frontend/beta/js/Clipperz/PM/BookmarkletProcessor.js b/frontend/beta/js/Clipperz/PM/BookmarkletProcessor.js index 83cbfe2..2295d3f 100644 --- a/frontend/beta/js/Clipperz/PM/BookmarkletProcessor.js +++ b/frontend/beta/js/Clipperz/PM/BookmarkletProcessor.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | //if (typeof(Clipperz.PM.BookmarkletProcessor) == 'undefined') { Clipperz.PM.BookmarkletProcessor = {}; } | 26 | //if (typeof(Clipperz.PM.BookmarkletProcessor) == 'undefined') { Clipperz.PM.BookmarkletProcessor = {}; } |
| 29 | //if (typeof(Clipperz.PM.BookmarkletProcessor.versions) == 'undefined') { Clipperz.PM.BookmarkletProcessor.versions = {}; } | 27 | //if (typeof(Clipperz.PM.BookmarkletProcessor.versions) == 'undefined') { Clipperz.PM.BookmarkletProcessor.versions = {}; } |
| 30 | 28 | ||
| 31 | /* | 29 | /* |
| 32 | Clipperz.PM.BookmarkletProcessor.versions['abstract'] = function(anUser, aConfiguration) { | 30 | Clipperz.PM.BookmarkletProcessor.versions['abstract'] = function(anUser, aConfiguration) { |
| 33 | this._user = anUser; | 31 | this._user = anUser; |
| 34 | this._configuration = aConfiguration; | 32 | this._configuration = aConfiguration; |
| 35 | 33 | ||
| 36 | this._recordTitle = null; | 34 | this._recordTitle = null; |
| 37 | this._record = null; | 35 | this._record = null; |
| 38 | this._editableFields = null; | 36 | this._editableFields = null; |
| 39 | 37 | ||
| 40 | return this; | 38 | return this; |
| 41 | } | 39 | } |
| 42 | 40 | ||
| 43 | 41 | ||
| 44 | Clipperz.PM.BookmarkletProcessor.versions['abstract'].prototype = MochiKit.Base.update(null, { | 42 | Clipperz.PM.BookmarkletProcessor.versions['abstract'].prototype = MochiKit.Base.update(null, { |
| 45 | 43 | ||
| 46 | 'toString': function() { | 44 | 'toString': function() { |
| 47 | return "BookmarkletProcessor - " + this.user(); | 45 | return "BookmarkletProcessor - " + this.user(); |
| 48 | }, | 46 | }, |
| 49 | 47 | ||
| 50 | //------------------------------------------------------------------------- | 48 | //------------------------------------------------------------------------- |
| 51 | 49 | ||
| 52 | 'user': function() { | 50 | 'user': function() { |
| 53 | return this._user; | 51 | return this._user; |
| 54 | }, | 52 | }, |
| 55 | 53 | ||
| 56 | //------------------------------------------------------------------------- | 54 | //------------------------------------------------------------------------- |
| 57 | 55 | ||
| 58 | 'configuration': function() { | 56 | 'configuration': function() { |
| 59 | return this._configuration; | 57 | return this._configuration; |
| 60 | }, | 58 | }, |
| 61 | 59 | ||
| 62 | //------------------------------------------------------------------------- | 60 | //------------------------------------------------------------------------- |
| 63 | 61 | ||
| 64 | 'record': function() { | 62 | 'record': function() { |
| 65 | throw Clipperz.Base.exception.AbstractMethod; | 63 | throw Clipperz.Base.exception.AbstractMethod; |
| 66 | }, | 64 | }, |
| 67 | 65 | ||
| 68 | //------------------------------------------------------------------------- | 66 | //------------------------------------------------------------------------- |
| 69 | __syntaxFix__: "syntax fix" | 67 | __syntaxFix__: "syntax fix" |
| 70 | }); | 68 | }); |
| 71 | */ | 69 | */ |
| 72 | 70 | ||
| 73 | Clipperz.PM.BookmarkletProcessor = function(anUser, aConfiguration) { | 71 | Clipperz.PM.BookmarkletProcessor = function(anUser, aConfiguration) { |
| 74 | this._user = anUser; | 72 | this._user = anUser; |
| 75 | this._configuration = aConfiguration; | 73 | this._configuration = aConfiguration; |
| 76 | 74 | ||
| 77 | this._recordTitle = null; | 75 | this._recordTitle = null; |
| 78 | this._record = null; | 76 | this._record = null; |
| 79 | this._editableFields = null; | 77 | this._editableFields = null; |
| 80 | this._favicon = null; | 78 | this._favicon = null; |
| 81 | 79 | ||
| 82 | return this; | 80 | return this; |
| 83 | } | 81 | } |
| 84 | 82 | ||
| 85 | Clipperz.PM.BookmarkletProcessor.prototype = MochiKit.Base.update(null, { | 83 | Clipperz.PM.BookmarkletProcessor.prototype = MochiKit.Base.update(null, { |
| 86 | 84 | ||
| 87 | 'toString': function() { | 85 | 'toString': function() { |
| 88 | return "BookmarkletProcessor - " + this.user(); | 86 | return "BookmarkletProcessor - " + this.user(); |
| 89 | }, | 87 | }, |
| 90 | 88 | ||
| 91 | //------------------------------------------------------------------------- | 89 | //------------------------------------------------------------------------- |
| 92 | 90 | ||
| 93 | 'user': function() { | 91 | 'user': function() { |
| 94 | return this._user; | 92 | return this._user; |
| 95 | }, | 93 | }, |
| 96 | 94 | ||
| 97 | //------------------------------------------------------------------------- | 95 | //------------------------------------------------------------------------- |
| 98 | 96 | ||
| 99 | 'configuration': function() { | 97 | 'configuration': function() { |
| 100 | return this._configuration; | 98 | return this._configuration; |
| 101 | }, | 99 | }, |
| 102 | 100 | ||
| 103 | //------------------------------------------------------------------------- | 101 | //------------------------------------------------------------------------- |
| 104 | 102 | ||
| 105 | 'recordTitle': function() { | 103 | 'recordTitle': function() { |
| 106 | if (this._recordTitle == null) { | 104 | if (this._recordTitle == null) { |
| 107 | this._recordTitle = this.configuration().page.title; | 105 | this._recordTitle = this.configuration().page.title; |
| 108 | } | 106 | } |
| 109 | 107 | ||
| 110 | return this._recordTitle; | 108 | return this._recordTitle; |
| 111 | }, | 109 | }, |
| 112 | 110 | ||
| 113 | //------------------------------------------------------------------------- | 111 | //------------------------------------------------------------------------- |
| 114 | 112 | ||
| 115 | 'fields': function() { | 113 | 'fields': function() { |
| 116 | return this.configuration().form.inputs; | 114 | return this.configuration().form.inputs; |
| 117 | }, | 115 | }, |
| 118 | 116 | ||
diff --git a/frontend/beta/js/Clipperz/PM/Components/BaseComponent.js b/frontend/beta/js/Clipperz/PM/Components/BaseComponent.js index f3a3902..07c0b97 100644 --- a/frontend/beta/js/Clipperz/PM/Components/BaseComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/BaseComponent.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | 27 | ||
| 30 | //############################################################################# | 28 | //############################################################################# |
| 31 | 29 | ||
| 32 | var _Clipperz_PM_Components_Panels_base_id_ = 0; | 30 | var _Clipperz_PM_Components_Panels_base_id_ = 0; |
| 33 | 31 | ||
| 34 | //############################################################################# | 32 | //############################################################################# |
| 35 | 33 | ||
| 36 | Clipperz.PM.Components.BaseComponent = function(anElement, args) { | 34 | Clipperz.PM.Components.BaseComponent = function(anElement, args) { |
| 37 | args = args || {}; | 35 | args = args || {}; |
| 38 | //MochiKit.Base.bindMethods(this); | 36 | //MochiKit.Base.bindMethods(this); |
| 39 | //Clipperz.PM.Components.BaseComponent.superclass.constructor.call(this, args); | 37 | //Clipperz.PM.Components.BaseComponent.superclass.constructor.call(this, args); |
| 40 | 38 | ||
| 41 | this._element = anElement; | 39 | this._element = anElement; |
| 42 | this._ids = {}; | 40 | this._ids = {}; |
| 43 | 41 | ||
| 44 | return this; | 42 | return this; |
| 45 | } | 43 | } |
| 46 | 44 | ||
| 47 | //============================================================================= | 45 | //============================================================================= |
| 48 | 46 | ||
| 49 | //MochiKit.Base.update(Clipperz.PM.Components.BaseComponent.prototype, { | 47 | //MochiKit.Base.update(Clipperz.PM.Components.BaseComponent.prototype, { |
| 50 | YAHOO.extendX(Clipperz.PM.Components.BaseComponent, YAHOO.ext.util.Observable, { | 48 | YAHOO.extendX(Clipperz.PM.Components.BaseComponent, YAHOO.ext.util.Observable, { |
| 51 | 49 | ||
| 52 | 'isClipperzPMComponent': true, | 50 | 'isClipperzPMComponent': true, |
| 53 | 51 | ||
| 54 | //------------------------------------------------------------------------- | 52 | //------------------------------------------------------------------------- |
| 55 | 53 | ||
| 56 | 'toString': function () { | 54 | 'toString': function () { |
| 57 | return "Clipperz.PM.Components.BaseComponent component"; | 55 | return "Clipperz.PM.Components.BaseComponent component"; |
| 58 | }, | 56 | }, |
| 59 | 57 | ||
| 60 | //------------------------------------------------------------------------- | 58 | //------------------------------------------------------------------------- |
| 61 | 59 | ||
| 62 | 'domHelper': function() { | 60 | 'domHelper': function() { |
| 63 | return Clipperz.YUI.DomHelper; | 61 | return Clipperz.YUI.DomHelper; |
| 64 | }, | 62 | }, |
| 65 | 63 | ||
| 66 | //------------------------------------------------------------------------- | 64 | //------------------------------------------------------------------------- |
| 67 | 65 | ||
| 68 | 'element': function() { | 66 | 'element': function() { |
| 69 | //MochiKit.Logging.logDebug(">>> BaseComponent.element"); | 67 | //MochiKit.Logging.logDebug(">>> BaseComponent.element"); |
| 70 | return this._element; | 68 | return this._element; |
| 71 | }, | 69 | }, |
| 72 | 70 | ||
| 73 | 'setElement': function(aValue) { | 71 | 'setElement': function(aValue) { |
| 74 | this._element = aValue; | 72 | this._element = aValue; |
| 75 | }, | 73 | }, |
| 76 | 74 | ||
| 77 | //----------------------------------------------------- | 75 | //----------------------------------------------------- |
| 78 | 76 | ||
| 79 | 'remove': function() { | 77 | 'remove': function() { |
| 80 | //MochiKit.Logging.logDebug(">>> BaseComponent.remove"); | 78 | //MochiKit.Logging.logDebug(">>> BaseComponent.remove"); |
| 81 | Clipperz.NotificationCenter.unregister(this); | 79 | Clipperz.NotificationCenter.unregister(this); |
| 82 | MochiKit.Signal.disconnectAllTo(this); | 80 | MochiKit.Signal.disconnectAllTo(this); |
| 83 | //MochiKit.Logging.logDebug("<<< BaseComponent.remove"); | 81 | //MochiKit.Logging.logDebug("<<< BaseComponent.remove"); |
| 84 | }, | 82 | }, |
| 85 | 83 | ||
| 86 | //------------------------------------------------------------------------- | 84 | //------------------------------------------------------------------------- |
| 87 | 85 | ||
| 88 | 'getId': function(aValue) { | 86 | 'getId': function(aValue) { |
| 89 | varresult; | 87 | varresult; |
| 90 | 88 | ||
| 91 | result = this._ids[aValue]; | 89 | result = this._ids[aValue]; |
| 92 | 90 | ||
| 93 | if (typeof(result) == 'undefined') { | 91 | if (typeof(result) == 'undefined') { |
| 94 | _Clipperz_PM_Components_Panels_base_id_ ++; | 92 | _Clipperz_PM_Components_Panels_base_id_ ++; |
| 95 | 93 | ||
| 96 | result = "Clipperz_PM_Components_Panels_" + aValue + "_" + _Clipperz_PM_Components_Panels_base_id_; | 94 | result = "Clipperz_PM_Components_Panels_" + aValue + "_" + _Clipperz_PM_Components_Panels_base_id_; |
| 97 | this._ids[aValue] = result; | 95 | this._ids[aValue] = result; |
| 98 | //MochiKit.Logging.logDebug(">>> getId(" + aValue + ") = " + result); | 96 | //MochiKit.Logging.logDebug(">>> getId(" + aValue + ") = " + result); |
| 99 | } else { | 97 | } else { |
| 100 | //MochiKit.Logging.logDebug("<<< getId(" + aValue + ") = " + result); | 98 | //MochiKit.Logging.logDebug("<<< getId(" + aValue + ") = " + result); |
| 101 | } | 99 | } |
| 102 | 100 | ||
| 103 | return result; | 101 | return result; |
| 104 | }, | 102 | }, |
| 105 | 103 | ||
| 106 | 'getDom': function(aValue) { | 104 | 'getDom': function(aValue) { |
| 107 | return YAHOO.util.Dom.get(this.getId(aValue)); | 105 | return YAHOO.util.Dom.get(this.getId(aValue)); |
| 108 | }, | 106 | }, |
| 109 | 107 | ||
| 110 | 'getElement': function(aValue) { | 108 | 'getElement': function(aValue) { |
| 111 | return YAHOO.ext.Element.get(this.getId(aValue)); | 109 | return YAHOO.ext.Element.get(this.getId(aValue)); |
| 112 | }, | 110 | }, |
| 113 | 111 | ||
| 114 | 'getActor': function(aValue, anAnimator) { | 112 | 'getActor': function(aValue, anAnimator) { |
| 115 | return new YAHOO.ext.Actor(this.getDom(aValue), anAnimator); | 113 | return new YAHOO.ext.Actor(this.getDom(aValue), anAnimator); |
| 116 | }, | 114 | }, |
| 117 | 115 | ||
| 118 | //------------------------------------------------------------------------- | 116 | //------------------------------------------------------------------------- |
diff --git a/frontend/beta/js/Clipperz/PM/Components/Compact/CompactHeader.js b/frontend/beta/js/Clipperz/PM/Components/Compact/CompactHeader.js index 7a3b3a3..14e42a5 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Compact/CompactHeader.js +++ b/frontend/beta/js/Clipperz/PM/Components/Compact/CompactHeader.js | |||
| @@ -1,83 +1,81 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Compact) == 'undefined') { Clipperz.PM.Components.Compact = {}; } | 27 | if (typeof(Clipperz.PM.Components.Compact) == 'undefined') { Clipperz.PM.Components.Compact = {}; } |
| 30 | 28 | ||
| 31 | Clipperz.PM.Components.Compact.CompactHeader = function(anElement, args) { | 29 | Clipperz.PM.Components.Compact.CompactHeader = function(anElement, args) { |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.Compact.CompactHeader.superclass.constructor.call(this, anElement, args); | 31 | Clipperz.PM.Components.Compact.CompactHeader.superclass.constructor.call(this, anElement, args); |
| 34 | 32 | ||
| 35 | this.render(); | 33 | this.render(); |
| 36 | 34 | ||
| 37 | return this; | 35 | return this; |
| 38 | }; | 36 | }; |
| 39 | 37 | ||
| 40 | YAHOO.extendX(Clipperz.PM.Components.Compact.CompactHeader, Clipperz.PM.Components.BaseComponent, { | 38 | YAHOO.extendX(Clipperz.PM.Components.Compact.CompactHeader, Clipperz.PM.Components.BaseComponent, { |
| 41 | 39 | ||
| 42 | 'toString': function() { | 40 | 'toString': function() { |
| 43 | return "Clipperz.PM.Components.Compact.CompactHeader"; | 41 | return "Clipperz.PM.Components.Compact.CompactHeader"; |
| 44 | }, | 42 | }, |
| 45 | 43 | ||
| 46 | //----------------------------------------------------- | 44 | //----------------------------------------------------- |
| 47 | 45 | ||
| 48 | 'render': function() { | 46 | 'render': function() { |
| 49 | this.element().update(""); | 47 | this.element().update(""); |
| 50 | 48 | ||
| 51 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'div', children:[ | 49 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'div', children:[ |
| 52 | {tag:'img', src:'./images/logo.gif'}, | 50 | {tag:'img', src:'./images/logo.gif'}, |
| 53 | {tag:'div', id:'lockBlock', children:[ | 51 | {tag:'div', id:'lockBlock', children:[ |
| 54 | {tag:'input', type:'checkbox', id:'autolock'}, | 52 | {tag:'input', type:'checkbox', id:'autolock'}, |
| 55 | {tag:'span', html:'auto'}, | 53 | {tag:'span', html:'auto'}, |
| 56 | {tag:'a', href:'#', htmlString:Clipperz.PM.Strings['lockMenuLabel'], id:'lock'} | 54 | {tag:'a', href:'#', htmlString:Clipperz.PM.Strings['lockMenuLabel'], id:'lock'} |
| 57 | ]} | 55 | ]} |
| 58 | ]}); | 56 | ]}); |
| 59 | 57 | ||
| 60 | Clipperz.YUI.DomHelper.append(this.element().dom, | 58 | Clipperz.YUI.DomHelper.append(this.element().dom, |
| 61 | {tag:'div', id:'compactMiscLinks', children:[ | 59 | {tag:'div', id:'compactMiscLinks', children:[ |
| 62 | {tag:'a', id:'donateHeaderIconLink', target:'_blank', href:Clipperz.PM.Strings['donateHeaderLinkUrl'], children:[ | 60 | {tag:'a', id:'donateHeaderIconLink', target:'_blank', href:Clipperz.PM.Strings['donateHeaderLinkUrl'], children:[ |
| 63 | {tag:'img', id:'donateHeaderLinkIcon', src:'./images/smiles_small.gif'} | 61 | {tag:'img', id:'donateHeaderLinkIcon', src:'./images/smiles_small.gif'} |
| 64 | ]}, | 62 | ]}, |
| 65 | {tag:'ul', children:[ | 63 | {tag:'ul', children:[ |
| 66 | {tag:'li', children:[{tag:'a', id:'donateHeaderLink', html:'donate', target:'_blank'}]}, | 64 | {tag:'li', children:[{tag:'a', id:'donateHeaderLink', html:'donate', target:'_blank'}]}, |
| 67 | {tag:'li', children:[{tag:'a', id:'creditsHeaderLink', html:'credits', target:'_blank'}]}, | 65 | {tag:'li', children:[{tag:'a', id:'creditsHeaderLink', html:'credits', target:'_blank'}]}, |
| 68 | {tag:'li', children:[{tag:'a', id:'feedbackHeaderLink', html:'feedback', target:'_blank'}]}, | 66 | {tag:'li', children:[{tag:'a', id:'feedbackHeaderLink', html:'feedback', target:'_blank'}]}, |
| 69 | {tag:'li', children:[{tag:'a', id:'helpHeaderLink', html:'help', target:'_blank'}]}, | 67 | {tag:'li', children:[{tag:'a', id:'helpHeaderLink', html:'help', target:'_blank'}]}, |
| 70 | {tag:'li', children:[{tag:'a', id:'forumHeaderLink', html:'forum', target:'_blank'}]} | 68 | {tag:'li', children:[{tag:'a', id:'forumHeaderLink', html:'forum', target:'_blank'}]} |
| 71 | ]} | 69 | ]} |
| 72 | ]} | 70 | ]} |
| 73 | ); | 71 | ); |
| 74 | 72 | ||
| 75 | YAHOO.ext.Element.get('lockBlock').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); | 73 | YAHOO.ext.Element.get('lockBlock').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); |
| 76 | Clipperz.NotificationCenter.notify(this, 'switchLanguage'); | 74 | Clipperz.NotificationCenter.notify(this, 'switchLanguage'); |
| 77 | }, | 75 | }, |
| 78 | 76 | ||
| 79 | //----------------------------------------------------- | 77 | //----------------------------------------------------- |
| 80 | __syntaxFix__: '__syntaxFix__' | 78 | __syntaxFix__: '__syntaxFix__' |
| 81 | }); | 79 | }); |
| 82 | 80 | ||
| 83 | 81 | ||
diff --git a/frontend/beta/js/Clipperz/PM/Components/Compact/CompactInterface.js b/frontend/beta/js/Clipperz/PM/Components/Compact/CompactInterface.js index 0f6858a..1312967 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Compact/CompactInterface.js +++ b/frontend/beta/js/Clipperz/PM/Components/Compact/CompactInterface.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Compact) == 'undefined') { Clipperz.PM.Components.Compact = {}; } | 27 | if (typeof(Clipperz.PM.Components.Compact) == 'undefined') { Clipperz.PM.Components.Compact = {}; } |
| 30 | 28 | ||
| 31 | Clipperz.PM.Components.Compact.CompactInterface = function(anElement, args) { | 29 | Clipperz.PM.Components.Compact.CompactInterface = function(anElement, args) { |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.Compact.CompactInterface.superclass.constructor.call(this, anElement, args); | 31 | Clipperz.PM.Components.Compact.CompactInterface.superclass.constructor.call(this, anElement, args); |
| 34 | 32 | ||
| 35 | this._directLoginItemTemplate = null; | 33 | this._directLoginItemTemplate = null; |
| 36 | this._user = args.user; | 34 | this._user = args.user; |
| 37 | this._autoLockTimer = null; | 35 | this._autoLockTimer = null; |
| 38 | 36 | ||
| 39 | Clipperz.NotificationCenter.register(null, 'updatedProgressState', this, 'userNotificationHandler') | 37 | Clipperz.NotificationCenter.register(null, 'updatedProgressState', this, 'userNotificationHandler') |
| 40 | Clipperz.NotificationCenter.register(null, 'directLoginAdded', this, 'directLoginAddedHandler'); | 38 | Clipperz.NotificationCenter.register(null, 'directLoginAdded', this, 'directLoginAddedHandler'); |
| 41 | 39 | ||
| 42 | this.render(); | 40 | this.render(); |
| 43 | 41 | ||
| 44 | return this; | 42 | return this; |
| 45 | }; | 43 | }; |
| 46 | 44 | ||
| 47 | YAHOO.extendX(Clipperz.PM.Components.Compact.CompactInterface, Clipperz.PM.Components.BaseComponent, { | 45 | YAHOO.extendX(Clipperz.PM.Components.Compact.CompactInterface, Clipperz.PM.Components.BaseComponent, { |
| 48 | 46 | ||
| 49 | 'toString': function() { | 47 | 'toString': function() { |
| 50 | return "Clipperz.PM.Components.Compact.CompactInterface"; | 48 | return "Clipperz.PM.Components.Compact.CompactInterface"; |
| 51 | }, | 49 | }, |
| 52 | 50 | ||
| 53 | //----------------------------------------------------- | 51 | //----------------------------------------------------- |
| 54 | 52 | ||
| 55 | 'render': function() { | 53 | 'render': function() { |
| 56 | var result; | 54 | var result; |
| 57 | varlayout; | 55 | varlayout; |
| 58 | var registerButton; | 56 | var registerButton; |
| 59 | 57 | ||
| 60 | //MochiKit.Logging.logDebug(">>> CompactInterface.render"); | 58 | //MochiKit.Logging.logDebug(">>> CompactInterface.render"); |
| 61 | this.element().update(""); | 59 | this.element().update(""); |
| 62 | 60 | ||
| 63 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'div', children:[ | 61 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'div', children:[ |
| 64 | {tag:'div', id:this.getId('cantentPanel'), children:[ | 62 | {tag:'div', id:this.getId('cantentPanel'), children:[ |
| 65 | {tag:'h4', id:this.getId('message')}, | 63 | {tag:'h4', id:this.getId('message')}, |
| 66 | {tag:'ul', id:'directLogins', children:[]} | 64 | {tag:'ul', id:'directLogins', children:[]} |
| 67 | ]}, | 65 | ]}, |
| 68 | {tag:'div', id:this.getId('lockPanel'), cls:'lockPanel', children:[ | 66 | {tag:'div', id:this.getId('lockPanel'), cls:'lockPanel', children:[ |
| 69 | {tag:'div', htmlString:Clipperz.PM.Strings['lockDescription']}, | 67 | {tag:'div', htmlString:Clipperz.PM.Strings['lockDescription']}, |
| 70 | {tag:'form', id:'lockDialogForm', children:[ | 68 | {tag:'form', id:'lockDialogForm', children:[ |
| 71 | {tag:'input', type:'password', id:this.getId('lockPassphrase')} | 69 | {tag:'input', type:'password', id:this.getId('lockPassphrase')} |
| 72 | ]}, | 70 | ]}, |
| 73 | {tag:'div', id:this.getId('unlock')} | 71 | {tag:'div', id:this.getId('unlock')} |
| 74 | ]} | 72 | ]} |
| 75 | ]}); | 73 | ]}); |
| 76 | 74 | ||
| 77 | this.getElement('lockPanel').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); | 75 | this.getElement('lockPanel').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); |
| 78 | 76 | ||
| 79 | YAHOO.ext.Element.get('lockBlock').show(); | 77 | YAHOO.ext.Element.get('lockBlock').show(); |
| 80 | MochiKit.Signal.connect(YAHOO.ext.Element.get('lock').dom, 'onclick', this, 'doLockEventHandler'); | 78 | MochiKit.Signal.connect(YAHOO.ext.Element.get('lock').dom, 'onclick', this, 'doLockEventHandler'); |
| 81 | new YAHOO.ext.Button(this.getId('unlock'), {text:Clipperz.PM.Strings['unlockButtonLabel'], handler:this.doUnlockEventHandler, scope:this, minWidth:0}); | 79 | new YAHOO.ext.Button(this.getId('unlock'), {text:Clipperz.PM.Strings['unlockButtonLabel'], handler:this.doUnlockEventHandler, scope:this, minWidth:0}); |
| 82 | this.getElement('unlock').swallowEvent('click', true); | 80 | this.getElement('unlock').swallowEvent('click', true); |
| 83 | new Clipperz.PM.Components.PasswordEntropyDisplay(this.getElement('lockPassphrase')); | 81 | new Clipperz.PM.Components.PasswordEntropyDisplay(this.getElement('lockPassphrase')); |
| 84 | MochiKit.Signal.connect('lockDialogForm', 'onsubmit', this, 'doUnlockEventHandler'); | 82 | MochiKit.Signal.connect('lockDialogForm', 'onsubmit', this, 'doUnlockEventHandler'); |
| 85 | 83 | ||
| 86 | this.getElement('cantentPanel').setVisibilityMode(YAHOO.ext.Element.DISPLAY); | 84 | this.getElement('cantentPanel').setVisibilityMode(YAHOO.ext.Element.DISPLAY); |
| 87 | //MochiKit.Logging.logDebug("<<< CompactInterface.render"); | 85 | //MochiKit.Logging.logDebug("<<< CompactInterface.render"); |
| 88 | 86 | ||
| 89 | return result; | 87 | return result; |
| 90 | }, | 88 | }, |
| 91 | 89 | ||
| 92 | //----------------------------------------------------- | 90 | //----------------------------------------------------- |
| 93 | 91 | ||
| 94 | 'directLoginAddedHandler': function(anEvent) { | 92 | 'directLoginAddedHandler': function(anEvent) { |
| 95 | this.redrawDirectLoginItems(); | 93 | this.redrawDirectLoginItems(); |
| 96 | }, | 94 | }, |
| 97 | 95 | ||
| 98 | //----------------------------------------------------- | 96 | //----------------------------------------------------- |
| 99 | 97 | ||
| 100 | 'compareDirectLogins': function(a, b) { | 98 | 'compareDirectLogins': function(a, b) { |
| 101 | return MochiKit.Base.compare(a.label().toLowerCase(), b.label().toLowerCase()); | 99 | return MochiKit.Base.compare(a.label().toLowerCase(), b.label().toLowerCase()); |
| 102 | }, | 100 | }, |
| 103 | 101 | ||
| 104 | //----------------------------------------------------- | 102 | //----------------------------------------------------- |
| 105 | 103 | ||
| 106 | 'redrawDirectLoginItems': function() { | 104 | 'redrawDirectLoginItems': function() { |
| 107 | var template; | 105 | var template; |
| 108 | var allDirectLogins; | 106 | var allDirectLogins; |
| 109 | 107 | ||
| 110 | this.getElement('message').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); | 108 | this.getElement('message').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); |
| 111 | //MochiKit.Logging.logDebug(">>> CompactInterface.redrawDirectLoginItems"); | 109 | //MochiKit.Logging.logDebug(">>> CompactInterface.redrawDirectLoginItems"); |
| 112 | //MochiKit.Logging.logDebug("--- CompactInterface.redrawDirectLoginItems - 0"); | 110 | //MochiKit.Logging.logDebug("--- CompactInterface.redrawDirectLoginItems - 0"); |
| 113 | MochiKit.Iter.forEach(YAHOO.ext.Element.get('directLogins').getChildrenByTagName('li'), function(aDirectLoginElement) { | 111 | MochiKit.Iter.forEach(YAHOO.ext.Element.get('directLogins').getChildrenByTagName('li'), function(aDirectLoginElement) { |
| 114 | MochiKit.Signal.disconnectAll(aDirectLoginElement.dom); | 112 | MochiKit.Signal.disconnectAll(aDirectLoginElement.dom); |
| 115 | //MochiKit.Logging.logDebug("disconnecting IMG " + aDirectLoginElement.getChildrenByTagName('img')[0].dom.src); | 113 | //MochiKit.Logging.logDebug("disconnecting IMG " + aDirectLoginElement.getChildrenByTagName('img')[0].dom.src); |
| 116 | MochiKit.Signal.disconnectAll(aDirectLoginElement.getChildrenByTagName('img')[0].dom); | 114 | MochiKit.Signal.disconnectAll(aDirectLoginElement.getChildrenByTagName('img')[0].dom); |
| 117 | }) | 115 | }) |
| 118 | //MochiKit.Logging.logDebug("--- CompactInterface.redrawDirectLoginItems - 1"); | 116 | //MochiKit.Logging.logDebug("--- CompactInterface.redrawDirectLoginItems - 1"); |
diff --git a/frontend/beta/js/Clipperz/PM/Components/Compact/LoginForm.js b/frontend/beta/js/Clipperz/PM/Components/Compact/LoginForm.js index a1e60d8..013dd0d 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Compact/LoginForm.js +++ b/frontend/beta/js/Clipperz/PM/Components/Compact/LoginForm.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Compact) == 'undefined') { Clipperz.PM.Components.Compact = {}; } | 27 | if (typeof(Clipperz.PM.Components.Compact) == 'undefined') { Clipperz.PM.Components.Compact = {}; } |
| 30 | 28 | ||
| 31 | Clipperz.PM.Components.Compact.LoginForm = function(anElement, args) { | 29 | Clipperz.PM.Components.Compact.LoginForm = function(anElement, args) { |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.Compact.LoginForm.superclass.constructor.call(this, anElement, args); | 31 | Clipperz.PM.Components.Compact.LoginForm.superclass.constructor.call(this, anElement, args); |
| 34 | 32 | ||
| 35 | this.render(); | 33 | this.render(); |
| 36 | Clipperz.NotificationCenter.register(null, 'updatedProgressState', this, 'userNotificationHandler') | 34 | Clipperz.NotificationCenter.register(null, 'updatedProgressState', this, 'userNotificationHandler') |
| 37 | 35 | ||
| 38 | return this; | 36 | return this; |
| 39 | }; | 37 | }; |
| 40 | 38 | ||
| 41 | YAHOO.extendX(Clipperz.PM.Components.Compact.LoginForm, Clipperz.PM.Components.BaseComponent, { | 39 | YAHOO.extendX(Clipperz.PM.Components.Compact.LoginForm, Clipperz.PM.Components.BaseComponent, { |
| 42 | 40 | ||
| 43 | 'toString': function() { | 41 | 'toString': function() { |
| 44 | return "Clipperz.PM.Components.Compact.LoginForm"; | 42 | return "Clipperz.PM.Components.Compact.LoginForm"; |
| 45 | }, | 43 | }, |
| 46 | 44 | ||
| 47 | //----------------------------------------------------- | 45 | //----------------------------------------------------- |
| 48 | 46 | ||
| 49 | 'render': function() { | 47 | 'render': function() { |
| 50 | var result; | 48 | var result; |
| 51 | varlayout; | 49 | varlayout; |
| 52 | 50 | ||
| 53 | MochiKit.Signal.disconnectAllTo(this); | 51 | MochiKit.Signal.disconnectAllTo(this); |
| 54 | this.element().update(""); | 52 | this.element().update(""); |
| 55 | 53 | ||
| 56 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'div', id:this.getId('baseDiv'), cls:'LoginPanel', children:[ | 54 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'div', id:this.getId('baseDiv'), cls:'LoginPanel', children:[ |
| 57 | {tag:'div', id:'compactHeader'}, | 55 | {tag:'div', id:'compactHeader'}, |
| 58 | {tag:'div', id:'compactBody', children:[ | 56 | {tag:'div', id:'compactBody', children:[ |
| 59 | {tag:'form', id:this.getId('loginForm_form'), children:[ | 57 | {tag:'form', id:this.getId('loginForm_form'), children:[ |
| 60 | {tag:'dl', children:[ | 58 | {tag:'dl', children:[ |
| 61 | {tag:'dt', htmlString:Clipperz.PM.Strings['loginFormUsernameLabel']}, | 59 | {tag:'dt', htmlString:Clipperz.PM.Strings['loginFormUsernameLabel']}, |
| 62 | {tag:'dd', children:[ | 60 | {tag:'dd', children:[ |
| 63 | {tag:'input', id:this.getId('login_username'), type:'text', size:'30', name:'username'} | 61 | {tag:'input', id:this.getId('login_username'), type:'text', size:'30', name:'username'} |
| 64 | ]}, | 62 | ]}, |
| 65 | {tag:'dt', htmlString:Clipperz.PM.Strings['loginFormPassphraseLabel']}, | 63 | {tag:'dt', htmlString:Clipperz.PM.Strings['loginFormPassphraseLabel']}, |
| 66 | {tag:'dd', children:[ | 64 | {tag:'dd', children:[ |
| 67 | {tag:'input', id:this.getId('login_passphrase'), type:'password', size:'30', name:'passphrase'} | 65 | {tag:'input', id:this.getId('login_passphrase'), type:'password', size:'30', name:'passphrase'} |
| 68 | ]} | 66 | ]} |
| 69 | ]}, | 67 | ]}, |
| 70 | {tag:'div', id:this.getId('login_submit')} | 68 | {tag:'div', id:this.getId('login_submit')} |
| 71 | ]}, | 69 | ]}, |
| 72 | {tag:'h4', id:this.getId('message')} | 70 | {tag:'h4', id:this.getId('message')} |
| 73 | ]} | 71 | ]} |
| 74 | ]}); | 72 | ]}); |
| 75 | 73 | ||
| 76 | new Clipperz.PM.Components.Compact.CompactHeader(YAHOO.ext.Element.get('compactHeader')); | 74 | new Clipperz.PM.Components.Compact.CompactHeader(YAHOO.ext.Element.get('compactHeader')); |
| 77 | 75 | ||
| 78 | MochiKit.Signal.connect(this.getId('loginForm_form'), 'onsubmit', this, 'stopFormSubmit'); | 76 | MochiKit.Signal.connect(this.getId('loginForm_form'), 'onsubmit', this, 'stopFormSubmit'); |
| 79 | new YAHOO.ext.Button(this.getId('login_submit'), {text:Clipperz.PM.Strings['loginFormButtonLabel'], handler:this.doLogin, scope:this, minWidth:0}); | 77 | new YAHOO.ext.Button(this.getId('login_submit'), {text:Clipperz.PM.Strings['loginFormButtonLabel'], handler:this.doLogin, scope:this, minWidth:0}); |
| 80 | this.getElement('login_submit').swallowEvent('click', true); | 78 | this.getElement('login_submit').swallowEvent('click', true); |
| 81 | 79 | ||
| 82 | MochiKit.Signal.connect(this.getId('loginForm_form'), 'onkeydown', this, 'onkeydown'); | 80 | MochiKit.Signal.connect(this.getId('loginForm_form'), 'onkeydown', this, 'onkeydown'); |
| 83 | 81 | ||
| 84 | new Clipperz.PM.Components.PasswordEntropyDisplay(this.getElement('login_passphrase')); | 82 | new Clipperz.PM.Components.PasswordEntropyDisplay(this.getElement('login_passphrase')); |
| 85 | this.getElement('login_username').focus(); | 83 | this.getElement('login_username').focus(); |
| 86 | 84 | ||
| 87 | return result; | 85 | return result; |
| 88 | }, | 86 | }, |
| 89 | 87 | ||
| 90 | //----------------------------------------------------- | 88 | //----------------------------------------------------- |
| 91 | 89 | ||
| 92 | 'doLogin': function(e) { | 90 | 'doLogin': function(e) { |
| 93 | //MochiKit.Logging.logDebug(">>> compact.LoginForm.doLogin"); | 91 | //MochiKit.Logging.logDebug(">>> compact.LoginForm.doLogin"); |
| 94 | if (this.checkLoginForm()) { | 92 | if (this.checkLoginForm()) { |
| 95 | this.doLoginWithUsernameAndPassphrase(this.getDom('login_username').value, this.getDom('login_passphrase').value); | 93 | this.doLoginWithUsernameAndPassphrase(this.getDom('login_username').value, this.getDom('login_passphrase').value); |
| 96 | } | 94 | } |
| 97 | //MochiKit.Logging.logDebug("<<< compact.LoginForm.doLogin"); | 95 | //MochiKit.Logging.logDebug("<<< compact.LoginForm.doLogin"); |
| 98 | }, | 96 | }, |
| 99 | 97 | ||
| 100 | //......................................................................... | 98 | //......................................................................... |
| 101 | 99 | ||
| 102 | 'doLoginWithUsernameAndPassphrase': function(anUsername, aPassphrase) { | 100 | 'doLoginWithUsernameAndPassphrase': function(anUsername, aPassphrase) { |
| 103 | var deferredResult; | 101 | var deferredResult; |
| 104 | var user; | 102 | var user; |
| 105 | 103 | ||
| 106 | //MochiKit.Logging.logDebug(">>> compact.LoginForm.doLoginWithUsernameAndPassphrase"); | 104 | //MochiKit.Logging.logDebug(">>> compact.LoginForm.doLoginWithUsernameAndPassphrase"); |
| 107 | user = new Clipperz.PM.DataModel.User({username:anUsername, passphrase:aPassphrase}); | 105 | user = new Clipperz.PM.DataModel.User({username:anUsername, passphrase:aPassphrase}); |
| 108 | 106 | ||
| 109 | deferredResult = new MochiKit.Async.Deferred(); | 107 | deferredResult = new MochiKit.Async.Deferred(); |
| 110 | deferredResult.addCallback(MochiKit.Base.method(user, 'connect')); | 108 | deferredResult.addCallback(MochiKit.Base.method(user, 'connect')); |
| 111 | deferredResult.addCallback(MochiKit.Base.method(user, 'loadPreferences')); | 109 | deferredResult.addCallback(MochiKit.Base.method(user, 'loadPreferences')); |
| 112 | deferredResult.addCallback(MochiKit.Base.method(user, 'loadRecords')); | 110 | deferredResult.addCallback(MochiKit.Base.method(user, 'loadRecords')); |
| 113 | deferredResult.addCallback(MochiKit.Base.method(user, 'loadDirectLogins')); | 111 | deferredResult.addCallback(MochiKit.Base.method(user, 'loadDirectLogins')); |
| 114 | deferredResult.addErrback(MochiKit.Base.bind(function() { | 112 | deferredResult.addErrback(MochiKit.Base.bind(function() { |
| 115 | this.getElement('loginForm_form').setVisibilityMode(YAHOO.ext.Element.DISPLAY).show(); | 113 | this.getElement('loginForm_form').setVisibilityMode(YAHOO.ext.Element.DISPLAY).show(); |
| 116 | this.getElement('message').update(Clipperz.PM.Strings['loginMessagePanelFailureText']); | 114 | this.getElement('message').update(Clipperz.PM.Strings['loginMessagePanelFailureText']); |
| 117 | this.getDom('login_passphrase').value = ""; | 115 | this.getDom('login_passphrase').value = ""; |
| 118 | this.getElement('login_passphrase').focus(); | 116 | this.getElement('login_passphrase').focus(); |
diff --git a/frontend/beta/js/Clipperz/PM/Components/Import/CSVImport/CSVImportColumns.js b/frontend/beta/js/Clipperz/PM/Components/Import/CSVImport/CSVImportColumns.js index 3f4952d..fef8e9e 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Import/CSVImport/CSVImportColumns.js +++ b/frontend/beta/js/Clipperz/PM/Components/Import/CSVImport/CSVImportColumns.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } | 27 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } |
| 30 | if (typeof(Clipperz.PM.Components.Import.CSVImport) == 'undefined') { Clipperz.PM.Components.Import.CSVImport = {}; } | 28 | if (typeof(Clipperz.PM.Components.Import.CSVImport) == 'undefined') { Clipperz.PM.Components.Import.CSVImport = {}; } |
| 31 | 29 | ||
| 32 | //############################################################################# | 30 | //############################################################################# |
| 33 | 31 | ||
| 34 | Clipperz.PM.Components.Import.CSVImport.CSVImportColumns = function(anElement, args) { | 32 | Clipperz.PM.Components.Import.CSVImport.CSVImportColumns = function(anElement, args) { |
| 35 | args = args || {}; | 33 | args = args || {}; |
| 36 | 34 | ||
| 37 | Clipperz.PM.Components.Import.CSVImport.CSVImportColumns.superclass.constructor.call(this, anElement, args); | 35 | Clipperz.PM.Components.Import.CSVImport.CSVImportColumns.superclass.constructor.call(this, anElement, args); |
| 38 | this._mainComponent = args.mainComponent; | 36 | this._mainComponent = args.mainComponent; |
| 39 | 37 | ||
| 40 | return this; | 38 | return this; |
| 41 | } | 39 | } |
| 42 | 40 | ||
| 43 | //============================================================================= | 41 | //============================================================================= |
| 44 | 42 | ||
| 45 | YAHOO.extendX(Clipperz.PM.Components.Import.CSVImport.CSVImportColumns, Clipperz.PM.Components.BaseComponent, { | 43 | YAHOO.extendX(Clipperz.PM.Components.Import.CSVImport.CSVImportColumns, Clipperz.PM.Components.BaseComponent, { |
| 46 | 44 | ||
| 47 | 'toString': function() { | 45 | 'toString': function() { |
| 48 | return "Clipperz.PM.Components.Import.CSVImport.CSVImportColumns component"; | 46 | return "Clipperz.PM.Components.Import.CSVImport.CSVImportColumns component"; |
| 49 | }, | 47 | }, |
| 50 | 48 | ||
| 51 | //------------------------------------------------------------------------- | 49 | //------------------------------------------------------------------------- |
| 52 | 50 | ||
| 53 | 'mainComponent': function() { | 51 | 'mainComponent': function() { |
| 54 | return this._mainComponent; | 52 | return this._mainComponent; |
| 55 | }, | 53 | }, |
| 56 | 54 | ||
| 57 | //------------------------------------------------------------------------- | 55 | //------------------------------------------------------------------------- |
| 58 | 56 | ||
| 59 | 'render': function() { | 57 | 'render': function() { |
| 60 | var i,c; | 58 | var i,c; |
| 61 | var columnSelectorCheckboxCells; | 59 | var columnSelectorCheckboxCells; |
| 62 | var checkboxes; | 60 | var checkboxes; |
| 63 | var data; | 61 | var data; |
| 64 | 62 | ||
| 65 | //MochiKit.Logging.logDebug(">>> CSVImportColumns.render"); | 63 | //MochiKit.Logging.logDebug(">>> CSVImportColumns.render"); |
| 66 | Clipperz.NotificationCenter.unregister(this); | 64 | Clipperz.NotificationCenter.unregister(this); |
| 67 | MochiKit.Signal.disconnectAllTo(this); | 65 | MochiKit.Signal.disconnectAllTo(this); |
| 68 | 66 | ||
| 69 | this.element().update(""); | 67 | this.element().update(""); |
| 70 | 68 | ||
| 71 | data = this.mainComponent().parsedValues(); | 69 | data = this.mainComponent().parsedValues(); |
| 72 | columnSelectorCheckboxCells = []; | 70 | columnSelectorCheckboxCells = []; |
| 73 | 71 | ||
| 74 | c =data[0].length; | 72 | c =data[0].length; |
| 75 | for (i=0; i<c; i++) { | 73 | for (i=0; i<c; i++) { |
| 76 | columnSelectorCheckboxCells.push({tag:'th', valign:'top', cls:(this.mainComponent().isColumnSelected(i) ? 'selectedColumn': 'skippedColumn'), children:[ | 74 | columnSelectorCheckboxCells.push({tag:'th', valign:'top', cls:(this.mainComponent().isColumnSelected(i) ? 'selectedColumn': 'skippedColumn'), children:[ |
| 77 | {tag:'input', type:'checkbox', id:this.getId('columnCheckbox_' + i), value:i} | 75 | {tag:'input', type:'checkbox', id:this.getId('columnCheckbox_' + i), value:i} |
| 78 | ]}) | 76 | ]}) |
| 79 | } | 77 | } |
| 80 | 78 | ||
| 81 | this.domHelper().append(this.element(), {tag:'div', children:[ | 79 | this.domHelper().append(this.element(), {tag:'div', children:[ |
| 82 | {tag:'div', cls:'importStepDescription', htmlString:Clipperz.PM.Strings['CSV_ImportWizard_Columns']}, | 80 | {tag:'div', cls:'importStepDescription', htmlString:Clipperz.PM.Strings['CSV_ImportWizard_Columns']}, |
| 83 | {tag:'div', id:this.getId('dataDiv'), cls:'csvImportPreview', children:[ | 81 | {tag:'div', id:this.getId('dataDiv'), cls:'csvImportPreview', children:[ |
| 84 | {tag:'table', id:this.getId('previewDada'), cls:'csvImportPreview columns', cellspacing:'0', children:[ | 82 | {tag:'table', id:this.getId('previewDada'), cls:'csvImportPreview columns', cellspacing:'0', children:[ |
| 85 | {tag:'thead', id:this.getId('previewData_thead'), children:[ | 83 | {tag:'thead', id:this.getId('previewData_thead'), children:[ |
| 86 | {tag:'tr', children:columnSelectorCheckboxCells} | 84 | {tag:'tr', children:columnSelectorCheckboxCells} |
| 87 | ]}, | 85 | ]}, |
| 88 | {tag:'tbody', id:this.getId('previewData_tbody'), children:[]} | 86 | {tag:'tbody', id:this.getId('previewData_tbody'), children:[]} |
| 89 | ]} | 87 | ]} |
| 90 | ]} | 88 | ]} |
| 91 | ]}); | 89 | ]}); |
| 92 | 90 | ||
| 93 | c =data[0].length; | 91 | c =data[0].length; |
| 94 | for (i=0; i<c; i++) { | 92 | for (i=0; i<c; i++) { |
| 95 | if (this.mainComponent().isColumnSelected(i)) { | 93 | if (this.mainComponent().isColumnSelected(i)) { |
| 96 | this.getDom('columnCheckbox_' + i).checked = true; | 94 | this.getDom('columnCheckbox_' + i).checked = true; |
| 97 | } | 95 | } |
| 98 | } | 96 | } |
| 99 | 97 | ||
| 100 | this.renderData(this.getElement('previewData_tbody'), data); | 98 | this.renderData(this.getElement('previewData_tbody'), data); |
| 101 | 99 | ||
| 102 | checkboxes = MochiKit.DOM.getElementsByTagAndClassName('input', null, this.getDom('previewData_thead')); | 100 | checkboxes = MochiKit.DOM.getElementsByTagAndClassName('input', null, this.getDom('previewData_thead')); |
| 103 | c = checkboxes.length; | 101 | c = checkboxes.length; |
| 104 | for (i=0; i<c; i++) { | 102 | for (i=0; i<c; i++) { |
| 105 | MochiKit.Signal.connect(checkboxes[i], 'onclick', this, 'renderDataHandler'); | 103 | MochiKit.Signal.connect(checkboxes[i], 'onclick', this, 'renderDataHandler'); |
| 106 | } | 104 | } |
| 107 | //MochiKit.Logging.logDebug("<<< CSVImportColumns.render"); | 105 | //MochiKit.Logging.logDebug("<<< CSVImportColumns.render"); |
| 108 | }, | 106 | }, |
| 109 | 107 | ||
| 110 | //------------------------------------------------------------------------- | 108 | //------------------------------------------------------------------------- |
| 111 | 109 | ||
| 112 | 'renderData': function(anElement, someData) { | 110 | 'renderData': function(anElement, someData) { |
| 113 | var config; | 111 | var config; |
| 114 | var i,c; | 112 | var i,c; |
| 115 | 113 | ||
| 116 | //MochiKit.Logging.logDebug(">>> CSVImportColumns.renderData"); | 114 | //MochiKit.Logging.logDebug(">>> CSVImportColumns.renderData"); |
| 117 | // anElement.update(""); | 115 | // anElement.update(""); |
| 118 | MochiKit.DOM.replaceChildNodes(anElement.dom); | 116 | MochiKit.DOM.replaceChildNodes(anElement.dom); |
diff --git a/frontend/beta/js/Clipperz/PM/Components/Import/CSVImport/CSVImportFields.js b/frontend/beta/js/Clipperz/PM/Components/Import/CSVImport/CSVImportFields.js index f7dbd5d..e816380 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Import/CSVImport/CSVImportFields.js +++ b/frontend/beta/js/Clipperz/PM/Components/Import/CSVImport/CSVImportFields.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } | 27 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } |
| 30 | if (typeof(Clipperz.PM.Components.Import.CSVImport) == 'undefined') { Clipperz.PM.Components.Import.CSVImport = {}; } | 28 | if (typeof(Clipperz.PM.Components.Import.CSVImport) == 'undefined') { Clipperz.PM.Components.Import.CSVImport = {}; } |
| 31 | 29 | ||
| 32 | //############################################################################# | 30 | //############################################################################# |
| 33 | 31 | ||
| 34 | Clipperz.PM.Components.Import.CSVImport.CSVImportFields = function(anElement, args) { | 32 | Clipperz.PM.Components.Import.CSVImport.CSVImportFields = function(anElement, args) { |
| 35 | args = args || {}; | 33 | args = args || {}; |
| 36 | 34 | ||
| 37 | Clipperz.PM.Components.Import.CSVImport.CSVImportFields.superclass.constructor.call(this, anElement, args); | 35 | Clipperz.PM.Components.Import.CSVImport.CSVImportFields.superclass.constructor.call(this, anElement, args); |
| 38 | this._mainComponent = args.mainComponent; | 36 | this._mainComponent = args.mainComponent; |
| 39 | 37 | ||
| 40 | return this; | 38 | return this; |
| 41 | } | 39 | } |
| 42 | 40 | ||
| 43 | //============================================================================= | 41 | //============================================================================= |
| 44 | 42 | ||
| 45 | YAHOO.extendX(Clipperz.PM.Components.Import.CSVImport.CSVImportFields, Clipperz.PM.Components.BaseComponent, { | 43 | YAHOO.extendX(Clipperz.PM.Components.Import.CSVImport.CSVImportFields, Clipperz.PM.Components.BaseComponent, { |
| 46 | 44 | ||
| 47 | 'toString': function() { | 45 | 'toString': function() { |
| 48 | return "Clipperz.PM.Components.Import.CSVImport.CSVImportFields component"; | 46 | return "Clipperz.PM.Components.Import.CSVImport.CSVImportFields component"; |
| 49 | }, | 47 | }, |
| 50 | 48 | ||
| 51 | //------------------------------------------------------------------------- | 49 | //------------------------------------------------------------------------- |
| 52 | 50 | ||
| 53 | 'mainComponent': function() { | 51 | 'mainComponent': function() { |
| 54 | return this._mainComponent; | 52 | return this._mainComponent; |
| 55 | }, | 53 | }, |
| 56 | 54 | ||
| 57 | //------------------------------------------------------------------------- | 55 | //------------------------------------------------------------------------- |
| 58 | 56 | ||
| 59 | 'render': function() { | 57 | 'render': function() { |
| 60 | varfieldsHeaderCells; | 58 | varfieldsHeaderCells; |
| 61 | var titleColumnIndex; | 59 | var titleColumnIndex; |
| 62 | var notesColumnIndex; | 60 | var notesColumnIndex; |
| 63 | var i,c; | 61 | var i,c; |
| 64 | 62 | ||
| 65 | Clipperz.NotificationCenter.unregister(this); | 63 | Clipperz.NotificationCenter.unregister(this); |
| 66 | MochiKit.Signal.disconnectAllTo(this); | 64 | MochiKit.Signal.disconnectAllTo(this); |
| 67 | 65 | ||
| 68 | this.element().update(""); | 66 | this.element().update(""); |
| 69 | 67 | ||
| 70 | titleColumnIndex = this.mainComponent().titleColumnIndex() | 68 | titleColumnIndex = this.mainComponent().titleColumnIndex() |
| 71 | notesColumnIndex = this.mainComponent().notesColumnIndex() | 69 | notesColumnIndex = this.mainComponent().notesColumnIndex() |
| 72 | 70 | ||
| 73 | fieldsHeaderCells = []; | 71 | fieldsHeaderCells = []; |
| 74 | fieldsHeaderCells.push({tag:'td', valign:'top', cls:'title', html:this.mainComponent().labelForColumn(titleColumnIndex)}); | 72 | fieldsHeaderCells.push({tag:'td', valign:'top', cls:'title', html:this.mainComponent().labelForColumn(titleColumnIndex)}); |
| 75 | 73 | ||
| 76 | c =this.mainComponent().parsedValues()[0].length; | 74 | c =this.mainComponent().parsedValues()[0].length; |
| 77 | for (i=0; i<c; i++) { | 75 | for (i=0; i<c; i++) { |
| 78 | if ((i != titleColumnIndex) && (i != notesColumnIndex) && (this.mainComponent().isColumnSelected(i))) { | 76 | if ((i != titleColumnIndex) && (i != notesColumnIndex) && (this.mainComponent().isColumnSelected(i))) { |
| 79 | var trimmedLabel; | 77 | var trimmedLabel; |
| 80 | 78 | ||
| 81 | trimmedLabel = Clipperz.Base.trim(this.mainComponent().labelForColumn(i)); | 79 | trimmedLabel = Clipperz.Base.trim(this.mainComponent().labelForColumn(i)); |
| 82 | fieldsHeaderCells.push({tag:'td', valign:'top', id:this.getId('fieldHeaderTD_' + i), cls:((trimmedLabel == "") ? 'missingLabelWarning' : (this.isColumnSetup(i) ? 'configuredColumn': 'unconfiguredColumn')), children:[ | 80 | fieldsHeaderCells.push({tag:'td', valign:'top', id:this.getId('fieldHeaderTD_' + i), cls:((trimmedLabel == "") ? 'missingLabelWarning' : (this.isColumnSetup(i) ? 'configuredColumn': 'unconfiguredColumn')), children:[ |
| 83 | {tag:'span', html:((trimmedLabel == "") ? Clipperz.PM.Strings['CSV_ImportWizard_Fields_MissingLabelWarning'] : trimmedLabel)/*, cls:((trimmedLabel == "") ? 'missingLabelWarning' : '')*/}, | 81 | {tag:'span', html:((trimmedLabel == "") ? Clipperz.PM.Strings['CSV_ImportWizard_Fields_MissingLabelWarning'] : trimmedLabel)/*, cls:((trimmedLabel == "") ? 'missingLabelWarning' : '')*/}, |
| 84 | {tag:'select', id:this.getId('select_' + i), name:i, children:[ | 82 | {tag:'select', id:this.getId('select_' + i), name:i, children:[ |
| 85 | {tag:'option', value:'UNDEFINED', html:"select data type", cls:'disabledOption'}, | 83 | {tag:'option', value:'UNDEFINED', html:"select data type", cls:'disabledOption'}, |
| 86 | {tag:'option', value:'TXT', htmlString:Clipperz.PM.Strings['recordFieldTypologies']['TXT']['shortDescription']}, | 84 | {tag:'option', value:'TXT', htmlString:Clipperz.PM.Strings['recordFieldTypologies']['TXT']['shortDescription']}, |
| 87 | {tag:'option', value:'PWD', htmlString:Clipperz.PM.Strings['recordFieldTypologies']['PWD']['shortDescription']}, | 85 | {tag:'option', value:'PWD', htmlString:Clipperz.PM.Strings['recordFieldTypologies']['PWD']['shortDescription']}, |
| 88 | {tag:'option', value:'URL', htmlString:Clipperz.PM.Strings['recordFieldTypologies']['URL']['shortDescription']}, | 86 | {tag:'option', value:'URL', htmlString:Clipperz.PM.Strings['recordFieldTypologies']['URL']['shortDescription']}, |
| 89 | {tag:'option', value:'DATE', htmlString:Clipperz.PM.Strings['recordFieldTypologies']['DATE']['shortDescription']}, | 87 | {tag:'option', value:'DATE', htmlString:Clipperz.PM.Strings['recordFieldTypologies']['DATE']['shortDescription']}, |
| 90 | {tag:'option', value:'ADDR', htmlString:Clipperz.PM.Strings['recordFieldTypologies']['ADDR']['shortDescription']} | 88 | {tag:'option', value:'ADDR', htmlString:Clipperz.PM.Strings['recordFieldTypologies']['ADDR']['shortDescription']} |
| 91 | ]} | 89 | ]} |
| 92 | ]}) | 90 | ]}) |
| 93 | } | 91 | } |
| 94 | } | 92 | } |
| 95 | 93 | ||
| 96 | if (notesColumnIndex != -1) { | 94 | if (notesColumnIndex != -1) { |
| 97 | fieldsHeaderCells.push({tag:'td', valign:'top', cls:'notes', html:this.mainComponent().labelForColumn(notesColumnIndex)}); | 95 | fieldsHeaderCells.push({tag:'td', valign:'top', cls:'notes', html:this.mainComponent().labelForColumn(notesColumnIndex)}); |
| 98 | } | 96 | } |
| 99 | 97 | ||
| 100 | this.domHelper().append(this.element(), {tag:'div', children:[ | 98 | this.domHelper().append(this.element(), {tag:'div', children:[ |
| 101 | {tag:'div', cls:'importStepDescription', htmlString:Clipperz.PM.Strings['CSV_ImportWizard_Fields']}, | 99 | {tag:'div', cls:'importStepDescription', htmlString:Clipperz.PM.Strings['CSV_ImportWizard_Fields']}, |
| 102 | {tag:'div', id:this.getId('dataDiv'), children:[ | 100 | {tag:'div', id:this.getId('dataDiv'), children:[ |
| 103 | {tag:'div', children:[ | 101 | {tag:'div', children:[ |
| 104 | ]}, | 102 | ]}, |
| 105 | {tag:'div', cls:'csvImportPreview', children:[ | 103 | {tag:'div', cls:'csvImportPreview', children:[ |
| 106 | {tag:'table', id:this.getId('previewDada'), cls:'csvImportPreview', cellspacing:'0', children:[ | 104 | {tag:'table', id:this.getId('previewDada'), cls:'csvImportPreview', cellspacing:'0', children:[ |
| 107 | {tag:'thead', id:this.getId('previewData_thead'), children:[ | 105 | {tag:'thead', id:this.getId('previewData_thead'), children:[ |
| 108 | {tag:'tr', cls:'CSV_previewData_header', children:fieldsHeaderCells} | 106 | {tag:'tr', cls:'CSV_previewData_header', children:fieldsHeaderCells} |
| 109 | ]}, | 107 | ]}, |
| 110 | {tag:'tbody', id:this.getId('previewData_tbody'), children:[]} | 108 | {tag:'tbody', id:this.getId('previewData_tbody'), children:[]} |
| 111 | ]} | 109 | ]} |
| 112 | ]} | 110 | ]} |
| 113 | ]} | 111 | ]} |
| 114 | ]}); | 112 | ]}); |
| 115 | 113 | ||
| 116 | for (i=0; i<c; i++) { | 114 | for (i=0; i<c; i++) { |
| 117 | if ((i != titleColumnIndex) && (i != notesColumnIndex) && (this.mainComponent().isColumnSelected(i))) { | 115 | if ((i != titleColumnIndex) && (i != notesColumnIndex) && (this.mainComponent().isColumnSelected(i))) { |
| 118 | Clipperz.DOM.selectOptionMatchingValue(this.getDom('select_' + i), this.mainComponent().typeForColumn(i)); | 116 | Clipperz.DOM.selectOptionMatchingValue(this.getDom('select_' + i), this.mainComponent().typeForColumn(i)); |
diff --git a/frontend/beta/js/Clipperz/PM/Components/Import/CSVImport/CSVImportHeader.js b/frontend/beta/js/Clipperz/PM/Components/Import/CSVImport/CSVImportHeader.js index 5cb8679..dbde138 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Import/CSVImport/CSVImportHeader.js +++ b/frontend/beta/js/Clipperz/PM/Components/Import/CSVImport/CSVImportHeader.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } | 27 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } |
| 30 | if (typeof(Clipperz.PM.Components.Import.CSVImport) == 'undefined') { Clipperz.PM.Components.Import.CSVImport = {}; } | 28 | if (typeof(Clipperz.PM.Components.Import.CSVImport) == 'undefined') { Clipperz.PM.Components.Import.CSVImport = {}; } |
| 31 | 29 | ||
| 32 | //############################################################################# | 30 | //############################################################################# |
| 33 | 31 | ||
| 34 | Clipperz.PM.Components.Import.CSVImport.CSVImportHeader = function(anElement, args) { | 32 | Clipperz.PM.Components.Import.CSVImport.CSVImportHeader = function(anElement, args) { |
| 35 | args = args || {}; | 33 | args = args || {}; |
| 36 | 34 | ||
| 37 | Clipperz.PM.Components.Import.CSVImport.CSVImportHeader.superclass.constructor.call(this, anElement, args); | 35 | Clipperz.PM.Components.Import.CSVImport.CSVImportHeader.superclass.constructor.call(this, anElement, args); |
| 38 | this._mainComponent = args.mainComponent; | 36 | this._mainComponent = args.mainComponent; |
| 39 | 37 | ||
| 40 | this._pendingDeferredLabelFieldHandlerEvents = 0; | 38 | this._pendingDeferredLabelFieldHandlerEvents = 0; |
| 41 | 39 | ||
| 42 | return this; | 40 | return this; |
| 43 | } | 41 | } |
| 44 | 42 | ||
| 45 | //============================================================================= | 43 | //============================================================================= |
| 46 | 44 | ||
| 47 | YAHOO.extendX(Clipperz.PM.Components.Import.CSVImport.CSVImportHeader, Clipperz.PM.Components.BaseComponent, { | 45 | YAHOO.extendX(Clipperz.PM.Components.Import.CSVImport.CSVImportHeader, Clipperz.PM.Components.BaseComponent, { |
| 48 | 46 | ||
| 49 | 'toString': function() { | 47 | 'toString': function() { |
| 50 | return "Clipperz.PM.Components.Import.CSVImport.CSVImportHeader component"; | 48 | return "Clipperz.PM.Components.Import.CSVImport.CSVImportHeader component"; |
| 51 | }, | 49 | }, |
| 52 | 50 | ||
| 53 | //------------------------------------------------------------------------- | 51 | //------------------------------------------------------------------------- |
| 54 | 52 | ||
| 55 | 'mainComponent': function() { | 53 | 'mainComponent': function() { |
| 56 | return this._mainComponent; | 54 | return this._mainComponent; |
| 57 | }, | 55 | }, |
| 58 | 56 | ||
| 59 | //------------------------------------------------------------------------- | 57 | //------------------------------------------------------------------------- |
| 60 | 58 | ||
| 61 | 'render': function() { | 59 | 'render': function() { |
| 62 | var thConfigs; | 60 | var thConfigs; |
| 63 | var i,c; | 61 | var i,c; |
| 64 | 62 | ||
| 65 | //MochiKit.Logging.logDebug(">>> CSVImportHeader.render"); | 63 | //MochiKit.Logging.logDebug(">>> CSVImportHeader.render"); |
| 66 | Clipperz.NotificationCenter.unregister(this); | 64 | Clipperz.NotificationCenter.unregister(this); |
| 67 | MochiKit.Signal.disconnectAllTo(this); | 65 | MochiKit.Signal.disconnectAllTo(this); |
| 68 | 66 | ||
| 69 | thConfigs = []; | 67 | thConfigs = []; |
| 70 | c = this.mainComponent().parsedValues()[0].length; | 68 | c = this.mainComponent().parsedValues()[0].length; |
| 71 | for (i=0; i<c; i++) { | 69 | for (i=0; i<c; i++) { |
| 72 | if (this.mainComponent().isColumnSelected(i)) { | 70 | if (this.mainComponent().isColumnSelected(i)) { |
| 73 | // thConfigs.push({tag:'th', children:[{tag:'input', type:'text', id:this.getId('headerTextField_' + i), value:this.mainComponent().labelForColumn(i)}]}); | 71 | // thConfigs.push({tag:'th', children:[{tag:'input', type:'text', id:this.getId('headerTextField_' + i), value:this.mainComponent().labelForColumn(i)}]}); |
| 74 | thConfigs.push({tag:'th', children:[{tag:'input', type:'text', id:this.getId('headerTextField_' + i), value:""}]}); | 72 | thConfigs.push({tag:'th', children:[{tag:'input', type:'text', id:this.getId('headerTextField_' + i), value:""}]}); |
| 75 | } | 73 | } |
| 76 | } | 74 | } |
| 77 | 75 | ||
| 78 | this.element().update(""); | 76 | this.element().update(""); |
| 79 | this.domHelper().append(this.element(), {tag:'div', children:[ | 77 | this.domHelper().append(this.element(), {tag:'div', children:[ |
| 80 | {tag:'div', cls:'importStepDescription', htmlString:Clipperz.PM.Strings['CSV_ImportWizard_Header']}, | 78 | {tag:'div', cls:'importStepDescription', htmlString:Clipperz.PM.Strings['CSV_ImportWizard_Header']}, |
| 81 | {tag:'div', cls:'importStepParameters', children:[ | 79 | {tag:'div', cls:'importStepParameters', children:[ |
| 82 | {tag:'input', type:'checkbox', name:'isFistRowHeader', id:this.getId('isFirstRowHeader_checkbox')}, | 80 | {tag:'input', type:'checkbox', name:'isFistRowHeader', id:this.getId('isFirstRowHeader_checkbox')}, |
| 83 | {tag:'span', id:this.getId('isFirstRowHeader_span'), cls:'clickableSpan', htmlString:Clipperz.PM.Strings['CSV_ImportWizard_Header_Settings_firstRowHeaderLabel']} | 81 | {tag:'span', id:this.getId('isFirstRowHeader_span'), cls:'clickableSpan', htmlString:Clipperz.PM.Strings['CSV_ImportWizard_Header_Settings_firstRowHeaderLabel']} |
| 84 | ]}, | 82 | ]}, |
| 85 | {tag:'div', id:this.getId('dataDiv'), children:[ | 83 | {tag:'div', id:this.getId('dataDiv'), children:[ |
| 86 | {tag:'div', cls:'csvImportPreview', children:[ | 84 | {tag:'div', cls:'csvImportPreview', children:[ |
| 87 | {tag:'table', id:this.getId('previewDada'), cls:'csvImportPreview header', cellspacing:'0', children:[ | 85 | {tag:'table', id:this.getId('previewDada'), cls:'csvImportPreview header', cellspacing:'0', children:[ |
| 88 | {tag:'thead', children:[{tag:'tr', children:thConfigs}]}, | 86 | {tag:'thead', children:[{tag:'tr', children:thConfigs}]}, |
| 89 | {tag:'tbody', id:this.getId('previewData_tbody')} | 87 | {tag:'tbody', id:this.getId('previewData_tbody')} |
| 90 | ]} | 88 | ]} |
| 91 | ]} | 89 | ]} |
| 92 | ]} | 90 | ]} |
| 93 | ]}); | 91 | ]}); |
| 94 | 92 | ||
| 95 | for (i=0; i<c; i++) { | 93 | for (i=0; i<c; i++) { |
| 96 | if (this.mainComponent().isColumnSelected(i)) { | 94 | if (this.mainComponent().isColumnSelected(i)) { |
| 97 | this.getElement('headerTextField_' + i).dom.value = this.mainComponent().labelForColumn(i); | 95 | this.getElement('headerTextField_' + i).dom.value = this.mainComponent().labelForColumn(i); |
| 98 | } | 96 | } |
| 99 | } | 97 | } |
| 100 | 98 | ||
| 101 | this.renderData(this.getElement('previewData_tbody'), this.mainComponent().parsedValues()); | 99 | this.renderData(this.getElement('previewData_tbody'), this.mainComponent().parsedValues()); |
| 102 | 100 | ||
| 103 | if (this.mainComponent().isFirstRowHeader()) { | 101 | if (this.mainComponent().isFirstRowHeader()) { |
| 104 | this.getDom('isFirstRowHeader_checkbox').click(); | 102 | this.getDom('isFirstRowHeader_checkbox').click(); |
| 105 | } | 103 | } |
| 106 | 104 | ||
| 107 | c = this.mainComponent().parsedValues()[0].length; | 105 | c = this.mainComponent().parsedValues()[0].length; |
| 108 | for (i=0; i<c; i++) { | 106 | for (i=0; i<c; i++) { |
| 109 | if (this.mainComponent().isColumnSelected(i)) { | 107 | if (this.mainComponent().isColumnSelected(i)) { |
| 110 | MochiKit.Signal.connect(this.getDom('headerTextField_' + i), 'onchange', MochiKit.Base.partial(MochiKit.Base.method(this, 'labelFieldHandler'), i)); | 108 | MochiKit.Signal.connect(this.getDom('headerTextField_' + i), 'onchange', MochiKit.Base.partial(MochiKit.Base.method(this, 'labelFieldHandler'), i)); |
| 111 | MochiKit.Signal.connect(this.getDom('headerTextField_' + i), 'onkeypress', MochiKit.Base.partial(MochiKit.Base.method(this, 'deferredLabelFieldHandler'), i)); | 109 | MochiKit.Signal.connect(this.getDom('headerTextField_' + i), 'onkeypress', MochiKit.Base.partial(MochiKit.Base.method(this, 'deferredLabelFieldHandler'), i)); |
| 112 | } | 110 | } |
| 113 | } | 111 | } |
| 114 | 112 | ||
| 115 | MochiKit.Signal.connect(this.getDom('isFirstRowHeader_checkbox'), 'onclick', this, 'toggleFirstRowHeaderCheckboxHandler'); | 113 | MochiKit.Signal.connect(this.getDom('isFirstRowHeader_checkbox'), 'onclick', this, 'toggleFirstRowHeaderCheckboxHandler'); |
| 116 | if (Clipperz_IEisBroken != true) { | 114 | if (Clipperz_IEisBroken != true) { |
| 117 | MochiKit.Signal.connect(this.getDom('isFirstRowHeader_span'), 'onclick', this.getDom('isFirstRowHeader_checkbox'), 'click'); | 115 | MochiKit.Signal.connect(this.getDom('isFirstRowHeader_span'), 'onclick', this.getDom('isFirstRowHeader_checkbox'), 'click'); |
| 118 | } | 116 | } |
diff --git a/frontend/beta/js/Clipperz/PM/Components/Import/CSVImport/CSVImportNotes.js b/frontend/beta/js/Clipperz/PM/Components/Import/CSVImport/CSVImportNotes.js index 6344e06..ccfdeca 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Import/CSVImport/CSVImportNotes.js +++ b/frontend/beta/js/Clipperz/PM/Components/Import/CSVImport/CSVImportNotes.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } | 27 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } |
| 30 | if (typeof(Clipperz.PM.Components.Import.CSVImport) == 'undefined') { Clipperz.PM.Components.Import.CSVImport = {}; } | 28 | if (typeof(Clipperz.PM.Components.Import.CSVImport) == 'undefined') { Clipperz.PM.Components.Import.CSVImport = {}; } |
| 31 | 29 | ||
| 32 | //############################################################################# | 30 | //############################################################################# |
| 33 | 31 | ||
| 34 | Clipperz.PM.Components.Import.CSVImport.CSVImportNotes = function(anElement, args) { | 32 | Clipperz.PM.Components.Import.CSVImport.CSVImportNotes = function(anElement, args) { |
| 35 | args = args || {}; | 33 | args = args || {}; |
| 36 | 34 | ||
| 37 | Clipperz.PM.Components.Import.CSVImport.CSVImportNotes.superclass.constructor.call(this, anElement, args); | 35 | Clipperz.PM.Components.Import.CSVImport.CSVImportNotes.superclass.constructor.call(this, anElement, args); |
| 38 | this._mainComponent = args.mainComponent; | 36 | this._mainComponent = args.mainComponent; |
| 39 | 37 | ||
| 40 | return this; | 38 | return this; |
| 41 | } | 39 | } |
| 42 | 40 | ||
| 43 | //============================================================================= | 41 | //============================================================================= |
| 44 | 42 | ||
| 45 | YAHOO.extendX(Clipperz.PM.Components.Import.CSVImport.CSVImportNotes, Clipperz.PM.Components.BaseComponent, { | 43 | YAHOO.extendX(Clipperz.PM.Components.Import.CSVImport.CSVImportNotes, Clipperz.PM.Components.BaseComponent, { |
| 46 | 44 | ||
| 47 | 'toString': function() { | 45 | 'toString': function() { |
| 48 | return "Clipperz.PM.Components.Import.CSVImport.CSVImportNotes component"; | 46 | return "Clipperz.PM.Components.Import.CSVImport.CSVImportNotes component"; |
| 49 | }, | 47 | }, |
| 50 | 48 | ||
| 51 | //------------------------------------------------------------------------- | 49 | //------------------------------------------------------------------------- |
| 52 | 50 | ||
| 53 | 'mainComponent': function() { | 51 | 'mainComponent': function() { |
| 54 | return this._mainComponent; | 52 | return this._mainComponent; |
| 55 | }, | 53 | }, |
| 56 | 54 | ||
| 57 | //------------------------------------------------------------------------- | 55 | //------------------------------------------------------------------------- |
| 58 | 56 | ||
| 59 | 'render': function() { | 57 | 'render': function() { |
| 60 | varnotesSelectorCheckboxCells; | 58 | varnotesSelectorCheckboxCells; |
| 61 | var totalNumberOfColumns; | 59 | var totalNumberOfColumns; |
| 62 | var titleColumnIndex; | 60 | var titleColumnIndex; |
| 63 | var notesColumnIndex; | 61 | var notesColumnIndex; |
| 64 | var i,c; | 62 | var i,c; |
| 65 | 63 | ||
| 66 | Clipperz.NotificationCenter.unregister(this); | 64 | Clipperz.NotificationCenter.unregister(this); |
| 67 | MochiKit.Signal.disconnectAllTo(this); | 65 | MochiKit.Signal.disconnectAllTo(this); |
| 68 | 66 | ||
| 69 | this.element().update(""); | 67 | this.element().update(""); |
| 70 | 68 | ||
| 71 | titleColumnIndex = this.mainComponent().titleColumnIndex() | 69 | titleColumnIndex = this.mainComponent().titleColumnIndex() |
| 72 | notesColumnIndex = this.mainComponent().notesColumnIndex() | 70 | notesColumnIndex = this.mainComponent().notesColumnIndex() |
| 73 | 71 | ||
| 74 | totalNumberOfColumns = this.mainComponent().parsedValues()[0].length; | 72 | totalNumberOfColumns = this.mainComponent().parsedValues()[0].length; |
| 75 | 73 | ||
| 76 | notesSelectorCheckboxCells = [{tag:'th', cls:'title', html:this.mainComponent().labelForColumn(titleColumnIndex)}]; | 74 | notesSelectorCheckboxCells = [{tag:'th', cls:'title', html:this.mainComponent().labelForColumn(titleColumnIndex)}]; |
| 77 | c =totalNumberOfColumns; | 75 | c =totalNumberOfColumns; |
| 78 | for (i=0; i<c; i++) { | 76 | for (i=0; i<c; i++) { |
| 79 | if ((i != titleColumnIndex) && (this.mainComponent().isColumnSelected(i))) { | 77 | if ((i != titleColumnIndex) && (this.mainComponent().isColumnSelected(i))) { |
| 80 | notesSelectorCheckboxCells.push({tag:'th', id:this.getId('th_' + i), valign:'top', children:[ | 78 | notesSelectorCheckboxCells.push({tag:'th', id:this.getId('th_' + i), valign:'top', children:[ |
| 81 | {tag:'input', type:'radio', id:this.getId('radio_' + i), name:'CSVImportNotesColumn', value:i}, | 79 | {tag:'input', type:'radio', id:this.getId('radio_' + i), name:'CSVImportNotesColumn', value:i}, |
| 82 | {tag:'span', cls:'clickableSpan', id:this.getId('columnLabel_' + i), html:this.mainComponent().labelForColumn(i)} | 80 | {tag:'span', cls:'clickableSpan', id:this.getId('columnLabel_' + i), html:this.mainComponent().labelForColumn(i)} |
| 83 | ]}) | 81 | ]}) |
| 84 | } | 82 | } |
| 85 | } | 83 | } |
| 86 | 84 | ||
| 87 | this.domHelper().append(this.element(), {tag:'div', children:[ | 85 | this.domHelper().append(this.element(), {tag:'div', children:[ |
| 88 | {tag:'div', cls:'importStepDescription', htmlString:Clipperz.PM.Strings['CSV_ImportWizard_Notes']}, | 86 | {tag:'div', cls:'importStepDescription', htmlString:Clipperz.PM.Strings['CSV_ImportWizard_Notes']}, |
| 89 | {tag:'div', id:this.getId('dataDiv'), children:[ | 87 | {tag:'div', id:this.getId('dataDiv'), children:[ |
| 90 | {tag:'div', cls:'importStepParameters', children:[ | 88 | {tag:'div', cls:'importStepParameters', children:[ |
| 91 | {tag:'input', id:this.getId('doNotSetNotes_radio'), type:'radio', name:'CSVImportNotesColumn', value:-1}, | 89 | {tag:'input', id:this.getId('doNotSetNotes_radio'), type:'radio', name:'CSVImportNotesColumn', value:-1}, |
| 92 | {tag:'span', id:this.getId('doNotSetNotes_span'), cls:'clickableSpan', htmlString:Clipperz.PM.Strings['CSV_ImportWizard_Notes_Settings_noSelectionLabel']} | 90 | {tag:'span', id:this.getId('doNotSetNotes_span'), cls:'clickableSpan', htmlString:Clipperz.PM.Strings['CSV_ImportWizard_Notes_Settings_noSelectionLabel']} |
| 93 | ]}, | 91 | ]}, |
| 94 | {tag:'div', cls:'csvImportPreview', children:[ | 92 | {tag:'div', cls:'csvImportPreview', children:[ |
| 95 | {tag:'table', id:this.getId('previewDada'), cls:'csvImportPreview', cellspacing:'0', children:[ | 93 | {tag:'table', id:this.getId('previewDada'), cls:'csvImportPreview', cellspacing:'0', children:[ |
| 96 | {tag:'thead', id:this.getId('previewData_thead'), children:[ | 94 | {tag:'thead', id:this.getId('previewData_thead'), children:[ |
| 97 | {tag:'tr', children:notesSelectorCheckboxCells} | 95 | {tag:'tr', children:notesSelectorCheckboxCells} |
| 98 | ]}, | 96 | ]}, |
| 99 | {tag:'tbody', id:this.getId('previewData_tbody'), children:[]} | 97 | {tag:'tbody', id:this.getId('previewData_tbody'), children:[]} |
| 100 | ]} | 98 | ]} |
| 101 | ]} | 99 | ]} |
| 102 | ]} | 100 | ]} |
| 103 | ]}); | 101 | ]}); |
| 104 | 102 | ||
| 105 | this.renderData(this.getElement('previewData_tbody'), this.mainComponent().parsedValues()); | 103 | this.renderData(this.getElement('previewData_tbody'), this.mainComponent().parsedValues()); |
| 106 | 104 | ||
| 107 | if ((notesColumnIndex >= totalNumberOfColumns) || (notesColumnIndex == titleColumnIndex) || !(this.mainComponent().isColumnSelected(notesColumnIndex))) { | 105 | if ((notesColumnIndex >= totalNumberOfColumns) || (notesColumnIndex == titleColumnIndex) || !(this.mainComponent().isColumnSelected(notesColumnIndex))) { |
| 108 | this.mainComponent().setNotesColumnIndex(-1); | 106 | this.mainComponent().setNotesColumnIndex(-1); |
| 109 | notesColumnIndex = -1; | 107 | notesColumnIndex = -1; |
| 110 | } | 108 | } |
| 111 | 109 | ||
| 112 | c =totalNumberOfColumns; | 110 | c =totalNumberOfColumns; |
| 113 | for (i=0; i<c; i++) { | 111 | for (i=0; i<c; i++) { |
| 114 | if ((i != titleColumnIndex) && (this.mainComponent().isColumnSelected(i))) { | 112 | if ((i != titleColumnIndex) && (this.mainComponent().isColumnSelected(i))) { |
| 115 | MochiKit.Signal.connect(this.getDom('radio_' + i), 'onclick', this, 'renderDataHandler'); | 113 | MochiKit.Signal.connect(this.getDom('radio_' + i), 'onclick', this, 'renderDataHandler'); |
| 116 | if (Clipperz_IEisBroken != true) { | 114 | if (Clipperz_IEisBroken != true) { |
| 117 | MochiKit.Signal.connect(this.getDom('columnLabel_' + i), 'onclick', this.getDom('radio_' + i), 'click'); | 115 | MochiKit.Signal.connect(this.getDom('columnLabel_' + i), 'onclick', this.getDom('radio_' + i), 'click'); |
| 118 | } | 116 | } |
diff --git a/frontend/beta/js/Clipperz/PM/Components/Import/CSVImport/CSVImportTitle.js b/frontend/beta/js/Clipperz/PM/Components/Import/CSVImport/CSVImportTitle.js index aa57580..4b2149a 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Import/CSVImport/CSVImportTitle.js +++ b/frontend/beta/js/Clipperz/PM/Components/Import/CSVImport/CSVImportTitle.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } | 27 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } |
| 30 | if (typeof(Clipperz.PM.Components.Import.CSVImport) == 'undefined') { Clipperz.PM.Components.Import.CSVImport = {}; } | 28 | if (typeof(Clipperz.PM.Components.Import.CSVImport) == 'undefined') { Clipperz.PM.Components.Import.CSVImport = {}; } |
| 31 | 29 | ||
| 32 | //############################################################################# | 30 | //############################################################################# |
| 33 | 31 | ||
| 34 | Clipperz.PM.Components.Import.CSVImport.CSVImportTitle = function(anElement, args) { | 32 | Clipperz.PM.Components.Import.CSVImport.CSVImportTitle = function(anElement, args) { |
| 35 | args = args || {}; | 33 | args = args || {}; |
| 36 | 34 | ||
| 37 | Clipperz.PM.Components.Import.CSVImport.CSVImportTitle.superclass.constructor.call(this, anElement, args); | 35 | Clipperz.PM.Components.Import.CSVImport.CSVImportTitle.superclass.constructor.call(this, anElement, args); |
| 38 | this._mainComponent = args.mainComponent; | 36 | this._mainComponent = args.mainComponent; |
| 39 | 37 | ||
| 40 | return this; | 38 | return this; |
| 41 | } | 39 | } |
| 42 | 40 | ||
| 43 | //============================================================================= | 41 | //============================================================================= |
| 44 | 42 | ||
| 45 | YAHOO.extendX(Clipperz.PM.Components.Import.CSVImport.CSVImportTitle, Clipperz.PM.Components.BaseComponent, { | 43 | YAHOO.extendX(Clipperz.PM.Components.Import.CSVImport.CSVImportTitle, Clipperz.PM.Components.BaseComponent, { |
| 46 | 44 | ||
| 47 | 'toString': function() { | 45 | 'toString': function() { |
| 48 | return "Clipperz.PM.Components.Import.CSVImport.CSVImportTitle component"; | 46 | return "Clipperz.PM.Components.Import.CSVImport.CSVImportTitle component"; |
| 49 | }, | 47 | }, |
| 50 | 48 | ||
| 51 | //------------------------------------------------------------------------- | 49 | //------------------------------------------------------------------------- |
| 52 | 50 | ||
| 53 | 'mainComponent': function() { | 51 | 'mainComponent': function() { |
| 54 | return this._mainComponent; | 52 | return this._mainComponent; |
| 55 | }, | 53 | }, |
| 56 | 54 | ||
| 57 | //------------------------------------------------------------------------- | 55 | //------------------------------------------------------------------------- |
| 58 | 56 | ||
| 59 | 'render': function() { | 57 | 'render': function() { |
| 60 | vartitleSelectorCheckboxCells; | 58 | vartitleSelectorCheckboxCells; |
| 61 | var titleColumnIndex; | 59 | var titleColumnIndex; |
| 62 | var i,c; | 60 | var i,c; |
| 63 | 61 | ||
| 64 | Clipperz.NotificationCenter.unregister(this); | 62 | Clipperz.NotificationCenter.unregister(this); |
| 65 | MochiKit.Signal.disconnectAllTo(this); | 63 | MochiKit.Signal.disconnectAllTo(this); |
| 66 | 64 | ||
| 67 | this.element().update(""); | 65 | this.element().update(""); |
| 68 | 66 | ||
| 69 | titleColumnIndex = this.mainComponent().titleColumnIndex() | 67 | titleColumnIndex = this.mainComponent().titleColumnIndex() |
| 70 | titleSelectorCheckboxCells = []; | 68 | titleSelectorCheckboxCells = []; |
| 71 | c =this.mainComponent().parsedValues()[0].length; | 69 | c =this.mainComponent().parsedValues()[0].length; |
| 72 | for (i=0; i<c; i++) { | 70 | for (i=0; i<c; i++) { |
| 73 | if (this.mainComponent().isColumnSelected(i)) { | 71 | if (this.mainComponent().isColumnSelected(i)) { |
| 74 | titleSelectorCheckboxCells.push({tag:'th', valign:'top', id:this.getId('th_' + i), children:[ | 72 | titleSelectorCheckboxCells.push({tag:'th', valign:'top', id:this.getId('th_' + i), children:[ |
| 75 | {tag:'input', type:'radio', id:this.getId('radio_' + i), name:'CSVImportTitleColumn', value:i}, | 73 | {tag:'input', type:'radio', id:this.getId('radio_' + i), name:'CSVImportTitleColumn', value:i}, |
| 76 | {tag:'span', cls:'clickableSpan', id:this.getId('columnLabel_' + i), html:this.mainComponent().labelForColumn(i)} | 74 | {tag:'span', cls:'clickableSpan', id:this.getId('columnLabel_' + i), html:this.mainComponent().labelForColumn(i)} |
| 77 | ]}) | 75 | ]}) |
| 78 | } | 76 | } |
| 79 | } | 77 | } |
| 80 | 78 | ||
| 81 | if (titleColumnIndex >= titleSelectorCheckboxCells.length) { | 79 | if (titleColumnIndex >= titleSelectorCheckboxCells.length) { |
| 82 | this.mainComponent().setTitleColumnIndex(-1); | 80 | this.mainComponent().setTitleColumnIndex(-1); |
| 83 | } | 81 | } |
| 84 | 82 | ||
| 85 | this.domHelper().append(this.element(), {tag:'div', children:[ | 83 | this.domHelper().append(this.element(), {tag:'div', children:[ |
| 86 | {tag:'div', cls:'importStepDescription', htmlString:Clipperz.PM.Strings['CSV_ImportWizard_Title']}, | 84 | {tag:'div', cls:'importStepDescription', htmlString:Clipperz.PM.Strings['CSV_ImportWizard_Title']}, |
| 87 | {tag:'div', id:this.getId('dataDiv'), cls:'csvImportPreview', children:[ | 85 | {tag:'div', id:this.getId('dataDiv'), cls:'csvImportPreview', children:[ |
| 88 | {tag:'table', id:this.getId('previewDada'), cls:'csvImportPreview', cellspacing:'0', children:[ | 86 | {tag:'table', id:this.getId('previewDada'), cls:'csvImportPreview', cellspacing:'0', children:[ |
| 89 | {tag:'thead', id:this.getId('previewData_thead'), children:[ | 87 | {tag:'thead', id:this.getId('previewData_thead'), children:[ |
| 90 | {tag:'tr', children:titleSelectorCheckboxCells} | 88 | {tag:'tr', children:titleSelectorCheckboxCells} |
| 91 | ]}, | 89 | ]}, |
| 92 | {tag:'tbody', id:this.getId('previewData_tbody'), children:[]} | 90 | {tag:'tbody', id:this.getId('previewData_tbody'), children:[]} |
| 93 | ]} | 91 | ]} |
| 94 | ]} | 92 | ]} |
| 95 | ]}); | 93 | ]}); |
| 96 | 94 | ||
| 97 | this.renderData(this.getElement('previewData_tbody'), this.mainComponent().parsedValues()); | 95 | this.renderData(this.getElement('previewData_tbody'), this.mainComponent().parsedValues()); |
| 98 | 96 | ||
| 99 | c =this.mainComponent().parsedValues()[0].length; | 97 | c =this.mainComponent().parsedValues()[0].length; |
| 100 | for (i=0; i<c; i++) { | 98 | for (i=0; i<c; i++) { |
| 101 | if (this.mainComponent().isColumnSelected(i)) { | 99 | if (this.mainComponent().isColumnSelected(i)) { |
| 102 | MochiKit.Signal.connect(this.getDom('radio_' + i), 'onclick', this, 'renderDataHandler'); | 100 | MochiKit.Signal.connect(this.getDom('radio_' + i), 'onclick', this, 'renderDataHandler'); |
| 103 | if (Clipperz_IEisBroken != true) { | 101 | if (Clipperz_IEisBroken != true) { |
| 104 | MochiKit.Signal.connect(this.getDom('columnLabel_' + i), 'onclick', this.getDom('radio_' + i), 'click'); | 102 | MochiKit.Signal.connect(this.getDom('columnLabel_' + i), 'onclick', this.getDom('radio_' + i), 'click'); |
| 105 | } | 103 | } |
| 106 | } | 104 | } |
| 107 | } | 105 | } |
| 108 | 106 | ||
| 109 | if (titleColumnIndex != -1) { | 107 | if (titleColumnIndex != -1) { |
| 110 | this.getDom('radio_' + titleColumnIndex).click(); | 108 | this.getDom('radio_' + titleColumnIndex).click(); |
| 111 | } else { | 109 | } else { |
| 112 | this.mainComponent().nextButton().disable(); | 110 | this.mainComponent().nextButton().disable(); |
| 113 | } | 111 | } |
| 114 | 112 | ||
| 115 | }, | 113 | }, |
| 116 | 114 | ||
| 117 | //------------------------------------------------------------------------- | 115 | //------------------------------------------------------------------------- |
| 118 | 116 | ||
diff --git a/frontend/beta/js/Clipperz/PM/Components/Import/CSVImportComponent.js b/frontend/beta/js/Clipperz/PM/Components/Import/CSVImportComponent.js index c1dd1a9..bd305c3 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Import/CSVImportComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/Import/CSVImportComponent.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } | 27 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.Import.CSVImportComponent = function(anElement, args) { | 31 | Clipperz.PM.Components.Import.CSVImportComponent = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | this._steps = this._steps || ['CSV_EDIT', 'CSV_COLUMNS', 'CSV_HEADER', 'CSV_TITLE', 'CSV_NOTES', 'CSV_FIELDS', 'PREVIEW', 'IMPORT']; | 34 | this._steps = this._steps || ['CSV_EDIT', 'CSV_COLUMNS', 'CSV_HEADER', 'CSV_TITLE', 'CSV_NOTES', 'CSV_FIELDS', 'PREVIEW', 'IMPORT']; |
| 37 | 35 | ||
| 38 | Clipperz.PM.Components.Import.CSVImportComponent.superclass.constructor.call(this, anElement, args); | 36 | Clipperz.PM.Components.Import.CSVImportComponent.superclass.constructor.call(this, anElement, args); |
| 39 | 37 | ||
| 40 | this._step1Component = null; | 38 | this._step1Component = null; |
| 41 | this._step2Component = null; | 39 | this._step2Component = null; |
| 42 | this._step3Component = null; | 40 | this._step3Component = null; |
| 43 | this._step4Component = null; | 41 | this._step4Component = null; |
| 44 | this._step5Component = null; | 42 | this._step5Component = null; |
| 45 | 43 | ||
| 46 | this._isFirstRowHeader = false; | 44 | this._isFirstRowHeader = false; |
| 47 | this._titleColumnIndex = -1; | 45 | this._titleColumnIndex = -1; |
| 48 | this._notesColumnIndex = -1; | 46 | this._notesColumnIndex = -1; |
| 49 | this._fieldSettings = {}; | 47 | this._fieldSettings = {}; |
| 50 | this._skippedColumns = new Clipperz.Set(); | 48 | this._skippedColumns = new Clipperz.Set(); |
| 51 | 49 | ||
| 52 | this.render(); | 50 | this.render(); |
| 53 | 51 | ||
| 54 | return this; | 52 | return this; |
| 55 | } | 53 | } |
| 56 | 54 | ||
| 57 | //============================================================================= | 55 | //============================================================================= |
| 58 | 56 | ||
| 59 | YAHOO.extendX(Clipperz.PM.Components.Import.CSVImportComponent, Clipperz.PM.Components.Import.GenericImportComponent, { | 57 | YAHOO.extendX(Clipperz.PM.Components.Import.CSVImportComponent, Clipperz.PM.Components.Import.GenericImportComponent, { |
| 60 | 58 | ||
| 61 | 'toString': function() { | 59 | 'toString': function() { |
| 62 | return "Clipperz.PM.Components.Import.CSVImportComponent component"; | 60 | return "Clipperz.PM.Components.Import.CSVImportComponent component"; |
| 63 | }, | 61 | }, |
| 64 | 62 | ||
| 65 | //------------------------------------------------------------------------- | 63 | //------------------------------------------------------------------------- |
| 66 | 64 | ||
| 67 | 'render': function() { | 65 | 'render': function() { |
| 68 | this.domHelper().append(this.element(), {tag:'div', cls:'csvImportWizard', children:[ | 66 | this.domHelper().append(this.element(), {tag:'div', cls:'csvImportWizard', children:[ |
| 69 | {tag:'h3', htmlString:Clipperz.PM.Strings['CSV_ImportWizard_Title']}, | 67 | {tag:'h3', htmlString:Clipperz.PM.Strings['CSV_ImportWizard_Title']}, |
| 70 | {tag:'div', cls:'importSteps', id:this.getId('importSteps')}, | 68 | {tag:'div', cls:'importSteps', id:this.getId('importSteps')}, |
| 71 | {tag:'div', cls:'importStepBlocks', children:[ | 69 | {tag:'div', cls:'importStepBlocks', children:[ |
| 72 | {tag:'div', cls:'step_0', id:this.getId('step_0'), children:[ | 70 | {tag:'div', cls:'step_0', id:this.getId('step_0'), children:[ |
| 73 | {tag:'div', children:[ | 71 | {tag:'div', children:[ |
| 74 | {tag:'div', cls:'importOptionsDescription', htmlString:Clipperz.PM.Strings['importOptions_csv_description']}, | 72 | {tag:'div', cls:'importOptionsDescription', htmlString:Clipperz.PM.Strings['importOptions_csv_description']}, |
| 75 | {tag:'div', cls:'importOptionsParameters', children:[ | 73 | {tag:'div', cls:'importOptionsParameters', children:[ |
| 76 | {tag:'div', cls:'CSVImportOptionsParameters', children:[ | 74 | {tag:'div', cls:'CSVImportOptionsParameters', children:[ |
| 77 | {tag:'ul', children:[ | 75 | {tag:'ul', children:[ |
| 78 | {tag:'li', children:[ | 76 | {tag:'li', children:[ |
| 79 | {tag:'label', 'for':this.getId('CSV_inputOptions_separator'), html:"separator"}, | 77 | {tag:'label', 'for':this.getId('CSV_inputOptions_separator'), html:"separator"}, |
| 80 | {tag:'select', name:this.getId('CSV_inputOptions_separator'), id:this.getId('CSV_inputOptions_separator'), children:[ | 78 | {tag:'select', name:this.getId('CSV_inputOptions_separator'), id:this.getId('CSV_inputOptions_separator'), children:[ |
| 81 | {tag:'option', name:'comma', value:',', html:"comma (,)", selected:true}, | 79 | {tag:'option', name:'comma', value:',', html:"comma (,)", selected:true}, |
| 82 | {tag:'option', name:'tab', value:'\t', html:"tab"} | 80 | {tag:'option', name:'tab', value:'\t', html:"tab"} |
| 83 | ]} | 81 | ]} |
| 84 | ]}, | 82 | ]}, |
| 85 | 83 | ||
| 86 | {tag:'li', children:[ | 84 | {tag:'li', children:[ |
| 87 | {tag:'label', 'for':this.getId('CSV_inputOptions_quote'), html:"quote"}, | 85 | {tag:'label', 'for':this.getId('CSV_inputOptions_quote'), html:"quote"}, |
| 88 | {tag:'select', name:this.getId('CSV_inputOptions_quote'), id:this.getId('CSV_inputOptions_quote'), children:[ | 86 | {tag:'select', name:this.getId('CSV_inputOptions_quote'), id:this.getId('CSV_inputOptions_quote'), children:[ |
| 89 | {tag:'option', name:'doubleQuote', value:'\"', html:"double quote (\")", selected:true}, | 87 | {tag:'option', name:'doubleQuote', value:'\"', html:"double quote (\")", selected:true}, |
| 90 | {tag:'option', name:'singleQuote', value:'\'', html:"single quote (\')"} | 88 | {tag:'option', name:'singleQuote', value:'\'', html:"single quote (\')"} |
| 91 | ]} | 89 | ]} |
| 92 | ]}, | 90 | ]}, |
| 93 | 91 | ||
| 94 | {tag:'li', children:[ | 92 | {tag:'li', children:[ |
| 95 | {tag:'label', 'for':this.getId('CSV_inputOptions_escape'), html:"escape"}, | 93 | {tag:'label', 'for':this.getId('CSV_inputOptions_escape'), html:"escape"}, |
| 96 | {tag:'select', name:this.getId('CSV_inputOptions_escape'), id:this.getId('CSV_inputOptions_escape'), children:[ | 94 | {tag:'select', name:this.getId('CSV_inputOptions_escape'), id:this.getId('CSV_inputOptions_escape'), children:[ |
| 97 | {tag:'option', name:'doubleQuote', value:'\"', html:"double quote (\")", selected:true}, | 95 | {tag:'option', name:'doubleQuote', value:'\"', html:"double quote (\")", selected:true}, |
| 98 | {tag:'option', name:'slash', value:'\/', html:"slash (\/)"}, | 96 | {tag:'option', name:'slash', value:'\/', html:"slash (\/)"}, |
| 99 | {tag:'option', name:'backslash', value:'\\', html:"backslash (\\)"} | 97 | {tag:'option', name:'backslash', value:'\\', html:"backslash (\\)"} |
| 100 | ]} | 98 | ]} |
| 101 | ]} | 99 | ]} |
| 102 | ]} | 100 | ]} |
| 103 | ]} | 101 | ]} |
| 104 | ]}, | 102 | ]}, |
| 105 | this.textAreaConfig() | 103 | this.textAreaConfig() |
| 106 | ]} | 104 | ]} |
| 107 | ]}, | 105 | ]}, |
| 108 | {tag:'div', cls:'step_1', id:this.getId('step_1'), children:[]}, | 106 | {tag:'div', cls:'step_1', id:this.getId('step_1'), children:[]}, |
| 109 | {tag:'div', cls:'step_2', id:this.getId('step_2'), children:[]}, | 107 | {tag:'div', cls:'step_2', id:this.getId('step_2'), children:[]}, |
| 110 | {tag:'div', cls:'step_3', id:this.getId('step_3'), children:[]}, | 108 | {tag:'div', cls:'step_3', id:this.getId('step_3'), children:[]}, |
| 111 | {tag:'div', cls:'step_4', id:this.getId('step_4'), children:[]}, | 109 | {tag:'div', cls:'step_4', id:this.getId('step_4'), children:[]}, |
| 112 | {tag:'div', cls:'step_5', id:this.getId('step_5'), children:[]}, | 110 | {tag:'div', cls:'step_5', id:this.getId('step_5'), children:[]}, |
| 113 | {tag:'div', cls:'step_6', id:this.getId('step_6'), children:[ | 111 | {tag:'div', cls:'step_6', id:this.getId('step_6'), children:[ |
| 114 | {tag:'div', children:[ | 112 | {tag:'div', children:[ |
| 115 | {tag:'div', id:this.getId('previewDiv'), html:"preview"} | 113 | {tag:'div', id:this.getId('previewDiv'), html:"preview"} |
| 116 | ]} | 114 | ]} |
| 117 | ]}, | 115 | ]}, |
| 118 | {tag:'div', cls:'step_7', id:this.getId('step_7'), children:[ | 116 | {tag:'div', cls:'step_7', id:this.getId('step_7'), children:[ |
diff --git a/frontend/beta/js/Clipperz/PM/Components/Import/ClipperzImportComponent.js b/frontend/beta/js/Clipperz/PM/Components/Import/ClipperzImportComponent.js index c3d2fac..d74961b 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Import/ClipperzImportComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/Import/ClipperzImportComponent.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } | 27 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.Import.ClipperzImportComponent = function(anElement, args) { | 31 | Clipperz.PM.Components.Import.ClipperzImportComponent = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | Clipperz.PM.Components.Import.ClipperzImportComponent.superclass.constructor.call(this, anElement, args); | 34 | Clipperz.PM.Components.Import.ClipperzImportComponent.superclass.constructor.call(this, anElement, args); |
| 37 | 35 | ||
| 38 | this.render(); | 36 | this.render(); |
| 39 | 37 | ||
| 40 | return this; | 38 | return this; |
| 41 | } | 39 | } |
| 42 | 40 | ||
| 43 | //============================================================================= | 41 | //============================================================================= |
| 44 | 42 | ||
| 45 | YAHOO.extendX(Clipperz.PM.Components.Import.ClipperzImportComponent, Clipperz.PM.Components.Import.GenericImportComponent, { | 43 | YAHOO.extendX(Clipperz.PM.Components.Import.ClipperzImportComponent, Clipperz.PM.Components.Import.GenericImportComponent, { |
| 46 | 44 | ||
| 47 | 'toString': function() { | 45 | 'toString': function() { |
| 48 | return "Clipperz.PM.Components.Import.ClipperzImportComponent component"; | 46 | return "Clipperz.PM.Components.Import.ClipperzImportComponent component"; |
| 49 | }, | 47 | }, |
| 50 | 48 | ||
| 51 | //------------------------------------------------------------------------- | 49 | //------------------------------------------------------------------------- |
| 52 | 50 | ||
| 53 | 'render': function() { | 51 | 'render': function() { |
| 54 | //MochiKit.Logging.logDebug(">>> Import.ClipperzImportComponent.render"); | 52 | //MochiKit.Logging.logDebug(">>> Import.ClipperzImportComponent.render"); |
| 55 | this.domHelper().append(this.element(), {tag:'div', cls:'clipperzImportWizard', children:[ | 53 | this.domHelper().append(this.element(), {tag:'div', cls:'clipperzImportWizard', children:[ |
| 56 | {tag:'h3', htmlString:Clipperz.PM.Strings['Clipperz_ImportWizard_Title']}, | 54 | {tag:'h3', htmlString:Clipperz.PM.Strings['Clipperz_ImportWizard_Title']}, |
| 57 | {tag:'div', cls:'importSteps', id:this.getId('importSteps')}, | 55 | {tag:'div', cls:'importSteps', id:this.getId('importSteps')}, |
| 58 | {tag:'div', cls:'importStepBlocks', children:[ | 56 | {tag:'div', cls:'importStepBlocks', children:[ |
| 59 | {tag:'div', cls:'step_0', id:this.getId('step_0'), children:[ | 57 | {tag:'div', cls:'step_0', id:this.getId('step_0'), children:[ |
| 60 | {tag:'div', children:[ | 58 | {tag:'div', children:[ |
| 61 | {tag:'div', cls:'importOptionsDescription', htmlString:Clipperz.PM.Strings['importOptions_clipperz_description']}, | 59 | {tag:'div', cls:'importOptionsDescription', htmlString:Clipperz.PM.Strings['importOptions_clipperz_description']}, |
| 62 | {tag:'div', cls:'importOptionsParameters', children:[]}, | 60 | {tag:'div', cls:'importOptionsParameters', children:[]}, |
| 63 | this.textAreaConfig() | 61 | this.textAreaConfig() |
| 64 | ]} | 62 | ]} |
| 65 | ]}, | 63 | ]}, |
| 66 | {tag:'div', cls:'step_1', id:this.getId('step_1'), children:[ | 64 | {tag:'div', cls:'step_1', id:this.getId('step_1'), children:[ |
| 67 | {tag:'div', children:[ | 65 | {tag:'div', children:[ |
| 68 | {tag:'div', id:this.getId('previewDiv'), html:"preview"} | 66 | {tag:'div', id:this.getId('previewDiv'), html:"preview"} |
| 69 | ]} | 67 | ]} |
| 70 | ]}, | 68 | ]}, |
| 71 | {tag:'div', cls:'step_2', id:this.getId('step_2'), children:[ | 69 | {tag:'div', cls:'step_2', id:this.getId('step_2'), children:[ |
| 72 | {tag:'div', children:[ | 70 | {tag:'div', children:[ |
| 73 | {tag:'h4', html:"done"} | 71 | {tag:'h4', html:"done"} |
| 74 | ]} | 72 | ]} |
| 75 | ]} | 73 | ]} |
| 76 | ]}, | 74 | ]}, |
| 77 | {tag:'div', cls:'importOptionsButtons', children:[ | 75 | {tag:'div', cls:'importOptionsButtons', children:[ |
| 78 | {tag:'table', children:[ | 76 | {tag:'table', children:[ |
| 79 | {tag:'tbody', children:[ | 77 | {tag:'tbody', children:[ |
| 80 | {tag:'tr', children:[ | 78 | {tag:'tr', children:[ |
| 81 | {tag:'td', html:' '}, | 79 | {tag:'td', html:' '}, |
| 82 | {tag:'td', children:[ | 80 | {tag:'td', children:[ |
| 83 | {tag:'div', id:this.getId('backActionButton')} | 81 | {tag:'div', id:this.getId('backActionButton')} |
| 84 | ]}, | 82 | ]}, |
| 85 | {tag:'td', html:' '}, | 83 | {tag:'td', html:' '}, |
| 86 | {tag:'td', children:[ | 84 | {tag:'td', children:[ |
| 87 | {tag:'div', id:this.getId('nextActionButton')} | 85 | {tag:'div', id:this.getId('nextActionButton')} |
| 88 | ]}, | 86 | ]}, |
| 89 | {tag:'td', html:' '} | 87 | {tag:'td', html:' '} |
| 90 | ]} | 88 | ]} |
| 91 | ]} | 89 | ]} |
| 92 | ]} | 90 | ]} |
| 93 | ]} | 91 | ]} |
| 94 | ]}); | 92 | ]}); |
| 95 | 93 | ||
| 96 | this.updateSteps(); | 94 | this.updateSteps(); |
| 97 | 95 | ||
| 98 | this.setBackButton(new YAHOO.ext.Button(this.getDom('backActionButton'), {text:"back", handler:this.backAction, scope:this})); | 96 | this.setBackButton(new YAHOO.ext.Button(this.getDom('backActionButton'), {text:"back", handler:this.backAction, scope:this})); |
| 99 | this.setNextButton(new YAHOO.ext.Button(this.getDom('nextActionButton'), {text:"next", handler:this.nextAction, scope:this})); | 97 | this.setNextButton(new YAHOO.ext.Button(this.getDom('nextActionButton'), {text:"next", handler:this.nextAction, scope:this})); |
| 100 | 98 | ||
| 101 | this.getElement('step_0').setVisibilityMode(YAHOO.ext.Element.DISPLAY).show() | 99 | this.getElement('step_0').setVisibilityMode(YAHOO.ext.Element.DISPLAY).show() |
| 102 | this.getElement('step_1').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); | 100 | this.getElement('step_1').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); |
| 103 | this.getElement('step_2').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); | 101 | this.getElement('step_2').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); |
| 104 | //MochiKit.Logging.logDebug("<<< Import.ClipperzImportComponent.render"); | 102 | //MochiKit.Logging.logDebug("<<< Import.ClipperzImportComponent.render"); |
| 105 | }, | 103 | }, |
| 106 | 104 | ||
| 107 | //------------------------------------------------------------------------- | 105 | //------------------------------------------------------------------------- |
| 108 | 106 | ||
| 109 | 'nextAction': function() { | 107 | 'nextAction': function() { |
| 110 | switch (this.currentStep()) { | 108 | switch (this.currentStep()) { |
| 111 | case 0: //-> 1 | 109 | case 0: //-> 1 |
| 112 | this.previewValues(); | 110 | this.previewValues(); |
| 113 | break; | 111 | break; |
| 114 | case 1: //-> 2 | 112 | case 1: //-> 2 |
| 115 | this.importValues(); | 113 | this.importValues(); |
| 116 | break; | 114 | break; |
| 117 | } | 115 | } |
| 118 | }, | 116 | }, |
diff --git a/frontend/beta/js/Clipperz/PM/Components/Import/ExcelImportComponent.js b/frontend/beta/js/Clipperz/PM/Components/Import/ExcelImportComponent.js index ad0d985..859c190 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Import/ExcelImportComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/Import/ExcelImportComponent.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } | 27 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.Import.ExcelImportComponent = function(anElement, args) { | 31 | Clipperz.PM.Components.Import.ExcelImportComponent = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | this._steps = ['EXCEL_EDIT', 'CSV_COLUMNS', 'CSV_HEADER', 'CSV_TITLE', 'CSV_NOTES', 'CSV_FIELDS', 'PREVIEW', 'IMPORT']; | 34 | this._steps = ['EXCEL_EDIT', 'CSV_COLUMNS', 'CSV_HEADER', 'CSV_TITLE', 'CSV_NOTES', 'CSV_FIELDS', 'PREVIEW', 'IMPORT']; |
| 37 | 35 | ||
| 38 | Clipperz.PM.Components.Import.ExcelImportComponent.superclass.constructor.call(this, anElement, args); | 36 | Clipperz.PM.Components.Import.ExcelImportComponent.superclass.constructor.call(this, anElement, args); |
| 39 | 37 | ||
| 40 | return this; | 38 | return this; |
| 41 | } | 39 | } |
| 42 | 40 | ||
| 43 | //============================================================================= | 41 | //============================================================================= |
| 44 | 42 | ||
| 45 | YAHOO.extendX(Clipperz.PM.Components.Import.ExcelImportComponent, Clipperz.PM.Components.Import.CSVImportComponent, { | 43 | YAHOO.extendX(Clipperz.PM.Components.Import.ExcelImportComponent, Clipperz.PM.Components.Import.CSVImportComponent, { |
| 46 | 44 | ||
| 47 | 'toString': function() { | 45 | 'toString': function() { |
| 48 | return "Clipperz.PM.Components.Import.ExcelImportComponent component"; | 46 | return "Clipperz.PM.Components.Import.ExcelImportComponent component"; |
| 49 | }, | 47 | }, |
| 50 | 48 | ||
| 51 | //------------------------------------------------------------------------- | 49 | //------------------------------------------------------------------------- |
| 52 | 50 | ||
| 53 | 'render': function() { | 51 | 'render': function() { |
| 54 | //MochiKit.Logging.logDebug(">>> Import.ExcelImportComponent.render"); | 52 | //MochiKit.Logging.logDebug(">>> Import.ExcelImportComponent.render"); |
| 55 | this.domHelper().append(this.element(), {tag:'div', cls:'excelImportWizard', children:[ | 53 | this.domHelper().append(this.element(), {tag:'div', cls:'excelImportWizard', children:[ |
| 56 | {tag:'h3', htmlString:Clipperz.PM.Strings['Excel_ImportWizard_Title']}, | 54 | {tag:'h3', htmlString:Clipperz.PM.Strings['Excel_ImportWizard_Title']}, |
| 57 | {tag:'div', cls:'importSteps', id:this.getId('importSteps')}, | 55 | {tag:'div', cls:'importSteps', id:this.getId('importSteps')}, |
| 58 | {tag:'div', cls:'importStepBlocks', children:[ | 56 | {tag:'div', cls:'importStepBlocks', children:[ |
| 59 | {tag:'div', cls:'step_0', id:this.getId('step_0'), children:[ | 57 | {tag:'div', cls:'step_0', id:this.getId('step_0'), children:[ |
| 60 | {tag:'div', children:[ | 58 | {tag:'div', children:[ |
| 61 | {tag:'div', cls:'importOptionsDescription', htmlString:Clipperz.PM.Strings['importOptions_excel_description']}, | 59 | {tag:'div', cls:'importOptionsDescription', htmlString:Clipperz.PM.Strings['importOptions_excel_description']}, |
| 62 | {tag:'div', cls:'importOptionsParameters', children:[]}, | 60 | {tag:'div', cls:'importOptionsParameters', children:[]}, |
| 63 | this.textAreaConfig() | 61 | this.textAreaConfig() |
| 64 | ]} | 62 | ]} |
| 65 | ]}, | 63 | ]}, |
| 66 | {tag:'div', cls:'step_1', id:this.getId('step_1'), children:[]}, | 64 | {tag:'div', cls:'step_1', id:this.getId('step_1'), children:[]}, |
| 67 | {tag:'div', cls:'step_2', id:this.getId('step_2'), children:[]}, | 65 | {tag:'div', cls:'step_2', id:this.getId('step_2'), children:[]}, |
| 68 | {tag:'div', cls:'step_3', id:this.getId('step_3'), children:[]}, | 66 | {tag:'div', cls:'step_3', id:this.getId('step_3'), children:[]}, |
| 69 | {tag:'div', cls:'step_4', id:this.getId('step_4'), children:[]}, | 67 | {tag:'div', cls:'step_4', id:this.getId('step_4'), children:[]}, |
| 70 | {tag:'div', cls:'step_5', id:this.getId('step_5'), children:[]}, | 68 | {tag:'div', cls:'step_5', id:this.getId('step_5'), children:[]}, |
| 71 | {tag:'div', cls:'step_6', id:this.getId('step_6'), children:[ | 69 | {tag:'div', cls:'step_6', id:this.getId('step_6'), children:[ |
| 72 | {tag:'div', children:[ | 70 | {tag:'div', children:[ |
| 73 | {tag:'div', id:this.getId('previewDiv'), html:"preview"} | 71 | {tag:'div', id:this.getId('previewDiv'), html:"preview"} |
| 74 | ]} | 72 | ]} |
| 75 | ]}, | 73 | ]}, |
| 76 | {tag:'div', cls:'step_7', id:this.getId('step_7'), children:[ | 74 | {tag:'div', cls:'step_7', id:this.getId('step_7'), children:[ |
| 77 | {tag:'div', children:[ | 75 | {tag:'div', children:[ |
| 78 | {tag:'h4', html:"done"} | 76 | {tag:'h4', html:"done"} |
| 79 | ]} | 77 | ]} |
| 80 | ]} | 78 | ]} |
| 81 | ]}, | 79 | ]}, |
| 82 | {tag:'div', cls:'importOptionsButtons', children:[ | 80 | {tag:'div', cls:'importOptionsButtons', children:[ |
| 83 | {tag:'table', children:[ | 81 | {tag:'table', children:[ |
| 84 | {tag:'tbody', children:[ | 82 | {tag:'tbody', children:[ |
| 85 | {tag:'tr', children:[ | 83 | {tag:'tr', children:[ |
| 86 | {tag:'td', html:' '}, | 84 | {tag:'td', html:' '}, |
| 87 | {tag:'td', children:[ | 85 | {tag:'td', children:[ |
| 88 | {tag:'div', id:this.getId('backActionButton')} | 86 | {tag:'div', id:this.getId('backActionButton')} |
| 89 | ]}, | 87 | ]}, |
| 90 | {tag:'td', html:' '}, | 88 | {tag:'td', html:' '}, |
| 91 | {tag:'td', children:[ | 89 | {tag:'td', children:[ |
| 92 | {tag:'div', id:this.getId('nextActionButton')} | 90 | {tag:'div', id:this.getId('nextActionButton')} |
| 93 | ]}, | 91 | ]}, |
| 94 | {tag:'td', html:' '} | 92 | {tag:'td', html:' '} |
| 95 | ]} | 93 | ]} |
| 96 | ]} | 94 | ]} |
| 97 | ]} | 95 | ]} |
| 98 | ]} | 96 | ]} |
| 99 | ]}); | 97 | ]}); |
| 100 | 98 | ||
| 101 | this.updateSteps(); | 99 | this.updateSteps(); |
| 102 | 100 | ||
| 103 | this.setBackButton(new YAHOO.ext.Button(this.getDom('backActionButton'), {text:"back", handler:this.backAction, scope:this})); | 101 | this.setBackButton(new YAHOO.ext.Button(this.getDom('backActionButton'), {text:"back", handler:this.backAction, scope:this})); |
| 104 | this.setNextButton(new YAHOO.ext.Button(this.getDom('nextActionButton'), {text:"next", handler:this.nextAction, scope:this})); | 102 | this.setNextButton(new YAHOO.ext.Button(this.getDom('nextActionButton'), {text:"next", handler:this.nextAction, scope:this})); |
| 105 | 103 | ||
| 106 | this.getElement('step_0').setVisibilityMode(YAHOO.ext.Element.DISPLAY).show() | 104 | this.getElement('step_0').setVisibilityMode(YAHOO.ext.Element.DISPLAY).show() |
| 107 | this.getElement('step_1').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); | 105 | this.getElement('step_1').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); |
| 108 | this.getElement('step_2').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); | 106 | this.getElement('step_2').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); |
| 109 | this.getElement('step_3').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); | 107 | this.getElement('step_3').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); |
| 110 | this.getElement('step_4').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); | 108 | this.getElement('step_4').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); |
| 111 | this.getElement('step_5').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); | 109 | this.getElement('step_5').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); |
| 112 | this.getElement('step_6').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); | 110 | this.getElement('step_6').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); |
| 113 | this.getElement('step_7').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); | 111 | this.getElement('step_7').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); |
| 114 | //MochiKit.Logging.logDebug("<<< Import.ExcelImportComponent.render"); | 112 | //MochiKit.Logging.logDebug("<<< Import.ExcelImportComponent.render"); |
| 115 | }, | 113 | }, |
| 116 | 114 | ||
| 117 | //------------------------------------------------------------------------- | 115 | //------------------------------------------------------------------------- |
| 118 | 116 | ||
diff --git a/frontend/beta/js/Clipperz/PM/Components/Import/GenericImportComponent.js b/frontend/beta/js/Clipperz/PM/Components/Import/GenericImportComponent.js index a55455a..3c23b1c 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Import/GenericImportComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/Import/GenericImportComponent.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } | 27 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.Import.GenericImportComponent = function(anElement, args) { | 31 | Clipperz.PM.Components.Import.GenericImportComponent = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | this._steps = this._steps || ['EDIT', 'PREVIEW', 'IMPORT']; | 34 | this._steps = this._steps || ['EDIT', 'PREVIEW', 'IMPORT']; |
| 37 | 35 | ||
| 38 | Clipperz.PM.Components.Import.GenericImportComponent.superclass.constructor.call(this, anElement, args); | 36 | Clipperz.PM.Components.Import.GenericImportComponent.superclass.constructor.call(this, anElement, args); |
| 39 | 37 | ||
| 40 | this._user = args['user']; | 38 | this._user = args['user']; |
| 41 | 39 | ||
| 42 | this._currentStep = 0; | 40 | this._currentStep = 0; |
| 43 | this._currentStatus = 'IDLE'; //'PROCESSING' | 41 | this._currentStatus = 'IDLE'; //'PROCESSING' |
| 44 | 42 | ||
| 45 | this._parsedValues = null; | 43 | this._parsedValues = null; |
| 46 | this._processedValues = null; | 44 | this._processedValues = null; |
| 47 | 45 | ||
| 48 | this._backButton = null; | 46 | this._backButton = null; |
| 49 | this._nextButton = null; | 47 | this._nextButton = null; |
| 50 | 48 | ||
| 51 | Clipperz.NotificationCenter.register(null, 'importProcessorProgressUpdate', this, 'updateProgressDialogStatus'); | 49 | Clipperz.NotificationCenter.register(null, 'importProcessorProgressUpdate', this, 'updateProgressDialogStatus'); |
| 52 | 50 | ||
| 53 | return this; | 51 | return this; |
| 54 | } | 52 | } |
| 55 | 53 | ||
| 56 | //============================================================================= | 54 | //============================================================================= |
| 57 | 55 | ||
| 58 | YAHOO.extendX(Clipperz.PM.Components.Import.GenericImportComponent, Clipperz.PM.Components.BaseComponent, { | 56 | YAHOO.extendX(Clipperz.PM.Components.Import.GenericImportComponent, Clipperz.PM.Components.BaseComponent, { |
| 59 | 57 | ||
| 60 | 'toString': function() { | 58 | 'toString': function() { |
| 61 | return "Clipperz.PM.Components.Import.GenericImportComponent component"; | 59 | return "Clipperz.PM.Components.Import.GenericImportComponent component"; |
| 62 | }, | 60 | }, |
| 63 | 61 | ||
| 64 | //------------------------------------------------------------------------- | 62 | //------------------------------------------------------------------------- |
| 65 | 63 | ||
| 66 | 'user': function() { | 64 | 'user': function() { |
| 67 | return this._user; | 65 | return this._user; |
| 68 | }, | 66 | }, |
| 69 | 67 | ||
| 70 | //------------------------------------------------------------------------- | 68 | //------------------------------------------------------------------------- |
| 71 | 69 | ||
| 72 | 'textAreaConfig': function() { | 70 | 'textAreaConfig': function() { |
| 73 | return {tag:'textarea', name:this.getId('importTextArea'), cls:'importTextArea', id:this.getId('importTextArea'), cols:60, rows:15, html:""}; | 71 | return {tag:'textarea', name:this.getId('importTextArea'), cls:'importTextArea', id:this.getId('importTextArea'), cols:60, rows:15, html:""}; |
| 74 | }, | 72 | }, |
| 75 | 73 | ||
| 76 | 'textAreaContent': function() { | 74 | 'textAreaContent': function() { |
| 77 | return this.getDom('importTextArea').value | 75 | return this.getDom('importTextArea').value |
| 78 | }, | 76 | }, |
| 79 | 77 | ||
| 80 | //------------------------------------------------------------------------- | 78 | //------------------------------------------------------------------------- |
| 81 | 79 | ||
| 82 | 'steps': function() { | 80 | 'steps': function() { |
| 83 | return this._steps; | 81 | return this._steps; |
| 84 | }, | 82 | }, |
| 85 | 83 | ||
| 86 | 'currentStep': function() { | 84 | 'currentStep': function() { |
| 87 | return this._currentStep; | 85 | return this._currentStep; |
| 88 | }, | 86 | }, |
| 89 | 87 | ||
| 90 | 'setCurrentStep': function(aValue) { | 88 | 'setCurrentStep': function(aValue) { |
| 91 | this._currentStep = aValue; | 89 | this._currentStep = aValue; |
| 92 | this.updateSteps(); | 90 | this.updateSteps(); |
| 93 | }, | 91 | }, |
| 94 | 92 | ||
| 95 | //------------------------------------------------------------------------- | 93 | //------------------------------------------------------------------------- |
| 96 | 94 | ||
| 97 | 'currentStatus': function() { | 95 | 'currentStatus': function() { |
| 98 | return this._currentStatus; | 96 | return this._currentStatus; |
| 99 | }, | 97 | }, |
| 100 | 98 | ||
| 101 | 'startProcessing': function() { | 99 | 'startProcessing': function() { |
| 102 | this._currentStatus = 'PROCESSING'; | 100 | this._currentStatus = 'PROCESSING'; |
| 103 | this.updateSteps(); | 101 | this.updateSteps(); |
| 104 | }, | 102 | }, |
| 105 | 103 | ||
| 106 | 'processingDone': function() { | 104 | 'processingDone': function() { |
| 107 | this._currentStatus = 'IDLE'; | 105 | this._currentStatus = 'IDLE'; |
| 108 | this.setCurrentStep(this.currentStep() + 1); | 106 | this.setCurrentStep(this.currentStep() + 1); |
| 109 | }, | 107 | }, |
| 110 | 108 | ||
| 111 | 'processingAborted': function() { | 109 | 'processingAborted': function() { |
| 112 | this._currentStatus = 'IDLE'; | 110 | this._currentStatus = 'IDLE'; |
| 113 | this.updateSteps(); | 111 | this.updateSteps(); |
| 114 | }, | 112 | }, |
| 115 | 113 | ||
| 116 | //------------------------------------------------------------------------- | 114 | //------------------------------------------------------------------------- |
| 117 | 115 | ||
| 118 | 'stepsConfig': function() { | 116 | 'stepsConfig': function() { |
diff --git a/frontend/beta/js/Clipperz/PM/Components/Import/KeePassImportComponent.js b/frontend/beta/js/Clipperz/PM/Components/Import/KeePassImportComponent.js index 5f4fe33..0570704 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Import/KeePassImportComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/Import/KeePassImportComponent.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } | 27 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.Import.KeePassImportComponent = function(anElement, args) { | 31 | Clipperz.PM.Components.Import.KeePassImportComponent = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | Clipperz.PM.Components.Import.KeePassImportComponent.superclass.constructor.call(this, anElement, args); | 34 | Clipperz.PM.Components.Import.KeePassImportComponent.superclass.constructor.call(this, anElement, args); |
| 37 | 35 | ||
| 38 | this._steps = ['EDIT', 'KEEPASS_SETTINGS', 'PREVIEW', 'IMPORT']; | 36 | this._steps = ['EDIT', 'KEEPASS_SETTINGS', 'PREVIEW', 'IMPORT']; |
| 39 | this._definedFields = ['Group', 'Group Tree', 'UserName', 'URL', 'Password', 'Notes', 'UUID', 'Icon', 'Creation Time', 'Last Access', 'Last Modification', 'Expires', 'Attachment Description', 'Attachment']; | 37 | this._definedFields = ['Group', 'Group Tree', 'UserName', 'URL', 'Password', 'Notes', 'UUID', 'Icon', 'Creation Time', 'Last Access', 'Last Modification', 'Expires', 'Attachment Description', 'Attachment']; |
| 40 | 38 | ||
| 41 | this.render(); | 39 | this.render(); |
| 42 | 40 | ||
| 43 | return this; | 41 | return this; |
| 44 | } | 42 | } |
| 45 | 43 | ||
| 46 | //============================================================================= | 44 | //============================================================================= |
| 47 | 45 | ||
| 48 | YAHOO.extendX(Clipperz.PM.Components.Import.KeePassImportComponent, Clipperz.PM.Components.Import.GenericImportComponent, { | 46 | YAHOO.extendX(Clipperz.PM.Components.Import.KeePassImportComponent, Clipperz.PM.Components.Import.GenericImportComponent, { |
| 49 | 47 | ||
| 50 | 'toString': function() { | 48 | 'toString': function() { |
| 51 | return "Clipperz.PM.Components.Import.KeePassImportComponent component"; | 49 | return "Clipperz.PM.Components.Import.KeePassImportComponent component"; |
| 52 | }, | 50 | }, |
| 53 | 51 | ||
| 54 | //------------------------------------------------------------------------- | 52 | //------------------------------------------------------------------------- |
| 55 | 53 | ||
| 56 | 'render': function() { | 54 | 'render': function() { |
| 57 | //MochiKit.Logging.logDebug(">>> Import.KeePassImportComponent.render"); | 55 | //MochiKit.Logging.logDebug(">>> Import.KeePassImportComponent.render"); |
| 58 | this.domHelper().append(this.element(), {tag:'div', cls:'keePassImportWizard', children:[ | 56 | this.domHelper().append(this.element(), {tag:'div', cls:'keePassImportWizard', children:[ |
| 59 | {tag:'h3', htmlString:Clipperz.PM.Strings['KeePass_ImportWizard_Title']}, | 57 | {tag:'h3', htmlString:Clipperz.PM.Strings['KeePass_ImportWizard_Title']}, |
| 60 | {tag:'div', cls:'importSteps', id:this.getId('importSteps')}, | 58 | {tag:'div', cls:'importSteps', id:this.getId('importSteps')}, |
| 61 | {tag:'div', cls:'importStepBlocks', children:[ | 59 | {tag:'div', cls:'importStepBlocks', children:[ |
| 62 | {tag:'div', cls:'step_0', id:this.getId('step_0'), children:[ | 60 | {tag:'div', cls:'step_0', id:this.getId('step_0'), children:[ |
| 63 | {tag:'div', children:[ | 61 | {tag:'div', children:[ |
| 64 | {tag:'div', cls:'importOptionsDescription', htmlString:Clipperz.PM.Strings['importOptions_keePass_description']}, | 62 | {tag:'div', cls:'importOptionsDescription', htmlString:Clipperz.PM.Strings['importOptions_keePass_description']}, |
| 65 | {tag:'div', cls:'importOptionsParameters', children:[]}, | 63 | {tag:'div', cls:'importOptionsParameters', children:[]}, |
| 66 | this.textAreaConfig() | 64 | this.textAreaConfig() |
| 67 | ]} | 65 | ]} |
| 68 | ]}, | 66 | ]}, |
| 69 | {tag:'div', cls:'step_1', id:this.getId('step_1'), children:[ | 67 | {tag:'div', cls:'step_1', id:this.getId('step_1'), children:[ |
| 70 | {tag:'div', children:[ | 68 | {tag:'div', children:[ |
| 71 | {tag:'div', id:this.getId('settingsDiv'), children:[ | 69 | {tag:'div', id:this.getId('settingsDiv'), children:[ |
| 72 | {tag:'table', id:'KeePassSettings', children:[ | 70 | {tag:'table', id:'KeePassSettings', children:[ |
| 73 | {tag:'tbody', children:[ | 71 | {tag:'tbody', children:[ |
| 74 | {tag:'tr', children:[ | 72 | {tag:'tr', children:[ |
| 75 | {tag:'td', width:'50%', valign:'top', children:[ | 73 | {tag:'td', width:'50%', valign:'top', children:[ |
| 76 | {tag:'table', children:[ | 74 | {tag:'table', children:[ |
| 77 | {tag:'tbody', children:[ | 75 | {tag:'tbody', children:[ |
| 78 | {tag:'tr', children:[ | 76 | {tag:'tr', children:[ |
| 79 | {tag:'td', valign:'top', children:[{tag:'input', type:'checkbox', id:this.getId('Group_checkbox'), name:'Group'/*, checked:true*/}]}, | 77 | {tag:'td', valign:'top', children:[{tag:'input', type:'checkbox', id:this.getId('Group_checkbox'), name:'Group'/*, checked:true*/}]}, |
| 80 | {tag:'td', width:'150', valign:'top', children:[{tag:'span', cls:'keePassFieldLabel', id:this.getId('Group_label'), html:"Group"}]} | 78 | {tag:'td', width:'150', valign:'top', children:[{tag:'span', cls:'keePassFieldLabel', id:this.getId('Group_label'), html:"Group"}]} |
| 81 | ]}, | 79 | ]}, |
| 82 | {tag:'tr', children:[ | 80 | {tag:'tr', children:[ |
| 83 | {tag:'td', valign:'top', children:[{tag:'input', type:'checkbox', id:this.getId('Group Tree_checkbox'), name:'Group Tree'/*, checked:true*/}]}, | 81 | {tag:'td', valign:'top', children:[{tag:'input', type:'checkbox', id:this.getId('Group Tree_checkbox'), name:'Group Tree'/*, checked:true*/}]}, |
| 84 | {tag:'td', valign:'top', children:[{tag:'span', cls:'keePassFieldLabel', id:this.getId('Group Tree_label'), html:"Group Tree"}]} | 82 | {tag:'td', valign:'top', children:[{tag:'span', cls:'keePassFieldLabel', id:this.getId('Group Tree_label'), html:"Group Tree"}]} |
| 85 | ]}, | 83 | ]}, |
| 86 | {tag:'tr', children:[ | 84 | {tag:'tr', children:[ |
| 87 | {tag:'td', valign:'top', children:[{tag:'input', type:'checkbox', id:this.getId('UserName_checkbox'), name:'UserName', checked:true}]}, | 85 | {tag:'td', valign:'top', children:[{tag:'input', type:'checkbox', id:this.getId('UserName_checkbox'), name:'UserName', checked:true}]}, |
| 88 | {tag:'td', valign:'top', children:[{tag:'span', cls:'keePassFieldLabel', id:this.getId('UserName_label'), html:"UserName"}]} | 86 | {tag:'td', valign:'top', children:[{tag:'span', cls:'keePassFieldLabel', id:this.getId('UserName_label'), html:"UserName"}]} |
| 89 | ]}, | 87 | ]}, |
| 90 | {tag:'tr', children:[ | 88 | {tag:'tr', children:[ |
| 91 | {tag:'td', valign:'top', children:[{tag:'input', type:'checkbox', id:this.getId('URL_checkbox'), name:'URL', checked:true}]}, | 89 | {tag:'td', valign:'top', children:[{tag:'input', type:'checkbox', id:this.getId('URL_checkbox'), name:'URL', checked:true}]}, |
| 92 | {tag:'td', valign:'top', children:[{tag:'span', cls:'keePassFieldLabel', id:this.getId('URL_label'), html:"URL"}]} | 90 | {tag:'td', valign:'top', children:[{tag:'span', cls:'keePassFieldLabel', id:this.getId('URL_label'), html:"URL"}]} |
| 93 | ]}, | 91 | ]}, |
| 94 | {tag:'tr', children:[ | 92 | {tag:'tr', children:[ |
| 95 | {tag:'td', valign:'top', children:[{tag:'input', type:'checkbox', id:this.getId('Password_checkbox'), name:'Password', checked:true}]}, | 93 | {tag:'td', valign:'top', children:[{tag:'input', type:'checkbox', id:this.getId('Password_checkbox'), name:'Password', checked:true}]}, |
| 96 | {tag:'td', valign:'top', children:[{tag:'span', cls:'keePassFieldLabel', id:this.getId('Password_label'), html:"Password"}]} | 94 | {tag:'td', valign:'top', children:[{tag:'span', cls:'keePassFieldLabel', id:this.getId('Password_label'), html:"Password"}]} |
| 97 | ]}, | 95 | ]}, |
| 98 | {tag:'tr', children:[ | 96 | {tag:'tr', children:[ |
| 99 | {tag:'td', valign:'top', children:[{tag:'input', type:'checkbox', id:this.getId('Notes_checkbox'), name:'Notes', checked:true}]}, | 97 | {tag:'td', valign:'top', children:[{tag:'input', type:'checkbox', id:this.getId('Notes_checkbox'), name:'Notes', checked:true}]}, |
| 100 | {tag:'td', valign:'top', children:[{tag:'span', cls:'keePassFieldLabel', id:this.getId('Notes_label'), html:"Notes"}]} | 98 | {tag:'td', valign:'top', children:[{tag:'span', cls:'keePassFieldLabel', id:this.getId('Notes_label'), html:"Notes"}]} |
| 101 | ]}, | 99 | ]}, |
| 102 | {tag:'tr', children:[ | 100 | {tag:'tr', children:[ |
| 103 | {tag:'td', valign:'top', children:[{tag:'input', type:'checkbox', id:this.getId('UUID_checkbox'), name:'UUID'/*, checked:true*/}]}, | 101 | {tag:'td', valign:'top', children:[{tag:'input', type:'checkbox', id:this.getId('UUID_checkbox'), name:'UUID'/*, checked:true*/}]}, |
| 104 | {tag:'td', valign:'top', children:[{tag:'span', cls:'keePassFieldLabel', id:this.getId('UUID_label'), html:"UUID"}]} | 102 | {tag:'td', valign:'top', children:[{tag:'span', cls:'keePassFieldLabel', id:this.getId('UUID_label'), html:"UUID"}]} |
| 105 | ]} | 103 | ]} |
| 106 | ]} | 104 | ]} |
| 107 | ]} | 105 | ]} |
| 108 | ]}, | 106 | ]}, |
| 109 | {tag:'td', width:'50%', valign:'top', children:[ | 107 | {tag:'td', width:'50%', valign:'top', children:[ |
| 110 | {tag:'table', children:[ | 108 | {tag:'table', children:[ |
| 111 | {tag:'tbody', children:[ | 109 | {tag:'tbody', children:[ |
| 112 | {tag:'tr', children:[ | 110 | {tag:'tr', children:[ |
| 113 | {tag:'td', valign:'top', children:[{tag:'input', type:'checkbox', id:this.getId('Icon_checkbox'), name:'Icon'/*, checked:true*/}]}, | 111 | {tag:'td', valign:'top', children:[{tag:'input', type:'checkbox', id:this.getId('Icon_checkbox'), name:'Icon'/*, checked:true*/}]}, |
| 114 | {tag:'td', width:'150', valign:'top', children:[{tag:'span', cls:'keePassFieldLabel', id:this.getId('Icon_label'), html:"Icon"}]} | 112 | {tag:'td', width:'150', valign:'top', children:[{tag:'span', cls:'keePassFieldLabel', id:this.getId('Icon_label'), html:"Icon"}]} |
| 115 | ]}, | 113 | ]}, |
| 116 | {tag:'tr', children:[ | 114 | {tag:'tr', children:[ |
| 117 | {tag:'td', valign:'top', children:[{tag:'input', type:'checkbox', id:this.getId('Creation Time_checkbox'), name:'Creation Time'/*, checked:true*/}]}, | 115 | {tag:'td', valign:'top', children:[{tag:'input', type:'checkbox', id:this.getId('Creation Time_checkbox'), name:'Creation Time'/*, checked:true*/}]}, |
| 118 | {tag:'td', valign:'top', children:[{tag:'span', cls:'keePassFieldLabel', id:this.getId('Creation Time_label'), html:"Creation Time"}]} | 116 | {tag:'td', valign:'top', children:[{tag:'span', cls:'keePassFieldLabel', id:this.getId('Creation Time_label'), html:"Creation Time"}]} |
diff --git a/frontend/beta/js/Clipperz/PM/Components/Import/MainComponent.js b/frontend/beta/js/Clipperz/PM/Components/Import/MainComponent.js index 05baf46..f97ce78 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Import/MainComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/Import/MainComponent.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } | 27 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.Import.MainComponent = function(anElement, args) { | 31 | Clipperz.PM.Components.Import.MainComponent = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | Clipperz.PM.Components.Import.MainComponent.superclass.constructor.call(this, anElement, args); | 34 | Clipperz.PM.Components.Import.MainComponent.superclass.constructor.call(this, anElement, args); |
| 37 | 35 | ||
| 38 | this._user = args.user; | 36 | this._user = args.user; |
| 39 | this._wizardComponent = null; | 37 | this._wizardComponent = null; |
| 40 | 38 | ||
| 41 | this._backButton = null; | 39 | this._backButton = null; |
| 42 | this._nextButton = null; | 40 | this._nextButton = null; |
| 43 | 41 | ||
| 44 | this._selectedComponent = null; | 42 | this._selectedComponent = null; |
| 45 | 43 | ||
| 46 | this.render(); | 44 | this.render(); |
| 47 | 45 | ||
| 48 | return this; | 46 | return this; |
| 49 | } | 47 | } |
| 50 | 48 | ||
| 51 | //============================================================================= | 49 | //============================================================================= |
| 52 | 50 | ||
| 53 | YAHOO.extendX(Clipperz.PM.Components.Import.MainComponent, Clipperz.PM.Components.BaseComponent, { | 51 | YAHOO.extendX(Clipperz.PM.Components.Import.MainComponent, Clipperz.PM.Components.BaseComponent, { |
| 54 | 52 | ||
| 55 | 'toString': function() { | 53 | 'toString': function() { |
| 56 | return "Clipperz.PM.Components.Import.MainComponent component"; | 54 | return "Clipperz.PM.Components.Import.MainComponent component"; |
| 57 | }, | 55 | }, |
| 58 | 56 | ||
| 59 | //------------------------------------------------------------------------- | 57 | //------------------------------------------------------------------------- |
| 60 | 58 | ||
| 61 | 'user': function() { | 59 | 'user': function() { |
| 62 | return this._user; | 60 | return this._user; |
| 63 | }, | 61 | }, |
| 64 | 62 | ||
| 65 | //------------------------------------------------------------------------- | 63 | //------------------------------------------------------------------------- |
| 66 | 64 | ||
| 67 | 'wizardComponent': function() { | 65 | 'wizardComponent': function() { |
| 68 | return this._wizardComponent; | 66 | return this._wizardComponent; |
| 69 | }, | 67 | }, |
| 70 | 68 | ||
| 71 | 'setWizardComponent': function(aValue) { | 69 | 'setWizardComponent': function(aValue) { |
| 72 | if (this._wizardComponent != null) { | 70 | if (this._wizardComponent != null) { |
| 73 | this._wizardComponent.remove(); | 71 | this._wizardComponent.remove(); |
| 74 | } | 72 | } |
| 75 | 73 | ||
| 76 | if (aValue != null) { | 74 | if (aValue != null) { |
| 77 | this.getElement('importCover').hide(); | 75 | this.getElement('importCover').hide(); |
| 78 | this.getElement('importWizard').show(); | 76 | this.getElement('importWizard').show(); |
| 79 | } | 77 | } |
| 80 | this._wizardComponent = aValue; | 78 | this._wizardComponent = aValue; |
| 81 | }, | 79 | }, |
| 82 | 80 | ||
| 83 | 'resetImportComponent': function() { | 81 | 'resetImportComponent': function() { |
| 84 | //MochiKit.Logging.logDebug(">>> resetImportComponent"); | 82 | //MochiKit.Logging.logDebug(">>> resetImportComponent"); |
| 85 | this.setWizardComponent(null); | 83 | this.setWizardComponent(null); |
| 86 | this.getElement('wizardComponent').update(""); | 84 | this.getElement('wizardComponent').update(""); |
| 87 | 85 | ||
| 88 | this.getElement('importCover').show(); | 86 | this.getElement('importCover').show(); |
| 89 | this.getElement('importWizard').hide(); | 87 | this.getElement('importWizard').hide(); |
| 90 | //MochiKit.Logging.logDebug("<<< resetImportComponent"); | 88 | //MochiKit.Logging.logDebug("<<< resetImportComponent"); |
| 91 | }, | 89 | }, |
| 92 | 90 | ||
| 93 | //------------------------------------------------------------------------- | 91 | //------------------------------------------------------------------------- |
| 94 | 92 | ||
| 95 | 'backButton': function() { | 93 | 'backButton': function() { |
| 96 | return this._backButton; | 94 | return this._backButton; |
| 97 | }, | 95 | }, |
| 98 | 96 | ||
| 99 | 'setBackButton': function(aValue) { | 97 | 'setBackButton': function(aValue) { |
| 100 | this._backButton = aValue; | 98 | this._backButton = aValue; |
| 101 | }, | 99 | }, |
| 102 | 100 | ||
| 103 | 'nextButton': function() { | 101 | 'nextButton': function() { |
| 104 | return this._nextButton; | 102 | return this._nextButton; |
| 105 | }, | 103 | }, |
| 106 | 104 | ||
| 107 | 'setNextButton': function(aValue) { | 105 | 'setNextButton': function(aValue) { |
| 108 | this._nextButton = aValue; | 106 | this._nextButton = aValue; |
| 109 | }, | 107 | }, |
| 110 | 108 | ||
| 111 | //------------------------------------------------------------------------- | 109 | //------------------------------------------------------------------------- |
| 112 | 110 | ||
| 113 | 'render': function() { | 111 | 'render': function() { |
| 114 | //MochiKit.Logging.logDebug(">>> Import.MainComponent.render"); | 112 | //MochiKit.Logging.logDebug(">>> Import.MainComponent.render"); |
| 115 | Clipperz.NotificationCenter.unregister(this); | 113 | Clipperz.NotificationCenter.unregister(this); |
| 116 | MochiKit.Signal.disconnectAllTo(this); | 114 | MochiKit.Signal.disconnectAllTo(this); |
| 117 | 115 | ||
| 118 | this.element().update(""); | 116 | this.element().update(""); |
diff --git a/frontend/beta/js/Clipperz/PM/Components/Import/PasswordPlusImportComponent.js b/frontend/beta/js/Clipperz/PM/Components/Import/PasswordPlusImportComponent.js index 24dc785..f58d913 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Import/PasswordPlusImportComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/Import/PasswordPlusImportComponent.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } | 27 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.Import.PasswordPlusImportComponent = function(anElement, args) { | 31 | Clipperz.PM.Components.Import.PasswordPlusImportComponent = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | Clipperz.PM.Components.Import.PasswordPlusImportComponent.superclass.constructor.call(this, anElement, args); | 34 | Clipperz.PM.Components.Import.PasswordPlusImportComponent.superclass.constructor.call(this, anElement, args); |
| 37 | 35 | ||
| 38 | this.render(); | 36 | this.render(); |
| 39 | 37 | ||
| 40 | return this; | 38 | return this; |
| 41 | } | 39 | } |
| 42 | 40 | ||
| 43 | //============================================================================= | 41 | //============================================================================= |
| 44 | 42 | ||
| 45 | YAHOO.extendX(Clipperz.PM.Components.Import.PasswordPlusImportComponent, Clipperz.PM.Components.Import.GenericImportComponent, { | 43 | YAHOO.extendX(Clipperz.PM.Components.Import.PasswordPlusImportComponent, Clipperz.PM.Components.Import.GenericImportComponent, { |
| 46 | 44 | ||
| 47 | 'toString': function() { | 45 | 'toString': function() { |
| 48 | return "Clipperz.PM.Components.Import.PasswordPlusImportComponent component"; | 46 | return "Clipperz.PM.Components.Import.PasswordPlusImportComponent component"; |
| 49 | }, | 47 | }, |
| 50 | 48 | ||
| 51 | //------------------------------------------------------------------------- | 49 | //------------------------------------------------------------------------- |
| 52 | 50 | ||
| 53 | 'render': function() { | 51 | 'render': function() { |
| 54 | //MochiKit.Logging.logDebug(">>> Import.PasswordPlusImportComponent.render"); | 52 | //MochiKit.Logging.logDebug(">>> Import.PasswordPlusImportComponent.render"); |
| 55 | this.domHelper().append(this.element(), {tag:'div', cls:'passwordPlusImportWizard', children:[ | 53 | this.domHelper().append(this.element(), {tag:'div', cls:'passwordPlusImportWizard', children:[ |
| 56 | {tag:'h3', htmlString:Clipperz.PM.Strings['PasswordPlus_ImportWizard_Title']}, | 54 | {tag:'h3', htmlString:Clipperz.PM.Strings['PasswordPlus_ImportWizard_Title']}, |
| 57 | {tag:'div', cls:'importSteps', id:this.getId('importSteps')}, | 55 | {tag:'div', cls:'importSteps', id:this.getId('importSteps')}, |
| 58 | {tag:'div', cls:'importStepBlocks', children:[ | 56 | {tag:'div', cls:'importStepBlocks', children:[ |
| 59 | {tag:'div', cls:'step_0', id:this.getId('step_0'), children:[ | 57 | {tag:'div', cls:'step_0', id:this.getId('step_0'), children:[ |
| 60 | {tag:'div', children:[ | 58 | {tag:'div', children:[ |
| 61 | {tag:'div', cls:'importOptionsDescription', htmlString:Clipperz.PM.Strings['importOptions_passwordPlus_description']}, | 59 | {tag:'div', cls:'importOptionsDescription', htmlString:Clipperz.PM.Strings['importOptions_passwordPlus_description']}, |
| 62 | {tag:'div', cls:'importOptionsParameters', children:[]}, | 60 | {tag:'div', cls:'importOptionsParameters', children:[]}, |
| 63 | this.textAreaConfig() | 61 | this.textAreaConfig() |
| 64 | ]} | 62 | ]} |
| 65 | ]}, | 63 | ]}, |
| 66 | {tag:'div', cls:'step_1', id:this.getId('step_1'), children:[ | 64 | {tag:'div', cls:'step_1', id:this.getId('step_1'), children:[ |
| 67 | {tag:'div', children:[ | 65 | {tag:'div', children:[ |
| 68 | {tag:'div', id:this.getId('previewDiv'), html:"preview"} | 66 | {tag:'div', id:this.getId('previewDiv'), html:"preview"} |
| 69 | ]} | 67 | ]} |
| 70 | ]}, | 68 | ]}, |
| 71 | {tag:'div', cls:'step_2', id:this.getId('step_2'), children:[ | 69 | {tag:'div', cls:'step_2', id:this.getId('step_2'), children:[ |
| 72 | {tag:'div', children:[ | 70 | {tag:'div', children:[ |
| 73 | {tag:'h4', html:"done"} | 71 | {tag:'h4', html:"done"} |
| 74 | ]} | 72 | ]} |
| 75 | ]} | 73 | ]} |
| 76 | ]}, | 74 | ]}, |
| 77 | {tag:'div', cls:'importOptionsButtons', children:[ | 75 | {tag:'div', cls:'importOptionsButtons', children:[ |
| 78 | {tag:'table', children:[ | 76 | {tag:'table', children:[ |
| 79 | {tag:'tbody', children:[ | 77 | {tag:'tbody', children:[ |
| 80 | {tag:'tr', children:[ | 78 | {tag:'tr', children:[ |
| 81 | {tag:'td', html:' '}, | 79 | {tag:'td', html:' '}, |
| 82 | {tag:'td', children:[ | 80 | {tag:'td', children:[ |
| 83 | {tag:'div', id:this.getId('backActionButton')} | 81 | {tag:'div', id:this.getId('backActionButton')} |
| 84 | ]}, | 82 | ]}, |
| 85 | {tag:'td', html:' '}, | 83 | {tag:'td', html:' '}, |
| 86 | {tag:'td', children:[ | 84 | {tag:'td', children:[ |
| 87 | {tag:'div', id:this.getId('nextActionButton')} | 85 | {tag:'div', id:this.getId('nextActionButton')} |
| 88 | ]}, | 86 | ]}, |
| 89 | {tag:'td', html:' '} | 87 | {tag:'td', html:' '} |
| 90 | ]} | 88 | ]} |
| 91 | ]} | 89 | ]} |
| 92 | ]} | 90 | ]} |
| 93 | ]} | 91 | ]} |
| 94 | ]}); | 92 | ]}); |
| 95 | 93 | ||
| 96 | this.updateSteps(); | 94 | this.updateSteps(); |
| 97 | 95 | ||
| 98 | this.setBackButton(new YAHOO.ext.Button(this.getDom('backActionButton'), {text:"back", handler:this.backAction, scope:this})); | 96 | this.setBackButton(new YAHOO.ext.Button(this.getDom('backActionButton'), {text:"back", handler:this.backAction, scope:this})); |
| 99 | this.setNextButton(new YAHOO.ext.Button(this.getDom('nextActionButton'), {text:"next", handler:this.nextAction, scope:this})); | 97 | this.setNextButton(new YAHOO.ext.Button(this.getDom('nextActionButton'), {text:"next", handler:this.nextAction, scope:this})); |
| 100 | 98 | ||
| 101 | this.getElement('step_0').setVisibilityMode(YAHOO.ext.Element.DISPLAY).show() | 99 | this.getElement('step_0').setVisibilityMode(YAHOO.ext.Element.DISPLAY).show() |
| 102 | this.getElement('step_1').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); | 100 | this.getElement('step_1').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); |
| 103 | this.getElement('step_2').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); | 101 | this.getElement('step_2').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); |
| 104 | //MochiKit.Logging.logDebug("<<< Import.PasswordPlusImportComponent.render"); | 102 | //MochiKit.Logging.logDebug("<<< Import.PasswordPlusImportComponent.render"); |
| 105 | }, | 103 | }, |
| 106 | 104 | ||
| 107 | //------------------------------------------------------------------------- | 105 | //------------------------------------------------------------------------- |
| 108 | /* | 106 | /* |
| 109 | 'backAction': function() { | 107 | 'backAction': function() { |
| 110 | switch (this.currentStep()) { | 108 | switch (this.currentStep()) { |
| 111 | case 1: //-> 0 | 109 | case 1: //-> 0 |
| 112 | this.backButton().disable(); | 110 | this.backButton().disable(); |
| 113 | this.getElement('step_1').hide(); | 111 | this.getElement('step_1').hide(); |
| 114 | this.setCurrentStep(0); | 112 | this.setCurrentStep(0); |
| 115 | this.getElement('step_0').show(); | 113 | this.getElement('step_0').show(); |
| 116 | break; | 114 | break; |
| 117 | } | 115 | } |
| 118 | }, | 116 | }, |
diff --git a/frontend/beta/js/Clipperz/PM/Components/Import/RoboFormImportComponent.js b/frontend/beta/js/Clipperz/PM/Components/Import/RoboFormImportComponent.js index fe4d45c..443ee17 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Import/RoboFormImportComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/Import/RoboFormImportComponent.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } | 27 | if (typeof(Clipperz.PM.Components.Import) == 'undefined') { Clipperz.PM.Components.Import = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.Import.RoboFormImportComponent = function(anElement, args) { | 31 | Clipperz.PM.Components.Import.RoboFormImportComponent = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | Clipperz.PM.Components.Import.RoboFormImportComponent.superclass.constructor.call(this, anElement, args); | 34 | Clipperz.PM.Components.Import.RoboFormImportComponent.superclass.constructor.call(this, anElement, args); |
| 37 | 35 | ||
| 38 | this.render(); | 36 | this.render(); |
| 39 | 37 | ||
| 40 | return this; | 38 | return this; |
| 41 | } | 39 | } |
| 42 | 40 | ||
| 43 | //============================================================================= | 41 | //============================================================================= |
| 44 | 42 | ||
| 45 | YAHOO.extendX(Clipperz.PM.Components.Import.RoboFormImportComponent, Clipperz.PM.Components.Import.GenericImportComponent, { | 43 | YAHOO.extendX(Clipperz.PM.Components.Import.RoboFormImportComponent, Clipperz.PM.Components.Import.GenericImportComponent, { |
| 46 | 44 | ||
| 47 | 'toString': function() { | 45 | 'toString': function() { |
| 48 | return "Clipperz.PM.Components.Import.RoboFormImportComponent component"; | 46 | return "Clipperz.PM.Components.Import.RoboFormImportComponent component"; |
| 49 | }, | 47 | }, |
| 50 | 48 | ||
| 51 | //------------------------------------------------------------------------- | 49 | //------------------------------------------------------------------------- |
| 52 | 50 | ||
| 53 | 'render': function() { | 51 | 'render': function() { |
| 54 | //MochiKit.Logging.logDebug(">>> Import.RoboFormImportComponent.render"); | 52 | //MochiKit.Logging.logDebug(">>> Import.RoboFormImportComponent.render"); |
| 55 | this.domHelper().append(this.element(), {tag:'div', cls:'roboFormImportWizard', children:[ | 53 | this.domHelper().append(this.element(), {tag:'div', cls:'roboFormImportWizard', children:[ |
| 56 | {tag:'h3', htmlString:Clipperz.PM.Strings['RoboForm_ImportWizard_Title']}, | 54 | {tag:'h3', htmlString:Clipperz.PM.Strings['RoboForm_ImportWizard_Title']}, |
| 57 | {tag:'div', cls:'importSteps', id:this.getId('importSteps')}, | 55 | {tag:'div', cls:'importSteps', id:this.getId('importSteps')}, |
| 58 | {tag:'div', cls:'importStepBlocks', children:[ | 56 | {tag:'div', cls:'importStepBlocks', children:[ |
| 59 | {tag:'div', cls:'step_0', id:this.getId('step_0'), children:[ | 57 | {tag:'div', cls:'step_0', id:this.getId('step_0'), children:[ |
| 60 | {tag:'div', children:[ | 58 | {tag:'div', children:[ |
| 61 | {tag:'div', cls:'importOptionsDescription', htmlString:Clipperz.PM.Strings['importOptions_roboForm_description']}, | 59 | {tag:'div', cls:'importOptionsDescription', htmlString:Clipperz.PM.Strings['importOptions_roboForm_description']}, |
| 62 | {tag:'div', cls:'importOptionsParameters', children:[]}, | 60 | {tag:'div', cls:'importOptionsParameters', children:[]}, |
| 63 | this.textAreaConfig() | 61 | this.textAreaConfig() |
| 64 | ]} | 62 | ]} |
| 65 | ]}, | 63 | ]}, |
| 66 | {tag:'div', cls:'step_1', id:this.getId('step_1'), children:[ | 64 | {tag:'div', cls:'step_1', id:this.getId('step_1'), children:[ |
| 67 | {tag:'div', children:[ | 65 | {tag:'div', children:[ |
| 68 | {tag:'div', id:this.getId('previewDiv'), html:"preview"} | 66 | {tag:'div', id:this.getId('previewDiv'), html:"preview"} |
| 69 | ]} | 67 | ]} |
| 70 | ]}, | 68 | ]}, |
| 71 | {tag:'div', cls:'step_2', id:this.getId('step_2'), children:[ | 69 | {tag:'div', cls:'step_2', id:this.getId('step_2'), children:[ |
| 72 | {tag:'div', children:[ | 70 | {tag:'div', children:[ |
| 73 | {tag:'h4', html:"done"} | 71 | {tag:'h4', html:"done"} |
| 74 | ]} | 72 | ]} |
| 75 | ]} | 73 | ]} |
| 76 | ]}, | 74 | ]}, |
| 77 | {tag:'div', cls:'importOptionsButtons', children:[ | 75 | {tag:'div', cls:'importOptionsButtons', children:[ |
| 78 | {tag:'table', children:[ | 76 | {tag:'table', children:[ |
| 79 | {tag:'tbody', children:[ | 77 | {tag:'tbody', children:[ |
| 80 | {tag:'tr', children:[ | 78 | {tag:'tr', children:[ |
| 81 | {tag:'td', html:' '}, | 79 | {tag:'td', html:' '}, |
| 82 | {tag:'td', children:[ | 80 | {tag:'td', children:[ |
| 83 | {tag:'div', id:this.getId('backActionButton')} | 81 | {tag:'div', id:this.getId('backActionButton')} |
| 84 | ]}, | 82 | ]}, |
| 85 | {tag:'td', html:' '}, | 83 | {tag:'td', html:' '}, |
| 86 | {tag:'td', children:[ | 84 | {tag:'td', children:[ |
| 87 | {tag:'div', id:this.getId('nextActionButton')} | 85 | {tag:'div', id:this.getId('nextActionButton')} |
| 88 | ]}, | 86 | ]}, |
| 89 | {tag:'td', html:' '} | 87 | {tag:'td', html:' '} |
| 90 | ]} | 88 | ]} |
| 91 | ]} | 89 | ]} |
| 92 | ]} | 90 | ]} |
| 93 | ]} | 91 | ]} |
| 94 | ]}); | 92 | ]}); |
| 95 | 93 | ||
| 96 | this.updateSteps(); | 94 | this.updateSteps(); |
| 97 | 95 | ||
| 98 | this.setBackButton(new YAHOO.ext.Button(this.getDom('backActionButton'), {text:"back", handler:this.backAction, scope:this})); | 96 | this.setBackButton(new YAHOO.ext.Button(this.getDom('backActionButton'), {text:"back", handler:this.backAction, scope:this})); |
| 99 | this.setNextButton(new YAHOO.ext.Button(this.getDom('nextActionButton'), {text:"next", handler:this.nextAction, scope:this})); | 97 | this.setNextButton(new YAHOO.ext.Button(this.getDom('nextActionButton'), {text:"next", handler:this.nextAction, scope:this})); |
| 100 | 98 | ||
| 101 | this.getElement('step_0').setVisibilityMode(YAHOO.ext.Element.DISPLAY).show() | 99 | this.getElement('step_0').setVisibilityMode(YAHOO.ext.Element.DISPLAY).show() |
| 102 | this.getElement('step_1').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); | 100 | this.getElement('step_1').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); |
| 103 | this.getElement('step_2').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); | 101 | this.getElement('step_2').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide(); |
| 104 | //MochiKit.Logging.logDebug("<<< Import.RoboFormImportComponent.render"); | 102 | //MochiKit.Logging.logDebug("<<< Import.RoboFormImportComponent.render"); |
| 105 | }, | 103 | }, |
| 106 | 104 | ||
| 107 | //------------------------------------------------------------------------- | 105 | //------------------------------------------------------------------------- |
| 108 | 106 | ||
| 109 | 'nextAction': function() { | 107 | 'nextAction': function() { |
| 110 | switch (this.currentStep()) { | 108 | switch (this.currentStep()) { |
| 111 | case 0: //-> 1 | 109 | case 0: //-> 1 |
| 112 | this.previewValues(); | 110 | this.previewValues(); |
| 113 | break; | 111 | break; |
| 114 | case 1: //-> 2 | 112 | case 1: //-> 2 |
| 115 | this.importValues(); | 113 | this.importValues(); |
| 116 | break; | 114 | break; |
| 117 | } | 115 | } |
| 118 | }, | 116 | }, |
diff --git a/frontend/beta/js/Clipperz/PM/Components/MessageBox.js b/frontend/beta/js/Clipperz/PM/Components/MessageBox.js index cf9ec86..f9b845e 100644 --- a/frontend/beta/js/Clipperz/PM/Components/MessageBox.js +++ b/frontend/beta/js/Clipperz/PM/Components/MessageBox.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | 27 | ||
| 30 | 28 | ||
| 31 | 29 | ||
| 32 | Clipperz.PM.Components.MessageBoxImplementation = function() { | 30 | Clipperz.PM.Components.MessageBoxImplementation = function() { |
| 33 | this._step = 0; | 31 | this._step = 0; |
| 34 | this._steps = 0; | 32 | this._steps = 0; |
| 35 | 33 | ||
| 36 | return this; | 34 | return this; |
| 37 | }; | 35 | }; |
| 38 | 36 | ||
| 39 | //YAHOO.extendX(Clipperz.PM.Components.MessageBoxImplementation, Clipperz.PM.Components.BaseComponent, { | 37 | //YAHOO.extendX(Clipperz.PM.Components.MessageBoxImplementation, Clipperz.PM.Components.BaseComponent, { |
| 40 | Clipperz.PM.Components.MessageBoxImplementation.prototype = MochiKit.Base.update(null, { | 38 | Clipperz.PM.Components.MessageBoxImplementation.prototype = MochiKit.Base.update(null, { |
| 41 | 39 | ||
| 42 | 'toString': function() { | 40 | 'toString': function() { |
| 43 | return "Clipperz.PM.Components.MessageBox"; | 41 | return "Clipperz.PM.Components.MessageBox"; |
| 44 | }, | 42 | }, |
| 45 | 43 | ||
| 46 | //----------------------------------------------------- | 44 | //----------------------------------------------------- |
| 47 | 45 | ||
| 48 | 'step': function() { | 46 | 'step': function() { |
| 49 | return this._step; | 47 | return this._step; |
| 50 | }, | 48 | }, |
| 51 | 49 | ||
| 52 | 'setStep': function(aValue) { | 50 | 'setStep': function(aValue) { |
| 53 | if (aValue == 'next') { | 51 | if (aValue == 'next') { |
| 54 | this._step = this._step + 1; | 52 | this._step = this._step + 1; |
| 55 | } else { | 53 | } else { |
| 56 | this._step = aValue; | 54 | this._step = aValue; |
| 57 | } | 55 | } |
| 58 | 56 | ||
| 59 | if (this._step > this.steps()) { | 57 | if (this._step > this.steps()) { |
| 60 | //MochiKit.Logging.logDebug("overstepping: " + this._step + " (" + this.steps() + ")"); | 58 | //MochiKit.Logging.logDebug("overstepping: " + this._step + " (" + this.steps() + ")"); |
| 61 | this._step = this.steps(); | 59 | this._step = this.steps(); |
| 62 | } | 60 | } |
| 63 | }, | 61 | }, |
| 64 | 62 | ||
| 65 | //----------------------------------------------------- | 63 | //----------------------------------------------------- |
| 66 | 64 | ||
| 67 | 'steps': function() { | 65 | 'steps': function() { |
| 68 | return this._steps; | 66 | return this._steps; |
| 69 | }, | 67 | }, |
| 70 | 68 | ||
| 71 | 'setSteps': function(aValue) { | 69 | 'setSteps': function(aValue) { |
| 72 | if (aValue.constructor == String) { | 70 | if (aValue.constructor == String) { |
| 73 | if (aValue.charAt(0) == '+') { | 71 | if (aValue.charAt(0) == '+') { |
| 74 | this._steps += aValue.substring(1)*1; | 72 | this._steps += aValue.substring(1)*1; |
| 75 | } else if (aValue.charAt(0) == '-') { | 73 | } else if (aValue.charAt(0) == '-') { |
| 76 | this._steps -= aValue.substring(1)*1; | 74 | this._steps -= aValue.substring(1)*1; |
| 77 | } else { | 75 | } else { |
| 78 | this._steps = aValue.substring(1)*1; | 76 | this._steps = aValue.substring(1)*1; |
| 79 | } | 77 | } |
| 80 | } else { | 78 | } else { |
| 81 | this._steps = aValue; | 79 | this._steps = aValue; |
| 82 | } | 80 | } |
| 83 | }, | 81 | }, |
| 84 | 82 | ||
| 85 | //----------------------------------------------------- | 83 | //----------------------------------------------------- |
| 86 | 84 | ||
| 87 | 'deferredShow': function(aConfiguration, anAnimationTargetElement, aValue) { | 85 | 'deferredShow': function(aConfiguration, anAnimationTargetElement, aValue) { |
| 88 | this.show(aConfiguration, anAnimationTargetElement); | 86 | this.show(aConfiguration, anAnimationTargetElement); |
| 89 | 87 | ||
| 90 | return aValue; | 88 | return aValue; |
| 91 | }, | 89 | }, |
| 92 | 90 | ||
| 93 | 'show': function(aConfiguration, anAnimationTargetElement) { | 91 | 'show': function(aConfiguration, anAnimationTargetElement) { |
| 94 | varmessageBoxConfiguration; | 92 | varmessageBoxConfiguration; |
| 95 | 93 | ||
| 96 | messageBoxConfiguration = MochiKit.Base.clone(aConfiguration); | 94 | messageBoxConfiguration = MochiKit.Base.clone(aConfiguration); |
| 97 | messageBoxConfiguration.msg = messageBoxConfiguration.text; | 95 | messageBoxConfiguration.msg = messageBoxConfiguration.text; |
| 98 | messageBoxConfiguration.animEl = anAnimationTargetElement; | 96 | messageBoxConfiguration.animEl = anAnimationTargetElement; |
| 99 | messageBoxConfiguration.progress = messageBoxConfiguration.showProgressBar; | 97 | messageBoxConfiguration.progress = messageBoxConfiguration.showProgressBar; |
| 100 | messageBoxConfiguration.closable = messageBoxConfiguration.showCloseButton; | 98 | messageBoxConfiguration.closable = messageBoxConfiguration.showCloseButton; |
| 101 | this.setSteps(aConfiguration.steps || 0); | 99 | this.setSteps(aConfiguration.steps || 0); |
| 102 | this.setStep(aConfiguration.step || 0); | 100 | this.setStep(aConfiguration.step || 0); |
| 103 | delete messageBoxConfiguration.buttons; | 101 | delete messageBoxConfiguration.buttons; |
| 104 | 102 | ||
| 105 | Clipperz.YUI.MessageBox.show(messageBoxConfiguration); | 103 | Clipperz.YUI.MessageBox.show(messageBoxConfiguration); |
| 106 | }, | 104 | }, |
| 107 | 105 | ||
| 108 | //----------------------------------------------------- | 106 | //----------------------------------------------------- |
| 109 | 107 | ||
| 110 | 'update': function(someValues) { | 108 | 'update': function(someValues) { |
| 111 | //MochiKit.Logging.logDebug(">>> MessageBox.update"); | 109 | //MochiKit.Logging.logDebug(">>> MessageBox.update"); |
| 112 | if (someValues.title) { | 110 | if (someValues.title) { |
| 113 | Clipperz.YUI.MessageBox.getDialog().setTitle(someValues.title); | 111 | Clipperz.YUI.MessageBox.getDialog().setTitle(someValues.title); |
| 114 | }; | 112 | }; |
| 115 | 113 | ||
| 116 | if (someValues.text) { | 114 | if (someValues.text) { |
| 117 | Clipperz.YUI.MessageBox.updateText(someValues.text); | 115 | Clipperz.YUI.MessageBox.updateText(someValues.text); |
| 118 | }; | 116 | }; |
diff --git a/frontend/beta/js/Clipperz/PM/Components/OTP/MainComponent.js b/frontend/beta/js/Clipperz/PM/Components/OTP/MainComponent.js index 7b0b12b..1e94c4b 100644 --- a/frontend/beta/js/Clipperz/PM/Components/OTP/MainComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/OTP/MainComponent.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.OTP) == 'undefined') { Clipperz.PM.Components.OTP = {}; } | 27 | if (typeof(Clipperz.PM.Components.OTP) == 'undefined') { Clipperz.PM.Components.OTP = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.OTP.MainComponent = function(anElement, args) { | 31 | Clipperz.PM.Components.OTP.MainComponent = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | //MochiKit.Logging.logDebug("new OTP.MainComponent"); | 34 | //MochiKit.Logging.logDebug("new OTP.MainComponent"); |
| 37 | Clipperz.PM.Components.OTP.MainComponent.superclass.constructor.call(this, anElement, args); | 35 | Clipperz.PM.Components.OTP.MainComponent.superclass.constructor.call(this, anElement, args); |
| 38 | 36 | ||
| 39 | this._user = args.user; | 37 | this._user = args.user; |
| 40 | this._shouldRender = true; | 38 | this._shouldRender = true; |
| 41 | 39 | ||
| 42 | this._deleteButton = null; | 40 | this._deleteButton = null; |
| 43 | this._printButton = null; | 41 | this._printButton = null; |
| 44 | 42 | ||
| 45 | Clipperz.NotificationCenter.register(null, 'tabSelected', this, 'tabSelectedHandler'); | 43 | Clipperz.NotificationCenter.register(null, 'tabSelected', this, 'tabSelectedHandler'); |
| 46 | //Clipperz.NotificationCenter.register(null, 'oneTimePasswordAdded', this, 'render'); | 44 | //Clipperz.NotificationCenter.register(null, 'oneTimePasswordAdded', this, 'render'); |
| 47 | 45 | ||
| 48 | return this; | 46 | return this; |
| 49 | } | 47 | } |
| 50 | 48 | ||
| 51 | //============================================================================= | 49 | //============================================================================= |
| 52 | 50 | ||
| 53 | YAHOO.extendX(Clipperz.PM.Components.OTP.MainComponent, Clipperz.PM.Components.BaseComponent, { | 51 | YAHOO.extendX(Clipperz.PM.Components.OTP.MainComponent, Clipperz.PM.Components.BaseComponent, { |
| 54 | 52 | ||
| 55 | 'toString': function() { | 53 | 'toString': function() { |
| 56 | return "Clipperz.PM.Components.OTP.MainComponent component"; | 54 | return "Clipperz.PM.Components.OTP.MainComponent component"; |
| 57 | }, | 55 | }, |
| 58 | 56 | ||
| 59 | //------------------------------------------------------------------------- | 57 | //------------------------------------------------------------------------- |
| 60 | 58 | ||
| 61 | 'render': function() { | 59 | 'render': function() { |
| 62 | //MochiKit.Logging.logDebug("### OTP.MainComponent.render"); | 60 | //MochiKit.Logging.logDebug("### OTP.MainComponent.render"); |
| 63 | Clipperz.NotificationCenter.unregister(this); | 61 | Clipperz.NotificationCenter.unregister(this); |
| 64 | MochiKit.Signal.disconnectAllTo(this); | 62 | MochiKit.Signal.disconnectAllTo(this); |
| 65 | 63 | ||
| 66 | if (Clipperz.PM.Proxy.defaultProxy.isReadOnly()) { | 64 | if (Clipperz.PM.Proxy.defaultProxy.isReadOnly()) { |
| 67 | this.element().update(""); | 65 | this.element().update(""); |
| 68 | this.domHelper().append(this.element(), {tag:'div', cls:'oneTimePasswordReadOnlyMessage', htmlString:Clipperz.PM.Strings['oneTimePasswordReadOnlyMessage']}); | 66 | this.domHelper().append(this.element(), {tag:'div', cls:'oneTimePasswordReadOnlyMessage', htmlString:Clipperz.PM.Strings['oneTimePasswordReadOnlyMessage']}); |
| 69 | } else { | 67 | } else { |
| 70 | var deferredResult; | 68 | var deferredResult; |
| 71 | 69 | ||
| 72 | deferredResult = new MochiKit.Async.Deferred(); | 70 | deferredResult = new MochiKit.Async.Deferred(); |
| 73 | 71 | ||
| 74 | //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OTP.MainComponent.render - 1: " + res); return res;}); | 72 | //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OTP.MainComponent.render - 1: " + res); return res;}); |
| 75 | deferredResult.addCallback(MochiKit.Base.bind(function() { | 73 | deferredResult.addCallback(MochiKit.Base.bind(function() { |
| 76 | this.element().update(""); | 74 | this.element().update(""); |
| 77 | Clipperz.YUI.DomHelper.append(this.element(), {tag:'div', htmlString:Clipperz.PM.Strings['oneTimePasswordLoadingMessage']}); | 75 | Clipperz.YUI.DomHelper.append(this.element(), {tag:'div', htmlString:Clipperz.PM.Strings['oneTimePasswordLoadingMessage']}); |
| 78 | }, this)); | 76 | }, this)); |
| 79 | //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OTP.MainComponent.render - 2: " + res); return res;}); | 77 | //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OTP.MainComponent.render - 2: " + res); return res;}); |
| 80 | deferredResult.addCallback(MochiKit.Base.method(this.user(), 'loadOneTimePasswords')); | 78 | deferredResult.addCallback(MochiKit.Base.method(this.user(), 'loadOneTimePasswords')); |
| 81 | //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OTP.MainComponent.render - 3: " + res); return res;}); | 79 | //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OTP.MainComponent.render - 3: " + res); return res;}); |
| 82 | //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OTP.MainComponent.render - 3.1: " + Clipperz.Base.serializeJSON(res.serializedData())); return res;}); | 80 | //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OTP.MainComponent.render - 3.1: " + Clipperz.Base.serializeJSON(res.serializedData())); return res;}); |
| 83 | deferredResult.addCallback(MochiKit.Base.bind(function(aResult) { | 81 | deferredResult.addCallback(MochiKit.Base.bind(function(aResult) { |
| 84 | vartbodyElement; | 82 | vartbodyElement; |
| 85 | varoneTimePasswordReferenceKeys; | 83 | varoneTimePasswordReferenceKeys; |
| 86 | var imageExtension; | 84 | var imageExtension; |
| 87 | var isThereAnyActiveOneTimePassword; | 85 | var isThereAnyActiveOneTimePassword; |
| 88 | 86 | ||
| 89 | isThereAnyActiveOneTimePassword = false; | 87 | isThereAnyActiveOneTimePassword = false; |
| 90 | 88 | ||
| 91 | this.element().update(""); | 89 | this.element().update(""); |
| 92 | Clipperz.YUI.DomHelper.append(this.element(), {tag:'div', id:'oneTimePasswordList', children:[ | 90 | Clipperz.YUI.DomHelper.append(this.element(), {tag:'div', id:'oneTimePasswordList', children:[ |
| 93 | {tag:'div', id:'oneTimePasswords_header', children:[ | 91 | {tag:'div', id:'oneTimePasswords_header', children:[ |
| 94 | {tag:'table', width:'100%', children:[ | 92 | {tag:'table', width:'100%', children:[ |
| 95 | {tag:'tbody', children:[ | 93 | {tag:'tbody', children:[ |
| 96 | {tag:'tr', children:[ | 94 | {tag:'tr', children:[ |
| 97 | {tag:'td', width:'10%', children:[ | 95 | {tag:'td', width:'10%', children:[ |
| 98 | {tag:'div', id:this.getId('createNewOneTimePasswordButton')} | 96 | {tag:'div', id:this.getId('createNewOneTimePasswordButton')} |
| 99 | ]}, | 97 | ]}, |
| 100 | {tag:'td', width:'40%', children:[ | 98 | {tag:'td', width:'40%', children:[ |
| 101 | {tag:'div', id:this.getId('deleteSelectedOneTimePasswordButton')} | 99 | {tag:'div', id:this.getId('deleteSelectedOneTimePasswordButton')} |
| 102 | ]}, | 100 | ]}, |
| 103 | {tag:'td', width:'50%', align:'right', children:[ | 101 | {tag:'td', width:'50%', align:'right', children:[ |
| 104 | {tag:'div', id:this.getId('printOneTimePasswordButton')} | 102 | {tag:'div', id:this.getId('printOneTimePasswordButton')} |
| 105 | ]} | 103 | ]} |
| 106 | ]} | 104 | ]} |
| 107 | ]} | 105 | ]} |
| 108 | ]}, | 106 | ]}, |
| 109 | {tag:'div', children:[ | 107 | {tag:'div', children:[ |
| 110 | {tag:'ul', children:[ | 108 | {tag:'ul', children:[ |
| 111 | {tag:'li', children:[ | 109 | {tag:'li', children:[ |
| 112 | {tag:'span', htmlString:Clipperz.PM.Strings['oneTimePasswordSelectionLink_selectLabel']} | 110 | {tag:'span', htmlString:Clipperz.PM.Strings['oneTimePasswordSelectionLink_selectLabel']} |
| 113 | ]}, | 111 | ]}, |
| 114 | {tag:'li', children:[ | 112 | {tag:'li', children:[ |
| 115 | {tag:'a', href:'#', id:this.getId('selectAllOneTimePasswords_link'), htmlString:Clipperz.PM.Strings['oneTimePasswordSelectionLink_all']} | 113 | {tag:'a', href:'#', id:this.getId('selectAllOneTimePasswords_link'), htmlString:Clipperz.PM.Strings['oneTimePasswordSelectionLink_all']} |
| 116 | ]}, | 114 | ]}, |
| 117 | {tag:'li', children:[ | 115 | {tag:'li', children:[ |
| 118 | {tag:'a', href:'#', id:this.getId('selectNoneOneTimePasswords_link'), htmlString:Clipperz.PM.Strings['oneTimePasswordSelectionLink_none']} | 116 | {tag:'a', href:'#', id:this.getId('selectNoneOneTimePasswords_link'), htmlString:Clipperz.PM.Strings['oneTimePasswordSelectionLink_none']} |
diff --git a/frontend/beta/js/Clipperz/PM/Components/Panels/AccountPanel.js b/frontend/beta/js/Clipperz/PM/Components/Panels/AccountPanel.js index f7991f1..defce91 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Panels/AccountPanel.js +++ b/frontend/beta/js/Clipperz/PM/Components/Panels/AccountPanel.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Panels) == 'undefined') { Clipperz.PM.Components.Panels = {}; } | 27 | if (typeof(Clipperz.PM.Components.Panels) == 'undefined') { Clipperz.PM.Components.Panels = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.Panels.AccountPanel = function(anElement, args) { | 31 | Clipperz.PM.Components.Panels.AccountPanel = function(anElement, args) { |
| 34 | //MochiKit.Logging.logDebug(">>> new AccountPanel"); | 32 | //MochiKit.Logging.logDebug(">>> new AccountPanel"); |
| 35 | args = args || {}; | 33 | args = args || {}; |
| 36 | 34 | ||
| 37 | Clipperz.PM.Components.Panels.AccountPanel.superclass.constructor.call(this, anElement, args); | 35 | Clipperz.PM.Components.Panels.AccountPanel.superclass.constructor.call(this, anElement, args); |
| 38 | 36 | ||
| 39 | Clipperz.NotificationCenter.register(null, 'setupDone', this, 'render'); | 37 | Clipperz.NotificationCenter.register(null, 'setupDone', this, 'render'); |
| 40 | 38 | ||
| 41 | this._shouldLoadLoginHistory = true; | 39 | this._shouldLoadLoginHistory = true; |
| 42 | 40 | ||
| 43 | //this.render(); | 41 | //this.render(); |
| 44 | //MochiKit.Logging.logDebug("<<< new AccountPanel"); | 42 | //MochiKit.Logging.logDebug("<<< new AccountPanel"); |
| 45 | 43 | ||
| 46 | return this; | 44 | return this; |
| 47 | } | 45 | } |
| 48 | 46 | ||
| 49 | //============================================================================= | 47 | //============================================================================= |
| 50 | 48 | ||
| 51 | YAHOO.extendX(Clipperz.PM.Components.Panels.AccountPanel, Clipperz.PM.Components.Panels.BasePanel, { | 49 | YAHOO.extendX(Clipperz.PM.Components.Panels.AccountPanel, Clipperz.PM.Components.Panels.BasePanel, { |
| 52 | 50 | ||
| 53 | 'toString': function() { | 51 | 'toString': function() { |
| 54 | return "Clipperz.PM.Components.AccountPanel component"; | 52 | return "Clipperz.PM.Components.AccountPanel component"; |
| 55 | }, | 53 | }, |
| 56 | 54 | ||
| 57 | //------------------------------------------------------------------------- | 55 | //------------------------------------------------------------------------- |
| 58 | 56 | ||
| 59 | 'render': function() { | 57 | 'render': function() { |
| 60 | var errorMessageActor; | 58 | var errorMessageActor; |
| 61 | varchangePasswordButton; | 59 | varchangePasswordButton; |
| 62 | var deleteAccountButton; | 60 | var deleteAccountButton; |
| 63 | 61 | ||
| 64 | try { | 62 | try { |
| 65 | //MochiKit.Logging.logDebug(">>> AccountPanel.render"); | 63 | //MochiKit.Logging.logDebug(">>> AccountPanel.render"); |
| 66 | Clipperz.NotificationCenter.unregister(this); | 64 | Clipperz.NotificationCenter.unregister(this); |
| 67 | MochiKit.Signal.disconnectAllTo(this); | 65 | MochiKit.Signal.disconnectAllTo(this); |
| 68 | 66 | ||
| 69 | this.element().update(""); | 67 | this.element().update(""); |
| 70 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'table', border:'0', cellspacing:'0', cellpadding:'0', children:[ | 68 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'table', border:'0', cellspacing:'0', cellpadding:'0', children:[ |
| 71 | {tag:'tbody', children:[ | 69 | {tag:'tbody', children:[ |
| 72 | {tag:'tr', children:[ | 70 | {tag:'tr', children:[ |
| 73 | {tag:'td', valign:'top', width:'200', children:[ | 71 | {tag:'td', valign:'top', width:'200', children:[ |
| 74 | {tag:'ul', id:"accountSubMenu", cls:'subMenu', children:[ | 72 | {tag:'ul', id:"accountSubMenu", cls:'subMenu', children:[ |
| 75 | {tag:'li', id:'changePassphraseTab', htmlString:Clipperz.PM.Strings['changePasswordTabLabel']}, | 73 | {tag:'li', id:'changePassphraseTab', htmlString:Clipperz.PM.Strings['changePasswordTabLabel']}, |
| 76 | {tag:'li', id:'manageOTPTab', htmlString:Clipperz.PM.Strings['manageOTPTabLabel']}, | 74 | {tag:'li', id:'manageOTPTab', htmlString:Clipperz.PM.Strings['manageOTPTabLabel']}, |
| 77 | {tag:'li', id:'accountPreferencesTab', htmlString:Clipperz.PM.Strings['accountPreferencesLabel']}, | 75 | {tag:'li', id:'accountPreferencesTab', htmlString:Clipperz.PM.Strings['accountPreferencesLabel']}, |
| 78 | {tag:'li', id:'loginHistoryTab', htmlString:Clipperz.PM.Strings['accountLoginHistoryLabel']}, | 76 | {tag:'li', id:'loginHistoryTab', htmlString:Clipperz.PM.Strings['accountLoginHistoryLabel']}, |
| 79 | {tag:'li', id:'deleteAccountTab', htmlString:Clipperz.PM.Strings['deleteAccountTabLabel']} | 77 | {tag:'li', id:'deleteAccountTab', htmlString:Clipperz.PM.Strings['deleteAccountTabLabel']} |
| 80 | // {tag:'li', id:'paidAccountTab'), htmlString:Clipperz.PM.Strings['paidAccountTabLabel']} | 78 | // {tag:'li', id:'paidAccountTab'), htmlString:Clipperz.PM.Strings['paidAccountTabLabel']} |
| 81 | ]} | 79 | ]} |
| 82 | ]}, | 80 | ]}, |
| 83 | {tag:'td', valign:'top', children:[ | 81 | {tag:'td', valign:'top', children:[ |
| 84 | {tag:'ul', cls:'clipperzTabPanels', children:[ | 82 | {tag:'ul', cls:'clipperzTabPanels', children:[ |
| 85 | {tag:'li', id:this.getId('changePassphrasePanel'), children:[ | 83 | {tag:'li', id:this.getId('changePassphrasePanel'), children:[ |
| 86 | {tag:'div', cls:'clipperzSubPanel', children:[ | 84 | {tag:'div', cls:'clipperzSubPanel', children:[ |
| 87 | {tag:'h5', htmlString:Clipperz.PM.Strings['changePasswordTabTitle']}, | 85 | {tag:'h5', htmlString:Clipperz.PM.Strings['changePasswordTabTitle']}, |
| 88 | {tag:'div', cls:'panelBody', id:'changePassphraseBlock', children:[ | 86 | {tag:'div', cls:'panelBody', id:'changePassphraseBlock', children:[ |
| 89 | {tag:'form', id:this.getId('changePassphraseForm'), children:[ | 87 | {tag:'form', id:this.getId('changePassphraseForm'), children:[ |
| 90 | {tag:'h5', cls:'errorMessage', id:this.getId('changePassphrase_errorMessage')}, | 88 | {tag:'h5', cls:'errorMessage', id:this.getId('changePassphrase_errorMessage')}, |
| 91 | {tag:'table', cls:'panelBody', children:[ | 89 | {tag:'table', cls:'panelBody', children:[ |
| 92 | {tag:'tr', children:[ | 90 | {tag:'tr', children:[ |
| 93 | {tag:'td', children:[ | 91 | {tag:'td', children:[ |
| 94 | {tag:'span', cls:'formLabel', htmlString:Clipperz.PM.Strings['changePasswordFormUsernameLabel']} | 92 | {tag:'span', cls:'formLabel', htmlString:Clipperz.PM.Strings['changePasswordFormUsernameLabel']} |
| 95 | ]}, | 93 | ]}, |
| 96 | {tag:'td', children:[ | 94 | {tag:'td', children:[ |
| 97 | {tag:'input', type:'text', name:'username', id:this.getId('changePassphrase_username')} | 95 | {tag:'input', type:'text', name:'username', id:this.getId('changePassphrase_username')} |
| 98 | ]} | 96 | ]} |
| 99 | ]}, | 97 | ]}, |
| 100 | {tag:'tr', children:[ | 98 | {tag:'tr', children:[ |
| 101 | {tag:'td', children:[ | 99 | {tag:'td', children:[ |
| 102 | {tag:'span', cls:'formLabel', htmlString:Clipperz.PM.Strings['changePasswordFormOldPassphraseLabel']} | 100 | {tag:'span', cls:'formLabel', htmlString:Clipperz.PM.Strings['changePasswordFormOldPassphraseLabel']} |
| 103 | ]}, | 101 | ]}, |
| 104 | {tag:'td', children:[ | 102 | {tag:'td', children:[ |
| 105 | {tag:'input', type:'password', name:'oldPassphrase', id:this.getId('changePassphrase_oldPassphrase')} | 103 | {tag:'input', type:'password', name:'oldPassphrase', id:this.getId('changePassphrase_oldPassphrase')} |
| 106 | ]} | 104 | ]} |
| 107 | ]}, | 105 | ]}, |
| 108 | {tag:'tr', children:[ | 106 | {tag:'tr', children:[ |
| 109 | {tag:'td', children:[ | 107 | {tag:'td', children:[ |
| 110 | {tag:'span', cls:'formLabel', htmlString:Clipperz.PM.Strings['changePasswordFormNewPassphraseLabel']} | 108 | {tag:'span', cls:'formLabel', htmlString:Clipperz.PM.Strings['changePasswordFormNewPassphraseLabel']} |
| 111 | ]}, | 109 | ]}, |
| 112 | {tag:'td', children:[ | 110 | {tag:'td', children:[ |
| 113 | {tag:'input', type:'password', name:'newPassphrase', id:this.getId('changePassphrase_newPassphrase')} | 111 | {tag:'input', type:'password', name:'newPassphrase', id:this.getId('changePassphrase_newPassphrase')} |
| 114 | ]} | 112 | ]} |
| 115 | ]}, | 113 | ]}, |
| 116 | {tag:'tr', children:[ | 114 | {tag:'tr', children:[ |
| 117 | {tag:'td', children:[ | 115 | {tag:'td', children:[ |
| 118 | {tag:'span', cls:'formLabel', htmlString:Clipperz.PM.Strings['changePasswordFormRetypePassphraseLabel']} | 116 | {tag:'span', cls:'formLabel', htmlString:Clipperz.PM.Strings['changePasswordFormRetypePassphraseLabel']} |
diff --git a/frontend/beta/js/Clipperz/PM/Components/Panels/BasePanel.js b/frontend/beta/js/Clipperz/PM/Components/Panels/BasePanel.js index 15dd622..f36e8b0 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Panels/BasePanel.js +++ b/frontend/beta/js/Clipperz/PM/Components/Panels/BasePanel.js | |||
| @@ -1,93 +1,91 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Panels) == 'undefined') { Clipperz.PM.Components.Panels = {}; } | 27 | if (typeof(Clipperz.PM.Components.Panels) == 'undefined') { Clipperz.PM.Components.Panels = {}; } |
| 30 | 28 | ||
| 31 | //var _Clipperz_PM_Components_Panels_base_id_ = 0; | 29 | //var _Clipperz_PM_Components_Panels_base_id_ = 0; |
| 32 | 30 | ||
| 33 | //############################################################################# | 31 | //############################################################################# |
| 34 | 32 | ||
| 35 | Clipperz.PM.Components.Panels.BasePanel = function(anElement, args) { | 33 | Clipperz.PM.Components.Panels.BasePanel = function(anElement, args) { |
| 36 | args = args || {}; | 34 | args = args || {}; |
| 37 | 35 | ||
| 38 | Clipperz.PM.Components.Panels.BasePanel.superclass.constructor.call(this, anElement, args); | 36 | Clipperz.PM.Components.Panels.BasePanel.superclass.constructor.call(this, anElement, args); |
| 39 | 37 | ||
| 40 | this._user = args.user || null; | 38 | this._user = args.user || null; |
| 41 | this._delegate = args.delegate || null; | 39 | this._delegate = args.delegate || null; |
| 42 | this._tabPanelController = null; | 40 | this._tabPanelController = null; |
| 43 | //Clipperz.NotificationCenter.register(null, 'switchLanguage', this, 'switchLanguageHandler'); | 41 | //Clipperz.NotificationCenter.register(null, 'switchLanguage', this, 'switchLanguageHandler'); |
| 44 | 42 | ||
| 45 | //this._ids = {}; | 43 | //this._ids = {}; |
| 46 | 44 | ||
| 47 | return this; | 45 | return this; |
| 48 | } | 46 | } |
| 49 | 47 | ||
| 50 | //============================================================================= | 48 | //============================================================================= |
| 51 | 49 | ||
| 52 | YAHOO.extendX(Clipperz.PM.Components.Panels.BasePanel, Clipperz.PM.Components.BaseComponent, { | 50 | YAHOO.extendX(Clipperz.PM.Components.Panels.BasePanel, Clipperz.PM.Components.BaseComponent, { |
| 53 | 51 | ||
| 54 | 'toString': function() { | 52 | 'toString': function() { |
| 55 | return "Clipperz.PM.Components.Panels.BasePanel component"; | 53 | return "Clipperz.PM.Components.Panels.BasePanel component"; |
| 56 | }, | 54 | }, |
| 57 | 55 | ||
| 58 | //------------------------------------------------------------------------- | 56 | //------------------------------------------------------------------------- |
| 59 | 57 | ||
| 60 | 'user': function() { | 58 | 'user': function() { |
| 61 | return this._user; | 59 | return this._user; |
| 62 | }, | 60 | }, |
| 63 | 61 | ||
| 64 | 'setUser': function(aValue) { | 62 | 'setUser': function(aValue) { |
| 65 | this._user = aValue; | 63 | this._user = aValue; |
| 66 | }, | 64 | }, |
| 67 | 65 | ||
| 68 | //------------------------------------------------------------------------- | 66 | //------------------------------------------------------------------------- |
| 69 | 67 | ||
| 70 | 'delegate': function() { | 68 | 'delegate': function() { |
| 71 | return this._delegate; | 69 | return this._delegate; |
| 72 | }, | 70 | }, |
| 73 | 71 | ||
| 74 | 'setDelegate': function(aValue) { | 72 | 'setDelegate': function(aValue) { |
| 75 | this._delegate = aValue; | 73 | this._delegate = aValue; |
| 76 | }, | 74 | }, |
| 77 | 75 | ||
| 78 | //------------------------------------------------------------------------- | 76 | //------------------------------------------------------------------------- |
| 79 | 77 | ||
| 80 | 'tabPanelController': function() { | 78 | 'tabPanelController': function() { |
| 81 | return this._tabPanelController; | 79 | return this._tabPanelController; |
| 82 | }, | 80 | }, |
| 83 | 81 | ||
| 84 | 'switchLanguageHandler': function() { | 82 | 'switchLanguageHandler': function() { |
| 85 | //MochiKit.Logging.logDebug(">>> BasePanel.switchLanguageHandler [" + this.toString() + "]"); | 83 | //MochiKit.Logging.logDebug(">>> BasePanel.switchLanguageHandler [" + this.toString() + "]"); |
| 86 | this.render(); | 84 | this.render(); |
| 87 | //MochiKit.Logging.logDebug("<<< BasePanel.switchLanguageHandler [" + this.toString() + "]"); | 85 | //MochiKit.Logging.logDebug("<<< BasePanel.switchLanguageHandler [" + this.toString() + "]"); |
| 88 | }, | 86 | }, |
| 89 | 87 | ||
| 90 | //------------------------------------------------------------------------- | 88 | //------------------------------------------------------------------------- |
| 91 | __syntaxFix__: "syntax fix" | 89 | __syntaxFix__: "syntax fix" |
| 92 | 90 | ||
| 93 | }); | 91 | }); |
diff --git a/frontend/beta/js/Clipperz/PM/Components/Panels/ContactsPanel.js b/frontend/beta/js/Clipperz/PM/Components/Panels/ContactsPanel.js index 5a91d83..3feed3d 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Panels/ContactsPanel.js +++ b/frontend/beta/js/Clipperz/PM/Components/Panels/ContactsPanel.js | |||
| @@ -1,102 +1,100 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Panels) == 'undefined') { Clipperz.PM.Components.Panels = {}; } | 27 | if (typeof(Clipperz.PM.Components.Panels) == 'undefined') { Clipperz.PM.Components.Panels = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.Panels.ContactsPanel = function(anElement, args) { | 31 | Clipperz.PM.Components.Panels.ContactsPanel = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | Clipperz.PM.Components.Panels.ContactsPanel.superclass.constructor.call(this, anElement, args); | 34 | Clipperz.PM.Components.Panels.ContactsPanel.superclass.constructor.call(this, anElement, args); |
| 37 | 35 | ||
| 38 | this.render(); | 36 | this.render(); |
| 39 | 37 | ||
| 40 | return this; | 38 | return this; |
| 41 | } | 39 | } |
| 42 | 40 | ||
| 43 | //============================================================================= | 41 | //============================================================================= |
| 44 | 42 | ||
| 45 | YAHOO.extendX(Clipperz.PM.Components.Panels.ContactsPanel, Clipperz.PM.Components.Panels.BasePanel, { | 43 | YAHOO.extendX(Clipperz.PM.Components.Panels.ContactsPanel, Clipperz.PM.Components.Panels.BasePanel, { |
| 46 | 44 | ||
| 47 | 'toString': function() { | 45 | 'toString': function() { |
| 48 | return "Clipperz.PM.Components.ContactsPanel component"; | 46 | return "Clipperz.PM.Components.ContactsPanel component"; |
| 49 | }, | 47 | }, |
| 50 | 48 | ||
| 51 | //------------------------------------------------------------------------- | 49 | //------------------------------------------------------------------------- |
| 52 | 50 | ||
| 53 | 'render': function() { | 51 | 'render': function() { |
| 54 | // var tabPanelControllerConfig; | 52 | // var tabPanelControllerConfig; |
| 55 | 53 | ||
| 56 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'table', border:'0', cellspacing:'0', cellpadding:'0', children:[ | 54 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'table', border:'0', cellspacing:'0', cellpadding:'0', children:[ |
| 57 | {tag:'tbody', children:[ | 55 | {tag:'tbody', children:[ |
| 58 | {tag:'tr', children:[ | 56 | {tag:'tr', children:[ |
| 59 | {tag:'td', valign:'top', width:'200', children:[ | 57 | {tag:'td', valign:'top', width:'200', children:[ |
| 60 | {tag:'ul', id:"dataSubMenu", cls:'subMenu', children:[ | 58 | {tag:'ul', id:"dataSubMenu", cls:'subMenu', children:[ |
| 61 | {tag:'li', id:this.getId('contacts'), htmlString:Clipperz.PM.Strings['contactsTabLabel']}, | 59 | {tag:'li', id:this.getId('contacts'), htmlString:Clipperz.PM.Strings['contactsTabLabel']}, |
| 62 | ]} | 60 | ]} |
| 63 | ]}, | 61 | ]}, |
| 64 | {tag:'td', valign:'top', children:[ | 62 | {tag:'td', valign:'top', children:[ |
| 65 | {tag:'ul', cls:'clipperzTabPanels', children:[ | 63 | {tag:'ul', cls:'clipperzTabPanels', children:[ |
| 66 | {tag:'li', id:this.getId('contactsPanel'), children:[ | 64 | {tag:'li', id:this.getId('contactsPanel'), children:[ |
| 67 | {tag:'div', cls:'clipperzSubPanel', children:[ | 65 | {tag:'div', cls:'clipperzSubPanel', children:[ |
| 68 | {tag:'h5', htmlString:Clipperz.PM.Strings['contactsTabTitle']}, | 66 | {tag:'h5', htmlString:Clipperz.PM.Strings['contactsTabTitle']}, |
| 69 | {tag:'div', htmlString:Clipperz.PM.Strings['comingSoon']} | 67 | {tag:'div', htmlString:Clipperz.PM.Strings['comingSoon']} |
| 70 | ]} | 68 | ]} |
| 71 | ]} | 69 | ]} |
| 72 | ]} | 70 | ]} |
| 73 | ]} | 71 | ]} |
| 74 | ]} | 72 | ]} |
| 75 | ]} | 73 | ]} |
| 76 | ]}); | 74 | ]}); |
| 77 | 75 | ||
| 78 | // tabPanelControllerConfig = {} | 76 | // tabPanelControllerConfig = {} |
| 79 | // tabPanelControllerConfig[this.getId('contacts')] = this.getId('contactsPanel'); | 77 | // tabPanelControllerConfig[this.getId('contacts')] = this.getId('contactsPanel'); |
| 80 | // new Clipperz.PM.Components.TabPanel.TabPanelController({ config:tabPanelControllerConfig, selectedTab:this.getId('contacts') }); | 78 | // new Clipperz.PM.Components.TabPanel.TabPanelController({ config:tabPanelControllerConfig, selectedTab:this.getId('contacts') }); |
| 81 | this.tabPanelController().setUp(); | 79 | this.tabPanelController().setUp(); |
| 82 | }, | 80 | }, |
| 83 | 81 | ||
| 84 | //------------------------------------------------------------------------- | 82 | //------------------------------------------------------------------------- |
| 85 | 83 | ||
| 86 | 'tabPanelController': function() { | 84 | 'tabPanelController': function() { |
| 87 | if (this._tabPanelController == null) { | 85 | if (this._tabPanelController == null) { |
| 88 | var tabPanelControllerConfig; | 86 | var tabPanelControllerConfig; |
| 89 | 87 | ||
| 90 | tabPanelControllerConfig = {} | 88 | tabPanelControllerConfig = {} |
| 91 | tabPanelControllerConfig[this.getId('contacts')] = this.getId('contactsPanel'); | 89 | tabPanelControllerConfig[this.getId('contacts')] = this.getId('contactsPanel'); |
| 92 | this._tabPanelController = new Clipperz.PM.Components.TabPanel.TabPanelController({ config:tabPanelControllerConfig, selectedTab:this.getId('contacts') }); | 90 | this._tabPanelController = new Clipperz.PM.Components.TabPanel.TabPanelController({ config:tabPanelControllerConfig, selectedTab:this.getId('contacts') }); |
| 93 | } | 91 | } |
| 94 | 92 | ||
| 95 | return this._tabPanelController; | 93 | return this._tabPanelController; |
| 96 | }, | 94 | }, |
| 97 | 95 | ||
| 98 | //------------------------------------------------------------------------- | 96 | //------------------------------------------------------------------------- |
| 99 | __syntaxFix__: "syntax fix" | 97 | __syntaxFix__: "syntax fix" |
| 100 | 98 | ||
| 101 | }); | 99 | }); |
| 102 | 100 | ||
diff --git a/frontend/beta/js/Clipperz/PM/Components/Panels/DataPanel.js b/frontend/beta/js/Clipperz/PM/Components/Panels/DataPanel.js index 11d4bd7..520542c 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Panels/DataPanel.js +++ b/frontend/beta/js/Clipperz/PM/Components/Panels/DataPanel.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Panels) == 'undefined') { Clipperz.PM.Components.Panels = {}; } | 27 | if (typeof(Clipperz.PM.Components.Panels) == 'undefined') { Clipperz.PM.Components.Panels = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.Panels.DataPanel = function(anElement, args) { | 31 | Clipperz.PM.Components.Panels.DataPanel = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | Clipperz.PM.Components.Panels.DataPanel.superclass.constructor.call(this, anElement, args); | 34 | Clipperz.PM.Components.Panels.DataPanel.superclass.constructor.call(this, anElement, args); |
| 37 | 35 | ||
| 38 | this._progressWidth = 400; | 36 | this._progressWidth = 400; |
| 39 | 37 | ||
| 40 | 38 | ||
| 41 | this.render(); | 39 | this.render(); |
| 42 | 40 | ||
| 43 | return this; | 41 | return this; |
| 44 | } | 42 | } |
| 45 | 43 | ||
| 46 | //============================================================================= | 44 | //============================================================================= |
| 47 | 45 | ||
| 48 | YAHOO.extendX(Clipperz.PM.Components.Panels.DataPanel, Clipperz.PM.Components.Panels.BasePanel, { | 46 | YAHOO.extendX(Clipperz.PM.Components.Panels.DataPanel, Clipperz.PM.Components.Panels.BasePanel, { |
| 49 | 47 | ||
| 50 | 'toString': function() { | 48 | 'toString': function() { |
| 51 | return "Clipperz.PM.Components.DataPanel component"; | 49 | return "Clipperz.PM.Components.DataPanel component"; |
| 52 | }, | 50 | }, |
| 53 | 51 | ||
| 54 | //------------------------------------------------------------------------- | 52 | //------------------------------------------------------------------------- |
| 55 | 53 | ||
| 56 | 'render': function() { | 54 | 'render': function() { |
| 57 | MochiKit.Signal.disconnectAllTo(this); | 55 | MochiKit.Signal.disconnectAllTo(this); |
| 58 | Clipperz.NotificationCenter.unregister(this); | 56 | Clipperz.NotificationCenter.unregister(this); |
| 59 | this.element().update(""); | 57 | this.element().update(""); |
| 60 | 58 | ||
| 61 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'table', border:'0', cellspacing:'0', cellpadding:'0', children:[ | 59 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'table', border:'0', cellspacing:'0', cellpadding:'0', children:[ |
| 62 | {tag:'tbody', children:[ | 60 | {tag:'tbody', children:[ |
| 63 | {tag:'tr', children:[ | 61 | {tag:'tr', children:[ |
| 64 | {tag:'td', valign:'top', width:'200', children:[ | 62 | {tag:'td', valign:'top', width:'200', children:[ |
| 65 | {tag:'ul', id:"dataSubMenu", cls:'subMenu', children:[ | 63 | {tag:'ul', id:"dataSubMenu", cls:'subMenu', children:[ |
| 66 | {tag:'li', id:'offlineCopyTab', htmlString:Clipperz.PM.Strings['offlineCopyTabLabel']}, | 64 | {tag:'li', id:'offlineCopyTab', htmlString:Clipperz.PM.Strings['offlineCopyTabLabel']}, |
| 67 | {tag:'li', id:'sharingTab', htmlString:Clipperz.PM.Strings['sharingTabLabel']}, | 65 | {tag:'li', id:'sharingTab', htmlString:Clipperz.PM.Strings['sharingTabLabel']}, |
| 68 | {tag:'li', id:'importTab', htmlString:Clipperz.PM.Strings['importTabLabel']}, | 66 | {tag:'li', id:'importTab', htmlString:Clipperz.PM.Strings['importTabLabel']}, |
| 69 | {tag:'li', id:'printingTab', htmlString:Clipperz.PM.Strings['printingTabLabel']} | 67 | {tag:'li', id:'printingTab', htmlString:Clipperz.PM.Strings['printingTabLabel']} |
| 70 | ]} | 68 | ]} |
| 71 | ]}, | 69 | ]}, |
| 72 | {tag:'td', valign:'top', children:[ | 70 | {tag:'td', valign:'top', children:[ |
| 73 | {tag:'ul', cls:'clipperzTabPanels', children:[ | 71 | {tag:'ul', cls:'clipperzTabPanels', children:[ |
| 74 | {tag:'li', id:this.getId('offlineCopyPanel'), children:[ | 72 | {tag:'li', id:this.getId('offlineCopyPanel'), children:[ |
| 75 | {tag:'div', cls:'clipperzSubPanel', children:[ | 73 | {tag:'div', cls:'clipperzSubPanel', children:[ |
| 76 | {tag:'h5', htmlString:Clipperz.PM.Strings['offlineCopyTabTitle']}, | 74 | {tag:'h5', htmlString:Clipperz.PM.Strings['offlineCopyTabTitle']}, |
| 77 | {tag:'div', cls:'panelDescription', htmlString:Clipperz.PM.Strings['offlineCopyTabDescription']}, | 75 | {tag:'div', cls:'panelDescription', htmlString:Clipperz.PM.Strings['offlineCopyTabDescription']}, |
| 78 | {tag:'div', id:this.getId('offlineCopyLinkBox'), children:[ | 76 | {tag:'div', id:this.getId('offlineCopyLinkBox'), children:[ |
| 79 | {tag:'a', id:'offlineCopyLink', href:'#', htmlString:Clipperz.PM.Strings['offlineCopyDownloadLinkLabel']} | 77 | {tag:'a', id:'offlineCopyLink', href:'#', htmlString:Clipperz.PM.Strings['offlineCopyDownloadLinkLabel']} |
| 80 | ]}, | 78 | ]}, |
| 81 | {tag:'div', id:this.getId('offlineCopyLinkBox_read-only'), children:[ | 79 | {tag:'div', id:this.getId('offlineCopyLinkBox_read-only'), children:[ |
| 82 | {tag:'span', cls:'read-only', htmlString:Clipperz.PM.Strings['offlineCopyDownloadLinkLabel']} | 80 | {tag:'span', cls:'read-only', htmlString:Clipperz.PM.Strings['offlineCopyDownloadLinkLabel']} |
| 83 | ]} | 81 | ]} |
| 84 | ]} | 82 | ]} |
| 85 | ]}, | 83 | ]}, |
| 86 | {tag:'li', id:this.getId('sharingPanel'), children:[ | 84 | {tag:'li', id:this.getId('sharingPanel'), children:[ |
| 87 | {tag:'div', cls:'clipperzSubPanel', children:[ | 85 | {tag:'div', cls:'clipperzSubPanel', children:[ |
| 88 | {tag:'h5', htmlString:Clipperz.PM.Strings['sharingTabTitle']}, | 86 | {tag:'h5', htmlString:Clipperz.PM.Strings['sharingTabTitle']}, |
| 89 | {tag:'div', cls:'panelDescription', htmlString:Clipperz.PM.Strings['sharingTabDescription']} | 87 | {tag:'div', cls:'panelDescription', htmlString:Clipperz.PM.Strings['sharingTabDescription']} |
| 90 | ]} | 88 | ]} |
| 91 | ]}, | 89 | ]}, |
| 92 | {tag:'li', id:this.getId('importPanel'), children:[ | 90 | {tag:'li', id:this.getId('importPanel'), children:[ |
| 93 | {tag:'div', cls:'clipperzSubPanel', children:[ | 91 | {tag:'div', cls:'clipperzSubPanel', children:[ |
| 94 | {tag:'div', id:this.getId('importPanelMainComponent')} | 92 | {tag:'div', id:this.getId('importPanelMainComponent')} |
| 95 | ]} | 93 | ]} |
| 96 | ]}, | 94 | ]}, |
| 97 | {tag:'li', id:this.getId('printingPanel'), children:[ | 95 | {tag:'li', id:this.getId('printingPanel'), children:[ |
| 98 | {tag:'div', cls:'clipperzSubPanel', children:[ | 96 | {tag:'div', cls:'clipperzSubPanel', children:[ |
| 99 | {tag:'h5', htmlString:Clipperz.PM.Strings['printingTabTitle']}, | 97 | {tag:'h5', htmlString:Clipperz.PM.Strings['printingTabTitle']}, |
| 100 | 98 | ||
| 101 | {tag:'div', cls:'panelDescription', htmlString:Clipperz.PM.Strings['printingTabDescription']}, | 99 | {tag:'div', cls:'panelDescription', htmlString:Clipperz.PM.Strings['printingTabDescription']}, |
| 102 | {tag:'div', id:this.getId('printingLinkBox'), children:[ | 100 | {tag:'div', id:this.getId('printingLinkBox'), children:[ |
| 103 | {tag:'a', id:'printingLink', href:'#', htmlString:Clipperz.PM.Strings['printingLinkLabel']} | 101 | {tag:'a', id:'printingLink', href:'#', htmlString:Clipperz.PM.Strings['printingLinkLabel']} |
| 104 | ]}, | 102 | ]}, |
| 105 | 103 | ||
| 106 | {tag:'hr'}, | 104 | {tag:'hr'}, |
| 107 | 105 | ||
| 108 | {tag:'div', cls:'panelDescription', htmlString:Clipperz.PM.Strings['exportTabDescription']}, | 106 | {tag:'div', cls:'panelDescription', htmlString:Clipperz.PM.Strings['exportTabDescription']}, |
| 109 | {tag:'div', id:this.getId('exportLinkBox'), children:[ | 107 | {tag:'div', id:this.getId('exportLinkBox'), children:[ |
| 110 | {tag:'a', id:'exportLink', href:'#', htmlString:Clipperz.PM.Strings['exportLinkLabel']} | 108 | {tag:'a', id:'exportLink', href:'#', htmlString:Clipperz.PM.Strings['exportLinkLabel']} |
| 111 | ]} | 109 | ]} |
| 112 | ]} | 110 | ]} |
| 113 | ]} | 111 | ]} |
| 114 | ]} | 112 | ]} |
| 115 | ]} | 113 | ]} |
| 116 | ]} | 114 | ]} |
| 117 | ]} | 115 | ]} |
| 118 | ]}); | 116 | ]}); |
diff --git a/frontend/beta/js/Clipperz/PM/Components/Panels/LoginPanel.js b/frontend/beta/js/Clipperz/PM/Components/Panels/LoginPanel.js index ef2b91c..3081a9d 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Panels/LoginPanel.js +++ b/frontend/beta/js/Clipperz/PM/Components/Panels/LoginPanel.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Panels) == 'undefined') { Clipperz.PM.Components.Panels = {}; } | 27 | if (typeof(Clipperz.PM.Components.Panels) == 'undefined') { Clipperz.PM.Components.Panels = {}; } |
| 30 | 28 | ||
| 31 | 29 | ||
| 32 | Clipperz.PM.Components.Panels.LoginPanel = function(anElement, args) { | 30 | Clipperz.PM.Components.Panels.LoginPanel = function(anElement, args) { |
| 33 | args = args || {}; | 31 | args = args || {}; |
| 34 | 32 | ||
| 35 | Clipperz.PM.Components.Panels.LoginPanel.superclass.constructor.call(this, anElement, args); | 33 | Clipperz.PM.Components.Panels.LoginPanel.superclass.constructor.call(this, anElement, args); |
| 36 | 34 | ||
| 37 | this._showLoginFormAnimator = null; | 35 | this._showLoginFormAnimator = null; |
| 38 | this._showRegistrationFormAnimator = null; | 36 | this._showRegistrationFormAnimator = null; |
| 39 | this._shouldShowRegistrationAlert = true; | 37 | this._shouldShowRegistrationAlert = true; |
| 40 | 38 | ||
| 41 | this._visibleForm = null; | 39 | this._visibleForm = null; |
| 42 | //this._isPassphraseVisible = true; | 40 | //this._isPassphraseVisible = true; |
| 43 | 41 | ||
| 44 | Clipperz.NotificationCenter.register(null, 'switchLanguage', this, 'switchLanguageHandler'); | 42 | Clipperz.NotificationCenter.register(null, 'switchLanguage', this, 'switchLanguageHandler'); |
| 45 | 43 | ||
| 46 | this.render(); | 44 | this.render(); |
| 47 | 45 | ||
| 48 | return this; | 46 | return this; |
| 49 | } | 47 | } |
| 50 | 48 | ||
| 51 | //============================================================================= | 49 | //============================================================================= |
| 52 | 50 | ||
| 53 | //MochiKit.Base.update(Clipperz.PM.Components.Panels.LoginPanel.prototype, { | 51 | //MochiKit.Base.update(Clipperz.PM.Components.Panels.LoginPanel.prototype, { |
| 54 | YAHOO.extendX(Clipperz.PM.Components.Panels.LoginPanel, Clipperz.PM.Components.Panels.BasePanel, { | 52 | YAHOO.extendX(Clipperz.PM.Components.Panels.LoginPanel, Clipperz.PM.Components.Panels.BasePanel, { |
| 55 | 53 | ||
| 56 | 'toString': function() { | 54 | 'toString': function() { |
| 57 | return "Clipperz.PM.Components.LoginPanel component"; | 55 | return "Clipperz.PM.Components.LoginPanel component"; |
| 58 | }, | 56 | }, |
| 59 | 57 | ||
| 60 | //------------------------------------------------------------------------- | 58 | //------------------------------------------------------------------------- |
| 61 | 59 | ||
| 62 | 'render': function() { | 60 | 'render': function() { |
| 63 | var result; | 61 | var result; |
| 64 | varlayout; | 62 | varlayout; |
| 65 | var registerButton; | 63 | var registerButton; |
| 66 | 64 | ||
| 67 | MochiKit.Signal.disconnectAllTo(this); | 65 | MochiKit.Signal.disconnectAllTo(this); |
| 68 | this.element().update(""); | 66 | this.element().update(""); |
| 69 | 67 | ||
| 70 | //MochiKit.Logging.logDebug(">>> LoginPanel.initPanel"); | 68 | //MochiKit.Logging.logDebug(">>> LoginPanel.initPanel"); |
| 71 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'div', id:this.getId('baseDiv'), cls:'LoginPanel', children:[ | 69 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'div', id:this.getId('baseDiv'), cls:'LoginPanel', children:[ |
| 72 | {tag:'table', children:[ | 70 | {tag:'table', children:[ |
| 73 | {tag:'thead'}, | 71 | {tag:'thead'}, |
| 74 | {tag:'tbody', children:[ | 72 | {tag:'tbody', children:[ |
| 75 | {tag:'tr', children:[ | 73 | {tag:'tr', children:[ |
| 76 | {tag:'td', valign:'top', children:[ | 74 | {tag:'td', valign:'top', children:[ |
| 77 | {tag:'div', cls:'clipperzServiceDescription', htmlString:Clipperz.PM.Strings['clipperzServiceDescription']} | 75 | {tag:'div', cls:'clipperzServiceDescription', htmlString:Clipperz.PM.Strings['clipperzServiceDescription']} |
| 78 | ]}, | 76 | ]}, |
| 79 | {tag:'td', valign:'top', align:'right', children:[ | 77 | {tag:'td', valign:'top', align:'right', children:[ |
| 80 | {tag:'div', id:this.getId('forms'), cls:'clipperzLoginForm', children:[ | 78 | {tag:'div', id:this.getId('forms'), cls:'clipperzLoginForm', children:[ |
| 81 | {tag:'div', id:this.getId('loginForm'), cls:'loginForm', children:[ | 79 | {tag:'div', id:this.getId('loginForm'), cls:'loginForm', children:[ |
| 82 | {tag:'div', cls:'loginFormHeaderBox', children:[{tag:'h3', htmlString:Clipperz.PM.Strings['loginFormTitle']}]}, | 80 | {tag:'div', cls:'loginFormHeaderBox', children:[{tag:'h3', htmlString:Clipperz.PM.Strings['loginFormTitle']}]}, |
| 83 | {tag:'form', id:this.getId('loginForm_form'), autocomplete:'off', children:[ | 81 | {tag:'form', id:this.getId('loginForm_form'), autocomplete:'off', children:[ |
| 84 | 82 | ||
| 85 | {tag:'table', cls:'formLayout', children:[ | 83 | {tag:'table', cls:'formLayout', children:[ |
| 86 | {tag:'thead'}, | 84 | {tag:'thead'}, |
| 87 | {tag:'tbody', children:[ | 85 | {tag:'tbody', children:[ |
| 88 | {tag:'tr', cls:'formFieldTR', children:[ | 86 | {tag:'tr', cls:'formFieldTR', children:[ |
| 89 | {tag:'td', width:'90', htmlString:Clipperz.PM.Strings['loginFormUsernameLabel']}, | 87 | {tag:'td', width:'90', htmlString:Clipperz.PM.Strings['loginFormUsernameLabel']}, |
| 90 | {tag:'td', children:[ | 88 | {tag:'td', children:[ |
| 91 | {tag:'input', id:this.getId('login_username'), cls:'loginFormField', type:'text', name:'username'} | 89 | {tag:'input', id:this.getId('login_username'), cls:'loginFormField', type:'text', name:'username'} |
| 92 | ]} | 90 | ]} |
| 93 | ]}, | 91 | ]}, |
| 94 | {tag:'tr', cls:'formFieldTR', children:[ | 92 | {tag:'tr', cls:'formFieldTR', children:[ |
| 95 | {tag:'td', htmlString:Clipperz.PM.Strings['loginFormPassphraseLabel']}, | 93 | {tag:'td', htmlString:Clipperz.PM.Strings['loginFormPassphraseLabel']}, |
| 96 | {tag:'td', children:[ | 94 | {tag:'td', children:[ |
| 97 | {tag:'div', id:this.getId('passphraseDIV'), children:[ | 95 | {tag:'div', id:this.getId('passphraseDIV'), children:[ |
| 98 | {tag:'input', id:this.getId('login_passphrase'), cls:'loginFormField', type:'password', name:'passphrase'} | 96 | {tag:'input', id:this.getId('login_passphrase'), cls:'loginFormField', type:'password', name:'passphrase'} |
| 99 | ]}, | 97 | ]}, |
| 100 | {tag:'div', cls:'oneTimePassword', id:this.getId('oneTimePasswordDIV'), children:[ | 98 | {tag:'div', cls:'oneTimePassword', id:this.getId('oneTimePasswordDIV'), children:[ |
| 101 | {tag:'input', type:'text', id:this.getId('oneTimePassword_1'), name:'passphrase'}, | 99 | {tag:'input', type:'text', id:this.getId('oneTimePassword_1'), name:'passphrase'}, |
| 102 | {tag:'span', html:'-'}, | 100 | {tag:'span', html:'-'}, |
| 103 | {tag:'input', type:'text', id:this.getId('oneTimePassword_2'), name:'passphrase'}, | 101 | {tag:'input', type:'text', id:this.getId('oneTimePassword_2'), name:'passphrase'}, |
| 104 | {tag:'span', html:'-'}, | 102 | {tag:'span', html:'-'}, |
| 105 | {tag:'input', type:'text', id:this.getId('oneTimePassword_3'), name:'passphrase'}, | 103 | {tag:'input', type:'text', id:this.getId('oneTimePassword_3'), name:'passphrase'}, |
| 106 | {tag:'span', html:'-'}, | 104 | {tag:'span', html:'-'}, |
| 107 | {tag:'input', type:'text', id:this.getId('oneTimePassword_4'), name:'passphrase'} | 105 | {tag:'input', type:'text', id:this.getId('oneTimePassword_4'), name:'passphrase'} |
| 108 | ]} | 106 | ]} |
| 109 | ]} | 107 | ]} |
| 110 | ]}, | 108 | ]}, |
| 111 | {tag:'tr', cls:'formFieldTR', id:this.getId('passwordTypeChooserTR'), children:[ | 109 | {tag:'tr', cls:'formFieldTR', id:this.getId('passwordTypeChooserTR'), children:[ |
| 112 | {tag:'td', valign:'top', align:'right', children:[ | 110 | {tag:'td', valign:'top', align:'right', children:[ |
| 113 | {tag:'input', type:'checkbox', cls:'passwordTypeCheckbox', id:this.getId('useOneTimePasswordCheckbox')} | 111 | {tag:'input', type:'checkbox', cls:'passwordTypeCheckbox', id:this.getId('useOneTimePasswordCheckbox')} |
| 114 | ]}, | 112 | ]}, |
| 115 | {tag:'td', children:[ | 113 | {tag:'td', children:[ |
| 116 | {tag:'div', cls:'passwordTypeChooser', children:[ | 114 | {tag:'div', cls:'passwordTypeChooser', children:[ |
| 117 | {tag:'h4', htmlString:Clipperz.PM.Strings['loginFormOneTimePasswordCheckboxLabel']}, | 115 | {tag:'h4', htmlString:Clipperz.PM.Strings['loginFormOneTimePasswordCheckboxLabel']}, |
| 118 | {tag:'span', htmlString:Clipperz.PM.Strings['loginFormOneTimePasswordCheckboxDescription']} | 116 | {tag:'span', htmlString:Clipperz.PM.Strings['loginFormOneTimePasswordCheckboxDescription']} |
diff --git a/frontend/beta/js/Clipperz/PM/Components/Panels/LogoutPanel.js b/frontend/beta/js/Clipperz/PM/Components/Panels/LogoutPanel.js index b8cc556..17ed8e4 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Panels/LogoutPanel.js +++ b/frontend/beta/js/Clipperz/PM/Components/Panels/LogoutPanel.js | |||
| @@ -1,70 +1,68 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Panels) == 'undefined') { Clipperz.PM.Components.Panels = {}; } | 27 | if (typeof(Clipperz.PM.Components.Panels) == 'undefined') { Clipperz.PM.Components.Panels = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.Panels.LogoutPanel = function(args) { | 31 | Clipperz.PM.Components.Panels.LogoutPanel = function(args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | Clipperz.PM.Components.Panels.LogoutPanel.superclass.constructor.call(this, args); | 34 | Clipperz.PM.Components.Panels.LogoutPanel.superclass.constructor.call(this, args); |
| 37 | 35 | ||
| 38 | return this; | 36 | return this; |
| 39 | } | 37 | } |
| 40 | 38 | ||
| 41 | //============================================================================= | 39 | //============================================================================= |
| 42 | 40 | ||
| 43 | YAHOO.extendX(Clipperz.PM.Components.Panels.LogoutPanel, Clipperz.PM.Components.Panels.BasePanel, { | 41 | YAHOO.extendX(Clipperz.PM.Components.Panels.LogoutPanel, Clipperz.PM.Components.Panels.BasePanel, { |
| 44 | 42 | ||
| 45 | 'toString': function() { | 43 | 'toString': function() { |
| 46 | return "Clipperz.PM.Components.LogoutPanel component"; | 44 | return "Clipperz.PM.Components.LogoutPanel component"; |
| 47 | }, | 45 | }, |
| 48 | 46 | ||
| 49 | //------------------------------------------------------------------------- | 47 | //------------------------------------------------------------------------- |
| 50 | 48 | ||
| 51 | 'initPanel': function() { | 49 | 'initPanel': function() { |
| 52 | var result; | 50 | var result; |
| 53 | varlayout; | 51 | varlayout; |
| 54 | 52 | ||
| 55 | result = new YAHOO.ext.ContentPanel(this.getId('panel'), {title:'logout', closable:false, autoCreate:true}); | 53 | result = new YAHOO.ext.ContentPanel(this.getId('panel'), {title:'logout', closable:false, autoCreate:true}); |
| 56 | 54 | ||
| 57 | Clipperz.YUI.DomHelper.append(result.getEl().dom, | 55 | Clipperz.YUI.DomHelper.append(result.getEl().dom, |
| 58 | {tag:'div', children:[ | 56 | {tag:'div', children:[ |
| 59 | {tag:'h2', html:'Logout panel'} | 57 | {tag:'h2', html:'Logout panel'} |
| 60 | ]} | 58 | ]} |
| 61 | ); | 59 | ); |
| 62 | 60 | ||
| 63 | return result; | 61 | return result; |
| 64 | }, | 62 | }, |
| 65 | 63 | ||
| 66 | //------------------------------------------------------------------------- | 64 | //------------------------------------------------------------------------- |
| 67 | __syntaxFix__: "syntax fix" | 65 | __syntaxFix__: "syntax fix" |
| 68 | 66 | ||
| 69 | }); | 67 | }); |
| 70 | 68 | ||
diff --git a/frontend/beta/js/Clipperz/PM/Components/Panels/MainPanel.js b/frontend/beta/js/Clipperz/PM/Components/Panels/MainPanel.js index 29ef516..c19a8a3 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Panels/MainPanel.js +++ b/frontend/beta/js/Clipperz/PM/Components/Panels/MainPanel.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Panels) == 'undefined') { Clipperz.PM.Components.Panels = {}; } | 27 | if (typeof(Clipperz.PM.Components.Panels) == 'undefined') { Clipperz.PM.Components.Panels = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.Panels.MainPanel = function(anElement, args) { | 31 | Clipperz.PM.Components.Panels.MainPanel = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | Clipperz.PM.Components.Panels.MainPanel.superclass.constructor.call(this, anElement, args); | 34 | Clipperz.PM.Components.Panels.MainPanel.superclass.constructor.call(this, anElement, args); |
| 37 | 35 | ||
| 38 | this._recordListDataModel = null; | 36 | this._recordListDataModel = null; |
| 39 | this._selectedRecord = null; | 37 | this._selectedRecord = null; |
| 40 | this._recordDetailComponent = null; | 38 | this._recordDetailComponent = null; |
| 41 | this._recordListGrid = null; | 39 | this._recordListGrid = null; |
| 42 | 40 | ||
| 43 | this._directLinkItemTemplate = null; | 41 | this._directLinkItemTemplate = null; |
| 44 | this._recordItemTemplate = null; | 42 | this._recordItemTemplate = null; |
| 45 | 43 | ||
| 46 | this._addNewRecordButton = null; | 44 | this._addNewRecordButton = null; |
| 47 | this._deleteRecordButton = null; | 45 | this._deleteRecordButton = null; |
| 48 | 46 | ||
| 49 | this._creationWizard = null; | 47 | this._creationWizard = null; |
| 50 | 48 | ||
| 51 | Clipperz.NotificationCenter.register(null, 'selectAndEnterEditMode', this, 'selectRecordAndEnterEditModeHandler'); | 49 | Clipperz.NotificationCenter.register(null, 'selectAndEnterEditMode', this, 'selectRecordAndEnterEditModeHandler'); |
| 52 | 50 | ||
| 53 | Clipperz.NotificationCenter.register(null, 'recordAdded', this, 'recordAddedHandler'); | 51 | Clipperz.NotificationCenter.register(null, 'recordAdded', this, 'recordAddedHandler'); |
| 54 | Clipperz.NotificationCenter.register(null, 'recordUpdated', this, 'recordUpdatedHandler'); | 52 | Clipperz.NotificationCenter.register(null, 'recordUpdated', this, 'recordUpdatedHandler'); |
| 55 | Clipperz.NotificationCenter.register(null, 'recordRemoved', this, 'recordRemovedHandler'); | 53 | Clipperz.NotificationCenter.register(null, 'recordRemoved', this, 'recordRemovedHandler'); |
| 56 | 54 | ||
| 57 | Clipperz.NotificationCenter.register(null, 'directLoginAdded', this, 'directLoginAddedHandler'); | 55 | Clipperz.NotificationCenter.register(null, 'directLoginAdded', this, 'directLoginAddedHandler'); |
| 58 | Clipperz.NotificationCenter.register(null, 'directLoginUpdated', this, 'directLoginUpdatedHandler'); | 56 | Clipperz.NotificationCenter.register(null, 'directLoginUpdated', this, 'directLoginUpdatedHandler'); |
| 59 | Clipperz.NotificationCenter.register(null, 'directLoginRemoved', this, 'directLoginRemovedHandler'); | 57 | Clipperz.NotificationCenter.register(null, 'directLoginRemoved', this, 'directLoginRemovedHandler'); |
| 60 | 58 | ||
| 61 | Clipperz.NotificationCenter.register(null, 'accountLocked', this, 'accountLockedHandler'); | 59 | Clipperz.NotificationCenter.register(null, 'accountLocked', this, 'accountLockedHandler'); |
| 62 | 60 | ||
| 63 | MochiKit.Signal.connect(MochiKit.DOM.currentWindow(), 'onresize', this, 'resizeModalMask'); | 61 | MochiKit.Signal.connect(MochiKit.DOM.currentWindow(), 'onresize', this, 'resizeModalMask'); |
| 64 | this.render(); | 62 | this.render(); |
| 65 | 63 | ||
| 66 | return this; | 64 | return this; |
| 67 | } | 65 | } |
| 68 | 66 | ||
| 69 | //============================================================================= | 67 | //============================================================================= |
| 70 | 68 | ||
| 71 | YAHOO.extendX(Clipperz.PM.Components.Panels.MainPanel, Clipperz.PM.Components.Panels.BasePanel, { | 69 | YAHOO.extendX(Clipperz.PM.Components.Panels.MainPanel, Clipperz.PM.Components.Panels.BasePanel, { |
| 72 | 70 | ||
| 73 | 'toString': function() { | 71 | 'toString': function() { |
| 74 | return "Clipperz.PM.Components.Panels.MainPanel component"; | 72 | return "Clipperz.PM.Components.Panels.MainPanel component"; |
| 75 | }, | 73 | }, |
| 76 | 74 | ||
| 77 | //------------------------------------------------------------------------- | 75 | //------------------------------------------------------------------------- |
| 78 | 76 | ||
| 79 | 'render': function() { | 77 | 'render': function() { |
| 80 | this.element().update(""); | 78 | this.element().update(""); |
| 81 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'table', id:'mainPanelTABLE', border:'0', cellspacing:'0', cellpadding:'0', children:[ | 79 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'table', id:'mainPanelTABLE', border:'0', cellspacing:'0', cellpadding:'0', children:[ |
| 82 | {tag:'tbody', children:[ | 80 | {tag:'tbody', children:[ |
| 83 | {tag:'tr', children:[ | 81 | {tag:'tr', children:[ |
| 84 | {tag:'td', width:'15', children:[ | 82 | {tag:'td', width:'15', children:[ |
| 85 | {tag:'div', cls:'mainPanelMinHeightDiv'} | 83 | {tag:'div', cls:'mainPanelMinHeightDiv'} |
| 86 | ]}, | 84 | ]}, |
| 87 | {tag:'td', valign:'top', id:'directLoginsTD', width:'200', children:[ | 85 | {tag:'td', valign:'top', id:'directLoginsTD', width:'200', children:[ |
| 88 | {tag:'div', id:'directLoginsBlock', children:[ | 86 | {tag:'div', id:'directLoginsBlock', children:[ |
| 89 | {tag:'div', cls:'directLoginsBlockHeaderBox', children:[{tag:'h3', id:'directLoginTitle', htmlString:Clipperz.PM.Strings['mainPanelDirectLoginBlockLabel']}]}, | 87 | {tag:'div', cls:'directLoginsBlockHeaderBox', children:[{tag:'h3', id:'directLoginTitle', htmlString:Clipperz.PM.Strings['mainPanelDirectLoginBlockLabel']}]}, |
| 90 | {tag:'div', id:'directLoginsDescription', htmlString:Clipperz.PM.Strings['mainPanelDirectLoginBlockDescription']}, | 88 | {tag:'div', id:'directLoginsDescription', htmlString:Clipperz.PM.Strings['mainPanelDirectLoginBlockDescription']}, |
| 91 | {tag:'ul', id:'directLogins'} | 89 | {tag:'ul', id:'directLogins'} |
| 92 | ]} | 90 | ]} |
| 93 | ]}, | 91 | ]}, |
| 94 | {tag:'td', width:'15', children:[ | 92 | {tag:'td', width:'15', children:[ |
| 95 | {tag:'div', cls:'mainPanelMinHeightDiv'} | 93 | {tag:'div', cls:'mainPanelMinHeightDiv'} |
| 96 | ]}, | 94 | ]}, |
| 97 | {tag:'td', valign:'top', children:[ | 95 | {tag:'td', valign:'top', children:[ |
| 98 | {tag:'div', id:'mainContent', children:[ | 96 | {tag:'div', id:'mainContent', children:[ |
| 99 | {tag:'div', id:'recordListBlockHeader'}, | 97 | {tag:'div', id:'recordListBlockHeader'}, |
| 100 | {tag:'div', id:'recordListAndDetailBlock', children:[ | 98 | {tag:'div', id:'recordListAndDetailBlock', children:[ |
| 101 | {tag:'table', id:'recordListAndDetailBlockTABLE', border:'0', cellspacing:'0', cellpadding:'0', children:[ | 99 | {tag:'table', id:'recordListAndDetailBlockTABLE', border:'0', cellspacing:'0', cellpadding:'0', children:[ |
| 102 | {tag:'tbody', children:[ | 100 | {tag:'tbody', children:[ |
| 103 | {tag:'tr', children:[ | 101 | {tag:'tr', children:[ |
| 104 | {tag:'td', valign:'top', width:'250', children:[ | 102 | {tag:'td', valign:'top', width:'250', children:[ |
| 105 | {tag:'div', id:'recordListBlock', children:[ | 103 | {tag:'div', id:'recordListBlock', children:[ |
| 106 | {tag:'div', id:'recordListFilterHeader'}, | 104 | {tag:'div', id:'recordListFilterHeader'}, |
| 107 | {tag:'ul', id:'records'} | 105 | {tag:'ul', id:'records'} |
| 108 | ]} | 106 | ]} |
| 109 | ]}, | 107 | ]}, |
| 110 | {tag:'td', id:'recordDetailSeparatorTD', rowspan:'2', valign:'top', bgcolor:'#ddddff', html:' '}, | 108 | {tag:'td', id:'recordDetailSeparatorTD', rowspan:'2', valign:'top', bgcolor:'#ddddff', html:' '}, |
| 111 | {tag:'td', valign:'top', children:[ | 109 | {tag:'td', valign:'top', children:[ |
| 112 | {tag:'div', id:'recordDetailMainBlock', children:[ | 110 | {tag:'div', id:'recordDetailMainBlock', children:[ |
| 113 | {tag:'div', id:'recordTitleTopBlock'}, | 111 | {tag:'div', id:'recordTitleTopBlock'}, |
| 114 | {tag:'div', id:'recordDetailBlock', children:[ | 112 | {tag:'div', id:'recordDetailBlock', children:[ |
| 115 | {tag:'div', id:'recordDetail'} | 113 | {tag:'div', id:'recordDetail'} |
| 116 | ]} | 114 | ]} |
| 117 | ]}, | 115 | ]}, |
| 118 | {tag:'div', id:'recordCreationWizardMainBlock', children:[ | 116 | {tag:'div', id:'recordCreationWizardMainBlock', children:[ |
diff --git a/frontend/beta/js/Clipperz/PM/Components/Panels/ToolsPanel.js b/frontend/beta/js/Clipperz/PM/Components/Panels/ToolsPanel.js index 4f2a015..1c799d0 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Panels/ToolsPanel.js +++ b/frontend/beta/js/Clipperz/PM/Components/Panels/ToolsPanel.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Panels) == 'undefined') { Clipperz.PM.Components.Panels = {}; } | 27 | if (typeof(Clipperz.PM.Components.Panels) == 'undefined') { Clipperz.PM.Components.Panels = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.Panels.ToolsPanel = function(anElement, args) { | 31 | Clipperz.PM.Components.Panels.ToolsPanel = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | Clipperz.PM.Components.Panels.ToolsPanel.superclass.constructor.call(this, anElement, args); | 34 | Clipperz.PM.Components.Panels.ToolsPanel.superclass.constructor.call(this, anElement, args); |
| 37 | 35 | ||
| 38 | this._generateButtonElement = null; | 36 | this._generateButtonElement = null; |
| 39 | this._needsRenderingUponTabSwitch = false; | 37 | this._needsRenderingUponTabSwitch = false; |
| 40 | 38 | ||
| 41 | this.render(); | 39 | this.render(); |
| 42 | 40 | ||
| 43 | return this; | 41 | return this; |
| 44 | } | 42 | } |
| 45 | 43 | ||
| 46 | //============================================================================= | 44 | //============================================================================= |
| 47 | 45 | ||
| 48 | YAHOO.extendX(Clipperz.PM.Components.Panels.ToolsPanel, Clipperz.PM.Components.Panels.BasePanel, { | 46 | YAHOO.extendX(Clipperz.PM.Components.Panels.ToolsPanel, Clipperz.PM.Components.Panels.BasePanel, { |
| 49 | 47 | ||
| 50 | 'toString': function() { | 48 | 'toString': function() { |
| 51 | return "Clipperz.PM.Components.Panels.ToolsPanel component"; | 49 | return "Clipperz.PM.Components.Panels.ToolsPanel component"; |
| 52 | }, | 50 | }, |
| 53 | 51 | ||
| 54 | //------------------------------------------------------------------------- | 52 | //------------------------------------------------------------------------- |
| 55 | 53 | ||
| 56 | 'render': function() { | 54 | 'render': function() { |
| 57 | var bookmarkletUrl; | 55 | var bookmarkletUrl; |
| 58 | 56 | ||
| 59 | //MochiKit.Logging.logDebug(">>> ToolsPanel.render"); | 57 | //MochiKit.Logging.logDebug(">>> ToolsPanel.render"); |
| 60 | Clipperz.NotificationCenter.unregister(this); | 58 | Clipperz.NotificationCenter.unregister(this); |
| 61 | MochiKit.Signal.disconnectAllTo(this); | 59 | MochiKit.Signal.disconnectAllTo(this); |
| 62 | 60 | ||
| 63 | if (Clipperz_IEisBroken == true) { | 61 | if (Clipperz_IEisBroken == true) { |
| 64 | bookmarkletUrl = bookmarklet_ie; | 62 | bookmarkletUrl = bookmarklet_ie; |
| 65 | } else { | 63 | } else { |
| 66 | bookmarkletUrl = bookmarklet; | 64 | bookmarkletUrl = bookmarklet; |
| 67 | } | 65 | } |
| 68 | 66 | ||
| 69 | this.element().update(""); | 67 | this.element().update(""); |
| 70 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'table', border:'0', cellspacing:'0', cellpadding:'0', children:[ | 68 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'table', border:'0', cellspacing:'0', cellpadding:'0', children:[ |
| 71 | {tag:'tbody', children:[ | 69 | {tag:'tbody', children:[ |
| 72 | {tag:'tr', children:[ | 70 | {tag:'tr', children:[ |
| 73 | {tag:'td', valign:'top', width:'200', children:[ | 71 | {tag:'td', valign:'top', width:'200', children:[ |
| 74 | {tag:'ul', id:"dataSubMenu", cls:'subMenu', children:[ | 72 | {tag:'ul', id:"dataSubMenu", cls:'subMenu', children:[ |
| 75 | {tag:'li', id:this.getId('passwordGenerator'), htmlString:Clipperz.PM.Strings['passwordGeneratorTabLabel']}, | 73 | {tag:'li', id:this.getId('passwordGenerator'), htmlString:Clipperz.PM.Strings['passwordGeneratorTabLabel']}, |
| 76 | {tag:'li', id:this.getId('bookmarklet'), htmlString:Clipperz.PM.Strings['bookmarkletTabLabel']}, | 74 | {tag:'li', id:this.getId('bookmarklet'), htmlString:Clipperz.PM.Strings['bookmarkletTabLabel']}, |
| 77 | {tag:'li', id:this.getId('compact'), htmlString:Clipperz.PM.Strings['compactTabLabel']}, | 75 | {tag:'li', id:this.getId('compact'), htmlString:Clipperz.PM.Strings['compactTabLabel']}, |
| 78 | {tag:'li', id:this.getId('httpAuth'), htmlString:Clipperz.PM.Strings['httpAuthTabLabel']} | 76 | {tag:'li', id:this.getId('httpAuth'), htmlString:Clipperz.PM.Strings['httpAuthTabLabel']} |
| 79 | ]} | 77 | ]} |
| 80 | ]}, | 78 | ]}, |
| 81 | {tag:'td', valign:'top', children:[ | 79 | {tag:'td', valign:'top', children:[ |
| 82 | {tag:'ul', cls:'clipperzTabPanels', children:[ | 80 | {tag:'ul', cls:'clipperzTabPanels', children:[ |
| 83 | {tag:'li', id:this.getId('passwordGeneratorPanel'), children:[ | 81 | {tag:'li', id:this.getId('passwordGeneratorPanel'), children:[ |
| 84 | {tag:'div', cls:'clipperzSubPanel', children:[ | 82 | {tag:'div', cls:'clipperzSubPanel', children:[ |
| 85 | {tag:'h5', htmlString:Clipperz.PM.Strings['passwordGeneratorTabTitle']}, | 83 | {tag:'h5', htmlString:Clipperz.PM.Strings['passwordGeneratorTabTitle']}, |
| 86 | {tag:'div', cls:'panelDescription', htmlString:Clipperz.PM.Strings['paswordGeneratorTabDescription']}, | 84 | {tag:'div', cls:'panelDescription', htmlString:Clipperz.PM.Strings['paswordGeneratorTabDescription']}, |
| 87 | 85 | ||
| 88 | //--------------------------------------------------- | 86 | //--------------------------------------------------- |
| 89 | {tag:'div', children:[ | 87 | {tag:'div', children:[ |
| 90 | {tag:'form', id:this.getId('passwordGeneratorForm'), cls:'passwordGenerator', children:[ | 88 | {tag:'form', id:this.getId('passwordGeneratorForm'), cls:'passwordGenerator', children:[ |
| 91 | {tag:'input', type:'text', cls:'clipperz_passwordGenerator_password', id:this.getId('passwordField')}, | 89 | {tag:'input', type:'text', cls:'clipperz_passwordGenerator_password', id:this.getId('passwordField')}, |
| 92 | {tag:'table', children:[ | 90 | {tag:'table', children:[ |
| 93 | {tag:'tbody', children:[ | 91 | {tag:'tbody', children:[ |
| 94 | {tag:'tr', children:[ | 92 | {tag:'tr', children:[ |
| 95 | {tag:'td', width:'20%', children:[ | 93 | {tag:'td', width:'20%', children:[ |
| 96 | {tag:'input', type:'checkbox', name:'lowercase', id:this.getId('lowercase'), checked:true}, | 94 | {tag:'input', type:'checkbox', name:'lowercase', id:this.getId('lowercase'), checked:true}, |
| 97 | {tag:'span', htmlString:Clipperz.PM.Strings['passwordGeneratorLowercaseLabel']} | 95 | {tag:'span', htmlString:Clipperz.PM.Strings['passwordGeneratorLowercaseLabel']} |
| 98 | ]}, | 96 | ]}, |
| 99 | {tag:'td', width:'20%', children:[ | 97 | {tag:'td', width:'20%', children:[ |
| 100 | {tag:'input', type:'checkbox', name:'uppercase', id:this.getId('uppercase'), checked:true}, | 98 | {tag:'input', type:'checkbox', name:'uppercase', id:this.getId('uppercase'), checked:true}, |
| 101 | {tag:'span', htmlString:Clipperz.PM.Strings['passwordGeneratorUppercaseLabel']} | 99 | {tag:'span', htmlString:Clipperz.PM.Strings['passwordGeneratorUppercaseLabel']} |
| 102 | ]}, | 100 | ]}, |
| 103 | {tag:'td', width:'20%', children:[ | 101 | {tag:'td', width:'20%', children:[ |
| 104 | {tag:'input', type:'checkbox', name:'numbers', id:this.getId('numbers'), checked:true}, | 102 | {tag:'input', type:'checkbox', name:'numbers', id:this.getId('numbers'), checked:true}, |
| 105 | {tag:'span', htmlString:Clipperz.PM.Strings['passwordGeneratorNumberLabel']} | 103 | {tag:'span', htmlString:Clipperz.PM.Strings['passwordGeneratorNumberLabel']} |
| 106 | ]}, | 104 | ]}, |
| 107 | {tag:'td', width:'20%', children:[ | 105 | {tag:'td', width:'20%', children:[ |
| 108 | {tag:'input', type:'checkbox', name:'symbols', id:this.getId('symbols'), checked:true}, | 106 | {tag:'input', type:'checkbox', name:'symbols', id:this.getId('symbols'), checked:true}, |
| 109 | {tag:'span', htmlString:Clipperz.PM.Strings['passwordGeneratorSymbolLabel']} | 107 | {tag:'span', htmlString:Clipperz.PM.Strings['passwordGeneratorSymbolLabel']} |
| 110 | ]}, | 108 | ]}, |
| 111 | {tag:'td', width:'20%', children:[ | 109 | {tag:'td', width:'20%', children:[ |
| 112 | {tag:'span', cls:'passwordGeneratorLength', children:[ | 110 | {tag:'span', cls:'passwordGeneratorLength', children:[ |
| 113 | {tag:'span', htmlString:Clipperz.PM.Strings['passwordGeneratorLengthLabel']}, | 111 | {tag:'span', htmlString:Clipperz.PM.Strings['passwordGeneratorLengthLabel']}, |
| 114 | {tag:'span', id:this.getId('passwordLength'), cls:'passwordGeneratorLengthValue', html:'0'} | 112 | {tag:'span', id:this.getId('passwordLength'), cls:'passwordGeneratorLengthValue', html:'0'} |
| 115 | ]} | 113 | ]} |
| 116 | ]} | 114 | ]} |
| 117 | ]} | 115 | ]} |
| 118 | ]} | 116 | ]} |
diff --git a/frontend/beta/js/Clipperz/PM/Components/PasswordEntropyDisplay.js b/frontend/beta/js/Clipperz/PM/Components/PasswordEntropyDisplay.js index 784dce9..b64e0f7 100644 --- a/frontend/beta/js/Clipperz/PM/Components/PasswordEntropyDisplay.js +++ b/frontend/beta/js/Clipperz/PM/Components/PasswordEntropyDisplay.js | |||
| @@ -1,115 +1,113 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | 27 | ||
| 30 | Clipperz.PM.Components.PasswordEntropyDisplay = function(anElement, args) { | 28 | Clipperz.PM.Components.PasswordEntropyDisplay = function(anElement, args) { |
| 31 | args = args || {}; | 29 | args = args || {}; |
| 32 | 30 | ||
| 33 | //MochiKit.Logging.logDebug(">>> new TextFormField"); | 31 | //MochiKit.Logging.logDebug(">>> new TextFormField"); |
| 34 | Clipperz.PM.Components.PasswordEntropyDisplay.superclass.constructor.call(this, anElement, args); | 32 | Clipperz.PM.Components.PasswordEntropyDisplay.superclass.constructor.call(this, anElement, args); |
| 35 | 33 | ||
| 36 | this._wrapperElement = null; | 34 | this._wrapperElement = null; |
| 37 | this._entropyElement = null; | 35 | this._entropyElement = null; |
| 38 | 36 | ||
| 39 | this.render(); | 37 | this.render(); |
| 40 | //MochiKit.Logging.logDebug("<<< new TextFormField"); | 38 | //MochiKit.Logging.logDebug("<<< new TextFormField"); |
| 41 | 39 | ||
| 42 | return this; | 40 | return this; |
| 43 | }; | 41 | }; |
| 44 | 42 | ||
| 45 | YAHOO.extendX(Clipperz.PM.Components.PasswordEntropyDisplay, Clipperz.PM.Components.BaseComponent, { | 43 | YAHOO.extendX(Clipperz.PM.Components.PasswordEntropyDisplay, Clipperz.PM.Components.BaseComponent, { |
| 46 | 44 | ||
| 47 | 'toString': function() { | 45 | 'toString': function() { |
| 48 | return "Clipperz.PM.Components.PasswordEntropyDisplay"; | 46 | return "Clipperz.PM.Components.PasswordEntropyDisplay"; |
| 49 | }, | 47 | }, |
| 50 | 48 | ||
| 51 | //----------------------------------------------------- | 49 | //----------------------------------------------------- |
| 52 | 50 | ||
| 53 | 'wrapperElement': function() { | 51 | 'wrapperElement': function() { |
| 54 | return this._wrapperElement; | 52 | return this._wrapperElement; |
| 55 | }, | 53 | }, |
| 56 | 54 | ||
| 57 | 'setWrapperElement': function(aValue) { | 55 | 'setWrapperElement': function(aValue) { |
| 58 | this._wrapperElement = aValue; | 56 | this._wrapperElement = aValue; |
| 59 | }, | 57 | }, |
| 60 | 58 | ||
| 61 | //----------------------------------------------------- | 59 | //----------------------------------------------------- |
| 62 | 60 | ||
| 63 | 'passwordElement': function() { | 61 | 'passwordElement': function() { |
| 64 | return this.element(); | 62 | return this.element(); |
| 65 | }, | 63 | }, |
| 66 | 64 | ||
| 67 | //----------------------------------------------------- | 65 | //----------------------------------------------------- |
| 68 | 66 | ||
| 69 | 'entropyElement': function() { | 67 | 'entropyElement': function() { |
| 70 | return this._entropyElement; | 68 | return this._entropyElement; |
| 71 | }, | 69 | }, |
| 72 | 70 | ||
| 73 | 'setEntropyElement': function(aValue) { | 71 | 'setEntropyElement': function(aValue) { |
| 74 | this._entropyElement = aValue; | 72 | this._entropyElement = aValue; |
| 75 | }, | 73 | }, |
| 76 | 74 | ||
| 77 | //----------------------------------------------------- | 75 | //----------------------------------------------------- |
| 78 | 76 | ||
| 79 | 'render': function() { | 77 | 'render': function() { |
| 80 | MochiKit.Signal.disconnectAllTo(this); | 78 | MochiKit.Signal.disconnectAllTo(this); |
| 81 | 79 | ||
| 82 | this.setWrapperElement(this.element().wrap({tag:'div'})); | 80 | this.setWrapperElement(this.element().wrap({tag:'div'})); |
| 83 | this.setEntropyElement(Clipperz.YUI.DomHelper.append(this.wrapperElement().dom, {tag:'div', cls:'passwordEntropy', html:" "}, true)); | 81 | this.setEntropyElement(Clipperz.YUI.DomHelper.append(this.wrapperElement().dom, {tag:'div', cls:'passwordEntropy', html:" "}, true)); |
| 84 | 82 | ||
| 85 | // this.entropyElement().setWidth(this.passwordElement().getWidth()); | 83 | // this.entropyElement().setWidth(this.passwordElement().getWidth()); |
| 86 | this.updateEntropyElement(); | 84 | this.updateEntropyElement(); |
| 87 | 85 | ||
| 88 | MochiKit.Signal.connect(this.element().dom, 'onkeyup', this, 'updateEntropyElement'); | 86 | MochiKit.Signal.connect(this.element().dom, 'onkeyup', this, 'updateEntropyElement'); |
| 89 | MochiKit.Signal.connect(this.element().dom, 'onchange', this, 'updateEntropyElement'); | 87 | MochiKit.Signal.connect(this.element().dom, 'onchange', this, 'updateEntropyElement'); |
| 90 | MochiKit.Signal.connect(this.element().dom, 'onblur', this, 'updateEntropyElement'); | 88 | MochiKit.Signal.connect(this.element().dom, 'onblur', this, 'updateEntropyElement'); |
| 91 | }, | 89 | }, |
| 92 | 90 | ||
| 93 | //----------------------------------------------------- | 91 | //----------------------------------------------------- |
| 94 | 92 | ||
| 95 | 'computeEntropyForString': function(aValue) { | 93 | 'computeEntropyForString': function(aValue) { |
| 96 | return Clipperz.PM.Crypto.passwordEntropy(aValue); | 94 | return Clipperz.PM.Crypto.passwordEntropy(aValue); |
| 97 | }, | 95 | }, |
| 98 | 96 | ||
| 99 | //----------------------------------------------------- | 97 | //----------------------------------------------------- |
| 100 | 98 | ||
| 101 | 'updateEntropyElement': function(anEvent) { | 99 | 'updateEntropyElement': function(anEvent) { |
| 102 | //MochiKit.Logging.logDebug(">>> PasswordEntropyDisplay.updateEntropyElement"); | 100 | //MochiKit.Logging.logDebug(">>> PasswordEntropyDisplay.updateEntropyElement"); |
| 103 | varmaxExtent; | 101 | varmaxExtent; |
| 104 | varentropy; | 102 | varentropy; |
| 105 | 103 | ||
| 106 | entropy = Math.min(128, this.computeEntropyForString(this.passwordElement().dom.value)); | 104 | entropy = Math.min(128, this.computeEntropyForString(this.passwordElement().dom.value)); |
| 107 | //MochiKit.Logging.logDebug("--- PasswordEntropyDisplay.updateEntropyElement - entropy: " + entropy); | 105 | //MochiKit.Logging.logDebug("--- PasswordEntropyDisplay.updateEntropyElement - entropy: " + entropy); |
| 108 | this.entropyElement().setStyle('background-position', "0px " + -entropy + "px"); | 106 | this.entropyElement().setStyle('background-position', "0px " + -entropy + "px"); |
| 109 | this.entropyElement().setWidth(this.passwordElement().getWidth() * (entropy/128)); | 107 | this.entropyElement().setWidth(this.passwordElement().getWidth() * (entropy/128)); |
| 110 | //MochiKit.Logging.logDebug("<<< PasswordEntropyDisplay.updateEntropyElement"); | 108 | //MochiKit.Logging.logDebug("<<< PasswordEntropyDisplay.updateEntropyElement"); |
| 111 | }, | 109 | }, |
| 112 | 110 | ||
| 113 | //----------------------------------------------------- | 111 | //----------------------------------------------------- |
| 114 | __syntaxFix__: '__syntaxFix__' | 112 | __syntaxFix__: '__syntaxFix__' |
| 115 | }); | 113 | }); |
diff --git a/frontend/beta/js/Clipperz/PM/Components/PasswordGenerator.js b/frontend/beta/js/Clipperz/PM/Components/PasswordGenerator.js index 87c52b2..67db50a 100644 --- a/frontend/beta/js/Clipperz/PM/Components/PasswordGenerator.js +++ b/frontend/beta/js/Clipperz/PM/Components/PasswordGenerator.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | 27 | ||
| 30 | Clipperz.PM.Components.PasswordGenerator = function(anElement, aFieldValueComponent, args) { | 28 | Clipperz.PM.Components.PasswordGenerator = function(anElement, aFieldValueComponent, args) { |
| 31 | args = args || {}; | 29 | args = args || {}; |
| 32 | 30 | ||
| 33 | //MochiKit.Logging.logDebug(">>> new TextFormField"); | 31 | //MochiKit.Logging.logDebug(">>> new TextFormField"); |
| 34 | Clipperz.PM.Components.PasswordGenerator.superclass.constructor.call(this, anElement, args); | 32 | Clipperz.PM.Components.PasswordGenerator.superclass.constructor.call(this, anElement, args); |
| 35 | 33 | ||
| 36 | this._fieldValueComponent = aFieldValueComponent; | 34 | this._fieldValueComponent = aFieldValueComponent; |
| 37 | this._panelButton = null; | 35 | this._panelButton = null; |
| 38 | this.render(); | 36 | this.render(); |
| 39 | //MochiKit.Logging.logDebug("<<< new TextFormField"); | 37 | //MochiKit.Logging.logDebug("<<< new TextFormField"); |
| 40 | 38 | ||
| 41 | return this; | 39 | return this; |
| 42 | }; | 40 | }; |
| 43 | 41 | ||
| 44 | YAHOO.extendX(Clipperz.PM.Components.PasswordGenerator, Clipperz.PM.Components.BaseComponent, { | 42 | YAHOO.extendX(Clipperz.PM.Components.PasswordGenerator, Clipperz.PM.Components.BaseComponent, { |
| 45 | 43 | ||
| 46 | 'toString': function() { | 44 | 'toString': function() { |
| 47 | return "Clipperz.PM.Components.PasswordGenerator"; | 45 | return "Clipperz.PM.Components.PasswordGenerator"; |
| 48 | }, | 46 | }, |
| 49 | 47 | ||
| 50 | //----------------------------------------------------- | 48 | //----------------------------------------------------- |
| 51 | 49 | ||
| 52 | 'fieldValueComponent': function() { | 50 | 'fieldValueComponent': function() { |
| 53 | return this._fieldValueComponent; | 51 | return this._fieldValueComponent; |
| 54 | }, | 52 | }, |
| 55 | 53 | ||
| 56 | //----------------------------------------------------- | 54 | //----------------------------------------------------- |
| 57 | 55 | ||
| 58 | 'render': function() { | 56 | 'render': function() { |
| 59 | MochiKit.Signal.disconnectAllTo(this); | 57 | MochiKit.Signal.disconnectAllTo(this); |
| 60 | 58 | ||
| 61 | // this._panelButton = new YAHOO.ext.Button(this.element().dom, {text:Clipperz.PM.Strings['passwordGeneratorButtonLabel'], handler:this.openPasswordPanel, scope:this}); | 59 | // this._panelButton = new YAHOO.ext.Button(this.element().dom, {text:Clipperz.PM.Strings['passwordGeneratorButtonLabel'], handler:this.openPasswordPanel, scope:this}); |
| 62 | MochiKit.Signal.connect(this.element().dom, 'onmouseenter', this, 'onMouseEnter'); | 60 | MochiKit.Signal.connect(this.element().dom, 'onmouseenter', this, 'onMouseEnter'); |
| 63 | MochiKit.Signal.connect(this.element().dom, 'onmouseleave', this, 'onMouseLeave'); | 61 | MochiKit.Signal.connect(this.element().dom, 'onmouseleave', this, 'onMouseLeave'); |
| 64 | MochiKit.Signal.connect(this.element().dom, 'onclick', this, 'openPasswordPanel'); | 62 | MochiKit.Signal.connect(this.element().dom, 'onclick', this, 'openPasswordPanel'); |
| 65 | }, | 63 | }, |
| 66 | 64 | ||
| 67 | //----------------------------------------------------- | 65 | //----------------------------------------------------- |
| 68 | 66 | ||
| 69 | 'onMouseEnter': function() { | 67 | 'onMouseEnter': function() { |
| 70 | this.element().addClass('hover'); | 68 | this.element().addClass('hover'); |
| 71 | }, | 69 | }, |
| 72 | 70 | ||
| 73 | 'onMouseLeave': function() { | 71 | 'onMouseLeave': function() { |
| 74 | this.element().removeClass('hover'); | 72 | this.element().removeClass('hover'); |
| 75 | }, | 73 | }, |
| 76 | 74 | ||
| 77 | //----------------------------------------------------- | 75 | //----------------------------------------------------- |
| 78 | 76 | ||
| 79 | 'panelButton': function() { | 77 | 'panelButton': function() { |
| 80 | return this._panelButton; | 78 | return this._panelButton; |
| 81 | }, | 79 | }, |
| 82 | 80 | ||
| 83 | //----------------------------------------------------- | 81 | //----------------------------------------------------- |
| 84 | 82 | ||
| 85 | 'openPasswordPanel': function() { | 83 | 'openPasswordPanel': function() { |
| 86 | var passwordGeneratorElement; | 84 | var passwordGeneratorElement; |
| 87 | var passwordGeneratorDialog; | 85 | var passwordGeneratorDialog; |
| 88 | var cancelButton; | 86 | var cancelButton; |
| 89 | var okButton; | 87 | var okButton; |
| 90 | var cancelFunction; | 88 | var cancelFunction; |
| 91 | var okFunction; | 89 | var okFunction; |
| 92 | 90 | ||
| 93 | //MochiKit.Logging.logDebug(">>> PasswordGenerator.openPasswordPanel"); | 91 | //MochiKit.Logging.logDebug(">>> PasswordGenerator.openPasswordPanel"); |
| 94 | passwordGeneratorElement = Clipperz.YUI.DomHelper.append(document.body, {tag:'div', id:'passwordGenerator', children:[ | 92 | passwordGeneratorElement = Clipperz.YUI.DomHelper.append(document.body, {tag:'div', id:'passwordGenerator', children:[ |
| 95 | {tag:'div', cls:'ydlg-hd', htmlString:Clipperz.PM.Strings['passwordGeneratorPanelTitle']}, | 93 | {tag:'div', cls:'ydlg-hd', htmlString:Clipperz.PM.Strings['passwordGeneratorPanelTitle']}, |
| 96 | {tag:'div', cls:'ydlg-bd', children:[ | 94 | {tag:'div', cls:'ydlg-bd', children:[ |
| 97 | {tag:'form', id:this.getId('passwordGeneratorForm'), cls:'passwordGenerator', children:[ | 95 | {tag:'form', id:this.getId('passwordGeneratorForm'), cls:'passwordGenerator', children:[ |
| 98 | {tag:'input', type:'text', cls:'clipperz_passwordGenerator_password', id:this.getId('passwordField')}, | 96 | {tag:'input', type:'text', cls:'clipperz_passwordGenerator_password', id:this.getId('passwordField')}, |
| 99 | {tag:'table', children:[ | 97 | {tag:'table', children:[ |
| 100 | {tag:'tbody', children:[ | 98 | {tag:'tbody', children:[ |
| 101 | {tag:'tr', children:[ | 99 | {tag:'tr', children:[ |
| 102 | {tag:'td', width:'20%', children:[ | 100 | {tag:'td', width:'20%', children:[ |
| 103 | {tag:'input', type:'checkbox', name:'lowercase', id:this.getId('lowercase'), checked:true}, | 101 | {tag:'input', type:'checkbox', name:'lowercase', id:this.getId('lowercase'), checked:true}, |
| 104 | {tag:'span', htmlString:Clipperz.PM.Strings['passwordGeneratorLowercaseLabel']} | 102 | {tag:'span', htmlString:Clipperz.PM.Strings['passwordGeneratorLowercaseLabel']} |
| 105 | ]}, | 103 | ]}, |
| 106 | {tag:'td', width:'20%', children:[ | 104 | {tag:'td', width:'20%', children:[ |
| 107 | {tag:'input', type:'checkbox', name:'uppercase', id:this.getId('uppercase'), checked:true}, | 105 | {tag:'input', type:'checkbox', name:'uppercase', id:this.getId('uppercase'), checked:true}, |
| 108 | {tag:'span', htmlString:Clipperz.PM.Strings['passwordGeneratorUppercaseLabel']} | 106 | {tag:'span', htmlString:Clipperz.PM.Strings['passwordGeneratorUppercaseLabel']} |
| 109 | ]}, | 107 | ]}, |
| 110 | {tag:'td', width:'20%', children:[ | 108 | {tag:'td', width:'20%', children:[ |
| 111 | {tag:'input', type:'checkbox', name:'numbers', id:this.getId('numbers'), checked:true}, | 109 | {tag:'input', type:'checkbox', name:'numbers', id:this.getId('numbers'), checked:true}, |
| 112 | {tag:'span', htmlString:Clipperz.PM.Strings['passwordGeneratorNumberLabel']} | 110 | {tag:'span', htmlString:Clipperz.PM.Strings['passwordGeneratorNumberLabel']} |
| 113 | ]}, | 111 | ]}, |
| 114 | {tag:'td', width:'20%', children:[ | 112 | {tag:'td', width:'20%', children:[ |
| 115 | {tag:'input', type:'checkbox', name:'symbols', id:this.getId('symbols'), checked:true}, | 113 | {tag:'input', type:'checkbox', name:'symbols', id:this.getId('symbols'), checked:true}, |
| 116 | {tag:'span', htmlString:Clipperz.PM.Strings['passwordGeneratorSymbolLabel']} | 114 | {tag:'span', htmlString:Clipperz.PM.Strings['passwordGeneratorSymbolLabel']} |
| 117 | ]}, | 115 | ]}, |
| 118 | {tag:'td', width:'20%', children:[ | 116 | {tag:'td', width:'20%', children:[ |
diff --git a/frontend/beta/js/Clipperz/PM/Components/Printing/Footer.js b/frontend/beta/js/Clipperz/PM/Components/Printing/Footer.js index b3debad..821dc94 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Printing/Footer.js +++ b/frontend/beta/js/Clipperz/PM/Components/Printing/Footer.js | |||
| @@ -1,25 +1,23 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
diff --git a/frontend/beta/js/Clipperz/PM/Components/Printing/Header.js b/frontend/beta/js/Clipperz/PM/Components/Printing/Header.js index b3debad..821dc94 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Printing/Header.js +++ b/frontend/beta/js/Clipperz/PM/Components/Printing/Header.js | |||
| @@ -1,25 +1,23 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
diff --git a/frontend/beta/js/Clipperz/PM/Components/Printing/Record.js b/frontend/beta/js/Clipperz/PM/Components/Printing/Record.js index 5f5c29f..170bd09 100644 --- a/frontend/beta/js/Clipperz/PM/Components/Printing/Record.js +++ b/frontend/beta/js/Clipperz/PM/Components/Printing/Record.js | |||
| @@ -1,92 +1,90 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.Printing) == 'undefined') { Clipperz.PM.Components.Printing = {}; } | 27 | if (typeof(Clipperz.PM.Components.Printing) == 'undefined') { Clipperz.PM.Components.Printing = {}; } |
| 30 | 28 | ||
| 31 | Clipperz.PM.Components.Printing.Record = function(args) { | 29 | Clipperz.PM.Components.Printing.Record = function(args) { |
| 32 | args = args || {}; | 30 | args = args || {}; |
| 33 | 31 | ||
| 34 | this._record = args['record']; | 32 | this._record = args['record']; |
| 35 | 33 | ||
| 36 | return this; | 34 | return this; |
| 37 | } | 35 | } |
| 38 | 36 | ||
| 39 | MochiKit.Base.update(Clipperz.PM.Components.Printing.Record.prototype, { | 37 | MochiKit.Base.update(Clipperz.PM.Components.Printing.Record.prototype, { |
| 40 | 38 | ||
| 41 | 'record': function() { | 39 | 'record': function() { |
| 42 | return this._record; | 40 | return this._record; |
| 43 | }, | 41 | }, |
| 44 | 42 | ||
| 45 | //------------------------------------------------------------------------- | 43 | //------------------------------------------------------------------------- |
| 46 | 44 | ||
| 47 | 'deferredDrawToWindow': function(aWindow) { | 45 | 'deferredDrawToWindow': function(aWindow) { |
| 48 | vardeferredResult; | 46 | vardeferredResult; |
| 49 | 47 | ||
| 50 | deferredResult = new MochiKit.Async.Deferred(); | 48 | deferredResult = new MochiKit.Async.Deferred(); |
| 51 | deferredResult.addCallback(MochiKit.Base.method(this.record(), 'deferredData')); | 49 | deferredResult.addCallback(MochiKit.Base.method(this.record(), 'deferredData')); |
| 52 | deferredResult.addCallback(MochiKit.Base.method(this, 'appendToWindow', aWindow)); | 50 | deferredResult.addCallback(MochiKit.Base.method(this, 'appendToWindow', aWindow)); |
| 53 | deferredResult.callback(); | 51 | deferredResult.callback(); |
| 54 | return deferredResult; | 52 | return deferredResult; |
| 55 | }, | 53 | }, |
| 56 | 54 | ||
| 57 | //------------------------------------------------------------------------- | 55 | //------------------------------------------------------------------------- |
| 58 | 56 | ||
| 59 | 'appendToWindow': function(aWindow) { | 57 | 'appendToWindow': function(aWindow) { |
| 60 | MochiKit.DOM.withWindow(aWindow, MochiKit.Base.bind(function() { | 58 | MochiKit.DOM.withWindow(aWindow, MochiKit.Base.bind(function() { |
| 61 | var newBlock; | 59 | var newBlock; |
| 62 | var fields; | 60 | var fields; |
| 63 | 61 | ||
| 64 | fields = MochiKit.Base.concat( | 62 | fields = MochiKit.Base.concat( |
| 65 | MochiKit.Base.map(MochiKit.Base.bind(function(aField) { | 63 | MochiKit.Base.map(MochiKit.Base.bind(function(aField) { |
| 66 | var result; | 64 | var result; |
| 67 | var dt, dd; | 65 | var dt, dd; |
| 68 | var label, value; | 66 | var label, value; |
| 69 | 67 | ||
| 70 | label = aField.label(); | 68 | label = aField.label(); |
| 71 | value = aField.value(); | 69 | value = aField.value(); |
| 72 | dt = MochiKit.DOM.createDOM('DT', null, label); | 70 | dt = MochiKit.DOM.createDOM('DT', null, label); |
| 73 | dd = MochiKit.DOM.createDOM('DD', null, value) | 71 | dd = MochiKit.DOM.createDOM('DD', null, value) |
| 74 | result = [dt, dd]; | 72 | result = [dt, dd]; |
| 75 | 73 | ||
| 76 | return result | 74 | return result |
| 77 | }, this), MochiKit.Base.values(this.record().currentVersion().fields())) | 75 | }, this), MochiKit.Base.values(this.record().currentVersion().fields())) |
| 78 | ); | 76 | ); |
| 79 | 77 | ||
| 80 | newBlock = MochiKit.DOM.DIV({'class': 'recordBlock'}, | 78 | newBlock = MochiKit.DOM.DIV({'class': 'recordBlock'}, |
| 81 | MochiKit.DOM.H2(null, this.record().label()), | 79 | MochiKit.DOM.H2(null, this.record().label()), |
| 82 | MochiKit.DOM.DIV({'class': 'recordNotes'}, MochiKit.Base.map(MochiKit.Base.partial(MochiKit.DOM.P, null), this.record().notes().split("\n"))), | 80 | MochiKit.DOM.DIV({'class': 'recordNotes'}, MochiKit.Base.map(MochiKit.Base.partial(MochiKit.DOM.P, null), this.record().notes().split("\n"))), |
| 83 | MochiKit.DOM.createDOM('DL', null, fields) | 81 | MochiKit.DOM.createDOM('DL', null, fields) |
| 84 | ); | 82 | ); |
| 85 | MochiKit.DOM.appendChildNodes(MochiKit.DOM.currentDocument().body, newBlock); | 83 | MochiKit.DOM.appendChildNodes(MochiKit.DOM.currentDocument().body, newBlock); |
| 86 | 84 | ||
| 87 | }, this)); | 85 | }, this)); |
| 88 | }, | 86 | }, |
| 89 | 87 | ||
| 90 | //------------------------------------------------------------------------- | 88 | //------------------------------------------------------------------------- |
| 91 | __syntaxFix__: "syntax fix" | 89 | __syntaxFix__: "syntax fix" |
| 92 | }); | 90 | }); |
diff --git a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/AbstractComponent.js b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/AbstractComponent.js index 5b50284..d6fde5c 100644 --- a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/AbstractComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/AbstractComponent.js | |||
| @@ -1,102 +1,100 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } | 27 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.RecordDetail.AbstractComponent = function(anElement, args) { | 31 | Clipperz.PM.Components.RecordDetail.AbstractComponent = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | Clipperz.PM.Components.RecordDetail.AbstractComponent.superclass.constructor.call(this, args); | 34 | Clipperz.PM.Components.RecordDetail.AbstractComponent.superclass.constructor.call(this, args); |
| 37 | 35 | ||
| 38 | this._element = anElement; | 36 | this._element = anElement; |
| 39 | this._mainComponent = args.mainComponent; | 37 | this._mainComponent = args.mainComponent; |
| 40 | 38 | ||
| 41 | return this; | 39 | return this; |
| 42 | } | 40 | } |
| 43 | 41 | ||
| 44 | //============================================================================= | 42 | //============================================================================= |
| 45 | 43 | ||
| 46 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.AbstractComponent, Clipperz.PM.Components.BaseComponent, { | 44 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.AbstractComponent, Clipperz.PM.Components.BaseComponent, { |
| 47 | 45 | ||
| 48 | 'toString': function() { | 46 | 'toString': function() { |
| 49 | return "Clipperz.PM.Components.RecordDetail.AbstractComponent"; | 47 | return "Clipperz.PM.Components.RecordDetail.AbstractComponent"; |
| 50 | }, | 48 | }, |
| 51 | 49 | ||
| 52 | //------------------------------------------------------------------------- | 50 | //------------------------------------------------------------------------- |
| 53 | 51 | ||
| 54 | 'mainComponent': function() { | 52 | 'mainComponent': function() { |
| 55 | return this._mainComponent; | 53 | return this._mainComponent; |
| 56 | }, | 54 | }, |
| 57 | 55 | ||
| 58 | //------------------------------------------------------------------------- | 56 | //------------------------------------------------------------------------- |
| 59 | 57 | ||
| 60 | 'record': function() { | 58 | 'record': function() { |
| 61 | return this.mainComponent().record(); | 59 | return this.mainComponent().record(); |
| 62 | }, | 60 | }, |
| 63 | 61 | ||
| 64 | //------------------------------------------------------------------------- | 62 | //------------------------------------------------------------------------- |
| 65 | 63 | ||
| 66 | 'editMode': function() { | 64 | 'editMode': function() { |
| 67 | return this.mainComponent().editMode(); | 65 | return this.mainComponent().editMode(); |
| 68 | }, | 66 | }, |
| 69 | 67 | ||
| 70 | //------------------------------------------------------------------------- | 68 | //------------------------------------------------------------------------- |
| 71 | 69 | ||
| 72 | 'render': function() { | 70 | 'render': function() { |
| 73 | this.element().update(""); | 71 | this.element().update(""); |
| 74 | this.update(); | 72 | this.update(); |
| 75 | }, | 73 | }, |
| 76 | 74 | ||
| 77 | //------------------------------------------------------------------------- | 75 | //------------------------------------------------------------------------- |
| 78 | 76 | ||
| 79 | 'update': function(anEvent) { | 77 | 'update': function(anEvent) { |
| 80 | if (this.editMode() == 'EDIT') { | 78 | if (this.editMode() == 'EDIT') { |
| 81 | this.updateEditMode(); | 79 | this.updateEditMode(); |
| 82 | } else if (this.editMode() == 'VIEW') { | 80 | } else if (this.editMode() == 'VIEW') { |
| 83 | this.updateViewMode(); | 81 | this.updateViewMode(); |
| 84 | } | 82 | } |
| 85 | }, | 83 | }, |
| 86 | 84 | ||
| 87 | //------------------------------------------------------------------------- | 85 | //------------------------------------------------------------------------- |
| 88 | 86 | ||
| 89 | 'updateViewMode': function() {}, | 87 | 'updateViewMode': function() {}, |
| 90 | 'updateEditMode': function() {}, | 88 | 'updateEditMode': function() {}, |
| 91 | 'synchronizeComponentValues': function() {}, | 89 | 'synchronizeComponentValues': function() {}, |
| 92 | 90 | ||
| 93 | //------------------------------------------------------------------------- | 91 | //------------------------------------------------------------------------- |
| 94 | 92 | ||
| 95 | 'destroy': function() { | 93 | 'destroy': function() { |
| 96 | this.element().remove(); | 94 | this.element().remove(); |
| 97 | }, | 95 | }, |
| 98 | 96 | ||
| 99 | //------------------------------------------------------------------------- | 97 | //------------------------------------------------------------------------- |
| 100 | __syntaxFix__: "syntax fix" | 98 | __syntaxFix__: "syntax fix" |
| 101 | }); | 99 | }); |
| 102 | 100 | ||
diff --git a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/AbstractFieldSubComponent.js b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/AbstractFieldSubComponent.js index ad733aa..ede42c2 100644 --- a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/AbstractFieldSubComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/AbstractFieldSubComponent.js | |||
| @@ -1,74 +1,72 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } | 27 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.RecordDetail.AbstractFieldSubComponent = function(anElement, args) { | 31 | Clipperz.PM.Components.RecordDetail.AbstractFieldSubComponent = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | Clipperz.PM.Components.RecordDetail.AbstractFieldSubComponent.superclass.constructor.call(this, anElement, args); | 34 | Clipperz.PM.Components.RecordDetail.AbstractFieldSubComponent.superclass.constructor.call(this, anElement, args); |
| 37 | 35 | ||
| 38 | this._fieldComponent = args.fieldComponent || null; | 36 | this._fieldComponent = args.fieldComponent || null; |
| 39 | 37 | ||
| 40 | this.render(); | 38 | this.render(); |
| 41 | 39 | ||
| 42 | return this; | 40 | return this; |
| 43 | } | 41 | } |
| 44 | 42 | ||
| 45 | //============================================================================= | 43 | //============================================================================= |
| 46 | 44 | ||
| 47 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.AbstractFieldSubComponent, Clipperz.PM.Components.RecordDetail.AbstractComponent, { | 45 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.AbstractFieldSubComponent, Clipperz.PM.Components.RecordDetail.AbstractComponent, { |
| 48 | 46 | ||
| 49 | 'toString': function() { | 47 | 'toString': function() { |
| 50 | return "Clipperz.PM.Components.RecordDetail.AbstractFieldSubComponent"; | 48 | return "Clipperz.PM.Components.RecordDetail.AbstractFieldSubComponent"; |
| 51 | }, | 49 | }, |
| 52 | 50 | ||
| 53 | //------------------------------------------------------------------------- | 51 | //------------------------------------------------------------------------- |
| 54 | 52 | ||
| 55 | 'fieldComponent': function() { | 53 | 'fieldComponent': function() { |
| 56 | return this._fieldComponent; | 54 | return this._fieldComponent; |
| 57 | }, | 55 | }, |
| 58 | 56 | ||
| 59 | //------------------------------------------------------------------------- | 57 | //------------------------------------------------------------------------- |
| 60 | 58 | ||
| 61 | 'mainComponent': function() { | 59 | 'mainComponent': function() { |
| 62 | return this.fieldComponent().mainComponent(); | 60 | return this.fieldComponent().mainComponent(); |
| 63 | }, | 61 | }, |
| 64 | 62 | ||
| 65 | //------------------------------------------------------------------------- | 63 | //------------------------------------------------------------------------- |
| 66 | 64 | ||
| 67 | 'recordField': function() { | 65 | 'recordField': function() { |
| 68 | return this.fieldComponent().recordField(); | 66 | return this.fieldComponent().recordField(); |
| 69 | }, | 67 | }, |
| 70 | 68 | ||
| 71 | //------------------------------------------------------------------------- | 69 | //------------------------------------------------------------------------- |
| 72 | __syntaxFix__: "syntax fix" | 70 | __syntaxFix__: "syntax fix" |
| 73 | }); | 71 | }); |
| 74 | 72 | ||
diff --git a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/CreationWizard.js b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/CreationWizard.js index d4c7837..c703db4 100644 --- a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/CreationWizard.js +++ b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/CreationWizard.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } | 27 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.RecordDetail.CreationWizard = function(anElement, args) { | 31 | Clipperz.PM.Components.RecordDetail.CreationWizard = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | Clipperz.PM.Components.RecordDetail.CreationWizard.superclass.constructor.call(this, anElement, args); | 34 | Clipperz.PM.Components.RecordDetail.CreationWizard.superclass.constructor.call(this, anElement, args); |
| 37 | 35 | ||
| 38 | this._mainComponent = args.mainComponent; | 36 | this._mainComponent = args.mainComponent; |
| 39 | this._previouslySelectedRecord = args.previouslySelectedRecord; | 37 | this._previouslySelectedRecord = args.previouslySelectedRecord; |
| 40 | //MochiKit.Logging.logDebug("--- new CreationWizard - previouslySelectedRecord: " + args.previouslySelectedRecord); | 38 | //MochiKit.Logging.logDebug("--- new CreationWizard - previouslySelectedRecord: " + args.previouslySelectedRecord); |
| 41 | this._createButton_header = null; | 39 | this._createButton_header = null; |
| 42 | this._createButton_footer = null; | 40 | this._createButton_footer = null; |
| 43 | 41 | ||
| 44 | this._cancelButton_header = null; | 42 | this._cancelButton_header = null; |
| 45 | this._cancelButton_footer = null; | 43 | this._cancelButton_footer = null; |
| 46 | 44 | ||
| 47 | this.render(); | 45 | this.render(); |
| 48 | 46 | ||
| 49 | return this; | 47 | return this; |
| 50 | } | 48 | } |
| 51 | 49 | ||
| 52 | //============================================================================= | 50 | //============================================================================= |
| 53 | 51 | ||
| 54 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.CreationWizard, Clipperz.PM.Components.BaseComponent, { | 52 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.CreationWizard, Clipperz.PM.Components.BaseComponent, { |
| 55 | 53 | ||
| 56 | 'toString': function() { | 54 | 'toString': function() { |
| 57 | return "Clipperz.PM.Components.RecordDetail.CreationWizard component"; | 55 | return "Clipperz.PM.Components.RecordDetail.CreationWizard component"; |
| 58 | }, | 56 | }, |
| 59 | 57 | ||
| 60 | //------------------------------------------------------------------------- | 58 | //------------------------------------------------------------------------- |
| 61 | 59 | ||
| 62 | 'previouslySelectedRecord': function() { | 60 | 'previouslySelectedRecord': function() { |
| 63 | return this._previouslySelectedRecord; | 61 | return this._previouslySelectedRecord; |
| 64 | }, | 62 | }, |
| 65 | 63 | ||
| 66 | //------------------------------------------------------------------------- | 64 | //------------------------------------------------------------------------- |
| 67 | 65 | ||
| 68 | 'render': function() { | 66 | 'render': function() { |
| 69 | vartemplateListElement; | 67 | vartemplateListElement; |
| 70 | vartemplates; | 68 | vartemplates; |
| 71 | 69 | ||
| 72 | this.element().update(""); | 70 | this.element().update(""); |
| 73 | 71 | ||
| 74 | Clipperz.YUI.DomHelper.append(this.element().dom, | 72 | Clipperz.YUI.DomHelper.append(this.element().dom, |
| 75 | {tag:'form', cls:'recordDataFORM', id:this.getId('form'), children:[ | 73 | {tag:'form', cls:'recordDataFORM', id:this.getId('form'), children:[ |
| 76 | {tag:'div', id:'recordDetailDataBox', cls:'recordDetailDataBox', children:[ | 74 | {tag:'div', id:'recordDetailDataBox', cls:'recordDetailDataBox', children:[ |
| 77 | {tag:'div', id:this.getId('wizardBox'), cls:'recordCreationWizard', children:[ | 75 | {tag:'div', id:this.getId('wizardBox'), cls:'recordCreationWizard', children:[ |
| 78 | {tag:'div', id:this.getId('recordCreationWizardTitleBox'), cls:'recordCreationWizardTitleBox', htmlString:Clipperz.PM.Strings['newRecordWizardTitleBox']}, | 76 | {tag:'div', id:this.getId('recordCreationWizardTitleBox'), cls:'recordCreationWizardTitleBox', htmlString:Clipperz.PM.Strings['newRecordWizardTitleBox']}, |
| 79 | {tag:'ul', id:this.getId('templateList'), cls:'radioList'} | 77 | {tag:'ul', id:this.getId('templateList'), cls:'radioList'} |
| 80 | ]} | 78 | ]} |
| 81 | ]} | 79 | ]} |
| 82 | ]} | 80 | ]} |
| 83 | ); | 81 | ); |
| 84 | 82 | ||
| 85 | Clipperz.YUI.DomHelper.append(this.getDom('recordCreationWizardTitleBox'), {tag:'div', cls:'newRecordWizardHeader', children:[ | 83 | Clipperz.YUI.DomHelper.append(this.getDom('recordCreationWizardTitleBox'), {tag:'div', cls:'newRecordWizardHeader', children:[ |
| 86 | {tag:'table', width:'100%', cellpadding:'5', children:[ | 84 | {tag:'table', width:'100%', cellpadding:'5', children:[ |
| 87 | {tag:'tbody', children:[ | 85 | {tag:'tbody', children:[ |
| 88 | {tag:'tr', children:[ | 86 | {tag:'tr', children:[ |
| 89 | {tag:'td', width:'49%', align:'right', children:[ | 87 | {tag:'td', width:'49%', align:'right', children:[ |
| 90 | {tag:'div', id:this.getId('cancelButton_header')} | 88 | {tag:'div', id:this.getId('cancelButton_header')} |
| 91 | ]}, | 89 | ]}, |
| 92 | {tag:'td', width:'10', html:' '}, | 90 | {tag:'td', width:'10', html:' '}, |
| 93 | {tag:'td', width:'49%', align:'left', children:[ | 91 | {tag:'td', width:'49%', align:'left', children:[ |
| 94 | {tag:'div', id:this.getId('createButton_header')} | 92 | {tag:'div', id:this.getId('createButton_header')} |
| 95 | ]} | 93 | ]} |
| 96 | ]} | 94 | ]} |
| 97 | ]} | 95 | ]} |
| 98 | ]} | 96 | ]} |
| 99 | ]}); | 97 | ]}); |
| 100 | 98 | ||
| 101 | templateListElement = this.getElement('templateList'); | 99 | templateListElement = this.getElement('templateList'); |
| 102 | templates = Clipperz.PM.Strings['recordTemplates']; | 100 | templates = Clipperz.PM.Strings['recordTemplates']; |
| 103 | MochiKit.Iter.forEach(MochiKit.Base.keys(templates), MochiKit.Base.bind(function(aTemplateKey) { | 101 | MochiKit.Iter.forEach(MochiKit.Base.keys(templates), MochiKit.Base.bind(function(aTemplateKey) { |
| 104 | Clipperz.YUI.DomHelper.append(templateListElement.dom, {tag:'li', children:[ | 102 | Clipperz.YUI.DomHelper.append(templateListElement.dom, {tag:'li', children:[ |
| 105 | {tag:'table', children:[ | 103 | {tag:'table', children:[ |
| 106 | {tag:'tbody', children:[ | 104 | {tag:'tbody', children:[ |
| 107 | {tag:'tr', children:[ | 105 | {tag:'tr', children:[ |
| 108 | {tag:'td', valign:'top', children:[ | 106 | {tag:'td', valign:'top', children:[ |
| 109 | {tag:'input', id:this.getId(aTemplateKey+"_radio"), type:'radio', name:'recordTemplate', value:"aTemplateKey"} | 107 | {tag:'input', id:this.getId(aTemplateKey+"_radio"), type:'radio', name:'recordTemplate', value:"aTemplateKey"} |
| 110 | ]}, | 108 | ]}, |
| 111 | {tag:'td', valign:'top', children:[ | 109 | {tag:'td', valign:'top', children:[ |
| 112 | {tag:'h4', id:this.getId(aTemplateKey+"_title"), html:templates[aTemplateKey]['title']}, | 110 | {tag:'h4', id:this.getId(aTemplateKey+"_title"), html:templates[aTemplateKey]['title']}, |
| 113 | {tag:'div', cls:'templateDescription', htmlString:templates[aTemplateKey]['description']} | 111 | {tag:'div', cls:'templateDescription', htmlString:templates[aTemplateKey]['description']} |
| 114 | ]} | 112 | ]} |
| 115 | ]} | 113 | ]} |
| 116 | ]} | 114 | ]} |
| 117 | ]} | 115 | ]} |
| 118 | ]}); | 116 | ]}); |
diff --git a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/DirectLoginBindingComponent.js b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/DirectLoginBindingComponent.js index 36dd9a8..0e4640e 100644 --- a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/DirectLoginBindingComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/DirectLoginBindingComponent.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } | 27 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.RecordDetail.DirectLoginBindingComponent = function(anElement, args) { | 31 | Clipperz.PM.Components.RecordDetail.DirectLoginBindingComponent = function(anElement, args) { |
| 34 | //MochiKit.Logging.logDebug(">>> new DirectLoginBindingComponent"); | 32 | //MochiKit.Logging.logDebug(">>> new DirectLoginBindingComponent"); |
| 35 | args = args || {}; | 33 | args = args || {}; |
| 36 | 34 | ||
| 37 | Clipperz.PM.Components.RecordDetail.DirectLoginBindingComponent.superclass.constructor.call(this, anElement, args); | 35 | Clipperz.PM.Components.RecordDetail.DirectLoginBindingComponent.superclass.constructor.call(this, anElement, args); |
| 38 | 36 | ||
| 39 | this._directLoginBinding = args.directLoginBinding || null; | 37 | this._directLoginBinding = args.directLoginBinding || null; |
| 40 | this.render(); | 38 | this.render(); |
| 41 | 39 | ||
| 42 | Clipperz.NotificationCenter.register(this.record(), 'addNewRecordField',this, 'syncAndUpdateEditMode'); | 40 | Clipperz.NotificationCenter.register(this.record(), 'addNewRecordField',this, 'syncAndUpdateEditMode'); |
| 43 | Clipperz.NotificationCenter.register(this.record(), 'removedField', this, 'syncAndUpdateEditMode'); | 41 | Clipperz.NotificationCenter.register(this.record(), 'removedField', this, 'syncAndUpdateEditMode'); |
| 44 | Clipperz.NotificationCenter.register(this.record(), 'updatedFieldLabel',this, 'syncAndUpdateEditMode'); | 42 | Clipperz.NotificationCenter.register(this.record(), 'updatedFieldLabel',this, 'syncAndUpdateEditMode'); |
| 45 | //MochiKit.Logging.logDebug("<<< new DirectLoginBindingComponent"); | 43 | //MochiKit.Logging.logDebug("<<< new DirectLoginBindingComponent"); |
| 46 | 44 | ||
| 47 | return this; | 45 | return this; |
| 48 | } | 46 | } |
| 49 | 47 | ||
| 50 | //============================================================================= | 48 | //============================================================================= |
| 51 | 49 | ||
| 52 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.DirectLoginBindingComponent, Clipperz.PM.Components.RecordDetail.AbstractComponent, { | 50 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.DirectLoginBindingComponent, Clipperz.PM.Components.RecordDetail.AbstractComponent, { |
| 53 | 51 | ||
| 54 | 'toString': function() { | 52 | 'toString': function() { |
| 55 | return "Clipperz.PM.Components.RecordDetail.DirectLoginBindingComponent component"; | 53 | return "Clipperz.PM.Components.RecordDetail.DirectLoginBindingComponent component"; |
| 56 | }, | 54 | }, |
| 57 | 55 | ||
| 58 | //------------------------------------------------------------------------- | 56 | //------------------------------------------------------------------------- |
| 59 | 57 | ||
| 60 | 'directLoginBinding': function() { | 58 | 'directLoginBinding': function() { |
| 61 | return this._directLoginBinding; | 59 | return this._directLoginBinding; |
| 62 | }, | 60 | }, |
| 63 | 61 | ||
| 64 | //------------------------------------------------------------------------- | 62 | //------------------------------------------------------------------------- |
| 65 | 63 | ||
| 66 | 'render': function() { | 64 | 'render': function() { |
| 67 | // Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'span', style:'font-weight:bold;', html:this.directLoginBinding().key()}) | 65 | // Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'span', style:'font-weight:bold;', html:this.directLoginBinding().key()}) |
| 68 | // Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'span', html:this.directLoginBinding().value()}) | 66 | // Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'span', html:this.directLoginBinding().value()}) |
| 69 | //MochiKit.Logging.logDebug(">>> DirectLoginBindingComponent.render"); | 67 | //MochiKit.Logging.logDebug(">>> DirectLoginBindingComponent.render"); |
| 70 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'td', cls:'directLoginBindingLabelTD', children:[ | 68 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'td', cls:'directLoginBindingLabelTD', children:[ |
| 71 | {tag:'span', html:this.directLoginBinding().key()} | 69 | {tag:'span', html:this.directLoginBinding().key()} |
| 72 | ]}); | 70 | ]}); |
| 73 | //MochiKit.Logging.logDebug("--- DirectLoginBindingComponent.render - 1"); | 71 | //MochiKit.Logging.logDebug("--- DirectLoginBindingComponent.render - 1"); |
| 74 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'td', cls:'directLoginBindingValueTD', children:[ | 72 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'td', cls:'directLoginBindingValueTD', children:[ |
| 75 | {tag:'div', id:this.getId('editModeBox'), children:[ | 73 | {tag:'div', id:this.getId('editModeBox'), children:[ |
| 76 | {tag:'select', id:this.getId('select'), children:this.recordFieldOptions()} | 74 | {tag:'select', id:this.getId('select'), children:this.recordFieldOptions()} |
| 77 | ]}, | 75 | ]}, |
| 78 | {tag:'div', id:this.getId('viewModeBox'), children:[ | 76 | {tag:'div', id:this.getId('viewModeBox'), children:[ |
| 79 | {tag:'span', id:this.getId('viewValue'), html:""} | 77 | {tag:'span', id:this.getId('viewValue'), html:""} |
| 80 | ]} | 78 | ]} |
| 81 | ]}); | 79 | ]}); |
| 82 | //MochiKit.Logging.logDebug("--- DirectLoginBindingComponent.render - 2"); | 80 | //MochiKit.Logging.logDebug("--- DirectLoginBindingComponent.render - 2"); |
| 83 | this.getElement('editModeBox').setVisibilityMode(YAHOO.ext.Element.DISPLAY); | 81 | this.getElement('editModeBox').setVisibilityMode(YAHOO.ext.Element.DISPLAY); |
| 84 | this.getElement('viewModeBox').setVisibilityMode(YAHOO.ext.Element.DISPLAY); | 82 | this.getElement('viewModeBox').setVisibilityMode(YAHOO.ext.Element.DISPLAY); |
| 85 | 83 | ||
| 86 | this.update(); | 84 | this.update(); |
| 87 | //MochiKit.Logging.logDebug("<<< DirectLoginBindingComponent.render"); | 85 | //MochiKit.Logging.logDebug("<<< DirectLoginBindingComponent.render"); |
| 88 | }, | 86 | }, |
| 89 | 87 | ||
| 90 | //------------------------------------------------------------------------- | 88 | //------------------------------------------------------------------------- |
| 91 | 89 | ||
| 92 | 'recordFieldOptions': function() { | 90 | 'recordFieldOptions': function() { |
| 93 | varresult; | 91 | varresult; |
| 94 | var option; | 92 | var option; |
| 95 | varrecordFieldKey; | 93 | varrecordFieldKey; |
| 96 | varrecordFields; | 94 | varrecordFields; |
| 97 | 95 | ||
| 98 | //MochiKit.Logging.logDebug(">>> DirectLoginBindingComponent.recordFieldOptions"); | 96 | //MochiKit.Logging.logDebug(">>> DirectLoginBindingComponent.recordFieldOptions"); |
| 99 | recordFields = this.directLoginBinding().directLogin().record().currentVersion().fields(); | 97 | recordFields = this.directLoginBinding().directLogin().record().currentVersion().fields(); |
| 100 | result = []; | 98 | result = []; |
| 101 | option = {tag:'option', value:null, html:'---'}; | 99 | option = {tag:'option', value:null, html:'---'}; |
| 102 | result.push(option); | 100 | result.push(option); |
| 103 | for (recordFieldKey in recordFields) { | 101 | for (recordFieldKey in recordFields) { |
| 104 | //TODO: remove the value: field and replace it with element.dom.value = <some value> | 102 | //TODO: remove the value: field and replace it with element.dom.value = <some value> |
| 105 | option = {tag:'option', value:recordFieldKey, html:recordFields[recordFieldKey].label()} | 103 | option = {tag:'option', value:recordFieldKey, html:recordFields[recordFieldKey].label()} |
| 106 | if (recordFieldKey == this.directLoginBinding().fieldKey()) { | 104 | if (recordFieldKey == this.directLoginBinding().fieldKey()) { |
| 107 | option['selected'] = true; | 105 | option['selected'] = true; |
| 108 | } | 106 | } |
| 109 | result.push(option); | 107 | result.push(option); |
| 110 | } | 108 | } |
| 111 | //MochiKit.Logging.logDebug("<<< DirectLoginBindingComponent.recordFieldOptions"); | 109 | //MochiKit.Logging.logDebug("<<< DirectLoginBindingComponent.recordFieldOptions"); |
| 112 | 110 | ||
| 113 | return result; | 111 | return result; |
| 114 | }, | 112 | }, |
| 115 | 113 | ||
| 116 | //------------------------------------------------------------------------- | 114 | //------------------------------------------------------------------------- |
| 117 | 115 | ||
| 118 | 'syncAndUpdateEditMode': function() { | 116 | 'syncAndUpdateEditMode': function() { |
diff --git a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/DirectLoginComponent.js b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/DirectLoginComponent.js index 69cad79..883c45c 100644 --- a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/DirectLoginComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/DirectLoginComponent.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } | 27 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.RecordDetail.DirectLoginComponent = function(anElement, args) { | 31 | Clipperz.PM.Components.RecordDetail.DirectLoginComponent = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | Clipperz.PM.Components.RecordDetail.DirectLoginComponent.superclass.constructor.call(this, anElement, args); | 34 | Clipperz.PM.Components.RecordDetail.DirectLoginComponent.superclass.constructor.call(this, anElement, args); |
| 37 | 35 | ||
| 38 | this._directLogin = args.directLogin || null; | 36 | this._directLogin = args.directLogin || null; |
| 39 | //this._titleElement = null; | 37 | //this._titleElement = null; |
| 40 | this._structureElement = null; | 38 | this._structureElement = null; |
| 41 | this._removeButton = null; | 39 | this._removeButton = null; |
| 42 | this._directLoginBindingComponents = null; | 40 | this._directLoginBindingComponents = null; |
| 43 | this._collapser = null; | 41 | this._collapser = null; |
| 44 | 42 | ||
| 45 | this.mainComponent().addEditComponent(this); | 43 | this.mainComponent().addEditComponent(this); |
| 46 | this.render(); | 44 | this.render(); |
| 47 | 45 | ||
| 48 | return this; | 46 | return this; |
| 49 | } | 47 | } |
| 50 | 48 | ||
| 51 | //============================================================================= | 49 | //============================================================================= |
| 52 | 50 | ||
| 53 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.DirectLoginComponent, Clipperz.PM.Components.RecordDetail.AbstractComponent, { | 51 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.DirectLoginComponent, Clipperz.PM.Components.RecordDetail.AbstractComponent, { |
| 54 | 52 | ||
| 55 | 'toString': function() { | 53 | 'toString': function() { |
| 56 | return "Clipperz.PM.Components.RecordDetail.DirectLoginComponent component"; | 54 | return "Clipperz.PM.Components.RecordDetail.DirectLoginComponent component"; |
| 57 | }, | 55 | }, |
| 58 | 56 | ||
| 59 | //------------------------------------------------------------------------- | 57 | //------------------------------------------------------------------------- |
| 60 | 58 | ||
| 61 | 'directLogin': function() { | 59 | 'directLogin': function() { |
| 62 | return this._directLogin; | 60 | return this._directLogin; |
| 63 | }, | 61 | }, |
| 64 | 62 | ||
| 65 | 'directLoginBindingComponents': function() { | 63 | 'directLoginBindingComponents': function() { |
| 66 | return this._directLoginBindingComponents; | 64 | return this._directLoginBindingComponents; |
| 67 | }, | 65 | }, |
| 68 | 66 | ||
| 69 | //------------------------------------------------------------------------- | 67 | //------------------------------------------------------------------------- |
| 70 | 68 | ||
| 71 | 'removeDirectLogin': function() { | 69 | 'removeDirectLogin': function() { |
| 72 | //MochiKit.Logging.logDebug(">>> DirectLoginComponent.removeDirectLogin"); | 70 | //MochiKit.Logging.logDebug(">>> DirectLoginComponent.removeDirectLogin"); |
| 73 | this.mainComponent().synchronizeComponentValues(); | 71 | this.mainComponent().synchronizeComponentValues(); |
| 74 | this.directLogin().remove(); | 72 | this.directLogin().remove(); |
| 75 | this.mainComponent().removeEditComponent(this); | 73 | this.mainComponent().removeEditComponent(this); |
| 76 | this.mainComponent().render(); | 74 | this.mainComponent().render(); |
| 77 | //MochiKit.Logging.logDebug("<<< DirectLoginComponent.removeDirectLogin"); | 75 | //MochiKit.Logging.logDebug("<<< DirectLoginComponent.removeDirectLogin"); |
| 78 | }, | 76 | }, |
| 79 | 77 | ||
| 80 | //------------------------------------------------------------------------- | 78 | //------------------------------------------------------------------------- |
| 81 | /* | 79 | /* |
| 82 | 'formDataValue': function() { | 80 | 'formDataValue': function() { |
| 83 | return Clipperz.Base.serializeJSON(this.directLogin().formData()); | 81 | return Clipperz.Base.serializeJSON(this.directLogin().formData()); |
| 84 | }, | 82 | }, |
| 85 | 83 | ||
| 86 | 'setFormDataValue': function(aValue) { | 84 | 'setFormDataValue': function(aValue) { |
| 87 | 85 | ||
| 88 | }, | 86 | }, |
| 89 | */ | 87 | */ |
| 90 | //------------------------------------------------------------------------- | 88 | //------------------------------------------------------------------------- |
| 91 | 89 | ||
| 92 | 'removeButton': function() { | 90 | 'removeButton': function() { |
| 93 | return this._removeButton; | 91 | return this._removeButton; |
| 94 | }, | 92 | }, |
| 95 | 93 | ||
| 96 | 'setRemoveButton': function(aValue) { | 94 | 'setRemoveButton': function(aValue) { |
| 97 | this._removeButton = aValue; | 95 | this._removeButton = aValue; |
| 98 | }, | 96 | }, |
| 99 | 97 | ||
| 100 | //------------------------------------------------------------------------- | 98 | //------------------------------------------------------------------------- |
| 101 | /* | 99 | /* |
| 102 | 'titleElement': function() { | 100 | 'titleElement': function() { |
| 103 | return this._titleElement; | 101 | return this._titleElement; |
| 104 | }, | 102 | }, |
| 105 | 103 | ||
| 106 | 'setTitleElement': function(aValue) { | 104 | 'setTitleElement': function(aValue) { |
| 107 | this._titleElement = aValue; | 105 | this._titleElement = aValue; |
| 108 | }, | 106 | }, |
| 109 | */ | 107 | */ |
| 110 | //------------------------------------------------------------------------- | 108 | //------------------------------------------------------------------------- |
| 111 | 109 | ||
| 112 | 'structureElement': function() { | 110 | 'structureElement': function() { |
| 113 | return this._structureElement; | 111 | return this._structureElement; |
| 114 | }, | 112 | }, |
| 115 | 113 | ||
| 116 | 'setStructureElement': function(aValue) { | 114 | 'setStructureElement': function(aValue) { |
| 117 | this._structureElement = aValue; | 115 | this._structureElement = aValue; |
| 118 | }, | 116 | }, |
diff --git a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/DirectLoginValueComponent.js b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/DirectLoginValueComponent.js index d210100..b478d94 100644 --- a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/DirectLoginValueComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/DirectLoginValueComponent.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } | 27 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.RecordDetail.DirectLoginValueComponent = function(anElement, args) { | 31 | Clipperz.PM.Components.RecordDetail.DirectLoginValueComponent = function(anElement, args) { |
| 34 | //MochiKit.Logging.logDebug(">>> new DirectLoginValueComponent"); | 32 | //MochiKit.Logging.logDebug(">>> new DirectLoginValueComponent"); |
| 35 | args = args || {}; | 33 | args = args || {}; |
| 36 | 34 | ||
| 37 | Clipperz.PM.Components.RecordDetail.DirectLoginValueComponent.superclass.constructor.call(this, anElement, args); | 35 | Clipperz.PM.Components.RecordDetail.DirectLoginValueComponent.superclass.constructor.call(this, anElement, args); |
| 38 | 36 | ||
| 39 | this._directLoginInputValue = args.directLoginInputValue || null; | 37 | this._directLoginInputValue = args.directLoginInputValue || null; |
| 40 | this._value = this.directLoginInputValue().directLogin().formValues()[this.directLoginInputValue().name()]; | 38 | this._value = this.directLoginInputValue().directLogin().formValues()[this.directLoginInputValue().name()]; |
| 41 | 39 | ||
| 42 | this.render(); | 40 | this.render(); |
| 43 | //MochiKit.Logging.logDebug("<<< new DirectLoginValueComponent - record: " + this.record()); | 41 | //MochiKit.Logging.logDebug("<<< new DirectLoginValueComponent - record: " + this.record()); |
| 44 | 42 | ||
| 45 | return this; | 43 | return this; |
| 46 | } | 44 | } |
| 47 | 45 | ||
| 48 | //============================================================================= | 46 | //============================================================================= |
| 49 | 47 | ||
| 50 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.DirectLoginValueComponent, Clipperz.PM.Components.RecordDetail.AbstractComponent, { | 48 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.DirectLoginValueComponent, Clipperz.PM.Components.RecordDetail.AbstractComponent, { |
| 51 | 49 | ||
| 52 | 'toString': function() { | 50 | 'toString': function() { |
| 53 | return "Clipperz.PM.Components.RecordDetail.DirectLoginValueComponent component - " + this.directLoginInputValue().name(); | 51 | return "Clipperz.PM.Components.RecordDetail.DirectLoginValueComponent component - " + this.directLoginInputValue().name(); |
| 54 | }, | 52 | }, |
| 55 | 53 | ||
| 56 | //------------------------------------------------------------------------- | 54 | //------------------------------------------------------------------------- |
| 57 | 55 | ||
| 58 | 'directLoginInputValue': function() { | 56 | 'directLoginInputValue': function() { |
| 59 | return this._directLoginInputValue; | 57 | return this._directLoginInputValue; |
| 60 | }, | 58 | }, |
| 61 | 59 | ||
| 62 | //------------------------------------------------------------------------- | 60 | //------------------------------------------------------------------------- |
| 63 | 61 | ||
| 64 | 'render': function() { | 62 | 'render': function() { |
| 65 | //MochiKit.Logging.logDebug(">>> DirectLoginValueComponent.render"); | 63 | //MochiKit.Logging.logDebug(">>> DirectLoginValueComponent.render"); |
| 66 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'td', cls:'directLoginDataLabelTD', children:[ | 64 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'td', cls:'directLoginDataLabelTD', children:[ |
| 67 | {tag:'span', html:this.directLoginInputValue().name()} | 65 | {tag:'span', html:this.directLoginInputValue().name()} |
| 68 | ]}); | 66 | ]}); |
| 69 | //MochiKit.Logging.logDebug("--- DirectLoginValueComponent.render - 1"); | 67 | //MochiKit.Logging.logDebug("--- DirectLoginValueComponent.render - 1"); |
| 70 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'td', cls:'directLoginDataValueTD', children:[ | 68 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'td', cls:'directLoginDataValueTD', children:[ |
| 71 | {tag:'span', id:this.getId('inputElement')} | 69 | {tag:'span', id:this.getId('inputElement')} |
| 72 | ]}); | 70 | ]}); |
| 73 | //MochiKit.Logging.logDebug("--- DirectLoginValueComponent.render - 2"); | 71 | //MochiKit.Logging.logDebug("--- DirectLoginValueComponent.render - 2"); |
| 74 | this.update(); | 72 | this.update(); |
| 75 | //MochiKit.Logging.logDebug("<<< DirectLoginValueComponent.render"); | 73 | //MochiKit.Logging.logDebug("<<< DirectLoginValueComponent.render"); |
| 76 | }, | 74 | }, |
| 77 | 75 | ||
| 78 | //------------------------------------------------------------------------- | 76 | //------------------------------------------------------------------------- |
| 79 | 77 | ||
| 80 | 'inputElementConfiguration': function() { | 78 | 'inputElementConfiguration': function() { |
| 81 | var result; | 79 | var result; |
| 82 | var currentValue; | 80 | var currentValue; |
| 83 | 81 | ||
| 84 | //MochiKit.Logging.logDebug(">>> DirectLoginValueComponent.inputElementConfiguration - " + this.directLoginInputValue().name()); | 82 | //MochiKit.Logging.logDebug(">>> DirectLoginValueComponent.inputElementConfiguration - " + this.directLoginInputValue().name()); |
| 85 | result = []; | 83 | result = []; |
| 86 | currentValue = this.value(); | 84 | currentValue = this.value(); |
| 87 | 85 | ||
| 88 | switch (this.directLoginInputValue().type()) { | 86 | switch (this.directLoginInputValue().type()) { |
| 89 | case 'checkbox': | 87 | case 'checkbox': |
| 90 | var checkbox; | 88 | var checkbox; |
| 91 | //{"type":"checkbox", "name":"rememberUsernameChk", "value":"checkbox"} | 89 | //{"type":"checkbox", "name":"rememberUsernameChk", "value":"checkbox"} |
| 92 | checkbox = {tag:'input', id:this.getId('checkbox'), type:'checkbox'} | 90 | checkbox = {tag:'input', id:this.getId('checkbox'), type:'checkbox'} |
| 93 | if (currentValue == true) { | 91 | if (currentValue == true) { |
| 94 | checkbox.checked = true; | 92 | checkbox.checked = true; |
| 95 | } | 93 | } |
| 96 | result.push(checkbox); | 94 | result.push(checkbox); |
| 97 | break; | 95 | break; |
| 98 | 96 | ||
| 99 | case 'select': | 97 | case 'select': |
| 100 | var input; | 98 | var input; |
| 101 | //{"type":"select", "name":"DOMAIN", "options":[{"selected":true, "label":"@tin.it", "value":"tin.it"}, {"selected":false, "label":"@virgilio.it", "value":"virgilio.it"}]} | 99 | //{"type":"select", "name":"DOMAIN", "options":[{"selected":true, "label":"@tin.it", "value":"tin.it"}, {"selected":false, "label":"@virgilio.it", "value":"virgilio.it"}]} |
| 102 | input = {tag:'select', id:this.getId('select'), name:this.directLoginInputValue().name(), children:[]}; | 100 | input = {tag:'select', id:this.getId('select'), name:this.directLoginInputValue().name(), children:[]}; |
| 103 | input.children.push({tag:'option', value:null, html:"---"}); | 101 | input.children.push({tag:'option', value:null, html:"---"}); |
| 104 | MochiKit.Iter.forEach(this.directLoginInputValue().args()['options'], function(anOption) { | 102 | MochiKit.Iter.forEach(this.directLoginInputValue().args()['options'], function(anOption) { |
| 105 | var option; | 103 | var option; |
| 106 | 104 | ||
| 107 | //TODO: remove the value: field and replace it with element.dom.value = <some value> | 105 | //TODO: remove the value: field and replace it with element.dom.value = <some value> |
| 108 | option = {tag:'option', value:anOption['value'], html:anOption['label']} | 106 | option = {tag:'option', value:anOption['value'], html:anOption['label']} |
| 109 | if (currentValue == anOption['value']) { | 107 | if (currentValue == anOption['value']) { |
| 110 | option.selected = true; | 108 | option.selected = true; |
| 111 | } | 109 | } |
| 112 | input.children.push(option); | 110 | input.children.push(option); |
| 113 | }) | 111 | }) |
| 114 | result.push(input); | 112 | result.push(input); |
| 115 | break; | 113 | break; |
| 116 | 114 | ||
| 117 | case 'radio': | 115 | case 'radio': |
| 118 | var name; | 116 | var name; |
diff --git a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/DirectLoginsComponent.js b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/DirectLoginsComponent.js index 1396bd8..878adce 100644 --- a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/DirectLoginsComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/DirectLoginsComponent.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } | 27 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.RecordDetail.DirectLoginsComponent = function(anElement, args) { | 31 | Clipperz.PM.Components.RecordDetail.DirectLoginsComponent = function(anElement, args) { |
| 34 | //MochiKit.Logging.logDebug(">>> new Clipperz.PM.Components.RecordDetail.DirectLoginsComponent"); | 32 | //MochiKit.Logging.logDebug(">>> new Clipperz.PM.Components.RecordDetail.DirectLoginsComponent"); |
| 35 | args = args || {}; | 33 | args = args || {}; |
| 36 | 34 | ||
| 37 | //MochiKit.Logging.logDebug("--- new Clipperz.PM.Components.RecordDetail.DirectLoginsComponent - 0"); | 35 | //MochiKit.Logging.logDebug("--- new Clipperz.PM.Components.RecordDetail.DirectLoginsComponent - 0"); |
| 38 | Clipperz.PM.Components.RecordDetail.DirectLoginsComponent.superclass.constructor.call(this, anElement, args); | 36 | Clipperz.PM.Components.RecordDetail.DirectLoginsComponent.superclass.constructor.call(this, anElement, args); |
| 39 | //MochiKit.Logging.logDebug("--- new Clipperz.PM.Components.RecordDetail.DirectLoginsComponent - 1"); | 37 | //MochiKit.Logging.logDebug("--- new Clipperz.PM.Components.RecordDetail.DirectLoginsComponent - 1"); |
| 40 | 38 | ||
| 41 | this._addDirectLoginButton = null; | 39 | this._addDirectLoginButton = null; |
| 42 | 40 | ||
| 43 | //MochiKit.Logging.logDebug("--- new Clipperz.PM.Components.RecordDetail.DirectLoginsComponent - 2"); | 41 | //MochiKit.Logging.logDebug("--- new Clipperz.PM.Components.RecordDetail.DirectLoginsComponent - 2"); |
| 44 | this.mainComponent().addEditComponent(this); | 42 | this.mainComponent().addEditComponent(this); |
| 45 | //MochiKit.Logging.logDebug("--- new Clipperz.PM.Components.RecordDetail.DirectLoginsComponent - 3"); | 43 | //MochiKit.Logging.logDebug("--- new Clipperz.PM.Components.RecordDetail.DirectLoginsComponent - 3"); |
| 46 | this.render(); | 44 | this.render(); |
| 47 | //MochiKit.Logging.logDebug("<<< new Clipperz.PM.Components.RecordDetail.DirectLoginsComponent"); | 45 | //MochiKit.Logging.logDebug("<<< new Clipperz.PM.Components.RecordDetail.DirectLoginsComponent"); |
| 48 | 46 | ||
| 49 | return this; | 47 | return this; |
| 50 | } | 48 | } |
| 51 | 49 | ||
| 52 | //============================================================================= | 50 | //============================================================================= |
| 53 | 51 | ||
| 54 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.DirectLoginsComponent, Clipperz.PM.Components.RecordDetail.AbstractComponent, { | 52 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.DirectLoginsComponent, Clipperz.PM.Components.RecordDetail.AbstractComponent, { |
| 55 | 53 | ||
| 56 | 'toString': function() { | 54 | 'toString': function() { |
| 57 | return "Clipperz.PM.Components.RecordDetail.DirectLoginsComponent component"; | 55 | return "Clipperz.PM.Components.RecordDetail.DirectLoginsComponent component"; |
| 58 | }, | 56 | }, |
| 59 | 57 | ||
| 60 | //------------------------------------------------------------------------- | 58 | //------------------------------------------------------------------------- |
| 61 | 59 | ||
| 62 | 'addDirectLoginButton': function() { | 60 | 'addDirectLoginButton': function() { |
| 63 | return this._addDirectLoginButton; | 61 | return this._addDirectLoginButton; |
| 64 | }, | 62 | }, |
| 65 | 63 | ||
| 66 | 'setAddDirectLoginButton': function(aValue) { | 64 | 'setAddDirectLoginButton': function(aValue) { |
| 67 | this._addDirectLoginButton = aValue; | 65 | this._addDirectLoginButton = aValue; |
| 68 | }, | 66 | }, |
| 69 | 67 | ||
| 70 | //------------------------------------------------------------------------- | 68 | //------------------------------------------------------------------------- |
| 71 | 69 | ||
| 72 | 'render': function() { | 70 | 'render': function() { |
| 73 | this.element().update(""); | 71 | this.element().update(""); |
| 74 | 72 | ||
| 75 | Clipperz.YUI.DomHelper.append(this.element().dom, | 73 | Clipperz.YUI.DomHelper.append(this.element().dom, |
| 76 | {tag:'div', cls:'directLoginsRecordBox', children:[ | 74 | {tag:'div', cls:'directLoginsRecordBox', children:[ |
| 77 | {tag:'h3', htmlString:Clipperz.PM.Strings['recordDetailDirectLoginBlockTitle']}, | 75 | {tag:'h3', htmlString:Clipperz.PM.Strings['recordDetailDirectLoginBlockTitle']}, |
| 78 | {tag:'ul', id:this.getId('directLogins')}, | 76 | {tag:'ul', id:this.getId('directLogins')}, |
| 79 | 77 | ||
| 80 | {tag:'div', cls:'addDirectLoginBox', id:this.getId('addDirectLogin'), children:[ | 78 | {tag:'div', cls:'addDirectLoginBox', id:this.getId('addDirectLogin'), children:[ |
| 81 | {tag:'div', cls:'addDirectLoginBoxContent', children:[ | 79 | {tag:'div', cls:'addDirectLoginBoxContent', children:[ |
| 82 | {tag:'div', cls:'bookmarkletConfiguration', children:[ | 80 | {tag:'div', cls:'bookmarkletConfiguration', children:[ |
| 83 | // {tag:'span', htmlString:Clipperz.PM.Strings['newRecordWizardBookmarkletConfigurationLabel']}, | 81 | // {tag:'span', htmlString:Clipperz.PM.Strings['newRecordWizardBookmarkletConfigurationLabel']}, |
| 84 | {tag:'div', htmlString:Clipperz.PM.Strings['recordDetailNewDirectLoginDescription']}, | 82 | {tag:'div', htmlString:Clipperz.PM.Strings['recordDetailNewDirectLoginDescription']}, |
| 85 | {tag:'textarea', id:this.getId('addDirectLoginTextarea')} | 83 | {tag:'textarea', id:this.getId('addDirectLoginTextarea')} |
| 86 | ]}, | 84 | ]}, |
| 87 | {tag:'div', id:this.getId('addDirectLoginButton')} | 85 | {tag:'div', id:this.getId('addDirectLoginButton')} |
| 88 | ]} | 86 | ]} |
| 89 | ]} | 87 | ]} |
| 90 | ]} | 88 | ]} |
| 91 | ); | 89 | ); |
| 92 | 90 | ||
| 93 | if (MochiKit.Base.keys(this.record().directLogins()).length == 0) { | 91 | if (MochiKit.Base.keys(this.record().directLogins()).length == 0) { |
| 94 | //MochiKit.Logging.logDebug("--- DirectLoginsComponent.render - 3"); | 92 | //MochiKit.Logging.logDebug("--- DirectLoginsComponent.render - 3"); |
| 95 | Clipperz.YUI.DomHelper.append(this.getElement('directLogins'), | 93 | Clipperz.YUI.DomHelper.append(this.getElement('directLogins'), |
| 96 | {tag:'li', children:[ | 94 | {tag:'li', children:[ |
| 97 | // {tag:'span', htmlString:Clipperz.PM.Strings['recordDetailDirectLoginBlockNoDirectLoginConfiguredLabel']} | 95 | // {tag:'span', htmlString:Clipperz.PM.Strings['recordDetailDirectLoginBlockNoDirectLoginConfiguredLabel']} |
| 98 | {tag:'div', cls:'recordDetailNoDirectLoginDescriptionBox', htmlString:Clipperz.PM.Strings['recordDetailDirectLoginBlockNoDirectLoginConfiguredDescription']} | 96 | {tag:'div', cls:'recordDetailNoDirectLoginDescriptionBox', htmlString:Clipperz.PM.Strings['recordDetailDirectLoginBlockNoDirectLoginConfiguredDescription']} |
| 99 | ]} | 97 | ]} |
| 100 | ); | 98 | ); |
| 101 | //MochiKit.Logging.logDebug("--- DirectLoginsComponent.render - 4"); | 99 | //MochiKit.Logging.logDebug("--- DirectLoginsComponent.render - 4"); |
| 102 | } else { | 100 | } else { |
| 103 | //MochiKit.Logging.logDebug("--- DirectLoginsComponent.render - 5"); | 101 | //MochiKit.Logging.logDebug("--- DirectLoginsComponent.render - 5"); |
| 104 | for (directLoginReference in this.record().directLogins()) { | 102 | for (directLoginReference in this.record().directLogins()) { |
| 105 | //MochiKit.Logging.logDebug("--- DirectLoginsComponent.render - 6"); | 103 | //MochiKit.Logging.logDebug("--- DirectLoginsComponent.render - 6"); |
| 106 | this.addDirectLogin(this.record().directLogins()[directLoginReference]); | 104 | this.addDirectLogin(this.record().directLogins()[directLoginReference]); |
| 107 | //MochiKit.Logging.logDebug("--- DirectLoginsComponent.render - 7"); | 105 | //MochiKit.Logging.logDebug("--- DirectLoginsComponent.render - 7"); |
| 108 | } | 106 | } |
| 109 | //MochiKit.Logging.logDebug("--- DirectLoginsComponent.render - 8"); | 107 | //MochiKit.Logging.logDebug("--- DirectLoginsComponent.render - 8"); |
| 110 | } | 108 | } |
| 111 | //MochiKit.Logging.logDebug("--- DirectLoginsComponent.render - 9"); | 109 | //MochiKit.Logging.logDebug("--- DirectLoginsComponent.render - 9"); |
| 112 | 110 | ||
| 113 | this.setAddDirectLoginButton(new YAHOO.ext.Button(this.getDom('addDirectLoginButton'), { | 111 | this.setAddDirectLoginButton(new YAHOO.ext.Button(this.getDom('addDirectLoginButton'), { |
| 114 | text:Clipperz.PM.Strings['recordDetailAddNewDirectLoginButtonLabel'], | 112 | text:Clipperz.PM.Strings['recordDetailAddNewDirectLoginButtonLabel'], |
| 115 | handler:this.addNewDirectLogin, | 113 | handler:this.addNewDirectLogin, |
| 116 | scope:this | 114 | scope:this |
| 117 | })); | 115 | })); |
| 118 | MochiKit.Signal.connect(this.getId('addDirectLoginTextarea'), 'onkeydown', this, 'onkeydown'); | 116 | MochiKit.Signal.connect(this.getId('addDirectLoginTextarea'), 'onkeydown', this, 'onkeydown'); |
diff --git a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldButtonComponent.js b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldButtonComponent.js index b79c365..661f94d 100644 --- a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldButtonComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldButtonComponent.js | |||
| @@ -1,114 +1,112 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } | 27 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.RecordDetail.FieldButtonComponent = function(anElement, args) { | 31 | Clipperz.PM.Components.RecordDetail.FieldButtonComponent = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | Clipperz.PM.Components.RecordDetail.FieldButtonComponent.superclass.constructor.call(this, anElement, args); | 34 | Clipperz.PM.Components.RecordDetail.FieldButtonComponent.superclass.constructor.call(this, anElement, args); |
| 37 | 35 | ||
| 38 | this._button = null; | 36 | this._button = null; |
| 39 | 37 | ||
| 40 | this.render(); | 38 | this.render(); |
| 41 | 39 | ||
| 42 | return this; | 40 | return this; |
| 43 | } | 41 | } |
| 44 | 42 | ||
| 45 | //============================================================================= | 43 | //============================================================================= |
| 46 | 44 | ||
| 47 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.FieldButtonComponent, Clipperz.PM.Components.RecordDetail.AbstractFieldSubComponent, { | 45 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.FieldButtonComponent, Clipperz.PM.Components.RecordDetail.AbstractFieldSubComponent, { |
| 48 | 46 | ||
| 49 | 'toString': function() { | 47 | 'toString': function() { |
| 50 | return "Clipperz.PM.Components.RecordDetail.FieldButtonComponent"; | 48 | return "Clipperz.PM.Components.RecordDetail.FieldButtonComponent"; |
| 51 | }, | 49 | }, |
| 52 | 50 | ||
| 53 | //------------------------------------------------------------------------- | 51 | //------------------------------------------------------------------------- |
| 54 | 52 | ||
| 55 | 'buttonText': function() { | 53 | 'buttonText': function() { |
| 56 | varresult; | 54 | varresult; |
| 57 | 55 | ||
| 58 | if (this.recordField() == null) { | 56 | if (this.recordField() == null) { |
| 59 | //TODO: this is never used. It is just an obsolete legacy chunk of code | 57 | //TODO: this is never used. It is just an obsolete legacy chunk of code |
| 60 | result = Clipperz.PM.Strings['recordDetailAddFieldButtonLabel']; | 58 | result = Clipperz.PM.Strings['recordDetailAddFieldButtonLabel']; |
| 61 | } else { | 59 | } else { |
| 62 | result = Clipperz.PM.Strings['recordDetailRemoveFieldButtonLabel']; | 60 | result = Clipperz.PM.Strings['recordDetailRemoveFieldButtonLabel']; |
| 63 | } | 61 | } |
| 64 | 62 | ||
| 65 | return result; | 63 | return result; |
| 66 | }, | 64 | }, |
| 67 | 65 | ||
| 68 | //------------------------------------------------------------------------- | 66 | //------------------------------------------------------------------------- |
| 69 | 67 | ||
| 70 | 'button': function() { | 68 | 'button': function() { |
| 71 | return this._button; | 69 | return this._button; |
| 72 | }, | 70 | }, |
| 73 | 71 | ||
| 74 | 'setButton': function(aValue) { | 72 | 'setButton': function(aValue) { |
| 75 | this._button = aValue; | 73 | this._button = aValue; |
| 76 | }, | 74 | }, |
| 77 | 75 | ||
| 78 | //------------------------------------------------------------------------- | 76 | //------------------------------------------------------------------------- |
| 79 | 77 | ||
| 80 | 'render': function() { | 78 | 'render': function() { |
| 81 | this.element().update(""); | 79 | this.element().update(""); |
| 82 | 80 | ||
| 83 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'div', id:this.getId('button')}) | 81 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'div', id:this.getId('button')}) |
| 84 | this.setButton(new YAHOO.ext.Button(this.getDom('button'), {text:this.buttonText(), handler:this.handleButtonClick, scope:this})); | 82 | this.setButton(new YAHOO.ext.Button(this.getDom('button'), {text:this.buttonText(), handler:this.handleButtonClick, scope:this})); |
| 85 | 83 | ||
| 86 | this.update(); | 84 | this.update(); |
| 87 | }, | 85 | }, |
| 88 | 86 | ||
| 89 | //------------------------------------------------------------------------- | 87 | //------------------------------------------------------------------------- |
| 90 | 88 | ||
| 91 | 'handleButtonClick': function() { | 89 | 'handleButtonClick': function() { |
| 92 | if (this.recordField() == null) { | 90 | if (this.recordField() == null) { |
| 93 | this.mainComponent().addNewField(); | 91 | this.mainComponent().addNewField(); |
| 94 | } else { | 92 | } else { |
| 95 | this.mainComponent().removeField(this.fieldComponent()); | 93 | this.mainComponent().removeField(this.fieldComponent()); |
| 96 | } | 94 | } |
| 97 | }, | 95 | }, |
| 98 | 96 | ||
| 99 | //------------------------------------------------------------------------- | 97 | //------------------------------------------------------------------------- |
| 100 | 98 | ||
| 101 | 'updateEditMode': function() { | 99 | 'updateEditMode': function() { |
| 102 | this.button().show(); | 100 | this.button().show(); |
| 103 | }, | 101 | }, |
| 104 | 102 | ||
| 105 | //------------------------------------------------------------------------- | 103 | //------------------------------------------------------------------------- |
| 106 | 104 | ||
| 107 | 'updateViewMode': function() { | 105 | 'updateViewMode': function() { |
| 108 | this.button().hide(); | 106 | this.button().hide(); |
| 109 | }, | 107 | }, |
| 110 | 108 | ||
| 111 | //------------------------------------------------------------------------- | 109 | //------------------------------------------------------------------------- |
| 112 | __syntaxFix__: "syntax fix" | 110 | __syntaxFix__: "syntax fix" |
| 113 | }); | 111 | }); |
| 114 | 112 | ||
diff --git a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldComponent.js b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldComponent.js index 978a54e..bfa4658 100644 --- a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldComponent.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } | 27 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.RecordDetail.FieldComponent = function(anElement, args) { | 31 | Clipperz.PM.Components.RecordDetail.FieldComponent = function(anElement, args) { |
| 34 | //MochiKit.Logging.logDebug(">>> new FieldComponent"); | 32 | //MochiKit.Logging.logDebug(">>> new FieldComponent"); |
| 35 | args = args || {}; | 33 | args = args || {}; |
| 36 | 34 | ||
| 37 | Clipperz.PM.Components.RecordDetail.FieldComponent.superclass.constructor.call(this, anElement, args); | 35 | Clipperz.PM.Components.RecordDetail.FieldComponent.superclass.constructor.call(this, anElement, args); |
| 38 | 36 | ||
| 39 | this._element = anElement; | 37 | this._element = anElement; |
| 40 | this._recordField = args.recordField || null; | 38 | this._recordField = args.recordField || null; |
| 41 | 39 | ||
| 42 | this._buttonComponent = null; | 40 | this._buttonComponent = null; |
| 43 | this._labelComponent = null; | 41 | this._labelComponent = null; |
| 44 | this._dragHandler = null; | 42 | this._dragHandler = null; |
| 45 | this._valueComponent = null; | 43 | this._valueComponent = null; |
| 46 | this._typeComponent = null; | 44 | this._typeComponent = null; |
| 47 | 45 | ||
| 48 | this.mainComponent().addEditComponent(this); | 46 | this.mainComponent().addEditComponent(this); |
| 49 | 47 | ||
| 50 | this.render(); | 48 | this.render(); |
| 51 | 49 | ||
| 52 | return this; | 50 | return this; |
| 53 | } | 51 | } |
| 54 | 52 | ||
| 55 | //============================================================================= | 53 | //============================================================================= |
| 56 | 54 | ||
| 57 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.FieldComponent, Clipperz.PM.Components.RecordDetail.AbstractComponent, { | 55 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.FieldComponent, Clipperz.PM.Components.RecordDetail.AbstractComponent, { |
| 58 | 56 | ||
| 59 | 'toString': function() { | 57 | 'toString': function() { |
| 60 | return "Clipperz.PM.Components.RecordDetail.FieldComponent component"; | 58 | return "Clipperz.PM.Components.RecordDetail.FieldComponent component"; |
| 61 | }, | 59 | }, |
| 62 | 60 | ||
| 63 | //------------------------------------------------------------------------- | 61 | //------------------------------------------------------------------------- |
| 64 | 62 | ||
| 65 | 'recordField': function() { | 63 | 'recordField': function() { |
| 66 | return this._recordField; | 64 | return this._recordField; |
| 67 | }, | 65 | }, |
| 68 | 66 | ||
| 69 | //------------------------------------------------------------------------- | 67 | //------------------------------------------------------------------------- |
| 70 | 68 | ||
| 71 | 'buttonComponent': function() { | 69 | 'buttonComponent': function() { |
| 72 | return this._buttonComponent; | 70 | return this._buttonComponent; |
| 73 | }, | 71 | }, |
| 74 | 72 | ||
| 75 | 'setButtonComponent': function(aValue) { | 73 | 'setButtonComponent': function(aValue) { |
| 76 | this._buttonComponent = aValue; | 74 | this._buttonComponent = aValue; |
| 77 | }, | 75 | }, |
| 78 | 76 | ||
| 79 | //------------------------------------------------------------------------- | 77 | //------------------------------------------------------------------------- |
| 80 | 78 | ||
| 81 | 'labelComponent': function() { | 79 | 'labelComponent': function() { |
| 82 | return this._labelComponent; | 80 | return this._labelComponent; |
| 83 | }, | 81 | }, |
| 84 | 82 | ||
| 85 | 'setLabelComponent': function(aValue) { | 83 | 'setLabelComponent': function(aValue) { |
| 86 | this._labelComponent = aValue; | 84 | this._labelComponent = aValue; |
| 87 | }, | 85 | }, |
| 88 | 86 | ||
| 89 | //------------------------------------------------------------------------- | 87 | //------------------------------------------------------------------------- |
| 90 | 88 | ||
| 91 | 'dragHandler': function() { | 89 | 'dragHandler': function() { |
| 92 | return this._dragHandler; | 90 | return this._dragHandler; |
| 93 | }, | 91 | }, |
| 94 | 92 | ||
| 95 | 'setDragHandler': function(aValue) { | 93 | 'setDragHandler': function(aValue) { |
| 96 | this._dragHandler = aValue; | 94 | this._dragHandler = aValue; |
| 97 | }, | 95 | }, |
| 98 | 96 | ||
| 99 | //------------------------------------------------------------------------- | 97 | //------------------------------------------------------------------------- |
| 100 | 98 | ||
| 101 | 'valueComponent': function() { | 99 | 'valueComponent': function() { |
| 102 | return this._valueComponent; | 100 | return this._valueComponent; |
| 103 | }, | 101 | }, |
| 104 | 102 | ||
| 105 | 'setValueComponent': function(aValue) { | 103 | 'setValueComponent': function(aValue) { |
| 106 | this._valueComponent = aValue; | 104 | this._valueComponent = aValue; |
| 107 | }, | 105 | }, |
| 108 | 106 | ||
| 109 | //------------------------------------------------------------------------- | 107 | //------------------------------------------------------------------------- |
| 110 | 108 | ||
| 111 | 'typeComponent': function() { | 109 | 'typeComponent': function() { |
| 112 | return this._typeComponent; | 110 | return this._typeComponent; |
| 113 | }, | 111 | }, |
| 114 | 112 | ||
| 115 | 'setTypeComponent': function(aValue) { | 113 | 'setTypeComponent': function(aValue) { |
| 116 | this._typeComponent = aValue; | 114 | this._typeComponent = aValue; |
| 117 | }, | 115 | }, |
| 118 | 116 | ||
diff --git a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldDragHandler.js b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldDragHandler.js index f7c5e21..7fea132 100644 --- a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldDragHandler.js +++ b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldDragHandler.js | |||
| @@ -1,56 +1,54 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } | 27 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.RecordDetail.FieldDragHandler = function(anElement, args) { | 31 | Clipperz.PM.Components.RecordDetail.FieldDragHandler = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | Clipperz.PM.Components.RecordDetail.FieldDragHandler.superclass.constructor.call(this, anElement, args); | 34 | Clipperz.PM.Components.RecordDetail.FieldDragHandler.superclass.constructor.call(this, anElement, args); |
| 37 | 35 | ||
| 38 | this._element = anElement; | 36 | this._element = anElement; |
| 39 | 37 | ||
| 40 | this.render(); | 38 | this.render(); |
| 41 | 39 | ||
| 42 | return this; | 40 | return this; |
| 43 | } | 41 | } |
| 44 | 42 | ||
| 45 | //============================================================================= | 43 | //============================================================================= |
| 46 | 44 | ||
| 47 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.FieldDragHandler, Clipperz.PM.Components.RecordDetail.AbstractFieldSubComponent, { | 45 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.FieldDragHandler, Clipperz.PM.Components.RecordDetail.AbstractFieldSubComponent, { |
| 48 | 46 | ||
| 49 | 'toString': function() { | 47 | 'toString': function() { |
| 50 | return "Clipperz.PM.Components.RecordDetail.FieldDragHandler component"; | 48 | return "Clipperz.PM.Components.RecordDetail.FieldDragHandler component"; |
| 51 | }, | 49 | }, |
| 52 | 50 | ||
| 53 | //------------------------------------------------------------------------- | 51 | //------------------------------------------------------------------------- |
| 54 | __syntaxFix__: "syntax fix" | 52 | __syntaxFix__: "syntax fix" |
| 55 | }); | 53 | }); |
| 56 | 54 | ||
diff --git a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldLabelComponent.js b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldLabelComponent.js index c58a7e2..c6f8cbf 100644 --- a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldLabelComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldLabelComponent.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } | 27 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.RecordDetail.FieldLabelComponent = function(anElement, args) { | 31 | Clipperz.PM.Components.RecordDetail.FieldLabelComponent = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | Clipperz.PM.Components.RecordDetail.FieldLabelComponent.superclass.constructor.call(this, anElement, args); | 34 | Clipperz.PM.Components.RecordDetail.FieldLabelComponent.superclass.constructor.call(this, anElement, args); |
| 37 | 35 | ||
| 38 | this._inputElement = null; | 36 | this._inputElement = null; |
| 39 | 37 | ||
| 40 | this.render(); | 38 | this.render(); |
| 41 | 39 | ||
| 42 | return this; | 40 | return this; |
| 43 | } | 41 | } |
| 44 | 42 | ||
| 45 | //============================================================================= | 43 | //============================================================================= |
| 46 | 44 | ||
| 47 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.FieldLabelComponent, Clipperz.PM.Components.RecordDetail.AbstractFieldSubComponent, { | 45 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.FieldLabelComponent, Clipperz.PM.Components.RecordDetail.AbstractFieldSubComponent, { |
| 48 | 46 | ||
| 49 | 'toString': function() { | 47 | 'toString': function() { |
| 50 | return "Clipperz.PM.Components.RecordDetail.FieldLabelComponent component"; | 48 | return "Clipperz.PM.Components.RecordDetail.FieldLabelComponent component"; |
| 51 | }, | 49 | }, |
| 52 | 50 | ||
| 53 | //------------------------------------------------------------------------- | 51 | //------------------------------------------------------------------------- |
| 54 | 52 | ||
| 55 | 'value': function() { | 53 | 'value': function() { |
| 56 | return this.recordField().label(); | 54 | return this.recordField().label(); |
| 57 | }, | 55 | }, |
| 58 | 56 | ||
| 59 | //------------------------------------------------------------------------- | 57 | //------------------------------------------------------------------------- |
| 60 | 58 | ||
| 61 | 'inputElement': function() { | 59 | 'inputElement': function() { |
| 62 | return this._inputElement; | 60 | return this._inputElement; |
| 63 | }, | 61 | }, |
| 64 | 62 | ||
| 65 | 'setInputElement': function(aValue) { | 63 | 'setInputElement': function(aValue) { |
| 66 | this._inputElement = aValue; | 64 | this._inputElement = aValue; |
| 67 | }, | 65 | }, |
| 68 | 66 | ||
| 69 | //------------------------------------------------------------------------- | 67 | //------------------------------------------------------------------------- |
| 70 | 68 | ||
| 71 | 'render': function() { | 69 | 'render': function() { |
| 72 | varnewTextFormField; | 70 | varnewTextFormField; |
| 73 | this.element().update(""); | 71 | this.element().update(""); |
| 74 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'div', cls:'Clipperz_recordFieldLabel', id:this.getId('label')}); | 72 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'div', cls:'Clipperz_recordFieldLabel', id:this.getId('label')}); |
| 75 | // Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'div', style:'font-size:8pt;', html:this.recordField().key()}); | 73 | // Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'div', style:'font-size:8pt;', html:this.recordField().key()}); |
| 76 | 74 | ||
| 77 | // this.setInputElement(new Clipperz.PM.Components.TextFormField(this.getElement('label'), {editMode:this.editMode(), value:this.value()})); | 75 | // this.setInputElement(new Clipperz.PM.Components.TextFormField(this.getElement('label'), {editMode:this.editMode(), value:this.value()})); |
| 78 | newTextFormField = new Clipperz.PM.Components.TextFormField(this.getElement('label'), {editMode:this.editMode(), value:this.value()}); | 76 | newTextFormField = new Clipperz.PM.Components.TextFormField(this.getElement('label'), {editMode:this.editMode(), value:this.value()}); |
| 79 | // newTextFormField.inputElement().setStyle({border:'3px solid cyan;'}); | 77 | // newTextFormField.inputElement().setStyle({border:'3px solid cyan;'}); |
| 80 | newTextFormField.on('change', this.notifyChanges, this, true) | 78 | newTextFormField.on('change', this.notifyChanges, this, true) |
| 81 | // this.inputElement().on('change', function() {alert("CHANGE");}); | 79 | // this.inputElement().on('change', function() {alert("CHANGE");}); |
| 82 | // this.inputElement().getElement('editComponent_input').on('change', function() {alert("CHANGE");}) | 80 | // this.inputElement().getElement('editComponent_input').on('change', function() {alert("CHANGE");}) |
| 83 | // this.inputElement().on('blur', this.notifyChanges, this, true); | 81 | // this.inputElement().on('blur', this.notifyChanges, this, true); |
| 84 | 82 | ||
| 85 | this.setInputElement(newTextFormField); | 83 | this.setInputElement(newTextFormField); |
| 86 | this.update(); | 84 | this.update(); |
| 87 | }, | 85 | }, |
| 88 | 86 | ||
| 89 | 'notifyChanges': function() { | 87 | 'notifyChanges': function() { |
| 90 | //MochiKit.Logging.logDebug(">>> FieldLabelComponent.notifyChanges - " + this); | 88 | //MochiKit.Logging.logDebug(">>> FieldLabelComponent.notifyChanges - " + this); |
| 91 | this.synchronizeComponentValues(); | 89 | this.synchronizeComponentValues(); |
| 92 | Clipperz.NotificationCenter.notify(this.recordField().recordVersion().record(), 'updatedFieldLabel'); | 90 | Clipperz.NotificationCenter.notify(this.recordField().recordVersion().record(), 'updatedFieldLabel'); |
| 93 | //MochiKit.Logging.logDebug("<<< FieldLabelComponent.notifyChanges"); | 91 | //MochiKit.Logging.logDebug("<<< FieldLabelComponent.notifyChanges"); |
| 94 | }, | 92 | }, |
| 95 | 93 | ||
| 96 | //------------------------------------------------------------------------- | 94 | //------------------------------------------------------------------------- |
| 97 | 95 | ||
| 98 | 'update': function() { | 96 | 'update': function() { |
| 99 | //MochiKit.Logging.logDebug(">>> FieldLabelComponent.update"); | 97 | //MochiKit.Logging.logDebug(">>> FieldLabelComponent.update"); |
| 100 | this.inputElement().update({editMode:this.editMode(), value:this.value()}); | 98 | this.inputElement().update({editMode:this.editMode(), value:this.value()}); |
| 101 | //MochiKit.Logging.logDebug("<<< FieldLabelComponent.update"); | 99 | //MochiKit.Logging.logDebug("<<< FieldLabelComponent.update"); |
| 102 | }, | 100 | }, |
| 103 | 101 | ||
| 104 | //------------------------------------------------------------------------- | 102 | //------------------------------------------------------------------------- |
| 105 | /* | 103 | /* |
| 106 | 'updateViewMode': function() { | 104 | 'updateViewMode': function() { |
| 107 | varwidth; | 105 | varwidth; |
| 108 | varelement; | 106 | varelement; |
| 109 | 107 | ||
| 110 | this.element().update(""); | 108 | this.element().update(""); |
| 111 | width = this.element().getWidth(); | 109 | width = this.element().getWidth(); |
| 112 | element = Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'div', html:this.value()}, true); | 110 | element = Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'div', html:this.value()}, true); |
| 113 | element.setWidth(width-1); | 111 | element.setWidth(width-1); |
| 114 | }, | 112 | }, |
| 115 | 113 | ||
| 116 | //------------------------------------------------------------------------- | 114 | //------------------------------------------------------------------------- |
| 117 | 115 | ||
| 118 | 'updateEditMode': function() { | 116 | 'updateEditMode': function() { |
diff --git a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldTypeComponent.js b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldTypeComponent.js index 489258a..3108885 100644 --- a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldTypeComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldTypeComponent.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } | 27 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.RecordDetail.FieldTypeComponent = function(anElement, args) { | 31 | Clipperz.PM.Components.RecordDetail.FieldTypeComponent = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | Clipperz.PM.Components.RecordDetail.FieldTypeComponent.superclass.constructor.call(this, anElement, args); | 34 | Clipperz.PM.Components.RecordDetail.FieldTypeComponent.superclass.constructor.call(this, anElement, args); |
| 37 | 35 | ||
| 38 | this._inputElement = null; | 36 | this._inputElement = null; |
| 39 | 37 | ||
| 40 | this.render(); | 38 | this.render(); |
| 41 | 39 | ||
| 42 | return this; | 40 | return this; |
| 43 | } | 41 | } |
| 44 | 42 | ||
| 45 | //============================================================================= | 43 | //============================================================================= |
| 46 | 44 | ||
| 47 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.FieldTypeComponent, Clipperz.PM.Components.RecordDetail.AbstractFieldSubComponent, { | 45 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.FieldTypeComponent, Clipperz.PM.Components.RecordDetail.AbstractFieldSubComponent, { |
| 48 | 46 | ||
| 49 | 'toString': function() { | 47 | 'toString': function() { |
| 50 | return "Clipperz.PM.Components.RecordDetail.FieldTypeComponent component"; | 48 | return "Clipperz.PM.Components.RecordDetail.FieldTypeComponent component"; |
| 51 | }, | 49 | }, |
| 52 | 50 | ||
| 53 | //------------------------------------------------------------------------- | 51 | //------------------------------------------------------------------------- |
| 54 | 52 | ||
| 55 | 'inputElement': function() { | 53 | 'inputElement': function() { |
| 56 | return this._inputElement; | 54 | return this._inputElement; |
| 57 | }, | 55 | }, |
| 58 | 56 | ||
| 59 | 'setInputElement': function(aValue) { | 57 | 'setInputElement': function(aValue) { |
| 60 | this._inputElement = aValue; | 58 | this._inputElement = aValue; |
| 61 | }, | 59 | }, |
| 62 | 60 | ||
| 63 | //------------------------------------------------------------------------- | 61 | //------------------------------------------------------------------------- |
| 64 | 62 | ||
| 65 | 'value': function() { | 63 | 'value': function() { |
| 66 | return this.recordField().type(); | 64 | return this.recordField().type(); |
| 67 | }, | 65 | }, |
| 68 | 66 | ||
| 69 | 'canChangeType': function() { | 67 | 'canChangeType': function() { |
| 70 | var value; | 68 | var value; |
| 71 | var result; | 69 | var result; |
| 72 | 70 | ||
| 73 | value = this.value(); | 71 | value = this.value(); |
| 74 | result = ((value == 'TXT') || (value == 'PWD') || (value == 'URL') || (value == 'DATE') || (value == 'ADDR')); | 72 | result = ((value == 'TXT') || (value == 'PWD') || (value == 'URL') || (value == 'DATE') || (value == 'ADDR')); |
| 75 | 73 | ||
| 76 | return result | 74 | return result |
| 77 | }, | 75 | }, |
| 78 | 76 | ||
| 79 | //------------------------------------------------------------------------- | 77 | //------------------------------------------------------------------------- |
| 80 | 78 | ||
| 81 | 'updateViewMode': function() { | 79 | 'updateViewMode': function() { |
| 82 | this.element().update(""); | 80 | this.element().update(""); |
| 83 | if (this.canChangeType()) { | 81 | if (this.canChangeType()) { |
| 84 | varwidth; | 82 | varwidth; |
| 85 | var element; | 83 | var element; |
| 86 | 84 | ||
| 87 | width = this.element().getWidth(true); | 85 | width = this.element().getWidth(true); |
| 88 | element = Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'div', html:this.recordField().typeShortDescription()}, true); | 86 | element = Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'div', html:this.recordField().typeShortDescription()}, true); |
| 89 | element.setWidth(width-1); | 87 | element.setWidth(width-1); |
| 90 | } | 88 | } |
| 91 | }, | 89 | }, |
| 92 | 90 | ||
| 93 | //------------------------------------------------------------------------- | 91 | //------------------------------------------------------------------------- |
| 94 | 92 | ||
| 95 | 'updateEditMode': function() { | 93 | 'updateEditMode': function() { |
| 96 | this.element().update(""); | 94 | this.element().update(""); |
| 97 | 95 | ||
| 98 | if (this.canChangeType()) { | 96 | if (this.canChangeType()) { |
| 99 | varwidth; | 97 | varwidth; |
| 100 | 98 | ||
| 101 | width = this.element().getWidth(true); | 99 | width = this.element().getWidth(true); |
| 102 | this.setInputElement(Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'select', children:[ | 100 | this.setInputElement(Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'select', children:[ |
| 103 | {tag:'option', value:'TXT', htmlString:Clipperz.PM.Strings['recordFieldTypologies']['TXT']['shortDescription']}, | 101 | {tag:'option', value:'TXT', htmlString:Clipperz.PM.Strings['recordFieldTypologies']['TXT']['shortDescription']}, |
| 104 | {tag:'option', value:'PWD', htmlString:Clipperz.PM.Strings['recordFieldTypologies']['PWD']['shortDescription']}, | 102 | {tag:'option', value:'PWD', htmlString:Clipperz.PM.Strings['recordFieldTypologies']['PWD']['shortDescription']}, |
| 105 | {tag:'option', value:'URL', htmlString:Clipperz.PM.Strings['recordFieldTypologies']['URL']['shortDescription']}, | 103 | {tag:'option', value:'URL', htmlString:Clipperz.PM.Strings['recordFieldTypologies']['URL']['shortDescription']}, |
| 106 | {tag:'option', value:'DATE', htmlString:Clipperz.PM.Strings['recordFieldTypologies']['DATE']['shortDescription']}, | 104 | {tag:'option', value:'DATE', htmlString:Clipperz.PM.Strings['recordFieldTypologies']['DATE']['shortDescription']}, |
| 107 | {tag:'option', value:'ADDR', htmlString:Clipperz.PM.Strings['recordFieldTypologies']['ADDR']['shortDescription']} | 105 | {tag:'option', value:'ADDR', htmlString:Clipperz.PM.Strings['recordFieldTypologies']['ADDR']['shortDescription']} |
| 108 | 106 | ||
| 109 | // {tag:'option', value:'CHECK', html:Clipperz.PM.DataModel.RecordField.TypeDescriptions['CHECK']['shortDescription']}, | 107 | // {tag:'option', value:'CHECK', html:Clipperz.PM.DataModel.RecordField.TypeDescriptions['CHECK']['shortDescription']}, |
| 110 | // {tag:'option', value:'RADIO', html:Clipperz.PM.DataModel.RecordField.TypeDescriptions['RADIO']['shortDescription']}, | 108 | // {tag:'option', value:'RADIO', html:Clipperz.PM.DataModel.RecordField.TypeDescriptions['RADIO']['shortDescription']}, |
| 111 | // {tag:'option', value:'CHECK', html:Clipperz.PM.DataModel.RecordField.TypeDescriptions['SELECT']['shortDescription']} | 109 | // {tag:'option', value:'CHECK', html:Clipperz.PM.DataModel.RecordField.TypeDescriptions['SELECT']['shortDescription']} |
| 112 | // {tag:'option', value:'NOTE', html:Clipperz.PM.DataModel.RecordField.TypeDescriptions['NOTE']['shortDescription']} | 110 | // {tag:'option', value:'NOTE', html:Clipperz.PM.DataModel.RecordField.TypeDescriptions['NOTE']['shortDescription']} |
| 113 | ]}, true)); | 111 | ]}, true)); |
| 114 | this.inputElement().setWidth(width-1); | 112 | this.inputElement().setWidth(width-1); |
| 115 | this.inputElement().addHandler('change', true, this.onChange, this, true); | 113 | this.inputElement().addHandler('change', true, this.onChange, this, true); |
| 116 | // this.selectCorrectOption(); | 114 | // this.selectCorrectOption(); |
| 117 | Clipperz.DOM.selectOptionMatchingValue(this.inputElement().dom, this.value()); | 115 | Clipperz.DOM.selectOptionMatchingValue(this.inputElement().dom, this.value()); |
| 118 | } | 116 | } |
diff --git a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldValueComponent.js b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldValueComponent.js index 8621397..f2c70aa 100644 --- a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldValueComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/FieldValueComponent.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } | 27 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.RecordDetail.FieldValueComponent = function(anElement, args) { | 31 | Clipperz.PM.Components.RecordDetail.FieldValueComponent = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | Clipperz.PM.Components.RecordDetail.FieldValueComponent.superclass.constructor.call(this, anElement, args); | 34 | Clipperz.PM.Components.RecordDetail.FieldValueComponent.superclass.constructor.call(this, anElement, args); |
| 37 | 35 | ||
| 38 | this._inputElement = null; | 36 | this._inputElement = null; |
| 39 | this._scrambledStatus = 'SCRAMBLED'; //'UNSCRAMBLED' | 37 | this._scrambledStatus = 'SCRAMBLED'; //'UNSCRAMBLED' |
| 40 | 38 | ||
| 41 | this.render(); | 39 | this.render(); |
| 42 | 40 | ||
| 43 | return this; | 41 | return this; |
| 44 | } | 42 | } |
| 45 | 43 | ||
| 46 | //============================================================================= | 44 | //============================================================================= |
| 47 | 45 | ||
| 48 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.FieldValueComponent, Clipperz.PM.Components.RecordDetail.AbstractFieldSubComponent, { | 46 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.FieldValueComponent, Clipperz.PM.Components.RecordDetail.AbstractFieldSubComponent, { |
| 49 | 47 | ||
| 50 | 'toString': function() { | 48 | 'toString': function() { |
| 51 | return "Clipperz.PM.Components.RecordDetail.FieldValueComponent component"; | 49 | return "Clipperz.PM.Components.RecordDetail.FieldValueComponent component"; |
| 52 | }, | 50 | }, |
| 53 | 51 | ||
| 54 | //------------------------------------------------------------------------- | 52 | //------------------------------------------------------------------------- |
| 55 | 53 | ||
| 56 | 'value': function() { | 54 | 'value': function() { |
| 57 | return this.recordField().value(); | 55 | return this.recordField().value(); |
| 58 | }, | 56 | }, |
| 59 | 57 | ||
| 60 | 'setValue': function(aValue) { | 58 | 'setValue': function(aValue) { |
| 61 | this.recordField().setValue(aValue); | 59 | this.recordField().setValue(aValue); |
| 62 | }, | 60 | }, |
| 63 | 61 | ||
| 64 | //------------------------------------------------------------------------- | 62 | //------------------------------------------------------------------------- |
| 65 | 63 | ||
| 66 | 'inputElement': function() { | 64 | 'inputElement': function() { |
| 67 | return this._inputElement; | 65 | return this._inputElement; |
| 68 | }, | 66 | }, |
| 69 | 67 | ||
| 70 | 'setInputElement': function(aValue) { | 68 | 'setInputElement': function(aValue) { |
| 71 | this._inputElement = aValue; | 69 | this._inputElement = aValue; |
| 72 | }, | 70 | }, |
| 73 | 71 | ||
| 74 | //------------------------------------------------------------------------- | 72 | //------------------------------------------------------------------------- |
| 75 | 73 | ||
| 76 | 'scrambledStatus': function() { | 74 | 'scrambledStatus': function() { |
| 77 | return this._scrambledStatus; | 75 | return this._scrambledStatus; |
| 78 | }, | 76 | }, |
| 79 | 77 | ||
| 80 | 'setScrambledStatus': function(aValue) { | 78 | 'setScrambledStatus': function(aValue) { |
| 81 | this._scrambledStatus = aValue; | 79 | this._scrambledStatus = aValue; |
| 82 | }, | 80 | }, |
| 83 | 81 | ||
| 84 | //------------------------------------------------------------------------- | 82 | //------------------------------------------------------------------------- |
| 85 | 83 | ||
| 86 | 'handleTypeChange': function() { | 84 | 'handleTypeChange': function() { |
| 87 | //MochiKit.Logging.logDebug(">>> handling type change - " + this.recordField().type()); | 85 | //MochiKit.Logging.logDebug(">>> handling type change - " + this.recordField().type()); |
| 88 | this.synchronizeComponentValues(); | 86 | this.synchronizeComponentValues(); |
| 89 | this.update(); | 87 | this.update(); |
| 90 | }, | 88 | }, |
| 91 | 89 | ||
| 92 | //------------------------------------------------------------------------- | 90 | //------------------------------------------------------------------------- |
| 93 | 91 | ||
| 94 | 'addrUrl': function() { | 92 | 'addrUrl': function() { |
| 95 | var result; | 93 | var result; |
| 96 | 94 | ||
| 97 | result = "http://maps.google.com/maps?q=" + this.value().split(' ').join('+'); | 95 | result = "http://maps.google.com/maps?q=" + this.value().split(' ').join('+'); |
| 98 | 96 | ||
| 99 | return result; | 97 | return result; |
| 100 | }, | 98 | }, |
| 101 | 99 | ||
| 102 | //------------------------------------------------------------------------- | 100 | //------------------------------------------------------------------------- |
| 103 | 101 | ||
| 104 | 'updateViewMode': function() { | 102 | 'updateViewMode': function() { |
| 105 | var scarmbledStatus; | 103 | var scarmbledStatus; |
| 106 | 104 | ||
| 107 | scrambledStatus = this.scrambledStatus() || 'SCRAMBLED'; | 105 | scrambledStatus = this.scrambledStatus() || 'SCRAMBLED'; |
| 108 | 106 | ||
| 109 | this.element().update(""); | 107 | this.element().update(""); |
| 110 | if (this.recordField().hidden() == false) { | 108 | if (this.recordField().hidden() == false) { |
| 111 | switch(this.recordField().type()) { | 109 | switch(this.recordField().type()) { |
| 112 | case 'TXT': | 110 | case 'TXT': |
| 113 | case 'PWD': | 111 | case 'PWD': |
| 114 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'span', html:this.value()}); | 112 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'span', html:this.value()}); |
| 115 | break; | 113 | break; |
| 116 | case 'URL': | 114 | case 'URL': |
| 117 | varurlLocation; | 115 | varurlLocation; |
| 118 | 116 | ||
diff --git a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/HeaderComponent.js b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/HeaderComponent.js index 46f456b..4f12c88 100644 --- a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/HeaderComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/HeaderComponent.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } | 27 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.RecordDetail.HeaderComponent = function(anElement, args) { | 31 | Clipperz.PM.Components.RecordDetail.HeaderComponent = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | Clipperz.PM.Components.RecordDetail.HeaderComponent.superclass.constructor.call(this, anElement, args); | 34 | Clipperz.PM.Components.RecordDetail.HeaderComponent.superclass.constructor.call(this, anElement, args); |
| 37 | this.mainComponent().addEditComponent(this); | 35 | this.mainComponent().addEditComponent(this); |
| 38 | 36 | ||
| 39 | this._saveButton = null; | 37 | this._saveButton = null; |
| 40 | 38 | ||
| 41 | this.render(); | 39 | this.render(); |
| 42 | 40 | ||
| 43 | return this; | 41 | return this; |
| 44 | } | 42 | } |
| 45 | 43 | ||
| 46 | //============================================================================= | 44 | //============================================================================= |
| 47 | 45 | ||
| 48 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.HeaderComponent, Clipperz.PM.Components.RecordDetail.AbstractComponent, { | 46 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.HeaderComponent, Clipperz.PM.Components.RecordDetail.AbstractComponent, { |
| 49 | 47 | ||
| 50 | 'toString': function() { | 48 | 'toString': function() { |
| 51 | return "Clipperz.PM.Components.RecordDetail.HeaderComponent component"; | 49 | return "Clipperz.PM.Components.RecordDetail.HeaderComponent component"; |
| 52 | }, | 50 | }, |
| 53 | 51 | ||
| 54 | //------------------------------------------------------------------------- | 52 | //------------------------------------------------------------------------- |
| 55 | 53 | ||
| 56 | 'render': function() { | 54 | 'render': function() { |
| 57 | var editButton; | 55 | var editButton; |
| 58 | 56 | ||
| 59 | //MochiKit.Logging.logDebug(">>> RecordDetail.HeaderComponent.appendTo"); | 57 | //MochiKit.Logging.logDebug(">>> RecordDetail.HeaderComponent.appendTo"); |
| 60 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'div', cls:'recordDetailButtonsBox', children:[ | 58 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'div', cls:'recordDetailButtonsBox', children:[ |
| 61 | {tag:'div', id:this.getId('editButtonBox'), children:[ | 59 | {tag:'div', id:this.getId('editButtonBox'), children:[ |
| 62 | {tag:'table', cls:'recordDetailButtonsTABLE', border:'0', cellpadding:'0', cellspacing:'0', children:[ | 60 | {tag:'table', cls:'recordDetailButtonsTABLE', border:'0', cellpadding:'0', cellspacing:'0', children:[ |
| 63 | {tag:'tbody', children:[ | 61 | {tag:'tbody', children:[ |
| 64 | {tag:'tr', children:[ | 62 | {tag:'tr', children:[ |
| 65 | {tag:'td', align:'center', children:[ | 63 | {tag:'td', align:'center', children:[ |
| 66 | {tag:'div', id:this.getId('editButton')} | 64 | {tag:'div', id:this.getId('editButton')} |
| 67 | ]} | 65 | ]} |
| 68 | ]} | 66 | ]} |
| 69 | ]} | 67 | ]} |
| 70 | ]} | 68 | ]} |
| 71 | ]}, | 69 | ]}, |
| 72 | {tag:'div', id:this.getId('saveCancelButtonBox'), children:[ | 70 | {tag:'div', id:this.getId('saveCancelButtonBox'), children:[ |
| 73 | {tag:'table', cls:'recordDetailButtonsTABLE', border:'0', cellpadding:'0', cellspacing:'0', children:[ | 71 | {tag:'table', cls:'recordDetailButtonsTABLE', border:'0', cellpadding:'0', cellspacing:'0', children:[ |
| 74 | {tag:'tbody', children:[ | 72 | {tag:'tbody', children:[ |
| 75 | {tag:'tr', children:[ | 73 | {tag:'tr', children:[ |
| 76 | {tag:'td', width:'49%', align:'right', children:[ | 74 | {tag:'td', width:'49%', align:'right', children:[ |
| 77 | {tag:'div', id:this.getId('saveButton')} | 75 | {tag:'div', id:this.getId('saveButton')} |
| 78 | ]}, | 76 | ]}, |
| 79 | {tag:'td', html:' '}, | 77 | {tag:'td', html:' '}, |
| 80 | {tag:'td', width:'49%', align:'left', children:[ | 78 | {tag:'td', width:'49%', align:'left', children:[ |
| 81 | {tag:'div', id:this.getId('cancelButton')} | 79 | {tag:'div', id:this.getId('cancelButton')} |
| 82 | ]} | 80 | ]} |
| 83 | ]} | 81 | ]} |
| 84 | ]} | 82 | ]} |
| 85 | ]} | 83 | ]} |
| 86 | ]} | 84 | ]} |
| 87 | ]}); | 85 | ]}); |
| 88 | 86 | ||
| 89 | this.getElement('editButtonBox').setVisibilityMode(YAHOO.ext.Element.DISPLAY); | 87 | this.getElement('editButtonBox').setVisibilityMode(YAHOO.ext.Element.DISPLAY); |
| 90 | this.getElement('saveCancelButtonBox').setVisibilityMode(YAHOO.ext.Element.DISPLAY); | 88 | this.getElement('saveCancelButtonBox').setVisibilityMode(YAHOO.ext.Element.DISPLAY); |
| 91 | 89 | ||
| 92 | editButton = new YAHOO.ext.Button(this.getDom('editButton'), {text:Clipperz.PM.Strings['recordDetailEditButtonLabel'], handler:this.editButtonHandler, scope:this}); | 90 | editButton = new YAHOO.ext.Button(this.getDom('editButton'), {text:Clipperz.PM.Strings['recordDetailEditButtonLabel'], handler:this.editButtonHandler, scope:this}); |
| 93 | this.setSaveButton(new YAHOO.ext.Button(this.getDom('saveButton'), {text:Clipperz.PM.Strings['recordDetailSaveButtonLabel'], handler:this.saveButtonHandler, scope:this})); | 91 | this.setSaveButton(new YAHOO.ext.Button(this.getDom('saveButton'), {text:Clipperz.PM.Strings['recordDetailSaveButtonLabel'], handler:this.saveButtonHandler, scope:this})); |
| 94 | new YAHOO.ext.Button(this.getDom('cancelButton'), {text:Clipperz.PM.Strings['recordDetailCancelButtonLabel'], handler:this.cancelButtonHandler, scope:this}); | 92 | new YAHOO.ext.Button(this.getDom('cancelButton'), {text:Clipperz.PM.Strings['recordDetailCancelButtonLabel'], handler:this.cancelButtonHandler, scope:this}); |
| 95 | 93 | ||
| 96 | if (Clipperz.PM.Proxy.defaultProxy.isReadOnly()) { | 94 | if (Clipperz.PM.Proxy.defaultProxy.isReadOnly()) { |
| 97 | editButton.disable(); | 95 | editButton.disable(); |
| 98 | } | 96 | } |
| 99 | 97 | ||
| 100 | this.update(); | 98 | this.update(); |
| 101 | //MochiKit.Logging.logDebug("<<< RecordDetail.HeaderComponent.appendTo"); | 99 | //MochiKit.Logging.logDebug("<<< RecordDetail.HeaderComponent.appendTo"); |
| 102 | }, | 100 | }, |
| 103 | 101 | ||
| 104 | //------------------------------------------------------------------------- | 102 | //------------------------------------------------------------------------- |
| 105 | 103 | ||
| 106 | 'updateViewMode': function() { | 104 | 'updateViewMode': function() { |
| 107 | //MochiKit.Logging.logDebug(">>> HeaderComponent.updateViewMode"); | 105 | //MochiKit.Logging.logDebug(">>> HeaderComponent.updateViewMode"); |
| 108 | this.getElement('editButtonBox').show(); | 106 | this.getElement('editButtonBox').show(); |
| 109 | this.getElement('saveCancelButtonBox').hide(); | 107 | this.getElement('saveCancelButtonBox').hide(); |
| 110 | //MochiKit.Logging.logDebug("<<< HeaderComponent.updateViewMode"); | 108 | //MochiKit.Logging.logDebug("<<< HeaderComponent.updateViewMode"); |
| 111 | }, | 109 | }, |
| 112 | 110 | ||
| 113 | //------------------------------------------------------------------------- | 111 | //------------------------------------------------------------------------- |
| 114 | 112 | ||
| 115 | 'updateEditMode': function() { | 113 | 'updateEditMode': function() { |
| 116 | this.getElement('editButtonBox').hide(); | 114 | this.getElement('editButtonBox').hide(); |
| 117 | this.getElement('saveCancelButtonBox').show(); | 115 | this.getElement('saveCancelButtonBox').show(); |
| 118 | if (this.mainComponent().enableSaveButton() == true) { | 116 | if (this.mainComponent().enableSaveButton() == true) { |
diff --git a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/MainComponent.js b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/MainComponent.js index d6a03d7..47ed3e6 100644 --- a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/MainComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/MainComponent.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } | 27 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.RecordDetail.MainComponent = function(anElement, args) { | 31 | Clipperz.PM.Components.RecordDetail.MainComponent = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | Clipperz.PM.Components.RecordDetail.MainComponent.superclass.constructor.call(this, anElement, args); | 34 | Clipperz.PM.Components.RecordDetail.MainComponent.superclass.constructor.call(this, anElement, args); |
| 37 | 35 | ||
| 38 | //this._element = args.element; | 36 | //this._element = args.element; |
| 39 | this._user = args.user; | 37 | this._user = args.user; |
| 40 | this._editMode = args.editMode || 'VIEW'; //[ 'VIEW' | 'EDIT' ] | 38 | this._editMode = args.editMode || 'VIEW'; //[ 'VIEW' | 'EDIT' ] |
| 41 | this._mainPanel = args.mainPanel; | 39 | this._mainPanel = args.mainPanel; |
| 42 | 40 | ||
| 43 | this._record = null; | 41 | this._record = null; |
| 44 | this._editComponents = []; | 42 | this._editComponents = []; |
| 45 | this._addFieldButton = null; | 43 | this._addFieldButton = null; |
| 46 | 44 | ||
| 47 | this._enableSaveButton = true; | 45 | this._enableSaveButton = true; |
| 48 | this._shouldShowLoginInfo = (Clipperz.PM.Proxy.defaultProxy.isReadOnly() ? false : true); | 46 | this._shouldShowLoginInfo = (Clipperz.PM.Proxy.defaultProxy.isReadOnly() ? false : true); |
| 49 | 47 | ||
| 50 | //this._mainLayoutManager = null; | 48 | //this._mainLayoutManager = null; |
| 51 | //this._layoutRegion = null; | 49 | //this._layoutRegion = null; |
| 52 | 50 | ||
| 53 | Clipperz.NotificationCenter.register(null, 'loadingRecordData', this, 'render'); | 51 | Clipperz.NotificationCenter.register(null, 'loadingRecordData', this, 'render'); |
| 54 | Clipperz.NotificationCenter.register(null, 'decryptingRecordData', this, 'render'); | 52 | Clipperz.NotificationCenter.register(null, 'decryptingRecordData', this, 'render'); |
| 55 | Clipperz.NotificationCenter.register(null, 'loadingRecordVersionData', this, 'render'); | 53 | Clipperz.NotificationCenter.register(null, 'loadingRecordVersionData', this, 'render'); |
| 56 | Clipperz.NotificationCenter.register(null, 'decryptingRecordVersionData', this, 'render'); | 54 | Clipperz.NotificationCenter.register(null, 'decryptingRecordVersionData', this, 'render'); |
| 57 | Clipperz.NotificationCenter.register(null, 'setupDone', this, 'render'); | 55 | Clipperz.NotificationCenter.register(null, 'setupDone', this, 'render'); |
| 58 | Clipperz.NotificationCenter.register(null, 'switchLanguage', this, 'render'); | 56 | Clipperz.NotificationCenter.register(null, 'switchLanguage', this, 'render'); |
| 59 | 57 | ||
| 60 | this.render(); | 58 | this.render(); |
| 61 | 59 | ||
| 62 | return this; | 60 | return this; |
| 63 | } | 61 | } |
| 64 | 62 | ||
| 65 | //============================================================================= | 63 | //============================================================================= |
| 66 | 64 | ||
| 67 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.MainComponent, Clipperz.PM.Components.BaseComponent, { | 65 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.MainComponent, Clipperz.PM.Components.BaseComponent, { |
| 68 | 66 | ||
| 69 | 'toString': function() { | 67 | 'toString': function() { |
| 70 | return "Clipperz.PM.Components.RecordDetail.MainComponent component"; | 68 | return "Clipperz.PM.Components.RecordDetail.MainComponent component"; |
| 71 | }, | 69 | }, |
| 72 | 70 | ||
| 73 | //------------------------------------------------------------------------- | 71 | //------------------------------------------------------------------------- |
| 74 | 72 | ||
| 75 | 'editMode': function() { | 73 | 'editMode': function() { |
| 76 | return this._editMode; | 74 | return this._editMode; |
| 77 | }, | 75 | }, |
| 78 | 76 | ||
| 79 | 'setEditMode': function(aValue, aButtonElement, shouldSkipComponentSynchronization) { | 77 | 'setEditMode': function(aValue, aButtonElement, shouldSkipComponentSynchronization) { |
| 80 | //MochiKit.Logging.logDebug(">>> MainComponent.setEditingMode"); | 78 | //MochiKit.Logging.logDebug(">>> MainComponent.setEditingMode"); |
| 81 | this.scrollToTop(); | 79 | this.scrollToTop(); |
| 82 | 80 | ||
| 83 | if (aValue == 'VIEW') { | 81 | if (aValue == 'VIEW') { |
| 84 | if (shouldSkipComponentSynchronization == true) { | 82 | if (shouldSkipComponentSynchronization == true) { |
| 85 | this.exitModalView(); | 83 | this.exitModalView(); |
| 86 | } else { | 84 | } else { |
| 87 | this.synchronizeComponentValues(); | 85 | this.synchronizeComponentValues(); |
| 88 | if (this.record().hasPendingChanges()) { | 86 | if (this.record().hasPendingChanges()) { |
| 89 | if (this.record().isBrandNew()) { | 87 | if (this.record().isBrandNew()) { |
| 90 | this.record().removeEmptyFields(); | 88 | this.record().removeEmptyFields(); |
| 91 | } | 89 | } |
| 92 | this.saveCurrentRecordChanges(aButtonElement); | 90 | this.saveCurrentRecordChanges(aButtonElement); |
| 93 | } else { | 91 | } else { |
| 94 | if (this.record().isBrandNew()) { | 92 | if (this.record().isBrandNew()) { |
| 95 | this.record().user().removeRecord(this.record()); | 93 | this.record().user().removeRecord(this.record()); |
| 96 | } | 94 | } |
| 97 | this.exitModalView(); | 95 | this.exitModalView(); |
| 98 | } | 96 | } |
| 99 | } | 97 | } |
| 100 | } else if (aValue == 'EDIT') { | 98 | } else if (aValue == 'EDIT') { |
| 101 | this.enterModalView(); | 99 | this.enterModalView(); |
| 102 | } else { | 100 | } else { |
| 103 | //???? | 101 | //???? |
| 104 | } | 102 | } |
| 105 | 103 | ||
| 106 | this._editMode = aValue; | 104 | this._editMode = aValue; |
| 107 | this.render(); | 105 | this.render(); |
| 108 | }, | 106 | }, |
| 109 | 107 | ||
| 110 | //------------------------------------------------------------------------- | 108 | //------------------------------------------------------------------------- |
| 111 | 109 | ||
| 112 | 'user': function() { | 110 | 'user': function() { |
| 113 | return this._user; | 111 | return this._user; |
| 114 | }, | 112 | }, |
| 115 | 113 | ||
| 116 | //------------------------------------------------------------------------- | 114 | //------------------------------------------------------------------------- |
| 117 | 115 | ||
| 118 | 'mainPanel': function() { | 116 | 'mainPanel': function() { |
diff --git a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/NotesComponent.js b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/NotesComponent.js index 2066543..bb23e8d 100644 --- a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/NotesComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/NotesComponent.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } | 27 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | 31 | ||
| 34 | 32 | ||
| 35 | Clipperz.PM.Components.RecordDetail.NotesComponent = function(anElement, args) { | 33 | Clipperz.PM.Components.RecordDetail.NotesComponent = function(anElement, args) { |
| 36 | //MochiKit.Logging.logDebug(">>> new NotesComponent"); | 34 | //MochiKit.Logging.logDebug(">>> new NotesComponent"); |
| 37 | args = args || {}; | 35 | args = args || {}; |
| 38 | 36 | ||
| 39 | Clipperz.PM.Components.RecordDetail.NotesComponent.superclass.constructor.call(this, anElement, args); | 37 | Clipperz.PM.Components.RecordDetail.NotesComponent.superclass.constructor.call(this, anElement, args); |
| 40 | 38 | ||
| 41 | this.mainComponent().addEditComponent(this); | 39 | this.mainComponent().addEditComponent(this); |
| 42 | 40 | ||
| 43 | this._staticOffset = null; | 41 | this._staticOffset = null; |
| 44 | this._componentHeight = 50; | 42 | this._componentHeight = 50; |
| 45 | this._mouseMoveIdentifier = null; | 43 | this._mouseMoveIdentifier = null; |
| 46 | this._mouseUpIdentifier = null; | 44 | this._mouseUpIdentifier = null; |
| 47 | 45 | ||
| 48 | this.element().setVisibilityMode(YAHOO.ext.Element.DISPLAY); | 46 | this.element().setVisibilityMode(YAHOO.ext.Element.DISPLAY); |
| 49 | 47 | ||
| 50 | this.render(); | 48 | this.render(); |
| 51 | //MochiKit.Logging.logDebug("<<< new NotesComponent"); | 49 | //MochiKit.Logging.logDebug("<<< new NotesComponent"); |
| 52 | 50 | ||
| 53 | return this; | 51 | return this; |
| 54 | } | 52 | } |
| 55 | 53 | ||
| 56 | //============================================================================= | 54 | //============================================================================= |
| 57 | 55 | ||
| 58 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.NotesComponent, Clipperz.PM.Components.RecordDetail.AbstractComponent, { | 56 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.NotesComponent, Clipperz.PM.Components.RecordDetail.AbstractComponent, { |
| 59 | 57 | ||
| 60 | 'toString': function() { | 58 | 'toString': function() { |
| 61 | return "Clipperz.PM.Components.RecordDetail.NotesComponent component"; | 59 | return "Clipperz.PM.Components.RecordDetail.NotesComponent component"; |
| 62 | }, | 60 | }, |
| 63 | 61 | ||
| 64 | //------------------------------------------------------------------------- | 62 | //------------------------------------------------------------------------- |
| 65 | 63 | ||
| 66 | 'value': function() { | 64 | 'value': function() { |
| 67 | return this.record().notes(); | 65 | return this.record().notes(); |
| 68 | }, | 66 | }, |
| 69 | 67 | ||
| 70 | 'setValue': function(aValue) { | 68 | 'setValue': function(aValue) { |
| 71 | this.record().setNotes(aValue); | 69 | this.record().setNotes(aValue); |
| 72 | }, | 70 | }, |
| 73 | 71 | ||
| 74 | //------------------------------------------------------------------------- | 72 | //------------------------------------------------------------------------- |
| 75 | 73 | ||
| 76 | 'render': function() { | 74 | 'render': function() { |
| 77 | //MochiKit.Logging.logDebug(">>> NotesComponent.render"); | 75 | //MochiKit.Logging.logDebug(">>> NotesComponent.render"); |
| 78 | /* | 76 | /* |
| 79 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'td', colspan:'5', children:[ | 77 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'td', colspan:'5', children:[ |
| 80 | {tag:'span', cls:'noteFieldLabel', htmlString:Clipperz.PM.Strings['recordDetailNotesLabel']}, | 78 | {tag:'span', cls:'noteFieldLabel', htmlString:Clipperz.PM.Strings['recordDetailNotesLabel']}, |
| 81 | {tag:'div', cls:'noteFieldContent', id:this.getId('notes')} | 79 | {tag:'div', cls:'noteFieldContent', id:this.getId('notes')} |
| 82 | ]}); | 80 | ]}); |
| 83 | */ | 81 | */ |
| 84 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'span', cls:'noteFieldLabel', htmlString:Clipperz.PM.Strings['recordDetailNotesLabel']}); | 82 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'span', cls:'noteFieldLabel', htmlString:Clipperz.PM.Strings['recordDetailNotesLabel']}); |
| 85 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'div', cls:'noteFieldContent', id:this.getId('notes'), children:[ | 83 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'div', cls:'noteFieldContent', id:this.getId('notes'), children:[ |
| 86 | {tag:'div', id:this.getId('resizableDiv'), cls:'resizable-textarea', children:[ | 84 | {tag:'div', id:this.getId('resizableDiv'), cls:'resizable-textarea', children:[ |
| 87 | {tag:'div', id:this.getId('contentView'), cls:'viewMode', html:""}, | 85 | {tag:'div', id:this.getId('contentView'), cls:'viewMode', html:""}, |
| 88 | {tag:'div', id:this.getId('contentEdit'), children:[ | 86 | {tag:'div', id:this.getId('contentEdit'), children:[ |
| 89 | {tag:'span', children:[ | 87 | {tag:'span', children:[ |
| 90 | {tag:'textarea', id:this.getId('textarea'), html:""} | 88 | {tag:'textarea', id:this.getId('textarea'), html:""} |
| 91 | ]} | 89 | ]} |
| 92 | ]}, | 90 | ]}, |
| 93 | {tag:'div', id:this.getId('grippie'), cls:'grippie'} | 91 | {tag:'div', id:this.getId('grippie'), cls:'grippie'} |
| 94 | ]} | 92 | ]} |
| 95 | ]}); | 93 | ]}); |
| 96 | 94 | ||
| 97 | this.getElement('contentView').setVisibilityMode(YAHOO.ext.Element.DISPLAY); | 95 | this.getElement('contentView').setVisibilityMode(YAHOO.ext.Element.DISPLAY); |
| 98 | this.getElement('contentEdit').setVisibilityMode(YAHOO.ext.Element.DISPLAY); | 96 | this.getElement('contentEdit').setVisibilityMode(YAHOO.ext.Element.DISPLAY); |
| 99 | 97 | ||
| 100 | MochiKit.Signal.connect(this.getId('grippie'), 'onmousedown', this, 'startResize'); | 98 | MochiKit.Signal.connect(this.getId('grippie'), 'onmousedown', this, 'startResize'); |
| 101 | 99 | ||
| 102 | this.update(); | 100 | this.update(); |
| 103 | //MochiKit.Logging.logDebug("<<< NotesComponent.render"); | 101 | //MochiKit.Logging.logDebug("<<< NotesComponent.render"); |
| 104 | }, | 102 | }, |
| 105 | 103 | ||
| 106 | //------------------------------------------------------------------------- | 104 | //------------------------------------------------------------------------- |
| 107 | 105 | ||
| 108 | 'updateViewMode': function() { | 106 | 'updateViewMode': function() { |
| 109 | //MochiKit.Logging.logDebug(">>> NotesComponent.updateViewMode"); | 107 | //MochiKit.Logging.logDebug(">>> NotesComponent.updateViewMode"); |
| 110 | // this.getElement('notes').update(this.value().replace(/\n/g, '<br>')); | 108 | // this.getElement('notes').update(this.value().replace(/\n/g, '<br>')); |
| 111 | 109 | ||
| 112 | this.getElement('contentView').update(Clipperz.Base.sanitizeString(this.value()).replace(/\n/g, '<br>')); | 110 | this.getElement('contentView').update(Clipperz.Base.sanitizeString(this.value()).replace(/\n/g, '<br>')); |
| 113 | 111 | ||
| 114 | if (this.isNoteEmpty()) { | 112 | if (this.isNoteEmpty()) { |
| 115 | this.element().hide(); | 113 | this.element().hide(); |
| 116 | } else { | 114 | } else { |
| 117 | this.getElement('contentView').show(); | 115 | this.getElement('contentView').show(); |
| 118 | this.getElement('contentView').setHeight(this.componentHeight()); | 116 | this.getElement('contentView').setHeight(this.componentHeight()); |
diff --git a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/TitleComponent.js b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/TitleComponent.js index 29fe972..d114eaa 100644 --- a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/TitleComponent.js +++ b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/TitleComponent.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } | 27 | if (typeof(Clipperz.PM.Components.RecordDetail) == 'undefined') { Clipperz.PM.Components.RecordDetail = {}; } |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Components.RecordDetail.TitleComponent = function(anElement, args) { | 31 | Clipperz.PM.Components.RecordDetail.TitleComponent = function(anElement, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | Clipperz.PM.Components.RecordDetail.TitleComponent.superclass.constructor.call(this, anElement, args); | 34 | Clipperz.PM.Components.RecordDetail.TitleComponent.superclass.constructor.call(this, anElement, args); |
| 37 | 35 | ||
| 38 | //this._inputElement = null; | 36 | //this._inputElement = null; |
| 39 | 37 | ||
| 40 | this.mainComponent().addEditComponent(this); | 38 | this.mainComponent().addEditComponent(this); |
| 41 | 39 | ||
| 42 | this.render(); | 40 | this.render(); |
| 43 | 41 | ||
| 44 | return this; | 42 | return this; |
| 45 | } | 43 | } |
| 46 | 44 | ||
| 47 | //============================================================================= | 45 | //============================================================================= |
| 48 | 46 | ||
| 49 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.TitleComponent, Clipperz.PM.Components.RecordDetail.AbstractComponent, { | 47 | YAHOO.extendX(Clipperz.PM.Components.RecordDetail.TitleComponent, Clipperz.PM.Components.RecordDetail.AbstractComponent, { |
| 50 | 48 | ||
| 51 | 'toString': function() { | 49 | 'toString': function() { |
| 52 | return "Clipperz.PM.Components.RecordDetail.TitleComponent component"; | 50 | return "Clipperz.PM.Components.RecordDetail.TitleComponent component"; |
| 53 | }, | 51 | }, |
| 54 | 52 | ||
| 55 | //------------------------------------------------------------------------- | 53 | //------------------------------------------------------------------------- |
| 56 | 54 | ||
| 57 | 'value': function() { | 55 | 'value': function() { |
| 58 | return this.record().label(); | 56 | return this.record().label(); |
| 59 | }, | 57 | }, |
| 60 | 58 | ||
| 61 | 'setValue': function(aValue) { | 59 | 'setValue': function(aValue) { |
| 62 | this.record().setLabel(aValue); | 60 | this.record().setLabel(aValue); |
| 63 | }, | 61 | }, |
| 64 | 62 | ||
| 65 | //------------------------------------------------------------------------- | 63 | //------------------------------------------------------------------------- |
| 66 | /* | 64 | /* |
| 67 | 'inputElement': function() { | 65 | 'inputElement': function() { |
| 68 | return this._inputElement; | 66 | return this._inputElement; |
| 69 | }, | 67 | }, |
| 70 | 68 | ||
| 71 | 'setInputElement': function(aValue) { | 69 | 'setInputElement': function(aValue) { |
| 72 | this._inputElement = aValue; | 70 | this._inputElement = aValue; |
| 73 | }, | 71 | }, |
| 74 | */ | 72 | */ |
| 75 | //------------------------------------------------------------------------- | 73 | //------------------------------------------------------------------------- |
| 76 | 74 | ||
| 77 | 'render': function() { | 75 | 'render': function() { |
| 78 | // Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'td', html:' '}); | 76 | // Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'td', html:' '}); |
| 79 | // Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'td', colspan:"3", html:' ', children:[ | 77 | // Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'td', colspan:"3", html:' ', children:[ |
| 80 | // {tag:'div', /*style:'border: 1px solid green;',*/ id:this.getId('title')} | 78 | // {tag:'div', /*style:'border: 1px solid green;',*/ id:this.getId('title')} |
| 81 | // ]}); | 79 | // ]}); |
| 82 | // Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'td', html:' '}); | 80 | // Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'td', html:' '}); |
| 83 | // | 81 | // |
| 84 | // this.setInputElement(new Clipperz.PM.Components.TextFormField(this.getElement('title'), {editMode:this.editMode(), value:this.value()})); | 82 | // this.setInputElement(new Clipperz.PM.Components.TextFormField(this.getElement('title'), {editMode:this.editMode(), value:this.value()})); |
| 85 | 83 | ||
| 86 | this.update(); | 84 | this.update(); |
| 87 | }, | 85 | }, |
| 88 | 86 | ||
| 89 | //------------------------------------------------------------------------- | 87 | //------------------------------------------------------------------------- |
| 90 | /* | 88 | /* |
| 91 | 'update': function() { | 89 | 'update': function() { |
| 92 | this.inputElement().update({value:this.value(), editMode:this.editMode()}); | 90 | this.inputElement().update({value:this.value(), editMode:this.editMode()}); |
| 93 | }, | 91 | }, |
| 94 | */ | 92 | */ |
| 95 | //------------------------------------------------------------------------- | 93 | //------------------------------------------------------------------------- |
| 96 | 94 | ||
| 97 | 'updateViewMode': function() { | 95 | 'updateViewMode': function() { |
| 98 | this.element().update(""); | 96 | this.element().update(""); |
| 99 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'h2', html:this.value()}); | 97 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'h2', html:this.value()}); |
| 100 | }, | 98 | }, |
| 101 | 99 | ||
| 102 | //------------------------------------------------------------------------- | 100 | //------------------------------------------------------------------------- |
| 103 | 101 | ||
| 104 | 'updateEditMode': function() { | 102 | 'updateEditMode': function() { |
| 105 | //MochiKit.Logging.logDebug(">>> TitleComponent.updateEditMode"); | 103 | //MochiKit.Logging.logDebug(">>> TitleComponent.updateEditMode"); |
| 106 | // this.getElement('title').update(""); | 104 | // this.getElement('title').update(""); |
| 107 | // Clipperz.YUI.DomHelper.append(this.getDom('title'), {tag:'div', id:this.getId('title_input')}); | 105 | // Clipperz.YUI.DomHelper.append(this.getDom('title'), {tag:'div', id:this.getId('title_input')}); |
| 108 | // this.setInputElement(Clipperz.YUI.DomHelper.append(this.getDom('title_input'), {tag:'input', type:'text', value:this.value()}, true)); | 106 | // this.setInputElement(Clipperz.YUI.DomHelper.append(this.getDom('title_input'), {tag:'input', type:'text', value:this.value()}, true)); |
| 109 | 107 | ||
| 110 | this.element().update(""); | 108 | this.element().update(""); |
| 111 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'input', id:this.getId('titleField'), type:'text', value:"this.value()"}); | 109 | Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'input', id:this.getId('titleField'), type:'text', value:"this.value()"}); |
| 112 | this.getElement('titleField').dom.value = this.value(); | 110 | this.getElement('titleField').dom.value = this.value(); |
| 113 | 111 | ||
| 114 | //MochiKit.Logging.logDebug("<<< TitleComponent.updateEditMode"); | 112 | //MochiKit.Logging.logDebug("<<< TitleComponent.updateEditMode"); |
| 115 | }, | 113 | }, |
| 116 | 114 | ||
| 117 | //------------------------------------------------------------------------- | 115 | //------------------------------------------------------------------------- |
| 118 | 116 | ||
diff --git a/frontend/beta/js/Clipperz/PM/Components/TabPanel/TabPanelController.js b/frontend/beta/js/Clipperz/PM/Components/TabPanel/TabPanelController.js index b300ba6..d30f514 100644 --- a/frontend/beta/js/Clipperz/PM/Components/TabPanel/TabPanelController.js +++ b/frontend/beta/js/Clipperz/PM/Components/TabPanel/TabPanelController.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | if (typeof(Clipperz.PM.Components.TabPanel) == 'undefined') { Clipperz.PM.Components.TabPanel = {}; } | 27 | if (typeof(Clipperz.PM.Components.TabPanel) == 'undefined') { Clipperz.PM.Components.TabPanel = {}; } |
| 30 | 28 | ||
| 31 | Clipperz.PM.Components.TabPanel.TabPanelController = function(args) { | 29 | Clipperz.PM.Components.TabPanel.TabPanelController = function(args) { |
| 32 | args = args || {}; | 30 | args = args || {}; |
| 33 | 31 | ||
| 34 | Clipperz.PM.Components.TabPanel.TabPanelController.superclass.constructor.call(this); | 32 | Clipperz.PM.Components.TabPanel.TabPanelController.superclass.constructor.call(this); |
| 35 | 33 | ||
| 36 | this._name = args.name || 'undefined'; | 34 | this._name = args.name || 'undefined'; |
| 37 | this._config = args.config; | 35 | this._config = args.config; |
| 38 | this._selectedTab = args.selectedTab || ((MochiKit.Base.keys(args.config).length > 0) ? MochiKit.Base.keys(args.config)[0] : null); | 36 | this._selectedTab = args.selectedTab || ((MochiKit.Base.keys(args.config).length > 0) ? MochiKit.Base.keys(args.config)[0] : null); |
| 39 | 37 | ||
| 40 | this._tabs = {}; | 38 | this._tabs = {}; |
| 41 | this._panels = {}; | 39 | this._panels = {}; |
| 42 | 40 | ||
| 43 | Clipperz.NotificationCenter.register(null, 'selectTab', this, 'handleSelectTabNotification'); | 41 | Clipperz.NotificationCenter.register(null, 'selectTab', this, 'handleSelectTabNotification'); |
| 44 | return this; | 42 | return this; |
| 45 | } | 43 | } |
| 46 | 44 | ||
| 47 | //============================================================================= | 45 | //============================================================================= |
| 48 | 46 | ||
| 49 | YAHOO.extendX(Clipperz.PM.Components.TabPanel.TabPanelController, YAHOO.ext.util.Observable, { | 47 | YAHOO.extendX(Clipperz.PM.Components.TabPanel.TabPanelController, YAHOO.ext.util.Observable, { |
| 50 | 48 | ||
| 51 | //------------------------------------------------------------------------- | 49 | //------------------------------------------------------------------------- |
| 52 | 50 | ||
| 53 | 'name': function() { | 51 | 'name': function() { |
| 54 | return this._name; | 52 | return this._name; |
| 55 | }, | 53 | }, |
| 56 | 54 | ||
| 57 | //------------------------------------------------------------------------- | 55 | //------------------------------------------------------------------------- |
| 58 | 56 | ||
| 59 | 'tabs': function() { | 57 | 'tabs': function() { |
| 60 | return this._tabs; | 58 | return this._tabs; |
| 61 | }, | 59 | }, |
| 62 | 60 | ||
| 63 | //------------------------------------------------------------------------- | 61 | //------------------------------------------------------------------------- |
| 64 | 62 | ||
| 65 | 'panels': function() { | 63 | 'panels': function() { |
| 66 | return this._panels; | 64 | return this._panels; |
| 67 | }, | 65 | }, |
| 68 | 66 | ||
| 69 | //------------------------------------------------------------------------- | 67 | //------------------------------------------------------------------------- |
| 70 | 68 | ||
| 71 | 'config': function() { | 69 | 'config': function() { |
| 72 | return this._config; | 70 | return this._config; |
| 73 | }, | 71 | }, |
| 74 | 72 | ||
| 75 | //------------------------------------------------------------------------- | 73 | //------------------------------------------------------------------------- |
| 76 | 74 | ||
| 77 | 'selectedTab': function() { | 75 | 'selectedTab': function() { |
| 78 | return this._selectedTab; | 76 | return this._selectedTab; |
| 79 | }, | 77 | }, |
| 80 | 78 | ||
| 81 | 'setSelectedTab': function(aValue) { | 79 | 'setSelectedTab': function(aValue) { |
| 82 | this._selectedTab = aValue; | 80 | this._selectedTab = aValue; |
| 83 | }, | 81 | }, |
| 84 | 82 | ||
| 85 | //------------------------------------------------------------------------- | 83 | //------------------------------------------------------------------------- |
| 86 | 84 | ||
| 87 | 'setUp': function() { | 85 | 'setUp': function() { |
| 88 | vartabId; | 86 | vartabId; |
| 89 | 87 | ||
| 90 | //MochiKit.Logging.logDebug(">>> TabPanelController.setUp - config: " + Clipperz.Base.serializeJSON(this.config())); | 88 | //MochiKit.Logging.logDebug(">>> TabPanelController.setUp - config: " + Clipperz.Base.serializeJSON(this.config())); |
| 91 | for (tabId in this.config()) { | 89 | for (tabId in this.config()) { |
| 92 | vartabElement; | 90 | vartabElement; |
| 93 | varpanelElement; | 91 | varpanelElement; |
| 94 | 92 | ||
| 95 | //MochiKit.Logging.logDebug("--- TabPanelController.setUp - tabId: " + tabId); | 93 | //MochiKit.Logging.logDebug("--- TabPanelController.setUp - tabId: " + tabId); |
| 96 | //MochiKit.Logging.logDebug("--- TabPanelController.setUp - panelId: " + this.config()[tabId]); | 94 | //MochiKit.Logging.logDebug("--- TabPanelController.setUp - panelId: " + this.config()[tabId]); |
| 97 | tabElement = YAHOO.ext.Element.get(tabId); | 95 | tabElement = YAHOO.ext.Element.get(tabId); |
| 98 | tabElement.addClassOnOver("hover"); | 96 | tabElement.addClassOnOver("hover"); |
| 99 | MochiKit.Signal.connect(tabId, 'onclick', this, 'selectTabHandler'); | 97 | MochiKit.Signal.connect(tabId, 'onclick', this, 'selectTabHandler'); |
| 100 | 98 | ||
| 101 | panelElement = YAHOO.ext.Element.get(this.config()[tabId]); | 99 | panelElement = YAHOO.ext.Element.get(this.config()[tabId]); |
| 102 | 100 | ||
| 103 | this._tabs[tabId] = tabElement; | 101 | this._tabs[tabId] = tabElement; |
| 104 | this._panels[tabId] = panelElement; | 102 | this._panels[tabId] = panelElement; |
| 105 | 103 | ||
| 106 | if (tabId == this.selectedTab()) { | 104 | if (tabId == this.selectedTab()) { |
| 107 | tabElement.addClass('selectedTab'); | 105 | tabElement.addClass('selectedTab'); |
| 108 | panelElement.addClass('selectedPanel'); | 106 | panelElement.addClass('selectedPanel'); |
| 109 | } else { | 107 | } else { |
| 110 | panelElement.addClass('hiddenPanel'); | 108 | panelElement.addClass('hiddenPanel'); |
| 111 | } | 109 | } |
| 112 | } | 110 | } |
| 113 | //MochiKit.Logging.logDebug("<<< TabPanelController.setUp"); | 111 | //MochiKit.Logging.logDebug("<<< TabPanelController.setUp"); |
| 114 | }, | 112 | }, |
| 115 | 113 | ||
| 116 | //------------------------------------------------------------------------- | 114 | //------------------------------------------------------------------------- |
| 117 | 115 | ||
| 118 | 'selectTab': function(aTab) { | 116 | 'selectTab': function(aTab) { |
diff --git a/frontend/beta/js/Clipperz/PM/Components/TextFormField.js b/frontend/beta/js/Clipperz/PM/Components/TextFormField.js index c6f0349..2b383ce 100644 --- a/frontend/beta/js/Clipperz/PM/Components/TextFormField.js +++ b/frontend/beta/js/Clipperz/PM/Components/TextFormField.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } | 26 | if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; } |
| 29 | 27 | ||
| 30 | Clipperz.PM.Components.TextFormField = function(anElement, args) { | 28 | Clipperz.PM.Components.TextFormField = function(anElement, args) { |
| 31 | args = args || {}; | 29 | args = args || {}; |
| 32 | 30 | ||
| 33 | //MochiKit.Logging.logDebug(">>> new TextFormField"); | 31 | //MochiKit.Logging.logDebug(">>> new TextFormField"); |
| 34 | Clipperz.PM.Components.TextFormField.superclass.constructor.call(this, args); | 32 | Clipperz.PM.Components.TextFormField.superclass.constructor.call(this, args); |
| 35 | 33 | ||
| 36 | this._element = anElement; | 34 | this._element = anElement; |
| 37 | this._editMode = args.editMode || 'VIEW'; | 35 | this._editMode = args.editMode || 'VIEW'; |
| 38 | this._value = args.value || ""; | 36 | this._value = args.value || ""; |
| 39 | this._inputElement = null; | 37 | this._inputElement = null; |
| 40 | this._wrapper = null; | 38 | this._wrapper = null; |
| 41 | this._multiline = args.multiline || false; | 39 | this._multiline = args.multiline || false; |
| 42 | 40 | ||
| 43 | //this.multiline = args.multiline || true; | 41 | //this.multiline = args.multiline || true; |
| 44 | //this.editing = true; | 42 | //this.editing = true; |
| 45 | //this.completeOnBlur = true; | 43 | //this.completeOnBlur = true; |
| 46 | //this.autoSizeTask = new YAHOO.ext.util.DelayedTask(this.autoSize, this); | 44 | //this.autoSizeTask = new YAHOO.ext.util.DelayedTask(this.autoSize, this); |
| 47 | //this.textSizeEl = Clipperz.YUI.DomHelper.append(document.body, { | 45 | //this.textSizeEl = Clipperz.YUI.DomHelper.append(document.body, { |
| 48 | // tag: 'div', | 46 | // tag: 'div', |
| 49 | // cls: 'yinline-editor-sizer ' + (this.cls || '') | 47 | // cls: 'yinline-editor-sizer ' + (this.cls || '') |
| 50 | //}); | 48 | //}); |
| 51 | 49 | ||
| 52 | this.render(); | 50 | this.render(); |
| 53 | //MochiKit.Logging.logDebug("<<< new TextFormField"); | 51 | //MochiKit.Logging.logDebug("<<< new TextFormField"); |
| 54 | 52 | ||
| 55 | return this; | 53 | return this; |
| 56 | }; | 54 | }; |
| 57 | 55 | ||
| 58 | YAHOO.extendX(Clipperz.PM.Components.TextFormField, Clipperz.PM.Components.BaseComponent, { | 56 | YAHOO.extendX(Clipperz.PM.Components.TextFormField, Clipperz.PM.Components.BaseComponent, { |
| 59 | 57 | ||
| 60 | 'toString': function() { | 58 | 'toString': function() { |
| 61 | return "Clipperz.PM.Components.TextFormField"; | 59 | return "Clipperz.PM.Components.TextFormField"; |
| 62 | }, | 60 | }, |
| 63 | 61 | ||
| 64 | //----------------------------------------------------- | 62 | //----------------------------------------------------- |
| 65 | 63 | ||
| 66 | 'value': function() { | 64 | 'value': function() { |
| 67 | if (this.inputElement() != null) { | 65 | if (this.inputElement() != null) { |
| 68 | this._value = this.inputElement().dom.value; | 66 | this._value = this.inputElement().dom.value; |
| 69 | } | 67 | } |
| 70 | 68 | ||
| 71 | return this._value; | 69 | return this._value; |
| 72 | // return this.inlineEditor().getValue(); | 70 | // return this.inlineEditor().getValue(); |
| 73 | }, | 71 | }, |
| 74 | 72 | ||
| 75 | 'setValue': function(aValue) { | 73 | 'setValue': function(aValue) { |
| 76 | this._value = aValue; | 74 | this._value = aValue; |
| 77 | // this.getElement('viewComponent_Content').update(aValue); | 75 | // this.getElement('viewComponent_Content').update(aValue); |
| 78 | // this.inlineEditor().setValue(aValue); | 76 | // this.inlineEditor().setValue(aValue); |
| 79 | }, | 77 | }, |
| 80 | 78 | ||
| 81 | //----------------------------------------------------- | 79 | //----------------------------------------------------- |
| 82 | 80 | ||
| 83 | 'multiline': function() { | 81 | 'multiline': function() { |
| 84 | return this._multiline; | 82 | return this._multiline; |
| 85 | }, | 83 | }, |
| 86 | 84 | ||
| 87 | //----------------------------------------------------- | 85 | //----------------------------------------------------- |
| 88 | 86 | ||
| 89 | 'editMode': function() { | 87 | 'editMode': function() { |
| 90 | return this._editMode; | 88 | return this._editMode; |
| 91 | }, | 89 | }, |
| 92 | 90 | ||
| 93 | 'setEditMode': function(aValue) { | 91 | 'setEditMode': function(aValue) { |
| 94 | this._editMode = aValue; | 92 | this._editMode = aValue; |
| 95 | }, | 93 | }, |
| 96 | 94 | ||
| 97 | //----------------------------------------------------- | 95 | //----------------------------------------------------- |
| 98 | 96 | ||
| 99 | 'inputElement': function() { | 97 | 'inputElement': function() { |
| 100 | return this._inputElement; | 98 | return this._inputElement; |
| 101 | }, | 99 | }, |
| 102 | 100 | ||
| 103 | 'setInputElement': function(aValue) { | 101 | 'setInputElement': function(aValue) { |
| 104 | this._inputElement = aValue; | 102 | this._inputElement = aValue; |
| 105 | }, | 103 | }, |
| 106 | 104 | ||
| 107 | //----------------------------------------------------- | 105 | //----------------------------------------------------- |
| 108 | 106 | ||
| 109 | 'on': function(anEventName, anHandler, aScope, shouldOverride) { | 107 | 'on': function(anEventName, anHandler, aScope, shouldOverride) { |
| 110 | //MochiKit.Logging.logDebug(">>> TextFormField.on - inputElement: " + this.inputElement()); | 108 | //MochiKit.Logging.logDebug(">>> TextFormField.on - inputElement: " + this.inputElement()); |
| 111 | return this.inputElement().on(anEventName, anHandler, aScope, shouldOverride); | 109 | return this.inputElement().on(anEventName, anHandler, aScope, shouldOverride); |
| 112 | //MochiKit.Logging.logDebug("<<< TextFormField.on - inputElement: " + this.inputElement()); | 110 | //MochiKit.Logging.logDebug("<<< TextFormField.on - inputElement: " + this.inputElement()); |
| 113 | }, | 111 | }, |
| 114 | 112 | ||
| 115 | //----------------------------------------------------- | 113 | //----------------------------------------------------- |
| 116 | 114 | ||
| 117 | 'wrapper': function() { | 115 | 'wrapper': function() { |
| 118 | return this._wrapper; | 116 | return this._wrapper; |
diff --git a/frontend/beta/js/Clipperz/PM/Connection.js b/frontend/beta/js/Clipperz/PM/Connection.js index e81c7a6..613e7d6 100644 --- a/frontend/beta/js/Clipperz/PM/Connection.js +++ b/frontend/beta/js/Clipperz/PM/Connection.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | 26 | ||
| 29 | //----------------------------------------------------------------------------- | 27 | //----------------------------------------------------------------------------- |
| 30 | // | 28 | // |
| 31 | // Abstract C O N N E C T I O N class | 29 | // Abstract C O N N E C T I O N class |
| 32 | // | 30 | // |
| 33 | //----------------------------------------------------------------------------- | 31 | //----------------------------------------------------------------------------- |
| 34 | 32 | ||
| 35 | Clipperz.PM.Connection = function (args) { | 33 | Clipperz.PM.Connection = function (args) { |
| 36 | args = args || {}; | 34 | args = args || {}; |
| 37 | 35 | ||
| 38 | this._user = args.user; | 36 | this._user = args.user; |
| 39 | this._clipperz_pm_crypto_version = null; | 37 | this._clipperz_pm_crypto_version = null; |
| 40 | this._connectionId = null; | 38 | this._connectionId = null; |
| 41 | this._oneTimePassword = null; | 39 | this._oneTimePassword = null; |
| 42 | 40 | ||
| 43 | return this; | 41 | return this; |
| 44 | } | 42 | } |
| 45 | 43 | ||
| 46 | Clipperz.PM.Connection.prototype = MochiKit.Base.update(null, { | 44 | Clipperz.PM.Connection.prototype = MochiKit.Base.update(null, { |
| 47 | 45 | ||
| 48 | 'user': function() { | 46 | 'user': function() { |
| 49 | return this._user; | 47 | return this._user; |
| 50 | }, | 48 | }, |
| 51 | 49 | ||
| 52 | 'toString': function() { | 50 | 'toString': function() { |
| 53 | return "Connection [" + this.version() + "] - user: " + this.user(); | 51 | return "Connection [" + this.version() + "] - user: " + this.user(); |
| 54 | }, | 52 | }, |
| 55 | 53 | ||
| 56 | //========================================================================= | 54 | //========================================================================= |
| 57 | 55 | ||
| 58 | 'version': function() { | 56 | 'version': function() { |
| 59 | throw Clipperz.Base.exception.AbstractMethod; | 57 | throw Clipperz.Base.exception.AbstractMethod; |
| 60 | }, | 58 | }, |
| 61 | 59 | ||
| 62 | 'clipperz_pm_crypto_version': function() { | 60 | 'clipperz_pm_crypto_version': function() { |
| 63 | if (this._clipperz_pm_crypto_version == null) { | 61 | if (this._clipperz_pm_crypto_version == null) { |
| 64 | var connectionVersions; | 62 | var connectionVersions; |
| 65 | varversions; | 63 | varversions; |
| 66 | varversion; | 64 | varversion; |
| 67 | var i, c; | 65 | var i, c; |
| 68 | 66 | ||
| 69 | version = null; | 67 | version = null; |
| 70 | connectionVersions = Clipperz.PM.Crypto.communicationProtocol.versions; | 68 | connectionVersions = Clipperz.PM.Crypto.communicationProtocol.versions; |
| 71 | versions = MochiKit.Base.keys(connectionVersions); | 69 | versions = MochiKit.Base.keys(connectionVersions); |
| 72 | c = versions.length; | 70 | c = versions.length; |
| 73 | for (i=0; i<c; i++) { | 71 | for (i=0; i<c; i++) { |
| 74 | if (! (versions[i] == 'current')) { | 72 | if (! (versions[i] == 'current')) { |
| 75 | if (this instanceof connectionVersions[versions[i]]) { | 73 | if (this instanceof connectionVersions[versions[i]]) { |
| 76 | version = versions[i]; | 74 | version = versions[i]; |
| 77 | }; | 75 | }; |
| 78 | } | 76 | } |
| 79 | } | 77 | } |
| 80 | 78 | ||
| 81 | this._clipperz_pm_crypto_version = version; | 79 | this._clipperz_pm_crypto_version = version; |
| 82 | } | 80 | } |
| 83 | 81 | ||
| 84 | return this._clipperz_pm_crypto_version; | 82 | return this._clipperz_pm_crypto_version; |
| 85 | }, | 83 | }, |
| 86 | 84 | ||
| 87 | //------------------------------------------------------------------------- | 85 | //------------------------------------------------------------------------- |
| 88 | 86 | ||
| 89 | 'defaultErrorHandler': function(anErrorString, anException) { | 87 | 'defaultErrorHandler': function(anErrorString, anException) { |
| 90 | MochiKit.Logging.logError("### Connection.defaultErrorHandler: " + anErrorString + " (" + anException + ")"); | 88 | MochiKit.Logging.logError("### Connection.defaultErrorHandler: " + anErrorString + " (" + anException + ")"); |
| 91 | }, | 89 | }, |
| 92 | 90 | ||
| 93 | //------------------------------------------------------------------------- | 91 | //------------------------------------------------------------------------- |
| 94 | 92 | ||
| 95 | 'login': function(someArguments, aCallback) { | 93 | 'login': function(someArguments, aCallback) { |
| 96 | throw Clipperz.Base.exception.AbstractMethod; | 94 | throw Clipperz.Base.exception.AbstractMethod; |
| 97 | }, | 95 | }, |
| 98 | 96 | ||
| 99 | //------------------------------------------------------------------------- | 97 | //------------------------------------------------------------------------- |
| 100 | 98 | ||
| 101 | 'message': function(someArguments, aCallback) { | 99 | 'message': function(someArguments, aCallback) { |
| 102 | throw Clipperz.Base.exception.AbstractMethod; | 100 | throw Clipperz.Base.exception.AbstractMethod; |
| 103 | }, | 101 | }, |
| 104 | 102 | ||
| 105 | //------------------------------------------------------------------------- | 103 | //------------------------------------------------------------------------- |
| 106 | 104 | ||
| 107 | 'sharedSecret': function() { | 105 | 'sharedSecret': function() { |
| 108 | throw Clipperz.Base.exception.AbstractMethod; | 106 | throw Clipperz.Base.exception.AbstractMethod; |
| 109 | }, | 107 | }, |
| 110 | 108 | ||
| 111 | 'serverSideUserCredentials': function() { | 109 | 'serverSideUserCredentials': function() { |
| 112 | throw Clipperz.Base.exception.AbstractMethod; | 110 | throw Clipperz.Base.exception.AbstractMethod; |
| 113 | }, | 111 | }, |
| 114 | 112 | ||
| 115 | //========================================================================= | 113 | //========================================================================= |
| 116 | 114 | ||
| 117 | 'connectionId': function() { | 115 | 'connectionId': function() { |
| 118 | return this._connectionId; | 116 | return this._connectionId; |
diff --git a/frontend/beta/js/Clipperz/PM/Crypto.js b/frontend/beta/js/Clipperz/PM/Crypto.js index 6e9608c..ad16ff0 100644 --- a/frontend/beta/js/Clipperz/PM/Crypto.js +++ b/frontend/beta/js/Clipperz/PM/Crypto.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Crypto) == 'undefined') { Clipperz.PM.Crypto = {}; } | 26 | if (typeof(Clipperz.PM.Crypto) == 'undefined') { Clipperz.PM.Crypto = {}; } |
| 29 | 27 | ||
| 30 | Clipperz.PM.Crypto.VERSION = "0.2"; | 28 | Clipperz.PM.Crypto.VERSION = "0.2"; |
| 31 | Clipperz.PM.Crypto.NAME = "Clipperz.PM.Crypto"; | 29 | Clipperz.PM.Crypto.NAME = "Clipperz.PM.Crypto"; |
| 32 | 30 | ||
| 33 | MochiKit.Base.update(Clipperz.PM.Crypto, { | 31 | MochiKit.Base.update(Clipperz.PM.Crypto, { |
| 34 | 32 | ||
| 35 | '__repr__': function () { | 33 | '__repr__': function () { |
| 36 | return "[" + this.NAME + " " + this.VERSION + "]"; | 34 | return "[" + this.NAME + " " + this.VERSION + "]"; |
| 37 | }, | 35 | }, |
| 38 | 36 | ||
| 39 | //------------------------------------------------------------------------- | 37 | //------------------------------------------------------------------------- |
| 40 | 38 | ||
| 41 | 'toString': function () { | 39 | 'toString': function () { |
| 42 | return this.__repr__(); | 40 | return this.__repr__(); |
| 43 | }, | 41 | }, |
| 44 | 42 | ||
| 45 | //------------------------------------------------------------------------- | 43 | //------------------------------------------------------------------------- |
| 46 | 44 | ||
| 47 | 'communicationProtocol': { | 45 | 'communicationProtocol': { |
| 48 | 'currentVersion': '0.2', | 46 | 'currentVersion': '0.2', |
| 49 | 'versions': { | 47 | 'versions': { |
| 50 | '0.1': Clipperz.PM.Connection.SRP['1.0'],//Clipperz.Crypto.SRP.versions['1.0'].Connection, | 48 | '0.1': Clipperz.PM.Connection.SRP['1.0'],//Clipperz.Crypto.SRP.versions['1.0'].Connection, |
| 51 | '0.2': Clipperz.PM.Connection.SRP['1.1']//Clipperz.Crypto.SRP.versions['1.1'].Connection, | 49 | '0.2': Clipperz.PM.Connection.SRP['1.1']//Clipperz.Crypto.SRP.versions['1.1'].Connection, |
| 52 | }, | 50 | }, |
| 53 | 'fallbackVersions': { | 51 | 'fallbackVersions': { |
| 54 | 'current':'0.1', | 52 | 'current':'0.1', |
| 55 | '0.2': '0.1', | 53 | '0.2': '0.1', |
| 56 | '0.1': null | 54 | '0.1': null |
| 57 | } | 55 | } |
| 58 | }, | 56 | }, |
| 59 | 57 | ||
| 60 | //------------------------------------------------------------------------- | 58 | //------------------------------------------------------------------------- |
| 61 | 59 | ||
| 62 | 'encryptingFunctions': { | 60 | 'encryptingFunctions': { |
| 63 | 'currentVersion': '0.3', | 61 | 'currentVersion': '0.3', |
| 64 | 'versions': { | 62 | 'versions': { |
| 65 | 63 | ||
| 66 | //##################################################################### | 64 | //##################################################################### |
| 67 | 65 | ||
| 68 | '0.1': { | 66 | '0.1': { |
| 69 | 'encrypt': function(aKey, aValue) { | 67 | 'encrypt': function(aKey, aValue) { |
| 70 | return Clipperz.Crypto.Base.encryptUsingSecretKey(aKey, Clipperz.Base.serializeJSON(aValue)); | 68 | return Clipperz.Crypto.Base.encryptUsingSecretKey(aKey, Clipperz.Base.serializeJSON(aValue)); |
| 71 | }, | 69 | }, |
| 72 | 70 | ||
| 73 | 'deferredEncrypt': function(aKey, aValue) { | 71 | 'deferredEncrypt': function(aKey, aValue) { |
| 74 | var deferredResult; | 72 | var deferredResult; |
| 75 | 73 | ||
| 76 | deferredResult = new MochiKit.Async.Deferred(); | 74 | deferredResult = new MochiKit.Async.Deferred(); |
| 77 | deferredResult.addCallback(Clipperz.PM.Crypto.encryptingFunctions.versions['0.1'].encrypt, aKey, aValue); | 75 | deferredResult.addCallback(Clipperz.PM.Crypto.encryptingFunctions.versions['0.1'].encrypt, aKey, aValue); |
| 78 | deferredResult.callback(); | 76 | deferredResult.callback(); |
| 79 | 77 | ||
| 80 | return deferredResult; | 78 | return deferredResult; |
| 81 | }, | 79 | }, |
| 82 | 80 | ||
| 83 | 'decrypt': function(aKey, aValue) { | 81 | 'decrypt': function(aKey, aValue) { |
| 84 | var result; | 82 | var result; |
| 85 | 83 | ||
| 86 | if (aValue != null) { | 84 | if (aValue != null) { |
| 87 | result = Clipperz.Base.evalJSON(Clipperz.Crypto.Base.decryptUsingSecretKey(aKey, aValue)); | 85 | result = Clipperz.Base.evalJSON(Clipperz.Crypto.Base.decryptUsingSecretKey(aKey, aValue)); |
| 88 | } else { | 86 | } else { |
| 89 | result = null; | 87 | result = null; |
| 90 | } | 88 | } |
| 91 | 89 | ||
| 92 | return result; | 90 | return result; |
| 93 | }, | 91 | }, |
| 94 | 92 | ||
| 95 | 'deferredDecrypt': function(aKey, aValue) { | 93 | 'deferredDecrypt': function(aKey, aValue) { |
| 96 | var deferredResult; | 94 | var deferredResult; |
| 97 | 95 | ||
| 98 | deferredResult = new MochiKit.Async.Deferred(); | 96 | deferredResult = new MochiKit.Async.Deferred(); |
| 99 | deferredResult.addCallback(Clipperz.PM.Crypto.encryptingFunctions.versions['0.1'].decrypt, aKey, aValue); | 97 | deferredResult.addCallback(Clipperz.PM.Crypto.encryptingFunctions.versions['0.1'].decrypt, aKey, aValue); |
| 100 | deferredResult.callback(); | 98 | deferredResult.callback(); |
| 101 | 99 | ||
| 102 | return deferredResult; | 100 | return deferredResult; |
| 103 | }, | 101 | }, |
| 104 | 102 | ||
| 105 | 'hash': function(aValue) { | 103 | 'hash': function(aValue) { |
| 106 | var result; | 104 | var result; |
| 107 | var strngResult; | 105 | var strngResult; |
| 108 | 106 | ||
| 109 | stringResult = Clipperz.Crypto.Base.computeHashValue(aValue.asString()); //!!!!!!! | 107 | stringResult = Clipperz.Crypto.Base.computeHashValue(aValue.asString()); //!!!!!!! |
| 110 | result = new Clipperz.ByteArray("0x" + stringResult); | 108 | result = new Clipperz.ByteArray("0x" + stringResult); |
| 111 | 109 | ||
| 112 | return result; | 110 | return result; |
| 113 | } | 111 | } |
| 114 | }, | 112 | }, |
| 115 | 113 | ||
| 116 | //##################################################################### | 114 | //##################################################################### |
| 117 | 115 | ||
| 118 | '0.2': { | 116 | '0.2': { |
diff --git a/frontend/beta/js/Clipperz/PM/DataModel/DirectLogin.js b/frontend/beta/js/Clipperz/PM/DataModel/DirectLogin.js index aee5703..c0cfa3c 100644 --- a/frontend/beta/js/Clipperz/PM/DataModel/DirectLogin.js +++ b/frontend/beta/js/Clipperz/PM/DataModel/DirectLogin.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } | 26 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } |
| 29 | 27 | ||
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.DataModel.DirectLogin = function(args) { | 31 | Clipperz.PM.DataModel.DirectLogin = function(args) { |
| 34 | //MochiKit.Logging.logDebug(">>> new Clipperz.PM.DataModel.DirectLogin"); | 32 | //MochiKit.Logging.logDebug(">>> new Clipperz.PM.DataModel.DirectLogin"); |
| 35 | //console.log(">>> new Clipperz.PM.DataModel.DirectLogin - args: %o", args); | 33 | //console.log(">>> new Clipperz.PM.DataModel.DirectLogin - args: %o", args); |
| 36 | //console.log("--- formData: %s", Clipperz.Base.serializeJSON(args.formData)); | 34 | //console.log("--- formData: %s", Clipperz.Base.serializeJSON(args.formData)); |
| 37 | args = args || {}; | 35 | args = args || {}; |
| 38 | 36 | ||
| 39 | //MochiKit.Logging.logDebug("--- new Clipperz.PM.DataModel.DirectLogin - args: " + Clipperz.Base.serializeJSON(MochiKit.Base.keys(args))); | 37 | //MochiKit.Logging.logDebug("--- new Clipperz.PM.DataModel.DirectLogin - args: " + Clipperz.Base.serializeJSON(MochiKit.Base.keys(args))); |
| 40 | this._record = args.record || null; | 38 | this._record = args.record || null; |
| 41 | this._label = args.label || "unnamed record" | 39 | this._label = args.label || "unnamed record" |
| 42 | this._reference = args.reference || Clipperz.PM.Crypto.randomKey(); | 40 | this._reference = args.reference || Clipperz.PM.Crypto.randomKey(); |
| 43 | this._favicon = args.favicon || null; | 41 | this._favicon = args.favicon || null; |
| 44 | this._bookmarkletVersion = args.bookmarkletVersion || "0.1"; | 42 | this._bookmarkletVersion = args.bookmarkletVersion || "0.1"; |
| 45 | 43 | ||
| 46 | this._directLoginInputs = null; | 44 | this._directLoginInputs = null; |
| 47 | 45 | ||
| 48 | this._formValues = args.formValues || {}; | 46 | this._formValues = args.formValues || {}; |
| 49 | this.setFormData(args.formData || null); | 47 | this.setFormData(args.formData || null); |
| 50 | //console.log("=== formData: %o", this.formData()); | 48 | //console.log("=== formData: %o", this.formData()); |
| 51 | 49 | ||
| 52 | if (args.legacyBindingData == null) { | 50 | if (args.legacyBindingData == null) { |
| 53 | this.setBindingData(args.bindingData || null); | 51 | this.setBindingData(args.bindingData || null); |
| 54 | } else { | 52 | } else { |
| 55 | this.setLegacyBindingData(args.legacyBindingData); | 53 | this.setLegacyBindingData(args.legacyBindingData); |
| 56 | } | 54 | } |
| 57 | 55 | ||
| 58 | this._fixedFavicon = null; | 56 | this._fixedFavicon = null; |
| 59 | 57 | ||
| 60 | //this._formValues = args.formValues || (this.hasValuesToSet() ? {} : null); | 58 | //this._formValues = args.formValues || (this.hasValuesToSet() ? {} : null); |
| 61 | //MochiKit.Logging.logDebug("<<< new Clipperz.PM.DataModel.DirectLogin"); | 59 | //MochiKit.Logging.logDebug("<<< new Clipperz.PM.DataModel.DirectLogin"); |
| 62 | 60 | ||
| 63 | return this; | 61 | return this; |
| 64 | } | 62 | } |
| 65 | 63 | ||
| 66 | Clipperz.PM.DataModel.DirectLogin.prototype = MochiKit.Base.update(null, { | 64 | Clipperz.PM.DataModel.DirectLogin.prototype = MochiKit.Base.update(null, { |
| 67 | 65 | ||
| 68 | 'remove': function() { | 66 | 'remove': function() { |
| 69 | this.record().removeDirectLogin(this); | 67 | this.record().removeDirectLogin(this); |
| 70 | }, | 68 | }, |
| 71 | 69 | ||
| 72 | //------------------------------------------------------------------------- | 70 | //------------------------------------------------------------------------- |
| 73 | 71 | ||
| 74 | 'record': function() { | 72 | 'record': function() { |
| 75 | return this._record; | 73 | return this._record; |
| 76 | }, | 74 | }, |
| 77 | 75 | ||
| 78 | //------------------------------------------------------------------------- | 76 | //------------------------------------------------------------------------- |
| 79 | 77 | ||
| 80 | 'user': function() { | 78 | 'user': function() { |
| 81 | return this.record().user(); | 79 | return this.record().user(); |
| 82 | }, | 80 | }, |
| 83 | 81 | ||
| 84 | //------------------------------------------------------------------------- | 82 | //------------------------------------------------------------------------- |
| 85 | 83 | ||
| 86 | 'reference': function() { | 84 | 'reference': function() { |
| 87 | return this._reference; | 85 | return this._reference; |
| 88 | }, | 86 | }, |
| 89 | 87 | ||
| 90 | //------------------------------------------------------------------------- | 88 | //------------------------------------------------------------------------- |
| 91 | 89 | ||
| 92 | 'label': function() { | 90 | 'label': function() { |
| 93 | return this._label; | 91 | return this._label; |
| 94 | }, | 92 | }, |
| 95 | 93 | ||
| 96 | 'setLabel': function(aValue) { | 94 | 'setLabel': function(aValue) { |
| 97 | this._label = aValue; | 95 | this._label = aValue; |
| 98 | }, | 96 | }, |
| 99 | 97 | ||
| 100 | //------------------------------------------------------------------------- | 98 | //------------------------------------------------------------------------- |
| 101 | 99 | ||
| 102 | 'favicon': function() { | 100 | 'favicon': function() { |
| 103 | if (this._favicon == null) { | 101 | if (this._favicon == null) { |
| 104 | varactionUrl; | 102 | varactionUrl; |
| 105 | var hostname; | 103 | var hostname; |
| 106 | 104 | ||
| 107 | actionUrl = this.formData()['attributes']['action']; | 105 | actionUrl = this.formData()['attributes']['action']; |
| 108 | hostname = actionUrl.replace(/^https?:\/\/([^\/]*)\/.*/, '$1'); | 106 | hostname = actionUrl.replace(/^https?:\/\/([^\/]*)\/.*/, '$1'); |
| 109 | this._favicon = "http://" + hostname + "/favicon.ico"; | 107 | this._favicon = "http://" + hostname + "/favicon.ico"; |
| 110 | } | 108 | } |
| 111 | 109 | ||
| 112 | return this._favicon; | 110 | return this._favicon; |
| 113 | }, | 111 | }, |
| 114 | 112 | ||
| 115 | //------------------------------------------------------------------------- | 113 | //------------------------------------------------------------------------- |
| 116 | 114 | ||
| 117 | 'fixedFavicon': function() { | 115 | 'fixedFavicon': function() { |
| 118 | var result; | 116 | var result; |
diff --git a/frontend/beta/js/Clipperz/PM/DataModel/DirectLoginBinding.js b/frontend/beta/js/Clipperz/PM/DataModel/DirectLoginBinding.js index 7f09bff..cef41af 100644 --- a/frontend/beta/js/Clipperz/PM/DataModel/DirectLoginBinding.js +++ b/frontend/beta/js/Clipperz/PM/DataModel/DirectLoginBinding.js | |||
| @@ -1,110 +1,108 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } | 26 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } |
| 29 | 27 | ||
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.DataModel.DirectLoginBinding = function(aDirectLogin, aKey, args) { | 31 | Clipperz.PM.DataModel.DirectLoginBinding = function(aDirectLogin, aKey, args) { |
| 34 | //MochiKit.Logging.logDebug(">>> new DirectLoginBinding") | 32 | //MochiKit.Logging.logDebug(">>> new DirectLoginBinding") |
| 35 | args = args || {}; | 33 | args = args || {}; |
| 36 | //MochiKit.Logging.logDebug("--- new DirectLoginBinding - args: " + Clipperz.Base.serializeJSON(args)); | 34 | //MochiKit.Logging.logDebug("--- new DirectLoginBinding - args: " + Clipperz.Base.serializeJSON(args)); |
| 37 | 35 | ||
| 38 | this._directLogin = aDirectLogin || args.directLogin || null; | 36 | this._directLogin = aDirectLogin || args.directLogin || null; |
| 39 | this._key = aKey; | 37 | this._key = aKey; |
| 40 | 38 | ||
| 41 | this._fieldKey = args.fieldKey || null; | 39 | this._fieldKey = args.fieldKey || null; |
| 42 | this._fieldName = args.fieldName || null; | 40 | this._fieldName = args.fieldName || null; |
| 43 | //MochiKit.Logging.logDebug("<<< new DirectLoginBinding") | 41 | //MochiKit.Logging.logDebug("<<< new DirectLoginBinding") |
| 44 | 42 | ||
| 45 | return this; | 43 | return this; |
| 46 | } | 44 | } |
| 47 | 45 | ||
| 48 | Clipperz.PM.DataModel.DirectLoginBinding.prototype = MochiKit.Base.update(null, { | 46 | Clipperz.PM.DataModel.DirectLoginBinding.prototype = MochiKit.Base.update(null, { |
| 49 | 47 | ||
| 50 | 'directLogin': function() { | 48 | 'directLogin': function() { |
| 51 | return this._directLogin; | 49 | return this._directLogin; |
| 52 | }, | 50 | }, |
| 53 | 51 | ||
| 54 | //------------------------------------------------------------------------- | 52 | //------------------------------------------------------------------------- |
| 55 | 53 | ||
| 56 | 'key': function() { | 54 | 'key': function() { |
| 57 | return this._key; | 55 | return this._key; |
| 58 | }, | 56 | }, |
| 59 | 57 | ||
| 60 | //------------------------------------------------------------------------- | 58 | //------------------------------------------------------------------------- |
| 61 | 59 | ||
| 62 | 'fieldKey': function() { | 60 | 'fieldKey': function() { |
| 63 | //MochiKit.Logging.logDebug("=== Clipperz.PM.DataModel.DirectLoginBinding.fieldKey"); | 61 | //MochiKit.Logging.logDebug("=== Clipperz.PM.DataModel.DirectLoginBinding.fieldKey"); |
| 64 | //MochiKit.Logging.logDebug("=== Clipperz.PM.DataModel.DirectLoginBinding.fieldKey - " + this._fieldKey); | 62 | //MochiKit.Logging.logDebug("=== Clipperz.PM.DataModel.DirectLoginBinding.fieldKey - " + this._fieldKey); |
| 65 | return this._fieldKey; | 63 | return this._fieldKey; |
| 66 | }, | 64 | }, |
| 67 | 65 | ||
| 68 | 'setFieldKey': function(aValue) { | 66 | 'setFieldKey': function(aValue) { |
| 69 | this._fieldKey = aValue; | 67 | this._fieldKey = aValue; |
| 70 | }, | 68 | }, |
| 71 | 69 | ||
| 72 | 'fieldName': function() { | 70 | 'fieldName': function() { |
| 73 | return this._fieldName; | 71 | return this._fieldName; |
| 74 | }, | 72 | }, |
| 75 | 73 | ||
| 76 | //------------------------------------------------------------------------- | 74 | //------------------------------------------------------------------------- |
| 77 | 75 | ||
| 78 | 'field': function() { | 76 | 'field': function() { |
| 79 | var result; | 77 | var result; |
| 80 | 78 | ||
| 81 | //MochiKit.Logging.logDebug(">>> Clipperz.PM.DataModel.DirectLoginBinding.field") | 79 | //MochiKit.Logging.logDebug(">>> Clipperz.PM.DataModel.DirectLoginBinding.field") |
| 82 | //MochiKit.Logging.logDebug("--- Clipperz.PM.DataModel.DirectLoginBinding.field - 1 - this.fieldKey(): " + this.fieldKey()); | 80 | //MochiKit.Logging.logDebug("--- Clipperz.PM.DataModel.DirectLoginBinding.field - 1 - this.fieldKey(): " + this.fieldKey()); |
| 83 | //MochiKit.Logging.logDebug("--- Clipperz.PM.DataModel.DirectLoginBinding.field - 2 - this.fieldName(): " + this.fieldName()); | 81 | //MochiKit.Logging.logDebug("--- Clipperz.PM.DataModel.DirectLoginBinding.field - 2 - this.fieldName(): " + this.fieldName()); |
| 84 | if (this.fieldKey() != null) { | 82 | if (this.fieldKey() != null) { |
| 85 | result = this.directLogin().record().currentVersion().fields()[this.fieldKey()]; | 83 | result = this.directLogin().record().currentVersion().fields()[this.fieldKey()]; |
| 86 | //MochiKit.Logging.logDebug("--- Clipperz.PM.DataModel.DirectLoginBinding.field - 3 - result: " + result); | 84 | //MochiKit.Logging.logDebug("--- Clipperz.PM.DataModel.DirectLoginBinding.field - 3 - result: " + result); |
| 87 | } else if (this.fieldName() != null) { | 85 | } else if (this.fieldName() != null) { |
| 88 | result = this.directLogin().record().currentVersion().fieldWithName(this.fieldName()); | 86 | result = this.directLogin().record().currentVersion().fieldWithName(this.fieldName()); |
| 89 | //MochiKit.Logging.logDebug("--- Clipperz.PM.DataModel.DirectLoginBinding.field - 4 - result: " + result); | 87 | //MochiKit.Logging.logDebug("--- Clipperz.PM.DataModel.DirectLoginBinding.field - 4 - result: " + result); |
| 90 | 88 | ||
| 91 | this.setFieldKey(result.key()); | 89 | this.setFieldKey(result.key()); |
| 92 | } else { | 90 | } else { |
| 93 | result = null; | 91 | result = null; |
| 94 | } | 92 | } |
| 95 | //MochiKit.Logging.logDebug("<<< Clipperz.PM.DataModel.DirectLoginBinding.field") | 93 | //MochiKit.Logging.logDebug("<<< Clipperz.PM.DataModel.DirectLoginBinding.field") |
| 96 | 94 | ||
| 97 | return result; | 95 | return result; |
| 98 | }, | 96 | }, |
| 99 | 97 | ||
| 100 | //------------------------------------------------------------------------- | 98 | //------------------------------------------------------------------------- |
| 101 | 99 | ||
| 102 | 'serializedData': function() { | 100 | 'serializedData': function() { |
| 103 | return this.fieldKey(); | 101 | return this.fieldKey(); |
| 104 | }, | 102 | }, |
| 105 | 103 | ||
| 106 | //------------------------------------------------------------------------- | 104 | //------------------------------------------------------------------------- |
| 107 | __syntaxFix__: "syntax fix" | 105 | __syntaxFix__: "syntax fix" |
| 108 | 106 | ||
| 109 | }); | 107 | }); |
| 110 | 108 | ||
diff --git a/frontend/beta/js/Clipperz/PM/DataModel/DirectLoginInput.js b/frontend/beta/js/Clipperz/PM/DataModel/DirectLoginInput.js index 0e2b7ad..e5e9ad5 100644 --- a/frontend/beta/js/Clipperz/PM/DataModel/DirectLoginInput.js +++ b/frontend/beta/js/Clipperz/PM/DataModel/DirectLoginInput.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } | 26 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } |
| 29 | 27 | ||
| 30 | //############################################################################# | 28 | //############################################################################# |
| 31 | 29 | ||
| 32 | Clipperz.PM.DataModel.DirectLoginInput = function(aDirectLogin, args) { | 30 | Clipperz.PM.DataModel.DirectLoginInput = function(aDirectLogin, args) { |
| 33 | args = args || {}; | 31 | args = args || {}; |
| 34 | 32 | ||
| 35 | //console.log(">>> new DirectLoginInput - args: %o" + args); | 33 | //console.log(">>> new DirectLoginInput - args: %o" + args); |
| 36 | this._directLogin = aDirectLogin; | 34 | this._directLogin = aDirectLogin; |
| 37 | this._args = args; | 35 | this._args = args; |
| 38 | 36 | ||
| 39 | return this; | 37 | return this; |
| 40 | } | 38 | } |
| 41 | 39 | ||
| 42 | Clipperz.PM.DataModel.DirectLoginInput.prototype = MochiKit.Base.update(null, { | 40 | Clipperz.PM.DataModel.DirectLoginInput.prototype = MochiKit.Base.update(null, { |
| 43 | 41 | ||
| 44 | 'directLogin': function() { | 42 | 'directLogin': function() { |
| 45 | return this._directLogin; | 43 | return this._directLogin; |
| 46 | }, | 44 | }, |
| 47 | 45 | ||
| 48 | //------------------------------------------------------------------------- | 46 | //------------------------------------------------------------------------- |
| 49 | 47 | ||
| 50 | 'args': function() { | 48 | 'args': function() { |
| 51 | return this._args; | 49 | return this._args; |
| 52 | }, | 50 | }, |
| 53 | 51 | ||
| 54 | //------------------------------------------------------------------------- | 52 | //------------------------------------------------------------------------- |
| 55 | 53 | ||
| 56 | 'name': function() { | 54 | 'name': function() { |
| 57 | return this.args()['name']; | 55 | return this.args()['name']; |
| 58 | }, | 56 | }, |
| 59 | 57 | ||
| 60 | //------------------------------------------------------------------------- | 58 | //------------------------------------------------------------------------- |
| 61 | 59 | ||
| 62 | 'type': function() { | 60 | 'type': function() { |
| 63 | var result; | 61 | var result; |
| 64 | 62 | ||
| 65 | result = this.args()['type']; | 63 | result = this.args()['type']; |
| 66 | 64 | ||
| 67 | if (result != null) { | 65 | if (result != null) { |
| 68 | result = result.toLowerCase(); | 66 | result = result.toLowerCase(); |
| 69 | } | 67 | } |
| 70 | return result; | 68 | return result; |
| 71 | }, | 69 | }, |
| 72 | 70 | ||
| 73 | //------------------------------------------------------------------------- | 71 | //------------------------------------------------------------------------- |
| 74 | 72 | ||
| 75 | 'value': function() { | 73 | 'value': function() { |
| 76 | return this.args()['value']; | 74 | return this.args()['value']; |
| 77 | }, | 75 | }, |
| 78 | 76 | ||
| 79 | //------------------------------------------------------------------------- | 77 | //------------------------------------------------------------------------- |
| 80 | 78 | ||
| 81 | 'formConfiguration': function() { | 79 | 'formConfiguration': function() { |
| 82 | var result; | 80 | var result; |
| 83 | 81 | ||
| 84 | //MochiKit.Logging.logDebug(">>> DirectLoginInput.formConfiguration - " + this.name()); | 82 | //MochiKit.Logging.logDebug(">>> DirectLoginInput.formConfiguration - " + this.name()); |
| 85 | if (this.shouldSetValue()) { | 83 | if (this.shouldSetValue()) { |
| 86 | //MochiKit.Logging.logDebug("--- DirectLoginInput.formConfiguration - 1"); | 84 | //MochiKit.Logging.logDebug("--- DirectLoginInput.formConfiguration - 1"); |
| 87 | switch (this.type()) { | 85 | switch (this.type()) { |
| 88 | case 'select': | 86 | case 'select': |
| 89 | var currentValue; | 87 | var currentValue; |
| 90 | var options; | 88 | var options; |
| 91 | 89 | ||
| 92 | //MochiKit.Logging.logDebug("--- DirectLoginInput.formConfiguration - 2"); | 90 | //MochiKit.Logging.logDebug("--- DirectLoginInput.formConfiguration - 2"); |
| 93 | currentValue = this.directLogin().formValues()[this.name()]; | 91 | currentValue = this.directLogin().formValues()[this.name()]; |
| 94 | //MochiKit.Logging.logDebug("--- DirectLoginInput.formConfiguration - 2.1"); | 92 | //MochiKit.Logging.logDebug("--- DirectLoginInput.formConfiguration - 2.1"); |
| 95 | options = this.args()['options']; | 93 | options = this.args()['options']; |
| 96 | //MochiKit.Logging.logDebug("--- DirectLoginInput.formConfiguration - 2.2"); | 94 | //MochiKit.Logging.logDebug("--- DirectLoginInput.formConfiguration - 2.2"); |
| 97 | 95 | ||
| 98 | result = MochiKit.DOM.SELECT({name:this.name()}, | 96 | result = MochiKit.DOM.SELECT({name:this.name()}, |
| 99 | MochiKit.Base.map(function(anOption) { | 97 | MochiKit.Base.map(function(anOption) { |
| 100 | var options; | 98 | var options; |
| 101 | 99 | ||
| 102 | //MochiKit.Logging.logDebug("--- DirectLoginInput.formConfiguration - 2.3"); | 100 | //MochiKit.Logging.logDebug("--- DirectLoginInput.formConfiguration - 2.3"); |
| 103 | //TODO: remove the value: field and replace it with element.dom.value = <some value> | 101 | //TODO: remove the value: field and replace it with element.dom.value = <some value> |
| 104 | options = {value:anOption['value']}; | 102 | options = {value:anOption['value']}; |
| 105 | //MochiKit.Logging.logDebug("--- DirectLoginInput.formConfiguration - 2.4"); | 103 | //MochiKit.Logging.logDebug("--- DirectLoginInput.formConfiguration - 2.4"); |
| 106 | if (currentValue == anOption['value']) { | 104 | if (currentValue == anOption['value']) { |
| 107 | //MochiKit.Logging.logDebug("--- DirectLoginInput.formConfiguration - 2.5"); | 105 | //MochiKit.Logging.logDebug("--- DirectLoginInput.formConfiguration - 2.5"); |
| 108 | options.selected = true; | 106 | options.selected = true; |
| 109 | //MochiKit.Logging.logDebug("--- DirectLoginInput.formConfiguration - 2.6"); | 107 | //MochiKit.Logging.logDebug("--- DirectLoginInput.formConfiguration - 2.6"); |
| 110 | } | 108 | } |
| 111 | //MochiKit.Logging.logDebug("--- DirectLoginInput.formConfiguration - 2.7"); | 109 | //MochiKit.Logging.logDebug("--- DirectLoginInput.formConfiguration - 2.7"); |
| 112 | 110 | ||
| 113 | return MochiKit.DOM.OPTION(options, anOption['label']) | 111 | return MochiKit.DOM.OPTION(options, anOption['label']) |
| 114 | }, options) | 112 | }, options) |
| 115 | ) | 113 | ) |
| 116 | //MochiKit.Logging.logDebug("--- DirectLoginInput.formConfiguration - 2.8"); | 114 | //MochiKit.Logging.logDebug("--- DirectLoginInput.formConfiguration - 2.8"); |
| 117 | break; | 115 | break; |
| 118 | case 'checkbox': | 116 | case 'checkbox': |
diff --git a/frontend/beta/js/Clipperz/PM/DataModel/DirectLoginReference.js b/frontend/beta/js/Clipperz/PM/DataModel/DirectLoginReference.js index 2be7d58..236d7c9 100644 --- a/frontend/beta/js/Clipperz/PM/DataModel/DirectLoginReference.js +++ b/frontend/beta/js/Clipperz/PM/DataModel/DirectLoginReference.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } | 26 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } |
| 29 | 27 | ||
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.DataModel.DirectLoginReference = function(args) { | 31 | Clipperz.PM.DataModel.DirectLoginReference = function(args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | //MochiKit.Logging.logDebug(">>> new DirectLoginReference: " + Clipperz.Base.serializeJSON(MochiKit.Base.keys(args))); | 34 | //MochiKit.Logging.logDebug(">>> new DirectLoginReference: " + Clipperz.Base.serializeJSON(MochiKit.Base.keys(args))); |
| 37 | //MochiKit.Logging.logDebug(">>> new DirectLoginReference - record: " + args.record); | 35 | //MochiKit.Logging.logDebug(">>> new DirectLoginReference - record: " + args.record); |
| 38 | this._user = args.user; | 36 | this._user = args.user; |
| 39 | 37 | ||
| 40 | if (args.directLogin != null) { | 38 | if (args.directLogin != null) { |
| 41 | this._reference = args.directLogin.reference(); | 39 | this._reference = args.directLogin.reference(); |
| 42 | this._recordReference = args.directLogin.record().reference(); | 40 | this._recordReference = args.directLogin.record().reference(); |
| 43 | this._label = args.directLogin.label(); | 41 | this._label = args.directLogin.label(); |
| 44 | this._favicon = args.directLogin.favicon() || null; | 42 | this._favicon = args.directLogin.favicon() || null; |
| 45 | 43 | ||
| 46 | this._directLogin = args.directLogin; | 44 | this._directLogin = args.directLogin; |
| 47 | this._record = args.directLogin.record(); | 45 | this._record = args.directLogin.record(); |
| 48 | } else { | 46 | } else { |
| 49 | this._reference = args.reference; | 47 | this._reference = args.reference; |
| 50 | this._recordReference = args.record; | 48 | this._recordReference = args.record; |
| 51 | this._label = args.label; | 49 | this._label = args.label; |
| 52 | this._favicon = args.favicon || null; | 50 | this._favicon = args.favicon || null; |
| 53 | 51 | ||
| 54 | this._directLogin = null; | 52 | this._directLogin = null; |
| 55 | this._record = null; | 53 | this._record = null; |
| 56 | } | 54 | } |
| 57 | 55 | ||
| 58 | this._fixedFavicon = null; | 56 | this._fixedFavicon = null; |
| 59 | 57 | ||
| 60 | return this; | 58 | return this; |
| 61 | } | 59 | } |
| 62 | 60 | ||
| 63 | Clipperz.PM.DataModel.DirectLoginReference.prototype = MochiKit.Base.update(null, { | 61 | Clipperz.PM.DataModel.DirectLoginReference.prototype = MochiKit.Base.update(null, { |
| 64 | 62 | ||
| 65 | 'user': function() { | 63 | 'user': function() { |
| 66 | return this._user; | 64 | return this._user; |
| 67 | }, | 65 | }, |
| 68 | 66 | ||
| 69 | //------------------------------------------------------------------------- | 67 | //------------------------------------------------------------------------- |
| 70 | 68 | ||
| 71 | 'reference': function() { | 69 | 'reference': function() { |
| 72 | return this._reference; | 70 | return this._reference; |
| 73 | }, | 71 | }, |
| 74 | 72 | ||
| 75 | //------------------------------------------------------------------------- | 73 | //------------------------------------------------------------------------- |
| 76 | 74 | ||
| 77 | 'synchronizeValues': function(aDirectLogin) { | 75 | 'synchronizeValues': function(aDirectLogin) { |
| 78 | this._label = aDirectLogin.label(); | 76 | this._label = aDirectLogin.label(); |
| 79 | this._favicon = aDirectLogin.favicon(); | 77 | this._favicon = aDirectLogin.favicon(); |
| 80 | }, | 78 | }, |
| 81 | 79 | ||
| 82 | //------------------------------------------------------------------------- | 80 | //------------------------------------------------------------------------- |
| 83 | 81 | ||
| 84 | 'label': function() { | 82 | 'label': function() { |
| 85 | return this._label; | 83 | return this._label; |
| 86 | }, | 84 | }, |
| 87 | 85 | ||
| 88 | //------------------------------------------------------------------------- | 86 | //------------------------------------------------------------------------- |
| 89 | 87 | ||
| 90 | 'recordReference': function() { | 88 | 'recordReference': function() { |
| 91 | return this._recordReference; | 89 | return this._recordReference; |
| 92 | }, | 90 | }, |
| 93 | 91 | ||
| 94 | //------------------------------------------------------------------------- | 92 | //------------------------------------------------------------------------- |
| 95 | 93 | ||
| 96 | 'record': function() { | 94 | 'record': function() { |
| 97 | //MochiKit.Logging.logDebug(">>> DirectLoginReference.record"); | 95 | //MochiKit.Logging.logDebug(">>> DirectLoginReference.record"); |
| 98 | if (this._record == null) { | 96 | if (this._record == null) { |
| 99 | this._record = this.user().records()[this.recordReference()]; | 97 | this._record = this.user().records()[this.recordReference()]; |
| 100 | } | 98 | } |
| 101 | 99 | ||
| 102 | //MochiKit.Logging.logDebug("<<< DirectLoginReference.record"); | 100 | //MochiKit.Logging.logDebug("<<< DirectLoginReference.record"); |
| 103 | return this._record; | 101 | return this._record; |
| 104 | }, | 102 | }, |
| 105 | 103 | ||
| 106 | //------------------------------------------------------------------------- | 104 | //------------------------------------------------------------------------- |
| 107 | 105 | ||
| 108 | 'favicon': function() { | 106 | 'favicon': function() { |
| 109 | return this._favicon; | 107 | return this._favicon; |
| 110 | }, | 108 | }, |
| 111 | 109 | ||
| 112 | //------------------------------------------------------------------------- | 110 | //------------------------------------------------------------------------- |
| 113 | 111 | ||
| 114 | 'fixedFavicon': function() { | 112 | 'fixedFavicon': function() { |
| 115 | var result; | 113 | var result; |
| 116 | 114 | ||
| 117 | if (this._fixedFavicon == null) { | 115 | if (this._fixedFavicon == null) { |
| 118 | result = this.favicon(); | 116 | result = this.favicon(); |
diff --git a/frontend/beta/js/Clipperz/PM/DataModel/Header.js b/frontend/beta/js/Clipperz/PM/DataModel/Header.js index c780855..908d9f4 100644 --- a/frontend/beta/js/Clipperz/PM/DataModel/Header.js +++ b/frontend/beta/js/Clipperz/PM/DataModel/Header.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } | 26 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } |
| 29 | 27 | ||
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.DataModel.Header = function(args) { | 31 | Clipperz.PM.DataModel.Header = function(args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | this._user = args.user; | 34 | this._user = args.user; |
| 37 | 35 | ||
| 38 | this._serverData = null; | 36 | this._serverData = null; |
| 39 | this._serverDataVersion = null; | 37 | this._serverDataVersion = null; |
| 40 | this._jsonEvaledServerData = null; | 38 | this._jsonEvaledServerData = null; |
| 41 | 39 | ||
| 42 | this._decryptedLegacyServerData = null; | 40 | this._decryptedLegacyServerData = null; |
| 43 | this._isDecryptingLegacyServerData = false; | 41 | this._isDecryptingLegacyServerData = false; |
| 44 | this._decryptingLegacyServerDataPendingQueue = []; | 42 | this._decryptingLegacyServerDataPendingQueue = []; |
| 45 | 43 | ||
| 46 | this.resetUpdatedSections(); | 44 | this.resetUpdatedSections(); |
| 47 | 45 | ||
| 48 | this._shouldLoadSections = {}; | 46 | this._shouldLoadSections = {}; |
| 49 | 47 | ||
| 50 | Clipperz.NotificationCenter.register(this.user(), 'updatedSection', this, 'updatedSectionHandler'); | 48 | Clipperz.NotificationCenter.register(this.user(), 'updatedSection', this, 'updatedSectionHandler'); |
| 51 | 49 | ||
| 52 | return this; | 50 | return this; |
| 53 | } | 51 | } |
| 54 | 52 | ||
| 55 | Clipperz.PM.DataModel.Header.prototype = MochiKit.Base.update(null, { | 53 | Clipperz.PM.DataModel.Header.prototype = MochiKit.Base.update(null, { |
| 56 | 54 | ||
| 57 | //------------------------------------------------------------------------- | 55 | //------------------------------------------------------------------------- |
| 58 | 56 | ||
| 59 | 'user': function() { | 57 | 'user': function() { |
| 60 | return this._user; | 58 | return this._user; |
| 61 | }, | 59 | }, |
| 62 | 60 | ||
| 63 | //------------------------------------------------------------------------- | 61 | //------------------------------------------------------------------------- |
| 64 | //------------------------------------------------------------------------- | 62 | //------------------------------------------------------------------------- |
| 65 | //------------------------------------------------------------------------- | 63 | //------------------------------------------------------------------------- |
| 66 | //------------------------------------------------------------------------- | 64 | //------------------------------------------------------------------------- |
| 67 | //------------------------------------------------------------------------- | 65 | //------------------------------------------------------------------------- |
| 68 | //------------------------------------------------------------------------- | 66 | //------------------------------------------------------------------------- |
| 69 | //------------------------------------------------------------------------- | 67 | //------------------------------------------------------------------------- |
| 70 | //------------------------------------------------------------------------- | 68 | //------------------------------------------------------------------------- |
| 71 | //------------------------------------------------------------------------- | 69 | //------------------------------------------------------------------------- |
| 72 | 70 | ||
| 73 | 'updatedSections': function() { | 71 | 'updatedSections': function() { |
| 74 | return this._updatedSections; | 72 | return this._updatedSections; |
| 75 | }, | 73 | }, |
| 76 | 74 | ||
| 77 | 'markSectionAsUpdated': function(aSectionName) { | 75 | 'markSectionAsUpdated': function(aSectionName) { |
| 78 | this.updatedSections().push(aSectionName); | 76 | this.updatedSections().push(aSectionName); |
| 79 | }, | 77 | }, |
| 80 | 78 | ||
| 81 | 'resetUpdatedSections': function() { | 79 | 'resetUpdatedSections': function() { |
| 82 | this._updatedSections = [] | 80 | this._updatedSections = [] |
| 83 | }, | 81 | }, |
| 84 | 82 | ||
| 85 | 'hasSectionBeenUpdated': function(aSectionName) { | 83 | 'hasSectionBeenUpdated': function(aSectionName) { |
| 86 | return (this.updatedSections().join().indexOf(aSectionName) != -1); | 84 | return (this.updatedSections().join().indexOf(aSectionName) != -1); |
| 87 | }, | 85 | }, |
| 88 | 86 | ||
| 89 | 'cachedServerDataSection': function(aSectionName) { | 87 | 'cachedServerDataSection': function(aSectionName) { |
| 90 | return (this.hasSectionBeenUpdated(aSectionName)) ? {} : this.jsonEvaledServerData()[aSectionName]; | 88 | return (this.hasSectionBeenUpdated(aSectionName)) ? {} : this.jsonEvaledServerData()[aSectionName]; |
| 91 | }, | 89 | }, |
| 92 | 90 | ||
| 93 | 'updateAllSections': function() { | 91 | 'updateAllSections': function() { |
| 94 | this.resetUpdatedSections(); | 92 | this.resetUpdatedSections(); |
| 95 | this.markSectionAsUpdated('records'); | 93 | this.markSectionAsUpdated('records'); |
| 96 | this.markSectionAsUpdated('directLogins'); | 94 | this.markSectionAsUpdated('directLogins'); |
| 97 | this.markSectionAsUpdated('preferences'); | 95 | this.markSectionAsUpdated('preferences'); |
| 98 | this.markSectionAsUpdated('oneTimePasswords'); | 96 | this.markSectionAsUpdated('oneTimePasswords'); |
| 99 | 97 | ||
| 100 | return MochiKit.Async.succeed(this); | 98 | return MochiKit.Async.succeed(this); |
| 101 | }, | 99 | }, |
| 102 | 100 | ||
| 103 | 'updatedSectionHandler': function(anEvent) { | 101 | 'updatedSectionHandler': function(anEvent) { |
| 104 | this.markSectionAsUpdated(anEvent.parameters()); | 102 | this.markSectionAsUpdated(anEvent.parameters()); |
| 105 | }, | 103 | }, |
| 106 | 104 | ||
| 107 | //------------------------------------------------------------------------- | 105 | //------------------------------------------------------------------------- |
| 108 | 106 | ||
| 109 | 'getObjectKeyIndex': function(anObject) { | 107 | 'getObjectKeyIndex': function(anObject) { |
| 110 | var result; | 108 | var result; |
| 111 | varitemReference; | 109 | varitemReference; |
| 112 | var index; | 110 | var index; |
| 113 | 111 | ||
| 114 | result = {}; | 112 | result = {}; |
| 115 | index = 0; | 113 | index = 0; |
| 116 | 114 | ||
| 117 | for (itemReference in anObject) { | 115 | for (itemReference in anObject) { |
| 118 | result[itemReference] = index.toString(); | 116 | result[itemReference] = index.toString(); |
diff --git a/frontend/beta/js/Clipperz/PM/DataModel/OneTimePassword.js b/frontend/beta/js/Clipperz/PM/DataModel/OneTimePassword.js index 88f383a..3f611b4 100644 --- a/frontend/beta/js/Clipperz/PM/DataModel/OneTimePassword.js +++ b/frontend/beta/js/Clipperz/PM/DataModel/OneTimePassword.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } | 26 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } |
| 29 | 27 | ||
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.DataModel.OneTimePassword = function(args) { | 31 | Clipperz.PM.DataModel.OneTimePassword = function(args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | //console.log("new OneTimePassword", args); | 34 | //console.log("new OneTimePassword", args); |
| 37 | //MochiKit.Logging.logDebug("---"); | 35 | //MochiKit.Logging.logDebug("---"); |
| 38 | this._user = args['user']; | 36 | this._user = args['user']; |
| 39 | this._password = args['password']; | 37 | this._password = args['password']; |
| 40 | this._passwordValue = Clipperz.PM.DataModel.OneTimePassword.normalizedOneTimePassword(args['password']); | 38 | this._passwordValue = Clipperz.PM.DataModel.OneTimePassword.normalizedOneTimePassword(args['password']); |
| 41 | this._reference = args['reference'] || Clipperz.PM.Crypto.randomKey(); | 39 | this._reference = args['reference'] || Clipperz.PM.Crypto.randomKey(); |
| 42 | this._creationDate = args['created'] ? Clipperz.PM.Date.parseDateWithUTCFormat(args['created']) : new Date(); | 40 | this._creationDate = args['created'] ? Clipperz.PM.Date.parseDateWithUTCFormat(args['created']) : new Date(); |
| 43 | this._usageDate = args['used'] ? Clipperz.PM.Date.parseDateWithUTCFormat(args['used']) : null; | 41 | this._usageDate = args['used'] ? Clipperz.PM.Date.parseDateWithUTCFormat(args['used']) : null; |
| 44 | 42 | ||
| 45 | this._status = args['status'] || 'ACTIVE'; | 43 | this._status = args['status'] || 'ACTIVE'; |
| 46 | this._connectionInfo = null; | 44 | this._connectionInfo = null; |
| 47 | 45 | ||
| 48 | this._key = null; | 46 | this._key = null; |
| 49 | this._keyChecksum = null; | 47 | this._keyChecksum = null; |
| 50 | 48 | ||
| 51 | return this; | 49 | return this; |
| 52 | } | 50 | } |
| 53 | 51 | ||
| 54 | Clipperz.PM.DataModel.OneTimePassword.prototype = MochiKit.Base.update(null, { | 52 | Clipperz.PM.DataModel.OneTimePassword.prototype = MochiKit.Base.update(null, { |
| 55 | 53 | ||
| 56 | 'toString': function() { | 54 | 'toString': function() { |
| 57 | return "Clipperz.PM.DataModel.OneTimePassword"; | 55 | return "Clipperz.PM.DataModel.OneTimePassword"; |
| 58 | }, | 56 | }, |
| 59 | 57 | ||
| 60 | //------------------------------------------------------------------------- | 58 | //------------------------------------------------------------------------- |
| 61 | 59 | ||
| 62 | 'user': function() { | 60 | 'user': function() { |
| 63 | return this._user; | 61 | return this._user; |
| 64 | }, | 62 | }, |
| 65 | 63 | ||
| 66 | //------------------------------------------------------------------------- | 64 | //------------------------------------------------------------------------- |
| 67 | 65 | ||
| 68 | 'password': function() { | 66 | 'password': function() { |
| 69 | return this._password; | 67 | return this._password; |
| 70 | }, | 68 | }, |
| 71 | 69 | ||
| 72 | //------------------------------------------------------------------------- | 70 | //------------------------------------------------------------------------- |
| 73 | 71 | ||
| 74 | 'passwordValue': function() { | 72 | 'passwordValue': function() { |
| 75 | return this._passwordValue; | 73 | return this._passwordValue; |
| 76 | }, | 74 | }, |
| 77 | 75 | ||
| 78 | //------------------------------------------------------------------------- | 76 | //------------------------------------------------------------------------- |
| 79 | 77 | ||
| 80 | 'creationDate': function() { | 78 | 'creationDate': function() { |
| 81 | return this._creationDate; | 79 | return this._creationDate; |
| 82 | }, | 80 | }, |
| 83 | 81 | ||
| 84 | //------------------------------------------------------------------------- | 82 | //------------------------------------------------------------------------- |
| 85 | 83 | ||
| 86 | 'reference': function() { | 84 | 'reference': function() { |
| 87 | return this._reference; | 85 | return this._reference; |
| 88 | }, | 86 | }, |
| 89 | 87 | ||
| 90 | //------------------------------------------------------------------------- | 88 | //------------------------------------------------------------------------- |
| 91 | 89 | ||
| 92 | 'key': function() { | 90 | 'key': function() { |
| 93 | if (this._key == null) { | 91 | if (this._key == null) { |
| 94 | this._key = Clipperz.PM.DataModel.OneTimePassword.computeKeyWithUsernameAndPassword(this.user().username(), this.passwordValue()); | 92 | this._key = Clipperz.PM.DataModel.OneTimePassword.computeKeyWithUsernameAndPassword(this.user().username(), this.passwordValue()); |
| 95 | } | 93 | } |
| 96 | 94 | ||
| 97 | return this._key; | 95 | return this._key; |
| 98 | }, | 96 | }, |
| 99 | 97 | ||
| 100 | //------------------------------------------------------------------------- | 98 | //------------------------------------------------------------------------- |
| 101 | 99 | ||
| 102 | 'keyChecksum': function() { | 100 | 'keyChecksum': function() { |
| 103 | if (this._keyChecksum == null) { | 101 | if (this._keyChecksum == null) { |
| 104 | this._keyChecksum = Clipperz.PM.DataModel.OneTimePassword.computeKeyChecksumWithUsernameAndPassword(this.user().username(), this.passwordValue()); | 102 | this._keyChecksum = Clipperz.PM.DataModel.OneTimePassword.computeKeyChecksumWithUsernameAndPassword(this.user().username(), this.passwordValue()); |
| 105 | } | 103 | } |
| 106 | 104 | ||
| 107 | return this._keyChecksum; | 105 | return this._keyChecksum; |
| 108 | }, | 106 | }, |
| 109 | 107 | ||
| 110 | //------------------------------------------------------------------------- | 108 | //------------------------------------------------------------------------- |
| 111 | 109 | ||
| 112 | 'status': function() { | 110 | 'status': function() { |
| 113 | return this._status; | 111 | return this._status; |
| 114 | }, | 112 | }, |
| 115 | 113 | ||
| 116 | 'setStatus': function(aValue) { | 114 | 'setStatus': function(aValue) { |
| 117 | this._status = aValue; | 115 | this._status = aValue; |
| 118 | }, | 116 | }, |
diff --git a/frontend/beta/js/Clipperz/PM/DataModel/OneTimePasswordManager.js b/frontend/beta/js/Clipperz/PM/DataModel/OneTimePasswordManager.js index aa40aba..1ebb615 100644 --- a/frontend/beta/js/Clipperz/PM/DataModel/OneTimePasswordManager.js +++ b/frontend/beta/js/Clipperz/PM/DataModel/OneTimePasswordManager.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } | 26 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } |
| 29 | 27 | ||
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.DataModel.OneTimePasswordManager = function(anUser, args) { | 31 | Clipperz.PM.DataModel.OneTimePasswordManager = function(anUser, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | this._user = anUser; | 34 | this._user = anUser; |
| 37 | this._oneTimePasswords = {}; | 35 | this._oneTimePasswords = {}; |
| 38 | 36 | ||
| 39 | this.updateWithData(args); | 37 | this.updateWithData(args); |
| 40 | 38 | ||
| 41 | Clipperz.NotificationCenter.notify(null, 'oneTimePasswordAdded', null, true); | 39 | Clipperz.NotificationCenter.notify(null, 'oneTimePasswordAdded', null, true); |
| 42 | 40 | ||
| 43 | return this; | 41 | return this; |
| 44 | } | 42 | } |
| 45 | 43 | ||
| 46 | Clipperz.PM.DataModel.OneTimePasswordManager.prototype = MochiKit.Base.update(null, { | 44 | Clipperz.PM.DataModel.OneTimePasswordManager.prototype = MochiKit.Base.update(null, { |
| 47 | 45 | ||
| 48 | 'toString': function() { | 46 | 'toString': function() { |
| 49 | return "Clipperz.PM.DataModel.OneTimePasswordManager"; | 47 | return "Clipperz.PM.DataModel.OneTimePasswordManager"; |
| 50 | }, | 48 | }, |
| 51 | 49 | ||
| 52 | //------------------------------------------------------------------------- | 50 | //------------------------------------------------------------------------- |
| 53 | 51 | ||
| 54 | 'updateWithData': function(someValues) { | 52 | 'updateWithData': function(someValues) { |
| 55 | varotpReference; | 53 | varotpReference; |
| 56 | 54 | ||
| 57 | //console.log("OneTimePasswordManager.updateWithData", someValues); | 55 | //console.log("OneTimePasswordManager.updateWithData", someValues); |
| 58 | //MochiKit.Logging.logDebug("OneTimePasswordManager.updateWithData: " + Clipperz.Base.serializeJSON(someValues)); | 56 | //MochiKit.Logging.logDebug("OneTimePasswordManager.updateWithData: " + Clipperz.Base.serializeJSON(someValues)); |
| 59 | for (otpReference in someValues) { | 57 | for (otpReference in someValues) { |
| 60 | var otp; | 58 | var otp; |
| 61 | var otpConfiguration; | 59 | var otpConfiguration; |
| 62 | 60 | ||
| 63 | otpConfiguration = someValues[otpReference]; | 61 | otpConfiguration = someValues[otpReference]; |
| 64 | otpConfiguration['user'] = this.user(); | 62 | otpConfiguration['user'] = this.user(); |
| 65 | otpConfiguration['reference'] = otpReference; | 63 | otpConfiguration['reference'] = otpReference; |
| 66 | otp = new Clipperz.PM.DataModel.OneTimePassword(otpConfiguration); | 64 | otp = new Clipperz.PM.DataModel.OneTimePassword(otpConfiguration); |
| 67 | this._oneTimePasswords[otpReference] = otp; | 65 | this._oneTimePasswords[otpReference] = otp; |
| 68 | } | 66 | } |
| 69 | 67 | ||
| 70 | return this; | 68 | return this; |
| 71 | }, | 69 | }, |
| 72 | 70 | ||
| 73 | //------------------------------------------------------------------------- | 71 | //------------------------------------------------------------------------- |
| 74 | 72 | ||
| 75 | 'updateWithServerData': function(someValues) { | 73 | 'updateWithServerData': function(someValues) { |
| 76 | var deferredResult; | 74 | var deferredResult; |
| 77 | varoneTimePasswordReference; | 75 | varoneTimePasswordReference; |
| 78 | var wereChangesApplied; | 76 | var wereChangesApplied; |
| 79 | 77 | ||
| 80 | //MochiKit.Logging.logDebug(">>> OneTimePasswordManager.updateWithServerData"); | 78 | //MochiKit.Logging.logDebug(">>> OneTimePasswordManager.updateWithServerData"); |
| 81 | deferredResult = new MochiKit.Async.Deferred(); | 79 | deferredResult = new MochiKit.Async.Deferred(); |
| 82 | wereChangesApplied = false; | 80 | wereChangesApplied = false; |
| 83 | 81 | ||
| 84 | for (oneTimePasswordReference in someValues) { | 82 | for (oneTimePasswordReference in someValues) { |
| 85 | var oneTimePassword; | 83 | var oneTimePassword; |
| 86 | 84 | ||
| 87 | oneTimePassword = this.oneTimePasswordWithReference(oneTimePasswordReference); | 85 | oneTimePassword = this.oneTimePasswordWithReference(oneTimePasswordReference); |
| 88 | if (oneTimePassword != null) { | 86 | if (oneTimePassword != null) { |
| 89 | var oneTimePasswordHasBeenUpdated; | 87 | var oneTimePasswordHasBeenUpdated; |
| 90 | 88 | ||
| 91 | oneTimePasswordHasBeenUpdated = oneTimePassword.updateStatusWithValues(someValues[oneTimePasswordReference]); | 89 | oneTimePasswordHasBeenUpdated = oneTimePassword.updateStatusWithValues(someValues[oneTimePasswordReference]); |
| 92 | wereChangesApplied = oneTimePasswordHasBeenUpdated || wereChangesApplied; | 90 | wereChangesApplied = oneTimePasswordHasBeenUpdated || wereChangesApplied; |
| 93 | } else { | 91 | } else { |
| 94 | 92 | ||
| 95 | } | 93 | } |
| 96 | } | 94 | } |
| 97 | 95 | ||
| 98 | if (wereChangesApplied == true) { | 96 | if (wereChangesApplied == true) { |
| 99 | this.user().header().markSectionAsUpdated('oneTimePasswords'); | 97 | this.user().header().markSectionAsUpdated('oneTimePasswords'); |
| 100 | } | 98 | } |
| 101 | 99 | ||
| 102 | for (oneTimePasswordReference in this.oneTimePasswords()) { | 100 | for (oneTimePasswordReference in this.oneTimePasswords()) { |
| 103 | if (typeof(someValues[oneTimePasswordReference]) == 'undefind') { | 101 | if (typeof(someValues[oneTimePasswordReference]) == 'undefind') { |
| 104 | deferredResult.addCallback(MochiKit.Base.method(this.oneTimePasswordWithReference(oneTimePasswordReference), 'saveChanges')); | 102 | deferredResult.addCallback(MochiKit.Base.method(this.oneTimePasswordWithReference(oneTimePasswordReference), 'saveChanges')); |
| 105 | } | 103 | } |
| 106 | } | 104 | } |
| 107 | 105 | ||
| 108 | deferredResult.addCallback(MochiKit.Async.succeed, this); | 106 | deferredResult.addCallback(MochiKit.Async.succeed, this); |
| 109 | 107 | ||
| 110 | deferredResult.callback(); | 108 | deferredResult.callback(); |
| 111 | //MochiKit.Logging.logDebug("<<< OneTimePasswordManager.updateWithServerData"); | 109 | //MochiKit.Logging.logDebug("<<< OneTimePasswordManager.updateWithServerData"); |
| 112 | 110 | ||
| 113 | return deferredResult; | 111 | return deferredResult; |
| 114 | }, | 112 | }, |
| 115 | 113 | ||
| 116 | //------------------------------------------------------------------------- | 114 | //------------------------------------------------------------------------- |
| 117 | 115 | ||
| 118 | 'user': function() { | 116 | 'user': function() { |
diff --git a/frontend/beta/js/Clipperz/PM/DataModel/Record.js b/frontend/beta/js/Clipperz/PM/DataModel/Record.js index f89f79c..7b06f29 100644 --- a/frontend/beta/js/Clipperz/PM/DataModel/Record.js +++ b/frontend/beta/js/Clipperz/PM/DataModel/Record.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } | 26 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } |
| 29 | 27 | ||
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.DataModel.Record = function(args) { | 31 | Clipperz.PM.DataModel.Record = function(args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | this._user = args['user'] || null; | 34 | this._user = args['user'] || null; |
| 37 | this._reference = args['reference'] || Clipperz.PM.Crypto.randomKey(); | 35 | this._reference = args['reference'] || Clipperz.PM.Crypto.randomKey(); |
| 38 | this._version = args['version'] || Clipperz.PM.Crypto.encryptingFunctions.currentVersion; | 36 | this._version = args['version'] || Clipperz.PM.Crypto.encryptingFunctions.currentVersion; |
| 39 | this._key = args['key'] || Clipperz.PM.Crypto.randomKey(); | 37 | this._key = args['key'] || Clipperz.PM.Crypto.randomKey(); |
| 40 | 38 | ||
| 41 | this.setLabel(args['label'] || Clipperz.PM.Strings['newRecordTitleLabel']); | 39 | this.setLabel(args['label'] || Clipperz.PM.Strings['newRecordTitleLabel']); |
| 42 | 40 | ||
| 43 | this.setHeaderNotes(args['headerNotes'] || null); | 41 | this.setHeaderNotes(args['headerNotes'] || null); |
| 44 | this.setNotes(args['notes'] || args['headerNotes'] || ""); | 42 | this.setNotes(args['notes'] || args['headerNotes'] || ""); |
| 45 | //MochiKit.Logging.logDebug("--- new Record ('" + this._label + "')- _headerNotes: '" + this._headerNotes + "'"); | 43 | //MochiKit.Logging.logDebug("--- new Record ('" + this._label + "')- _headerNotes: '" + this._headerNotes + "'"); |
| 46 | //MochiKit.Logging.logDebug("--- new Record ('" + this._label + "')- _notes: '" + this._notes + "'"); | 44 | //MochiKit.Logging.logDebug("--- new Record ('" + this._label + "')- _notes: '" + this._notes + "'"); |
| 47 | //this._notes = args.notes || ""; | 45 | //this._notes = args.notes || ""; |
| 48 | 46 | ||
| 49 | this._versions = {}; | 47 | this._versions = {}; |
| 50 | this._directLogins = {}; | 48 | this._directLogins = {}; |
| 51 | this._removedDirectLogins = []; | 49 | this._removedDirectLogins = []; |
| 52 | 50 | ||
| 53 | this.setIsBrandNew(args['reference'] == null); | 51 | this.setIsBrandNew(args['reference'] == null); |
| 54 | 52 | ||
| 55 | this.setShouldLoadData(this.isBrandNew() ? false: true); | 53 | this.setShouldLoadData(this.isBrandNew() ? false: true); |
| 56 | this.setShouldDecryptData(this.isBrandNew() ? false: true); | 54 | this.setShouldDecryptData(this.isBrandNew() ? false: true); |
| 57 | this.setShouldProcessData(this.isBrandNew() ? false: true); | 55 | this.setShouldProcessData(this.isBrandNew() ? false: true); |
| 58 | 56 | ||
| 59 | this.setCurrentVersion(this.isBrandNew() ? new Clipperz.PM.DataModel.RecordVersion(this, null): null); | 57 | this.setCurrentVersion(this.isBrandNew() ? new Clipperz.PM.DataModel.RecordVersion(this, null): null); |
| 60 | this.setCurrentVersionKey(null); | 58 | this.setCurrentVersionKey(null); |
| 61 | 59 | ||
| 62 | this._serverData = null; | 60 | this._serverData = null; |
| 63 | this._decryptedData = null; | 61 | this._decryptedData = null; |
| 64 | this._cachedData = null; | 62 | this._cachedData = null; |
| 65 | 63 | ||
| 66 | return this; | 64 | return this; |
| 67 | } | 65 | } |
| 68 | 66 | ||
| 69 | Clipperz.PM.DataModel.Record.prototype = MochiKit.Base.update(null, { | 67 | Clipperz.PM.DataModel.Record.prototype = MochiKit.Base.update(null, { |
| 70 | 68 | ||
| 71 | 'toString': function() { | 69 | 'toString': function() { |
| 72 | return "Record (" + this.label() + ")"; | 70 | return "Record (" + this.label() + ")"; |
| 73 | }, | 71 | }, |
| 74 | 72 | ||
| 75 | //------------------------------------------------------------------------- | 73 | //------------------------------------------------------------------------- |
| 76 | 74 | ||
| 77 | 'isBrandNew': function() { | 75 | 'isBrandNew': function() { |
| 78 | return this._isBrandNew; | 76 | return this._isBrandNew; |
| 79 | }, | 77 | }, |
| 80 | 78 | ||
| 81 | 'setIsBrandNew': function(aValue) { | 79 | 'setIsBrandNew': function(aValue) { |
| 82 | this._isBrandNew = aValue; | 80 | this._isBrandNew = aValue; |
| 83 | }, | 81 | }, |
| 84 | 82 | ||
| 85 | //------------------------------------------------------------------------- | 83 | //------------------------------------------------------------------------- |
| 86 | /* | 84 | /* |
| 87 | 'shouldRunTheRecordCreationWizard': function() { | 85 | 'shouldRunTheRecordCreationWizard': function() { |
| 88 | return (this.isBrandNew() && (MochiKit.Base.keys(this.currentVersion().fields()).length == 0)); | 86 | return (this.isBrandNew() && (MochiKit.Base.keys(this.currentVersion().fields()).length == 0)); |
| 89 | }, | 87 | }, |
| 90 | */ | 88 | */ |
| 91 | //------------------------------------------------------------------------- | 89 | //------------------------------------------------------------------------- |
| 92 | 90 | ||
| 93 | 'user': function() { | 91 | 'user': function() { |
| 94 | return this._user; | 92 | return this._user; |
| 95 | }, | 93 | }, |
| 96 | 94 | ||
| 97 | //------------------------------------------------------------------------- | 95 | //------------------------------------------------------------------------- |
| 98 | 96 | ||
| 99 | 'reference': function() { | 97 | 'reference': function() { |
| 100 | return this._reference; | 98 | return this._reference; |
| 101 | }, | 99 | }, |
| 102 | 100 | ||
| 103 | //------------------------------------------------------------------------- | 101 | //------------------------------------------------------------------------- |
| 104 | 102 | ||
| 105 | 'key': function() { | 103 | 'key': function() { |
| 106 | return this._key; | 104 | return this._key; |
| 107 | }, | 105 | }, |
| 108 | 106 | ||
| 109 | 'updateKey': function() { | 107 | 'updateKey': function() { |
| 110 | this._key = Clipperz.PM.Crypto.randomKey(); | 108 | this._key = Clipperz.PM.Crypto.randomKey(); |
| 111 | }, | 109 | }, |
| 112 | 110 | ||
| 113 | //------------------------------------------------------------------------- | 111 | //------------------------------------------------------------------------- |
| 114 | 112 | ||
| 115 | 'label': function() { | 113 | 'label': function() { |
| 116 | return this._label; | 114 | return this._label; |
| 117 | }, | 115 | }, |
| 118 | 116 | ||
diff --git a/frontend/beta/js/Clipperz/PM/DataModel/RecordField.js b/frontend/beta/js/Clipperz/PM/DataModel/RecordField.js index bca664d..a5d7980 100644 --- a/frontend/beta/js/Clipperz/PM/DataModel/RecordField.js +++ b/frontend/beta/js/Clipperz/PM/DataModel/RecordField.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } | 26 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } |
| 29 | 27 | ||
| 30 | //############################################################################# | 28 | //############################################################################# |
| 31 | 29 | ||
| 32 | Clipperz.PM.DataModel.RecordField = function(args) { | 30 | Clipperz.PM.DataModel.RecordField = function(args) { |
| 33 | args = args || {}; | 31 | args = args || {}; |
| 34 | 32 | ||
| 35 | this._recordVersion = args.recordVersion || null; | 33 | this._recordVersion = args.recordVersion || null; |
| 36 | this._key = args.key || Clipperz.PM.Crypto.randomKey(); | 34 | this._key = args.key || Clipperz.PM.Crypto.randomKey(); |
| 37 | this.setLabel(args.label || ''); | 35 | this.setLabel(args.label || ''); |
| 38 | this.setValue(args.value || ''); | 36 | this.setValue(args.value || ''); |
| 39 | this.setType(args.type || 'TXT'); //valid types: 'TXT', 'PWD', 'URL', 'DATE', 'ADDR', 'CHECK', 'RADIO', ('NOTE' probably not), ... | 37 | this.setType(args.type || 'TXT'); //valid types: 'TXT', 'PWD', 'URL', 'DATE', 'ADDR', 'CHECK', 'RADIO', ('NOTE' probably not), ... |
| 40 | this._hidden = args.hidden || (args.type == 'PWD') || false; | 38 | this._hidden = args.hidden || (args.type == 'PWD') || false; |
| 41 | 39 | ||
| 42 | return this; | 40 | return this; |
| 43 | } | 41 | } |
| 44 | 42 | ||
| 45 | Clipperz.PM.DataModel.RecordField.prototype = MochiKit.Base.update(null, { | 43 | Clipperz.PM.DataModel.RecordField.prototype = MochiKit.Base.update(null, { |
| 46 | 44 | ||
| 47 | 'toString': function() { | 45 | 'toString': function() { |
| 48 | return "Clipperz.PM.DataModel.RecordField - " + this.label() + " (" + this.key() + ")"; | 46 | return "Clipperz.PM.DataModel.RecordField - " + this.label() + " (" + this.key() + ")"; |
| 49 | }, | 47 | }, |
| 50 | 48 | ||
| 51 | //------------------------------------------------------------------------- | 49 | //------------------------------------------------------------------------- |
| 52 | 50 | ||
| 53 | 'recordVersion': function() { | 51 | 'recordVersion': function() { |
| 54 | return this._recordVersion; | 52 | return this._recordVersion; |
| 55 | }, | 53 | }, |
| 56 | 54 | ||
| 57 | //------------------------------------------------------------------------- | 55 | //------------------------------------------------------------------------- |
| 58 | 56 | ||
| 59 | 'key': function() { | 57 | 'key': function() { |
| 60 | return this._key; | 58 | return this._key; |
| 61 | }, | 59 | }, |
| 62 | 60 | ||
| 63 | //------------------------------------------------------------------------- | 61 | //------------------------------------------------------------------------- |
| 64 | 62 | ||
| 65 | 'label': function() { | 63 | 'label': function() { |
| 66 | return this._label; | 64 | return this._label; |
| 67 | }, | 65 | }, |
| 68 | 66 | ||
| 69 | 'setLabel': function(aValue) { | 67 | 'setLabel': function(aValue) { |
| 70 | this._label = aValue; | 68 | this._label = aValue; |
| 71 | }, | 69 | }, |
| 72 | 70 | ||
| 73 | //------------------------------------------------------------------------- | 71 | //------------------------------------------------------------------------- |
| 74 | 72 | ||
| 75 | 'value': function() { | 73 | 'value': function() { |
| 76 | return this._value; | 74 | return this._value; |
| 77 | }, | 75 | }, |
| 78 | 76 | ||
| 79 | 'setValue': function(aValue) { | 77 | 'setValue': function(aValue) { |
| 80 | this._value = aValue; | 78 | this._value = aValue; |
| 81 | }, | 79 | }, |
| 82 | 80 | ||
| 83 | //------------------------------------------------------------------------- | 81 | //------------------------------------------------------------------------- |
| 84 | 82 | ||
| 85 | 'type': function() { | 83 | 'type': function() { |
| 86 | return this._type; | 84 | return this._type; |
| 87 | }, | 85 | }, |
| 88 | 86 | ||
| 89 | 'setType': function(aValue) { | 87 | 'setType': function(aValue) { |
| 90 | this._type = aValue; | 88 | this._type = aValue; |
| 91 | 89 | ||
| 92 | if (aValue == 'PWD') { | 90 | if (aValue == 'PWD') { |
| 93 | this.setHidden(true); | 91 | this.setHidden(true); |
| 94 | } else { | 92 | } else { |
| 95 | this.setHidden(false); | 93 | this.setHidden(false); |
| 96 | } | 94 | } |
| 97 | }, | 95 | }, |
| 98 | 96 | ||
| 99 | //------------------------------------------------------------------------- | 97 | //------------------------------------------------------------------------- |
| 100 | 98 | ||
| 101 | 'serializeData': function() { | 99 | 'serializeData': function() { |
| 102 | var result; | 100 | var result; |
| 103 | 101 | ||
| 104 | //MochiKit.Logging.logDebug(">>> RecordField.serializeData - " + this); | 102 | //MochiKit.Logging.logDebug(">>> RecordField.serializeData - " + this); |
| 105 | result = { | 103 | result = { |
| 106 | label: this.label(), | 104 | label: this.label(), |
| 107 | value:this.value(), | 105 | value:this.value(), |
| 108 | type: this.type(), | 106 | type: this.type(), |
| 109 | hidden: this.hidden() | 107 | hidden: this.hidden() |
| 110 | }; | 108 | }; |
| 111 | //MochiKit.Logging.logDebug("<<< RecordField.serializeData"); | 109 | //MochiKit.Logging.logDebug("<<< RecordField.serializeData"); |
| 112 | 110 | ||
| 113 | return result; | 111 | return result; |
| 114 | }, | 112 | }, |
| 115 | 113 | ||
| 116 | //------------------------------------------------------------------------- | 114 | //------------------------------------------------------------------------- |
| 117 | 115 | ||
| 118 | 'typeShortDescription': function() { | 116 | 'typeShortDescription': function() { |
diff --git a/frontend/beta/js/Clipperz/PM/DataModel/RecordVersion.js b/frontend/beta/js/Clipperz/PM/DataModel/RecordVersion.js index fc4a45c..69a7d91 100644 --- a/frontend/beta/js/Clipperz/PM/DataModel/RecordVersion.js +++ b/frontend/beta/js/Clipperz/PM/DataModel/RecordVersion.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } | 26 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } |
| 29 | 27 | ||
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.DataModel.RecordVersion = function(aRecord, args) { | 31 | Clipperz.PM.DataModel.RecordVersion = function(aRecord, args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | this._record = aRecord; | 34 | this._record = aRecord; |
| 37 | 35 | ||
| 38 | this._reference = args.reference || Clipperz.PM.Crypto.randomKey(); | 36 | this._reference = args.reference || Clipperz.PM.Crypto.randomKey(); |
| 39 | this._version = args.version || Clipperz.PM.Crypto.encryptingFunctions.currentVersion; | 37 | this._version = args.version || Clipperz.PM.Crypto.encryptingFunctions.currentVersion; |
| 40 | this._key = args.key || Clipperz.PM.Crypto.randomKey();; | 38 | this._key = args.key || Clipperz.PM.Crypto.randomKey();; |
| 41 | 39 | ||
| 42 | this._previousVersion = args.previousVersion || null; | 40 | this._previousVersion = args.previousVersion || null; |
| 43 | this._previousVersionKey = args.previousVersionKey || null; | 41 | this._previousVersionKey = args.previousVersionKey || null; |
| 44 | 42 | ||
| 45 | this.setIsBrandNew(args.reference == null); | 43 | this.setIsBrandNew(args.reference == null); |
| 46 | 44 | ||
| 47 | if (this.isBrandNew()) { | 45 | if (this.isBrandNew()) { |
| 48 | this._fields = {}; | 46 | this._fields = {}; |
| 49 | 47 | ||
| 50 | this.setShouldLoadData(false); | 48 | this.setShouldLoadData(false); |
| 51 | this.setShouldDecryptData(false); | 49 | this.setShouldDecryptData(false); |
| 52 | this.setShouldProcessData(false); | 50 | this.setShouldProcessData(false); |
| 53 | } else { | 51 | } else { |
| 54 | if (typeof(args.fields) != 'undefined') { | 52 | if (typeof(args.fields) != 'undefined') { |
| 55 | this.processFieldData(args.fields); | 53 | this.processFieldData(args.fields); |
| 56 | 54 | ||
| 57 | this.setShouldLoadData(false); | 55 | this.setShouldLoadData(false); |
| 58 | this.setShouldDecryptData(false); | 56 | this.setShouldDecryptData(false); |
| 59 | this.setShouldProcessData(false); | 57 | this.setShouldProcessData(false); |
| 60 | } else { | 58 | } else { |
| 61 | if (typeof(args.data) != 'undefined') { | 59 | if (typeof(args.data) != 'undefined') { |
| 62 | this.setShouldLoadData(false); | 60 | this.setShouldLoadData(false); |
| 63 | } else { | 61 | } else { |
| 64 | this.setShouldLoadData(true); | 62 | this.setShouldLoadData(true); |
| 65 | } | 63 | } |
| 66 | this.setShouldDecryptData(true); | 64 | this.setShouldDecryptData(true); |
| 67 | this.setShouldProcessData(true); | 65 | this.setShouldProcessData(true); |
| 68 | } | 66 | } |
| 69 | } | 67 | } |
| 70 | 68 | ||
| 71 | this._serverData = args.data; | 69 | this._serverData = args.data; |
| 72 | this._decryptedData = null; | 70 | this._decryptedData = null; |
| 73 | 71 | ||
| 74 | return this; | 72 | return this; |
| 75 | } | 73 | } |
| 76 | 74 | ||
| 77 | Clipperz.PM.DataModel.RecordVersion.prototype = MochiKit.Base.update(null, { | 75 | Clipperz.PM.DataModel.RecordVersion.prototype = MochiKit.Base.update(null, { |
| 78 | 76 | ||
| 79 | 'toString': function() { | 77 | 'toString': function() { |
| 80 | return "RecordVersion"; | 78 | return "RecordVersion"; |
| 81 | }, | 79 | }, |
| 82 | 80 | ||
| 83 | //------------------------------------------------------------------------- | 81 | //------------------------------------------------------------------------- |
| 84 | 82 | ||
| 85 | 'record': function() { | 83 | 'record': function() { |
| 86 | return this._record; | 84 | return this._record; |
| 87 | }, | 85 | }, |
| 88 | 86 | ||
| 89 | //------------------------------------------------------------------------- | 87 | //------------------------------------------------------------------------- |
| 90 | 88 | ||
| 91 | 'reference': function() { | 89 | 'reference': function() { |
| 92 | return this._reference; | 90 | return this._reference; |
| 93 | }, | 91 | }, |
| 94 | 92 | ||
| 95 | 'setReference': function(aValue) { | 93 | 'setReference': function(aValue) { |
| 96 | this._reference = aValue; | 94 | this._reference = aValue; |
| 97 | }, | 95 | }, |
| 98 | 96 | ||
| 99 | //------------------------------------------------------------------------- | 97 | //------------------------------------------------------------------------- |
| 100 | 98 | ||
| 101 | 'key': function() { | 99 | 'key': function() { |
| 102 | //MochiKit.Logging.logDebug(">>> RecordVersion.key"); | 100 | //MochiKit.Logging.logDebug(">>> RecordVersion.key"); |
| 103 | //MochiKit.Logging.logDebug("--- RecordVersion.key - " + this._key); | 101 | //MochiKit.Logging.logDebug("--- RecordVersion.key - " + this._key); |
| 104 | return this._key; | 102 | return this._key; |
| 105 | }, | 103 | }, |
| 106 | 104 | ||
| 107 | 'setKey': function(aValue) { | 105 | 'setKey': function(aValue) { |
| 108 | this._key = aValue; | 106 | this._key = aValue; |
| 109 | }, | 107 | }, |
| 110 | 108 | ||
| 111 | //------------------------------------------------------------------------- | 109 | //------------------------------------------------------------------------- |
| 112 | 110 | ||
| 113 | 'serverData': function() { | 111 | 'serverData': function() { |
| 114 | return this._serverData; | 112 | return this._serverData; |
| 115 | }, | 113 | }, |
| 116 | 114 | ||
| 117 | 'setServerData': function(aValue) { | 115 | 'setServerData': function(aValue) { |
| 118 | this._serverData = aValue; | 116 | this._serverData = aValue; |
diff --git a/frontend/beta/js/Clipperz/PM/DataModel/Statistics.js b/frontend/beta/js/Clipperz/PM/DataModel/Statistics.js index 3d53adf..f0c229e 100644 --- a/frontend/beta/js/Clipperz/PM/DataModel/Statistics.js +++ b/frontend/beta/js/Clipperz/PM/DataModel/Statistics.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } | 26 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } |
| 29 | 27 | ||
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.DataModel.Statistics = function(args) { | 31 | Clipperz.PM.DataModel.Statistics = function(args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | this._user = args.user; | 34 | this._user = args.user; |
| 37 | this._data = args.data || null; | 35 | this._data = args.data || null; |
| 38 | 36 | ||
| 39 | return this; | 37 | return this; |
| 40 | } | 38 | } |
| 41 | 39 | ||
| 42 | Clipperz.PM.DataModel.Statistics.prototype = MochiKit.Base.update(null, { | 40 | Clipperz.PM.DataModel.Statistics.prototype = MochiKit.Base.update(null, { |
| 43 | 41 | ||
| 44 | //------------------------------------------------------------------------- | 42 | //------------------------------------------------------------------------- |
| 45 | 43 | ||
| 46 | 'decrypt': function(aVersion, someEncryptedData) { | 44 | 'decrypt': function(aVersion, someEncryptedData) { |
| 47 | var deferredResult; | 45 | var deferredResult; |
| 48 | 46 | ||
| 49 | //MochiKit.Logging.logDebug(">>> Statistics.decrypt"); | 47 | //MochiKit.Logging.logDebug(">>> Statistics.decrypt"); |
| 50 | if (someEncryptedData == Clipperz.PM.Crypto.nullValue) { | 48 | if (someEncryptedData == Clipperz.PM.Crypto.nullValue) { |
| 51 | this.setData({}); | 49 | this.setData({}); |
| 52 | deferredResult = MochiKit.Async.succeed(this.data()); | 50 | deferredResult = MochiKit.Async.succeed(this.data()); |
| 53 | } else { | 51 | } else { |
| 54 | varstatistic; | 52 | varstatistic; |
| 55 | var user; | 53 | var user; |
| 56 | 54 | ||
| 57 | statistic = this; | 55 | statistic = this; |
| 58 | user = this.user(); | 56 | user = this.user(); |
| 59 | deferredResult = new MochiKit.Async.Deferred(); | 57 | deferredResult = new MochiKit.Async.Deferred(); |
| 60 | //deferredResult.addCallback(function() { console.time("Statistics.decrypt.deferredDecrypt")}); | 58 | //deferredResult.addCallback(function() { console.time("Statistics.decrypt.deferredDecrypt")}); |
| 61 | deferredResult.addCallback(Clipperz.PM.Crypto.deferredDecrypt, user.passphrase(), someEncryptedData, aVersion); | 59 | deferredResult.addCallback(Clipperz.PM.Crypto.deferredDecrypt, user.passphrase(), someEncryptedData, aVersion); |
| 62 | //deferredResult.addCallback(function() { console.timeEnd("Statistics.decrypt.deferredDecrypt")}); | 60 | //deferredResult.addCallback(function() { console.timeEnd("Statistics.decrypt.deferredDecrypt")}); |
| 63 | //deferredResult.addCallback(function() { console.time("Statistics.decrypt.setup")}); | 61 | //deferredResult.addCallback(function() { console.time("Statistics.decrypt.setup")}); |
| 64 | deferredResult.addCallbacks( | 62 | deferredResult.addCallbacks( |
| 65 | MochiKit.Base.partial(function (aStatistic, someData) { | 63 | MochiKit.Base.partial(function (aStatistic, someData) { |
| 66 | aStatistic.setData(someData); | 64 | aStatistic.setData(someData); |
| 67 | return aStatistic.data(); | 65 | return aStatistic.data(); |
| 68 | }, statistic), | 66 | }, statistic), |
| 69 | MochiKit.Base.partial(function (aStatistic) { | 67 | MochiKit.Base.partial(function (aStatistic) { |
| 70 | MochiKit.Logging.logWarning("resetting user statistics due to an error while decrypting stored data"); | 68 | MochiKit.Logging.logWarning("resetting user statistics due to an error while decrypting stored data"); |
| 71 | aStatistic.setData({}); | 69 | aStatistic.setData({}); |
| 72 | return aStatistic.data(); | 70 | return aStatistic.data(); |
| 73 | }, statistic) | 71 | }, statistic) |
| 74 | ); | 72 | ); |
| 75 | //deferredResult.addCallback(function() { console.timeEnd("Statistics.decrypt.setup")}); | 73 | //deferredResult.addCallback(function() { console.timeEnd("Statistics.decrypt.setup")}); |
| 76 | 74 | ||
| 77 | deferredResult.callback(); | 75 | deferredResult.callback(); |
| 78 | } | 76 | } |
| 79 | //MochiKit.Logging.logDebug("<<< Statistics.decrypt"); | 77 | //MochiKit.Logging.logDebug("<<< Statistics.decrypt"); |
| 80 | 78 | ||
| 81 | return deferredResult; | 79 | return deferredResult; |
| 82 | }, | 80 | }, |
| 83 | 81 | ||
| 84 | //------------------------------------------------------------------------- | 82 | //------------------------------------------------------------------------- |
| 85 | 83 | ||
| 86 | 'user': function() { | 84 | 'user': function() { |
| 87 | return this._user; | 85 | return this._user; |
| 88 | }, | 86 | }, |
| 89 | 87 | ||
| 90 | //------------------------------------------------------------------------- | 88 | //------------------------------------------------------------------------- |
| 91 | 89 | ||
| 92 | 'data': function() { | 90 | 'data': function() { |
| 93 | return this._data; | 91 | return this._data; |
| 94 | }, | 92 | }, |
| 95 | 93 | ||
| 96 | 'setData': function(aValue) { | 94 | 'setData': function(aValue) { |
| 97 | this._data = aValue; | 95 | this._data = aValue; |
| 98 | 96 | ||
| 99 | this.extractInfoFromData(aValue); | 97 | this.extractInfoFromData(aValue); |
| 100 | }, | 98 | }, |
| 101 | 99 | ||
| 102 | //------------------------------------------------------------------------- | 100 | //------------------------------------------------------------------------- |
| 103 | 101 | ||
| 104 | 'extractInfoFromData': function(someValues) { | 102 | 'extractInfoFromData': function(someValues) { |
| 105 | 103 | ||
| 106 | }, | 104 | }, |
| 107 | 105 | ||
| 108 | //------------------------------------------------------------------------- | 106 | //------------------------------------------------------------------------- |
| 109 | 107 | ||
| 110 | 'encryptedData': function() { | 108 | 'encryptedData': function() { |
| 111 | return Clipperz.PM.Crypto.deferredEncryptWithCurrentVersion(this.user().passphrase(), this.serializedData()); | 109 | return Clipperz.PM.Crypto.deferredEncryptWithCurrentVersion(this.user().passphrase(), this.serializedData()); |
| 112 | }, | 110 | }, |
| 113 | 111 | ||
| 114 | //------------------------------------------------------------------------- | 112 | //------------------------------------------------------------------------- |
| 115 | 113 | ||
| 116 | 'serializedData': function() { | 114 | 'serializedData': function() { |
| 117 | var result; | 115 | var result; |
| 118 | 116 | ||
diff --git a/frontend/beta/js/Clipperz/PM/DataModel/User.js b/frontend/beta/js/Clipperz/PM/DataModel/User.js index b29d224..3067742 100644 --- a/frontend/beta/js/Clipperz/PM/DataModel/User.js +++ b/frontend/beta/js/Clipperz/PM/DataModel/User.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } | 26 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } |
| 29 | 27 | ||
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.DataModel.User = function(args) { | 31 | Clipperz.PM.DataModel.User = function(args) { |
| 34 | //MochiKit.Logging.logDebug(">>> new User"); | 32 | //MochiKit.Logging.logDebug(">>> new User"); |
| 35 | args = args || {}; | 33 | args = args || {}; |
| 36 | 34 | ||
| 37 | this._username = args.username || null; | 35 | this._username = args.username || null; |
| 38 | this._passphrase = args.passphrase || null; | 36 | this._passphrase = args.passphrase || null; |
| 39 | 37 | ||
| 40 | this._connection = null; | 38 | this._connection = null; |
| 41 | this._connectionVersion = 'current'; | 39 | this._connectionVersion = 'current'; |
| 42 | 40 | ||
| 43 | this._header = null; | 41 | this._header = null; |
| 44 | this._statistics = null; | 42 | this._statistics = null; |
| 45 | this._lock = 'new lock'; | 43 | this._lock = 'new lock'; |
| 46 | 44 | ||
| 47 | this._preferences = null; | 45 | this._preferences = null; |
| 48 | this._records = {}; | 46 | this._records = {}; |
| 49 | this._directLoginReferences = {}; | 47 | this._directLoginReferences = {}; |
| 50 | this._oneTimePasswordManager = null; | 48 | this._oneTimePasswordManager = null; |
| 51 | 49 | ||
| 52 | this._isLoadingUserDetails = false; | 50 | this._isLoadingUserDetails = false; |
| 53 | this._loadingUserDetailsPendingQueue = []; | 51 | this._loadingUserDetailsPendingQueue = []; |
| 54 | 52 | ||
| 55 | this._maxNumberOfRecords = Number.MAX_VALUE; | 53 | this._maxNumberOfRecords = Number.MAX_VALUE; |
| 56 | 54 | ||
| 57 | this._shouldDownloadOfflineCopy = false; | 55 | this._shouldDownloadOfflineCopy = false; |
| 58 | 56 | ||
| 59 | this._loginInfo = null; | 57 | this._loginInfo = null; |
| 60 | this._loginHistory = null; | 58 | this._loginHistory = null; |
| 61 | 59 | ||
| 62 | this._serverData = null; | 60 | this._serverData = null; |
| 63 | //MochiKit.Logging.logDebug("<<< new User"); | 61 | //MochiKit.Logging.logDebug("<<< new User"); |
| 64 | 62 | ||
| 65 | return this; | 63 | return this; |
| 66 | } | 64 | } |
| 67 | 65 | ||
| 68 | Clipperz.PM.DataModel.User.prototype = MochiKit.Base.update(null, { | 66 | Clipperz.PM.DataModel.User.prototype = MochiKit.Base.update(null, { |
| 69 | 67 | ||
| 70 | 'toString': function() { | 68 | 'toString': function() { |
| 71 | return "Clipperz.PM.DataModel.User - " + this.username(); | 69 | return "Clipperz.PM.DataModel.User - " + this.username(); |
| 72 | }, | 70 | }, |
| 73 | 71 | ||
| 74 | //------------------------------------------------------------------------- | 72 | //------------------------------------------------------------------------- |
| 75 | 73 | ||
| 76 | 'username': function() { | 74 | 'username': function() { |
| 77 | return this._username; | 75 | return this._username; |
| 78 | }, | 76 | }, |
| 79 | 77 | ||
| 80 | 'setUsername': function(aValue) { | 78 | 'setUsername': function(aValue) { |
| 81 | this._username = aValue; | 79 | this._username = aValue; |
| 82 | }, | 80 | }, |
| 83 | 81 | ||
| 84 | //------------------------------------------------------------------------- | 82 | //------------------------------------------------------------------------- |
| 85 | 83 | ||
| 86 | 'passphrase': function() { | 84 | 'passphrase': function() { |
| 87 | return this._passphrase; | 85 | return this._passphrase; |
| 88 | }, | 86 | }, |
| 89 | 87 | ||
| 90 | 'setPassphrase': function(aValue) { | 88 | 'setPassphrase': function(aValue) { |
| 91 | this._passphrase = aValue; | 89 | this._passphrase = aValue; |
| 92 | }, | 90 | }, |
| 93 | 91 | ||
| 94 | //------------------------------------------------------------------------- | 92 | //------------------------------------------------------------------------- |
| 95 | 93 | ||
| 96 | 'maxNumberOfRecords': function() { | 94 | 'maxNumberOfRecords': function() { |
| 97 | return this._maxNumberOfRecords; | 95 | return this._maxNumberOfRecords; |
| 98 | }, | 96 | }, |
| 99 | 97 | ||
| 100 | 'setMaxNumberOfRecords': function(aValue) { | 98 | 'setMaxNumberOfRecords': function(aValue) { |
| 101 | this._maxNumberOfRecords = aValue; | 99 | this._maxNumberOfRecords = aValue; |
| 102 | }, | 100 | }, |
| 103 | 101 | ||
| 104 | //------------------------------------------------------------------------- | 102 | //------------------------------------------------------------------------- |
| 105 | 103 | ||
| 106 | 'errorHandler': function(anErrorString, anException) { | 104 | 'errorHandler': function(anErrorString, anException) { |
| 107 | MochiKit.Logging.logError("- User.errorHandler: " + anErrorString + " (" + anException + ")"); | 105 | MochiKit.Logging.logError("- User.errorHandler: " + anErrorString + " (" + anException + ")"); |
| 108 | }, | 106 | }, |
| 109 | 107 | ||
| 110 | //------------------------------------------------------------------------- | 108 | //------------------------------------------------------------------------- |
| 111 | 109 | ||
| 112 | 'connectionVersion': function() { | 110 | 'connectionVersion': function() { |
| 113 | return this._connectionVersion; | 111 | return this._connectionVersion; |
| 114 | }, | 112 | }, |
| 115 | 113 | ||
| 116 | 'setConnectionVersion': function(aValue) { | 114 | 'setConnectionVersion': function(aValue) { |
| 117 | this._connectionVersion = aValue; | 115 | this._connectionVersion = aValue; |
| 118 | }, | 116 | }, |
diff --git a/frontend/beta/js/Clipperz/PM/DataModel/UserPreferences.js b/frontend/beta/js/Clipperz/PM/DataModel/UserPreferences.js index 919289d..d44ad89 100644 --- a/frontend/beta/js/Clipperz/PM/DataModel/UserPreferences.js +++ b/frontend/beta/js/Clipperz/PM/DataModel/UserPreferences.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } | 26 | if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; } |
| 29 | 27 | ||
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.DataModel.UserPreferences = function(args) { | 31 | Clipperz.PM.DataModel.UserPreferences = function(args) { |
| 34 | args = args || {}; | 32 | args = args || {}; |
| 35 | 33 | ||
| 36 | this._user = args['user']; delete args['user']; | 34 | this._user = args['user']; delete args['user']; |
| 37 | this._config = args; | 35 | this._config = args; |
| 38 | 36 | ||
| 39 | return this; | 37 | return this; |
| 40 | } | 38 | } |
| 41 | 39 | ||
| 42 | Clipperz.PM.DataModel.UserPreferences.prototype = MochiKit.Base.update(null, { | 40 | Clipperz.PM.DataModel.UserPreferences.prototype = MochiKit.Base.update(null, { |
| 43 | 41 | ||
| 44 | //------------------------------------------------------------------------- | 42 | //------------------------------------------------------------------------- |
| 45 | 43 | ||
| 46 | 'config': function() { | 44 | 'config': function() { |
| 47 | return this._config; | 45 | return this._config; |
| 48 | }, | 46 | }, |
| 49 | 47 | ||
| 50 | //------------------------------------------------------------------------- | 48 | //------------------------------------------------------------------------- |
| 51 | 49 | ||
| 52 | 'user': function() { | 50 | 'user': function() { |
| 53 | return this._user; | 51 | return this._user; |
| 54 | }, | 52 | }, |
| 55 | 53 | ||
| 56 | //------------------------------------------------------------------------- | 54 | //------------------------------------------------------------------------- |
| 57 | 55 | ||
| 58 | 'updateWithData': function(someValues) { | 56 | 'updateWithData': function(someValues) { |
| 59 | var currentLanguage; | 57 | var currentLanguage; |
| 60 | 58 | ||
| 61 | //MochiKit.Logging.logDebug(">>> Clipperz.PM.DataModel.UserPreferences.updateWithData: " + Clipperz.Base.serializeJSON(someValues)); | 59 | //MochiKit.Logging.logDebug(">>> Clipperz.PM.DataModel.UserPreferences.updateWithData: " + Clipperz.Base.serializeJSON(someValues)); |
| 62 | currentLanguage = this.preferredLanguage(); | 60 | currentLanguage = this.preferredLanguage(); |
| 63 | 61 | ||
| 64 | MochiKit.Base.update(this._config, someValues); | 62 | MochiKit.Base.update(this._config, someValues); |
| 65 | 63 | ||
| 66 | if (this.preferredLanguage() != currentLanguage) { | 64 | if (this.preferredLanguage() != currentLanguage) { |
| 67 | Clipperz.PM.Strings.Languages.setSelectedLanguage(this.preferredLanguage()); | 65 | Clipperz.PM.Strings.Languages.setSelectedLanguage(this.preferredLanguage()); |
| 68 | } else { | 66 | } else { |
| 69 | //MochiKit.Logging.logDebug("### keepping the browser selected language: " + Clipperz.PM.Strings.selectedLanguage); | 67 | //MochiKit.Logging.logDebug("### keepping the browser selected language: " + Clipperz.PM.Strings.selectedLanguage); |
| 70 | } | 68 | } |
| 71 | 69 | ||
| 72 | return this; | 70 | return this; |
| 73 | }, | 71 | }, |
| 74 | 72 | ||
| 75 | //------------------------------------------------------------------------- | 73 | //------------------------------------------------------------------------- |
| 76 | 74 | ||
| 77 | 'configValue': function(aConfigName, aDefaultValue) { | 75 | 'configValue': function(aConfigName, aDefaultValue) { |
| 78 | var result; | 76 | var result; |
| 79 | 77 | ||
| 80 | //MochiKit.Logging.logDebug(">>> UserPreferences.configValue - config: " + Clipperz.Base.serializeJSON(this.config())); | 78 | //MochiKit.Logging.logDebug(">>> UserPreferences.configValue - config: " + Clipperz.Base.serializeJSON(this.config())); |
| 81 | if (typeof(this.config()[aConfigName]) == 'undefined') { | 79 | if (typeof(this.config()[aConfigName]) == 'undefined') { |
| 82 | result = aDefaultValue; | 80 | result = aDefaultValue; |
| 83 | } else { | 81 | } else { |
| 84 | result = this.config()[aConfigName]; | 82 | result = this.config()[aConfigName]; |
| 85 | } | 83 | } |
| 86 | //MochiKit.Logging.logDebug("<<< UserPreferences.configValue"); | 84 | //MochiKit.Logging.logDebug("<<< UserPreferences.configValue"); |
| 87 | 85 | ||
| 88 | return result; | 86 | return result; |
| 89 | }, | 87 | }, |
| 90 | 88 | ||
| 91 | 'setConfigValue': function(aConfigName, aValue) { | 89 | 'setConfigValue': function(aConfigName, aValue) { |
| 92 | var result; | 90 | var result; |
| 93 | 91 | ||
| 94 | if (aValue != this.configValue(aConfigName)) { | 92 | if (aValue != this.configValue(aConfigName)) { |
| 95 | if (aValue == null) { | 93 | if (aValue == null) { |
| 96 | delete this.config()[aConfigName] | 94 | delete this.config()[aConfigName] |
| 97 | } else { | 95 | } else { |
| 98 | this.config()[aConfigName] = aValue; | 96 | this.config()[aConfigName] = aValue; |
| 99 | } | 97 | } |
| 100 | 98 | ||
| 101 | Clipperz.NotificationCenter.notify(this.user(), 'updatedSection', 'preferences', true); | 99 | Clipperz.NotificationCenter.notify(this.user(), 'updatedSection', 'preferences', true); |
| 102 | 100 | ||
| 103 | result = true; | 101 | result = true; |
| 104 | } else { | 102 | } else { |
| 105 | result = false; | 103 | result = false; |
| 106 | } | 104 | } |
| 107 | 105 | ||
| 108 | return result; | 106 | return result; |
| 109 | }, | 107 | }, |
| 110 | 108 | ||
| 111 | //------------------------------------------------------------------------- | 109 | //------------------------------------------------------------------------- |
| 112 | 110 | ||
| 113 | 'useSafeEditMode': function() { | 111 | 'useSafeEditMode': function() { |
| 114 | return this.configValue('useSafeEditMode', true); | 112 | return this.configValue('useSafeEditMode', true); |
| 115 | }, | 113 | }, |
| 116 | 114 | ||
| 117 | 'setUseSafeEditMode': function(aValue) { | 115 | 'setUseSafeEditMode': function(aValue) { |
| 118 | this.setConfigValue('useSafeEditMode', aValue); | 116 | this.setConfigValue('useSafeEditMode', aValue); |
diff --git a/frontend/beta/js/Clipperz/PM/Date.js b/frontend/beta/js/Clipperz/PM/Date.js index 13116e9..36c10c8 100644 --- a/frontend/beta/js/Clipperz/PM/Date.js +++ b/frontend/beta/js/Clipperz/PM/Date.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Date) == 'undefined') { Clipperz.PM.Date = {}; } | 26 | if (typeof(Clipperz.PM.Date) == 'undefined') { Clipperz.PM.Date = {}; } |
| 29 | 27 | ||
| 30 | Clipperz.PM.Date.VERSION = "0.1"; | 28 | Clipperz.PM.Date.VERSION = "0.1"; |
| 31 | Clipperz.PM.Date.NAME = "Clipperz.PM.Date"; | 29 | Clipperz.PM.Date.NAME = "Clipperz.PM.Date"; |
| 32 | 30 | ||
| 33 | MochiKit.Base.update(Clipperz.PM.Date, { | 31 | MochiKit.Base.update(Clipperz.PM.Date, { |
| 34 | 32 | ||
| 35 | '__repr__': function () { | 33 | '__repr__': function () { |
| 36 | return "[" + this.NAME + " " + this.VERSION + "]"; | 34 | return "[" + this.NAME + " " + this.VERSION + "]"; |
| 37 | }, | 35 | }, |
| 38 | 36 | ||
| 39 | //------------------------------------------------------------------------- | 37 | //------------------------------------------------------------------------- |
| 40 | 38 | ||
| 41 | 'toString': function () { | 39 | 'toString': function () { |
| 42 | return this.__repr__(); | 40 | return this.__repr__(); |
| 43 | }, | 41 | }, |
| 44 | 42 | ||
| 45 | //------------------------------------------------------------------------- | 43 | //------------------------------------------------------------------------- |
| 46 | 44 | ||
| 47 | 'locale': function() { | 45 | 'locale': function() { |
| 48 | return { | 46 | return { |
| 49 | 'amDesignation':Clipperz.PM.Strings['calendarStrings']['amDesignation'], | 47 | 'amDesignation':Clipperz.PM.Strings['calendarStrings']['amDesignation'], |
| 50 | 'pmDesignation':Clipperz.PM.Strings['calendarStrings']['pmDesignation'], | 48 | 'pmDesignation':Clipperz.PM.Strings['calendarStrings']['pmDesignation'], |
| 51 | 'days': Clipperz.PM.Strings['calendarStrings']['days'], | 49 | 'days': Clipperz.PM.Strings['calendarStrings']['days'], |
| 52 | 'shortDays': Clipperz.PM.Strings['calendarStrings']['shortDays'], | 50 | 'shortDays': Clipperz.PM.Strings['calendarStrings']['shortDays'], |
| 53 | 'shortMonths': Clipperz.PM.Strings['calendarStrings']['shortMonths'], | 51 | 'shortMonths': Clipperz.PM.Strings['calendarStrings']['shortMonths'], |
| 54 | 'months': Clipperz.PM.Strings['calendarStrings']['months'] | 52 | 'months': Clipperz.PM.Strings['calendarStrings']['months'] |
| 55 | } | 53 | } |
| 56 | }, | 54 | }, |
| 57 | 55 | ||
| 58 | //========================================================================= | 56 | //========================================================================= |
| 59 | /* | 57 | /* |
| 60 | 'formatDateWithPHPLikeTemplate': function(aDate, aTemplate) { | 58 | 'formatDateWithPHPLikeTemplate': function(aDate, aTemplate) { |
| 61 | return Clipperz.Date.formatDateWithPHPLikeTemplateAndLocale(aDate, aTemplate, Clipperz.PM.Date.locale()); | 59 | return Clipperz.Date.formatDateWithPHPLikeTemplateAndLocale(aDate, aTemplate, Clipperz.PM.Date.locale()); |
| 62 | }, | 60 | }, |
| 63 | 61 | ||
| 64 | 'parseDateWithPHPLikeTemplate': function(aDate, aTemplate) { | 62 | 'parseDateWithPHPLikeTemplate': function(aDate, aTemplate) { |
| 65 | return Clipperz.Date.parseDateWithPHPTemplateAndLocale(aDate, aTemplate, Clipperz.PM.Date.locale()); | 63 | return Clipperz.Date.parseDateWithPHPTemplateAndLocale(aDate, aTemplate, Clipperz.PM.Date.locale()); |
| 66 | }, | 64 | }, |
| 67 | 65 | ||
| 68 | //========================================================================= | 66 | //========================================================================= |
| 69 | 67 | ||
| 70 | 'formatDateWithJavaLikeTemplate': function(aDate, aTemplate) { | 68 | 'formatDateWithJavaLikeTemplate': function(aDate, aTemplate) { |
| 71 | return Clipperz.Date.formatDateWithJavaLikeTemplateAndLocale(aDate, aTemplate, Clipperz.PM.Date.locale()); | 69 | return Clipperz.Date.formatDateWithJavaLikeTemplateAndLocale(aDate, aTemplate, Clipperz.PM.Date.locale()); |
| 72 | }, | 70 | }, |
| 73 | 71 | ||
| 74 | 'parseDateWithJavaLikeTemplate': function(aDate, aTemplate) { | 72 | 'parseDateWithJavaLikeTemplate': function(aDate, aTemplate) { |
| 75 | return Clipperz.Date.parseDateWithJavaLikeTemplateAndLocale(aDate, aTemplate, Clipperz.PM.Date.locale()); | 73 | return Clipperz.Date.parseDateWithJavaLikeTemplateAndLocale(aDate, aTemplate, Clipperz.PM.Date.locale()); |
| 76 | }, | 74 | }, |
| 77 | */ | 75 | */ |
| 78 | //========================================================================= | 76 | //========================================================================= |
| 79 | 77 | ||
| 80 | 'formatDateWithTemplate': function(aDate, aTemplate) { | 78 | 'formatDateWithTemplate': function(aDate, aTemplate) { |
| 81 | var result; | 79 | var result; |
| 82 | 80 | ||
| 83 | if (aDate == null) { | 81 | if (aDate == null) { |
| 84 | result = "" | 82 | result = "" |
| 85 | } else { | 83 | } else { |
| 86 | result = Clipperz.Date.formatDateWithPHPLikeTemplateAndLocale(aDate, aTemplate, Clipperz.PM.Date.locale()); | 84 | result = Clipperz.Date.formatDateWithPHPLikeTemplateAndLocale(aDate, aTemplate, Clipperz.PM.Date.locale()); |
| 87 | }; | 85 | }; |
| 88 | 86 | ||
| 89 | return result; | 87 | return result; |
| 90 | }, | 88 | }, |
| 91 | 89 | ||
| 92 | 'parseDateWithTemplate': function(aValue, aTemplate) { | 90 | 'parseDateWithTemplate': function(aValue, aTemplate) { |
| 93 | return Clipperz.Date.parseDateWithPHPTemplateAndLocale(aValue, aTemplate, Clipperz.PM.Date.locale()); | 91 | return Clipperz.Date.parseDateWithPHPTemplateAndLocale(aValue, aTemplate, Clipperz.PM.Date.locale()); |
| 94 | }, | 92 | }, |
| 95 | 93 | ||
| 96 | //========================================================================= | 94 | //========================================================================= |
| 97 | 95 | ||
| 98 | 'formatDateWithUTCFormat': function(aDate) { | 96 | 'formatDateWithUTCFormat': function(aDate) { |
| 99 | return Clipperz.Date.formatDateWithUTCFormatAndLocale(aDate, Clipperz.PM.Date.locale()); | 97 | return Clipperz.Date.formatDateWithUTCFormatAndLocale(aDate, Clipperz.PM.Date.locale()); |
| 100 | }, | 98 | }, |
| 101 | 99 | ||
| 102 | 'parseDateWithUTCFormat': function(aValue) { | 100 | 'parseDateWithUTCFormat': function(aValue) { |
| 103 | var result; | 101 | var result; |
| 104 | 102 | ||
| 105 | if (aValue == null) { | 103 | if (aValue == null) { |
| 106 | result = null; | 104 | result = null; |
| 107 | } else { | 105 | } else { |
| 108 | result = Clipperz.Date.parseDateWithUTCFormatAndLocale(aValue, Clipperz.PM.Date.locale()); | 106 | result = Clipperz.Date.parseDateWithUTCFormatAndLocale(aValue, Clipperz.PM.Date.locale()); |
| 109 | } | 107 | } |
| 110 | 108 | ||
| 111 | return result; | 109 | return result; |
| 112 | }, | 110 | }, |
| 113 | 111 | ||
| 114 | //========================================================================= | 112 | //========================================================================= |
| 115 | 113 | ||
| 116 | 'getElapsedTimeDescription': function(aDate) { | 114 | 'getElapsedTimeDescription': function(aDate) { |
| 117 | var result; | 115 | var result; |
| 118 | 116 | ||
diff --git a/frontend/beta/js/Clipperz/PM/Main.js b/frontend/beta/js/Clipperz/PM/Main.js index 989e0a4..3dded31 100644 --- a/frontend/beta/js/Clipperz/PM/Main.js +++ b/frontend/beta/js/Clipperz/PM/Main.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 24 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 27 | 25 | ||
| 28 | Clipperz.PM.VERSION = "0.1"; | 26 | Clipperz.PM.VERSION = "0.1"; |
| 29 | Clipperz.PM.NAME = "Clipperz.PM"; | 27 | Clipperz.PM.NAME = "Clipperz.PM"; |
| 30 | 28 | ||
| 31 | //############################################################################# | 29 | //############################################################################# |
| 32 | 30 | ||
| 33 | Clipperz.PM.Main = function() { | 31 | Clipperz.PM.Main = function() { |
| 34 | this._loginPanel = null; | 32 | this._loginPanel = null; |
| 35 | this._user = null; | 33 | this._user = null; |
| 36 | 34 | ||
| 37 | this._isRunningCompact = false; | 35 | this._isRunningCompact = false; |
| 38 | 36 | ||
| 39 | Clipperz.NotificationCenter.register(null, 'userConnected', this, 'userConnectedCallback'); | 37 | Clipperz.NotificationCenter.register(null, 'userConnected', this, 'userConnectedCallback'); |
| 40 | Clipperz.NotificationCenter.register(null, 'switchLanguage', this, 'switchLanguageHandler'); | 38 | Clipperz.NotificationCenter.register(null, 'switchLanguage', this, 'switchLanguageHandler'); |
| 41 | 39 | ||
| 42 | Clipperz.NotificationCenter.register(null, 'EXCEPTION', this, 'reportException'); | 40 | Clipperz.NotificationCenter.register(null, 'EXCEPTION', this, 'reportException'); |
| 43 | 41 | ||
| 44 | return this; | 42 | return this; |
| 45 | } | 43 | } |
| 46 | 44 | ||
| 47 | //============================================================================= | 45 | //============================================================================= |
| 48 | 46 | ||
| 49 | MochiKit.Base.update(Clipperz.PM.Main.prototype, { | 47 | MochiKit.Base.update(Clipperz.PM.Main.prototype, { |
| 50 | 'toString': function() { | 48 | 'toString': function() { |
| 51 | return "Clipperz.PM.Main"; | 49 | return "Clipperz.PM.Main"; |
| 52 | }, | 50 | }, |
| 53 | 51 | ||
| 54 | 'switchLanguageHandler': function() { | 52 | 'switchLanguageHandler': function() { |
| 55 | //MochiKit.Logging.logDebug(">>> main.switchLanguageHandler"); | 53 | //MochiKit.Logging.logDebug(">>> main.switchLanguageHandler"); |
| 56 | YAHOO.ext.Element.get('donateHeaderIconLink').dom.href = Clipperz.PM.Strings['donateHeaderLinkUrl']; | 54 | YAHOO.ext.Element.get('donateHeaderIconLink').dom.href = Clipperz.PM.Strings['donateHeaderLinkUrl']; |
| 57 | YAHOO.ext.Element.get('donateHeaderLink').update(Clipperz.PM.Strings['donateHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['donateHeaderLinkUrl']; | 55 | YAHOO.ext.Element.get('donateHeaderLink').update(Clipperz.PM.Strings['donateHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['donateHeaderLinkUrl']; |
| 58 | YAHOO.ext.Element.get('creditsHeaderLink').update(Clipperz.PM.Strings['creditsHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['creditsHeaderLinkUrl']; | 56 | YAHOO.ext.Element.get('creditsHeaderLink').update(Clipperz.PM.Strings['creditsHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['creditsHeaderLinkUrl']; |
| 59 | YAHOO.ext.Element.get('feedbackHeaderLink').update(Clipperz.PM.Strings['feedbackHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['feedbackHeaderLinkUrl']; | 57 | YAHOO.ext.Element.get('feedbackHeaderLink').update(Clipperz.PM.Strings['feedbackHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['feedbackHeaderLinkUrl']; |
| 60 | YAHOO.ext.Element.get('helpHeaderLink').update(Clipperz.PM.Strings['helpHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['helpHeaderLinkUrl']; | 58 | YAHOO.ext.Element.get('helpHeaderLink').update(Clipperz.PM.Strings['helpHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['helpHeaderLinkUrl']; |
| 61 | YAHOO.ext.Element.get('forumHeaderLink').update(Clipperz.PM.Strings['forumHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['forumHeaderLinkUrl']; | 59 | YAHOO.ext.Element.get('forumHeaderLink').update(Clipperz.PM.Strings['forumHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['forumHeaderLinkUrl']; |
| 62 | 60 | ||
| 63 | if (YAHOO.ext.Element.get('logout') != null) { | 61 | if (YAHOO.ext.Element.get('logout') != null) { |
| 64 | YAHOO.ext.Element.get('logout').update(Clipperz.PM.Strings['logoutMenuLabel']); | 62 | YAHOO.ext.Element.get('logout').update(Clipperz.PM.Strings['logoutMenuLabel']); |
| 65 | YAHOO.ext.Element.get('lock').update(Clipperz.PM.Strings['lockMenuLabel']); | 63 | YAHOO.ext.Element.get('lock').update(Clipperz.PM.Strings['lockMenuLabel']); |
| 66 | 64 | ||
| 67 | YAHOO.ext.Element.get('recordsTabAnchor').update(Clipperz.PM.Strings['recordMenuLabel']); | 65 | YAHOO.ext.Element.get('recordsTabAnchor').update(Clipperz.PM.Strings['recordMenuLabel']); |
| 68 | YAHOO.ext.Element.get('accountTabAnchor').update(Clipperz.PM.Strings['accountMenuLabel']); | 66 | YAHOO.ext.Element.get('accountTabAnchor').update(Clipperz.PM.Strings['accountMenuLabel']); |
| 69 | YAHOO.ext.Element.get('dataTabAnchor').update(Clipperz.PM.Strings['dataMenuLabel']); | 67 | YAHOO.ext.Element.get('dataTabAnchor').update(Clipperz.PM.Strings['dataMenuLabel']); |
| 70 | // YAHOO.ext.Element.get('contactsTabAnchor').update(Clipperz.PM.Strings['contactsMenuLabel']); | 68 | // YAHOO.ext.Element.get('contactsTabAnchor').update(Clipperz.PM.Strings['contactsMenuLabel']); |
| 71 | YAHOO.ext.Element.get('toolsTabAnchor').update(Clipperz.PM.Strings['toolsMenuLabel']); | 69 | YAHOO.ext.Element.get('toolsTabAnchor').update(Clipperz.PM.Strings['toolsMenuLabel']); |
| 72 | } | 70 | } |
| 73 | //MochiKit.Logging.logDebug("<<< main.switchLanguageHandler"); | 71 | //MochiKit.Logging.logDebug("<<< main.switchLanguageHandler"); |
| 74 | }, | 72 | }, |
| 75 | 73 | ||
| 76 | //------------------------------------------------------------------------- | 74 | //------------------------------------------------------------------------- |
| 77 | 75 | ||
| 78 | 'fixToDrawTheMainTabsCorrectlyOnSafari': function() { | 76 | 'fixToDrawTheMainTabsCorrectlyOnSafari': function() { |
| 79 | this.switchLanguageHandler(); | 77 | this.switchLanguageHandler(); |
| 80 | }, | 78 | }, |
| 81 | 79 | ||
| 82 | //------------------------------------------------------------------------- | 80 | //------------------------------------------------------------------------- |
| 83 | 81 | ||
| 84 | 'run': function(shouldShowRegistrationForm) { | 82 | 'run': function(shouldShowRegistrationForm) { |
| 85 | varmainElement; | 83 | varmainElement; |
| 86 | 84 | ||
| 87 | Clipperz.NotificationCenter.register(null, 'updatedProgressState', this, 'updateProgressDialogStatus'); | 85 | Clipperz.NotificationCenter.register(null, 'updatedProgressState', this, 'updateProgressDialogStatus'); |
| 88 | 86 | ||
| 89 | YAHOO.ext.Element.get('recordDetailEditModeHeaderMask').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide().unmask(); | 87 | YAHOO.ext.Element.get('recordDetailEditModeHeaderMask').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide().unmask(); |
| 90 | YAHOO.ext.Element.get('recordDetailEditModeVerticalMask').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide().unmask(); | 88 | YAHOO.ext.Element.get('recordDetailEditModeVerticalMask').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide().unmask(); |
| 91 | 89 | ||
| 92 | //MochiKit.Logging.logDebug(">>> Main.run"); | 90 | //MochiKit.Logging.logDebug(">>> Main.run"); |
| 93 | mainElement = YAHOO.ext.Element.get('main'); | 91 | mainElement = YAHOO.ext.Element.get('main'); |
| 94 | if (Clipperz.PM.Proxy.defaultProxy.isReadOnly()) { | 92 | if (Clipperz.PM.Proxy.defaultProxy.isReadOnly()) { |
| 95 | YAHOO.ext.Element.get('applicationVersionType').dom.className = "readOnly"; | 93 | YAHOO.ext.Element.get('applicationVersionType').dom.className = "readOnly"; |
| 96 | } | 94 | } |
| 97 | mainElement.update(""); | 95 | mainElement.update(""); |
| 98 | 96 | ||
| 99 | Clipperz.YUI.DomHelper.append(mainElement.dom, {tag:'ul', cls:'clipperzTabPanels', children:[ | 97 | Clipperz.YUI.DomHelper.append(mainElement.dom, {tag:'ul', cls:'clipperzTabPanels', children:[ |
| 100 | {tag:'li', id:'loginPanel'} | 98 | {tag:'li', id:'loginPanel'} |
| 101 | ]}) | 99 | ]}) |
| 102 | 100 | ||
| 103 | this.setLoginPanel(new Clipperz.PM.Components.Panels.LoginPanel(YAHOO.ext.Element.get('loginPanel'))); | 101 | this.setLoginPanel(new Clipperz.PM.Components.Panels.LoginPanel(YAHOO.ext.Element.get('loginPanel'))); |
| 104 | 102 | ||
| 105 | //MochiKit.Logging.logDebug("--- Main.run - selecting active form to show ..."); | 103 | //MochiKit.Logging.logDebug("--- Main.run - selecting active form to show ..."); |
| 106 | if (shouldShowRegistrationForm == true) { | 104 | if (shouldShowRegistrationForm == true) { |
| 107 | this.loginPanel().showRegistrationForm(false); | 105 | this.loginPanel().showRegistrationForm(false); |
| 108 | } else { | 106 | } else { |
| 109 | this.loginPanel().showLoginForm(false); | 107 | this.loginPanel().showLoginForm(false); |
| 110 | } | 108 | } |
| 111 | 109 | ||
| 112 | this.switchLanguageHandler(); | 110 | this.switchLanguageHandler(); |
| 113 | //MochiKit.Logging.logDebug("--- Main.run - selecting active form to show. done."); | 111 | //MochiKit.Logging.logDebug("--- Main.run - selecting active form to show. done."); |
| 114 | //MochiKit.Logging.logDebug("<<< Main.run"); | 112 | //MochiKit.Logging.logDebug("<<< Main.run"); |
| 115 | }, | 113 | }, |
| 116 | 114 | ||
| 117 | //------------------------------------------------------------------------- | 115 | //------------------------------------------------------------------------- |
| 118 | 116 | ||
diff --git a/frontend/beta/js/Clipperz/PM/Proxy.js b/frontend/beta/js/Clipperz/PM/Proxy.js index bec9195..cf5a237 100644 --- a/frontend/beta/js/Clipperz/PM/Proxy.js +++ b/frontend/beta/js/Clipperz/PM/Proxy.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | 26 | ||
| 29 | //============================================================================= | 27 | //============================================================================= |
| 30 | 28 | ||
| 31 | Clipperz.PM.Proxy = function(args) { | 29 | Clipperz.PM.Proxy = function(args) { |
| 32 | args = args || {}; | 30 | args = args || {}; |
| 33 | 31 | ||
| 34 | this._shouldPayTolls = args.shouldPayTolls || false; | 32 | this._shouldPayTolls = args.shouldPayTolls || false; |
| 35 | 33 | ||
| 36 | this._tolls = { | 34 | this._tolls = { |
| 37 | 'CONNECT':[], | 35 | 'CONNECT':[], |
| 38 | 'REGISTER':[], | 36 | 'REGISTER':[], |
| 39 | 'MESSAGE':[] | 37 | 'MESSAGE':[] |
| 40 | }; | 38 | }; |
| 41 | 39 | ||
| 42 | if (args.isDefault === true) { | 40 | if (args.isDefault === true) { |
| 43 | Clipperz.PM.Proxy.defaultProxy = this; | 41 | Clipperz.PM.Proxy.defaultProxy = this; |
| 44 | } | 42 | } |
| 45 | 43 | ||
| 46 | return this; | 44 | return this; |
| 47 | } | 45 | } |
| 48 | 46 | ||
| 49 | Clipperz.PM.Proxy.prototype = MochiKit.Base.update(null, { | 47 | Clipperz.PM.Proxy.prototype = MochiKit.Base.update(null, { |
| 50 | 48 | ||
| 51 | 'toString': function() { | 49 | 'toString': function() { |
| 52 | return "Clipperz.PM.Proxy"; | 50 | return "Clipperz.PM.Proxy"; |
| 53 | }, | 51 | }, |
| 54 | 52 | ||
| 55 | //========================================================================= | 53 | //========================================================================= |
| 56 | 54 | ||
| 57 | 'shouldPayTolls': function() { | 55 | 'shouldPayTolls': function() { |
| 58 | return this._shouldPayTolls; | 56 | return this._shouldPayTolls; |
| 59 | }, | 57 | }, |
| 60 | 58 | ||
| 61 | //------------------------------------------------------------------------- | 59 | //------------------------------------------------------------------------- |
| 62 | 60 | ||
| 63 | 'tolls': function() { | 61 | 'tolls': function() { |
| 64 | return this._tolls; | 62 | return this._tolls; |
| 65 | }, | 63 | }, |
| 66 | 64 | ||
| 67 | //------------------------------------------------------------------------- | 65 | //------------------------------------------------------------------------- |
| 68 | 66 | ||
| 69 | 'payToll': function(aRequestType, someParameters) { | 67 | 'payToll': function(aRequestType, someParameters) { |
| 70 | vardeferredResult; | 68 | vardeferredResult; |
| 71 | 69 | ||
| 72 | //console.log(">>> Proxy.payToll", aRequestType, someParameters); | 70 | //console.log(">>> Proxy.payToll", aRequestType, someParameters); |
| 73 | if (this.shouldPayTolls()) { | 71 | if (this.shouldPayTolls()) { |
| 74 | deferredResult = new MochiKit.Async.Deferred(); | 72 | deferredResult = new MochiKit.Async.Deferred(); |
| 75 | 73 | ||
| 76 | if (this.tolls()[aRequestType].length == 0) { | 74 | if (this.tolls()[aRequestType].length == 0) { |
| 77 | deferredResult.addCallback(MochiKit.Base.method(this, 'sendMessage', 'knock', {requestType:aRequestType})); | 75 | deferredResult.addCallback(MochiKit.Base.method(this, 'sendMessage', 'knock', {requestType:aRequestType})); |
| 78 | deferredResult.addCallback(MochiKit.Base.method(this, 'setTollCallback')); | 76 | deferredResult.addCallback(MochiKit.Base.method(this, 'setTollCallback')); |
| 79 | } | 77 | } |
| 80 | deferredResult.addCallback(MochiKit.Base.method(this.tolls()[aRequestType], 'pop')); | 78 | deferredResult.addCallback(MochiKit.Base.method(this.tolls()[aRequestType], 'pop')); |
| 81 | deferredResult.addCallback(MochiKit.Base.methodcaller('deferredPay')); | 79 | deferredResult.addCallback(MochiKit.Base.methodcaller('deferredPay')); |
| 82 | deferredResult.addCallback(function(aToll) { | 80 | deferredResult.addCallback(function(aToll) { |
| 83 | var result; | 81 | var result; |
| 84 | 82 | ||
| 85 | result = { | 83 | result = { |
| 86 | parameters: someParameters, | 84 | parameters: someParameters, |
| 87 | toll: aToll | 85 | toll: aToll |
| 88 | } | 86 | } |
| 89 | 87 | ||
| 90 | return result; | 88 | return result; |
| 91 | }); | 89 | }); |
| 92 | 90 | ||
| 93 | deferredResult.callback(); | 91 | deferredResult.callback(); |
| 94 | } else { | 92 | } else { |
| 95 | deferredResult = MochiKit.Async.succeed({parameters:someParameters}); | 93 | deferredResult = MochiKit.Async.succeed({parameters:someParameters}); |
| 96 | } | 94 | } |
| 97 | //console.log("<<< Proxy.payToll"); | 95 | //console.log("<<< Proxy.payToll"); |
| 98 | 96 | ||
| 99 | return deferredResult; | 97 | return deferredResult; |
| 100 | }, | 98 | }, |
| 101 | 99 | ||
| 102 | //------------------------------------------------------------------------- | 100 | //------------------------------------------------------------------------- |
| 103 | 101 | ||
| 104 | 'addToll': function(aToll) { | 102 | 'addToll': function(aToll) { |
| 105 | //console.log(">>> Proxy.addToll", aToll); | 103 | //console.log(">>> Proxy.addToll", aToll); |
| 106 | this.tolls()[aToll.requestType()].push(aToll); | 104 | this.tolls()[aToll.requestType()].push(aToll); |
| 107 | //console.log("<<< Proxy.addToll"); | 105 | //console.log("<<< Proxy.addToll"); |
| 108 | }, | 106 | }, |
| 109 | 107 | ||
| 110 | //========================================================================= | 108 | //========================================================================= |
| 111 | 109 | ||
| 112 | 'setTollCallback': function(someParameters) { | 110 | 'setTollCallback': function(someParameters) { |
| 113 | //console.log(">>> Proxy.setTollCallback", someParameters); | 111 | //console.log(">>> Proxy.setTollCallback", someParameters); |
| 114 | if (typeof(someParameters['toll']) != 'undefined') { | 112 | if (typeof(someParameters['toll']) != 'undefined') { |
| 115 | //console.log("added a new toll", someParameters['toll']); | 113 | //console.log("added a new toll", someParameters['toll']); |
| 116 | this.addToll(new Clipperz.PM.Toll(someParameters['toll'])); | 114 | this.addToll(new Clipperz.PM.Toll(someParameters['toll'])); |
| 117 | } | 115 | } |
| 118 | //console.log("<<< Proxy.setTallCallback", someParameters['result']); | 116 | //console.log("<<< Proxy.setTallCallback", someParameters['result']); |
diff --git a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.JSON.js b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.JSON.js index 4f3b4b2..dac966d 100755 --- a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.JSON.js +++ b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.JSON.js | |||
| @@ -1,97 +1,95 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | 26 | ||
| 29 | //============================================================================= | 27 | //============================================================================= |
| 30 | 28 | ||
| 31 | Clipperz.PM.Proxy.JSON = function(args) { | 29 | Clipperz.PM.Proxy.JSON = function(args) { |
| 32 | Clipperz.PM.Proxy.JSON.superclass.constructor.call(this, args); | 30 | Clipperz.PM.Proxy.JSON.superclass.constructor.call(this, args); |
| 33 | 31 | ||
| 34 | this._url = args.url || Clipperz.Base.exception.raise('MandatoryParameter'); | 32 | this._url = args.url || Clipperz.Base.exception.raise('MandatoryParameter'); |
| 35 | 33 | ||
| 36 | return this; | 34 | return this; |
| 37 | } | 35 | } |
| 38 | 36 | ||
| 39 | YAHOO.extendX(Clipperz.PM.Proxy.JSON, Clipperz.PM.Proxy, { | 37 | YAHOO.extendX(Clipperz.PM.Proxy.JSON, Clipperz.PM.Proxy, { |
| 40 | 38 | ||
| 41 | 'toString': function() { | 39 | 'toString': function() { |
| 42 | return "Clipperz.PM.Proxy.JSON"; | 40 | return "Clipperz.PM.Proxy.JSON"; |
| 43 | }, | 41 | }, |
| 44 | 42 | ||
| 45 | //========================================================================= | 43 | //========================================================================= |
| 46 | 44 | ||
| 47 | 'url': function () { | 45 | 'url': function () { |
| 48 | return this._url; | 46 | return this._url; |
| 49 | }, | 47 | }, |
| 50 | 48 | ||
| 51 | //========================================================================= | 49 | //========================================================================= |
| 52 | 50 | ||
| 53 | 'sendMessage': function(aFunctionName, someParameters) { | 51 | 'sendMessage': function(aFunctionName, someParameters) { |
| 54 | vardeferredResult; | 52 | vardeferredResult; |
| 55 | var parameters; | 53 | var parameters; |
| 56 | 54 | ||
| 57 | parameters = { | 55 | parameters = { |
| 58 | method: aFunctionName, | 56 | method: aFunctionName, |
| 59 | // version: someParameters['version'], | 57 | // version: someParameters['version'], |
| 60 | // message: someParameters['message'], | 58 | // message: someParameters['message'], |
| 61 | parameters: Clipperz.Base.serializeJSON(someParameters) | 59 | parameters: Clipperz.Base.serializeJSON(someParameters) |
| 62 | }; | 60 | }; |
| 63 | 61 | ||
| 64 | deferredResult = new MochiKit.Async.Deferred(); | 62 | deferredResult = new MochiKit.Async.Deferred(); |
| 65 | deferredResult.addCallback(function (aValue) { | 63 | deferredResult.addCallback(function (aValue) { |
| 66 | MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'remoteRequestSent'); | 64 | MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'remoteRequestSent'); |
| 67 | return aValue; | 65 | return aValue; |
| 68 | }); | 66 | }); |
| 69 | deferredResult.addCallback(MochiKit.Async.doXHR, this.url(), { | 67 | deferredResult.addCallback(MochiKit.Async.doXHR, this.url(), { |
| 70 | method:'POST', | 68 | method:'POST', |
| 71 | sendContent:MochiKit.Base.queryString(parameters), | 69 | sendContent:MochiKit.Base.queryString(parameters), |
| 72 | headers:{"Content-Type":"application/x-www-form-urlencoded"} | 70 | headers:{"Content-Type":"application/x-www-form-urlencoded"} |
| 73 | }); | 71 | }); |
| 74 | deferredResult.addCallback(function (aValue) { | 72 | deferredResult.addCallback(function (aValue) { |
| 75 | MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'remoteRequestReceived'); | 73 | MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'remoteRequestReceived'); |
| 76 | return aValue; | 74 | return aValue; |
| 77 | }); | 75 | }); |
| 78 | // deferredResult.addCallback(MochiKit.Async.evalJSONRequest); | 76 | // deferredResult.addCallback(MochiKit.Async.evalJSONRequest); |
| 79 | deferredResult.addCallback(MochiKit.Base.itemgetter('responseText')); | 77 | deferredResult.addCallback(MochiKit.Base.itemgetter('responseText')); |
| 80 | deferredResult.addCallback(Clipperz.Base.evalJSON); | 78 | deferredResult.addCallback(Clipperz.Base.evalJSON); |
| 81 | deferredResult.addCallback(function (someValues) { | 79 | deferredResult.addCallback(function (someValues) { |
| 82 | if (someValues['result'] == 'EXCEPTION') { | 80 | if (someValues['result'] == 'EXCEPTION') { |
| 83 | throw someValues['message']; | 81 | throw someValues['message']; |
| 84 | } | 82 | } |
| 85 | 83 | ||
| 86 | return someValues; | 84 | return someValues; |
| 87 | }) | 85 | }) |
| 88 | // return MochiKit.Base.evalJSON(req.responseText); | 86 | // return MochiKit.Base.evalJSON(req.responseText); |
| 89 | deferredResult.callback(); | 87 | deferredResult.callback(); |
| 90 | 88 | ||
| 91 | return deferredResult; | 89 | return deferredResult; |
| 92 | }, | 90 | }, |
| 93 | 91 | ||
| 94 | //========================================================================= | 92 | //========================================================================= |
| 95 | __syntaxFix__: "syntax fix" | 93 | __syntaxFix__: "syntax fix" |
| 96 | 94 | ||
| 97 | }); | 95 | }); |
diff --git a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.Offline.DataStore.js b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.Offline.DataStore.js index d5336be..1a5caff 100644 --- a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.Offline.DataStore.js +++ b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.Offline.DataStore.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | try { if (typeof(Clipperz.PM.Proxy.Offline) == 'undefined') { throw ""; }} catch (e) { | 24 | try { if (typeof(Clipperz.PM.Proxy.Offline) == 'undefined') { throw ""; }} catch (e) { |
| 27 | throw "Clipperz.PM.Proxy.Offline.DataStore depends on Clipperz.PM.Proxy.Offline!"; | 25 | throw "Clipperz.PM.Proxy.Offline.DataStore depends on Clipperz.PM.Proxy.Offline!"; |
| 28 | } | 26 | } |
| 29 | 27 | ||
| 30 | //============================================================================= | 28 | //============================================================================= |
| 31 | 29 | ||
| 32 | Clipperz.PM.Proxy.Offline.DataStore = function(args) { | 30 | Clipperz.PM.Proxy.Offline.DataStore = function(args) { |
| 33 | args = args || {}; | 31 | args = args || {}; |
| 34 | 32 | ||
| 35 | this._data = args.data || (typeof(_clipperz_dump_data_) != 'undefined' ? _clipperz_dump_data_ : null); | 33 | this._data = args.data || (typeof(_clipperz_dump_data_) != 'undefined' ? _clipperz_dump_data_ : null); |
| 36 | this._isReadOnly = (typeof(args.readOnly) == 'undefined' ? true : args.readOnly); | 34 | this._isReadOnly = (typeof(args.readOnly) == 'undefined' ? true : args.readOnly); |
| 37 | this._shouldPayTolls = args.shouldPayTolls || false; | 35 | this._shouldPayTolls = args.shouldPayTolls || false; |
| 38 | 36 | ||
| 39 | this._tolls = {}; | 37 | this._tolls = {}; |
| 40 | this._connections = {}; | 38 | this._connections = {}; |
| 41 | 39 | ||
| 42 | this._b = null; | 40 | this._b = null; |
| 43 | this._B = null; | 41 | this._B = null; |
| 44 | this._A = null; | 42 | this._A = null; |
| 45 | this._userData = null; | 43 | this._userData = null; |
| 46 | 44 | ||
| 47 | return this; | 45 | return this; |
| 48 | } | 46 | } |
| 49 | 47 | ||
| 50 | //Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.DataStore, Object, { | 48 | //Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.DataStore, Object, { |
| 51 | Clipperz.PM.Proxy.Offline.DataStore.prototype = MochiKit.Base.update(null, { | 49 | Clipperz.PM.Proxy.Offline.DataStore.prototype = MochiKit.Base.update(null, { |
| 52 | 50 | ||
| 53 | //------------------------------------------------------------------------- | 51 | //------------------------------------------------------------------------- |
| 54 | 52 | ||
| 55 | 'isReadOnly': function () { | 53 | 'isReadOnly': function () { |
| 56 | return this._isReadOnly; | 54 | return this._isReadOnly; |
| 57 | }, | 55 | }, |
| 58 | 56 | ||
| 59 | //------------------------------------------------------------------------- | 57 | //------------------------------------------------------------------------- |
| 60 | 58 | ||
| 61 | 'shouldPayTolls': function() { | 59 | 'shouldPayTolls': function() { |
| 62 | return this._shouldPayTolls; | 60 | return this._shouldPayTolls; |
| 63 | }, | 61 | }, |
| 64 | 62 | ||
| 65 | //------------------------------------------------------------------------- | 63 | //------------------------------------------------------------------------- |
| 66 | 64 | ||
| 67 | 'data': function () { | 65 | 'data': function () { |
| 68 | return this._data; | 66 | return this._data; |
| 69 | }, | 67 | }, |
| 70 | 68 | ||
| 71 | //------------------------------------------------------------------------- | 69 | //------------------------------------------------------------------------- |
| 72 | 70 | ||
| 73 | 'tolls': function () { | 71 | 'tolls': function () { |
| 74 | return this._tolls; | 72 | return this._tolls; |
| 75 | }, | 73 | }, |
| 76 | 74 | ||
| 77 | //------------------------------------------------------------------------- | 75 | //------------------------------------------------------------------------- |
| 78 | 76 | ||
| 79 | 'connections': function () { | 77 | 'connections': function () { |
| 80 | return this._connections; | 78 | return this._connections; |
| 81 | }, | 79 | }, |
| 82 | 80 | ||
| 83 | //========================================================================= | 81 | //========================================================================= |
| 84 | 82 | ||
| 85 | 'resetData': function() { | 83 | 'resetData': function() { |
| 86 | this._data = { | 84 | this._data = { |
| 87 | 'users': { | 85 | 'users': { |
| 88 | 'catchAllUser': { | 86 | 'catchAllUser': { |
| 89 | __masterkey_test_value__: 'masterkey', | 87 | __masterkey_test_value__: 'masterkey', |
| 90 | s: '112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00', | 88 | s: '112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00', |
| 91 | v: '112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00' | 89 | v: '112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00' |
| 92 | } | 90 | } |
| 93 | } | 91 | } |
| 94 | }; | 92 | }; |
| 95 | }, | 93 | }, |
| 96 | 94 | ||
| 97 | //------------------------------------------------------------------------- | 95 | //------------------------------------------------------------------------- |
| 98 | 96 | ||
| 99 | 'setupWithEncryptedData': function(someData) { | 97 | 'setupWithEncryptedData': function(someData) { |
| 100 | this._data = Clipperz.Base.deepClone(someData); | 98 | this._data = Clipperz.Base.deepClone(someData); |
| 101 | }, | 99 | }, |
| 102 | 100 | ||
| 103 | //------------------------------------------------------------------------- | 101 | //------------------------------------------------------------------------- |
| 104 | 102 | ||
| 105 | 'setupWithData': function(someData) { | 103 | 'setupWithData': function(someData) { |
| 106 | var deferredResult; | 104 | var deferredResult; |
| 107 | var resultData; | 105 | var resultData; |
| 108 | var i, c; | 106 | var i, c; |
| 109 | 107 | ||
| 110 | //Clipperz.log(">>> Proxy.Test.setupWithData"); | 108 | //Clipperz.log(">>> Proxy.Test.setupWithData"); |
| 111 | resultData = this._data; | 109 | resultData = this._data; |
| 112 | 110 | ||
| 113 | deferredResult = new MochiKit.Async.Deferred(); | 111 | deferredResult = new MochiKit.Async.Deferred(); |
| 114 | c = someData['users'].length; | 112 | c = someData['users'].length; |
| 115 | 113 | ||
| 116 | for (i=0; i<c; i++) { | 114 | for (i=0; i<c; i++) { |
| 117 | varnewConnection; | 115 | varnewConnection; |
| 118 | varrecordConfiguration; | 116 | varrecordConfiguration; |
diff --git a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.Offline.js b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.Offline.js index 3cf499e..91a7b48 100644 --- a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.Offline.js +++ b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.Offline.js | |||
| @@ -1,70 +1,68 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | 26 | ||
| 29 | //============================================================================= | 27 | //============================================================================= |
| 30 | 28 | ||
| 31 | Clipperz.PM.Proxy.Offline = function(args) { | 29 | Clipperz.PM.Proxy.Offline = function(args) { |
| 32 | args = args || {}; | 30 | args = args || {}; |
| 33 | 31 | ||
| 34 | Clipperz.PM.Proxy.Offline.superclass.constructor.call(this, args); | 32 | Clipperz.PM.Proxy.Offline.superclass.constructor.call(this, args); |
| 35 | 33 | ||
| 36 | this._dataStore = args.dataStore || new Clipperz.PM.Proxy.Offline.DataStore(args); | 34 | this._dataStore = args.dataStore || new Clipperz.PM.Proxy.Offline.DataStore(args); |
| 37 | 35 | ||
| 38 | return this; | 36 | return this; |
| 39 | } | 37 | } |
| 40 | 38 | ||
| 41 | YAHOO.extendX(Clipperz.PM.Proxy.Offline, Clipperz.PM.Proxy, { | 39 | YAHOO.extendX(Clipperz.PM.Proxy.Offline, Clipperz.PM.Proxy, { |
| 42 | 40 | ||
| 43 | 'toString': function () { | 41 | 'toString': function () { |
| 44 | return "Clipperz.PM.Proxy.Offline"; | 42 | return "Clipperz.PM.Proxy.Offline"; |
| 45 | }, | 43 | }, |
| 46 | 44 | ||
| 47 | //------------------------------------------------------------------------- | 45 | //------------------------------------------------------------------------- |
| 48 | 46 | ||
| 49 | 'dataStore': function () { | 47 | 'dataStore': function () { |
| 50 | return this._dataStore; | 48 | return this._dataStore; |
| 51 | }, | 49 | }, |
| 52 | 50 | ||
| 53 | //------------------------------------------------------------------------- | 51 | //------------------------------------------------------------------------- |
| 54 | 52 | ||
| 55 | 'sendMessage': function(aFunctionName, someParameters) { | 53 | 'sendMessage': function(aFunctionName, someParameters) { |
| 56 | return this.dataStore().processMessage(aFunctionName, someParameters); | 54 | return this.dataStore().processMessage(aFunctionName, someParameters); |
| 57 | }, | 55 | }, |
| 58 | 56 | ||
| 59 | //------------------------------------------------------------------------- | 57 | //------------------------------------------------------------------------- |
| 60 | 58 | ||
| 61 | 'isReadOnly': function () { | 59 | 'isReadOnly': function () { |
| 62 | return true; | 60 | return true; |
| 63 | }, | 61 | }, |
| 64 | 62 | ||
| 65 | //------------------------------------------------------------------------- | 63 | //------------------------------------------------------------------------- |
| 66 | 64 | ||
| 67 | __syntaxFix__: "syntax fix" | 65 | __syntaxFix__: "syntax fix" |
| 68 | 66 | ||
| 69 | }); | 67 | }); |
| 70 | 68 | ||
diff --git a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.Test.js b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.Test.js index ce6e6d8..18014f4 100644 --- a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.Test.js +++ b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.Test.js | |||
| @@ -1,91 +1,89 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Proxy) == 'undefined') { Clipperz.PM.Proxy = {}; } | 26 | if (typeof(Clipperz.PM.Proxy) == 'undefined') { Clipperz.PM.Proxy = {}; } |
| 29 | 27 | ||
| 30 | //============================================================================= | 28 | //============================================================================= |
| 31 | 29 | ||
| 32 | Clipperz.PM.Proxy.Test = function(args) { | 30 | Clipperz.PM.Proxy.Test = function(args) { |
| 33 | args = args || {}; | 31 | args = args || {}; |
| 34 | 32 | ||
| 35 | Clipperz.PM.Proxy.Offline.call(this, args); | 33 | Clipperz.PM.Proxy.Offline.call(this, args); |
| 36 | 34 | ||
| 37 | 35 | ||
| 38 | 36 | ||
| 39 | return this; | 37 | return this; |
| 40 | } | 38 | } |
| 41 | 39 | ||
| 42 | Clipperz.PM.Proxy.Test.prototype = MochiKit.Base.update(new Clipperz.PM.Proxy.Offline(), { | 40 | Clipperz.PM.Proxy.Test.prototype = MochiKit.Base.update(new Clipperz.PM.Proxy.Offline(), { |
| 43 | 41 | ||
| 44 | 'toString': function() { | 42 | 'toString': function() { |
| 45 | return "Clipperz.PM.Proxy.Test"; | 43 | return "Clipperz.PM.Proxy.Test"; |
| 46 | }, | 44 | }, |
| 47 | 45 | ||
| 48 | //------------------------------------------------------------------------- | 46 | //------------------------------------------------------------------------- |
| 49 | 47 | ||
| 50 | 'isTestData': function() { | 48 | 'isTestData': function() { |
| 51 | return typeof(this.userData()['__masterkey_test_value__'] != 'undefined'); | 49 | return typeof(this.userData()['__masterkey_test_value__'] != 'undefined'); |
| 52 | }, | 50 | }, |
| 53 | 51 | ||
| 54 | //------------------------------------------------------------------------- | 52 | //------------------------------------------------------------------------- |
| 55 | 53 | ||
| 56 | 'userDetails': function() { | 54 | 'userDetails': function() { |
| 57 | var result; | 55 | var result; |
| 58 | 56 | ||
| 59 | if (this.isTestData()) { | 57 | if (this.isTestData()) { |
| 60 | var serializedHeader; | 58 | var serializedHeader; |
| 61 | var version; | 59 | var version; |
| 62 | 60 | ||
| 63 | version = this.userData()['version']; | 61 | version = this.userData()['version']; |
| 64 | serializedHeader = Clipperz.Base.serializeJSON(this.userData()['userDetails']); | 62 | serializedHeader = Clipperz.Base.serializeJSON(this.userData()['userDetails']); |
| 65 | result = Clipperz.PM.Crypto.encryptingFunctions.versions[version].encrypt(this.userData()['__masterkey_test_value__'], serializedHeader); | 63 | result = Clipperz.PM.Crypto.encryptingFunctions.versions[version].encrypt(this.userData()['__masterkey_test_value__'], serializedHeader); |
| 66 | } else { | 64 | } else { |
| 67 | result = Clipperz.PM.Proxy.Offline.prototype.userDetails.call(this); | 65 | result = Clipperz.PM.Proxy.Offline.prototype.userDetails.call(this); |
| 68 | } | 66 | } |
| 69 | 67 | ||
| 70 | return result; | 68 | return result; |
| 71 | }, | 69 | }, |
| 72 | 70 | ||
| 73 | //------------------------------------------------------------------------- | 71 | //------------------------------------------------------------------------- |
| 74 | 72 | ||
| 75 | 'statistics': function() { | 73 | 'statistics': function() { |
| 76 | var result; | 74 | var result; |
| 77 | var serializedStatistics; | 75 | var serializedStatistics; |
| 78 | var version; | 76 | var version; |
| 79 | 77 | ||
| 80 | version = this.userData()['version']; | 78 | version = this.userData()['version']; |
| 81 | serializedStatistics = Clipperz.Base.serializeJSON(this.userData()['statistics']); | 79 | serializedStatistics = Clipperz.Base.serializeJSON(this.userData()['statistics']); |
| 82 | result = Clipperz.PM.Crypto.encryptingFunctions.versions[version].encrypt(this.userData()['__masterkey_test_value__'], serializedStatistics); | 80 | result = Clipperz.PM.Crypto.encryptingFunctions.versions[version].encrypt(this.userData()['__masterkey_test_value__'], serializedStatistics); |
| 83 | 81 | ||
| 84 | return result; | 82 | return result; |
| 85 | }, | 83 | }, |
| 86 | 84 | ||
| 87 | //------------------------------------------------------------------------- | 85 | //------------------------------------------------------------------------- |
| 88 | __syntaxFix__: "syntax fix" | 86 | __syntaxFix__: "syntax fix" |
| 89 | 87 | ||
| 90 | }); | 88 | }); |
| 91 | 89 | ||
diff --git a/frontend/beta/js/Clipperz/PM/Strings.js b/frontend/beta/js/Clipperz/PM/Strings.js index 24ef0ce..204159f 100644 --- a/frontend/beta/js/Clipperz/PM/Strings.js +++ b/frontend/beta/js/Clipperz/PM/Strings.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Strings) == 'undefined') { Clipperz.PM.Strings = {}; } | 26 | if (typeof(Clipperz.PM.Strings) == 'undefined') { Clipperz.PM.Strings = {}; } |
| 29 | if (typeof(Clipperz.PM.Strings.Languages) == 'undefined') { Clipperz.PM.Strings.Languages = {}; } | 27 | if (typeof(Clipperz.PM.Strings.Languages) == 'undefined') { Clipperz.PM.Strings.Languages = {}; } |
| 30 | 28 | ||
| 31 | Clipperz.PM.Strings.standardStrings = { | 29 | Clipperz.PM.Strings.standardStrings = { |
| 32 | 30 | ||
| 33 | 'loginPanelSwitchLanguageSelectOptions':[ | 31 | 'loginPanelSwitchLanguageSelectOptions':[ |
| 34 | /* | 32 | /* |
| 35 | {tag:'option', html:"Arabic (Oman) (العربية)", value:'ar-OM', disabled:true}, | 33 | {tag:'option', html:"Arabic (Oman) (العربية)", value:'ar-OM', disabled:true}, |
| 36 | {tag:'option', html:"Arabic (Syria) (العربية)", value:'ar-SY', disabled:true}, | 34 | {tag:'option', html:"Arabic (Syria) (العربية)", value:'ar-SY', disabled:true}, |
| 37 | {tag:'option', html:"Bahasa Indonesia", value:'id-ID', disabled:true}, | 35 | {tag:'option', html:"Bahasa Indonesia", value:'id-ID', disabled:true}, |
| 38 | {tag:'option', html:"Bulgarian (Български)", value:'bg-BG', disabled:true}, | 36 | {tag:'option', html:"Bulgarian (Български)", value:'bg-BG', disabled:true}, |
| 39 | {tag:'option', html:"Català", value:'ca-ES', disabled:true}, | 37 | {tag:'option', html:"Català", value:'ca-ES', disabled:true}, |
| 40 | {tag:'option', html:"Chinese (Simplified) (简体中文)", value:'zh-CN', disabled:true}, | 38 | {tag:'option', html:"Chinese (Simplified) (简体中文)", value:'zh-CN', disabled:true}, |
| 41 | {tag:'option', html:"Chinese (Traditional) (正體中文)", value:'zh-TW', disabled:true}, | 39 | {tag:'option', html:"Chinese (Traditional) (正體中文)", value:'zh-TW', disabled:true}, |
| 42 | {tag:'option', html:"Czech (Česky)", value:'cs-CZ', disabled:true}, | 40 | {tag:'option', html:"Czech (Česky)", value:'cs-CZ', disabled:true}, |
| 43 | {tag:'option', html:"Dansk", value:'da-DK', disabled:true}, | 41 | {tag:'option', html:"Dansk", value:'da-DK', disabled:true}, |
| 44 | {tag:'option', html:"Deutsch", value:'de-DE'/ *, disabled:true* /}, | 42 | {tag:'option', html:"Deutsch", value:'de-DE'/ *, disabled:true* /}, |
| 45 | {tag:'option', html:"English (American)", value:'en-US'/ *, disabled:true* /}, | 43 | {tag:'option', html:"English (American)", value:'en-US'/ *, disabled:true* /}, |
| 46 | {tag:'option', html:"English (British)", value:'en-GB'/ *, disabled:true* /}, | 44 | {tag:'option', html:"English (British)", value:'en-GB'/ *, disabled:true* /}, |
| 47 | {tag:'option', html:"English (Canadian)", value:'en-CA'/ *, disabled:true* /}, | 45 | {tag:'option', html:"English (Canadian)", value:'en-CA'/ *, disabled:true* /}, |
| 48 | {tag:'option', html:"Español", value:'es-ES', disabled:true}, | 46 | {tag:'option', html:"Español", value:'es-ES', disabled:true}, |
| 49 | {tag:'option', html:"Eesti", value:'et-EE', disabled:true}, | 47 | {tag:'option', html:"Eesti", value:'et-EE', disabled:true}, |
| 50 | {tag:'option', html:"Français", value:'fr-FR', disabled:true}, | 48 | {tag:'option', html:"Français", value:'fr-FR', disabled:true}, |
| 51 | {tag:'option', html:"Galego", value:'gl-ES', disabled:true}, | 49 | {tag:'option', html:"Galego", value:'gl-ES', disabled:true}, |
| 52 | {tag:'option', html:"Greek (Ελληνικά)", value:'el-GR', disabled:true}, | 50 | {tag:'option', html:"Greek (Ελληνικά)", value:'el-GR', disabled:true}, |
| 53 | {tag:'option', html:"Íslenska", value:'is-IS', disabled:true}, | 51 | {tag:'option', html:"Íslenska", value:'is-IS', disabled:true}, |
| 54 | {tag:'option', html:"Italiano", value:'it-IT'/ *, disabled:true* /}, | 52 | {tag:'option', html:"Italiano", value:'it-IT'/ *, disabled:true* /}, |
| 55 | {tag:'option', html:"Japanese (日本語)", value:'ja-JP', disabled:true}, | 53 | {tag:'option', html:"Japanese (日本語)", value:'ja-JP', disabled:true}, |
| 56 | {tag:'option', html:"Korean (한국어)", value:'ko-KR', disabled:true}, | 54 | {tag:'option', html:"Korean (한국어)", value:'ko-KR', disabled:true}, |
| 57 | {tag:'option', html:"Latviešu", value:'lv-LV', disabled:true}, | 55 | {tag:'option', html:"Latviešu", value:'lv-LV', disabled:true}, |
| 58 | {tag:'option', html:"Lietuvių", value:'lt-LT', disabled:true}, | 56 | {tag:'option', html:"Lietuvių", value:'lt-LT', disabled:true}, |
| 59 | {tag:'option', html:"Macedonian (Македонски)", value:'mk-MK', disabled:true}, | 57 | {tag:'option', html:"Macedonian (Македонски)", value:'mk-MK', disabled:true}, |
| 60 | {tag:'option', html:"Magyar", value:'hu-HU', disabled:true}, | 58 | {tag:'option', html:"Magyar", value:'hu-HU', disabled:true}, |
| 61 | {tag:'option', html:"Nederlands", value:'nl-NL', disabled:true}, | 59 | {tag:'option', html:"Nederlands", value:'nl-NL', disabled:true}, |
| 62 | {tag:'option', html:"Norsk bokmål", value:'nb-NO', disabled:true}, | 60 | {tag:'option', html:"Norsk bokmål", value:'nb-NO', disabled:true}, |
| 63 | {tag:'option', html:"Norsk nynorsk", value:'nn-NO', disabled:true}, | 61 | {tag:'option', html:"Norsk nynorsk", value:'nn-NO', disabled:true}, |
| 64 | {tag:'option', html:"Persian (Western) (فارسى)", value:'fa-IR', disabled:true}, | 62 | {tag:'option', html:"Persian (Western) (فارسى)", value:'fa-IR', disabled:true}, |
| 65 | {tag:'option', html:"Polski", value:'pl-PL', disabled:true}, | 63 | {tag:'option', html:"Polski", value:'pl-PL', disabled:true}, |
| 66 | {tag:'option', html:"Português", value:'pt-PT'/ *, disabled:true* /}, | 64 | {tag:'option', html:"Português", value:'pt-PT'/ *, disabled:true* /}, |
| 67 | {tag:'option', html:"Português Brasileiro", value:'pt-BR'/ *, disabled:true* /}, | 65 | {tag:'option', html:"Português Brasileiro", value:'pt-BR'/ *, disabled:true* /}, |
| 68 | {tag:'option', html:"Românä", value:'ro-RO', disabled:true}, | 66 | {tag:'option', html:"Românä", value:'ro-RO', disabled:true}, |
| 69 | {tag:'option', html:"Russian (Русский)", value:'ru-RU', disabled:true}, | 67 | {tag:'option', html:"Russian (Русский)", value:'ru-RU', disabled:true}, |
| 70 | {tag:'option', html:"Slovak (Slovenčina)", value:'sk-SK', disabled:true}, | 68 | {tag:'option', html:"Slovak (Slovenčina)", value:'sk-SK', disabled:true}, |
| 71 | {tag:'option', html:"Slovenian (Slovenščina)", value:'sl-SI', disabled:true}, | 69 | {tag:'option', html:"Slovenian (Slovenščina)", value:'sl-SI', disabled:true}, |
| 72 | {tag:'option', html:"Suomi", value:'fi-FI', disabled:true}, | 70 | {tag:'option', html:"Suomi", value:'fi-FI', disabled:true}, |
| 73 | {tag:'option', html:"Svenska", value:'sv-SE', disabled:true}, | 71 | {tag:'option', html:"Svenska", value:'sv-SE', disabled:true}, |
| 74 | {tag:'option', html:"Thai (ไทย)", value:'th-TH', disabled:true}, | 72 | {tag:'option', html:"Thai (ไทย)", value:'th-TH', disabled:true}, |
| 75 | {tag:'option', html:"Türkçe", value:'tr-TR', disabled:true}, | 73 | {tag:'option', html:"Türkçe", value:'tr-TR', disabled:true}, |
| 76 | {tag:'option', html:"Ukrainian (Українська)", value:'uk-UA', disabled:true} | 74 | {tag:'option', html:"Ukrainian (Українська)", value:'uk-UA', disabled:true} |
| 77 | */ | 75 | */ |
| 78 | {tag:'option', html:"Arabic (العربية)", value:"ar", disabled:true, cls:'disabledOption'}, | 76 | {tag:'option', html:"Arabic (العربية)", value:"ar", disabled:true, cls:'disabledOption'}, |
| 79 | // {tag:'option', html:"Chinese (中文)", value:"zh", disabled:true}, | 77 | // {tag:'option', html:"Chinese (中文)", value:"zh", disabled:true}, |
| 80 | {tag:'option', html:"Chinese (Simplified) (简体中文)", value:'zh-CN'}, | 78 | {tag:'option', html:"Chinese (Simplified) (简体中文)", value:'zh-CN'}, |
| 81 | {tag:'option', html:"Dutch (Nederlands)", value:"nl-NL", disabled:true, cls:'disabledOption'}, | 79 | {tag:'option', html:"Dutch (Nederlands)", value:"nl-NL", disabled:true, cls:'disabledOption'}, |
| 82 | {tag:'option', html:"English", value:"en-US"}, | 80 | {tag:'option', html:"English", value:"en-US"}, |
| 83 | {tag:'option', html:"French (Français)", value:"fr-FR"}, | 81 | {tag:'option', html:"French (Français)", value:"fr-FR"}, |
| 84 | {tag:'option', html:"German (Deutsch)", value:"de-DE"/* -- */, disabled:true, cls:'disabledOption' /* */}, | 82 | {tag:'option', html:"German (Deutsch)", value:"de-DE"/* -- */, disabled:true, cls:'disabledOption' /* */}, |
| 85 | {tag:'option', html:"Greek (Ελληνικά)", value:"el-GR"/* -- */, disabled:true, cls:'disabledOption' /* */}, | 83 | {tag:'option', html:"Greek (Ελληνικά)", value:"el-GR"/* -- */, disabled:true, cls:'disabledOption' /* */}, |
| 86 | {tag:'option', html:"Hebrew (עברית)", value:"he-IL"/* -- */, disabled:true, cls:'disabledOption' /* */}, | 84 | {tag:'option', html:"Hebrew (עברית)", value:"he-IL"/* -- */, disabled:true, cls:'disabledOption' /* */}, |
| 87 | {tag:'option', html:"Italian (Italiano)", value:"it-IT"}, | 85 | {tag:'option', html:"Italian (Italiano)", value:"it-IT"}, |
| 88 | {tag:'option', html:"Japanese (日本語)", value:"ja-JP"}, | 86 | {tag:'option', html:"Japanese (日本語)", value:"ja-JP"}, |
| 89 | {tag:'option', html:"Korean (한국어)", value:"ko-KR", disabled:true, cls:'disabledOption'}, | 87 | {tag:'option', html:"Korean (한국어)", value:"ko-KR", disabled:true, cls:'disabledOption'}, |
| 90 | {tag:'option', html:"Norwegian (Norsk)", value:"no", disabled:true, cls:'disabledOption'}, | 88 | {tag:'option', html:"Norwegian (Norsk)", value:"no", disabled:true, cls:'disabledOption'}, |
| 91 | {tag:'option', html:"Persian (فارسی)", value:"fa-IR", disabled:true, cls:'disabledOption'}, | 89 | {tag:'option', html:"Persian (فارسی)", value:"fa-IR", disabled:true, cls:'disabledOption'}, |
| 92 | {tag:'option', html:"Polish (Polski)", value:"pl-PL", disabled:true, cls:'disabledOption'}, | 90 | {tag:'option', html:"Polish (Polski)", value:"pl-PL", disabled:true, cls:'disabledOption'}, |
| 93 | {tag:'option', html:"Portuguese (Português)", value:"pt-BR"}, | 91 | {tag:'option', html:"Portuguese (Português)", value:"pt-BR"}, |
| 94 | {tag:'option', html:"Russian (Русский)", value:"ru-RU"}, | 92 | {tag:'option', html:"Russian (Русский)", value:"ru-RU"}, |
| 95 | {tag:'option', html:"Spanish (Español)", value:"es-ES"}, | 93 | {tag:'option', html:"Spanish (Español)", value:"es-ES"}, |
| 96 | {tag:'option', html:"Swedish (Svenska)", value:"sv-SE", disabled:true, cls:'disabledOption'}, | 94 | {tag:'option', html:"Swedish (Svenska)", value:"sv-SE", disabled:true, cls:'disabledOption'}, |
| 97 | {tag:'option', html:"Turkish (Türkçe)", value:"tr-TR", disabled:true, cls:'disabledOption'}, | 95 | {tag:'option', html:"Turkish (Türkçe)", value:"tr-TR", disabled:true, cls:'disabledOption'}, |
| 98 | {tag:'option', html:"Vietnamese (Tiếng Việt)", value:"vi-VN", disabled:true, cls:'disabledOption'} | 96 | {tag:'option', html:"Vietnamese (Tiếng Việt)", value:"vi-VN", disabled:true, cls:'disabledOption'} |
| 99 | ] | 97 | ] |
| 100 | } | 98 | } |
| 101 | 99 | ||
| 102 | Clipperz.PM.Strings.GeneralSettings = { | 100 | Clipperz.PM.Strings.GeneralSettings = { |
| 103 | 'en-us': { | 101 | 'en-us': { |
| 104 | 'loginFormAarghThatsBadUrl':"http://www.clipperz.com/support/faq/account_faq", | 102 | 'loginFormAarghThatsBadUrl':"http://www.clipperz.com/support/faq/account_faq", |
| 105 | 'loginFormVerifyTheCodeUrl':"http://www.clipperz.com/learn_more/reviewing_the_code", | 103 | 'loginFormVerifyTheCodeUrl':"http://www.clipperz.com/learn_more/reviewing_the_code", |
| 106 | 104 | ||
| 107 | 'donateHeaderLinkUrl': "http://www.clipperz.com/donations", | 105 | 'donateHeaderLinkUrl': "http://www.clipperz.com/donations", |
| 108 | 'creditsHeaderLinkUrl': "http://www.clipperz.com/credits", | 106 | 'creditsHeaderLinkUrl': "http://www.clipperz.com/credits", |
| 109 | 'feedbackHeaderLinkUrl': "http://www.clipperz.com/contact", | 107 | 'feedbackHeaderLinkUrl': "http://www.clipperz.com/contact", |
| 110 | 'helpHeaderLinkUrl': "http://www.clipperz.com/support/user_guide", | 108 | 'helpHeaderLinkUrl': "http://www.clipperz.com/support/user_guide", |
| 111 | 'forumHeaderLinkUrl': "http://www.clipperz.com/forum", | 109 | 'forumHeaderLinkUrl': "http://www.clipperz.com/forum", |
| 112 | 110 | ||
| 113 | 'httpAuthBookmarkletConfiguration':{tag:'textarea', id:'httpAuthDefaultConfiguration', html:"" + | 111 | 'httpAuthBookmarkletConfiguration':{tag:'textarea', id:'httpAuthDefaultConfiguration', html:"" + |
| 114 | "{ \"page\":{\"title\":\"HTTP authentication\"}," + "\n" + | 112 | "{ \"page\":{\"title\":\"HTTP authentication\"}," + "\n" + |
| 115 | " \"form\":{\"attributes\": {" + "\n" + | 113 | " \"form\":{\"attributes\": {" + "\n" + |
| 116 | " \"action\":\"\"," + "\n" + | 114 | " \"action\":\"\"," + "\n" + |
| 117 | " \"type\":\"http_auth\"" + "\n" + | 115 | " \"type\":\"http_auth\"" + "\n" + |
| 118 | " }, \"inputs\": [" + "\n" + | 116 | " }, \"inputs\": [" + "\n" + |
diff --git a/frontend/beta/js/Clipperz/PM/Strings/MessagePanelConfigurations.js b/frontend/beta/js/Clipperz/PM/Strings/MessagePanelConfigurations.js index 7f6c52f..7565d2d 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/MessagePanelConfigurations.js +++ b/frontend/beta/js/Clipperz/PM/Strings/MessagePanelConfigurations.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Strings) == 'undefined') { Clipperz.PM.Strings = {}; } | 26 | if (typeof(Clipperz.PM.Strings) == 'undefined') { Clipperz.PM.Strings = {}; } |
| 29 | 27 | ||
| 30 | Clipperz.PM.Strings.messagePanelConfigurations = { | 28 | Clipperz.PM.Strings.messagePanelConfigurations = { |
| 31 | 29 | ||
| 32 | 30 | ||
| 33 | //------------------------------------------------------------------------- | 31 | //------------------------------------------------------------------------- |
| 34 | // | 32 | // |
| 35 | // Registration - connection | 33 | // Registration - connection |
| 36 | // | 34 | // |
| 37 | 'registration_verify': function() { | 35 | 'registration_verify': function() { |
| 38 | return { | 36 | return { |
| 39 | 'title': null, | 37 | 'title': null, |
| 40 | 'text': Clipperz.PM.Strings['connectionRegistrationSendingRequestMessageText'] | 38 | 'text': Clipperz.PM.Strings['connectionRegistrationSendingRequestMessageText'] |
| 41 | } | 39 | } |
| 42 | }, | 40 | }, |
| 43 | 41 | ||
| 44 | 'registration_sendingCredentials': function() { | 42 | 'registration_sendingCredentials': function() { |
| 45 | return { | 43 | return { |
| 46 | 'title': null, | 44 | 'title': null, |
| 47 | 'text': Clipperz.PM.Strings['connectionRegistrationSendingCredentialsMessageText'] | 45 | 'text': Clipperz.PM.Strings['connectionRegistrationSendingCredentialsMessageText'] |
| 48 | } | 46 | } |
| 49 | }, | 47 | }, |
| 50 | 48 | ||
| 51 | //------------------------------------------------------------------------- | 49 | //------------------------------------------------------------------------- |
| 52 | // | 50 | // |
| 53 | // One Time Password login message panel | 51 | // One Time Password login message panel |
| 54 | // | 52 | // |
| 55 | 53 | ||
| 56 | 'OTP_login_start': function() { | 54 | 'OTP_login_start': function() { |
| 57 | return { | 55 | return { |
| 58 | 'title': Clipperz.PM.Strings['OTPloginMessagePanelInitialTitle'], | 56 | 'title': Clipperz.PM.Strings['OTPloginMessagePanelInitialTitle'], |
| 59 | 'text': Clipperz.PM.Strings['OTPloginMessagePanelInitialText'], | 57 | 'text': Clipperz.PM.Strings['OTPloginMessagePanelInitialText'], |
| 60 | 'steps': '+3', | 58 | 'steps': '+3', |
| 61 | 'buttons': {} | 59 | 'buttons': {} |
| 62 | } | 60 | } |
| 63 | }, | 61 | }, |
| 64 | 62 | ||
| 65 | 'OTP_login_loadingOTP': function() { | 63 | 'OTP_login_loadingOTP': function() { |
| 66 | return { | 64 | return { |
| 67 | 'title': Clipperz.PM.Strings['OTPloginMessagePanelLoadingTitle'], | 65 | 'title': Clipperz.PM.Strings['OTPloginMessagePanelLoadingTitle'], |
| 68 | 'text': Clipperz.PM.Strings['OTPloginMessagePanelLoadingText'] | 66 | 'text': Clipperz.PM.Strings['OTPloginMessagePanelLoadingText'] |
| 69 | } | 67 | } |
| 70 | }, | 68 | }, |
| 71 | 69 | ||
| 72 | 'OTP_login_extractingPassphrase': function() { | 70 | 'OTP_login_extractingPassphrase': function() { |
| 73 | return { | 71 | return { |
| 74 | 'title': Clipperz.PM.Strings['OTPloginMessagePanelProcessingTitle'], | 72 | 'title': Clipperz.PM.Strings['OTPloginMessagePanelProcessingTitle'], |
| 75 | 'text': Clipperz.PM.Strings['OTPloginMessagePanelProcessingText'] | 73 | 'text': Clipperz.PM.Strings['OTPloginMessagePanelProcessingText'] |
| 76 | } | 74 | } |
| 77 | }, | 75 | }, |
| 78 | 76 | ||
| 79 | 77 | ||
| 80 | //------------------------------------------------------------------------- | 78 | //------------------------------------------------------------------------- |
| 81 | // | 79 | // |
| 82 | // Login message panel | 80 | // Login message panel |
| 83 | // | 81 | // |
| 84 | 'login_start': function() { | 82 | 'login_start': function() { |
| 85 | return { | 83 | return { |
| 86 | 'title': Clipperz.PM.Strings['loginMessagePanelInitialTitle'], | 84 | 'title': Clipperz.PM.Strings['loginMessagePanelInitialTitle'], |
| 87 | 'text': Clipperz.PM.Strings['loginMessagePanelInitialText'], | 85 | 'text': Clipperz.PM.Strings['loginMessagePanelInitialText'], |
| 88 | 'steps': '+7', | 86 | 'steps': '+7', |
| 89 | 'buttons': { | 87 | 'buttons': { |
| 90 | 'ok': Clipperz.PM.Strings['loginMessagePanelInitialButtonLabel'] | 88 | 'ok': Clipperz.PM.Strings['loginMessagePanelInitialButtonLabel'] |
| 91 | } | 89 | } |
| 92 | } | 90 | } |
| 93 | }, | 91 | }, |
| 94 | 92 | ||
| 95 | 'login_connected': function() { | 93 | 'login_connected': function() { |
| 96 | return { | 94 | return { |
| 97 | 'title': Clipperz.PM.Strings['loginMessagePanelConnectedTitle'], | 95 | 'title': Clipperz.PM.Strings['loginMessagePanelConnectedTitle'], |
| 98 | 'text': Clipperz.PM.Strings['loginMessagePanelConnectedText'], | 96 | 'text': Clipperz.PM.Strings['loginMessagePanelConnectedText'], |
| 99 | 'buttons': {} | 97 | 'buttons': {} |
| 100 | } | 98 | } |
| 101 | }, | 99 | }, |
| 102 | 100 | ||
| 103 | 'login_failed':function() { | 101 | 'login_failed':function() { |
| 104 | return { | 102 | return { |
| 105 | 'title': Clipperz.PM.Strings['loginMessagePanelFailureTitle'], | 103 | 'title': Clipperz.PM.Strings['loginMessagePanelFailureTitle'], |
| 106 | 'text': Clipperz.PM.Strings['loginMessagePanelFailureText'], | 104 | 'text': Clipperz.PM.Strings['loginMessagePanelFailureText'], |
| 107 | 'button': Clipperz.PM.Strings['loginMessagePanelFailureButtonLabel'] | 105 | 'button': Clipperz.PM.Strings['loginMessagePanelFailureButtonLabel'] |
| 108 | } | 106 | } |
| 109 | }, | 107 | }, |
| 110 | 108 | ||
| 111 | //------------------------------------------------------------------------- | 109 | //------------------------------------------------------------------------- |
| 112 | // | 110 | // |
| 113 | // Login message panel - connection | 111 | // Login message panel - connection |
| 114 | // | 112 | // |
| 115 | 'connection_sendingCredentials': function() { | 113 | 'connection_sendingCredentials': function() { |
| 116 | return { | 114 | return { |
| 117 | 'title': Clipperz.PM.Strings['connectionLoginSendingCredentialsMessageTitle'], | 115 | 'title': Clipperz.PM.Strings['connectionLoginSendingCredentialsMessageTitle'], |
| 118 | 'text': Clipperz.PM.Strings['connectionLoginSendingCredentialsMessageText'] | 116 | 'text': Clipperz.PM.Strings['connectionLoginSendingCredentialsMessageText'] |
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_de-DE.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_de-DE.js index 6ccffa8..0ca4b51 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_de-DE.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_de-DE.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | Clipperz.PM.Strings.Languages['de-DE'.toLowerCase()] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { | 24 | Clipperz.PM.Strings.Languages['de-DE'.toLowerCase()] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { |
| 27 | 'clipperzServiceDescription':"<h2>Privatsphäre für Deine Daten</h2> <ul> <li> <h3>Clipperz heißt:</h3> <ul> <li> <p>sichere und einfache zu bedienene Passwortverwaltung</p> </li> <li> <p>eine effektive Lösung des einmaligen Anmeldens</p> </li> <li> <p>eine digitale Brieftasche für Deine vertraulichen Daten</p> </li> </ul> </li> <li> <h3>Clipperz bietet Dir:</h3> <ul> <li> <p>einfaches Speichern und Verwalten von Passwörtern und Webzugangsdaten</p> </li> <li> <p>schnelles unkompliziertes einloggen, ohne Eingabe des Benutzernamen und Passworts, bei Webdiensten</p> </li> <li> <p>Schutz aller Deiner persönlichen Daten: Zutrittscodes, PINs, Benutzernamen, Passwörter, Kreditkartennummern, …</p> </li> <li> <p>Deine Geheimnisse mit Familienmitgliedern und Freunden zu teilen (mehr dazu in Kürze)</p> </li> </ul> </li> <li> <h3>Clipperz ist:</h3> <ul> <li> <p>kostenlos und absolut anonym</p> </li> <li> <p>unkomplizierter Zugriff zu jeder Zeit von jedem Rechner</p> </li> <li> <p>ohne Download und Installation verwendbar</p> </li> <li> <p>ein Schutz gegen das Speichern von Passwörtern auf Deinem PC oder das Notieren auf Papier</p> </li> </ul> </li> <li> <h3>Clipperz Sicherheit:</h3> <ul> <li> <p>Deine sensiblen persönlichen Informationen werden lokal durch Deinen Browser verschlüsselt, bevor sie an Clipperz über das Internet gesendet werden</p> </li> <li> <p>Der Schlüssel für diese Daten ist der Sicherheitssatz, den nur Du kennst</p> </li> <li> <p>Clipperz speichert Deine sensiblen Daten nur in verschlüsselter Form und kann zu keinem Zeitpunkt diese entschlüssel und in ihrer ursprünglichen Klartextform zugänglich machen</p> </li> <li> <p>Clipperz basiert auf standart Verschlüsselungsverfahren. Nichts ausergewöhnliches – oder hand gestricktes</p> </li> <li> <p>Du kannst den Quellcode zu jeder Zeit anschauen, aber Du brauchst nichts von Kryptographie zu verstehen um ein glücklicher Anwender zu sein!</p> </li> </ul> </li> <li> <a href=\"http://www.clipperz.com\" target=\"_blank\">Weitere Informationen</a> </li> </ul> ", | 25 | 'clipperzServiceDescription':"<h2>Privatsphäre für Deine Daten</h2> <ul> <li> <h3>Clipperz heißt:</h3> <ul> <li> <p>sichere und einfache zu bedienene Passwortverwaltung</p> </li> <li> <p>eine effektive Lösung des einmaligen Anmeldens</p> </li> <li> <p>eine digitale Brieftasche für Deine vertraulichen Daten</p> </li> </ul> </li> <li> <h3>Clipperz bietet Dir:</h3> <ul> <li> <p>einfaches Speichern und Verwalten von Passwörtern und Webzugangsdaten</p> </li> <li> <p>schnelles unkompliziertes einloggen, ohne Eingabe des Benutzernamen und Passworts, bei Webdiensten</p> </li> <li> <p>Schutz aller Deiner persönlichen Daten: Zutrittscodes, PINs, Benutzernamen, Passwörter, Kreditkartennummern, …</p> </li> <li> <p>Deine Geheimnisse mit Familienmitgliedern und Freunden zu teilen (mehr dazu in Kürze)</p> </li> </ul> </li> <li> <h3>Clipperz ist:</h3> <ul> <li> <p>kostenlos und absolut anonym</p> </li> <li> <p>unkomplizierter Zugriff zu jeder Zeit von jedem Rechner</p> </li> <li> <p>ohne Download und Installation verwendbar</p> </li> <li> <p>ein Schutz gegen das Speichern von Passwörtern auf Deinem PC oder das Notieren auf Papier</p> </li> </ul> </li> <li> <h3>Clipperz Sicherheit:</h3> <ul> <li> <p>Deine sensiblen persönlichen Informationen werden lokal durch Deinen Browser verschlüsselt, bevor sie an Clipperz über das Internet gesendet werden</p> </li> <li> <p>Der Schlüssel für diese Daten ist der Sicherheitssatz, den nur Du kennst</p> </li> <li> <p>Clipperz speichert Deine sensiblen Daten nur in verschlüsselter Form und kann zu keinem Zeitpunkt diese entschlüssel und in ihrer ursprünglichen Klartextform zugänglich machen</p> </li> <li> <p>Clipperz basiert auf standart Verschlüsselungsverfahren. Nichts ausergewöhnliches – oder hand gestricktes</p> </li> <li> <p>Du kannst den Quellcode zu jeder Zeit anschauen, aber Du brauchst nichts von Kryptographie zu verstehen um ein glücklicher Anwender zu sein!</p> </li> </ul> </li> <li> <a href=\"http://www.clipperz.com\" target=\"_blank\">Weitere Informationen</a> </li> </ul> ", |
| 28 | 'loginFormTitle':"Login zu Deinem Clipperz Konto", | 26 | 'loginFormTitle':"Login zu Deinem Clipperz Konto", |
| 29 | 'loginFormUsernameLabel':"Benutzernamen", | 27 | 'loginFormUsernameLabel':"Benutzernamen", |
| 30 | 'loginFormPassphraseLabel':"Sicherheitssatz", | 28 | 'loginFormPassphraseLabel':"Sicherheitssatz", |
| 31 | 'loginFormDontHaveAnAccountLabel':"Du hast noch kein Clipperz Konto?", | 29 | 'loginFormDontHaveAnAccountLabel':"Du hast noch kein Clipperz Konto?", |
| 32 | 'loginFormCreateOneLabel':"Konto erstellen", | 30 | 'loginFormCreateOneLabel':"Konto erstellen", |
| 33 | 'loginFormForgotYourCredentialsLabel':"Zugangsdaten vergessen?", | 31 | 'loginFormForgotYourCredentialsLabel':"Zugangsdaten vergessen?", |
| 34 | 'loginFormAarghThatsBadLabel':"Misst! Dass ist schlecht!", | 32 | 'loginFormAarghThatsBadLabel':"Misst! Dass ist schlecht!", |
| 35 | 'loginFormAfraidOfMaliciousScriptsLabel':"verängstigt von bösartigen Scripts?", | 33 | 'loginFormAfraidOfMaliciousScriptsLabel':"verängstigt von bösartigen Scripts?", |
| 36 | 'loginFormVerifyTheCodeLabel':"begutachte den Quellcode", | 34 | 'loginFormVerifyTheCodeLabel':"begutachte den Quellcode", |
| 37 | 'loginFormButtonLabel':"Einloggen", | 35 | 'loginFormButtonLabel':"Einloggen", |
| 38 | 'loginPanelSwithLanguageDescription':"<h5>Wechsel zu Deiner vervorzugten Sprache</h5> ", | 36 | 'loginPanelSwithLanguageDescription':"<h5>Wechsel zu Deiner vervorzugten Sprache</h5> ", |
| 39 | 'browserCompatibilityDescription':"<p>Bessere und sicherere Clipperz-Erfahrung mit Firefox. Clipperz funktioniert auch mit Safari, Opera und MS Internet Explorer!</p> ", | 37 | 'browserCompatibilityDescription':"<p>Bessere und sicherere Clipperz-Erfahrung mit Firefox. Clipperz funktioniert auch mit Safari, Opera und MS Internet Explorer!</p> ", |
| 40 | 'loginMessagePanelInitialTitle':"Du wirst eingeloggt…", | 38 | 'loginMessagePanelInitialTitle':"Du wirst eingeloggt…", |
| 41 | 'loginMessagePanelInitialButtonLabel':"Abbruch", | 39 | 'loginMessagePanelInitialButtonLabel':"Abbruch", |
| 42 | 'loginMessagePanelConnectedTitle':"Verbunden", | 40 | 'loginMessagePanelConnectedTitle':"Verbunden", |
| 43 | 'loginMessagePanelConnectedText':"Fertig", | 41 | 'loginMessagePanelConnectedText':"Fertig", |
| 44 | 'loginMessagePanelFailureTitle':"Fehler", | 42 | 'loginMessagePanelFailureTitle':"Fehler", |
| 45 | 'loginMessagePanelFailureText':"Login fehlgeschlagen", | 43 | 'loginMessagePanelFailureText':"Login fehlgeschlagen", |
| 46 | 'loginMessagePanelFailureButtonLabel':"Schließen", | 44 | 'loginMessagePanelFailureButtonLabel':"Schließen", |
| 47 | 'connectionLoginSendingCredentialsMessageTitle':"Prüfe Zugangsdaten", | 45 | 'connectionLoginSendingCredentialsMessageTitle':"Prüfe Zugangsdaten", |
| 48 | 'connectionLoginSendingCredentialsMessageText':"Sende Zugangsdaten", | 46 | 'connectionLoginSendingCredentialsMessageText':"Sende Zugangsdaten", |
| 49 | 'connectionLoginCredentialsVerificationMessageTitle':"Prüfe Zugangsdaten", | 47 | 'connectionLoginCredentialsVerificationMessageTitle':"Prüfe Zugangsdaten", |
| 50 | 'connectionLoginCredentialsVerificationMessageText':"Führe SRP Authentifizierung durch", | 48 | 'connectionLoginCredentialsVerificationMessageText':"Führe SRP Authentifizierung durch", |
| 51 | 'connectionLoginDoneMessageTitle':"Prüfe Zugangsdaten", | 49 | 'connectionLoginDoneMessageTitle':"Prüfe Zugangsdaten", |
| 52 | 'connectionLoginDoneMessageText':"Verbunden", | 50 | 'connectionLoginDoneMessageText':"Verbunden", |
| 53 | 'userLoginPanelUpgradingUserCredentialsMessageTitle':"Prüfe Zugangsdaten", | 51 | 'userLoginPanelUpgradingUserCredentialsMessageTitle':"Prüfe Zugangsdaten", |
| 54 | 'userLoginPanelUpgradingUserCredentialsMessageText':"Aktualisierung Deiner Zugangsdaten auf ein neues Authentifizierungsschema", | 52 | 'userLoginPanelUpgradingUserCredentialsMessageText':"Aktualisierung Deiner Zugangsdaten auf ein neues Authentifizierungsschema", |
| 55 | 'userLoginPanelConnectedMessageTitle':"Benutzer authentifiziert", | 53 | 'userLoginPanelConnectedMessageTitle':"Benutzer authentifiziert", |
| 56 | 'userLoginPanelConnectedMessageText':"Login erfolgreich", | 54 | 'userLoginPanelConnectedMessageText':"Login erfolgreich", |
| 57 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':"Prüfe Zugangsdaten", | 55 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':"Prüfe Zugangsdaten", |
| 58 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageText':"Probiere älteres Authentifizierungsschema", | 56 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageText':"Probiere älteres Authentifizierungsschema", |
| 59 | 'userLoginPanelLoadingUserDataMessageTitle':"Benutzer authentifiziert", | 57 | 'userLoginPanelLoadingUserDataMessageTitle':"Benutzer authentifiziert", |
| 60 | 'userLoginPanelLoadingUserDataMessageText':"Lade verschlüsselte Kartendaten von Clipperz", | 58 | 'userLoginPanelLoadingUserDataMessageText':"Lade verschlüsselte Kartendaten von Clipperz", |
| 61 | 'userLoginPanelDecryptingUserDataMessageTitle':"Benutzer authentifiziert", | 59 | 'userLoginPanelDecryptingUserDataMessageTitle':"Benutzer authentifiziert", |
| 62 | 'userLoginPanelDecryptingUserDataMessageText':"Lokale Entschlüsselung der Kartendaten", | 60 | 'userLoginPanelDecryptingUserDataMessageText':"Lokale Entschlüsselung der Kartendaten", |
| 63 | 'userLoginPanelDecryptingUserStatisticsMessageTitle':"Benutzer authentifiziert", | 61 | 'userLoginPanelDecryptingUserStatisticsMessageTitle':"Benutzer authentifiziert", |
| 64 | 'userLoginPanelDecryptingUserStatisticsMessageText':"Lokale Entschlüsselung der Benutzerstatisik", | 62 | 'userLoginPanelDecryptingUserStatisticsMessageText':"Lokale Entschlüsselung der Benutzerstatisik", |
| 65 | 'splashAlertTitle':"Willkommen bei Clipperz!", | 63 | 'splashAlertTitle':"Willkommen bei Clipperz!", |
| 66 | 'splashAlertText':"<p>Sicherheitshinweis</p> <ul> <li> <p>Die Speicherung von Informationen bei Clipperz ist so sicher, wie der Sicherheitssatz den Du zum Schutz gewählt hast. Ist der Sicherheitssatz nicht bekannt, können keine Informationen abgefragt werden.</p> </li> <li> <p>Solltest Du Clipperz nutzen, um sensible und kritische persönliche Daten abzuspeichern, so empfehlen wir in jedem Fall die Nutzung eines langen Sicherheitssatzes als Passwort und die Nutzung von Sonderzeichen, Zahlen, Groß- und Kleinbuchstaben.</p> </li> <li> <p>Clipperz kann einen verlorenen Sicherheitssatz nicht wiederherstellen!</p> </li> </ul> <p>Weitere Informationen findest Du bei <a href=\"http://www.clipperz.com\" target=\"_blank\">Clipperz</a>.</p> ", | 64 | 'splashAlertText':"<p>Sicherheitshinweis</p> <ul> <li> <p>Die Speicherung von Informationen bei Clipperz ist so sicher, wie der Sicherheitssatz den Du zum Schutz gewählt hast. Ist der Sicherheitssatz nicht bekannt, können keine Informationen abgefragt werden.</p> </li> <li> <p>Solltest Du Clipperz nutzen, um sensible und kritische persönliche Daten abzuspeichern, so empfehlen wir in jedem Fall die Nutzung eines langen Sicherheitssatzes als Passwort und die Nutzung von Sonderzeichen, Zahlen, Groß- und Kleinbuchstaben.</p> </li> <li> <p>Clipperz kann einen verlorenen Sicherheitssatz nicht wiederherstellen!</p> </li> </ul> <p>Weitere Informationen findest Du bei <a href=\"http://www.clipperz.com\" target=\"_blank\">Clipperz</a>.</p> ", |
| 67 | 'splashAlertCloseButtonLabel':"Ok", | 65 | 'splashAlertCloseButtonLabel':"Ok", |
| 68 | 'registrationFormTitle':"Erstelle Dein Konto", | 66 | 'registrationFormTitle':"Erstelle Dein Konto", |
| 69 | 'registrationFormUsernameLabel':"Benutzernamen", | 67 | 'registrationFormUsernameLabel':"Benutzernamen", |
| 70 | 'registrationFormPassphraseLabel':"Sicherheitssatz", | 68 | 'registrationFormPassphraseLabel':"Sicherheitssatz", |
| 71 | 'registrationFormRetypePassphraseLabel':"Wiederhole Sicherheitssatz", | 69 | 'registrationFormRetypePassphraseLabel':"Wiederhole Sicherheitssatz", |
| 72 | 'registrationFormSafetyCheckLabel':"Ich akzeptiere dass es Clipperz nicht möglich ist, einen verlorenen Sicherheitssatz wiederherzustellen.", | 70 | 'registrationFormSafetyCheckLabel':"Ich akzeptiere dass es Clipperz nicht möglich ist, einen verlorenen Sicherheitssatz wiederherzustellen.", |
| 73 | 'registrationFormTermsOfServiceCheckLabel':"Ich habe die <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Nutzungsbedingungen</a> gelesen, verstanden und akzeptiere diese.", | 71 | 'registrationFormTermsOfServiceCheckLabel':"Ich habe die <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Nutzungsbedingungen</a> gelesen, verstanden und akzeptiere diese.", |
| 74 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"Hast Du bereits einen Zugang?", | 72 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"Hast Du bereits einen Zugang?", |
| 75 | 'registrationFormSimplyLoginLabel':"Einloggen", | 73 | 'registrationFormSimplyLoginLabel':"Einloggen", |
| 76 | 'registrationFormButtonLabel':"Anmelden", | 74 | 'registrationFormButtonLabel':"Anmelden", |
| 77 | 'registrationFormWarningMessageNotMatchingPassphrases':"Deine Sicherheitssätze stimmen nicht überein. Bitte erneut eingeben.", | 75 | 'registrationFormWarningMessageNotMatchingPassphrases':"Deine Sicherheitssätze stimmen nicht überein. Bitte erneut eingeben.", |
| 78 | 'registrationFormWarningMessageSafetyCheckNotSelected':"Bitte lese die Bedingungen und akzeptiere die Auswahlboxen weiter unten.", | 76 | 'registrationFormWarningMessageSafetyCheckNotSelected':"Bitte lese die Bedingungen und akzeptiere die Auswahlboxen weiter unten.", |
| 79 | 'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"Du musst die Nutzungsbedingungen akzeptieren.", | 77 | 'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"Du musst die Nutzungsbedingungen akzeptieren.", |
| 80 | 'registrationMessagePanelInitialTitle':"Benutzer wird angelegt…", | 78 | 'registrationMessagePanelInitialTitle':"Benutzer wird angelegt…", |
| 81 | 'registrationMessagePanelInitialButtonLabel':"Abbruch", | 79 | 'registrationMessagePanelInitialButtonLabel':"Abbruch", |
| 82 | 'registrationMessagePanelRegistrationDoneTitle':"Anmeldung", | 80 | 'registrationMessagePanelRegistrationDoneTitle':"Anmeldung", |
| 83 | 'registrationMessagePanelRegistrationDoneText':"Fertig", | 81 | 'registrationMessagePanelRegistrationDoneText':"Fertig", |
| 84 | 'registrationMessagePanelFailureTitle':"Anmerldung fehlgeschlagen", | 82 | 'registrationMessagePanelFailureTitle':"Anmerldung fehlgeschlagen", |
| 85 | 'registrationMessagePanelFailureButtonLabel':"Schließen", | 83 | 'registrationMessagePanelFailureButtonLabel':"Schließen", |
| 86 | 'connectionRegistrationSendingRequestMessageText':"Zugangsdaten werden geprüft", | 84 | 'connectionRegistrationSendingRequestMessageText':"Zugangsdaten werden geprüft", |
| 87 | 'connectionRegistrationSendingCredentialsMessageText':"Sende Zugangsdaten", | 85 | 'connectionRegistrationSendingCredentialsMessageText':"Sende Zugangsdaten", |
| 88 | 'registrationSplashPanelTitle':"Sicherheitshinweis", | 86 | 'registrationSplashPanelTitle':"Sicherheitshinweis", |
| 89 | 'registrationSplashPanelDescription':"<p>Dies sind Deine Clipperz Zugangsdaten, pass sehr gut auf sie auf. Clipperz wird diese kein zweites und weiteres mal anzeigen!</p> ", | 87 | 'registrationSplashPanelDescription':"<p>Dies sind Deine Clipperz Zugangsdaten, pass sehr gut auf sie auf. Clipperz wird diese kein zweites und weiteres mal anzeigen!</p> ", |
| 90 | 'registrationSplashPanelUsernameLabel':"Benutzernamen", | 88 | 'registrationSplashPanelUsernameLabel':"Benutzernamen", |
| 91 | 'registrationSplashPanelPassphraseLabel':"Schlüsselsatz", | 89 | 'registrationSplashPanelPassphraseLabel':"Schlüsselsatz", |
| 92 | 'donateHeaderLinkLabel':"spende", | 90 | 'donateHeaderLinkLabel':"spende", |
| 93 | 'creditsHeaderLinkLabel':"credits", | 91 | 'creditsHeaderLinkLabel':"credits", |
| 94 | 'feedbackHeaderLinkLabel':"feedback", | 92 | 'feedbackHeaderLinkLabel':"feedback", |
| 95 | 'helpHeaderLinkLabel':"hilfe", | 93 | 'helpHeaderLinkLabel':"hilfe", |
| 96 | 'forumHeaderLinkLabel':"forum", | 94 | 'forumHeaderLinkLabel':"forum", |
| 97 | 'recordMenuLabel':"Karten", | 95 | 'recordMenuLabel':"Karten", |
| 98 | 'accountMenuLabel':"Benutzer", | 96 | 'accountMenuLabel':"Benutzer", |
| 99 | 'dataMenuLabel':"Daten", | 97 | 'dataMenuLabel':"Daten", |
| 100 | 'contactsMenuLabel':"Kontakt", | 98 | 'contactsMenuLabel':"Kontakt", |
| 101 | 'bookmarkletMenuLabel':"Bookmarklet", | 99 | 'bookmarkletMenuLabel':"Bookmarklet", |
| 102 | 'logoutMenuLabel':"Ausloggen", | 100 | 'logoutMenuLabel':"Ausloggen", |
| 103 | 'lockMenuLabel':"Sperren", | 101 | 'lockMenuLabel':"Sperren", |
| 104 | 'lockTitle':"Dieses Konto ist gesperrt", | 102 | 'lockTitle':"Dieses Konto ist gesperrt", |
| 105 | 'lockDescription':"<p>Bitte gebe Deinen Sicherheitssatz ein, um das Clipperz-Konto zu entsperren.</p> ", | 103 | 'lockDescription':"<p>Bitte gebe Deinen Sicherheitssatz ein, um das Clipperz-Konto zu entsperren.</p> ", |
| 106 | 'unlockButtonLabel':"Entsperren", | 104 | 'unlockButtonLabel':"Entsperren", |
| 107 | 'changePasswordTabLabel':"Sicherheitssatz ändern", | 105 | 'changePasswordTabLabel':"Sicherheitssatz ändern", |
| 108 | 'changePasswordTabTitle':"Sicherheitssatz ändern", | 106 | 'changePasswordTabTitle':"Sicherheitssatz ändern", |
| 109 | 'changePasswordFormUsernameLabel':"Benutzername", | 107 | 'changePasswordFormUsernameLabel':"Benutzername", |
| 110 | 'changePasswordFormOldPassphraseLabel':"Alter Sicherheitssatz", | 108 | 'changePasswordFormOldPassphraseLabel':"Alter Sicherheitssatz", |
| 111 | 'changePasswordFormNewPassphraseLabel':"Neuer Sicherheitssatz", | 109 | 'changePasswordFormNewPassphraseLabel':"Neuer Sicherheitssatz", |
| 112 | 'changePasswordFormRetypePassphraseLabel':"Wiederholdung neuen Sicherheitssatz", | 110 | 'changePasswordFormRetypePassphraseLabel':"Wiederholdung neuen Sicherheitssatz", |
| 113 | 'changePasswordFormSafetyCheckboxLabel':"Ich akzeptiere dass es Clipperz nicht möglich ist, einen verlorenen Sicherheitssatz wiederherzustellen.", | 111 | 'changePasswordFormSafetyCheckboxLabel':"Ich akzeptiere dass es Clipperz nicht möglich ist, einen verlorenen Sicherheitssatz wiederherzustellen.", |
| 114 | 'changePasswordFormSubmitLabel':"Sicherheitssatz ändern", | 112 | 'changePasswordFormSubmitLabel':"Sicherheitssatz ändern", |
| 115 | 'changePasswordFormWrongUsernameWarning':"Falscher Benutzername", | 113 | 'changePasswordFormWrongUsernameWarning':"Falscher Benutzername", |
| 116 | 'changePasswordFormWrongPassphraseWarning':"Falscher Sicherheitssatz", | 114 | 'changePasswordFormWrongPassphraseWarning':"Falscher Sicherheitssatz", |
| 117 | 'changePasswordFormWrongRetypePassphraseWarning':"Deine Sicherheitssätze stimmen nicht überein. Bitte erneut eingeben.", | 115 | 'changePasswordFormWrongRetypePassphraseWarning':"Deine Sicherheitssätze stimmen nicht überein. Bitte erneut eingeben.", |
| 118 | 'changePasswordFormSafetyCheckWarning':"Bitte ließ die folgenden Hinweise und akzeptiere diese.", | 116 | 'changePasswordFormSafetyCheckWarning':"Bitte ließ die folgenden Hinweise und akzeptiere diese.", |
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_el-GR.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_el-GR.js index fc610d6..f7a7583 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_el-GR.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_el-GR.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | //============================================================================= | 24 | //============================================================================= |
| 27 | // | 25 | // |
| 28 | // G R E E K (el_GR) | 26 | // G R E E K (el_GR) |
| 29 | // | 27 | // |
| 30 | //============================================================================= | 28 | //============================================================================= |
| 31 | 29 | ||
| 32 | Clipperz.PM.Strings.Languages['el-gr'] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { | 30 | Clipperz.PM.Strings.Languages['el-gr'] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { |
| 33 | 31 | ||
| 34 | //----------------------------------------------------- | 32 | //----------------------------------------------------- |
| 35 | //Login page - description | 33 | //Login page - description |
| 36 | 'clipperzServiceDescriptionConfig': [ | 34 | 'clipperzServiceDescriptionConfig': [ |
| 37 | {tag:'h2', html:'Κρατήστε το για τον Εαυτό Σας'}, | 35 | {tag:'h2', html:'Κρατήστε το για τον Εαυτό Σας'}, |
| 38 | {tag:'ul', children:[ | 36 | {tag:'ul', children:[ |
| 39 | {tag:'li', children:[ | 37 | {tag:'li', children:[ |
| 40 | {tag:'h3', html:'Το Clipperz είναι:'}, | 38 | {tag:'h3', html:'Το Clipperz είναι:'}, |
| 41 | {tag:'ul', children:[ | 39 | {tag:'ul', children:[ |
| 42 | {tag:'li', children:[{tag:'span', html:'Ένας ασφαλής και απλός τρόπος διαχείρησης όλων των κωδικών πρόσβασης σας'}]}, | 40 | {tag:'li', children:[{tag:'span', html:'Ένας ασφαλής και απλός τρόπος διαχείρησης όλων των κωδικών πρόσβασης σας'}]}, |
| 43 | {tag:'li', children:[{tag:'span', html:'Μια αποτελεσματική λύση πρόσβασης σε δεδομένα/εφαρμογές με μοναδικό κωδικό'}]}, | 41 | {tag:'li', children:[{tag:'span', html:'Μια αποτελεσματική λύση πρόσβασης σε δεδομένα/εφαρμογές με μοναδικό κωδικό'}]}, |
| 44 | {tag:'li', children:[{tag:'span', html:'Μια ψηφιακή θυρίδα για τα απόρρητα δεδομένα σας'}]} | 42 | {tag:'li', children:[{tag:'span', html:'Μια ψηφιακή θυρίδα για τα απόρρητα δεδομένα σας'}]} |
| 45 | ]} | 43 | ]} |
| 46 | ]}, | 44 | ]}, |
| 47 | {tag:'li', children:[ | 45 | {tag:'li', children:[ |
| 48 | {tag:'h3', html:'Με το Clipperz μπορείτε:'}, | 46 | {tag:'h3', html:'Με το Clipperz μπορείτε:'}, |
| 49 | {tag:'ul', children:[ | 47 | {tag:'ul', children:[ |
| 50 | {tag:'li', children:[{tag:'span', html:'Να αποθηκεύσετε και να διαχειριστείτε όλους τους κωδικούς πρόσβασης και τα online πιστοποιητικά/διαπιστευτήρια σας'}]}, | 48 | {tag:'li', children:[{tag:'span', html:'Να αποθηκεύσετε και να διαχειριστείτε όλους τους κωδικούς πρόσβασης και τα online πιστοποιητικά/διαπιστευτήρια σας'}]}, |
| 51 | {tag:'li', children:[{tag:'span', html:'Να έχετε πρόσβαση (login) στις υπηρεσίες διαδικτύου χωρίς την εισαγωγή oνομάτων λογαρισμών χρήστη (username),ή, κωδικών πρόσβασης (passwords)'}]}, | 49 | {tag:'li', children:[{tag:'span', html:'Να έχετε πρόσβαση (login) στις υπηρεσίες διαδικτύου χωρίς την εισαγωγή oνομάτων λογαρισμών χρήστη (username),ή, κωδικών πρόσβασης (passwords)'}]}, |
| 52 | {tag:'li', children:[{tag:'span', html:'Να προστατεύσετε όλα τα προσωπικά δεδομένα σας: κωδικούς συναγερμών, PINs, αριθμούς πιστωτικών καρτών, ...'}]}, | 50 | {tag:'li', children:[{tag:'span', html:'Να προστατεύσετε όλα τα προσωπικά δεδομένα σας: κωδικούς συναγερμών, PINs, αριθμούς πιστωτικών καρτών, ...'}]}, |
| 53 | {tag:'li', children:[{tag:'span', html:'Να μοιραστείτε δεδομένα με μέλη της οικογένεια σας και τους συνεργάτες σας (σύντομα στην διάθεση σας)'}]} | 51 | {tag:'li', children:[{tag:'span', html:'Να μοιραστείτε δεδομένα με μέλη της οικογένεια σας και τους συνεργάτες σας (σύντομα στην διάθεση σας)'}]} |
| 54 | ]} | 52 | ]} |
| 55 | ]}, | 53 | ]}, |
| 56 | {tag:'li', children:[ | 54 | {tag:'li', children:[ |
| 57 | {tag:'h3', html:'Τα πλεονεκτήματα του Clipperz είναι:'}, | 55 | {tag:'h3', html:'Τα πλεονεκτήματα του Clipperz είναι:'}, |
| 58 | {tag:'ul', children:[ | 56 | {tag:'ul', children:[ |
| 59 | {tag:'li', children:[{tag:'span', html:'Είναι δωρεάν και προσφέρει πρόσβαση ανώνυμα'}]}, | 57 | {tag:'li', children:[{tag:'span', html:'Είναι δωρεάν και προσφέρει πρόσβαση ανώνυμα'}]}, |
| 60 | {tag:'li', children:[{tag:'span', html:'Μπορεί να χρησιμοποιηθεί οποαδήποτε ώρα και από οποιοδήποτε τερματικό'}]}, | 58 | {tag:'li', children:[{tag:'span', html:'Μπορεί να χρησιμοποιηθεί οποαδήποτε ώρα και από οποιοδήποτε τερματικό'}]}, |
| 61 | {tag:'li', children:[{tag:'span', html:'Δεν απαιτεί την φόρτωση και εγκατάσταση οποιουδήποτε λογισμικού'}]}, | 59 | {tag:'li', children:[{tag:'span', html:'Δεν απαιτεί την φόρτωση και εγκατάσταση οποιουδήποτε λογισμικού'}]}, |
| 62 | {tag:'li', children:[{tag:'span', html:'Αποφεύγετε την διατήριση απορρήτων στον υπολογιστή σας ή σε έντυπη μορφή'}]} | 60 | {tag:'li', children:[{tag:'span', html:'Αποφεύγετε την διατήριση απορρήτων στον υπολογιστή σας ή σε έντυπη μορφή'}]} |
| 63 | ]} | 61 | ]} |
| 64 | ]}, | 62 | ]}, |
| 65 | {tag:'li', children:[ | 63 | {tag:'li', children:[ |
| 66 | {tag:'h3', html:'Η ασφάλεια που παρέχει το Clipperz:'}, | 64 | {tag:'h3', html:'Η ασφάλεια που παρέχει το Clipperz:'}, |
| 67 | {tag:'ul', children:[ | 65 | {tag:'ul', children:[ |
| 68 | {tag:'li', children:[{tag:'span', html:'Τα απόρρητα δεδομένα σας κωδικοποιούνται τοπικά από τον διακομιστή σας (browser) πρίν να φορτωθούν στο Clipperz'}]}, | 66 | {tag:'li', children:[{tag:'span', html:'Τα απόρρητα δεδομένα σας κωδικοποιούνται τοπικά από τον διακομιστή σας (browser) πρίν να φορτωθούν στο Clipperz'}]}, |
| 69 | {tag:'li', children:[{tag:'span', html:'Το κλειδί της κωδικοποίησης είναι μία φράση-κωδικός γνωστή μόνο σε εσάς'}]}, | 67 | {tag:'li', children:[{tag:'span', html:'Το κλειδί της κωδικοποίησης είναι μία φράση-κωδικός γνωστή μόνο σε εσάς'}]}, |
| 70 | {tag:'li', children:[{tag:'span', html:'Το Clipperz φυλάσσει τα προσωπικά σας δεδομένα σε κωδικοποιημένη μορφή, και δεν μπορεί να έχει πρόσβαση σε αυτά στην αρχική τους μορφή'}]}, | 68 | {tag:'li', children:[{tag:'span', html:'Το Clipperz φυλάσσει τα προσωπικά σας δεδομένα σε κωδικοποιημένη μορφή, και δεν μπορεί να έχει πρόσβαση σε αυτά στην αρχική τους μορφή'}]}, |
| 71 | {tag:'li', children:[{tag:'span', html:'Το Clipperz χρησιμοποιεί επίσημες /πρότυπες μεθόδους κωδικοποίησης, και όχι αόριστα και εφάνταστα μοντέλα'}]}, | 69 | {tag:'li', children:[{tag:'span', html:'Το Clipperz χρησιμοποιεί επίσημες /πρότυπες μεθόδους κωδικοποίησης, και όχι αόριστα και εφάνταστα μοντέλα'}]}, |
| 72 | {tag:'li', children:[{tag:'span', html:'Έχετε πρόσβαση στον πηγαίο κώδικα οποτεδήποτε το θελήσετε, και δεν χρειάζετε να γνωρίζετε τίποτα από κρυπτογράφηση για να είστε ένας ευχαριστημένος χρήστης!'}]} | 70 | {tag:'li', children:[{tag:'span', html:'Έχετε πρόσβαση στον πηγαίο κώδικα οποτεδήποτε το θελήσετε, και δεν χρειάζετε να γνωρίζετε τίποτα από κρυπτογράφηση για να είστε ένας ευχαριστημένος χρήστης!'}]} |
| 73 | ]} | 71 | ]} |
| 74 | ]}, | 72 | ]}, |
| 75 | {tag:'li', children:[ | 73 | {tag:'li', children:[ |
| 76 | {tag:'a', href:"http://www.clipperz.com", target:'_blank', html:'Μάθετε περισσότερα'} | 74 | {tag:'a', href:"http://www.clipperz.com", target:'_blank', html:'Μάθετε περισσότερα'} |
| 77 | ]} | 75 | ]} |
| 78 | ]} | 76 | ]} |
| 79 | ], | 77 | ], |
| 80 | 78 | ||
| 81 | // Login page - form | 79 | // Login page - form |
| 82 | 'loginFormTitle': "Συνδεθείτε με τον Clipperz λογαριασμό σας", | 80 | 'loginFormTitle': "Συνδεθείτε με τον Clipperz λογαριασμό σας", |
| 83 | 'loginFormUsernameLabel': "Όνομα χρήστη", | 81 | 'loginFormUsernameLabel': "Όνομα χρήστη", |
| 84 | 'loginFormPassphraseLabel': "Κωδική φράση", | 82 | 'loginFormPassphraseLabel': "Κωδική φράση", |
| 85 | 'loginFormDontHaveAnAccountLabel': "Δεν έχετε δημιουργήσει λογαριασμό?", | 83 | 'loginFormDontHaveAnAccountLabel': "Δεν έχετε δημιουργήσει λογαριασμό?", |
| 86 | 'loginFormCreateOneLabel': "Δημιουργήστε έναν", | 84 | 'loginFormCreateOneLabel': "Δημιουργήστε έναν", |
| 87 | 'loginFormForgotYourCredentialsLabel': "Ξεχάσατε τα διαπιστευτήριά σας?", | 85 | 'loginFormForgotYourCredentialsLabel': "Ξεχάσατε τα διαπιστευτήριά σας?", |
| 88 | 'loginFormAarghThatsBadLabel': "Ααααργκ! Αυτό είναι κακό!", | 86 | 'loginFormAarghThatsBadLabel': "Ααααργκ! Αυτό είναι κακό!", |
| 89 | 'loginFormAfraidOfMaliciousScriptsLabel':"φοβάστε κακόβουλα προγράμματα (scripts)?", | 87 | 'loginFormAfraidOfMaliciousScriptsLabel':"φοβάστε κακόβουλα προγράμματα (scripts)?", |
| 90 | 'loginFormVerifyTheCodeLabel': "Επαληθεύστε τον κωδικό", | 88 | 'loginFormVerifyTheCodeLabel': "Επαληθεύστε τον κωδικό", |
| 91 | 'loginFormButtonLabel': "Σύνδεση", | 89 | 'loginFormButtonLabel': "Σύνδεση", |
| 92 | 90 | ||
| 93 | // Login page - language selection | 91 | // Login page - language selection |
| 94 | 'loginPanelSwithLanguageDescriptionConfig':[ | 92 | 'loginPanelSwithLanguageDescriptionConfig':[ |
| 95 | {tag:'h5', html:"Αλλάξτε στην γλώσσα προτήμησης σας"} | 93 | {tag:'h5', html:"Αλλάξτε στην γλώσσα προτήμησης σας"} |
| 96 | ], | 94 | ], |
| 97 | 95 | ||
| 98 | // Login page - browser compatibility | 96 | // Login page - browser compatibility |
| 99 | 'browserCompatibilityDescriptionConfig':[ | 97 | 'browserCompatibilityDescriptionConfig':[ |
| 100 | {tag:'p', html:"Έχετε μία καλύτερη και πιό ασφαλή Clipperz εμπειρία χρησιμοποιόντας τον Firefox. Ωστόσο το Clipperz συνεργάζετε άψογα με Opera και MS Internet Explorer!"} | 98 | {tag:'p', html:"Έχετε μία καλύτερη και πιό ασφαλή Clipperz εμπειρία χρησιμοποιόντας τον Firefox. Ωστόσο το Clipperz συνεργάζετε άψογα με Opera και MS Internet Explorer!"} |
| 101 | ], | 99 | ], |
| 102 | 100 | ||
| 103 | // Login message panel | 101 | // Login message panel |
| 104 | 'loginMessagePanelInitialTitle': "Γίνεται σύνδεση ...", | 102 | 'loginMessagePanelInitialTitle': "Γίνεται σύνδεση ...", |
| 105 | 'loginMessagePanelInitialButtonLabel': "Ακύρωση", | 103 | 'loginMessagePanelInitialButtonLabel': "Ακύρωση", |
| 106 | 'loginMessagePanelConnectedTitle': "Συνδεθήκατε", | 104 | 'loginMessagePanelConnectedTitle': "Συνδεθήκατε", |
| 107 | 'loginMessagePanelConnectedText': "Ολοκληρώθηκε", | 105 | 'loginMessagePanelConnectedText': "Ολοκληρώθηκε", |
| 108 | 'loginMessagePanelFailureTitle': "Λάθος", | 106 | 'loginMessagePanelFailureTitle': "Λάθος", |
| 109 | 'loginMessagePanelFailureText': "Η σύνδεση χρήστη απέτυχε", | 107 | 'loginMessagePanelFailureText': "Η σύνδεση χρήστη απέτυχε", |
| 110 | 'loginMessagePanelFailureButtonLabel': "Κλείσιμο", | 108 | 'loginMessagePanelFailureButtonLabel': "Κλείσιμο", |
| 111 | 109 | ||
| 112 | // Login message panel - connection | 110 | // Login message panel - connection |
| 113 | 'connectionLoginSendingCredentialsMessageTitle': "Γίνεται επαλήθευση διαπιστευτηρίων", | 111 | 'connectionLoginSendingCredentialsMessageTitle': "Γίνεται επαλήθευση διαπιστευτηρίων", |
| 114 | 'connectionLoginSendingCredentialsMessageText': "Αποστέλλονται διαπιστευτήρια", | 112 | 'connectionLoginSendingCredentialsMessageText': "Αποστέλλονται διαπιστευτήρια", |
| 115 | 'connectionLoginCredentialsVerificationMessageTitle':"Γίνεται επαλήθευση διαπιστευτηρίων", | 113 | 'connectionLoginCredentialsVerificationMessageTitle':"Γίνεται επαλήθευση διαπιστευτηρίων", |
| 116 | 'connectionLoginCredentialsVerificationMessageText':"Εκτέλεση πιστοποίησης SRP ", | 114 | 'connectionLoginCredentialsVerificationMessageText':"Εκτέλεση πιστοποίησης SRP ", |
| 117 | 'connectionLoginDoneMessageTitle': "Γίνεται επαλήθευση διαπιστευτηρίων", | 115 | 'connectionLoginDoneMessageTitle': "Γίνεται επαλήθευση διαπιστευτηρίων", |
| 118 | 'connectionLoginDoneMessageText': "Συνδεδεμένος", | 116 | 'connectionLoginDoneMessageText': "Συνδεδεμένος", |
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_en-CA.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_en-CA.js index 6879c60..4ecd533 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_en-CA.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_en-CA.js | |||
| @@ -1,40 +1,38 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | //============================================================================= | 24 | //============================================================================= |
| 27 | // | 25 | // |
| 28 | // E N G L I S H C A N A D I A N ( en_CA ) | 26 | // E N G L I S H C A N A D I A N ( en_CA ) |
| 29 | // | 27 | // |
| 30 | //============================================================================= | 28 | //============================================================================= |
| 31 | 29 | ||
| 32 | Clipperz.PM.Strings.Languages['en-ca'] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { | 30 | Clipperz.PM.Strings.Languages['en-ca'] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { |
| 33 | 31 | ||
| 34 | // 'forumHeaderLinkLabel': "forum-CA", | 32 | // 'forumHeaderLinkLabel': "forum-CA", |
| 35 | 33 | ||
| 36 | // 'recordMenuLabel': "cards-CA", | 34 | // 'recordMenuLabel': "cards-CA", |
| 37 | 35 | ||
| 38 | //------------------------------------------------------------------------- | 36 | //------------------------------------------------------------------------- |
| 39 | __syntaxFix__: "syntax fix" | 37 | __syntaxFix__: "syntax fix" |
| 40 | }); \ No newline at end of file | 38 | }); \ No newline at end of file |
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_en-GB.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_en-GB.js index f734c8e..af7b6a2 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_en-GB.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_en-GB.js | |||
| @@ -1,40 +1,38 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | //============================================================================= | 24 | //============================================================================= |
| 27 | // | 25 | // |
| 28 | // E N G L I S H B R I T I S H ( en_GB ) | 26 | // E N G L I S H B R I T I S H ( en_GB ) |
| 29 | // | 27 | // |
| 30 | //============================================================================= | 28 | //============================================================================= |
| 31 | 29 | ||
| 32 | Clipperz.PM.Strings.Languages['en-gb'] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { | 30 | Clipperz.PM.Strings.Languages['en-gb'] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { |
| 33 | 31 | ||
| 34 | // 'forumHeaderLinkLabel': "forum-GB", | 32 | // 'forumHeaderLinkLabel': "forum-GB", |
| 35 | 33 | ||
| 36 | // 'recordMenuLabel': "cards-GB", | 34 | // 'recordMenuLabel': "cards-GB", |
| 37 | 35 | ||
| 38 | //------------------------------------------------------------------------- | 36 | //------------------------------------------------------------------------- |
| 39 | __syntaxFix__: "syntax fix" | 37 | __syntaxFix__: "syntax fix" |
| 40 | }); \ No newline at end of file | 38 | }); \ No newline at end of file |
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js index ab1bb0f..97543a4 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | if (typeof(Clipperz.PM.Strings) == 'undefined') { Clipperz.PM.Strings = {}; } | 26 | if (typeof(Clipperz.PM.Strings) == 'undefined') { Clipperz.PM.Strings = {}; } |
| 29 | if (typeof(Clipperz.PM.Strings.Languages) == 'undefined') { Clipperz.PM.Strings.Languages = {}; } | 27 | if (typeof(Clipperz.PM.Strings.Languages) == 'undefined') { Clipperz.PM.Strings.Languages = {}; } |
| 30 | 28 | ||
| 31 | //============================================================================= | 29 | //============================================================================= |
| 32 | // | 30 | // |
| 33 | // E N G L I S H A M E R I C A N ( en_US ) | 31 | // E N G L I S H A M E R I C A N ( en_US ) |
| 34 | // | 32 | // |
| 35 | //============================================================================= | 33 | //============================================================================= |
| 36 | 34 | ||
| 37 | Clipperz.PM.Strings.Languages['en-us'] = { | 35 | Clipperz.PM.Strings.Languages['en-us'] = { |
| 38 | 36 | ||
| 39 | //Login page - description | 37 | //Login page - description |
| 40 | 'clipperzServiceDescription': "\ | 38 | 'clipperzServiceDescription': "\ |
| 41 | <!-- FIX CSS DONE -->\ | 39 | <!-- FIX CSS DONE -->\ |
| 42 | <h2>Keep it to yourself!</h2>\ | 40 | <h2>Keep it to yourself!</h2>\ |
| 43 | <ul>\ | 41 | <ul>\ |
| 44 | <li>\ | 42 | <li>\ |
| 45 | <h3>Clipperz is:</h3>\ | 43 | <h3>Clipperz is:</h3>\ |
| 46 | <ul>\ | 44 | <ul>\ |
| 47 | <li><p>a secure and simple password manager</p></li>\ | 45 | <li><p>a secure and simple password manager</p></li>\ |
| 48 | <li><p>an effective single sign-on solution</p></li>\ | 46 | <li><p>an effective single sign-on solution</p></li>\ |
| 49 | <li><p>a digital vault for your personal data</p></li>\ | 47 | <li><p>a digital vault for your personal data</p></li>\ |
| 50 | </ul>\ | 48 | </ul>\ |
| 51 | </li>\ | 49 | </li>\ |
| 52 | <li>\ | 50 | <li>\ |
| 53 | <h3>With Clipperz you can:</h3>\ | 51 | <h3>With Clipperz you can:</h3>\ |
| 54 | <ul>\ | 52 | <ul>\ |
| 55 | <li><p>store and manage your passwords and online credentials</p></li>\ | 53 | <li><p>store and manage your passwords and online credentials</p></li>\ |
| 56 | <li><p>login to your web services without entering any username or password</p></li>\ | 54 | <li><p>login to your web services without entering any username or password</p></li>\ |
| 57 | <li><p>protect all your sensitive data: codes for burglar alarms, PINs, credit card numbers, …</p></li>\ | 55 | <li><p>protect all your sensitive data: codes for burglar alarms, PINs, credit card numbers, …</p></li>\ |
| 58 | <li><p>share secrets with family members and associates (coming soon)</p></li>\ | 56 | <li><p>share secrets with family members and associates (coming soon)</p></li>\ |
| 59 | </ul>\ | 57 | </ul>\ |
| 60 | </li>\ | 58 | </li>\ |
| 61 | <li>\ | 59 | <li>\ |
| 62 | <h3>Clipperz benefits:</h3>\ | 60 | <h3>Clipperz benefits:</h3>\ |
| 63 | <ul>\ | 61 | <ul>\ |
| 64 | <li><p>free and completely anonymous</p></li>\ | 62 | <li><p>free and completely anonymous</p></li>\ |
| 65 | <li><p>access it any time from any computer</p></li>\ | 63 | <li><p>access it any time from any computer</p></li>\ |
| 66 | <li><p>no software to download and nothing to install</p></li>\ | 64 | <li><p>no software to download and nothing to install</p></li>\ |
| 67 | <li><p>avoid keeping secrets on your PC or on paper</p></li>\ | 65 | <li><p>avoid keeping secrets on your PC or on paper</p></li>\ |
| 68 | </ul>\ | 66 | </ul>\ |
| 69 | </li>\ | 67 | </li>\ |
| 70 | <li>\ | 68 | <li>\ |
| 71 | <h3>Clipperz security:</h3>\ | 69 | <h3>Clipperz security:</h3>\ |
| 72 | <ul>\ | 70 | <ul>\ |
| 73 | <li><p>your secrets are locally encrypted by your browser before being uploaded to Clipperz</p></li>\ | 71 | <li><p>your secrets are locally encrypted by your browser before being uploaded to Clipperz</p></li>\ |
| 74 | <li><p>the encryption key is a passphrase known only to you</p></li>\ | 72 | <li><p>the encryption key is a passphrase known only to you</p></li>\ |
| 75 | <li><p>Clipperz hosts your sensitive data in encrypted form and could never actually access the data in its plain form</p></li>\ | 73 | <li><p>Clipperz hosts your sensitive data in encrypted form and could never actually access the data in its plain form</p></li>\ |
| 76 | <li><p>Clipperz is built upon standard encryption schemes, nothing fancies or homemade</p></li>\ | 74 | <li><p>Clipperz is built upon standard encryption schemes, nothing fancies or homemade</p></li>\ |
| 77 | <li><p>you can review the source code anytime you like, but you need to know nothing about cryptography to be an happy user!</p></li>\ | 75 | <li><p>you can review the source code anytime you like, but you need to know nothing about cryptography to be an happy user!</p></li>\ |
| 78 | </ul>\ | 76 | </ul>\ |
| 79 | </li>\ | 77 | </li>\ |
| 80 | <li>\ | 78 | <li>\ |
| 81 | <a href=\"http://www.clipperz.com\" target=\"_blank\">Learn more</a>\ | 79 | <a href=\"http://www.clipperz.com\" target=\"_blank\">Learn more</a>\ |
| 82 | </li>\ | 80 | </li>\ |
| 83 | </ul>", | 81 | </ul>", |
| 84 | 82 | ||
| 85 | 83 | ||
| 86 | 'loginFormTitle': "login with your Clipperz account", | 84 | 'loginFormTitle': "login with your Clipperz account", |
| 87 | 'loginFormUsernameLabel': "username", | 85 | 'loginFormUsernameLabel': "username", |
| 88 | 'loginFormPassphraseLabel': "passphrase", | 86 | 'loginFormPassphraseLabel': "passphrase", |
| 89 | 'loginFormDontHaveAnAccountLabel': "don\'t have an account?", | 87 | 'loginFormDontHaveAnAccountLabel': "don\'t have an account?", |
| 90 | 'loginFormCreateOneLabel': "create one", | 88 | 'loginFormCreateOneLabel': "create one", |
| 91 | 'loginFormForgotYourCredentialsLabel': "forgot your credentials?", | 89 | 'loginFormForgotYourCredentialsLabel': "forgot your credentials?", |
| 92 | 'loginFormAarghThatsBadLabel': "aargh! that\'s bad!", | 90 | 'loginFormAarghThatsBadLabel': "aargh! that\'s bad!", |
| 93 | 'loginFormAfraidOfMaliciousScriptsLabel': "afraid of malicious scripts?", | 91 | 'loginFormAfraidOfMaliciousScriptsLabel': "afraid of malicious scripts?", |
| 94 | 'loginFormVerifyTheCodeLabel': "verify the code", | 92 | 'loginFormVerifyTheCodeLabel': "verify the code", |
| 95 | 'loginFormButtonLabel': "Login", | 93 | 'loginFormButtonLabel': "Login", |
| 96 | 'loginFormOneTimePasswordCheckboxLabel': "use a one-time passphrase", | 94 | 'loginFormOneTimePasswordCheckboxLabel': "use a one-time passphrase", |
| 97 | 'loginFormOneTimePasswordCheckboxDescription': "", | 95 | 'loginFormOneTimePasswordCheckboxDescription': "", |
| 98 | 96 | ||
| 99 | // Login page - language selection | 97 | // Login page - language selection |
| 100 | 'loginPanelSwithLanguageDescription': "<h5>Switch to your preferred language</h5>", | 98 | 'loginPanelSwithLanguageDescription': "<h5>Switch to your preferred language</h5>", |
| 101 | 99 | ||
| 102 | // Login page - browser compatibility | 100 | // Login page - browser compatibility |
| 103 | 'browserCompatibilityDescription': "<p>Have a better and safer Clipperz experience with Firefox. However Clipperz works just fine also with Opera, Safari and MS Internet Explorer!</p>", | 101 | 'browserCompatibilityDescription': "<p>Have a better and safer Clipperz experience with Firefox. However Clipperz works just fine also with Opera, Safari and MS Internet Explorer!</p>", |
| 104 | 102 | ||
| 105 | // Login with OTP - message panel | 103 | // Login with OTP - message panel |
| 106 | 'OTPloginMessagePanelInitialTitle': "Logging in using a one-time passphrase", | 104 | 'OTPloginMessagePanelInitialTitle': "Logging in using a one-time passphrase", |
| 107 | 'OTPloginMessagePanelInitialText': "Sending OTP credentials …", | 105 | 'OTPloginMessagePanelInitialText': "Sending OTP credentials …", |
| 108 | 'OTPloginMessagePanelLoadingTitle': "Logging in using a one-time passphrase", | 106 | 'OTPloginMessagePanelLoadingTitle': "Logging in using a one-time passphrase", |
| 109 | 'OTPloginMessagePanelLoadingText': "Fetching encrypted authentication data from the server …", | 107 | 'OTPloginMessagePanelLoadingText': "Fetching encrypted authentication data from the server …", |
| 110 | 'OTPloginMessagePanelProcessingTitle': "Logging in using a one-time passphrase", | 108 | 'OTPloginMessagePanelProcessingTitle': "Logging in using a one-time passphrase", |
| 111 | 'OTPloginMessagePanelProcessingText': "Local decryption of authentication data", | 109 | 'OTPloginMessagePanelProcessingText': "Local decryption of authentication data", |
| 112 | 110 | ||
| 113 | // Regular login - message panel | 111 | // Regular login - message panel |
| 114 | 'loginMessagePanelInitialTitle': "Logging in …", | 112 | 'loginMessagePanelInitialTitle': "Logging in …", |
| 115 | 'loginMessagePanelInitialText': "---", | 113 | 'loginMessagePanelInitialText': "---", |
| 116 | 'loginMessagePanelInitialButtonLabel': "Cancel", | 114 | 'loginMessagePanelInitialButtonLabel': "Cancel", |
| 117 | 'loginMessagePanelConnectedTitle': "Connected", | 115 | 'loginMessagePanelConnectedTitle': "Connected", |
| 118 | 'loginMessagePanelConnectedText': "Done", | 116 | 'loginMessagePanelConnectedText': "Done", |
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_es-ES.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_es-ES.js index 57286fe..2090913 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_es-ES.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_es-ES.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | Clipperz.PM.Strings.Languages['es-ES'.toLowerCase()] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { | 24 | Clipperz.PM.Strings.Languages['es-ES'.toLowerCase()] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { |
| 27 | 'clipperzServiceDescription':"<h2>Guárdelo usted mismo!</h2> <ul> <li> <h3>Clipperz es:</h3> <ul> <li> <p>un simple y seguro administrador de contraseñas</p> </li> <li> <p>una efectiva y simple solución de logueo</p> </li> <li> <p>un maletín digital para sus datos confidenciales</p> </li> </ul> </li> <li> <h3>Con Clipperz usted puede:</h3> <ul> <li> <p>administrar y almacenar en línea sus contraseñas y credenciales digitales</p> </li> <li> <p>ingresar en sus servicios web sin ningún nombre de usuario o contraseña</p> </li> <li> <p>protejer todos sus datos sensibles: códigos de alarmas, PINs y números de tarjetas de crédito, …</p> </li> <li> <p>compartir secretos con sus familiares y socios</p> </li> </ul> </li> <li> <h3>Beneficios de Clipperz:</h3> <ul> <li> <p>es gratis y completamente anónimo</p> </li> <li> <p>con acceso en cualquier momento y desde cualquier ordenador</p> </li> <li> <p>no necesita instalar o descargar ningún programa</p> </li> <li> <p>no necesita guardar secretos en papel o en el ordenador</p> </li> </ul> </li> <li> <h3>Seguridad de Clipperz:</h3> <ul> <li> <p>sus secretos son localmente encriptados por su navegador antes de ser almacenados en Clipperz</p> </li> <li> <p>la llave de encriptación es una frase clave conocida solo por usted</p> </li> <li> <p>Clipperz almacena sus datos de manera encriptada y nunca accede a ellos en forma de texto plano</p> </li> <li> <p>Clipperz esta basado en esquemas estándares de encriptación, no hemos inventado nada</p> </li> <li> <p>usted puede revisar el código todas las veces que lo desee, ¡ pero no necesita conocer algo de encriptación para ser un usuario feliz!</p> </li> </ul> </li> <li> <a href=\"http://www.clipperz.com\" target=\"_blank\">Aprender más</a> </li> </ul> ", | 25 | 'clipperzServiceDescription':"<h2>Guárdelo usted mismo!</h2> <ul> <li> <h3>Clipperz es:</h3> <ul> <li> <p>un simple y seguro administrador de contraseñas</p> </li> <li> <p>una efectiva y simple solución de logueo</p> </li> <li> <p>un maletín digital para sus datos confidenciales</p> </li> </ul> </li> <li> <h3>Con Clipperz usted puede:</h3> <ul> <li> <p>administrar y almacenar en línea sus contraseñas y credenciales digitales</p> </li> <li> <p>ingresar en sus servicios web sin ningún nombre de usuario o contraseña</p> </li> <li> <p>protejer todos sus datos sensibles: códigos de alarmas, PINs y números de tarjetas de crédito, …</p> </li> <li> <p>compartir secretos con sus familiares y socios</p> </li> </ul> </li> <li> <h3>Beneficios de Clipperz:</h3> <ul> <li> <p>es gratis y completamente anónimo</p> </li> <li> <p>con acceso en cualquier momento y desde cualquier ordenador</p> </li> <li> <p>no necesita instalar o descargar ningún programa</p> </li> <li> <p>no necesita guardar secretos en papel o en el ordenador</p> </li> </ul> </li> <li> <h3>Seguridad de Clipperz:</h3> <ul> <li> <p>sus secretos son localmente encriptados por su navegador antes de ser almacenados en Clipperz</p> </li> <li> <p>la llave de encriptación es una frase clave conocida solo por usted</p> </li> <li> <p>Clipperz almacena sus datos de manera encriptada y nunca accede a ellos en forma de texto plano</p> </li> <li> <p>Clipperz esta basado en esquemas estándares de encriptación, no hemos inventado nada</p> </li> <li> <p>usted puede revisar el código todas las veces que lo desee, ¡ pero no necesita conocer algo de encriptación para ser un usuario feliz!</p> </li> </ul> </li> <li> <a href=\"http://www.clipperz.com\" target=\"_blank\">Aprender más</a> </li> </ul> ", |
| 28 | 'loginFormTitle':"ingrese con su usuario Clipperz", | 26 | 'loginFormTitle':"ingrese con su usuario Clipperz", |
| 29 | 'loginFormUsernameLabel':"usuario", | 27 | 'loginFormUsernameLabel':"usuario", |
| 30 | 'loginFormPassphraseLabel':"frase clave", | 28 | 'loginFormPassphraseLabel':"frase clave", |
| 31 | 'loginFormDontHaveAnAccountLabel':"¿no tiene una cuenta?", | 29 | 'loginFormDontHaveAnAccountLabel':"¿no tiene una cuenta?", |
| 32 | 'loginFormCreateOneLabel':"crear una", | 30 | 'loginFormCreateOneLabel':"crear una", |
| 33 | 'loginFormForgotYourCredentialsLabel':"¿perdió sus credenciales?", | 31 | 'loginFormForgotYourCredentialsLabel':"¿perdió sus credenciales?", |
| 34 | 'loginFormAarghThatsBadLabel':"¡Ahhh! ¡eso es malo!", | 32 | 'loginFormAarghThatsBadLabel':"¡Ahhh! ¡eso es malo!", |
| 35 | 'loginFormAfraidOfMaliciousScriptsLabel':"¿evitar scripts maliciosos?", | 33 | 'loginFormAfraidOfMaliciousScriptsLabel':"¿evitar scripts maliciosos?", |
| 36 | 'loginFormVerifyTheCodeLabel':"verificar el código", | 34 | 'loginFormVerifyTheCodeLabel':"verificar el código", |
| 37 | 'loginFormButtonLabel':"Ingresar", | 35 | 'loginFormButtonLabel':"Ingresar", |
| 38 | 'loginFormOneTimePasswordCheckboxLabel':"usar una frase clave desechable", | 36 | 'loginFormOneTimePasswordCheckboxLabel':"usar una frase clave desechable", |
| 39 | 'loginPanelSwithLanguageDescription':"<h5>Cambiar a su lenguaje preferido</h5> ", | 37 | 'loginPanelSwithLanguageDescription':"<h5>Cambiar a su lenguaje preferido</h5> ", |
| 40 | 'browserCompatibilityDescription':"<p>Obtenga una mejor y más segura experiencia con Firefox. De todas maneras Clipperz funciona también con Opera y MS Explorer!</p> ", | 38 | 'browserCompatibilityDescription':"<p>Obtenga una mejor y más segura experiencia con Firefox. De todas maneras Clipperz funciona también con Opera y MS Explorer!</p> ", |
| 41 | 'OTPloginMessagePanelInitialTitle':"Ingresar usando una frase clave desechable", | 39 | 'OTPloginMessagePanelInitialTitle':"Ingresar usando una frase clave desechable", |
| 42 | 'OTPloginMessagePanelInitialText':"Enviando credenciales OTP ...", | 40 | 'OTPloginMessagePanelInitialText':"Enviando credenciales OTP ...", |
| 43 | 'OTPloginMessagePanelLoadingTitle':"Ingresar usando una frase clave desechable", | 41 | 'OTPloginMessagePanelLoadingTitle':"Ingresar usando una frase clave desechable", |
| 44 | 'OTPloginMessagePanelLoadingText':"Descargando datos de autenticación encriptados desde el servidor ...", | 42 | 'OTPloginMessagePanelLoadingText':"Descargando datos de autenticación encriptados desde el servidor ...", |
| 45 | 'OTPloginMessagePanelProcessingTitle':"Ingresar usando una frase clave desechable", | 43 | 'OTPloginMessagePanelProcessingTitle':"Ingresar usando una frase clave desechable", |
| 46 | 'OTPloginMessagePanelProcessingText':"Desencriptación local de datos de autenticación ...", | 44 | 'OTPloginMessagePanelProcessingText':"Desencriptación local de datos de autenticación ...", |
| 47 | 'loginMessagePanelInitialTitle':"Ingresando ...", | 45 | 'loginMessagePanelInitialTitle':"Ingresando ...", |
| 48 | 'loginMessagePanelInitialButtonLabel':"Cancelar", | 46 | 'loginMessagePanelInitialButtonLabel':"Cancelar", |
| 49 | 'loginMessagePanelConnectedTitle':"Conectado", | 47 | 'loginMessagePanelConnectedTitle':"Conectado", |
| 50 | 'loginMessagePanelConnectedText':"Hecho", | 48 | 'loginMessagePanelConnectedText':"Hecho", |
| 51 | 'loginMessagePanelFailureTitle':"Error", | 49 | 'loginMessagePanelFailureTitle':"Error", |
| 52 | 'loginMessagePanelFailureText':"Ingreso fallido", | 50 | 'loginMessagePanelFailureText':"Ingreso fallido", |
| 53 | 'loginMessagePanelFailureButtonLabel':"Cerrar", | 51 | 'loginMessagePanelFailureButtonLabel':"Cerrar", |
| 54 | 'connectionLoginSendingCredentialsMessageTitle':"Verificando credenciales", | 52 | 'connectionLoginSendingCredentialsMessageTitle':"Verificando credenciales", |
| 55 | 'connectionLoginSendingCredentialsMessageText':"Enviando credenciales", | 53 | 'connectionLoginSendingCredentialsMessageText':"Enviando credenciales", |
| 56 | 'connectionLoginCredentialsVerificationMessageTitle':"Verificando credenciales", | 54 | 'connectionLoginCredentialsVerificationMessageTitle':"Verificando credenciales", |
| 57 | 'connectionLoginCredentialsVerificationMessageText':"Realizando una autenticación SRP", | 55 | 'connectionLoginCredentialsVerificationMessageText':"Realizando una autenticación SRP", |
| 58 | 'connectionLoginDoneMessageTitle':"Verificando credenciales", | 56 | 'connectionLoginDoneMessageTitle':"Verificando credenciales", |
| 59 | 'connectionLoginDoneMessageText':"Conectado", | 57 | 'connectionLoginDoneMessageText':"Conectado", |
| 60 | 'userLoginPanelUpgradingUserCredentialsMessageTitle':"Verificando credenciales", | 58 | 'userLoginPanelUpgradingUserCredentialsMessageTitle':"Verificando credenciales", |
| 61 | 'userLoginPanelUpgradingUserCredentialsMessageText':"Actualizando sus credenciales al nuevo esquema de autenticación", | 59 | 'userLoginPanelUpgradingUserCredentialsMessageText':"Actualizando sus credenciales al nuevo esquema de autenticación", |
| 62 | 'userLoginPanelConnectedMessageTitle':"Usuario autenticado", | 60 | 'userLoginPanelConnectedMessageTitle':"Usuario autenticado", |
| 63 | 'userLoginPanelConnectedMessageText':"Exitosamente logueado", | 61 | 'userLoginPanelConnectedMessageText':"Exitosamente logueado", |
| 64 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':"Verifying credentials", | 62 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':"Verifying credentials", |
| 65 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageText':"Probando un esquema de autenticación antiguo", | 63 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageText':"Probando un esquema de autenticación antiguo", |
| 66 | 'userLoginPanelLoadingUserDataMessageTitle':"Usuario autenticado", | 64 | 'userLoginPanelLoadingUserDataMessageTitle':"Usuario autenticado", |
| 67 | 'userLoginPanelLoadingUserDataMessageText':"Descargando encabezamientos encriptados desde Clipperz", | 65 | 'userLoginPanelLoadingUserDataMessageText':"Descargando encabezamientos encriptados desde Clipperz", |
| 68 | 'userLoginPanelDecryptingUserDataMessageTitle':"Usuario autenticado", | 66 | 'userLoginPanelDecryptingUserDataMessageTitle':"Usuario autenticado", |
| 69 | 'userLoginPanelDecryptingUserDataMessageText':"Desencriptación local de datos", | 67 | 'userLoginPanelDecryptingUserDataMessageText':"Desencriptación local de datos", |
| 70 | 'userLoginPanelDecryptingUserStatisticsMessageTitle':"Usuario autenticado", | 68 | 'userLoginPanelDecryptingUserStatisticsMessageTitle':"Usuario autenticado", |
| 71 | 'userLoginPanelDecryptingUserStatisticsMessageText':"Desencriptación local de estadísticas de uso", | 69 | 'userLoginPanelDecryptingUserStatisticsMessageText':"Desencriptación local de estadísticas de uso", |
| 72 | 'splashAlertTitle':"¡Bienvenido a Clipperz!", | 70 | 'splashAlertTitle':"¡Bienvenido a Clipperz!", |
| 73 | 'splashAlertText':"<p>Algunas advertencias sobre seguridad</p> <ul> <li> <p>Almacenar sus datos en Clipperz es tan seguro como la frase clave que usted elija para protegerlos. Nadie puede acceder a ellos a no ser que conozca la frase clave.</p> </li> <li> <p>Si usted va a usar Clipperz para guardar información sensible y crítica, esté seguro de elegir una frase clave fuerte. ¡Cuanto más larga mejor!</p> </li> <li> <p>Clipperz no le permitirá recuperar una frase clave perdida.</p> </li> </ul> <p>Si necesita más información, por favor visite el sitio de <a href=\"http://www.clipperz.com\" target=\"_blank\">Clipperz</a>.</p> ", | 71 | 'splashAlertText':"<p>Algunas advertencias sobre seguridad</p> <ul> <li> <p>Almacenar sus datos en Clipperz es tan seguro como la frase clave que usted elija para protegerlos. Nadie puede acceder a ellos a no ser que conozca la frase clave.</p> </li> <li> <p>Si usted va a usar Clipperz para guardar información sensible y crítica, esté seguro de elegir una frase clave fuerte. ¡Cuanto más larga mejor!</p> </li> <li> <p>Clipperz no le permitirá recuperar una frase clave perdida.</p> </li> </ul> <p>Si necesita más información, por favor visite el sitio de <a href=\"http://www.clipperz.com\" target=\"_blank\">Clipperz</a>.</p> ", |
| 74 | 'splashAlertCloseButtonLabel':"Aceptar", | 72 | 'splashAlertCloseButtonLabel':"Aceptar", |
| 75 | 'registrationFormTitle':"Abrir su cuenta", | 73 | 'registrationFormTitle':"Abrir su cuenta", |
| 76 | 'registrationFormUsernameLabel':"usuario", | 74 | 'registrationFormUsernameLabel':"usuario", |
| 77 | 'registrationFormPassphraseLabel':"frase clave", | 75 | 'registrationFormPassphraseLabel':"frase clave", |
| 78 | 'registrationFormRetypePassphraseLabel':"reingrese la frase clave", | 76 | 'registrationFormRetypePassphraseLabel':"reingrese la frase clave", |
| 79 | 'registrationFormSafetyCheckLabel':"Yo entiendo que Clipperz no me permite recuperar frases clave perdidas", | 77 | 'registrationFormSafetyCheckLabel':"Yo entiendo que Clipperz no me permite recuperar frases clave perdidas", |
| 80 | 'registrationFormTermsOfServiceCheckLabel':"He leído y estoy de acuerdo con los <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Términos de Servicio</a>.", | 78 | 'registrationFormTermsOfServiceCheckLabel':"He leído y estoy de acuerdo con los <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Términos de Servicio</a>.", |
| 81 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"¿usted ya tiene una cuenta?", | 79 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"¿usted ya tiene una cuenta?", |
| 82 | 'registrationFormSimplyLoginLabel':"ingreso simple", | 80 | 'registrationFormSimplyLoginLabel':"ingreso simple", |
| 83 | 'registrationFormButtonLabel':"Registrarse", | 81 | 'registrationFormButtonLabel':"Registrarse", |
| 84 | 'registrationFormWarningMessageNotMatchingPassphrases':"Su frase clave no coincide, por favor reescríbala.", | 82 | 'registrationFormWarningMessageNotMatchingPassphrases':"Su frase clave no coincide, por favor reescríbala.", |
| 85 | 'registrationFormWarningMessageSafetyCheckNotSelected':"Por favor, lea y chequee todas las casillas debajo.", | 83 | 'registrationFormWarningMessageSafetyCheckNotSelected':"Por favor, lea y chequee todas las casillas debajo.", |
| 86 | 'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"Usted necesita estar de acuerdo con los Términos de Servicio.", | 84 | 'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"Usted necesita estar de acuerdo con los Términos de Servicio.", |
| 87 | 'registrationMessagePanelInitialTitle':"Creando cuenta ...", | 85 | 'registrationMessagePanelInitialTitle':"Creando cuenta ...", |
| 88 | 'registrationMessagePanelInitialButtonLabel':"Cancelar", | 86 | 'registrationMessagePanelInitialButtonLabel':"Cancelar", |
| 89 | 'registrationMessagePanelRegistrationDoneTitle':"Registración", | 87 | 'registrationMessagePanelRegistrationDoneTitle':"Registración", |
| 90 | 'registrationMessagePanelRegistrationDoneText':"Hecho", | 88 | 'registrationMessagePanelRegistrationDoneText':"Hecho", |
| 91 | 'registrationMessagePanelFailureTitle':"Registración fallada", | 89 | 'registrationMessagePanelFailureTitle':"Registración fallada", |
| 92 | 'registrationMessagePanelFailureButtonLabel':"Cerrar", | 90 | 'registrationMessagePanelFailureButtonLabel':"Cerrar", |
| 93 | 'connectionRegistrationSendingRequestMessageText':"Verificando credenciales", | 91 | 'connectionRegistrationSendingRequestMessageText':"Verificando credenciales", |
| 94 | 'connectionRegistrationSendingCredentialsMessageText':"Enviando credenciales", | 92 | 'connectionRegistrationSendingCredentialsMessageText':"Enviando credenciales", |
| 95 | 'registrationSplashPanelTitle':"Aviso de seguridad", | 93 | 'registrationSplashPanelTitle':"Aviso de seguridad", |
| 96 | 'registrationSplashPanelDescriptionConfig':"<p>Estas son sus credenciales de Clipperz, cuídelas. ¡Clipperz nunca más le mostrará su cuenta y frase clave por segunda vez!</p> ", | 94 | 'registrationSplashPanelDescriptionConfig':"<p>Estas son sus credenciales de Clipperz, cuídelas. ¡Clipperz nunca más le mostrará su cuenta y frase clave por segunda vez!</p> ", |
| 97 | 'registrationSplashPanelUsernameLabel':"usuario", | 95 | 'registrationSplashPanelUsernameLabel':"usuario", |
| 98 | 'registrationSplashPanelPassphraseLabel':"frase clave", | 96 | 'registrationSplashPanelPassphraseLabel':"frase clave", |
| 99 | 'registrationSplashPanelShowPassphraseButtonLabel':" mostrar frase clave", | 97 | 'registrationSplashPanelShowPassphraseButtonLabel':" mostrar frase clave", |
| 100 | 'donateHeaderLinkLabel':"donaciones", | 98 | 'donateHeaderLinkLabel':"donaciones", |
| 101 | 'creditsHeaderLinkLabel':"créditos", | 99 | 'creditsHeaderLinkLabel':"créditos", |
| 102 | 'feedbackHeaderLinkLabel':"contacto", | 100 | 'feedbackHeaderLinkLabel':"contacto", |
| 103 | 'helpHeaderLinkLabel':"ayuda", | 101 | 'helpHeaderLinkLabel':"ayuda", |
| 104 | 'forumHeaderLinkLabel':"foro", | 102 | 'forumHeaderLinkLabel':"foro", |
| 105 | 'recordMenuLabel':"tarjetas", | 103 | 'recordMenuLabel':"tarjetas", |
| 106 | 'accountMenuLabel':"cuenta", | 104 | 'accountMenuLabel':"cuenta", |
| 107 | 'dataMenuLabel':"datos", | 105 | 'dataMenuLabel':"datos", |
| 108 | 'contactsMenuLabel':"contactos", | 106 | 'contactsMenuLabel':"contactos", |
| 109 | 'toolsMenuLabel':"herramientas", | 107 | 'toolsMenuLabel':"herramientas", |
| 110 | 'logoutMenuLabel':"salir", | 108 | 'logoutMenuLabel':"salir", |
| 111 | 'lockMenuLabel':"bloquear", | 109 | 'lockMenuLabel':"bloquear", |
| 112 | 'lockTitle':"La cuenta está bloqueada", | 110 | 'lockTitle':"La cuenta está bloqueada", |
| 113 | 'lockDescriptionConfig':"<p>Para desbloquear su cuenta, por favor ingrese su frase clave</p> ", | 111 | 'lockDescriptionConfig':"<p>Para desbloquear su cuenta, por favor ingrese su frase clave</p> ", |
| 114 | 'unlockButtonLabel':"desbloquear", | 112 | 'unlockButtonLabel':"desbloquear", |
| 115 | 'changePasswordTabLabel':"Cambiar su frase clave", | 113 | 'changePasswordTabLabel':"Cambiar su frase clave", |
| 116 | 'changePasswordTabTitle':"Cambiar su frase clave", | 114 | 'changePasswordTabTitle':"Cambiar su frase clave", |
| 117 | 'changePasswordFormUsernameLabel':"usuario", | 115 | 'changePasswordFormUsernameLabel':"usuario", |
| 118 | 'changePasswordFormOldPassphraseLabel':"frase clave anterior", | 116 | 'changePasswordFormOldPassphraseLabel':"frase clave anterior", |
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_fr-FR.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_fr-FR.js index 34467e9..08f0c21 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_fr-FR.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_fr-FR.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | Clipperz.PM.Strings.Languages['fr-FR'.toLowerCase()] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { | 24 | Clipperz.PM.Strings.Languages['fr-FR'.toLowerCase()] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { |
| 27 | 'clipperzServiceDescription':"<h2>Gardez le pour vous!</h2> <ul> <li> <h3>Clipperz est:</h3> <ul> <li> <p>un gestionnaire de mots de passe sécurisé</p> </li> <li> <p>une solution fiable d’authentification unique</p> </li> <li> <p>une chambre forte numérique pour vos données confidentielles</p> </li> </ul> </li> <li> <h3>Avec Clipperz vous pouvez:</h3> <ul> <li> <p>enregistrer et gérer vos mots de passe et autres informations d'identification en ligne</p> </li> <li> <p>vous identifier sur vos sites web sans avoir besoin de saisir votre nom d’utilisateur ou votre mot de passe</p> </li> <li> <p>protéger toutes vos données sensibles: codes d’alarmes, PINs (téléphone portable), carte de crédits, …</p> </li> <li> <p>partager certaines données confidentielles avec vos proches et vos associés (bientôt disponible!)</p> </li> </ul> </li> <li> <h3>Les avantages de Clipperz:</h3> <ul> <li> <p>c'est gratuit et totalement anonyme</p> </li> <li> <p>accéder à vos données depuis n’importe quel ordinateur</p> </li> <li> <p>vous n'avez besoin d'aucun logiciel et rien n'est à installer sur votre poste</p> </li> <li> <p>cela vous évite de garder des mots de passe sur votre PC ou sur des bouts de papier</p> </li> </ul> </li> <li> <h3>La sécurité de Clipperz:</h3> <ul> <li> <p>vos mots de passe sont localement chiffrés par votre navigateur avant d’être téléchargé à Clipperz</p> </li> <li> <p>la clé de cryptage est une phrase secrète détenue uniquement par vous même</p> </li> <li> <p>héberge vos données sensibles dans des formulaires cryptés et ne peuvent être consultées directement en clair</p> </li> <li> <p>est développé sur des standard de cryptage réputé sans aucune fantaisie ni de bricolage fait maison</p> </li> <li> <p>vous pouvez consulter le code source autant que vous le souhaitez</p> </li> </ul> </li> <li> <a href=\"http://www.clipperz.com\" target=\"_blank\">Plus d’informations</a> </li> </ul> ", | 25 | 'clipperzServiceDescription':"<h2>Gardez le pour vous!</h2> <ul> <li> <h3>Clipperz est:</h3> <ul> <li> <p>un gestionnaire de mots de passe sécurisé</p> </li> <li> <p>une solution fiable d’authentification unique</p> </li> <li> <p>une chambre forte numérique pour vos données confidentielles</p> </li> </ul> </li> <li> <h3>Avec Clipperz vous pouvez:</h3> <ul> <li> <p>enregistrer et gérer vos mots de passe et autres informations d'identification en ligne</p> </li> <li> <p>vous identifier sur vos sites web sans avoir besoin de saisir votre nom d’utilisateur ou votre mot de passe</p> </li> <li> <p>protéger toutes vos données sensibles: codes d’alarmes, PINs (téléphone portable), carte de crédits, …</p> </li> <li> <p>partager certaines données confidentielles avec vos proches et vos associés (bientôt disponible!)</p> </li> </ul> </li> <li> <h3>Les avantages de Clipperz:</h3> <ul> <li> <p>c'est gratuit et totalement anonyme</p> </li> <li> <p>accéder à vos données depuis n’importe quel ordinateur</p> </li> <li> <p>vous n'avez besoin d'aucun logiciel et rien n'est à installer sur votre poste</p> </li> <li> <p>cela vous évite de garder des mots de passe sur votre PC ou sur des bouts de papier</p> </li> </ul> </li> <li> <h3>La sécurité de Clipperz:</h3> <ul> <li> <p>vos mots de passe sont localement chiffrés par votre navigateur avant d’être téléchargé à Clipperz</p> </li> <li> <p>la clé de cryptage est une phrase secrète détenue uniquement par vous même</p> </li> <li> <p>héberge vos données sensibles dans des formulaires cryptés et ne peuvent être consultées directement en clair</p> </li> <li> <p>est développé sur des standard de cryptage réputé sans aucune fantaisie ni de bricolage fait maison</p> </li> <li> <p>vous pouvez consulter le code source autant que vous le souhaitez</p> </li> </ul> </li> <li> <a href=\"http://www.clipperz.com\" target=\"_blank\">Plus d’informations</a> </li> </ul> ", |
| 28 | 'loginFormTitle':"identifiez-vous avec votre compte Clipperz", | 26 | 'loginFormTitle':"identifiez-vous avec votre compte Clipperz", |
| 29 | 'loginFormUsernameLabel':"nom d’utilisateur", | 27 | 'loginFormUsernameLabel':"nom d’utilisateur", |
| 30 | 'loginFormPassphraseLabel':"phrase secrète", | 28 | 'loginFormPassphraseLabel':"phrase secrète", |
| 31 | 'loginFormDontHaveAnAccountLabel':"vous n’avez pas de compte?", | 29 | 'loginFormDontHaveAnAccountLabel':"vous n’avez pas de compte?", |
| 32 | 'loginFormCreateOneLabel':"créez votre compte", | 30 | 'loginFormCreateOneLabel':"créez votre compte", |
| 33 | 'loginFormForgotYourCredentialsLabel':"vous avez oublié votre certificat?", | 31 | 'loginFormForgotYourCredentialsLabel':"vous avez oublié votre certificat?", |
| 34 | 'loginFormAarghThatsBadLabel':"c’est fort dommage pour vous!", | 32 | 'loginFormAarghThatsBadLabel':"c’est fort dommage pour vous!", |
| 35 | 'loginFormAfraidOfMaliciousScriptsLabel':"vous avez peur des script malicieux?", | 33 | 'loginFormAfraidOfMaliciousScriptsLabel':"vous avez peur des script malicieux?", |
| 36 | 'loginFormVerifyTheCodeLabel':"vérifiez le code", | 34 | 'loginFormVerifyTheCodeLabel':"vérifiez le code", |
| 37 | 'loginFormButtonLabel':"S’identifer", | 35 | 'loginFormButtonLabel':"S’identifer", |
| 38 | 'loginPanelSwithLanguageDescription':"<p>Sélectionnez votre langue préféré</p> ", | 36 | 'loginPanelSwithLanguageDescription':"<p>Sélectionnez votre langue préféré</p> ", |
| 39 | 'browserCompatibilityDescription':"<p>Have a better and safer Clipperz experience with Firefox. However Clipperz works just fine also with Opera and MS Internet Explorer!</p> ", | 37 | 'browserCompatibilityDescription':"<p>Have a better and safer Clipperz experience with Firefox. However Clipperz works just fine also with Opera and MS Internet Explorer!</p> ", |
| 40 | 'loginMessagePanelInitialTitle':"En cours d’identification ...", | 38 | 'loginMessagePanelInitialTitle':"En cours d’identification ...", |
| 41 | 'loginMessagePanelInitialButtonLabel':"Annuler", | 39 | 'loginMessagePanelInitialButtonLabel':"Annuler", |
| 42 | 'loginMessagePanelConnectedTitle':"Connecté", | 40 | 'loginMessagePanelConnectedTitle':"Connecté", |
| 43 | 'loginMessagePanelConnectedText':"Terminé", | 41 | 'loginMessagePanelConnectedText':"Terminé", |
| 44 | 'loginMessagePanelFailureTitle':"Erreur", | 42 | 'loginMessagePanelFailureTitle':"Erreur", |
| 45 | 'loginMessagePanelFailureText':"Identification échoué", | 43 | 'loginMessagePanelFailureText':"Identification échoué", |
| 46 | 'loginMessagePanelFailureButtonLabel':"Fermer", | 44 | 'loginMessagePanelFailureButtonLabel':"Fermer", |
| 47 | 'connectionLoginSendingCredentialsMessageTitle':"Vérification des identifiants", | 45 | 'connectionLoginSendingCredentialsMessageTitle':"Vérification des identifiants", |
| 48 | 'connectionLoginSendingCredentialsMessageText':"Envoi des identifiants", | 46 | 'connectionLoginSendingCredentialsMessageText':"Envoi des identifiants", |
| 49 | 'connectionLoginCredentialsVerificationMessageTitle':"Vérification des identifiants", | 47 | 'connectionLoginCredentialsVerificationMessageTitle':"Vérification des identifiants", |
| 50 | 'connectionLoginCredentialsVerificationMessageText':"Authentification SRP en cours", | 48 | 'connectionLoginCredentialsVerificationMessageText':"Authentification SRP en cours", |
| 51 | 'connectionLoginDoneMessageTitle':"Vérification des identifiants", | 49 | 'connectionLoginDoneMessageTitle':"Vérification des identifiants", |
| 52 | 'connectionLoginDoneMessageText':"Connecté", | 50 | 'connectionLoginDoneMessageText':"Connecté", |
| 53 | 'userLoginPanelUpgradingUserCredentialsMessageTitle':"Vérification des identifiants", | 51 | 'userLoginPanelUpgradingUserCredentialsMessageTitle':"Vérification des identifiants", |
| 54 | 'userLoginPanelUpgradingUserCredentialsMessageText':"Mise à jour de vos identifiants à un nouveau schéma d’authentification", | 52 | 'userLoginPanelUpgradingUserCredentialsMessageText':"Mise à jour de vos identifiants à un nouveau schéma d’authentification", |
| 55 | 'userLoginPanelConnectedMessageTitle':"Utilisateur identifié", | 53 | 'userLoginPanelConnectedMessageTitle':"Utilisateur identifié", |
| 56 | 'userLoginPanelConnectedMessageText':"Vous vous êtes identifié avec succès", | 54 | 'userLoginPanelConnectedMessageText':"Vous vous êtes identifié avec succès", |
| 57 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':"Vérification des identifiants", | 55 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':"Vérification des identifiants", |
| 58 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageText':"Nous essayons un ancien schéma d’authentification", | 56 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageText':"Nous essayons un ancien schéma d’authentification", |
| 59 | 'userLoginPanelLoadingUserDataMessageTitle':"Utilisateur identifié", | 57 | 'userLoginPanelLoadingUserDataMessageTitle':"Utilisateur identifié", |
| 60 | 'userLoginPanelLoadingUserDataMessageText':"Téléchargement des cartes d’en-têtes chiffrés depuis Clipperz", | 58 | 'userLoginPanelLoadingUserDataMessageText':"Téléchargement des cartes d’en-têtes chiffrés depuis Clipperz", |
| 61 | 'userLoginPanelDecryptingUserDataMessageTitle':"Utilisateur identifié", | 59 | 'userLoginPanelDecryptingUserDataMessageTitle':"Utilisateur identifié", |
| 62 | 'userLoginPanelDecryptingUserDataMessageText':"Décryptage local des en-têtes chiffrés", | 60 | 'userLoginPanelDecryptingUserDataMessageText':"Décryptage local des en-têtes chiffrés", |
| 63 | 'userLoginPanelDecryptingUserStatisticsMessageTitle':"Utilisateur identifié", | 61 | 'userLoginPanelDecryptingUserStatisticsMessageTitle':"Utilisateur identifié", |
| 64 | 'userLoginPanelDecryptingUserStatisticsMessageText':"Décryptage local des statistiques", | 62 | 'userLoginPanelDecryptingUserStatisticsMessageText':"Décryptage local des statistiques", |
| 65 | 'splashAlertTitle':"Bienvenue sur Clipperz!", | 63 | 'splashAlertTitle':"Bienvenue sur Clipperz!", |
| 66 | 'splashAlertText':"<p>Conseils de sécurité</p> <ul> <li> <p>Le stockage de vos mots de passe sur Clipperz est aussi sécurisé que la phrase que vous avez sélectionnée pour les protéger. Personne ne peux y accéder tant que personne ne connait votre phrase secrète.</p> </li> <li> <p>Si vous allez utiliser Clipperz pour sauvegarder des informations sensibles et critiques assurez-vous d’utiliser une phrase secrète compliquée. Plus elle sera longue mieux ce sera!</p> </li> <li> <p>Clipperz ne sera pas capable de récupérer votre phrase secrète!</p> </li> </ul> <p>Pour toute autre information, veuillez vous référer au site <a href=\"http://www.clipperz.com\" target=\"_blank\">Clipperz</a>.</p> ", | 64 | 'splashAlertText':"<p>Conseils de sécurité</p> <ul> <li> <p>Le stockage de vos mots de passe sur Clipperz est aussi sécurisé que la phrase que vous avez sélectionnée pour les protéger. Personne ne peux y accéder tant que personne ne connait votre phrase secrète.</p> </li> <li> <p>Si vous allez utiliser Clipperz pour sauvegarder des informations sensibles et critiques assurez-vous d’utiliser une phrase secrète compliquée. Plus elle sera longue mieux ce sera!</p> </li> <li> <p>Clipperz ne sera pas capable de récupérer votre phrase secrète!</p> </li> </ul> <p>Pour toute autre information, veuillez vous référer au site <a href=\"http://www.clipperz.com\" target=\"_blank\">Clipperz</a>.</p> ", |
| 67 | 'splashAlertCloseButtonLabel':"Ok", | 65 | 'splashAlertCloseButtonLabel':"Ok", |
| 68 | 'registrationFormTitle':"créer votre compte", | 66 | 'registrationFormTitle':"créer votre compte", |
| 69 | 'registrationFormUsernameLabel':"nom d’utilisateur", | 67 | 'registrationFormUsernameLabel':"nom d’utilisateur", |
| 70 | 'registrationFormPassphraseLabel':"phrase secrète", | 68 | 'registrationFormPassphraseLabel':"phrase secrète", |
| 71 | 'registrationFormRetypePassphraseLabel':"re-saisissez votre phrase secrète", | 69 | 'registrationFormRetypePassphraseLabel':"re-saisissez votre phrase secrète", |
| 72 | 'registrationFormSafetyCheckLabel':"J’accepte que Clipperz ne pourra pas récupérer ma phrase secrète.", | 70 | 'registrationFormSafetyCheckLabel':"J’accepte que Clipperz ne pourra pas récupérer ma phrase secrète.", |
| 73 | 'registrationFormTermsOfServiceCheckLabel':"J’ai lu et j’accepte les <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Conditions d’Utilisation du Service</a>.", | 71 | 'registrationFormTermsOfServiceCheckLabel':"J’ai lu et j’accepte les <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Conditions d’Utilisation du Service</a>.", |
| 74 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"avez-vous déjà un compte?", | 72 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"avez-vous déjà un compte?", |
| 75 | 'registrationFormSimplyLoginLabel':"identifiez-vous", | 73 | 'registrationFormSimplyLoginLabel':"identifiez-vous", |
| 76 | 'registrationFormButtonLabel':"S’inscrire", | 74 | 'registrationFormButtonLabel':"S’inscrire", |
| 77 | 'registrationFormWarningMessageNotMatchingPassphrases':"Vos phrases secrètes ne correspondent pas, veuillez les saisir à nouveau.", | 75 | 'registrationFormWarningMessageNotMatchingPassphrases':"Vos phrases secrètes ne correspondent pas, veuillez les saisir à nouveau.", |
| 78 | 'registrationFormWarningMessageSafetyCheckNotSelected':"Veuillez lire et cocher les cases-à-cocher ci-dessous.", | 76 | 'registrationFormWarningMessageSafetyCheckNotSelected':"Veuillez lire et cocher les cases-à-cocher ci-dessous.", |
| 79 | 'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"Vous devez accepter les “Conditions d’Utilisation du Service”.", | 77 | 'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"Vous devez accepter les “Conditions d’Utilisation du Service”.", |
| 80 | 'registrationMessagePanelInitialTitle':"Création du compte en cours ...", | 78 | 'registrationMessagePanelInitialTitle':"Création du compte en cours ...", |
| 81 | 'registrationMessagePanelInitialButtonLabel':"Annuler", | 79 | 'registrationMessagePanelInitialButtonLabel':"Annuler", |
| 82 | 'registrationMessagePanelRegistrationDoneTitle':"Enregistrement", | 80 | 'registrationMessagePanelRegistrationDoneTitle':"Enregistrement", |
| 83 | 'registrationMessagePanelRegistrationDoneText':"Terminé", | 81 | 'registrationMessagePanelRegistrationDoneText':"Terminé", |
| 84 | 'registrationMessagePanelFailureTitle':"Enregistrement échoué", | 82 | 'registrationMessagePanelFailureTitle':"Enregistrement échoué", |
| 85 | 'registrationMessagePanelFailureButtonLabel':"Fermer", | 83 | 'registrationMessagePanelFailureButtonLabel':"Fermer", |
| 86 | 'connectionRegistrationSendingRequestMessageText':"Vérification en cours des identifiants", | 84 | 'connectionRegistrationSendingRequestMessageText':"Vérification en cours des identifiants", |
| 87 | 'connectionRegistrationSendingCredentialsMessageText':"Envoi des identifiants", | 85 | 'connectionRegistrationSendingCredentialsMessageText':"Envoi des identifiants", |
| 88 | 'registrationSplashPanelTitle':"Conseils de sécurité", | 86 | 'registrationSplashPanelTitle':"Conseils de sécurité", |
| 89 | 'registrationSplashPanelDescription':"<p>Ce sont vos identifiants Clipperz, gardez les biens. Clipperz ne va plus jamais vous montrer votre nom d’utilisateur et votre phrase secrète!</p> ", | 87 | 'registrationSplashPanelDescription':"<p>Ce sont vos identifiants Clipperz, gardez les biens. Clipperz ne va plus jamais vous montrer votre nom d’utilisateur et votre phrase secrète!</p> ", |
| 90 | 'registrationSplashPanelUsernameLabel':"nom d’utilisateur", | 88 | 'registrationSplashPanelUsernameLabel':"nom d’utilisateur", |
| 91 | 'registrationSplashPanelPassphraseLabel':"phrase secrète", | 89 | 'registrationSplashPanelPassphraseLabel':"phrase secrète", |
| 92 | 'registrationSplashPanelShowPassphraseButtonLabel':"afficher la phrase secrète", | 90 | 'registrationSplashPanelShowPassphraseButtonLabel':"afficher la phrase secrète", |
| 93 | 'donateHeaderLinkLabel':"faites un don", | 91 | 'donateHeaderLinkLabel':"faites un don", |
| 94 | 'creditsHeaderLinkLabel':"crédits", | 92 | 'creditsHeaderLinkLabel':"crédits", |
| 95 | 'feedbackHeaderLinkLabel':"votre avis", | 93 | 'feedbackHeaderLinkLabel':"votre avis", |
| 96 | 'helpHeaderLinkLabel':"aide", | 94 | 'helpHeaderLinkLabel':"aide", |
| 97 | 'forumHeaderLinkLabel':"forum", | 95 | 'forumHeaderLinkLabel':"forum", |
| 98 | 'recordMenuLabel':"cartes", | 96 | 'recordMenuLabel':"cartes", |
| 99 | 'accountMenuLabel':"compte", | 97 | 'accountMenuLabel':"compte", |
| 100 | 'dataMenuLabel':"données", | 98 | 'dataMenuLabel':"données", |
| 101 | 'contactsMenuLabel':"contacts", | 99 | 'contactsMenuLabel':"contacts", |
| 102 | 'toolsMenuLabel':"outils", | 100 | 'toolsMenuLabel':"outils", |
| 103 | 'logoutMenuLabel':"déconnexion", | 101 | 'logoutMenuLabel':"déconnexion", |
| 104 | 'lockMenuLabel':"verrouiller", | 102 | 'lockMenuLabel':"verrouiller", |
| 105 | 'lockTitle':"Le compte est verrouillé", | 103 | 'lockTitle':"Le compte est verrouillé", |
| 106 | 'lockDescription':"<p>Pour déverrouiller votre compte, veuillez saisir votre phrase secrète</p> ", | 104 | 'lockDescription':"<p>Pour déverrouiller votre compte, veuillez saisir votre phrase secrète</p> ", |
| 107 | 'unlockButtonLabel':"Déverrouiller", | 105 | 'unlockButtonLabel':"Déverrouiller", |
| 108 | 'changePasswordTabLabel':"Changer votre phrase secrète", | 106 | 'changePasswordTabLabel':"Changer votre phrase secrète", |
| 109 | 'changePasswordTabTitle':"Changer votre phrase secrète", | 107 | 'changePasswordTabTitle':"Changer votre phrase secrète", |
| 110 | 'changePasswordFormUsernameLabel':"nom d’utilisateur", | 108 | 'changePasswordFormUsernameLabel':"nom d’utilisateur", |
| 111 | 'changePasswordFormOldPassphraseLabel':"ancienne phrase secrète", | 109 | 'changePasswordFormOldPassphraseLabel':"ancienne phrase secrète", |
| 112 | 'changePasswordFormNewPassphraseLabel':"nouvelle phrase secrète", | 110 | 'changePasswordFormNewPassphraseLabel':"nouvelle phrase secrète", |
| 113 | 'changePasswordFormRetypePassphraseLabel':"re-saisissez phrase secrète", | 111 | 'changePasswordFormRetypePassphraseLabel':"re-saisissez phrase secrète", |
| 114 | 'changePasswordFormSafetyCheckboxLabel':"Je sais que Clipperz ne pourra pas récupérer ma phrase secrète.", | 112 | 'changePasswordFormSafetyCheckboxLabel':"Je sais que Clipperz ne pourra pas récupérer ma phrase secrète.", |
| 115 | 'changePasswordFormSubmitLabel':"Changer ma phrase secrète", | 113 | 'changePasswordFormSubmitLabel':"Changer ma phrase secrète", |
| 116 | 'changePasswordFormWrongUsernameWarning':"Nom d’utilisateur incorrect", | 114 | 'changePasswordFormWrongUsernameWarning':"Nom d’utilisateur incorrect", |
| 117 | 'changePasswordFormWrongPassphraseWarning':"Phrase secrète incorrect", | 115 | 'changePasswordFormWrongPassphraseWarning':"Phrase secrète incorrect", |
| 118 | 'changePasswordFormWrongRetypePassphraseWarning':"Votre phrase secrète ne correspond pas, veuillez la saisir à nouveau", | 116 | 'changePasswordFormWrongRetypePassphraseWarning':"Votre phrase secrète ne correspond pas, veuillez la saisir à nouveau", |
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_he-IL.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_he-IL.js index 70a59c8..fa94311 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_he-IL.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_he-IL.js | |||
| @@ -1,37 +1,35 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | //============================================================================= | 24 | //============================================================================= |
| 27 | // | 25 | // |
| 28 | // H E B R E W (he_IL) | 26 | // H E B R E W (he_IL) |
| 29 | // | 27 | // |
| 30 | //============================================================================= | 28 | //============================================================================= |
| 31 | 29 | ||
| 32 | Clipperz.PM.Strings.Languages['he-il'] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { | 30 | Clipperz.PM.Strings.Languages['he-il'] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { |
| 33 | 31 | ||
| 34 | //------------------------------------------------------------------------- | 32 | //------------------------------------------------------------------------- |
| 35 | __syntaxFix__: "syntax fix" | 33 | __syntaxFix__: "syntax fix" |
| 36 | }); | 34 | }); |
| 37 | 35 | ||
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_it-IT.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_it-IT.js index acf6acd..0499376 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_it-IT.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_it-IT.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | Clipperz.PM.Strings.Languages['it-IT'.toLowerCase()] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { | 24 | Clipperz.PM.Strings.Languages['it-IT'.toLowerCase()] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { |
| 27 | 'clipperzServiceDescription':"<h2>Tienilo per te!</h2> <ul> <li> <h3>Clipperz è:</h3> <ul> <li> <p>un archivio semplice e sicuro per le tue password</p> </li> <li> <p>un canale di accesso unificato a tutti i tuoi servizi online</p> </li> <li> <p>una cassaforte digitale per tutti i tuoi dati riservati</p> </li> </ul> </li> <li> <h3>Con Clipperz puoi:</h3> <ul> <li> <p>memorizzare e gestire le password e le credenziali di accesso dei tuoi servizi online</p> </li> <li> <p>accedere ai tuoi servizi online con un solo click senza bisogno di inserire username o password</p> </li> <li> <p>proteggere tutte le tue informazioni confidenziali: codice dell'allarme di casa, dati delle carte di credito, …</p> </li> <li> <p>condividere dati riservati con i tuoi familiari o colleghi (disponibile a breve)</p> </li> </ul> </li> <li> <h3>I vantaggi di Clipperz:</h3> <ul> <li> <p>gratuito e completamente anonimo</p> </li> <li> <p>accessibile da qualsiasi computer</p> </li> <li> <p>nessun software da scaricare e niente da installare</p> </li> <li> <p>mai più informazioni riservate sul tuo PC o sulla carta!</p> </li> </ul> </li> <li> <h3>La sicurezza di Clipperz:</h3> <ul> <li> <p>i dati sono criptati dal tuo browser prima di essere inviati a Clipperz</p> </li> <li> <p>la chiave per decriptare i dati è conosciuta soltanto da te</p> </li> <li> <p>Clipperz riceve e memorizza solo i tuoi dati criptati e non ha nessuna possibilità di accedere alla versione in chiaro</p> </li> <li> <p>Clipperz utilizza solo sistemi crittografici standard, senza nessuna velleità di inventare e proporre nuovi algoritmi non validati dalla comunità scientifica</p> </li> <li> <p>tutto il codice di Clipperz è disponibile e può essere analizzato in qualsiasi momento, ma non serve essere un esperto di crittografia per apprezzare la sicurezza e la comodità di Clipperz!</p> </li> </ul> </li> <li><a href=\"http://www.clipperz.com\" target=\"_blank\">Maggiori informazioni su Clipperz (in inglese)</a> </li> </ul> ", | 25 | 'clipperzServiceDescription':"<h2>Tienilo per te!</h2> <ul> <li> <h3>Clipperz è:</h3> <ul> <li> <p>un archivio semplice e sicuro per le tue password</p> </li> <li> <p>un canale di accesso unificato a tutti i tuoi servizi online</p> </li> <li> <p>una cassaforte digitale per tutti i tuoi dati riservati</p> </li> </ul> </li> <li> <h3>Con Clipperz puoi:</h3> <ul> <li> <p>memorizzare e gestire le password e le credenziali di accesso dei tuoi servizi online</p> </li> <li> <p>accedere ai tuoi servizi online con un solo click senza bisogno di inserire username o password</p> </li> <li> <p>proteggere tutte le tue informazioni confidenziali: codice dell'allarme di casa, dati delle carte di credito, …</p> </li> <li> <p>condividere dati riservati con i tuoi familiari o colleghi (disponibile a breve)</p> </li> </ul> </li> <li> <h3>I vantaggi di Clipperz:</h3> <ul> <li> <p>gratuito e completamente anonimo</p> </li> <li> <p>accessibile da qualsiasi computer</p> </li> <li> <p>nessun software da scaricare e niente da installare</p> </li> <li> <p>mai più informazioni riservate sul tuo PC o sulla carta!</p> </li> </ul> </li> <li> <h3>La sicurezza di Clipperz:</h3> <ul> <li> <p>i dati sono criptati dal tuo browser prima di essere inviati a Clipperz</p> </li> <li> <p>la chiave per decriptare i dati è conosciuta soltanto da te</p> </li> <li> <p>Clipperz riceve e memorizza solo i tuoi dati criptati e non ha nessuna possibilità di accedere alla versione in chiaro</p> </li> <li> <p>Clipperz utilizza solo sistemi crittografici standard, senza nessuna velleità di inventare e proporre nuovi algoritmi non validati dalla comunità scientifica</p> </li> <li> <p>tutto il codice di Clipperz è disponibile e può essere analizzato in qualsiasi momento, ma non serve essere un esperto di crittografia per apprezzare la sicurezza e la comodità di Clipperz!</p> </li> </ul> </li> <li><a href=\"http://www.clipperz.com\" target=\"_blank\">Maggiori informazioni su Clipperz (in inglese)</a> </li> </ul> ", |
| 28 | 'loginFormTitle':"accedi a Clipperz", | 26 | 'loginFormTitle':"accedi a Clipperz", |
| 29 | 'loginFormUsernameLabel':"Utente", | 27 | 'loginFormUsernameLabel':"Utente", |
| 30 | 'loginFormPassphraseLabel':"frase segreta", | 28 | 'loginFormPassphraseLabel':"frase segreta", |
| 31 | 'loginFormDontHaveAnAccountLabel':"non ti sei ancora registrato?", | 29 | 'loginFormDontHaveAnAccountLabel':"non ti sei ancora registrato?", |
| 32 | 'loginFormCreateOneLabel':"registrati adesso", | 30 | 'loginFormCreateOneLabel':"registrati adesso", |
| 33 | 'loginFormForgotYourCredentialsLabel':"hai perso i dati di accesso?", | 31 | 'loginFormForgotYourCredentialsLabel':"hai perso i dati di accesso?", |
| 34 | 'loginFormAarghThatsBadLabel':"aargh! questo non è bello!", | 32 | 'loginFormAarghThatsBadLabel':"aargh! questo non è bello!", |
| 35 | 'loginFormAfraidOfMaliciousScriptsLabel':"non ti fidi?", | 33 | 'loginFormAfraidOfMaliciousScriptsLabel':"non ti fidi?", |
| 36 | 'loginFormVerifyTheCodeLabel':"controlla il codice", | 34 | 'loginFormVerifyTheCodeLabel':"controlla il codice", |
| 37 | 'loginFormButtonLabel':"Accedi", | 35 | 'loginFormButtonLabel':"Accedi", |
| 38 | 'loginFormOneTimePasswordCheckboxLabel':"usa un codice “usa e getta”", | 36 | 'loginFormOneTimePasswordCheckboxLabel':"usa un codice “usa e getta”", |
| 39 | 'loginFormOneTimePasswordCheckboxDescription':"", | 37 | 'loginFormOneTimePasswordCheckboxDescription':"", |
| 40 | 'loginPanelSwithLanguageDescription':"<h5>Seleziona la tua lingua preferita</h5> ", | 38 | 'loginPanelSwithLanguageDescription':"<h5>Seleziona la tua lingua preferita</h5> ", |
| 41 | 'browserCompatibilityDescription':"<p>Clipperz consiglia Firefox per una maggiore sicurezza. Clipperz supporta anche Opera ed Internet Explorer.</p> ", | 39 | 'browserCompatibilityDescription':"<p>Clipperz consiglia Firefox per una maggiore sicurezza. Clipperz supporta anche Opera ed Internet Explorer.</p> ", |
| 42 | 'OTPloginMessagePanelInitialTitle':"Accesso con codice “usa e getta”", | 40 | 'OTPloginMessagePanelInitialTitle':"Accesso con codice “usa e getta”", |
| 43 | 'OTPloginMessagePanelInitialText':"Invio delle credenziali OTP ...", | 41 | 'OTPloginMessagePanelInitialText':"Invio delle credenziali OTP ...", |
| 44 | 'OTPloginMessagePanelLoadingTitle':"Accesso con codice “usa e getta”", | 42 | 'OTPloginMessagePanelLoadingTitle':"Accesso con codice “usa e getta”", |
| 45 | 'OTPloginMessagePanelLoadingText':"Caricamento dei dati di autenticazione criptati ...", | 43 | 'OTPloginMessagePanelLoadingText':"Caricamento dei dati di autenticazione criptati ...", |
| 46 | 'OTPloginMessagePanelProcessingTitle':"Accesso con codice “usa e getta”", | 44 | 'OTPloginMessagePanelProcessingTitle':"Accesso con codice “usa e getta”", |
| 47 | 'OTPloginMessagePanelProcessingText':"Decodifica locale dei dati di autenticazione ...", | 45 | 'OTPloginMessagePanelProcessingText':"Decodifica locale dei dati di autenticazione ...", |
| 48 | 'loginMessagePanelInitialTitle':"Connessione in corso ...", | 46 | 'loginMessagePanelInitialTitle':"Connessione in corso ...", |
| 49 | 'loginMessagePanelInitialText':"---", | 47 | 'loginMessagePanelInitialText':"---", |
| 50 | 'loginMessagePanelInitialButtonLabel':"Annulla", | 48 | 'loginMessagePanelInitialButtonLabel':"Annulla", |
| 51 | 'loginMessagePanelConnectedTitle':"Connesso", | 49 | 'loginMessagePanelConnectedTitle':"Connesso", |
| 52 | 'loginMessagePanelConnectedText':"Fatto", | 50 | 'loginMessagePanelConnectedText':"Fatto", |
| 53 | 'loginMessagePanelFailureTitle':"Errore", | 51 | 'loginMessagePanelFailureTitle':"Errore", |
| 54 | 'loginMessagePanelFailureText':"Connessione fallita", | 52 | 'loginMessagePanelFailureText':"Connessione fallita", |
| 55 | 'loginMessagePanelFailureButtonLabel':"Chiudi", | 53 | 'loginMessagePanelFailureButtonLabel':"Chiudi", |
| 56 | 'connectionLoginSendingCredentialsMessageTitle':"Verifica delle credenziali", | 54 | 'connectionLoginSendingCredentialsMessageTitle':"Verifica delle credenziali", |
| 57 | 'connectionLoginSendingCredentialsMessageText':"Invio delle credenziali", | 55 | 'connectionLoginSendingCredentialsMessageText':"Invio delle credenziali", |
| 58 | 'connectionLoginCredentialsVerificationMessageTitle':"Verifica delle credenziali", | 56 | 'connectionLoginCredentialsVerificationMessageTitle':"Verifica delle credenziali", |
| 59 | 'connectionLoginCredentialsVerificationMessageText':"Esecuzione dell'autenticazione SRP ...", | 57 | 'connectionLoginCredentialsVerificationMessageText':"Esecuzione dell'autenticazione SRP ...", |
| 60 | 'connectionLoginDoneMessageTitle':"Verifica delle credenziali", | 58 | 'connectionLoginDoneMessageTitle':"Verifica delle credenziali", |
| 61 | 'connectionLoginDoneMessageText':"Connesso", | 59 | 'connectionLoginDoneMessageText':"Connesso", |
| 62 | 'userLoginPanelUpgradingUserCredentialsMessageTitle':"Verifica delle credenziali", | 60 | 'userLoginPanelUpgradingUserCredentialsMessageTitle':"Verifica delle credenziali", |
| 63 | 'userLoginPanelUpgradingUserCredentialsMessageText':"Aggiornamento delle credenziali ad un nuovo schema di autenticazione", | 61 | 'userLoginPanelUpgradingUserCredentialsMessageText':"Aggiornamento delle credenziali ad un nuovo schema di autenticazione", |
| 64 | 'userLoginPanelConnectedMessageTitle':"Utente autenticato", | 62 | 'userLoginPanelConnectedMessageTitle':"Utente autenticato", |
| 65 | 'userLoginPanelConnectedMessageText':"Autenticazione eseguita con successo", | 63 | 'userLoginPanelConnectedMessageText':"Autenticazione eseguita con successo", |
| 66 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':"Verifica delle credenziali", | 64 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':"Verifica delle credenziali", |
| 67 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageText':"Tentativo con vecchio schema di autenticazione", | 65 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageText':"Tentativo con vecchio schema di autenticazione", |
| 68 | 'userLoginPanelLoadingUserDataMessageTitle':"Utente autenticato", | 66 | 'userLoginPanelLoadingUserDataMessageTitle':"Utente autenticato", |
| 69 | 'userLoginPanelLoadingUserDataMessageText':"Scarica le intestazioni criptate delle schede da Clipperz", | 67 | 'userLoginPanelLoadingUserDataMessageText':"Scarica le intestazioni criptate delle schede da Clipperz", |
| 70 | 'userLoginPanelDecryptingUserDataMessageTitle':"Utente autenticato", | 68 | 'userLoginPanelDecryptingUserDataMessageTitle':"Utente autenticato", |
| 71 | 'userLoginPanelDecryptingUserDataMessageText':"Decodifica locale dell'intestazione delle schede", | 69 | 'userLoginPanelDecryptingUserDataMessageText':"Decodifica locale dell'intestazione delle schede", |
| 72 | 'userLoginPanelDecryptingUserStatisticsMessageTitle':"Utente autenticato", | 70 | 'userLoginPanelDecryptingUserStatisticsMessageTitle':"Utente autenticato", |
| 73 | 'userLoginPanelDecryptingUserStatisticsMessageText':"Decodifica locale delle statistiche d'uso", | 71 | 'userLoginPanelDecryptingUserStatisticsMessageText':"Decodifica locale delle statistiche d'uso", |
| 74 | 'splashAlertTitle':"Benvenuto a Clipperz!", | 72 | 'splashAlertTitle':"Benvenuto a Clipperz!", |
| 75 | 'splashAlertText':"<p>Alcuni consigli per la sicurezza</p> <ul> <li> <p>La sicurezza dei tuoi dati dipende da quanto è sicura la frase segreta che usi per proteggerli. Nessuno può accedervi a meno che non conosca la frase segreta.</p> </li> <li> <p>Se hai intenzione di usare Clipperz per conservare informazioni sensibili e riservate, scegli attentamente una frase segreta complessa. Più è lunga, maggiore è la sicurezza!</p> </li> <li> <p>E non dimenticare che Clipperz non è in grado di recuperare la tua frase segreta in caso di smarrimento!</p> </li> </ul> <p>Per maggiori informazioni sulla sicurezza, consulta il sito <a href=\"http://www.clipperz.com\" target=\"_blank\">Clipperz</a> (in lingua inglese).</p> ", | 73 | 'splashAlertText':"<p>Alcuni consigli per la sicurezza</p> <ul> <li> <p>La sicurezza dei tuoi dati dipende da quanto è sicura la frase segreta che usi per proteggerli. Nessuno può accedervi a meno che non conosca la frase segreta.</p> </li> <li> <p>Se hai intenzione di usare Clipperz per conservare informazioni sensibili e riservate, scegli attentamente una frase segreta complessa. Più è lunga, maggiore è la sicurezza!</p> </li> <li> <p>E non dimenticare che Clipperz non è in grado di recuperare la tua frase segreta in caso di smarrimento!</p> </li> </ul> <p>Per maggiori informazioni sulla sicurezza, consulta il sito <a href=\"http://www.clipperz.com\" target=\"_blank\">Clipperz</a> (in lingua inglese).</p> ", |
| 76 | 'splashAlertCloseButtonLabel':"Ok", | 74 | 'splashAlertCloseButtonLabel':"Ok", |
| 77 | 'registrationFormTitle':"crea il tuo utente", | 75 | 'registrationFormTitle':"crea il tuo utente", |
| 78 | 'registrationFormUsernameLabel':"Utente", | 76 | 'registrationFormUsernameLabel':"Utente", |
| 79 | 'registrationFormPassphraseLabel':"frase segreta", | 77 | 'registrationFormPassphraseLabel':"frase segreta", |
| 80 | 'registrationFormRetypePassphraseLabel':"ripeti frase segreta", | 78 | 'registrationFormRetypePassphraseLabel':"ripeti frase segreta", |
| 81 | 'registrationFormSafetyCheckLabel':"Sono consapevole che Clipperz non è in grado di recuperare una frase segreta dimenticata.", | 79 | 'registrationFormSafetyCheckLabel':"Sono consapevole che Clipperz non è in grado di recuperare una frase segreta dimenticata.", |
| 82 | 'registrationFormTermsOfServiceCheckLabel':"Dichiaro di aver letto e di accettare i <a href=\"http://www.clipperz.com/terms_of_service\" target=\"_blank\">Termini del Servizio</a> .", | 80 | 'registrationFormTermsOfServiceCheckLabel':"Dichiaro di aver letto e di accettare i <a href=\"http://www.clipperz.com/terms_of_service\" target=\"_blank\">Termini del Servizio</a> .", |
| 83 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"sei già un utente registrato?", | 81 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"sei già un utente registrato?", |
| 84 | 'registrationFormSimplyLoginLabel':"accedi subito", | 82 | 'registrationFormSimplyLoginLabel':"accedi subito", |
| 85 | 'registrationFormButtonLabel':"Registrati", | 83 | 'registrationFormButtonLabel':"Registrati", |
| 86 | 'registrationFormWarningMessageNotMatchingPassphrases':"Le frasi segrete non corrispondono, ripeti l'inserimento.", | 84 | 'registrationFormWarningMessageNotMatchingPassphrases':"Le frasi segrete non corrispondono, ripeti l'inserimento.", |
| 87 | 'registrationFormWarningMessageSafetyCheckNotSelected':"Leggi e spunta le condizioni sotto riportate.", | 85 | 'registrationFormWarningMessageSafetyCheckNotSelected':"Leggi e spunta le condizioni sotto riportate.", |
| 88 | 'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"Per procedere devi accettare i Termini del Servizio.", | 86 | 'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"Per procedere devi accettare i Termini del Servizio.", |
| 89 | 'registrationMessagePanelInitialTitle':"Registrazione in corso ...", | 87 | 'registrationMessagePanelInitialTitle':"Registrazione in corso ...", |
| 90 | 'registrationMessagePanelInitialText':"---", | 88 | 'registrationMessagePanelInitialText':"---", |
| 91 | 'registrationMessagePanelInitialButtonLabel':"Annulla", | 89 | 'registrationMessagePanelInitialButtonLabel':"Annulla", |
| 92 | 'registrationMessagePanelRegistrationDoneTitle':"Registrazione", | 90 | 'registrationMessagePanelRegistrationDoneTitle':"Registrazione", |
| 93 | 'registrationMessagePanelRegistrationDoneText':"Fatto", | 91 | 'registrationMessagePanelRegistrationDoneText':"Fatto", |
| 94 | 'registrationMessagePanelFailureTitle':"Registrazione fallita", | 92 | 'registrationMessagePanelFailureTitle':"Registrazione fallita", |
| 95 | 'registrationMessagePanelFailureButtonLabel':"Chiudi", | 93 | 'registrationMessagePanelFailureButtonLabel':"Chiudi", |
| 96 | 'connectionRegistrationSendingRequestMessageText':"Verifica delle credenziali", | 94 | 'connectionRegistrationSendingRequestMessageText':"Verifica delle credenziali", |
| 97 | 'connectionRegistrationSendingCredentialsMessageText':"Invio delle credenziali", | 95 | 'connectionRegistrationSendingCredentialsMessageText':"Invio delle credenziali", |
| 98 | 'registrationSplashPanelTitle':"Avviso di sicurezza", | 96 | 'registrationSplashPanelTitle':"Avviso di sicurezza", |
| 99 | 'registrationSplashPanelDescription':"<p>Queste sono le tue credenziali di accesso a Clipperz, conservale con cura. Il tuo utente ed la tua frase segreta non ti verranno mostrati una seconda volta!</p> ", | 97 | 'registrationSplashPanelDescription':"<p>Queste sono le tue credenziali di accesso a Clipperz, conservale con cura. Il tuo utente ed la tua frase segreta non ti verranno mostrati una seconda volta!</p> ", |
| 100 | 'registrationSplashPanelUsernameLabel':"Utente", | 98 | 'registrationSplashPanelUsernameLabel':"Utente", |
| 101 | 'registrationSplashPanelPassphraseLabel':"frase segreta", | 99 | 'registrationSplashPanelPassphraseLabel':"frase segreta", |
| 102 | 'registrationSplashPanelShowPassphraseButtonLabel':"mostra la frase segreta", | 100 | 'registrationSplashPanelShowPassphraseButtonLabel':"mostra la frase segreta", |
| 103 | 'donateHeaderLinkLabel':"donazioni", | 101 | 'donateHeaderLinkLabel':"donazioni", |
| 104 | 'creditsHeaderLinkLabel':"credits", | 102 | 'creditsHeaderLinkLabel':"credits", |
| 105 | 'feedbackHeaderLinkLabel':"scrivici", | 103 | 'feedbackHeaderLinkLabel':"scrivici", |
| 106 | 'helpHeaderLinkLabel':"aiuto", | 104 | 'helpHeaderLinkLabel':"aiuto", |
| 107 | 'forumHeaderLinkLabel':"forum", | 105 | 'forumHeaderLinkLabel':"forum", |
| 108 | 'recordMenuLabel':"Schede", | 106 | 'recordMenuLabel':"Schede", |
| 109 | 'accountMenuLabel':"profilo", | 107 | 'accountMenuLabel':"profilo", |
| 110 | 'dataMenuLabel':"dati", | 108 | 'dataMenuLabel':"dati", |
| 111 | 'contactsMenuLabel':"Contatti", | 109 | 'contactsMenuLabel':"Contatti", |
| 112 | 'toolsMenuLabel':"strumenti", | 110 | 'toolsMenuLabel':"strumenti", |
| 113 | 'logoutMenuLabel':"esci", | 111 | 'logoutMenuLabel':"esci", |
| 114 | 'lockMenuLabel':"blocca", | 112 | 'lockMenuLabel':"blocca", |
| 115 | 'lockTitle':"Utente bloccato", | 113 | 'lockTitle':"Utente bloccato", |
| 116 | 'lockDescription':"<p>Per sbloccare il tuo utente inserisci la frase segreta</p> ", | 114 | 'lockDescription':"<p>Per sbloccare il tuo utente inserisci la frase segreta</p> ", |
| 117 | 'unlockButtonLabel':"Sblocca", | 115 | 'unlockButtonLabel':"Sblocca", |
| 118 | 'changePasswordTabLabel':"Cambia la tua frase segreta", | 116 | 'changePasswordTabLabel':"Cambia la tua frase segreta", |
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_ja-JP.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_ja-JP.js index 42993b3..1401acc 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_ja-JP.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_ja-JP.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | Clipperz.PM.Strings.Languages['ja-JP'.toLowerCase()] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { | 24 | Clipperz.PM.Strings.Languages['ja-JP'.toLowerCase()] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { |
| 27 | 'clipperzServiceDescription':"<h2>自分で管理しよう！</h2> <ul> <li> <h3>Clipperz は</h3> <ul> <li> <p>安全でシンプルなパスワードマネージャです</p> </li> <li> <p>シングルサインオンを提供します</p> </li> <li> <p>機密情報のデジタル格納庫です</p> </li> </ul> </li> <li> <h3>Clipperz でできること</h3> <ul> <li> <p>パスワードを保管して管理できます</p> </li> <li> <p>ユーザー名やパスワードを入力せずに登録したウェブサービスにログインできます</p> </li> <li> <p>暗証番号やクレジットカード番号などあらゆる機密情報を守ります</p> </li> <li> <p>家族や信用できる相手と機密情報を共有できます（提供予定）</p> </li> </ul> </li> <li> <h3>Clipperz のよいところ</h3> <ul> <li> <p>無料で匿名利用できます</p> </li> <li> <p>いつでもどのコンピュータからでもアクセスできます</p> </li> <li> <p>ソフトウェアのダウンロードやインストールは不要です</p> </li> <li> <p>PC や紙に機密情報を残す必要がありません</p> </li> </ul> </li> <li> <h3>Clipperz のセキュリティ</h3> <ul> <li> <p>データはブラウザで暗号化されてから Clipprez に送信されます</p> </li> <li> <p>暗号化のキーはあなただけが知っているパスフレーズです</p> </li> <li> <p>保管したデータは暗号化されていて、保管中には決して中身を見ることができません</p> </li> <li> <p>標準が確立された暗号化手順を採用しています</p> </li> <li> <p>ソースコードはいつでも参照できますが、暗号化について何も知らなくても使えます</p> </li> </ul> </li> <li><a href=\"http://www.clipperz.com\" target=\"_blank\">もっと見る</a> </li> </ul> ", | 25 | 'clipperzServiceDescription':"<h2>自分で管理しよう！</h2> <ul> <li> <h3>Clipperz は</h3> <ul> <li> <p>安全でシンプルなパスワードマネージャです</p> </li> <li> <p>シングルサインオンを提供します</p> </li> <li> <p>機密情報のデジタル格納庫です</p> </li> </ul> </li> <li> <h3>Clipperz でできること</h3> <ul> <li> <p>パスワードを保管して管理できます</p> </li> <li> <p>ユーザー名やパスワードを入力せずに登録したウェブサービスにログインできます</p> </li> <li> <p>暗証番号やクレジットカード番号などあらゆる機密情報を守ります</p> </li> <li> <p>家族や信用できる相手と機密情報を共有できます（提供予定）</p> </li> </ul> </li> <li> <h3>Clipperz のよいところ</h3> <ul> <li> <p>無料で匿名利用できます</p> </li> <li> <p>いつでもどのコンピュータからでもアクセスできます</p> </li> <li> <p>ソフトウェアのダウンロードやインストールは不要です</p> </li> <li> <p>PC や紙に機密情報を残す必要がありません</p> </li> </ul> </li> <li> <h3>Clipperz のセキュリティ</h3> <ul> <li> <p>データはブラウザで暗号化されてから Clipprez に送信されます</p> </li> <li> <p>暗号化のキーはあなただけが知っているパスフレーズです</p> </li> <li> <p>保管したデータは暗号化されていて、保管中には決して中身を見ることができません</p> </li> <li> <p>標準が確立された暗号化手順を採用しています</p> </li> <li> <p>ソースコードはいつでも参照できますが、暗号化について何も知らなくても使えます</p> </li> </ul> </li> <li><a href=\"http://www.clipperz.com\" target=\"_blank\">もっと見る</a> </li> </ul> ", |
| 28 | 'loginFormTitle':"Clipperz のアカウントでログイン", | 26 | 'loginFormTitle':"Clipperz のアカウントでログイン", |
| 29 | 'loginFormUsernameLabel':"ユーザー名", | 27 | 'loginFormUsernameLabel':"ユーザー名", |
| 30 | 'loginFormPassphraseLabel':"パスフレーズ", | 28 | 'loginFormPassphraseLabel':"パスフレーズ", |
| 31 | 'loginFormDontHaveAnAccountLabel':"アカウントを持っていない?", | 29 | 'loginFormDontHaveAnAccountLabel':"アカウントを持っていない?", |
| 32 | 'loginFormCreateOneLabel':"新規作成", | 30 | 'loginFormCreateOneLabel':"新規作成", |
| 33 | 'loginFormForgotYourCredentialsLabel':"パスフレーズを忘れた?", | 31 | 'loginFormForgotYourCredentialsLabel':"パスフレーズを忘れた?", |
| 34 | 'loginFormAarghThatsBadLabel':"それは困った！", | 32 | 'loginFormAarghThatsBadLabel':"それは困った！", |
| 35 | 'loginFormAfraidOfMaliciousScriptsLabel':"偽サイトかも？", | 33 | 'loginFormAfraidOfMaliciousScriptsLabel':"偽サイトかも？", |
| 36 | 'loginFormVerifyTheCodeLabel':"確認する", | 34 | 'loginFormVerifyTheCodeLabel':"確認する", |
| 37 | 'loginFormButtonLabel':"ログイン", | 35 | 'loginFormButtonLabel':"ログイン", |
| 38 | 'loginFormOneTimePasswordCheckboxLabel':"ワンタイムパスフレーズ使用", | 36 | 'loginFormOneTimePasswordCheckboxLabel':"ワンタイムパスフレーズ使用", |
| 39 | 'loginFormOneTimePasswordCheckboxDescription':"", | 37 | 'loginFormOneTimePasswordCheckboxDescription':"", |
| 40 | 'loginPanelSwithLanguageDescription':"<h5>言語設定の変更</h5> ", | 38 | 'loginPanelSwithLanguageDescription':"<h5>言語設定の変更</h5> ", |
| 41 | 'browserCompatibilityDescription':"<p>Clipperz は Firefox に最適化されています。 しかし Clipperz は Opera や Safari そしてインターネットエクスプローラでも十分動作します。</p> ", | 39 | 'browserCompatibilityDescription':"<p>Clipperz は Firefox に最適化されています。 しかし Clipperz は Opera や Safari そしてインターネットエクスプローラでも十分動作します。</p> ", |
| 42 | 'OTPloginMessagePanelInitialTitle':"ワンタイムパスフレーズでログイン中", | 40 | 'OTPloginMessagePanelInitialTitle':"ワンタイムパスフレーズでログイン中", |
| 43 | 'OTPloginMessagePanelInitialText':"OTP 情報送信中 ...", | 41 | 'OTPloginMessagePanelInitialText':"OTP 情報送信中 ...", |
| 44 | 'OTPloginMessagePanelLoadingTitle':"ワンタイムパスフレーズでログイン中", | 42 | 'OTPloginMessagePanelLoadingTitle':"ワンタイムパスフレーズでログイン中", |
| 45 | 'OTPloginMessagePanelLoadingText':"認証情報を取得中 ...", | 43 | 'OTPloginMessagePanelLoadingText':"認証情報を取得中 ...", |
| 46 | 'OTPloginMessagePanelProcessingTitle':"ワンタイムパスフレーズでログイン中", | 44 | 'OTPloginMessagePanelProcessingTitle':"ワンタイムパスフレーズでログイン中", |
| 47 | 'OTPloginMessagePanelProcessingText':"認証情報を復号中 ...", | 45 | 'OTPloginMessagePanelProcessingText':"認証情報を復号中 ...", |
| 48 | 'loginMessagePanelInitialTitle':"ログイン中 ...", | 46 | 'loginMessagePanelInitialTitle':"ログイン中 ...", |
| 49 | 'loginMessagePanelInitialText':"---", | 47 | 'loginMessagePanelInitialText':"---", |
| 50 | 'loginMessagePanelInitialButtonLabel':"キャンセル", | 48 | 'loginMessagePanelInitialButtonLabel':"キャンセル", |
| 51 | 'loginMessagePanelConnectedTitle':"接続完了", | 49 | 'loginMessagePanelConnectedTitle':"接続完了", |
| 52 | 'loginMessagePanelConnectedText':"完了", | 50 | 'loginMessagePanelConnectedText':"完了", |
| 53 | 'loginMessagePanelFailureTitle':"エラー", | 51 | 'loginMessagePanelFailureTitle':"エラー", |
| 54 | 'loginMessagePanelFailureText':"ログインに失敗しました", | 52 | 'loginMessagePanelFailureText':"ログインに失敗しました", |
| 55 | 'loginMessagePanelFailureButtonLabel':"閉じる", | 53 | 'loginMessagePanelFailureButtonLabel':"閉じる", |
| 56 | 'connectionLoginSendingCredentialsMessageTitle':"認証確認中", | 54 | 'connectionLoginSendingCredentialsMessageTitle':"認証確認中", |
| 57 | 'connectionLoginSendingCredentialsMessageText':"認証送信中", | 55 | 'connectionLoginSendingCredentialsMessageText':"認証送信中", |
| 58 | 'connectionLoginCredentialsVerificationMessageTitle':"認証確認中", | 56 | 'connectionLoginCredentialsVerificationMessageTitle':"認証確認中", |
| 59 | 'connectionLoginCredentialsVerificationMessageText':"SRP 認証中", | 57 | 'connectionLoginCredentialsVerificationMessageText':"SRP 認証中", |
| 60 | 'connectionLoginDoneMessageTitle':"認証確認中", | 58 | 'connectionLoginDoneMessageTitle':"認証確認中", |
| 61 | 'connectionLoginDoneMessageText':"接続完了", | 59 | 'connectionLoginDoneMessageText':"接続完了", |
| 62 | 'userLoginPanelUpgradingUserCredentialsMessageTitle':"認証確認中", | 60 | 'userLoginPanelUpgradingUserCredentialsMessageTitle':"認証確認中", |
| 63 | 'userLoginPanelUpgradingUserCredentialsMessageText':"認証更新中", | 61 | 'userLoginPanelUpgradingUserCredentialsMessageText':"認証更新中", |
| 64 | 'userLoginPanelConnectedMessageTitle':"認証完了", | 62 | 'userLoginPanelConnectedMessageTitle':"認証完了", |
| 65 | 'userLoginPanelConnectedMessageText':"ログイン完了", | 63 | 'userLoginPanelConnectedMessageText':"ログイン完了", |
| 66 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':"認証確認中", | 64 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':"認証確認中", |
| 67 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageText':"認証復元中", | 65 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageText':"認証復元中", |
| 68 | 'userLoginPanelLoadingUserDataMessageTitle':"認証完了", | 66 | 'userLoginPanelLoadingUserDataMessageTitle':"認証完了", |
| 69 | 'userLoginPanelLoadingUserDataMessageText':"暗号化データを受信中", | 67 | 'userLoginPanelLoadingUserDataMessageText':"暗号化データを受信中", |
| 70 | 'userLoginPanelDecryptingUserDataMessageTitle':"認証完了", | 68 | 'userLoginPanelDecryptingUserDataMessageTitle':"認証完了", |
| 71 | 'userLoginPanelDecryptingUserDataMessageText':"復号中", | 69 | 'userLoginPanelDecryptingUserDataMessageText':"復号中", |
| 72 | 'userLoginPanelDecryptingUserStatisticsMessageTitle':"認証完了", | 70 | 'userLoginPanelDecryptingUserStatisticsMessageTitle':"認証完了", |
| 73 | 'userLoginPanelDecryptingUserStatisticsMessageText':"復号中", | 71 | 'userLoginPanelDecryptingUserStatisticsMessageText':"復号中", |
| 74 | 'splashAlertTitle':"Clipperz へようこそ", | 72 | 'splashAlertTitle':"Clipperz へようこそ", |
| 75 | 'splashAlertText':"<p>セキュリティアドバイス</p> <ul> <li> <p>Clipperz に保管したデータはパスフレーズによって保護されます。 パスフレーズを知らない人はデータにアクセスできません。</p> </li> <li> <p>Clipperz に重要なデータを保管するためにパスフレーズを類推されにくいものにしてください。 長いほど安全です。</p> </li> <li> <p>パスフレーズを忘れてしまったら Clipperz ではデータを復元できません。</p> </li> </ul> <p>さらに詳しくは Clipperz のサイトをごらんください。</p> ", | 73 | 'splashAlertText':"<p>セキュリティアドバイス</p> <ul> <li> <p>Clipperz に保管したデータはパスフレーズによって保護されます。 パスフレーズを知らない人はデータにアクセスできません。</p> </li> <li> <p>Clipperz に重要なデータを保管するためにパスフレーズを類推されにくいものにしてください。 長いほど安全です。</p> </li> <li> <p>パスフレーズを忘れてしまったら Clipperz ではデータを復元できません。</p> </li> </ul> <p>さらに詳しくは Clipperz のサイトをごらんください。</p> ", |
| 76 | 'splashAlertCloseButtonLabel':"OK", | 74 | 'splashAlertCloseButtonLabel':"OK", |
| 77 | 'registrationFormTitle':"新規アカウント作成", | 75 | 'registrationFormTitle':"新規アカウント作成", |
| 78 | 'registrationFormUsernameLabel':"ユーザー名", | 76 | 'registrationFormUsernameLabel':"ユーザー名", |
| 79 | 'registrationFormPassphraseLabel':"パスフレーズ", | 77 | 'registrationFormPassphraseLabel':"パスフレーズ", |
| 80 | 'registrationFormRetypePassphraseLabel':"パスフレーズをもう一度", | 78 | 'registrationFormRetypePassphraseLabel':"パスフレーズをもう一度", |
| 81 | 'registrationFormSafetyCheckLabel':"パスフレーズを忘れたら復活できないことを了承します。", | 79 | 'registrationFormSafetyCheckLabel':"パスフレーズを忘れたら復活できないことを了承します。", |
| 82 | 'registrationFormTermsOfServiceCheckLabel':"利用許諾に同意します 。", | 80 | 'registrationFormTermsOfServiceCheckLabel':"利用許諾に同意します 。", |
| 83 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"アカウントを持っている？", | 81 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"アカウントを持っている？", |
| 84 | 'registrationFormSimplyLoginLabel':"すぐにログイン", | 82 | 'registrationFormSimplyLoginLabel':"すぐにログイン", |
| 85 | 'registrationFormButtonLabel':"登録", | 83 | 'registrationFormButtonLabel':"登録", |
| 86 | 'registrationFormWarningMessageNotMatchingPassphrases':"パスフレーズの入力に誤りがあります。 再入力してください。", | 84 | 'registrationFormWarningMessageNotMatchingPassphrases':"パスフレーズの入力に誤りがあります。 再入力してください。", |
| 87 | 'registrationFormWarningMessageSafetyCheckNotSelected':"説明を読んで下のボックスを全てチェックしてください。", | 85 | 'registrationFormWarningMessageSafetyCheckNotSelected':"説明を読んで下のボックスを全てチェックしてください。", |
| 88 | 'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"利用許諾に同意してください。", | 86 | 'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"利用許諾に同意してください。", |
| 89 | 'registrationMessagePanelInitialTitle':"アカウント作成中 ...", | 87 | 'registrationMessagePanelInitialTitle':"アカウント作成中 ...", |
| 90 | 'registrationMessagePanelInitialText':"---", | 88 | 'registrationMessagePanelInitialText':"---", |
| 91 | 'registrationMessagePanelInitialButtonLabel':"キャンセル", | 89 | 'registrationMessagePanelInitialButtonLabel':"キャンセル", |
| 92 | 'registrationMessagePanelRegistrationDoneTitle':"登録", | 90 | 'registrationMessagePanelRegistrationDoneTitle':"登録", |
| 93 | 'registrationMessagePanelRegistrationDoneText':"完了", | 91 | 'registrationMessagePanelRegistrationDoneText':"完了", |
| 94 | 'registrationMessagePanelFailureTitle':"登録失敗", | 92 | 'registrationMessagePanelFailureTitle':"登録失敗", |
| 95 | 'registrationMessagePanelFailureButtonLabel':"閉じる", | 93 | 'registrationMessagePanelFailureButtonLabel':"閉じる", |
| 96 | 'connectionRegistrationSendingRequestMessageText':"認証確認中", | 94 | 'connectionRegistrationSendingRequestMessageText':"認証確認中", |
| 97 | 'connectionRegistrationSendingCredentialsMessageText':"認証送信中", | 95 | 'connectionRegistrationSendingCredentialsMessageText':"認証送信中", |
| 98 | 'registrationSplashPanelTitle':"セキュリティアドバイス", | 96 | 'registrationSplashPanelTitle':"セキュリティアドバイス", |
| 99 | 'registrationSplashPanelDescription':"<p>Clipperz の認証情報です。 大切に保管してください。 ユーザー名とパスフレーズは二度と表示されません。</p> ", | 97 | 'registrationSplashPanelDescription':"<p>Clipperz の認証情報です。 大切に保管してください。 ユーザー名とパスフレーズは二度と表示されません。</p> ", |
| 100 | 'registrationSplashPanelUsernameLabel':"ユーザー名", | 98 | 'registrationSplashPanelUsernameLabel':"ユーザー名", |
| 101 | 'registrationSplashPanelPassphraseLabel':"パスフレーズ", | 99 | 'registrationSplashPanelPassphraseLabel':"パスフレーズ", |
| 102 | 'registrationSplashPanelShowPassphraseButtonLabel':"パスフレーズを表示", | 100 | 'registrationSplashPanelShowPassphraseButtonLabel':"パスフレーズを表示", |
| 103 | 'donateHeaderLinkLabel':"寄付", | 101 | 'donateHeaderLinkLabel':"寄付", |
| 104 | 'creditsHeaderLinkLabel':"クレジット", | 102 | 'creditsHeaderLinkLabel':"クレジット", |
| 105 | 'feedbackHeaderLinkLabel':"フィードバック", | 103 | 'feedbackHeaderLinkLabel':"フィードバック", |
| 106 | 'helpHeaderLinkLabel':"ヘルプ", | 104 | 'helpHeaderLinkLabel':"ヘルプ", |
| 107 | 'forumHeaderLinkLabel':"フォーラム", | 105 | 'forumHeaderLinkLabel':"フォーラム", |
| 108 | 'recordMenuLabel':"カード", | 106 | 'recordMenuLabel':"カード", |
| 109 | 'accountMenuLabel':"アカウント", | 107 | 'accountMenuLabel':"アカウント", |
| 110 | 'dataMenuLabel':"データ", | 108 | 'dataMenuLabel':"データ", |
| 111 | 'contactsMenuLabel':"コンタクト", | 109 | 'contactsMenuLabel':"コンタクト", |
| 112 | 'toolsMenuLabel':"ツール", | 110 | 'toolsMenuLabel':"ツール", |
| 113 | 'logoutMenuLabel':"ログアウト", | 111 | 'logoutMenuLabel':"ログアウト", |
| 114 | 'lockMenuLabel':"ロック", | 112 | 'lockMenuLabel':"ロック", |
| 115 | 'lockTitle':"アカウントはロックされました", | 113 | 'lockTitle':"アカウントはロックされました", |
| 116 | 'lockDescription':"<p>ロックを解除するにはパスフレーズを入力してください。</p> ", | 114 | 'lockDescription':"<p>ロックを解除するにはパスフレーズを入力してください。</p> ", |
| 117 | 'unlockButtonLabel':"解除", | 115 | 'unlockButtonLabel':"解除", |
| 118 | 'changePasswordTabLabel':"パスフレーズの変更", | 116 | 'changePasswordTabLabel':"パスフレーズの変更", |
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_pt-BR.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_pt-BR.js index 8fde63f..8478c0d 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_pt-BR.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_pt-BR.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | Clipperz.PM.Strings.Languages['pt-BR'.toLowerCase()] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { | 24 | Clipperz.PM.Strings.Languages['pt-BR'.toLowerCase()] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { |
| 27 | 'clipperzServiceDescriptionConfig':"<h2>Guarde com você!</h2> <ul> <li> <h3>Clipperz é:</h3> <ul> <li> <p>um simples e seguro gerenciador de senhas</p> </li> <li> <p>uma efetiva solução com uma única assinatura</p> </li> <li> <p>um cofre digital para suas informações confidenciais</p> </li> </ul> </li> <li> <h3>Com Clipperz você pode:</h3> <ul> <li> <p>guardar e gerenciar suas senhas e credenciais online</p> </li> <li> <p>logar em seus serviços web sem precisar entrar com nenhum nome de usuário ou senha</p> </li> <li> <p>proteger todos os seus dados sensíveis: códigos de alarme, PINs, números de cartão de crédito, …</p> </li> <li> <p>compartilhar segredos com membros da família e associados (em breve)</p> </li> </ul> </li> <li> <h3>Clipperz proporciona:</h3> <ul> <li> <p>anonimato completo e gratuito</p> </li> <li> <p>acesso a qualquer hora em qualquer computador</p> </li> <li> <p>sem software ou download e nada que instalar</p> </li> <li> <p>evite guardar seus segredos em seu PC ou papel</p> </li> </ul> </li> <li> <h3>Segurança Clipperz:</h3> <ul> <li> <p>seus segredos são codificados localmente por seu navegador antes de ser enviado para Clipperz</p> </li> <li> <p>a chave de codificação é uma senha que só você conhece</p> </li> <li> <p>Clipperz armazena apenas seus dados confidenciais codificados, nunca acessando os dados originais</p> </li> <li> <p>Clipperz é construído a partir de esquemas de codificação padrão, ou seja, nada é exclusivo ou caseiro</p> </li> <li> <p>você pode revisar o código a qualquer momento, mas você não precisa conhecer nada sobre criptograia para ser um usuário feliz!</p> </li> </ul> </li> <li> <a href=\"http://www.clipperz.com\" target=\"_blank\">Saiba mais</a> </li> </ul> ", | 25 | 'clipperzServiceDescriptionConfig':"<h2>Guarde com você!</h2> <ul> <li> <h3>Clipperz é:</h3> <ul> <li> <p>um simples e seguro gerenciador de senhas</p> </li> <li> <p>uma efetiva solução com uma única assinatura</p> </li> <li> <p>um cofre digital para suas informações confidenciais</p> </li> </ul> </li> <li> <h3>Com Clipperz você pode:</h3> <ul> <li> <p>guardar e gerenciar suas senhas e credenciais online</p> </li> <li> <p>logar em seus serviços web sem precisar entrar com nenhum nome de usuário ou senha</p> </li> <li> <p>proteger todos os seus dados sensíveis: códigos de alarme, PINs, números de cartão de crédito, …</p> </li> <li> <p>compartilhar segredos com membros da família e associados (em breve)</p> </li> </ul> </li> <li> <h3>Clipperz proporciona:</h3> <ul> <li> <p>anonimato completo e gratuito</p> </li> <li> <p>acesso a qualquer hora em qualquer computador</p> </li> <li> <p>sem software ou download e nada que instalar</p> </li> <li> <p>evite guardar seus segredos em seu PC ou papel</p> </li> </ul> </li> <li> <h3>Segurança Clipperz:</h3> <ul> <li> <p>seus segredos são codificados localmente por seu navegador antes de ser enviado para Clipperz</p> </li> <li> <p>a chave de codificação é uma senha que só você conhece</p> </li> <li> <p>Clipperz armazena apenas seus dados confidenciais codificados, nunca acessando os dados originais</p> </li> <li> <p>Clipperz é construído a partir de esquemas de codificação padrão, ou seja, nada é exclusivo ou caseiro</p> </li> <li> <p>você pode revisar o código a qualquer momento, mas você não precisa conhecer nada sobre criptograia para ser um usuário feliz!</p> </li> </ul> </li> <li> <a href=\"http://www.clipperz.com\" target=\"_blank\">Saiba mais</a> </li> </ul> ", |
| 28 | 'loginFormTitle':"entre sua conta Clipperz", | 26 | 'loginFormTitle':"entre sua conta Clipperz", |
| 29 | 'loginFormUsernameLabel':"nome do usuário", | 27 | 'loginFormUsernameLabel':"nome do usuário", |
| 30 | 'loginFormPassphraseLabel':"frase chave", | 28 | 'loginFormPassphraseLabel':"frase chave", |
| 31 | 'loginFormDontHaveAnAccountLabel':"não tem uma conta?", | 29 | 'loginFormDontHaveAnAccountLabel':"não tem uma conta?", |
| 32 | 'loginFormCreateOneLabel':"criar uma", | 30 | 'loginFormCreateOneLabel':"criar uma", |
| 33 | 'loginFormForgotYourCredentialsLabel':"esqueceu suas credenciais?", | 31 | 'loginFormForgotYourCredentialsLabel':"esqueceu suas credenciais?", |
| 34 | 'loginFormAarghThatsBadLabel':"xiiiii! isso é não é bom!", | 32 | 'loginFormAarghThatsBadLabel':"xiiiii! isso é não é bom!", |
| 35 | 'loginFormAfraidOfMaliciousScriptsLabel':"medo de scripts maliciosos?", | 33 | 'loginFormAfraidOfMaliciousScriptsLabel':"medo de scripts maliciosos?", |
| 36 | 'loginFormVerifyTheCodeLabel':"verifique o código", | 34 | 'loginFormVerifyTheCodeLabel':"verifique o código", |
| 37 | 'loginFormButtonLabel':"Entrar", | 35 | 'loginFormButtonLabel':"Entrar", |
| 38 | 'loginFormOneTimePasswordCheckboxLabel':"use uma frase chave descartável", | 36 | 'loginFormOneTimePasswordCheckboxLabel':"use uma frase chave descartável", |
| 39 | 'loginPanelSwithLanguageDescription':"<h5>Mudar para sua linguagem preferida</h5> ", | 37 | 'loginPanelSwithLanguageDescription':"<h5>Mudar para sua linguagem preferida</h5> ", |
| 40 | 'browserCompatibilityDescription':"<p>Tenha uma experiência melhor e mais segura com Clipperz, utilizando o Firefox. No entanto, Clipperz funciona bem também em Opera e MS Internet Explorer!</p> ", | 38 | 'browserCompatibilityDescription':"<p>Tenha uma experiência melhor e mais segura com Clipperz, utilizando o Firefox. No entanto, Clipperz funciona bem também em Opera e MS Internet Explorer!</p> ", |
| 41 | 'OTPloginMessagePanelInitialTitle':"Acessando usando a frase chave descartável", | 39 | 'OTPloginMessagePanelInitialTitle':"Acessando usando a frase chave descartável", |
| 42 | 'OTPloginMessagePanelInitialText':"Enviando credenciais descartáveis ...", | 40 | 'OTPloginMessagePanelInitialText':"Enviando credenciais descartáveis ...", |
| 43 | 'OTPloginMessagePanelLoadingTitle':"Acessando usando a frase chave descartável", | 41 | 'OTPloginMessagePanelLoadingTitle':"Acessando usando a frase chave descartável", |
| 44 | 'OTPloginMessagePanelLoadingText':"Buscando informação de autenticação codificada no servidor ...", | 42 | 'OTPloginMessagePanelLoadingText':"Buscando informação de autenticação codificada no servidor ...", |
| 45 | 'OTPloginMessagePanelProcessingTitle':"Acessando usando a frase chave descartável", | 43 | 'OTPloginMessagePanelProcessingTitle':"Acessando usando a frase chave descartável", |
| 46 | 'OTPloginMessagePanelProcessingText':"Decodificação local da informação de autenticação ...", | 44 | 'OTPloginMessagePanelProcessingText':"Decodificação local da informação de autenticação ...", |
| 47 | 'loginMessagePanelInitialTitle':"Entrando ...", | 45 | 'loginMessagePanelInitialTitle':"Entrando ...", |
| 48 | 'loginMessagePanelInitialButtonLabel':"Cancelar", | 46 | 'loginMessagePanelInitialButtonLabel':"Cancelar", |
| 49 | 'loginMessagePanelConnectedTitle':"Conectado", | 47 | 'loginMessagePanelConnectedTitle':"Conectado", |
| 50 | 'loginMessagePanelConnectedText':"Concluído", | 48 | 'loginMessagePanelConnectedText':"Concluído", |
| 51 | 'loginMessagePanelFailureTitle':"Erro", | 49 | 'loginMessagePanelFailureTitle':"Erro", |
| 52 | 'loginMessagePanelFailureText':"Ocorreu uma falha", | 50 | 'loginMessagePanelFailureText':"Ocorreu uma falha", |
| 53 | 'loginMessagePanelFailureButtonLabel':"Fechar", | 51 | 'loginMessagePanelFailureButtonLabel':"Fechar", |
| 54 | 'connectionLoginSendingCredentialsMessageTitle':"Verificando credenciais", | 52 | 'connectionLoginSendingCredentialsMessageTitle':"Verificando credenciais", |
| 55 | 'connectionLoginSendingCredentialsMessageText':"Enviando credenciais", | 53 | 'connectionLoginSendingCredentialsMessageText':"Enviando credenciais", |
| 56 | 'connectionLoginCredentialsVerificationMessageTitle':"Verificando credenciais", | 54 | 'connectionLoginCredentialsVerificationMessageTitle':"Verificando credenciais", |
| 57 | 'connectionLoginCredentialsVerificationMessageText':"Realizando autenticação SRP", | 55 | 'connectionLoginCredentialsVerificationMessageText':"Realizando autenticação SRP", |
| 58 | 'connectionLoginDoneMessageTitle':"Verificando credenciais", | 56 | 'connectionLoginDoneMessageTitle':"Verificando credenciais", |
| 59 | 'connectionLoginDoneMessageText':"Conectado", | 57 | 'connectionLoginDoneMessageText':"Conectado", |
| 60 | 'userLoginPanelUpgradingUserCredentialsMessageTitle':"Verificando credenciais", | 58 | 'userLoginPanelUpgradingUserCredentialsMessageTitle':"Verificando credenciais", |
| 61 | 'userLoginPanelUpgradingUserCredentialsMessageText':"Upgrade de suas credenciais para um novo esquema de autenticação", | 59 | 'userLoginPanelUpgradingUserCredentialsMessageText':"Upgrade de suas credenciais para um novo esquema de autenticação", |
| 62 | 'userLoginPanelConnectedMessageTitle':"Usuário autenticado", | 60 | 'userLoginPanelConnectedMessageTitle':"Usuário autenticado", |
| 63 | 'userLoginPanelConnectedMessageText':"Logado com sucesso em", | 61 | 'userLoginPanelConnectedMessageText':"Logado com sucesso em", |
| 64 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':"Verificando credenciais", | 62 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':"Verificando credenciais", |
| 65 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageText':"Tentando esquema antigo de autenticação", | 63 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageText':"Tentando esquema antigo de autenticação", |
| 66 | 'userLoginPanelLoadingUserDataMessageTitle':"Usuário autenticado", | 64 | 'userLoginPanelLoadingUserDataMessageTitle':"Usuário autenticado", |
| 67 | 'userLoginPanelLoadingUserDataMessageText':"Baixando cabeçalhos de cartão codificados de Clipperz", | 65 | 'userLoginPanelLoadingUserDataMessageText':"Baixando cabeçalhos de cartão codificados de Clipperz", |
| 68 | 'userLoginPanelDecryptingUserDataMessageTitle':"Usuário autenticado", | 66 | 'userLoginPanelDecryptingUserDataMessageTitle':"Usuário autenticado", |
| 69 | 'userLoginPanelDecryptingUserDataMessageText':"Descrição local de cabeçalhos dos cartões", | 67 | 'userLoginPanelDecryptingUserDataMessageText':"Descrição local de cabeçalhos dos cartões", |
| 70 | 'userLoginPanelDecryptingUserStatisticsMessageTitle':"Usuário autenticado", | 68 | 'userLoginPanelDecryptingUserStatisticsMessageTitle':"Usuário autenticado", |
| 71 | 'userLoginPanelDecryptingUserStatisticsMessageText':"Descrição local de estatísticas de uso", | 69 | 'userLoginPanelDecryptingUserStatisticsMessageText':"Descrição local de estatísticas de uso", |
| 72 | 'splashAlertTitle':"Bem-vindo ao Clipperz!", | 70 | 'splashAlertTitle':"Bem-vindo ao Clipperz!", |
| 73 | 'splashAlertText':"<p>Alguns avisos de segurança</p> <ul> <li> <p>Guardar suas informações no Clipperz é tão seguro quanto a frase chave que você escolher para protege-los. Ninguém pode acessá-los sem essa frase chave.</p> </li> <li> <p>Se você vai utlizar Clipperz para armazenar suas informações confidenciais e críticas, escolha uma frase chave difícil de ser descoberta. Quanto mais longa, melhor!</p> </li> <li> <p>Clipperz não será capaz de recuperar frase chave perdidas!</p> </li> </ul> <p>Para mais informações, por favor vá até <a href=\"http://www.clipperz.com\" target=\"_blank\">Clipperz</a> website.</p> ", | 71 | 'splashAlertText':"<p>Alguns avisos de segurança</p> <ul> <li> <p>Guardar suas informações no Clipperz é tão seguro quanto a frase chave que você escolher para protege-los. Ninguém pode acessá-los sem essa frase chave.</p> </li> <li> <p>Se você vai utlizar Clipperz para armazenar suas informações confidenciais e críticas, escolha uma frase chave difícil de ser descoberta. Quanto mais longa, melhor!</p> </li> <li> <p>Clipperz não será capaz de recuperar frase chave perdidas!</p> </li> </ul> <p>Para mais informações, por favor vá até <a href=\"http://www.clipperz.com\" target=\"_blank\">Clipperz</a> website.</p> ", |
| 74 | 'splashAlertCloseButtonLabel':"Ok", | 72 | 'splashAlertCloseButtonLabel':"Ok", |
| 75 | 'registrationFormTitle':"crie sua conta", | 73 | 'registrationFormTitle':"crie sua conta", |
| 76 | 'registrationFormUsernameLabel':"nome do usuário", | 74 | 'registrationFormUsernameLabel':"nome do usuário", |
| 77 | 'registrationFormPassphraseLabel':"frase chave", | 75 | 'registrationFormPassphraseLabel':"frase chave", |
| 78 | 'registrationFormRetypePassphraseLabel':"entre novamente sua frase chave", | 76 | 'registrationFormRetypePassphraseLabel':"entre novamente sua frase chave", |
| 79 | 'registrationFormSafetyCheckLabel':"Eu compreendo que Clipperz não será capaz de recuperar senhas perdidas.", | 77 | 'registrationFormSafetyCheckLabel':"Eu compreendo que Clipperz não será capaz de recuperar senhas perdidas.", |
| 80 | 'registrationFormTermsOfServiceCheckLabel':"Eu li e concordo com os <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Termos do Serviço</a>.", | 78 | 'registrationFormTermsOfServiceCheckLabel':"Eu li e concordo com os <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Termos do Serviço</a>.", |
| 81 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"você já tem uma conta?", | 79 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"você já tem uma conta?", |
| 82 | 'registrationFormSimplyLoginLabel':"login simples", | 80 | 'registrationFormSimplyLoginLabel':"login simples", |
| 83 | 'registrationFormButtonLabel':"Registrar", | 81 | 'registrationFormButtonLabel':"Registrar", |
| 84 | 'registrationFormWarningMessageNotMatchingPassphrases':"Suas frases chaves não conferem, por favor tente novamente.", | 82 | 'registrationFormWarningMessageNotMatchingPassphrases':"Suas frases chaves não conferem, por favor tente novamente.", |
| 85 | 'registrationFormWarningMessageSafetyCheckNotSelected':"Por favor leia e confira todos os campos abaixo.", | 83 | 'registrationFormWarningMessageSafetyCheckNotSelected':"Por favor leia e confira todos os campos abaixo.", |
| 86 | 'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"Você precisa concordar com os Termos do Serviço.", | 84 | 'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"Você precisa concordar com os Termos do Serviço.", |
| 87 | 'registrationMessagePanelInitialTitle':"Criando conta ...", | 85 | 'registrationMessagePanelInitialTitle':"Criando conta ...", |
| 88 | 'registrationMessagePanelInitialText':"---", | 86 | 'registrationMessagePanelInitialText':"---", |
| 89 | 'registrationMessagePanelInitialButtonLabel':"Cancelar", | 87 | 'registrationMessagePanelInitialButtonLabel':"Cancelar", |
| 90 | 'registrationMessagePanelRegistrationDoneTitle':"Registro", | 88 | 'registrationMessagePanelRegistrationDoneTitle':"Registro", |
| 91 | 'registrationMessagePanelRegistrationDoneText':"Concluído", | 89 | 'registrationMessagePanelRegistrationDoneText':"Concluído", |
| 92 | 'registrationMessagePanelFailureTitle':"Registrou falhou", | 90 | 'registrationMessagePanelFailureTitle':"Registrou falhou", |
| 93 | 'registrationMessagePanelFailureButtonLabel':"Fechar", | 91 | 'registrationMessagePanelFailureButtonLabel':"Fechar", |
| 94 | 'connectionRegistrationSendingRequestMessageText':"Verificando credenciais", | 92 | 'connectionRegistrationSendingRequestMessageText':"Verificando credenciais", |
| 95 | 'connectionRegistrationSendingCredentialsMessageText':"Enviando credenciais", | 93 | 'connectionRegistrationSendingCredentialsMessageText':"Enviando credenciais", |
| 96 | 'registrationSplashPanelTitle':"Informe de segurança", | 94 | 'registrationSplashPanelTitle':"Informe de segurança", |
| 97 | 'registrationSplashPanelDescription':"<p>Essas são suas credenciais Clipperz, cuide delas com cuidado. Clipperz nunca vai mostrar seu nome de usuário e frase chave uma outra vez!</p> ", | 95 | 'registrationSplashPanelDescription':"<p>Essas são suas credenciais Clipperz, cuide delas com cuidado. Clipperz nunca vai mostrar seu nome de usuário e frase chave uma outra vez!</p> ", |
| 98 | 'registrationSplashPanelUsernameLabel':"nome de usuário", | 96 | 'registrationSplashPanelUsernameLabel':"nome de usuário", |
| 99 | 'registrationSplashPanelPassphraseLabel':"frase chave", | 97 | 'registrationSplashPanelPassphraseLabel':"frase chave", |
| 100 | 'registrationSplashPanelShowPassphraseButtonLabel':"mostrar frase chave", | 98 | 'registrationSplashPanelShowPassphraseButtonLabel':"mostrar frase chave", |
| 101 | 'donateHeaderLinkLabel':"doar", | 99 | 'donateHeaderLinkLabel':"doar", |
| 102 | 'creditsHeaderLinkLabel':"créditos", | 100 | 'creditsHeaderLinkLabel':"créditos", |
| 103 | 'feedbackHeaderLinkLabel':"feedback", | 101 | 'feedbackHeaderLinkLabel':"feedback", |
| 104 | 'helpHeaderLinkLabel':"ajuda", | 102 | 'helpHeaderLinkLabel':"ajuda", |
| 105 | 'forumHeaderLinkLabel':"fórum", | 103 | 'forumHeaderLinkLabel':"fórum", |
| 106 | 'recordMenuLabel':"cartões", | 104 | 'recordMenuLabel':"cartões", |
| 107 | 'accountMenuLabel':"conta", | 105 | 'accountMenuLabel':"conta", |
| 108 | 'dataMenuLabel':"dados", | 106 | 'dataMenuLabel':"dados", |
| 109 | 'contactsMenuLabel':"contatos", | 107 | 'contactsMenuLabel':"contatos", |
| 110 | 'toolsMenuLabel':"ferramentas", | 108 | 'toolsMenuLabel':"ferramentas", |
| 111 | 'logoutMenuLabel':"sair", | 109 | 'logoutMenuLabel':"sair", |
| 112 | 'lockMenuLabel':"bloquear", | 110 | 'lockMenuLabel':"bloquear", |
| 113 | 'lockTitle':"A conta está bloqueada", | 111 | 'lockTitle':"A conta está bloqueada", |
| 114 | 'lockDescription':"<p>Para desbloquear sua conta, por favor, entre com a frase chave</p> ", | 112 | 'lockDescription':"<p>Para desbloquear sua conta, por favor, entre com a frase chave</p> ", |
| 115 | 'unlockButtonLabel':"desbloquear", | 113 | 'unlockButtonLabel':"desbloquear", |
| 116 | 'changePasswordTabLabel':"Alterar sua frase chave", | 114 | 'changePasswordTabLabel':"Alterar sua frase chave", |
| 117 | 'changePasswordTabTitle':"Alterar sua frase chave", | 115 | 'changePasswordTabTitle':"Alterar sua frase chave", |
| 118 | 'changePasswordFormUsernameLabel':"nome de usuário", | 116 | 'changePasswordFormUsernameLabel':"nome de usuário", |
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_pt-PT.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_pt-PT.js index 7930852..d27829d 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_pt-PT.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_pt-PT.js | |||
| @@ -1,39 +1,37 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | //============================================================================= | 24 | //============================================================================= |
| 27 | // | 25 | // |
| 28 | // P O R T U G U Ê S ( pt_PT ) | 26 | // P O R T U G U Ê S ( pt_PT ) |
| 29 | // | 27 | // |
| 30 | //============================================================================= | 28 | //============================================================================= |
| 31 | 29 | ||
| 32 | Clipperz.PM.Strings.Languages['pt-pt'] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['pt-br'], { | 30 | Clipperz.PM.Strings.Languages['pt-pt'] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['pt-br'], { |
| 33 | 31 | ||
| 34 | 32 | ||
| 35 | 33 | ||
| 36 | //------------------------------------------------------------------------- | 34 | //------------------------------------------------------------------------- |
| 37 | __syntaxFix__: "syntax fix" | 35 | __syntaxFix__: "syntax fix" |
| 38 | }); | 36 | }); |
| 39 | 37 | ||
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_ru-RU.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_ru-RU.js index 547dcc8..612e745 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_ru-RU.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_ru-RU.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | Clipperz.PM.Strings.Languages['ru-RU'.toLowerCase()] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { | 24 | Clipperz.PM.Strings.Languages['ru-RU'.toLowerCase()] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { |
| 27 | 'clipperzServiceDescription':"<h2>Держи всегда при себе!</h2> <ul> <li> <h3>Clipperz - это:</h3> <ul> <li> <p>безопасный и простой менеджер паролей</p> </li> <li> <p>эффективное решение для единой регистрации</p> </li> <li> <p>цифровое хранилище ваших конфиденциальных данных</p> </li> </ul> </li> <li>\ | 25 | 'clipperzServiceDescription':"<h2>Держи всегда при себе!</h2> <ul> <li> <h3>Clipperz - это:</h3> <ul> <li> <p>безопасный и простой менеджер паролей</p> </li> <li> <p>эффективное решение для единой регистрации</p> </li> <li> <p>цифровое хранилище ваших конфиденциальных данных</p> </li> </ul> </li> <li>\ |
| 28 | <h3>C помощью Clipperz вы можете:</h3> <ul>\ | 26 | <h3>C помощью Clipperz вы можете:</h3> <ul>\ |
| 29 | <li> <p>хранить и управлять вашими паролями</p> </li> <li> <p>входить в любые веб-сервисы без ввода логина и пароля</p> </li> <li> <p>защитить все важные данные: коды охранной сигнализации, PINы, номера кредитных карт, и пр.</p> </li> <li> <p>открыть доступ к паролям вашим членам семьи, друзьям, коллегам</p> </li> </ul> </li> <li>\ | 27 | <li> <p>хранить и управлять вашими паролями</p> </li> <li> <p>входить в любые веб-сервисы без ввода логина и пароля</p> </li> <li> <p>защитить все важные данные: коды охранной сигнализации, PINы, номера кредитных карт, и пр.</p> </li> <li> <p>открыть доступ к паролям вашим членам семьи, друзьям, коллегам</p> </li> </ul> </li> <li>\ |
| 30 | <h3>Преимущества Clipperz:</h3> <ul>\ | 28 | <h3>Преимущества Clipperz:</h3> <ul>\ |
| 31 | <li> <p>бесплатный и абсолютно анонимный</p> </li> <li> <p>доступен в любое время и с любого компьютера</p> </li> <li> <p>не нужно ничего устанавливать</p> </li> <li> <p>не надо хранить секреты на компьютере или бумаге</p> </li> </ul> </li> <li>\ | 29 | <li> <p>бесплатный и абсолютно анонимный</p> </li> <li> <p>доступен в любое время и с любого компьютера</p> </li> <li> <p>не нужно ничего устанавливать</p> </li> <li> <p>не надо хранить секреты на компьютере или бумаге</p> </li> </ul> </li> <li>\ |
| 32 | <h3>Безопасность Clipperz:</h3> <ul>\ | 30 | <h3>Безопасность Clipperz:</h3> <ul>\ |
| 33 | <li> <p>все данные перед отправкой в Clipperz шифруются в браузере</p> </li> <li> <p>пароль знаете только вы</p> </li> <li> <p>Clipperz управляет важными данными в зашифрованном виде и никогда не получит доступ к ним в открытом виде</p> </li> <li> <p>Clipperz основан на стандартных криптографических протоколах: без каких-либо самоделок</p> </li> <li> <p>вы можете просмотреть исходный код, но вам ничего не надо знать о криптографии, чтобы просто использовать его!</p> </li> </ul> </li> <li>\ | 31 | <li> <p>все данные перед отправкой в Clipperz шифруются в браузере</p> </li> <li> <p>пароль знаете только вы</p> </li> <li> <p>Clipperz управляет важными данными в зашифрованном виде и никогда не получит доступ к ним в открытом виде</p> </li> <li> <p>Clipperz основан на стандартных криптографических протоколах: без каких-либо самоделок</p> </li> <li> <p>вы можете просмотреть исходный код, но вам ничего не надо знать о криптографии, чтобы просто использовать его!</p> </li> </ul> </li> <li>\ |
| 34 | <a href=\"http://www.clipperz.com\" target=\"_blank\">Подробнее</a> </li> </ul> ", | 32 | <a href=\"http://www.clipperz.com\" target=\"_blank\">Подробнее</a> </li> </ul> ", |
| 35 | 'loginFormTitle':"войти в аккаунт Clipperz", | 33 | 'loginFormTitle':"войти в аккаунт Clipperz", |
| 36 | 'loginFormUsernameLabel':"логин", | 34 | 'loginFormUsernameLabel':"логин", |
| 37 | 'loginFormPassphraseLabel':"пароль", | 35 | 'loginFormPassphraseLabel':"пароль", |
| 38 | 'loginFormDontHaveAnAccountLabel':"у вас еще нет аккаунта?", | 36 | 'loginFormDontHaveAnAccountLabel':"у вас еще нет аккаунта?", |
| 39 | 'loginFormCreateOneLabel':"создать сейчас", | 37 | 'loginFormCreateOneLabel':"создать сейчас", |
| 40 | 'loginFormForgotYourCredentialsLabel':"забыли пароль?", | 38 | 'loginFormForgotYourCredentialsLabel':"забыли пароль?", |
| 41 | 'loginFormAarghThatsBadLabel':"это плохо!", | 39 | 'loginFormAarghThatsBadLabel':"это плохо!", |
| 42 | 'loginFormAfraidOfMaliciousScriptsLabel':"опасаетесь вредоносных скриптов?", | 40 | 'loginFormAfraidOfMaliciousScriptsLabel':"опасаетесь вредоносных скриптов?", |
| 43 | 'loginFormVerifyTheCodeLabel':"проверить", | 41 | 'loginFormVerifyTheCodeLabel':"проверить", |
| 44 | 'loginFormButtonLabel':"Войти", | 42 | 'loginFormButtonLabel':"Войти", |
| 45 | 'loginFormOneTimePasswordCheckboxLabel':"использовать одноразовый пароль", | 43 | 'loginFormOneTimePasswordCheckboxLabel':"использовать одноразовый пароль", |
| 46 | 'loginPanelSwithLanguageDescription':"<h5>Переключить язык</h5> ", | 44 | 'loginPanelSwithLanguageDescription':"<h5>Переключить язык</h5> ", |
| 47 | 'browserCompatibilityDescription':"<p>Clipperz адаптирован для Firefox. Но также совместим с Opera и MS Internet Explorer!</p> ", | 45 | 'browserCompatibilityDescription':"<p>Clipperz адаптирован для Firefox. Но также совместим с Opera и MS Internet Explorer!</p> ", |
| 48 | 'OTPloginMessagePanelInitialTitle':"Вход", | 46 | 'OTPloginMessagePanelInitialTitle':"Вход", |
| 49 | 'OTPloginMessagePanelInitialText':"Передача данных учетной записи ...", | 47 | 'OTPloginMessagePanelInitialText':"Передача данных учетной записи ...", |
| 50 | 'OTPloginMessagePanelLoadingTitle':"Вход", | 48 | 'OTPloginMessagePanelLoadingTitle':"Вход", |
| 51 | 'OTPloginMessagePanelLoadingText':"Запрос аутентификационных данных с сервера ...", | 49 | 'OTPloginMessagePanelLoadingText':"Запрос аутентификационных данных с сервера ...", |
| 52 | 'OTPloginMessagePanelProcessingTitle':"Вход", | 50 | 'OTPloginMessagePanelProcessingTitle':"Вход", |
| 53 | 'OTPloginMessagePanelProcessingText':"Расшифровка аутентификационных данных", | 51 | 'OTPloginMessagePanelProcessingText':"Расшифровка аутентификационных данных", |
| 54 | 'loginMessagePanelInitialTitle':"Вход ...", | 52 | 'loginMessagePanelInitialTitle':"Вход ...", |
| 55 | 'loginMessagePanelInitialButtonLabel':"Отмена", | 53 | 'loginMessagePanelInitialButtonLabel':"Отмена", |
| 56 | 'loginMessagePanelConnectedTitle':"Соединен", | 54 | 'loginMessagePanelConnectedTitle':"Соединен", |
| 57 | 'loginMessagePanelConnectedText':"Выполнен", | 55 | 'loginMessagePanelConnectedText':"Выполнен", |
| 58 | 'loginMessagePanelFailureTitle':"Ошибка", | 56 | 'loginMessagePanelFailureTitle':"Ошибка", |
| 59 | 'loginMessagePanelFailureText':"Ошибка при попытке входа", | 57 | 'loginMessagePanelFailureText':"Ошибка при попытке входа", |
| 60 | 'loginMessagePanelFailureButtonLabel':"Закрыть", | 58 | 'loginMessagePanelFailureButtonLabel':"Закрыть", |
| 61 | 'connectionLoginSendingCredentialsMessageTitle':"Проверка учетной записи", | 59 | 'connectionLoginSendingCredentialsMessageTitle':"Проверка учетной записи", |
| 62 | 'connectionLoginSendingCredentialsMessageText':"Передача данных ...", | 60 | 'connectionLoginSendingCredentialsMessageText':"Передача данных ...", |
| 63 | 'connectionLoginCredentialsVerificationMessageTitle':"Проверка учетной записи", | 61 | 'connectionLoginCredentialsVerificationMessageTitle':"Проверка учетной записи", |
| 64 | 'connectionLoginCredentialsVerificationMessageText':"Выполняем SRP-аутентификацию ...", | 62 | 'connectionLoginCredentialsVerificationMessageText':"Выполняем SRP-аутентификацию ...", |
| 65 | 'connectionLoginDoneMessageTitle':"Проверка учетной записи", | 63 | 'connectionLoginDoneMessageTitle':"Проверка учетной записи", |
| 66 | 'connectionLoginDoneMessageText':"Соединено", | 64 | 'connectionLoginDoneMessageText':"Соединено", |
| 67 | 'userLoginPanelUpgradingUserCredentialsMessageTitle':"Проверка учетной записи", | 65 | 'userLoginPanelUpgradingUserCredentialsMessageTitle':"Проверка учетной записи", |
| 68 | 'userLoginPanelUpgradingUserCredentialsMessageText':"Обновляем полномочия к новой схеме аутентификации", | 66 | 'userLoginPanelUpgradingUserCredentialsMessageText':"Обновляем полномочия к новой схеме аутентификации", |
| 69 | 'userLoginPanelConnectedMessageTitle':"Пользователь аутентифицирован", | 67 | 'userLoginPanelConnectedMessageTitle':"Пользователь аутентифицирован", |
| 70 | 'userLoginPanelConnectedMessageText':"Успешный вход", | 68 | 'userLoginPanelConnectedMessageText':"Успешный вход", |
| 71 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':"Проверка учетной записи", | 69 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':"Проверка учетной записи", |
| 72 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageText':"Пробуем войти по старой схеме", | 70 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageText':"Пробуем войти по старой схеме", |
| 73 | 'userLoginPanelLoadingUserDataMessageTitle':"Пользователь аутентифицирован", | 71 | 'userLoginPanelLoadingUserDataMessageTitle':"Пользователь аутентифицирован", |
| 74 | 'userLoginPanelLoadingUserDataMessageText':"Загрузка зашифрованных заголовков карточек", | 72 | 'userLoginPanelLoadingUserDataMessageText':"Загрузка зашифрованных заголовков карточек", |
| 75 | 'userLoginPanelDecryptingUserDataMessageTitle':"Пользователь аутентифицирован", | 73 | 'userLoginPanelDecryptingUserDataMessageTitle':"Пользователь аутентифицирован", |
| 76 | 'userLoginPanelDecryptingUserDataMessageText':"Расшифровка заголовков карточек", | 74 | 'userLoginPanelDecryptingUserDataMessageText':"Расшифровка заголовков карточек", |
| 77 | 'userLoginPanelDecryptingUserStatisticsMessageTitle':"Пользователь аутентифицирован", | 75 | 'userLoginPanelDecryptingUserStatisticsMessageTitle':"Пользователь аутентифицирован", |
| 78 | 'userLoginPanelDecryptingUserStatisticsMessageText':"Расшифровка статистики", | 76 | 'userLoginPanelDecryptingUserStatisticsMessageText':"Расшифровка статистики", |
| 79 | 'splashAlertTitle':"Добро пожаловать в Clipperz!", | 77 | 'splashAlertTitle':"Добро пожаловать в Clipperz!", |
| 80 | 'splashAlertText':"<p>Несколько советов по безопасности:</p> <ul> <li> <p>Хранение данных в Clipperz зависит от того, насколько безопасен выбранный вами пароль</p> </li> <li> <p>Если собираетесь использовать Clipperz для защиты важных или критических данных, то убедитесь, что выбрали сложный пароль</p> </li> <li> <p>Clipperz не сможет восстановить забытый пароль</p> </li> </ul> <p>За дополнительной информацией обратитесь на <a href=\"http://www.clipperz.com\" target=\"_blank\">сайт</a> Clipperz.</p> ", | 78 | 'splashAlertText':"<p>Несколько советов по безопасности:</p> <ul> <li> <p>Хранение данных в Clipperz зависит от того, насколько безопасен выбранный вами пароль</p> </li> <li> <p>Если собираетесь использовать Clipperz для защиты важных или критических данных, то убедитесь, что выбрали сложный пароль</p> </li> <li> <p>Clipperz не сможет восстановить забытый пароль</p> </li> </ul> <p>За дополнительной информацией обратитесь на <a href=\"http://www.clipperz.com\" target=\"_blank\">сайт</a> Clipperz.</p> ", |
| 81 | 'splashAlertCloseButtonLabel':"OK", | 79 | 'splashAlertCloseButtonLabel':"OK", |
| 82 | 'registrationFormTitle':"создать аккаунт", | 80 | 'registrationFormTitle':"создать аккаунт", |
| 83 | 'registrationFormUsernameLabel':"имя пользователя", | 81 | 'registrationFormUsernameLabel':"имя пользователя", |
| 84 | 'registrationFormPassphraseLabel':"пароль", | 82 | 'registrationFormPassphraseLabel':"пароль", |
| 85 | 'registrationFormRetypePassphraseLabel':"повторите пароль", | 83 | 'registrationFormRetypePassphraseLabel':"повторите пароль", |
| 86 | 'registrationFormSafetyCheckLabel':"Я понимаю, что Clipperz не сможет восстановить забытый пароль", | 84 | 'registrationFormSafetyCheckLabel':"Я понимаю, что Clipperz не сможет восстановить забытый пароль", |
| 87 | 'registrationFormTermsOfServiceCheckLabel':"Я прочитал и согласен с <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Условиями предоставления услуг</a>.", | 85 | 'registrationFormTermsOfServiceCheckLabel':"Я прочитал и согласен с <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Условиями предоставления услуг</a>.", |
| 88 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"у вас уже есть аккаунт?", | 86 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"у вас уже есть аккаунт?", |
| 89 | 'registrationFormSimplyLoginLabel':"просто авторизируйтесь", | 87 | 'registrationFormSimplyLoginLabel':"просто авторизируйтесь", |
| 90 | 'registrationFormButtonLabel':"Зарегистрировать", | 88 | 'registrationFormButtonLabel':"Зарегистрировать", |
| 91 | 'registrationFormWarningMessageNotMatchingPassphrases':"Пароли не совпадают, пожайлуста, повторите ввод", | 89 | 'registrationFormWarningMessageNotMatchingPassphrases':"Пароли не совпадают, пожайлуста, повторите ввод", |
| 92 | 'registrationFormWarningMessageSafetyCheckNotSelected':"Прочитайте и проверьте все поля ниже", | 90 | 'registrationFormWarningMessageSafetyCheckNotSelected':"Прочитайте и проверьте все поля ниже", |
| 93 | 'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"Вы должны принять Условия предоставления услуг", | 91 | 'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"Вы должны принять Условия предоставления услуг", |
| 94 | 'registrationMessagePanelInitialTitle':"Создание аккаунта", | 92 | 'registrationMessagePanelInitialTitle':"Создание аккаунта", |
| 95 | 'registrationMessagePanelInitialButtonLabel':"Отмена", | 93 | 'registrationMessagePanelInitialButtonLabel':"Отмена", |
| 96 | 'registrationMessagePanelRegistrationDoneTitle':"Регистрация", | 94 | 'registrationMessagePanelRegistrationDoneTitle':"Регистрация", |
| 97 | 'registrationMessagePanelRegistrationDoneText':"Выполнено", | 95 | 'registrationMessagePanelRegistrationDoneText':"Выполнено", |
| 98 | 'registrationMessagePanelFailureTitle':"Ошибка регистрации", | 96 | 'registrationMessagePanelFailureTitle':"Ошибка регистрации", |
| 99 | 'registrationMessagePanelFailureButtonLabel':"Закрыть", | 97 | 'registrationMessagePanelFailureButtonLabel':"Закрыть", |
| 100 | 'connectionRegistrationSendingRequestMessageText':"Проверка учетной записи", | 98 | 'connectionRegistrationSendingRequestMessageText':"Проверка учетной записи", |
| 101 | 'connectionRegistrationSendingCredentialsMessageText':"Передача данных", | 99 | 'connectionRegistrationSendingCredentialsMessageText':"Передача данных", |
| 102 | 'registrationSplashPanelTitle':"Совет", | 100 | 'registrationSplashPanelTitle':"Совет", |
| 103 | 'registrationSplashPanelDescription':"<p>Это ваши данные учетной записи, позаботесь об их безопасности. Clipperz никогда больше не покажет ваш логин и пароль!</p> ", | 101 | 'registrationSplashPanelDescription':"<p>Это ваши данные учетной записи, позаботесь об их безопасности. Clipperz никогда больше не покажет ваш логин и пароль!</p> ", |
| 104 | 'registrationSplashPanelUsernameLabel':"имя пользователя", | 102 | 'registrationSplashPanelUsernameLabel':"имя пользователя", |
| 105 | 'registrationSplashPanelPassphraseLabel':"пароль", | 103 | 'registrationSplashPanelPassphraseLabel':"пароль", |
| 106 | 'registrationSplashPanelShowPassphraseButtonLabel':"показать пароль", | 104 | 'registrationSplashPanelShowPassphraseButtonLabel':"показать пароль", |
| 107 | 'donateHeaderLinkLabel':"помочь проекту", | 105 | 'donateHeaderLinkLabel':"помочь проекту", |
| 108 | 'creditsHeaderLinkLabel':"авторы", | 106 | 'creditsHeaderLinkLabel':"авторы", |
| 109 | 'feedbackHeaderLinkLabel':"обратная связь", | 107 | 'feedbackHeaderLinkLabel':"обратная связь", |
| 110 | 'helpHeaderLinkLabel':"помощь", | 108 | 'helpHeaderLinkLabel':"помощь", |
| 111 | 'forumHeaderLinkLabel':"форум", | 109 | 'forumHeaderLinkLabel':"форум", |
| 112 | 'recordMenuLabel':"карточки", | 110 | 'recordMenuLabel':"карточки", |
| 113 | 'accountMenuLabel':"аккаунт", | 111 | 'accountMenuLabel':"аккаунт", |
| 114 | 'dataMenuLabel':"данные", | 112 | 'dataMenuLabel':"данные", |
| 115 | 'contactsMenuLabel':"контакты", | 113 | 'contactsMenuLabel':"контакты", |
| 116 | 'toolsMenuLabel':"инструменты", | 114 | 'toolsMenuLabel':"инструменты", |
| 117 | 'logoutMenuLabel':"выход", | 115 | 'logoutMenuLabel':"выход", |
| 118 | 'lockMenuLabel':"заблокировать", | 116 | 'lockMenuLabel':"заблокировать", |
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_zh-CN.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_zh-CN.js index 1a9caed..e880954 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_zh-CN.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_zh-CN.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | Clipperz.PM.Strings.Languages['zh-CN'.toLowerCase()] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { | 24 | Clipperz.PM.Strings.Languages['zh-CN'.toLowerCase()] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], { |
| 27 | 'clipperzServiceDescription':"<h2>只有你知道</h2> <ul> <li> <h3>Clipperz 是:</h3> <ul> <li> <p>一个简单而又安全的密码管理员</p> </li> <li> <p>一个有效的单一登录解决方案</p> </li> <li> <p>一个您保密的资料数据库</p> </li> </ul> </li> <li> <h3> 使用 Clipperz 你能:</h3> <ul> <li> <p>储存和管理你的密码和网上证书</p> </li> <li> <p>无需输入密码自动帮助你登录网站服务</p> </li> <li> <p>保护你的敏感数据:通讯录,口令,信用卡号码, ...</p> </li> <li> <p>与家人和伙伴分享秘密(将要上线)</p> </li> </ul> </li> <li> <h3>Clipperz 的特点:</h3> <ul> <li> <p>免费，彻底匿名</p> </li> <li> <p>在任何时间 任何电脑都可以轻松获取你的密码</p> </li> <li> <p>无需下载和安装任何软件</p> </li> <li> <p>再也无需在电脑或者纸上记录密码了</p> </li> </ul> </li> <li> <h3>Clipperz 的安全性:</h3> <ul> <li> <p>密码将在本地浏览器加密，然后上传至 Clipperz</p> </li> <li> <p>加密密钥是一个只有你知道的密码短语</p> </li> <li> <p>Clipperz 服务会加密你的敏感数据，并不会出现数据的原始形式</p> </li> <li> <p>Clipperz 基于加密标准，没有任何的花哨</p> </li> <li> <p>只要你愿意，你随时都可以查看源代码，但是做为一个使用者来说完全没有去必要去了解那些繁琐的加密原理</p> </li> </ul> </li> <li> <a href=\"http://www.clipperz.com\" target=\"_blank\">更多</a> </li> </ul> ", | 25 | 'clipperzServiceDescription':"<h2>只有你知道</h2> <ul> <li> <h3>Clipperz 是:</h3> <ul> <li> <p>一个简单而又安全的密码管理员</p> </li> <li> <p>一个有效的单一登录解决方案</p> </li> <li> <p>一个您保密的资料数据库</p> </li> </ul> </li> <li> <h3> 使用 Clipperz 你能:</h3> <ul> <li> <p>储存和管理你的密码和网上证书</p> </li> <li> <p>无需输入密码自动帮助你登录网站服务</p> </li> <li> <p>保护你的敏感数据:通讯录,口令,信用卡号码, ...</p> </li> <li> <p>与家人和伙伴分享秘密(将要上线)</p> </li> </ul> </li> <li> <h3>Clipperz 的特点:</h3> <ul> <li> <p>免费，彻底匿名</p> </li> <li> <p>在任何时间 任何电脑都可以轻松获取你的密码</p> </li> <li> <p>无需下载和安装任何软件</p> </li> <li> <p>再也无需在电脑或者纸上记录密码了</p> </li> </ul> </li> <li> <h3>Clipperz 的安全性:</h3> <ul> <li> <p>密码将在本地浏览器加密，然后上传至 Clipperz</p> </li> <li> <p>加密密钥是一个只有你知道的密码短语</p> </li> <li> <p>Clipperz 服务会加密你的敏感数据，并不会出现数据的原始形式</p> </li> <li> <p>Clipperz 基于加密标准，没有任何的花哨</p> </li> <li> <p>只要你愿意，你随时都可以查看源代码，但是做为一个使用者来说完全没有去必要去了解那些繁琐的加密原理</p> </li> </ul> </li> <li> <a href=\"http://www.clipperz.com\" target=\"_blank\">更多</a> </li> </ul> ", |
| 28 | 'loginFormTitle':"用你的 Clipperz 帐户登录", | 26 | 'loginFormTitle':"用你的 Clipperz 帐户登录", |
| 29 | 'loginFormUsernameLabel':"用户名", | 27 | 'loginFormUsernameLabel':"用户名", |
| 30 | 'loginFormPassphraseLabel':"密码短语", | 28 | 'loginFormPassphraseLabel':"密码短语", |
| 31 | 'loginFormDontHaveAnAccountLabel':"还未建立帐户？", | 29 | 'loginFormDontHaveAnAccountLabel':"还未建立帐户？", |
| 32 | 'loginFormCreateOneLabel':"创建一个新帐户", | 30 | 'loginFormCreateOneLabel':"创建一个新帐户", |
| 33 | 'loginFormForgotYourCredentialsLabel':"忘记你的证书？", | 31 | 'loginFormForgotYourCredentialsLabel':"忘记你的证书？", |
| 34 | 'loginFormAarghThatsBadLabel':"呃？这下糟糕了", | 32 | 'loginFormAarghThatsBadLabel':"呃？这下糟糕了", |
| 35 | 'loginFormAfraidOfMaliciousScriptsLabel':"害怕有恶意脚本？", | 33 | 'loginFormAfraidOfMaliciousScriptsLabel':"害怕有恶意脚本？", |
| 36 | 'loginFormVerifyTheCodeLabel':"验证代码", | 34 | 'loginFormVerifyTheCodeLabel':"验证代码", |
| 37 | 'loginFormButtonLabel':"登录", | 35 | 'loginFormButtonLabel':"登录", |
| 38 | 'loginFormOneTimePasswordCheckboxLabel':"使用一次性密码短语", | 36 | 'loginFormOneTimePasswordCheckboxLabel':"使用一次性密码短语", |
| 39 | 'loginPanelSwithLanguageDescription':"<h5>选择你的第一语言</h5> ", | 37 | 'loginPanelSwithLanguageDescription':"<h5>选择你的第一语言</h5> ", |
| 40 | 'browserCompatibilityDescription':"<p>使用 Firefox 将得到更快更安全的 Clipperz 服务。不过 Clipperz 同样可以很好的工作在 Opera 和 微软的 IE 中。</p> ", | 38 | 'browserCompatibilityDescription':"<p>使用 Firefox 将得到更快更安全的 Clipperz 服务。不过 Clipperz 同样可以很好的工作在 Opera 和 微软的 IE 中。</p> ", |
| 41 | 'OTPloginMessagePanelInitialTitle':"用一次性密码短语登录", | 39 | 'OTPloginMessagePanelInitialTitle':"用一次性密码短语登录", |
| 42 | 'OTPloginMessagePanelInitialText':"发送 OTP 证书 ...", | 40 | 'OTPloginMessagePanelInitialText':"发送 OTP 证书 ...", |
| 43 | 'OTPloginMessagePanelLoadingTitle':"用一次性密码短语登录", | 41 | 'OTPloginMessagePanelLoadingTitle':"用一次性密码短语登录", |
| 44 | 'OTPloginMessagePanelLoadingText':"从服务器读取加密认证数据 ...", | 42 | 'OTPloginMessagePanelLoadingText':"从服务器读取加密认证数据 ...", |
| 45 | 'OTPloginMessagePanelProcessingTitle':"用一次性密码短语登录", | 43 | 'OTPloginMessagePanelProcessingTitle':"用一次性密码短语登录", |
| 46 | 'OTPloginMessagePanelProcessingText':"本地解密认证数据", | 44 | 'OTPloginMessagePanelProcessingText':"本地解密认证数据", |
| 47 | 'loginMessagePanelInitialTitle':"登录中...", | 45 | 'loginMessagePanelInitialTitle':"登录中...", |
| 48 | 'loginMessagePanelInitialButtonLabel':"取消", | 46 | 'loginMessagePanelInitialButtonLabel':"取消", |
| 49 | 'loginMessagePanelConnectedTitle':"连接成功", | 47 | 'loginMessagePanelConnectedTitle':"连接成功", |
| 50 | 'loginMessagePanelConnectedText':"完成", | 48 | 'loginMessagePanelConnectedText':"完成", |
| 51 | 'loginMessagePanelFailureTitle':"错误", | 49 | 'loginMessagePanelFailureTitle':"错误", |
| 52 | 'loginMessagePanelFailureText':"登录失败", | 50 | 'loginMessagePanelFailureText':"登录失败", |
| 53 | 'loginMessagePanelFailureButtonLabel':"取消", | 51 | 'loginMessagePanelFailureButtonLabel':"取消", |
| 54 | 'connectionLoginSendingCredentialsMessageTitle':"验证证书", | 52 | 'connectionLoginSendingCredentialsMessageTitle':"验证证书", |
| 55 | 'connectionLoginSendingCredentialsMessageText':"传送证书", | 53 | 'connectionLoginSendingCredentialsMessageText':"传送证书", |
| 56 | 'connectionLoginCredentialsVerificationMessageTitle':"验证证书", | 54 | 'connectionLoginCredentialsVerificationMessageTitle':"验证证书", |
| 57 | 'connectionLoginCredentialsVerificationMessageText':"进行 SRP 认证", | 55 | 'connectionLoginCredentialsVerificationMessageText':"进行 SRP 认证", |
| 58 | 'connectionLoginDoneMessageTitle':"验证证书", | 56 | 'connectionLoginDoneMessageTitle':"验证证书", |
| 59 | 'connectionLoginDoneMessageText':"已连接", | 57 | 'connectionLoginDoneMessageText':"已连接", |
| 60 | 'userLoginPanelUpgradingUserCredentialsMessageTitle':"验证证书", | 58 | 'userLoginPanelUpgradingUserCredentialsMessageTitle':"验证证书", |
| 61 | 'userLoginPanelUpgradingUserCredentialsMessageText':"升级证书到新的认证模式", | 59 | 'userLoginPanelUpgradingUserCredentialsMessageText':"升级证书到新的认证模式", |
| 62 | 'userLoginPanelConnectedMessageTitle':"用户识别", | 60 | 'userLoginPanelConnectedMessageTitle':"用户识别", |
| 63 | 'userLoginPanelConnectedMessageText':"成功登录", | 61 | 'userLoginPanelConnectedMessageText':"成功登录", |
| 64 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':"验证证书", | 62 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':"验证证书", |
| 65 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageText':"旧认证模式失效", | 63 | 'userLoginPanelTryingAnOlderConnectionSchemaMessageText':"旧认证模式失效", |
| 66 | 'userLoginPanelLoadingUserDataMessageTitle':"用户识别", | 64 | 'userLoginPanelLoadingUserDataMessageTitle':"用户识别", |
| 67 | 'userLoginPanelLoadingUserDataMessageText':"正在从 Clipperz 下载加密卡报头", | 65 | 'userLoginPanelLoadingUserDataMessageText':"正在从 Clipperz 下载加密卡报头", |
| 68 | 'userLoginPanelDecryptingUserDataMessageTitle':"用户识别", | 66 | 'userLoginPanelDecryptingUserDataMessageTitle':"用户识别", |
| 69 | 'userLoginPanelDecryptingUserDataMessageText':"加密卡报头本地解密", | 67 | 'userLoginPanelDecryptingUserDataMessageText':"加密卡报头本地解密", |
| 70 | 'userLoginPanelDecryptingUserStatisticsMessageTitle':"用户识别", | 68 | 'userLoginPanelDecryptingUserStatisticsMessageTitle':"用户识别", |
| 71 | 'userLoginPanelDecryptingUserStatisticsMessageText':"本地解密使用统计", | 69 | 'userLoginPanelDecryptingUserStatisticsMessageText':"本地解密使用统计", |
| 72 | 'splashAlertTitle':"Clipperz 欢迎您", | 70 | 'splashAlertTitle':"Clipperz 欢迎您", |
| 73 | 'splashAlertText':"<p>安全忠告</p> <ul> <li> <p>在 Clipperz ，用你选择的密码短语保存数据是安全的。没有人能够得到这些数据，除非他们有你的密码。</p> </li> <li> <p> 如果你决定使用 Clipperz 保护敏感数据和关键资料，请务必选用一个复杂的密码短语。越长越好</p> </li> <li> <p>注意:Clipperz将无法找回忘记的密码码短语!</p> </li> </ul> <p>获得更多的说明，请前往 <a href=\"http://www.clipperz.com\" target=\"_blank\">Clipperz</a> 网站.</p> ", | 71 | 'splashAlertText':"<p>安全忠告</p> <ul> <li> <p>在 Clipperz ，用你选择的密码短语保存数据是安全的。没有人能够得到这些数据，除非他们有你的密码。</p> </li> <li> <p> 如果你决定使用 Clipperz 保护敏感数据和关键资料，请务必选用一个复杂的密码短语。越长越好</p> </li> <li> <p>注意:Clipperz将无法找回忘记的密码码短语!</p> </li> </ul> <p>获得更多的说明，请前往 <a href=\"http://www.clipperz.com\" target=\"_blank\">Clipperz</a> 网站.</p> ", |
| 74 | 'splashAlertCloseButtonLabel':"确定", | 72 | 'splashAlertCloseButtonLabel':"确定", |
| 75 | 'registrationFormTitle':"创建你的帐户", | 73 | 'registrationFormTitle':"创建你的帐户", |
| 76 | 'registrationFormUsernameLabel':"用户名", | 74 | 'registrationFormUsernameLabel':"用户名", |
| 77 | 'registrationFormPassphraseLabel':"密码短语", | 75 | 'registrationFormPassphraseLabel':"密码短语", |
| 78 | 'registrationFormRetypePassphraseLabel':"确认密码短语", | 76 | 'registrationFormRetypePassphraseLabel':"确认密码短语", |
| 79 | 'registrationFormSafetyCheckLabel':"我明白 Clipperz 无法找回忘记的密码短语.", | 77 | 'registrationFormSafetyCheckLabel':"我明白 Clipperz 无法找回忘记的密码短语.", |
| 80 | 'registrationFormTermsOfServiceCheckLabel':"我同意接受 <a href='http://www.clipperz.com/terms_of_service' target='_blank'>服务条款</a> 款.", | 78 | 'registrationFormTermsOfServiceCheckLabel':"我同意接受 <a href='http://www.clipperz.com/terms_of_service' target='_blank'>服务条款</a> 款.", |
| 81 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"如果已有一个 Clipperz 帐户", | 79 | 'registrationFormDoYouAlreadyHaveAnAccountLabel':"如果已有一个 Clipperz 帐户", |
| 82 | 'registrationFormSimplyLoginLabel':"在此登录", | 80 | 'registrationFormSimplyLoginLabel':"在此登录", |
| 83 | 'registrationFormButtonLabel':"注册", | 81 | 'registrationFormButtonLabel':"注册", |
| 84 | 'registrationFormWarningMessageNotMatchingPassphrases':"两次密码短语不同，请重新输入", | 82 | 'registrationFormWarningMessageNotMatchingPassphrases':"两次密码短语不同，请重新输入", |
| 85 | 'registrationFormWarningMessageSafetyCheckNotSelected':"请阅读并检查下面的选项框", | 83 | 'registrationFormWarningMessageSafetyCheckNotSelected':"请阅读并检查下面的选项框", |
| 86 | 'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"您需要同意服务条款", | 84 | 'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"您需要同意服务条款", |
| 87 | 'registrationMessagePanelInitialTitle':"创建账户...", | 85 | 'registrationMessagePanelInitialTitle':"创建账户...", |
| 88 | 'registrationMessagePanelInitialButtonLabel':"取消", | 86 | 'registrationMessagePanelInitialButtonLabel':"取消", |
| 89 | 'registrationMessagePanelRegistrationDoneTitle':"注册", | 87 | 'registrationMessagePanelRegistrationDoneTitle':"注册", |
| 90 | 'registrationMessagePanelRegistrationDoneText':"完成", | 88 | 'registrationMessagePanelRegistrationDoneText':"完成", |
| 91 | 'registrationMessagePanelFailureTitle':"注册失败", | 89 | 'registrationMessagePanelFailureTitle':"注册失败", |
| 92 | 'registrationMessagePanelFailureButtonLabel':"关闭", | 90 | 'registrationMessagePanelFailureButtonLabel':"关闭", |
| 93 | 'connectionRegistrationSendingRequestMessageText':"验证证书", | 91 | 'connectionRegistrationSendingRequestMessageText':"验证证书", |
| 94 | 'connectionRegistrationSendingCredentialsMessageText':"传送证书", | 92 | 'connectionRegistrationSendingCredentialsMessageText':"传送证书", |
| 95 | 'registrationSplashPanelTitle':"安全忠告", | 93 | 'registrationSplashPanelTitle':"安全忠告", |
| 96 | 'registrationSplashPanelDescription':"<p>这是你的 Clipperz 证书，请保存好。Clipperz 永远不会第二次显示你的用户名和密码短语</p> ", | 94 | 'registrationSplashPanelDescription':"<p>这是你的 Clipperz 证书，请保存好。Clipperz 永远不会第二次显示你的用户名和密码短语</p> ", |
| 97 | 'registrationSplashPanelUsernameLabel':"用户名", | 95 | 'registrationSplashPanelUsernameLabel':"用户名", |
| 98 | 'registrationSplashPanelPassphraseLabel':"密码短语", | 96 | 'registrationSplashPanelPassphraseLabel':"密码短语", |
| 99 | 'registrationSplashPanelShowPassphraseButtonLabel':"显示密码短语", | 97 | 'registrationSplashPanelShowPassphraseButtonLabel':"显示密码短语", |
| 100 | 'donateHeaderLinkLabel':"捐赠", | 98 | 'donateHeaderLinkLabel':"捐赠", |
| 101 | 'creditsHeaderLinkLabel':"致谢", | 99 | 'creditsHeaderLinkLabel':"致谢", |
| 102 | 'feedbackHeaderLinkLabel':"反馈", | 100 | 'feedbackHeaderLinkLabel':"反馈", |
| 103 | 'helpHeaderLinkLabel':"帮助", | 101 | 'helpHeaderLinkLabel':"帮助", |
| 104 | 'forumHeaderLinkLabel':"论坛", | 102 | 'forumHeaderLinkLabel':"论坛", |
| 105 | 'recordMenuLabel':"密码卡片", | 103 | 'recordMenuLabel':"密码卡片", |
| 106 | 'accountMenuLabel':"账户", | 104 | 'accountMenuLabel':"账户", |
| 107 | 'dataMenuLabel':"资料", | 105 | 'dataMenuLabel':"资料", |
| 108 | 'contactsMenuLabel':"联系", | 106 | 'contactsMenuLabel':"联系", |
| 109 | 'toolsMenuLabel':"工具", | 107 | 'toolsMenuLabel':"工具", |
| 110 | 'logoutMenuLabel':"暂时离开", | 108 | 'logoutMenuLabel':"暂时离开", |
| 111 | 'lockMenuLabel':"安全锁", | 109 | 'lockMenuLabel':"安全锁", |
| 112 | 'lockTitle':"账户被锁定", | 110 | 'lockTitle':"账户被锁定", |
| 113 | 'lockDescription':"<p>请输入你的密码短语解开账户</p> ", | 111 | 'lockDescription':"<p>请输入你的密码短语解开账户</p> ", |
| 114 | 'unlockButtonLabel':"解锁", | 112 | 'unlockButtonLabel':"解锁", |
| 115 | 'changePasswordTabLabel':"修改密码短语", | 113 | 'changePasswordTabLabel':"修改密码短语", |
| 116 | 'changePasswordTabTitle':"修改密码短语", | 114 | 'changePasswordTabTitle':"修改密码短语", |
| 117 | 'changePasswordFormUsernameLabel':"用户名", | 115 | 'changePasswordFormUsernameLabel':"用户名", |
| 118 | 'changePasswordFormOldPassphraseLabel':"旧密码短语", | 116 | 'changePasswordFormOldPassphraseLabel':"旧密码短语", |
diff --git a/frontend/beta/js/Clipperz/PM/Toll.js b/frontend/beta/js/Clipperz/PM/Toll.js index 3a9b48f..027d8a3 100644 --- a/frontend/beta/js/Clipperz/PM/Toll.js +++ b/frontend/beta/js/Clipperz/PM/Toll.js | |||
| @@ -1,118 +1,116 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
| 4 | 4 | ||
| 5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
| 6 | Clipperz Community Edition is an online password manager. | ||
| 7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
| 8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
| 9 | 8 | ||
| 10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
| 11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
| 12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
| 13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
| 14 | 13 | ||
| 15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
| 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
| 19 | 18 | ||
| 20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
| 21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
| 22 | <http://www.gnu.org/licenses/>. | ||
| 23 | 21 | ||
| 24 | */ | 22 | */ |
| 25 | 23 | ||
| 26 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } | 24 | if (typeof(Clipperz) == 'undefined') { Clipperz = {}; } |
| 27 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } | 25 | if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; } |
| 28 | 26 | ||
| 29 | //============================================================================= | 27 | //============================================================================= |
| 30 | 28 | ||
| 31 | Clipperz.PM.Toll = function(args) { | 29 | Clipperz.PM.Toll = function(args) { |
| 32 | this._requestType = args.requestType; | 30 | this._requestType = args.requestType; |
| 33 | this._targetValue = args.targetValue; | 31 | this._targetValue = args.targetValue; |
| 34 | this._cost = args.cost; | 32 | this._cost = args.cost; |
| 35 | this._toll = null; | 33 | this._toll = null; |
| 36 | 34 | ||
| 37 | return this; | 35 | return this; |
| 38 | } | 36 | } |
| 39 | 37 | ||
| 40 | Clipperz.PM.Toll.prototype = MochiKit.Base.update(null, { | 38 | Clipperz.PM.Toll.prototype = MochiKit.Base.update(null, { |
| 41 | 39 | ||
| 42 | 'toString': function() { | 40 | 'toString': function() { |
| 43 | return "Clipperz.PM.Toll (" + this.requestType() + ": " + this.cost() + " - " + ((this.toll() == null)? 'UNPAID' : 'PAID') + ")"; | 41 | return "Clipperz.PM.Toll (" + this.requestType() + ": " + this.cost() + " - " + ((this.toll() == null)? 'UNPAID' : 'PAID') + ")"; |
| 44 | }, | 42 | }, |
| 45 | 43 | ||
| 46 | //------------------------------------------------------------------------- | 44 | //------------------------------------------------------------------------- |
| 47 | 45 | ||
| 48 | 'requestType': function() { | 46 | 'requestType': function() { |
| 49 | return this._requestType; | 47 | return this._requestType; |
| 50 | }, | 48 | }, |
| 51 | 49 | ||
| 52 | //------------------------------------------------------------------------- | 50 | //------------------------------------------------------------------------- |
| 53 | 51 | ||
| 54 | 'targetValue': function() { | 52 | 'targetValue': function() { |
| 55 | return this._targetValue; | 53 | return this._targetValue; |
| 56 | }, | 54 | }, |
| 57 | 55 | ||
| 58 | //------------------------------------------------------------------------- | 56 | //------------------------------------------------------------------------- |
| 59 | 57 | ||
| 60 | 'cost': function() { | 58 | 'cost': function() { |
| 61 | return this._cost; | 59 | return this._cost; |
| 62 | }, | 60 | }, |
| 63 | 61 | ||
| 64 | //------------------------------------------------------------------------- | 62 | //------------------------------------------------------------------------- |
| 65 | 63 | ||
| 66 | 'toll': function() { | 64 | 'toll': function() { |
| 67 | return this._toll; | 65 | return this._toll; |
| 68 | }, | 66 | }, |
| 69 | 67 | ||
| 70 | //========================================================================= | 68 | //========================================================================= |
| 71 | 69 | ||
| 72 | 'prefixMatchingBits': function(aValue1, aValue2) { | 70 | 'prefixMatchingBits': function(aValue1, aValue2) { |
| 73 | varresult; | 71 | varresult; |
| 74 | var i,c; | 72 | var i,c; |
| 75 | 73 | ||
| 76 | result = 0; | 74 | result = 0; |
| 77 | 75 | ||
| 78 | c = Math.min(aValue1.length(), aValue2.length()); | 76 | c = Math.min(aValue1.length(), aValue2.length()); |
| 79 | i = 0; | 77 | i = 0; |
| 80 | while (i<c && (aValue1.byteAtIndex(i) == aValue2.byteAtIndex(i))) { | 78 | while (i<c && (aValue1.byteAtIndex(i) == aValue2.byteAtIndex(i))) { |
| 81 | result += 8; | 79 | result += 8; |
| 82 | i++; | 80 | i++; |
| 83 | } | 81 | } |
| 84 | 82 | ||
| 85 | if (i<c) { | 83 | if (i<c) { |
| 86 | varxorValue; | 84 | varxorValue; |
| 87 | 85 | ||
| 88 | xorValue = (aValue1.byteAtIndex(i) ^ aValue2.byteAtIndex(i)); | 86 | xorValue = (aValue1.byteAtIndex(i) ^ aValue2.byteAtIndex(i)); |
| 89 | 87 | ||
| 90 | if (xorValue >= 128) { | 88 | if (xorValue >= 128) { |
| 91 | result += 0; | 89 | result += 0; |
| 92 | } else if (xorValue >= 64) { | 90 | } else if (xorValue >= 64) { |
| 93 | result += 1; | 91 | result += 1; |
| 94 | } else if (xorValue >= 32) { | 92 | } else if (xorValue >= 32) { |
| 95 | result += 2; | 93 | result += 2; |
| 96 | } else if (xorValue >= 16) { | 94 | } else if (xorValue >= 16) { |
| 97 | result += 3; | 95 | result += 3; |
| 98 | } else if (xorValue >= 8) { | 96 | } else if (xorValue >= 8) { |
| 99 | result += 4; | 97 | result += 4; |
| 100 | } else if (xorValue >= 4) { | 98 | } else if (xorValue >= 4) { |
| 101 | result += 5; | 99 | result += 5; |
| 102 | } else if (xorValue >= 2) { | 100 | } else if (xorValue >= 2) { |
| 103 | result += 6; | 101 | result += 6; |
| 104 | } else if (xorValue >= 1) { | 102 | } else if (xorValue >= 1) { |
| 105 | result += 7; | 103 | result += 7; |
| 106 | } | 104 | } |
| 107 | } | 105 | } |
| 108 | 106 | ||
| 109 | return result; | 107 | return result; |
| 110 | }, | 108 | }, |
| 111 | 109 | ||
| 112 | //========================================================================= | 110 | //========================================================================= |
| 113 | 111 | ||
| 114 | 'pay': function() { | 112 | 'pay': function() { |
| 115 | varresult; | 113 | varresult; |
| 116 | vartargetData; | 114 | vartargetData; |
| 117 | vartargetMatchSize; | 115 | vartargetMatchSize; |
| 118 | var prefixMatchingBits; | 116 | var prefixMatchingBits; |