summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/404.html6
-rw-r--r--templates/500.html4
-rw-r--r--templates/about.html11
-rw-r--r--templates/answer_edit_tips.html2
-rw-r--r--templates/badge.html2
-rw-r--r--templates/book.html4
-rw-r--r--templates/content/images/logo.pngbin3631 -> 4972 bytes
-rw-r--r--templates/content/images/originals/logo.svg119
-rw-r--r--templates/content/style/style.css11
-rw-r--r--templates/faq.html4
-rw-r--r--templates/footer.html6
-rw-r--r--templates/header.html33
-rw-r--r--templates/index.html20
-rw-r--r--templates/question.html18
-rw-r--r--templates/question_edit_tips.html3
-rw-r--r--templates/revisions_answer.html2
-rw-r--r--templates/revisions_question.html2
-rw-r--r--templates/tags.html4
-rw-r--r--templates/user_info.html2
-rw-r--r--templates/user_reputation.html2
-rw-r--r--templates/user_stats.html6
-rw-r--r--templates/user_tabs.html16
-rw-r--r--templates/user_votes.html4
-rw-r--r--templates/users_questions.html6
24 files changed, 206 insertions, 81 deletions
diff --git a/templates/404.html b/templates/404.html
index 7090156b..bfb86e7d 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -27,7 +27,7 @@
<ul>
<li>{% trans "this question or answer has been deleted;" %}</li>
<li>{% trans "url has error - please check it;" %}</li>
- <li>{% trans "the page you tried to visit is protected or you don't have sufficient points, see" %} <a href="/faq"> faq</a>;</li>
+ <li>{% trans "the page you tried to visit is protected or you don't have sufficient points, see" %} <a href="{% url faq %}"> faq</a>;</li>
<li>{% trans "if you believe this error 404 should not have occured, please" %}
<a href="{{feedback_site_url}}" target="_blank">{% trans "report this problem" %}</a></li>
</u>
@@ -39,8 +39,8 @@
<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" %} » </li>
- <li><a href="/questions">{% trans "see all questions" %} » </a></li>
- <li><a href="/tags/">{% trans "see all tags" %} » </a></li>
+ <li><a href="{% url questions %}">{% trans "see all questions" %} » </a></li>
+ <li><a href="{% url tags %}">{% trans "see all tags" %} » </a></li>
</u>
</div>
diff --git a/templates/500.html b/templates/500.html
index 313150fb..51e73178 100644
--- a/templates/500.html
+++ b/templates/500.html
@@ -25,8 +25,8 @@
{% trans "please report the error to the site administrators if you wish" %}
<ul>
<li><a href="#" id="linkPrevious">{% trans "back to previous page" %}</li>
- <li><a href="/questions">{% trans "see latest questions" %}</a></li>
- <li><a href="/tags/">{% trans "see tags" %}</a></li>
+ <li><a href="{% url questions %}">{% trans "see latest questions" %}</a></li>
+ <li><a href="{% url tags %}">{% trans "see tags" %}</a></li>
</u>
</div>
diff --git a/templates/about.html b/templates/about.html
index eaf0d591..7beedb0b 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -12,10 +12,13 @@
</div>
<div class="content">
- <p>edit file templates/about.html. Below are just suggestions of what can go here</p>
- <p>what is your site for?</p>
- <p>how does it work? what are roles of members?</p>
- <p>is there a place to find out more about this website?</p>
+ <p>Preguntalo.com.uy es una herramienta social para hacer preguntas y recibir respuestas
+ de forma colectiva, incentivando a quienes aporten contenidos relevantes mediante un
+ sistema de reputación.</p>
+ <p>Si haces una pregunta ques es votada por los usuarios como útil, recibiras
+ puntos de reputación, también si respondes una pregunta, y más puntos aún si tu respuesta
+ es aceptada como la correcta!</p>
+ <p>Estamos en estapa de desarrollo. Si tenés alguna duda, preguntalo.com.uy! :)</p>
</div>
{% endblock %}
<!-- end template about.html -->
diff --git a/templates/answer_edit_tips.html b/templates/answer_edit_tips.html
index bf1cd516..33e4e242 100644
--- a/templates/answer_edit_tips.html
+++ b/templates/answer_edit_tips.html
@@ -16,7 +16,7 @@
{% trans "be clear and concise" %}
</li>
</ul>
- <a href="/faq/" target="_blank" title="{% trans "see frequently asked questions" %}" style="float:right;position:relative">faq »</a>
+ <a href="{% url faq %}" target="_blank" title="{% trans "see frequently asked questions" %}" style="float:right;position:relative">faq »</a>
</div>
</div>
diff --git a/templates/badge.html b/templates/badge.html
index 029ba0d9..73cba4ba 100644
--- a/templates/badge.html
+++ b/templates/badge.html
@@ -28,7 +28,7 @@
</div>
<div id="award-list" style="clear:both;margin-left:20px;line-height:25px;">
{% for award in awards %}
- <p style="width:185px;float:left"><a href="/users/{{ award.id }}/{{ award.name }}">{{ award.name }}</a> {% get_score_badge_by_details award.rep award.gold award.silver award.bronze %}</p>
+ <p style="width:185px;float:left"><a href="{% url users %}{{ award.id }}/{{ award.name }}">{{ award.name }}</a> {% get_score_badge_by_details award.rep award.gold award.silver award.bronze %}</p>
{% endfor %}
</div>
diff --git a/templates/book.html b/templates/book.html
index 23166cb7..cc6fc77b 100644
--- a/templates/book.html
+++ b/templates/book.html
@@ -98,7 +98,7 @@
<div class="favorites-empty"> </div>
{% endif %}
<div id="question-summary-{{question.id}}" class="question-summary narrow">
- <a style="text-decoration: none;" href="/questions/{{question.id}}/{{question.get_question_title}}">
+ <a style="text-decoration: none;" href="{% url questions %}{{question.id}}/{{question.get_question_title}}">
<div class="stats">
<div class="votes">
<div class="vote-count-post">{{question.score|intcomma}}</div>
@@ -118,7 +118,7 @@
</a>
<div class="bookQuestionItem">
<h3>
- <a title="{{question.summary|collapse}}" href="/questions/{{question.id}}/{{question.title}}">{{question.title}}</a>
+ <a title="{{question.summary|collapse}}" href="{% url questions %}{{question.id}}/{{question.title}}">{{question.title}}</a>
</h3>
<div class="tags">
{% for tag in question.tagname_list %}
diff --git a/templates/content/images/logo.png b/templates/content/images/logo.png
index 640eb1da..b5501337 100644
--- a/templates/content/images/logo.png
+++ b/templates/content/images/logo.png
Binary files differ
diff --git a/templates/content/images/originals/logo.svg b/templates/content/images/originals/logo.svg
new file mode 100644
index 00000000..29c53f60
--- /dev/null
+++ b/templates/content/images/originals/logo.svg
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="200"
+ height="60"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ version="1.0"
+ sodipodi:docname="logo.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="/home/bruno/repos/preguntalo/templates/content/images/logo.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs4">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective10" />
+ <inkscape:perspective
+ id="perspective2390"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.979899"
+ inkscape:cx="130.73959"
+ inkscape:cy="39.353001"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1280"
+ inkscape:window-height="732"
+ inkscape:window-x="0"
+ inkscape:window-y="24" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-154.28572,-485.2193)">
+ <text
+ xml:space="preserve"
+ style="font-size:35.70877075px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:semi-condensed;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold Semi-Condensed"
+ x="154.2048"
+ y="532.07758"
+ id="text2396"
+ sodipodi:linespacing="125%"
+ inkscape:export-filename="/home/bruno/repos/preguntalo/templates/content/images/text2424.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"><tspan
+ sodipodi:role="line"
+ id="tspan2398"
+ x="154.2048"
+ y="532.07758">Preguntalo</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:12.09910297px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:semi-condensed;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold Semi-Condensed"
+ x="303.99615"
+ y="542.42242"
+ id="text2400"
+ sodipodi:linespacing="125%"
+ inkscape:export-filename="/home/bruno/repos/preguntalo/templates/content/images/text2424.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"><tspan
+ sodipodi:role="line"
+ id="tspan2402"
+ x="303.99615"
+ y="542.42242"
+ style="font-size:12.09910297px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:semi-condensed;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#808080;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold Semi-Condensed">.com.uy</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:10.5875988px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:semi-condensed;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold Semi-Condensed"
+ x="157.2961"
+ y="502.24216"
+ id="text2424"
+ inkscape:export-filename="/home/bruno/repos/preguntalo/templates/content/images/text2424.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan2426"
+ x="157.2961"
+ y="502.24216">Si no lo sabes ¿?#*!...</tspan></text>
+ </g>
+</svg>
diff --git a/templates/content/style/style.css b/templates/content/style/style.css
index e353dd47..1f992b7b 100644
--- a/templates/content/style/style.css
+++ b/templates/content/style/style.css
@@ -110,7 +110,7 @@ blockquote
margin-bottom:-3px;
}
#navBar {float:clear;position:relative;display:block;width:960px;}
-#navBar .nav {margin:20px 0px 0px 16px;
+#navBar .nav {margin:50px 0px 0px 16px;
/*letter-spacing:1px; */
}
#navBar .nav a {color:#333333; background-color:#F9F7ED;
@@ -118,13 +118,14 @@ blockquote
border-bottom: none;
padding:0px 12px 3px 12px; height:25px; line-height:30px;margin-left:10px; font-size:14px; font-weight:400; text-decoration:none;display: block;float: left;}
#navBar .nav a:hover {text-decoration:underline}
-#navBar .nav a.on {height:24px;line-height:28px;border:1px solid #d64000; background:#B02B2C; color:#FFF; font-weight:600; text-decoration:none}
-#navBar .nav a.special {font-size:15px; color:#B02B2C; font-weight:bold; text-decoration:none; }
+#navBar .nav a.on {height:24px;line-height:28px;border:1px solid green; background:green; color:#FFF; font-weight:600; text-decoration:none}
+#navBar .nav a.special {font-size:15px; color:green; font-weight:bold; text-decoration:none; border:solid 1px;}
#navBar .nav a.special:hover {text-decoration:underline;}
-#navBar .nav div.focus {float:right; padding-right:0px;}
+#navBar .nav div.focus {position: absolute; top:10px;
+ padding-right:0px;}
/*搜索栏*/
#searchBar {
- background-color:#9db2b1;/*#e9b96e;*/
+ background-color:green;/*#e9b96e;*/
padding:5px 0 0 0;} /* #B02B2C */
#searchBar .content { }
#searchBar .searchInput {font-size:13px; height:18px; width:400px;}
diff --git a/templates/faq.html b/templates/faq.html
index 7e99ae7f..8adee552 100644
--- a/templates/faq.html
+++ b/templates/faq.html
@@ -115,7 +115,7 @@
<div>
<h3 class="subtitle">{% trans "To register, do I need to create new password?" %}</h3>
<p>{% trans "No, you don't have to. You can login through any service that supports OpenID, e.g. Google, Yahoo, AOL, etc." %}
- <strong><a href="/account/signin">{% trans "Login now!" %}</a> »</strong>
+ <strong><a href="{% url user_signin %}">{% trans "Login now!" %}</a> »</strong>
</p>
</div>
@@ -129,7 +129,7 @@
<h3 class="subtitle">{% trans "Still have questions?" %}</h3>
<p>{% trans "Please ask your question, help make our community better!" %}
<!--
- <a href="/tags/faq" class="big">{% trans "site title" %} {% trans "questions" %}</a>{% trans "." %}
+ <a href="{% url tags %}faq" class="big">{% trans "site title" %} {% trans "questions" %}</a>{% trans "." %}
-->
</p>
</div>
diff --git a/templates/footer.html b/templates/footer.html
index c291c328..f182ca3c 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -4,11 +4,11 @@
<!-- 页面底部开始: -->
<div id="ground">
<div class="footerLinks" >
- <a href="/about">{% trans "about" %}</a><span class="link-separator"> |</span>
- <a href="/faq">{% trans "faq" %}</a><span class="link-separator"> |</span>
+ <a href="{% url about %}">{% trans "about" %}</a><span class="link-separator"> |</span>
+ <a href="{% url faq %}">{% trans "faq" %}</a><span class="link-separator"> |</span>
<a href="{{ blog_url }}">{% trans "blog" %}</a><span class="link-separator"> |</span>
<a href="{{ webmaster_email }}">{% trans "contact us" %}</a><span class="link-separator"> |</span>
- <a href="/privacy">{% trans "privacy policy" %}</a><span class="link-separator"> |</span>
+ <a href="{% url privacy %}">{% trans "privacy policy" %}</a><span class="link-separator"> |</span>
<a href="{{ feedback_url }}" target="_blank">{% trans "give feedback" %}</a>
</div>
<p style="margin-top:10px;">
diff --git a/templates/header.html b/templates/header.html
index d606e9e7..077de586 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -6,13 +6,13 @@
<div id="top">
<!--<div id="header">-->
{% if request.user.is_authenticated %}
- <a href="/users/{{ request.user.id }}/{{ request.user.username }}/">{{ request.user.username }}</a> {% get_score_badge request.user %}
- <a href="/logout/">{% trans "logout" %}</a>
+ <a href="{% url users %}{{ request.user.id }}/{{ request.user.username }}/">{{ request.user.username }}</a> {% get_score_badge request.user %}
+ <a href="{% url logout %}">{% trans "logout" %}</a>
{% else %}
- <a href="/account/signin">{% trans "login" %}</a>
+ <a href="{% url user_signin %}">{% trans "login" %}</a>
{% endif %}
- <a href="/about">{% trans "about" %}</a>
- <a href="/faq">{% trans "faq" %}</a>
+ <a href="{% url about %}">{% trans "about" %}</a>
+ <a href="{% url faq %}">{% trans "faq" %}</a>
<!--</div>-->
</div>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
@@ -26,21 +26,22 @@
</td>
<td width="77%" valign="bottom">
<div class="nav">
- <a id="nav_questions" href="/questions/" >{% trans "questions" %}</a>
- <a id="nav_tags" href="/tags/">{% trans "tags" %}</a>
- <a id="nav_users" href="/users/">{% trans "users" %}</a>
- <!--<a id="nav_books" href="/books/">{% trans "books" %}</a>-->
- <a id="nav_badges" href="/badges/">{% trans "badges" %}</a>
- <a id="nav_unanswered" href="/questions/unanswered/">{% trans "unanswered questions" %}</a>
+ <div class="focus">
+ <a id="nav_ask" href="{% url ask %}" class="special">{% trans "ask a question" %}</a>
+ </div>
+
+ <a id="nav_questions" href="{% url questions %}" >{% trans "questions" %}</a>
+ <a id="nav_tags" href="{% url tags %}">{% trans "tags" %}</a>
+ <a id="nav_users" href="{% url users %}">{% trans "users" %}</a>
+ <!--<a id="nav_books" href="{% url books %}">{% trans "books" %}</a>-->
+ <a id="nav_badges" href="{% url badges %}">{% trans "badges" %}</a>
+ <a id="nav_unanswered" href="{% url unanswered %}">{% trans "unanswered questions" %}</a>
{% comment %}<!-- i think this needs to be removed -e.f. -->
{% if request.user.is_authenticated %}
- <a id="nav_profile" href="/users/{{ request.user.id }}/{{ request.user.username }}/">{% trans "my profile" %}</a>
+ <a id="nav_profile" href="{% url user %}{{ request.user.id }}/{{ request.user.username }}/">{% trans "my profile" %}</a>
{% endif %}
{% endcomment %}
- <div class="focus">
- <a id="nav_ask" href="/questions/ask/" class="special">{% trans "ask a question" %}</a>
- </div>
</div>
</td>
@@ -51,7 +52,7 @@
<table width="100%" border="0" cellpadding="0" cellspacing="0" class="content">
<tr>
<td align="center" valign="middle">
- <form action="/search/" method="get">
+ <form action="{% url search %}" method="GET">
<div>
<input type="text" class="searchInput" value="{{ keywords }}" name="q" id="keywords" />
<input type="submit" name="Submit" value="{% trans "search" %}" class="searchBtn" />
diff --git a/templates/index.html b/templates/index.html
index 964721f7..b358c384 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -24,7 +24,7 @@
<a id="latest" href="?sort=latest" title="{% trans "last updated questions" %}" >{% trans "newest" %}</a>
<a id="hottest" href="?sort=hottest" title="{% trans "hottest questions" %}" >{% trans "hottest" %}</a>
<a id="mostvoted" href="?sort=mostvoted" title="{% trans "most voted questions" %}" >{% trans "most voted" %}</a>
- <a id="all" href="/questions/" title="{% trans "all questions" %}" >{% trans "all questions" %}</a>
+ <a id="all" href="{% url questions %}" title="{% trans "all questions" %}" >{% trans "all questions" %}</a>
</div>
</div>
<!-- 问题列表 -->
@@ -79,9 +79,9 @@
<div class="boxA">
<h3>{% trans "welcome to website" %}</h3>
<div class="body">
- {{settings.APP_INTRO|safe}}
- <div class="more"><a href="/about">{% trans "about" %} »</a></div>
- <div class="more"><a href="/faq">{% trans "faq" %} »</a></div>
+ {{ settings.APP_INTRO|safe }}
+ <div class="more"><a href="{% url about %}">{% trans "about" %} »</a></div>
+ <div class="more"><a href="{% url faq %}">{% trans "faq" %} »</a></div>
</div>
</div>
{% endif %}
@@ -93,8 +93,8 @@
<a rel="tag"
title="{% blocktrans with tag.name as tagname %}see questions tagged '{{tagname}}'{% endblocktrans %}" href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
{% endfor %}
- </div>
- <div class="more"><a href="/tags">{% trans "popular tags" %} »</a> </div>
+ </p>
+ <div class="more"><a href="{% url tags %}">{% trans "popular tags" %} »</a> </div>
</div>
</div>
{% if awards %}
@@ -104,13 +104,13 @@
<ul class="badge-list">
{% for award in awards %}
<li>
- <a href="/badges/{{award.badge_id}}/{{award.badge_name}}" title="{{ award.badge_description }}" class="medal">
+ <a href="{% url badges %}{{award.badge_id}}/{{award.badge_name}}" title="{{ award.badge_description }}" class="medal">
<span class="badge{{ award.badge_type }}">&#9679;</span>&nbsp;{{ award.badge_name }}</a> {% trans "given to" %}
- <a href="/users/{{award.user_id}}/{{award.user_name}}">{{ award.user_name }}</a>
+ <a href="{% url users %}{{award.user_id}}/{{award.user_name}}">{{ award.user_name }}</a>
</li>
{% endfor %}
</ul>
- <div class="more"><a href="/badges/">{% trans "all awards" %} »</a> </div>
+ <div class="more"><a href="{% url badges %}">{% trans "all awards" %} »</a> </div>
</div>
</div>
{% endif %}
@@ -120,7 +120,7 @@
{% endblock %}
{% block tail %}
<div style="padding:5px 0 5px 5px;">
-<span class="evenMore">{% trans "Still looking for more? See" %} <a href="/questions/">{% trans "complete list of questions" %}</a> {% trans "or" %} <a href="/tags/">{% trans "popular tags" %}</a>{% trans "." %} {% trans "Please help us answer" %} <a href="/questions/unanswered">{% trans "list of unanswered questions" %}</a>{% trans "." %}</span>
+<span class="evenMore">{% trans "Still looking for more? See" %} <a href="{% url questions %}">{% trans "complete list of questions" %}</a> {% trans "or" %} <a href="/tags/">{% trans "popular tags" %}</a>{% trans "." %} {% trans "Please help us answer" %} <a href="{% url questions %}unanswered">{% trans "list of unanswered questions" %}</a>{% trans "." %}</span>
</div>
{% endblock %}
<!-- index.html -->
diff --git a/templates/question.html b/templates/question.html
index a2628859..0e1b8cb2 100644
--- a/templates/question.html
+++ b/templates/question.html
@@ -30,7 +30,7 @@
{% if not question.closed and request.user.is_authenticated %}initEditor();{% endif %}
lanai.highlightSyntax();
- $('#btLogin').bind('click', function(){window.location.href='/account/signin/'; } )
+ $('#btLogin').bind('click', function(){window.location.href='{% url user_signin %}'; } )
});
function initEditor(){
@@ -122,7 +122,7 @@
<div id="question-tags" class="tags" >
{% for tag in question.tagname_list %}
<a href="{% url forum.views.tag tag|urlencode %}" class="post-tag"
- title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">{{ tag }}</a>
+ title="{% trans "see questions tagged" %} '{{ tag }}' {% trans "using tags" %}" rel="tag">{{ tag }}</a>
{% endfor %}
</div>
<div id="question-controls" style="clear:both;">
@@ -174,7 +174,7 @@
{% gravatar question.last_edited_by 32 %}
</td>
<td style="width:160px; vertical-align:top">
- <a href="/users/{{ question.last_edited_by.id }}/{{ question.last_edited_by.username }}">{{ question.last_edited_by.username }}</a>
+ <a href="{% url users %}{{ question.last_edited_by.id }}/{{ question.last_edited_by.username }}">{{ question.last_edited_by.username }}</a>
</td>
</tr>
{% else %}
@@ -189,7 +189,7 @@
{% gravatar question.last_edited_by 32 %}
</td>
<td style="width:160px; vertical-align:top">
- <div><a href="/users/{{ question.last_edited_by.id }}/{{ question.last_edited_by.username }}">{{ question.last_edited_by.username }}</a></div>
+ <div><a href="{% url users %}{{ question.last_edited_by.id }}/{{ question.last_edited_by.username }}">{{ question.last_edited_by.username }}</a></div>
<div>
{% get_score_badge question.last_edited_by %}
@@ -223,7 +223,7 @@
{% gravatar question.author 32 %}
</td>
<td align="left" style="width:160px;vertical-align:top">
- <div><a href="/users/{{ question.author.id }}/{{ question.author }}">{{ question.author }}</a></div>
+ <div><a href="{% url users %}{{ question.author.id }}/{{ question.author }}">{{ question.author }}</a></div>
<div>
{% get_score_badge question.author %}
</div>
@@ -361,7 +361,7 @@
{% gravatar answer.last_edited_by 32 %}
</td>
<td style="width:160px; vertical-align:top">
- <div><a href="/users/{{ answer.last_edited_by.id }}/{{ answer.last_edited_by.username }}">{{ answer.last_edited_by.username }}</a></div>
+ <div><a href="{% url users %}{{ answer.last_edited_by.id }}/{{ answer.last_edited_by.username }}">{{ answer.last_edited_by.username }}</a></div>
</td>
</tr>
@@ -377,7 +377,7 @@
{% gravatar answer.last_edited_by 32 %}
</td>
<td style="width:160px; vertical-align:top">
- <div><a href="/users/{{ answer.last_edited_by.id }}/{{ answer.last_edited_by.username }}">{{ answer.last_edited_by.username }}</a></div>
+ <div><a href="{% url users %}{{ answer.last_edited_by.id }}/{{ answer.last_edited_by.username }}">{{ answer.last_edited_by.username }}</a></div>
<div>
{% get_score_badge answer.last_edited_by %}
</div>
@@ -407,7 +407,7 @@
{% gravatar answer.author 32 %}
</td>
<td style="width:160px; vertical-align:top">
- <div><a href="/users/{{ answer.author.id }}/{{ answer.author.username }}">{{ answer.author }}</a></div>
+ <div><a href="{% url users %}{{ answer.author.id }}/{{ answer.author.username }}">{{ answer.author }}</a></div>
<div>
{% get_score_badge answer.author %}
</div>
@@ -516,7 +516,7 @@
<div class="questions-related">
{% for question in similar_questions %}
<p>
- <a href="/questions/{{question.id}}/{{ question.get_question_title }}">{{ question.get_question_title }}</a>
+ <a href="{% url questions %}{{question.id}}/{{ question.get_question_title }}">{{ question.get_question_title }}</a>
</p>
{% endfor %}
</div>
diff --git a/templates/question_edit_tips.html b/templates/question_edit_tips.html
index ef6dca15..85614595 100644
--- a/templates/question_edit_tips.html
+++ b/templates/question_edit_tips.html
@@ -13,7 +13,8 @@
{% trans "be clear and concise" %}
</li>
</ul>
- <a href="/faq/" target="_blank" title="{% trans "see frequently asked questions" %}" style="float:right;position:relative">faq »</a>
+ <a href="{% url faq %}" target="_blank" title="{% trans "see frequently asked questions" %}" style="float:right;position:relative">{% trans "faq" %} »</a>
+ <br>
</div>
</div>
diff --git a/templates/revisions_answer.html b/templates/revisions_answer.html
index 9c2e53eb..23606dc9 100644
--- a/templates/revisions_answer.html
+++ b/templates/revisions_answer.html
@@ -73,7 +73,7 @@
</td>
<td style="width:120px; vertical-align:top">
<div style="height:18px">
- <a href="/users/{{ revision.author.id }}/{{ revision.author.username }}">{{ revision.author.username }}</a></div>
+ <a href="{% url users %}{{ revision.author.id }}/{{ revision.author.username }}">{{ revision.author.username }}</a></div>
<div>
{% get_score_badge revision.author %}
</div>
diff --git a/templates/revisions_question.html b/templates/revisions_question.html
index 7ada3e74..b76ced24 100644
--- a/templates/revisions_question.html
+++ b/templates/revisions_question.html
@@ -73,7 +73,7 @@
</td>
<td style="width:120px; vertical-align:top">
<div style="height:18px">
- <a href="/users/{{ revision.author.id }}/{{ revision.author.username }}">{{ revision.author.username }}</a></div>
+ <a href="{% url users %}{{ revision.author.id }}/{{ revision.author.username }}">{{ revision.author.username }}</a></div>
<div>
{% get_score_badge revision.author %}
</div>
diff --git a/templates/tags.html b/templates/tags.html
index 65a7e4dd..f558594a 100644
--- a/templates/tags.html
+++ b/templates/tags.html
@@ -29,8 +29,8 @@
<div class="tabBar">
<div class="headQuestions">{% trans "Tag list" %}</div>
<div class="tabsA">
- <a id="sort_name" href="/tags/?sort=name" class="off" title="{% trans "sorted alphabetically" %}">{% trans "by name" %}</a>
- <a id="sort_used" href="/tags/?sort=used" class="off" title="{% trans "sorted by frequency of tag use" %}">{% trans "by popularity" %}</a>
+ <a id="sort_name" href="{% url tags %}?sort=name" class="off" title="{% trans "sorted alphabetically" %}">{% trans "by name" %}</a>
+ <a id="sort_used" href="{% url tags %}?sort=used" class="off" title="{% trans "sorted by frequency of tag use" %}">{% trans "by popularity" %}</a>
</div>
</div>
<div id="searchtags">
diff --git a/templates/user_info.html b/templates/user_info.html
index 86e36023..e56fb143 100644
--- a/templates/user_info.html
+++ b/templates/user_info.html
@@ -31,7 +31,7 @@
<th width="130" align="left"><strong>{% trans "Registered user" %}</strong></th>
<th width="230" align="right">
{% if request.user|can_view_user_edit:view_user %}
- <span class="user-edit-link"><a href="/users/{{ view_user.id }}/edit/">{% trans "update profile" %}</a></span>
+ <span class="user-edit-link"><a href="{% url users %}{{ view_user.id }}/{% trans "edit/" %}">{% trans "update profile" %}</a></span>
{% endif %}
</th>
</tr>
diff --git a/templates/user_reputation.html b/templates/user_reputation.html
index bb7200de..270bb37d 100644
--- a/templates/user_reputation.html
+++ b/templates/user_reputation.html
@@ -33,7 +33,7 @@
<div style="float:left;width:20px;color:red">{{ rep.negative }}</div>
</div>
- <a href="/questions/{{ rep.question_id }}/{{ rep.title }}">{{ rep.title }}</a> <span class="small">({{ rep.reputed_at }})</span>
+ <a href="{% url questions %}{{ rep.question_id }}/{{ rep.title }}">{{ rep.title }}</a> <span class="small">({{ rep.reputed_at }})</span>
</p>
{% endfor %}
</div>
diff --git a/templates/user_stats.html b/templates/user_stats.html
index 2c2a7a72..7313fac3 100644
--- a/templates/user_stats.html
+++ b/templates/user_stats.html
@@ -33,14 +33,14 @@
<div class="user-stats-table">
{% for answered_question in answered_questions %}
<div class="answer-summary">
- <a title="{{answered_question.summary|collapse}}" href="/questions/{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">
+ <a title="{{answered_question.summary}}" href="{% url questions %}{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">
<div class="answer-votes {% if answered_question.accepted %}answered-accepted{% endif %}"
title="{% blocktrans with answered_question.vote_count as vote_count %}the answer has been voted for {{ vote_count }} times{% endblocktrans %}&#13;{% if answered_question.accepted %}{% trans "this answer has been selected as correct" %}{%endif%}">
{{ answered_question.vote_count }}
</div>
</a>
<div class="answer-link">
- <a href="/questions/{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">{{answered_question.title}}</a> {% if answered_question.comment_count %}<span
+ <a href="{% url questions %}{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">{{answered_question.title}}</a> {% if answered_question.comment_count %}<span
title="{% blocktrans with answered_question.comment_count as comment_count %}the answer has been commented {{ comment_count }} times{% endblocktrans %}">({{answered_question.comment_count}})</span>{% endif %}
</div>
</div>
@@ -120,7 +120,7 @@
<tr>
<td width="180" style="line-height:35px">
{% for award in awards %}
- <a href="/badges/{{award.id}}/{{award.name}}" title="{{ award.description }}" class="medal"><span class="badge{{ award.type }}">&#9679;</span>&nbsp;{{ award.name }}</a><span class="tag-number"> × {{ award.count|intcomma }}</span><br/>
+ <a href="{% url badges %}{{award.id}}/{{award.name}}" title="{{ award.description }}" class="medal"><span class="badge{{ award.type }}">&#9679;</span>&nbsp;{{ award.name }}</a><span class="tag-number"> × {{ award.count|intcomma }}</span><br/>
{% if forloop.counter|divisibleby:"6" %}
</td>
<td width="180" style="line-height:35px">
diff --git a/templates/user_tabs.html b/templates/user_tabs.html
index 7800eb00..96cc5aca 100644
--- a/templates/user_tabs.html
+++ b/templates/user_tabs.html
@@ -4,28 +4,28 @@
<div class="tabBar">
<div class="tabsA">
<a id="stats" {% ifequal tab_name "stats" %}class="on"{% endifequal %}
- title="{% trans "User profile" %}" href="/users/{{view_user.id}}/{{view_user.username}}?sort=stats">{% trans "overview" %}</a>
+ title="{% trans "User profile" %}" href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=stats">{% trans "overview" %}</a>
<a id="recent" {% ifequal tab_name "recent" %}class="on"{% endifequal %}
- title="{% trans "recent activity" %}" href="/users/{{view_user.id}}/{{view_user.username}}?sort=recent">{% trans "recent activity" %}</a>
+ title="{% trans "recent activity" %}" href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=recent">{% trans "recent activity" %}</a>
{% if request.user|is_user_self:view_user %}
<a id="responses" {% ifequal tab_name "responses" %}class="on"{% endifequal %}
title="{% trans "comments and answers to others questions" %}"
- href="/users/{{view_user.id}}/{{view_user.username}}?sort=responses">{% trans "responses" %}</a>
+ href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=responses">{% trans "responses" %}</a>
{% endif %}
<a id="reputation" {% ifequal tab_name "reputation" %}class="on"{% endifequal %}
title="{% trans "graph of user reputation" %}"
- href="/users/{{view_user.id}}/{{view_user.username}}?sort=reputation">{% trans "reputation history" %}</a>
+ href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=reputation">{% trans "reputation history" %}</a>
{% if request.user|can_view_user_votes:view_user %}
<a id="votes" {% ifequal tab_name "votes" %}class="on"{% endifequal %}
- title="{% trans "user vote record" %}" href="/users/{{view_user.id}}/{{view_user.username}}?sort=votes">{% trans "casted votes" %}</a>
+ title="{% trans "user vote record" %}" href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=votes">{% trans "casted votes" %}</a>
{% endif %}
<a id="favorites" {% ifequal tab_name "favorites" %}class="on"{% endifequal %}
- title="{% trans "questions that user selected as his/her favorite" %}"
- href="/users/{{view_user.id}}/{{view_user.username}}?sort=favorites">{% trans "favorites" %}</a>
+ title="{% trans "questions that user selected as his/her favorite"
+ href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=favorites">{% trans "favorites" %}</a>
{% if request.user|can_view_user_preferences:view_user %}
<a id="preferences" {% ifequal tab_name "preferences" %}class="on"{% endifequal %}
title="{% trans "user preference settings" %}"
- href="/users/{{view_user.id}}/{{view_user.username}}?sort=preferences">{% trans "settings" %}</a>
+ href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=preferences">{% trans "settings" %}</a>
{% endif %}
</div>
</div>
diff --git a/templates/user_votes.html b/templates/user_votes.html
index 80fa27ee..45134ac9 100644
--- a/templates/user_votes.html
+++ b/templates/user_votes.html
@@ -18,9 +18,9 @@
</div>
<div style="float:left;overflow:hidden;width:750px">
{% ifequal vote.answer_id 0 %}
- <span class="question-title-link"><a href="/questions/{{ vote.question_id }}/{{ vote.title }}">{{ vote.title }}</a></span>
+ <span class="question-title-link"><a href="{% url questions %}{{ vote.question_id }}/{{ vote.title }}">{{ vote.title }}</a></span>
{% else %}
- <span class="answer-title-link" ><a href="/questions/{{ vote.question_id }}/{{ vote.title }}#{{ vote.answer_id }}">{{ vote.title }}</a></span>
+ <span class="answer-title-link" ><a href="{% url questions %}{{ vote.question_id }}/{{ vote.title }}#{{ vote.answer_id }}">{{ vote.title }}</a></span>
{% endifequal %}
<div style="height:5px"></div>
</div>
diff --git a/templates/users_questions.html b/templates/users_questions.html
index 7b00fd3f..dd818ddb 100644
--- a/templates/users_questions.html
+++ b/templates/users_questions.html
@@ -23,7 +23,7 @@
<div class="favorites-empty"> </div>
{% endif %}
<div id="question-summary-{{question.id}}" class="question-summary narrow">
- <a style="text-decoration: none;" href="/questions/{{question.id}}/{{question.get_question_title}}">
+ <a style="text-decoration: none;" href="{% url questions %}{{question.id}}/{{question.get_question_title}}">
<div class="stats">
<div class="votes">
<div class="vote-count-post">{{question.vote_count|intcomma}}</div>
@@ -43,7 +43,7 @@
</a>
<div class="summary">
<h3>
- <a title="{{question.summary|collapse}}" href="/questions/{{question.id}}/{{question.title}}">{{question.title}}</a>
+ <a title="{{question.summary}}" href="{% url questions %}{{question.id}}/{{question.title}}">{{question.title}}</a>
</h3>
<div class="tags">
{% convert2tagname_list question %}
@@ -55,7 +55,7 @@
<div class="started">
<span class="relativetime" title="{{question.last_activity_at}}">{% diff_date question.last_activity_at %}</span>
{% if question.la_username %}
- <a href="/users/{{question.la_user_id}}/{{question.la_username}}">{{question.la_username}}</a> {% get_score_badge_by_details question.la_user_reputation question.la_user_gold question.la_user_silver question.la_user_bronze%}
+ <a href="{% url users %}{{question.la_user_id}}/{{question.la_username}}">{{question.la_username}}</a> {% get_score_badge_by_details question.la_user_reputation question.la_user_gold question.la_user_silver question.la_user_bronze%}
{% endif %}
</div>
</div>