Commit 73dc3990 authored by Pietro Albini's avatar Pietro Albini

Added ~rpadovani sidebar changes

parents 50e7704c 540af90c
...@@ -1791,6 +1791,10 @@ ul.form-horizontal-rows li input { ...@@ -1791,6 +1791,10 @@ ul.form-horizontal-rows li input {
margin: 0 2px 0 1px; margin: 0 2px 0 1px;
} }
#sidebar-upper, #sidebar-lower {
background-color: #EFEFEF;
}
a.sidebar_button { a.sidebar_button {
background: none repeat scroll 0 0 #EEEEEE; background: none repeat scroll 0 0 #EEEEEE;
color: black; color: black;
...@@ -2392,3 +2396,23 @@ h3.or_label, .signin_form#dummy_form_unused { ...@@ -2392,3 +2396,23 @@ h3.or_label, .signin_form#dummy_form_unused {
{ {
max-width: 679px; max-width: 679px;
} }
#interestingTagInput, #ignoredTagInput {
width: 80%;
}
#interestingTagAdd, #ignoredTagAdd {
background-color: inherit;
background-image: url(../images/light/icon-tag.png);
vertical-align: middle;
cursor: pointer;
width: 22px;
height: 22px;
background-repeat: no-repeat;
background-position: center;
border-style: none;
}
#interestingTagAdd:hover, #ignoredTagAdd:hover {
background-image: url(../images/light/icon-tag-hover.png);
}
\ No newline at end of file
{% extends base %}
{% load i18n markup node_tags general_sidebar_tags %}
{% block title %}{% spaceless %}{{ page.title }}{% endspaceless %}{% endblock %}
{% block content %}
<div class="headNormal">{{ page.title }}</div>
<div class="content">
{{ body }}
</div>
{% if page.extra.comments %}
{% comments page request.user %}
{% endif %}
{% endblock %}
{% ifequal page.extra.template "sidebar" %}
{% block sidebar %}
{% sidebar_upper %}
{% if page.extra.sidebar %}
{% if page.extra.sidebar_wrap %}<div class="boxC"><div class="body">{% endif %}
{{ sidebar }}
{% if page.extra.sidebar_wrap %}</div></div>{% endif %}
{% endif %}
{% sidebar_lower %}
{% endblock %}
{% endifequal %}
\ No newline at end of file
{% spaceless %}
{% load i18n humanize extra_tags %}
{% declare %}
answer_count = questions.children_count('answer')
{% enddeclare %}
<div class="boxC">
<div class="questions-count">
{{ questions.paginator.count }}<span style="color:black;font-size:14px;margin-left:5px;font-weight:normal;"> {{ list_description }}</span>
</div>
{% if answer_count %}
<div class="questions-count">
{{ answer_count }}<span style="color:black;font-size:14px;margin-left:5px;font-weight:normal;"> {% trans "answers" %}</span>
</div>
{% endif %}
</div>
{% endspaceless %}
\ No newline at end of file
{% load i18n %}
{% load extra_tags %}
{% if show_interesting_tags %}
{% if user_authenticated %}
<div id="tagSelector" class="boxC">
<h3 class="subtitle">{% trans "Interesting tags" %}</h3>
<div class="tags interesting marked-tags">
{% for tag_name in interesting_tag_names %}
{% spaceless %}
<span class="deletable-tag" id="interesting-tag-{{tag_name}}">
<a rel="tag"
class="tag-link-{{ tag_name }}"
title="{% blocktrans with tag as tagname %}see questions tagged '{{ tag_name }}'{% endblocktrans %}"
href="{% url tag_questions tag_name|urlencode %}">{{tag_name}}</a>
<img class="delete-icon"
src="{% media "/media/images/close-small-dark.png" %}"
title="{% blocktrans %}remove '{{tag_name}}' from the list of interesting tags{% endblocktrans %}"/>
</span>
{% endspaceless %}
{% endfor %}
</div>
<input id="interestingTagInput" autocomplete="off" type="text"/>
<button id="interestingTagAdd" type="submit" value="{% trans "Add" %}"></button>
<h3 class="subtitle">{% trans "Ignored tags" %}</h3>
<div class="tags ignored marked-tags">
{% for tag_name in ignored_tag_names %}
{% spaceless %}
<span class="deletable-tag" id="ignored-tag-{{tag_name}}">
<a rel="tag"
class="tag-link-{{ tag_name }}"
title="{% blocktrans with tag as tagname %}see questions tagged '{{ tag_name }}'{% endblocktrans %}"
href="{% url tag_questions tag_name|urlencode %}">{{tag_name}}</a>
<img class="delete-icon"
src="{% media "/media/images/close-small-dark.png" %}"
title="{% blocktrans %}remove '{{tag_name}}' from the list of ignored tags{% endblocktrans %}"/>
</span>
{% endspaceless %}
{% endfor %}
</div>
<input id="ignoredTagInput" autocomplete="off" type="text"/>
<button id="ignoredTagAdd" type="submit" value="{% trans "Add" %}"></button>
{% comment %}
<p id="hideIgnoredTagsControl">
<input id="hideIgnoredTagsCb" type="checkbox" {% if request.user.hide_ignored_questions %}checked="checked"{% endif %} />
<label id="hideIgnoredTagsLabel" for="hideIgnoredTagsCb">{% trans "keep ignored questions hidden" %}</label>
<p>
{% endcomment %}
</div>
{% endif %}
{% endif %}
\ No newline at end of file
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