diff options
Diffstat (limited to 'application/modules/user/layouts/user.phtml')
| -rw-r--r-- | application/modules/user/layouts/user.phtml | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml index 35f0b22..e09df87 100644 --- a/application/modules/user/layouts/user.phtml +++ b/application/modules/user/layouts/user.phtml @@ -19,36 +19,6 @@ echo $this->headScript()."\n"; </head> <body> <div id='sidepannel'> -<<<<<<< HEAD - <div id="logo"><div id="logo-bar-gray"></div></div> - <div id="sidepannel-top" class='portletNavigationTree'> - <ul class='navTreeLevel0'> - <li class='navTreeItem'><a href='/'><<</a></li> - <li class='navTreeItem'><a href='/user/'>user</a></li> - <li> - <ul class='navTreeLevel1'> - <li class='navTreeItem'><a href='/user/person'>Person</a></li> - <li class='navTreeItem'><a href='/user/group'>Group</a></li> - <li class='navTreeItem'><a href='/user/role'>Role</a></li> - <li class='navTreeItem'><a href='/user/bootiso'>BootIso</a></li> - <li class='navTreeItem'><a href='/user/preboot'>PreBoot</a></li> - <li class='navTreeItem'><a href='/user/bootmenu'>BootMenu</a></li> - <li class='navTreeItem'><a href='/user/config'>Config</a></li> - <li class='navTreeItem'><a href='/user/bootos'>BootOs</a></li> - <li class='navTreeItem'><a href='/user/client'>Client</a></li> - <li class='navTreeItem'><a href='/user/filter'>Filter</a></li> - <li class='navTreeItem'><a href='/user/pool'>Pool</a></li> - <li class='navTreeItem'><a href='/user/auth'>Auth</a></li> - <?php if (!Zend_Auth::getInstance()->hasIdentity()) {?> - <li class='navTreeItem'><a href='/user/auth/login'>Login</a></li> - <li class='navTreeItem'><a href='/user/auth/register'>Register</a></li> - <?php - } else {?> - <li class='navTreeItem'><a href='/user/auth/delete'>Account Löschen</a></li> - <li class='navTreeItem'><a href='/user/auth/logout'>Logout</a></li> - <?php - } -======= <div id="logo"> <div id="logo-bar-gray"></div> </div> @@ -62,6 +32,7 @@ echo $this->headScript()."\n"; <li class='navTreeItem'><a href='/user/group'>Group</a></li> <li class='navTreeItem'><a href='/user/role'>Role</a></li> <li class='navTreeItem'><a href='/user/bootiso'>BootIso</a></li> + <li class='navTreeItem'><a href='/user/preboot'>PreBoot</a></li> <li class='navTreeItem'><a href='/user/bootmenu'>BootMenu</a></li> <li class='navTreeItem'><a href='/user/config'>Config</a></li> <li class='navTreeItem'><a href='/user/bootos'>BootOs</a></li> @@ -75,7 +46,6 @@ echo $this->headScript()."\n"; Membership</a></li> <?php } else { ->>>>>>> d7af4710c133f5cfaf830c9ef617bac9730a77d3 ?> <li class='navTreeItem'><a href='/user/person/selectmembership'>Select Membership</a></li> |