From bb1f45eb02bac603d67ac08cb674c4050a245c28 Mon Sep 17 00:00:00 2001 From: ewinslow Date: Sat, 30 Oct 2010 22:23:45 +0000 Subject: Refs #2598: Converted most $vars['url'] to elgg_get_site_url() git-svn-id: http://code.elgg.org/elgg/trunk@7149 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/riverdashboard/views/default/riverdashboard/container.php | 2 +- mod/riverdashboard/views/default/riverdashboard/css.php | 6 +++--- mod/riverdashboard/views/default/riverdashboard/js.php | 4 ++-- mod/riverdashboard/views/default/riverdashboard/menu.php | 6 +++--- mod/riverdashboard/views/default/riverdashboard/rivercomment.php | 2 +- mod/riverdashboard/views/default/riverdashboard/sitemessage.php | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'mod/riverdashboard/views/default') diff --git a/mod/riverdashboard/views/default/riverdashboard/container.php b/mod/riverdashboard/views/default/riverdashboard/container.php index c7123a722..9f0164b43 100644 --- a/mod/riverdashboard/views/default/riverdashboard/container.php +++ b/mod/riverdashboard/views/default/riverdashboard/container.php @@ -10,7 +10,7 @@ $(document).ready(function(){ function activityUpdateChecker(interval) { this.intervalID = null; this.interval = interval; - this.url = 'mod/riverdashboard/endpoint/ping.php'; + this.url = 'mod/riverdashboard/endpoint/ping.php'; this.seconds_passed = 0; this.start = function() { diff --git a/mod/riverdashboard/views/default/riverdashboard/css.php b/mod/riverdashboard/views/default/riverdashboard/css.php index 20da6ebeb..ec27f9686 100644 --- a/mod/riverdashboard/views/default/riverdashboard/css.php +++ b/mod/riverdashboard/views/default/riverdashboard/css.php @@ -14,12 +14,12 @@ padding:1px 8px 2px 24px; margin-top:9px; cursor: pointer; - background: red url("mod/riverdashboard/graphics/refresh.png") no-repeat 5px 3px; + background: red url("mod/riverdashboard/graphics/refresh.png") no-repeat 5px 3px; -webkit-border-radius: 10px; -moz-border-radius: 10px; } #riverdashboard_updates a.update_link:hover { - background: #4690D6 url("mod/riverdashboard/graphics/refresh.png") no-repeat 5px -22px; + background: #4690D6 url("mod/riverdashboard/graphics/refresh.png") no-repeat 5px -22px; color:white; text-decoration: none; } @@ -62,7 +62,7 @@ width:20px; height:25px; margin:0 2px 0 2px; - background: url(mod/riverdashboard/graphics/follow_icon.png) no-repeat left -7px; + background: url(mod/riverdashboard/graphics/follow_icon.png) no-repeat left -7px; } /* LATEST COMMENTS IN RIVER */ diff --git a/mod/riverdashboard/views/default/riverdashboard/js.php b/mod/riverdashboard/views/default/riverdashboard/js.php index 2b761cdcd..4eec41149 100644 --- a/mod/riverdashboard/views/default/riverdashboard/js.php +++ b/mod/riverdashboard/views/default/riverdashboard/js.php @@ -17,7 +17,7 @@ 'entity_guid': guid } - $(likesList).load('mod/riverdashboard/endpoint/get_likes.php', params, function(data) { + $(likesList).load('mod/riverdashboard/endpoint/get_likes.php', params, function(data) { // hide comments myParent.find('.comments_container').animate({"height": "toggle", "opacity": "toggle"}, { duration: 400 }); // change selected tab @@ -57,7 +57,7 @@ 'offset': numComments } - $.post('mod/riverdashboard/endpoint/get_comments.php', params, function(data) { + $.post('mod/riverdashboard/endpoint/get_comments.php', params, function(data) { commentsList.prepend(data); showLess.toggle(); diff --git a/mod/riverdashboard/views/default/riverdashboard/menu.php b/mod/riverdashboard/views/default/riverdashboard/menu.php index 5ab4821a8..889cfbbd2 100644 --- a/mod/riverdashboard/views/default/riverdashboard/menu.php +++ b/mod/riverdashboard/views/default/riverdashboard/menu.php @@ -18,9 +18,9 @@ switch($vars['orient']) { -
  • >
    • -
  • >
    • -
  • >
    • +
  • >
    • +
  • >
    • +
  • >
    • diff --git a/mod/riverdashboard/views/default/riverdashboard/rivercomment.php b/mod/riverdashboard/views/default/riverdashboard/rivercomment.php index d440e7ab6..fdc5dd535 100644 --- a/mod/riverdashboard/views/default/riverdashboard/rivercomment.php +++ b/mod/riverdashboard/views/default/riverdashboard/rivercomment.php @@ -14,5 +14,5 @@ if (isset($vars['entity']) && isloggedin()) { $form_body .= elgg_view('input/hidden', array('internalname' => 'entity_guid', 'value' => $vars['entity']->getGUID())); $form_body .= elgg_view('input/submit', array('value' => elgg_echo("Comment"))); $form_body .= ""; - echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$vars['url']}action/comments/add")); + echo elgg_view('input/form', array('body' => $form_body, 'action' => elgg_get_site_url()."action/comments/add")); } \ No newline at end of file diff --git a/mod/riverdashboard/views/default/riverdashboard/sitemessage.php b/mod/riverdashboard/views/default/riverdashboard/sitemessage.php index c59c3e2d5..2d3c7aa57 100644 --- a/mod/riverdashboard/views/default/riverdashboard/sitemessage.php +++ b/mod/riverdashboard/views/default/riverdashboard/sitemessage.php @@ -14,7 +14,7 @@ if ($site_message) { $message = $mes->description; $dateStamp = elgg_view_friendly_time($mes->time_created); $delete = elgg_view("output/confirmlink",array( - 'href' => $vars['url'] . "action/riverdashboard/delete?message=" . $mes->guid, + 'href' => elgg_get_site_url() . "action/riverdashboard/delete?message=" . $mes->guid, 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm'), )); @@ -49,7 +49,7 @@ if ($site_message) { EOT; //display the form - echo elgg_view('input/form', array('action' => "{$vars['url']}action/$action", 'body' => $form_body)); + echo elgg_view('input/form', array('action' => elgg_get_site_url()."action/$action", 'body' => $form_body)); }//end of admin if statement @@ -71,7 +71,7 @@ EOT; EOT; //display the form - echo elgg_view('input/form', array('action' => "{$vars['url']}action/$action", 'body' => $form_body)); + echo elgg_view('input/form', array('action' => elgg_get_site_url()."action/$action", 'body' => $form_body)); }//end of admin check }//end of main if -- cgit v1.2.3