haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-08 18:30:53 +00:00
Code Issues Releases Wiki Activity

[lib icons] use new lib icons

Browse Source
This commit is contained in:
llj
2017-07-31 17:30:43 +08:00
parent df40bee1d5
commit ab5c066a74
30 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/scripts/app/views/deleted-repo.js
View File

@@ -24,7 +24,7 @@ define([
render: function() {
var obj = this.model.toJSON();
var icon_size = Common.isHiDPI() ? 96 : 24;
var icon_size = Common.isHiDPI() ? 48 : 24;
var icon_url = this.model.getIconUrl(icon_size);
var m = Moment(this.model.get('del_time'));
var tmpl;

2
static/scripts/app/views/group-repo.js
View File

@@ -33,7 +33,7 @@ define([
render: function() {
var obj = this.model.toJSON();
var icon_size = Common.isHiDPI() ? 96 : 24;
var icon_size = Common.isHiDPI() ? 48 : 24;
var icon_url = this.model.getIconUrl(icon_size);
var tmpl = $(window).width() >= 768 ? this.template : this.mobileTemplate;
$.extend(obj, {

2
static/scripts/app/views/organization-repo.js
View File

@@ -19,7 +19,7 @@ define([
render: function() {
var obj = this.model.toJSON();
var icon_size = Common.isHiDPI() ? 96 : 24;
var icon_size = Common.isHiDPI() ? 48 : 24;
var icon_url = this.model.getIconUrl(icon_size);
var tmpl = $(window).width() >= 768 ? this.template : this.mobileTemplate;
_.extend(obj, {

6
static/scripts/app/views/repo.js
View File

@@ -49,7 +49,7 @@ define([
render: function() {
var obj = this.model.toJSON();
var icon_size = Common.isHiDPI() ? 96 : 24;
var icon_size = Common.isHiDPI() ? 48 : 24;
var icon_url = this.model.getIconUrl(icon_size);
var tmpl, dropdownOptions = {};
if ($(window).width() >= 768) {
@@ -331,10 +331,10 @@ define([
viewDetails: function() {
var obj = this.model.toJSON();
var icon_size = Common.isHiDPI() ? 96 : 24;
var icon_size = Common.isHiDPI() ? 48 : 24;
var data = $.extend({}, obj, {
icon_url: this.model.getIconUrl(icon_size),
big_icon_url: this.model.getIconUrl(96)
big_icon_url: this.model.getIconUrl()
});
var detailsView = this.myReposView.repoDetailsView;
detailsView.show(data);

2
static/scripts/app/views/share-admin-repo.js
View File

@@ -104,7 +104,7 @@ define([
render: function() {
var obj = this.model.toJSON(),
icon_size = Common.isHiDPI() ? 96 : 24,
icon_size = Common.isHiDPI() ? 48 : 24,
icon_url = this.model.getIconUrl(icon_size);
_.extend(obj, {

2
static/scripts/app/views/shared-repo.js
View File

@@ -47,7 +47,7 @@ define([
render: function() {
var obj = this.model.toJSON();
var icon_size = Common.isHiDPI() ? 96 : 24;
var icon_size = Common.isHiDPI() ? 48 : 24;
var icon_url = this.model.getIconUrl(icon_size);
var tmpl = $(window).width() >= 768 ? this.template : this.mobileTemplate;
_.extend(obj, {

29
static/scripts/common.js
View File

@@ -295,23 +295,20 @@ define([
},
getLibIconUrl: function(is_encrypted, is_readonly, size) {
if (size > 24) {
if (is_encrypted) {
return app.config.mediaUrl + "img/lib/96/lib-encrypted.png";
} else if (is_readonly) {
return app.config.mediaUrl + "img/lib/96/lib-readonly.png";
} else {
return app.config.mediaUrl + "img/lib/96/lib.png";
}
} else {
if (is_encrypted) {
return app.config.mediaUrl + "img/lib/24/lib-encrypted.png";
} else if (is_readonly) {
return app.config.mediaUrl + "img/lib/24/lib-readonly.png";
} else {
return app.config.mediaUrl + "img/lib/24/lib.png";
}
// icon name
var icon_name = 'lib.png';
if (is_encrypted) {
icon_name = 'lib-encrypted.png';
}
if (is_readonly) {
icon_name = 'lib-readonly.png';
}
// icon size
var icon_size = size || 256; // 'size' can be 24, 48, or undefined. (2017.7.31)
return app.config.mediaUrl + 'img/lib/' + icon_size + '/' + icon_name;
},
getLibIconTitle: function(is_encrypted, is_readonly) {

2
static/scripts/sysadmin-app/views/group-repo.js
View File

@@ -56,7 +56,7 @@ define([
render: function() {
var data = this.model.toJSON(),
icon_size = Common.isHiDPI() ? 96 : 24,
icon_size = Common.isHiDPI() ? 48 : 24,
icon_url = this.model.getIconUrl(icon_size);
data['icon_url'] = icon_url;

2
static/scripts/sysadmin-app/views/repo.js
View File

@@ -153,7 +153,7 @@ define([
render: function() {
var data = this.model.toJSON(),
icon_size = Common.isHiDPI() ? 96 : 24,
icon_size = Common.isHiDPI() ? 48 : 24,
icon_url = this.model.getIconUrl(icon_size),
last_accessed = Moment(data['last_accessed']);

2
static/scripts/sysadmin-app/views/trash-repo.js
View File

@@ -84,7 +84,7 @@ define([
render: function() {
var data = this.model.toJSON(),
icon_size = Common.isHiDPI() ? 96 : 24,
icon_size = Common.isHiDPI() ? 48 : 24,
icon_url = this.model.getIconUrl(icon_size),
delete_time = Moment(data['delete_time']);