aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-01-21 21:06:06 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-01-21 21:06:06 +0000
commit864804a251c1b3ec23baf4dbe60b471b579cc01e (patch)
tree8985797f765a8a4de749a7897c02eedc2c141bf1
parent0578ec0578a3b5925b0d25d649c21d2cc57b9f68 (diff)
downloadelgg-864804a251c1b3ec23baf4dbe60b471b579cc01e.tar.gz
elgg-864804a251c1b3ec23baf4dbe60b471b579cc01e.tar.bz2
Updated views to use output/url with action flag set.
git-svn-id: http://code.elgg.org/elgg/trunk@3828 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--views/default/basic_elements/welcome.php2
-rw-r--r--views/default/page_elements/elgg_topbar.php2
-rw-r--r--views/default/welcome/logged_in.php6
3 files changed, 7 insertions, 3 deletions
diff --git a/views/default/basic_elements/welcome.php b/views/default/basic_elements/welcome.php
index 979f32b4f..8564778d2 100644
--- a/views/default/basic_elements/welcome.php
+++ b/views/default/basic_elements/welcome.php
@@ -13,5 +13,5 @@ $user = $vars['name'];
?>
<p><?php echo sprintf(elgg_echo('welcome:user'), $user); ?></p>
-<p><?php echo elgg_view('output/action_link', array('href' => "{$vars['url']}action/logout", 'text' => elgg_echo('logout'))); ?></p>
+<p><?php echo elgg_view('output/url', array('href' => "{$vars['url']}action/logout", 'text' => elgg_echo('logout'), 'is_action' => TRUE)); ?></p>
diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/elgg_topbar.php
index d871d622e..affed6fd1 100644
--- a/views/default/page_elements/elgg_topbar.php
+++ b/views/default/page_elements/elgg_topbar.php
@@ -63,7 +63,7 @@
<div id="elgg_topbar_container_right">
<small>
- <?php echo elgg_view('output/action_link', array('href' => "{$vars['url']}action/logout", 'text' => elgg_echo('logout'))); ?>
+ <?php echo elgg_view('output/url', array('href' => "{$vars['url']}action/logout", 'text' => elgg_echo('logout'), 'is_action' => TRUE)); ?>
</small>
</div>
diff --git a/views/default/welcome/logged_in.php b/views/default/welcome/logged_in.php
index 180746f22..d1e568669 100644
--- a/views/default/welcome/logged_in.php
+++ b/views/default/welcome/logged_in.php
@@ -11,7 +11,11 @@
//add various views to area1
$area1 = "<h2>" . sprintf(elgg_echo("welcome:user"),$vars['user']->name) . "</h2>";
$area1 .= "<p>" . elgg_echo("welcome_message") . "</p><br />";
-$area1 .= elgg_view('output/action_link', array('href' => "{$vars['url']}action/logout", 'text' => elgg_echo('logout')));
+$area1 .= elgg_view('output/url', array(
+ 'href' => "{$vars['url']}action/logout",
+ 'text' => elgg_echo('logout'),
+ 'is_action' => TRUE
+));
//send area one to the appropriate canvas layout
$body = elgg_view_layout("one_column", $area1);