[Fusionforge-commits] FusionForge branch master updated. 737c3be19f0214c535749d28fab27fe878e78514

Franck Villaume nerville at fusionforge.org
Sat Nov 22 17:05:02 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  737c3be19f0214c535749d28fab27fe878e78514 (commit)
       via  a9961e1244a2bb3a368250ccccecb70a7c4e638f (commit)
      from  6562f6f9afcbe122cdd0a22e76c9793ed217f216 (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 737c3be19f0214c535749d28fab27fe878e78514
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Nov 22 17:02:38 2014 +0100

    partial [#693] sync doman icon with standard icon

diff --git a/src/common/docman/Document.class.php b/src/common/docman/Document.class.php
index 0c75f80..9aad002 100644
--- a/src/common/docman/Document.class.php
+++ b/src/common/docman/Document.class.php
@@ -725,7 +725,7 @@ class Document extends Error {
 			case "text/x-c":
 			case "text/x-diff":
 			case "text/x-shellscript": {
-				$image = 'docman/file_type_plain.png';
+				$image = 'ic/file-txt.png';
 				break;
 			}
 			case "application/msword":
diff --git a/src/common/docman/views/listfile.php b/src/common/docman/views/listfile.php
index e7b3aad..2e31f61 100644
--- a/src/common/docman/views/listfile.php
+++ b/src/common/docman/views/listfile.php
@@ -265,7 +265,7 @@ if (isset($nested_docs[$dirid]) && is_array($nested_docs[$dirid])) {
 				break;
 			}
 			default: {
-				$cells[][] =  util_make_link('/docman/view.php/'.$d->Group->getID().'/'.$d->getID().'/'.urlencode($d->getFileName()), html_image($d->getFileTypeImage(), '22', '22', array('alt' => $d->getFileType())), array('title' => _('View this document')));
+				$cells[][] =  util_make_link('/docman/view.php/'.$d->Group->getID().'/'.$d->getID().'/'.urlencode($d->getFileName()), html_image($d->getFileTypeImage(), '20', '20', array('alt' => $d->getFileType())), array('title' => _('View this document')));
 			}
 		}
 		$nextcell = '';
diff --git a/src/common/docman/views/listtrashfile.php b/src/common/docman/views/listtrashfile.php
index d54280c..85ef5f0 100644
--- a/src/common/docman/views/listtrashfile.php
+++ b/src/common/docman/views/listtrashfile.php
@@ -153,7 +153,7 @@ if (isset($nested_docs[$dirid]) && is_array($nested_docs[$dirid])) {
 				break;
 			}
 			default: {
-				$cells[][] = util_make_link('/docman/view.php/'.$group_id.'/'.$d->getID().'/'.urlencode($d->getFileName()), html_image($d->getFileTypeImage(), '22', '22', array('alt' => $d->getFileType())), array('title' => _('View this document')));
+				$cells[][] = util_make_link('/docman/view.php/'.$group_id.'/'.$d->getID().'/'.urlencode($d->getFileName()), html_image($d->getFileTypeImage(), '20', '20', array('alt' => $d->getFileType())), array('title' => _('View this document')));
 			}
 		}
 		$nextcell ='';
diff --git a/src/common/docman/views/pendingfiles.php b/src/common/docman/views/pendingfiles.php
index 2169495..0020998 100644
--- a/src/common/docman/views/pendingfiles.php
+++ b/src/common/docman/views/pendingfiles.php
@@ -73,7 +73,7 @@ jQuery(document).ready(function() {
 					break;
 				}
 				default: {
-					$cells[][] = util_make_link('/docman/view.php/'.$g->getID().'/'.$d->getID().'/'.urlencode($d->getFileName()), html_image($d->getFileTypeImage(), '22', '22', array('alt'=>$d->getFileType())), array('title' => _('View this document')));
+					$cells[][] = util_make_link('/docman/view.php/'.$g->getID().'/'.$d->getID().'/'.urlencode($d->getFileName()), html_image($d->getFileTypeImage(), '20', '20', array('alt'=>$d->getFileType())), array('title' => _('View this document')));
 				}
 			}
 			$nextcell = '';
diff --git a/src/www/themes/funky-wOw/images/docman/file_type_plain.png b/src/www/themes/funky-wOw/images/docman/file_type_plain.png
deleted file mode 100644
index adc2883..0000000
Binary files a/src/www/themes/funky-wOw/images/docman/file_type_plain.png and /dev/null differ
diff --git a/src/www/themes/funky/images/docman/file_type_plain.png b/src/www/themes/funky/images/docman/file_type_plain.png
deleted file mode 100644
index adc2883..0000000
Binary files a/src/www/themes/funky/images/docman/file_type_plain.png and /dev/null differ

commit a9961e1244a2bb3a368250ccccecb70a7c4e638f
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Nov 22 16:54:01 2014 +0100

    docman: use documentgroup_get_object rather creating a new object

diff --git a/src/common/docman/DocumentManager.class.php b/src/common/docman/DocumentManager.class.php
index 94eb887..cb99bb7 100644
--- a/src/common/docman/DocumentManager.class.php
+++ b/src/common/docman/DocumentManager.class.php
@@ -165,7 +165,7 @@ class DocumentManager extends Error {
 		$subGroupIdArr = $dg->getSubgroup($docGroupId, $stateId);
 		if (sizeof($subGroupIdArr)) {
 			foreach ($subGroupIdArr as $subGroupIdValue) {
-				$localDg = new DocumentGroup($this->Group, $subGroupIdValue);
+				$localDg = documentgroup_get_object($subGroupIdValue);
 				$liclass = 'docman_li_treecontent';
 				if ($selecteddir == $localDg->getID()) {
 					$liclass = 'docman_li_treecontent_selected';

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

Summary of changes:
 src/common/docman/Document.class.php                       |    2 +-
 src/common/docman/DocumentManager.class.php                |    2 +-
 src/common/docman/views/listfile.php                       |    2 +-
 src/common/docman/views/listtrashfile.php                  |    2 +-
 src/common/docman/views/pendingfiles.php                   |    2 +-
 src/www/themes/funky-wOw/images/docman/file_type_plain.png |  Bin 1138 -> 0 bytes
 src/www/themes/funky/images/docman/file_type_plain.png     |  Bin 1138 -> 0 bytes
 7 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 src/www/themes/funky-wOw/images/docman/file_type_plain.png
 delete mode 100644 src/www/themes/funky/images/docman/file_type_plain.png


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list