Commit 86cf6a30 authored by Giuseppe Terrasi's avatar Giuseppe Terrasi

corretto altro errore di distrazione...

parents d6e43737 5970e9eb
/*
** This file contains function to enable and
** disable Accessibility stylesheet in ubuntu-it
*/
//ACCESSIBILITY_CSS_THEME_DIR = 'light-drupal-theme/styles';
//ACCESSIBILITY_CSS_FILE_NAME = 'accessibility.css' ;
ACCESSIBILITY_CSS_ABSPATH = ['http://ubuntu-it.org/sites/all/themes/light-drupal-theme/styles/accessibility.css'];
ACCESSIBILITY_COOKIE_VALUE_ON = 'on';
ACCESSIBILITY_COOKIE_VALUE_OFF = 'off';
// This function adds the accessibility css into the Head section
// and set the cookie value ON
function accessibility_set_on () {
head = document.getElementsByTagName('head')[0];
for (i = 0; i < ACCESSIBILITY_CSS_ABSPATH.length ; i++) {
link = document.createElement('link');
link.setAttribute('type','text/css');
link.setAttribute('rel', 'stylesheet');
link.setAttribute('media', 'screen');
link.setAttribute('href', ACCESSIBILITY_CSS_ABSPATH[i]);
head.appendChild(link);
}
set_cookie_accessibility( ACCESSIBILITY_COOKIE_VALUE_ON );
}
// This function removes the accessibility css from the Head section
// and set the cookie value OFF
function accessibility_set_off() {
head = document.getElementsByTagName('head')[0];
links = head.getElementsByTagName('link');
links_to_remove = []
for (i = 0 ; i < links.length ; i++) {
link = links[i];
if (link.getAttribute('type') == 'text/css') {
for (j = 0 ; j < ACCESSIBILITY_CSS_ABSPATH.length ; j++) {
if (link.getAttribute('href').indexOf(ACCESSIBILITY_CSS_ABSPATH[j]) >= 0 ) {
links_to_remove.push(link);
}
}
}
}
for (i = 0; i < links_to_remove.length; i++) {
head.removeChild(links_to_remove[i]);
}
set_cookie_accessibility( ACCESSIBILITY_COOKIE_VALUE_OFF );
}
function accessibility_toggle () {
value = get_cookie_accessibility();
// If accessibility is ON, remove the css stylesheet
if (value == ACCESSIBILITY_COOKIE_VALUE_ON)
accessibility_set_off();
else
accessibility_set_on();
}
// The main function
function accessibility () {
value = get_cookie_accessibility();
// If accessibility is ON, add the css stylesheet
if (value == ACCESSIBILITY_COOKIE_VALUE_ON)
accessibility_set_on();
}
// Common variabiles
COOKIE_DOMAIN = "ubuntu-it.org";
COOKIE_PREFIX = "ubuntu-it_custom_";
COOKIE_ACCESIBILITY_NAME = "accessibility";
// Start Cookie in browser functions
function set_cookie ( name, value, expires, path, domain, secure )
{
name = COOKIE_PREFIX + name;
var cookie_string = name + "=" + escape ( value );
if ( expires ) {
cookie_string += "; expires=" + expires.toGMTString();
}
else {
var expires = new Date ( 2100, 1, 1); // never expires
cookie_string += "; expires=" + expires.toGMTString();
}
if ( path )
cookie_string += "; path=" + escape ( path );
else
cookie_string += "; path=" + escape ("/")
if ( domain )
cookie_string += "; domain=" + escape ( domain );
else
// cookie_string += "; domain=" + escape (location.host)
cookie_string += "; domain=" + escape (COOKIE_DOMAIN);
if ( secure )
cookie_string += "; secure";
document.cookie = cookie_string;
}
function delete_cookie ( cookie_name ) {
cookie_name = COOKIE_PREFIX + cookie_name;
var cookie_date = new Date ( ); // current date & time
cookie_date.setTime ( cookie_date.getTime() - 1 );
document.cookie = cookie_name += "=; expires=" + cookie_date.toGMTString();
}
function get_cookie ( cookie_name ) {
cookie_name = COOKIE_PREFIX + cookie_name;
var results = document.cookie.match ( '(^|;) ?' + cookie_name + '=([^;]*)(;|$)' );
if ( results )
return ( unescape ( results[2] ) );
else
return null;
}
// End Cookie in browser functions
// Accessibility
function set_cookie_accessibility (cookie_value) {
cookie_name = COOKIE_ACCESIBILITY_NAME;
set_cookie (cookie_name, cookie_value);
}
function get_cookie_accessibility () {
cookie_name = COOKIE_ACCESIBILITY_NAME;
return get_cookie (cookie_name);
}
......@@ -8,7 +8,7 @@ html {
}
body {
background: url("../images/ubuntu/dotted.png") repeat scroll 0 0 #F5F6F7;
background: url("../images/light/dotted.png") repeat scroll 0 0 #F5F6F7;
min-width: 985px;
margin: 0 1px 0 0;
padding: 0;
......@@ -193,8 +193,22 @@ blockquote blockquote {
background-color: #FFF;
}
#fixed-header {
height: 120px;
}
.container {
background: transparent;
margin: 0 15px;
padding: 0;
}
#wrap {
min-width: 985px;
}
#header {
background: url("../images/ubuntu/header.png") repeat-x scroll left top #DD4814;
background: url("../images/light/header_b.png") repeat-x scroll left top #DD4814;
height: 64px;
margin: 0 2px;
text-shadow: 0 1px black;
......@@ -204,67 +218,58 @@ blockquote blockquote {
font-size: 12px;
}
#roof {
background: url("../images/ubuntu/topnav_divider.png") no-repeat scroll left top transparent !important;
#header .container {
background: url("../images/light/topnav_divider.png") no-repeat scroll left top transparent !important;
height: 100%;
padding-left: 2px;
}
#room {
background-color: #FFFFFF;
border-bottom: 1px solid #777777;
padding: 10px 0;
}
#CALeft {
float: left;
position: relative;
width: 740px;
#header li, #header li.last {
border: 0 none;
}
#CARight {
float: right;
width: 240px;
#header .links {
margin-left: 0;
}
#CAFull {
#header li {
background: url("../images/light/topnav_divider.png") no-repeat scroll right top transparent !important;
padding-right: 2px;
float: left;
padding: 0 5px;
width: 950px;
}
#ground {
padding-bottom: 0;
padding-top: 6px;
text-align: center;
width: 990px;
margin: 0;
padding-right: 2px;
list-style: none;
text-transform: capitalize;
}
#ground a, #ground a:hover, #ground a:visited {
color: black;
#header li a {
background: url("../images/light/header_b.png") repeat-x scroll left top #DD4814;
height: 64px;
line-height: 64px;
padding: 0 7px 0 5px;
color: #FFFFFF;
text-shadow: 1px 1px 1px #333333;
float: left;
}
#top {
float: right;
padding: 3px;
text-align: right;
width: 500px;
#header li.active-trail a, #header li a.active, #header li.active a, #header li a:hover, #header li a.on {
background: url("../images/light/header_b_active.png") repeat-x scroll left top #B83A10 !important;
text-decoration: none;
}
#top a {
color: #333333;
font-size: 12px;
height: 35px;
margin-left: 20px;
text-align: right;
text-decoration: underline;
#page-header { display: none; }
#page-body {
overflow: hidden;
margin-top: 0px;
padding-top: 4px;
}
#logo {
float: right;
padding: 0 15px 0 0;
float:right;
color: white;
text-shadow: none;
padding: 0;
}
#logo > span {
......@@ -295,6 +300,27 @@ blockquote blockquote {
text-decoration: none;
}
#header .buttons {
cursor: pointer;
float: left;
margin-left: 5px;
margin-top: 5px;
}
#header .buttons #accessibility {
background: url("../images/light/accessibility.png") repeat scroll 0 0 transparent;
height: 24px;
width: 24px;
}
#header .buttons #accessibility:hover {
background-position: center bottom;
}
#header .buttons #accessibility:active {
background-position: 24px 50%;
}
#header #ubuntu-it-sites {
float: right;
font-size: 10.5px;
......@@ -313,7 +339,7 @@ blockquote blockquote {
}
#header #ubuntu-it-sites a.active {
background: url(images/light/header-uit-bk.png) repeat;
background: url(../images/light/header-uit-bk.png) repeat;
border: 1px solid #6F202A;
background: rgba(0, 0, 0, 0.25);
border: 1px solid rgba(0, 0, 0, 0.1);
......@@ -321,45 +347,13 @@ blockquote blockquote {
border-radius: 0 0 4px 4px;
}
#nav {
margin: 0;
padding: 0;
}
#nav a {
background: url("../images/ubuntu/header.png") repeat-x scroll left top #DD4814;
height: 64px;
line-height: 64px;
padding: 0 7px 0 5px;
color: #FFFFFF;
text-shadow: 1px 1px 1px #333333;
float: left;
text-decoration: none;
text-transform: capitalize;
margin: 0;
}
#nav a.on, #nav a:hover {
background: url("../images/ubuntu/header_b_active.png") repeat-x scroll left top #B83A10 !important;
text-decoration: none;
}
#nav li {
background: url("../images/ubuntu/topnav_divider.png") no-repeat scroll right top transparent !important;
padding-right: 2px;
float: left;
margin: 0;
list-style-type: none;
display: inline;
}
#sub_header {
background: url("../images/ubuntu/header-shadow.png") repeat-x scroll center top #F7F7F7;
#subheader .container-inside {
background: url("../images/light/header-shadow.png") repeat-x scroll center top #F7F7F7;
border-radius: 0 0 8px 8px;
-webkit-border-radius: 0 0 8px 8px;
-moz-border-radius: 0 0 8px 8px;
margin: 0 auto 25px auto;
height: 39px;
margin: 0 auto;
position: relative;
width: 96%;
background-color: #F7F7F7;
......@@ -367,54 +361,72 @@ blockquote blockquote {
-webkit-box-shadow: 0 1px 1px #DFDFDF;
-moz-box-shadow: 0 1px 1px #DFDFDF;
font-size: 12px;
padding-top: 16px;
padding-right: 15px;
height: 44px;
}
#sub_header_options {
float: left;
#top {
display: block;
padding: 0 10px;
float: right;
}
#sub_header_search {
#top a {
clear: none;
color: #333333;
display: block;
float: left;
text-shadow: none;
width: auto;
line-height: 40px;
margin: 0;
padding: 0 15px;
text-decoration: none;
}
#searchBar {
float: left;
#top a:focus, #top a:hover, #top a:active, #top li.active a {
background: url("../images/light/header-shadow.png") repeat-x scroll center top #F2F2F2;
border-bottom: medium solid #666666;
color: #DD4814;
}
#searchBar .content {
#top a:hover {
border-color: #DD4814;
}
#searchBar .searchInput {
border: 0px;
padding: 3px;
font-size: 13px;
height: 18px;
width: 400px;
#room {
background-color: #FFFFFF;
border-bottom: 1px solid #777777;
padding: 10px 0;
}
#searchBar .searchBtn {
font-size: 14px;
height: 26px;
width: 80px;
#CALeft {
float: left;
position: relative;
width: 84%;
}
#searchBar .options {
color: #333333;
font-size: 120%;
padding: 3px 0;
#CARight {
float: right;
width: 15%;
}
#searchBar .options input {
margin: 0 3px 0 15px;
#CAFull {
float: left;
padding: 0 5px;
width: 950px;
}
#searchBar .options input:hover {
cursor: pointer;
#ground {
padding-bottom: 0;
padding-top: 6px;
text-align: center;
width: 990px;
}
#ground a, #ground a:hover, #ground a:visited {
color: black;
}
#listA {
background-color: #FFFFFF;
float: left;
......@@ -432,7 +444,7 @@ blockquote blockquote {
overflow: hidden;
padding: 3px 0px 5px 0;
position: relative;
width: 740px;
width: 100%;
}
#listA .short-summary:first-of-type {
......@@ -472,7 +484,7 @@ blockquote blockquote {
}
.short-summary .question-summary-wrapper {
float: right;
float: left;
width: 565px;
}
......@@ -1253,14 +1265,82 @@ ins {
margin-left: 3px;
}
.footerLinks {
color: #3060A8;
font-size: 13px;
#subheader .score, .accept_rate {
float: left;
line-height: 40px;
margin-left: 0px;
}
.footerLinks a {
color: #3060A8;
#subheader .silver, .badge2 {
float: left;
line-height: 40px;
margin-left: 0px;
}
#subheader .bronze, .badge3 {
float: left;
line-height: 40px;
margin-left: 0px;
}
#subheader .badgecount {
float: left;
line-height: 40px;
margin-left: 0px;
}
#sub_header_options {
float: left;
}
#sub_header_search {
float: left;
margin-left: 15px;
}
#searchBar {
float: left;
margin-left: 15px;
margin-top: 7px;
}
#searchBar .content {
}
#searchBar .searchInput {
border: 0px;
padding: 3px;
font-size: 13px;
height: 18px;
width: 380px;
}
#searchBar .searchBtn {
font-size: 14px;
height: 26px;
width: 80px;
}
#searchBar .options {
color: #333333;
font-size: 120%;
padding: 3px 0;
}
#searchBar .options input {
margin: 0 3px 0 15px;
}
#searchBar .options input:hover {
cursor: pointer;
}
#footer * {
color: #666;
font-size: 10px;
text-align: center;
text-shadow: 0 1px 0 white;
padding: 6px;
}
.user {
......
......@@ -52,6 +52,8 @@
}
/*]]>*/
</script>
<script type="text/javascript" src="{% media "/media/js/accessibility.js" %}"></script>
<script type="text/javascript" src="{% media "/media/js/cookies.js" %}"></script>
<script type="text/javascript" src="{% media "/media/js/osqa.main.js" %}"></script>
{% if user_messages %}
<style type="text/css">
......
{% load extra_tags ui_registry i18n %}
<div>
<div id="footer">
<!--<div class="footerLinks" >
{% loadregistry footer_links %}<span class="link-separator"> |</span>{% endloadregistry %}
</div>-->
<p>
<a href="http://osqa.net" target="_blank" title="OSQA {{ settings.OSQA_VERSION }} ({{ settings.SVN_REVISION }})">
powered by OSQA
</a>
&bull; <a href="http://www.postgresql.org/" target="_blank">PostgreSQL</a> database <br/>
<a href="http://osqa.net" target="_blank" title="OSQA {{ settings.OSQA_VERSION }} ({{ settings.SVN_REVISION }})">powered by OSQA</a>
&bull; <a href="http://www.postgresql.org/" target="_blank">PostgreSQL database</a><br/>
Ubuntu e Canonical sono marchi registrati da Canonical Ltd.
</p>
</div>
......
<!-- template header.html -->
{% load extra_tags ui_registry i18n extra_filters markup %}
<div id="header" class="shadowed curved-bottom">
<div id="roof">
<ul id="nav">
<div id="fixed-header">
<div id="header" class="shadowed curved-bottom"> <!--Menù arancione-->
<div class="container">
<ul class="links">
<li><a id="nav_index" href="{% url index %}">{% trans "home" %}</a></li>
{% loopregistry page_top_tabs %}{% spaceless %}
<li><a id="nav_{{ tab_name }}"{% ifequal tab tab_name %} class="on"{% endifequal %} href="{{ tab_url }}" >{{ tab_title }}</a></li>
{% endspaceless %}{% endloopregistry %}
......@@ -25,35 +26,46 @@
<span>comunità italiana</span>
</div>
<div class="buttons">
<div id="accessibility" title="Maggiore focus ai contenuti" onclick="accessibility_toggle();"></div>
</div>
</div>
</div>
</div>
<div class="clear"></div>
<div id="sub_header">
<div id="subheader">
<div class="container">
<div class="container-inside">
<div id="searchBar">
<form action="{% url search %}" method="get">
{% csrf_token %}
<div class="options" id="sub_header_options">
<input id="type-question" type="radio" value="question" name="t"
checked="checked" /><label for="type-question">{% trans "questions" %}</label>
<input id="type-tag" type="radio" value="tag" name="t" /><label for="type-tag">{% trans "tags" %}</label>
<input id="type-user" type="radio" value="user" name="t" /><label for="type-user">{% trans "users" %}</label>
<select name="t">
<option value="question" selected>{% trans "questions" %}</option>
<option value="tag">{% trans "tags" %}</option>
<option value="user">{% trans "users" %}</option>
</select>
</div>
{% csrf_token %}
<div id="sub_header_search">
<input type="text" class="searchInput" value="{{ keywords }}" name="q" id="keywords" />
<input type="submit" name="Submit" value="{% trans "search" %}" class="searchBtn" />
</div>
</form>
</div>
<div id="top">
{% loadregistry header_links %}{% endloadregistry %}
</div>
</div>
</div>
<div class="clear"></div>
{% if settings.USE_ANNOUNCEMENT_BAR|or_preview:request %}
<div id="announcement">
{{ settings.ANNOUNCEMENT_BAR|or_preview:request|static_content:settings.ANNOUNCEMENT_BAR_RENDER_MODE }}
</div>
{% endif %}
</div>
</div>
<!-- end template header.html -->
......@@ -4,6 +4,19 @@
{% load question_list_tags %}
{% load i18n %}
{% block fulltitle %}{{ settings.APP_TITLE }}{% endblock %}
{% block forejs %}
<style>
#header li #nav_questions {
background: url("m/light/media/images/light/header_b.png") repeat-x scroll left top #DD4814 !important;
}
#header li a#nav_questions:hover {
background: url("m/light/media/images/light/header_b_active.png") repeat-x scroll left top #B83A10 !important;
}
#header li #nav_index {
background: url("m/light/media/images/light/header_b_active.png") repeat-x scroll left top #B83A10;
}
</style>
{% endblock %}
{% block sidebar %}
{% if not request.user.is_authenticated %}
{% if settings.SHOW_WELCOME_BOX %}
......
......@@ -27,7 +27,7 @@ class LaunchpadAuthConsumer(OpenIdAbstractAuthConsumer):
def get_user_url(self, request):
return 'https://login.launchpad.net'
class LaunchpadAuthConsumer(ConsumerTemplateContext):
class LaunchpadAuthContext(ConsumerTemplateContext):
mode = 'BIGICON'
type = 'DIRECT'
weight = 200
......
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