[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1617-gdd29a38
Marc-Etienne VARGENAU
vargenau at libremir.placard.fr.eu.org
Thu Mar 30 18:59:11 CEST 2017
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 dd29a3887446a68d9e021dcd48adaaa5ba4f946f (commit)
from f1e7aa6b3d1ea07cfb4f4c3d47afefed683c1a8d (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=dd29a3887446a68d9e021dcd48adaaa5ba4f946f
commit dd29a3887446a68d9e021dcd48adaaa5ba4f946f
Author: Marc-Etienne Vargenau <marc-etienne.vargenau at nokia.com>
Date: Thu Mar 30 18:59:06 2017 +0200
Use lowercase
diff --git a/src/common/include/Navigation.class.php b/src/common/include/Navigation.class.php
index d65e5c9..0f163bb 100644
--- a/src/common/include/Navigation.class.php
+++ b/src/common/include/Navigation.class.php
@@ -407,8 +407,8 @@ class Navigation extends FFError {
/* Homepage
// check for use_home_tab?
- $TABS_DIRS[]='http://'. $this->getHomePage();
- $TABS_TITLES[]=_('Home Page');
+ $tabs_dirs[]='http://'. $this->getHomePage();
+ $tabs_titles[]=_('Home Page');
*/
// Project Activity
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index cb55928..acf00e8 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -740,9 +740,9 @@ if (isset($params['group']) && $params['group']) {
echo $this->tabGenerator($menu['urls'], $menu['titles'], $menu['tooltips'], true, $menu['selected'], 'white');
}
- function tabGenerator($TABS_DIRS, $TABS_TITLES, $TABS_TOOLTIPS, $nested=false, $selected=false, $sel_tab_bgcolor='white', $total_width='100%') {
+ function tabGenerator($tabs_dirs, $tabs_titles, $tabs_tooltips, $nested=false, $selected=false, $sel_tab_bgcolor='white', $total_width='100%') {
- $count=count($TABS_DIRS);
+ $count=count($tabs_dirs);
$width=intval((100/$count));
$return = '';
@@ -774,7 +774,7 @@ if (isset($params['group']) && $params['group']) {
$return .= '
<td '.$rowspan.'class="top" width="10" style="background:url('.$this->imgbaseurl . 'theme-'.$inner.'-end-'.(($issel) ? '' : 'not').'selected.png)">'.
'<img src="'.$this->imgbaseurl . 'clear.png" height="25" width="10" alt="" /></td>'.
- '<td '.$rowspan.'style="background:url('.$this->imgbaseurl . $bgimg.')" width="'.$width.'%" align="center">'.util_make_link ($TABS_DIRS[$i],$TABS_TITLES[$i],array('class'=>(($issel)?'tabsellink':'tablink')),true).'</td>';
+ '<td '.$rowspan.'style="background:url('.$this->imgbaseurl . $bgimg.')" width="'.$width.'%" align="center">'.util_make_link ($tabs_dirs[$i],$tabs_titles[$i],array('class'=>(($issel)?'tabsellink':'tablink')),true).'</td>';
} elseif ($i==$count-1) {
//
// this is the last tab, choose an image with name-end
@@ -789,7 +789,7 @@ if (isset($params['group']) && $params['group']) {
$return .= '
<td '.$rowspan.'colspan="2" class="top" width="20" style="background:url('.$this->imgbaseurl . 'theme-'.$inner.'-'.(($wassel) ? '' : 'not').'selected-'.(($issel) ? '' : 'not').'selected.png)">'.
'<img src="'.$this->imgbaseurl . 'clear.png" height="2" width="20" alt="" /></td>'.
- '<td '.$rowspan.'style="background:url('.$this->imgbaseurl . $bgimg.')" width="'.$width.'%" align="center">'.util_make_link($TABS_DIRS[$i], $TABS_TITLES[$i], array('class'=>(($issel)?'tabsellink':'tablink')), true).'</td>';
+ '<td '.$rowspan.'style="background:url('.$this->imgbaseurl . $bgimg.')" width="'.$width.'%" align="center">'.util_make_link($tabs_dirs[$i], $tabs_titles[$i], array('class'=>(($issel)?'tabsellink':'tablink')), true).'</td>';
//
// Last graphic on right-side
//
@@ -811,7 +811,7 @@ if (isset($params['group']) && $params['group']) {
$return .= '
<td '.$rowspan.'colspan="2" class="top" width="20" style="background:url('.$this->imgbaseurl . 'theme-'.$inner.'-'.(($wassel) ? '' : 'not').'selected-'.(($issel) ? '' : 'not').'selected.png)">'.
'<img src="'.$this->imgbaseurl . 'clear.png" height="2" width="20" alt="" /></td>'.
- '<td '.$rowspan.'style="background:url('.$this->imgbaseurl . $bgimg.')" width="'.$width.'%" align="center">'.util_make_link($TABS_DIRS[$i], $TABS_TITLES[$i], array('class'=>(($issel)?'tabsellink':'tablink')), true).'</td>';
+ '<td '.$rowspan.'style="background:url('.$this->imgbaseurl . $bgimg.')" width="'.$width.'%" align="center">'.util_make_link($tabs_dirs[$i], $tabs_titles[$i], array('class'=>(($issel)?'tabsellink':'tablink')), true).'</td>';
}
}
@@ -822,13 +822,13 @@ if (isset($params['group']) && $params['group']) {
//
if ($selected == 0) {
$beg_cols=0;
- $end_cols=((count($TABS_DIRS)*3)-3);
- } elseif ($selected == (count($TABS_DIRS)-1)) {
- $beg_cols=((count($TABS_DIRS)*3)-3);
+ $end_cols=((count($tabs_dirs)*3)-3);
+ } elseif ($selected == (count($tabs_dirs)-1)) {
+ $beg_cols=((count($tabs_dirs)*3)-3);
$end_cols=0;
} else {
$beg_cols=($selected*3);
- $end_cols=(((count($TABS_DIRS)*3)-3)-$beg_cols);
+ $end_cols=(((count($tabs_dirs)*3)-3)-$beg_cols);
}
$return .= '<tr>';
if ($beg_cols > 0) {
diff --git a/src/www/themes/funky/Theme.class.php b/src/www/themes/funky/Theme.class.php
index f87fffc..d33022e 100644
--- a/src/www/themes/funky/Theme.class.php
+++ b/src/www/themes/funky/Theme.class.php
@@ -185,8 +185,8 @@ class Theme_Funky extends Layout {
return html_ac(html_ap() -1).'<!-- class="box-surround" -->'."\n";
}
- function tabGenerator($TABS_DIRS, $TABS_TITLES, $TABS_TOOLTIPS, $nested=false, $selected=false, $sel_tab_bgcolor='WHITE', $total_width='100%') {
- $count = count($TABS_DIRS);
+ function tabGenerator($tabs_dirs, $tabs_titles, $tabs_tooltips, $nested=false, $selected=false, $sel_tab_bgcolor='WHITE', $total_width='100%') {
+ $count = count($tabs_dirs);
if ($count < 1) {
return '';
@@ -213,9 +213,9 @@ class Theme_Funky extends Layout {
$attrs['style'] = 'width:'.$tabwidth.'%';
$return .= html_ao('td', $attrs);
$attrs = array();
- $attrs['id'] = md5($TABS_DIRS[$i]);
- $attrs['href'] = $TABS_DIRS[$i];
- if (preg_match('/^https?:\/\//', $TABS_DIRS[$i])) {
+ $attrs['id'] = md5($tabs_dirs[$i]);
+ $attrs['href'] = $tabs_dirs[$i];
+ if (preg_match('/^https?:\/\//', $tabs_dirs[$i])) {
$attrs['target'] = '_blank';
}
$return .= html_ao('a', $attrs);
@@ -224,11 +224,11 @@ class Theme_Funky extends Layout {
$attrs['class'] = 'selected';
$return .= html_ao('span', $attrs);
- $attrs = array('title' => $TABS_TOOLTIPS[$i]);
+ $attrs = array('title' => $tabs_tooltips[$i]);
if ($nested)
$attrs['class'] = 'nested';
- $return .= html_e('span', $attrs, $TABS_TITLES[$i], false);
+ $return .= html_e('span', $attrs, $tabs_titles[$i], false);
$return .= html_ac(html_ap() - 3);
}
-----------------------------------------------------------------------
Summary of changes:
src/common/include/Navigation.class.php | 4 ++--
src/www/include/Layout.class.php | 18 +++++++++---------
src/www/themes/funky/Theme.class.php | 14 +++++++-------
3 files changed, 18 insertions(+), 18 deletions(-)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list