[Fusionforge-commits] r8881 - in trunk/gforge/www: . docman include my themes/gforge themes/gforge-simple-theme themes/lite themes/osx tracker

Roland Mas lolando at libremir.placard.fr.eu.org
Fri Feb 26 14:30:17 CET 2010


Author: lolando
Date: 2010-02-26 14:30:16 +0100 (Fri, 26 Feb 2010)
New Revision: 8881

Modified:
   trunk/gforge/www/docman/index.php
   trunk/gforge/www/include/Layout.class.php
   trunk/gforge/www/index_std.php
   trunk/gforge/www/my/index.php
   trunk/gforge/www/themes/gforge-simple-theme/Theme.class.php
   trunk/gforge/www/themes/gforge/Theme.class.php
   trunk/gforge/www/themes/lite/Theme.class.php
   trunk/gforge/www/themes/osx/Theme.class.php
   trunk/gforge/www/tracker/detail.php
   trunk/gforge/www/tracker/mod-limited.php
   trunk/gforge/www/tracker/mod.php
Log:
Use URIs rather than URLs for images and CSS, so that they're not fetched over HTTPS if the page itself is in plain HTTP

Modified: trunk/gforge/www/docman/index.php
===================================================================
--- trunk/gforge/www/docman/index.php	2010-02-26 12:39:03 UTC (rev 8880)
+++ trunk/gforge/www/docman/index.php	2010-02-26 13:30:16 UTC (rev 8881)
@@ -131,11 +131,11 @@
 	}
 	?>
 	<script language="JavaScript"><!--
-	var myThemeXPBase = "<?php echo util_make_url ('/jscook/ThemeXP/'); ?>";
+	var myThemeXPBase = "<?php echo util_make_uri ('/jscook/ThemeXP/'); ?>";
 	--></script>
-	<script language="JavaScript" src="<?php echo util_make_url ('/jscook/JSCookTree.js'); ?>"></script>
-	<link rel="stylesheet" href="<?php echo util_make_url ('/jscook/ThemeXP/theme.css'); ?>" type="text/css" />
-	<script src="<?php echo util_make_url ('/jscook/ThemeXP/theme.js'); ?>" type="text/javascript"></script>
+	<script language="JavaScript" src="<?php echo util_make_uri ('/jscook/JSCookTree.js'); ?>"></script>
+	<link rel="stylesheet" href="<?php echo util_make_uri ('/jscook/ThemeXP/theme.css'); ?>" type="text/css" />
+	<script src="<?php echo util_make_uri ('/jscook/ThemeXP/theme.js'); ?>" type="text/javascript"></script>
 
 	<br>
 	<form action="">

Modified: trunk/gforge/www/include/Layout.class.php
===================================================================
--- trunk/gforge/www/include/Layout.class.php	2010-02-26 12:39:03 UTC (rev 8880)
+++ trunk/gforge/www/include/Layout.class.php	2010-02-26 13:30:16 UTC (rev 8881)
@@ -51,7 +51,7 @@
 		$this->themeroot = $GLOBALS['sys_themeroot'].$GLOBALS['sys_theme'];
 		/* if images directory exists in theme, then use it as imgroot */
 		if (file_exists ($this->themeroot.'/images')){
-			$this->imgroot = util_make_url ('/themes/'.$GLOBALS['sys_theme'].'/images/');
+			$this->imgroot = util_make_uri ('/themes/'.$GLOBALS['sys_theme'].'/images/');
 		}
         
 		$this->Error();
@@ -125,7 +125,7 @@
 		$theme_cssfile = $this->themeroot . '/css/'.$GLOBALS['sys_theme'].'.css';
 		if (file_exists($theme_cssfile)){
 			echo '
-	<link rel="stylesheet" type="text/css" href="'.util_make_url ('/themes/'.$GLOBALS['sys_theme'].'/css/'.$GLOBALS['sys_theme'].'.css').'"/>';
+	<link rel="stylesheet" type="text/css" href="'.util_make_uri ('/themes/'.$GLOBALS['sys_theme'].'/css/'.$GLOBALS['sys_theme'].'.css').'"/>';
 		} else {
 		/* if this is not our case, then include the compatibility stylesheet
    		that contains all removed styles from the code and check if a
@@ -133,11 +133,11 @@
    		Used for compatibility with existing stylesheets
 		*/
 			echo '
-	<link rel="stylesheet" type="text/css" href="'.util_make_url ('/themes/css/gforge-compat.css').'" />';
+	<link rel="stylesheet" type="text/css" href="'.util_make_uri ('/themes/css/gforge-compat.css').'" />';
 			$theme_cssfile = $this->themeroot . '/css/theme.css';
 			if (file_exists($theme_cssfile)){
 				echo '
-	<link rel="stylesheet" type="text/css" href="'.util_make_url ('/themes/'.$GLOBALS['sys_theme'].'/css/theme.css').'" />';
+	<link rel="stylesheet" type="text/css" href="'.util_make_uri ('/themes/'.$GLOBALS['sys_theme'].'/css/theme.css').'" />';
 			}
 		}
 		plugin_hook ('cssfile',$this);
@@ -281,7 +281,7 @@
 
 <!-- PLEASE LEAVE "Powered By FusionForge" on your site -->
 <div align="right">
-<a href="http://fusionforge.org/"><img src="<?php echo util_make_url ('/images/pow-fusionforge.png'); ?>" alt="Powered By FusionForge" border="0" /></a>
+<a href="http://fusionforge.org/"><img src="<?php echo util_make_uri ('/images/pow-fusionforge.png'); ?>" alt="Powered By FusionForge" border="0" /></a>
 </div>
 
 <?php

Modified: trunk/gforge/www/index_std.php
===================================================================
--- trunk/gforge/www/index_std.php	2010-02-26 12:39:03 UTC (rev 8880)
+++ trunk/gforge/www/index_std.php	2010-02-26 13:30:16 UTC (rev 8881)
@@ -5,7 +5,7 @@
 <table id="bd" class="width-100p100" summary="">
 <tr>
 <td id="bd-col1">
-	<h2 id="title-home-page"><img src="<?php echo util_make_url ('/images/fusionforge-resized.png') ?>" alt="FusionForge"/></h2>
+	<h2 id="title-home-page"><img src="<?php echo util_make_uri ('/images/fusionforge-resized.png') ?>" alt="FusionForge"/></h2>
 	  <h3><?php print _('FusionForge helps you manage the entire development life cycle'); ?></h3>
 <p>
 

Modified: trunk/gforge/www/my/index.php
===================================================================
--- trunk/gforge/www/my/index.php	2010-02-26 12:39:03 UTC (rev 8880)
+++ trunk/gforge/www/my/index.php	2010-02-26 13:30:16 UTC (rev 8881)
@@ -39,7 +39,7 @@
 	echo site_user_header(array('title'=>sprintf(_('Personal Page For %s'),user_getname())));
 	?>
 
-<script type="text/javascript" src="<?php echo util_make_url ('/tabber/tabber.js'); ?>"></script>
+<script type="text/javascript" src="<?php echo util_make_uri ('/tabber/tabber.js'); ?>"></script>
 <div id="tabber" class="tabber tabber-user-homepage" <?php plugin_hook('call_user_js');?>>
 <?php if ($GLOBALS['sys_use_tracker']) { ?>
 <div class="tabbertab" 

Modified: trunk/gforge/www/themes/gforge/Theme.class.php
===================================================================
--- trunk/gforge/www/themes/gforge/Theme.class.php	2010-02-26 12:39:03 UTC (rev 8880)
+++ trunk/gforge/www/themes/gforge/Theme.class.php	2010-02-26 13:30:16 UTC (rev 8881)
@@ -2,7 +2,7 @@
 
 require_once $gfwww.'include/Layout.class.php';
 
-define('THEME_DIR', util_make_url ('/themes/gforge'));
+define('THEME_DIR', util_make_uri ('/themes/gforge'));
 
 define('TOP_TAB_HEIGHT', 30);
 define('BOTTOM_TAB_HEIGHT', 22);
@@ -49,8 +49,8 @@
 		<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<title>'. $params['title'] . '</title>
-		<link rel="icon" type="image/png" href="'. util_make_url('/images/icon.png') .'" />
-		<link rel="shortcut icon" type="image/png" href="'. util_make_url('/images/icon.png') .'" />';
+		<link rel="icon" type="image/png" href="'. util_make_uri('/images/icon.png') .'" />
+		<link rel="shortcut icon" type="image/png" href="'. util_make_uri('/images/icon.png') .'" />';
 
         echo $this->headerLink();
 
@@ -133,7 +133,7 @@
 			<!-- PLEASE LEAVE "Powered By FusionForge" on your site -->
 			<div class="align-right">
 			<a href="http://fusionforge.org/">
-			<img src="'. util_make_url ('/images/pow-fusionforge.png') .'" alt="Powered By FusionForge" />
+			<img src="'. util_make_uri ('/images/pow-fusionforge.png') .'" alt="Powered By FusionForge" />
 			</a></div>
 			';
 
@@ -153,7 +153,7 @@
         echo '
 		<link href="http://yui.yahooapis.com/2.6.0/build/reset-fonts-grids/reset-fonts-grids.css" type="text/css" rel="stylesheet" />
 		<link href="http://yui.yahooapis.com/2.6.0/build/base/base-min.css"	type="text/css" rel="stylesheet" />
-		<link rel="stylesheet" type="text/css" href="'. util_make_url ('/themes/css/fusionforge.css') .'" />
+		<link rel="stylesheet" type="text/css" href="'. util_make_uri ('/themes/css/fusionforge.css') .'" />
 		<link rel="stylesheet" type="text/css" href="'. THEME_DIR .'/css/theme.css" />
 		<link rel="stylesheet" type="text/css" href="'. THEME_DIR .'/css/theme-pages.css" />
 		';

Modified: trunk/gforge/www/themes/gforge-simple-theme/Theme.class.php
===================================================================
--- trunk/gforge/www/themes/gforge-simple-theme/Theme.class.php	2010-02-26 12:39:03 UTC (rev 8880)
+++ trunk/gforge/www/themes/gforge-simple-theme/Theme.class.php	2010-02-26 13:30:16 UTC (rev 8881)
@@ -100,7 +100,7 @@
 		$theme_cssfile=$GLOBALS['sys_themeroot'].$GLOBALS['sys_theme'].'/css/'.$GLOBALS['sys_theme'].'.css';
 		if (file_exists($theme_cssfile)){
 			echo '
-<link rel="stylesheet" type="text/css" href="'.util_make_url ('/themes/'.$GLOBALS['sys_theme'].'/css/'.$GLOBALS['sys_theme'].'.css').'"/>';
+<link rel="stylesheet" type="text/css" href="'.util_make_uri ('/themes/'.$GLOBALS['sys_theme'].'/css/'.$GLOBALS['sys_theme'].'.css').'"/>';
 		}
 		?>
 
@@ -198,7 +198,7 @@
 }
 function footerEnd($params) { ?> <!-- PLEASE LEAVE "Powered By FusionForge" on your site -->
 <div id="footer"><a href="http://fusionforge.org/"><img
-	src="<?php echo util_make_url ('/images/pow-fusionforge.png'); ?>"
+	src="<?php echo util_make_uri ('/images/pow-fusionforge.png'); ?>"
 	alt="Powered By FusionForge"
 	border="0" /></a>
 </div>

Modified: trunk/gforge/www/themes/lite/Theme.class.php
===================================================================
--- trunk/gforge/www/themes/lite/Theme.class.php	2010-02-26 12:39:03 UTC (rev 8880)
+++ trunk/gforge/www/themes/lite/Theme.class.php	2010-02-26 13:30:16 UTC (rev 8881)
@@ -79,7 +79,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 	<title><?php echo $params['title']; ?></title>
 	<?php $this->headerLink(); ?>
-	<link rel="stylesheet" type="text/css" href="<?php echo util_make_url ('/themes/lite/css/theme.css'); ?>" />
+	<link rel="stylesheet" type="text/css" href="<?php echo util_make_uri ('/themes/lite/css/theme.css'); ?>" />
 	<script type="text/javascript">
 	<!--
 	function help_window(helpurl) {
@@ -176,7 +176,7 @@
 <!-- PLEASE LEAVE "Powered By FusionForge" on your site -->
 <br />
 <div align="right">
-<a href="http://fusionforge.org/"><img src="<?php echo util_make_url ('/images/pow-fusionforge.png'); ?>" alt="Powered By FusionForge" border="0" /></a>
+<a href="http://fusionforge.org/"><img src="<?php echo util_make_uri ('/images/pow-fusionforge.png'); ?>" alt="Powered By FusionForge" border="0" /></a>
 </div>
 
 </body>

Modified: trunk/gforge/www/themes/osx/Theme.class.php
===================================================================
--- trunk/gforge/www/themes/osx/Theme.class.php	2010-02-26 12:39:03 UTC (rev 8880)
+++ trunk/gforge/www/themes/osx/Theme.class.php	2010-02-26 13:30:16 UTC (rev 8881)
@@ -61,7 +61,7 @@
 
 		$this->headerStart($params); ?>
 
-<link rel="stylesheet" type="text/css" href="<?php echo util_make_url ('/themes/osx/css/theme.css'); ?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo util_make_uri ('/themes/osx/css/theme.css'); ?>" />
 <body>
 
 <table border="0" width="100%" cellspacing="0" cellpadding="0">

Modified: trunk/gforge/www/tracker/detail.php
===================================================================
--- trunk/gforge/www/tracker/detail.php	2010-02-26 12:39:03 UTC (rev 8880)
+++ trunk/gforge/www/tracker/detail.php	2010-02-26 13:30:16 UTC (rev 8881)
@@ -76,7 +76,7 @@
 			<?php echo $ah->showDetails(); ?>
 		</td></tr>
 </table>
-<script type="text/javascript" src="<?php echo util_make_url('/tabber/tabber.js') ?>"></script>
+<script type="text/javascript" src="<?php echo util_make_uri('/tabber/tabber.js') ?>"></script>
 
 <div id="tabber" class="tabber">
 <div class="tabbertab" title="<?php echo _('Followups'); ?>">

Modified: trunk/gforge/www/tracker/mod-limited.php
===================================================================
--- trunk/gforge/www/tracker/mod-limited.php	2010-02-26 12:39:03 UTC (rev 8880)
+++ trunk/gforge/www/tracker/mod-limited.php	2010-02-26 13:30:16 UTC (rev 8881)
@@ -122,7 +122,7 @@
 		<?php echo $ah->showDetails(); ?>
 	</td></tr>
 </table>
-<script type="text/javascript" src="<?php echo util_make_url('/tabber/tabber.js') ?>"></script>
+<script type="text/javascript" src="<?php echo util_make_uri('/tabber/tabber.js') ?>"></script>
 <div id="tabber" class="tabber">
 <div class="tabbertab" title="<?php echo _('Followups');?>">
 <table border="0" width="80%">

Modified: trunk/gforge/www/tracker/mod.php
===================================================================
--- trunk/gforge/www/tracker/mod.php	2010-02-26 12:39:03 UTC (rev 8880)
+++ trunk/gforge/www/tracker/mod.php	2010-02-26 13:30:16 UTC (rev 8881)
@@ -177,7 +177,7 @@
 </table>
 <br />
 <br />
-<script type="text/javascript" src="<?php echo util_make_url('/tabber/tabber.js') ?>"></script>
+<script type="text/javascript" src="<?php echo util_make_uri('/tabber/tabber.js') ?>"></script>
 <div id="tabber" class="tabber">
 <div class="tabbertab" title="<?php echo _('Followups'); ?>">
 <table border="0" width="80%">




More information about the Fusionforge-commits mailing list