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 c88bf4a4c88cd3ec4ca3e9887d255e80af99a441 (commit)
from d6e5cfba348d8ced0f7fa68791fcc8b170221d5c (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=c88bf4a4c88cd3ec4ca3e9887d255e80af99a441
commit c88bf4a4c88cd3ec4ca3e9887d255e80af99a441
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri Apr 21 11:01:22 2017 +0200
Remove dead code
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index 3b076d8..b5c8489 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -699,112 +699,7 @@ 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%') {
-
- $count=count($tabs_dirs);
- $width=intval((100/$count));
-
- $return = '';
- $return .= '
- <!-- start tabs -->
- <table class="tabGenerator" ';
-
- if ($total_width != '100%') {
- $return .= 'style="width:' . $total_width . ';"';
- }
- $return .= ">\n";
- $return .= '<tr>';
- if ($nested) {
- $inner='bottomtab';
- } else {
- $inner='toptab';
- }
- $rowspan = '';
- for ($i=0; $i<$count; $i++) {
- if ($i == 0) {
- //
- // this is the first tab, choose an image
with end-name
- //
- $wassel=false;
- $issel=($selected==$i);
-
$bgimg=(($issel)?'theme-'.$inner.'-selected-bg.png':'theme-'.$inner.'-notselected-bg.png');
- // $rowspan=(($issel)?'rowspan="2"
' : '');
-
- $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>';
- } elseif ($i==$count-1) {
- //
- // this is the last tab, choose an image
with name-end
- //
- $wassel=($selected==$i-1);
- $issel=($selected==$i);
-
$bgimg=(($issel)?'theme-'.$inner.'-selected-bg.png':'theme-'.$inner.'-notselected-bg.png');
- // $rowspan=(($issel)?'rowspan="2"
' : '');
- //
- // Build image between current and prior
tab
- //
- $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>';
- //
- // Last graphic on right-side
- //
- $return .= '
- <td '.$rowspan.'class="top" width="10"
style="background:url('.$this->imgbaseurl . 'theme-'.$inner.'-'.(($issel) ? ''
: 'not').'selected-end.png)">'.
- '<img src="'.$this->imgbaseurl .
'clear.png" height="2" width="10" alt="" /></td>';
-
- } else {
- //
- // middle tabs
- //
- $wassel=($selected==$i-1);
- $issel=($selected==$i);
-
$bgimg=(($issel)?'theme-'.$inner.'-selected-bg.png':'theme-'.$inner.'-notselected-bg.png');
- // $rowspan=(($issel)?'rowspan="2"
' : '');
- //
- // Build image between current and prior
tab
- //
- $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>';
-
- }
- }
- $return .= '</tr>';
-
- //
- // Building a bottom row in this table, which will be
darker
- //
- 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=0;
- } else {
- $beg_cols=($selected*3);
- $end_cols=(((count($tabs_dirs)*3)-3)-$beg_cols);
- }
- $return .= '<tr>';
- if ($beg_cols > 0) {
- $return .= '<td colspan="'.$beg_cols.'" height="1"
class="notSelTab"><img src="'.$this->imgbaseurl.'clear.png" height="1"
width="10" alt="" /></td>';
- }
- $return .= '<td colspan="3" height="1" class="selTab"><img
src="'.$this->imgbaseurl.'clear.png" height="1" width="10" alt="" /></td>';
- if ($end_cols > 0) {
- $return .= '<td colspan="'.$end_cols.'" height="1"
class="notSelTab"><img src="'.$this->imgbaseurl.'clear.png" height="1"
width="10" alt="" /></td>';
- }
- $return .= '</tr>';
-
- return $return.'
- </table>
-
- <!-- end tabs -->
- ';
- }
+ abstract function tabGenerator($tabs_dirs, $tabs_titles,
$tabs_tooltips, $nested=false, $selected=false, $sel_tab_bgcolor='white',
$total_width='100%');
function searchBox() {
return $this->navigation->getSearchBox();
diff --git a/src/www/themes/funky/Theme.class.php
b/src/www/themes/funky/Theme.class.php
index d33022e..c017a11 100644
--- a/src/www/themes/funky/Theme.class.php
+++ b/src/www/themes/funky/Theme.class.php
@@ -185,7 +185,7 @@ 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%') {
+ 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) {
-----------------------------------------------------------------------
Summary of changes:
src/www/include/Layout.class.php | 107 +----------------------------------
src/www/themes/funky/Theme.class.php | 2 +-
2 files changed, 2 insertions(+), 107 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
