Commits

Zhang Huangbin committed 6301dc9

Typo. mail address is first column now.

Comments (0)

Files changed (4)

templates/default/ldap/admins.html

 
 {% block title %}{{ _('Domain admins') }}{% endblock %}
 
-{% block jquery_snippets %}
-{# Sort user name at initialization. #}
-$("#admin_list").tablesorter( {
-    headers: {4: {sorter: false},},
-    sortList: [[1,0]]
-});
-{% endblock jquery_snippets %}
-
 {% block id_welcome %}
 <span>{{ _('All mail administrators.') }} {{ _('Total: %s.') |format(admins |length) }}</span>
 {% endblock id_welcome %}
 {% if admins is not string %}
     <div>
     <form id="list_table" method="post" action="{{ctx.homepath}}/admins">
-        <table id="admin_list" class="tablesorter">
+        <table id="account_list" class="tablesorter">
         <thead>
         <tr>
-            <th>{{ _('Display name') }}</th>
-            <th>{{ _('Mail address') }}</th>
+            <th>{{ _('Mail Address') }}</th>
+            <th>{{ _('Display Name') }}</th>
             <th>{{ _('Global Admin') }}</th>
         </tr>
         </thead>
                 <td>
                     <span class="float_left">
                         <input type="checkbox" name="mail" value="{{mail}}" />
-                        <a href="{{ctx.homepath}}/profile/admin/general/{{mail}}" title="{{ _('Edit admin profile.') }}">{{ cn }}</a>
+                        <a href="mailto:{{mail}}" title="{{ _('Send mail to %s.') |format(mail) }}">{{ mail }}</a>
                     </span>
                     <span class="float_right">{{ set_account_status_img(accountStatus) }}</span>
                 </td>
-                <td><a href="mailto:{{mail}}" title="{{ _('Send mail to %s.') |format(mail) }}">{{ mail }}</a></td>
+                <td><a href="{{ctx.homepath}}/profile/admin/general/{{mail}}" title="{{ _('Edit admin profile.') }}">{{ cn }}</a></td>
                 <td>{{ set_account_status_img(domainGlobalAdmin) }}</td>
             </tr>
         {% endfor %}

templates/default/ldap/domains.html

 
 {% block title %}{{ _('Mail domains') }}{% endblock %}
 
-{% block jquery_snippets %}
-    {# Sort domain name at initialization. #}
-    $("#account_list").tablesorter( {
-        sortList: [[0,0]]
-    });
-{% endblock jquery_snippets %}
-
 {% block id_welcome %}
 <span>{{ _('All domains under your control.') }} {{ _('Total: %s.') |format(domains|length) }}</span>
 {% endblock id_welcome %}

templates/default/ldap/layout.html

             });
 
             $("a,input,img").ToolTipDemo('#8dbdd8');
-            //$(".success").show().fadeOut(1500);
+            $("#account_list").tablesorter( {sortList: [[0,0]]} );
             {% block jquery_snippets %}{% endblock jquery_snippets %}
         });
 

templates/default/ldap/users.html

 
 {% block title %}{{ _('Mail users') }}{% endblock %}
 
-{% block jquery_snippets %}
-{# Sort user name at initialization. #}
-$("#user_list").tablesorter( {
-    sortList: [[1,0]]
-});
-{% endblock jquery_snippets %}
-
 {# Show drop-down menu of domain list #}
 {% block id_welcome %}
 <span>{{ _('View users under domain:') }} </span>
         {% endfor %}
     </select>
 </span>
+{% if users |length > 0 %}<span>{{ _('Total: %s.') |format(users |length) }}</span>{% endif %}
 {% endblock id_welcome %}
 
 {% block id_visit_links %}
 {% if users is defined %}
     {# List all users. #}
     <div class="main-frm">
-    <form name="list_table" id="list_table" action="{{ctx.homepath}}/users/{{cur_domain}}" method="post">
-    <table id="user_list" class="full tablesorter headerSortUp">
+    <form id="list_table" method="post" action="{{ctx.homepath}}/users/{{cur_domain}}">
+    <table id="account_list" class="tablesorter">
         {# Table header. #}
         <thead>
         <tr>
-            <th>{{ _('Display name') }}/{{ users |length}}</th>
-            <th>{{ _('Mail address') }}</th>
+            <th>{{ _('Mail Address') }}</th>
+            <th>{{ _('Display Name') }}</th>
             <th>{{ _('Quota') }}</th>
             <th>{{ _('Created date') }}</th>
         </tr>
                     <td>
                         <span class="float_left">
                             <input type="checkbox" name="mail" value="{{mail}}" />
-                            <a href="{{ctx.homepath}}/profile/user/general/{{mail}}" title="{{ _('Edit user profile.') }}">{{ cn }}</a>
+                            <a href="mailto:{{mail}}" title="{{ _('Send mail to %s.') |format(mail) }}">{{ mail }}</a>
                         </span>
                         <span class="float_right">{{ set_account_status_img(accountStatus) }}</span>
                     </td>
-                    <td><a href="mailto:{{mail}}" title="{{ _('Send mail to %s.') |format(mail) }}">{{ mail }}</a></td>
+                    <td><a href="{{ctx.homepath}}/profile/user/general/{{mail}}" title="{{ _('Edit user profile.') }}">{{ cn }}</a></td>
 
                 {# mail quota #}
                 <td>{% if entries.get('mailQuota', ['0'])[0] == '0' %}{{ _('Unlimited') }}{% else %}{{ entries.get('mailQuota', ['0'])[0] |filesizeformat }} {% endif %}</td>