From e44aadcd4fcf8ff5fe95b58976f4c372356f718e Mon Sep 17 00:00:00 2001 From: Olga Brani Date: Tue, 12 Feb 2013 17:32:50 +0200 Subject: [PATCH] Synchronization of static files with Astakos --- cloudcms/static/cloudcms/css/forms.css | 45 +++++++++---- cloudcms/static/cloudcms/css/modules.css | 96 +++++++++++++++++++++++---- cloudcms/static/cloudcms/js/common.js | 105 +++++++++++++++++++++++------- 3 files changed, 199 insertions(+), 47 deletions(-) diff --git a/cloudcms/static/cloudcms/css/forms.css b/cloudcms/static/cloudcms/css/forms.css index 2ac23e5..6b34891 100644 --- a/cloudcms/static/cloudcms/css/forms.css +++ b/cloudcms/static/cloudcms/css/forms.css @@ -1,17 +1,17 @@ /* generic form styles */ input, textarea, .form-widget { background-color: #ffffff; color: #000;border-color: #000000; } -#forms .input, #forms input { font-family: 'Didact Gothic', Verdana, sans-serif; font-size: 14px; font-weight: normal; line-height: 22px; letter-spacing: 1px; border: 1px solid #808080; height: 21px; display: inline-block; margin-bottom: -1px; padding: 0.8em; padding-left: 1.5em; z-index: 2; } +#forms .input, #forms input { font-family: 'Didact Gothic', Verdana, sans-serif; font-size: 14px; font-weight: normal; line-height: 22px; letter-spacing: 1px; border: 1px solid #9e9e9e; height: 21px; display: inline-block; margin-bottom: -1px; padding: 0.8em; padding-left: 1.5em; z-index: 2; } #forms .input:focus, #forms input:focus { position: relative; border: 1px solid #000; z-index: 100; } #forms .input:focus label, #forms input:focus label { z-index: 300; } form.withlabels label { width: 224px; display: block; float: left; padding-top: 0.8em; } form.withlabels input[type=text], -form.withlabels input[type=password] { width: 270px; } +form.withlabels input[type=password] { width: 228px; } form.withlabels input[type=text].long, form.withlabels input[type=password].long, form.withlabels textarea.long { width: 224px; } -form.withlabels textarea { width:270px; } +form.withlabels textarea { width:228px; } .login-section a.button { margin-bottom: 12px; } .login-section a.button:last-child { margin-bottom: none;} .login-section a.button.withicon { background-repeat: no-repeat; background-position: 15px 50%; padding-left: 40px; } @@ -21,7 +21,7 @@ form h2 span { padding-bottom: 3px; } form .form-row { min-height: 30px; position: relative;} form .form-row.submit { margin: 22px 0 ;} form .form-row .extra-link { color: #808080; text-decoration: none; border: none; margin-top:15px; line-height:98%; display:inline-block; padding-top:15px; float: right; position:absolute; right:0; top:0; } -form .form-row .extra-link:hover { border-bottom:1px solid #808080;} +form .form-row .extra-link:hover { border-bottom:1px solid #9e9e9e;} form .form-row label { font-size: 1.077em; } form.innerlabels label { position: absolute; bottom: 11px; left: 1.5em; color: #808080 ; } form.innerlabels p { margin:0; position: relative;} @@ -33,8 +33,8 @@ form.innerlabels a:hover { } form textarea, form input.text, form input[type="text"], -form input[type="password"] { color:#808080; font-family: 'Didact Gothic', Verdana, sans-serif; font-weight: normal; line-height: 22px; letter-spacing: 1px;border: 1px solid #808080; height: 21px; display: inline-block; margin-bottom: -1px; padding: 0.8em; padding-left: 1.5em; z-index: 2; width:300px; } -form select { font-family: 'Didact Gothic', Verdana, sans-serif; font-weight: normal; line-height: 22px; letter-spacing: 1px; border: 1px solid #808080; display:block; margin-bottom: -1px; padding: 0.8em; padding-left: 1.5em; z-index: 2; width:301px; } +form input[type="password"] { color:#808080; font-family: 'Didact Gothic', Verdana, sans-serif; font-weight: normal; line-height: 22px; letter-spacing: 1px;border: 1px solid #9e9e9e; height: 21px; display: inline-block; margin-bottom: -1px; padding: 0.8em; padding-left: 1.5em; padding-right: 4em;z-index: 2; width:258px; } +form select { font-family: 'Didact Gothic', Verdana, sans-serif; font-weight: normal; line-height: 22px; letter-spacing: 1px; border: 1px solid #9e9e9e; display:block; margin-bottom: -1px; padding: 0.8em; padding-left: 1.5em; z-index: 2; width:301px; } form textarea:focus, form input.text:focus, form input[type="text"]:focus, @@ -66,19 +66,20 @@ form .with-errors select { color: #9d261d;} form .with-errors label { color: #e4776f; } .form-error { color:red; font-size: 0.8em; padding: 5px 5px; } .form-errors.all .form-error { position: relative; border-radius: 0; margin-bottom: 1.3em; padding: 0.5em; } -div.form-stacked { margin-bottom: 4em; } +div.form-stacked { margin-bottom: 2em; padding-bottom:1em; } .checkbox-widget.checked { background-color: #FF0000; background-image: url("../images/checkbox.png"); background-position: 50% 50%; } .content a.checkbox-widget { border: 1px solid #808080; cursor: pointer; display: block; float: left; height: 25px; margin:5px 20px 0 0 ; width: 25px; } form.withlabels .checkbox-widget { margin-top:12px; } form.innerlabels .checkbox-widget + label { position:static; line-height:36px; color:#808080; } form.innerlabels .checkbox-widget + label + a { border-bottom:1px solid #F89A1C; font-size: 1.1em; } -form span.info { position:absolute;z-index:7; top:10px; } +form span.info { position:absolute;z-index:7; bottom:32px; } form.innerlabels span.info { left: 290px; } form.withlabels span.info { left:485px; } form span.info em { display:block; overflow:hidden; position:absolute; left:0; text-indent:-100px; top:0; height:21px; width:21px; background:url(../images/symbols.png) no-repeat -4px -31px;cursor:pointer; } form span.info:hover em { background-position:-4px -3px; } form span.info span { position:absolute; left:29px; top:-2px; width:120px; padding-left:30px; background:url(../images/black-line.jpg ) no-repeat left 8px; min-height:50px; display:none; font-size:0.846em;} form span.info:hover span { display:block; } +form span.extra-img:hover +span.info span { display:block; } form .with-errors span.info { display:none;} form p { margin-bottom:0;position:relative;} form input[readonly=true] { /*background-color: #ddd;*/ color: #5e5e5e; } @@ -108,23 +109,23 @@ form .with-hidden { display:none; } /* custom captcha */ -#okeanos_recaptcha { width:329px; border:1px solid #808080; margin:0 0 20px; position:relative; } +#okeanos_recaptcha { width:329px; border:1px solid #9e9e9e; margin:0 0 20px; position:relative; } #okeanos_recaptcha #recaptcha_image { padding:15px 0; } #okeanos_recaptcha label.recaptcha_only_if_image, #okeanos_recaptcha label.recaptcha_only_if_audio{ position:absolute; top:auto; bottom:11px; } #okeanos_recaptcha a.recaptcha_audio_cant_hear_link { margin-left:20px; } -#okeanos_recaptcha #recaptcha_response_field { width:220px; float:left; margin-left:-1px; } +#okeanos_recaptcha #recaptcha_response_field { width:170px; float:left; margin-left:-1px; } #okeanos_recaptcha .img { width:23px; float:left; height:23px; overflow:hidden; margin:8px; } #okeanos_recaptcha .img a { display:block; width:100%; height:100%; background:url(../images/refresh_lg.png) no-repeat top left; text-indent:-100px } #okeanos_recaptcha .img-refresh a { background:url(../images/refresh_lg.png); } #okeanos_recaptcha .img-refresh a:hover { background:url(../images/refresh_g.png); } #okeanos_recaptcha .img-audio a { background:url(../images/sound_lg.png); } #okeanos_recaptcha .img-audio a:hover { background:url(../images/sound_g.png); } -#okeanos_recaptcha .actions-wrap { border-top:1px solid #808080 } +#okeanos_recaptcha .actions-wrap { border-top:1px solid #9e9e9e; } input.submit:focus, input[type="submit"]:focus, -.content a.submit:focus { box-shadow: 0 0 0 1px #FFFFFF inset; border:1px solid #F89A1C; outline:0 none; } +.content a.submit:focus { box-shadow: 0 0 0 1px #FFFFFF inset; border:1px solid #F89A1C; outline:0 none; line-height:20px;} .content a.submit:hover { border-color:#3582AC; } p+ form { margin:2em 0; } @@ -193,10 +194,28 @@ form.link-like.alone input[type="submit"] { padding:0; } form textarea, form input.text, form input[type="text"], - form input[type="password"] { width:90%; } + form input[type="password"] { width:75%; } .form-row .dk_container { width:100%; } } form.submit-inline { position:relative } form.submit-inline .form-row.submit { position:absolute; left:578px; top:0; margin:0; } form.submit-inline .form-row input { margin:0 20px 0 0 ; } form.signup .back { float:right; margin:15px 70px 0 0 ; height:43px; line-height:43px } + + +/* styles for complex profile form */ +form .form-following p span.extra-img { background:url(../images/symbols3.png) 0 -161px; z-index:8; } +form .form-following input:hover + span.extra-img { background-position:0 0px; } +form .form-following p:hover span.extra-img:hover { background-position:0 -54px; cursor:pointer; } +form .form-following.open p span.extra-img { background-position: -33px -161px; } +form .form-following.open input:hover + span.extra-img { background-position: -33px 0px; } +form .form-following.open p:hover span.extra-img:hover { background-position: -33px -54px; cursor:pointer; } + +form .refresh p span.extra-img { background:url(../images/symbols3.png) 54px -161px; z-index:8; } +form .refresh input:hover + span.extra-img { background-position:54px 0px; } +form .refresh p:hover span.extra-img:hover { background-position:54px -54px; cursor:pointer; } +form .refresh.open p span.extra-img { background-position: -33px -161px; } +form .refresh.open input:hover + span.extra-img { background-position: -33px 0px; } +form .refresh.open p:hover span.extra-img:hover { background-position: -33px -54px; cursor:pointer; } +.hidden-form-rows { display:none; } +.signup .form-row.with-checkbox { margin-top:1em; } diff --git a/cloudcms/static/cloudcms/css/modules.css b/cloudcms/static/cloudcms/css/modules.css index 866e02c..e7b33a2 100644 --- a/cloudcms/static/cloudcms/css/modules.css +++ b/cloudcms/static/cloudcms/css/modules.css @@ -8,6 +8,7 @@ body { overflow-y: scroll;} img.left { margin:0 1em 1em 0; float:left;} img.right { margin:0 0 1em 1em; float:right;} + /* footer */ .footer { font-size:0.923em;color:#B3B3B3; } @@ -34,7 +35,7 @@ img.right { margin:0 0 1em 1em; float:right;} .top-msg.error { background-color:#EF4F54; color: #fff} .top-msg.warning { background-color:#F6921E; color: #fff} .top-msg.info { background-color:#C3C3B9; color: #fff} -.top-msg.warning a { color: #3582AC} +.top-msg.warning a { color: #4F3515} .top-msg.info a { color: #222} /* container */ @@ -55,7 +56,7 @@ img.right { margin:0 0 1em 1em; float:right;} .two-cols .lt { float:left; width:400px;} .two-cols-blog .rt { float:right; width:220px; margin-left:80px; padding-right:65px;} .two-cols-blog .lt { overflow:hidden;} -.container h2 { font-weight:normal; font-size:1.308em; margin-bottom:1em; } +.container h2 { font-weight:normal; font-size:1.308em; margin-bottom:1.5em; } .container h3 { font-weight:normal; margin-bottom:1em; } .container h2 em { color: #3582AC; font-style:normal; } /*.content a { border-bottom: 1px solid #F89A1C; text-decoration:none; color:#000; } @@ -81,6 +82,8 @@ img.right { margin:0 0 1em 1em; float:right;} .faq ul li { padding:0; margin:0 0 8px 0; list-style:none outside none;line-height:140%; } .faq ul li a { color:#222222; border:0 none; } .faq .faq-category { margin: 0 0 1.5em;} +.faq .question.details ul li { list-style:circle inside none; } +.faq .question.details ul li a { color:#F6921E } .follow h3 a { color:#4085A6;} .follow a { border:0 none;} .follow ul { margin:0; padding:0;} @@ -391,18 +394,26 @@ table.alt-style tr td.info-td div { padding:15px; border:1px dashed #000 } /* end of workaround*/ .quotas-form legend span { color:#222; font-size:0.867em; } -form.quotas-form legend span.info { position:relative; display:inline-block; top:auto; left:auto; margin-left:10px; vertical-align:middle; margin-top:-2px;} +form.quotas-form legend span.info { position:relative; display:inline-block; top:auto; left:auto; bottom:auto; margin-left:10px; vertical-align:middle; margin-top:-2px;} form.quotas-form legend span.info em { position:static; } form.quotas-form legend span.info span { width:530px; } form.quotas-form span.info span { width:285px; } .quotas-form .with-checkbox .checkbox-widget { margin-top:9px; } .quotas-form .with-checkbox span.info { top:12px; } .quotas-form .form-row.submit { text-align:center; } -.quotas-form input[type="submit"] { margin:15px 0; background-color:#B3B3B3 } +.quotas-form input[type="submit"] { margin:15px 0; } +/* grey green buttons +.quotas-form input[type="submit"] { background-color:#B3B3B3 } .quotas-form input[type="submit"]:hover { background:#55B577 } .quotas-form input[type="submit"]:focus { border-color: #B3B3B3} .quotas-form input[type="submit"]:focus:hover { border-color: #55B577} +*/ + .quotas-form input[type="submit"].lt { position:absolute; left:0; top:0; } + +.form-row.submit .rt-link { position:absolute; right:70px;bottom:15px; } +.quotas-form .form-row.submit .rt-link { right:0; bottom:30px } +.form-row.submit .rt-link.reset { right:15px; } .quotas-form fieldset ul { padding:0; margin:0 0 1em; position:relative; } .quotas-form fieldset ul li { list-style:none outside none; float:left; margin:0 0 0 60px; padding:0; } .quotas-form fieldset ul li:first-child { margin-left:0; } @@ -419,6 +430,8 @@ form.quotas-form span.info span { width:285px; } .quotas-form .group fieldset { background:transparent; margin-bottom:1em; padding-bottom:1em; } .quotas-form .group fieldset legend { } .quotas-form fieldset ul li.rel+li.rel { background:url(../images/quota-related-bg.png) no-repeat left center; } + + .quotas-form .double-checks label { font-size:1.077em; } .quotas-form .double-checks .form-row { float:left; margin-right:10px;} .quotas-form .double-checks .with-checkbox .checkbox-widget { left:0; } @@ -434,8 +447,19 @@ form.quotas-form span.info span { width:285px; } .quotas-form .with-info .double-checks span.info { left:262px; } .quotas-form .with-info .with-checkbox { margin-bottom:12px; } .quotas-form .quota input[type="text"] { width:150px;} -.quotas-form .quota .error-msg { display:none; color:red; font-size:0.8em; margin:0; margin-left:224px; margin-bottom:5px; padding:5px; } + +/* quota form errors */ +.quotas-form .quota .with-errors input[type="text"] { border-color:#222; color:grey;} +.quotas-form .quota .with-errors.strong-error input[type="text"] { border-color:red; color:#9D261D} +.quotas-form .quota .with-errors .extra-img { display:none; } +.quotas-form .quota .with-errors.strong-error .extra-img { display:block; } +.quotas-form .quota .with-errors span.info { display:block; } +.quotas-form .quota .error-msg { display:none; color:#B3B3B3; font-size:0.8em; margin:0; margin-left:224px; margin-bottom:5px; padding:5px; } .quotas-form .quota .with-errors .error-msg { display:block;} +.quotas-form .quota .strong-error .error-msg { color:red; } +.quotas-form .quota .with-errors label { color:#222; } +.quotas-form .quota .with-errors.strong-error label { color:#E4776F } + form input[type="text"]::-webkit-input-placeholder, form textarea::-webkit-input-placeholder { color: #D4D4D4; font-style:italic; } form input[type="text"]:-moz-placeholder, @@ -449,22 +473,23 @@ form input[type="text"]:-ms-input-placeholder, /* stats */ .stats ul { margin:0; padding:0; list-style:none outside none; } .stats ul li { margin:0 0 1em 0; padding:0 0 1em 0; list-style:none outside none; background:url(../images/stats-line.jpg) repeat-x left bottom} -.stats .bar { padding: 0; text-align:center; float:left; width:200px;} +.stats .bar { padding: 0; float:left; } .stats .bar div { width:340px; height:30px; border:1px solid #000; margin-top:20px; overflow:hidden;} -.stats .bar span { text-align:right; display:block; height:100%; position: relative; overflow: visible; } +.stats .bar span { text-align:right; display:block; float:left; height:100%; position: relative; overflow: visible; } +.stats .bar span.hovered { } .stats .bar span.value { background-color: transparent !important; } .stats .bar span em { color:#000; } -.stats .bar span em.hovered { color:#fff; } +.stats .bar span.hovered em { color:#fff; } .stats .bar em { font-style:normal; color:#222; line-height:30px; font-size:1.231em; padding-left:10px; - position: absolute; - right: 10px; - left: 10px; + } + +.stats .bar span + em { position: } .stats .red .bar span { background:#ef4f54; } .stats .yellow .bar span { background:#f6921e; } .stats .green .bar span { background:#55b577; } @@ -522,6 +547,7 @@ form.withlabels.hidden-submit { margin-bottom:4em; } .content .how-it-works .link-33 { bottom:275px; right:14px; } .content .how-it-works .link-42 { bottom:12px; left:251px; } +/* .auth_methods { margin-top:2em; padding-bottom:1em; } .auth_methods ul { margin:1em 0; padding:0; list-style:none outside none; } .auth_methods ul li { margin:0 0 1em 0; padding:0; list-style:none outside none; font-size:1.154em; } @@ -535,9 +561,31 @@ form.withlabels.hidden-submit { margin-bottom:4em; } .auth_methods .dialog-wrap { display:inline; position:relative; } .auth_methods .dialog { background:#fff; border:1px dashed #ccc; position:absolute; bottom:30px; left:0; padding:15px; width:220px; display:none;} .auth_methods .dialog .submit { min-width:30px; padding:5px 22px; } +*/ .right-align { text-align:right; } - +.auth_methods h3 { float:left; width:224px; font-size:1.077em;} +.auth_methods ul { overflow:hidden; padding:0; } +.auth_methods ul li { list-style:none outside none; padding:0; margin:0 0 5px 0; position:relative;} +.auth_methods ul li a { display:inline-block; height:50px; overflow:hidden; vertical-align:middle; } +.auth_methods ul li a:hover img { margin-top:-240px; } +.auth_methods ul li span.extra-message { display:none; color:#F6921E; position:absolute; left:140px; top:13px; } +.auth_methods ul li span.extra-message em { font-style:normal; background:#fff; } +.auth_methods ul li span.extra-message em span { display:inline-block; max-width:420px; vertical-align: middle; } +.auth_methods ul li a:hover + span { display:inline; } +.auth_methods .dialog-wrap { color:#F24E53; display:none; margin-top:1em; } +.auth_methods .dialog-wrap .submit { min-width:10px; text-transform:uppercase; margin-right:10px; } +.auth_methods ul li a.noaction:hover img { margin-top:-60px } +.auth_methods ul li a.noaction:hover { cursor:default; } +.auth_methods ul li a.noaction:focus { outline:0 none; } +.auth_methods ul li a.canremove:hover img, +.auth_methods .assigned ul li.remove a img { margin-top:-120px; } +.auth_methods .assigned ul li span.extra-message{ color:#F24E53;} +.auth_methods .assigned ul li a img { margin-top:-60px } +.auth_methods .assigned, +.auth_methods .notassigned { margin-bottom:40px; } +.auth_methods .assigned span.details { color:grey; display:inline-block; max-width:400px; vertical-align:middle; position:absolute; left:140px; top:13px;} +#token-confirm { display:none; position:absolute; left:550px; top:-10px; } /* login section */ .login-section {} .main-login-method { margin-bottom: 20px;} @@ -559,3 +607,27 @@ form.withlabels.hidden-submit { margin-bottom:4em; } } i.tiny { font-size: 0.8em; color: #999;} + +h2 span.subtitle { font-size: 0.9em; color: #55B577;} + +.main-login-method + .extralogin { margin-top:3em; } +.extralogin a.icons { display:inline-block; margin-right:5px; height:28px; overflow:hidden; vertical-align:middle; } +.extralogin a.icons:hover img { margin-top:-38px; } +.landing-page .dotted { padding-bottom:40px; margin-bottom:40px; } +.landing-page .cyclades a { color:#04a0af; } +.landing-page .dashboard a { color:#3780b0; } +.landing-page .cms a { color:#3780b0; } +.landing-page .rt { text-align:center;vertical-align:middle; } +#signup-classic { clear:both; } +#signup-classic + .form-stacked { display:none; } +.extralogin a.standalone { display:block; width:150px; margin-bottom:20px; white-space:nowrap;} +.hidden-form-rows { display:none; } + + +.content a:hover:focus { outline: 0 none } +.content a:hover, +.content a:active, +.content a:visited { outline: 0 none; } +.content a:visited { border:0 none; } + +#hand { position:absolute; height:79px; width:61px; background:url(../images/xeraki_hover.png) no-repeat; overflow:hidden; display:none; top:40px;} diff --git a/cloudcms/static/cloudcms/js/common.js b/cloudcms/static/cloudcms/js/common.js index 3415564..a157aff 100644 --- a/cloudcms/static/cloudcms/js/common.js +++ b/cloudcms/static/cloudcms/js/common.js @@ -23,7 +23,17 @@ function tableFixedCols(table, firstColWidth ){ } - +function addClassHover(hoverEl, applicableEl){ + $(hoverEl).hover( + function () { + + $(applicableEl).addClass('red-border') + }, + function () { + $(applicableEl).removeClass('red-border'); + + }); +} //equal heights (function($) { @@ -74,6 +84,7 @@ if (navigator.userAgent.match(/iPhone/i)) { } //end of fix + $(document).ready(function() { @@ -188,9 +199,9 @@ $(document).ready(function() { }); }); - + + $('table .more-info').click(function(e){ - e.preventDefault(); $(this).toggleClass('open'); if ($(this).hasClass('open')){ @@ -241,23 +252,8 @@ $(document).ready(function() { - $('.auth_methods').find('li>a').click(function(e){ - e.preventDefault(); - $(this).siblings('.wrap').toggle('slow'); - $(this).toggleClass('up'); - }); - - $('.auth_methods a.red').click(function(e){ - e.preventDefault(); - $(this).siblings('.dialog').show(); - }) - + - $('.auth_methods .dialog .no').click( function(e){ - e.preventDefault(); - console.log($(this)); - $(this).parents('.dialog').hide(); - }) setTimeout(function() { if ($('input#id_username').val()){ @@ -268,6 +264,71 @@ $(document).ready(function() { } }, 100); + + + + $('.landing-page .cms').hover( + function () { + el = $('.cloudbar ul.services li').first(); + var offset = el.offset(); + positionX = offset.left; + $('#hand').css('left',positionX); + $('#hand').show(); + }, + function () { + $('#hand').hide(); + + }); + + $('.landing-page .pithos').hover( + function () { + el = $('.cloudbar ul.services li:nth-child(3)'); + var offset = el.offset(); + positionX = offset.left; + left = parseInt(positionX) +20; + $('#hand').css('left',left+'px'); + $('#hand').show(); + }, + function () { + $('#hand').hide(); + + }); + + $('.landing-page .cyclades').hover( + function () { + el = $('.cloudbar ul.services li:nth-child(2)').first(); + var offset = el.offset(); + positionX = offset.left; + left = parseInt(positionX) +20; + $('#hand').css('left',left+'px'); + $('#hand').show(); + }, + function () { + $('#hand').hide(); + + }); + + + $('.landing-page .dashboard').hover( + function () { + el = $('.cloudbar .profile'); + var offset = el.offset(); + positionX = offset.left +50; + $('#hand').css('left',positionX); + $('#hand').show(); + }, + function () { + $('#hand').hide(); + + }); + + $('.pagination a.disabled').click(function(e){ + e.preventDefault(); + }); + + // fix for recaptcha fields + $('#okeanos_recaptcha').parents('.form-row').find('.extra-img').hide(); + }); @@ -275,6 +336,6 @@ $(document).ready(function() { $(window).resize(function() { setContainerMinHeight('.container .wrapper'); - -}); - + + +}); \ No newline at end of file -- 1.7.10.4