[Fusionforge-commits] FusionForge branch master updated. 710c948bf98d01211a40460fe7e64fef7c404f81

Franck VILLAUME nerville at fusionforge.org
Sat Feb 22 13:55:30 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  710c948bf98d01211a40460fe7e64fef7c404f81 (commit)
       via  114ef5a34360cc54c86b72702beb7572bbddd8f5 (commit)
      from  d63fa34df499634b26336dfb48b79dcefd4ba958 (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 710c948bf98d01211a40460fe7e64fef7c404f81
Merge: d63fa34 114ef5a
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Feb 22 13:55:19 2014 +0100

    merge Branch_5_3

diff --cc src/common/docman/views/addfile.php
index fcf9d9e,0d37b8d..1b12835
--- a/src/common/docman/views/addfile.php
+++ b/src/common/docman/views/addfile.php
@@@ -85,59 -85,64 +85,60 @@@ if ($dgf->getNested() == NULL) 
  		session_redirect('/docman/?group_id='.$group_id.'&view=additem');
  	}
  
 -	echo '<div class="warning">'. _('You MUST first create at least one folder to store your document.') .'</div>';
 +	echo html_e('div', array('class' => 'warning'), _('You MUST first create at least one folder to store your document.'), false);
  } else {
  	/* display the add new documentation form */
 -	echo '<p><strong>'. _('Document Title')._(': ').'</strong> '. _('Refers to the relatively brief title of the document (e.g. How to use the download server).'). '</p>';
 -	echo '<p><strong>'. _('Description')._(': ').'</strong> '. _('A brief description to be placed just under the title.') .'</p>';
 +	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 '<p>'._('Both fields are used by the document search engine.').'</p>';
 +		echo html_e('p', array(), _('Both fields are used by the document search engine.'), false);
  
 -	echo '<form name="adddata" action="'.$actionurl.'" method="post" enctype="multipart/form-data">';
 -	echo '<table class="infotable">
 -				<tr>
 -					<td>
 -						'. _('Document Title').utils_requiredField()
 -					.'</td><td>'
 -					.'<input pattern=".{5,}" placeholder="'._('Document Title').'" title="'.sprintf(_('(at least %s characters)'), 5).'" type="text" name="title" size="40" maxlength="255" required="required" /> '
 -					.sprintf(_('(at least %s characters)'), 5)
 -					.'</td>
 -				</tr>
 -				<tr>
 -					<td>
 -						'. _('Description') .utils_requiredField()
 -				 	.'</td><td>'
 -						.'<input pattern=".{10,}" placeholder="'._('Description').'" title="'.sprintf(_('(at least %s characters)'), 10).'" type="text" name="description" size="50" maxlength="255" required="required" /> '
 -						.sprintf(_('(at least %s characters)'), 10)
 -					.'</td>
 -				</tr>
 -				<tr>
 -					<td>
 -						'. _('Type of Document') .utils_requiredField()
 -					.'</td><td>
 -					<input type="radio" id="buttonFile" name="type" value="httpupload" checked="checked" required="required" />'. _('File') .
 -					'<input type="radio" id="buttonUrl" name="type" value="pasteurl" required="required" />'. _('URL');
 +	echo html_ao('form', array('name' => 'adddata', 'action' => $actionurl, 'method' => 'post', 'enctype' => 'multipart/form-data'));
 +	echo html_ao('table', array('class' => 'infotable'));
 +	echo html_ao('tr');
 +	echo html_e('td', array(), _('Document Title').utils_requiredField(), false);
 +	echo html_ao('td');
 +	echo html_e('input', array('pattern' => '.{5,}', 'placeholder' => _('Document Title'), 'title' => sprintf(_('(at least %s characters)'), 5), 'type' => 'text', 'name' => 'title', 'size' => '40', 'maxlength' => '255', 'required' => 'required'));
 +	echo html_e('span', array(), sprintf(_('(at least %s characters)'), 5), false);
 +	echo html_ac(html_ap() - 2);
 +	echo html_ao('tr');
 +	echo html_e('td', array(), _('Description') .utils_requiredField(), false);
 +	echo html_ao('td');
 +	echo html_e('input', array('pattern' => '.{10,}', 'placeholder' => _('Description'), 'title' => sprintf(_('(at least %s characters)'), 10), 'type' => 'text', 'name' => 'description', 'size' => '50', 'maxlength' => '255', 'required' => 'required'));
 +	echo html_e('span', array(), sprintf(_('(at least %s characters)'), 10), false);
 +	echo html_ac(html_ap() - 2);
 +	echo html_ao('tr');
 +	echo html_e('td', array(), _('Type of Document') .utils_requiredField());
 +	echo html_ao('td');
 +	echo html_e('input', array('type' => 'radio', 'id' => 'buttonFile', 'name' => 'type', 'value' => 'httpupload', 'checked' => 'checked', 'required' => 'required')).html_e('span', array(), _('File'), false);
 +	echo html_e('input', array('type' => 'radio', 'id' => 'buttonUrl', 'name' => 'type', 'value' => 'pasteurl', 'required' => 'required')).html_e('span', array(), _('URL'), false);
  	if (forge_get_config('use_manual_uploads')) {
 -					echo '<input type="radio" id="buttonManualUpload" name="type" value="manualupload" required="required" />'. _('Already-uploaded file');
 +		echo html_e('input', array('type' => 'radio', 'id' => 'buttonManualUpload', 'name' => 'type', 'value' => 'manualupload', 'required' => 'required')).html_e('span', array(), _('Already-uploaded file'), false);
  	}
  	if ($g->useCreateOnline()) {
 -					echo '<input type="radio" id="buttonEditor" name="type" value="editor" required="required" />'. _('Create online');
 +		echo html_e('input', array('type' => 'radio', 'id' => 'buttonEditor', 'name' => 'type', 'value' => 'editor', 'required' => 'required')).html_e('span', array(), _('Create online'), false);
  	}
 -	echo '				</td>
 -				</tr>
 -				<tr id="filerow">
 -					<td>
 -						'. _('Upload File') .utils_requiredField()
 -					.'</td><td>'
 -						.'<input type="file" required="required" name="uploaded_data" />'.sprintf(_('(max upload size: %s)'),human_readable_bytes(util_get_maxuploadfilesize())).'
 -					</td>
 -				</tr>
 -				<tr id="urlrow" style="display:none">
 -					<td>
 -						'. _('URL') . utils_requiredField()
 -					.'</td><td>'
 -						.'<input type="url" name="file_url" size="30" placeholder="'._('Enter a valid URL').'" pattern="ftp://.+|https?://.+" />
 -					</td>
 -				</tr>';
++<<<<<<< HEAD
 +	echo html_ac(html_ap() - 2);
 +	echo html_ao('tr', array('id' => 'filerow'));
 +	echo html_e('td', array(), _('Upload File').utils_requiredField(), false);
 +	echo html_ao('td');
 +	echo html_e('input', array('type' => 'file', 'required' => 'required', 'name' => 'uploaded_data'));
 +	echo html_e('span', array(), sprintf(_('(max upload size: %s)'), human_readable_bytes(util_get_maxuploadfilesize())), false);
 +	echo html_ac(html_ap() - 2);
 +	echo html_ao('tr', array('id' => 'urlrow', 'style' => 'display:none'));
 +	echo html_e('td', array(), _('URL').utils_requiredField());
 +	echo html_ao('td');
 +	echo html_e('input', array('type' => 'url', 'name' => 'file_url', 'size' => '30', 'placeholder' => _('Enter a valid URL'), 'pattern' => 'ftp://.+|https?://.+'));
 +	echo html_ac(html_ap() - 2);
- 	echo html_ao('tr', array('id' => 'pathrow', 'style' => 'display:none'));
- 	echo html_e('td', array(), _('File') . utils_requiredField(), false);
  	if (forge_get_config('use_manual_uploads')) {
 -		echo '		<tr id="pathrow" style="display:none">
 -					<td>
 -						'. _('File') . utils_requiredField() . '</td><td>';
++		echo html_ao('tr', array('id' => 'pathrow', 'style' => 'display:none'));
++		echo html_e('td', array(), _('File') . utils_requiredField(), false);
 +		echo html_ao('td');
  		$incoming = forge_get_config('groupdir_prefix')."/".$g->getUnixName()."/incoming";
  		$manual_files_arr = ls($incoming, true);
  		if (count($manual_files_arr)) {

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

Summary of changes:
 src/common/docman/views/addfile.php |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list