1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-26 02:30:02 +00:00

Merge branch 'org'

This commit is contained in:
zhengxie 2013-03-01 13:47:14 +08:00
commit dc1da56563
3 changed files with 14 additions and 0 deletions

View File

@ -480,6 +480,16 @@ textarea:-moz-placeholder {/* for FF */
}
/* header */
#notice {
text-align:center;
}
#notice-con {
color:red;
padding:3px 5px;
background:#ffc;
box-shadow:0 0 6px gray;
border-radius:1px;
}
#logo {
width:95px;
height:40px;

View File

@ -81,6 +81,7 @@
<div id="header">
<div id="header-inner">
{% block notice_panel %}{% endblock %}
<a href="http://seafile.com/" id="logo" class="fleft">
<img src="{{ MEDIA_URL }}img/logo.png?t=1359353100" title="Seafile" alt="Seafile logo" />
</a>

View File

@ -3,6 +3,9 @@
{% load i18n %}
{% block top_bar_org_myaccount_class %} class="cur"{% endblock %}
{% block notice_panel %}
<p id="notice"><span id="notice-con">{% trans "Organization will be removed in next version, data will be merged into your current account." %}</span></p>
{% endblock %}
{% block nav %}
<ul class="nav">
<li>