summaryrefslogtreecommitdiff
path: root/frontend/beta
Unidiff
Diffstat (limited to 'frontend/beta') (more/less context) (show whitespace changes)
-rw-r--r--frontend/beta/css/yui-extensions/basic-dialog.css2
-rw-r--r--frontend/beta/js/Clipperz/PM/DataModel/Record.js8
2 files changed, 7 insertions, 3 deletions
diff --git a/frontend/beta/css/yui-extensions/basic-dialog.css b/frontend/beta/css/yui-extensions/basic-dialog.css
index bad0679..5a9f311 100644
--- a/frontend/beta/css/yui-extensions/basic-dialog.css
+++ b/frontend/beta/css/yui-extensions/basic-dialog.css
@@ -15,25 +15,24 @@ refer to http://www.clipperz.com.
15* Clipperz Community Edition is distributed in the hope that it will 15* Clipperz Community Edition is distributed in the hope that it will
16 be useful, but WITHOUT ANY WARRANTY; without even the implied 16 be useful, but WITHOUT ANY WARRANTY; without even the implied
17 warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 17 warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
18 See the GNU Affero General Public License for more details. 18 See the GNU Affero General Public License for more details.
19 19
20* You should have received a copy of the GNU Affero General Public 20* You should have received a copy of the GNU Affero General Public
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 background-image: url(../images/default/gradient-bg.gif);
28 background-color:#c3daf9; 27 background-color:#c3daf9;
29 border:1px solid #6593cf; 28 border:1px solid #6593cf;
30 z-index:10001; 29 z-index:10001;
31 overflow:hidden; 30 overflow:hidden;
32 position:absolute; 31 position:absolute;
33 left:0;top:0; 32 left:0;top:0;
34} 33}
35.ydlg-shadow{ 34.ydlg-shadow{
36 background:#aaaaaa; 35 background:#aaaaaa;
37 position:absolute; 36 position:absolute;
38 left:0;top:0; 37 left:0;top:0;
39} 38}
@@ -84,25 +83,24 @@ body.masked .ydlg select {
84 padding:5px; 83 padding:5px;
85} 84}
86.ydlg .ydlg-hd-left { 85.ydlg .ydlg-hd-left {
87 background: url(../images/default/basic-dialog/hd-sprite.gif) no-repeat 0 -41px; 86 background: url(../images/default/basic-dialog/hd-sprite.gif) no-repeat 0 -41px;
88 padding-left:3px; 87 padding-left:3px;
89 margin:0px; 88 margin:0px;
90} 89}
91.ydlg .ydlg-hd-right { 90.ydlg .ydlg-hd-right {
92 background: url(../images/default/basic-dialog/hd-sprite.gif) no-repeat right 0; 91 background: url(../images/default/basic-dialog/hd-sprite.gif) no-repeat right 0;
93 padding-right:3px; 92 padding-right:3px;
94} 93}
95.ydlg .ydlg-dlg-body{ 94.ydlg .ydlg-dlg-body{
96 background:url(../images/default/layout/gradient-bg.gif);
97 border:1px solid #6593cf; 95 border:1px solid #6593cf;
98 border-top:0 none; 96 border-top:0 none;
99 padding:10px; 97 padding:10px;
100 overflow:hidden; 98 overflow:hidden;
101} 99}
102.ydlg .ydlg-bd{ 100.ydlg .ydlg-bd{
103 overflow:hidden; 101 overflow:hidden;
104} 102}
105.ydlg .ydlg-ft{ 103.ydlg .ydlg-ft{
106 overflow:hidden; 104 overflow:hidden;
107 padding:5px; 105 padding:5px;
108 padding-bottom:0; 106 padding-bottom:0;
diff --git a/frontend/beta/js/Clipperz/PM/DataModel/Record.js b/frontend/beta/js/Clipperz/PM/DataModel/Record.js
index ffb45de..9e496de 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);
283 this.processDataToExtractLegacyValues(someValues['data']); 283 this.processDataToExtractLegacyValues(someValues['data']);
284 284
285 if (typeof(someValues['data']['notes']) != 'undefined') { 285 if (typeof(someValues['data']['notes']) != 'undefined') {
286 this.setNotes(someValues['data']['notes']); 286 this.setNotes(someValues['data']['notes']);
287 } 287 }
288 288
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 // information
297 if (someValues['versions'] == null) {
298 currentVersionParameters = someValues['currentVersion'];
299 } else {
296 currentVersionParameters = someValues['versions'][someValues['currentVersion']]; 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) {
303 vardirectLoginReference; 309 vardirectLoginReference;
304 310
305 for (directLoginReference in someValues['data']['directLogins']) { 311 for (directLoginReference in someValues['data']['directLogins']) {
306 var directLogin; 312 var directLogin;
307 var directLoginParameters; 313 var directLoginParameters;
308 314