1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-14 14:21:23 +00:00

Add nav footer

This commit is contained in:
Daniel Pan
2016-05-07 14:15:39 +08:00
committed by llj
parent 9c4e1e57e8
commit 134cef775a
6 changed files with 35 additions and 12 deletions

View File

@@ -708,7 +708,7 @@ textarea:-moz-placeholder {/* for FF */
top:52px; top:52px;
bottom:0; bottom:0;
z-index:1; z-index:1;
padding:20px; padding:0;
overflow:hidden; overflow:hidden;
border-right:1px solid #eee; border-right:1px solid #eee;
} }
@@ -722,7 +722,6 @@ textarea:-moz-placeholder {/* for FF */
top:0; top:0;
bottom:0; bottom:0;
z-index:1; z-index:1;
padding:20px;
overflow:hidden; overflow:hidden;
border-right:1px solid #eee; border-right:1px solid #eee;
box-shadow:0 0 4px #ccc; box-shadow:0 0 4px #ccc;
@@ -735,6 +734,21 @@ textarea:-moz-placeholder {/* for FF */
-webkit-transition: all 0.3s ease; -webkit-transition: all 0.3s ease;
-moz-transition: all 0.3s ease; -moz-transition: all 0.3s ease;
transition: all 0.3s ease; transition: all 0.3s ease;
display: flex;
flex-direction: column;
}
.side-nav-con {
overflow-y:auto;
padding:20px;
}
.side-nav-footer {
padding: 12px 20px 16px;
background: #f8f8f8;
border-top:1px solid #eee;
}
.side-nav-footer a {
color:#333;
font-weight: normal;
} }
.side-tabnav .hd { .side-tabnav .hd {
margin-bottom:0.5em; margin-bottom:0.5em;

View File

@@ -75,15 +75,15 @@
</div> </div>
<div id="main" class="clear container-fluid top-padding"> <div id="main" class="clear container-fluid top-padding">
<div class="row"> <div class="row main-content hide">
<div class="side-tabnav col-md-3 hide" id="side-nav" role="navigation"></div> <div class="side-tabnav col-md-3" id="side-nav" role="navigation"></div>
<div id="right-panel" class="col-md-9 col-md-offset-3"> <div id="right-panel" class="col-md-9 col-md-offset-3">
{% block right_panel %}{% endblock %} {% block right_panel %}{% endblock %}
</div> </div>
<div id="main-panel" class="clear w100 ovhd">
<div id="initial-loading-view">
<span class="loading-icon loading-tip"></span>
</div> </div>
<div class="row initial-loading">
<div id="initial-loading-view" class="clear w100 ovhd">
<span class="loading-icon loading-tip"></span>
</div> </div>
</div> </div>
@@ -108,7 +108,7 @@
</div> </div>
{% include 'js/templates.html' %} {% include 'js/templates.html' %}
</div><!-- wrapper --> </div><!-- wrapper -->
<script type="text/javascript"> <script type="text/javascript">
var app = { var app = {

View File

@@ -606,6 +606,7 @@
</script> </script>
<script type="text/template" id="side-nav-tmpl"> <script type="text/template" id="side-nav-tmpl">
<div class="side-nav-con">
<a href="#" title="{% trans "Close" %}" aria-label="{% trans "Close" %}" class="sf2-icon-x1 sf-popover-close op-icon hidden-md-up js-close-side-nav fright"></a> <a href="#" title="{% trans "Close" %}" aria-label="{% trans "Close" %}" class="sf2-icon-x1 sf-popover-close op-icon hidden-md-up js-close-side-nav fright"></a>
<h3 class="hd">{% trans "Files" %}</h3> <h3 class="hd">{% trans "Files" %}</h3>
<ul class="side-tabnav-tabs"> <ul class="side-tabnav-tabs">
@@ -704,6 +705,10 @@
<a href="{{ SITE_ROOT }}share/links/"><span aria-hidden="true" class="sf2-icon-link"></span>{% trans "Links" %}</a> <a href="{{ SITE_ROOT }}share/links/"><span aria-hidden="true" class="sf2-icon-link"></span>{% trans "Links" %}</a>
</li> </li>
</ul> </ul>
</div>
<div class="side-nav-footer ovhd" role="contentinfo">
{% include 'nav_footer.html' %}
</div>
</script> </script>
<script type="text/template" id="myhome-mods-enable-form-tmpl"> <script type="text/template" id="myhome-mods-enable-form-tmpl">

View File

@@ -0,0 +1,4 @@
{% load i18n %}
<a href="{{SITE_ROOT}}help/" target="_blank">{% trans "Help" %}</a>
<a href="{{SITE_ROOT}}help/" target="_blank">{% trans "About" %}</a>
<a href="{% url 'download_client' %}" class="fright"><span aria-hidden="true" class="sf2-icon-monitor"></span> Clients</a>

View File

@@ -43,7 +43,8 @@ define([
}, },
initialize: function() { initialize: function() {
$('#initial-loading-view').hide(); $('.initial-loading').hide();
$('.main-content').show();
Common.prepareApiCsrf(); Common.prepareApiCsrf();
Common.initLocale(); Common.initLocale();

View File

@@ -28,7 +28,6 @@ define([
'can_add_repo': app.pageOptions.can_add_repo, 'can_add_repo': app.pageOptions.can_add_repo,
}; };
this.render(); this.render();
this.$el.show();
var _this = this; var _this = this;
$('#js-toggle-side-nav').click(function() { $('#js-toggle-side-nav').click(function() {
_this.show(); _this.show();