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

Conflicts:
	frontend/beta/css/yui-extensions/basic-dialog.css

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
@@ -15,25 +15,28 @@ refer to http://www.clipperz.com.
 * Clipperz Community Edition is distributed in the hope that it will
   be useful, but WITHOUT ANY WARRANTY; without even the implied
   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
   License along with Clipperz Community Edition.  If not, see
   <http://www.gnu.org/licenses/>.
 
 */
 
 .ydlg-proxy {

+<<<<<<< HEAD
         background-image: url(./images/default/gradient-bg.gif);

+=======
+>>>>>>> 0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9
         background-color:#c3daf9;

         border:1px solid #6593cf;

         z-index:10001;

         overflow:hidden;

         position:absolute;

         left:0;top:0;

 }

 .ydlg-shadow{

         background:#aaaaaa;

         position:absolute;

         left:0;top:0;

 }

@@ -84,25 +87,28 @@ body.masked .ydlg select {
         padding:5px;

 }

 .ydlg .ydlg-hd-left {

         background: url(./images/default/basic-dialog/hd-sprite.gif) no-repeat 0 -41px;

         padding-left:3px;

         margin:0px;

 }

 .ydlg .ydlg-hd-right {

         background: url(./images/default/basic-dialog/hd-sprite.gif) no-repeat right 0;

         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;

         overflow:hidden;

 }

 .ydlg .ydlg-bd{

         overflow:hidden;

 }

 .ydlg .ydlg-ft{

         overflow:hidden;

         padding:5px;

         padding-bottom:0;

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
@@ -283,26 +283,32 @@ 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());
                         }
 
-        //              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();
                         this.setCurrentVersion(new Clipperz.PM.DataModel.RecordVersion(this, currentVersionParameters));
                         
                         if (someValues['data']['directLogins'] != null) {
                                         vardirectLoginReference;
                         
                                 for (directLoginReference in someValues['data']['directLogins']) {
                                         var directLogin;
                                         var directLoginParameters;
                                 
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
@@ -499,25 +499,25 @@ Clipperz.PM.Strings.Languages['en-us'] = {
 
         //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=\"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>\
         \
         <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>\