summaryrefslogtreecommitdiff
authorClipperz <info@clipperz.com>2013-01-09 10:56:27 (UTC)
committer Clipperz <info@clipperz.com>2013-01-09 10:56:27 (UTC)
commit34726bbee84efbf0490f204d5d267b15fb4d3214 (patch) (unidiff)
tree1dcc3953e6dd153b9c59232e63085dd6b0d88021
parent5996ee475c193f08a713eb53338e4769c2716aa7 (diff)
downloadclipperz-34726bbee84efbf0490f204d5d267b15fb4d3214.zip
clipperz-34726bbee84efbf0490f204d5d267b15fb4d3214.tar.gz
clipperz-34726bbee84efbf0490f204d5d267b15fb4d3214.tar.bz2
Fixed application version display on /gamma
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--frontend/gamma/css/web.css5
-rw-r--r--frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js2
2 files changed, 5 insertions, 2 deletions
diff --git a/frontend/gamma/css/web.css b/frontend/gamma/css/web.css
index 3540016..94cd715 100644
--- a/frontend/gamma/css/web.css
+++ b/frontend/gamma/css/web.css
@@ -504,72 +504,75 @@ div.pageHeaderAndBody div.pageHeader div#news.hidden div.grip div.gripHandler {
504 border-top: 5px solid #e9e9ec; 504 border-top: 5px solid #e9e9ec;
505} 505}
506div.pageFooter { 506div.pageFooter {
507 margin-top: -90px; 507 margin-top: -90px;
508 height: 90px; 508 height: 90px;
509 clear: both; 509 clear: both;
510} 510}
511div.pageFooter div.footerWrapper { 511div.pageFooter div.footerWrapper {
512 clear: both; 512 clear: both;
513 padding-top: 10px; 513 padding-top: 10px;
514} 514}
515div.pageFooter div.footerWrapper div.footerContent { 515div.pageFooter div.footerWrapper div.footerContent {
516 background-color: #eaebe6; 516 background-color: #eaebe6;
517 padding: 20px; 517 padding: 20px;
518 font-size: 8pt; 518 font-size: 8pt;
519} 519}
520div.pageFooter div.footerWrapper div.footerContent canvas.footerStarIcon { 520div.pageFooter div.footerWrapper div.footerContent canvas.footerStarIcon {
521 width: 40px; 521 width: 40px;
522 height: 40px; 522 height: 40px;
523 float: left; 523 float: left;
524} 524}
525div.pageFooter div.footerWrapper div.footerContent span.copyright { 525div.pageFooter div.footerWrapper div.footerContent span.copyright {
526 padding-left: 10px; 526 padding-left: 10px;
527 color: #a0a0a0; 527 color: #a0a0a0;
528} 528}
529div.pageFooter div.footerWrapper div.footerContent a { 529div.pageFooter div.footerWrapper div.footerContent a {
530 padding-left: 50px; 530 padding-left: 50px;
531 display: block; 531 display: block;
532 color: #888888; 532 color: #888888;
533 font-weight: bold; 533 font-weight: bold;
534 text-decoration: none; 534 text-decoration: none;
535} 535}
536div.pageFooter div.footerWrapper div.footerContent span.applicationVersion { 536div.pageFooter div.footerWrapper div.footerContent div.applicationVersion {
537 padding: 8px; 537 padding: 8px;
538 color: #888888; 538 color: #888888;
539 background-color: #d2d2d2; 539 background-color: #d2d2d2;
540 position: relative; 540 position: relative;
541 top: -40px; 541 top: -40px;
542 float: right; 542 float: right;
543} 543}
544div.pageFooter div.footerWrapper div.footerContent div.applicationVersion a {
545 display: inline;
546}
544/* 547/*
545 548
546Color list: 549Color list:
547- login box: 550- login box:
548 light#ff9955 551 light#ff9955
549 dark#ff6622 552 dark#ff6622
550- login button: 553- login button:
551 regular#dd5500 554 regular#dd5500
552 hover#773311 555 hover#773311
553- login translations: 556- login translations:
554 box: #cc6622; 557 box: #cc6622;
555 not-selected: 558 not-selected:
556 color: #ddaa99 559 color: #ddaa99
557 background:#994422 560 background:#994422
558 selected: #772211; 561 selected: #772211;
559*/ 562*/
560html { 563html {
561 height: 100%; 564 height: 100%;
562} 565}
563body { 566body {
564 font-family: Helvetica-Neue, Helvetica, Arial, Geneva, sans-serif; 567 font-family: Helvetica-Neue, Helvetica, Arial, Geneva, sans-serif;
565 margin: 0px; 568 margin: 0px;
566} 569}
567div.modalDialogMask.userInfoBoxMask { 570div.modalDialogMask.userInfoBoxMask {
568 -moz-opacity: 0.0; 571 -moz-opacity: 0.0;
569 opacity: .0; 572 opacity: .0;
570 filter: alpha(opacity=0); 573 filter: alpha(opacity=0);
571 z-index: 19000; 574 z-index: 19000;
572} 575}
573.reset-margin { 576.reset-margin {
574 margin: 0px; 577 margin: 0px;
575 padding: 0px; 578 padding: 0px;
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js
index 2b2865c..e6ae72b 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js
@@ -24,44 +24,44 @@ refer to http://www.clipperz.com.
24*/ 24*/
25 25
26Clipperz.Base.module('Clipperz.PM.UI.Web.Components'); 26Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
27 27
28Clipperz.PM.UI.Web.Components.PageFooter = function(args) { 28Clipperz.PM.UI.Web.Components.PageFooter = function(args) {
29 args = args || {}; 29 args = args || {};
30 30
31 Clipperz.PM.UI.Web.Components.PageFooter.superclass.constructor.apply(this, arguments); 31 Clipperz.PM.UI.Web.Components.PageFooter.superclass.constructor.apply(this, arguments);
32 32
33 return this; 33 return this;
34} 34}
35 35
36//============================================================================= 36//=============================================================================
37 37
38Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageFooter, Clipperz.PM.UI.Common.Components.BaseComponent, { 38Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageFooter, Clipperz.PM.UI.Common.Components.BaseComponent, {
39 39
40 //------------------------------------------------------------------------- 40 //-------------------------------------------------------------------------
41 41
42 'toString': function () { 42 'toString': function () {
43 return "Clipperz.PM.UI.Web.Components.PageFooter component"; 43 return "Clipperz.PM.UI.Web.Components.PageFooter component";
44 }, 44 },
45 45
46 //------------------------------------------------------------------------- 46 //-------------------------------------------------------------------------
47 47
48 'renderSelf': function(/*aContainer, aPosition*/) { 48 'renderSelf': function(/*aContainer, aPosition*/) {
49 this.append(this.element(), [ 49 this.append(this.element(), [
50 {tag:'div', cls:'footerWrapper', children:[ 50 {tag:'div', cls:'footerWrapper', children:[
51 {tag:'div', cls:'footerContent', children:[ 51 {tag:'div', cls:'footerContent', children:[
52 {tag:'canvas', id:this.getId('footerStarIcon'), cls:'footerStarIcon'}, 52 {tag:'canvas', id:this.getId('footerStarIcon'), cls:'footerStarIcon'},
53 {tag:'span', cls:'copyright', html:'Copyright &copy; 2009-2013 Clipperz Srl'}, 53 {tag:'span', cls:'copyright', html:'Copyright &copy; 2009-2013 Clipperz Srl'},
54 {tag:'a', href:'http://www.clipperz.com/terms_of_service',target:'_blank', html:'terms of service'}, 54 {tag:'a', href:'http://www.clipperz.com/terms_of_service',target:'_blank', html:'terms of service'},
55 {tag:'a', href:'http://www.clipperz.com/privacy_policy',target:'_blank', html:'privacy policy'}, 55 {tag:'a', href:'http://www.clipperz.com/privacy_policy',target:'_blank', html:'privacy policy'},
56 {tag:'span', cls:'applicationVersion', htmlString:'application version: [<a href="https://github.com/clipperz/password-manager/tree/' + Clipperz_version + '" target="github">' + Clipperz_version + '</a>]'} 56 {tag:'div', cls:'applicationVersion', htmlString:'application version: [<a href="https://github.com/clipperz/password-manager/tree/' + Clipperz_version + '" target="github">' + Clipperz_version + '</a>]'}
57 ]} 57 ]}
58 ]} 58 ]}
59 ]); 59 ]);
60 60
61 Clipperz.PM.UI.Canvas.star.normal(this.getElement('footerStarIcon'), "#7e7e7e"); 61 Clipperz.PM.UI.Canvas.star.normal(this.getElement('footerStarIcon'), "#7e7e7e");
62 }, 62 },
63 63
64 //------------------------------------------------------------------------- 64 //-------------------------------------------------------------------------
65 65
66 __syntaxFix__: "syntax fix" 66 __syntaxFix__: "syntax fix"
67}); 67});