aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflop25 <flop25@piwigo.org>2012-07-08 15:50:56 +0000
committerflop25 <flop25@piwigo.org>2012-07-08 15:50:56 +0000
commitb5025b2947285dc5958e1e2f871f3de54bff971f (patch)
tree9525a3505fa2d57426e4eecf0f57db316ac511dc
parent077c076069ada124e9700801effed9c0d61475f5 (diff)
merge r16502 from trunk to branch 2.4
adding a conf img_dir and a loader : ajax-loader-big.gif 128x128 bug:2684 git-svn-id: http://piwigo.org/svn/branches/2.4@16503 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--themes/default/images/ajax-loader-big.gifbin0 -> 85105 bytes
-rw-r--r--themes/default/themeconf.inc.php1
2 files changed, 1 insertions, 0 deletions
diff --git a/themes/default/images/ajax-loader-big.gif b/themes/default/images/ajax-loader-big.gif
new file mode 100644
index 000000000..1b82b5d76
--- /dev/null
+++ b/themes/default/images/ajax-loader-big.gif
Binary files differ
diff --git a/themes/default/themeconf.inc.php b/themes/default/themeconf.inc.php
index 50ab59819..3bd69eddd 100644
--- a/themes/default/themeconf.inc.php
+++ b/themes/default/themeconf.inc.php
@@ -2,6 +2,7 @@
$themeconf = array(
'name' => 'default',
'icon_dir' => 'themes/default/icon',
+ 'img_dir' => 'themes/default/images',
'mime_icon_dir' => 'themes/default/icon/mimetypes/',
'local_head' => 'local_head.tpl',
);