[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1955-g3451c6e

Franck Villaume nerville at libremir.placard.fr.eu.org
Sat Jun 24 16:27:18 CEST 2017


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  3451c6e235aa509a4a622a596cd919b236d73c86 (commit)
       via  a2cd4ffdf4c5fd42e38bccf1c7dc1c26afb41fb3 (commit)
       via  05f0b7853042aed63b96589b7eefcbd099e8c6c1 (commit)
       via  302fcc5806a8e20fdf9d32a6383ba040907782e7 (commit)
      from  c4f2be97751369c26123e4cb0fb528d4230496c2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=3451c6e235aa509a4a622a596cd919b236d73c86

commit 3451c6e235aa509a4a622a596cd919b236d73c86
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Jun 24 16:26:52 2017 +0200

    use correct icon

diff --git a/src/common/widget/Widget_ProjectPublicAreas.class.php b/src/common/widget/Widget_ProjectPublicAreas.class.php
index 149e1b7..fc59c5c 100644
--- a/src/common/widget/Widget_ProjectPublicAreas.class.php
+++ b/src/common/widget/Widget_ProjectPublicAreas.class.php
@@ -129,7 +129,7 @@ class Widget_ProjectPublicAreas extends Widget {
 
 		if ($project->usesFRS()) {
 			$result .= '<div class="public-area-box">';
-			$link_content = $HTML->getDownloadPic('') . ' ' . _('Files');
+			$link_content = $HTML->getPackagePic('') . ' ' . _('Files');
 			//	<a rel="sioc:container_of" xmlns:sioc="http://rdfs.org/sioc/ns#" href="'.util_make_url ('/frs/?group_id='.$group_id).'">';
 			$result .= util_make_link('/frs/?group_id='.$group_id, $link_content);
 			$result .= '</div>';

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=a2cd4ffdf4c5fd42e38bccf1c7dc1c26afb41fb3

commit a2cd4ffdf4c5fd42e38bccf1c7dc1c26afb41fb3
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Jun 24 16:20:28 2017 +0200

    clean-up icons

diff --git a/src/common/include/Activity.class.php b/src/common/include/Activity.class.php
index d548605..97d1ddb 100644
--- a/src/common/include/Activity.class.php
+++ b/src/common/include/Activity.class.php
@@ -84,7 +84,7 @@ class Activity extends FFError {
 		$docmanerror = 0;
 		switch (@$arr['section']) {
 			case 'scm': {
-				$icon = html_image('ic/cvs16b.png','','',array('alt'=>_('Source Code')));
+				$icon = $HTML->getScmPic(_('Source Code'), 'sourcecode');
 				$url = util_make_link('/scm/'.$arr['ref_id'].$arr['subref_id'],_('scm commit')._(': ').$arr['description']);
 				break;
 			}
@@ -99,33 +99,33 @@ class Activity extends FFError {
 				break;
 			}
 			case 'frsrelease': {
-				$icon = html_image('ic/cvs16b.png','','',array('alt'=>_('Files')));
+				$icon = $HTML->getPackagePic(_('Files'), 'files');
 				$url = util_make_link('/frs/?release_id='.$arr['subref_id'].'&group_id='.$arr['group_id'],_('FRS Release').' '.$arr['description']);
 				break;
 			}
 			case 'forumpost': {
-				$icon = html_image('ic/forum20g.png','','',array('alt'=>_('Forum')));
+				$icon = $HTML->getForumPic(_('Forum'), 'forum');
 				$url = util_make_link('/forum/message.php?msg_id='.$arr['subref_id'].'&group_id='.$arr['group_id'],_('Forum Post').' '.$arr['description']);
 				break;
 			}
 			case 'news': {
-				$icon = html_image('ic/write16w.png','','',array('alt'=>_('News')));
+				$icon = $HTML->getNewsPic(_('News'), 'news');
 				$url = util_make_link('/forum/forum.php?forum_id='.$arr['subref_id'],_('News').' '.$arr['description']);
 				break;
 			}
 			case 'taskopen': {
-				$icon = html_image('ic/taskman20w.png','','',array('alt'=>_('Tasks')));
+				$icon = $HTML->getPmPic(_('Open Task'), 'opentask');
 				$url = util_make_link('/pm/t_follow.php/'.$arr['subref_id'],_('Tasks').' '.$arr['description']);
 				break;
 			}
 			case 'taskclose': {
-				$icon = html_image('ic/taskman20w.png','','',array('alt'=>_('Tasks')));
+				$icon = $HTML->getPmPic(_('Closed Task'), 'closedtask');
 				$url = util_make_link('/pm/t_follow.php/'.$arr['subref_id'],_('Tasks').' '.$arr['description']);
 				break;
 			}
 
 			case 'taskdelete': {
-				$icon = html_image('ic/taskman20w.png','','',array('alt'=>_('Tasks')));
+				$icon = $HTML->getPmPic(_('Deleted Task', 'deletedtask'));
 				$url = util_make_link('/pm/t_follow.php/'.$arr['subref_id'],_('Tasks').' '.$arr['description']);
 				break;
 			}
@@ -152,7 +152,7 @@ class Activity extends FFError {
 					$docmanerror = 1;
 					break;
 				}
-				$icon = $HTML->getFolderPic('', _('Directory'));
+				$icon = $HTML->getFolderPic(_('Directory'), 'directory');
 				if ($dg->getState() == 2) {
 					$view = 'listtrashfile';
 				} else {
diff --git a/src/plugins/globalactivity/www/index.php b/src/plugins/globalactivity/www/index.php
index 3b225e3..0bdd89d 100644
--- a/src/plugins/globalactivity/www/index.php
+++ b/src/plugins/globalactivity/www/index.php
@@ -211,7 +211,7 @@ if (count($ids) < 1) {
 					break;
 				}
 				case 'docgroupnew': {
-					$icon = html_image('ic/cfolder15.png', '', '', array("alt"=>_('Directory')));
+					$icon = $HTML->getFolderPic(_('Directory'), 'directory');
 					$url = util_make_link('docman/?group_id='.$arr['group_id'].'&view=listfile&dirid='.$arr['subref_id'],_('Directory').' '.$arr['description']);
 					break;
 				}
diff --git a/src/plugins/globalsearch/www/index.php b/src/plugins/globalsearch/www/index.php
index f2111f9..2e41569 100644
--- a/src/plugins/globalsearch/www/index.php
+++ b/src/plugins/globalsearch/www/index.php
@@ -33,6 +33,8 @@
 require_once '../../env.inc.php';
 require_once $gfcommon.'include/pre.php';
 
+global $HTML;
+
 $otherfreeknowledge = getIntFromRequest('otherfreeknowledge') ;
 $gwords = getStringFromRequest('gwords');
 $order = getStringFromRequest('order', 'rank');
@@ -163,7 +165,7 @@ if (!$result || $rows < 1) {
         $title_arr[] = util_make_link('/plugins/'.$gsplugin->name.'/?gwords='.urlencode($gwords).'&order=title&gexact='.$gexact,
 				       _('Forge')) ;
 
-        echo $GLOBALS['HTML']->listTableTop($title_arr);
+        echo $HTML->listTableTop($title_arr);
 
         for ( $i = 0; $i < $rows; $i++ ) {
                 print        "<tr><td><a href=\""
@@ -175,7 +177,7 @@ if (!$result || $rows < 1) {
                         . db_result($result,$i,'title')."</a></center></td></tr>\n";
         }
 
-        echo $GLOBALS['HTML']->listTableBottom();
+        echo $HTML->listTableBottom();
 
 }
 
@@ -198,7 +200,7 @@ if ( !$no_rows && ( ($rows_returned > $rows) || ($offset != 0) ) ) {
 	if ( $rows_returned > $rows) {
 		echo "<span style=\"font-family:arial, helvetica;text-decoration: none\">";
 		echo util_make_link('/plugins/'.$gsplugin->name.'/?gwords='.urlencode($gwords).'&order='.urlencode($order).'&gexact='.$gexact.'&offset='.($offset+25),
-			'<strong>'._('Next Results').html_image('t.png', 15, 15, array("align"=>"middle")).'</strong>').'</span>';
+			'<strong>'._('Next Results').$HTML->getNextPic('', '', array("align"=>"middle")).'</strong>').'</span>';
 	} else {
 		echo " ";
 	}
diff --git a/src/www/admin/cronman.php b/src/www/admin/cronman.php
index 7e50a21..821fe19 100644
--- a/src/www/admin/cronman.php
+++ b/src/www/admin/cronman.php
@@ -92,7 +92,7 @@ if ($totalCount) {
 			<td><?php
 			if ($offset != 0) {
 				echo util_make_link('/admin/cronman.php?which='.$which.'&offset='.($offset - ADMIN_CRONMAN_ROWS),
-							html_image('t2.png', 15, 15).' '._('Previous'),
+							$HTML->getPrevPic().' '._('Previous'),
 							array('class' => 'prev'));
 			} else {
 				echo ' ';
@@ -100,7 +100,7 @@ if ($totalCount) {
 			echo '</td><td class="align-right">';
 			if ($totalCount > $offset + ADMIN_CRONMAN_ROWS) {
 				echo util_make_link('/admin/cronman.php?which='.$which.'&offset='.($offset + ADMIN_CRONMAN_ROWS),
-							_('Next').' '.html_image('t.png', 15, 15),
+							_('Next').' '.$HTML->getNextPic(),
 							array('class' => 'next'));
 			} else {
 				echo ' ';
diff --git a/src/www/admin/trove/trove_cat_list.php b/src/www/admin/trove/trove_cat_list.php
index d55778c..e80a18d 100644
--- a/src/www/admin/trove/trove_cat_list.php
+++ b/src/www/admin/trove/trove_cat_list.php
@@ -29,6 +29,7 @@ require_once $gfwww.'admin/admin_utils.php';
 
 // print current node, then all subnodes
 function printnode ($nodeid,$text) {
+	global $HTML;
 	print ('<br />');
 
 	if (!isset($GLOBALS['depth']))
@@ -45,7 +46,7 @@ function printnode ($nodeid,$text) {
 		$title = '';
 	}
 
-	print html_image('ic/cfolder15.png');
+	print $HTML->getFolderPic();
 	print ('  <span class="trove-nodes" title="'.util_html_secure($title).'">'.$text.'</span> ');
 	if ($nodeid == 0) {
 		echo util_make_link('/admin/trove/trove_cat_add.php?parent_trove_cat_id='.$nodeid, '['._('Add').']');
diff --git a/src/www/forum/forum.php b/src/www/forum/forum.php
index 8e892c6..b78abae 100644
--- a/src/www/forum/forum.php
+++ b/src/www/forum/forum.php
@@ -348,7 +348,7 @@ if ($forum_id) {
 				*/
 				$ret_val .= '<tr><td>'
 					.util_make_link('/forum/forum.php?thread_id='.$row['thread_id'].'&forum_id='.$forum_id.'&group_id='.$group_id,
-							html_image('ic/cfolder15.png').' '. $subject).'</td>'
+							$HTML->getFolderPic().' '. $subject).'</td>'
 					.'<td>'.util_display_user($row['user_name'], $row['user_id'], $row['realname']).'</td>'.
 					'<td>'. $row['followups'] .'</td>'.
 					'<td>'. relative_date($row['recent']).'</td></tr>';
@@ -369,7 +369,7 @@ if ($forum_id) {
 		if ($offset != 0) {
 			$ret_val .= '<span class="prev">
 			<a href="javascript:history.back()"><strong>' .
-				html_image('t2.png', 15, 15) ._('Newer Messages').'</strong></a></span>';
+				$HTML->getPrevPic() ._('Newer Messages').'</strong></a></span>';
 		} else {
 			$ret_val .= ' ';
 		}
@@ -379,7 +379,7 @@ if ($forum_id) {
 		if ($avail_rows > $max_rows) {
 			$ret_val .= '<span class="next">'.
 				util_make_link('/forum/forum.php?max_rows='.$max_rows.'&style='.$style.'&offset='.($offset+$i).'&forum_id='.$forum_id.'&group_id='.$group_id,
-						html_e('strong', array(), _('Older Messages').html_image('t.png', 15, 15))).'</span>';
+						html_e('strong', array(), _('Older Messages').$HTML->getNextPic())).'</span>';
 		} else {
 			$ret_val .= ' ';
 		}
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index eadc88f..2d0b0b7 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -929,64 +929,76 @@ abstract class Layout extends FFError {
 		return $return;
 	}
 
-	function getMonitorPic($title = '', $alt = '') {
-		return $this->getPicto('ic/mail16w.png', $title, $alt);
+	function getNextPic($title = '', $alt = '', $otherAttr = array()) {
+		return $this->getPicto('ic/t.png', $title, $alt, 20, 20, $otherAttr);
 	}
 
-	function getStartMonitoringPic($title = '', $alt = '') {
-		return $this->getPicto('ic/startmonitor.png', $title, $alt);
+	function getPrevPic($title = '', $alt = '', $otherAttr = array()) {
+		return $this->getPicto('ic/t2.png', $title, $alt, 20, 20, $otherAttr);
 	}
 
-	function getStopMonitoringPic($title = '', $alt = '') {
-		return $this->getPicto('ic/stopmonitor.png', $title, $alt);
+	function getMonitorPic($title = '', $alt = '', $otherAttr = array()) {
+		return $this->getPicto('ic/mail16w.png', $title, $alt, 20, 20, $otherAttr);
 	}
 
-	function getReleaseNotesPic($title = '', $alt = '') {
-		return $this->getPicto('ic/manual16c.png', $title, $alt);
+	function getStartMonitoringPic($title = '', $alt = '', $otherAttr = array()) {
+		return $this->getPicto('ic/startmonitor.png', $title, $alt, 20, 20, $otherAttr);
 	}
 
-	function getDownloadPic($title = '', $alt = '') {
-		return $this->getPicto('ic/download.png', $title, $alt);
+	function getStopMonitoringPic($title = '', $alt = '', $otherAttr = array()) {
+		return $this->getPicto('ic/stopmonitor.png', $title, $alt, 20, 20, $otherAttr);
 	}
 
-	function getHomePic($title = '', $alt = '') {
-		return $this->getPicto('ic/home16b.png', $title, $alt);
+	function getReleaseNotesPic($title = '', $alt = '', $otherAttr = array()) {
+		return $this->getPicto('ic/manual16c.png', $title, $alt, 20, 20, $otherAttr);
 	}
 
-	function getFollowPic($title = '', $alt = '') {
-		return $this->getPicto('ic/tracker20g.png', $title, $alt);
+	function getDownloadPic($title = '', $alt = '', $otherAttr = array()) {
+		return $this->getPicto('ic/download.png', $title, $alt, 20, 20, $otherAttr);
 	}
 
-	function getForumPic($title = '', $alt = '') {
-		return $this->getPicto('ic/forum20g.png', $title, $alt);
+	function getHomePic($title = '', $alt = '', $otherAttr = array()) {
+		return $this->getPicto('ic/home16b.png', $title, $alt, 20, 20, $otherAttr);
 	}
 
-	function getDocmanPic($title = '', $alt = '') {
-		return $this->getPicto('ic/docman16b.png', $title, $alt);
+	function getFollowPic($title = '', $alt = '', $otherAttr = array()) {
+		return $this->getPicto('ic/tracker20g.png', $title, $alt, 20, 20, $otherAttr);
 	}
 
-	function getMailPic($title = '', $alt = '') {
-		return $this->getPicto('ic/mail16b.png', $title, $alt);
+	function getForumPic($title = '', $alt = '', $otherAttr = array()) {
+		return $this->getPicto('ic/forum20g.png', $title, $alt, 20, 20, $otherAttr);
 	}
 
-	function getMailNotifyPic($title = '', $alt = '') {
-		return $this->getPicto('ic/mail-send.png', $title, $alt);
+	function getDocmanPic($title = '', $alt = '', $otherAttr = array()) {
+		return $this->getPicto('ic/docman16b.png', $title, $alt, 20, 20, $otherAttr);
 	}
 
-	function getPmPic($title = '', $alt = '') {
-		return $this->getPicto('ic/taskman20g.png', $title, $alt);
+	function getMailPic($title = '', $alt = '', $otherAttr = array()) {
+		return $this->getPicto('ic/mail16b.png', $title, $alt, 20, 20, $otherAttr);
 	}
 
-	function getSurveyPic($title = '', $alt = '') {
-		return $this->getPicto('ic/survey16b.png', $title, $alt);
+	function getMailNotifyPic($title = '', $alt = '', $otherAttr = array()) {
+		return $this->getPicto('ic/mail-send.png', $title, $alt, 20, 20, $otherAttr);
 	}
 
-	function getScmPic($title = '', $alt = '') {
-		return $this->getPicto('ic/cvs16b.png', $title, $alt);
+	function getPmPic($title = '', $alt = '', $otherAttr = array()) {
+		return $this->getPicto('ic/taskman20g.png', $title, $alt, 20, 20, $otherAttr);
 	}
 
-	function getFtpPic($title = '', $alt = '') {
-		return $this->getPicto('ic/ftp16b.png', $title, $alt);
+	function getSurveyPic($title = '', $alt = '', $otherAttr = array()) {
+		return $this->getPicto('ic/survey16b.png', $title, $alt, 20, 20, $otherAttr);
+	}
+
+	function getScmPic($title = '', $alt = '', $otherAttr = array()) {
+		return $this->getPicto('ic/cvs16b.png', $title, $alt, 20, 20, $otherAttr);
+	}
+
+	function getFtpPic($title = '', $alt = '', $otherAttr = array()) {
+		return $this->getPicto('ic/ftp16b.png', $title, $alt, 20, 20, $otherAttr);
+	}
+
+	function getPackagePic($title = '', $alt = '', $otherAttr = array()) {
+		return $this->getPicto('ic/package.png', $title, $alt, 20, 20, $otherAttr);
 	}
 
 	function getDeletePic($title = '', $alt = '', $otherAttr = array()) {
@@ -1033,6 +1045,10 @@ abstract class Layout extends FFError {
 		return $this->getPicto('ic/folder.png', $title, $alt, 20, 20, $otherAttr);
 	}
 
+	function getOpenFolderPic($title = '', $alt = '', $otherAttr = array()) {
+		return $this->getPicto('ic/ofolder.png', $title, $alt, 20, 20, $otherAttr);
+	}
+
 	function getOpenTicketPic($title = '', $alt = '', $otherAttr = array()) {
 		return $this->getPicto('ic/ticket-open.png', $title, $alt, 20, 20, $otherAttr);
 	}
diff --git a/src/www/search/include/renderers/HtmlSearchRenderer.class.php b/src/www/search/include/renderers/HtmlSearchRenderer.class.php
index ec67ef1..dc4ad17 100644
--- a/src/www/search/include/renderers/HtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/HtmlSearchRenderer.class.php
@@ -35,15 +35,7 @@ class HtmlSearchRenderer extends SearchRenderer {
 	 */
 	var $tableHeaders = array();
 
-	/**
-	 * @param string  $typeOfSearch type of the search (Software, Forum, People and so on)
-	 * @param string  $words        words we are searching for
-	 * @param bool    $isExact      if we want to search for all the words or if only one matching the query is sufficient
-	 * @param object  $searchQuery  SearchQuery instance
-	 */
-	function __construct($typeOfSearch, $words, $isExact, $searchQuery) {
-		parent::__construct($typeOfSearch, $words, $isExact, $searchQuery);
-	}
+	// No __construct. Inherited from parent.
 
 	/**
 	 * flush - flush the html output
@@ -128,6 +120,7 @@ class HtmlSearchRenderer extends SearchRenderer {
 	 * @return string html output
 	 */
 	function getNavigationPanel() {
+		global $HTML;
 		$searchQuery =& $this->searchQuery;
 
 		$html = '<br />';
@@ -135,14 +128,14 @@ class HtmlSearchRenderer extends SearchRenderer {
 		$html .= '<tr>';
 		$html .= '<td>';
 		if ($searchQuery->getOffset() != 0) {
-			$html .= util_make_link($this->getPreviousResultsUrl(), html_image('t2.png', 15, 15).' '._('Previous Results'), array('class' => 'prev'));
+			$html .= util_make_link($this->getPreviousResultsUrl(), $HTML->getPrevPic().' '._('Previous Results'), array('class' => 'prev'));
 		} else {
 			$html .= ' ';
 		}
 		$html .= '</td><td class="align-right">';
 		$result = $this->searchQuery->getData($this->searchQuery->getRowsPerPage(),$this->searchQuery->getOffset());
 		if ($searchQuery->getRowsTotalCount() > $this->searchQuery->getRowsPerPage()+$this->searchQuery->getOffset()) {
-			$html .= util_make_link($this->getNextResultsUrl(), _('Next Results').' '.html_image('t.png', 15, 15), array('class' => 'next'));
+			$html .= util_make_link($this->getNextResultsUrl(), _('Next Results').' '.$HTML->getNextPic(), array('class' => 'next'));
 		} else {
 			$html .= ' ';
 		}
diff --git a/src/www/themes/funky-wOw/images/ic/ofolder.png b/src/www/themes/funky-wOw/images/ic/ofolder.png
new file mode 100644
index 0000000..9443cbf
Binary files /dev/null and b/src/www/themes/funky-wOw/images/ic/ofolder.png differ
diff --git a/src/www/themes/funky-wOw/images/ic/ofolder15.png b/src/www/themes/funky-wOw/images/ic/ofolder15.png
deleted file mode 100644
index 31d73a2..0000000
Binary files a/src/www/themes/funky-wOw/images/ic/ofolder15.png and /dev/null differ
diff --git a/src/www/themes/funky-wOw/images/ic/package.png b/src/www/themes/funky-wOw/images/ic/package.png
new file mode 100644
index 0000000..2226ef7
Binary files /dev/null and b/src/www/themes/funky-wOw/images/ic/package.png differ
diff --git a/src/www/themes/funky/images/t.png b/src/www/themes/funky-wOw/images/ic/t.png
similarity index 100%
rename from src/www/themes/funky/images/t.png
rename to src/www/themes/funky-wOw/images/ic/t.png
diff --git a/src/www/themes/funky/images/t2.png b/src/www/themes/funky-wOw/images/ic/t2.png
similarity index 100%
rename from src/www/themes/funky/images/t2.png
rename to src/www/themes/funky-wOw/images/ic/t2.png
diff --git a/src/www/themes/funky/images/ic/ofolder.png b/src/www/themes/funky/images/ic/ofolder.png
new file mode 100644
index 0000000..9443cbf
Binary files /dev/null and b/src/www/themes/funky/images/ic/ofolder.png differ
diff --git a/src/www/themes/funky/images/ic/ofolder15.png b/src/www/themes/funky/images/ic/ofolder15.png
deleted file mode 100644
index 31d73a2..0000000
Binary files a/src/www/themes/funky/images/ic/ofolder15.png and /dev/null differ
diff --git a/src/www/themes/funky/images/ic/package.png b/src/www/themes/funky/images/ic/package.png
new file mode 100644
index 0000000..2226ef7
Binary files /dev/null and b/src/www/themes/funky/images/ic/package.png differ
diff --git a/src/www/themes/funky-wOw/images/t.png b/src/www/themes/funky/images/ic/t.png
similarity index 100%
rename from src/www/themes/funky-wOw/images/t.png
rename to src/www/themes/funky/images/ic/t.png
diff --git a/src/www/themes/funky-wOw/images/t2.png b/src/www/themes/funky/images/ic/t2.png
similarity index 100%
rename from src/www/themes/funky-wOw/images/t2.png
rename to src/www/themes/funky/images/ic/t2.png
diff --git a/src/www/trove/index.php b/src/www/trove/index.php
index 7bd1143..a57c113 100644
--- a/src/www/trove/index.php
+++ b/src/www/trove/index.php
@@ -42,9 +42,7 @@ if (!$categoryId) {
 }
 
 $category = new TroveCategory($categoryId);
-
-	$HTML->header(array('title'=>_('Trove Map')));
-
+$HTML->header(array('title'=>_('Trove Map')));
 echo '<hr />';
 
 // We check current filtering directives and display them
@@ -92,7 +90,7 @@ if($filter) {
 		<?php
 			// here we print list of root level categories, and use open folder for current
 			$rootCategories = TroveCategoryFactory::getRootCategories();
-			echo _('Browse By').':';
+			echo _('Browse By')._(':');
 			for($i = 0, $count = sizeof($rootCategories); $i < $count; $i++) {
 				$rootCategory =& $rootCategories[$i];
 
@@ -103,11 +101,11 @@ if($filter) {
 				if (($rootCategory->getID() == $category->getRootParentId())
 					|| ($rootCategory->getID() == $category->getID())) {
 
-					echo html_image('ic/ofolder15.png', 15, 13);
+					echo $HTML->getOpenFolderPic();
 					echo '  <strong>'.$rootCategory->getLocalizedLabel().'</strong>';
 				} else {
 					echo '<a href="?form_cat='.$rootCategory->getID().@$discrim_url.'">';
-					echo html_image('ic/cfolder15.png', 15, 13);
+					echo $HTML->getFolderPic();
 					echo '  '.$rootCategory->getLocalizedLabel();
 					echo '</a>';
 				}
@@ -121,7 +119,7 @@ if($filter) {
 			for ($i=0, $count = sizeof($parentCategories); $i < $count; $i++) {
 				echo str_repeat('   ', $i * 2);
 
-				echo html_image('ic/ofolder15.png', 15, 13);
+				echo $HTML->getOpenFolderPic();
 				echo '  ';
 				if($parentCategories[$i]['id'] != $category->getID()) {
 					echo '<a href="?form_cat='.$parentCategories[$i]['id'].$discrim_url.'">';
@@ -146,7 +144,7 @@ if($filter) {
 
 				echo $currentIndent;
 				echo '<a href="?form_cat='.$childCategory->getID().@$discrim_url.'">';
-				echo html_image('ic/cfolder15.png', 15, 13);
+				echo $HTML->getFolderPic();
 				echo '  '.$childCategory->getLocalizedLabel().'</a>';
 				echo ' <em>('
 					.sprintf(_('%s projects'), $childCategory->getSubProjectsCount())

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=05f0b7853042aed63b96589b7eefcbd099e8c6c1

commit 05f0b7853042aed63b96589b7eefcbd099e8c6c1
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Jun 24 15:59:48 2017 +0200

    align icons & texts

diff --git a/src/common/widget/Widget_ProjectLatestFileReleases.class.php b/src/common/widget/Widget_ProjectLatestFileReleases.class.php
index 52783c0..2d7ac12 100644
--- a/src/common/widget/Widget_ProjectLatestFileReleases.class.php
+++ b/src/common/widget/Widget_ProjectLatestFileReleases.class.php
@@ -89,7 +89,7 @@ class Widget_ProjectLatestFileReleases extends Widget {
 				$tmp_alt = $package_name . " - " . _('Release Notes');
 				$link = '/frs/?group_id=' . $group_id . '&view=shownotes&release_id='.$frsrnr->getID();
 				$link_content = $HTML->getReleaseNotesPic($tmp_alt, $tmp_alt);
-				$cells[] = array(util_make_link($link, $link_content), 'class' => 'align-center');
+				$cells[][] = util_make_link($link, $link_content);
 				// -> monitor
 				if (session_loggedin()) {
 					$url = '/frs/?group_id='.$group_id.'&package_id='.$frsrnr->FRSPackage->getID().'&action=monitor';
@@ -109,7 +109,7 @@ class Widget_ProjectLatestFileReleases extends Widget {
 				$link_content = $HTML->getDownloadPic($tmp_alt, $tmp_alt);
 				$t_link_anchor = $HTML->toSlug($package_name)."-".$HTML->toSlug($package_release)."-title-content";
 				$link = '/frs/?group_id=' . $group_id . '&release_id='.$frsrnr->getID()."#".$t_link_anchor;
-				$cells[] = array(util_make_link ($link, $link_content), 'class' => 'align-center');
+				$cells[][] = util_make_link($link, $link_content);
 				$result .= $HTML->multiTableRow(array(), $cells);
 			}
 			$result .= $HTML->listTableBottom();

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=302fcc5806a8e20fdf9d32a6383ba040907782e7

commit 302fcc5806a8e20fdf9d32a6383ba040907782e7
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Jun 24 15:54:59 2017 +0200

    clean-up

diff --git a/src/common/forum/AttachManager.class.php b/src/common/forum/AttachManager.class.php
index 4811840..f62fa19 100644
--- a/src/common/forum/AttachManager.class.php
+++ b/src/common/forum/AttachManager.class.php
@@ -144,7 +144,7 @@ class AttachManager extends FFError {
 
 			$f = $msg->getForum();
 			if (!$f || !is_object($f)) {
-				exit_error(_('Could Not Get Forum Object'),'forums');
+				exit_error(_('Could Not Get Forum Object'), 'forums');
 			} else {
 				if ( ((user_getid() == $attach_userid)
 				      || (forge_check_perm ('forum_admin', $f->Group->getID())))
@@ -157,9 +157,8 @@ class AttachManager extends FFError {
 			//add attach for existing message
 			$f = $msg->getForum();
 			if (!$f || !is_object($f)) {
-				exit_error(_('Could Not Get Forum Object'),'forums');
+				exit_error(_('Could Not Get Forum Object'), 'forums');
 			} else {
-//				$attach = html_image('ic/cfolder15.png', 15, 13) . _('No attachment found');
 				$attach = '';
 				if ( ((user_getid() == $msg->getPosterID())
 				      || (forge_check_perm ('forum_admin', $f->Group->getID())))

-----------------------------------------------------------------------

Summary of changes:
 src/common/forum/AttachManager.class.php           |   5 +-
 src/common/include/Activity.class.php              |  16 ++---
 .../Widget_ProjectLatestFileReleases.class.php     |   4 +-
 .../widget/Widget_ProjectPublicAreas.class.php     |   2 +-
 src/plugins/globalactivity/www/index.php           |   2 +-
 src/plugins/globalsearch/www/index.php             |   8 ++-
 src/www/admin/cronman.php                          |   4 +-
 src/www/admin/trove/trove_cat_list.php             |   3 +-
 src/www/forum/forum.php                            |   6 +-
 src/www/include/Layout.class.php                   |  76 +++++++++++++--------
 .../include/renderers/HtmlSearchRenderer.class.php |  15 ++--
 .../images/ic/ofolder.png}                         | Bin
 src/www/themes/funky-wOw/images/ic/ofolder15.png   | Bin 447 -> 0 bytes
 src/www/themes/funky-wOw/images/ic/package.png     | Bin 0 -> 2312 bytes
 .../{funky/images => funky-wOw/images/ic}/t.png    | Bin
 .../{funky/images => funky-wOw/images/ic}/t2.png   | Bin
 .../ofolder.png}                                   | Bin
 src/www/themes/funky/images/ic/ofolder15.png       | Bin 447 -> 0 bytes
 src/www/themes/funky/images/ic/package.png         | Bin 0 -> 2312 bytes
 .../{funky-wOw/images => funky/images/ic}/t.png    | Bin
 .../{funky-wOw/images => funky/images/ic}/t2.png   | Bin
 src/www/trove/index.php                            |  14 ++--
 22 files changed, 82 insertions(+), 73 deletions(-)
 copy src/www/themes/{funky/images/docman/directory-with-documents.png => funky-wOw/images/ic/ofolder.png} (100%)
 delete mode 100644 src/www/themes/funky-wOw/images/ic/ofolder15.png
 create mode 100644 src/www/themes/funky-wOw/images/ic/package.png
 rename src/www/themes/{funky/images => funky-wOw/images/ic}/t.png (100%)
 rename src/www/themes/{funky/images => funky-wOw/images/ic}/t2.png (100%)
 copy src/www/themes/funky/images/{docman/directory-with-documents.png => ic/ofolder.png} (100%)
 delete mode 100644 src/www/themes/funky/images/ic/ofolder15.png
 create mode 100644 src/www/themes/funky/images/ic/package.png
 rename src/www/themes/{funky-wOw/images => funky/images/ic}/t.png (100%)
 rename src/www/themes/{funky-wOw/images => funky/images/ic}/t2.png (100%)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list