[evolvis-commits] r17635: [#2030] theme-evolvis pending merges:↵ Thorsten Glaser 2011-10-24 move “jump to task/tracker ID” and retire rightnav entirely↵ Thorsten Glaser 2011-10-24 usability improvements for the global search↵ Thorsten Glaser 2011-10-24 make “Advanced Search” into a projectTab↵ Thorsten Glaser 2011-10-24 fix ECMAscript (the API changed)↵ Thorsten Glaser 2011-10-24 primitive movement to a global searchBox↵ Thorsten Glaser 2011-10-24 drop emit_search_box, unused↵ Thorsten Glaser 2011-10-24 retire most of rightnav, as per khapke design suggestion↵ Thorsten Glaser 2011-10-24 make the “public areas” widget match the Evolvis rightnav

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Oct 24 16:13:09 CEST 2011


Author: mirabilos
Date: 2011-10-24 16:13:09 +0200 (Mon, 24 Oct 2011)
New Revision: 17635

Added:
   trunk/gforge_base/evolvisforge-5.1/src/www/images/ic/wiki.jpg
   trunk/gforge_base/evolvisforge-5.1/src/www/images/ic/wiki.png
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/wiki.jpg
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/wiki.png
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/funky/images/ic/wiki.jpg
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/funky/images/ic/wiki.png
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/gforge/images/ic/wiki.jpg
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/gforge/images/ic/wiki.png
Removed:
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/wiki.jpg
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/wiki.png
Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/include/Navigation.class.php
   trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/common/MediaWikiPlugin.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/index_std.php
   trunk/gforge_base/evolvisforge-5.1/src/www/search/include/SearchManager.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/HtmlGroupSearchRenderer.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/SkillHtmlSearchRenderer.class.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
Log:
[#2030] theme-evolvis pending merges:
  Thorsten Glaser 2011-10-24 move “jump to task/tracker ID” and retire rightnav entirely
    Thorsten Glaser 2011-10-24 usability improvements for the global search
    Thorsten Glaser 2011-10-24 make “Advanced Search” into a projectTab
    Thorsten Glaser 2011-10-24 fix ECMAscript (the API changed)
    Thorsten Glaser 2011-10-24 primitive movement to a global searchBox
    Thorsten Glaser 2011-10-24 drop emit_search_box, unused
    Thorsten Glaser 2011-10-24 retire most of rightnav, as per khapke design suggestion
    Thorsten Glaser 2011-10-24 make the “public areas” widget match the Evolvis rightnav


Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/Navigation.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/Navigation.class.php	2011-10-24 14:13:04 UTC (rev 17634)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/Navigation.class.php	2011-10-24 14:13:09 UTC (rev 17635)
@@ -138,6 +138,9 @@
                 
 		$res .= '<form id="searchBox" action="'.util_make_uri('/search/').'" method="get">
                          <div>';
+		$res .= '<input type="text" size="12" id="searchBox-words" name="words" value="' 
+			. $defaultWords . '" />' . "\n";
+		$res .= '<input type="submit" name="Search" value="'._('Search').'" />' . "\n";
 		$parameters = array(
 			SEARCH__PARAMETER_GROUP_ID => $group_id,
 			SEARCH__PARAMETER_ARTIFACT_ID => $atid,
@@ -162,14 +165,7 @@
 		foreach($parameters AS $name => $value) {
 			$res .= '<input type="hidden" value="'.$value.'" name="'.$name.'" />' . "\n";
 		}
-		$res .= '<input type="text" size="12" id="searchBox-words" name="words" value="' 
-			. $defaultWords . '" />' . "\n";
-		$res .= '<input type="submit" name="Search" value="'._('Search').'" />' . "\n";
 
-		if (isset($group_id) && $group_id) {
-			$res .= util_make_link('/search/advanced_search.php?group_id=' . 
-					       $group_id, _('Advanced search'));
-		}
 		$res .= '</div>';
 		$res .= '</form>';
 
@@ -402,6 +398,15 @@
                         if ($toptab == "activity") {
                                 $selected = (count($menu['urls'])-1);
                         }
+
+			// Advanced Search tab
+			$menu['titles'][] = _('Search');
+			$menu['urls'][] = util_make_uri('/search/advanced_search.php?group_id=' . $group_id);
+			$menu['tooltips'][] = _('Advanced Search in this Project');
+			$menu['adminurls'][] = false;
+			if ($toptab == "search") {
+				$selected = (count($menu['urls'])-1);
+			}
                         
                         // Forums
                         if ($group->usesForum()) {

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/common/MediaWikiPlugin.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/common/MediaWikiPlugin.class.php	2011-10-24 14:13:04 UTC (rev 17634)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/common/MediaWikiPlugin.class.php	2011-10-24 14:13:09 UTC (rev 17635)
@@ -120,7 +120,7 @@
 			if ( $project->usesPlugin ( $this->name ) ) {
 				echo '<div class="public-area-box">';
 				print '<a href="'. util_make_url ('/plugins/mediawiki/wiki/'.$project->getUnixName().'/index.php').'">';
-				print html_abs_image(util_make_url ('/plugins/mediawiki/wiki/'.$project->getUnixName().'/skins/fusionforge/wiki.png'),'20','20',array('alt'=>'Mediawiki'));
+				print html_image('ic/wiki.png','20','20',array('alt'=>'Wiki'));
 				print ' Mediawiki';
 				print '</a>';
 				echo '</div>';

Copied: trunk/gforge_base/evolvisforge-5.1/src/www/images/ic/wiki.jpg (from rev 17634, trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/wiki.jpg)
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/images/ic/wiki.jpg	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/images/ic/wiki.jpg	2011-10-24 14:13:09 UTC (rev 17635)
@@ -0,0 +1,35 @@
+ÿØÿà JFIF      ÿÛ C 		
+
+	
+
+
+ "" $(4,$&1'-=-157:::#+?D?8C49:7ÿÛ C
+
+
+
+
+7%%77777777777777777777777777777777777777777777777777ÿÀ  o o" ÿÄ             ÿÄ ;      !1AQq"Ba‚‘#2’¡±3Cr$S¢²ÂñÿÄ                 ÿÄ                 ÿÚ   ? ¸S¶™§m”Í R™¥´¦yÐ)LÓ4
+R™ R™¦h!<\^ië컬+”æ¬n¸€Ê™(l”ŽE?0{1^¾(ëVƐÉ
+«ùMjKÝ®5êÑ.Ù5;£Êh¶¾ñž¢>`à˜¬q{µÈ²Ýæ[&?Õ4¾ãƒÖ>G¯ÎƒÒ'ˆúæ{íÇf÷1ǝPCm²„…)Dà ždš¼ð¶×ªíöÙOkîÈ‘!hSL¸÷HYH9=@œõz«-”ôŒKŠ²‡Øq.6±ð©' ýÅl7vjûauc%0—0å$sO‘Èò ‰jhœZӝ<õ]%I†Þå©ÈÏR„÷” íÆyÅmp üï.ö?úÖ­RB’R #ÚÉLÓGKk	°[FØ®ž/wD¢p<ŽSôÐr\⦷paWç‡ø´Ú„Õ;BØø•&ékºÞïkÒRó‘Ü”JœAjF;G"k?V«àDC+P2aUxˆOšvùæƒÂñÓÄë}Æçs¶Ýe½j.¸óh‰(å–²HîÏUNãqZ¥ßç-j %$…’{ È5|ã&£{DË
+¯çƒ€1¸{ÊòNy÷‘^ÑóG¥å½ª'´–ÉfPø¾5Ê>®ê^‹c‹7+”79’"ÛCÈ[âXm
+[a@¨mÝ’3Öz^,Â×¹
+FŒøe¤(Hj;©BŠ²0pq»—ÿ *Œ+q˜Íº™Ò•µˆí)×Ü”ŒŸâƒ,Hâ&º‚û±$Þæ´óJ(q·PÈPäAÊr
+X8<ηur®:²L£
+öR#5)CqVs»oZF;ñœÔ¿†V×5§ýzzÚC«¸I˜'vRŸÔS˸Óô
+€úEiÏV¹ÃÔ1ц姠Gü‰é>)ú*ý^^iôê})pµ:WÜÁ?©æŸÜ`ü‰ Çµ}ôtÔ^±m›§Ÿ_âEW¬Gÿ mG
+ÁX?]AB›qM¸’•¤¤‘ÌÙ]þÔ
+Ó²ßtÉèPæÇÀíi\•û˜¥^:sÚZe«ËÌ‹jýò2ÒˆìvŸÕM
+KˆJР¤¨•G}|gÃbáD)HÞƔӉïJ†ìh1-Tx¨}—«µ<¼G¹·µ õS’Ÿ¸Ü<H©þ¡´¿b¾NµIþ¬W”Ù8üÀu+ÀŒ:áƐôY
+HŒâšy¥…¶â
+TA¿4¾(\äëÎ#±bµ+{1Ýõ61Í;ÉüEø:û‘šÐ–;\k%¢%²vÇŠÐm¹œu“ó'$üÍF½ôÁ[’õ<´FcÅ*í?¿„ç檹Ð*[é¨=›¥Z´²¼?ss
+¬4Œ}ÎÑáš©vVdâ·õçŶ
+·6—“9À	>úü2TsÜ'ÑûOû7J»vy~ææS‘Ì4Œ„ýÎãኩWß
+‹|ð¢£cÚKM§¹)År(¥;h34ç°õ›²™FØ·0d#_÷ߟÔ*yZzsÛÚ)÷™Févãë-`s)ߧŸŠEeÊ
+AÁ
+GíÝÌg—º]´ˆÎdó(ðÏéåôš¡V]à–£öµa‡—¶%Èz³™<‚‰÷êåà£ZŠ‚é§z„BÂ0‰)õy#('Å9EFkIú@^"BÑ¢Úòä©ï$2“Ö€‚¥ÿ ê¬ÙAnôtÔ›]§$/’ÿ ÜÆÉíOÛiò5t¬a¦o/iûü´lïŠðYH?™=JO˜$yÖȃ-™ð˜™al>Ú\mcâJ†AûˆZ€i­!q¹%A/¥¾Ž?ÍÕrOØœøR_Gm:dÜæê)	Ê#Äu×2£âõ××Ò*ú©7nœŒJº!ë%<òµ{¨ dýB«O§Lé;}¯h6ÞçÈíu\ÕûœxAè)JP)ÛJvÐ~T”­%* ¤Œzˆ¬…Ä-<tÆ®Ÿm	!€¾’9=­+š~Ý^ Ö¿©¤6šõÛ$mAzèŸÀëiG‘òQÿ ± Ï¨R°´(¥I9k^è
+DM¤ ]
+“Ó)½’s©ä¯õøY½f˜Öótö—¾YcnÅÅ)
+¬è“™O/!AÞjY28£ÅB€²a‡=]…Ža ’·<ýåy_ž5èèú^ûE±€ÕºkCbÔ‡ PóUâMP½ô§³l®j	mâUÀmc#šY¯ê#>5êx±¦ÿ Ôº.dv‘º\aë1°9•¤¤x§pñ"ƒ'VŠà6ªnV’•mœðJí^åì«>D(|†+:×6Ùu™kÄ'‹b\uF{jÆGì((Ú;šÿ ‹OÞ¥ ˜Ì<©Š
+ì	8i^ï’MhúšðO{'GƒÈÛ&æ¾”’9†Ç$ü•õU*JRNÚS¶\kœ.vé0%£{ZSN'½*5É¥-¿ÚŸ±Þ¦ÚåÅŠò›'›‘"0|럡t㺫TBµ#pijÞúÓð4žj?nCæEV8ÓÃ˽ïPÇ»ièQ}’R•¥$)<’£¸Ž´>šï¸%¡¥é{|É·˜Ý
+ÎRöÚOÌ9ž~I ¤Æa¨Ñڏ´¶ËHm		H yWÒ”í ÉÜXÓƒMkY±ÙFØ’O¬Ç rY9ÁACÀ
+èt͝Ûýþ©Œï”ò[$|)ø•ä2|«Cq·FJÕh’m‹÷(ná(I ­µ~aÏD$ýëÏpO‡×k%úUÛP at TU²ÏG+RI*WæPÁ=@c꠲ĎÔH¬ÆŽ€†YB[m©) }…}iJ)J;iNÚ)J)J;iNÚ)J)J)JÿÙ
\ No newline at end of file

Copied: trunk/gforge_base/evolvisforge-5.1/src/www/images/ic/wiki.png (from rev 17634, trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/wiki.png)
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/images/ic/wiki.png	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/images/ic/wiki.png	2011-10-24 14:13:09 UTC (rev 17635)
@@ -0,0 +1,10 @@
+‰PNG
+
+   
+IHDR         ëŠZ   sRGB ®Îé   	pHYs     šœ   tIMEØz=␠ ŽIDAT8Ë¥T±J+Q;W
+ëŠb
+Át+‹ 	¨`£‚¢„,
+Šiü±±„@*-,Tlì´	‚`±Zèh"‚QPY5»3³¯¸¾}Ñ'¯xžj™9çÎÜsgG‰ü/TEQ€R*Š"¥ ˜ÈC)óÓþ¤˜ùßshÿD[YY9::J$ÌÜÞÞ^*•\×%¢–––0mÛv]w}}ýýýÝqœÉÉÉd2¹±±ˆ³³³àû~&“AD­u¥R!¢———l6kŠÑééiww·çy̆áòòòÌÌLÀÌ;;;ZkD,‹Ì,"ûûûˆ ù|žˆWWWM*‚ÏóDDäíí­·· ’ÉäÓÓ“ˆ¼¾¾¦Ói pçêê*N?>>ñÉÉI&“	ÃPD ,ËšŸŸWJÕëõ½½=±,Ëu]Dô}bb¢P(ttt˜‹lmm™ €ˆ0sµZµm[k=883ßÞÞ&	Dlkk«Õj"""õz=•JÝßß›.@~cnnN)¥”ªT*æÄééió<¦"ÚÜÜ\XX0ÊOâ³³3ÓÌÔÔ33óîŽŽQ†CCCççç_Åæ
+r¹"¶¶¶ÞÜÜÑøøxgg§RJkíyÞÅÅÅÈÈÅõ0D\ZZ€ Êåòåååõõu¹\ f.•JÛÛÛ…BáÃ*i‚ïû©T
+ zzzÆÆƍF__ ضÝßßÿüüÜÌÿ$fæµµ53mÙlÖØn†Q)Ð÷b¹»»sGk}xxh¨]]]Zëf«¾3s>Ÿn4q¤X,ær¹f«ÔßË€ˆŒñ¯j
+Z–õuüd“ ü ¿ P¨%Í×ÈÉ_    IEND®B`‚
\ No newline at end of file

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/index_std.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/index_std.php	2011-10-24 14:13:04 UTC (rev 17634)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/index_std.php	2011-10-24 14:13:09 UTC (rev 17635)
@@ -64,7 +64,6 @@
 
 <td id="bd-col2">
 <?php
-	echo $HTML->searchBox(0);
 	echo show_features_boxes();
 ?>
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/search/include/SearchManager.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/search/include/SearchManager.class.php	2011-10-24 14:13:04 UTC (rev 17634)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/search/include/SearchManager.class.php	2011-10-24 14:13:09 UTC (rev 17635)
@@ -108,7 +108,7 @@
 		// Project search engines
 		$this->addSearchEngine(
 			SEARCH__TYPE_IS_FULL_PROJECT,
-			new GroupSearchEngine(SEARCH__TYPE_IS_FULL_PROJECT, 'FullProjectHtmlSearchRenderer', _('Search the entire project'))
+			new GroupSearchEngine(SEARCH__TYPE_IS_FULL_PROJECT, 'FullProjectHtmlSearchRenderer', _('This entire project'))
 		);
 		$this->addSearchEngine(
 			SEARCH__TYPE_IS_TRACKERS,
@@ -141,16 +141,16 @@
 		// Global search engine
 		$this->addSearchEngine(
 			SEARCH__TYPE_IS_SOFTWARE,
-			new GFSearchEngine(SEARCH__TYPE_IS_SOFTWARE, 'ProjectHtmlSearchRenderer', _('Project'))
+			new GFSearchEngine(SEARCH__TYPE_IS_SOFTWARE, 'ProjectHtmlSearchRenderer', _('for a Project'))
 		);
 		$this->addSearchEngine(
 			SEARCH__TYPE_IS_PEOPLE,
-			new GFSearchEngine(SEARCH__TYPE_IS_PEOPLE, 'PeopleHtmlSearchRenderer', _('People'))
+			new GFSearchEngine(SEARCH__TYPE_IS_PEOPLE, 'PeopleHtmlSearchRenderer', _('for People'))
 		);
 		if (forge_get_config('use_people')) {
 			$this->addSearchEngine(
 				SEARCH__TYPE_IS_SKILL,
-				new GFSearchEngine(SEARCH__TYPE_IS_SKILL, 'SkillHtmlSearchRenderer', _('Skill'))
+				new GFSearchEngine(SEARCH__TYPE_IS_SKILL, 'SkillHtmlSearchRenderer', _('for a Skill'))
 			);
 		}
 		

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php	2011-10-24 14:13:04 UTC (rev 17634)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php	2011-10-24 14:13:09 UTC (rev 17635)
@@ -85,7 +85,7 @@
 	 * writeHeader - write the header of the output
 	 */		
 	function writeHeader() {
-		site_project_header(array('title' => _('Advanced search'), 'group' => $this->groupId, 'toptab'=>'none'));
+		site_project_header(array('toptab' => 'search', 'title' => _('Advanced search'), 'group' => $this->groupId));
 		$sectionarray = $this->getSectionArray();
 		$this->handleTransferInformation($sectionarray);
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php	2011-10-24 14:13:04 UTC (rev 17634)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php	2011-10-24 14:13:09 UTC (rev 17635)
@@ -83,7 +83,7 @@
 	 */
 	function writeBody() {
 		$title = _('Entire project search');
-		site_project_header(array('title' => $title, 'group' => $this->groupId, 'toptab' => ''));
+		site_project_header(array('toptab' => 'search', 'title' => $title, 'group' => $this->groupId, 'toptab' => ''));
 		echo $this->getResult();
 	}
 	

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/HtmlGroupSearchRenderer.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/HtmlGroupSearchRenderer.class.php	2011-10-24 14:13:04 UTC (rev 17634)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/HtmlGroupSearchRenderer.class.php	2011-10-24 14:13:09 UTC (rev 17635)
@@ -62,7 +62,7 @@
 	 * writeHeader - write the header of the output
 	 */
 	function writeHeader() {
-		site_project_header(array('title' => _('Search'), 'group' => $this->groupId, 'toptab' => $this->topTab));
+		site_project_header(array('toptab' => 'search', 'title' => _('Search'), 'group' => $this->groupId, 'toptab' => $this->topTab));
 		parent::writeHeader();
 	}
 	

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php	2011-10-24 14:13:04 UTC (rev 17634)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php	2011-10-24 14:13:09 UTC (rev 17635)
@@ -50,7 +50,7 @@
 	 * writeHeader - write the header of the output
 	 */
 	function writeHeader() {
-		$GLOBALS['HTML']->header(array('title'=>_('People Search')));
+		$GLOBALS['HTML']->header(array('toptab' => 'search', 'title'=>_('People Search')));
 		parent::writeHeader();
 	}
 	

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php	2011-10-24 14:13:04 UTC (rev 17634)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php	2011-10-24 14:13:09 UTC (rev 17635)
@@ -50,7 +50,7 @@
 	 * writeHeader - write the header of the output
 	 */
 	function writeHeader() {
-		$GLOBALS['HTML']->header(array('title'=>_('Project Search'), 'pagename'=>'search'));
+		$GLOBALS['HTML']->header(array('toptab' => 'search', 'title'=>_('Project Search'), 'pagename'=>'search'));
 		parent::writeHeader();
 	}
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/SkillHtmlSearchRenderer.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/SkillHtmlSearchRenderer.class.php	2011-10-24 14:13:04 UTC (rev 17634)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/search/include/renderers/SkillHtmlSearchRenderer.class.php	2011-10-24 14:13:09 UTC (rev 17635)
@@ -54,7 +54,7 @@
 	 * writeHeader - write the header of the output
 	 */
 	function writeHeader() {
-		$GLOBALS['HTML']->header(array('title'=>_('Search')));
+		$GLOBALS['HTML']->header(array('toptab' => 'search', 'title'=>_('Search')));
 		parent::writeHeader();
 	}
 	

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-10-24 14:13:04 UTC (rev 17634)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/css/evolvis.css	2011-10-24 14:13:09 UTC (rev 17635)
@@ -457,6 +457,18 @@
 	padding:12px;
 }
 
+.forgegrouptitle {
+	padding-bottom:3px;
+	margin-bottom:3px;
+	border-bottom:3px ridge black;
+}
+
+.forgesearchbox {
+	position:absolute;
+	top:0.5em;
+	right:0px;
+}
+
 #bd-col1 {
 	vertical-align:top;
 	width:65%;

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-10-24 14:13:04 UTC (rev 17634)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php	2011-10-24 14:13:09 UTC (rev 17635)
@@ -96,14 +96,13 @@
 		$this->EVOLVIS_BG_COLOR = '#bebebe';
 
 		$this->project = false;
-		$this->rightnav = false;
 
 		$this->addStylesheet('/themes/css/evolvis.css', 'all');
 		// $this->addStylesheet('/themes/css/screen.css', 'screen');
 		$this->addStylesheet('/themes/css/print.css', 'print');
-		$this->addJavascript('common.js');
-		$this->addJavascript('css.js');
-		$this->addJavascript('standardista-table-sorting.js');
+		$this->addJavascript('/js/common.js');
+		$this->addJavascript('/js/css.js');
+		$this->addJavascript('/js/standardista-table-sorting.js');
 		$this->emit_forgebar = true;
 	}
 
@@ -221,6 +220,8 @@
 			 alt="evolvis" /></a></span>
 			<div class="forgeglobalmenu"><table style="white-space:nowrap;">
 			<tr><td style="padding-left:1em;"><?php
+				echo _('Jump to Task:');
+			?></td><td style="padding-left:1em;"><?php
 	if (session_loggedin()) {
 		echo "\n" . $this->emit_headlink(false,
 		    _('Log out of the session with the Forge system'),
@@ -239,7 +240,11 @@
 	    forge_get_config('evolvis_portal_ttip', 'theme'),
 	    true, false, forge_get_config('evolvis_portal_href', 'theme'),
 	    forge_get_config('evolvis_portal_name', 'theme'));
-	echo "\n\t\t\t" . '</td></tr><tr>';
+	echo "\n\t\t\t" . '</td></tr><tr><td style="padding-left:1em;">
+			<form action="' . util_make_url('/pm/t_follow.php') . '" method="get">
+				<input type="text" size="8" name="tid" />
+				<input type="submit" name="j" value="' . _('OK') . '" />
+			</form></td>';
 	if (session_loggedin()) {
 		echo "\n\t\t\t\t" . '<td style="padding-left:1em;">';
 		echo "\n" . $this->emit_headlink(false,
@@ -280,26 +285,19 @@
 			echo '<div id="ev_content" class="contentnoforgebar">';
 		}
 
+		echo "\n".'<div class="forgegrouptitle"><div id="project_name">';
 		if ($has_group) {
-			echo "\n<div id=\"project_name\">Project: " .
-			    $this->project->getPublicName() .
-			    "<hr class=\"hidePartForPrinting\" /></div>\n\n";
+			echo "Project: " . $this->project->getPublicName();
+		} else {
+			echo "Forge: " . forge_get_config('forge_name');
 		}
+		echo '</div><div class="forgesearchbox">' .
+		    $this->navigation->getSearchBox();
+		echo "</div></div>\n\n";
 
 		if (isset($params['submenu'])) {
 			echo $params['submenu'];
 		}
-
-		if ($has_group) {
-			if (preg_match('!^/(forum|tracker|mail|pm|docman|news|scm|frs|project/admin|projects)!',
-			    $_SERVER['REQUEST_URI']) ||
-			    util_ifsetor($params['rightnav'])) {
-				$this->rightnav = true;
-?>
-<table class="project_papa"><tr class="ff"><td class="project_content">
-<?php
-			}
-		}
 		echo "<!-- ]internal_header -->\n";
 	}
 
@@ -307,11 +305,6 @@
 		global $group_id;
 
 		echo "\n<!-- footer[ -->\n";
-		if ($this->rightnav) {
-			echo '</td><td class="project_info"><div class="hidePartForPrinting">';
-			$this->write_rightnav($group_id);
-			echo "\n</div></td></tr></table>";
-		}
 ?><div id="fffooter" class="hidePartForPrinting">
 <span id="imprint"><a href="/impress/">Impressum / imprint</a></span>
 <span id="powerd_by">powered by <a
@@ -334,159 +327,6 @@
 <?php
 	}
 
-	function write_rightnav($group_id) {
-		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');
-		require_once($gfcommon.'/pm/ProjectTaskSqlQueries.php');
-
-		$project = $this->project;
-		$this->searchBox();
-		echo '<br />';
-
-		// ############################## PUBLIC AREAS
-
-		echo $this->boxTop(_('Public Areas'));
-
-		// ################# Homepage and Wiki Link
-
-		print '<a href="' . $project->getHomePage() . '">';
-		print html_image('ic/home16b.png','20','20',array('alt'=>_('Home Page')));
-		print ' '._('Project Home Page')."</a>\n";
-
-		if ($project->usesPlugin('mediawiki')) {
-			echo '<br /><a href="' .
-			    '/plugins/mediawiki/wiki/' . $project->getUnixName() .
-			    '/index.php">' .
-			    html_image('ic/wiki.png','20','20',array('alt'=>'wiki')) .
-			    " Wiki</a>\n";
-		}
-
-		// ################## ArtifactTypes
-
-		if ($project->usesTracker()) {
-			print '<hr size="1" />' . "\n" .
-			    '<a href="'.util_make_url ('/tracker/?group_id='.$group_id).'">';
-			print html_image('ic/tracker20g.png','20','20',array('alt'=>_('Tracker')));
-			print ' '._('Tracker')."</a>\n";
-
-			$result = db_query_params("SELECT agl.*,aca.count,aca.open_count
-			FROM artifact_group_list agl
-			LEFT JOIN artifact_counts_agg aca USING (group_artifact_id)
-			WHERE agl.group_id=$1
-			AND agl.is_public=1
-			ORDER BY group_artifact_id ASC", array($group_id));
-			$rows = db_numrows($result);
-
-			if (!$result || $rows < 1) {
-				echo "<br />\n<em>"._('No trackers found').'</em>';
-			} else {
-				for ($j = 0; $j < $rows; $j++) {
-					echo "\n<p>- ";
-					print util_make_link ('/tracker/?atid='. db_result($result, $j, 'group_artifact_id') . '&group_id='.$group_id.'&func=browse',db_result($result, $j, 'name')) . ' ' ;
-					printf(ngettext('(<strong>%1$s</strong> open / <strong>%2$s</strong> total)', '(<strong>%1$s</strong> open / <strong>%2$s</strong> total)', (int) db_result($result, $j, 'open_count')), (int) db_result($result, $j, 'open_count'), (int) db_result($result, $j, 'count'));
-					echo '<br />'.db_result($result, $j, 'description').'</p>';
-				}
-				echo "\n";
-			}
-		}
-
-		// ################## forums
-
-		if ($project->usesForum()) {
-			print '<hr size="1" />' . "\n" .
-			    '<a href="'.util_make_url ('/forum/?group_id='.$group_id).'">';
-			print html_image('ic/forum20g.png','20','20',array('alt'=>_('Forums')));
-			print ' '._('Public Forums')."</a>\n<br />(";
-			$messages_count = project_get_public_forum_message_count($group_id);
-			$forums_count = project_get_public_forum_count($group_id);
-			printf(ngettext("<strong>%d</strong> message","<strong>%d</strong> messages",$messages_count),$messages_count);
-			print ' in ';
-			printf(ngettext("<strong>%d</strong> forum","<strong>%d</strong> forums",$forums_count),$forums_count);
-			print ")\n";
-		}
-
-		// ##################### Doc Manager
-
-		if ($project->usesDocman()) {
-			print '
-			<hr size="1" />
-			<a href="'.util_make_url ('/docman/?group_id='.$group_id).'">';
-			print html_image('ic/docman16b.png','20','20',array('alt'=>_('Docs')));
-			print ' '._('Document Manager')."</a>\n";
-		}
-
-		// ##################### Mailing lists
-
-		if ($project->usesMail()) {
-			print '<hr size="1" />' . "\n" .
-			    '<a href="'.util_make_url ('/mail/?group_id='.$group_id).'">';
-			print html_image('ic/mail16b.png','20','20',array('alt'=>_('Lists')));
-			print ' '._('Mailing Lists')."</a><br />\n";
-			$n = project_get_mail_list_count($group_id);
-			printf(ngettext('(<strong>%1$s</strong> public mailing list)', '(<strong>%1$s</strong> public mailing lists)', $n), $n)."\n";
-		}
-
-		// ##################### Task Manager
-
-		if ($project->usesPm()) {
-			print '<hr size="1" />' . "\n" .
-			    '<a href="'.util_make_url ('/pm/?group_id='.$group_id).'">';
-			print html_image('ic/taskman20g.png','20','20',array('alt'=>_('Tasks')));
-			print ' '._('Task Manager')."</a>\n";
-			$result = db_query_params ("SELECT * FROM project_group_list WHERE group_id=$1 AND is_public=1",array($group_id));
-			$rows = db_numrows($result);
-			if (!$result || $rows < 1) {
-				echo "<br />\n<em>"._('No tasks found').'</em>';
-			} else {
-				for ($j = 0; $j < $rows; $j++) {
-					echo "\n<br />- ";
-					print util_make_link ('/pm/task.php?group_project_id='.db_result($result, $j, 'group_project_id').'&group_id='.$group_id.'&func=browse',db_result($result, $j, 'project_name'));
-				}
-				echo "\n";
-			}
-		}
-
-		// ######################### SCM
-
-		if ($project->usesSCM()) {
-			print '<hr size="1" />' . "\n" .
-			    '<a href="'.util_make_url ('/scm/?group_id='.$group_id).'">';
-			print html_image('ic/cvs16b.png','20','20',array('alt'=>_('SCM')));
-			print ' '._('SCM Repository')."</a><br />";
-
-			$hook_params = array () ;
-			$hook_params['group_id'] = $group_id ;
-			plugin_hook ("scm_stats", $hook_params) ;
-			echo "\n";
-		}
-
-		// ######################## AnonFTP
-
-		if ($project->usesFTP()) {
-			if ($project->isActive()) {
-				print '<hr size="1" />'."\n";
-				print '<a href="ftp://' . $project->getUnixName() . '.' . forge_get_config('web_host') . '/pub/'. $project->getUnixName() .'/">';
-				print html_image('ic/ftp16b.png','20','20',array('alt'=>_('Anonymous FTP Space')));
-				print ' '._('Anonymous FTP Space')."</a>\n";
-			}
-		}
-
-		// ######################## minimum unique ID
-
-		print "\n<hr size=\"1\" />\n";
-		printf(_('Minimum Unique Task/Tracker Item ID: %d') . "\n",
-		    tasktracker_getminid());
-
-		// ######################## (end)
-
-		echo $this->boxBottom();
-		echo "<!-- ]write_rightnav -->\n";
-	}
-
 	/**
 	 * boxTop() - Top HTML box
 	 *
@@ -727,76 +567,6 @@
 		return $rv;
 	}
 
-	function emit_search_box() {
-		/* backwards compat */
-		searchBox();
-	}
-	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 there is no search currently, set the default
-		if (!isset($type_of_search)) {
-			$exact = 1;
-		}
-
-		$rv = '<div class="hidePartForPrinting">
-		<form action="/search/" method="get">';
-		$parameters = array(
-			SEARCH__PARAMETER_GROUP_ID => $group_id,
-			SEARCH__PARAMETER_ARTIFACT_ID => $atid,
-			SEARCH__PARAMETER_FORUM_ID => $forum_id,
-			SEARCH__PARAMETER_GROUP_PROJECT_ID => $group_project_id
-		);
-
-		$searchManager =& getSearchManager();
-		$searchManager->setParametersValues($parameters);
-		$searchEngines =& $searchManager->getAvailableSearchEngines();
-
-		$rv .= '<select name="type_of_search">';
-		for ($i = 0, $max = count($searchEngines); $i < $max; $i++) {
-			$searchEngine =& $searchEngines[$i];
-			$rv .= '<option value="'.$searchEngine->getType().'"'.( $type_of_search == $searchEngine->getType() ? ' selected="selected"' : '' ).'>'.$searchEngine->getLabel($parameters).'</option>'."\n";
-		}
-		$rv .= '</select>';
-
-		$parameters = $searchManager->getParameters();
-		foreach ($parameters AS $name => $value) {
-			$rv .= '<input type="hidden" value="'.$value.'" name="'.$name.'" />';
-		}
-		$rv .= '<input type="text" size="12" name="words" value="'.$defaultWords.'" />';
-
-		$rv .= '<input type="submit" name="Search" value="'._('Search').'" />';
-
-		if (isset($group_id) && $group_id) {
-			$rv .= '
-				<br />
-				<span id="advanced_search">
-				› <a href="/search/advanced_search.php?group_id='.$group_id.'">'
-				._('Advanced search').'</a>
-				</span>';
-		}
-		$rv .= '</form>
-<hr />
-<form action="' . util_make_url('/pm/t_follow.php') . '" method="get">
-	' . _('Jump to Task:') . '<br /><input type="text" size="8"
-	name="tid" /><input type="submit" name="j" value="' . _('OK') . '" />
-</form></div>';
-
-		if ($print) {
-			echo $rv;
-			return "<div>bogus call <pre>{".debug_string_backtrace()."}</pre> & ERROR</div>\n";
-		} else {
-			return $rv;
-		}
-	}
-
 	/**
 	 * feedback() - returns the htmlized feedback string when an action is performed.
 	 *

Added: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/wiki.jpg
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/wiki.jpg	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/wiki.jpg	2011-10-24 14:13:09 UTC (rev 17635)
@@ -0,0 +1 @@
+link ../../../../images/ic/wiki.jpg
\ No newline at end of file


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

Added: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/wiki.png
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/wiki.png	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/images/ic/wiki.png	2011-10-24 14:13:09 UTC (rev 17635)
@@ -0,0 +1 @@
+link ../../../../images/ic/wiki.png
\ No newline at end of file


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

Added: trunk/gforge_base/evolvisforge-5.1/src/www/themes/funky/images/ic/wiki.jpg
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/funky/images/ic/wiki.jpg	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/funky/images/ic/wiki.jpg	2011-10-24 14:13:09 UTC (rev 17635)
@@ -0,0 +1 @@
+link ../../../../images/ic/wiki.jpg
\ No newline at end of file


Property changes on: trunk/gforge_base/evolvisforge-5.1/src/www/themes/funky/images/ic/wiki.jpg
___________________________________________________________________
Added: svn:special
   + *

Added: trunk/gforge_base/evolvisforge-5.1/src/www/themes/funky/images/ic/wiki.png
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/funky/images/ic/wiki.png	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/funky/images/ic/wiki.png	2011-10-24 14:13:09 UTC (rev 17635)
@@ -0,0 +1 @@
+link ../../../../images/ic/wiki.png
\ No newline at end of file


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

Added: trunk/gforge_base/evolvisforge-5.1/src/www/themes/gforge/images/ic/wiki.jpg
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/gforge/images/ic/wiki.jpg	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/gforge/images/ic/wiki.jpg	2011-10-24 14:13:09 UTC (rev 17635)
@@ -0,0 +1 @@
+link ../../../../images/ic/wiki.jpg
\ No newline at end of file


Property changes on: trunk/gforge_base/evolvisforge-5.1/src/www/themes/gforge/images/ic/wiki.jpg
___________________________________________________________________
Added: svn:special
   + *

Added: trunk/gforge_base/evolvisforge-5.1/src/www/themes/gforge/images/ic/wiki.png
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/gforge/images/ic/wiki.png	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/gforge/images/ic/wiki.png	2011-10-24 14:13:09 UTC (rev 17635)
@@ -0,0 +1 @@
+link ../../../../images/ic/wiki.png
\ No newline at end of file


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



More information about the evolvis-commits mailing list