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
@@ -281,3 +281,2 @@ Clipperz.PM.DataModel.Record.prototype = MochiKit.Base.update(null, {
 
-console.log("Record.processData", someValues);
                         this.processDataToExtractLegacyValues(someValues['data']);
@@ -294,4 +293,3 @@ console.log("Record.processData", someValues);
 
-        //              community edition doesn't currently pass version
-        //              information
+        //              community edition doesn't currently pass version information
                         if (someValues['versions'] == null) {
@@ -302,4 +300,5 @@ console.log("Record.processData", someValues);
 
-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();
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
@@ -510,3 +510,3 @@ Clipperz.PM.Strings.Languages['en-us'] = {
                         <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>\