Fixes #2318: Adjusted system message markup + styles to work with ajax actions

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

diff --git a/engine/js/lib/elgglib.js b/engine/js/lib/elgglib.js
index 208c027168a377171ced2ce02bf8f2f0ca4015f3..5c32deaafec35f22fa7dced674834747b68b77bd 100644 (file)
--- a/engine/js/lib/elgglib.js
+++ b/engine/js/lib/elgglib.js
@@ -144,14 +144,7 @@ elgg.system_messages = function(msgs, delay, type) {
        var messages_html = [];\r
        \r
        for (var i in msgs) {\r
-               messages_html.push('<div class="' + classes.join(' ') + '">' \r
-                       + '<span class="closeMessages">'\r
-                               + '<a href="#">' \r
-                                       + elgg.echo('systemmessages:dismiss')\r
-                               + '</a>'\r
-                       + '</span>'\r
-                       + '<p>' + msgs[i] + '</p>'\r
-               + '</div>');\r
+               messages_html.push('<div class="' + classes.join(' ') + '"><p>' + msgs[i] + '</p></div>');\r
        }\r
        \r
        $(messages_html.join('')).appendTo('#elgg_system_messages').animate({opacity:'1.0'},delay).fadeOut('slow');\r

diff --git a/views/default/css.php b/views/default/css.php
index b4d88e7d9d6294cfd49db462dab73145d93ec663..076bfdb627e18606324bd7bca54bab0660717b7d 100644 (file)
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -621,27 +621,30 @@ li.navigation_more ul li {
 /* ***************************************
        SYSTEM MESSAGES
 *************************************** */
-#elgg_system_message {
+#elgg_system_messages {
+       position:fixed;
+       right:20px;
+       max-width: 500px;
+       z-index: 9600;
+}
+
+.elgg_system_message {
        background-color:black;
        color:white;
        font-weight: bold;
        display:block;
        padding:3px 10px;
-       z-index: 9600;
-       position:fixed;
-       right:20px;
        margin-top:10px;
-       width:auto;
-       max-width: 500px;
        cursor: pointer;
        opacity:0.9;
        -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
        -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
+       z-index: 9600;
 }
-#elgg_system_message.error {
+.elgg_system_message.error {
        background-color:red;
 }
-#elgg_system_message p {
+.elgg_system_message p {
        margin:0;
 }
 

diff --git a/views/default/messages/errors/list.php b/views/default/messages/errors/list.php
index 922f2378746086b0f5454b568a96f18f3734a61f..5f675715dffa12fff37bea35415c87d448458ef1 100644 (file)
--- a/views/default/messages/errors/list.php
+++ b/views/default/messages/errors/list.php
@@ -10,15 +10,13 @@
  */
 
 if (!empty($vars['object']) && is_array($vars['object'])) {
-
-?>
-<div id="elgg_system_message" class="hidden radius8 error">
-<script type="text/javascript">$(document).ready(function(){ elgg_system_message() });</script>
-<?php
        foreach($vars['object'] as $error) {
-               echo elgg_view('messages/errors/error',array('object' => $error));
-       }
 ?>
-</div>
+
+       <div class="elgg_system_message hidden radius8 error">
+               <?php echo elgg_view('messages/errors/error',array('object' => $error)); ?>
+       </div>
+       
 <?php
+       }
 }
\ No newline at end of file

diff --git a/views/default/messages/list.php b/views/default/messages/list.php
index 3084f09f85b26395e7396bfaa5a30b5c55cb2988..dc50ef071e329ab9fa1bee7ad673921bb0c48642 100644 (file)
--- a/views/default/messages/list.php
+++ b/views/default/messages/list.php
@@ -8,9 +8,14 @@
  *
  * @uses $vars['object'] The array of message registers
  */
+?>
 
-if (!empty($vars['object']) && is_array($vars['object']) && sizeof($vars['object']) > 0) {
-       foreach($vars['object'] as $register => $list ) {
-               echo elgg_view("messages/{$register}/list", array('object' => $list));
+<div id="elgg_system_messages">
+<?php 
+       if (!empty($vars['object']) && is_array($vars['object']) && sizeof($vars['object']) > 0) {
+               foreach($vars['object'] as $register => $list ) {
+                       echo elgg_view("messages/{$register}/list", array('object' => $list));
+               }
        }
-}
+?>
+</div>
\ No newline at end of file

diff --git a/views/default/messages/messages/list.php b/views/default/messages/messages/list.php
index 07fae11e7e7c5fd2ae16456b0f238a1e3cea4120..1d69c028935c6dfd60e520bb9814f83c390ac6b6 100644 (file)
--- a/views/default/messages/messages/list.php
+++ b/views/default/messages/messages/list.php
@@ -10,16 +10,13 @@
  */
 
 if (!empty($vars['object']) && is_array($vars['object'])) {
-
-?>
-<div id="elgg_system_message" class="hidden radius8">
-<script type="text/javascript">$(document).ready(function(){ elgg_system_message() });</script>
-<?php
        foreach($vars['object'] as $message) {
-               echo elgg_view('messages/messages/message',array('object' => $message));
-       }
 ?>
-</div>
-<?php
 
+       <div class="elgg_system_message hidden radius8">
+               <?php echo elgg_view('messages/messages/message',array('object' => $message)); ?>
+       </div>
+
+<?php
+       }
 }