diff options
| author | Graham Eames <grahamje@users.sourceforge.net> | 2006-03-15 21:52:48 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2006-03-15 21:52:48 +0000 |
| commit | e221b03b957e49cb2248b91af303c453c4d1e975 (patch) | |
| tree | 1ff2c829c190471a80d5e046eb9994b0e18f9dd3 | |
| parent | 5b2abb82f5aa3347521e56668a3d898c6c0677d4 (diff) | |
| download | forums-e221b03b957e49cb2248b91af303c453c4d1e975.tar forums-e221b03b957e49cb2248b91af303c453c4d1e975.tar.gz forums-e221b03b957e49cb2248b91af303c453c4d1e975.tar.bz2 forums-e221b03b957e49cb2248b91af303c453c4d1e975.tar.xz forums-e221b03b957e49cb2248b91af303c453c4d1e975.zip | |
Some slight alterations for another forthcoming feature.
Tom: If you want to clean up my CSS changes for this or change the colour for completed stages, feel free ;-)
git-svn-id: file:///svn/phpbb/trunk@5635 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/adm/style/admin.css | 9 | ||||
| -rwxr-xr-x | phpBB/adm/style/install_header.html | 3 | ||||
| -rwxr-xr-x | phpBB/install/index.php | 22 |
3 files changed, 32 insertions, 2 deletions
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index dd71698c93..befcaa22ba 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -217,7 +217,7 @@ span.corners-top span, span.corners-bottom span { } /* Link styles for the sub-section links */ -#menu li a { +#menu li a, #menu li span { display: block; padding: 3px 2px 3px 10px; text-decoration: none; @@ -227,11 +227,16 @@ span.corners-top span, span.corners-bottom span { background-color: #ECECEC; border-top: 1px solid #FFFFFF; } -#menu li a:hover { +#menu li a:hover, #menu li#activemenu span { text-decoration: none; background-color: #FFA34F; color: #FFFFFF; } +#menu li span.completed { + text-decoration: none; + background-color: #B9DBB3; + color: #006699; + } #menu li.header { display: block; padding: 5px; diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html index ed53d149bd..78bc52860e 100755 --- a/phpBB/adm/style/install_header.html +++ b/phpBB/adm/style/install_header.html @@ -35,6 +35,9 @@ <!-- BEGIN l_block1 --> <li<!-- IF l_block1.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li> <!-- END l_block1 --> + <!-- BEGIN l_block2 --> + <li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF -->>{l_block2.L_TITLE}</span></li> + <!-- END l_block2 --> </ul> </div> diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 8ab56c4dd0..d63973360e 100755 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -206,6 +206,10 @@ class module { $this->sub = strtolower((in_array(strtoupper($selected_submod), $row['module_subs'])) ? $selected_submod : $row['module_subs'][0]); } + elseif (is_array($row['module_stages'])) + { + $this->sub = strtolower((in_array(strtoupper($selected_submod), $row['module_stages'])) ? $selected_submod : $row['module_stages'][0]); + } else { $this->sub = ''; @@ -361,6 +365,24 @@ class module )); } } + + if (is_array($this->module_ary[$this->id]['stages'])) + { + $subs = $this->module_ary[$this->id]['stages']; + $matched = false; + foreach ($subs as $option) + { + $l_option = (!empty($lang['STAGE_' . $option])) ? $lang['STAGE_' . $option] : preg_replace('#_#', ' ', $option); + $option = strtolower($option); + $matched = ($this->sub == $option) ? true : $matched; + + $template->assign_block_vars('l_block2', array( + 'L_TITLE' => $l_option, + 'S_SELECTED' => ($this->sub == $option), + 'S_COMPLETE' => !$matched, + )); + } + } } else { |