haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-10 11:21:29 +00:00
Code Issues Releases Wiki Activity

Use breadcrumb, update path-bar style and fix close button in popover

Browse Source
This commit is contained in:
Daniel Pan
2016-05-02 11:31:01 +08:00
parent 55da80b237
commit 374edec89b
8 changed files with 52 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
media/css/seahub.css
View File

@@ -165,7 +165,6 @@ h4 { font-size:1.1em; color:#222; font-weight:normal; }
h5, h6 { font-size:1em; margin:0.4em 0 0.15em; } h5, h6 { font-size:1em; margin:0.4em 0 0.15em; }
h1, h2, h3, h4 { line-height: 1.5; } h1, h2, h3, h4 { line-height: 1.5; }
ul { list-style:none; } ul { list-style:none; }
ol { padding-left:2em; }
dl { margin:1.5em 0; } dl { margin:1.5em 0; }
dt { color:#666; margin:24px 0 2px; font-weight: normal; } dt { color:#666; margin:24px 0 2px; font-weight: normal; }
dd { margin-bottom:.8em; color:#222; } dd { margin-bottom:.8em; color:#222; }
@@ -302,7 +301,12 @@ th { text-align:left; font-weight:normal; color:#9c9c9c; }
td, th { padding:5px 3px; word-wrap:break-word; border-bottom:1px solid #eee; } td, th { padding:5px 3px; word-wrap:break-word; border-bottom:1px solid #eee; }
td { color: #333; font-size:14px; } td { color: #333; font-size:14px; }
table img { vertical-align:middle; } table img { vertical-align:middle; }
/**** overwrite bootstrap css ****/
.breadcrumb {
padding:0;
background-color:#fff;
border-radius:0;
}
/********** common class ***********/ /********** common class ***********/
.hl { background-color: #f8f8f8; }/*highlight*/ .hl { background-color: #f8f8f8; }/*highlight*/
.fleft { float:left } .fleft { float:left }
@@ -388,8 +392,8 @@ table img { vertical-align:middle; }
} }
.loading-icon { .loading-icon {
display:inline-block; display:inline-block;
width:22px; width:26px;
height:22px; height:26px;
border:2px solid #eee; border:2px solid #eee;
border-left-color:#aaa; border-left-color:#aaa;
border-radius:50%; border-radius:50%;
@@ -517,6 +521,15 @@ textarea:-moz-placeholder {/* for FF */
} }
/*******ui widgets**************/ /*******ui widgets**************/
/**** path ****/
.path-bar {
font-size:1rem;
line-height:1.5;
margin:0; /* for merge with tabs */
background-color:#f2f2f2;
padding:0.6rem 0.75rem 0.25rem;
border-radius: 2px 2px 0 0;
}
/****paginator****/ /****paginator****/
#paginator { #paginator {
text-align:center; text-align:center;
@@ -1862,12 +1875,6 @@ button.sf-dropdown-toggle:focus {
line-height:25px; line-height:25px;
margin:0; margin:0;
} }
#group-top .path,
#dir-view .path {
font-size:16px;
line-height:1.5;
margin:0 0 5px;
}
#dir-view .repo-op .op-btn { #dir-view .repo-op .op-btn {
padding:5px 14px; padding:5px 14px;
} }
@@ -1909,7 +1916,7 @@ button.sf-dropdown-toggle:focus {
width:200px; width:200px;
} }
.repo-file-list th { .repo-file-list th {
padding-top:20px; padding-top:1rem;
} }
#repo-file-list .fixed-hd { #repo-file-list .fixed-hd {
position:fixed; position:fixed;
@@ -3040,7 +3047,7 @@ button.sf-dropdown-toggle:focus {
} }
.repo-folder-perm-folder-path { .repo-folder-perm-folder-path {
width:150px; width:150px;
padding:3px 33px 3px 5px; padding:1px 33px 1px 5px;
} }
.repo-folder-perm-add-folder { .repo-folder-perm-add-folder {
position:absolute; position:absolute;
@@ -3316,19 +3323,14 @@ img.thumbnail {
#group { #group {
position:relative; position:relative;
} }
#group-members { #group-members, #group-settings, #group-discussions {
position:absolute; position:absolute;
top:77px; top:90px;
right:0; right:0;
} }
#group-members .outer-caret { #group-members .outer-caret {
right:66px; right:66px;
} }
#group-settings {
position:absolute;
top:77px;
right:0;
}
#group-settings .outer-caret { #group-settings .outer-caret {
right:106px; right:106px;
} }
@@ -3340,9 +3342,6 @@ img.thumbnail {
} }
#group-discussions { #group-discussions {
width:440px; width:440px;
position:absolute;
top:77px;
right:0;
} }
#group-discussions .outer-caret { #group-discussions .outer-caret {
right:30px; right:30px;

2
seahub/templates/js/dir-view.html
View File

@@ -1,7 +1,7 @@
{% load i18n %} {% load i18n %}
<script type="text/template" id="dir-view-tmpl"> <script type="text/template" id="dir-view-tmpl">
<div class="repo-file-list-topbar"> <div class="repo-file-list-topbar">
<p class="path"></p> <ol class="path-bar breadcrumb"></ol>
<div class="repo-op"></div> <div class="repo-op"></div>
</div> </div>
<div class="js-dir-content"> <div class="js-dir-content">

29
seahub/templates/js/templates.html
View File

@@ -153,23 +153,23 @@
</script> </script>
<script type="text/template" id="dir-path-bar-tmpl"> <script type="text/template" id="dir-path-bar-tmpl">
<% if (context == 'group') { %> <% if (context == 'group') { %>
<a href="#groups/" class="path-link normal">{% trans "Groups" %}</a> / <li><a href="#groups/" class="path-link normal">{% trans "Groups" %}</a></li>
<a href="#<%= category %>/" class="path-link normal"><%- group_name %></a> / <li><a href="#<%= category %>/" class="path-link normal"><%- group_name %></a></li>
<% } else if (context == 'org') { %> <% } else if (context == 'org') { %>
<a href="#<%= category %>/" class="path-link normal">{% trans "Organization" %}</a> / <li><a href="#<%= category %>/" class="path-link normal">{% trans "Organization" %}</a></li>
<% } else if (context == 'common') { %> <% } else if (context == 'common') { %>
<a href="#my-libs/" class="path-link normal">{% trans "Mine" %}</a> / <li><a href="#my-libs/" class="path-link normal">{% trans "Mine" %}</a></li>
<% } else { %> <% } else { %>
<a href="#<%= category %>/" class="path-link normal"><% if (category == 'my-libs') { %>{% trans "Mine" %}<% } %><% if (category == 'shared-libs') { %>{% trans "Shared" %}<% } %><% if (category == 'my-sub-libs') { %>{% trans "Sub-libraries" %}<% } %></a> / <li><a href="#<%= category %>/" class="path-link normal"><% if (category == 'my-libs') { %>{% trans "Mine" %}<% } %><% if (category == 'shared-libs') { %>{% trans "Shared" %}<% } %></a></li>
<% } %> <% } %>
<% if (path == '/') { %> <% if (path == '/') { %>
<%- repo_name %> / <li><%- repo_name %></li>
<% } else { %> <% } else { %>
<a href="#<%= category %>/lib/<%= repo_id %>/" class="path-link normal"><%- repo_name %></a> / <li><a href="#<%= category %>/lib/<%= repo_id %>/" class="path-link normal"><%- repo_name %></a></li>
<% for (var i = 0,len = path_list.length - 1; i < len; i++) { %> <% for (var i = 0,len = path_list.length - 1; i < len; i++) { %>
<a href="#<%= category %>/lib/<%= repo_id %>/<% print(path_list_encoded.slice(0, i+1).join('/')); %>" class="path-link normal"><%- path_list[i] %></a> / <li><a href="#<%= category %>/lib/<%= repo_id %>/<% print(path_list_encoded.slice(0, i+1).join('/')); %>" class="path-link normal"><%- path_list[i] %></a></li>
<% } %> <% } %>
<%- path_list[i] + ' /' %> <li><%- path_list[i] %></li>
<% } %> <% } %>
</script> </script>
<script type="text/template" id="dirents-hd-tmpl"> <script type="text/template" id="dirents-hd-tmpl">
@@ -729,7 +729,10 @@
</form> </form>
</script> </script>
<script type="text/template" id="group-top-tmpl"> <script type="text/template" id="group-top-tmpl">
<p class="path"><a href="{% url 'group_list' %}" class="normal">{% trans "Groups" %}</a> / <%- name %></p> <ol class="path-bar breadcrumb">
<li><a href="{% url 'group_list' %}" class="normal">{% trans "Groups" %}</a></li>
<li><%- name %></li>
</ol>
<div class="hd ovhd"> <div class="hd ovhd">
{% if user.permissions.can_add_repo %} {% if user.permissions.can_add_repo %}
<button class="repo-create fleft"><span class="icon-plus-square add vam"></span><span class="vam">{% trans "New Library" %}</span></button> <button class="repo-create fleft"><span class="icon-plus-square add vam"></span><span class="vam">{% trans "New Library" %}</span></button>
@@ -1423,7 +1426,7 @@
<script type="text/template" id="notice-popover-tmpl"> <script type="text/template" id="notice-popover-tmpl">
<div class="outer-caret up-outer-caret"><div class="inner-caret"></div></div> <div class="outer-caret up-outer-caret"><div class="inner-caret"></div></div>
<div class="sf-popover-hd ovhd"> <div class="sf-popover-hd ovhd">
<a href="#" title="{% trans "Close" %}" aria-label="{% trans "Close" %}" class="sf-popover-close close sf2-icon-x1 op-icon fright"></a> <a href="#" title="{% trans "Close" %}" aria-label="{% trans "Close" %}" class="sf-popover-close js-close sf2-icon-x1 op-icon fright"></a>
<h3 class="sf-popover-title">{% trans "Notifications" %}</h3> <h3 class="sf-popover-title">{% trans "Notifications" %}</h3>
</div> </div>
<div class="sf-popover-con"> <div class="sf-popover-con">

6
seahub/templates/libraries.html
View File

@@ -116,7 +116,7 @@
<script type="text/template" id="group-settings-tmpl"> <script type="text/template" id="group-settings-tmpl">
<div class="outer-caret up-outer-caret"><div class="inner-caret"></div></div> <div class="outer-caret up-outer-caret"><div class="inner-caret"></div></div>
<div class="sf-popover-hd ovhd"> <div class="sf-popover-hd ovhd">
<a href="#" title="{% trans "Close" %}" aria-label="{% trans "Close" %}" class="sf-popover-close close sf2-icon-x1 op-icon fright"></a> <a href="#" title="{% trans "Close" %}" aria-label="{% trans "Close" %}" class="sf-popover-close js-close sf2-icon-x1 op-icon fright"></a>
<h3 class="sf-popover-title">{% trans "Settings" %}</h3> <h3 class="sf-popover-title">{% trans "Settings" %}</h3>
</div> </div>
<div class="sf-popover-con"> <div class="sf-popover-con">
@@ -126,7 +126,7 @@
<script type="text/template" id="group-members-tmpl"> <script type="text/template" id="group-members-tmpl">
<div class="outer-caret up-outer-caret"><div class="inner-caret"></div></div> <div class="outer-caret up-outer-caret"><div class="inner-caret"></div></div>
<div class="sf-popover-hd ovhd"> <div class="sf-popover-hd ovhd">
<a href="#" title="{% trans "Close" %}" aria-label="{% trans "Close" %}" class="sf-popover-close close sf2-icon-x1 op-icon fright"></a> <a href="#" title="{% trans "Close" %}" aria-label="{% trans "Close" %}" class="sf-popover-close js-close sf2-icon-x1 op-icon fright"></a>
<h3 class="sf-popover-title">{% trans "Members" %}</h3> <h3 class="sf-popover-title">{% trans "Members" %}</h3>
</div> </div>
<div class="sf-popover-con"> <div class="sf-popover-con">
@@ -139,7 +139,7 @@
<script type="text/template" id="group-discussions-tmpl"> <script type="text/template" id="group-discussions-tmpl">
<div class="outer-caret up-outer-caret"><div class="inner-caret"></div></div> <div class="outer-caret up-outer-caret"><div class="inner-caret"></div></div>
<div class="sf-popover-hd ovhd"> <div class="sf-popover-hd ovhd">
<a href="#" title="{% trans "Close" %}" aria-label="{% trans "Close" %}" class="sf-popover-close close sf2-icon-x1 op-icon fright"></a> <a href="#" title="{% trans "Close" %}" aria-label="{% trans "Close" %}" class="sf-popover-close js-close sf2-icon-x1 op-icon fright"></a>
<h3 class="sf-popover-title">{% trans "Discussions" %}</h3> <h3 class="sf-popover-title">{% trans "Discussions" %}</h3>
</div> </div>
<div class="sf-popover-con"> <div class="sf-popover-con">

8
seahub/templates/sysadmin/sys_admin_group_info.html
View File

@@ -5,10 +5,10 @@
{% block right_panel %} {% block right_panel %}
<p class="path"> <ol class="path-bar breadcrumb">
<a class="path-link normal" href="{{ SITE_ROOT }}sys/groupadmin/">Groups</a> / <li><a class="path-link normal" href="{{ SITE_ROOT }}sys/groupadmin/">Groups</a></li>
{{ group.group_name }} <li>{{ group.group_name }}</li>
</p> </ol>
<div id="tabs" class="tab-tabs"> <div id="tabs" class="tab-tabs">
<div class="hd ovhd"> <div class="hd ovhd">

10
seahub/templates/sysadmin/userinfo.html
View File

@@ -11,13 +11,13 @@
{% block right_panel %} {% block right_panel %}
<p class="path"> <ol class="path-bar breadcrumb">
<a class="path-link normal" href="{{ SITE_ROOT }}sys/useradmin/">Users</a> / <li><a class="path-link normal" href="{{ SITE_ROOT }}sys/useradmin/">Users</a></li>
{{ email }} <li>{{ email }}</li>
</p> </ol>
<div id="tabs" class="tab-tabs"> <div id="tabs" class="tab-tabs">
<div class="hd ovhd"> <div class="hd header-bar ovhd">
<ul class="tab-tabs-nav fleft"> <ul class="tab-tabs-nav fleft">
<li class="tab"><a href="#profile" class="a">{% trans "Profile" %}</a></li> <li class="tab"><a href="#profile" class="a">{% trans "Profile" %}</a></li>
<li class="tab"><a href="#owned" class="a">{% trans "Owned Libs" %}</a></li> <li class="tab"><a href="#owned" class="a">{% trans "Owned Libs" %}</a></li>

2
static/scripts/app/views/dir.js
View File

@@ -104,7 +104,7 @@ define([
this.$dirent_grid = this.$('.grid-view'); this.$dirent_grid = this.$('.grid-view');
this.$dirent_list_body = this.$('.repo-file-list tbody'); this.$dirent_list_body = this.$('.repo-file-list tbody');
this.$path_bar = this.$('.path'); this.$path_bar = this.$('.path-bar');
// For compatible with css, we use .repo-op instead of .dir-op // For compatible with css, we use .repo-op instead of .dir-op
this.$dir_op_bar = this.$('.repo-op'); this.$dir_op_bar = this.$('.repo-op');

2
static/scripts/app/views/widgets/popover.js
View File

@@ -48,7 +48,7 @@ define([
var PopoverView = Backbone.View.extend({ var PopoverView = Backbone.View.extend({
initialize: function(options) { initialize: function(options) {
this.$el.on('click', '.close', _.bind(this.hide, this)); this.$el.on('click', '.js-close', _.bind(this.hide, this));
}, },
// set max-height for '.sf-popover-con' // set max-height for '.sf-popover-con'