diff options
Diffstat (limited to 'views/default/page_elements')
| -rw-r--r-- | views/default/page_elements/content_header.php | 6 | ||||
| -rw-r--r-- | views/default/page_elements/elgg_footer.php | 2 | ||||
| -rw-r--r-- | views/default/page_elements/elgg_header_logo.php | 2 | ||||
| -rw-r--r-- | views/default/page_elements/elgg_topbar.php | 6 | ||||
| -rw-r--r-- | views/default/page_elements/elgg_topbar_logout.php | 2 | ||||
| -rw-r--r-- | views/default/page_elements/html_begin.php | 20 | ||||
| -rw-r--r-- | views/default/page_elements/html_begin_admin.php | 12 |
7 files changed, 25 insertions, 25 deletions
diff --git a/views/default/page_elements/content_header.php b/views/default/page_elements/content_header.php index 6ae5849ae..3704e9a49 100644 --- a/views/default/page_elements/content_header.php +++ b/views/default/page_elements/content_header.php @@ -38,17 +38,17 @@ $new_button = ''; $default_tabs = array( 'all' => array( 'title' => elgg_echo('all'), - 'url' => (isset($vars['all_link'])) ? $vars['all_link'] : "{$vars['url']}mod/$type/all.php", + 'url' => (isset($vars['all_link'])) ? $vars['all_link'] : elgg_get_site_url()."mod/$type/all.php", 'selected' => ($filter_context == 'everyone'), ), 'mine' => array( 'title' => elgg_echo('mine'), - 'url' => (isset($vars['mine_link'])) ? $vars['mine_link'] : "{$vars['url']}pg/$type/$username", + 'url' => (isset($vars['mine_link'])) ? $vars['mine_link'] : elgg_get_site_url()."pg/$type/$username", 'selected' => ($filter_context == 'mine'), ), 'friend' => array( 'title' => elgg_echo('friends'), - 'url' => (isset($vars['friend_link'])) ? $vars['friend_link'] : "{$vars['url']}pg/$type/$username/friends", + 'url' => (isset($vars['friend_link'])) ? $vars['friend_link'] : elgg_get_site_url()."pg/$type/$username/friends", 'selected' => ($filter_context == 'friends'), ), ); diff --git a/views/default/page_elements/elgg_footer.php b/views/default/page_elements/elgg_footer.php index 62ec5a110..6d6fd8965 100644 --- a/views/default/page_elements/elgg_footer.php +++ b/views/default/page_elements/elgg_footer.php @@ -13,7 +13,7 @@ <div id="elgg_footer_contents" class="clearfloat"> <?php echo elgg_view('footer/links'); ?> <a href="http://www.elgg.org" class="powered_by_elgg_badge"> - <img src="<?php echo $vars['url']; ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" alt="Powered by Elgg" /> + <img src="<?php echo elgg_get_site_url(); ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" alt="Powered by Elgg" /> </a> </div> </div> diff --git a/views/default/page_elements/elgg_header_logo.php b/views/default/page_elements/elgg_header_logo.php index 4449c9644..1e5e5269d 100644 --- a/views/default/page_elements/elgg_header_logo.php +++ b/views/default/page_elements/elgg_header_logo.php @@ -5,6 +5,6 @@ **/ ?> -<h1><a href="<?php echo $vars['url']; ?>"> +<h1><a href="<?php echo elgg_get_site_url(); ?>"> <span class='network_title'><?php echo $vars['config']->sitename; ?></span> </a></h1> diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/elgg_topbar.php index e88cb0fac..4908625e4 100644 --- a/views/default/page_elements/elgg_topbar.php +++ b/views/default/page_elements/elgg_topbar.php @@ -11,7 +11,7 @@ if (($user instanceof ElggUser) && ($user->guid > 0)) { // Elgg logo echo '<a href="http://www.elgg.org">'; - echo "<img class=\"site_logo\" src=\"{$vars['url']}_graphics/elgg_toolbar_logo.gif\" alt=\"Elgg logo\" />"; + echo "<img class=\"site_logo\" src=\"".elgg_get_site_url()."_graphics/elgg_toolbar_logo.gif\" alt=\"Elgg logo\" />"; echo '</a>'; // avatar @@ -31,12 +31,12 @@ if (($user instanceof ElggUser) && ($user->guid > 0)) { // user settings $settings = elgg_echo('settings'); - echo "<a href=\"{$vars['url']}pg/settings\" class=\"settings\">$settings</a>"; + echo "<a href=\"".elgg_get_site_url()."pg/settings\" class=\"settings\">$settings</a>"; // The administration link is for admin or site admin users only if ($user->isAdmin()) { $admin = elgg_echo("admin"); - echo "<a href=\"{$vars['url']}pg/admin\" class=\"admin\">$admin</a>"; + echo "<a href=\"".elgg_get_site_url()."pg/admin\" class=\"admin\">$admin</a>"; } echo '</div>'; diff --git a/views/default/page_elements/elgg_topbar_logout.php b/views/default/page_elements/elgg_topbar_logout.php index d37c5f126..ca3d16707 100644 --- a/views/default/page_elements/elgg_topbar_logout.php +++ b/views/default/page_elements/elgg_topbar_logout.php @@ -7,7 +7,7 @@ echo '<div class="log_out">'; echo elgg_view('output/url', array( - 'href' => "{$vars['url']}action/logout", + 'href' => elgg_get_site_url()."action/logout", 'text' => elgg_echo('logout'), 'is_action' => TRUE )); diff --git a/views/default/page_elements/html_begin.php b/views/default/page_elements/html_begin.php index 7b1204c18..37a9999f0 100644 --- a/views/default/page_elements/html_begin.php +++ b/views/default/page_elements/html_begin.php @@ -48,12 +48,12 @@ $release = get_version(true); <meta name="ElggRelease" content="<?php echo $release; ?>" /> <meta name="ElggVersion" content="<?php echo $version; ?>" /> <title><?php echo $title; ?></title> - <link rel="SHORTCUT ICON" href="<?php echo $vars['url']; ?>_graphics/favicon.ico" /> + <link rel="SHORTCUT ICON" href="<?php echo elgg_get_site_url(); ?>_graphics/favicon.ico" /> - <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-1.4.2.min.js"></script> - <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-ui-1.7.2.min.js"></script> - <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery.form.js"></script> - <script type="text/javascript" src="<?php echo $vars['url']; ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&js=initialise_elgg&viewtype=<?php echo $vars['view']; ?>"></script> + <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery-1.4.2.min.js"></script> + <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery-ui-1.7.2.min.js"></script> + <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.form.js"></script> + <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&js=initialise_elgg&viewtype=<?php echo $vars['view']; ?>"></script> <?php echo $feedref; @@ -65,20 +65,20 @@ $release = get_version(true); if (isset($pickerinuse) && $pickerinuse == true) { ?> <!-- only needed on pages where we have friends collections and/or the friends picker --> - <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery.easing.1.3.packed.js"></script> - <script type="text/javascript" src="<?php echo $vars['url']; ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&js=friendsPickerv1&viewtype=<?php echo $vars['view']; ?>"></script> + <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.easing.1.3.packed.js"></script> + <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&js=friendsPickerv1&viewtype=<?php echo $vars['view']; ?>"></script> <?php } ?> <!-- include the default css file --> - <link rel="stylesheet" href="<?php echo $vars['url']; ?>_css/css.css?lastcache=<?php echo $vars['config']->lastcache; ?>&viewtype=<?php echo $vars['view']; ?>" type="text/css" /> + <link rel="stylesheet" href="<?php echo elgg_get_site_url(); ?>_css/css.css?lastcache=<?php echo $vars['config']->lastcache; ?>&viewtype=<?php echo $vars['view']; ?>" type="text/css" /> <!--[if IE 6]> - <link rel="stylesheet" type="text/css" href="<?php echo $vars['url']; ?>views/default/css_ie6.php" /> + <link rel="stylesheet" type="text/css" href="<?php echo elgg_get_site_url(); ?>views/default/css_ie6.php" /> <![endif]--> <!--[if gt IE 6]> - <link rel="stylesheet" type="text/css" href="<?php echo $vars['url']; ?>views/default/css_ie.php" /> + <link rel="stylesheet" type="text/css" href="<?php echo elgg_get_site_url(); ?>views/default/css_ie.php" /> <![endif]--> <?php echo elgg_view('metatags', $vars); diff --git a/views/default/page_elements/html_begin_admin.php b/views/default/page_elements/html_begin_admin.php index a35cafb3f..34a70b60e 100644 --- a/views/default/page_elements/html_begin_admin.php +++ b/views/default/page_elements/html_begin_admin.php @@ -17,12 +17,12 @@ $release = get_version(true); <meta name="ElggRelease" content="<?php echo $release; ?>" /> <meta name="ElggVersion" content="<?php echo $version; ?>" /> <title><?php echo $vars['config']->sitename; echo " ".elgg_echo('admin'); ?></title> - <link rel="shortcut icon" href="<?php echo $vars['url']; ?>_graphics/favicon.ico" /> + <link rel="shortcut icon" href="<?php echo elgg_get_site_url(); ?>_graphics/favicon.ico" /> - <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-1.4.2.min.js"></script> - <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-ui-1.7.2.min.js"></script> - <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery.form.js"></script> - <script type="text/javascript" src="<?php echo $vars['url']; ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&js=initialise_elgg&viewtype=<?php echo $vars['view']; ?>"></script> + <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery-1.4.2.min.js"></script> + <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery-ui-1.7.2.min.js"></script> + <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.form.js"></script> + <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&js=initialise_elgg&viewtype=<?php echo $vars['view']; ?>"></script> <?php echo $feedref; @@ -31,7 +31,7 @@ $release = get_version(true); } ?> <!-- include the admin css file - <link rel="stylesheet" href="<?php echo $vars['url']; ?>views/default/css_admin.php" type="text/css" />--> + <link rel="stylesheet" href="<?php echo elgg_get_site_url(); ?>views/default/css_admin.php" type="text/css" />--> </head> <body> |