-
{if count($categories)}
{foreach from=$categories item=category}
-
-
-
+
+
+
+
+
+
+
+ {$category.NAME}
+
-
- {$category.NAME}
-
{$category.NB_PHOTOS|translate_dec:'%d photo':'%d photos'}
{$category.NB_SUB_PHOTOS|translate_dec:'%d photo':'%d photos'} {$category.NB_SUB_ALBUMS|translate_dec:'in %d sub-album':'in %d sub-albums'}
{/foreach}
{/if}
+
+
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index 30f155ec1..95e0baa5e 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -195,7 +195,6 @@ TABLE.languages TR TD { padding: 7px 20px; }
text-align: center;
font-weight: 600;
font-size: 14px;
- margin-top: 10px;
display: block;
}
@@ -204,13 +203,10 @@ TABLE.languages TR TD { padding: 7px 20px; }
}
.albumActions {
- position: absolute;
bottom: 5px;
flex-direction: column;
width: 90%;
overflow: hidden;
- margin-left: 20px;
- margin-bottom: 10px;
display: none;
}
@@ -236,7 +232,7 @@ TABLE.languages TR TD { padding: 7px 20px; }
.addAlbum {
display: flex;
flex-direction: column;
- justify-content: space-around;
+ justify-content: center;
cursor: pointer;
}
@@ -244,6 +240,10 @@ TABLE.languages TR TD { padding: 7px 20px; }
cursor: auto;
}
+.addAlbum.input-mode form {
+ display: flex;
+}
+
.addAlbum label {
margin: 0;
border-radius: 5px 5px 0 0;
@@ -312,7 +312,8 @@ TABLE.languages TR TD { padding: 7px 20px; }
}
.addAlbum.input-mode .addAlbumHead{
- transform: translateY(0px);
+ transform: translateY(0px) !important;
+ margin-top: 0;
}
.addAlbum.input-mode form {
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 12ae6c701..14499014b 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -1118,3 +1118,7 @@ $lang['Created on %s'] = 'Created on %s';
$lang['Edited on %s'] = 'Edited on %s';
$lang['%d sub-albums'] = '%d sub-albums';
$lang['Refresh thumbnail'] = 'Refresh thumbnail';
+$lang['Compact View'] = 'Compact View';
+$lang['Tile View'] = 'Tile View';
+$lang['Line View'] = 'Line View';
+$lang['Add Album'] = 'Add Album';
\ No newline at end of file
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index b893d9f8b..2ce54d7a0 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -1120,3 +1120,7 @@ $lang['Created on %s'] = 'Créé le %s';
$lang['Edited on %s'] = 'Modifié le %s';
$lang['%d sub-albums'] = '%d sous-albums';
$lang['Refresh thumbnail'] = 'Changer de miniature';
+$lang['Compact View'] = 'Affichage compact';
+$lang['Tile View'] = 'Affichage tuiles';
+$lang['Line View'] = 'Affichage lignes';
+$lang['Add Album'] = 'Ajouter un Album';
\ No newline at end of file
diff --git a/themes/default/js/jquery.cookie.js b/themes/default/js/jquery.cookie.js
new file mode 100644
index 000000000..c7f3a59b5
--- /dev/null
+++ b/themes/default/js/jquery.cookie.js
@@ -0,0 +1,117 @@
+/*!
+ * jQuery Cookie Plugin v1.4.1
+ * https://github.com/carhartl/jquery-cookie
+ *
+ * Copyright 2013 Klaus Hartl
+ * Released under the MIT license
+ */
+(function (factory) {
+ if (typeof define === 'function' && define.amd) {
+ // AMD
+ define(['jquery'], factory);
+ } else if (typeof exports === 'object') {
+ // CommonJS
+ factory(require('jquery'));
+ } else {
+ // Browser globals
+ factory(jQuery);
+ }
+}(function ($) {
+
+ var pluses = /\+/g;
+
+ function encode(s) {
+ return config.raw ? s : encodeURIComponent(s);
+ }
+
+ function decode(s) {
+ return config.raw ? s : decodeURIComponent(s);
+ }
+
+ function stringifyCookieValue(value) {
+ return encode(config.json ? JSON.stringify(value) : String(value));
+ }
+
+ function parseCookieValue(s) {
+ if (s.indexOf('"') === 0) {
+ // This is a quoted cookie as according to RFC2068, unescape...
+ s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
+ }
+
+ try {
+ // Replace server-side written pluses with spaces.
+ // If we can't decode the cookie, ignore it, it's unusable.
+ // If we can't parse the cookie, ignore it, it's unusable.
+ s = decodeURIComponent(s.replace(pluses, ' '));
+ return config.json ? JSON.parse(s) : s;
+ } catch(e) {}
+ }
+
+ function read(s, converter) {
+ var value = config.raw ? s : parseCookieValue(s);
+ return $.isFunction(converter) ? converter(value) : value;
+ }
+
+ var config = $.cookie = function (key, value, options) {
+
+ // Write
+
+ if (value !== undefined && !$.isFunction(value)) {
+ options = $.extend({}, config.defaults, options);
+
+ if (typeof options.expires === 'number') {
+ var days = options.expires, t = options.expires = new Date();
+ t.setTime(+t + days * 864e+5);
+ }
+
+ return (document.cookie = [
+ encode(key), '=', stringifyCookieValue(value),
+ options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
+ options.path ? '; path=' + options.path : '',
+ options.domain ? '; domain=' + options.domain : '',
+ options.secure ? '; secure' : ''
+ ].join(''));
+ }
+
+ // Read
+
+ var result = key ? undefined : {};
+
+ // To prevent the for loop in the first place assign an empty array
+ // in case there are no cookies at all. Also prevents odd result when
+ // calling $.cookie().
+ var cookies = document.cookie ? document.cookie.split('; ') : [];
+
+ for (var i = 0, l = cookies.length; i < l; i++) {
+ var parts = cookies[i].split('=');
+ var name = decode(parts.shift());
+ var cookie = parts.join('=');
+
+ if (key && key === name) {
+ // If second argument (value) is a function it's a converter...
+ result = read(cookie, value);
+ break;
+ }
+
+ // Prevent storing a cookie that we couldn't decode.
+ if (!key && (cookie = read(cookie)) !== undefined) {
+ result[name] = cookie;
+ }
+ }
+
+ return result;
+ };
+
+ config.defaults = {};
+
+ $.removeCookie = function (key, options) {
+ if ($.cookie(key) === undefined) {
+ return false;
+ }
+
+ // Must not alter options, thus extending a fresh object...
+ $.cookie(key, '', $.extend({}, options, { expires: -1 }));
+ return !$.cookie(key);
+ };
+
+}));