Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG into evgenyfadeev/master

Conflicts:
	INSTALL
	LICENSE
	TODO
	cnprog.wsgi
	context.py
	development.log
	forum/feed.py
	forum/forms.py
	forum/management/commands/send_email_alerts.py
	forum/managers.py
	forum/models.py
	forum/templatetags/extra_filters.py
	forum/templatetags/extra_tags.py
	forum/urls.py
	forum/views.py
	locale/en/LC_MESSAGES/django.mo
	locale/en/LC_MESSAGES/django.po
	middleware/__init__.py
	middleware/anon_user.py
	settings.py
	settings_local.py.dist
	templates/about.html
	templates/authopenid/complete.html
	templates/authopenid/external_legacy_login_info.html
	templates/base.html
	templates/base_content.html
	templates/content/js/com.cnprog.admin.js
	templates/content/js/com.cnprog.i18n.js
	templates/content/js/com.cnprog.post.js
	templates/content/js/com.cnprog.utils.js
	templates/content/js/wmd/wmd.js
	templates/content/style/style.css
	templates/question.html
	templates/questions.html
	templates/unanswered.html
	templates/user_email_subscriptions.html
	templates/user_reputation.html
	templates/user_stats.html
	templates/user_votes.html

1 files changed, 42 insertions, 0 deletions

diff --git a/templates/tag_selector.html b/templates/tag_selector.html
new file mode 100644
index 00000000..6edc5cc8
--- /dev/null
+++ b/templates/tag_selector.html
@@ -0,0 +1,42 @@
+{% load i18n %}
+{% load extra_tags %}
+<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" 
+                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="{% href "/content/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"/>
+    <input id="interestingTagAdd" type="submit" value="{% trans "Add" %}"/>
+	<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" 
+                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="{% href "/content/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"/>
+    <input id="ignoredTagAdd" type="submit" value="{% trans "Add" %}"/>
+    <p id="hideIgnoredTagsControl">
+    <input id="hideIgnoredTagsCb" type="checkbox" {% if request.user.hide_ignored_questions %}checked="checked"{% endif %} />
+    <label id="hideIgnoredTagsLabel" for="hideIgnoredTags">{% trans "keep ingored questions hidden" %}</label>
+    <p>
+</div>