fixed ajax loader css and html

git-svn-id: http://code.elgg.org/elgg/trunk@8030 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php
index d465d5efd4505cf1419b7b07a82ac9745f1aa424..18ea4899e52774b75dd4b030272b905b179ec1ac 100644 (file)
--- 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 e539188f222cf7b759144c04dde8f2f4e86e6fa0..2d2da30b7f95f1da8169c27c879a17eb95e13a3e 100644 (file)
--- 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