Commit 132517a8 authored by Dries's avatar Dries

- Patch #22215 by Richard Archer: theme system improvements for the primary links menu.

parent 1c4cc972
......@@ -18,8 +18,8 @@
<?php if ($site_slogan) { ?><div class='site-slogan'><?php print $site_slogan ?></div><?php } ?>
</td>
<td id="menu">
<?php if ($secondary_links) { ?><div id="secondary"><?php print theme('menu_links', $secondary_links) ?></div><?php } ?>
<?php if ($primary_links) { ?><div id="primary"><?php print theme('menu_links', $primary_links) ?></div><?php } ?>
<?php if ($secondary_links) { ?><div id="secondary"><?php print theme('links', $secondary_links) ?></div><?php } ?>
<?php if ($primary_links) { ?><div id="primary"><?php print theme('links', $primary_links) ?></div><?php } ?>
<?php print $search_box ?>
</td>
</tr>
......
......@@ -34,7 +34,7 @@
</td>
<td class="primary-links" width="70%" align="center" valign="middle">
<?php print theme('menu_links', $primary_links) ?>
<?php print theme('links', $primary_links) ?>
</td>
</tr>
</table>
......@@ -42,7 +42,7 @@
<table id="secondary-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td class="secondary-links" width="75%" align="center" valign="middle">
<?php print theme('menu_links', $secondary_links) ?>
<?php print theme('links', $secondary_links) ?>
</td>
<td width="25%" align="center" valign="middle">
<?php print $search_box ?>
......@@ -104,12 +104,12 @@
<td align="center" valign="middle">
<?php if (is_array($primary_links)) : ?>
<div class="primary-links">
<?php print theme('menu_links', $primary_links) ?>
<?php print theme('links', $primary_links) ?>
</div>
<?php endif; ?>
<?php if (is_array($secondary_links)) : ?>
<div class="secondary-links">
<?php print theme('menu_links', $secondary_links) ?>
<?php print theme('links', $secondary_links) ?>
</div>
<?php endif; ?>
</td>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment