Add initial theme support. Remove get_http_code.

This commit is contained in:
Lars Jung 2014-05-29 03:55:46 +02:00
parent 0ce49c3535
commit 844b37d165
169 changed files with 29998 additions and 294 deletions

View file

@ -85,7 +85,7 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event
_.each(json.items, function (jsonItem) {
var e = Item.get(jsonItem.absHref, jsonItem.time, jsonItem.size, jsonItem.status, jsonItem.content);
var e = Item.get(jsonItem.absHref, jsonItem.time, jsonItem.size, jsonItem.is_managed, jsonItem.content);
found[e.absHref] = true;
});
@ -155,7 +155,7 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event
$el.attr('href', item.absHref);
if (history && item.isFolder() && item.status === '=h5ai=') {
if (history && item.isFolder() && item.isManaged) {
$el.on('click', function () {
setLocation(item.absHref);
@ -163,7 +163,7 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event
});
}
if (settings.extInNewWindow && item.status !== '=h5ai=') {
if (settings.extInNewWindow && !item.isManaged) {
$el.attr('target', '_blank');
}
};

View file

@ -8,7 +8,8 @@ modulejs.define('core/resource', ['core/settings'], function (settings) {
icon = function (id) {
return settings.h5aiAbsHref + 'client/icons/96/' + id + '.png';
return settings.h5aiAbsHref + 'client/themes/faenza/icons/' + id + '.png';
// return settings.h5aiAbsHref + 'client/themes/evolvere/icons/' + id + '.svg';
};
return {

View file

@ -44,12 +44,8 @@ modulejs.define('ext/crumb', ['_', '$', 'core/settings', 'core/resource', 'core/
$html.addClass('current');
}
if (_.isNumber(item.status)) {
if (item.status === 200) {
$a.append($(pageHintTemplate));
} else {
$a.append($(statusHintTemplate).text('(' + item.status + ')'));
}
if (!item.isManaged) {
$a.append($(pageHintTemplate));
}
if (item.$crumb) {

View file

@ -18,8 +18,6 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
'</span>',
statusHintTemplate = '<span class="hint"/>',
magicSequence = '=h5ai=',
update = function (item) {
var $html = $(template),
@ -30,8 +28,7 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
$html
.addClass(item.isFolder() ? 'folder' : 'file')
.data('item', item)
.data('status', item.status);
.data('item', item);
location.setLink($a, item);
$img.attr('src', resource.image('folder'));
@ -42,11 +39,11 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
var subfolders = item.getSubfolders();
// indicator
if (!item.status || (item.status === magicSequence && !item.isContentFetched) || subfolders.length) {
if ((item.isManaged && !item.isContentFetched) || subfolders.length) {
$indicator.removeClass('none');
if (!item.status || (item.status === magicSequence && !item.isContentFetched)) {
if ((item.isManaged && !item.isContentFetched)) {
$indicator.addClass('unknown');
} else if (item.isContentVisible) {
$indicator.addClass('open');
@ -92,13 +89,8 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
}
// reflect folder status
if (_.isNumber(item.status)) {
if (item.status === 200) {
$img.attr('src', resource.image('folder-page'));
} else {
$html.addClass('error');
$a.append($(statusHintTemplate).text(item.status));
}
if (!item.isManaged) {
$img.attr('src', resource.image('folder-page'));
}
}

View file

@ -41,7 +41,7 @@ modulejs.define('model/item', ['_', 'core/types', 'core/event', 'core/settings',
cache = {},
getItem = function (absHref, time, size, status, isContentFetched) {
getItem = function (absHref, time, size, isManaged, isContentFetched) {
absHref = location.forceEncoding(absHref);
@ -57,8 +57,8 @@ modulejs.define('model/item', ['_', 'core/types', 'core/event', 'core/settings',
if (_.isNumber(size)) {
self.size = size;
}
if (status) {
self.status = status;
if (isManaged) {
self.isManaged = true;
}
if (isContentFetched) {
self.isContentFetched = true;
@ -100,7 +100,7 @@ modulejs.define('model/item', ['_', 'core/types', 'core/event', 'core/settings',
if (response.items) {
_.each(response.items, function (item) {
getItem(item.absHref, item.time, item.size, item.status, item.content);
getItem(item.absHref, item.time, item.size, item.is_managed, item.content);
});
}
@ -123,7 +123,7 @@ modulejs.define('model/item', ['_', 'core/types', 'core/event', 'core/settings',
this.time = null;
this.size = null;
this.parent = null;
this.status = null;
this.isManaged = null;
this.content = {};
if (split.parent) {

View file

@ -56,14 +56,9 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core
$date.data('time', item.time).text(format.formatDate(item.time));
$size.data('bytes', item.size).text(format.formatSize(item.size));
if (item.isFolder() && _.isNumber(item.status)) {
if (item.status === 200) {
$html.addClass('page');
$iconImg.attr('src', resource.icon('folder-page'));
} else {
$html.addClass('error');
$label.append($(hintTemplate).text(' ' + item.status + ' '));
}
if (item.isFolder() && !item.isManaged) {
$html.addClass('page');
$iconImg.attr('src', resource.icon('folder-page'));
}
if (item.isCurrentParentFolder()) {