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 858212edc0d0a587a18c7afc3ca644b08f68d31c (commit)
via bfc10b552edf024be3293f0c9b4fb6f4095e8712 (commit)
via 96e0285fb9387656ff5455b1a5344f5079e44251 (commit)
via df33f5818bde18108d5390307f835c60ddc210ce (commit)
from d0fee4bd3d700ac4ea70a86844db27d00fcb7b3a (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=858212edc0d0a587a18c7afc3ca644b08f68d31c
commit 858212edc0d0a587a18c7afc3ca644b08f68d31c
Author: Franck Villaume <[email protected]>
Date: Sat Jul 9 14:37:31 2016 +0200
use !==
diff --git a/src/plugins/headermenu/www/scripts/HeaderMenuController.js
b/src/plugins/headermenu/www/scripts/HeaderMenuController.js
index df35dc4..af26da1 100644
--- a/src/plugins/headermenu/www/scripts/HeaderMenuController.js
+++ b/src/plugins/headermenu/www/scripts/HeaderMenuController.js
@@ -1,7 +1,7 @@
/**
* headerMenu Plugin Js Controller
*
- * Copyright 2012-2014, Franck Villaume - TrivialDev
+ * Copyright 2012-2014,2016, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -54,7 +54,7 @@ HeaderMenuController.prototype =
this.params.trHtmlCode.hide();
this.params.trUrlCode.show();
this.params.inputURL.attr('checked', 'checked');
- if (typeof(this.params.tableOutTbLink) != 'undefined') {
+ if (typeof(this.params.tableOutTbLink) !== 'undefined') {
this.params.tableOutTbLink.sortable({
update: function(event, ui) {
jQuery(".sortable_outermenu_listlinks
tbody").children().each(function() {
@@ -69,7 +69,7 @@ HeaderMenuController.prototype =
}
});
}
- if (typeof(this.params.tableHeaTbLink) != 'undefined') {
+ if (typeof(this.params.tableHeaTbLink) !== 'undefined') {
this.params.tableHeaTbLink.sortable({
update: function(event, ui) {
jQuery(".sortable_headermenu_listlinks
tbody").children().each(function() {
@@ -112,7 +112,7 @@ HeaderMenuController.prototype =
jQuery('#maindiv >
.feedback').remove();
jQuery('#maindiv >
.error').remove();
jQuery('#maindiv >
.warning_msg').remove();
- if (typeof data.html !=
'undefined') {
+ if (typeof data.html !==
'undefined') {
jQuery('#maindiv').prepend(data.html);
}
this.params.validOutButton.hide();
@@ -132,7 +132,7 @@ HeaderMenuController.prototype =
jQuery('#maindiv >
.feedback').remove();
jQuery('#maindiv >
.error').remove();
jQuery('#maindiv >
.warning_msg').remove();
- if (typeof data.html !=
'undefined') {
+ if (typeof data.html !==
'undefined') {
jQuery('#maindiv').prepend(data.html);
}
this.params.validHeaButton.hide();
@@ -153,7 +153,7 @@ GroupMenuController.prototype =
this.params.trHtmlCode.hide();
this.params.trUrlCode.show();
this.params.inputURL.attr('checked', 'checked');
- if (typeof(this.params.tableTbodyLink) != 'undefined') {
+ if (typeof(this.params.tableTbodyLink) !== 'undefined') {
this.params.tableTbodyLink.sortable({
update: function(event, ui) {
jQuery("#sortable").find("tbody").children().each(function() {
@@ -199,7 +199,7 @@ GroupMenuController.prototype =
jQuery('#maindiv >
.feedback').remove();
jQuery('#maindiv >
.error').remove();
jQuery('#maindiv >
.warning_msg').remove();
- if (typeof data.html !=
'undefined') {
+ if (typeof data.html !==
'undefined') {
jQuery('#maindiv').prepend(data.html);
}
this.params.validateButton.hide();
@@ -213,13 +213,13 @@ EditHeaderMenuController.prototype =
bindControls: function() {
this.params.inputHtmlCode.click(jQuery.proxy(this,
"htmlCodeView"));
this.params.inputURL.click(jQuery.proxy(this, "htmlUrlView"));
- if (typeof(this.params.inputOuter) != 'undefined') {
+ if (typeof(this.params.inputOuter) !== 'undefined') {
this.params.inputOuter.click(jQuery.proxy(this,
"inputHtmlCodeView"));
}
- if (typeof(this.params.inputHeader) != 'undefined') {
+ if (typeof(this.params.inputHeader) !== 'undefined') {
this.params.inputHeader.click(jQuery.proxy(this,
"headerView"));
}
- if (typeof(this.params.inputURLIframe) != 'undefined') {
+ if (typeof(this.params.inputURLIframe) !== 'undefined') {
this.params.inputURLIframe.click(jQuery.proxy(this,
"htmlUrlView"));
}
},
@@ -236,7 +236,7 @@ EditHeaderMenuController.prototype =
this.params.trHtmlCode.hide();
this.params.trUrlCode.show();
}
- if (typeof(this.params.inputURLIframe) != 'undefined') {
+ if (typeof(this.params.inputURLIframe) !== 'undefined') {
if (this.params.inputURLIframe.attr("checked")) {
this.params.trHtmlCode.hide();
this.params.trUrlCode.show();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=bfc10b552edf024be3293f0c9b4fb6f4095e8712
commit bfc10b552edf024be3293f0c9b4fb6f4095e8712
Author: Franck Villaume <[email protected]>
Date: Sat Jul 9 14:37:11 2016 +0200
cleanup & add missing {}
diff --git a/src/plugins/globalsearch/common/globalsearch_stats_boxes.php
b/src/plugins/globalsearch/common/globalsearch_stats_boxes.php
index a52f1bb..d9261a2 100644
--- a/src/plugins/globalsearch/common/globalsearch_stats_boxes.php
+++ b/src/plugins/globalsearch/common/globalsearch_stats_boxes.php
@@ -4,6 +4,7 @@
*
* Copyright 2003-2004, GForge, LLC
* Copyright 2007-2009, Roland Mas
+ * Copyright 2016, Franck Villaume - TrivialDev
*
* This file is part of FusionForge.
*
@@ -27,81 +28,81 @@ require_once $gfcommon.'include/pre.php';
require_once $gfcommon.'/include/FusionForge.class.php';
function show_globalsearch_stats_boxes() {
- global $HTML;
+ global $HTML;
- $return = '';
- $return .= $HTML->boxTop(_("Global Search"));
- $return .= globalsearch_box();
- $return .= $HTML->boxMiddle(_("Top associated forges"));
- $return .= show_top_n_assocsites(5);
- $return .= "<div align=\"center\">".sprintf(_("Total projects in
associated forges: <b>%1$d</b>"),stats_get_total_projects_assoc_sites()).
"</div>";
- $return .= $HTML->boxBottom();
- return $return;
+ $return = '';
+ $return .= $HTML->boxTop(_("Global Search"));
+ $return .= globalsearch_box();
+ $return .= $HTML->boxMiddle(_("Top associated forges"));
+ $return .= show_top_n_assocsites(5);
+ $return .= "<div align=\"center\">"._('Total projects in associated
forges')._(': ').html_e('b', array(), stats_get_total_projects_assoc_sites()).
"</div>";
+ $return .= $HTML->boxBottom();
+ return $return;
}
function globalsearch_box() {
- global $gwords,$gexact,$otherfreeknowledge;
+ global $gwords, $gexact, $otherfreeknowledge, $HTML;
- $return = 'Search in other associated forges:<br />
- <form method="post" action="/plugins/globalsearch/"/>
- <input width="100%" type="text" name="gwords" value="'.$gwords.'"/>
- <input type="submit" name="Search" value="'._("Search").'" /><br/>
- <input type="checkbox" name="otherfreeknowledge" value="1"'.(
$otherfreeknowledge ? ' checked' : ' unchecked' ).'>'._('Extend search to
include non-software projects').'<br/>
- <input type="checkbox" name="gexact" value="1"'.( $gexact ? ' checked'
: ' unchecked' ).'>'._("Require all words").'</form>';
- return $return;
+ $return = _('Search in other associated forges')._(':').html_e('br').
+ $HTML->openForm(array('method' => 'post', 'action' =>
'/plugins/globalsearch/')).
+ '<input width="100%" type="text" name="gwords" value="'.$gwords.'"/>
+ <input type="submit" name="Search" value="'._("Search").'" /><br/>
+ <input type="checkbox" name="otherfreeknowledge" value="1"'.(
$otherfreeknowledge ? ' checked' : ' unchecked' ).'>'._('Extend search to
include non-software projects').'<br/>
+ <input type="checkbox" name="gexact" value="1"'.( $gexact ? ' checked'
: ' unchecked' ).'>'._("Require all words").$HTML->closeForm();
+ return $return;
}
/**
* show_top_n_assocsites() - Show the n top ranked associated sites
*
- * @param string Number of associated sites to show
+ * @param string Number of associated sites to show
*
*/
function show_top_n_assocsites($num_assocsites) {
- $res_top_n_assoc = db_query_params ('
- SELECT a.title, a.link, count(*) AS numprojects
- FROM plugin_globalsearch_assoc_site_project p,
plugin_globalsearch_assoc_site a
- WHERE p.assoc_site_id = a.assoc_site_id AND p.assoc_site_id IN
- (SELECT assoc_site_id FROM
plugin_globalsearch_assoc_site
- WHERE status_id = 2 AND enabled=$1 ORDER BY rank LIMIT
$2)
- GROUP BY a.title, a.link',
- array('t',
- $num_assocsites));
+ $res_top_n_assoc = db_query_params ('
+ SELECT a.title, a.link, count(*) AS numprojects
+ FROM plugin_globalsearch_assoc_site_project p,
plugin_globalsearch_assoc_site a
+ WHERE p.assoc_site_id = a.assoc_site_id AND p.assoc_site_id IN
+ (SELECT assoc_site_id FROM
plugin_globalsearch_assoc_site
+ WHERE status_id = 2 AND enabled=$1 ORDER BY rank LIMIT
$2)
+ GROUP BY a.title, a.link',
+ array('t', $num_assocsites));
if (db_numrows($res_top_n_assoc) == 0) {
return _('No stats available')." ".db_error();
}
- $return .= "<div align=\"left\"><table>";
- while ($row_topdown = db_fetch_array($res_top_n_assoc)) {
- if ($row_topdown['numprojects'] > 0)
- $return .= "<tr><td><a href=\"$row_topdown[link]/\">";
- $return .= $row_topdown[title]."</a></td>";
- $return .= "<td><div align=\"right\">".
number_format($row_topdown[numprojects], 0);
- $return .= " projects</div></td></tr>\n";
- }
- $return .= "</div></table>";
+ $return .= "<div align=\"left\"><table>";
+ while ($row_topdown = db_fetch_array($res_top_n_assoc)) {
+ if ($row_topdown['numprojects'] > 0) {
+ $return .= "<tr><td><a href=\"$row_topdown[link]/\">";
+ $return .= $row_topdown[title]."</a></td>";
+ $return .= "<td><div align=\"right\">".
number_format($row_topdown[numprojects], 0);
+ $return .= " "._('projects')."</div></td></tr>\n";
+ }
+ }
+ $return .= "</div></table>";
- return $return;
+ return $return;
}
/**
* stats_get_total_projects_assoc_sites() - Show the total number of projects
of associated sites
*
- * @param string Number of associated sites to show
+ * @param string Number of associated sites to show
*
*/
function stats_get_total_projects_assoc_sites() {
- $res_count = db_query_params ('SELECT count(*) AS numprojects FROM
plugin_globalsearch_assoc_site_project p, plugin_globalsearch_assoc_site a
WHERE p.assoc_site_id = a.assoc_site_id AND a.status_id = 2',
+ $res_count = db_query_params ('SELECT count(*) AS numprojects FROM
plugin_globalsearch_assoc_site_project p, plugin_globalsearch_assoc_site a
WHERE p.assoc_site_id = a.assoc_site_id AND a.status_id = 2',
array());
- if (db_numrows($res_count) > 0) {
- $row_count = db_fetch_array($res_count);
- return $row_count['numprojects'];
- } else {
+ if (db_numrows($res_count) > 0) {
+ $row_count = db_fetch_array($res_count);
+ return $row_count['numprojects'];
+ } else {
return _('No stats available')." ".db_error();
- }
+ }
}
// Local Variables:
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=96e0285fb9387656ff5455b1a5344f5079e44251
commit 96e0285fb9387656ff5455b1a5344f5079e44251
Author: Franck Villaume <[email protected]>
Date: Sat Jul 9 14:36:29 2016 +0200
remove useless code
diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index 16f2af3..f7ea648 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -1295,9 +1295,7 @@ function util_ini_get_bytes($id) {
$last = strtolower($val[strlen($val)-1]);
switch ($last) {
case 'g':
- $val *= 1024;
case 'm':
- $val *= 1024;
case 'k':
$val *= 1024;
}
diff --git a/src/plugins/compactpreview/www/scripts/oslcTooltip.js
b/src/plugins/compactpreview/www/scripts/oslcTooltip.js
index 878011a..e984936 100644
--- a/src/plugins/compactpreview/www/scripts/oslcTooltip.js
+++ b/src/plugins/compactpreview/www/scripts/oslcTooltip.js
@@ -62,7 +62,6 @@ jQuery(function(){
clearTimeout(hideTimer);
}
var pos = jQuery(this).offset();
- var width = jQuery(this).width();
container.css({
left: (pos.left) + 'px',
top: pos.top + 10 + 'px'
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=df33f5818bde18108d5390307f835c60ddc210ce
commit df33f5818bde18108d5390307f835c60ddc210ce
Author: Franck Villaume <[email protected]>
Date: Sat Jul 9 14:35:52 2016 +0200
remove useless br
diff --git a/src/common/include/Plugin.class.php
b/src/common/include/Plugin.class.php
index 7cb30f4..74ff5b5 100644
--- a/src/common/include/Plugin.class.php
+++ b/src/common/include/Plugin.class.php
@@ -269,7 +269,7 @@ class Plugin extends FFError {
if ($group->usesPlugin($this->name)) {
echo 'checked="checked"';
}
- echo ' /><br/>';
+ echo ' />';
echo "</td>\n";
echo '<td title="'.$this->pkg_desc.'">';
echo "<strong>";
-----------------------------------------------------------------------
Summary of changes:
src/common/include/Plugin.class.php | 2 +-
src/common/include/utils.php | 2 -
.../compactpreview/www/scripts/oslcTooltip.js | 1 -
.../common/globalsearch_stats_boxes.php | 89 +++++++++++-----------
.../headermenu/www/scripts/HeaderMenuController.js | 22 +++---
5 files changed, 57 insertions(+), 59 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
