[Fusionforge-commits] FusionForge branch master updated. dee9ce1a75fe73a39abe8c6adcab6a432512f95e

Franck Villaume nerville at fusionforge.org
Wed Jul 2 23:43:55 CEST 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  dee9ce1a75fe73a39abe8c6adcab6a432512f95e (commit)
       via  fd060e1297c8e4a605d510cdb1723e653cf7be85 (commit)
      from  f575a0845d3cffc27eb9e6bf36c1643d33ad14a8 (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 dee9ce1a75fe73a39abe8c6adcab6a432512f95e
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Jul 2 23:42:13 2014 +0200

    partial [#693]: merge docman icons into ic

diff --git a/src/common/docman/views/listfile.php b/src/common/docman/views/listfile.php
index 2e631b7..dbd71d9 100644
--- a/src/common/docman/views/listfile.php
+++ b/src/common/docman/views/listfile.php
@@ -185,7 +185,7 @@ if ($DocGroupName) {
 	if (!$ndg->getLocked()) {
 		if (forge_check_perm('docman', $ndg->Group->getID(), 'approve')) {
 			echo html_e('input', array('type' => 'hidden', 'id' => 'doc_group_id', 'value' => $ndg->getID()));
-			echo util_make_link('#', html_image('docman/configure-directory.png', 22, 22, array('alt' => 'edit')), array('id' => 'docman-editdirectory', 'title' => _('Edit this folder'), 'onclick' => 'javascript:controllerListFile.toggleEditDirectoryView()' ), true);
+			echo util_make_link('#', $HTML->getConfigurePic('', _('Edit')), array('id' => 'docman-editdirectory', 'title' => _('Edit this folder'), 'onclick' => 'javascript:controllerListFile.toggleEditDirectoryView()'), true);
 			echo util_make_link($redirecturl.'&action=trashdir', $HTML->getDeletePic('', 'trashdir'), array('id' => 'docman-trashdirectory', 'title' => _('Move this folder and his content to trash')));
 			if (!isset($nested_docs[$dirid]) && !isset($nested_groups[$dirid]) && !isset($nested_pending_docs[$dirid])) {
 				echo util_make_link($redirecturl.'&action=deldir', html_image('docman/delete-directory.png', 22, 22, array('alt' => 'deldir')), array('id' => 'docman-deletedirectory', 'title' => _('Permanently delete this folder')));
diff --git a/src/common/docman/views/listtrashfile.php b/src/common/docman/views/listtrashfile.php
index fe94a56..3cda86b 100644
--- a/src/common/docman/views/listtrashfile.php
+++ b/src/common/docman/views/listtrashfile.php
@@ -123,7 +123,7 @@ jQuery(document).ready(function() {
 if ($DocGroupName) {
 	$content = _('Document Folder')._(': ').html_e('i', array(), $DocGroupName, false).' ';
 	if ($DocGroupName != '.trash') {
-		$content .= util_make_link('#', html_image('docman/configure-directory.png', 22, 22, array('alt' => _('Edit'))), array('id' => 'docman-editdirectory', 'title' => _('Edit this folder'), 'onclick' => 'javascript:controllerListTrash.toggleEditDirectoryView({lockIntervalDelay: 60000, doc_group:'.$ndg->getID().', groupId:'.$ndg->Group->getID().', docManURL:\''.util_make_uri('/docman').'\'})' ), true);
+		$content .= util_make_link('#', $HTML->getConfigurePic('', _('Edit')), array('id' => 'docman-editdirectory', 'title' => _('Edit this folder'), 'onclick' => 'javascript:controllerListTrash.toggleEditDirectoryView({lockIntervalDelay: 60000, doc_group:'.$ndg->getID().', groupId:'.$ndg->Group->getID().', docManURL:\''.util_make_uri('/docman').'\'})' ), true);
 		$content .= util_make_link($redirecturl.'&action=deldir', html_image('docman/delete-directory.png', 22, 22, array('alt' => _('Delete folder'))), array('id' => 'docman-deletedirectory', 'title' => _('Delete permanently this folder and his content.')));
 	}
 	echo html_e('h3', array('class' => 'docman_h3'), $content, false);
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index 43dd880..a6db61c 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -1281,6 +1281,10 @@ if (isset($params['group']) && $params['group']) {
 		return $this->getPicto('ic/delete.png', $title, $alt, 20, 20, $otherAttr);
 	}
 
+	function getConfigurePic($title = '', $alt = '', $otherAttr = array()) {
+		return $this->getPicto('ic/configure.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/configure-directory.png b/src/www/themes/funky-wOw/images/ic/configure.png
similarity index 100%
rename from src/www/themes/funky-wOw/images/docman/configure-directory.png
rename to src/www/themes/funky-wOw/images/ic/configure.png
diff --git a/src/www/themes/funky/images/docman/configure-directory.png b/src/www/themes/funky/images/ic/configure.png
similarity index 100%
rename from src/www/themes/funky/images/docman/configure-directory.png
rename to src/www/themes/funky/images/ic/configure.png

commit fd060e1297c8e4a605d510cdb1723e653cf7be85
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Jun 29 00:18:28 2014 +0200

    use HTML helpers

diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index c3b7b09..43dd880 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -1348,7 +1348,7 @@ if (isset($params['group']) && $params['group']) {
 		}
 		echo html_ao('div', array('class' => 'widget_content', 'style' => $style));
 		if (!$readonly && $display_preferences) {
-			echo '<div class="widget_preferences">'. $widget->getPreferencesForm($layout_id, $owner_id, $owner_type) . "</div>\n";
+			echo html_e('div', array('class' => 'widget_preferences'), $widget->getPreferencesForm($layout_id, $owner_id, $owner_type));
 		}
 		if ($widget->isAjax()) {
 			echo html_ao('div', array('id' => $element_id.'-ajax'));

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

Summary of changes:
 src/common/docman/views/listfile.php                             |    2 +-
 src/common/docman/views/listtrashfile.php                        |    2 +-
 src/www/include/Layout.class.php                                 |    6 +++++-
 .../images/{docman/configure-directory.png => ic/configure.png}  |  Bin 1380 -> 1380 bytes
 .../images/{docman/configure-directory.png => ic/configure.png}  |  Bin 1380 -> 1380 bytes
 5 files changed, 7 insertions(+), 3 deletions(-)
 rename src/www/themes/funky-wOw/images/{docman/configure-directory.png => ic/configure.png} (100%)
 rename src/www/themes/funky/images/{docman/configure-directory.png => ic/configure.png} (100%)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list