summaryrefslogtreecommitdiffstats
path: root/application/modules/user/layouts
diff options
context:
space:
mode:
authormichael pereira2011-03-29 11:01:35 +0200
committermichael pereira2011-03-29 11:01:35 +0200
commitecb5c8d8c31ad70bb24e0ea1cfb6110bcd0a96bb (patch)
tree4b40a4178c2dc3bd3fe21730a29dd07bb8742790 /application/modules/user/layouts
parentPreboot User Controller fertig, ACL fehlt noch (diff)
parentselectmembership von auth zu person verschoben fbgui module (diff)
downloadpbs2-ecb5c8d8c31ad70bb24e0ea1cfb6110bcd0a96bb.tar.gz
pbs2-ecb5c8d8c31ad70bb24e0ea1cfb6110bcd0a96bb.tar.xz
pbs2-ecb5c8d8c31ad70bb24e0ea1cfb6110bcd0a96bb.zip
zfconf
Diffstat (limited to 'application/modules/user/layouts')
-rw-r--r--application/modules/user/layouts/user.phtml126
1 files changed, 81 insertions, 45 deletions
diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml
index 83b1c49..35f0b22 100644
--- a/application/modules/user/layouts/user.phtml
+++ b/application/modules/user/layouts/user.phtml
@@ -1,8 +1,8 @@
<?php echo $this->doctype(); ?>
-
+
<html xmlns="http://www.w3.org/1999/xhtml" lang="de" xml:lang="de">
<head>
-
+
<?php
$request = Zend_Controller_Front::getInstance()->getRequest();
$this->headTitle()->append(ucwords($request->getControllerName()));
@@ -13,12 +13,13 @@ echo $this->headStyle()."\n";
echo $this->headLink()."\n";
echo $this->headScript()."\n";
?>
-<script src='/media/js/jquery.min.js'></script>
+<script src='/media/js/jquery.min.js'></script>
<script src='/media/js/jquery-ui.min.js'></script>
-<script src='/media/js/script.js'></script>
+<script src='/media/js/script.js'></script>
</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'>
@@ -47,51 +48,86 @@ echo $this->headScript()."\n";
<li class='navTreeItem'><a href='/user/auth/logout'>Logout</a></li>
<?php
}
+=======
+<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/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>
+ <?php
+ if(count(Zend_Session::namespaceGet('userIDs')) > 0) {
+ ?>
+ <li class='navTreeItem'><a href='/user/person/changemembership'>Change
+ Membership</a></li>
+ <?php
+ } else {
+>>>>>>> d7af4710c133f5cfaf830c9ef617bac9730a77d3
?>
- </ul></li>
- </ul>
-</ul>
- </div>
+ <li class='navTreeItem'><a href='/user/person/selectmembership'>Select
+ Membership</a></li>
+ <?php
+ }
+ ?>
+ <?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'>Delete Account</a></li>
+ <li class='navTreeItem'><a href='/user/auth/logout'>Logout</a></li>
+ <?php
+ }
+ ?>
+ </ul>
+ </li>
+</ul>
+</ul>
+</div>
</div>
<div id='main'>
- <div id="head-bg">
- <div id="head">
- <h1>pbs<sup>2</sup></h1>
- <h2>Rechenzentrum Universit&auml;t Freiburg</h2>
- </div>
- </div>
- <div id="logo-bar-red"></div>
- <div id="head-titlebar">
- <?php
- echo ucwords($request->getControllerName()) . " > " . ucwords($request->getActionName());
- ?>
- </div>
- <div id="content">
- <?php echo $this->layout()->content; ?>
- </div>
+<div id="head-bg">
+<div id="head">
+<h1>pbs<sup>2</sup></h1>
+<h2>Rechenzentrum Universit&auml;t Freiburg</h2>
+</div>
+</div>
+<div id="logo-bar-red"></div>
+<div id="head-titlebar"><?php
+echo ucwords($request->getControllerName()) . " > " . ucwords($request->getActionName());
+?></div>
+<div id="content"><?php echo $this->layout()->content; ?></div>
+
+<div id="footer" class="footer flexbox flex">
+<div style='padding: 5px;'><a
+ onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();">display
+Debug</a> // <i>last edit: <?php echo date("m\/Y",filectime('index.php'));?></i>
+// <i>version: 0.1.1</i></div>
</div>
-
-<div id="footer" class="footer flexbox flex">
- <div style='padding:5px;'>
- <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();">display Debug</a> //
- <i>last edit: <?php echo date("m\/Y",filectime('index.php'));?></i> //
- <i>version: 0.1.1</i>
- </div>
</div>
+
<div id='debug'>
- <div class='v1'>
- <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();">
- <img src='/media/img/down.png' />
- </a>
- </div>
- <div class='v2' style='display:none;'>
- <div style='text-align:right;'>
- <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();">
- <img src='/media/img/up.png' />
- </a>
- </div>
- <?php print_a('Session',$_SESSION,'GET',$_GET,'POST',$_POST); ?>
- </div>
+<div class='v1'><a
+ onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();"> <img
+ src='/media/img/down.png' /> </a></div>
+<div class='v2' style='display: none;'>
+<div style='text-align: right;'><a
+ onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();"> <img
+ src='/media/img/up.png' /> </a></div>
+<?php print_a('Session',$_SESSION,'GET',$_GET,'POST',$_POST); ?></div>
</div>
-</body>
-</html>
+</body>
+</html>