Browse Source

Droppped icons from tabs.

Ralfp 12 years ago
parent
commit
6565ce82d3

+ 0 - 1
misago/overview/admin/__init__.py

@@ -45,7 +45,6 @@ ADMIN_ACTIONS=(
                actions=[
                actions=[
                         {
                         {
                          'id': 'list',
                          'id': 'list',
-                         'icon': 'list-alt',
                          'name': _("Browse Users"),
                          'name': _("Browse Users"),
                          'help': _("Browse all registered user accounts"),
                          'help': _("Browse all registered user accounts"),
                          'route': 'admin_overview_online'
                          'route': 'admin_overview_online'

+ 0 - 8
misago/users/admin/__init__.py

@@ -25,14 +25,12 @@ ADMIN_ACTIONS=(
                actions=[
                actions=[
                         {
                         {
                          'id': 'list',
                          'id': 'list',
-                         'icon': 'list-alt',
                          'name': _("Browse Users"),
                          'name': _("Browse Users"),
                          'help': _("Browse all registered user accounts"),
                          'help': _("Browse all registered user accounts"),
                          'route': 'admin_users'
                          'route': 'admin_users'
                          },
                          },
                         {
                         {
                          'id': 'new',
                          'id': 'new',
-                         'icon': 'plus',
                          'name': _("Add User"),
                          'name': _("Add User"),
                          'help': _("Create new user account"),
                          'help': _("Create new user account"),
                          'route': 'admin_users_new'
                          'route': 'admin_users_new'
@@ -59,14 +57,12 @@ ADMIN_ACTIONS=(
                actions=[
                actions=[
                         {
                         {
                          'id': 'list',
                          'id': 'list',
-                         'icon': 'list-alt',
                          'name': _("Browse Roles"),
                          'name': _("Browse Roles"),
                          'help': _("Browse all existing roles"),
                          'help': _("Browse all existing roles"),
                          'route': 'admin_users_roles'
                          'route': 'admin_users_roles'
                          },
                          },
                         {
                         {
                          'id': 'new',
                          'id': 'new',
-                         'icon': 'plus',
                          'name': _("Add Role"),
                          'name': _("Add Role"),
                          'help': _("Create new role"),
                          'help': _("Create new role"),
                          'route': 'admin_users_roles_new'
                          'route': 'admin_users_roles_new'
@@ -90,14 +86,12 @@ ADMIN_ACTIONS=(
                actions=[
                actions=[
                         {
                         {
                          'id': 'list',
                          'id': 'list',
-                         'icon': 'list-alt',
                          'name': _("Browse Ranks"),
                          'name': _("Browse Ranks"),
                          'help': _("Browse all existing ranks"),
                          'help': _("Browse all existing ranks"),
                          'route': 'admin_users_ranks'
                          'route': 'admin_users_ranks'
                          },
                          },
                         {
                         {
                          'id': 'new',
                          'id': 'new',
-                         'icon': 'plus',
                          'name': _("Add Rank"),
                          'name': _("Add Rank"),
                          'help': _("Create new rank"),
                          'help': _("Create new rank"),
                          'route': 'admin_users_ranks_new'
                          'route': 'admin_users_ranks_new'
@@ -121,14 +115,12 @@ ADMIN_ACTIONS=(
                actions=[
                actions=[
                         {
                         {
                          'id': 'list',
                          'id': 'list',
-                         'icon': 'list-alt',
                          'name': _("Browse Bans"),
                          'name': _("Browse Bans"),
                          'help': _("Browse all existing bans"),
                          'help': _("Browse all existing bans"),
                          'route': 'admin_users_bans'
                          'route': 'admin_users_bans'
                          },
                          },
                         {
                         {
                          'id': 'new',
                          'id': 'new',
-                         'icon': 'plus',
                          'name': _("Set Ban"),
                          'name': _("Set Ban"),
                          'help': _("Set new Ban"),
                          'help': _("Set new Ban"),
                          'route': 'admin_users_bans_new'
                          'route': 'admin_users_bans_new'

+ 1 - 1
templates/admin/admin/layout.html

@@ -15,7 +15,7 @@
 <div class="page-header{% if admin.actions|length > 1 %} tabs-header{% endif %}">
 <div class="page-header{% if admin.actions|length > 1 %} tabs-header{% endif %}">
   <h1>{{ admin.name }}{% if admin.help %} <small>{{ admin.help }}</small>{% endif %}</h1>
   <h1>{{ admin.name }}{% if admin.help %} <small>{{ admin.help }}</small>{% endif %}</h1>
   {% if admin.actions|length > 1 %}<ul class="nav nav-tabs">{% for item in admin.actions %}
   {% if admin.actions|length > 1 %}<ul class="nav nav-tabs">{% for item in admin.actions %}
-  	<li{% if action.id == item.id %} class="active"{% endif %}><a href="{{ item.route|url() }}"{% if action.id != item.id and item.help %} class="tooltip-bottom" title="{{ item.help }}"{% endif %}><i class="icon-{{ item.icon }}"></i> {{ item.name }}</a></li>{% endfor %}
+  	<li{% if action.id == item.id %} class="active"{% endif %}><a href="{{ item.route|url() }}"{% if action.id != item.id and item.help %} class="tooltip-bottom" title="{{ item.help }}"{% endif %}>{{ item.name }}</a></li>{% endfor %}
   </ul>{% endif %}
   </ul>{% endif %}
 </div>
 </div>
 {% if admin.actions[0].id != action.id -%}
 {% if admin.actions[0].id != action.id -%}

+ 6 - 6
templates/sora/users/usercp/usercp.html

@@ -11,12 +11,12 @@
   	<div class="tabbable tabs-left">
   	<div class="tabbable tabs-left">
   	  <ul class="nav nav-tabs">
   	  <ul class="nav nav-tabs">
         <li class="nav-header">{% trans %}Account Settings{% endtrans %}</li>
         <li class="nav-header">{% trans %}Account Settings{% endtrans %}</li>
-  	    <li{% if tab == 'options' %} class="active"{% endif %}><a href="{% url 'usercp' %}"><i class="icon-cog"></i> {% trans %}Forum Options{% endtrans %}</a></li>
-        <li{% if tab == 'avatar' %} class="active"{% endif %}><a href="{% url 'usercp_avatar' %}"><i class="icon-picture"></i> {% trans %}Change Avatar{% endtrans %}</a></li>
-        <li{% if tab == 'signature' %} class="active"{% endif %}><a href="{% url 'usercp_signature' %}"><i class="icon-align-left"></i> {% trans %}Edit Signature{% endtrans %}</a></li>
-  	    <li{% if tab == 'credentials' %} class="active"{% endif %}><a href="{% url 'usercp_credentials' %}"><i class="icon-edit"></i> {% trans %}Change E-mail or Password{% endtrans %}</a></li>
-  	    <li{% if tab == 'username' %} class="active"{% endif %}><a href="{% url 'usercp_username' %}"><i class="icon-user"></i> {% trans %}Change Username{% endtrans %}</a></li>
-        <li{% if tab == 'ignored' %} class="active"{% endif %}><a href="{% url 'usercp_ignored' %}"><i class="icon-eye-close"></i> {% trans %}Ignored Members List{% endtrans %}</a></li>
+  	    <li{% if tab == 'options' %} class="active"{% endif %}><a href="{% url 'usercp' %}">{% trans %}Forum Options{% endtrans %}</a></li>
+        <li{% if tab == 'avatar' %} class="active"{% endif %}><a href="{% url 'usercp_avatar' %}">{% trans %}Change Avatar{% endtrans %}</a></li>
+        <li{% if tab == 'signature' %} class="active"{% endif %}><a href="{% url 'usercp_signature' %}">{% trans %}Edit Signature{% endtrans %}</a></li>
+  	    <li{% if tab == 'credentials' %} class="active"{% endif %}><a href="{% url 'usercp_credentials' %}">{% trans %}Change E-mail or Password{% endtrans %}</a></li>
+  	    <li{% if tab == 'username' %} class="active"{% endif %}><a href="{% url 'usercp_username' %}">{% trans %}Change Username{% endtrans %}</a></li>
+        <li{% if tab == 'ignored' %} class="active"{% endif %}><a href="{% url 'usercp_ignored' %}">{% trans %}Ignored Members List{% endtrans %}</a></li>
       </ul>
       </ul>
     </div>
     </div>
   </div>
   </div>