Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mantisbt/mantisbt
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fae02ce8d8da
Choose a base ref
...
head repository: mantisbt/mantisbt
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 370082a7bf09
Choose a head ref
  • 4 commits
  • 3 files changed
  • 1 contributor

Commits on Dec 27, 2012

  1. Improve readability of CSS for sub-menus

    @dregad
    dregad committed Dec 27, 2012
    Copy the full SHA
    47bdc42 View commit details

  2. Fix #15328: CSS for bracketed sub-menus 

    Make the bracketed sub-menus more similar to 1.2.x-style GUI by adding
padding between each line item and around current menu text.
    @dregad
    dregad committed Dec 27, 2012
    Copy the full SHA
    8ca85e1 View commit details

  3. Fix #15327: Removed unnecessary blank line above Account sub-menu

    @dregad
    dregad committed Dec 27, 2012
    Copy the full SHA
    f5dc0d2 View commit details

  4. Fix #15329: use CSS to display admin page sub-menu

    @dregad
    dregad committed Dec 27, 2012
    Copy the full SHA
    370082a View commit details
Showing with 67 additions and 15 deletions.
  1. +10 −8 admin/index.php
  2. +1 −1 core/html_api.php
  3. +56 −6 css/default.css
18 changes: 10 additions & 8 deletions admin/index.php
View file
Original file line number Diff line number Diff line change
@@ -39,16 +39,18 @@ function print_info_row( $p_description, $p_value ) {
?>
<br />

<div>
<p>[ <a href="check/index.php">Check your installation</a> ]</p>
<div id="admin-menu">
<ul class="menu">
<li><a href="check/index.php">Check your installation</a></li>
<?php if ( count($upgrade) - 1 != config_get( 'database_version' ) ) { ?>
<p>[ <a href="upgrade_warning.php"><strong>Upgrade your installation</strong></a> ]</p>
<li><a href="upgrade_warning.php"><span class="bold">Upgrade your installation</span></a></li>
<?php } ?>
<p>[ <a href="system_utils.php">System Utilities</a> ]</p>
<p>[ <a href="test_icons.php">Test Icons</a> ]</p>
<p>[ <a href="test_langs.php">Test Langs</a> ]</p>
<p>[ <a href="test_email.php">Test Email</a> ]</p>
<p>[ <a href="email_queue.php">Email Queue</a> ]</p>
<li><a href="system_utils.php">System Utilities</a></li>
<li><a href="test_icons.php">Test Icons</a></li>
<li><a href="test_langs.php">Test Langs</a></li>
<li><a href="test_email.php">Test Email</a></li>
<li><a href="email_queue.php">Email Queue</a></li>
</ul>
</div>

<table class="width75" cellspacing="1">
2 changes: 1 addition & 1 deletion core/html_api.php
View file
Original file line number Diff line number Diff line change
@@ -1175,7 +1175,7 @@ function print_account_menu( $p_page = '' ) {
echo '<ul class="menu">';
foreach ( $t_pages as $t_page ) {
if( $t_page['url'] == '' ) {
echo '<li>', lang_get( $t_page['label'] ), '</li>';
echo '<li><span>', lang_get( $t_page['label'] ), '</span></li>';
} else {
echo '<li><a href="'. helper_mantis_url( $t_page['url'] ) .'">' . lang_get( $t_page['label'] ) . '</a></li>';
}
62 changes: 56 additions & 6 deletions css/default.css
View file
Original file line number Diff line number Diff line change
@@ -127,10 +127,56 @@ td.login-info-right { width: 33%; padding: 0px; text-align: right; white-space:
.main-menu ul li a { padding-right: .9em; border-right: 1px solid #000; text-decoration: underline; }
.main-menu ul li > a#logout-link { padding-right: 0; border-right: none; }

#manage-menu, #account-menu, #summary-menu , #summary-submenu, #manage-config-menu, #manage-user-filter-menu, #manage-tags-filter-menu { float: left; width: 100%; margin: 0; padding: 0; overflow: hidden; font-size: 1em; position: relative; top: -1.5em; }
#manage-menu ul, #manage-config-menu ul, #summary-menu ul, #summary-submenu ul, #manage-user-filter-menu ul, #manage-tags-filter-menu ul { clear: left; float: left; list-style: none; position: relative; left: 50%; padding: 0; margin: 0; text-align: center; }
#manage-menu ul li, #manage-config-menu ul li, #summary-menu ul li, #summary-submenu ul li, #manage-user-filter-menu ul li, #manage-tags-filter-menu ul li { display:block; float: left; list-style: none; margin: .5em 0; padding: 0; position: relative; right: 50%; }
#manage-menu ul a, #manage-config-menu ul a, #summary-menu ul a, #summary-submenu ul a, #account-menu ul a, #doc-menu ul a, #manage-user-filter-menu ul a, #manage-tags-filter-menu ul a { text-decoration: underline; padding: 0 .25em; }
/* sub-menus */

#manage-menu,
#summary-menu,
#summary-submenu,
#manage-config-menu,
#manage-user-filter-menu,
#manage-tags-filter-menu,
#admin-menu
{ float: left; width: 100%; margin: 0; padding: 0; overflow: hidden; font-size: 1em; position: relative; top: -1.5em; }

#manage-menu ul,
#manage-config-menu ul,
#summary-menu ul,
#summary-submenu ul,
#manage-user-filter-menu ul,
#manage-tags-filter-menu ul,
#admin-menu ul
{ clear: left; float: left; list-style: none; position: relative; left: 50%; padding: 0; margin: 0; text-align: center; }

#manage-menu ul li,
#manage-config-menu ul li,
#summary-menu ul li,
#summary-submenu ul li,
#manage-user-filter-menu ul li,
#manage-tags-filter-menu ul li,
#admin-menu ul li
{ display:block; float: left; list-style: none; margin: .5em 0; padding: 0 .25em; position: relative; right: 50%; }

#manage-menu ul a,
#manage-config-menu ul a,
#summary-menu ul a,
#summary-submenu ul a,
#account-menu ul a,
#doc-menu ul a,
#manage-user-filter-menu ul a,
#manage-tags-filter-menu ul a,
#admin-menu ul a
{ text-decoration: underline; padding: 0 .25em; }

#manage-menu ul span,
#manage-config-menu ul span,
#summary-menu ul span,
#summary-submenu ul span,
#account-menu ul span,
#doc-menu ul span,
#manage-user-filter-menu ul span,
#manage-tags-filter-menu ul span,
#admin-menu ul span
{ padding: 0 .25em; }

#account-menu, #doc-menu { top: 0; }
#account-menu ul, #doc-menu ul { margin: 0 auto; padding: .25em; float: right; text-align: center; }
@@ -144,8 +190,10 @@ td.login-info-right { width: 33%; padding: 0px; text-align: right; white-space:
#summary-submenu ul li:before,
#account-menu ul li:before,
#doc-menu ul li:before,
#admin-menu ul li:before,
span.permalink:before,
span.switch-view:before { content: "[" }
span.switch-view:before
{ content: "[" }

#manage-user-link:after,
#manage-menu ul li:after,
@@ -154,8 +202,10 @@ span.switch-view:before { content: "[" }
#summary-submenu ul li:after,
#account-menu ul li:after,
#doc-menu ul li:after,
#admin-menu ul li:after,
span.permalink:after,
span.switch-view:after { content: "]" }
span.switch-view:after
{ content: "]" }

#content { clear: both; position: relative; top: 0; margin: 0; padding: .5em; }
.recently-visited { position: relative; top: -2.5em; float: right; text-align: right; font-size: x-small; }