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, 6.1 has been updated
via 6f540e0f0ae0b12cb6085193cafb284348f2bfd4 (commit)
from 9f654906f6d911a092040b5fdcbf66af024a637f (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=6f540e0f0ae0b12cb6085193cafb284348f2bfd4
commit 6f540e0f0ae0b12cb6085193cafb284348f2bfd4
Author: Franck Villaume <[email protected]>
Date: Fri Nov 24 13:15:59 2017 +0000
docman: fix online document creation
diff --git a/src/common/docman/views/addfile.php
b/src/common/docman/views/addfile.php
index 2a81969..8378986 100644
--- a/src/common/docman/views/addfile.php
+++ b/src/common/docman/views/addfile.php
@@ -148,7 +148,7 @@ if ($dgf->getNested($stateidArr) == NULL) {
$cells[][] = html_e('input', array('type' => 'text', 'name' => 'name',
'size' => '30'));
echo $HTML->multiTableRow(array('id' => 'editnamerow', 'class' =>
'hide'), $cells);
echo html_ao('tr', array('id' => 'editrow', 'class' => 'hide'));
- echo html_ao('td', array('colspan' => '2'));
+ echo html_e('td', array(), _('Set the content to your file')._(':'));
$GLOBALS['editor_was_set_up'] = false;
$params = array() ;
/* name must be details !!! if name = data then nothing is displayed */
@@ -158,10 +158,10 @@ if ($dgf->getNested($stateidArr) == NULL) {
$params['group'] = $group_id;
plugin_hook("text_editor", $params);
if (!$GLOBALS['editor_was_set_up']) {
- echo html_e('textarea', array('name' => 'details', 'rows' => 5,
'cols' => 80), '', false);
+ echo html_e('td', array(), html_e('textarea', array('name' =>
'details', 'rows' => 5, 'cols' => 80), '', false));
}
unset($GLOBALS['editor_was_set_up']);
- echo html_ac(html_ap() - 2);
+ echo html_ac(html_ap() - 1);
if ($dirid) {
echo html_ao('tr');
echo html_ao('td', array('colspan' => 2));
diff --git a/src/common/docman/views/editfile.php
b/src/common/docman/views/editfile.php
index dd42f8c..b0300bd 100644
--- a/src/common/docman/views/editfile.php
+++ b/src/common/docman/views/editfile.php
@@ -140,11 +140,10 @@ if (forge_get_config('use_manual_uploads')) {
}
if ($g->useCreateOnline()) {
$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' => '100'), '', false).
+ $cells[][] = _('Edit the content of your file')._(':');
+ $cells[][] = html_e('textarea', array('id' => 'defaulteditzone', 'name'
=> 'details', 'rows' => '15', 'cols' => '100'), '', 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);
+ html_e('input', array('id' => 'editor', 'type' =>
'hidden', 'name' => 'editor', 'value' => 'online'));
echo $HTML->multiTableRow(array('id' => 'editonlineroweditfile',
'class' => 'hide'), $cells);
}
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/views/addfile.php | 6 +++---
src/common/docman/views/editfile.php | 7 +++----
2 files changed, 6 insertions(+), 7 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
