mirrors/h5ai
1
0
Fork 0
mirror of https://github.com/lrsjng/h5ai.git synced 2025-06-05 17:24:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Testing some view changes. Smaller font, bigger icons.

Browse source
This commit is contained in:
Lars Jung 2013-08-27 19:15:48 +02:00
parent 774742b98c
commit c186be6cb5
230 changed files with 109 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/_h5ai/client/js/inc/core/resource.js
View file

@ -8,7 +8,7 @@ modulejs.define('core/resource', ['core/settings'], function (settings) {
icon = function (id, big) {
return settings.h5aiAbsHref + 'client/icons/' + (big ? '48x48' : '16x16') + '/' + id + '.png';
return settings.h5aiAbsHref + 'client/icons/96/' + id + '.png';
};
return {

6
src/_h5ai/client/js/inc/ext/select.js
View file

@ -114,7 +114,7 @@ modulejs.define('ext/select', ['_', '$', 'core/settings', 'core/resource', 'core
initItem = function (item) {
if (item.$view) {
item.$view
item.$view.find('a')
.on('mouseenter', function () {
$('#selector').remove();
@ -142,7 +142,7 @@ modulejs.define('ext/select', ['_', '$', 'core/settings', 'core/resource', 'core
onLocationChanged = function (item) {
_.each(item.content, initItem);
// _.each(item.content, initItem);
publish();
},
@ -150,7 +150,7 @@ modulejs.define('ext/select', ['_', '$', 'core/settings', 'core/resource', 'core
var selectionChanged = false;
_.each(added, initItem);
// _.each(added, initItem);
_.each(removed, function (item) {
if (item.$view && item.$view.hasClass('selected')) {

28
src/_h5ai/client/js/inc/ext/thumbnails.js
View file

@ -9,17 +9,17 @@ modulejs.define('ext/thumbnails', ['_', 'core/settings', 'core/event', 'core/ser
delay: 1000
}, allsettings.thumbnails),
requestThumbSmall = function (type, href, callback) {
requestThumbSquare = function (type, href, callback) {
server.request({action: 'getThumbHref', type: type, href: href, mode: 'square', width: 16, height: 16}, function (json) {
server.request({action: 'getThumbHref', type: type, href: href, mode: 'square', width: 96, height: 96}, function (json) {
callback(json && json.code === 0 ? json.absHref : null);
});
},
requestThumbBig = function (type, href, callback) {
requestThumbRational = function (type, href, callback) {
server.request({action: 'getThumbHref', type: type, href: href, mode: 'rational', width: 100, height: 48}, function (json) {
server.request({action: 'getThumbHref', type: type, href: href, mode: 'rational', width: 96 * 2, height: 96}, function (json) {
callback(json && json.code === 0 ? json.absHref : null);
});
@ -38,25 +38,25 @@ modulejs.define('ext/thumbnails', ['_', 'core/settings', 'core/event', 'core/ser
}
if (type) {
if (item.thumbSmall) {
item.$view.find('.icon.small img').addClass('thumb').attr('src', item.thumbSmall);
if (item.thumbSquare) {
item.$view.find('.icon.square img').addClass('thumb').attr('src', item.thumbSquare);
} else {
requestThumbSmall(type, item.absHref, function (src) {
requestThumbSquare(type, item.absHref, function (src) {
if (src && item.$view) {
item.thumbSmall = src;
item.$view.find('.icon.small img').addClass('thumb').attr('src', src);
item.thumbSquare = src;
item.$view.find('.icon.square img').addClass('thumb').attr('src', src);
}
});
}
if (item.thumbBig) {
item.$view.find('.icon.big img').addClass('thumb').attr('src', item.thumbBig);
if (item.thumbRational) {
item.$view.find('.icon.rational img').addClass('thumb').attr('src', item.thumbRational);
} else {
requestThumbBig(type, item.absHref, function (src) {
requestThumbRational(type, item.absHref, function (src) {
if (src && item.$view) {
item.thumbBig = src;
item.$view.find('.icon.big img').addClass('thumb').attr('src', src);
item.thumbRational = src;
item.$view.find('.icon.rational img').addClass('thumb').attr('src', src);
}
});
}

20
src/_h5ai/client/js/inc/view/items.js
View file

@ -9,8 +9,8 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core
itemTemplate = '<li class="item">' +
'<a>' +
'<span class="icon small"><img/></span>' +
'<span class="icon big"><img/></span>' +
'<span class="icon square"><img/></span>' +
'<span class="icon rational"><img/></span>' +
'<span class="label"/>' +
'<span class="date"/>' +
'<span class="size"/>' +
@ -39,8 +39,8 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core
var $html = $(itemTemplate),
$a = $html.find('a'),
$imgSmall = $html.find('.icon.small img'),
$imgBig = $html.find('.icon.big img'),
$imgSquare = $html.find('.icon.square img'),
$imgRational = $html.find('.icon.rational img'),
$label = $html.find('.label'),
$date = $html.find('.date'),
$size = $html.find('.size');
@ -51,8 +51,8 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core
location.setLink($a, item);
$imgSmall.attr('src', resource.icon(item.type)).attr('alt', item.type);
$imgBig.attr('src', resource.icon(item.type, true)).attr('alt', item.type);
$imgSquare.attr('src', resource.icon(item.type)).attr('alt', item.type);
$imgRational.attr('src', resource.icon(item.type)).attr('alt', item.type);
$label.text(item.label);
$date.data('time', item.time).text(format.formatDate(item.time));
$size.data('bytes', item.size).text(format.formatSize(item.size));
@ -60,8 +60,8 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core
if (item.isFolder() && _.isNumber(item.status)) {
if (item.status === 200) {
$html.addClass('page');
$imgSmall.attr('src', resource.icon('folder-page'));
$imgBig.attr('src', resource.icon('folder-page', true));
$imgSquare.attr('src', resource.icon('folder-page'));
$imgRational.attr('src', resource.icon('folder-page'));
} else {
$html.addClass('error');
$label.append($(hintTemplate).text(' ' + item.status + ' '));
@ -69,8 +69,8 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core
}
if (item.isCurrentParentFolder()) {
$imgSmall.attr('src', resource.icon('folder-parent'));
$imgBig.attr('src', resource.icon('folder-parent', true));
$imgSquare.attr('src', resource.icon('folder-parent'));
$imgRational.attr('src', resource.icon('folder-parent'));
if (!settings.setParentFolderLabels) {
$label.addClass('l10n-parentDirectory');
}