clipperz/password-manager-mirror
1
0
Fork 0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2025-10-24 01:07:35 +02:00
Code Issues Releases Wiki Activity

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

Browse Source 
Conflicts:
	frontend/beta/css/yui-extensions/basic-dialog.css
This commit is contained in:
Clipperz
2013-01-09 12:24:13 +01:00
parent f6903b9a56 0db1d5c8b1
commit 6cfcbb8dee
4 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/beta/css/yui-extensions/basic-dialog.css
View File

@@ -24,7 +24,10 @@ 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;
z-index:10001;
@@ -93,7 +96,10 @@ body.masked .ydlg select {
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;

10
frontend/beta/js/Clipperz/PM/DataModel/Record.js
View File

@@ -292,8 +292,14 @@ console.log("Record.processData", someValues);
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();

2
frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js
View File

@@ -508,7 +508,7 @@ Clipperz.PM.Strings.Languages['en-us'] = {
<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>\