| -rw-r--r-- | frontend/beta/css/yui-extensions/basic-dialog.css | 6 | ||||
| -rw-r--r-- | frontend/beta/js/Clipperz/PM/DataModel/Record.js | 8 | ||||
| -rw-r--r-- | frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js | 2 | ||||
| -rw-r--r-- | scripts/builder/repository.py | 11 |
4 files changed, 24 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 @@ -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;
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 @@ -292,8 +292,14 @@ console.log("Record.processData", someValues); this.setCurrentVersionKey(this.key()); } -// currentVersionParameters = 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(); 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 @@ -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>\ diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py index a47e249..7ac2324 100644 --- a/scripts/builder/repository.py +++ b/scripts/builder/repository.py @@ -11,12 +11,14 @@ def repositoryWithPath (path): except: try: from git import Repo - repo = Repo(path) result = GitRepository(repo, path) + except ImportError, exception: print "Failed to import git, please install http://gitorious.org/git-python" raise exception + except: + result = SnapshotRepository('', path) return result @@ -86,3 +88,10 @@ class HgRepository(Repository): #=================================================================== + +class SnapshotRepository(Repository): + def revision (self): + return 'SNAPSHOT' + + def areTherePendingChanges (self): + return False |