summaryrefslogtreecommitdiff
path: root/frontend
authorClipperz <info@clipperz.com>2013-01-09 11:05:50 (UTC)
committer Clipperz <info@clipperz.com>2013-01-09 11:05:50 (UTC)
commitf6903b9a5670370ef742a02092ab72e4227ddcd9 (patch) (unidiff)
tree01a5c33671c05765729522dfd383d7434c1c0c35 /frontend
parent34726bbee84efbf0490f204d5d267b15fb4d3214 (diff)
downloadclipperz-f6903b9a5670370ef742a02092ab72e4227ddcd9.zip
clipperz-f6903b9a5670370ef742a02092ab72e4227ddcd9.tar.gz
clipperz-f6903b9a5670370ef742a02092ab72e4227ddcd9.tar.bz2
Fixed application version display on /gamma
Diffstat (limited to 'frontend') (more/less context) (ignore whitespace changes)
-rw-r--r--frontend/gamma/css/web.css1
-rw-r--r--frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js2
2 files changed, 2 insertions, 1 deletions
diff --git a/frontend/gamma/css/web.css b/frontend/gamma/css/web.css
index 94cd715..5d8bc20 100644
--- a/frontend/gamma/css/web.css
+++ b/frontend/gamma/css/web.css
@@ -521,48 +521,49 @@ div.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 div.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 { 544div.pageFooter div.footerWrapper div.footerContent div.applicationVersion a {
545 padding-left: 0px;
545 display: inline; 546 display: inline;
546} 547}
547/* 548/*
548 549
549Color list: 550Color list:
550- login box: 551- login box:
551 light#ff9955 552 light#ff9955
552 dark#ff6622 553 dark#ff6622
553- login button: 554- login button:
554 regular#dd5500 555 regular#dd5500
555 hover#773311 556 hover#773311
556- login translations: 557- login translations:
557 box: #cc6622; 558 box: #cc6622;
558 not-selected: 559 not-selected:
559 color: #ddaa99 560 color: #ddaa99
560 background:#994422 561 background:#994422
561 selected: #772211; 562 selected: #772211;
562*/ 563*/
563html { 564html {
564 height: 100%; 565 height: 100%;
565} 566}
566body { 567body {
567 font-family: Helvetica-Neue, Helvetica, Arial, Geneva, sans-serif; 568 font-family: Helvetica-Neue, Helvetica, Arial, Geneva, sans-serif;
568 margin: 0px; 569 margin: 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 e6ae72b..dcf506f 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js
@@ -32,36 +32,36 @@ Clipperz.PM.UI.Web.Components.PageFooter = function(args) {
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:'div', 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});