summaryrefslogtreecommitdiff
path: root/frontend
authorClipperz <info@clipperz.com>2013-01-09 11:24:13 (UTC)
committer Clipperz <info@clipperz.com>2013-01-09 11:24:13 (UTC)
commit6cfcbb8deeb99b0b88f5ce3b34a5c9aa1877dc57 (patch) (unidiff)
treeae7ed58da6d0f4ce64b7ae4a4ba3f7b1519471d3 /frontend
parentf6903b9a5670370ef742a02092ab72e4227ddcd9 (diff)
parent0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9 (diff)
downloadclipperz-6cfcbb8deeb99b0b88f5ce3b34a5c9aa1877dc57.zip
clipperz-6cfcbb8deeb99b0b88f5ce3b34a5c9aa1877dc57.tar.gz
clipperz-6cfcbb8deeb99b0b88f5ce3b34a5c9aa1877dc57.tar.bz2
Merge branch 'master' of github.com:clipperz/password-manager
Conflicts: frontend/beta/css/yui-extensions/basic-dialog.css
Diffstat (limited to 'frontend') (more/less context) (ignore whitespace changes)
-rw-r--r--frontend/beta/css/yui-extensions/basic-dialog.css6
-rw-r--r--frontend/beta/js/Clipperz/PM/DataModel/Record.js10
-rw-r--r--frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js2
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
@@ -21,13 +21,16 @@ refer to http://www.clipperz.com.
21 License along with Clipperz Community Edition. If not, see 21 License along with Clipperz Community Edition. If not, see
22 <http://www.gnu.org/licenses/>. 22 <http://www.gnu.org/licenses/>.
23 23
24*/ 24*/
25 25
26.ydlg-proxy { 26.ydlg-proxy {
27<<<<<<< HEAD
27 background-image: url(./images/default/gradient-bg.gif); 28 background-image: url(./images/default/gradient-bg.gif);
29=======
30>>>>>>> 0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9
28 background-color:#c3daf9; 31 background-color:#c3daf9;
29 border:1px solid #6593cf; 32 border:1px solid #6593cf;
30 z-index:10001; 33 z-index:10001;
31 overflow:hidden; 34 overflow:hidden;
32 position:absolute; 35 position:absolute;
33 left:0;top:0; 36 left:0;top:0;
@@ -90,13 +93,16 @@ body.masked .ydlg select {
90} 93}
91.ydlg .ydlg-hd-right { 94.ydlg .ydlg-hd-right {
92 background: url(./images/default/basic-dialog/hd-sprite.gif) no-repeat right 0; 95 background: url(./images/default/basic-dialog/hd-sprite.gif) no-repeat right 0;
93 padding-right:3px; 96 padding-right:3px;
94} 97}
95.ydlg .ydlg-dlg-body{ 98.ydlg .ydlg-dlg-body{
99<<<<<<< HEAD
96 background:url(./images/default/layout/gradient-bg.gif); 100 background:url(./images/default/layout/gradient-bg.gif);
101=======
102>>>>>>> 0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9
97 border:1px solid #6593cf; 103 border:1px solid #6593cf;
98 border-top:0 none; 104 border-top:0 none;
99 padding:10px; 105 padding:10px;
100 overflow:hidden; 106 overflow:hidden;
101} 107}
102.ydlg .ydlg-bd{ 108.ydlg .ydlg-bd{
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
@@ -289,14 +289,20 @@ console.log("Record.processData", someValues);
289 if (someValues['data']['currentVersionKey'] != null) { 289 if (someValues['data']['currentVersionKey'] != null) {
290 this.setCurrentVersionKey(someValues['data']['currentVersionKey']); 290 this.setCurrentVersionKey(someValues['data']['currentVersionKey']);
291 } else { 291 } else {
292 this.setCurrentVersionKey(this.key()); 292 this.setCurrentVersionKey(this.key());
293 } 293 }
294 294
295 // currentVersionParameters = someValues['currentVersion']; 295 // community edition doesn't currently pass version
296 currentVersionParameters = someValues['versions'][someValues['currentVersion']]; 296 // information
297 if (someValues['versions'] == null) {
298 currentVersionParameters = someValues['currentVersion'];
299 } else {
300 currentVersionParameters = someValues['versions'][someValues['currentVersion']];
301 }
302
297console.log("Record.processData - this.currentVersionKey()", this.currentVersionKey()); 303console.log("Record.processData - this.currentVersionKey()", this.currentVersionKey());
298console.log("Record.processData - currentVersionParameters", currentVersionParameters); 304console.log("Record.processData - currentVersionParameters", currentVersionParameters);
299 currentVersionParameters['key'] = this.currentVersionKey(); 305 currentVersionParameters['key'] = this.currentVersionKey();
300 this.setCurrentVersion(new Clipperz.PM.DataModel.RecordVersion(this, currentVersionParameters)); 306 this.setCurrentVersion(new Clipperz.PM.DataModel.RecordVersion(this, currentVersionParameters));
301 307
302 if (someValues['data']['directLogins'] != null) { 308 if (someValues['data']['directLogins'] != null) {
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
@@ -505,13 +505,13 @@ Clipperz.PM.Strings.Languages['en-us'] = {
505 \ 505 \
506 <h3>How to launch Clipperz Compact in the sidebar</h3>\ 506 <h3>How to launch Clipperz Compact in the sidebar</h3>\
507 <ol>\ 507 <ol>\
508 <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>\ 508 <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>\
509 <li>\ 509 <li>\
510 <p>Add the following URL to Firefox bookmarks, or even better, drag it to the bookmark bar.</p>\ 510 <p>Add the following URL to Firefox bookmarks, or even better, drag it to the bookmark bar.</p>\
511 <div id=\"compactLinkBox\"><a href=\"https://www.clipperz.com/beta/index.html?compact\" target=\"_search\">Clipperz Compact</a></div>\ 511 <div id=\"compactLinkBox\"><a href=\"index.html?compact\" target=\"_search\">Clipperz Compact</a></div>\
512 </li>\ 512 </li>\
513 <li><p>Change the properties of the bookmark so that “load this bookmark in the sidebar” is checked.</p></li>\ 513 <li><p>Change the properties of the bookmark so that “load this bookmark in the sidebar” is checked.</p></li>\
514 </ol>\ 514 </ol>\
515 \ 515 \
516 <h5>Added bonus: Clipperz Compact works also in Opera’s panel.</h5>", 516 <h5>Added bonus: Clipperz Compact works also in Opera’s panel.</h5>",
517 517