[Fusionforge-commits] FusionForge branch master updated. 6562f6f9afcbe122cdd0a22e76c9793ed217f216

Franck Villaume nerville at fusionforge.org
Sat Nov 22 16:07:57 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  6562f6f9afcbe122cdd0a22e76c9793ed217f216 (commit)
       via  6bad1673730fd7828ee387685c056ee14d4c6f6a (commit)
      from  c0ddf5f2e88ed7cdaf8182dd22df09e6f0d83905 (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 6562f6f9afcbe122cdd0a22e76c9793ed217f216
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Nov 22 16:07:19 2014 +0100

    my forums: wrong image

diff --git a/src/www/forum/myforums.php b/src/www/forum/myforums.php
index 7653ad0..739182a 100644
--- a/src/www/forum/myforums.php
+++ b/src/www/forum/myforums.php
@@ -119,7 +119,7 @@ for($i = 0; $i < sizeof($monitoredForumsIdsArray); $i++) {
 					foreach ($forum_msg_arr as $forum_msg) {
 						if ($forumObject->getSavedDate() < $forum_msg->getPostDate()) {
 							//we've got ourselves a new message or followup for this forum. note that, exit the search
-							$new_content = html_image('ic/new.png','', '', array('alt' => 'new'));
+							$new_content = html_image('ic/add.png','', '', array('alt' => 'new'));
 							break;
 						}
 					}

commit 6bad1673730fd7828ee387685c056ee14d4c6f6a
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Nov 22 16:06:44 2014 +0100

    partial [#693] sync docman icon with standard icon

diff --git a/src/common/docman/views/listfile.php b/src/common/docman/views/listfile.php
index b4b64a2..e7b3aad 100644
--- a/src/common/docman/views/listfile.php
+++ b/src/common/docman/views/listfile.php
@@ -270,7 +270,7 @@ if (isset($nested_docs[$dirid]) && is_array($nested_docs[$dirid])) {
 		}
 		$nextcell = '';
 		if (($d->getUpdated() && $time_new > (time() - $d->getUpdated())) || $time_new > (time() - $d->getCreated())) {
-			$nextcell = html_image('docman/new.png', '14', '14', array('alt' => _('new'), 'title' => _('Created or updated since less than 7 days'))).' ';
+			$nextcell = $HTML->getNewPic(_('Created or updated since less than 7 days'), 'new').' ';
 		}
 		$cells[] = array($nextcell.$d->getFileName(), 'style' => 'word-wrap: break-word; max-width: 250px;');
 		$cells[] = array($d->getName(), 'style' => 'word-wrap: break-word; max-width: 250px;');
diff --git a/src/common/docman/views/listtrashfile.php b/src/common/docman/views/listtrashfile.php
index e135337..d54280c 100644
--- a/src/common/docman/views/listtrashfile.php
+++ b/src/common/docman/views/listtrashfile.php
@@ -158,7 +158,7 @@ if (isset($nested_docs[$dirid]) && is_array($nested_docs[$dirid])) {
 		}
 		$nextcell ='';
 		if (($d->getUpdated() && $time_new > (time() - $d->getUpdated())) || $time_new > (time() - $d->getCreated())) {
-			$nextcell =  html_image('docman/new.png', '14', '14', array('alt' => _('new'), 'class' => 'docman-newdocument', 'title' => _('Updated since less than 7 days'))).' ';
+			$nextcell.= $HTML->getNewPic(_('Created or updated since less than 7 days'), 'new', array('class' => 'docman-newdocument')).' ';
 		}
 		$cells[] = array($nextcell.$d->getFileName(), 'style' => 'word-wrap: break-word; max-width: 250px;');
 		$cells[] = array($d->getName(), 'style' => 'word-wrap: break-word; max-width: 250px;');
diff --git a/src/common/docman/views/pendingfiles.php b/src/common/docman/views/pendingfiles.php
index 83fcb77..2169495 100644
--- a/src/common/docman/views/pendingfiles.php
+++ b/src/common/docman/views/pendingfiles.php
@@ -78,7 +78,7 @@ jQuery(document).ready(function() {
 			}
 			$nextcell = '';
 			if (($d->getUpdated() && $time_new > (time() - $d->getUpdated())) || $time_new > (time() - $d->getCreated())) {
-				$nextcell.= html_image('docman/new.png', '14', '14', array('alt' => _('new'), 'class' => 'docman-newdocument', 'title' => _('Created or updated since less than 7 days'))).' ';
+				$nextcell.= $HTML->getNewPic(_('Created or updated since less than 7 days'), 'new', array('class' => 'docman-newdocument')).' ';
 			}
 			$cells[] = array($nextcell.$d->getFileName(), 'style' => 'word-wrap: break-word; max-width: 250px;');
 			$cells[] = array($d->getName(), 'style' => 'word-wrap: break-word; max-width: 250px;');
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index ec94b9a..6776086 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -1297,6 +1297,10 @@ if (isset($params['group']) && $params['group']) {
 		return $this->getPicto('ic/directory-add.png', $title, $alt, 20, 20, $otherAttr);
 	}
 
+	function getNewPic($title = '', $alt = '', $otherAttr = array()) {
+		return $this->getPicto('ic/add.png', $title, $alt, 20, 20, $otherAttr);
+	}
+
 	function getPicto($url, $title, $alt, $width = '20', $height = '20', $otherAttr = array()) {
 		$otherAttr['title'] = $title;
 		if (!$alt) {
diff --git a/src/www/themes/funky-wOw/images/docman/new.png b/src/www/themes/funky-wOw/images/docman/new.png
deleted file mode 100644
index 2dc1f23..0000000
Binary files a/src/www/themes/funky-wOw/images/docman/new.png and /dev/null differ
diff --git a/src/www/themes/funky/images/docman/new.png b/src/www/themes/funky/images/docman/new.png
deleted file mode 100644
index 2dc1f23..0000000
Binary files a/src/www/themes/funky/images/docman/new.png and /dev/null differ

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

Summary of changes:
 src/common/docman/views/listfile.php           |    2 +-
 src/common/docman/views/listtrashfile.php      |    2 +-
 src/common/docman/views/pendingfiles.php       |    2 +-
 src/www/forum/myforums.php                     |    2 +-
 src/www/include/Layout.class.php               |    4 ++++
 src/www/themes/funky-wOw/images/docman/new.png |  Bin 1208 -> 0 bytes
 src/www/themes/funky/images/docman/new.png     |  Bin 1208 -> 0 bytes
 7 files changed, 8 insertions(+), 4 deletions(-)
 delete mode 100644 src/www/themes/funky-wOw/images/docman/new.png
 delete mode 100644 src/www/themes/funky/images/docman/new.png


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list