diff options
| author | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-08-08 17:52:29 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-08-08 19:50:42 +0200 |
| commit | 4de7009014f3b64b5a17a73d57167c7f82b56b33 (patch) | |
| tree | e417216751ca6bd2ab9f369d7d69dae45b8a4757 | |
| parent | 90726b10c417cd53361a2c914b2fb9c7eb10aac4 (diff) | |
| download | nextcloud-server-4de7009014f3b64b5a17a73d57167c7f82b56b33.tar.gz nextcloud-server-4de7009014f3b64b5a17a73d57167c7f82b56b33.zip | |
removed gratuitous main div
| -rw-r--r-- | core/templates/layout.admin.php | 50 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 36 |
2 files changed, 41 insertions, 45 deletions
diff --git a/core/templates/layout.admin.php b/core/templates/layout.admin.php index d70c54f7b15..853fcff608d 100644 --- 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 a8dff9ff3d4..57c48563bd8 100644 --- 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> |