Merge latest changes with public repository

2 files changed, 5 insertions, 6 deletions

diff --git a/frontend/beta/js/Clipperz/PM/DataModel/Record.js b/frontend/beta/js/Clipperz/PM/DataModel/Record.js
index d6ebb39..f89f79c 100644
--- a/frontend/beta/js/Clipperz/PM/DataModel/Record.js
+++ b/frontend/beta/js/Clipperz/PM/DataModel/Record.js
@@ -266,55 +266,54 @@ Clipperz.PM.DataModel.Record.prototype = MochiKit.Base.update(null, {
 		} 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());
 			}
 
-//			community edition doesn't currently pass version
-//			information
+//			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 = someValues['currentVersion'];
+//			currentVersionParameters = someValues['versions'][someValues['currentVersion']];
+
 			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);
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 299ebc7..ab1bb0f 100644
--- a/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js
+++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js
@@ -495,33 +495,33 @@ Clipperz.PM.Strings.Languages['en-us'] = {
 	</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=\"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>\