diff options
Diffstat (limited to 'templates/index.html')
-rw-r--r-- | templates/index.html | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/templates/index.html b/templates/index.html index fe0206ab..3e52e59c 100644 --- a/templates/index.html +++ b/templates/index.html @@ -21,10 +21,17 @@ <div class="tabBar"> <div class="headQuestions">{% trans "Questions" %}</div> <div class="tabsA"> +<<<<<<< HEAD:templates/index.html <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="/preguntas/" title="{% trans "all questions" %}" >{% trans "all questions" %}</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> +>>>>>>> master:templates/index.html </div> </div> <!-- 问题列表 --> @@ -79,9 +86,15 @@ <div class="boxA"> <h3>{% trans "welcome to website" %}</h3> <div class="body"> +<<<<<<< HEAD:templates/index.html {{settings.APP_INTRO|safe}} <div class="more"><a href="/sobre">{% 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> +>>>>>>> master:templates/index.html </div> </div> {% endif %} @@ -94,7 +107,7 @@ 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> + <div class="more"><a href="{% url tags %}">{% trans "popular tags" %} »</a> </div> </div> </div> {% if awards %} @@ -104,13 +117,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 }}">●</span> {{ 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 +133,11 @@ {% endblock %} {% block tail %} <div style="padding:5px 0 5px 5px;"> +<<<<<<< HEAD:templates/index.html <span class="evenMore">{% trans "Still looking for more? See" %} <a href="/preguntas/">{% trans "complete list of quesionts" %}</a>, {% trans "or" %} <a href="/etiquetas/">{% trans "popular tags" %}</a>{% trans "." %} {% trans "Please help us answer" %} <a href="/preguntas/sin-responder">{% trans "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> +>>>>>>> master:templates/index.html </div> {% endblock %} <!-- index.html --> |