author | Clipperz <info@clipperz.com> | 2013-01-09 10:56:27 (UTC) |
---|---|---|
committer | Clipperz <info@clipperz.com> | 2013-01-09 10:56:27 (UTC) |
commit | 34726bbee84efbf0490f204d5d267b15fb4d3214 (patch) (unidiff) | |
tree | 1dcc3953e6dd153b9c59232e63085dd6b0d88021 /frontend | |
parent | 5996ee475c193f08a713eb53338e4769c2716aa7 (diff) | |
download | clipperz-34726bbee84efbf0490f204d5d267b15fb4d3214.zip clipperz-34726bbee84efbf0490f204d5d267b15fb4d3214.tar.gz clipperz-34726bbee84efbf0490f204d5d267b15fb4d3214.tar.bz2 |
Fixed application version display on /gamma
-rw-r--r-- | frontend/gamma/css/web.css | 5 | ||||
-rw-r--r-- | frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js | 2 |
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 | |||
@@ -530,20 +530,23 @@ div.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 | } |
536 | div.pageFooter div.footerWrapper div.footerContent span.applicationVersion { | 536 | div.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 | } |
544 | div.pageFooter div.footerWrapper div.footerContent div.applicationVersion a { | ||
545 | display: inline; | ||
546 | } | ||
544 | /* | 547 | /* |
545 | 548 | ||
546 | Color list: | 549 | Color list: |
547 | - login box: | 550 | - login box: |
548 | light#ff9955 | 551 | light#ff9955 |
549 | dark#ff6622 | 552 | dark#ff6622 |
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 | |||
@@ -50,13 +50,13 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageFooter, Clipperz.PM.UI.Co | |||
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 © 2009-2013 Clipperz Srl'}, | 53 | {tag:'span', cls:'copyright', html:'Copyright © 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 | }, |