[Fusionforge-commits] FusionForge branch Branch_5_3 updated. f9fe6e4ff9d4fb942e67ff88c40b95a0d78c7b52

Franck Villaume nerville at fusionforge.org
Sun Mar 9 14:57:58 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, Branch_5_3 has been updated
       via  f9fe6e4ff9d4fb942e67ff88c40b95a0d78c7b52 (commit)
       via  6cb3a59ebf75e1049b0693a42e7a652fb8bdf4df (commit)
       via  8b1e0723c7044bffb4aba920034c1a0913f39741 (commit)
       via  e48b767d5ce1db10c009d6f2932cbc9f49bc61f0 (commit)
       via  c293b54d42173629ed430bc3c691defc4cc05933 (commit)
       via  3f3874a65cc58a22ffde0ea5b4105e5f630165c9 (commit)
       via  4f439c5474bc9192826e6f65b48c75ce5c0f9b6a (commit)
      from  94450a4dfeff1a8d50ab3860189132493cd4ac26 (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 f9fe6e4ff9d4fb942e67ff88c40b95a0d78c7b52
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Mar 9 14:57:00 2014 +0100

    funky, funky-wOw theme: add missing file

diff --git a/src/www/themes/funky-wOw/images/ic/add.png b/src/www/themes/funky-wOw/images/ic/add.png
new file mode 100644
index 0000000..2dc1f23
Binary files /dev/null and b/src/www/themes/funky-wOw/images/ic/add.png differ
diff --git a/src/www/themes/funky/images/ic/add.png b/src/www/themes/funky/images/ic/add.png
new file mode 100644
index 0000000..2dc1f23
Binary files /dev/null and b/src/www/themes/funky/images/ic/add.png differ

commit 6cb3a59ebf75e1049b0693a42e7a652fb8bdf4df
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Mar 9 14:55:59 2014 +0100

    plugin hudson: fix display iframe

diff --git a/src/plugins/hudson/include/hudsonViews.class.php b/src/plugins/hudson/include/hudsonViews.class.php
index 87d311b..bc1e61c 100644
--- a/src/plugins/hudson/include/hudsonViews.class.php
+++ b/src/plugins/hudson/include/hudsonViews.class.php
@@ -77,7 +77,6 @@ class hudsonViews extends Views {
 			$this->_display_add_job_form($group_id);
 		}
 		$this->_display_iframe();
-		$this->_hide_iframe();
 	}
 
 	function job_details() {
@@ -431,12 +430,10 @@ class hudsonViews extends Views {
 	}
 
 	function _display_iframe($url = '') {
-		echo '<div id="hudson_iframe_div">';
-		htmlIframe($url, array('id' => 'hudson_iframe', 'class' => 'iframe_service'));
-		echo '</div>';
-	}
-
-	function _hide_iframe() {
-		echo "<script type=\"text/javascript\">jQuery('hudson_iframe_div').slideToggle();</script>";
+		if (!empty($url)) {
+			echo '<div id="hudson_iframe_div">';
+			htmlIframe($url, array('id' => 'hudson_iframe', 'class' => 'iframe_service'));
+			echo '</div>';
+		}
 	}
 }

commit 8b1e0723c7044bffb4aba920034c1a0913f39741
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Mar 9 14:55:34 2014 +0100

    fix image path in widget preview

diff --git a/src/plugins/hudson/include/hudson_Widget_ProjectJobsOverview.class.php b/src/plugins/hudson/include/hudson_Widget_ProjectJobsOverview.class.php
index 03453e8..ea4e667 100644
--- a/src/plugins/hudson/include/hudson_Widget_ProjectJobsOverview.class.php
+++ b/src/plugins/hudson/include/hudson_Widget_ProjectJobsOverview.class.php
@@ -58,13 +58,13 @@ class hudson_Widget_ProjectJobsOverview extends HudsonOverviewWidget {
 		}
 		if ($this->_all_status['grey'] > 0 || $this->_all_status['red'] > 0) {
 			$this->_global_status = _("One or more failure or pending job");
-			$this->_global_status_icon = $this->plugin->getThemePath() . "/images/ic/" . "status_red.png";
+			$this->_global_status_icon = '/'.$this->plugin->getThemePath() . "/images/ic/status_red.png";
 		} elseif ($this->_all_status['yellow'] > 0) {
 			$this->_global_status = _("One or more unstable job");
-			$this->_global_status_icon = $this->plugin->getThemePath() . "/images/ic/" . "status_yellow.png";
+			$this->_global_status_icon = '/'.$this->plugin->getThemePath() . "/images/ic/status_yellow.png";
 		} else {
 			$this->_global_status = _("Success");
-			$this->_global_status_icon = $this->plugin->getThemePath() . "/images/ic/" . "status_blue.png";
+			$this->_global_status_icon = '/'.$this->plugin->getThemePath() . "/images/ic/status_blue.png";
 		}
 	}
 

commit e48b767d5ce1db10c009d6f2932cbc9f49bc61f0
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Mar 9 14:54:22 2014 +0100

    fix scripts path

diff --git a/src/plugins/hudson/include/hudson.class.php b/src/plugins/hudson/include/hudson.class.php
index a8cd44c..b4c134e 100644
--- a/src/plugins/hudson/include/hudson.class.php
+++ b/src/plugins/hudson/include/hudson.class.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights reserved
- * Copyright 2013, Franck Villaume - TrivialDev
+ * Copyright 2013-2014, Franck Villaume - TrivialDev
  *
  * This file is a part of Fusionforge.
  *
@@ -23,14 +23,15 @@ require_once 'common/mvc/Controler.class.php';
 require_once 'hudsonViews.class.php';
 require_once 'hudsonActions.class.php';
 /**
- * hudson */
+ * hudson
+ */
 class hudson extends Controler {
 
 	private $themePath;
 
 	function hudson() {
 		$p = PluginManager::instance()->getPluginByName('hudson');
-		$this->themePath = $p->getThemePath();
+		$this->themePath = '/'.$p->getThemePath();
 	}
 
 	function getThemePath() {
diff --git a/src/plugins/hudson/www/index.php b/src/plugins/hudson/www/index.php
index 63a9a43..f776631 100644
--- a/src/plugins/hudson/www/index.php
+++ b/src/plugins/hudson/www/index.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights reserved
- * Copyright 2013, Franck Villaume - TrivialDev
+ * Copyright 2013-2014, Franck Villaume - TrivialDev
  *
  * This file is a part of Fusionforge.
  *
@@ -25,7 +25,7 @@ require_once $gfcommon.'include/preplugins.php';
 require_once 'plugins_utils.php';
 
 html_use_jquery();
-use_javascript('scripts/hudson_tab.js');
+use_javascript('/plugins/hudson/scripts/hudson_tab.js');
 
 $plugin_manager = PluginManager::instance();
 $p = $plugin_manager->getPluginByName('hudson');
diff --git a/src/www/widgets/widgets.php b/src/www/widgets/widgets.php
index 41f089b..d2bcde0 100644
--- a/src/www/widgets/widgets.php
+++ b/src/www/widgets/widgets.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * Copyright 2011-2013, Franck Villaume - TrivialDev
+ * Copyright 2011-2014, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -28,7 +28,7 @@ require_once $gfcommon.'widget/WidgetLayoutManager.class.php';
 require_once $gfcommon.'widget/Valid_Widget.class.php';
 
 html_use_jquery();
-use_javascript('scripts/LayoutController.js');
+use_javascript('/widgets/scripts/LayoutController.js');
 
 $hp = Codendi_HTMLPurifier::instance();
 if (isLogged()) {

commit c293b54d42173629ed430bc3c691defc4cc05933
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Mar 9 14:50:54 2014 +0100

    plugin utils: indent, fix use of htmlIframe, remove hardcoded path

diff --git a/src/common/include/plugins_utils.php b/src/common/include/plugins_utils.php
index a328763..622a01b 100644
--- a/src/common/include/plugins_utils.php
+++ b/src/common/include/plugins_utils.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Copyright 2010 (c) Mélanie Le Bail
+ * Copyright 2014, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -23,37 +24,53 @@ $GLOBALS['mailman_bin_dir'] =  '/usr/lib/mailman/bin';
 $GLOBALS['mailman_lib_dir'] = '/var/lib/mailman';
 $GLOBALS['forumml_arch'] = '/var/lib/mailman/archives';
 $GLOBALS['forumml_tmp'] = '/var/spool/forumml';
-$GLOBALS['forumml_dir'] = '/var/lib/gforge/forumml';
+$GLOBALS['forumml_dir'] = forge_get_config('data_path').'/forumml';
 $GLOBALS['sys_lf'] = "\n";
 
 function isLogged(){
-
-        return session_loggedin();
+	return session_loggedin();
 }
 
 function htmlRedirect($url) {
-        session_redirect($url);
+	session_redirect($url);
 }
+
 function htmlIframe($url,$poub) {
-        if (isset($poub['id'])) {
-                $id=$poub['id'];
-        }
-        else {
-                $id='';
-        }
-        echo ('<iframe src= "'.$url.'" id="'.$id.'" width=100% height=500px></iframe>');
+	global $HTML, $group_id;
+	$project = group_get_object($group_id);
+	if (isset($poub['id'])) {
+		$id = $poub['id'];
+	}
+	else {
+		$id = 'default_id_htmliframe';
+	}
+	if (!empty($url)) {
+		echo ('<iframe src="'.$url.'" id="'.$id.'" width="100%" ></iframe>');
+		html_use_jqueryautoheight();
+		echo $HTML->getJavascripts();
+		echo '<script type="text/javascript">//<![CDATA[
+			jQuery(\'#'.$id.'\').iframeAutoHeight({heightOffset: 50});
+			jQuery(\'#'.$id.'\').load(function (){
+					if (this.contentWindow.location.href == "'.util_make_url('/projects/'.$project->getUnixName()).'/") {
+						console.log(this.contentWindow.location.href);
+						window.location.href = this.contentWindow.location.href;
+					};
+				});
+			//]]></script>';
+	}
 }
 
 function helpButton($help) {
-
 }
-function getIcon($url,$w=16,$h=16,$args=array()) {
-        echo html_image($url,$w,$h,$args);
+
+function getIcon($url, $w = 16, $h = 16, $args = array()) {
+	echo html_image($url, $w, $h, $args);
 }
-function getImage($img) {
-        echo util_make_url($GLOBALS['HTML']->imgroot.$img);
 
+function getImage($img) {
+	echo util_make_url($GLOBALS['HTML']->imgroot.$img);
 }
+
 function get_server_url() {
-		return util_make_url('');
+	return util_make_url('');
 }

commit 3f3874a65cc58a22ffde0ea5b4105e5f630165c9
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Mar 9 14:50:09 2014 +0100

    plugin extsubproj: fix widget category.

diff --git a/src/plugins/extsubproj/include/extsubproj_Widget_SubProjects.class.php b/src/plugins/extsubproj/include/extsubproj_Widget_SubProjects.class.php
index 2327ed2..3f73e27 100644
--- a/src/plugins/extsubproj/include/extsubproj_Widget_SubProjects.class.php
+++ b/src/plugins/extsubproj/include/extsubproj_Widget_SubProjects.class.php
@@ -32,7 +32,7 @@ class extsubproj_Widget_SubProjects extends Widget {
 	}
 
 	function getCategory() {
-		return _('Plugin (project)');
+		return _('General');
 	}
 
 	function getDescription() {

commit 4f439c5474bc9192826e6f65b48c75ce5c0f9b6a
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Mar 9 14:49:12 2014 +0100

    widget: add missing preview

diff --git a/src/www/images/widget/widget-preview-project_info-en_US.png b/src/www/images/widget/widget-preview-project_info-en_US.png
new file mode 100644
index 0000000..46bf938
Binary files /dev/null and b/src/www/images/widget/widget-preview-project_info-en_US.png differ

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

Summary of changes:
 src/common/include/plugins_utils.php               |   51 +++++++++++++-------
 .../extsubproj_Widget_SubProjects.class.php        |    2 +-
 src/plugins/hudson/include/hudson.class.php        |    7 +--
 src/plugins/hudson/include/hudsonViews.class.php   |   13 ++---
 .../hudson_Widget_ProjectJobsOverview.class.php    |    6 +--
 src/plugins/hudson/www/index.php                   |    4 +-
 .../widget/widget-preview-project_info-en_US.png   |  Bin 0 -> 8862 bytes
 .../images/{docman/new.png => ic/add.png}          |  Bin 1208 -> 1208 bytes
 .../docman/new.png => funky/images/ic/add.png}     |  Bin 1208 -> 1208 bytes
 src/www/widgets/widgets.php                        |    4 +-
 10 files changed, 51 insertions(+), 36 deletions(-)
 create mode 100644 src/www/images/widget/widget-preview-project_info-en_US.png
 copy src/www/themes/funky-wOw/images/{docman/new.png => ic/add.png} (100%)
 copy src/www/themes/{funky-wOw/images/docman/new.png => funky/images/ic/add.png} (100%)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list