summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-11-09 22:17:07 -0500
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-11-09 22:17:07 -0500
commita918860eb1ca9a149a823caaac883a8fda8bdedc (patch)
treeed06a164d114d82e472a7fd5a36c482998ff1ba3
parentf3513017cf2867f71adf83af58018188e332f7ee (diff)
downloadaskbot-a918860eb1ca9a149a823caaac883a8fda8bdedc.tar.gz
askbot-a918860eb1ca9a149a823caaac883a8fda8bdedc.tar.bz2
askbot-a918860eb1ca9a149a823caaac883a8fda8bdedc.zip
made most tabs "light up" on the server script, not in js as before
Diffstat
-rw-r--r--askbot/skins/default/templates/ask.html1
-rw-r--r--askbot/skins/default/templates/badge.html7
-rw-r--r--askbot/skins/default/templates/badges.html8
-rw-r--r--askbot/skins/default/templates/base_content.html86
-rw-r--r--askbot/skins/default/templates/header.html32
-rw-r--r--askbot/skins/default/templates/tags.html21
-rw-r--r--askbot/skins/default/templates/user.html3
-rw-r--r--askbot/skins/default/templates/users.html33
8 files changed, 61 insertions, 130 deletions
diff --git a/askbot/skins/default/templates/ask.html b/askbot/skins/default/templates/ask.html
index 0634704d..1ab19bce 100644
--- a/askbot/skins/default/templates/ask.html
+++ b/askbot/skins/default/templates/ask.html
@@ -24,7 +24,6 @@
var tags = {{ tags|safe }};
$().ready(function(){
//set current module button style
- $("#nav_ask").attr('className',"on");
$('#editor').TextAreaResizer();
//highlight code synctax when editor has new text
diff --git a/askbot/skins/default/templates/badge.html b/askbot/skins/default/templates/badge.html
index 016a3302..c4f117eb 100644
--- a/askbot/skins/default/templates/badge.html
+++ b/askbot/skins/default/templates/badge.html
@@ -35,11 +35,4 @@
</div>
{% endblock %}
-{% block endjs %}
- <script type="text/javascript">
- $().ready(function(){
- $("#nav_badges").attr('className',"on");
- });
- </script>
-{% endblock %}
<!-- end template badge.html -->
diff --git a/askbot/skins/default/templates/badges.html b/askbot/skins/default/templates/badges.html
index d1111ce5..e899191b 100644
--- a/askbot/skins/default/templates/badges.html
+++ b/askbot/skins/default/templates/badges.html
@@ -64,12 +64,4 @@
</div>
</div>
{% endblock %}
-{% block endjs %}
- <script type="text/javascript">
- $().ready(function(){
- $("#nav_badges").attr('className',"on");
- });
-
- </script>
-{% endblock %}
<!-- end template badges.html -->
diff --git a/askbot/skins/default/templates/base_content.html b/askbot/skins/default/templates/base_content.html
deleted file mode 100644
index 02465f37..00000000
--- a/askbot/skins/default/templates/base_content.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- base_content.html -->
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>{% block title %}{% endblock %} - {{ settings.APP_TITLE|escape }}</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <meta name="keywords" content="{%block keywords%}{%endblock%},{{settings.APP_KEYWORDS|escape}}" />
- {% block meta_description %}
- <meta name="description" content="{{settings.APP_DESCRIPTION|escape}}" />
- {% endblock %}
- {% if settings.GOOGLE_SITEMAP_CODE %}
- <meta name="google-site-verification" content="{{ settings.GOOGLE_SITEMAP_CODE }}" />
- {% endif %}
- <link rel="shortcut icon" href="{{"/images/favicon.gif"|media}}" />
- <link href="{{"/style/style.css"|media}}" rel="stylesheet" type="text/css" />
- {% spaceless %}
- {% block forestyle %}{% endblock %}
- {% endspaceless %}
- <script type="text/javascript">
- var i18nLang = '{{ settings.LANGUAGE_CODE }}';
- var scriptUrl = '/{{settings.ASKBOT_URL}}'
- var askbotSkin = '{{settings.ASKBOT_DEFAULT_SKIN}}';
- {% if settings.ENABLE_MATHJAX %}
- var enableMathJax = true;
- {% else %}
- var enableMathJax = false;
- {% endif %}
- </script>
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js" type="text/javascript"></script>
- <script type='text/javascript' src='{{"/js/com.cnprog.i18n.js"|media}}'></script>
- <script type='text/javascript' src='{{"/js/jquery.i18n.js"|media}}'></script>
- <script type='text/javascript' src='{{"/js/com.cnprog.utils.js"|media}}'></script>
- {% if settings.ENABLE_MATHJAX %}
- <script type='text/javascript' src='{{settings.MATHJAX_BASE_URL}}/MathJax.js'>
- MathJax.Hub.Config({
- extensions: ["tex2jax.js"],
- jax: ["input/TeX","output/HTML-CSS"],
- tex2jax: {inlineMath: [["$","$"],["\\(","\\)"]]}
- });
- </script>
- {% endif %}
- {% if user_messages %}
- <style type="text/css">
- body { margin-top:2.4em; }
- </style>
- <script type="text/javascript">
- $(document).ready(function() {
- var element = $('#validate_email_alert')
- element.click(function(){notify.close(true);setTimeout(function(){},1000)})
- notify.show();
- });
- </script>
- {% endif %}
- {% block forejs %}
- {% endblock %}
- </head>
- <body>
- <div class="notify" style="display:none">
- {% if user_messages %}
- {% for message in user_messages %}
- <p class="darkred">{{ message }}</p>
- {% endfor %}
- {% endif %}
- <a id="close-notify" onclick="notify.close(true)">&times;</a>
- </div>
- {% include "header.html" %}
- <div id="wrapper">
- <div id="room">
- <div id="CAFull">
- {% include "input_bar.html" %}
- {% block content%}
- {% endblock%}
- </div>
- <div id="tail" style="clear:both;">
- {% block tail %}
- {% endblock %}
- </div>
- </div>
- <div class="spacer3"></div>
- </div>
- {% include "footer.html" %}
- {% block endjs %}
- {% endblock %}
- </body>
-</html>
-<!-- end template base_content.html -->
diff --git a/askbot/skins/default/templates/header.html b/askbot/skins/default/templates/header.html
index 49771721..6b1251f8 100644
--- a/askbot/skins/default/templates/header.html
+++ b/askbot/skins/default/templates/header.html
@@ -8,8 +8,6 @@
{% spaceless %}
{% if request.user.new_response_count > 0 or request.user.seen_response_count > 0 %}
<a class='ab-responses-envelope' href="{{request.user.get_absolute_url()}}?sort=inbox&section=forum">
- new {{request.user.new_response_count}}
- old {{request.user.seen_response_count}}
<img
alt="{% trans username=request.user.username %}responses for {{username}}{% endtrans %}"
{% if request.user.new_response_count > 0 %}
@@ -73,11 +71,31 @@
</td>
<td id="navTabContainer" valign="bottom" align="left">
<div class="nav">
- <a id="nav_questions" href="{% url questions %}" >{% trans %}questions{% endtrans %}</a>
- <a id="nav_tags" href="{% url tags %}">{% trans %}tags{% endtrans %}</a>
- <a id="nav_users" href="{% url users %}">{% trans %}users{% endtrans %}</a>
- <a id="nav_badges" href="{% url badges %}">{% trans %}badges{% endtrans %}</a>
- <a id="nav_ask" href="{% url ask %}" class="special">{% trans %}ask a question{% endtrans %}</a>
+ <a
+ id="nav_questions"
+ href="{% url questions %}"
+ {% if active_tab == 'questions' %}class="on"{% endif %}
+ >{% trans %}questions{% endtrans %}</a>
+ <a
+ id="nav_tags"
+ href="{% url tags %}"
+ {% if active_tab == 'tags' %}class="on"{% endif %}
+ >{% trans %}tags{% endtrans %}</a>
+ <a
+ id="nav_users"
+ href="{% url users %}"
+ {% if active_tab == 'users' %}class="on"{% endif %}
+ >{% trans %}users{% endtrans %}</a>
+ <a
+ id="nav_badges"
+ href="{% url badges %}"
+ {% if active_tab == 'badges' %}class="on"{% endif %}
+ >{% trans %}badges{% endtrans %}</a>
+ <a
+ id="nav_ask"
+ href="{% url ask %}"
+ class="{% if active_tab == 'ask' %}on{% else %}special{% endif %}"
+ >{% trans %}ask a question{% endtrans %}</a>
</div>
</td>
</tr>
diff --git a/askbot/skins/default/templates/tags.html b/askbot/skins/default/templates/tags.html
index a6aa7d5d..2fff4a21 100644
--- a/askbot/skins/default/templates/tags.html
+++ b/askbot/skins/default/templates/tags.html
@@ -7,8 +7,18 @@
<div class="tabBar">
<div class="headUsers">{% trans %}Tag list{% endtrans %}</div>
<div class="tabsA">
- <a id="sort_name" href="{% url tags %}?sort=name" class="off" title="{% trans %}sorted alphabetically{% endtrans %}">{% trans %}by name{% endtrans %}</a>
- <a id="sort_used" href="{% url tags %}?sort=used" class="off" title="{% trans %}sorted by frequency of tag use{% endtrans %}">{% trans %}by popularity{% endtrans %}</a>
+ <a
+ id="sort_name"
+ href="{% url tags %}?sort=name"
+ {% if tab_id == 'name' %}class="on"{% endif %}
+ title="{% trans %}sorted alphabetically{% endtrans %}"
+ >{% trans %}by name{% endtrans %}</a>
+ <a
+ id="sort_used"
+ href="{% url tags %}?sort=used"
+ {% if tab_id == 'used' %}class="on"{% endif %}
+ title="{% trans %}sorted by frequency of tag use{% endtrans %}"
+ >{% trans %}by popularity{% endtrans %}</a>
</div>
</div>
<div id="searchtags">
@@ -45,15 +55,8 @@
<script type="text/javascript">
/*<![CDATA[*/
$().ready(function(){
- $("#nav_tags").attr('className',"on");
$("#ipSearchTag").focus();
-
- var orderby = "{{ tab_id }}";
- if(orderby != "used" && orderby != "name")
- orderby = "used";
- $("#sort_" + orderby).attr('className',"on");
$("#type-tag").attr('checked',true);
-
Hilite.exact = false;
Hilite.elementid = "searchtags";
Hilite.debug_referrer = location.href;
diff --git a/askbot/skins/default/templates/user.html b/askbot/skins/default/templates/user.html
index 6ca19211..d868eea5 100644
--- a/askbot/skins/default/templates/user.html
+++ b/askbot/skins/default/templates/user.html
@@ -29,9 +29,6 @@
{% endif %}
<script type="text/javascript">
var viewUserID = {{view_user.id}};
- $().ready(function(){
- $("#nav_users").attr('className',"on");
- });
</script>
{% block userjs %}
{% endblock %}
diff --git a/askbot/skins/default/templates/users.html b/askbot/skins/default/templates/users.html
index 5b6ce475..766e5025 100644
--- a/askbot/skins/default/templates/users.html
+++ b/askbot/skins/default/templates/users.html
@@ -6,10 +6,30 @@
<div class="tabBar">
<div class="headUsers">{% trans %}Users{% endtrans %}</div>
<div class="tabsA">
- <a id="sort_reputation" href="{% url users %}?sort=reputation" class="off" title="{% trans %}reputation{% endtrans %}">{% trans %}reputation{% endtrans %}</a>
- <a id="sort_newest" href="{% url users %}?sort=newest" class="off" title="{% trans %}recent{% endtrans %}">{% trans %}recent{% endtrans %}</a>
- <a id="sort_last" href="{% url users %}?sort=last" class="off" title="{% trans %}oldest{% endtrans %}">{% trans %}oldest{% endtrans %}</a>
- <a id="sort_user" href="{% url users %}?sort=user" class="off" title="{% trans %}by username{% endtrans %}">{% trans %}by username{% endtrans %}</a>
+ <a
+ id="sort_reputation"
+ href="{% url users %}?sort=reputation"
+ {% if tab_id == 'reputation' %}class="on"{% endif %}
+ title="{% trans %}reputation{% endtrans %}"
+ >{% trans %}reputation{% endtrans %}</a>
+ <a
+ id="sort_newest"
+ href="{% url users %}?sort=newest"
+ {% if tab_id == 'newest' %}class="on"{% endif %}
+ class="off" title="{% trans %}recent{% endtrans %}"
+ >{% trans %}recent{% endtrans %}</a>
+ <a
+ id="sort_last"
+ href="{% url users %}?sort=last"
+ {% if tab_id == 'last' %}class="on"{% endif %}
+ class="off" title="{% trans %}oldest{% endtrans %}"
+ >{% trans %}oldest{% endtrans %}</a>
+ <a
+ id="sort_user"
+ href="{% url users %}?sort=user"
+ {% if tab_id == 'user' %}class="on"{% endif %}
+ title="{% trans %}by username{% endtrans %}"
+ >{% trans %}by username{% endtrans %}</a>
</div>
</div>
<div id="main-body" style="width:100%">
@@ -54,11 +74,6 @@
<script type="text/javascript">
//todo move javascript out
$().ready(function(){
- $("#nav_users").attr('className',"on");
- $("#type-user").attr('checked',true);
- var orderby = "{{ tab_id }}";
- $("#sort_" + orderby).attr('className',"on");
-
Hilite.exact = false;
Hilite.elementid = "main-body";
Hilite.debug_referrer = location.href;
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-04 15:04:41 +0000