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 75c404659cb2f540eeb172eb4de78b2fed5d0f44 (commit)
via cb43e419154ac0201d84aec07ba13ecd2f421d20 (commit)
from 47b78b4cf0d7fe46a25907a6e1a517f68bb83639 (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=75c404659cb2f540eeb172eb4de78b2fed5d0f44
commit 75c404659cb2f540eeb172eb4de78b2fed5d0f44
Author: Franck Villaume <[email protected]>
Date: Sat Jul 1 16:51:52 2017 +0200
fix HTML syntax
diff --git a/src/www/search/include/renderers/DocsHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/DocsHtmlSearchRenderer.class.php
index 7914fee..6007d45 100644
--- a/src/www/search/include/renderers/DocsHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/DocsHtmlSearchRenderer.class.php
@@ -96,7 +96,6 @@ class DocsHtmlSearchRenderer extends HtmlGroupSearchRenderer {
<?php
echo html_ac(html_ap() - 1);
}
- $i = 0;
foreach ($result as $row) {
$document = document_get_object($row['docid'],
$row['group_id']);
$currentDocGroup =
documentgroup_get_object($document->getDocGroupID(), $document->Group->getID());
@@ -108,10 +107,9 @@ class DocsHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
$content = _('Project')._(':
').util_make_link('/docman/?group_id='.$currentDocGroup->Group->getID(),$currentDocGroup->Group->getPublicName()).'
';
}
$cells = array();
- $cells[] =
array($content.html_image('ic/folder.png', 22, 22, array('border' =>
'0')).$currentDocGroup->getPath(true), 'colspan' => 4);
+ $cells[] =
array($content.$HTML->getFolderPic().$currentDocGroup->getPath(true), 'colspan'
=> 7);
$lastDocGroupID = $currentDocGroup->getID();
$return .= $HTML->multiTableRow(array(),
$cells);
- $rowColor = 0;
}
$cells = array();
if (!$document->getLocked() &&
!$document->getReserved()) {
@@ -143,14 +141,13 @@ class DocsHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
$cells[][] = ' ';
}
$return .= $HTML->multiTableRow(array(), $cells);
- $rowColor++;
}
$content = html_ao('span', array('id' => 'massactionactive',
'class' => 'hide'));
$content .= html_e('span', array('id' =>
'docman-massactionmessage', 'title' => _('Actions availables for selected
documents, you need to check at least one document to get actions')), _('Mass
actions for selected documents')._(':'), false);
$content .= util_make_link('#',
html_image('docman/download-directory-zip.png', 22, 22, array('alt' =>
_('Download as a ZIP'))) , array('onclick' =>
'window.location.href=\''.util_make_uri('/docman/view.php/'.$this->groupId.'/zip/selected/files/\'+controllerListFile.buildUrlByCheckbox("active")'),
'title' => _('Download as a ZIP')), true);
$content .= html_ac(html_ap() - 1);
$cells = array();
- $cells[] = array($content, 'colspan' => 4);
+ $cells[] = array($content, 'colspan' => 7);
$return .= $HTML->multiTableRow(array(), $cells);
return $return;
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=cb43e419154ac0201d84aec07ba13ecd2f421d20
commit cb43e419154ac0201d84aec07ba13ecd2f421d20
Author: Franck Villaume <[email protected]>
Date: Sat Jul 1 16:51:37 2017 +0200
remove dup code
diff --git a/src/www/include/html.php b/src/www/include/html.php
index dc6e28e..fb1d5f1 100644
--- a/src/www/include/html.php
+++ b/src/www/include/html.php
@@ -134,11 +134,7 @@ function html_blankimage($height, $width) {
* @return string
*/
function html_abs_image($url, $width, $height, $args) {
- global $use_tooltips;
$args['src'] = $url;
- if (!$use_tooltips && isset($args['title'])) {
- $args['title'] = '';
- }
if (!isset($args['alt'])) {
$args['alt'] = '';
}
-----------------------------------------------------------------------
Summary of changes:
src/www/include/html.php | 4 ----
src/www/search/include/renderers/DocsHtmlSearchRenderer.class.php | 7 ++-----
2 files changed, 2 insertions(+), 9 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
