haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-07 10:03:54 +00:00
Code Issues Releases Wiki Activity

[profile edit] modified 'account' ui in home pages and added tip to avatar-link in topbar

Browse Source
This commit is contained in:
llj 2012-12-26 14:59:37 +08:00
parent 33c8064d56
commit 1b82f78b74
4 changed files with 149 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
media/css/seahub.css
View File

@ -676,9 +676,21 @@ textarea:-moz-placeholder {/* for FF */
/* for separate pages */
/*myhome*/
.home-profile .avatar {
float:left;
margin:0 15px 0 9px;
.home-profile .pic {
margin-left:9px;
}
.home-profile .txt {
width:135px;
}
.home-profile .edit {
font-weight:normal;
color:#999;
font-size:12px;
display:inline-block;
margin-top:5px;
}
.home-profile .edit:hover {
color:#333;
}
.mygroup {
display:inline-block; /*to handle different height of items*/

13
organizations/templates/organizations/personal.html
View File

@ -9,19 +9,18 @@
{% endblock %}
{% block left_panel %}
<!-- 我的基本信息 -->
<div class="info-item">
<h3 class="info-item-top">{% trans "Account" %}</h3>
<div class="info-item-bottom home-profile ovhd">
<a href="{{ SITE_ROOT }}profile/" class="no-deco">{% avatar request.user 48 %}</a>
{% if nickname %}
<p class="fleft">{{ nickname }}</p>
{% else %}
<p class="fleft">{% trans "No Nickname" %} <a href="{{ SITE_ROOT }}profile/"><img src="{{ MEDIA_URL }}img/edit_12.png" alt="{% trans "Edit" %}" title="{% trans "Edit" %}" /></a></p>
{% endif %}
<a href="{{ SITE_ROOT }}profile/" class="pic no-deco fleft" title="{% trans "Edit" %}">{% avatar request.user 48 %}</a>
<div class="txt fright">
<p>{% if nickname %}{{ nickname }}{% else %}{% trans "No Nickname" %}{% endif %}</p>
<a href="{{ SITE_ROOT }}profile/" class="edit">{% trans "Edit" %}</a>
</div>
</div>
</div>
<div class="info-item">
<h3 class="info-item-top">{% trans "Space Used" %}</h3>
<p class="info-item-bottom">{{ quota_usage|filesizeformat }}</p>

12
templates/base.html
View File

@ -17,7 +17,7 @@
</head>
<body>
<div id="wrapper">
<div id="wrapper">
{% block info_bar_message %}
{% if request.user.is_authenticated and request.cur_note %}
<div id="info-bar">
@ -60,7 +60,7 @@
<div class="account fright">
{% if request.user.is_authenticated %}
<a href="{% url 'edit_profile' %}" class="avatar-link">{% avatar request.user 16 %}</a> <span>{{ request.user }}</span>
<a href="{% url 'edit_profile' %}" class="avatar-link" title="{% trans 'Profile Setting' %}">{% avatar request.user 16 %}</a> <span>{{ request.user }}</span>
<a href="{{ SITE_ROOT }}accounts/logout/">{% trans "Log out" %}</a>
{% else %}
<a href="{{ SITE_ROOT }}accounts/login/">{% trans "Log In" %}</a>
@ -68,16 +68,13 @@
<a href="{{ SITE_ROOT }}accounts/register/">{% trans "Signup" %}</a>
{% endif %}
{% endif %}
<a href="#" id="lang-context" data="no-popup" data-lang="{{ LANGUAGE_CODE }}">
{{ LANGUAGE_CODE|language_name_local }}
<span class="tri-bg tri-down-bg"></span>
</a>
<a href="#" id="lang-context" data="no-popup" data-lang="{{ LANGUAGE_CODE }}">{{ LANGUAGE_CODE|language_name_local }} <span class="tri-bg tri-down-bg"></span></a>
<ul class="hide" id="lang-context-selector">
{% for LANG in LANGUAGES %}
<li><a href="{% url 'i18n' %}?lang={{ LANG.0 }}">{{ LANG.1 }}</a></li>
{% endfor %}
</ul>
</div> <!-- /.account -->
</div>
</div>
</div>
</div>
@ -151,7 +148,6 @@
</div>
</div>
</div><!-- wrapper -->
<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.min.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.simplemodal.1.4.1.min.js"></script>

11
templates/myhome.html
View File

@ -8,12 +8,11 @@
<div class="info-item">
<h3 class="info-item-top">{% trans "Account" %}</h3>
<div class="info-item-bottom home-profile ovhd">
<a href="{{ SITE_ROOT }}profile/" class="no-deco">{% avatar request.user 48 %}</a>
{% if nickname %}
<p class="fleft">{{ nickname }}</p>
{% else %}
<p class="fleft">{% trans "No Nickname" %} <a href="{{ SITE_ROOT }}profile/"><img src="{{ MEDIA_URL }}img/edit_12.png" alt="{% trans "Edit" %}" title="{% trans "Edit" %}" /></a></p>
{% endif %}
<a href="{{ SITE_ROOT }}profile/" class="pic no-deco fleft" title="{% trans "Edit" %}">{% avatar request.user 48 %}</a>
<div class="txt fright">
<p>{% if nickname %}{{ nickname }}{% else %}{% trans "No Nickname" %}{% endif %}</p>
<a href="{{ SITE_ROOT }}profile/" class="edit">{% trans "Edit" %}</a>
</div>
</div>
</div>