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 9691e134f460da4086dc27646735b2f890ccacda (commit)
from 25e01e5cc71e0ab023357e729aabf744c61415a1 (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=9691e134f460da4086dc27646735b2f890ccacda
commit 9691e134f460da4086dc27646735b2f890ccacda
Author: Franck Villaume <[email protected]>
Date: Fri Jul 15 12:50:10 2016 +0200
docman: reorg tooltips on edit & add file
diff --git a/src/common/docman/views/addfile.php
b/src/common/docman/views/addfile.php
index 5c89f77..f157ffb 100644
--- a/src/common/docman/views/addfile.php
+++ b/src/common/docman/views/addfile.php
@@ -93,24 +93,15 @@ if ($dgf->getNested($stateidArr) == NULL) {
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');
- echo html_e('strong', array(), _('Document Title')._(': ')._('Refers to
the relatively brief title of the document (e.g. How to use the download
server).'), false);
- echo html_ac(html_ap() - 1);
- echo html_ao('p');
- echo html_e('strong', array(), _('Description')._(': ')._('A brief
description to be placed just under the title.'), false);
- echo html_ac(html_ap() - 1);
- if ($g->useDocmanSearch())
- echo html_e('p', array(), _('Both fields are used by the
document search engine.'), false);
-
echo $HTML->openForm(array('name' => 'adddata', 'action' =>
util_make_uri($actionurl), 'method' => 'post', 'enctype' =>
'multipart/form-data'));
echo $HTML->listTableTop(array(), array(), 'infotable');
$cells = array();
$cells[][] = _('Document Title').utils_requiredField();
- $cells[][] = html_e('input', array('pattern' => '.{5,}', 'placeholder'
=> _('Document Title').' '.sprintf(_('(at least %s characters)'), 5), 'type' =>
'text', 'name' => 'title', 'size' => 40, 'maxlength' => 255, 'required' =>
'required'));
+ $cells[][] = html_e('input', array('pattern' => '.{5,}', 'placeholder'
=> _('Document Title').' '.sprintf(_('(at least %s characters)'), 5), 'title'
=> _('Document Title')._(': ')._('Refers to the relatively brief title of the
document (e.g. How to use the download server).'), 'type' => 'text', 'name' =>
'title', 'size' => 40, 'maxlength' => 255, 'required' => 'required'));
echo $HTML->multiTableRow(array(), $cells);
$cells = array();
$cells[][] = _('Description') .utils_requiredField();
- $cells[][] = html_e('textarea', array('pattern' => '.{10,}',
'placeholder' => _('Description').' '.sprintf(_('(at least %s characters)'),
10), 'name' => 'description', 'rows' => 5, 'cols' => 50, 'maxlength' => 255,
'required' => 'required'), '', false);
+ $cells[][] = html_e('textarea', array('pattern' => '.{10,}',
'placeholder' => _('Description').' '.sprintf(_('(at least %s characters)'),
10), 'title' => _('Editing tips:http,https or ftp: Hyperlinks. [#NNN]: Tracker
id NNN. [TNNN]: Task id NNN. [wiki:<pagename>]: Wiki page.
[forum:<msg_id>]: Forum post. [DNNN]: Document id NNN.'), 'name' =>
'description', 'rows' => 5, 'cols' => 50, 'maxlength' => 255, 'required' =>
'required'), '', false);
echo $HTML->multiTableRow(array(), $cells);
$cells = array();
$cells[][] = _('Comment');
@@ -190,6 +181,9 @@ if ($dgf->getNested($stateidArr) == NULL) {
}
echo $HTML->listTableBottom();
echo $HTML->addRequiredFieldsInfoBox();
+ if ($g->useDocmanSearch()) {
+ echo html_e('p', array(), _('Both fields Title & Description
are used by the document search engine.'), false);
+ }
echo html_e('div', array('class' => 'docmanSubmitDiv'), html_e('input',
array('type' => 'submit', 'name' => 'submit', 'value' => _('Submit
Information'))));
echo $HTML->closeForm();
}
diff --git a/src/common/docman/views/editfile.php
b/src/common/docman/views/editfile.php
index 0b13722..27e2593 100644
--- a/src/common/docman/views/editfile.php
+++ b/src/common/docman/views/editfile.php
@@ -78,7 +78,8 @@ $cells[][] = html_e('input', array('pattern' => '.{5,}',
'title' => sprintf(_('(
echo $HTML->multiTableRow(array(), $cells);
$cells = array();
$cells[] = array(_('Description').utils_requiredField()._(':'), 'class' =>
'docman_editfile_description');
-$cells[][] = html_e('textarea', array('pattern' => '.{10,}', 'title' =>
sprintf(_('(at least %s characters)'), 10), 'id' => 'description', 'name' =>
'description', 'maxlength' => '255', 'rows' => '5', 'cols' => '50'), '', false);
+$cells[][] = html_e('textarea', array('pattern' => '.{10,}', 'title' =>
_('Editing tips:http,https or ftp: Hyperlinks. [#NNN]: Tracker id NNN. [TNNN]:
Task id NNN. [wiki:<pagename>]: Wiki page. [forum:<msg_id>]: Forum
post. [DNNN]: Document id NNN.').
+
sprintf(_('at least %s characters)'), 10), 'id' => 'description', 'name' =>
'description', 'maxlength' => '255', 'rows' => '5', 'cols' => '50'), '', false);
echo $HTML->multiTableRow(array(), $cells);
$cells = array();
$cells[] = array(_('Comment')._(':'), 'class' => 'docman_editfile_comment');
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/views/addfile.php | 16 +++++-----------
src/common/docman/views/editfile.php | 3 ++-
2 files changed, 7 insertions(+), 12 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
