[evolvis-commits] r17244: merge bm:taramir51/patches/theme-evolvis

mirabilos at evolvis.org mirabilos at evolvis.org
Mon May 16 13:35:17 CEST 2011


Author: mirabilos
Date: 2011-05-16 13:35:17 +0200 (Mon, 16 May 2011)
New Revision: 17244

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php
Log:
merge bm:taramir51/patches/theme-evolvis

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php	2011-05-13 16:14:31 UTC (rev 17243)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php	2011-05-16 11:35:17 UTC (rev 17244)
@@ -221,10 +221,13 @@
 			}
 		}
 		/* rightnav end */
+		echo "<!-- ]internal_header -->\n";
 	}
 
 	function footer($params) {
 		global $group_id;
+
+		echo "\n<!-- footer[ -->\n";
 		/* rightnav start */
 		if ($this->rightnav == true) {
 			echo '</td><td class="project_info"><div class="hidePartForPrinting">';
@@ -246,6 +249,7 @@
 	{
 		global $gfcommon;
 
+		echo "\n<!-- write_rightnav[ -->\n";
 		require_once('www/news/news_utils.php');
 		require_once('www/include/trove.php');
 		require_once('www/include/project_summary.php');
@@ -401,6 +405,7 @@
 		// ######################## (end)
 
 		echo $this->boxBottom();
+		echo "<!-- ]write_rightnav -->\n";
 	}
 
 	/**
@@ -412,17 +417,18 @@
 	 */
 	function boxTop($title) {
 		return '
-		<!-- boxTop -->
+		<!-- boxTop[ -->
 		<table cellspacing="2" cellpadding="0" width="100%" border="0" class="hidePartForPrinting">
 		<tr class="ff">
 		<td class="ff">
-
-			<table cellspacing="2" cellpadding="0" width="100%" border="0" >
+			<table cellspacing="2" cellpadding="0" width="100%" border="0">
 				<tr class="titlebar">
 					<td class="ff" colspan="2">'.$title.'</td>
 				</tr>
 				<tr class="ff" align="left" bgcolor="'. $this->COLOR_HTMLBOX_BACK .'">
-					<td class="ff" colspan="2" height="1"></td></tr><tr class="ff" align="left"><td class="ff" colspan="2">';
+					<td class="ff" colspan="2" height="1"></td>
+				</tr>
+				<tr class="ff" align="left"><td class="ff" colspan="2"><!-- ]boxTop -->';
 	}
 
 	/**
@@ -433,14 +439,16 @@
 	 */
 	function boxMiddle($title) {
 		return '
-				<!-- boxMiddle -->
+				<!-- boxMiddle[ -->
 				</td>
 				</tr>
 				<tr class="titlebar">
 					<td class="ff" colspan="2"><span>'.$title.'</span></td>
 				</tr>
 				<tr class="ff" align="left" bgcolor="'. $this->COLOR_HTMLBOX_BACK .'">
-					<td class="ff" colspan="2" height="1"></td></tr><tr class="ff"><td class="ff" colspan="2">';
+					<td class="ff" colspan="2" height="1"></td>
+				</tr>
+				<tr class="ff"><td class="ff" colspan="2"><!-- ]boxMiddle -->';
 	}
 
 	/**
@@ -465,13 +473,13 @@
 	 * @param	bool	Whether to echo or return the results
 	 */
 	function boxBottom() {
-		return '<!-- boxBottom -->
+		return '<!-- boxBottom[ -->
 					</td>
 				</tr>
 			</table>
 		</td>
 		</tr>
-		</table>';
+		</table><!-- ]boxBottom -->'."\n";
 	}
 
 	/**
@@ -482,7 +490,7 @@
 	 */
 	function listTableTop ($title_arr,$links_arr=false) {
 		$return = '
-		<!-- listTableTop -->
+		<!-- listTableTop[ -->
 		<table cellspacing="0" cellpadding="1" width="100%" border="0">
 		<tr class="ff"><td class="ff">
 		<table width="100%" border="0" cellspacing="2" cellpadding="0">
@@ -507,7 +515,7 @@
 		<tr class="ff" align="left" bgcolor="'. $this->COLOR_HTMLBOX_BACK .'">
 		<td class="ff" colspan="'.$count.'" height="1"><img src="'.$this->imgroot.'clear.png" height="1" width="1" alt="" /></td>
 		</tr>
-		</tfoot><tbody>';
+		</tfoot><tbody><!-- ]listTableTop -->'."\n";
 		return $return;
 	}
 
@@ -519,7 +527,7 @@
 	 */
 	function listTableTopSortable ($title_arr,$links_arr=false) {
 		$return = '
-		<!-- listTableTop -->
+		<!-- listTableTopSortable[ -->
 		<table cellspacing="0" cellpadding="1" width="100%" border="0">
 		<tr class="ff"><td class="ff">
 		<table class="sortable" width="100%" border="0" cellspacing="2" cellpadding="0">
@@ -544,12 +552,12 @@
 		<tfoot><tr class="ff" align="left" bgcolor="'. $this->COLOR_HTMLBOX_BACK .'">
 		<td class="ff" colspan="'.$count.'" height="1"><img src="'.$this->imgroot.'clear.png" height="1" width="1" alt="" /></td>
 		</tr></tfoot>
-		<tbody>';
+		<tbody><!-- ]listTableTopSortable -->'."\n";
 		return $return;
 	}
 
 	function listTableBottom() {
-		return "</tbody></table></td></tr></table>\n";
+		return "<!-- listTableBottom[ --></tbody></table></td></tr></table><!-- ]listTableBottom -->\n";
 	}
 
 



More information about the evolvis-commits mailing list