From 341a0140d6f6b33310323bdf14f08ea4d9ff384a Mon Sep 17 00:00:00 2001 From: llj Date: Fri, 20 Dec 2013 16:16:31 +0800 Subject: [PATCH] [sysadmin] redesigned user_info page; changed 'Nickname' to 'Name' --- media/css/seahub.css | 9 +- .../templates/profile/set_profile.html | 2 +- .../templates/profile/user_profile.html | 4 +- seahub/templates/sysadmin/sys_useradmin.html | 2 +- seahub/templates/sysadmin/userinfo.html | 156 +++++++++--------- 5 files changed, 93 insertions(+), 80 deletions(-) diff --git a/media/css/seahub.css b/media/css/seahub.css index c1783893c3..137768f0b4 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -388,7 +388,9 @@ textarea:-moz-placeholder {/* for FF */ } /**** side-tabnav ****/ .side-tabnav .hd, -.side-textnav .hd { +.side-textnav .hd, +.side-info .hd, +#right-panel .hd { padding-bottom:4px; border-bottom:1px solid #ddd; margin-bottom:1em; @@ -452,6 +454,9 @@ textarea:-moz-placeholder {/* for FF */ text-decoration:none; } +.side-info dt { + margin-top:15px; +} /**** checkbox ****/ .checkbox-orig { font-size:0; @@ -845,8 +850,6 @@ textarea:-moz-placeholder {/* for FF */ margin-top: 0px; } #right-panel .hd { - padding-bottom:4px; - border-bottom:1px solid #ddd; border-radius:0; /* rm radius when 'hd' is also '.ui-corner-all' */ margin-bottom:1.5em; } diff --git a/seahub/profile/templates/profile/set_profile.html b/seahub/profile/templates/profile/set_profile.html index 01ba15dfc7..de9a981efb 100644 --- a/seahub/profile/templates/profile/set_profile.html +++ b/seahub/profile/templates/profile/set_profile.html @@ -33,7 +33,7 @@
{% csrf_token %} {% trans "Update" %}
- + {% for error in form.nickname.errors %} {{ error|escape }} {% endfor %} diff --git a/seahub/profile/templates/profile/user_profile.html b/seahub/profile/templates/profile/user_profile.html index 314de3af68..716ebd544e 100644 --- a/seahub/profile/templates/profile/user_profile.html +++ b/seahub/profile/templates/profile/user_profile.html @@ -38,14 +38,16 @@

{% trans "Info" %}

-
{% trans "Nickname" %}
+
{% trans "Name" context "true name" %}
{{ nickname }}
{% trans "Self-introduction" %}
{{ intro }}
+ {% if d_profile %}
{% trans "Department" %}
{{ d_profile.department }}
+
{% trans "Telephone" %}
{{ d_profile.telephone }}
{% endif %} diff --git a/seahub/templates/sysadmin/sys_useradmin.html b/seahub/templates/sysadmin/sys_useradmin.html index 389f116c45..a7e3396061 100644 --- a/seahub/templates/sysadmin/sys_useradmin.html +++ b/seahub/templates/sysadmin/sys_useradmin.html @@ -4,7 +4,7 @@ {% block title_panel %}
-
    +
    • {% trans "Database" %}
      • {% if have_ldap %}
    • {% trans "LDAP" %}
      • diff --git a/seahub/templates/sysadmin/userinfo.html b/seahub/templates/sysadmin/userinfo.html index 54b58bfc39..ac2f15c122 100644 --- a/seahub/templates/sysadmin/userinfo.html +++ b/seahub/templates/sysadmin/userinfo.html @@ -13,29 +13,28 @@ {% endblock %} {% block left_panel %} - -
      -

      {% trans "Profile" %}

      -
      - {% avatar email 48 %} -

      +

      +

      {% trans "Profile" %}

      + {% avatar email 48 %} +
      {% if profile %} -

      {{ profile.nickname }}

      -

      {{ profile.intro }}

      - {% endif %} - {% if d_profile %} -

      {{ d_profile.department }}

      -

      {{ d_profile.telephone }}

      - {% endif %} -

      -
      -
      +
      {% trans "Name" context "true name" %}
      +
      {{ profile.nickname }}
      -
      -
      -

      {% trans "Space Used" %}

      -
      -
      +
      {% trans "Self-introduction" %}
      +
      {{ profile.intro }}
      + {% endif %} + + {% if d_profile %} +
      {% trans "Department" %}
      +
      {{ d_profile.department }}
      + +
      {% trans "Telephone" %}
      +
      {{ d_profile.telephone }}
      + {% endif %} +
+ +

{% trans "Space Used" %}

{% if CALC_SHARE_USAGE %}

{% trans "Total" %}: {{ quota_usage|filesizeformat }} {% if quota > 0 %}/ {{ quota|filesizeformat }} {% endif %}

{% trans "Used" %}: {{ my_usage|filesizeformat }}

@@ -45,59 +44,6 @@ {% endif %} {% trans "Set Quota" %} - - -{% endblock %} - -{% block right_panel %} -

{% trans "Owned" %}

-{% if owned_repos %} - - - - - - - - - {% for repo in owned_repos %} - - - - - - - {% endfor %} -
{% trans "Name" %}{% trans "Description" %}{% trans "Operations" %}
{% trans {{ repo.props.name }}{{ repo.props.desc }} - -
-{% else %} -

{% trans "None" %}

-{% endif %} - -

{% trans "Shared" %}

-{% if in_repos %} - - - - - - - - - {% for repo in in_repos %} - - - - - - - {% endfor %} -
{% trans "Name" %}{% trans "Share From" %}{% trans "Description" %}
library icon{{ repo.props.repo_name }}{{ repo.props.user }}{{ repo.props.repo_desc }}
-{% else %} -

{% trans "None" %}

-{% endif %} - {% csrf_token %}

{% trans "Set user storage limit" %}

@@ -106,6 +52,68 @@

+{% endblock %} + +{% block right_panel %} +
+
+ +
+ +
+ {% if owned_repos %} + + + + + + + + + {% for repo in owned_repos %} + + + + + + + {% endfor %} +
{% trans "Name" %}{% trans "Description" %}{% trans "Operations" %}
{% trans {{ repo.props.name }}{{ repo.props.desc }} + +
+ {% else %} +

{% trans "None" %}

+ {% endif %} +
+ +
+ {% if in_repos %} + + + + + + + + + {% for repo in in_repos %} + + + + + + + {% endfor %} +
{% trans "Name" %}{% trans "Share From" %}{% trans "Description" %}
library icon{{ repo.props.repo_name }}{{ repo.props.user }}{{ repo.props.repo_desc }}
+ {% else %} +

{% trans "None" %}

+ {% endif %} +
+
+ {% include 'snippets/repo_del_popup.html' %} {% endblock %}