[Fusionforge-commits] FusionForge branch master updated. 6.0.4-766-g46ff278

Franck Villaume nerville at libremir.placard.fr.eu.org
Thu Aug 4 16:04:24 CEST 2016


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  46ff278ce60099cf680d927ecd36421b1c10c8ce (commit)
       via  8f46c445e63aadb5766b208b92b9bb2e4b437015 (commit)
       via  779dff72135b71794bf5c81e90488a8e7c057cd0 (commit)
      from  398b2901ebde062eec5ce82be2bb4f00f1b2c381 (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=46ff278ce60099cf680d927ecd36421b1c10c8ce

commit 46ff278ce60099cf680d927ecd36421b1c10c8ce
Merge: 8f46c44 779dff7
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Aug 4 16:03:43 2016 +0200

    Merge branch 'master' of git+ssh://fusionforge.org/scmrepos/git/fusionforge/users/nerville


https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=8f46c445e63aadb5766b208b92b9bb2e4b437015

commit 8f46c445e63aadb5766b208b92b9bb2e4b437015
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Jul 16 18:07:34 2016 +0200

    docman editfile modal window: review scrolling when large number of versions, fix columns width

diff --git a/src/common/docman/views/editfile.php b/src/common/docman/views/editfile.php
index 27e2593..8f0d5bc 100644
--- a/src/common/docman/views/editfile.php
+++ b/src/common/docman/views/editfile.php
@@ -66,9 +66,12 @@ $cells[] = array(_('State')._(':'), 'class' => 'docman_editfile_title');
 $cells[][] = html_e('select', array('name' => 'stateid', 'id' => 'stateid'), '', false);
 echo $HTML->multiTableRow(array(), $cells);
 echo $HTML->listTableBottom();
-$thArr = array(_('VersionID/Current'), _('Filename'), _('Title'), _('Description'), _('Comment'), _('Author'), _('Last Time'), _('Size'), _('Actions'));
+$thArr = array(_('ID (x)'), _('Filename'), _('Title'), _('Description'), _('Comment'), _('Author'), _('Last Time'), _('Size'), _('Actions'));
+$thTitle = array(_('x does mark the current version'), '', '', '', '', '', '', '', '', '', '');
+$thSizeCssArr = array(array('style' => 'width: 60px'), array('style' => 'width: 150px'), array('style' => 'width: 150px'), array('style' => 'width: 150px'), array('style' => 'width: 110px'),
+			array('style' => 'width: 100px'), array('style' => 'width: 100px'), array('style' => 'width: 50px'),array('style' => 'width: 50px'));
 $thClass = array('', '', '', '', '', '', '', '', 'unsortable');
-echo $HTML->listTableTop($thArr, array(), 'sortable full', 'sortable_doc_version_table', $thClass);
+echo $HTML->listTableTop($thArr, array(), 'sortable full', 'sortable_doc_version_table', $thClass, $thTitle, $thSizeCssArr);
 echo $HTML->listTableBottom();
 echo html_e('button', array('id' => 'doc_version_addbutton', 'type' => 'button', 'onclick' => 'javascript:controllerListFile.toggleAddVersionView()'), _('Add new version'));
 echo $HTML->listTableTop(array(), array(), 'listing full hide', 'doc_version_edit');
diff --git a/src/www/docman/scripts/DocManController.js b/src/www/docman/scripts/DocManController.js
index 94847c3..be56e5b 100644
--- a/src/www/docman/scripts/DocManController.js
+++ b/src/www/docman/scripts/DocManController.js
@@ -105,7 +105,7 @@ DocManListFileController.prototype =
 		var modalId = this.listfileparams.divEditFile;
 		jQuery(modalId).dialog({
 			autoOpen: false,
-			width: 900,
+			width: 1000,
 			modal: true,
 			title: this.listfileparams.divEditTitle,
 			buttons: {
@@ -408,9 +408,11 @@ DocManListFileController.prototype =
 					jQuery('#editFile').prepend(data.html);
 				} else {
 					jQuery('#sortable_doc_version_table > tbody').children().remove();
+					jQuery('#sortable_doc_version_table > tbody').css('max-height', '400px').css('overflow-y', 'auto').css('display', 'block');
+					jQuery('#sortable_doc_version_table > thead > tr').css('display', 'block');
 					eachdocparams = this.docparams;
 					jQuery.each(data, function (i, val) {
-						//_('VersionID/Current'), _('Filename'), _('Title'), _('Description'), _('Comment'), _('Author'), _('Last Time'), _('Size'), _('Actions'));
+						//_('ID (x)'), _('Filename'), _('Title'), _('Description'), _('Comment'), _('Author'), _('Last Time'), _('Size'), _('Actions'));
 						currenttdcontent = '';
 						if (val.current_version == 1) {
 							currenttdcontent += ' (x)';
@@ -431,7 +433,8 @@ DocManListFileController.prototype =
 						for (var i = 0; i < versionActionsArrayLength; i++) {
 							versionactiontdcontent += val.versionactions[i];
 						}
-						var htmlString = '<tr id="docversion'+val.version.substr(1)+'" ><td>'+val.version.substr(1)+currenttdcontent+'</td><td>'+filenametdcontent[0].outerHTML+'</td><td>'+val.title+'</td><td>'+val.description+'</td><td>'+val.vcomment+'</td><td>'+val.created_by_username+'</td><td>'+val.lastdate+'</td><td>'+val.filesize_readable+'</td><td>'+versionactiontdcontent+'</td></tr>'
+						// please sync with the editfile.php widths if you change it here.
+						var htmlString = '<tr id="docversion'+val.version.substr(1)+'" ><td style="width: 60px">'+val.version.substr(1)+currenttdcontent+'</td><td style="width: 150px">'+filenametdcontent[0].outerHTML+'</td><td style="width: 150px">'+val.title+'</td><td style="width: 150px">'+val.description+'</td><td style="width: 110px">'+val.vcomment+'</td><td style="width: 100px">'+val.created_by_username+'</td><td style="width: 100px">'+val.lastdate+'</td><td style="width: 50px">'+val.filesize_readable+'</td><td style="width: 50px">'+versionactiontdcontent+'</td></tr>'
 						jQuery('#sortable_doc_version_table > tbody:last-child').append(htmlString);
 						});
 				}

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=779dff72135b71794bf5c81e90488a8e7c057cd0

commit 779dff72135b71794bf5c81e90488a8e7c057cd0
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Jul 16 18:07:34 2016 +0200

    docman editfile modal window: review scrolling when large number of versions, fix columns width

diff --git a/src/common/docman/views/editfile.php b/src/common/docman/views/editfile.php
index 27e2593..8f0d5bc 100644
--- a/src/common/docman/views/editfile.php
+++ b/src/common/docman/views/editfile.php
@@ -66,9 +66,12 @@ $cells[] = array(_('State')._(':'), 'class' => 'docman_editfile_title');
 $cells[][] = html_e('select', array('name' => 'stateid', 'id' => 'stateid'), '', false);
 echo $HTML->multiTableRow(array(), $cells);
 echo $HTML->listTableBottom();
-$thArr = array(_('VersionID/Current'), _('Filename'), _('Title'), _('Description'), _('Comment'), _('Author'), _('Last Time'), _('Size'), _('Actions'));
+$thArr = array(_('ID (x)'), _('Filename'), _('Title'), _('Description'), _('Comment'), _('Author'), _('Last Time'), _('Size'), _('Actions'));
+$thTitle = array(_('x does mark the current version'), '', '', '', '', '', '', '', '', '', '');
+$thSizeCssArr = array(array('style' => 'width: 60px'), array('style' => 'width: 150px'), array('style' => 'width: 150px'), array('style' => 'width: 150px'), array('style' => 'width: 110px'),
+			array('style' => 'width: 100px'), array('style' => 'width: 100px'), array('style' => 'width: 50px'),array('style' => 'width: 50px'));
 $thClass = array('', '', '', '', '', '', '', '', 'unsortable');
-echo $HTML->listTableTop($thArr, array(), 'sortable full', 'sortable_doc_version_table', $thClass);
+echo $HTML->listTableTop($thArr, array(), 'sortable full', 'sortable_doc_version_table', $thClass, $thTitle, $thSizeCssArr);
 echo $HTML->listTableBottom();
 echo html_e('button', array('id' => 'doc_version_addbutton', 'type' => 'button', 'onclick' => 'javascript:controllerListFile.toggleAddVersionView()'), _('Add new version'));
 echo $HTML->listTableTop(array(), array(), 'listing full hide', 'doc_version_edit');
diff --git a/src/www/docman/scripts/DocManController.js b/src/www/docman/scripts/DocManController.js
index 94847c3..be56e5b 100644
--- a/src/www/docman/scripts/DocManController.js
+++ b/src/www/docman/scripts/DocManController.js
@@ -105,7 +105,7 @@ DocManListFileController.prototype =
 		var modalId = this.listfileparams.divEditFile;
 		jQuery(modalId).dialog({
 			autoOpen: false,
-			width: 900,
+			width: 1000,
 			modal: true,
 			title: this.listfileparams.divEditTitle,
 			buttons: {
@@ -408,9 +408,11 @@ DocManListFileController.prototype =
 					jQuery('#editFile').prepend(data.html);
 				} else {
 					jQuery('#sortable_doc_version_table > tbody').children().remove();
+					jQuery('#sortable_doc_version_table > tbody').css('max-height', '400px').css('overflow-y', 'auto').css('display', 'block');
+					jQuery('#sortable_doc_version_table > thead > tr').css('display', 'block');
 					eachdocparams = this.docparams;
 					jQuery.each(data, function (i, val) {
-						//_('VersionID/Current'), _('Filename'), _('Title'), _('Description'), _('Comment'), _('Author'), _('Last Time'), _('Size'), _('Actions'));
+						//_('ID (x)'), _('Filename'), _('Title'), _('Description'), _('Comment'), _('Author'), _('Last Time'), _('Size'), _('Actions'));
 						currenttdcontent = '';
 						if (val.current_version == 1) {
 							currenttdcontent += ' (x)';
@@ -431,7 +433,8 @@ DocManListFileController.prototype =
 						for (var i = 0; i < versionActionsArrayLength; i++) {
 							versionactiontdcontent += val.versionactions[i];
 						}
-						var htmlString = '<tr id="docversion'+val.version.substr(1)+'" ><td>'+val.version.substr(1)+currenttdcontent+'</td><td>'+filenametdcontent[0].outerHTML+'</td><td>'+val.title+'</td><td>'+val.description+'</td><td>'+val.vcomment+'</td><td>'+val.created_by_username+'</td><td>'+val.lastdate+'</td><td>'+val.filesize_readable+'</td><td>'+versionactiontdcontent+'</td></tr>'
+						// please sync with the editfile.php widths if you change it here.
+						var htmlString = '<tr id="docversion'+val.version.substr(1)+'" ><td style="width: 60px">'+val.version.substr(1)+currenttdcontent+'</td><td style="width: 150px">'+filenametdcontent[0].outerHTML+'</td><td style="width: 150px">'+val.title+'</td><td style="width: 150px">'+val.description+'</td><td style="width: 110px">'+val.vcomment+'</td><td style="width: 100px">'+val.created_by_username+'</td><td style="width: 100px">'+val.lastdate+'</td><td style="width: 50px">'+val.filesize_readable+'</td><td style="width: 50px">'+versionactiontdcontent+'</td></tr>'
 						jQuery('#sortable_doc_version_table > tbody:last-child').append(htmlString);
 						});
 				}

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

Summary of changes:
 src/common/docman/views/editfile.php       | 7 +++++--
 src/www/docman/scripts/DocManController.js | 9 ++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list