diff options
author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2009-08-12 15:26:56 -0400 |
---|---|---|
committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2009-08-12 15:26:56 -0400 |
commit | 5c6fceae98c0916c94ec5b919950c67475f44b67 (patch) | |
tree | 5e9041d10f27b47489344b5dc892c5ec223e30cf /templates | |
parent | 1f034e12f4deeb27cd641c73e555c050e5f4d942 (diff) | |
download | askbot-5c6fceae98c0916c94ec5b919950c67475f44b67.tar.gz askbot-5c6fceae98c0916c94ec5b919950c67475f44b67.tar.bz2 askbot-5c6fceae98c0916c94ec5b919950c67475f44b67.zip |
merged Bruno url translations, removed his local mods, added settings.BOOKS_ON, validated more templates
Diffstat (limited to 'templates')
-rw-r--r-- | templates/404.html | 8 | ||||
-rw-r--r-- | templates/about.html | 11 | ||||
-rw-r--r-- | templates/content/images/logo.png | bin | 4972 -> 3631 bytes | |||
-rw-r--r-- | templates/content/images/originals/logo.svg | 119 | ||||
-rw-r--r-- | templates/content/style/style.css | 13 | ||||
-rw-r--r-- | templates/faq.html | 4 | ||||
-rw-r--r-- | templates/header.html | 13 | ||||
-rw-r--r-- | templates/index.html | 8 | ||||
-rw-r--r-- | templates/question.html | 2 | ||||
-rw-r--r-- | templates/user_stats.html | 84 | ||||
-rw-r--r-- | templates/user_tabs.html | 2 | ||||
-rw-r--r-- | templates/users_questions.html | 30 |
12 files changed, 65 insertions, 229 deletions
diff --git a/templates/404.html b/templates/404.html index bfb86e7d..2fa38f99 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="{% url 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> @@ -38,9 +38,9 @@ </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" %} » </li> - <li><a href="{% url questions %}">{% trans "see all questions" %} » </a></li> - <li><a href="{% url tags %}">{% trans "see all tags" %} » </a></li> + <li><a href="#" id="linkPrevious">{% trans "back to previous page" %} »</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/about.html b/templates/about.html index 9a3e2101..eaf0d591 100644 --- a/templates/about.html +++ b/templates/about.html @@ -12,13 +12,10 @@ </div> <div class="content"> - <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>Si tenés alguna duda, no dudes en preguntalo! :)</p> + <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> </div> {% endblock %} <!-- end template about.html --> diff --git a/templates/content/images/logo.png b/templates/content/images/logo.png Binary files differindex b5501337..640eb1da 100644 --- a/templates/content/images/logo.png +++ b/templates/content/images/logo.png diff --git a/templates/content/images/originals/logo.svg b/templates/content/images/originals/logo.svg deleted file mode 100644 index 29c53f60..00000000 --- a/templates/content/images/originals/logo.svg +++ /dev/null @@ -1,119 +0,0 @@ -<?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 1f992b7b..6d48198b 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:50px 0px 0px 16px; +#navBar .nav {margin:20px 0px 0px 16px; /*letter-spacing:1px; */ } #navBar .nav a {color:#333333; background-color:#F9F7ED; @@ -118,14 +118,13 @@ 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 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.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.special:hover {text-decoration:underline;} -#navBar .nav div.focus {position: absolute; top:10px; - padding-right:0px;} +#navBar .nav div.focus {float:right; padding-right:0px;} /*搜索栏*/ #searchBar { - background-color:green;/*#e9b96e;*/ + background-color:#9db2b1;/*#e9b96e;*/ padding:5px 0 0 0;} /* #B02B2C */ #searchBar .content { } #searchBar .searchInput {font-size:13px; height:18px; width:400px;} @@ -746,7 +745,7 @@ background-color: #97ff97; } /*用户资料页面*/ -.count {font-family:Arial;font-size:200%;font-weight:700;color:#777} +.count {font-family:Arial;font-size:24px;font-weight:700;color:#777} .scoreNumber{font-family:Arial;font-size:35px;font-weight:800;color:#777;line-height:40px; /*letter-spacing:0px*/ } diff --git a/templates/faq.html b/templates/faq.html index ffbc2ed7..aec37a56 100644 --- a/templates/faq.html +++ b/templates/faq.html @@ -25,7 +25,7 @@ <div> <h3 class="subtitle">{% trans "What should I avoid in my answers?" %}</h3> - <p>{% trans "site title" %} {% trans "is a Q&A site, not a discussion group. Therefore - please avoid having discussions in your answers, comment facility allows some space for brief discussions." %}</p> + <p>{{ settings.APP_TITLE }} {% trans "is a Q&A site, not a discussion group. Therefore - please avoid having discussions in your answers, comment facility allows some space for brief discussions." %}</p> </div> <div> @@ -123,7 +123,7 @@ <h3 class="subtitle">{% trans "Still have questions?" %}</h3> <p>{% trans "Please ask your question, help make our community better!" %} <!-- - <a href="{% url tags %}faq" class="big">{% trans "site title" %} {% trans "questions" %}</a>{% trans "." %} + <a href="{% url tags %}faq" class="big">{{ settings.APP_TITLE }} {% trans "questions" %}</a>{% trans "." %} --> </p> </div> diff --git a/templates/header.html b/templates/header.html index 077de586..e1097802 100644 --- a/templates/header.html +++ b/templates/header.html @@ -26,14 +26,12 @@ </td> <td width="77%" valign="bottom"> <div class="nav"> - <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>--> + {% if settings.BOOKS_ON %} + <a id="nav_books" href="{% url books %}">{% trans "books" %}</a> + {% endif %} <a id="nav_badges" href="{% url badges %}">{% trans "badges" %}</a> <a id="nav_unanswered" href="{% url unanswered %}">{% trans "unanswered questions" %}</a> @@ -42,6 +40,9 @@ <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="{% url ask %}" class="special">{% trans "ask a question" %}</a> + </div> </div> </td> @@ -52,7 +53,7 @@ <table width="100%" border="0" cellpadding="0" cellspacing="0" class="content"> <tr> <td align="center" valign="middle"> - <form action="{% url 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 b358c384..104b24d0 100644 --- a/templates/index.html +++ b/templates/index.html @@ -21,9 +21,9 @@ <div class="tabBar"> <div class="headQuestions">{% trans "Questions" %}</div> <div class="tabsA"> - <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="latest" href="{% url questions %}?sort=latest" title="{% trans "last updated questions" %}" >{% trans "newest" %}</a> + <a id="hottest" href="{% url questions %}?sort=hottest" title="{% trans "hottest questions" %}" >{% trans "hottest" %}</a> + <a id="mostvoted" href="{% url questions %}?sort=mostvoted" title="{% trans "most voted questions" %}" >{% trans "most voted" %}</a> <a id="all" href="{% url questions %}" title="{% trans "all questions" %}" >{% trans "all questions" %}</a> </div> </div> @@ -93,7 +93,7 @@ <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 %} - </p> + </div> <div class="more"><a href="{% url tags %}">{% trans "popular tags" %} »</a> </div> </div> </div> diff --git a/templates/question.html b/templates/question.html index 0e1b8cb2..13d283ed 100644 --- a/templates/question.html +++ b/templates/question.html @@ -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="{% blocktrans with tag as tagname %}see questions tagged '{{ tagname }}'{% endblocktrans %}" rel="tag">{{ tag }}</a> {% endfor %} </div> <div id="question-controls" style="clear:both;"> diff --git a/templates/user_stats.html b/templates/user_stats.html index 7313fac3..07578cb7 100644 --- a/templates/user_stats.html +++ b/templates/user_stats.html @@ -7,85 +7,51 @@ {% block usercontent %} <a name="questions"></a> - <table> - <tr> - <td> - <div style="text-align: right;" class="count">{{questions|length}}</div> - </td> - <td> - <h2>{% trans "User questions" %}</h2> - </td> - </tr> - </table> + <h2><span class="count">{{questions|length}}</span> {% trans "User questions" %}</h2> {% include "users_questions.html" %} - <p> </p> <a name="answers"></a> - <table> - <tr> - <td> - <div style="text-align: right;" class="count">{{answered_questions|length}}</div> - </td> - <td > - <h2>{% trans "Answers" %}</h2> - </td> - </tr> - </table> + <h2><span class="count">{{answered_questions|length}}</span> {% trans "Answers" %}</h2> <div class="user-stats-table"> {% for answered_question in answered_questions %} <div class="answer-summary"> - <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 %} {% if answered_question.accepted %}{% trans "this answer has been selected as correct" %}{%endif%}"> + <a title="{{answered_question.summary|collapse}}" + href="{% url questions %}{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}"> + <span 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 %} {% if answered_question.accepted %}{% trans "this answer has been selected as correct" %}{%endif%}"> {{ answered_question.vote_count }} - </div> + </span> </a> <div class="answer-link"> - <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 %} + <a href="{% url questions %}{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">{{answered_question.title}}</a> + {% if answered_question.comment_count %} + <span> + {% blocktrans with answered_question.comment_count as comment_count %}the answer has been commented {{ comment_count }} times{% endblocktrans %} + </span> + {% endif %} </div> </div> {% endfor %} </div> - <p> </p> <a name="votes"></a> - <table> - <tr> - <td> - <div style="text-align: right;" class="count">{{total_votes}}</div> - </td> - <td > - <h2>{% trans "votes total" %}</h2> - </td> - </tr> - </table> + <h2><span class="count">{{total_votes}}</span> {% trans "Votes" %}</h2> <div class="user-stats-table"> - <table height="50px"> + <table> <tr> <td width="60"> - <img style="cursor: default;" align="absmiddle" src="/content/images/vote-arrow-up-on.png"/> + <img style="cursor: default;" src="/content/images/vote-arrow-up-on.png" alt="{% trans "thumb up" %}" /> <span title="{% trans "user has voted up this many times" %}" class="vote-count">{{up_votes}}</span> </td> <td width="60"> - <img style="cursor: default;" align="absmiddle" src="/content/images/vote-arrow-down-on.png"/> + <img style="cursor: default;" src="/content/images/vote-arrow-down-on.png" alt="{% trans "thumb down" %}" /> <span title="{% trans "user voted down this many times" %}" class="vote-count">{{down_votes}}</span> </td> </tr> </table> </div> - <p> </p> <a name="tags"></a> - <table> - <tr> - <td> - <div style="text-align: right;" class="count">{{tags|length}}</div> - </td> - <td > - <h2>{% trans "Tags" %}</h2> - </td> - </tr> - </table> + <h2><span class="count">{{tags|length}}</span> {% trans "Tags" %}</h2> <div class="user-stats-table"> <table class="tags"> <tr> @@ -103,24 +69,14 @@ </tr> </table> </div> - <p> </p> <a name="badges"></a> - <table> - <tr> - <td> - <div style="text-align: right;" class="count">{{total_awards}}</div> - </td> - <td > - <h2>{% trans "Badges" %}</h2> - </td> - </tr> - </table> + <h2><span class="count">{{total_awards}}</span> {% trans "Badges" %}</h2> <div class="user-stats-table"> <table> <tr> <td width="180" style="line-height:35px"> {% for award in awards %} - <a href="{% url badges %}{{award.id}}/{{award.name}}" title="{{ award.description }}" class="medal"><span class="badge{{ award.type }}">●</span> {{ 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 }}">●</span> {{ 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 96cc5aca..cb7e1d2f 100644 --- a/templates/user_tabs.html +++ b/templates/user_tabs.html @@ -20,7 +20,7 @@ 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" + 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 %} diff --git a/templates/users_questions.html b/templates/users_questions.html index dd818ddb..9907885e 100644 --- a/templates/users_questions.html +++ b/templates/users_questions.html @@ -9,13 +9,15 @@ {% if question.favorited_myself %} <div class="favorites-count"> <img title="{% trans "this questions was selected as favorite" %} {{question.favourite_count}} {% trans "number of times" %}" - src="/content/images/vote-favorite-on.png"> + alt="{% trans "thumb-up on" %}" + src="/content/images/vote-favorite-on.png"/> <div><b>{{question.favourite_count|intcomma}}</b></div> </div> {% else %} <div class="favorites-count-off"> <img title="{% trans "this question was selected as favorite" %}{{question.favourite_count}} {% trans "number of times" %}" - src="/content/images/vote-favorite-off.png"> + alt="{% trans "thumb-up off" %}" + src="/content/images/vote-favorite-off.png"/> <div><b>{{question.favourite_count|intcomma}}</b></div> </div> {% endif %} @@ -24,22 +26,22 @@ {% endif %} <div id="question-summary-{{question.id}}" class="question-summary narrow"> <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> + <span class="stats"> + <span class="votes"> + <span class="vote-count-post">{{question.vote_count|intcomma}}</span> {% trans "votes" %} - </div> - <div title="{% if question.answer_accepted %}{% trans "this answer has been accepted to be correct" %}{% endif %}" class="status {% if question.answer_accepted %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}"> - <div class="answer-count-post">{{question.answer_count|intcomma}}</div> + </span> + <span title="{% if question.answer_accepted %}{% trans "this answer has been accepted to be correct" %}{% endif %}" class="status {% if question.answer_accepted %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}"> + <span class="answer-count-post">{{question.answer_count|intcomma}}</span> {% trans "answers" %} - </div> - <div class="views"> - <div class="views-count-post">{{question.view_count|cnprog_intword|safe}}</div> + </span> + <span class="views"> + <span class="views-count-post">{{question.view_count|cnprog_intword|safe}}</span> {% trans "views" %} - </div> - </div> + </span> + </span> </a> <div class="summary"> <h3> @@ -60,7 +62,7 @@ </div> </div> </div> - <br clear="both"/> + <br clear="all"/> {% endfor %} </div> <!-- end users_questions.html --> |