author | Clipperz <info@clipperz.com> | 2013-01-09 11:05:50 (UTC) |
---|---|---|
committer | Clipperz <info@clipperz.com> | 2013-01-09 11:05:50 (UTC) |
commit | f6903b9a5670370ef742a02092ab72e4227ddcd9 (patch) (unidiff) | |
tree | 01a5c33671c05765729522dfd383d7434c1c0c35 /frontend/gamma | |
parent | 34726bbee84efbf0490f204d5d267b15fb4d3214 (diff) | |
download | clipperz-f6903b9a5670370ef742a02092ab72e4227ddcd9.zip clipperz-f6903b9a5670370ef742a02092ab72e4227ddcd9.tar.gz clipperz-f6903b9a5670370ef742a02092ab72e4227ddcd9.tar.bz2 |
Fixed application version display on /gamma
-rw-r--r-- | frontend/gamma/css/web.css | 1 | ||||
-rw-r--r-- | frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js | 2 |
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 | |||
@@ -497,96 +497,97 @@ div.pageHeaderAndBody div.pageHeader div#news div.grip div.gripHandler { | |||
497 | border-left: 5px solid transparent; | 497 | border-left: 5px solid transparent; |
498 | border-right: 5px solid transparent; | 498 | border-right: 5px solid transparent; |
499 | } | 499 | } |
500 | div.pageHeaderAndBody div.pageHeader div#news.open div.grip div.gripHandler { | 500 | div.pageHeaderAndBody div.pageHeader div#news.open div.grip div.gripHandler { |
501 | border-bottom: 5px solid #e9e9ec; | 501 | border-bottom: 5px solid #e9e9ec; |
502 | } | 502 | } |
503 | div.pageHeaderAndBody div.pageHeader div#news.hidden div.grip div.gripHandler { | 503 | 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 | } |
506 | div.pageFooter { | 506 | div.pageFooter { |
507 | margin-top: -90px; | 507 | margin-top: -90px; |
508 | height: 90px; | 508 | height: 90px; |
509 | clear: both; | 509 | clear: both; |
510 | } | 510 | } |
511 | div.pageFooter div.footerWrapper { | 511 | div.pageFooter div.footerWrapper { |
512 | clear: both; | 512 | clear: both; |
513 | padding-top: 10px; | 513 | padding-top: 10px; |
514 | } | 514 | } |
515 | div.pageFooter div.footerWrapper div.footerContent { | 515 | div.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 | } |
520 | div.pageFooter div.footerWrapper div.footerContent canvas.footerStarIcon { | 520 | 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 | } |
525 | div.pageFooter div.footerWrapper div.footerContent span.copyright { | 525 | div.pageFooter div.footerWrapper div.footerContent span.copyright { |
526 | padding-left: 10px; | 526 | padding-left: 10px; |
527 | color: #a0a0a0; | 527 | color: #a0a0a0; |
528 | } | 528 | } |
529 | div.pageFooter div.footerWrapper div.footerContent a { | 529 | 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 div.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 { | 544 | div.pageFooter div.footerWrapper div.footerContent div.applicationVersion a { |
545 | padding-left: 0px; | ||
545 | display: inline; | 546 | display: inline; |
546 | } | 547 | } |
547 | /* | 548 | /* |
548 | 549 | ||
549 | Color list: | 550 | Color 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 | */ |
563 | html { | 564 | html { |
564 | height: 100%; | 565 | height: 100%; |
565 | } | 566 | } |
566 | body { | 567 | body { |
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; |
569 | } | 570 | } |
570 | div.modalDialogMask.userInfoBoxMask { | 571 | div.modalDialogMask.userInfoBoxMask { |
571 | -moz-opacity: 0.0; | 572 | -moz-opacity: 0.0; |
572 | opacity: .0; | 573 | opacity: .0; |
573 | filter: alpha(opacity=0); | 574 | filter: alpha(opacity=0); |
574 | z-index: 19000; | 575 | z-index: 19000; |
575 | } | 576 | } |
576 | .reset-margin { | 577 | .reset-margin { |
577 | margin: 0px; | 578 | margin: 0px; |
578 | padding: 0px; | 579 | padding: 0px; |
579 | border: 0px; | 580 | border: 0px; |
580 | } | 581 | } |
581 | .clear { | 582 | .clear { |
582 | clear: both; | 583 | clear: both; |
583 | } | 584 | } |
584 | .hidden_none { | 585 | .hidden_none { |
585 | display: none; | 586 | display: none; |
586 | visibility: hidden; | 587 | visibility: hidden; |
587 | } | 588 | } |
588 | .keepTogether { | 589 | .keepTogether { |
589 | display: inline-block; | 590 | display: inline-block; |
590 | white-space: nowrap; | 591 | white-space: nowrap; |
591 | } | 592 | } |
592 | #mainDiv { | 593 | #mainDiv { |
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 | |||
@@ -8,60 +8,60 @@ For further information about its features and functionalities please | |||
8 | refer to http://www.clipperz.com. | 8 | refer to http://www.clipperz.com. |
9 | 9 | ||
10 | * Clipperz Community Edition is free software: you can redistribute | 10 | * Clipperz Community Edition is free software: you can redistribute |
11 | it and/or modify it under the terms of the GNU Affero General Public | 11 | it and/or modify it under the terms of the GNU Affero General Public |
12 | License as published by the Free Software Foundation, either version | 12 | License as published by the Free Software Foundation, either version |
13 | 3 of the License, or (at your option) any later version. | 13 | 3 of the License, or (at your option) any later version. |
14 | 14 | ||
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 | Clipperz.Base.module('Clipperz.PM.UI.Web.Components'); | 26 | Clipperz.Base.module('Clipperz.PM.UI.Web.Components'); |
27 | 27 | ||
28 | Clipperz.PM.UI.Web.Components.PageFooter = function(args) { | 28 | Clipperz.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 | ||
38 | Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageFooter, Clipperz.PM.UI.Common.Components.BaseComponent, { | 38 | Clipperz.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 © 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:'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 | }); |