Skip to content

W
website
Commit 4af5871a authored by Giuseppe Terrasi's avatar Giuseppe Terrasi
Browse files
Options 

import from ubuntu-it-ask/dev:
- custom pages error;
- fix bug #1024828
- change search form colors
thanks to Riccardo Padovani.
- twitter, facebook, google plus button in question.html under comment box
- Modificato il layout della sidebar, in stile planet
thanks to Riccardo Padovani.
- minor tweaks
parents 8c71137e 7f4ee8a6
Hide whitespace changes
Inline Side-by-side
Showing with 174 additions and 104 deletions
forum/skins/light/media/style/style.css
View file @ 4af5871a
......@@ -193,15 +193,20 @@ blockquote blockquote {
margin: auto;
min-width: 985px;
margin: 0 20px;
background-color: #FFF;
}
#announcement {
padding: 0 5px;
}
#fixed-header {
height: 120px;
text-align: center;
margin: 5px 20px;
height: 35px;
font-size: 17px;
background: none repeat scroll 0 0 rgba(0, 0, 0, 0.6);
border-radius: 5px 5px 5px 5px;
-moz-border-radius: 5px 5px 5px 5px;
-webkit-border-radius: 5px 5px 5px;
line-height: 2;
color: white;
}
.container {
......@@ -264,6 +269,10 @@ blockquote blockquote {
text-decoration: none;
}
#fixed-header {
height: 105px;
}
#page-header { display: none; }
#page-body {
overflow: hidden;
......@@ -403,24 +412,38 @@ padding-top: 4px;
padding: 5px;
}
#room {
border: 1px solid #DD4814;
background-color: #E7E7E7;
padding: 5px;
}
#CALeft {
float: left;
width: 84%;
background-color: #e4e4e4;
padding: 5px;
border: solid 1px #D4D4D4;
border-radius: 3px;
}
#CARight {
float: right;
width: 15%;
color: #EEE;
}
#CARight h3 {
background-color: transparent;
font-size: 20px;
text-align: center;
color: #E0E0E0;
text-shadow: 1px 1px 1px #222;
}
#CARight p {
font-size: 14px;
}
#CAFull {
float: left;
background-color: #e4e4e4;
border: solid 1px #D4D4D4;
border-radius: 3px;
width: 100%;
}
......@@ -525,7 +548,7 @@ padding-top: 4px;
}
.questions-count {
color: #A40000;
color: #DD4818;
font-family: sans-serif;
font-size: 24px;
font-weight: 600;
......@@ -562,12 +585,16 @@ padding-top: 4px;
}
.boxC {
background-color: #D7D7D7;
border-left: 1px solid #DD4814;
border-bottom: 1px solid #DD4814;
padding: 10px;
margin-right: -5px;
margin-top: -5px;
padding-left: 10px;
padding-right: 10px;
padding-bottom: 5px;
padding-top: 5px;
margin-left: 5px;
margin-bottom: 10px;
background: none repeat scroll 0 0 rgba(0, 0, 0, 0.6);
border-radius: 5px 5px 5px 5px;
-moz-border-radius: 5px 5px 5px 5px;
-webkit-border-radius: 5px 5px 5px;
}
.boxC p {
......@@ -655,10 +682,11 @@ padding-top: 4px;
}
.tags {
display: block;
/*display: block;*/
font-family: sans-serif;
line-height: 200%;
margin-top: 5px;
width: 100%;
}
.tags-summary {
......@@ -668,8 +696,6 @@ padding-top: 4px;
.tags a, span.tag, .tags-summary a {
background-color: #EEEEEE;
border-bottom: 1px solid #CCCCCC;
border-right: 1px solid #CCCCCC;
color: #777777;
font-size: 11px;
font-weight: normal;
......@@ -696,8 +722,7 @@ padding-top: 4px;
.medal {
background: none repeat scroll 0 0 #DD4818;
border: #DD4818 solid 1px;
color: #333333;
color: white;
font-size: 14px;
font-weight: bold;
line-height: 250%;
......@@ -712,7 +737,6 @@ a.medal {
a.medal:hover {
/*background: url("../images/medala_on.gif") no-repeat scroll 0 0 transparent;*/
background-color: white;
border: #DD4818 solid 1px;
color: #DD4818;
text-decoration: none;
}
......@@ -720,7 +744,7 @@ a.medal:hover {
.tabBar {
clear: both;
height: 30px;
margin-bottom: 3px;
margin: 3px;
width: 100%;
}
......@@ -837,7 +861,7 @@ a.medal:hover {
.questions-related {
font-weight: 700;
word-wrap: break-word;
/*word-wrap: break-word;*/
}
.questions-related p {
......@@ -952,7 +976,7 @@ div.question-body p, div.answer-body p {
margin: 0;
}
.badge-list a {
/*.badge-list a {
color: #DD4818;
}
......@@ -962,7 +986,7 @@ div.question-body p, div.answer-body p {
.badge-list a.medal:hover {
color: #DD4818;
}
}*/
#medalList .badgeListDescription {
float: left;
......@@ -1174,6 +1198,7 @@ ins {
width: 90%;
border: 3px solid #DD4814;
background-color: #D7D7D7;
border-radius: 5px;
}
.user-edit-link {
......@@ -1325,6 +1350,10 @@ ins {
margin-left: 15px;
}
#searchtags {
margin: 5px;
}
#searchBar {
float: left;
margin-left: 15px;
......@@ -1335,13 +1364,18 @@ ins {
}
#searchBar .searchInput {
border: 0px;
border: 3px solid #D7D7D7;
padding: 3px;
font-size: 13px;
height: 18px;
width: 380px;
}
#searchBar .searchInput:focus {
border: 3px solid #DD4818;
outline: none;
}
#searchBar .searchBtn {
font-size: 14px;
height: 26px;
......@@ -1400,8 +1434,8 @@ padding: 6px;
margin-bottom: 0;
}
.darkred { /*Quando è un figlio di notify lo facciamo bianco, (è usato da altre parti?)*/
color: darkred;
.darkred { /*Quando è un figlio di notify lo facciamo bianco, altrimenti lo convertiamo in arancio per i titoletti*/
color: #DD4818;
}
.notify > .darkred {
color: white;
......@@ -2165,3 +2199,24 @@ div.wmd-button {
div.wmd-button-bar {
float:left;
}
#error > h1 {
color: white;
background-color: #DD4818;
}
#error {
text-align: center;
margin: 5px;
}
.error-box {
float: left;
margin-left: auto;
margin-right: auto;
width: 32%;
text-align: center;
height: 66px;
padding-top: 44px;
font-size: large;
}
forum/skins/light/templates/401.html
View file @ 4af5871a
......@@ -24,23 +24,17 @@
</script>
{% endblock %}
{% block content %}
<div id="main-bar" class="headNormal">
{% trans "Not logged in" %}
<div id="error">
<h1>401</h1>
<h2>{% trans "Not logged in" %}</h2><br/>
<h3>{% trans "You are not logged in..." %} <br/> {% trans "...and the resource you're trying to access is protected." %} </h3> <br/>
<p>
{% trans "Redirecting to the login page." %}<span id="redirect_loader"></span>
</p>
<p>
{% trans "If you're not automatically redirected in 5 seconds, please click" %}
<a href="{% url auth_signin %}">{% trans "here" %}</a>.
</p>
</div>
<div id="main-body" class="">
<div style="padding:5px 0px 10px 0;line-height:25px;">
<h3>{% trans "You are not logged in..." %}</h3>
<div style="margin-top:5px">
{% trans "...and the resource you're trying to access is protected." %}
<p>
{% trans "Redirecting to the login page." %}<span id="redirect_loader"></span>
</p>
<p>
{% trans "If you're not automatically redirected in 5 seconds, please click" %}
<a href="{% url auth_signin %}">{% trans "here" %}</a>.
</p>
</div>
</div>
</div>
{% endblock %}
\ No newline at end of file
{% endblock %}
forum/skins/light/templates/403.html
View file @ 4af5871a
......@@ -7,7 +7,23 @@
</style>
{% endblock %}
{% block content %}
<div id="main-bar" class="headNormal">
<div id="error">
<h1>403</h1>
<h2>{% trans "Forbidden" %}</h2><br/>
<h3>{% trans "Sorry, you don't have permissions to access this page." %}</h3> <br/>
</div>
<div id="error-box1">
<a href="{% url questions %}">{% trans "see all questions" %} &raquo;</a>
</div>
<div id="error-box2">
<a href="{% url tags %}">{% trans "see all tags" %} &raquo;</a>
</div>
<div id="error-box3">
<a href="#" id="linkPrevious">{% trans "back to previous page" %} &raquo;</a>
</div>
<!--<div id="main-bar" class="headNormal">
{% trans "Forbidden" %}
</div>
<div id="main-body" class="">
......@@ -32,5 +48,5 @@
</ul>
</div>
</div>
</div>-->
{% endblock %}
forum/skins/light/templates/404.html
View file @ 4af5871a
......@@ -2,11 +2,6 @@
<!-- template 404.html -->
{% load i18n %}
{% block title %}{% trans "404 Error" %}{% endblock %}
{% block forestyle%}
<style type="text/css">
form input { margin-right: 5px; }
</style>
{% endblock %}
{% block forejs %}
<script type="text/javascript">
$().ready(function(){
......@@ -16,33 +11,19 @@
</script>
{% endblock %}
{% block content %}
<div id="main-bar" class="headNormal">
{% trans "404 Not Found" %}
<div id="error">
<h1>404</h1>
<h2>Questa pagina non esiste</h2><br/>
<h3>Beh, ovviamente <em>questa pagina esiste</em>. Ma la pagina che hai richiesto non esiste. Infatti, questa pagina è qui solo per dirti che la pagina che stai cercando non esiste</h3> <br/>
</div>
<div id="main-body" class="">
<div style="padding:5px 0px 10px 0;line-height:25px;">
<h3>{% trans "Sorry, could not find the page you requested." %}</h3>
<div style="margin-top:5px">
{% trans "This might have happened for the following reasons:" %}<br/>
<ul>
<li>{% trans "this question or answer has been deleted;" %}</li>
<li>{% trans "url has error - please check it;" %}</li>
<li>{% trans "if you believe this error 404 should not have occurred, please" %}
<a href="{% if settings.CONTACT_URL %}{{ settings.CONTACT_URL }}{% else %}{% url feedback %}{% endif %}">{% trans "report this problem" %}</a></li>
</ul>
</div>
<script type="text/javascript">
var GOOG_FIXURL_LANG = '{{settings.LANGUAGE_CODE}}';
var GOOG_FIXURL_SITE = '{{site_url}}';
</script>
<script type="text/javascript" src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
<ul>
<li><a href="#" id="linkPrevious">{% trans "back to previous page" %} &raquo;</a></li>
<li><a href="{% url questions %}">{% trans "see all questions" %} &raquo;</a></li>
<li><a href="{% url tags %}">{% trans "see all tags" %} &raquo;</a></li>
</ul>
</div>
<div id="error-box1">
<a href="{% url questions %}">{% trans "see all questions" %} &raquo;</a>
</div>
<div id="error-box2">
<a href="{% url tags %}">{% trans "see all tags" %} &raquo;</a>
</div>
<div id="error-box3">
<a href="#" id="linkPrevious">{% trans "back to previous page" %} &raquo;</a>
</div>
{% endblock %}
<!-- end template 404.html -->
forum/skins/light/templates/500.html
View file @ 4af5871a
......@@ -11,25 +11,28 @@
</script>
{% endblock %}
{% block content %}
<div id="error">
<h1>500</h1>
<h2>Server Error</h2><br/>
<h3>{% trans "sorry, system error" %}<br/>
{% trans "system error log is recorded, error will be fixed as soon as possible" %}<br/>
{% trans "please report the error to the site administrators if you wish" %}</h3> <br/>
</div>
<div id="error-box1">
<a href="{% url questions %}">{% trans "see all questions" %} &raquo;</a>
</div>
<div id="error-box2">
<a href="{% url tags %}">{% trans "see all tags" %} &raquo;</a>
</div>
<div id="error-box3">
<a href="#" id="linkPrevious">{% trans "back to previous page" %} &raquo;</a>
</div>
<div id="main-bar" class="">
<h3>
500 Server Error
</h3>
</div>
<div id="main-body" class="headNormal">
<div style="padding:5px 0px 10px 0;line-height:25px">
<h3>{% trans "sorry, system error" %}</h3>
<br/>
{% trans "system error log is recorded, error will be fixed as soon as possible" %}<br/>
{% trans "please report the error to the site administrators if you wish" %}
<ul>
<li><a href="#" id="linkPrevious">{% trans "back to previous page" %}</a></li>
<li><a href="{% url questions %}">{% trans "see latest questions" %}</a></li>
<li><a href="{% url tags %}">{% trans "see tags" %}</a></li>
</ul>
</div>
</div>
{% endblock %}
<!-- end template 500.html -->
forum/skins/light/templates/base.html
View file @ 4af5871a
......@@ -2,7 +2,6 @@
{% block page_center %}
{% block full_width_banner %}{% endblock %}
<div id="wrapper">
{% block site_width_banner %}{% endblock %}
......
forum/skins/light/templates/header.html
View file @ 4af5871a
......@@ -61,11 +61,11 @@
<div class="clear"></div>
{% if settings.USE_ANNOUNCEMENT_BAR|or_preview:request %}
</div>
</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 -->
forum/skins/light/templates/question.html
View file @ 4af5871a
......@@ -92,6 +92,14 @@
}
</style>
</noscript>
<div id="fb-root"></div>
<script>
(function(d, s, id) { var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s); js.id = id; js.src = "//connect.facebook.net/it_IT/all.js#xfbml=1";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));
</script>
{% endblock %}
{% block content %}
......@@ -127,7 +135,21 @@
{% contributors_info question %}
</div>
{% comments question request.user %}
</div>
<!-- start share content -->
<a href="https://twitter.com/share" class="twitter-share-button" data-lang="it" data-count="none" data-dnt="true">Tweet</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
<div class="g-plus" data-action="share" data-annotation="none"></div>
<script type="text/javascript">
window.___gcfg = {lang: 'it'};
(function() {
var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
po.src = 'https://apis.google.com/js/plusone.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
})();
</script>
<div class="fb-like" data-send="true" data-layout="button_count" data-width="450" data-show-faces="false"></div>
<!-- end share content -->
</div>
</td>
</tr>
......
forum/skins/light/templates/question_list/count.html
View file @ 4af5871a
......@@ -6,13 +6,13 @@
<div class="boxC">
<div class="questions-count">
{{ questions.paginator.count }}<span style="color:black;font-size:14px;margin-left:5px">{{ list_description }}</span>
{{ questions.paginator.count }}<span style="color:#EEE;font-size:14px;margin-left:5px;text-shadow: 1px 1px 1px #222;">{{ list_description }}</span>
</div>
{% if answer_count %}
<div class="questions-count">
{{ answer_count }}<span style="color:black;font-size:14px;margin-left:5px">{% trans "answers" %}</span>
{{ answer_count }}<span style="color:#EEE;font-size:14px;margin-left:5px;text-shadow: 1px 1px 1px #222;">{% trans "answers" %}</span>
</div>
{% endif %}
......@@ -23,4 +23,4 @@
</p>
</div>
</div>
{% endspaceless %}
\ No newline at end of file
{% endspaceless %}
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