removed gratuitous main div

diff --git a/core/templates/layout.admin.php b/core/templates/layout.admin.php
index d70c54f7b1575f271fc19416bcf69985eeaea09b..853fcff608d2bf428cc18360ca7e414e7f594dd6 100644 (file)
--- a/core/templates/layout.admin.php
+++ b/core/templates/layout.admin.php
@@ -36,36 +36,34 @@
                        </ul>
                </div>
 
-               <div id="main">
-                       <div id="navigation">
-                               <ul>
-                                       <?php foreach($_['settingsnavigation'] as $entry):?>
-                                               <li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a></li>
+               <div id="navigation">
+                       <ul>
+                               <?php foreach($_['settingsnavigation'] as $entry):?>
+                                       <li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a></li>
+                                       <?php if( sizeof( $entry["subnavigation"] )): ?>
+                                               <?php foreach($entry["subnavigation"] as $subentry):?>
+                                                       <li><a href="<?php echo $subentry['href']; ?>" title="" <?php if( $subentry['active'] ): ?>class="active"<?php endif; ?>><?php echo $subentry['name'] ?></a></li>
+                                               <?php endforeach; ?>
+                                       <?php endif; ?>
+                               <?php endforeach; ?>
+                               <?php if(isset($_['adminnavigation'])):?>
+                                       <?php foreach($_['adminnavigation'] as $entry):?>
+                                               <li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a>
                                                <?php if( sizeof( $entry["subnavigation"] )): ?>
-                                                       <?php foreach($entry["subnavigation"] as $subentry):?>
-                                                               <li><a href="<?php echo $subentry['href']; ?>" title="" <?php if( $subentry['active'] ): ?>class="active"<?php endif; ?>><?php echo $subentry['name'] ?></a></li>
-                                                       <?php endforeach; ?>
+                                                       <ul>
+                                                               <?php foreach($entry["subnavigation"] as $subentry):?>
+                                                                       <li class="subentry"><a class="subentry<?php if( $subentry['active'] ): ?> active<?php endif; ?>" href="<?php echo $subentry['href']; ?>" title=""><?php echo $subentry['name'] ?></a></li>
+                                                               <?php endforeach; ?>
+                                                       </ul>
                                                <?php endif; ?>
+                                               </li>
                                        <?php endforeach; ?>
-                                       <?php if(isset($_['adminnavigation'])):?>
-                                               <?php foreach($_['adminnavigation'] as $entry):?>
-                                                       <li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a>
-                                                       <?php if( sizeof( $entry["subnavigation"] )): ?>
-                                                               <ul>
-                                                                       <?php foreach($entry["subnavigation"] as $subentry):?>
-                                                                               <li class="subentry"><a class="subentry<?php if( $subentry['active'] ): ?> active<?php endif; ?>" href="<?php echo $subentry['href']; ?>" title=""><?php echo $subentry['name'] ?></a></li>
-                                                                       <?php endforeach; ?>
-                                                               </ul>
-                                                       <?php endif; ?>
-                                                       </li>
-                                               <?php endforeach; ?>
-                                       <?php endif; ?>
-                               </ul>
-                       </div>
+                               <?php endif; ?>
+                       </ul>
+               </div>
 
-                       <div id="content">
-                               <?php echo $_['content']; ?>
-                       </div>
+               <div id="content">
+                       <?php echo $_['content']; ?>
                </div>
        </body>
 </html>

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index a8dff9ff3d44d1d50b145f21b23cce2fe9c908d5..57c48563bd8f615f69155e5c634895f1601643f2 100644 (file)
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -37,25 +37,23 @@
                        </ul>
                </div>
 
-               <div id="main">
-                       <div id="navigation">
-                               <ul>
-                                       <?php foreach($_['navigation'] as $entry): ?>
-                                               <li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>><?php echo $entry['name']; ?></a>
-                                                       <?php if( sizeof( $entry["subnavigation"] )): ?>
-                                                               <ul>
-                                                                       <?php foreach($entry["subnavigation"] as $subentry):?>
-                                                                               <li class="subentry"><a style="background-image:url(<?php echo $subentry['icon']; ?>)" href="<?php echo $subentry['href']; ?>" title="" class="subentry<?php if( $subentry['active'] ): ?> active<?php endif; ?>"><?php echo $subentry['name'] ?></a></li>
-                                                                       <?php endforeach; ?>
-                                                               </ul>
-                                                       <?php endif; ?>
-                                               </li>
-                                       <?php endforeach; ?>
-                               </ul>
-                       </div>
-                       <div id="content">
-                               <?php echo $_['content']; ?>
-                       </div>
+               <div id="navigation">
+                       <ul>
+                               <?php foreach($_['navigation'] as $entry): ?>
+                                       <li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>><?php echo $entry['name']; ?></a>
+                                               <?php if( sizeof( $entry["subnavigation"] )): ?>
+                                                       <ul>
+                                                               <?php foreach($entry["subnavigation"] as $subentry):?>
+                                                                       <li class="subentry"><a style="background-image:url(<?php echo $subentry['icon']; ?>)" href="<?php echo $subentry['href']; ?>" title="" class="subentry<?php if( $subentry['active'] ): ?> active<?php endif; ?>"><?php echo $subentry['name'] ?></a></li>
+                                                               <?php endforeach; ?>
+                                                       </ul>
+                                               <?php endif; ?>
+                                       </li>
+                               <?php endforeach; ?>
+                       </ul>
+               </div>
+               <div id="content">
+                       <?php echo $_['content']; ?>
                </div>
        </body>
 </html>