Commit c252e429 authored by Olga Brani's avatar Olga Brani
Browse files

Minor fixes & improvements

parent 427c95f4
......@@ -56,7 +56,8 @@ CLOUD_SERVICES = getattr(settings, 'ASTAKOS_CLOUD_SERVICES', (
# Set recaptcha keys
RECAPTCHA_PUBLIC_KEY = getattr(settings, 'ASTAKOS_RECAPTCHA_PUBLIC_KEY', '')
RECAPTCHA_PRIVATE_KEY = getattr(settings, 'ASTAKOS_RECAPTCHA_PRIVATE_KEY', '')
RECAPTCHA_OPTIONS = getattr(settings, 'ASTAKOS_RECAPTCHA_OPTIONS', {'theme': 'white'})
RECAPTCHA_OPTIONS = getattr(settings, 'ASTAKOS_RECAPTCHA_OPTIONS',
{'theme' : 'custom', 'custom_theme_widget': 'okeanos_recaptcha'})
RECAPTCHA_USE_SSL = getattr(settings, 'ASTAKOS_RECAPTCHA_USE_SSL', True)
RECAPTCHA_ENABLED = getattr(settings, 'ASTAKOS_RECAPTCHA_ENABLED', True)
......
......@@ -149,14 +149,14 @@
.cloudbar .wrapper { width:auto; padding:0;}
.cloudbar a { color:#fff; text-decoration:none;}
.cloudbar .profile { float:right; background:#01A1AE; min-width:150px; padding:0 20px; text-align:right; }
.cloudbar .profile:hover { background:#000; }
.cloudbar .profile:hover { background:#41b9c2; }
.cloudbar .profile a { text-decoration:none; color:#fff; display:block; width:100%;}
.cloudbar .profile ul { position:absolute; right:0; top:35px; padding:0; margin:0; width:190px; display:none; z-index:9; background:#fff;}
.cloudbar .profile ul li { list-style:none outside; line-height:35px; padding:0 20px;}
.cloudbar .profile ul li:hover a { color:#01A1AE;}
.cloudbar .profile .full a { padding-right:20px; background:url(../images/arrow-white.png) no-repeat right center; width:auto;}
.cloudbar .profile .full a.open { background-image:url(../images/arrow-white-reverse.png); }
.cloudbar .profile .user a { padding-right:20px; width:auto; background:url(../images/arrow-lt.png) no-repeat right center;}
.cloudbar .profile .full a { background-image:url(../images/arrow-down.png); }
.cloudbar .profile .full a.open { background-image:url(../images/arrow-up.png); }
.cloudbar .profile .full ul { border:1px dashed #000; border-top:0 none; border-right:0 none;}
.cloudbar .profile ul li a { padding-right:0; background:none; color:#000; display:inline; width:auto;}
.cloudbar ul.services { margin:0; padding:0; }
......
......@@ -21,8 +21,8 @@ form.login { margin-bottom: 22px; width:340px; }
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:42px; float: right; }
form .form-row .extra-link:hover { text-decoration:underline;}
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; }
form .form-row .extra-link:hover { border-bottom:1px solid #808080;}
form .form-row label { font-size: 1.1em; }
form.innerlabels label { position: absolute; top: 12px; left: 1.5em; color: #808080 ; }
form.innerlabels p { margin:0; position: relative;}
......@@ -30,7 +30,7 @@ form.innerlabels p.p15px { font-size:1.154em;}
form.innerlabels p.p15px a { margin:0 5px;}
form.innerlabels p.p15px a:hover { text-decoration:underline;}
form.innerlabels a,
form.innerlabels a:hover { border:0 none;}
form.innerlabels a:hover { }
form textarea,
form input.text,
form input[type="text"],
......@@ -73,7 +73,9 @@ div.form-stacked { margin-bottom: 4em; }
form.withlabels .checkbox-widget { margin-top:20px; }
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:10; top:10px; left: 290px; }
form span.info { position:absolute;z-index:10; bottom:32px; }
form.innerlabels span.info { left: 290px; }
form.withlabels span.info { left: 440px; }
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 12px; min-height:50px; display:none; font-size:0.846em;}
......@@ -85,20 +87,44 @@ form input[readonly=true] { /*background-color: #ddd;*/ color: #5e5e5e; }
form.innerlabels .with-checkbox .checkbox-widget { margin-top:15px; }
form.innerlabels .with-checkbox .checkbox-label { left:2.5em; top:17px; }
form .extra-img { display:block; width:21px; height:21px; overflow:hidden; position:absolute; left:440px; bottom:10px; z-index:101;}
form .extra-img { display:block; width:21px; height:21px; overflow:hidden; position:absolute; }
form.withlabels .extra-img { left:440px; bottom:12px; }
form.innerlabels .extra-img { bottom:10px; left:290px }
form .with-checkbox .extra-img { top:20px; }
form .with-errors .extra-img { background:url(../images/symbols.png) no-repeat -58px -3px;}
form .with-errors .extra-img { background:url(../images/symbols.png) no-repeat -58px -3px; z-index:101;}
form .with-errors textarea+.extra-img,
form .with-errors noscript+.extra-img { background:transparent;}
form .with-errors input[type="text"],
form .with-errors input[type="password"] { border:1px solid red;}
form.innerlabels .with-errors .extra-img { left:290px;}
form input[readonly="True"]+ span.extra-img { background:url(../images/symbols.png) no-repeat -111px -3px;}
form input[readonly="True"]+ span.extra-img { background:url(../images/symbols.png) no-repeat -111px -3px; z-index:101;}
.errorlist { margin:0; padding:0;}
.errorlist li { list-style:none outside;}
@media screen and (max-width : 583px) {
form .extra-img { left:222px; }
.form-error { margin-left:0!important; }
form .with-hidden { display:none; }
/* custom captcha */
#okeanos_recaptcha { width:331px; border:1px solid #808080; margin:20px 0; 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:12px; }
#okeanos_recaptcha a.recaptcha_audio_cant_hear_link { margin-left:20px; }
#okeanos_recaptcha #recaptcha_response_field { width:220px; float:left; border-left:0 none; }
#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 }
@media screen and (max-width : 591px) {
form.withlabels .extra-img { left:222px; }
form.withlabels span.info { left:222px; }
form .extra-img { left:222px; }
.form-error { margin-left:0!important; }
}
\ No newline at end of file
......@@ -13,3 +13,5 @@ img { -ms-interpolation-mode:bicubic; }
form input.text,
form input[type="text"],
form input[type="password"] { margin-bottom:-3px;}
#okeanos_recaptcha #recaptcha_response_field { margin-bottom:-1px; }
.container ul.options li a { display:inline }
......@@ -5,3 +5,4 @@
.buttons-list.fixpos { position:static; }
.buttons-list .button { margin-left:0; }
form input.submit, form input[type="submit"] { margin:0; }
.container .lt-div { float:none; width:auto; }
......@@ -20,9 +20,10 @@ img.right { margin:0 0 1em 1em; float:right;}
/*top message*/
.top-msg { margin:-36px -70px 36px; background:blue; padding:100px 200px; color:#fff; display:none; position:relative; font-size:1.538em;}
.top-msg p.title { font-size:1.3em; }
.top-msg p.title span { border-bottom:2px dotted #fff; padding:0 0 10px 0;}
.top-msg { margin:-36px -70px 36px; background:blue; padding:100px; color:#fff; display:none; position:relative; font-size:1.538em; }
.top-msg p { text-align:center; }
.top-msg p.title { font-size:1.3em; }
.top-msg p.title span { border-bottom:2px dotted #fff; padding:0 0 10px 0;}
.top-msg.active { display:block;}
.top-msg +.mainlogo { margin-top:-73px;}
.top-msg .close { position:absolute; bottom:20px; right:20px; font-size:1.3em; font-weight:bold; border:0 none; color:#fff; text-decoration:none;}
......@@ -115,16 +116,19 @@ a.videolink:hover { background:url(../images/video_image.png)
/* resources*/
.resources .categories .clear { color: #000000; position:relative; top:-1px;}
.resources .categories .clear { color: #000000; position:relative; top:-1px; line-height:100%; display:inline-block;}
.resources .categories .clear:hover { border-bottom:1px solid #000; }
.resources a, .resources a:hover { border:0 none;}
.resources .categories ul { margin:0;padding:0;}
.resources .categories ul li { float: left; list-style:none outside;}
.resources .categories .title { margin-bottom: 0.5em; }
.resources .categories ul li a { color: #000000; margin-right: 22px; text-decoration: none; }
.resources .categories ul li a:hover,
.resources .categories ul li a.selected { color: #000000 }
.resources .categories ul li a.selected { color: #000000;}
.resources .categories ul li.resource-cat-1.active a { border-bottom: 1px solid #F89A1C; }
.resources .categories ul li.resource-cat-2.active a { border-bottom: 1px solid #4085A5 }
.resources .categories ul li.inactive { opacity: 0.3; }
.resources .categories ul li.active { font-weight: bold; opacity: 1; }
.resources .categories ul li.active { opacity: 1; }
.resources .list { line-height: 1em; margin-top: 60px; position: relative; margin-right:-35px; }
.resources .list .resource-wrapper.first .resource { margin-left: 0; }
.resources .list .resource-wrapper { float: left; height: 250px; margin-bottom: 22px; margin-right: 35px; overflow: hidden; position: relative; width: 250px; }
......@@ -149,14 +153,17 @@ a.videolink:hover { background:url(../images/video_image.png)
.resources .list .resource-cat-1.resource { border-color: #4085A5 }
.resources .list .resource-cat-1.resource .title { color: #4085A5 }
.resources .list .resource-cat-1.resource .description { background-color: #4085A5 }
.resources .resource-cat-1.filter-item a { color: #4085A5 }
.resources .resource-cat-1.filter-item a { color: #4085A5 }
.resources .filter-item a { display:inline-block; line-height:100%; }
.resources .resource-cat-1.filter-item a:hover { border-bottom:1px solid #F89A1C; }
.resources .resource-cat-2.filter-item a:hover { border-bottom:1px solid #4085A5; }
.resources .list .resource-cat-2.resource { border-color: #FF6F00 }
.resources .list .resource-cat-2.resource .title { color: #FF6F00 }
.resources .list .resource-cat-2.resource .description { background-color: #FF6F00 }
.resources .resource-cat-2.filter-item a { color: #FF6F00 }
table { width:80%; color:#B3B3B3;}
table th, table td { padding:5px 5px 5px 0; }
table th, table td { padding:5px 5px 5px 0; }1234
/*table td { border-top: 1px solid #DDDDDD; }*/
table th { color:#222; font-weight:normal;}
table td.consumed { color: #9D261D; }
......@@ -164,7 +171,7 @@ table td.consumed { color: #9D261D; }
/*.zebra-striped tbody tr:nth-child(2n+1) td,
.zebra-striped tbody tr:nth-child(2n+1) th { background-color: #F9F9F9; }*/
.zebra-striped tbody tr:hover td,
.zebra-striped tbody tr:hover th { background-color: #F5F5F5; }
.zebra-striped tbody tr:hover th { color:#000; }
.buttons-list.fixpos { position:absolute; bottom:0; right:0; }
.button.back.right { right: 0; }
......@@ -175,9 +182,19 @@ a.button { border:0 none; color: #FFFFFF; display: inline-block; te
a.button:hover { background-color: #F89A1C; border:0 none; color:#fff;}*/
/*pagination*/
.pagination a { border:0 none;}
.pagination .next-prev { float:left; }
.pagination .nums { text-align:right;}
.pagination .nums span { color:#F89A1C;}
.two-cols .lt .clients-wrapper p { padding:0; }
\ No newline at end of file
.two-cols .lt .clients-wrapper p { padding:0; }
/* colors for links */
.container ul.options li a { display:inline-block; line-height:100%; }
.container ul.options li a:hover { text-decoration: none; }
.container ul.options li a.red { color:#F24E53 }
.container ul.options li a.red:hover { border-bottom:1px solid #F24E53; }
.container ul.options li a.grey { color:#aaa }
.container ul.options li a.grey:hover { border-bottom:1px solid #aaa; }
.container ul.options li a.blue { color:#00A2B1 }
.container ul.options li a.blue:hover { border-bottom:1px solid #00A2B1; }
\ No newline at end of file
<div id="okeanos_recaptcha" style="display:none" class="clearfix">
<div id="recaptcha_image"></div>
<div class="recaptcha_only_if_incorrect_sol" style="color:red">Incorrect please try again</div>
<label for="recaptcha_response_field" class="recaptcha_only_if_image">Enter the words above:</label>
<label for="recaptcha_response_field" class="recaptcha_only_if_audio">Enter the numbers you hear:</label>
<input type="text" id="recaptcha_response_field" name="recaptcha_response_field" />
<div class="actions-wrap clearfix">
<div class="img img-refresh"><a href="javascript:Recaptcha.reload()">Get another CAPTCHA</a></div>
<div class="recaptcha_only_if_image img-audio img"><a href="javascript:Recaptcha.switch_type('audio')">Get an audio CAPTCHA</a></div>
</div>
<!--<div class="recaptcha_only_if_audio"><a href="javascript:Recaptcha.switch_type('image')">Get an image CAPTCHA</a></div>-->
</div>
......@@ -6,7 +6,7 @@
{% endfor %}
</div>
{% for field in form %}
<div class="form-row {% if field.errors|length %}with-errors{% endif %}">
<div class="form-row {% if field.errors|length %}with-errors{% endif %} {% if field.is_hidden %}with-hidden{% endif %}">
{{ field.errors }}
<p class="clearfix {% if field.blank %}required{% endif %}">
{{ field.label_tag }}
......
......@@ -6,7 +6,7 @@
{% endblock %}
{% block body.left %}
<img class="pic" src="{{ IM_STATIC_URL }}images/pictures/ring_bell_beige.gif" />
<img class="pic" src="{{ IM_STATIC_URL }}images/pictures/accounts_3.png" />
{% comment %}{% include "im/services_description.html" %}{% endcomment %}
{% endblock body.left %}
......
......@@ -37,6 +37,7 @@ from django import forms
from django.utils.safestring import mark_safe
from django.utils import simplejson as json
from django.utils.translation import ugettext as _
from django.template.loader import render_to_string
from astakos.im.settings import RECAPTCHA_PUBLIC_KEY, RECAPTCHA_OPTIONS, \
RECAPTCHA_USE_SSL
......@@ -48,7 +49,10 @@ class RecaptchaWidget(forms.Widget):
recaptcha_conf = ('<script type="text/javascript">'
'var RecaptchaOptions = %s'
'</script>') % json.dumps(conf)
custom_widget_html = render_to_string("im/captcha.html",
{'conf': 'Bob'})
return mark_safe(recaptcha_conf + \
custom_widget_html + \
captcha.displayhtml(RECAPTCHA_PUBLIC_KEY,
use_ssl=RECAPTCHA_USE_SSL))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment