haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-04 00:20:07 +00:00
Code Issues Releases Wiki Activity

Clean code and fix bugs

Browse Source
This commit is contained in:
Daniel Pan
2016-03-22 16:09:40 +08:00
parent 2e5ced905f
commit cb02bca661
3 changed files with 20 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
media/css/seahub.css
View File

@@ -1165,7 +1165,7 @@ textarea:-moz-placeholder {/* for FF */
background:#fff; background:#fff;
border:1px solid #c9c9c9; border:1px solid #c9c9c9;
border-radius:3px; border-radius:3px;
box-shadow:0 0 1px #f3f3f3; box-shadow:0 0 4px #ccc;
position:absolute; position:absolute;
} }
.popover-hd { .popover-hd {
@@ -1200,12 +1200,16 @@ textarea:-moz-placeholder {/* for FF */
margin:0; margin:0;
} }
/**** dropdown menu ******/ /**** dropdown menu ******/
.dropdown {
position:relative;
}
.dropdown-menu { .dropdown-menu {
position:absolute; position:absolute;
background:#fff; background:#fff;
padding:6px 1px; padding:6px 1px;
border:1px solid #eee; border:1px solid rgba(34,36,38,.15);
border-radius:5px; border-radius:3px;
box-shadow:0 2px 3px 0 rgba(34,36,38,.15);
z-index:10; z-index:10;
} }
.dropdown-menu li a, .dropdown-menu li a,
@@ -1215,6 +1219,7 @@ textarea:-moz-placeholder {/* for FF */
min-width:110px; min-width:110px;
white-space:nowrap; white-space:nowrap;
color:#444; color:#444;
font-weight:normal;
} }
.dropdown-menu a:hover { .dropdown-menu a:hover {
background:#feaa7c; background:#feaa7c;
@@ -3901,17 +3906,7 @@ img.thumbnail {
width:134px; width:134px;
} }
/* devices */ /* devices */
.device-libs-popover { .device-libs-dropdown-menu {
left:-80px; left:-60px;
z-index:100; min-width:200px;
}
.device-libs-item {
display:block;
padding:4px 12px;
white-space:nowrap;
color:#eb8205;
}
.device-libs-item:hover {
background:#f8f8f8;
text-decoration:none;
} }

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

@@ -1377,21 +1377,19 @@
<td><%- device_name %></td> <td><%- device_name %></td>
<td><%- last_login_ip %></td> <td><%- last_login_ip %></td>
<td><time title='<%- time %>'><%- time_from_now %></time></td> <td><time title='<%- time %>'><%- time_from_now %></time></td>
<td class="popover-container js-dropdown"> <td class="dropdown js-dropdown">
<% if (synced_repos.length > 0) { %> <% if (synced_repos.length > 0) { %>
<span class="js-toggle-repos js-dropdown-toggle cspt"><%- synced_repos_length %> <span class="dir-icon icon-caret-down"></span></span> <span class="js-dropdown-toggle cspt"><%- synced_repos_length %> <span class="icon-caret-down"></span></span>
<div class="device-libs-dropdown-menu dropdown-menu js-dropdown-content hide">
<ul>
<% for (var i = 0, len = synced_repos_length; i < len; i++) { %>
<li><a href="#common/lib/<%- synced_repos[i].repo_id %>"><%- synced_repos[i].repo_name %></a></li>
<% } %>
</ul>
</div>
<% } else { %> <% } else { %>
<span class="cspt">0</span> <span class="cspt">0</span>
<% } %> <% } %>
<div class="lib-list device-libs-popover popover js-dropdown-content hide">
<div class="popover-con">
<ul>
<% for (var i = 0, len = synced_repos_length; i < len; i++) { %>
<li><a class="device-libs-item" href="#common/lib/<%- synced_repos[i].repo_id %>"><%- synced_repos[i].repo_name %></a></li>
<% } %>
</ul>
</div>
</div>
</td> </td>
<td> <td>
<div> <div>

28
static/scripts/app/views/device.js
View File

@@ -55,34 +55,6 @@ define([
return this; return this;
}, },
_hidePopover: function(e) {
var view = e.data.view;
var target = e.target || event.srcElement;
if (!$('.js-toggle-repos, .device-libs-popover').is(target)) {
$('.device-libs-popover').addClass('hide');
$('.dir-icon').removeClass('icon-caret-up').addClass('icon-caret-down');
view.rmHighlight();
$(document).off('click', view._hidePopover);
}
},
toggleSyncedRepos: function(e) {
var $icon= this.$('.dir-icon'),
$popover = this.$('.device-libs-popover');
if ($popover.is(':hidden')) {
$icon.removeClass('icon-caret-down').addClass('icon-caret-up');
$popover.removeClass('hide');
$(document).on('click', { view: this }, this._hidePopover);
} else {
$icon.removeClass('icon-caret-up').addClass('icon-caret-down');
$popover.addClass('hide');
$(document).off('click', this._hidePopover);
}
return false;
},
unlinkDevice: function() { unlinkDevice: function() {
var _this = this, var _this = this,
device_name = this.model.get('device_name'); device_name = this.model.get('device_name');