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

mirabilos at evolvis.org mirabilos at evolvis.org
Thu May 12 14:15:30 CEST 2011


Author: mirabilos
Date: 2011-05-12 14:15:30 +0200 (Thu, 12 May 2011)
New Revision: 17212

Added:
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/category.png
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/docman
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/acl_roles20.png
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/btn_down.png
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/btn_up.png
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/close.png
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/forum_move.gif
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/spinner.gif
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/tag.png
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/toggle_minus.png
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/toggle_plus.png
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/layout
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/notes.png
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/spacer.gif
Modified:
   trunk/gforge_base/evolvisforge-5.1/src/www/index_std.php
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/css/evolvis.css
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/bottomtab-new
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/header
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/forum_add.gif
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/forum_delete.gif
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/forum_edit.gif
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/wiki20g.png
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/toptab-new
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/template.class
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/viewvc
Log:
merge bm:taramir51/patches/theme-evolvis

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/index_std.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/index_std.php	2011-05-09 14:47:15 UTC (rev 17211)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/index_std.php	2011-05-12 12:15:30 UTC (rev 17212)
@@ -13,7 +13,7 @@
 	  <?php print _('FusionForge has tools to help your team collaborate, like message forums and mailing lists; tools to create and control access to Source Code Management repositories like CVS and Subversion. FusionForge automatically creates a repository and controls access to it depending on the role settings of the project.'); ?>
 <?php }
 else { ?>
-	<h2 id="title-home-page"><img src="<?php echo util_make_uri ('/images/fusionforge-resized.png') ?>" alt="EvolvisForge"/></h2>
+	<h2 id="title-home-page"><img src="<?php echo util_make_uri ('/themes/evolvis/images/logo_internal_repo.png') ?>" alt="EvolvisForge"/></h2>
 	  <h3><?php print _('Evolvis – Make it into a project!'); ?></h3>
 <p>
 <?php print _('evolvis stems from the latin verb "evolvere" and means "you evolve". "Evolution" as well traces back to this word.<br />evolvis.org is a free project platform for free software projects, the publicly available instance of the Evolvis platform provided by tarent GmbH. Here developers and other project participants can find everything that is needed for a free software project:<br />source code management, discussion board, bug tracking, release and document management, downloads and <a href="http://info.evolvis.org/">more</a>.'); ?>

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/themes/css/evolvis.css
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/css/evolvis.css	2011-05-09 14:47:15 UTC (rev 17211)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/css/evolvis.css	2011-05-12 12:15:30 UTC (rev 17212)
@@ -1,7 +1,7 @@
 /**
  * Evolvis Theme main CSS file
  *
- * Copyright © 2010
+ * Copyright © 2010, 2011
  *     Thorsten “mirabilos” Glaser <t.glaser at tarent.de>
  * (and numerous others; README.Evolvis contains a list)
  * All rights reserved.
@@ -409,6 +409,14 @@
 	font-family:sans-serif;
 }
 
+#bd-col1 {
+	width:65%;
+}
+
+#bd-col2 {
+	width:35%;
+}
+
 #ffErrors {
 	z-index:10;
 	position:absolute;

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-09 14:47:15 UTC (rev 17211)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php	2011-05-12 12:15:30 UTC (rev 17212)
@@ -1,7 +1,8 @@
 <?php
 /* Evolvis theme for Tarent GmbH
  * heavily modified version of the Mac OS X like theme.
- * Copyright (c) 2009, 2010 Thorsten Glaser <t.glaser at tarent.de>
+ * Copyright (c) 2009, 2010, 2011
+ *	Thorsten Glaser <t.glaser at tarent.de>
  * Copyright (c) 2007 Thorsten Glaser <t.glaser at aurisp.de>
  *	on behalf of Tarent GmbH
  * Copyright (c) 2007 Waldemar Brodkorb <w.brodkorb at tarent.de>
@@ -30,9 +31,10 @@
 
  *
  * Based on the "debian" theme, which is apparantly :-
- * 		Copyright 1999-2001 (c) VA Linux Systems
+ *		Copyright 1999-2001 (c) VA Linux Systems
  *
  */
+
 //for all subpages available:
 //array for directories that need right navi:
 $right_navarr[]='/forum';
@@ -45,6 +47,7 @@
 $right_navarr[]='/frs';
 $right_navarr[]='/project/admin';
 $right_navarr[]='/projects';
+
 class Theme extends Layout {
 
 	/**
@@ -80,7 +83,8 @@
 		//The HTML box title font size
 		$this->FONTSIZE_HTMLBOX_TITLE = 'x-small';
 
-// new variables introduced by this theme...
+		// new variables introduced by this theme...
+
 		// background image
 		//$this->BACKGROUND= 'background.png';
 
@@ -89,7 +93,6 @@
 		// this will lead to the images being cropped or tiled, either will look bad.
 		$this->TAB_HEIGHT=23;
 
-
 		// the following are not used in this theme, but have been set to obnoxious
 		// colors to help debug any new pages that make assumptions about a theme...
 		// The content background color
@@ -103,7 +106,7 @@
 		//standard evolvis color
 		$this->EVOLVIS_COLOR='#CC0E08';
 		$this->EVOLVIS_BG_COLOR='#bebebe';
-		$this->allvar=array( 	'imgroot' => '/themes/evolvis/images/',
+		$this->allvar=array(	'imgroot' => '/themes/evolvis/images/',
 					'imgproj' => '/themes/evolvis/images/proj/',
 					'COLOR_HTMLBOX_BACK' => '#FFFFFF',
 					'COLOR_HTMLBOX_SEP' => '#000000',
@@ -163,7 +166,8 @@
 		$tpl_input['lang_getText_common_myaccount'] = _('My Account');
 		$tpl_input['lang_getText_menu_mypage'] = _('My Page');
 
-		####Head-Variablen####
+		// ####Head-Variablen####
+
 		$tpl_input['outerTabs']=$this->outerTabs($params,0);
 		if (isset($params['group'])) {
 			$tpl_input['projectTabs'] = $this->projectTabs($params['toptab'],$params['group']);
@@ -177,8 +181,8 @@
 					$tpl_input['publicName'] = "<div id=\"project_name\">Project: ".$this->project->getPublicName()."<hr class=\"hidePartForPrinting\" /></div>";
 				}
 		}
-		
-		if( eregi("(msie) ([0-9]{1,2}.[0-9]{1,3})",$_SERVER['HTTP_USER_AGENT'],$regs) )  {
+
+		if (eregi("(msie) ([0-9]{1,2}.[0-9]{1,3})",$_SERVER['HTTP_USER_AGENT'],$regs)) {
 			$tpl_input['ie']='_ie';
 		}
 		$this->template->assign_vars($tpl_input);
@@ -197,37 +201,33 @@
 				 * as black-on-white always, no matter the
 				 * style, when leaving the select’s focus.
 				 */
-				echo "\n<style type=\"text/css\">
-	option { background-color:black; color:white; }</style>\n";
+				echo "\n<style type=\"text/css\">\n" .
+				    "	option { background-color:black; color:white; }</style>\n";
 			}
 			echo "\n</head><body>\n";
 		}
 		$this->template->pparse('body');
-/* rightnav start by rklein */
-		if (isset($this->project) && is_object($this->project) && !$this->project->isError() && $this->project->isProject())
-		{
-			foreach($right_navarr AS $dir)
-			{
-				if(strpos($_SERVER['REQUEST_URI'], $dir)===0)
-				{
+		/* rightnav start by rklein */
+		if (isset($this->project) && is_object($this->project) && !$this->project->isError() && $this->project->isProject()) {
+			foreach ($right_navarr AS $dir) {
+				if (strpos($_SERVER['REQUEST_URI'], $dir) === 0) {
 					$this->rightnav=true;
 					echo '<table class="project_papa"><tr class="ff"><td class="project_content">';
 				}
 			}
 		}
-/* rightnav end */
+		/* rightnav end */
 	}
 
 	function footer($params) {
 		global $group_id;
-/* rightnav start */
-		if($this->rightnav==true)
-		{
+		/* rightnav start */
+		if ($this->rightnav == true) {
 			echo '</td><td class="project_info"><div class="hidePartForPrinting">';
 			$this->write_rightnav($group_id);
 			echo '</div></td></tr></table>';
 		}
-/* rightnav end */
+		/* rightnav end */
 		$tpl_input['SCRIPT_NAME']='';
 		if (forge_get_config ('show_source')) {
 			$tpl_input['SCRIPT_NAME']='<a class="showsource" href="/source.php?file=' . getStringFromServer('SCRIPT_NAME') . '">Show Source</a>';
@@ -237,7 +237,7 @@
 		$this->template->pparse('footer');
 	}
 
-//function write_rightnav by rklein
+	//function write_rightnav by rklein
 	function write_rightnav($group_id)
 	{
 		require_once('www/news/news_utils.php');
@@ -257,12 +257,6 @@
 		print html_image('ic/home16b.png','20','20',array('alt'=>_('Home Page')));
 		print ' '._('Project Home Page').'</a>';
 
-		// ################# old-style (external) wiki
-
-		if (!empty($this->wikilink)) {
-			echo '<br /><a href="'.$this->wikilink.'">'.html_image('ic/wiki.png','20','20',array('alt'=>'wiki')).' Wiki</a>';
-		}
-
 		// ################## ArtifactTypes
 
 		// CB hide tracker if desired
@@ -391,9 +385,9 @@
 	/**
 	 * boxTop() - Top HTML box
 	 *
-	 * @param   string  Box title
-	 * @param   bool	Whether to echo or return the results
-	 * @param   string  The box background color
+	 * @param	string	Box title
+	 * @param	bool	Whether to echo or return the results
+	 * @param	string	The box background color
 	 */
 	function boxTop($title) {
 		return '
@@ -413,8 +407,8 @@
 	/**
 	 * boxMiddle() - Middle HTML box
 	 *
-	 * @param   string  Box title
-	 * @param   string  The box background color
+	 * @param	string	Box title
+	 * @param	string	The box background color
 	 */
 	function boxMiddle($title) {
 		return '
@@ -431,7 +425,7 @@
 	/**
 	 * boxGetAltRowStyle() - Get an alternating row style for tables
 	 *
-	 * @param			   int			 Row number
+	 * @param	int	Row number
 	 */
 	function boxGetAltRowStyle($i) {
 		switch ($i % 3 ) {
@@ -447,7 +441,7 @@
 	/**
 	 * boxBottom() - Bottom HTML box
 	 *
-	 * @param   bool	Whether to echo or return the results
+	 * @param	bool	Whether to echo or return the results
 	 */
 	function boxBottom() {
 		return '<!-- boxBottom -->
@@ -462,13 +456,13 @@
 	/**
 	 * listTableTop() - Takes an array of titles and builds the first row of a new table.
 	 *
-	 * @param		array   The array of titles
-	 * @param    	array   The array of title links
+	 * @param	array	The array of titles
+	 * @param	array	The array of title links
 	 */
 	function listTableTop ($title_arr,$links_arr=false) {
 		$return = '
 		<!-- listTableTop -->
-		<table  cellspacing="0" cellpadding="1" width="100%" border="0">
+		<table cellspacing="0" cellpadding="1" width="100%" border="0">
 		<tr class="ff"><td class="ff">
 		<table width="100%" border="0" cellspacing="2" cellpadding="0">
 		<thead>
@@ -478,12 +472,12 @@
 		if ($links_arr) {
 			for ($i=0; $i<$count; $i++) {
 				$return .= '
-                <td class="ff" align="left"><a class="titlebar" href="'.$links_arr[$i].'">'.$title_arr[$i].'</a></td>';
+		<td class="ff" align="left"><a class="titlebar" href="'.$links_arr[$i].'">'.$title_arr[$i].'</a></td>';
 			}
 		} else {
 			for ($i=0; $i<$count; $i++) {
 				$return .= '
-                <td align="left" class="list_table_top">'.$title_arr[$i].'</td>';
+		<td align="left" class="list_table_top">'.$title_arr[$i].'</td>';
 			}
 		}
 		$return .= '
@@ -496,42 +490,42 @@
 		return $return;
 	}
 
-        /**
-         * listTableTopSortable() - Takes an array of titles and builds the first row of a new table and table is sortable.
-         *
-         * @param          array   The array of titles
-         * @param          array   The array of title links
-         */
-        function listTableTopSortable ($title_arr,$links_arr=false) {
-                $return = '
+	/**
+	 * listTableTopSortable() - Takes an array of titles and builds the first row of a new table and table is sortable.
+	 *
+	 * @param	array	The array of titles
+	 * @param	array	The array of title links
+	 */
+	function listTableTopSortable ($title_arr,$links_arr=false) {
+		$return = '
 		<!-- listTableTop -->
-		<table  cellspacing="0" cellpadding="1" width="100%" border="0">
+		<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">
 		<thead>
 		<tr class="ff">';
 
-                $count=count($title_arr);
-                if ($links_arr) {
-                        for ($i=0; $i<$count; $i++) {
-                                $return .= '
-                                <th class="ff" align="left"><a class="titlebar" href="'.$links_arr[$i].'">'.$title_arr[$i].'</a></th>';
-                        }
-                } else {
-                        for ($i=0; $i<$count; $i++) {
-                                $return .= '
-                                <th align="left" class="list_table_top">'.$title_arr[$i].'</th>';
-                        }
-                }
-                $return .= '
+		$count=count($title_arr);
+		if ($links_arr) {
+			for ($i=0; $i<$count; $i++) {
+				$return .= '
+				<th class="ff" align="left"><a class="titlebar" href="'.$links_arr[$i].'">'.$title_arr[$i].'</a></th>';
+			}
+		} else {
+			for ($i=0; $i<$count; $i++) {
+				$return .= '
+				<th align="left" class="list_table_top">'.$title_arr[$i].'</th>';
+			}
+		}
+		$return .= '
 		</tr>
 		</thead>
 		<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>';
-                return $return;
-        }
+		return $return;
+	}
 
 	function listTableBottom() {
 		return "</tbody></table></td></tr></table>\n";
@@ -567,7 +561,7 @@
 			$TABS_DIRS[]='/reporting/';
 			$TABS_TITLES[]=_('Reporting');
 		}
-		if (strstr($_SERVER['REQUEST_URI'],'/my/') || strstr($_SERVER['REQUEST_URI'],'/account/') || 
+		if (strstr($_SERVER['REQUEST_URI'],'/my/') || strstr($_SERVER['REQUEST_URI'],'/account/') ||
 				strstr($_SERVER['REQUEST_URI'],'/themes/') ) {
 			$selected=array_search("/my/", $TABS_DIRS);
 		} elseif (strstr($_SERVER['REQUEST_URI'],'softwaremap')) {
@@ -588,11 +582,9 @@
 			$this->COLOR_SELECTED_TAB= '#e0e0e0';
 		}
 		$GLOBALS['tabcount'] = count($TABS_DIRS);
-		if(!$write)
-		{
+		if (!$write) {
 			return $this->tabGenerator($TABS_DIRS,$TABS_TITLES,false,$selected,$this->COLOR_SELECTED_TAB,'100%',"outerTab");
-		} else
-		{
+		} else {
 			echo $this->tabGenerator($TABS_DIRS,$TABS_TITLES,false,$selected,$this->COLOR_SELECTED_TAB,'100%',"outerTab");
 		}
 	}
@@ -605,9 +597,6 @@
 	 *	@param	string	Is the group we should look up get title info
 	 */
 	function projectTabs($toptab,$group) {
-		global $sys_oldstyle_external_wiki_base,
-		    $sys_oldstyle_external_wiki_conn;
-
 		// get group info using the common result set
 		$project =& group_get_object($group);
 		if (!$project || !is_object($project)) {
@@ -626,19 +615,6 @@
 		$TABS_TITLES[]=_('Summary');
 		(($toptab == 'home') ? $selected=(count($TABS_TITLES)-1) : '' );
 
-		// Wiki (old-style separate, by Jutta Horstmann)
-		if (!empty($sys_oldstyle_external_wiki_base)) {
-			$dbconn = pg_connect($sys_oldstyle_external_wiki_conn);
-			$sql="SELECT * FROM pg_catalog.pg_namespace WHERE nspname='".str_replace("-", "", $project->getUnixName())."'";
-			$res=pg_query($dbconn, $sql);
-			if (db_numrows($res) == 1) {
-				$this->wikilink = $sys_oldstyle_external_wiki_base.$project->getUnixName()."/index.php";
-				$TABS_DIRS[] = $this->wikilink;
-				$TABS_TITLES[] = "Wiki";
-			}
-			//XXX don't we need to close the dbconn now?
-		}
-
 		if (user_ismember($group,'A')) {
 			// Project Admin
 			$TABS_DIRS[]='/project/admin/?group_id='. $group;
@@ -702,9 +678,9 @@
 		$hookParams['toptab'] = &$toptab;
 		$hookParams['selected'] = &$selected;
 		$hookParams['group_id'] = $group ;
-				
-		plugin_hook ("groupmenu_scm", $hookParams) ; 
 
+		plugin_hook ("groupmenu_scm", $hookParams) ;
+
 		// Downloads
 		if ($project->usesFRS()) {
 			$TABS_DIRS[]='/frs/?group_id='.$group;
@@ -718,11 +694,11 @@
 		$hookParams['toptab'] = &$toptab;
 		$hookParams['selected'] = &$selected;
 		$hookParams['group'] = $group;
-				
-		plugin_hook ("groupmenu", $hookParams) ; 
 
+		plugin_hook ("groupmenu", $hookParams) ;
+
 		$GLOBALS['tabcount'] = count($TABS_DIRS);
-		
+
 		//reverse array to show tabs in right order if tabs are floated to the right
 		//$TABS_DIRS = array_reverse($TABS_DIRS);
 		//$TABS_TITLES = array_reverse($TABS_TITLES);
@@ -736,14 +712,14 @@
 	 *
 	 * @param	string	the row attributes
 	 * @param	array	the array of cell data, each element is an array,
-	 *				  	the first item being the text,
-	 *					  the subsequent items are attributes
+	 *				the first item being the text,
+	 *				the subsequent items are attributes
 	 * @param	boolean is this row part of the title ?
 	 *
 	 */
 
 
-	 function multiTableRow($row_attr, $cell_data, $istitle) {
+	function multiTableRow($row_attr, $cell_data, $istitle) {
 		$return= '
 		<!-- multiTableRow -->
 		<tr class="multi_table_row" '.$row_attr;
@@ -772,23 +748,23 @@
 		';
 
 		return $return;
-	 }
+	}
 
-        function searchBox($print=1) {
-                global $words,$forum_id,$group_id,$group_project_id,$atid,$exact,$type_of_search;
+	function searchBox($print=1) {
+		global $words,$forum_id,$group_id,$group_project_id,$atid,$exact,$type_of_search;
 
-                if(get_magic_quotes_gpc()) {
-                        $defaultWords = stripslashes($words);
-                } else {
-                        $defaultWords = $words;
-                }
+		if (get_magic_quotes_gpc()) {
+			$defaultWords = stripslashes($words);
+		} else {
+			$defaultWords = $words;
+		}
 
-                // if there is no search currently, set the default
-                if ( ! isset($type_of_search) ) {
-                        $exact = 1;
-                }
+		// if there is no search currently, set the default
+		if (!isset($type_of_search)) {
+			$exact = 1;
+		}
 		if ($print) {
-			print '<div class="hidePartForPrinting" />
+			print '<div class="hidePartForPrinting">
 			<form action="/search/" method="get">';
 			$parameters = array(
 				SEARCH__PARAMETER_GROUP_ID => $group_id,
@@ -808,10 +784,6 @@
 			}
 			echo '</select>';
 
-	//              print '<br />';
-	//              print '
-	//              <input type="CHECKBOX" name="exact" value="1"'.( $exact ? ' CHECKED' : ' UNCHECKED' ).'> Require All Words';
-
 			$parameters = $searchManager->getParameters();
 			foreach($parameters AS $name => $value) {
 				print '<input type="hidden" value="'.$value.'" name="'.$name.'" />';
@@ -826,9 +798,9 @@
 					<span id="advanced_search">
 					› <a href="/search/advanced_search.php?group_id='.$group_id.'">'
 					._('Advanced search').'</a>
-					</span></div>';
+					</span>';
 			}
-			print '</form>';
+			print '</form></div>';
 			print '
 <hr />
 <form action="' . util_make_url('/pm/t_follow.php') . '" method="get">
@@ -836,7 +808,7 @@
 	name="tid" /><input type="submit" name="j" value="' . _('OK') . '" />
 </form>';
 		} else {
-			 $re= '<div class="hidePartForPrinting" />
+			$re= '<div class="hidePartForPrinting">
 				<form action="/search/" method="get">';
 			$parameters = array(
 				SEARCH__PARAMETER_GROUP_ID => $group_id,
@@ -849,20 +821,16 @@
 			$searchManager->setParametersValues($parameters);
 			$searchEngines =& $searchManager->getAvailableSearchEngines();
 
-		       $re.= '<select name="type_of_search">';
+			$re.= '<select name="type_of_search">';
 			for($i = 0, $max = count($searchEngines); $i < $max; $i++) {
 				$searchEngine =& $searchEngines[$i];
 				$re.= '<option value="'.$searchEngine->getType().'"'.( $type_of_search == $searchEngine->getType() ? ' selected="selected"' : '' ).'>'.$searchEngine->getLabel($parameters).'</option>'."\n";
 			}
 			$re.= '</select>';
 
-	//              print '<br />';
-	//              print '
-	//              <input type="CHECKBOX" name="exact" value="1"'.( $exact ? ' CHECKED' : ' UNCHECKED' ).'> Require All Words';
-
 			$parameters = $searchManager->getParameters();
 			foreach($parameters AS $name => $value) {
-			       $re.= '<input type="hidden" value="'.$value.'" name="'.$name.'" />';
+				$re.= '<input type="hidden" value="'.$value.'" name="'.$name.'" />';
 			}
 			$re.= '<input type="text" size="12" name="words" value="'.$defaultWords.'" />';
 
@@ -874,9 +842,9 @@
 					<span id="advanced_search">
 					› <a href="/search/advanced_search.php?group_id='.$group_id.'">'
 					._('Advanced search').'</a>
-					</span></div>';
+					</span>';
 			}
-			$re.='</form>';
+			$re.='</form></div>';
 			$re .= '
 <hr />
 <form action="' . util_make_url('/pm/t_follow.php') . '" method="get">
@@ -887,20 +855,20 @@
 		}
 	}
 
-    /**
-     * feedback() - returns the htmlized feedback string when an action is performed.
-     *
-     * @param string feedback string
-     * @return string htmlized feedback
-     */
-    function feedback($feedback) {
-        if (!$feedback) {
-            return '';
-        } else {
-            return '
-                <h3 style="color:red">'.strip_tags($feedback, '<br>').'</h3>';
-        }
-    }
+	/**
+	 * feedback() - returns the htmlized feedback string when an action is performed.
+	 *
+	 * @param	string	feedback string
+	 * @return	string	htmlized feedback
+	 */
+	function feedback($feedback) {
+		if (!$feedback) {
+			return '';
+		} else {
+			return '
+		<h3 style="color:red">'.strip_tags($feedback, '<br>').'</h3>';
+		}
+	}
 
 }
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/bottomtab-new
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/bottomtab-new	2011-05-09 14:47:15 UTC (rev 17211)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/bottomtab-new	2011-05-12 12:15:30 UTC (rev 17212)
@@ -1 +1 @@
-link ../../src/images/bottomtab-new
\ No newline at end of file
+link ../../gforge/images/bottomtab-new
\ No newline at end of file

Added: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/category.png
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/category.png	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/category.png	2011-05-12 12:15:30 UTC (rev 17212)
@@ -0,0 +1 @@
+link ../../gforge/images/category.png
\ No newline at end of file


Property changes on: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/category.png
___________________________________________________________________
Added: svn:special
   + *

Added: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/docman
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/docman	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/docman	2011-05-12 12:15:30 UTC (rev 17212)
@@ -0,0 +1 @@
+link ../../gforge/images/docman
\ No newline at end of file


Property changes on: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/docman
___________________________________________________________________
Added: svn:special
   + *

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/header
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/header	2011-05-09 14:47:15 UTC (rev 17211)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/header	2011-05-12 12:15:30 UTC (rev 17212)
@@ -1 +1 @@
-link ../../src/images/header
\ No newline at end of file
+link ../../gforge/images/header
\ No newline at end of file

Added: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/acl_roles20.png
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/acl_roles20.png	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/acl_roles20.png	2011-05-12 12:15:30 UTC (rev 17212)
@@ -0,0 +1 @@
+link ../../../gforge/images/ic/acl_roles20.png
\ No newline at end of file


Property changes on: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/acl_roles20.png
___________________________________________________________________
Added: svn:special
   + *

Added: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/btn_down.png
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/btn_down.png	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/btn_down.png	2011-05-12 12:15:30 UTC (rev 17212)
@@ -0,0 +1 @@
+link ../../../gforge/images/ic/btn_down.png
\ No newline at end of file


Property changes on: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/btn_down.png
___________________________________________________________________
Added: svn:special
   + *

Added: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/btn_up.png
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/btn_up.png	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/btn_up.png	2011-05-12 12:15:30 UTC (rev 17212)
@@ -0,0 +1 @@
+link ../../../gforge/images/ic/btn_up.png
\ No newline at end of file


Property changes on: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/btn_up.png
___________________________________________________________________
Added: svn:special
   + *

Added: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/close.png
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/close.png	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/close.png	2011-05-12 12:15:30 UTC (rev 17212)
@@ -0,0 +1 @@
+link ../../../gforge/images/ic/close.png
\ No newline at end of file


Property changes on: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/close.png
___________________________________________________________________
Added: svn:special
   + *

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/forum_add.gif
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/forum_add.gif	2011-05-09 14:47:15 UTC (rev 17211)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/forum_add.gif	2011-05-12 12:15:30 UTC (rev 17212)
@@ -1 +1 @@
-link ../../../src/images/ic/forum_add.gif
\ No newline at end of file
+link ../../../gforge/images/ic/forum_add.gif
\ No newline at end of file

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/forum_delete.gif
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/forum_delete.gif	2011-05-09 14:47:15 UTC (rev 17211)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/forum_delete.gif	2011-05-12 12:15:30 UTC (rev 17212)
@@ -1 +1 @@
-link ../../../src/images/ic/forum_delete.gif
\ No newline at end of file
+link ../../../gforge/images/ic/forum_delete.gif
\ No newline at end of file

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/forum_edit.gif
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/forum_edit.gif	2011-05-09 14:47:15 UTC (rev 17211)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/forum_edit.gif	2011-05-12 12:15:30 UTC (rev 17212)
@@ -1 +1 @@
-link ../../../src/images/ic/forum_edit.gif
\ No newline at end of file
+link ../../../gforge/images/ic/forum_edit.gif
\ No newline at end of file

Added: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/forum_move.gif
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/forum_move.gif	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/forum_move.gif	2011-05-12 12:15:30 UTC (rev 17212)
@@ -0,0 +1 @@
+link ../../../gforge/images/ic/forum_move.gif
\ No newline at end of file


Property changes on: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/forum_move.gif
___________________________________________________________________
Added: svn:special
   + *

Added: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/spinner.gif
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/spinner.gif	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/spinner.gif	2011-05-12 12:15:30 UTC (rev 17212)
@@ -0,0 +1 @@
+link ../../../gforge/images/ic/spinner.gif
\ No newline at end of file


Property changes on: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/spinner.gif
___________________________________________________________________
Added: svn:special
   + *

Added: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/tag.png
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/tag.png	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/tag.png	2011-05-12 12:15:30 UTC (rev 17212)
@@ -0,0 +1 @@
+link ../../../gforge/images/ic/tag.png
\ No newline at end of file


Property changes on: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/tag.png
___________________________________________________________________
Added: svn:special
   + *

Added: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/toggle_minus.png
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/toggle_minus.png	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/toggle_minus.png	2011-05-12 12:15:30 UTC (rev 17212)
@@ -0,0 +1 @@
+link ../../../gforge/images/ic/toggle_minus.png
\ No newline at end of file


Property changes on: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/toggle_minus.png
___________________________________________________________________
Added: svn:special
   + *

Added: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/toggle_plus.png
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/toggle_plus.png	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/toggle_plus.png	2011-05-12 12:15:30 UTC (rev 17212)
@@ -0,0 +1 @@
+link ../../../gforge/images/ic/toggle_plus.png
\ No newline at end of file


Property changes on: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/toggle_plus.png
___________________________________________________________________
Added: svn:special
   + *

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/wiki20g.png
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/wiki20g.png	2011-05-09 14:47:15 UTC (rev 17211)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/wiki20g.png	2011-05-12 12:15:30 UTC (rev 17212)
@@ -1 +1 @@
-link ../../../src/images/ic/wiki20g.png
\ No newline at end of file
+link ../../../gforge/images/ic/wiki20g.png
\ No newline at end of file

Added: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/layout
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/layout	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/layout	2011-05-12 12:15:30 UTC (rev 17212)
@@ -0,0 +1 @@
+link ../../gforge/images/layout
\ No newline at end of file


Property changes on: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/layout
___________________________________________________________________
Added: svn:special
   + *

Added: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/notes.png
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/notes.png	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/notes.png	2011-05-12 12:15:30 UTC (rev 17212)
@@ -0,0 +1 @@
+link ../../gforge/images/notes.png
\ No newline at end of file


Property changes on: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/notes.png
___________________________________________________________________
Added: svn:special
   + *

Added: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/spacer.gif
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/spacer.gif	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/spacer.gif	2011-05-12 12:15:30 UTC (rev 17212)
@@ -0,0 +1 @@
+link ../../gforge/images/spacer.gif
\ No newline at end of file


Property changes on: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/spacer.gif
___________________________________________________________________
Added: svn:special
   + *

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/toptab-new
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/toptab-new	2011-05-09 14:47:15 UTC (rev 17211)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/toptab-new	2011-05-12 12:15:30 UTC (rev 17212)
@@ -1 +1 @@
-link ../../src/images/toptab-new
\ No newline at end of file
+link ../../gforge/images/toptab-new
\ No newline at end of file

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/template.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/template.class	2011-05-09 14:47:15 UTC (rev 17211)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/template.class	2011-05-12 12:15:30 UTC (rev 17212)
@@ -315,7 +315,7 @@
 		$code1 = array('<?php');
 
 	    $code = preg_replace('#\{([a-z0-9\-_]*?)\}#is', '\'. ( ( isset($this->_tpldata[\'.\'][0][\'\1\']) ) ? $this->_tpldata[\'.\'][0][\'\1\'] : \'\' ).\'', $code);
-	    $code = preg_replace_callback('#\{(([a-z0-9\-_]+?\.)+?)([a-z0-9\-_]+?)\}#is', array("Template", "trans_namespaces"), $code);
+	    $code = preg_replace_callback('#\{(([a-z0-9\-_]+?\.)+?)([a-z0-9\-_]+?)\}#is', array($this, "trans_namespaces"), $code);
 	    
 	    $code = explode("\n", $code);
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/viewvc
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/viewvc	2011-05-09 14:47:15 UTC (rev 17211)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/viewvc	2011-05-12 12:15:30 UTC (rev 17212)
@@ -1 +1 @@
-link ../src/viewvc
\ No newline at end of file
+link ../gforge/viewvc
\ No newline at end of file



More information about the evolvis-commits mailing list