[Fusionforge-commits] FusionForge branch master updated. 4c69edca6304388aa386193f466af8817edd00cc

Franck Villaume nerville at fusionforge.org
Thu Dec 4 13:34:08 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  4c69edca6304388aa386193f466af8817edd00cc (commit)
      from  7ce87344b94412ce7284e3b99c57401d93e87499 (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 4c69edca6304388aa386193f466af8817edd00cc
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Dec 4 13:33:21 2014 +0100

    more HTML helpers

diff --git a/src/common/docman/views/addfile.php b/src/common/docman/views/addfile.php
index f62b3a5..163fd3d 100644
--- a/src/common/docman/views/addfile.php
+++ b/src/common/docman/views/addfile.php
@@ -161,7 +161,7 @@ if ($dgf->getNested() == NULL) {
 	$params['group'] = $group_id;
 	plugin_hook("text_editor", $params);
 	if (!$GLOBALS['editor_was_set_up']) {
-		echo '<textarea name="details" rows="5" cols="80"></textarea>';
+		echo html_e('textarea', array('name' => 'details', 'rows' => 5, 'cols' => 80), '', false);
 	}
 	unset($GLOBALS['editor_was_set_up']);
 	echo html_ac(html_ap() - 2);
@@ -184,9 +184,7 @@ if ($dgf->getNested() == NULL) {
 	}
 	echo $HTML->listTableBottom();
 	echo $HTML->addRequiredFieldsInfoBox();
-	echo html_ao('div', array('class' => 'docmanSubmitDiv'));
-	echo html_e('input', array('type' => 'submit', 'name' => 'submit', 'value' => _('Submit Information')));
-	echo html_ac(html_ap() - 1);
+	echo html_e('div', array('class' => 'docmanSubmitDiv'), html_e('input', array('type' => 'submit', 'name' => 'submit', 'value' => _('Submit Information'))));
 	echo $HTML->closeForm();
 }
 echo html_ac(html_ap() - 1);
diff --git a/src/common/docman/views/additem.php b/src/common/docman/views/additem.php
index 71e5594..424d5c2 100644
--- a/src/common/docman/views/additem.php
+++ b/src/common/docman/views/additem.php
@@ -51,15 +51,13 @@ jQuery(document).ready(function() {
 <?php
 echo html_ac(html_ap() - 1);
 echo html_ao('div', array('id' => 'tabs'));
-echo html_ao('ul');
-echo html_e('li', array(), util_make_link('#tabs-new-document', _('New Document'), array('id' => 'tab-new-document', 'title' => _('Submit a new document in this folder.')), true), false);
-
+elementsLi = array();
+$elementsLi[] = array('content' => util_make_link('#tabs-new-document', _('New Document'), array('id' => 'tab-new-document', 'title' => _('Submit a new document in this folder.')), true));
 if (forge_check_perm('docman', $group_id, 'approve')) {
-	echo html_e('li', array(), util_make_link('#tabs-new-folder', _('New Folder'), array('id' => 'tab-new-folder', 'title' => _('Create a folder based on this name.')), true), false);
-	echo html_e('li', array(), util_make_link('#tabs-inject-tree', _('Inject Tree'), array('id' => 'tab-inject-tree', 'title' => _('Create a full folders tree using an compressed archive. Only ZIP format support.')), true), false);
+	$elementsLi[] = array('content' => util_make_link('#tabs-new-folder', _('New Folder'), array('id' => 'tab-new-folder', 'title' => _('Create a folder based on this name.')), true));
+	$elementsLi[] = array('content' => util_make_link('#tabs-inject-tree', _('Inject Tree'), array('id' => 'tab-inject-tree', 'title' => _('Create a full folders tree using an compressed archive. Only ZIP format support.')), true));
 }
-
-echo html_ac(html_ap() -1);
+echo $HTML->html_list($elementsLi);
 echo html_ao('div', array('id' => 'tabs-new-document'));
 echo html_ao('div', array('class' => 'docman_div_include', 'id' => 'addfile'));
 include ($gfcommon.'docman/views/addfile.php');

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

Summary of changes:
 src/common/docman/views/addfile.php |    6 ++----
 src/common/docman/views/additem.php |   12 +++++-------
 2 files changed, 7 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list