From ca03d831fc65cd4ca669de7785dd3fff30bd33f1 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 5 Feb 2011 16:20:24 +0000
Subject: fixed ajax loader css and html

git-svn-id: http://code.elgg.org/elgg/trunk@8030 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/css/elements/icons.php   |  5 +----
 views/default/graphics/ajax_loader.php | 17 ++++++++---------
 2 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'views/default')

diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php
index d465d5efd..18ea4899e 100644
--- a/views/default/css/elements/icons.php
+++ b/views/default/css/elements/icons.php
@@ -79,7 +79,7 @@
 }
 
 <?php //@todo prefix with elgg- ?>
-.ajax-loader {
+.elgg-ajax-loader {
 	background-color: white;
 	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader_bw.gif);
 	background-repeat: no-repeat;
@@ -87,9 +87,6 @@
 	min-height:33px;
 	min-width:33px;
 }
-.ajax-loader.left {
-	background-position: left center;
-}
 
 /* ***************************************
 	AVATAR ICONS
diff --git a/views/default/graphics/ajax_loader.php b/views/default/graphics/ajax_loader.php
index e539188f2..2d2da30b7 100644
--- a/views/default/graphics/ajax_loader.php
+++ b/views/default/graphics/ajax_loader.php
@@ -5,24 +5,23 @@
  * @package Elgg
  * @subpackage Core
  *
- * @uses $vars['id']
+ * @uses $vars['id']     CSS id
+ * @uses $vars['hidden'] Begin hidden? (true)
  */
 
 if (isset($vars['internalid'])) {
 	$id = "id=\"{$vars['internalid']}\"";
 }
 
+$hidden = 'hidden';
+if (isset($vars['hidden']) && $vars['hidden'] == false) {
+	$hidden = '';
+}
+
 $loader = <<< END
 
-<div align="center" class="ajax-loader hidden" $id></div>
+<div class="elgg-ajax-loader $hidden" $id></div>
 
 END;
 
-$loader = str_replace("\n","",$loader);
-$loader = str_replace("\r","",$loader);
-
-if (isset($vars['slashes']) && $vars['slashes'] == true) {
-	$loader = addslashes($loader);
-}
-
 echo $loader;
\ No newline at end of file
-- 
cgit v1.2.3