Skip to content

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

- update fixme 

- re-add social network button
parent 833bd0b2
Hide whitespace changes
Inline Side-by-side
Showing with 356 additions and 51 deletions
00-FIXME
View file @ c4907391
Elenco dei maggiori cambiamenti tra la nostra versione e upstream.
= forum/registry.py =
Rimossi da ui.registerui.HEADER_LINKS i seguenti per non farli apparire nel subheader:
ui.Link(_('faq'), ui.Url('faq'), weight=400, name='FAQ'),
ui.Link(_('about'), ui.Url('about'), weight=300, name='ABOUT'),
= forum_modules/openidauth/authentication.py =
Aggiunte le classi LaunchpadAuth e UbuntuSSOAuth.
......@@ -20,51 +13,8 @@ Aggiunta cartella "it", la nostra localizzazione, prima non presente.
Disabilitati i seguenti moduli, di default abilitati: mysqlfulltext, localauth, oauthauth, facebookauth, sphinxfulltext
= forum/skins/light/media/js/wmd/wmd.js =
File nel quale sono state apportate direttamente delle traduzioni.
= forum/skins/light/media/js/osqa.ask.js =
File nel quale sono state apportate direttamente delle traduzioni.
= forum/skins/light/templates/auth/signin.html =
Nascosti, commentati, metodi di autenticazione e/o registrazione non utilizzati.
= ask.jquery.header.string.replace.js =
Aggiunto questo file e collegato all'interno di header.html
Questi javascript usando il metodo replaceWith agiscono sui selettori css presenti nell'output html ed eseguono una serie di sostituzioni.
Nello specifico, l'introduzione di questo work-around serve a risolvere il problema della capitalizzazone del testo mostrato nell'header che risulta essere difficoltoso per via delle diverse stringhe del file .po comuni a più parti dell'interfaccia.
= ask.jquery.subscriptions.string.replace.js =
Eliminata capitalizzazione parola "impostazioni" in subscriptions.html usando javascript. La presenza di un link dinamico non permette l'uso di string replace. L'effetto è stato raggiunto in questa maniera:
var subscriptionDiv = $('#navBar a#subscriptions_settings_button');
subscriptionDiv.text('impostazioni');
= forum/skins/light/templates/users/online_users.html =
FIXME: proporre cambiamento upstream come da lp:~giuseppeterrasi/ubuntu-it-ask/l18ned
= forum/skins/light/templates/users/subscriptions.html =
FIXME: proporre cambiamento upstream come da lp:~giuseppeterrasi/ubuntu-it-ask/l18ned
= forum/skins/light/templates/users/users.html =
FIXME: proporre cambiamento upstream come da lp:~giuseppeterrasi/ubuntu-it-ask/l18ned
= forum/templatetags/extra_tags.py =
FIXME: proporre cambiamento upstream come da lp:~giuseppeterrasi/ubuntu-it-ask/l18ned
Revert parziale con modifica 64 ramo dev, attraverso questo merge [1]
[1] https://code.launchpad.net/~giuseppeterrasi/ubuntu-it-ask/revert-extra-tag/+merge/121304
DISABLED_MODULES = ['books', 'recaptcha', 'project_badges', 'mysqlfulltext', 'localauth', 'oauthauth', 'facebookauth']
= forum_modules/pgfulltext =
sostituito "english" con "italian"
= forum/skins/light/templates/notifications/digest.html =
File nel quale sono state apportate direttamente delle traduzioni.
Nello specifico le parole "nuove domande" e "elementi" invece di "posts"
forum/skins/light/templates/question.html 0 → 100644
View file @ c4907391
{% extends "base.html" %}
<!-- question.html -->
{% load node_tags %}
{% load extra_tags %}
{% load extra_filters %}
{% load general_sidebar_tags %}
{% load smart_if %}
{% load humanize %}
{% load i18n %}
{% load cache %}
{% block metadescription %}{{ question.meta_description }}{% endblock %}
{% block metakeywords %}{{question.tagname_meta_generator}}{% endblock %}
{% block meta %}
<link rel="canonical" href="{{settings.APP_BASE_URL}}{{question.get_absolute_url}}" />
<link rel="alternate" type="application/rss+xml" title="RSS" href="{{ question.get_absolute_url }}?type=rss">
{% endblock %}
{% block title %}{% spaceless %}{{ question.headline }}{% endspaceless %}{% endblock %}
{% block forejs %}
{% if not question.nis.closed %}
<script type='text/javascript' src='{% media "/media/js/osqa.question.js" %}'></script>
<script type='text/javascript' src='{% media "/media/js/jquery.caret.js" %}'></script>
<script type='text/javascript' src='{% media "/media/js/wmd/showdown.js" %}'></script>
<script type='text/javascript' src='{% media "/media/js/wmd/wmd.js" %}'></script>
<script type='text/javascript' src='{% media "/media/js/html_sanitizer.js" %}'></script>
<link rel="stylesheet" type="text/css" href="{% media "/media/js/wmd/wmd.css" %}" />
{% if embed_youtube_videos %}
<script type='text/javascript' src='{% media "/media/js/viewbox_min.js" %}'></script>
<script type='text/javascript' src='{% media "/media/js/youtube.js" %}'></script>
<link rel="stylesheet" type="text/css" href="{% media "/media/js/viewbox.css" %}" />
{% endif %}
{% endif %}
<script type="text/javascript">
$().ready(function(){
$("#nav_questions").attr('className',"on");
var answer_sort_tab = "{{ tab_id }}";
if (answer_sort_tab) {
$("#" + answer_sort_tab).attr('className',"on");
}
$('#editor').TextAreaResizer();
//toggle preview of editor
var display = true;
var txt = "[{% trans "hide preview" %}]";
$('#pre-collapse').text(txt);
$('#pre-collapse').bind('click', function(){
txt = display ? "[{% trans "show preview" %}]" : "[{% trans "hide preview" %}]";
display = !display;
$('#previewer').toggle();
$('#pre-collapse').text(txt);
});
});
function submitClicked(e, f) {
if(!(browserTester('chrome') || browserTester('safari'))) {
$("input.submit")[0].disabled=true;
}
window.removeEventListener('beforeunload', beforeUnload, true);
if (f) {
f.submit();
}
}
function beforeUnload(e) {
if($("textarea#editor")[0].value != "") {
return yourWorkWillBeLost(e);
}
var commentBoxes = $("textarea.commentBox");
for(var index = 0; index < commentBoxes.length; index++) {
if(commentBoxes[index].value != "") {
return yourWorkWillBeLost(e);
}
}
}
window.addEventListener('beforeunload', beforeUnload, true);
</script>
<noscript>
<style>
.comment.not_top_scorer {
display: block;
}
.comment-form-container {
display: block;
}
.div.comment-tools {
display: none;
}
</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 %}
<div class="headNormal">
<h1><a href="{{ question.get_absolute_url }}">{{ question.headline }}</a></h1>
</div>
<div id="main-body" class="">
<div id="askform">
<table style="width:100%;" id="question-table" {% post_classes question %}>
<tr>
<td style="width:30px;vertical-align:top">
<div class="vote-buttons">
{% vote_buttons question request.user %}
{% favorite_mark question request.user %}
</div>
</td>
<td>
<div id="item-right">
<div class="question-body">
{{ question.html|safe }}
</div>
<div id="question-tags" class="tags-container tags">
{% for tag in question.tagname_list %}
<a href="{% url tag_questions tag|urlencode %}" class="post-tag tag-link-{{ tag }}"
title="{% blocktrans with tag as tagname %}see questions tagged '{{ tagname }}'{% endblocktrans %}" rel="tag">{{ tag }}</a>
{% endfor %}
</div>
<div id="question-controls" class="post-controls">
{% post_controls question request.user %}
{% wiki_symbol request.user question %}
</div>
<div class="post-update-info-container">
{% 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>
</table>
{% if question.nis.closed %}
<div class="question-status" style="margin-bottom:15px">
<h3>
{% blocktrans with question.nstate.closed.extra as close_reason %}The question has been closed for the following reason "{{ close_reason }}" by{% endblocktrans %}
<a href="{{ question.nstate.closed.by.get_profile_url }}">{{ question.nstate.closed.by.username }}</a>
{% diff_date question.nstate.closed.at %}
</h3>
</div>
{% endif %}
{% if answers %}
<hr/>
<div class="tabBar">
<a name="sort-top"></a>
<div class="headQuestions">
{% blocktrans count answers.paginator.count as counter %}One Answer:{% plural %}{{counter}} Answers:{% endblocktrans %}
</div>
{{ answers.paginator.sort_tabs }}
</div>
{{ answers.paginator.page_numbers }}
{% for answer in answers.paginator.page %}
<a name="{{ answer.id }}"></a>
<div id="answer-container-{{ answer.id }}" class="answer {% post_classes answer %}{% ifequal answer.id focused_answer_id %} focusedAnswer{% endifequal %}">
<table style="width:100%;">
<tr>
<td style="width:30px;vertical-align:top">
<div class="vote-buttons">
{% vote_buttons answer request.user %}
{% accept_button answer request.user %}
</div>
</td>
<td>
<div class="item-right">
<div class="answer-body">
{{ answer.html|safe }}
</div>
<div class="answer-controls post-controls">
{% post_controls answer request.user %}
{% wiki_symbol request.user answer %}
</div>
<div class="post-update-info-container">
{% contributors_info answer %}
</div>
{% comments answer request.user %}
</div>
</td>
</tr>
</table>
</div>
{% endfor %}
<div class="paginator-container-left">
{{ answers.paginator.page_numbers }}
</div>
{% endif %}
<form id="fmanswer" action="{% url answer question.id %}" method="post">
{% csrf_token %}
<div style="clear:both">
</div>
{% if not question.closed %}
<div style="padding:10px 0 0 0;">
{% spaceless %}
<div class="headNormal">
{% if answers %}
{% trans "Your answer" %}
{% else %}
{% trans "Be the first one to answer this question!" %}
{% endif %}
</div>
{% endspaceless %}
</div>
{% comment %}
{% if not request.user.is_authenticated %}
<div class="message">{% trans "You can answer anonymously and then login." %}</div>
{% else %}
<p class="message">
{% ifequal request.user question.author %}
{% trans "Answer your own question only to give an answer." %}
{% else %}
{% trans "Please only give an answer, no discussions." %}
{% endifequal %}
{% if not request.user.email_valid_and_can_answer %}
{% blocktrans %}Remember, your answer will not be published until you validate your email.{% endblocktrans %}
<a href="{% url send_validation_email %}">{% trans "Send me a validation link." %}</a>
{% endif %}
</p>
{% endif %}
{% endcomment %}
<div id="description" class="" >
<div id="wmd-button-bar" class="wmd-panel"></div>
{{ answer.text }}
<div class="preview-toggle">
<table width="100%">
<tr>
<td>
<span id="pre-collapse"
title="{% trans "Toggle the real time Markdown editor preview" %}">
{% trans "toggle preview" %}
</span>
</td>
<td style="text-align: right;" id="editor-metrics"></td>
{% if settings.WIKI_ON %}
<td style="text-align:right;">
{{ answer.wiki }}
<span style="font-weight:normal;cursor:help"
title="{{answer.wiki.help_text}}">
{{ answer.wiki.label_tag }}
</span>
</td>
{% endif %}
</tr>
</table>
</div>
{{ answer.text.errors }}
<div id="previewer" class="wmd-preview"></div>
</div>
{% if answer.recaptcha %}
<div class="question-captcha" style="float: left;">
{{ answer.recaptcha.errors }}
{{ answer.recaptcha }}
</div>
<div class="clear"></div>
{% endif %}
<p><span class="form-error"></span></p>
<input type="button"
{% if user.is_anonymous %}
value="{% trans "Login/Signup to Post Your Answer" %}"
{% else %}
{% if user == question.author %}
value="{% trans "Answer Your Own Question" %}"
{% else %}
value="{% trans "Answer the question" %}"
{% endif %}
{% endif %}
class="submit" style="float:left" onclick="submitClicked(event, this.form)"/>
{% endif %}
</form>
</div>
</div>
{% endblock %}
{% block sidebar %}
<div class="boxC" id="subscription_box">
{% include "subscription_status.html" %}
</div>
{% markdown_help %}
{% sidebar_upper %}
{% cache 60 questions_tags settings.APP_URL question.id %}
<div class="boxC">
<p>
{% trans "Question tags" %}:
</p>
<p class="tags" >
{% for tag in question.tags.all %}
<a href="{% url tag_questions tag.name|urlencode %}"
class="tag-link-{{ tag.name }}"
title="{% trans "see questions tagged"%}'{{tag.name}}'{% trans "using tags" %}"
rel="tag">{{ tag.name }}</a> <span class="tag-number">&#215;{{ tag.used_count|intcomma }}</span><br/>
{% endfor %}
</p>
<p>
{% trans "question asked" %}: <strong title="{{ question.added_at }}">{% diff_date question.added_at %}</strong>
</p>
<p>
{% trans "question was seen" %}: <strong>{{ question.view_count|intcomma }} {% trans "times" %}</strong>
</p>
<p>
{% trans "last updated" %}: <strong title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</strong>
</p>
</div>
{% endcache %}
{% sidebar_lower %}
<div class="boxC">
<h3 class="subtitle">{% trans "Related questions" %}</h3>
<div class="questions-related">
{% for question in similar_questions %}
<p>
<a href="{{ question.get_absolute_url }}">{{ question.headline }}</a>
</p>
{% endfor %}
</div>
</div>
{% endblock %}
{% block endjs %}
{% endblock %}
<!-- end question.html -->
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