From bfd74931be68fefef1b3ee32926a41e898c0e320 Mon Sep 17 00:00:00 2001
From: zhengxie <xiez1989@gmail.com>
Date: Fri, 1 Mar 2013 10:03:45 +0800
Subject: [PATCH 1/2] Added org removal tip

---
 templates/org_base.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/org_base.html b/templates/org_base.html
index b45ab8bd6a..0f9c9a42a2 100644
--- a/templates/org_base.html
+++ b/templates/org_base.html
@@ -4,6 +4,7 @@
 
 {% block top_bar_org_myaccount_class %} class="cur"{% endblock %}
 {% block nav %}
+<p>{% trans "Organization will be removed in next version, data will be merged into your current account." %}</p>
 <ul class="nav">
     <li>
         <a href="{% url 'organizations.views.org_personal' org.url_prefix %}" {% block nav_org_personal_class %}{% endblock %}>{% trans "Personal" %}</a>

From b240a551c224bdedda777629be2e9bfcecf80d3b Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Fri, 1 Mar 2013 11:27:58 +0800
Subject: [PATCH 2/2] add styles for org remove notice

---
 media/css/seahub.css    | 10 ++++++++++
 templates/base.html     |  1 +
 templates/org_base.html |  4 +++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/media/css/seahub.css b/media/css/seahub.css
index ce14649660..3f400575b3 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -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;
diff --git a/templates/base.html b/templates/base.html
index 7c286b6135..75b1d22f64 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -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>
diff --git a/templates/org_base.html b/templates/org_base.html
index 0f9c9a42a2..754c2f9a4e 100644
--- a/templates/org_base.html
+++ b/templates/org_base.html
@@ -3,8 +3,10 @@
 {% 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 %}
-<p>{% trans "Organization will be removed in next version, data will be merged into your current account." %}</p>
 <ul class="nav">
     <li>
         <a href="{% url 'organizations.views.org_personal' org.url_prefix %}" {% block nav_org_personal_class %}{% endblock %}>{% trans "Personal" %}</a>