Merge branch 'org'

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;

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>

templates/org_base.html

@@ -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>