[evolvis-commits] r12687: Applied patch [#5633] Php notices produced by themes

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 01:56:01 CET 2011


Author: mirabilos
Date: 2011-02-28 01:56:01 +0100 (Mon, 28 Feb 2011)
New Revision: 12687

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/gforge-simple-theme/Theme.class.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/gforge-simple-theme/css/gforge-simple-theme.css
   trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/lite/Theme.class.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/osx/Theme.class.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/ultralite/Theme.class.php
Log:
Applied patch [#5633] Php notices produced by themes

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/gforge-simple-theme/Theme.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/gforge-simple-theme/Theme.class.php	2011-02-28 00:55:59 UTC (rev 12686)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/gforge-simple-theme/Theme.class.php	2011-02-28 00:56:01 UTC (rev 12687)
@@ -165,7 +165,7 @@
 ?>
 </div>
 
-<div id="content"><br />
+<div id="headercontent"><br />
 <?php echo $this->searchBox();
 ?></div>
 
@@ -611,12 +611,12 @@
 		if ($selected==$i){
 			$this->selected_title = $TABS_TITLES[$i];
 			$this->selected_dir = $TABS_DIRS[$i];
-			$this->selected_id = $TABS_IDS[$i];
+			//$this->selected_id = $TABS_IDS[$i];
 			$return .= util_make_link ($TABS_DIRS[$i],$TABS_TITLES[$i],array('id'=>'gforge-project-selected'));
 
 		}
 		else{
-			if ($TABS_IDS[$i]==''){
+			if (!isset($TABS_IDS[$i]) || $TABS_IDS[$i]==''){
 				$return .= util_make_link ($TABS_DIRS[$i],$TABS_TITLES[$i],array('id'=>'gforge-project-std','title'=>$TABS_TITLES[$i]));
 
 			}

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/gforge-simple-theme/css/gforge-simple-theme.css
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/gforge-simple-theme/css/gforge-simple-theme.css	2011-02-28 00:55:59 UTC (rev 12686)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/gforge-simple-theme/css/gforge-simple-theme.css	2011-02-28 00:56:01 UTC (rev 12687)
@@ -50,11 +50,11 @@
 
 div#toolscontent{margin: 0 210px;padding: 1em 10px}
 
-div#content TEXTAREA, INPUT, SELECT, OPTION  {
+div#headercontent TEXTAREA, INPUT, SELECT, OPTION  {
 	FONT: 9px Lucida Grande, Tahoma, sans-serif;
 }
 
-div#content{margin: 0 170px;padding: 1em 10px }
+div#headercontent{margin: 0 170px;padding: 1em 10px }
 
 
 /* style for footer */

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/lite/Theme.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/lite/Theme.class.php	2011-02-28 00:55:59 UTC (rev 12686)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/lite/Theme.class.php	2011-02-28 00:56:01 UTC (rev 12687)
@@ -50,6 +50,8 @@
 		$this->FONTCOLOR_HTMLBOX_TITLE = '#C6BCBF';
 		// The content font color
 		$this->FONTCOLOR_CONTENT = '#000000';
+
+		$this->FONTSIZE='small';
 		//The smaller font size
 		$this->FONTSIZE_SMALLER='x-small';
 		//The smallest font size
@@ -142,7 +144,7 @@
 <?php
 
 
-if ($params['group']) {
+if (isset($params['group']) && $params['group']) {
 			?>
 				<div class="union_menu" >
 				</div>	
@@ -328,7 +330,7 @@
 		} else {
 		        $selected=0;
 		}
-		if (!$this->COLOR_SELECTED_TAB) {
+		if (!isset($this->COLOR_SELECTED_TAB)) {
 		        $this->COLOR_SELECTED_TAB= '#e0e0e0';
 		}
 		echo $this->tabGenerator($TABS_DIRS,$TABS_TITLES,false,$selected,$this->COLOR_SELECTED_TAB,'100%');

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/osx/Theme.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/osx/Theme.class.php	2011-02-28 00:55:59 UTC (rev 12686)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/osx/Theme.class.php	2011-02-28 00:56:01 UTC (rev 12687)
@@ -43,6 +43,13 @@
 
 		$this->Layout();
 
+		// The HTML box background color
+		$this->COLOR_HTMLBOX_BACK = '#B6B6B6';
+
+		// height of a tab (ie the size of the background image), 23 is specified in the
+		// style guide and so the background images were drawn for that size, changing
+		// this will lead to the images being cropped or tiled, either will look bad.
+		$this->TAB_HEIGHT=23;
 	}
 
 	/**
@@ -107,7 +114,7 @@
 <?php
 
 
-		  if ($params['group']) {
+		  if (isset($params['group']) && $params['group']) {
 
 ?>
 			<tr>
@@ -221,9 +228,9 @@
 			case 0:
 				return ' bgcolor="#FFFFFF"';
 			case 1:
-				return ' bgcolor="' . $this->COLOR_LTBACK1 . '"';
+				return ' bgcolor="#DDDDDD"';
 			case 2:
-				return ' bgcolor="' . $this->COLOR_LTBACK2 . '"';
+				return ' bgcolor="#B6B6B6"';
 		}
 	}
 
@@ -286,7 +293,7 @@
 		$count=count($TABS_DIRS);
 		$width=intval((100/($count+1)));
 		$space=intval($width/2);
-		$return .= '
+		$return = '
 
 		<!-- tabGenerator -->
 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/ultralite/Theme.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/ultralite/Theme.class.php	2011-02-28 00:55:59 UTC (rev 12686)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/ultralite/Theme.class.php	2011-02-28 00:56:01 UTC (rev 12687)
@@ -62,7 +62,7 @@
 		<p align=left>
 		<?php echo $this->outerTabs($params); ?>
 		<?php
-		if ($params['group']) {
+		if (isset($params['group']) && $params['group']) {
 		?>
 		<?php
 		echo $this->projectTabs($params['toptab'],$params['group']);



More information about the evolvis-commits mailing list