| -rw-r--r-- | frontend/beta/css/yui-extensions/basic-dialog.css | 6 | ||||
| -rw-r--r-- | frontend/beta/js/Clipperz/PM/DataModel/Record.js | 10 | ||||
| -rw-r--r-- | frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js | 2 |
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 @@ -25,5 +25,8 @@ refer to http://www.clipperz.com. .ydlg-proxy {
+<<<<<<< HEAD background-image: url(./images/default/gradient-bg.gif);
+======= +>>>>>>> 0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9 background-color:#c3daf9;
border:1px solid #6593cf;
@@ -94,5 +97,8 @@ body.masked .ydlg select { }
.ydlg .ydlg-dlg-body{
+<<<<<<< HEAD background:url(./images/default/layout/gradient-bg.gif);
+======= +>>>>>>> 0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9 border:1px solid #6593cf;
border-top:0 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 @@ -293,6 +293,12 @@ console.log("Record.processData", someValues); } -// 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); 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 @@ -509,5 +509,5 @@ Clipperz.PM.Strings.Languages['en-us'] = { <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>\ |