haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-10-20 18:32:41 +00:00
Code Issues Releases Wiki Activity

redesigned footer;improved file-op popup position

Browse Source
This commit is contained in:
llj
2012-07-04 17:06:25 +08:00
parent bef3039a75
commit 677853f1ec
4 changed files with 87 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
media/css/seahub.css
View File

@@ -134,7 +134,6 @@ table img {
.main { .main {
width:680px; width:680px;
} }
#footer { color:#999; padding-top:2px; margin:25px auto; border-top:1px solid #DDD; }
/* info-bar */ /* info-bar */
#info-bar { height: 30px; color: #fff; background: #000; } #info-bar { height: 30px; color: #fff; background: #000; }
@@ -175,7 +174,36 @@ table img {
#header .nav a.cur { color:#000; } #header .nav a.cur { color:#000; }
#header .nav a:hover { color: #ff9933; text-decoration: underline; } #header .nav a:hover { color: #ff9933; text-decoration: underline; }
/* footer */ /* footer */
#footer a { color:#333; text-decoration:none; } #footer {
color:#636363;
font-size:12px;
padding:20px 0 10px;
margin:25px auto;
border-top:1px solid #DDD;
}
#footer .items {
width:65%;
}
#footer .other-info {
width:30%;
}
#footer .item {
float:left;
width:28%;
padding:0 3% 0 2%;
}
#footer .item h4 {
font-size:12px;
font-weight:bold;
color:#636363;
padding-bottom:5px;
border-bottom:1px solid #e1e1e1;
margin-bottom:5px;
}
#footer a {
color:#444;
font-weight:normal;
}
/* main */ /* main */
.path, .access-notice { margin: 12px 0 6px 0; } .path, .access-notice { margin: 12px 0 6px 0; }
.with-bg li { .with-bg li {
@@ -349,24 +377,24 @@ table img {
margin-top:12px; margin-top:12px;
} }
.repo-op a { .repo-op a {
font-weight: normal;
margin-left:8px; margin-left:8px;
background:#fff scroll no-repeat left 50%; background:#fff scroll no-repeat left 50%;
} }
.repo-op .upload-file { .repo-op .upload-file {
padding-left:17px; padding-left:17px;
background-image:url('../img/upload.png'); background-image:url('../img/upload.png');
font-weight: normal;
} }
#add-new-dir { #add-new-dir {
padding-left:20px; padding-left:20px;
background-image:url('../img/folder-add.png'); background-image:url('../img/folder-add.png');
font-weight: normal;
} }
.more-op { .more-op {
cursor:pointer; cursor:pointer;
} }
.op-list { .op-list {
position:absolute; position:absolute;
left:18px;
background:#fff; background:#fff;
padding:6px 1px; padding:6px 1px;
border:1px solid #eee; border:1px solid #eee;

33
templates/base.html
View File

@@ -77,7 +77,7 @@
<div id="right-panel"> <div id="right-panel">
{% block right_panel %}{% endblock %} {% block right_panel %}{% endblock %}
</div> </div>
<div id="main-panel" class="clear w100"> <div id="main-panel" class="clear w100 ovhd">
{% block main_panel %}{% endblock %} {% block main_panel %}{% endblock %}
</div> </div>
<div id="dialog-confirm" class="hide"> <div id="dialog-confirm" class="hide">
@@ -88,14 +88,39 @@
</div> </div>
<div id="footer" class="ovhd"> <div id="footer" class="ovhd">
<p class="fleft">Copyright © 2012 海文互知. 服务器版本：{{ seafile_version }}</p> <div class="items fleft">
<p class="fright">Contact | About</p> <div class="item">
<h4>SeaCloud</h4>
<ul>
<li>About</li>
<li><a href="http://wiki.seafile.com.cn/" target="_blank">Wiki</a></li>
<li><a href="http://gonggeng.org/vanilla/" target="_blank">论坛</a></li>
<li>Contact</li>
</ul>
</div>
<div class="item">
<h4>客户端</h4>
<ul>
<li><a href="http://www.seafile.com/download/">Seafile for Windows</a></li>
</ul>
</div>
<div class="item">
<h4>文档</h4>
<ul>
<li><a href="http://www.seafile.com/help/" target="_blank">使用帮助</a></li>
</ul>
</div>
</div>
<div class="other-info fright">
<p>服务器版本：{{ seafile_version }}</p>
<p>© 2012 海文互知.</p>
</div>
</div> </div>
</div><!-- wrapper --> </div><!-- wrapper -->
<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.min.js"></script> <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.min.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.simplemodal.1.4.1.min.js"></script> <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.simplemodal.1.4.1.min.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.cookie.js"></script> <!--script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.cookie.js"></script-->
<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-ui-1.8.16.custom.min.js"></script> <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}js/utils.js"></script> <script type="text/javascript" src="{{ MEDIA_URL }}js/utils.js"></script>
{% block extra_script %}{% endblock %} {% block extra_script %}{% endblock %}

15
templates/myhome_base.html
View File

@@ -22,20 +22,5 @@
<li> <li>
<a href="{{ SITE_ROOT}}back/local/">回到本地</a> <a href="{{ SITE_ROOT}}back/local/">回到本地</a>
</li> </li>
<li>
<a href="http://www.gonggeng.org/seasite/help/" target="_blank">使用帮助</a>
</li>
<!--
<li>
<a href="{{ SITE_ROOT }}repos/my/">Files</a>
</li>
<li>
<a href="{{ SITE_ROOT }}peers/">Peers</a>
</li>
<li>
<a href="{{ SITE_ROOT }}groups/">Groups</a>
</li>
-->
</ul> </ul>
{% endblock %} {% endblock %}

46
templates/repo.html
View File

@@ -126,13 +126,15 @@
<td></td> <td></td>
<td> <td>
{% if not view_history %} {% if not view_history %}
<img src="{{ MEDIA_URL }}img/more-option.png" alt="更多操作" class="more-op hide" /> <div>
<ul class="op-list hide"> <img src="{{ MEDIA_URL }}img/more-option.png" alt="更多操作" class="more-op hide" />
<li><a class="op" href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/{{ dirent.props.obj_id }}/?p={{ path|urlencode }}&file_name={{ dirent.props.obj_name|urlencode }}&op=del">删除</a></li> <ul class="op-list hide">
<li><a class="op dir-rename" href="#" data="{{ dirent.obj_name }}">重命名</a></li> <li><a class="op" href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/{{ dirent.props.obj_id }}/?p={{ path|urlencode }}&file_name={{ dirent.props.obj_name|urlencode }}&op=del">删除</a></li>
<li><a class="op dir-mv" href="#" data="{{ dirent.obj_name }}">移动</a></li> <li><a class="op dir-rename" href="#" data="{{ dirent.obj_name }}">重命名</a></li>
<li><a class="op dir-cp" href="#" data="{{ dirent.obj_name }}">复制</a></li> <li><a class="op dir-mv" href="#" data="{{ dirent.obj_name }}">移动</a></li>
</ul> <li><a class="op dir-cp" href="#" data="{{ dirent.obj_name }}">复制</a></li>
</ul>
</div>
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@@ -144,16 +146,18 @@
<td><a class="op" href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/view/{{ dirent.props.obj_id }}/?commit_id={{ current_commit.id }}&file_name={{ dirent.props.obj_name }}&p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}&history={{ view_history }}">{{ dirent.props.obj_name }}</a></td> <td><a class="op" href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/view/{{ dirent.props.obj_id }}/?commit_id={{ current_commit.id }}&file_name={{ dirent.props.obj_name }}&p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}&history={{ view_history }}">{{ dirent.props.obj_name }}</a></td>
<td>{{ dirent.file_size|filesizeformat }}</td> <td>{{ dirent.file_size|filesizeformat }}</td>
<td> <td>
<img src="{{ MEDIA_URL }}img/more-option.png" alt="更多操作" class="more-op hide" /> <div>
<ul class="op-list hide"> <img src="{{ MEDIA_URL }}img/more-option.png" alt="更多操作" class="more-op hide" />
<li><a class="op" href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/{{ dirent.props.obj_id }}/?file_name={{ dirent.props.obj_name }}&op=download">下载</a></li> <ul class="op-list hide">
{% if not view_history %} <li><a class="op" href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/{{ dirent.props.obj_id }}/?file_name={{ dirent.props.obj_name }}&op=download">下载</a></li>
<li><a class="op" href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/{{ dirent.props.obj_id }}/?p={{ path|urlencode }}&file_name={{ dirent.props.obj_name|urlencode }}&op=del">删除</a></li> {% if not view_history %}
<li><a class="op file-rename" href="#" data="{{ dirent.obj_name }}">重命名</a></li> <li><a class="op" href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/{{ dirent.props.obj_id }}/?p={{ path|urlencode }}&file_name={{ dirent.props.obj_name|urlencode }}&op=del">删除</a></li>
<li><a class="op file-mv" href="#" data="{{ dirent.obj_name }}">移动</a></li> <li><a class="op file-rename" href="#" data="{{ dirent.obj_name }}">重命名</a></li>
<li><a class="op file-cp" href="#" data="{{ dirent.obj_name }}">复制</a></li> <li><a class="op file-mv" href="#" data="{{ dirent.obj_name }}">移动</a></li>
{% endif %} <li><a class="op file-cp" href="#" data="{{ dirent.obj_name }}">复制</a></li>
</ul> {% endif %}
</ul>
</div>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
@@ -222,8 +226,10 @@ $('.more-op').hover(
function() { function() {
$(this).parent().css('position','relative'); $(this).parent().css('position','relative');
$('.op-list').attr('class', 'op-list hide'); $('.op-list').attr('class', 'op-list hide');
if ($(this).offset().top + $(this).next().height() > $('#main').offset().top + $('#main').height()) { if ($(this).offset().top + $(this).next().height() <= $('#main-panel').offset().top + $('#main-panel').height()) {
$(this).next().css('bottom', 25); $(this).next().css('top', 6);
} else {
$(this).next().css('bottom', 2);
} }
$(this).next().removeClass('hide'); $(this).next().removeClass('hide');
clearTimeout(Hide); clearTimeout(Hide);
@@ -335,7 +341,7 @@ $('.file-cp, .file-mv, .dir-cp, .dir-mv').click(function () {
path.shift(); path.shift();
path = '/' + path.join('/') + '/'; path = '/' + path.join('/') + '/';
} }
return '{{ SITE_ROOT }}file/move/get_subdir/?repo_id=' + encodeURIComponent(repo_id) + '&path=' + encodeURIComponent(path); return '{{ SITE_ROOT }}file/move/get_subdir/?repo_id=' + e(repo_id) + '&path=' + e(path);
} }
} }
}, },