Fixes #3385 rel now used for the confirm text so that title can be used separately

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

diff --git a/js/lib/ui.js b/js/lib/ui.js
index 85ca8caf17f9bd038fadb7cab496573dff9cf3e2..692311d730c9979d7fe20eb6d0ff43af9db9bd62 100644 (file)
--- a/js/lib/ui.js
+++ b/js/lib/ui.js
@@ -221,7 +221,7 @@ elgg.ui.initHoverMenu = function(parent) {
  * @return void
  */
 elgg.ui.requiresConfirmation = function(e) {
-       var confirmText = $(this).attr('title') || elgg.echo('question:areyousure');
+       var confirmText = $(this).attr('rel') || elgg.echo('question:areyousure');
        if (!confirm(confirmText)) {
                e.preventDefault();
        }

diff --git a/views/default/output/confirmlink.php b/views/default/output/confirmlink.php
index 9670941134389fa88dcb39000c14d931aef8c7c9..5059a656ebcfa2d280b003d6b41e95b8957ff997 100644 (file)
--- a/views/default/output/confirmlink.php
+++ b/views/default/output/confirmlink.php
@@ -13,7 +13,8 @@
  * @uses $vars['text_encode'] Encode special characters? (false)
  */
 
-$confirm = elgg_extract('confirm', $vars, elgg_echo('question:areyousure'));
+$vars['rel'] = elgg_extract('confirm', $vars, elgg_echo('question:areyousure'));
+$vars['rel'] = addslashes($vars['rel']);
 $encode = elgg_extract('text_encode', $vars, false);
 
 // always generate missing action tokens
@@ -36,7 +37,6 @@ if (isset($vars['class'])) {
 } else {
        $vars['class'] = 'elgg-requires-confirmation';
 }
-//$vars['onclick'] = "return confirm('" . addslashes($confirm) . "')";
 
 unset($vars['encode_text']);
 unset($vars['text']);

diff --git a/views/default/page/elements/header.php b/views/default/page/elements/header.php
index 2361644f23e8feacefca48933648dd9ff46609a9..1a1f5d21103c24943fd00ae40886c3df45b867de 100644 (file)
--- a/views/default/page/elements/header.php
+++ b/views/default/page/elements/header.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Elgg header contents
- * This file holds the header output that a user will see
- **/
+ * Elgg page header
+ * In the default theme, the header lives between the topbar and main content area.
+ */
 
 // link back to main site.
 echo elgg_view('page/elements/header_logo', $vars);