From 8630d08dd669b797e44d7a63fb7ab75fbd17acf3 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Sat, 18 Aug 2012 17:00:44 +0800
Subject: [PATCH] modified info-bar

---
 media/css/seahub.css          | 18 +++++++++++++++---
 templates/base.html           | 16 +++++++++++++---
 templates/file_revisions.html | 10 ----------
 templates/repo.html           |  4 ++--
 templates/repo_view_file.html | 10 ----------
 5 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/media/css/seahub.css b/media/css/seahub.css
index 58827f2e6f..f2fb1f5009 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -182,9 +182,21 @@ p {
 }
 
 /* info-bar */
-#info-bar { height: 30px; color: #fff; background: #000; }
-#info-bar .info { margin: 5px 0 auto 1em; float: left; }
-#info-bar .close { margin: 7px 5px auto 0;  float: right; background: url(../img/close-16.png); height: 16px; width:16px; }
+#info-bar,
+#sharelink-infobar {
+    color: #fff;
+    padding:2px 25px 2px 10px;
+    background: #000;
+}
+#info-bar {
+    position:relative;
+}
+#info-bar .close {
+    cursor:pointer;
+    position:absolute;
+    right:5px;
+    top:5px;
+}
 
 /* top-bar */
 #top-bar { height:21px; padding-bottom:21px;  background:#fff url('../img/dropshadow.png') repeat-x center bottom; }
diff --git a/templates/base.html b/templates/base.html
index 829c4b0920..bc69a0eb9e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -16,8 +16,8 @@
   {% block info_bar_message %}
     {% if request.user.is_authenticated and request.cur_note %}
     <div id="info-bar">
-      <span class="info">{{ request.cur_note.message|urlize|url_target_blank }}</span>
-      <a href="{{ SITE_ROOT }}notification/close/{{ request.cur_note.id }}/?next={{ request.path }}"><span class="close"></span></a>
+      <p>{{ request.cur_note.message|urlize|url_target_blank }}</p>
+      <img src="{{ MEDIA_URL }}img/close-16.png" class="close" />
     </div>
     {% endif %}
   {% endblock info_bar_message %}
@@ -129,7 +129,15 @@
 <script type="text/javascript" src="{{ MEDIA_URL }}js/utils.js"></script>
 <script type="text/javascript">
     $('.top-bar-in .manage').css('width', $('.top-bar-in').width() - $('.top-bar-in .account').width() - 30);
-{% if request.user.is_authenticated and request.cloud_mode %}
+{% if request.user.is_authenticated %}
+
+{% if request.cur_note %}
+$('#info-bar .close').click(function() {
+    $('#info-bar').addClass('hide');
+});
+{% endif %}
+
+{% if request.cloud_mode %}
     $('#team-account').click(function() {
         if ($(this).attr('data') == 'no-popup') {
             $(this).parent().css('position', 'relative');
@@ -149,6 +157,8 @@ $(document).click(function(e) {
         $('#team-account').attr('data', 'no-popup');
     }
 });
+{% endif %}
+
 {% endif %}
 </script>
 {% block extra_script %}{% endblock %}
diff --git a/templates/file_revisions.html b/templates/file_revisions.html
index 823f4b52d5..ecf845dab2 100644
--- a/templates/file_revisions.html
+++ b/templates/file_revisions.html
@@ -1,16 +1,6 @@
 {% extends base_template %}
 {% load seahub_tags avatar_tags %}
 
-{% block info_bar_message %}
-{% if request.user.is_authenticated %}
-  {{ block.super }}
-{% else %}
-  <div id="info-bar">
-    <span class="info">当前链接会在短期内失效，欢迎您 <a href="http://seafile.com/" target="_blank">加入Seafile </a>体验更多功能。</span>
-  </div>
-{% endif %}
-{% endblock %}
-
 {% block main_panel %}
 <h2>{{ u_filename }} 修改历史</h2>
 <p class="path">
diff --git a/templates/repo.html b/templates/repo.html
index b588a2d675..d77cd8d1fd 100644
--- a/templates/repo.html
+++ b/templates/repo.html
@@ -7,8 +7,8 @@
 {% if request.user.is_authenticated %}
   {{ block.super }}
 {% else %}
-  <div id="info-bar">
-    <span class="info">当前链接会在短期内失效，欢迎您 <a href="http://seafile.com/" target="_blank">加入Seafile </a>体验更多功能。</span>
+  <div id="sharelink-infobar">
+    <p>当前链接会在短期内失效，欢迎您 <a href="http://seafile.com/" target="_blank">加入Seafile </a>体验更多功能。</p>
   </div>
 {% endif %}
 {% endblock %}
diff --git a/templates/repo_view_file.html b/templates/repo_view_file.html
index a135583c8a..8fb6eebd8e 100644
--- a/templates/repo_view_file.html
+++ b/templates/repo_view_file.html
@@ -2,16 +2,6 @@
 {% load seahub_tags %}
 {% load url from future %}
 
-{% block info_bar_message %}
-{% if request.user.is_authenticated %}
-  {{ block.super }}
-{% else %}
-  <div id="info-bar">
-    <span class="info">当前链接会在短期内失效，欢迎您 <a href="http://seafile.com/" target="_blank">加入Seafile </a>体验更多功能。</span>
-  </div>
-{% endif %}
-{% endblock %}
-
 {% block main_panel %}
 {% if messages %}
 {% autoescape off %}