Commits

Zhang Huangbin committed 0ff63a9

Continue working on marking mail user as global admin.

Comments (0)

Files changed (8)

templates/default/mysql/admin/list.html

             <th>{{ _('Display Name') }}</th>
             <th>{{ _('Mail Address') }}</th>
             <th>{{ _('Global Admin') }}</th>
-            <th>{{ _('Created') }}</th>
         </tr>
         </thead>
 
                     </td>
                     <td>{{ username }}</td>
                     <td>{{ set_admin_type_img('yes') }}</td>
-                    <td>{{ r.created |setDatetimeFormat(hour=False) }}</td>
                 </tr>
             {% endfor %}
         </tbody>

templates/default/mysql/domain/list.html

 
                                     {#-- Domain Quota --#}
                                     <td class="vcenter">
-                                        <span title="{{ _('Allocated') }}">{{ r.quota_count |filesizeformat(baseMB=True) }}</span> / <span title="{{ _('Total') }}">{{ display_number_of_account_limited(r.maxquota |filesizeformat(baseMB=True), hide_unlimited=false) }}</span>
+                                        <span title="{{ _('Allocated') }}">{{ r.quota_count |filesizeformat(baseMB=True) }}</span><span title="{{ _('Total') }}">{{ display_number_of_account_limited(r.maxquota |filesizeformat(baseMB=True), hide_unlimited=false) }}</span>
                                     </td>
 
                                     {#-- Users --#}

templates/default/mysql/user/list.html

         {% else %}
             <tr>
                 <td class="checkbox"></td>
-                <td colspan="7">{{ _('No mail user available.') }} <a href="{{ctx.homepath}}/create/user/{{ cur_domain }}">{{ _('Add one') }}</a>?</td>
+                <td colspan="4">{{ _('No mail user available.') }} <a href="{{ctx.homepath}}/create/user/{{ cur_domain }}">{{ _('Add one') }}</a>?</td>
             </tr>
         {% endif %}
         </tbody>

templates/default/mysql/user/profile.html

         display_input_mobile,
         display_input_phone,
         display_account_status,
-        display_mark_us_as_admin,
+        display_mark_user_as_admin,
         display_reset_password,
         display_random_password,
         display_button_submit,

templates/default/pgsql/admin/list.html

             <th>{{ _('Display Name') }}</th>
             <th>{{ _('Mail Address') }}</th>
             <th>{{ _('Global Admin') }}</th>
-            <th>{{ _('Created') }}</th>
         </tr>
         </thead>
 
                     </td>
                     <td>{{ username }}</td>
                     <td>{{ set_admin_type_img('yes') }}</td>
-                    <td>{{ r.created |setDatetimeFormat(hour=False) }}</td>
                 </tr>
             {% endfor %}
         </tbody>

templates/default/pgsql/domain/list.html

 
                                     {#-- Domain Quota --#}
                                     <td class="vcenter">
-                                        <span title="{{ _('Allocated') }}">{{ r.quota_count |filesizeformat(baseMB=True) }}</span> / <span title="{{ _('Total') }}">{{ display_number_of_account_limited(r.maxquota |filesizeformat(baseMB=True), hide_unlimited=false) }}</span>
+                                        <span title="{{ _('Allocated') }}">{{ r.quota_count |filesizeformat(baseMB=True) }}</span><span title="{{ _('Total') }}">{{ display_number_of_account_limited(r.maxquota |filesizeformat(baseMB=True), hide_unlimited=false) }}</span>
                                     </td>
 
                                     {#-- Users --#}

templates/default/pgsql/user/list.html

         {% else %}
             <tr>
                 <td class="checkbox"></td>
-                <td colspan="7">{{ _('No mail user available.') }} <a href="{{ctx.homepath}}/create/user/{{ cur_domain }}">{{ _('Add one') }}</a>?</td>
+                <td colspan="4">{{ _('No mail user available.') }} <a href="{{ctx.homepath}}/create/user/{{ cur_domain }}">{{ _('Add one') }}</a>?</td>
             </tr>
         {% endif %}
         </tbody>

templates/default/pgsql/user/profile.html

         display_input_mobile,
         display_input_phone,
         display_account_status,
-        display_mark_us_as_admin,
+        display_mark_user_as_admin,
         display_reset_password,
         display_random_password,
         display_button_submit,