1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 06:33:48 +00:00

modified info-bar

This commit is contained in:
llj
2012-08-18 17:00:44 +08:00
parent afb29917bf
commit 8630d08dd6
5 changed files with 30 additions and 28 deletions

View File

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

View File

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

View File

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

View File

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

View File

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