[Fusionforge-commits] FusionForge branch master updated. ec290b1913dbddaa7f487c44fdc71835d1c500c0

Franck Villaume nerville at fusionforge.org
Tue Mar 18 16:24:59 CET 2014


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  ec290b1913dbddaa7f487c44fdc71835d1c500c0 (commit)
       via  a5d17ae0059cb267a6a6667e1a7c15ae825f9ec3 (commit)
       via  48ca5ac84b3de90a64af040571ca507b44cae4c2 (commit)
       via  5669f06e182b3680583c2abefa4bc8cb1f0185d1 (commit)
      from  18370a475d24194e72bd79d1b41d74df48bef9d7 (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 -----------------------------------------------------------------
commit ec290b1913dbddaa7f487c44fdc71835d1c500c0
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Tue Mar 18 16:19:47 2014 +0100

    docman: more html_{ao,e,ac,ap}, use HTML->information, HTML->error_msg, HTML->warning_msg

diff --git a/src/common/docman/views/addfile.php b/src/common/docman/views/addfile.php
index c74ac51..19a4e6d 100644
--- a/src/common/docman/views/addfile.php
+++ b/src/common/docman/views/addfile.php
@@ -87,7 +87,7 @@ if ($dgf->getNested() == NULL) {
 		session_redirect('/docman/?group_id='.$group_id.'&view=additem');
 	}
 
-	echo html_e('div', array('class' => 'warning'), _('You MUST first create at least one folder to store your document.'), false);
+	echo $HTML->warning_msg(_('You MUST first create at least one folder to store your document.'));
 } else {
 	/* display the add new documentation form */
 	echo html_ao('p');
diff --git a/src/common/docman/views/admin.php b/src/common/docman/views/admin.php
index 1a25c5f..1b0265c 100644
--- a/src/common/docman/views/admin.php
+++ b/src/common/docman/views/admin.php
@@ -48,7 +48,7 @@ echo html_ac(html_ap() - 1);
 if (extension_loaded('zip')) {
 	echo html_ao('form', array('id' => 'backup', 'name' => 'backup', 'method' => 'post', 'action' => util_make_uri('/docman/view.php/'.$group_id.'/backup')));
 	echo html_ao('ul');
-	echo html_e('li', array(), '<input id="submitbackup" type="button" value="'. _('Extract documents and directories as an archive') .'" onclick="javascript:doIt(\'backup\')" />', false);
+	echo html_e('li', array(), html_e('input', array('id' => 'submitbackup', 'type' => 'button', 'value' => _('Extract documents and directories as an archive'), 'onclick' => 'javascript:doIt("backup")')), false);
 	echo html_ac(html_ap() -2);
 }
 
@@ -60,7 +60,7 @@ if ($g->useCreateOnline()) {
 	$createOnlineStatus='0';
 	$labelCreateOnline = _('Disable Create Online Documents');
 }
-echo '<li><input name="status" type="hidden" value="'.$createOnlineStatus.'"><input id="submitcreateonline" type="button" value="'.$labelCreateOnline.'" onclick="javascript:doIt(\'createonline\')"></li>';
+echo html_e('li', array(), html_e('input', array('name' => 'status', 'type' => 'hidden', 'value' => $createOnlineStatus)).html_e('input', array('id' => 'submitcreateonline', 'type' => 'button', 'value' => $labelCreateOnline, 'onclick' => 'javascript:doIt("createonline")')), false);
 echo html_ac(html_ap() -2);
 
 echo html_ao('form', array('id' => 'searchengine', 'name' => 'searchengine', 'method' => 'post', 'action' => util_make_uri('/docman/?group_id='.$group_id.'&action=updateenginesearch')));
@@ -71,13 +71,13 @@ if ($g->useDocmanSearch()) {
 	$searchEngineStatus='0';
 	$labelSearchEngine = _('Disable Search Engine');
 }
-echo '<li><input name="status" type="hidden" value="'.$searchEngineStatus.'"><input id="submitsearchengine" type="button" value="'.$labelSearchEngine.'" onclick="javascript:doIt(\'searchengine\')"></li>';
+echo html_e('li', array(), html_e('input', array('name' => 'status', 'type' => 'hidden', 'value' => $searchEngineStatus)).html_e('input', array('id' => 'submitsearchengine', 'type' => 'button', 'value' => $labelSearchEngine, 'onclick' =>'javascript:doIt("searchengine")')), false);
 echo html_ac(html_ap() -2);
 
 if ($g->useDocmanSearch()) {
 	echo html_ao('form', array('id' => 'reindexword', 'name' => 'reindexword', 'method' => 'post', 'action' => util_make_uri('/docman/?group_id='.$group_id.'&action=forcereindexenginesearch')));
 	echo html_ao('ul');
-	echo html_e('li', array(), html_e('input', array('name' => 'status', 'type' => 'hidden', 'value' => '1')).'<input id="submitreindexword" type="button" value="'. _('Force reindexation search engine') .'" onclick="javascript:doIt(\'reindexword\')">', false);
+	echo html_e('li', array(), html_e('input', array('name' => 'status', 'type' => 'hidden', 'value' => '1')).html_e('input', array('id' => 'submitreindexword', 'type' => 'button', 'value' => _('Force reindexation search engine'), 'onclick' => 'javascript:doIt("reindexword")')), false);
 	echo html_ac(html_ap() -2);
 }
 
@@ -90,7 +90,7 @@ if (forge_get_config('use_webdav')) {
 		$webdavStatus = '0';
 		$labelWebdavInterface = _('Disable Webdav Interface');
 	}
-	echo html_e('li', array(), html_e('input', array('name' => 'status', 'type' => 'hidden', 'value' => $webdavStatus)).'<input id="submitweddavinterface" type="button" value="'.$labelWebdavInterface.'" onclick="javascript:doIt(\'webdavinterface\')">', false);
+	echo html_e('li', array(), html_e('input', array('name' => 'status', 'type' => 'hidden', 'value' => $webdavStatus)).html_e('input', array('id' => 'submitweddavinterface', 'type' => 'button', 'value' => $labelWebdavInterface, 'onclick' => 'javascript:doIt("webdavinterface")')), false);
 	echo html_ac(html_ap() -2);
 }
 
diff --git a/src/common/docman/views/listfile.php b/src/common/docman/views/listfile.php
index f87599a..f21d1e9 100644
--- a/src/common/docman/views/listfile.php
+++ b/src/common/docman/views/listfile.php
@@ -341,7 +341,7 @@ if (isset($nested_docs[$dirid]) && is_array($nested_docs[$dirid])) {
 	echo html_ac(html_ap() - 3);
 } else {
 	if ($dirid) {
-		echo html_e('p', array('class' => 'information'), _('No documents.'), false);
+		echo $HTML->information(_('No documents.'));
 	}
 }
 if (forge_check_perm('docman', $group_id, 'approve') && $DocGroupName) {
diff --git a/src/common/docman/views/listtrashfile.php b/src/common/docman/views/listtrashfile.php
index e5396d7..722d0dd 100644
--- a/src/common/docman/views/listtrashfile.php
+++ b/src/common/docman/views/listtrashfile.php
@@ -194,7 +194,7 @@ if (isset($nested_docs[$dirid]) && is_array($nested_docs[$dirid])) {
 	echo html_ac(html_ap() - 3);
 } else {
 	if ($dirid) {
-		echo html_e('p', array('class' => 'information'), _('No documents.'), false);
+		echo $HTML->information(_('No documents.'));
 	}
 }
 
diff --git a/src/common/docman/views/pendingfiles.php b/src/common/docman/views/pendingfiles.php
index ae4083a..c4a942e 100644
--- a/src/common/docman/views/pendingfiles.php
+++ b/src/common/docman/views/pendingfiles.php
@@ -38,7 +38,7 @@ if (!forge_check_perm('docman', $g->getID(), 'approve')) {
 }
 
 if (!isset($nested_pending_docs)) {
-	echo html_e('p', array('class' => 'information'), _('No pending documents.'), false);
+	echo $HTML->information(_('No pending documents.'));
 } else {
 	echo html_ao('script', array('type' => 'text/javascript'));
 ?>
diff --git a/src/common/docman/views/reporting.php b/src/common/docman/views/reporting.php
index 933978b..809e8b7 100644
--- a/src/common/docman/views/reporting.php
+++ b/src/common/docman/views/reporting.php
@@ -82,7 +82,7 @@ echo $HTML->getStylesheets();
 $report = new ReportPerGroupDocmanDownloads($group_id, $start, $end);
 
 if ($report->isError()) {
-	echo html_e('p', array('class' => 'error_msg'), $report->getErrorMessage(), false);
+	echo $HTML->error_msg($report->getErrorMessage());
 } else {
 
 	echo html_ao('form', array('action' => util_make_uri('/docman/?group_id='.$group_id.'&view=reporting'), 'method' => 'post', 'class' => 'align-center'));
@@ -96,7 +96,7 @@ if ($report->isError()) {
 $data = $report->getData();
 
 if (count($data) == 0) {
-	echo html_e('p', array('class' => 'information'), _('There have been no viewed documents for this project yet.'), false);
+	echo $HTML->information(_('There have been no viewed documents for this project yet.'));
 } else {
 	echo '<script type="text/javascript">';
 	echo '//<![CDATA['."\n";
diff --git a/src/common/docman/views/search.php b/src/common/docman/views/search.php
index e1ebe43..6f8de4a 100644
--- a/src/common/docman/views/search.php
+++ b/src/common/docman/views/search.php
@@ -29,6 +29,7 @@
 global $g;
 global $group_id;
 global $gfcommon;
+global $HTML;
 
 if (!forge_check_perm('docman', $group_id, 'read')) {
 	$return_msg= _('Document Manager Access Denied');
@@ -126,10 +127,10 @@ if ($searchString) {
 	$qpa = db_construct_qpa($qpa, ' ORDER BY updatedate, createdate');
 	$result = db_query_qpa($qpa);
 	if (!$result) {
-		echo html_e('p', array('class' => 'error'), _('Database query error'));
+		echo $HTML->error_msg(_('Database query error'));
 		db_free_result($result);
 	} elseif (db_numrows($result) < 1) {
-		echo html_e('p', array('class' => 'warning_msg'), _('Your search did not match any documents.'));
+		echo $HTML->warning_msg(_('Your search did not match any documents.'));
 		db_free_result($result);
 	} else {
 		$resarr = array();
@@ -156,8 +157,7 @@ if ($searchString) {
 			$cells[][] = $item["statename"];
 			$nextcell = '';
 			if ($localProject->getUnixName() != $g->getUnixName()) {
-				$browselink = '/docman/?group_id='.$localProject->getID();
-				$nextcell .= util_make_link($browselink, $localProject->getPublicName(), array('title' => _('Browse document manager for this project.'), 'class' => 'tabtitle-nw')).'::';
+				$nextcell .= util_make_link('/docman/?group_id='.$localProject->getID(), $localProject->getPublicName(), array('title' => _('Browse document manager for this project.'), 'class' => 'tabtitle-nw')).'::';
 			}
 			$nextcell .= html_e('i', array(), $docGroupObject->getPath(true, true), false);
 			$cells[][] = $nextcell;
@@ -166,6 +166,6 @@ if ($searchString) {
 		echo $HTML->listTableBottom();
 	}
 } elseif (getStringFromServer('REQUEST_METHOD') === 'POST') {
-	echo html_e('p', array('class' => 'warning_msg'), _('Your search is empty.'));
+	echo $HTML->warning_msg(_('Your search is empty.'));
 }
 echo html_ac(html_ap() -2);
diff --git a/src/common/widget/Widget_ProjectLatestDocuments.class.php b/src/common/widget/Widget_ProjectLatestDocuments.class.php
index b6dff50..b1cc3ef 100644
--- a/src/common/widget/Widget_ProjectLatestDocuments.class.php
+++ b/src/common/widget/Widget_ProjectLatestDocuments.class.php
@@ -69,7 +69,7 @@ class Widget_ProjectLatestDocuments extends Widget {
 		if (!$res_files || $rows_files < 1) {
 			echo db_error();
 			// No documents
-			echo '<div class="warning">'._('This Project Has Not Published Any Documents').'</div>';
+			echo $HTML->warning_msg(_('This project has not published any documents.'));
 		} else {
 			$tabletop = array(_('Date'), _('File Name'), _('Title'), _('Author'), _('Path'));
 			if (session_loggedin() && (user_ismember($group_id) ||

commit a5d17ae0059cb267a6a6667e1a7c15ae825f9ec3
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Tue Mar 18 15:08:29 2014 +0100

    docman: editfile, move to html_{ao,ac,ap,e}, more css, listTableTop, listTableBottom, multiTabRow

diff --git a/src/common/docman/views/editfile.php b/src/common/docman/views/editfile.php
index dce87e2..5947271 100644
--- a/src/common/docman/views/editfile.php
+++ b/src/common/docman/views/editfile.php
@@ -2,7 +2,7 @@
 /**
  * FusionForge Documentation Manager
  *
- * Copyright 2012-2013, Franck Villaume - TrivialDev
+ * Copyright 2012-2014, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -25,63 +25,58 @@
 /* global variables used */
 global $g; //group object
 global $group_id; // id of the group
+global $HTML;
 
 if (!forge_check_perm('docman', $group_id, 'approve')) {
 	$return_msg= _('Document Manager Access Denied');
 	session_redirect('/docman/?group_id='.$group_id.'&warning_msg='.urlencode($return_msg));
 }
 
-echo '<div id="editFile" >';
-echo '<form id="editdocdata" name="editdocdata" method="post" enctype="multipart/form-data">';
-echo '<table>';
-echo '	<tr>';
-echo '		<td><strong>'. _('Document Title').utils_requiredField()._(':').'</strong><br />';
-echo '		<input pattern=".{5,}" title="'.sprintf(_('(at least %s characters)'), 5).'" id="title" type="text" name="title" size="40" maxlength="255"/></td>';
-echo '	</tr>';
-echo '	<tr>';
-echo '		<td><strong>'. _('Description').utils_requiredField()._(':').'</strong><br />';
-echo '		<input pattern=".{10,}" title="'.sprintf(_('(at least %s characters)'), 10).'" id="description" type="text" name="description" size="40" maxlength="255"/></td>';
-echo '	</tr>';
+echo html_ao('div', array('id' => 'editFile'));
+echo html_ao('form', array('id' => 'editdocdata', 'name' => 'editdocdata', 'method' => 'post', 'enctype' => 'multipart/form-data'));
+echo $HTML->listTableTop(array());
+$cells = array();
+$cells[] = array(_('Document Title').utils_requiredField()._(':'), 'class' => 'docman_editfile_title');
+$cells[][] = html_e('input', array('pattern' => '.{5,}', 'title' => sprintf(_('(at least %s characters)'), 5), 'id' => 'title', 'type' => 'text', 'name' => 'title', 'size' => '40', 'maxlength' => '255'));
+echo $HTML->multiTableRow(array(), $cells);
+$cells = array();
+$cells[] = array(_('Description').utils_requiredField()._(':'), 'class' => 'docman_editfile_title');
+$cells[][] = html_e('input', array('pattern' => '.{10,}', 'title' => sprintf(_('(at least %s characters)'), 10), 'id' => 'description', 'type' => 'text', 'name' => 'description', 'size' => '40', 'maxlength' => '255'));
+echo $HTML->multiTableRow(array(), $cells);
 if ($g->useDocmanSearch()) {
-	echo '	<tr>';
-	echo '		<td>'. _('Both fields are used by the document search engine.') .'</td>';
-	echo '	</tr>';
+	$cells = array();
+	$cells[] =  array(_('Both fields are used by the document search engine.'), 'colspan' => 2);
+	echo $HTML->multiTableRow(array(), $cells);
 }
-echo '	<tr>';
-echo '		<td><strong>'. _('File')._(': ').'</strong>';
-echo '			<a id="filelink"></a>';
-echo '		</td>';
-echo '	</tr>';
+$cells = array();
+$cells[] = array(_('File')._(':'), 'class' => 'docman_editfile_title');
+$cells[][] = html_e('a', array('id' => 'filelink'), '', false);
+echo $HTML->multiTableRow(array(), $cells);
 if ($g->useCreateOnline()) {
-	echo '	<tr id="editonlineroweditfile" >';
-	echo '		<td>'. _('Edit the contents to your desire or leave them as they are to remain unmodified.') .'<br />';
-	echo '			<textarea id="defaulteditzone" name="details" rows="15" cols="70"></textarea><br />';
-	echo '			<input id="defaulteditfiletype" type="hidden" name="filetype" value="text/plain" />';
-	echo '			<input id="editor" type="hidden" name="editor" value="online" />';
-	echo '		</td>';
-	echo '	</tr>';
+	$cells = array();
+	$cells[] = array(_('Edit the contents to your desire or leave them as they are to remain unmodified.').html_e('br').
+			html_e('textarea', array('id' => 'defaulteditzone', 'name' => 'details', 'rows' => '15', 'cols' => '70'), '', false).
+			html_e('input', array('id' => 'defaulteditfiletype', 'type' => 'hidden', 'name' => 'filetype', 'value' => 'text/plain')).
+			html_e('input', array('id' => 'editor', 'type' => 'hidden', 'name' => 'editor', 'value' => 'online')),
+			'colspan' => 2);
+	echo $HTML->multiTableRow(array('id' => 'editonlineroweditfile'), $cells);
 }
-echo '	<tr>';
-echo '		<td><strong>'. _('Folder that document belongs to:') .'</strong><br />';
-echo '			<select name="doc_group" id="doc_group"></select>';
-echo '		</td>';
-echo '	</tr>';
-echo '	<tr>';
-echo '		<td><strong>'. _('State')._(': ').'</strong><br />';
-echo '			<select name="stateid" id="stateid"></select>';
-echo '		</td>';
-echo '	</tr>';
-echo '	<tr id="fileurlroweditfile">';
-echo '		<td><strong>'. _('Specify an new outside URL where the file will be referenced:') .'</strong>'. utils_requiredField() .'<br />';
-echo '			<input id="fileurl" type="url" name="file_url" size="50" pattern="ftp://.+|https?://.+" />';
-echo '		</td>';
-echo '	</tr>';
-echo '	<tr id="uploadnewroweditfile">';
-echo '		<td><strong>'. _('OPTIONAL: Upload new file:') .'</strong><br />';
-echo '			<input type="file" name="uploaded_data" /><br />'.sprintf(_('(max upload size: %s)'),human_readable_bytes(util_get_maxuploadfilesize()));
-echo '		</td>';
-echo '	</tr>';
-echo '</table>';
-echo '<input type="hidden" id="docid" name="docid" />';
-echo '</form>';
-echo '</div>';
+$cells = array();
+$cells[] = array(_('Folder that document belongs to')._(':'), 'class' => 'docman_editfile_title');
+$cells[][] = html_e('select', array('name' => 'doc_group', 'id' => 'doc_group'), '', false);
+echo $HTML->multiTableRow(array(), $cells);
+$cells = array();
+$cells[] = array(_('State')._(':'), 'class' => 'docman_editfile_title');
+$cells[][] = html_e('select', array('name' => 'stateid', 'id' => 'stateid'), '', false);
+echo $HTML->multiTableRow(array(), $cells);
+$cells = array();
+$cells[] = array(_('Specify an new outside URL where the file will be referenced').utils_requiredField()._(':'), 'class' => 'docman_editfile_title');
+$cells[][] = html_e('input', array('id' => 'fileurl', 'type' => 'url', 'name' => 'file_url', 'size' => '50', 'pattern' => 'ftp://.+|https?://.+'));
+echo $HTML->multiTableRow(array('id' => 'fileurlroweditfile'), $cells);
+$cells = array();
+$cells[] = array(_('OPTIONAL Upload new file')._(':'), 'class' => 'docman_editfile_title');
+$cells[][] = html_e('input', array('type' => 'file', 'name' => 'uploaded_data')).html_e('br').sprintf(_('(max upload size: %s)'),human_readable_bytes(util_get_maxuploadfilesize()));
+echo $HTML->multiTableRow(array('id' => 'uploadnewroweditfile'), $cells);
+echo $HTML->listTableBottom();
+echo html_e('input', array('type' => 'hidden', 'id' => 'docid', 'name' => 'docid'));
+echo html_ac(html_ap() -2);
diff --git a/src/www/themes/funky-wOw/css/theme-pages.css b/src/www/themes/funky-wOw/css/theme-pages.css
index 7a2a77b..06911e4 100644
--- a/src/www/themes/funky-wOw/css/theme-pages.css
+++ b/src/www/themes/funky-wOw/css/theme-pages.css
@@ -231,10 +231,6 @@
 	margin: 2px;
 }
 
-.docman_editfile_nodisplay {
-	display: none;
-}
-
 /*
 	tracker
 */
diff --git a/src/www/themes/funky-wOw/css/theme.css b/src/www/themes/funky-wOw/css/theme.css
index 96d7dc9..a0c76ba 100644
--- a/src/www/themes/funky-wOw/css/theme.css
+++ b/src/www/themes/funky-wOw/css/theme.css
@@ -770,6 +770,7 @@ p.information {
 	margin-left: 5px;
 }
 
+.docman_editfile_title,
 #docman_search_query_label {
 	font-weight:bold;
 }
diff --git a/src/www/themes/funky/css/theme-pages.css b/src/www/themes/funky/css/theme-pages.css
index 7a2a77b..06911e4 100644
--- a/src/www/themes/funky/css/theme-pages.css
+++ b/src/www/themes/funky/css/theme-pages.css
@@ -231,10 +231,6 @@
 	margin: 2px;
 }
 
-.docman_editfile_nodisplay {
-	display: none;
-}
-
 /*
 	tracker
 */
diff --git a/src/www/themes/funky/css/theme.css b/src/www/themes/funky/css/theme.css
index 707f96a..9183314 100644
--- a/src/www/themes/funky/css/theme.css
+++ b/src/www/themes/funky/css/theme.css
@@ -811,6 +811,7 @@ p.information {
 	margin-top:10px;
 }
 
+.docman_editfile_title,
 #docman_search_query_label {
 	font-weight:bold;
 }

commit 48ca5ac84b3de90a64af040571ca507b44cae4c2
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Tue Mar 18 11:24:44 2014 +0100

    docman: listfile, util_make_uri needs echo

diff --git a/src/common/docman/views/listfile.php b/src/common/docman/views/listfile.php
index e3c1ef7..f87599a 100644
--- a/src/common/docman/views/listfile.php
+++ b/src/common/docman/views/listfile.php
@@ -143,7 +143,7 @@ jQuery(document).ready(function() {
 		divEditDirectory:	jQuery('#editdocgroup'),
 		buttonAddItem:		jQuery('#docman-additem'),
 		buttonEditDirectory:	jQuery('#docman-editdirectory'),
-		docManURL:		'<?php util_make_uri('/docman') ?>',
+		docManURL:		'<?php echo util_make_uri('/docman') ?>',
 		divLeft:		jQuery('#leftdiv'),
 		divRight:		jQuery('#rightdiv'),
 		childGroupId:		<?php echo util_ifsetor($childgroup_id, 0) ?>,

commit 5669f06e182b3680583c2abefa4bc8cb1f0185d1
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Tue Mar 18 11:11:31 2014 +0100

    docman: search fix form & add filename

diff --git a/src/common/docman/views/search.php b/src/common/docman/views/search.php
index eb75881..e1ebe43 100644
--- a/src/common/docman/views/search.php
+++ b/src/common/docman/views/search.php
@@ -57,7 +57,7 @@ echo html_ao('div', array('id' => 'docman_search_query_words'));
 echo html_e('span', array('id' => 'docman_search_query_label'), _('Query').utils_requiredField()._(': '));
 echo html_e('input', array('type' => 'text', 'name' => 'textsearch', 'id' => 'textsearch', 'size' => 48, 'value' => $searchString, 'required' => 'required', 'placeholder' => _('Searched words')));
 echo html_e('input', array('type' => 'submit', 'value' => _('Search')));
-echo html_ac(html_ap() - 2);
+echo html_ac(html_ap() - 1);
 echo html_ao('div', array('id' => 'docman_search_query_ckeckbox'));
 echo html_e('input', $attrsInputSearchAll)._('With all the words');
 echo html_e('input', $attrsInputSearchOne)._('With at least one of words');
@@ -78,7 +78,7 @@ if (isset($projectIDsArray) && is_array($projectIDsArray)) {
 	echo html_e('input', $attrsInputIncludeSubprojects)._('Include child projects');
 }
 
-echo html_ac(html_ap() - 1);
+echo html_ac(html_ap() - 2);
 echo html_ao('div', array('id' => 'docman_search_query_result'));
 if ($searchString) {
 	$mots = preg_split("/[\s,]+/",$searchString);
@@ -148,7 +148,7 @@ if ($searchString) {
 			if ($item['filetype'] == 'URL') {
 				$cells[][] = util_make_link($item["filename"], $item["title"], array(), true);
 			} else {
-				$cells[][] = util_make_link('/docman/view.php/'.$item["group_id"].'/'.$item["docid"].'/'.urlencode($item["filename"]), $item["title"]);
+				$cells[][] = util_make_link('/docman/view.php/'.$item["group_id"].'/'.$item["docid"].'/'.urlencode($item["filename"]), $item["filename"]).' ('.$item["title"].')';
 			}
 			$cells[][] = $item["description"];
 			$localProject = group_get_object($item['group_id']);

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

Summary of changes:
 src/common/docman/views/addfile.php                |    2 +-
 src/common/docman/views/admin.php                  |   10 +-
 src/common/docman/views/editfile.php               |   97 ++++++++++----------
 src/common/docman/views/listfile.php               |    4 +-
 src/common/docman/views/listtrashfile.php          |    2 +-
 src/common/docman/views/pendingfiles.php           |    2 +-
 src/common/docman/views/reporting.php              |    4 +-
 src/common/docman/views/search.php                 |   16 ++--
 .../widget/Widget_ProjectLatestDocuments.class.php |    2 +-
 src/www/themes/funky-wOw/css/theme-pages.css       |    4 -
 src/www/themes/funky-wOw/css/theme.css             |    1 +
 src/www/themes/funky/css/theme-pages.css           |    4 -
 src/www/themes/funky/css/theme.css                 |    1 +
 13 files changed, 69 insertions(+), 80 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list