sync with dev

69559a51 · Giuseppe Terrasi · 08659c8c · 7f4ee8a6 · 69559a51 · 69559a51
Commit 69559a51 authored Jul 20, 2012 by Giuseppe Terrasi
10 changed files
--- a/forum/skins/light/media/style/style.css
+++ b/forum/skins/light/media/style/style.css
@@ -193,15 +193,20 @@ blockquote blockquote {
    margin: auto;
    min-width: 985px;
    margin: 0 20px;
-    background-color: #FFF;
 }
 #announcement {
    padding: 0 5px;
-}
+    text-align: center;
+    margin: 5px 20px;
-#fixed-header {
+    height: 35px;
-    height: 120px;
+    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;
+    padding-left: 10px;
-    border-left: 1px solid #DD4814;
+    padding-right: 10px;
-    border-bottom: 1px solid #DD4814;
+    padding-bottom: 5px;
-    padding: 10px;
+    padding-top: 5px;
-    margin-right: -5px;
+    margin-left: 5px;
-    margin-top: -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: white;
-    color: #333333;
    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?)*/
+.darkred { /*Quando è un figlio di notify lo facciamo bianco, altrimenti lo convertiamo in arancio per i titoletti*/
-    color: darkred;
+    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;
+}
--- a/forum/skins/light/templates/401.html
+++ b/forum/skins/light/templates/401.html
@@ -24,14 +24,10 @@
        </script>
 {% endblock %}
 {% block content %}
-<div id="main-bar" class="headNormal">
+<div id="error">
-    {% trans "Not logged in" %}
+    <h1>401</h1>
-</div>
+    <h2>{% trans "Not logged in" %}</h2><br/>
-<div id="main-body" class="">
+    <h3>{% trans "You are not logged in..." %} <br/> {% trans "...and the resource you're trying to access is protected." %} </h3>  <br/>  
-    <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>
@@ -39,8 +35,6 @@
        {% 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 %}
--- a/forum/skins/light/templates/403.html
+++ b/forum/skins/light/templates/403.html
@@ -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 %}
--- a/forum/skins/light/templates/404.html
+++ b/forum/skins/light/templates/404.html
@@ -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">
+<div id="error">
-    {% trans "404 Not Found" %}
+    <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 id="error-box1">
-    <div style="padding:5px 0px 10px 0;line-height:25px;">
+    <a href="{% url questions %}">{% trans "see all questions" %}  &raquo;</a>
-        <h3>{% trans "Sorry, could not find the page you requested." %}</h3>
+</div>
-        <div style="margin-top:5px">
+<div id="error-box2">
-        {% trans "This might have happened for the following reasons:" %}<br/>
+    <a href="{% url tags %}">{% trans "see all tags" %} &raquo;</a>
-            <ul>
+</div>
-            <li>{% trans "this question or answer has been deleted;" %}</li>
+<div id="error-box3">
-            <li>{% trans "url has error - please check it;" %}</li>
+    <a href="#" id="linkPrevious">{% trans "back to previous page" %} &raquo;</a>
-            <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>
 {% endblock %}
 <!-- end template 404.html -->
--- a/forum/skins/light/templates/500.html
+++ b/forum/skins/light/templates/500.html
@@ -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 -->
--- a/forum/skins/light/templates/base.html
+++ b/forum/skins/light/templates/base.html
@@ -2,7 +2,6 @@
 {% block page_center %}
 {% block full_width_banner %}{% endblock %}
 <div id="wrapper">
    {% block site_width_banner %}{% endblock %}

--- a/forum/skins/light/templates/header.html
+++ b/forum/skins/light/templates/header.html
@@ -61,11 +61,11 @@
        <div class="clear"></div>
+    </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 -->
--- a/forum/skins/light/templates/question.html
+++ b/forum/skins/light/templates/question.html
@@ -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,6 +135,20 @@
                                    {% contributors_info question %}
                            </div>
                            {% comments question request.user %}
+                            <!-- 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>

--- a/forum/skins/light/templates/question_list/count.html
+++ b/forum/skins/light/templates/question_list/count.html
@@ -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 %}

--- a/locale/it/LC_MESSAGES/it.po
+++ b/locale/it/LC_MESSAGES/it.po
@@ -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"
+"PO-Revision-Date: 2012-07-15 08:58+0000\n"
-"Last-Translator: Giuseppe Terrasi <Unknown>\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"