Skip to content

W
website
Commit 2929f4b2 authored by root's avatar root
Browse files
Options 

import from lp:~ricki-padovani/ubuntu-it-ask/errors
- custom pages error;
- fix bug #1024828
- change search form colors
parents 08659c8c b2e264f4
Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 77 deletions
forum/skins/light/media/style/style.css
View file @ 2929f4b2
......@@ -655,10 +655,11 @@ padding-top: 4px;
}
.tags {
display: block;
/*display: block;*/
font-family: sans-serif;
line-height: 200%;
margin-top: 5px;
width: 100%;
}
.tags-summary {
......@@ -1335,13 +1336,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;
......@@ -2165,3 +2171,23 @@ div.wmd-button {
div.wmd-button-bar {
float:left;
}
#error > h1 {
color: white;
background-color: #DD4818;
}
#error {
text-align: center;
}
#error-box1, #error-box2, #error-box3 {
float: left;
margin-left: auto;
margin-right: auto;
width: 33%;
text-align: center;
height: 66px;
padding-top: 44px;
font-size: large;
}
forum/skins/light/templates/401.html
View file @ 2929f4b2
......@@ -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 @ 2929f4b2
......@@ -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 @ 2929f4b2
......@@ -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 @ 2929f4b2
......@@ -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/index.html 100755 → 100644
View file @ 2929f4b2
File mode changed from 100755 to 100644
forum/skins/light/templates/question.html 100755 → 100644
View file @ 2929f4b2
File mode changed from 100755 to 100644
forum/skins/light/templates/questions.html 100755 → 100644
View file @ 2929f4b2
File mode changed from 100755 to 100644
locale/it/LC_MESSAGES/it.po
View file @ 2929f4b2
......@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-04-02 14:15-0700\n"
"PO-Revision-Date: 2012-07-14 10:47+0000\n"
"Last-Translator: Giuseppe Terrasi <Unknown>\n"
"PO-Revision-Date: 2012-07-15 08:58+0000\n"
"Last-Translator: Pietro Albini <Unknown>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Launchpad-Export-Date: 2012-07-15 05:36+0000\n"
"X-Launchpad-Export-Date: 2012-07-16 05:34+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"Language: \n"
"X-Translated-Using: django-rosetta 0.5.3\n"
......@@ -1742,7 +1742,7 @@ msgstr "Consentire markdown nei commenti"
#: forum/settings/form.py:78
msgid "Allow users to use markdown in comments."
msgstr ""
msgstr "Abilita gli utenti a usare markdown nei commenti"
#: forum/settings/form.py:82
msgid "Show author gravatar in comments"
......@@ -2878,7 +2878,7 @@ msgstr "qui"
#: forum/skins/nuxeo/templates/403.html:3
#: forum/skins/nuxeo/templates/403.html:11
msgid "Forbidden"
msgstr ""
msgstr "Accesso vietato"
#: forum/skins/default/templates/403.html:15
#: forum/skins/nuxeo/templates/403.html:15
......@@ -2890,7 +2890,7 @@ msgstr "Non hai i permessi per accedere a questa pagina"
#: forum/skins/nuxeo/templates/403.html:17
#: forum/skins/nuxeo/templates/404.html:26
msgid "This might have happened for the following reasons:"
msgstr ""
msgstr "Questo può essere successo per le seguenti ragioni:"
#: forum/skins/default/templates/403.html:19
#: forum/skins/nuxeo/templates/403.html:19
......@@ -2963,7 +2963,7 @@ msgstr "L'indirizzo utilizzato presenta un errore, prova a controllarlo;"
#: forum/skins/default/templates/404.html:30
#: forum/skins/nuxeo/templates/404.html:30
msgid "if you believe this error 404 should not have occurred, please"
msgstr ""
msgstr "Se pensi che questo errore non sarebbe dovuto capitare, per favore"
#: forum/skins/default/templates/404.html:40
#: forum/skins/default/templates/500.html:27
......@@ -3274,7 +3274,7 @@ msgstr "Badge comunità"
#: forum/skins/default/templates/badges.html:42
#: forum/skins/nuxeo/templates/badges.html:44
msgid "gold badge: the highest honor and is very rare"
msgstr ""
msgstr "I badge oro sono la più alta onorificenza e sono molto rari"
#: forum/skins/default/templates/badges.html:42
#: forum/skins/nuxeo/templates/badges.html:44
......@@ -3291,6 +3291,8 @@ msgstr "I badge oro sono molto rari, devi lavorare sodo per ottenerne uno!"
msgid ""
"silver badge: occasionally awarded for the very high quality contributions"
msgstr ""
"I badge argeno sono assegnati occasionalmente per contributi di qualità "
"elevata."
#: forum/skins/default/templates/badges.html:50
#: forum/skins/nuxeo/templates/badges.html:52
......@@ -3307,7 +3309,7 @@ msgstr ""
#: forum/skins/default/templates/badges.html:56
#: forum/skins/nuxeo/templates/badges.html:58
msgid "bronze badge: often given as a special honor"
msgstr ""
msgstr "I badge di bronzo sono spesso dati come onorificenza speciale"
#: forum/skins/default/templates/badges.html:57
#: forum/skins/nuxeo/templates/badges.html:59
......@@ -3524,6 +3526,11 @@ msgid ""
"href=\"http://daringfireball.net/projects/markdown/syntax\" "
"rel=\"nofollow\">Markdown Syntax</a> page"
msgstr ""
"Questa pagina descrive alcune delle parti più importanti di markdown. Ci "
"sono molte sintassi non menzionate qui, però. Per avere la documentazione di "
"tutta la sintassi vai alla pagina di John Gruber sulla <a "
"href=\"http://daringfireball.net/projects/markdown/syntax\" "
"rel=\"nofollow\">sintassi markdown</a> (in inglese)."
#: forum/skins/default/templates/markdown_help.html:20
#: forum/skins/nuxeo/templates/markdown_help.html:20
......@@ -3763,6 +3770,9 @@ msgid ""
"number followed by a period and space. The number you use actually doesn't "
"matter."
msgstr ""
"Per creare un elenco numerato in markdown, inserire prima di ogni elemento "
"un numero seguito da un punto e uno spazio. Il numero inserito però non "
"viene considerato."
#: forum/skins/default/templates/markdown_help.html:213
#: forum/skins/default/templates/markdown_help.html:214
......@@ -7784,7 +7794,7 @@ msgstr "Hai posto una domanda con %s visite"
#: forum_modules/default_badges/badges.py:24
msgid "Popular Question"
msgstr ""
msgstr "Domanda Popolare"
#: forum_modules/default_badges/badges.py:30
msgid "Notable Question"
......@@ -8031,6 +8041,8 @@ msgid ""
"Number of question views required to award a Popular Question badge to the "
"question author\n"
msgstr ""
"\n"
"Numero di visite necessarie per dare il badge «Domanda popolare» all'utente\n"
#: forum_modules/default_badges/settings.py:12
msgid "Notable Question views"
......@@ -8042,6 +8054,8 @@ msgid ""
"Number of question views required to award a Notable Question badge to the "
"question author\n"
msgstr ""
"\n"
"Numero di visite necessarie per dare il badge «Domanda notevole» all'utente\n"
#: forum_modules/default_badges/settings.py:18
msgid "Famous Question views"
......@@ -8066,6 +8080,9 @@ msgid ""
"Number of up votes required to award a Nice Answer badge to the answer "
"author\n"
msgstr ""
"\n"
"Numero di voti positivi richiesti per dare il badge «Buona risposta» "
"all'autore della risposta\n"
#: forum_modules/default_badges/settings.py:30
msgid "Nice Question up votes"
......@@ -8077,6 +8094,9 @@ msgid ""
"Number of up votes required to award a Nice Question badge to the question "
"author\n"
msgstr ""
"\n"
"Numero di voti positivi richiesti per dare il badge «Buona risposta» "
"all'autore della risposta\n"
#: forum_modules/default_badges/settings.py:36
msgid "Good Answer up votes"
......
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