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
@@ -449,192 +449,193 @@ div.pageHeaderAndBody div.pageHeader div#featureTabs canvas.featureIcon {
449 float: left; 449 float: left;
450 background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffad79), to(#ff6622)); 450 background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffad79), to(#ff6622));
451 background: -moz-linear-gradient(0% 100% 90deg, #ff6622, #ffad79); 451 background: -moz-linear-gradient(0% 100% 90deg, #ff6622, #ffad79);
452 border-radius: 38px; 452 border-radius: 38px;
453 -moz-border-radius: 38px; 453 -moz-border-radius: 38px;
454 -webkit-border-radius: 38px; 454 -webkit-border-radius: 38px;
455} 455}
456div.pageHeaderAndBody div.pageHeader div#news { 456div.pageHeaderAndBody div.pageHeader div#news {
457 top: -82px; 457 top: -82px;
458 left: 240px; 458 left: 240px;
459 width: 310px; 459 width: 310px;
460 height: 90px; 460 height: 90px;
461 position: absolute; 461 position: absolute;
462 background-color: #616475; 462 background-color: #616475;
463 -webkit-border-bottom-left-radius: 8px; 463 -webkit-border-bottom-left-radius: 8px;
464 -moz-border-radius-bottomleft: 8px; 464 -moz-border-radius-bottomleft: 8px;
465 border-bottom-left-radius: 8px; 465 border-bottom-left-radius: 8px;
466 -webkit-border-bottom-right-radius: 8px; 466 -webkit-border-bottom-right-radius: 8px;
467 -moz-border-radius-bottomright: 8px; 467 -moz-border-radius-bottomright: 8px;
468 border-bottom-right-radius: 8px; 468 border-bottom-right-radius: 8px;
469 -webkit-box-shadow: 2px 2px 9px #333333; 469 -webkit-box-shadow: 2px 2px 9px #333333;
470 -moz-box-shadow: 2px 2px 9px #333333; 470 -moz-box-shadow: 2px 2px 9px #333333;
471 box-shadow: 2px 2px 9px #333333; 471 box-shadow: 2px 2px 9px #333333;
472} 472}
473div.pageHeaderAndBody div.pageHeader div#news div#newsframe { 473div.pageHeaderAndBody div.pageHeader div#news div#newsframe {
474 margin-left: 10px; 474 margin-left: 10px;
475 margin-right: 10px; 475 margin-right: 10px;
476 height: 75px; 476 height: 75px;
477 overflow: hidden; 477 overflow: hidden;
478} 478}
479div.pageHeaderAndBody div.pageHeader div#news div#newsframe iframe { 479div.pageHeaderAndBody div.pageHeader div#news div#newsframe iframe {
480 width: 290px; 480 width: 290px;
481 border: 0px; 481 border: 0px;
482 color: #616475; 482 color: #616475;
483 background-color: #616475; 483 background-color: #616475;
484} 484}
485div.pageHeaderAndBody div.pageHeader div#news div.grip { 485div.pageHeaderAndBody div.pageHeader div#news div.grip {
486 width: 310px; 486 width: 310px;
487 height: 6px; 487 height: 6px;
488 margin-top: 2px; 488 margin-top: 2px;
489 cursor: pointer; 489 cursor: pointer;
490} 490}
491div.pageHeaderAndBody div.pageHeader div#news div.grip div.gripHandler { 491div.pageHeaderAndBody div.pageHeader div#news div.grip div.gripHandler {
492 margin-left: auto; 492 margin-left: auto;
493 margin-right: auto; 493 margin-right: auto;
494 margin-top: 8px; 494 margin-top: 8px;
495 width: 0; 495 width: 0;
496 height: 0; 496 height: 0;
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}
500div.pageHeaderAndBody div.pageHeader div#news.open div.grip div.gripHandler { 500div.pageHeaderAndBody div.pageHeader div#news.open div.grip div.gripHandler {
501 border-bottom: 5px solid #e9e9ec; 501 border-bottom: 5px solid #e9e9ec;
502} 502}
503div.pageHeaderAndBody div.pageHeader div#news.hidden div.grip div.gripHandler { 503div.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 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;
569} 570}
570div.modalDialogMask.userInfoBoxMask { 571div.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 {
593 margin: 0 auto; 594 margin: 0 auto;
594} 595}
595div#loginBox { 596div#loginBox {
596 width: 273px; 597 width: 273px;
597 z-index: 19000; 598 z-index: 19000;
598 top: -30px; 599 top: -30px;
599 right: 30px; 600 right: 30px;
600 position: relative; 601 position: relative;
601 float: right; 602 float: right;
602} 603}
603div#loginBox div.header { 604div#loginBox div.header {
604 height: 25px; 605 height: 25px;
605 width: 273px; 606 width: 273px;
606 background-color: #ff9b5a; 607 background-color: #ff9b5a;
607 -webkit-border-top-left-radius: 20px; 608 -webkit-border-top-left-radius: 20px;
608 -moz-border-radius-topleft: 20px; 609 -moz-border-radius-topleft: 20px;
609 border-top-left-radius: 20px; 610 border-top-left-radius: 20px;
610 -webkit-border-top-right-radius: 20px; 611 -webkit-border-top-right-radius: 20px;
611 -moz-border-radius-topright: 20px; 612 -moz-border-radius-topright: 20px;
612 border-top-right-radius: 20px; 613 border-top-right-radius: 20px;
613} 614}
614div#loginBox div.body { 615div#loginBox div.body {
615 background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ff9b5a), to(#ff6622)); 616 background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ff9b5a), to(#ff6622));
616 background: -moz-linear-gradient(0% 100% 90deg, #ff6622, #ff9b5a); 617 background: -moz-linear-gradient(0% 100% 90deg, #ff6622, #ff9b5a);
617} 618}
618div#loginBox div.body h4 { 619div#loginBox div.body h4 {
619 color: #ffffff; 620 color: #ffffff;
620 font-size: 16pt; 621 font-size: 16pt;
621 font-weight: normal; 622 font-weight: normal;
622 padding-left: 20px; 623 padding-left: 20px;
623 margin: 0px; 624 margin: 0px;
624} 625}
625div#loginBox div.body form.loginForm { 626div#loginBox div.body form.loginForm {
626 padding: 5px 20px 0px; 627 padding: 5px 20px 0px;
627 margin-bottom: 0px; 628 margin-bottom: 0px;
628} 629}
629div#loginBox div.body form.loginForm label { 630div#loginBox div.body form.loginForm label {
630 color: #ffffff; 631 color: #ffffff;
631 font-size: 10pt; 632 font-size: 10pt;
632 display: block; 633 display: block;
633 padding-top: 5px; 634 padding-top: 5px;
634} 635}
635div#loginBox div.body form.loginForm label.checkbox { 636div#loginBox div.body form.loginForm label.checkbox {
636 display: inline; 637 display: inline;
637} 638}
638div#loginBox div.body form.loginForm input { 639div#loginBox div.body form.loginForm input {
639 width: 230px; 640 width: 230px;
640 font-size: 14pt; 641 font-size: 14pt;
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
@@ -1,67 +1,67 @@
1/* 1/*
2 2
3Copyright 2008-2011 Clipperz Srl 3Copyright 2008-2011 Clipperz Srl
4 4
5This file is part of Clipperz Community Edition. 5This file is part of Clipperz Community Edition.
6Clipperz Community Edition is an online password manager. 6Clipperz Community Edition is an online password manager.
7For further information about its features and functionalities please 7For further information about its features and functionalities please
8refer to http://www.clipperz.com. 8refer 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
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:'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});