Commits

David Jean Louis  committed d34212c Merge

merge + Fixed various issues with disabled items, closes issue #83

  • Participants
  • Parent commits 0f8aff3, 2ed1298

Comments (0)

Files changed (5)

File admin_tools/dashboard/static/admin_tools/js/dashboard.js

 var init_dashboard = function(id, columns, preferences, url) {
-    $('#'+id).dashboard({
+    jQuery('#'+id).dashboard({
         'columns': columns,
         'load_preferences_function': function(options) {
             return preferences;
             jQuery.post(url, { data: JSON.stringify(preferences) });
         }
     });
-    $(".group-tabs").tabs();
-    $(".group-accordion").accordion({header: '.group-accordion-header'});
+    jQuery(".group-tabs").tabs();
+    jQuery(".group-accordion").accordion({header: '.group-accordion-header'});
 };

File admin_tools/locale/zh_TW/LC_MESSAGES/django.po

 
 #: dashboard/dashboards.py:81 menu/menus.py:100
 msgid "Dashboard"
-msgstr ""
+msgstr "控制台"
 
 #: dashboard/dashboards.py:217
 msgid "Quick links"
-msgstr ""
+msgstr "捷徑"
 
 #: dashboard/dashboards.py:223
 msgid "Return to site"
-msgstr ""
+msgstr "首頁"
 
 #: dashboard/dashboards.py:224 theming/templates/admin/base.html:43
 msgid "Change password"
 
 #: dashboard/dashboards.py:232 dashboard/modules.py:385 menu/menus.py:103
 msgid "Applications"
-msgstr ""
+msgstr "應用程序"
 
 #: dashboard/dashboards.py:238 menu/menus.py:107
 msgid "Administration"
-msgstr ""
+msgstr "管理"
 
 #: dashboard/dashboards.py:243 dashboard/dashboards.py:297
 #: dashboard/modules.py:538
 
 #: dashboard/dashboards.py:247
 msgid "Latest Django News"
-msgstr ""
+msgstr "最新 Django 新聞"
 
 #: dashboard/dashboards.py:254
 msgid "Support"
-msgstr ""
+msgstr "支援"
 
 #: dashboard/dashboards.py:257
 msgid "Django documentation"

File admin_tools/media/admin_tools/css/menu.css

     background: transparent url(../images/admin-tools.png) repeat-x 0 -245px;
 }
 
-#header ul#navigation-menu li.disabled:hover,
-#header ul#navigation-menu li.disabled .over {
+#header ul#navigation-menu li.disabled a:hover,
+#header ul#navigation-menu li.disabled a.over {
     background: none;
 }

File admin_tools/menu/static/admin_tools/css/menu.css

     background: transparent url(../images/admin-tools.png) repeat-x 0 -245px;
 }
 
-#header ul#navigation-menu li.disabled:hover,
-#header ul#navigation-menu li.disabled .over {
+#header ul#navigation-menu li.disabled a:hover,
+#header ul#navigation-menu li.disabled a.over {
     background: none;
 }

File admin_tools/menu/templates/admin_tools/menu/item.html

 {% spaceless %}
 {% if not item.is_empty %}
 <li class="menu-item{% ifequal index 1 %} first{% endifequal %}{% if not item.enabled %} disabled{% endif %}{% if selected %} selected{% endif %}{% if item.css_classes %} {{ item.css_classes|join:' ' }}{% endif %}">
-<a href="{% if item.url and item.enabled %}{{ item.url }}{% else %}#{% endif %}"{% if item.description %} title="{{ item.description }}"{% endif %}{% if item.accesskey %} accesskey="{{ item.accesskey }}"{% endif %}>{% if item.children %}<span class="icon"></span>{% endif %}{{ item.title }}</a>
-    {% if item.children %}
+<a href="{% if item.url and item.enabled %}{{ item.url }}{% else %}#{% endif %}"{% if item.description %} title="{{ item.description }}"{% endif %}{% if item.accesskey %} accesskey="{{ item.accesskey }}"{% endif %}>{% if item.children and item.enabled %}<span class="icon"></span>{% endif %}{{ item.title }}</a>
+    {% if item.children and item.enabled %}
     <ul>
         {% for child_item in item.children %}
         {% admin_tools_render_menu_item child_item %}