\n\t\t\t\t ", "\n\t\t\t\t ", "\n\t\t\t\t ", "\n\t\t\t\t\n\t\t\t"]),
_templateObject16 = _taggedTemplateLiteral(["\n\t\t\t\t\n\t\t\t\t"], ["\n\t\t\t\t\n\t\t\t\t"]),
- _templateObject17 = _taggedTemplateLiteral(["\n\t\t\t\t
\n\t\t\t\t\t", "\t\n\t\t\t\t
"], ["\n\t\t\t\t\n\t\t\t\t\t", "\t\n\t\t\t\t
"]),
+ _templateObject17 = _taggedTemplateLiteral(["\n\t\t\t\t\n\t\t\t\t\t", "\n\t\t\t\t
"], ["\n\t\t\t\t\n\t\t\t\t\t", "\n\t\t\t\t
"]),
_templateObject18 = _taggedTemplateLiteral(["\n\t\t\t\n\t\t\t\t", "\n\t\t\t\t
\n\t\t\t\t\t
$", "
\n\t\t\t"], ["\n\t\t\t\n\t\t\t\t", "\n\t\t\t\t
\n\t\t\t\t\t\n\t"], ["\n\t\t\n\t"]),
- _templateObject23 = _taggedTemplateLiteral([""], [""]),
- _templateObject24 = _taggedTemplateLiteral(["![](", ")
"], [""]),
- _templateObject25 = _taggedTemplateLiteral(["
$", "
\n\t\t\t"]), _templateObject19 = _taggedTemplateLiteral(["", "", ""], ["", "", ""]), _templateObject20 = _taggedTemplateLiteral(["", ""], ["", ""]), _templateObject21 = _taggedTemplateLiteral(["\n\t\t\t\t\n\t\t\t\t"], ["\n\t\t\t\t\n\t\t\t\t"]), - _templateObject22 = _taggedTemplateLiteral(["\n\t\t$", "
\n\t\t", " at ", ", ", " ", "
\n\t\t", " ", "
$", "
\n\t\t", " at ", ", ", " ", "
\n\t\t", " ", "
", ""], ["
", ""]),
- _templateObject26 = _taggedTemplateLiteral(["
", "
"], ["", "
"]), - _templateObject27 = _taggedTemplateLiteral(["\n\t\t\t$", "
\n\t\t\t\n\t\t\t"], ["\n\t\t\t
$", "
\n\t\t\t\n\t\t\t"]),
- _templateObject28 = _taggedTemplateLiteral(["\n\t\t\t\t\n\t\t\t \n\t\t\t \n\t\t\t\t\t\t ", " \n\t\t\t\t\t\t ", " \n\t\t\t\t\t \n\t\t\t\t\t "], ["\n\t\t\t\t\t \n\t\t\t\t\t\t ", " \n\t\t\t\t\t\t ", " \n\t\t\t\t\t \n\t\t\t\t\t "]),
- _templateObject47 = _taggedTemplateLiteral(["\n\t\t\t\t \n\t\t\t\t \n\t\t\t\t "], ["\n\t\t\t\t \n\t\t\t\t \n\t\t\t\t "]),
- _templateObject48 = _taggedTemplateLiteral(["\n\t\t"], ["\n\t\t\t\n\t\t"]),
+ _templateObject25 = _taggedTemplateLiteral([""], [""]),
+ _templateObject26 = _taggedTemplateLiteral([""], [""]),
+ _templateObject27 = _taggedTemplateLiteral(["
\n\t\t\t\t\t", "\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
\n\t\t\t\t"], ["\n\t\t\t\t\n\t\t\t\t\t", "\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
\n\t\t\t\t"]),
- _templateObject29 = _taggedTemplateLiteral(["$", "", ""], ["$", "", ""]),
- _templateObject30 = _taggedTemplateLiteral(["", "
"], ["", "
"]),
- _templateObject31 = _taggedTemplateLiteral(["\n\t\t\t
\n\t\t"], ["\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t
\n\t\t\tSave\n\t\t\tDelete\n\t\t\n\t\t\t
\n\t\t"]),
- _templateObject32 = _taggedTemplateLiteral(["\n\t\t\t ", "\n\t\t\t \n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t
\n\t\t\tSave\n\t\t\tDelete\n\t\t$", "
\n\t\t\t "], ["\n\t\t\t ", "\n\t\t\t $", "
\n\t\t\t "]),
- _templateObject33 = _taggedTemplateLiteral(["$", "", ""], ["$", "", ""]),
- _templateObject34 = _taggedTemplateLiteral(["\n\t\t×\n\t\t", ""], ["\n\t\t×\n\t\t", ""]),
- _templateObject35 = _taggedTemplateLiteral(["\n\t\t", " ", " \n\t\t", " ", ""], ["\n\t\t", " ", " \n\t\t", " ", ""]),
- _templateObject36 = _taggedTemplateLiteral(["\n\t\t", " ", "\n\t\t", " ", "\n\t\t", " ", "\n\t\t", " ", ""], ["\n\t\t", " ", "\n\t\t", " ", "\n\t\t", " ", "\n\t\t", " ", ""]),
- _templateObject37 = _taggedTemplateLiteral(["\n\t\t\t\tLychee ", "
\n\t\t\t\t\n\t\t\t\t", "
\n\t\t\t\tLychee ", "
\n\t\t\t "], ["\n\t\t\t\tLychee ", "
\n\t\t\t\t\n\t\t\t\t", "
\n\t\t\t\tLychee ", "
\n\t\t\t "]), - _templateObject38 = _taggedTemplateLiteral(["\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
\n\t\t\t\tLychee ", " – ", "
\n\t\t\t"], ["\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
\n\t\t\t\tLychee ", " – ", "
\n\t\t\t"]), - _templateObject39 = _taggedTemplateLiteral(["", " '", "' ", "
"], ["", " '", "' ", "
"]), - _templateObject40 = _taggedTemplateLiteral(["", " ", " ", "
"], ["", " ", " ", "
"]), - _templateObject41 = _taggedTemplateLiteral([""], [""]), - _templateObject42 = _taggedTemplateLiteral(["", " ", " ", " ", "
"], ["", " ", " ", " ", "
"]), - _templateObject43 = _taggedTemplateLiteral(["", "
"], ["", "
"]), - _templateObject44 = _taggedTemplateLiteral([""], [""]), - _templateObject45 = _taggedTemplateLiteral(["$", ""], ["$", ""]), - _templateObject46 = _taggedTemplateLiteral(["\n\t\t\t\t\t"], ["
"]), - _templateObject49 = _taggedTemplateLiteral(["linear-gradient(to bottom, rgba(0, 0, 0, .4), rgba(0, 0, 0, .4)), url(\"", "\")"], ["linear-gradient(to bottom, rgba(0, 0, 0, .4), rgba(0, 0, 0, .4)), url(\"", "\")"]), - _templateObject50 = _taggedTemplateLiteral(["\n\t\t\t
\n\t\t\t\t", "\n\t\t\t
\n\t\t\t"], ["\n\t\t\t\n\t\t\t\t", "\n\t\t\t
\n\t\t\t"]),
- _templateObject51 = _taggedTemplateLiteral(["\n\t\t\t\n\t\t\t\t
\n\t\t\t"]),
- _templateObject54 = _taggedTemplateLiteral([""], [""]);
+ _templateObject22 = _taggedTemplateLiteral(["\n\t\t\t\t\t\n\t\t\t\t
\n\t\t\t\t"], ["\n\t\t\t\n\t\t\t\t", "\n\t\t\t\t
\n\t\t\t\t\n\t\t\t\t
\n\t\t\t"], ["\n\t\t\t", "\n\t\t\n\t\t\t\t
\n\t\t\t\t"]),
- _templateObject52 = _taggedTemplateLiteral(["\n\t\t\t\n\t\t\t\t", "\n\t\t\t\t
\n\t\t\t\t\n\t\t\t\t
\n\t\t"], ["\n\t\t\t\n\t\t\t\t$", "\n\t\t\t\t\n\t\t\t\t
\n\t\t\t\n\t\t\t\t
\n\t\t"]),
- _templateObject53 = _taggedTemplateLiteral(["\n\t\t\t", "\n\t\t\n\t\t\t\t$", "\n\t\t\t\t\n\t\t\t\t
\n\t\t\t\n\t\t\t\t\t\t
\n\t\t\t\t"], ["\n\t\t\t\t\t$", "
\n\t\t\t\t\t\t$", "
\n\t\t\t\t\t\n\t\t\t\t\t\t
\n\t\t\t\t"]),
+ _templateObject23 = _taggedTemplateLiteral(["\n\t\t\t$", "
\n\t\t\t\t\t\t$", "
\n\t\t\t\t\t\n\t\t\t\t
\n\t\t"], ["\n\t\t\t$", "
\n\t\t\t\t", "
\n\t\t\t\n\t\t\t\t
\n\t\t"]),
+ _templateObject24 = _taggedTemplateLiteral(["\n\t\t\t$", "
\n\t\t\t\t", "
\n\t\t\t$", "
\n\t\t\t", " at ", ", ", " ", "
\n\t\t\t", " ", "
$", "
\n\t\t\t", " at ", ", ", " ", "
\n\t\t\t", " ", "
", ""], ["
", ""]),
+ _templateObject28 = _taggedTemplateLiteral(["
", "
"], ["", "
"]), + _templateObject29 = _taggedTemplateLiteral(["\n\t\t\t$", "
\n\t\t\t\n\t\t\t"], ["\n\t\t\t
$", "
\n\t\t\t\n\t\t\t"]),
+ _templateObject30 = _taggedTemplateLiteral(["\n\t\t\t\t\n\t\t\t \n\t\t\t \n\t\t\t\t\t\t ", " \n\t\t\t\t\t\t ", " \n\t\t\t\t\t \n\t\t\t\t\t "], ["\n\t\t\t\t\t \n\t\t\t\t\t\t ", " \n\t\t\t\t\t\t ", " \n\t\t\t\t\t \n\t\t\t\t\t "]),
+ _templateObject49 = _taggedTemplateLiteral(["\n\t\t\t\t \n\t\t\t\t \n\t\t\t\t "], ["\n\t\t\t\t \n\t\t\t\t \n\t\t\t\t "]),
+ _templateObject50 = _taggedTemplateLiteral(["
"], [""]),
_templateObject5 = _taggedTemplateLiteral(["\n\t\t\t\n\t\t\t\t\t", "\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
\n\t\t\t\t"], ["\n\t\t\t\t\n\t\t\t\t\t", "\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
\n\t\t\t\t"]),
+ _templateObject31 = _taggedTemplateLiteral(["$", "", ""], ["$", "", ""]),
+ _templateObject32 = _taggedTemplateLiteral(["", "
"], ["", "
"]),
+ _templateObject33 = _taggedTemplateLiteral(["\n\t\t\t
\n\t\t"], ["\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t
\n\t\t\tSave\n\t\t\tDelete\n\t\t\n\t\t\t
\n\t\t"]),
+ _templateObject34 = _taggedTemplateLiteral(["\n\t\t\t ", "\n\t\t\t \n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t
\n\t\t\tSave\n\t\t\tDelete\n\t\t$", "
\n\t\t\t "], ["\n\t\t\t ", "\n\t\t\t $", "
\n\t\t\t "]),
+ _templateObject35 = _taggedTemplateLiteral(["$", "", ""], ["$", "", ""]),
+ _templateObject36 = _taggedTemplateLiteral(["\n\t\t×\n\t\t", ""], ["\n\t\t×\n\t\t", ""]),
+ _templateObject37 = _taggedTemplateLiteral(["\n\t\t", " ", " \n\t\t", " ", ""], ["\n\t\t", " ", " \n\t\t", " ", ""]),
+ _templateObject38 = _taggedTemplateLiteral(["\n\t\t", " ", "\n\t\t", " ", "\n\t\t", " ", "\n\t\t", " ", ""], ["\n\t\t", " ", "\n\t\t", " ", "\n\t\t", " ", "\n\t\t", " ", ""]),
+ _templateObject39 = _taggedTemplateLiteral(["\n\t\t\t\tLychee ", "
\n\t\t\t\t\n\t\t\t\t", "
\n\t\t\t\tLychee ", "
\n\t\t\t "], ["\n\t\t\t\tLychee ", "
\n\t\t\t\t\n\t\t\t\t", "
\n\t\t\t\tLychee ", "
\n\t\t\t "]), + _templateObject40 = _taggedTemplateLiteral(["\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
\n\t\t\t\tLychee ", " – ", "
\n\t\t\t"], ["\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
\n\t\t\t\tLychee ", " – ", "
\n\t\t\t"]), + _templateObject41 = _taggedTemplateLiteral(["", " '", "' ", "
"], ["", " '", "' ", "
"]), + _templateObject42 = _taggedTemplateLiteral(["", " ", " ", "
"], ["", " ", " ", "
"]), + _templateObject43 = _taggedTemplateLiteral([""], [""]), + _templateObject44 = _taggedTemplateLiteral(["", " ", " ", " ", "
"], ["", " ", " ", " ", "
"]), + _templateObject45 = _taggedTemplateLiteral(["", "
"], ["", "
"]), + _templateObject46 = _taggedTemplateLiteral([""], [""]), + _templateObject47 = _taggedTemplateLiteral(["$", ""], ["$", ""]), + _templateObject48 = _taggedTemplateLiteral(["\n\t\t\t\t\t"], ["
"]), + _templateObject51 = _taggedTemplateLiteral(["linear-gradient(to bottom, rgba(0, 0, 0, .4), rgba(0, 0, 0, .4)), url(\"", "\")"], ["linear-gradient(to bottom, rgba(0, 0, 0, .4), rgba(0, 0, 0, .4)), url(\"", "\")"]), + _templateObject52 = _taggedTemplateLiteral(["\n\t\t\t
\n\t\t\t\t", "\n\t\t\t
\n\t\t\t"], ["\n\t\t\t\n\t\t\t\t", "\n\t\t\t
\n\t\t\t"]),
+ _templateObject53 = _taggedTemplateLiteral(["\n\t\t\t\n\t\t\t\t
\n\t\t\t"]),
+ _templateObject56 = _taggedTemplateLiteral([""], [""]);
function _taggedTemplateLiteral(strings, raw) { return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
@@ -1400,14 +1402,22 @@ build.photo = function (data) {
};
build.overlay_image = function (data) {
-
var exifHash = data.make + data.model + data.shutter + data.aperture + data.focal + data.iso;
+ // Get the stored setting for the overlay_image
+ var type = lychee.image_overlay_type;
var html = "";
- if (exifHash !== '') {
- html += lychee.html(_templateObject22, data.title, data.shutter.replace('s', 'sec'), data.aperture.replace('f/', 'ƒ / '), lychee.locale['PHOTO_ISO'], data.iso, data.focal, data.lens && data.lens !== '' ? '(' + data.lens + ')' : '');
+ if (type && type === 'desc' && data.description !== '') {
+ html = lychee.html(_templateObject22, data.title, data.description);
+ } else if (type && type === 'takedate' && data.takedate !== '') {
+ html = lychee.html(_templateObject23, data.title, data.takedate);
}
+ // fall back to exif data if there is no description
+ else if (exifHash !== '') {
+
+ html += lychee.html(_templateObject24, data.title, data.shutter.replace('s', 'sec'), data.aperture.replace('f/', 'ƒ / '), lychee.locale['PHOTO_ISO'], data.iso, data.focal, data.lens && data.lens !== '' ? '(' + data.lens + ')' : '');
+ }
return html;
};
@@ -1417,9 +1427,9 @@ build.imageview = function (data, visibleControls) {
var html = '';
if (data.type.indexOf('video') > -1) {
- html += lychee.html(_templateObject23, visibleControls === true ? '' : 'full', data.url);
+ html += lychee.html(_templateObject25, visibleControls === true ? '' : 'full', data.url);
} else {
- html += lychee.html(_templateObject24, visibleControls === true ? '' : 'full', data.medium !== '' ? data.medium : data.url);
+ html += lychee.html(_templateObject26, visibleControls === true ? '' : 'full', data.medium !== '' ? data.medium : data.url);
if (lychee.image_overlay) html += build.overlay_image(data);
}
@@ -1432,20 +1442,20 @@ build.no_content = function (typ) {
var html = '';
- html += lychee.html(_templateObject25, build.iconic(typ));
+ html += lychee.html(_templateObject27, build.iconic(typ));
switch (typ) {
case 'magnifying-glass':
- html += lychee.html(_templateObject26, lychee.locale['VIEW_NO_RESULT']);
+ html += lychee.html(_templateObject28, lychee.locale['VIEW_NO_RESULT']);
break;
case 'eye':
- html += lychee.html(_templateObject26, lychee.locale['VIEW_NO_PUBLIC_ALBUMS']);
+ html += lychee.html(_templateObject28, lychee.locale['VIEW_NO_PUBLIC_ALBUMS']);
break;
case 'cog':
- html += lychee.html(_templateObject26, lychee.locale['VIEW_NO_CONFIGURATION']);
+ html += lychee.html(_templateObject28, lychee.locale['VIEW_NO_CONFIGURATION']);
break;
case 'question-mark':
- html += lychee.html(_templateObject26, lychee.locale['VIEW_PHOTO_NOT_FOUND']);
+ html += lychee.html(_templateObject28, lychee.locale['VIEW_PHOTO_NOT_FOUND']);
break;
}
@@ -1458,7 +1468,7 @@ build.uploadModal = function (title, files) {
var html = '';
- html += lychee.html(_templateObject27, title);
+ html += lychee.html(_templateObject29, title);
var i = 0;
@@ -1468,7 +1478,7 @@ build.uploadModal = function (title, files) {
if (file.name.length > 40) file.name = file.name.substr(0, 17) + '...' + file.name.substr(file.name.length - 20, 20);
- html += lychee.html(_templateObject28, file.name);
+ html += lychee.html(_templateObject30, file.name);
i++;
}
@@ -1487,18 +1497,18 @@ build.tags = function (tags) {
tags = tags.split(',');
tags.forEach(function (tag, index, array) {
- html += lychee.html(_templateObject29, tag, index, build.iconic('x'));
+ html += lychee.html(_templateObject31, tag, index, build.iconic('x'));
});
} else {
- html = lychee.html(_templateObject30, lychee.locale['NO_TAGS']);
+ html = lychee.html(_templateObject32, lychee.locale['NO_TAGS']);
}
return html;
};
build.user = function (user) {
- var html = lychee.html(_templateObject31, user.id, user.id, user.username, user.id, user.id);
+ var html = lychee.html(_templateObject33, user.id, user.id, user.username, user.id, user.id);
return html;
};
@@ -1609,7 +1619,7 @@ contextMenu.buildList = function (lists, exclude, action) {
var prefix = layer > 0 ? ' '.repeat(layer - 1) + '└ ' : '';
- var html = lychee.html(_templateObject32, prefix, thumb, item.title);
+ var html = lychee.html(_templateObject34, prefix, thumb, item.title);
items.push({
title: html,
@@ -2047,7 +2057,7 @@ header.setTitle = function () {
var $title = header.dom('.header__title');
- var html = lychee.html(_templateObject33, title, build.iconic('caret-bottom'));
+ var html = lychee.html(_templateObject35, title, build.iconic('caret-bottom'));
$title.html(html);
@@ -2205,6 +2215,10 @@ $(document).ready(function () {
} else if (visible.albums() && basicModal.visible() === false) {
multiselect.selectAll();return false;
}
+ }).bind(['o'], function () {
+ if (visible.photo()) {
+ photo.update_overlay_type();
+ }
});
Mousetrap.bindGlobal('enter', function () {
@@ -2301,11 +2315,11 @@ leftMenu.dom = function (selector) {
};
leftMenu.build = function () {
- var html = lychee.html(_templateObject34, lychee.locale['SETTINGS']);
+ var html = lychee.html(_templateObject36, lychee.locale['SETTINGS']);
if (lychee.api_V2) {
- html += lychee.html(_templateObject35, build.iconic('person'), lychee.locale['USERS'], build.iconic('cloud'), lychee.locale['SHARING']);
+ html += lychee.html(_templateObject37, build.iconic('person'), lychee.locale['USERS'], build.iconic('cloud'), lychee.locale['SHARING']);
}
- html += lychee.html(_templateObject36, build.iconic('align-left'), lychee.locale['LOGS'], build.iconic('wrench'), lychee.locale['DIAGNOSTICS'], build.iconic('info'), lychee.locale['ABOUT_LYCHEE'], build.iconic('account-logout'), lychee.locale['SIGN_OUT']);
+ html += lychee.html(_templateObject38, build.iconic('align-left'), lychee.locale['LOGS'], build.iconic('wrench'), lychee.locale['DIAGNOSTICS'], build.iconic('info'), lychee.locale['ABOUT_LYCHEE'], build.iconic('account-logout'), lychee.locale['SIGN_OUT']);
leftMenu._dom.html(html);
};
@@ -2483,8 +2497,8 @@ loadingBar.hide = function (force) {
lychee = {
title: document.title,
- version: '3.2.10',
- versionCode: '030210', // not really needed anymore
+ version: '3.2.11',
+ versionCode: '030211', // not really needed anymore
updatePath: 'https://LycheeOrg.github.io/update.json',
updateURL: 'https://github.com/LycheeOrg/Lychee/releases',
@@ -2501,6 +2515,8 @@ lychee = {
justified: true, // use Flickr Justified Layout Like
image_overlay: false, // display Overlay like in Lightroom
image_overlay_default: false, // display Overlay like in Lightroom by default
+ image_overlay_type: 'exif', // current Overlay display type
+ image_overlay_type_default: 'exif', // image overlay type default type
checkForUpdates: '1',
update_json: 0,
@@ -2539,7 +2555,7 @@ lychee.logs = function () {
lychee.aboutDialog = function () {
- var msg = lychee.html(_templateObject37, lychee.version, lychee.updateURL, lychee.locale['UPDATE_AVAILABLE'], lychee.locale['ABOUT_SUBTITLE'], lychee.website, lychee.locale['ABOUT_DESCRIPTION']);
+ var msg = lychee.html(_templateObject39, lychee.version, lychee.updateURL, lychee.locale['UPDATE_AVAILABLE'], lychee.locale['ABOUT_SUBTITLE'], lychee.website, lychee.locale['ABOUT_DESCRIPTION']);
basicModal.show({
body: msg,
@@ -2606,6 +2622,8 @@ lychee.init = function () {
lychee.justified = data.config.justified_layout && data.config.justified_layout === '1' || false;
lychee.image_overlay_default = data.config.image_overlay && data.config.image_overlay === '1' || false;
lychee.image_overlay = lychee.image_overlay_default;
+ lychee.image_overlay_type = !data.config.image_overlay_type ? 'exif' : data.config.image_overlay_type;
+ lychee.image_overlay_type_default = lychee.image_overlay_type;
lychee.default_license = data.config.default_license || 'none';
lychee.css = data.config.css || '';
@@ -2633,6 +2651,8 @@ lychee.init = function () {
lychee.checkForUpdates = data.config.checkForUpdates || '1';
lychee.justified = data.config.justified_layout && data.config.justified_layout === '1' || false;
lychee.image_overlay = data.config.image_overlay && data.config.image_overlay === '1' || false;
+ lychee.image_overlay_type = !data.config.image_overlay_type ? 'exif' : data.config.image_overlay_type;
+ lychee.image_overlay_type_default = lychee.image_overlay_type;
console.log(lychee.full_photo);
lychee.setMode('public');
@@ -2670,7 +2690,7 @@ lychee.login = function (data) {
lychee.loginDialog = function () {
- var msg = lychee.html(_templateObject38, lychee.locale['USERNAME'], lychee.locale['PASSWORD'], lychee.version, lychee.updateURL, lychee.locale['UPDATE_AVAILABLE']);
+ var msg = lychee.html(_templateObject40, lychee.locale['USERNAME'], lychee.locale['PASSWORD'], lychee.version, lychee.updateURL, lychee.locale['UPDATE_AVAILABLE']);
basicModal.show({
body: msg,
@@ -2988,6 +3008,7 @@ lychee.locale = {
'UPDATE_AVAILABLE': 'Update available!',
'DEFAULT_LICENSE': 'Default License for new uploads:',
'SET_LICENSE': 'Set License',
+ 'SET_OVERLAY_TYPE': 'Set Overlay',
'SAVE_RISK': 'Save my modifications, I accept the Risk!',
'MORE': 'More',
@@ -3243,7 +3264,12 @@ lychee.locale = {
'CSS_TITLE': 'Change CSS',
'LAYOUT_TEXT': 'Use justified layout:',
- 'IMAGE_OVERLAY_TEXT': 'Display EXIF data overlay by default:',
+ 'IMAGE_OVERLAY_TEXT': 'Display image overlay by default:',
+
+ 'LAYOUT_TYPE': 'Data to use in image overlay:',
+ 'OVERLAY_EXIF': 'Photo EXIF data',
+ 'OVERLAY_DESCRIPTION': 'Photo description',
+ 'OVERLAY_DATE': 'Photo date taken',
'VIEW_NO_RESULT': 'No results',
'VIEW_NO_PUBLIC_ALBUMS': 'No public albums',
@@ -3815,6 +3841,45 @@ photo.load = function (photoID, albumID) {
});
};
+photo.hasExif = function () {
+ var exifHash = photo.json.make + photo.json.model + photo.json.shutter + photo.json.aperture + photo.json.focal + photo.json.iso;
+
+ return exifHash !== '';
+};
+
+photo.hasTakedate = function () {
+ return photo.json.takedate && photo.json.takedate !== '';
+};
+
+photo.hasDesc = function () {
+ return photo.json.description && photo.json.description !== '';
+};
+
+photo.update_overlay_type = function () {
+ // Only run if the overlay is showing
+ if (!lychee.image_overlay) {
+ return false;
+ } else {
+ // console.log('Current ' + lychee.image_overlay_type);
+ var types = ['exif', 'desc', 'takedate'];
+
+ var i = types.indexOf(lychee.image_overlay_type);
+ var j = (i + 1) % types.length;
+ var cont = true;
+ while (i !== j && cont) {
+ if (types[j] === 'desc' && photo.hasDesc()) cont = false;else if (types[j] === 'takedate' && photo.hasTakedate()) cont = false;else if (types[j] === 'exif' && photo.hasExif()) cont = false;else j = (j + 1) % types.length;
+ }
+
+ if (i !== j) {
+ lychee.image_overlay_type = types[j];
+ $('#image_overlay').remove();
+ lychee.imageview.append(build.overlay_image(photo.json));
+ } else {
+ console.log('no other data found, displaying ' + types[j]);
+ }
+ }
+};
+
photo.update_display_overlay = function () {
lychee.image_overlay = !lychee.image_overlay;
if (!lychee.image_overlay) {
@@ -3982,13 +4047,13 @@ photo.delete = function (photoIDs) {
action.title = lychee.locale['PHOTO_DELETE'];
cancel.title = lychee.locale['PHOTO_KEEP'];
- msg = lychee.html(_templateObject39, lychee.locale['PHOTO_DELETE_1'], photoTitle, lychee.locale['PHOTO_DELETE_2']);
+ msg = lychee.html(_templateObject41, lychee.locale['PHOTO_DELETE_1'], photoTitle, lychee.locale['PHOTO_DELETE_2']);
} else {
action.title = lychee.locale['PHOTO_DELETE'];
cancel.title = lychee.locale['PHOTO_KEEP'];
- msg = lychee.html(_templateObject40, lychee.locale['PHOTO_DELETE_ALL_1'], photoIDs.length, lychee.locale['PHOTO_DELETE_ALL_2']);
+ msg = lychee.html(_templateObject42, lychee.locale['PHOTO_DELETE_ALL_1'], photoIDs.length, lychee.locale['PHOTO_DELETE_ALL_2']);
}
basicModal.show({
@@ -4048,9 +4113,9 @@ photo.setTitle = function (photoIDs) {
});
};
- var input = lychee.html(_templateObject41, oldTitle);
+ var input = lychee.html(_templateObject43, oldTitle);
- if (photoIDs.length === 1) msg = lychee.html(_templateObject2, lychee.locale['PHOTO_NEW_TITLE'], input);else msg = lychee.html(_templateObject42, lychee.locale['PHOTOS_NEW_TITLE_1'], photoIDs.length, lychee.locale['PHOTOS_NEW_TITLE_2'], input);
+ if (photoIDs.length === 1) msg = lychee.html(_templateObject2, lychee.locale['PHOTO_NEW_TITLE'], input);else msg = lychee.html(_templateObject44, lychee.locale['PHOTOS_NEW_TITLE_1'], photoIDs.length, lychee.locale['PHOTOS_NEW_TITLE_2'], input);
basicModal.show({
body: msg,
@@ -4217,7 +4282,7 @@ photo.setDescription = function (photoID) {
};
basicModal.show({
- body: lychee.html(_templateObject43, lychee.locale['PHOTO_NEW_DESCRIPTION'], lychee.locale['PHOTO_DESCRIPTION'], oldDescription),
+ body: lychee.html(_templateObject45, lychee.locale['PHOTO_NEW_DESCRIPTION'], lychee.locale['PHOTO_DESCRIPTION'], oldDescription),
buttons: {
action: {
title: lychee.locale['PHOTO_SET_DESCRIPTION'],
@@ -4257,9 +4322,9 @@ photo.editTags = function (photoIDs) {
photo.setTags(photoIDs, data.tags);
};
- var input = lychee.html(_templateObject44, oldTags);
+ var input = lychee.html(_templateObject46, oldTags);
- if (photoIDs.length === 1) msg = lychee.html(_templateObject2, lychee.locale['PHOTO_NEW_TAGS'], input);else msg = lychee.html(_templateObject42, lychee.locale['PHOTO_NEW_TAGS_1'], photoIDs.length, lychee.locale['PHOTO_NEW_TAGS_2'], input);
+ if (photoIDs.length === 1) msg = lychee.html(_templateObject2, lychee.locale['PHOTO_NEW_TAGS'], input);else msg = lychee.html(_templateObject44, lychee.locale['PHOTO_NEW_TAGS_1'], photoIDs.length, lychee.locale['PHOTO_NEW_TAGS_2'], input);
basicModal.show({
body: msg,
@@ -4833,8 +4898,14 @@ settings.changeImageOverlay = function () {
var params = {};
if ($('#ImageOverlay:checked').length === 1) {
params.image_overlay = '1';
+
+ // enable image_overlay_type
+ $('select#ImgOverlayType').attr('disabled', false);
} else {
params.image_overlay = '0';
+
+ // disable image_overlay_type
+ $('select#ImgOverlayType').attr('disabled', true);
}
api.post('Settings::setImageOverlay', params, function (data) {
if (data === true) {
@@ -4845,6 +4916,29 @@ settings.changeImageOverlay = function () {
});
};
+settings.setOverlayType = function () {
+ // validate the input
+ var params = {};
+ if ($('#ImageOverlay:checked') && $('#ImgOverlayType').val() === "exif") {
+ params.image_overlay_type = 'exif';
+ } else if ($('#ImageOverlay:checked') && $('#ImgOverlayType').val() === "desc") {
+ params.image_overlay_type = 'desc';
+ } else if ($('#ImageOverlay:checked') && $('#ImgOverlayType').val() === "takedate") {
+ params.image_overlay_type = 'takedate';
+ } else {
+ params.image_overlay_type = 'exif';
+ console.log('Error - default used');
+ }
+
+ api.post('Settings::setOverlayType', params, function (data) {
+ if (data === true) {
+ loadingBar.show('success', lychee.locale['SETTINGS_SUCCESS_IMAGE_OVERLAY']);
+ lychee.image_overlay_type = params.image_overlay_type;
+ lychee.image_overlay_type_default = params.image_overlay_type;
+ } else lychee.error(null, params, data);
+ });
+};
+
settings.changeCSS = function () {
var params = {};
@@ -4870,6 +4964,7 @@ settings.save = function (params) {
} else lychee.error(null, params, data);
});
};
+
sharing = {
json: null
};
@@ -5274,12 +5369,12 @@ sidebar.render = function (structure) {
if (value === '' || value == null) value = '-';
// Wrap span-element around value for easier selecting on change
- value = lychee.html(_templateObject45, row.kind, value);
+ value = lychee.html(_templateObject47, row.kind, value);
// Add edit-icon to the value when editable
if (row.editable === true) value += ' ' + build.editIcon('edit_' + row.kind);
- _html += lychee.html(_templateObject46, row.title, value);
+ _html += lychee.html(_templateObject48, row.title, value);
});
_html += "\n\t\t\t\t \n\t\t\t\t ";
@@ -5295,7 +5390,7 @@ sidebar.render = function (structure) {
// Add edit-icon to the value when editable
if (section.editable === true) editable = build.editIcon('edit_tags');
- _html += lychee.html(_templateObject47, section.title, section.title.toLowerCase(), section.value, editable);
+ _html += lychee.html(_templateObject49, section.title, section.title.toLowerCase(), section.value, editable);
return _html;
};
@@ -5642,7 +5737,7 @@ upload.start = {
};
basicModal.show({
- body: lychee.html(_templateObject48) + lychee.locale['UPLOAD_IMPORT_INSTR'] + (" "),
+ body: lychee.html(_templateObject50) + lychee.locale['UPLOAD_IMPORT_INSTR'] + (" "),
buttons: {
action: {
title: lychee.locale['UPLOAD_IMPORT'],
@@ -5729,7 +5824,7 @@ upload.start = {
};
basicModal.show({
- body: lychee.html(_templateObject48) + lychee.locale['UPLOAD_IMPORT_SERVER_INSTR'] + " "),
+ body: lychee.html(_templateObject50) + lychee.locale['UPLOAD_IMPORT_SERVER_INSTR'] + " "),
buttons: {
action: {
title: lychee.locale['UPLOAD_IMPORT'],
@@ -6410,7 +6505,7 @@ view.photo = {
var nextPhotoID = album.getByID(photoID).nextPhoto;
var nextPhoto = album.getByID(nextPhotoID);
- $nextArrow.css('background-image', lychee.html(_templateObject49, nextPhoto.thumbUrl));
+ $nextArrow.css('background-image', lychee.html(_templateObject51, nextPhoto.thumbUrl));
}
if (hasPrevious === false || lychee.viewMode === true) {
@@ -6421,7 +6516,7 @@ view.photo = {
var previousPhotoID = album.getByID(photoID).previousPhoto;
var previousPhoto = album.getByID(previousPhotoID);
- $previousArrow.css('background-image', lychee.html(_templateObject49, previousPhoto.thumbUrl));
+ $previousArrow.css('background-image', lychee.html(_templateObject51, previousPhoto.thumbUrl));
}
}),
@@ -6477,6 +6572,7 @@ view.settings = {
view.settings.content.setLang();
view.settings.content.setDefaultLicense();
view.settings.content.setLayoutOverlay();
+ view.settings.content.setOverlayType();
view.settings.content.setCSS();
view.settings.content.moreButton();
}
@@ -6551,7 +6647,7 @@ view.settings = {
},
setLayoutOverlay: function setLayoutOverlay() {
- var msg = "\n\t\t\t\n\t\t\t\t
\n\t\t\t\t"], ["\n\t\t\t\n\t\t\t\t", "\n\t\t\t\t
\n\t\t\t\t\n\t\t\t\t
\n\t\t\t"], ["\n\t\t\t", "\n\t\t\n\t\t\t\t
\n\t\t\t\t"]),
+ _templateObject54 = _taggedTemplateLiteral(["\n\t\t\t\n\t\t\t\t", "\n\t\t\t\t
\n\t\t\t\t\n\t\t\t\t
\n\t\t"], ["\n\t\t\t\n\t\t\t\t$", "\n\t\t\t\t\n\t\t\t\t
\n\t\t\t\n\t\t\t\t
\n\t\t"]),
+ _templateObject55 = _taggedTemplateLiteral(["\n\t\t\t", "\n\t\t\n\t\t\t\t$", "\n\t\t\t\t\n\t\t\t\t
\n\t\t\t\n\t\t\t
";
+ var msg = "\n\t\t\t" + lychee.locale['LAYOUT_TEXT'] + "\n\t\t\t\n\t\t\t
\n\t\t\t" + lychee.locale['IMAGE_OVERLAY_TEXT'] + "\n\t\t\t\n\t\t\t
\n\t\t\t\n\t\t\t
\n\t\t\t";
$(".settings_view").append(msg);
if (lychee.justified) $('#JustifiedLayout').click();
@@ -6561,6 +6657,18 @@ view.settings = {
settings.bind('#ImageOverlay', '.setLayoutOverlay', settings.changeImageOverlay);
},
+ setOverlayType: function setOverlayType() {
+ var msg = "\n\t\t\t" + lychee.locale['LAYOUT_TEXT'] + "\n\t\t\t\n\t\t\t
\n\t\t\t" + lychee.locale['IMAGE_OVERLAY_TEXT'] + "\n\t\t\t\n\t\t\t
\n\t\t\t\n\t\t\t
\n\t\t\t";
+
+ $(".settings_view").append(msg);
+
+ // Enable based on image_overlay setting
+ if (!lychee.image_overlay) $('select#ImgOverlayType').attr('disabled', true);
+
+ $('select#ImgOverlayType').val(!lychee.image_overlay_type_default ? 'exif' : lychee.image_overlay_type_default);
+ settings.bind('#basicModal__action_set_overlay_type', '.setOverlayType', settings.setOverlayType);
+ },
+
setCSS: function setCSS() {
var msg = "\n\t\t\t" + lychee.locale['LAYOUT_TYPE'] + "\n\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t
\n\t\t\t\n\t\t\t
";
@@ -6574,7 +6682,7 @@ view.settings = {
},
moreButton: function moreButton() {
- var msg = lychee.html(_templateObject50, lychee.locale['MORE']);
+ var msg = lychee.html(_templateObject52, lychee.locale['MORE']);
$(".settings_view").append(msg);
@@ -6612,14 +6720,14 @@ view.full_settings = {
api.post('Settings::getAll', {}, function (data) {
- var msg = lychee.html(_templateObject51, lychee.locale['SETTINGS_WARNING']);
+ var msg = lychee.html(_templateObject53, lychee.locale['SETTINGS_WARNING']);
$.each(data, function () {
- msg += lychee.html(_templateObject52, this.key, this.key, this.value);
+ msg += lychee.html(_templateObject54, this.key, this.key, this.value);
});
- msg += lychee.html(_templateObject53, lychee.locale['SAVE_RISK']);
+ msg += lychee.html(_templateObject55, lychee.locale['SAVE_RISK']);
$(".settings_view").append(msg);
settings.bind('#FullSettingsSave_button', '#fullSettings', settings.save);
@@ -6782,7 +6890,7 @@ view.logs_diagnostics = {
var html = '';
if (lychee.api_V2 && get === 'Logs') {
- html += lychee.html(_templateObject54, lychee.locale['CLEAN_LOGS']);
+ html += lychee.html(_templateObject56, lychee.locale['CLEAN_LOGS']);
}
html += '';
lychee.content.html(html);
diff --git a/dist/view.js b/dist/view.js
index a39dc82a..e6f054a2 100644
--- a/dist/view.js
+++ b/dist/view.js
@@ -10,25 +10,27 @@ var _templateObject = _taggedTemplateLiteral(["" + lychee.locale['CSS_TEXT'] + "
\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t ", "\n\t\t\t\t ", "\n\t\t\t\t ", "\n\t\t\t\t\n\t\t\t"], ["\n\t\t\t
\n\t\t\t\t ", "\n\t\t\t\t ", "\n\t\t\t\t ", "\n\t\t\t\t\n\t\t\t"]),
_templateObject6 = _taggedTemplateLiteral(["\n\t\t\t\t\n\t\t\t\t"], ["\n\t\t\t\t\n\t\t\t\t"]),
- _templateObject7 = _taggedTemplateLiteral(["\n\t\t\t\t
\n\t\t\t\t\t", "\t\n\t\t\t\t
"], ["\n\t\t\t\t\n\t\t\t\t\t", "\t\n\t\t\t\t
"]),
+ _templateObject7 = _taggedTemplateLiteral(["\n\t\t\t\t\n\t\t\t\t\t", "\n\t\t\t\t
"], ["\n\t\t\t\t\n\t\t\t\t\t", "\n\t\t\t\t
"]),
_templateObject8 = _taggedTemplateLiteral(["\n\t\t\t\n\t\t\t\t", "\n\t\t\t\t
\n\t\t\t\t\t
$", "
\n\t\t\t"], ["\n\t\t\t\n\t\t\t\t", "\n\t\t\t\t
\n\t\t\t\t\t\n\t"], ["\n\t\t\n\t"]),
- _templateObject13 = _taggedTemplateLiteral([""], [""]),
- _templateObject14 = _taggedTemplateLiteral([""], [""]),
- _templateObject15 = _taggedTemplateLiteral(["
$", "
\n\t\t\t"]), _templateObject9 = _taggedTemplateLiteral(["", "", ""], ["", "", ""]), _templateObject10 = _taggedTemplateLiteral(["", ""], ["", ""]), _templateObject11 = _taggedTemplateLiteral(["\n\t\t\t\t\n\t\t\t\t"], ["\n\t\t\t\t\n\t\t\t\t"]), - _templateObject12 = _taggedTemplateLiteral(["\n\t\t$", "
\n\t\t", " at ", ", ", " ", "
\n\t\t", " ", "
$", "
\n\t\t", " at ", ", ", " ", "
\n\t\t", " ", "
", ""], ["
", ""]),
- _templateObject16 = _taggedTemplateLiteral(["
", "
"], ["", "
"]), - _templateObject17 = _taggedTemplateLiteral(["\n\t\t\t$", "
\n\t\t\t\n\t\t\t"], ["\n\t\t\t
$", "
\n\t\t\t\n\t\t\t"]),
- _templateObject18 = _taggedTemplateLiteral(["\n\t\t\t\t\n\t\t\t\t\t\t ", " \n\t\t\t\t\t\t ", " \n\t\t\t\t\t \n\t\t\t\t\t "], ["\n\t\t\t\t\t \n\t\t\t\t\t\t ", " \n\t\t\t\t\t\t ", " \n\t\t\t\t\t \n\t\t\t\t\t "]),
- _templateObject25 = _taggedTemplateLiteral(["\n\t\t\t\t \n\t\t\t\t \n\t\t\t\t "], ["\n\t\t\t\t \n\t\t\t\t \n\t\t\t\t "]);
+ _templateObject12 = _taggedTemplateLiteral(["\n\t\t\t\t\t\n\t\t"], ["\n\t\t\t\n\t\t"]),
+ _templateObject15 = _taggedTemplateLiteral([""], [""]),
+ _templateObject16 = _taggedTemplateLiteral([""], [""]),
+ _templateObject17 = _taggedTemplateLiteral(["
\n\t\t\t\t\t", "\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
\n\t\t\t\t"], ["\n\t\t\t\t\n\t\t\t\t\t", "\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
\n\t\t\t\t"]),
- _templateObject19 = _taggedTemplateLiteral(["$", "", ""], ["$", "", ""]),
- _templateObject20 = _taggedTemplateLiteral(["", "
"], ["", "
"]),
- _templateObject21 = _taggedTemplateLiteral(["\n\t\t\t
\n\t\t"], ["\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t
\n\t\t\tSave\n\t\t\tDelete\n\t\t\n\t\t\t
\n\t\t"]),
- _templateObject22 = _taggedTemplateLiteral(["$", "", ""], ["$", "", ""]),
- _templateObject23 = _taggedTemplateLiteral(["$", ""], ["$", ""]),
- _templateObject24 = _taggedTemplateLiteral(["\n\t\t\t\t\t \n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t
\n\t\t\tSave\n\t\t\tDelete\n\t\t\n\t\t\t\t\t\t
\n\t\t\t\t"], ["\n\t\t\t\t\t$", "
\n\t\t\t\t\t\t$", "
\n\t\t\t\t\t\n\t\t\t\t\t\t
\n\t\t\t\t"]),
+ _templateObject13 = _taggedTemplateLiteral(["\n\t\t\t$", "
\n\t\t\t\t\t\t$", "
\n\t\t\t\t\t\n\t\t\t\t
\n\t\t"], ["\n\t\t\t$", "
\n\t\t\t\t", "
\n\t\t\t\n\t\t\t\t
\n\t\t"]),
+ _templateObject14 = _taggedTemplateLiteral(["\n\t\t\t$", "
\n\t\t\t\t", "
\n\t\t\t$", "
\n\t\t\t", " at ", ", ", " ", "
\n\t\t\t", " ", "
$", "
\n\t\t\t", " at ", ", ", " ", "
\n\t\t\t", " ", "
", ""], ["
", ""]),
+ _templateObject18 = _taggedTemplateLiteral(["
", "
"], ["", "
"]), + _templateObject19 = _taggedTemplateLiteral(["\n\t\t\t$", "
\n\t\t\t\n\t\t\t"], ["\n\t\t\t
$", "
\n\t\t\t\n\t\t\t"]),
+ _templateObject20 = _taggedTemplateLiteral(["\n\t\t\t\t\n\t\t\t\t\t\t ", " \n\t\t\t\t\t\t ", " \n\t\t\t\t\t \n\t\t\t\t\t "], ["\n\t\t\t\t\t \n\t\t\t\t\t\t ", " \n\t\t\t\t\t\t ", " \n\t\t\t\t\t \n\t\t\t\t\t "]),
+ _templateObject27 = _taggedTemplateLiteral(["\n\t\t\t\t \n\t\t\t\t \n\t\t\t\t "], ["\n\t\t\t\t \n\t\t\t\t \n\t\t\t\t "]);
function _taggedTemplateLiteral(strings, raw) { return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
@@ -170,14 +172,22 @@ build.photo = function (data) {
};
build.overlay_image = function (data) {
-
var exifHash = data.make + data.model + data.shutter + data.aperture + data.focal + data.iso;
+ // Get the stored setting for the overlay_image
+ var type = lychee.image_overlay_type;
var html = "";
- if (exifHash !== '') {
- html += lychee.html(_templateObject12, data.title, data.shutter.replace('s', 'sec'), data.aperture.replace('f/', 'ƒ / '), lychee.locale['PHOTO_ISO'], data.iso, data.focal, data.lens && data.lens !== '' ? '(' + data.lens + ')' : '');
+ if (type && type === 'desc' && data.description !== '') {
+ html = lychee.html(_templateObject12, data.title, data.description);
+ } else if (type && type === 'takedate' && data.takedate !== '') {
+ html = lychee.html(_templateObject13, data.title, data.takedate);
}
+ // fall back to exif data if there is no description
+ else if (exifHash !== '') {
+
+ html += lychee.html(_templateObject14, data.title, data.shutter.replace('s', 'sec'), data.aperture.replace('f/', 'ƒ / '), lychee.locale['PHOTO_ISO'], data.iso, data.focal, data.lens && data.lens !== '' ? '(' + data.lens + ')' : '');
+ }
return html;
};
@@ -187,9 +197,9 @@ build.imageview = function (data, visibleControls) {
var html = '';
if (data.type.indexOf('video') > -1) {
- html += lychee.html(_templateObject13, visibleControls === true ? '' : 'full', data.url);
+ html += lychee.html(_templateObject15, visibleControls === true ? '' : 'full', data.url);
} else {
- html += lychee.html(_templateObject14, visibleControls === true ? '' : 'full', data.medium !== '' ? data.medium : data.url);
+ html += lychee.html(_templateObject16, visibleControls === true ? '' : 'full', data.medium !== '' ? data.medium : data.url);
if (lychee.image_overlay) html += build.overlay_image(data);
}
@@ -202,20 +212,20 @@ build.no_content = function (typ) {
var html = '';
- html += lychee.html(_templateObject15, build.iconic(typ));
+ html += lychee.html(_templateObject17, build.iconic(typ));
switch (typ) {
case 'magnifying-glass':
- html += lychee.html(_templateObject16, lychee.locale['VIEW_NO_RESULT']);
+ html += lychee.html(_templateObject18, lychee.locale['VIEW_NO_RESULT']);
break;
case 'eye':
- html += lychee.html(_templateObject16, lychee.locale['VIEW_NO_PUBLIC_ALBUMS']);
+ html += lychee.html(_templateObject18, lychee.locale['VIEW_NO_PUBLIC_ALBUMS']);
break;
case 'cog':
- html += lychee.html(_templateObject16, lychee.locale['VIEW_NO_CONFIGURATION']);
+ html += lychee.html(_templateObject18, lychee.locale['VIEW_NO_CONFIGURATION']);
break;
case 'question-mark':
- html += lychee.html(_templateObject16, lychee.locale['VIEW_PHOTO_NOT_FOUND']);
+ html += lychee.html(_templateObject18, lychee.locale['VIEW_PHOTO_NOT_FOUND']);
break;
}
@@ -228,7 +238,7 @@ build.uploadModal = function (title, files) {
var html = '';
- html += lychee.html(_templateObject17, title);
+ html += lychee.html(_templateObject19, title);
var i = 0;
@@ -238,7 +248,7 @@ build.uploadModal = function (title, files) {
if (file.name.length > 40) file.name = file.name.substr(0, 17) + '...' + file.name.substr(file.name.length - 20, 20);
- html += lychee.html(_templateObject18, file.name);
+ html += lychee.html(_templateObject20, file.name);
i++;
}
@@ -257,18 +267,18 @@ build.tags = function (tags) {
tags = tags.split(',');
tags.forEach(function (tag, index, array) {
- html += lychee.html(_templateObject19, tag, index, build.iconic('x'));
+ html += lychee.html(_templateObject21, tag, index, build.iconic('x'));
});
} else {
- html = lychee.html(_templateObject20, lychee.locale['NO_TAGS']);
+ html = lychee.html(_templateObject22, lychee.locale['NO_TAGS']);
}
return html;
};
build.user = function (user) {
- var html = lychee.html(_templateObject21, user.id, user.id, user.username, user.id, user.id);
+ var html = lychee.html(_templateObject23, user.id, user.id, user.username, user.id, user.id);
return html;
};
@@ -510,7 +520,7 @@ header.setTitle = function () {
var $title = header.dom('.header__title');
- var html = lychee.html(_templateObject22, title, build.iconic('caret-bottom'));
+ var html = lychee.html(_templateObject24, title, build.iconic('caret-bottom'));
$title.html(html);
@@ -989,12 +999,12 @@ sidebar.render = function (structure) {
if (value === '' || value == null) value = '-';
// Wrap span-element around value for easier selecting on change
- value = lychee.html(_templateObject23, row.kind, value);
+ value = lychee.html(_templateObject25, row.kind, value);
// Add edit-icon to the value when editable
if (row.editable === true) value += ' ' + build.editIcon('edit_' + row.kind);
- _html += lychee.html(_templateObject24, row.title, value);
+ _html += lychee.html(_templateObject26, row.title, value);
});
_html += "\n\t\t\t\t \n\t\t\t\t ";
@@ -1010,7 +1020,7 @@ sidebar.render = function (structure) {
// Add edit-icon to the value when editable
if (section.editable === true) editable = build.editIcon('edit_tags');
- _html += lychee.html(_templateObject25, section.title, section.title.toLowerCase(), section.value, editable);
+ _html += lychee.html(_templateObject27, section.title, section.title.toLowerCase(), section.value, editable);
return _html;
};
@@ -1306,6 +1316,7 @@ lychee.locale = {
'UPDATE_AVAILABLE': 'Update available!',
'DEFAULT_LICENSE': 'Default License for new uploads:',
'SET_LICENSE': 'Set License',
+ 'SET_OVERLAY_TYPE': 'Set Overlay',
'SAVE_RISK': 'Save my modifications, I accept the Risk!',
'MORE': 'More',
@@ -1561,7 +1572,12 @@ lychee.locale = {
'CSS_TITLE': 'Change CSS',
'LAYOUT_TEXT': 'Use justified layout:',
- 'IMAGE_OVERLAY_TEXT': 'Display EXIF data overlay by default:',
+ 'IMAGE_OVERLAY_TEXT': 'Display image overlay by default:',
+
+ 'LAYOUT_TYPE': 'Data to use in image overlay:',
+ 'OVERLAY_EXIF': 'Photo EXIF data',
+ 'OVERLAY_DESCRIPTION': 'Photo description',
+ 'OVERLAY_DATE': 'Photo date taken',
'VIEW_NO_RESULT': 'No results',
'VIEW_NO_PUBLIC_ALBUMS': 'No public albums',
diff --git a/php/Access/Admin.php b/php/Access/Admin.php
index 88ea41fd..e48f3df9 100644
--- a/php/Access/Admin.php
+++ b/php/Access/Admin.php
@@ -58,6 +58,7 @@ public static function init($fn) {
// Settings functions
case 'Settings::setImageOverlay': self::setImageOverlay(); break;
+ case 'Settings::setOverlayType': self::setOverlayType(); break;
case 'Settings::setLayout': self::setLayoutAction(); break;
case 'Settings::setLang': self::setLangAction(); break;
case 'Settings::setDefaultLicense': self::setDefaultLicenseAction(); break;
@@ -355,6 +356,13 @@ private static function setImageOverlay() {
Response::json(Settings::setImageOverlay($_POST['image_overlay']));
}
+ private static function setOverlayType() {
+
+ Validator::required(isset($_POST['image_overlay_type']), __METHOD__);
+
+ Response::json(Settings::setOverlayType($_POST['image_overlay_type']));
+ }
+
private static function setSortingAction() {
Validator::required(isset($_POST['typeAlbums'], $_POST['orderAlbums'], $_POST['typePhotos'], $_POST['orderPhotos']), __METHOD__);
diff --git a/php/Locale/English.php b/php/Locale/English.php
index c5234162..2fabad9a 100644
--- a/php/Locale/English.php
+++ b/php/Locale/English.php
@@ -32,6 +32,7 @@ static public function get_locale()
'UPDATE_AVAILABLE' => 'Update available!',
'DEFAULT_LICENSE' => 'Default license for new uploads:',
'SET_LICENSE' => 'Set License',
+ 'SET_OVERLAY_TYPE' => 'Set Overlay',
'SMART_ALBUMS' => 'Smart albums',
'SHARED_ALBUMS' => 'Shared albums',
@@ -277,7 +278,12 @@ static public function get_locale()
'LANG_TITLE' => 'Change Language',
'LAYOUT_TEXT' => 'Use justified layout:',
- 'IMAGE_OVERLAY_TEXT' => 'Display EXIF data overlay by default:',
+ 'IMAGE_OVERLAY_TEXT' => 'Display data overlay by default:',
+
+ 'LAYOUT_TYPE' => 'Data to use in image overlay:',
+ 'OVERLAY_EXIF' => 'Photo EXIF data',
+ 'OVERLAY_DESCRIPTION' => 'Photo description',
+ 'OVERLAY_DATE' => 'Photo date taken',
'VIEW_NO_RESULT' => 'No results',
'VIEW_NO_PUBLIC_ALBUMS' => 'No public albums',
diff --git a/php/Modules/Import.php b/php/Modules/Import.php
index 8e5ea324..de0efb9b 100644
--- a/php/Modules/Import.php
+++ b/php/Modules/Import.php
@@ -98,6 +98,13 @@ public function url($urls, $albumID = 0) {
*/
public function server($path, $albumID = 0) {
+ // Fixes #177
+ $php_script_limit = Settings::get()['php_script_limit'];
+ if ($php_script_limit == 1) {
+ set_time_limit(0);
+ Log::notice(Database::get(), __METHOD__, __LINE__, 'Importing using unlimited execution time');
+ }
+
// Parse path
if (!isset($path)) $path = LYCHEE_UPLOADS_IMPORT;
if (substr($path, -1)==='/') $path = substr($path, 0, -1);
diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index c66f9769..8a3c9de8 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -886,7 +886,7 @@ public static function prepareData(array $data) {
// Use takestamp
$photo['cameraDate'] = '1';
$photo['sysdate'] = strftime('%d %B %Y', substr($data['id'], 0, -4));
- $photo['takedate'] = strftime('%d %B %Y', $data['takestamp']);
+ $photo['takedate'] = strftime('%d %B %Y - %k:%M', $data['takestamp']);
} else {
diff --git a/php/Modules/Session.php b/php/Modules/Session.php
index e4a08966..432b61de 100755
--- a/php/Modules/Session.php
+++ b/php/Modules/Session.php
@@ -53,6 +53,7 @@ public function init($public = true) {
unset($return['config']['location']);
unset($return['config']['imagick']);
unset($return['config']['plugins']);
+ unset($return['config']['php_script_limit']);
}
diff --git a/php/Modules/Settings.php b/php/Modules/Settings.php
index 31ee74df..11b3eed2 100755
--- a/php/Modules/Settings.php
+++ b/php/Modules/Settings.php
@@ -207,6 +207,26 @@ public static function setImageOverlay($imageOverlay) {
return true;
}
+ public static function setOverlayType($imageOverlayType) {
+ $overlays = [ 'exif', 'desc', 'takedate' ];
+
+ $found = false;
+ $i = 0;
+
+ while(!$found && $i < count($overlays)) {
+ if ($overlays[$i] === $imageOverlayType) $found = true;
+ $i++;
+ }
+
+ if(!$found) {
+ Log::error(Database::get(), __METHOD__, __LINE__, 'Cound not find the submitted overlay type');
+ Response::error(Database::get(), __METHOD__, __LINE__, 'Cound not find the submitted overlay type');
+ }
+ else {
+ if (self::set('image_overlay_type', $imageOverlayType, true)===false) return false;
+ return true;
+ }
+ }
/**
* Sets a new sorting for the photos.
diff --git a/php/database/update_030211.php b/php/database/update_030211.php
new file mode 100644
index 00000000..0b0cb0c0
--- /dev/null
+++ b/php/database/update_030211.php
@@ -0,0 +1,41 @@
+num_rows===0) {
+
+ $query = Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('image_overlay_type', 'exif')", array(LYCHEE_TABLE_SETTINGS));
+ $result = Database::execute($connection, $query, 'update_030211', __LINE__);
+
+ if ($result===false) Response::error('Could not add image_overlay_type to database!');
+
+}
+
+// Add php_script_limit to settings
+$query = Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'php_script_limit' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
+$result = Database::execute($connection, $query, 'update_030211', __LINE__);
+
+if ($result===false) Response::error('Could not get current php_script_limit from database!');
+
+if ($result->num_rows===0) {
+
+ $query = Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('php_script_limit', '0')", array(LYCHEE_TABLE_SETTINGS));
+ $result = Database::execute($connection, $query, 'update_030211', __LINE__);
+
+ if ($result===false) Response::error('Could not add php_script_limit to database!');
+}
+
+
+// Set version
+if (Database::setVersion($connection, 'update_030211')===false) Response::error('Could not update version of database!');
diff --git a/version.md b/version.md
index f15386a5..17ce9180 100644
--- a/version.md
+++ b/version.md
@@ -1 +1 @@
-3.2.10
+3.2.11
\n\t\t\t\t\t", "\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
\n\t\t\t\t"], ["\n\t\t\t\t\n\t\t\t\t\t", "\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
\n\t\t\t\t"]),
+ _templateObject21 = _taggedTemplateLiteral(["$", "", ""], ["$", "", ""]),
+ _templateObject22 = _taggedTemplateLiteral(["", "
"], ["", "
"]),
+ _templateObject23 = _taggedTemplateLiteral(["\n\t\t\t
\n\t\t"], ["\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t
\n\t\t\tSave\n\t\t\tDelete\n\t\t\n\t\t\t
\n\t\t"]),
+ _templateObject24 = _taggedTemplateLiteral(["$", "", ""], ["$", "", ""]),
+ _templateObject25 = _taggedTemplateLiteral(["$", ""], ["$", ""]),
+ _templateObject26 = _taggedTemplateLiteral(["\n\t\t\t\t\t \n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t
\n\t\t\tSave\n\t\t\tDelete\n\t\t