Merge branch 'master' of github.com:clipperz/password-manager

Conflicts:
	frontend/beta/css/yui-extensions/basic-dialog.css

3 files changed, 15 insertions, 3 deletions

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

+<<<<<<< HEAD
 	background-image: url(./images/default/gradient-bg.gif);

+=======
+>>>>>>> 0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9
 	background-color:#c3daf9;

 	border:1px solid #6593cf;

 	z-index:10001;

 	overflow:hidden;

 	position:absolute;

 	left:0;top:0;

 }

 .ydlg-shadow{

 	background:#aaaaaa;

 	position:absolute;

 	left:0;top:0;

 }

 .ydlg-focus{

 	-moz-outline:0 none;

 	outline:0 none;

 	width:0;

 	height:0;

 	overflow:hidden;

 	position:absolute;

 	top:0;

 	left:0;

 }

 .ydlg-mask{

 	z-index:10000;   

    display:none;

    position:absolute;

    top:0;

    left:0;

    -moz-opacity: 0.5;

    opacity:.50;

    filter: alpha(opacity=50);

    background-color:#CCC;

 }

 body.masked{

 }

 body.masked select {

 	visibility:hidden;

 }

 body.masked .ydlg select {

 	visibility:visible;

 }

 .ydlg{

 	z-index:10001;

 	overflow:hidden;

 	position:absolute;

 	left:300;top:0;

 }

 .yresizable-proxy{

 	z-index:10002;

 }

 .ydlg .ydlg-hd {

 	background: url(./images/default/basic-dialog/hd-sprite.gif) repeat-x 0 -82px;

 	background-color:navy;

 	color:#ffffff;

 	font:bold 12px "sans serif", tahoma, verdana, helvetica;

 	overflow:hidden;

 	padding:5px;

 }

 .ydlg .ydlg-hd-left {

 	background: url(./images/default/basic-dialog/hd-sprite.gif) no-repeat 0 -41px;

 	padding-left:3px;

 	margin:0px;

 }

 .ydlg .ydlg-hd-right {

 	background: url(./images/default/basic-dialog/hd-sprite.gif) no-repeat right 0;

 	padding-right:3px;

 }

 .ydlg .ydlg-dlg-body{

+<<<<<<< HEAD
 	background:url(./images/default/layout/gradient-bg.gif);

+=======
+>>>>>>> 0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9
 	border:1px solid #6593cf;

 	border-top:0 none;

 	padding:10px;

 	overflow:hidden;

 }

 .ydlg .ydlg-bd{

 	overflow:hidden;

 }

 .ydlg .ydlg-ft{

 	overflow:hidden;

 	padding:5px;

 	padding-bottom:0;

 }

 .ydlg .yui-ext-tabbody{

 	background:white;

 	overflow:auto;

 }

 .ydlg .ytabs-top .yui-ext-tabbody{

 	border:1px solid #6593cf;

 	border-top:0 none;

 }

 .ydlg .ytabs-bottom .yui-ext-tabbody{

 	border:1px solid #6593cf;

 	border-bottom:0 none;

 }

 .ydlg .ylayout-container  .yui-ext-tabbody{

 	border:0 none;

 }

 .ydlg .inner-tab{

 	margin:5px;

 }

 .ydlg .ydlg-ft .ybtn{

 	margin-right:5px;

 	float:right;

 	clear:none;

 }

 .ydlg .ydlg-ft .ydlg-btns td {

 	border:0;

 	padding:0;

 }

 .ydlg .ydlg-ft .ydlg-btns-right table{

 	float:right;

 	clear:none;

 }

 .ydlg .ydlg-ft .ydlg-btns-left table{

 	float:left;

 	clear:none;

 }

diff --git a/frontend/beta/js/Clipperz/PM/DataModel/Record.js b/frontend/beta/js/Clipperz/PM/DataModel/Record.js
index ecb6c37..d6ebb39 100644
--- a/frontend/beta/js/Clipperz/PM/DataModel/Record.js
+++ b/frontend/beta/js/Clipperz/PM/DataModel/Record.js
@@ -247,98 +247,104 @@ Clipperz.PM.DataModel.Record.prototype = MochiKit.Base.update(null, {
 //MochiKit.Logging.logDebug(">>> [" + (new Date()).valueOf() + "] Record.decryptData - this: " + this + " (" + anEncryptedData + ")");
 		if (this.shouldDecryptData()) {
 			var deferredResult;
 		
 			deferredResult = new MochiKit.Async.Deferred();
 			deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'notify', 'decryptingRecordData');
 			deferredResult.addCallback(Clipperz.PM.Crypto.deferredDecrypt, this.key(), anEncryptedData['data'], anEncryptedData['version']);
 			deferredResult.addCallback(function(anEncryptedData, someDecryptedValues) {
 				var	result;
 
 				result = anEncryptedData;
 				result['data'] = someDecryptedValues;
 			
 				return result;
 			}, anEncryptedData);
 			deferredResult.addCallback(MochiKit.Base.method(this, 'setDecryptedData'));
 			deferredResult.callback();
 
 			result = deferredResult;
 		} else {
 			result = MochiKit.Async.succeed(this.decryptedData());
 		}
 //MochiKit.Logging.logDebug("<<< [" + (new Date()).valueOf() + "] Record.decryptData");
 
 		return result;
 	},
 
 	//-------------------------------------------------------------------------
 
 	'processData': function(someValues) {
 //MochiKit.Logging.logDebug(">>> [" + (new Date()).valueOf() + "] Record.processData");
 //MochiKit.Logging.logDebug("--- Record.processData: " + Clipperz.Base.serializeJSON(someValues));
 		if (this.shouldProcessData()) {
 			var currentVersionParameters;
 
 console.log("Record.processData", someValues);
 			this.processDataToExtractLegacyValues(someValues['data']);
 
 			if (typeof(someValues['data']['notes']) != 'undefined') {
 				this.setNotes(someValues['data']['notes']);
 			}
 
 			if (someValues['data']['currentVersionKey'] != null) {
 				this.setCurrentVersionKey(someValues['data']['currentVersionKey']);
 			} else {
 				this.setCurrentVersionKey(this.key());
 			}
 
-//			currentVersionParameters = someValues['currentVersion'];
-			currentVersionParameters = someValues['versions'][someValues['currentVersion']];
+//			community edition doesn't currently pass version
+//			information
+			if (someValues['versions'] == null) {
+				currentVersionParameters = someValues['currentVersion'];
+			} else {
+				currentVersionParameters = someValues['versions'][someValues['currentVersion']];
+			}
+
 console.log("Record.processData - this.currentVersionKey()", this.currentVersionKey());
 console.log("Record.processData - currentVersionParameters", currentVersionParameters);
 			currentVersionParameters['key'] = this.currentVersionKey();
 			this.setCurrentVersion(new Clipperz.PM.DataModel.RecordVersion(this, currentVersionParameters));
 			
 			if (someValues['data']['directLogins'] != null) {
 				var	directLoginReference;
 			
 				for (directLoginReference in someValues['data']['directLogins']) {
 					var directLogin;
 					var directLoginParameters;
 				
 					directLoginParameters = someValues['data']['directLogins'][directLoginReference];
 					directLoginParameters.record = this;
 					directLoginParameters.reference = directLoginReference;
 				
 					directLogin = new Clipperz.PM.DataModel.DirectLogin(directLoginParameters);
 					this.addDirectLogin(directLogin, true);
 				}
 			}
 			this.setShouldProcessData(false);
 		}
 		
 		Clipperz.NotificationCenter.notify(this, 'recordDataReady');
 //MochiKit.Logging.logDebug("<<< [" + (new Date()).valueOf() + "] Record.processData");
 //MochiKit.Logging.logDebug("<<< Record.processData");
 		
 		return this;
 	},
 
 	//-------------------------------------------------------------------------
 
 	'processDataToExtractLegacyValues': function(someValues) {
 //MochiKit.Logging.logDebug(">>> Record.processDataToExtractLegacyValues");
 		if (someValues['data'] != null) {
 			this.setNotes(someValues['data']);
 		}
 
 		if (
 				(typeof(someValues['loginFormData']) != "undefined")
 			&&	(typeof(someValues['loginBindings'] != "undefined"))
 			&&	(someValues['loginFormData'] != "")
 			&&	(someValues['loginBindings'] != "")
 		) {
 			var	directLogin;
 
 			directLogin = new Clipperz.PM.DataModel.DirectLogin({
 				record:this,
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 9fa95e9..299ebc7 100644
--- a/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js
+++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js
@@ -463,97 +463,97 @@ Clipperz.PM.Strings.Languages['en-us'] = {
 	<h5>Internet Explorer</h5>\
 	<ol>\
 		<li><p>Make sure that the “Links” toolbar is displayed by selecting “View > Toolbars > Links” from the browser menu.</p></li>\
 		<li><p>Right-click on the “Add to Clipperz” link below.</p></li>\
 		<li><p>Select “Add to favorites” from the contextual menu.</p></li>\
 		<li><p>Click “Yes” for any security message that pops up.</p></li>\
 		<li><p>Open the “Links” folder and click “OK”</p></li>\
 	</ol>",
 	
 'bookmarkletTabBookmarkletTitle':	"Add to Clipperz",
 
 //	Tools panel - bookmarklet - instructions
 'bookmarkletTabInstructions':		"\
 	<!-- 	FIX CSS		DONE!	-->	\
 	<h3>How to create a new card inclusive of a “direct login” link to an online service</h3>\
 	<ol>\
 		<li><p>Open the web page where the login form is hosted. (this is the page where you usually enter your sign-in credentials)</p></li>\
 		<li><p>Launch the bookmarklet by clicking on it: a pop-up window will appear over the web page.</p></li>\
 		<li><p>Copy to the clipboard the content of the large text area within the pop-up. (ctrl-C)</p></li>\
 		<li><p>Enter your Clipperz account and click on the <b>Add new card</b> button.</p></li>\
 		<li><p>Select the “Direct login” template and paste the content of the clipboard to the large text area in the form. (ctrl-V)</p></li>\
 		<li><p>Press the <b>Create</b> button, complete and review the details, then click <b>Save</b>.</p></li>\
 	</ol>\
 	\
 	<h3>How to add a “direct login” link to an existing card</h3>\
 	<ol>\
 		<li><p>Same as above.</p></li>\
 		<li><p>Same as above.</p></li>\
 		<li><p>Same as above.</p></li>\
 		<li><p>Enter your Clipperz account and select the card containing the credentials for the web service you just visited and click the <b>Edit</b> button.</p></li>\
 		<li><p>Paste the content of the clipboard to the large text area in the “Direct logins” section. (ctrl-V)</p></li>\
 		<li><p>Press the <b>Add direct login</b> button, review the details and then click <b>Save</b>.</p></li>\
 	</ol>\
 	\
 	<p></p>\
 	<p>Further information about the bookmarklet are <a href=\"http://www.clipperz.com/support/user_guide/bookmarklet\" target=\"_blank\">available here</a>.</p>",
 
 //	Tools panel - Compact - instructions
 'compactTabDescription':				"\
 	<!-- 	FIX CSS		DONE!	-->	\
 	<p>Clipperz Compact is a special version of Clipperz designed to be opened in the Firefox sidebar.</p>\
 	<p>Its purpose is to keep your collection of “direct logins” always at hand. Read more <a href=\"http://www.clipperz.com/support/user_guide/clipperz_compact\", target=\"blank\">here</a></p>\
 	\
 	<h3>How to launch Clipperz Compact in the sidebar</h3>\
 	<ol>\
 		<li><p>Get Firefox! Sidebars are only available in Firefox and you need to switch to Firefox in order to enjoy the convenience of Clipperz Compact.</p></li>\
 		<li>\
 			<p>Add the following URL to Firefox bookmarks, or even better, drag it to the bookmark bar.</p>\
-			<div id=\"compactLinkBox\"><a href=\"https://www.clipperz.com/beta/index.html?compact\" target=\"_search\">Clipperz Compact</a></div>\
+			<div id=\"compactLinkBox\"><a href=\"index.html?compact\" target=\"_search\">Clipperz Compact</a></div>\
 		</li>\
 		<li><p>Change the properties of the bookmark so that “load this bookmark in the sidebar” is checked.</p></li>\
 	</ol>\
 	\
 	<h5>Added bonus: Clipperz Compact works also in Opera’s panel.</h5>",
 
 //	Tools panel - HTTP authentication - instructions
 'httpAuthTabDescription':					"\
 	<!-- 	FIX CSS		DONE!	-->	\
 	<p>HTTP authentication is a method designed to allow a web browser to provide credentials – in the form of a username and password – including them in a website address (HTTP or HTTPS URL).</p>\
 	<p>Nowadays it is rarely used, but it can still be found on small, private websites. You can tell that a website is protected by HTTP authentication when the browser displays a pop-up window to enter username and password.</p>\
 	<p>Unfortunately the Clipperz bookmarklet does not work on websites that use HTTP authentication. However you can still create a “direct login”.</p>\
 	\
 	<h3>How to create a “direct login” for a website that uses HTTP authentication</h3>\
 	<ol>\
 		<li><p>Store website URL, username and password in a new card.</p></li>\
 		<li><p>Copy the configuration below and paste it to the large text area in the “Direct logins” section of the new card.</p></li>\
 		<li><p>Press the <b>Add direct login</b> button, bind URL, username and password fields and then click <b>Save</b>.</p></li>\
 	</ol>\
 	\
 	<h5><a href=\"http://support.microsoft.com/kb/834489\" target=\"_blank\">Warning: Internet Explorer does not support HTTP authentication.</a></h5>",
 	
 // Direct logins block
 'mainPanelDirectLoginBlockLabel':			"Direct logins",
 'directLinkReferenceShowButtonLabel':		"show",
 	
 // Direct logins - blank slate
 'mainPanelDirectLoginBlockDescription':		"\
 	<!-- 	FIX CSS		DONE!	-->	\
 	<p>Add “direct logins” to sign in to your web accounts without typing usernames and passwords!</p>\
 	<p>“Direct logins” greatly enhance your password security since you can:</p>\
 	<ul>\
 		<li><p>conveniently adopt and enter complex passwords;</p></li>\
 		<li><p>never re-use the same and easy-to-guess password.</p></li>\
 	</ul>\
 	<p>Simple and quick configuration with the <b>Clipperz bookmarklet</b>.</p>\
 	<a href=\"http://www.clipperz.com/support/user_guide/direct_logins\" target=\"_blank\">Learn more about “direct logins”</a>",
 
 // Cards block		
 'mainPanelRecordsBlockLabel':				"Cards",
 'mainPanelAddRecordButtonLabel':			"Add new card",
 'mainPanelRemoveRecordButtonLabel':			"Delete card",
 
 // Cards block - filter tabs
 'mainPanelRecordFilterBlockAllLabel':		"all",
 'mainPanelRecordFilterBlockTagsLabel':		"tags",
 'mainPanelRecordFilterBlockSearchLabel':	"search",