aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflop25 <flop25@piwigo.org>2013-01-29 18:35:50 +0000
committerflop25 <flop25@piwigo.org>2013-01-29 18:35:50 +0000
commit6b1b98df15686a020341e96c60203b855efed088 (patch)
tree89679366be8da7d5640395f66cd55b3c258edca2
parent4708e6c75e7a681b44a5cd3631209dc64a5fbc1b (diff)
moved inline css in theme.css
removed useless theme conf ready for rc git-svn-id: http://piwigo.org/svn/trunk@20452 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--themes/default/template/comment_list.tpl2
-rw-r--r--themes/default/template/index.tpl2
-rw-r--r--themes/default/template/mainpage_categories.tpl2
-rw-r--r--themes/default/theme.css7
-rw-r--r--themes/default/themeconf.inc.php1
5 files changed, 10 insertions, 4 deletions
diff --git a/themes/default/template/comment_list.tpl b/themes/default/template/comment_list.tpl
index 64b6ee2b5..433de1ff2 100644
--- a/themes/default/template/comment_list.tpl
+++ b/themes/default/template/comment_list.tpl
@@ -10,7 +10,7 @@
{/html_style}{/strip}
{/if}
{footer_script}var error_icon = "{$ROOT_URL}{$themeconf.icon_dir}/errors_small.png";{/footer_script}
-<div class="loader" style="display: none; position: fixed; right: 0;bottom: 0;"><img src="{$ROOT_URL}{$themeconf.img_dir}/ajax_loader.gif"></div>
+<div class="loader"><img src="{$ROOT_URL}{$themeconf.img_dir}/ajax_loader.gif"></div>
<ul class="commentsList">
{foreach from=$comments item=comment name=comment_loop}
<li class="commentElement {if $smarty.foreach.comment_loop.index is odd}odd{else}even{/if}">
diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl
index e6874567e..c24f4e364 100644
--- a/themes/default/template/index.tpl
+++ b/themes/default/template/index.tpl
@@ -171,7 +171,7 @@ jQuery("#derivativeSwitchBox").on("mouseleave", function() {
{/if}
{if !empty($THUMBNAILS)}
-<div class="loader" style="display: none; position: fixed; right: 0;bottom: 0;"><img src="{$ROOT_URL}{$themeconf.img_dir}/ajax_loader.gif"></div>
+<div class="loader"><img src="{$ROOT_URL}{$themeconf.img_dir}/ajax_loader.gif"></div>
<ul class="thumbnails" id="thumbnails">
{$THUMBNAILS}
</ul>
diff --git a/themes/default/template/mainpage_categories.tpl b/themes/default/template/mainpage_categories.tpl
index 6ca8bbe2b..60bbf1cf6 100644
--- a/themes/default/template/mainpage_categories.tpl
+++ b/themes/default/template/mainpage_categories.tpl
@@ -10,7 +10,7 @@
{footer_script}
var error_icon = "{$ROOT_URL}{$themeconf.icon_dir}/errors_small.png", max_requests = {$maxRequests};
{/footer_script}
-<div class="loader" style="display: none; position: fixed; right: 0;bottom: 0;"><img src="{$ROOT_URL}{$themeconf.img_dir}/ajax_loader.gif"></div>
+<div class="loader"><img src="{$ROOT_URL}{$themeconf.img_dir}/ajax_loader.gif"></div>
<ul class="thumbnailCategories">
{foreach from=$category_thumbnails item=cat name=cat_loop}
{assign var=derivative value=$pwg->derivative($derivative_params, $cat.representative.src_image)}
diff --git a/themes/default/theme.css b/themes/default/theme.css
index b3ae0f1b5..267b35fd1 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -253,6 +253,13 @@ TD.calDayCellFull, TD.calDayCellEmpty {
float: left;
}
+/* Loader gif new in 2.5 */
+.loader {
+ display: none;
+ position: fixed;
+ right: 0;
+ bottom: 0;
+}
/* User comments */
#comments {
diff --git a/themes/default/themeconf.inc.php b/themes/default/themeconf.inc.php
index 7d759f14e..3bd69eddd 100644
--- a/themes/default/themeconf.inc.php
+++ b/themes/default/themeconf.inc.php
@@ -3,7 +3,6 @@ $themeconf = array(
'name' => 'default',
'icon_dir' => 'themes/default/icon',
'img_dir' => 'themes/default/images',
- 'loading_img' => 'themes/default/images/359_s.png',
'mime_icon_dir' => 'themes/default/icon/mimetypes/',
'local_head' => 'local_head.tpl',
);