summaryrefslogtreecommitdiffstats
path: root/application/modules/user/views
diff options
context:
space:
mode:
authormichael pereira2011-04-08 15:20:55 +0200
committermichael pereira2011-04-08 15:20:55 +0200
commit7067b772abaf370fb9b73c33e4b92d4dfbc5b2cf (patch)
tree6d901d595c04b9b5156b6803bfb2fbcb2785273c /application/modules/user/views
parentkcl gefixt (diff)
parentFooter ist wieder an der Box (diff)
downloadpbs2-7067b772abaf370fb9b73c33e4b92d4dfbc5b2cf.tar.gz
pbs2-7067b772abaf370fb9b73c33e4b92d4dfbc5b2cf.tar.xz
pbs2-7067b772abaf370fb9b73c33e4b92d4dfbc5b2cf.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user/views')
-rw-r--r--application/modules/user/views/scripts/bootiso/index.phtml4
-rw-r--r--application/modules/user/views/scripts/bootmenu/index.phtml35
-rw-r--r--application/modules/user/views/scripts/group/show.phtml55
-rw-r--r--application/modules/user/views/scripts/person/index.phtml48
-rw-r--r--application/modules/user/views/scripts/person/show.phtml3
-rw-r--r--application/modules/user/views/scripts/role/show.phtml2
6 files changed, 69 insertions, 78 deletions
diff --git a/application/modules/user/views/scripts/bootiso/index.phtml b/application/modules/user/views/scripts/bootiso/index.phtml
index 4af8c0e..1c0c5fe 100644
--- a/application/modules/user/views/scripts/bootiso/index.phtml
+++ b/application/modules/user/views/scripts/bootiso/index.phtml
@@ -19,9 +19,9 @@
<div class='listelement'>
<?php if(count($this->bootisolist)==0)
echo "There are no BootISO entries to display." ?>
- <?php foreach ($this->bootisolist as $bootiso): ?>
+ <?php foreach ($this->bootisolist as $k => $bootiso): ?>
<div class='element'>
- <div class='number'><?php echo $this->escape($bootiso->getID()); ?></div>
+ <div class='number'><?php echo $k+1; ?></div>
<div class='content'>
<div class='actions'>
<a href="<?php echo $this->url(
diff --git a/application/modules/user/views/scripts/bootmenu/index.phtml b/application/modules/user/views/scripts/bootmenu/index.phtml
index 2e04618..5d298a5 100644
--- a/application/modules/user/views/scripts/bootmenu/index.phtml
+++ b/application/modules/user/views/scripts/bootmenu/index.phtml
@@ -1,5 +1,6 @@
<h1>BootMenu</h1>
<?php if($this->notification != ''){echo $this->notification;} ?>
+<div id='notification' style='display:none;'></div>
<?php echo $this->searchform; ?>
<?php echo $this->formButton('createbootmenu', 'Create BootMenu', array(
'onclick' => 'self.location="/user/bootmenu/createbootmenu/page/'.$this->page.'"',
@@ -24,20 +25,20 @@
<div class='element<?php echo " $class";?>'>
<div class='number'><?php echo $this->escape($bootmenu->getID()); ?></div>
<div class='content'>
- <div class='actions'>
- <a href="<?php echo $this->url(
- array(
- 'module' => 'user',
- 'controller' => 'bootmenu',
- 'action' => 'defaultbootmenu',
- 'bootmenuID' => $bootmenu->getID(),
- 'page' => $this->page
- ),
- 'default',
- true, false) ?>">
+ <div class='actions'>
<?php if($bootmenu->getDefaultbootmenu() == true): ?>
- <img src='/media/img/default.png' alt='Checked as default'/></a>
+ <a><img src='/media/img/default.png' alt='Checked as default'/></a>
<?php else: ?>
+ <a href="<?php echo $this->url(
+ array(
+ 'module' => 'user',
+ 'controller' => 'bootmenu',
+ 'action' => 'defaultbootmenu',
+ 'bootmenuID' => $bootmenu->getID(),
+ 'page' => $this->page
+ ),
+ 'default',
+ true, false) ?>">
<img src='/media/img/default_grey.png' alt='Not checked as default' /></a>
<?php endif; ?>
<a href="<?php echo $this->url(
@@ -80,7 +81,7 @@
<div class='number'><?php echo $this->escape($bootmenuentry->getID()); ?></div>
<div class='content'>
<div class='actions'>
- <a href="<?php echo $this->url(
+ <a class='play' href="<?php echo $this->url(
array(
'controller' => 'resource',
'action' => 'getbootmenuentry',
@@ -135,3 +136,11 @@
<?php echo $this->pagination; ?>
+<script>
+$(document).ready(function(){
+ $('.actions .play').click(function (){
+ $("#notification").load($(this).attr('href')).addClass('infobox').show();
+ return false;
+ });
+});
+</script>
diff --git a/application/modules/user/views/scripts/group/show.phtml b/application/modules/user/views/scripts/group/show.phtml
index a1c0896..ea677ac 100644
--- a/application/modules/user/views/scripts/group/show.phtml
+++ b/application/modules/user/views/scripts/group/show.phtml
@@ -44,9 +44,6 @@ if($this->groupID) {
?>
</table>
<?php
- echo $this->formButton('editgroup', 'Show Grouplist', array(
- 'onclick' => 'self.location="/user/group/showall"',
- 'class' => 'rightbutton'));
if(isset($this->groupRequestList)) {
?>
<br />
@@ -87,19 +84,17 @@ if($this->groupID) {
?>
<br />
<h2>Members:</h2>
-<div class='listelement'>
- <?php if(count($this->membersList)==0)
- echo "This hroup has no members." ?>
- <?php foreach ($this->membersList as $member): ?>
- <?php
- $membershipID = $member['membershipID'];
- $person = $member['person'];
- $role = $member['role'];
- ?>
- <div class='element'>
- <div class='content'>
- <div class='actions'>
- <a href="<?php echo $this->url(
+<div class='listelement'><?php if(count($this->membersList)==0)
+echo "This hroup has no members." ?> <?php foreach ($this->membersList as $member): ?>
+<?php
+$membershipID = $member['membershipID'];
+$person = $member['person'];
+$role = $member['role'];
+?>
+<div class='element'>
+<div class='content'>
+<div class='actions'><a
+ href="<?php echo $this->url(
array(
'module' => 'user',
'controller' => 'group',
@@ -108,23 +103,21 @@ if($this->groupID) {
),
'default',
true) ?>"> <img src='/media/img/delete.png' alt='Revoke Membership' /></a>
- </div>
- <div class='title'><?php echo $person->getFirstname(); ?> <?php echo $person->getName(); ?></div>
- <div class='subtitle'>Role: <?php echo $role->getTitle(); ?></div>
- <div class='details dispnone'>
- <label>Email</label>
- <div class='item'><?php echo $person->getEmail(); ?></div>
- <label>City</label>
- <div class='item'><?php echo $person->getCity(); ?></div>
- </div>
- </div>
- <div class='clear'></div>
- </div>
- <?php endforeach ?>
</div>
+<div class='title'><?php echo $person->getFirstname(); ?> <?php echo $person->getName(); ?></div>
+<div class='subtitle'>Role: <?php echo $role->getTitle(); ?></div>
+<div class='details dispnone'><label>Email</label>
+<div class='item'><?php echo $person->getEmail(); ?></div>
+<label>City</label>
+<div class='item'><?php echo $person->getCity(); ?></div>
+</div>
+</div>
+<div class='clear'></div>
+</div>
+ <?php endforeach ?></div>
- <?php echo $this->memberPagination; ?>
- <?php
+ <?php echo $this->memberPagination; ?>
+ <?php
}
}
diff --git a/application/modules/user/views/scripts/person/index.phtml b/application/modules/user/views/scripts/person/index.phtml
index a4d3a3d..7c6fc8d 100644
--- a/application/modules/user/views/scripts/person/index.phtml
+++ b/application/modules/user/views/scripts/person/index.phtml
@@ -15,28 +15,22 @@
<div class="personColorDiv"><span class="bold">Last Login Date:</span>&nbsp;<?php if( $this->person->getLogindate()) echo date ('d. F Y - H:i', $this->person->getLogindate()) . " Uhr"; ?></div>
<div class="personDiv"><span class="bold">Register Date:</span>&nbsp;<?php echo date ('d. F Y - H:i', $this->person->getRegisterdate()) . ' Uhr'; ?></div>
<?php
-if($this->overviewRight === true) echo $this->formButton('showallperson', 'Show Personlist', array(
- 'onclick' => 'self.location="/user/person/showall/"',
- 'class' => 'rightbutton'));
if(isset($this->groups)) {
?>
<br />
<h2>Member in the following Groups:</h2>
-<div class='listelement'>
- <?php if(count($this->groups)==0)
- echo "You are in no group." ?>
- <?php foreach ($this->groups as $group): ?>
- <?php
- $class='';
- if($group['membershipID'] == $this->userIDsNamespace['membershipID'])
- $class= 'highlight checked';
- ?>
- <div class='element<?php echo " $class";?>'>
- <div class='content'>
- <div class='actions'>
- <?php if($this->leaveRight === true): ?>
- <a href="<?php echo $this->url(
+<div class='listelement'><?php if(count($this->groups)==0)
+echo "You are in no group." ?> <?php foreach ($this->groups as $group): ?>
+<?php
+$class='';
+if($group['membershipID'] == $this->userIDsNamespace['membershipID'])
+$class= 'highlight checked';
+?>
+<div class='element<?php echo " $class";?>'>
+<div class='content'>
+<div class='actions'><?php if($this->leaveRight === true): ?> <a
+ href="<?php echo $this->url(
array(
'module' => 'user',
'controller' => 'person',
@@ -44,18 +38,16 @@ if(isset($this->groups)) {
'membershipID' => $group['membershipID']
),
'default',
- true) ?>"> <img src='/media/img/delete.png' alt='Delete Group' /></a>
- <?php endif; ?>
- </div>
- <div class='title'><?php echo $group['title']; ?></div>
- <div class='subtitle'><?php echo $group['description']; ?></div>
- </div>
- <div class='clear'></div>
- </div>
- <?php endforeach ?>
+ true) ?>"> <img src='/media/img/delete.png' alt='Delete Group' /></a>
+ <?php endif; ?></div>
+<div class='title'><?php echo $group['title']; ?></div>
+<div class='subtitle'><?php echo $group['description']; ?></div>
+</div>
+<div class='clear'></div>
</div>
- <?php echo $this->pagination;
- if($this->groupRequestRight === true) echo $this->formButton('addtogroup', 'Add to additional
+ <?php endforeach ?></div>
+ <?php echo $this->pagination;
+ if($this->groupRequestRight === true) echo $this->formButton('addtogroup', 'Add to additional
Groups', array(
'onclick' => 'self.location="/user/person/request/"',
'class' => 'addbutton'));
diff --git a/application/modules/user/views/scripts/person/show.phtml b/application/modules/user/views/scripts/person/show.phtml
index be973b9..8ebb371 100644
--- a/application/modules/user/views/scripts/person/show.phtml
+++ b/application/modules/user/views/scripts/person/show.phtml
@@ -18,9 +18,6 @@
<div class="personColorDiv"><span class="bold">Last Login Date:</span>&nbsp;<?php if( $this->person->getLogindate()) echo date ('d. F Y - H:i', $this->person->getLogindate()) . " Uhr"; ?></div>
<div class="personDiv"><span class="bold">Register Date:</span>&nbsp;<?php echo date ('d. F Y - H:i', $this->person->getRegisterdate()) . ' Uhr'; ?></div>
<?php
-if($this->overviewRight === true) echo $this->formButton('showallperson', 'Show Personlist', array(
- 'onclick' => 'self.location="/user/person/showall/"',
- 'class' => 'rightbutton'));
if(isset($this->groups)) {
?>
<br />
diff --git a/application/modules/user/views/scripts/role/show.phtml b/application/modules/user/views/scripts/role/show.phtml
index 6769336..8194353 100644
--- a/application/modules/user/views/scripts/role/show.phtml
+++ b/application/modules/user/views/scripts/role/show.phtml
@@ -33,7 +33,7 @@ if($this->roleID) {
<h2>Rights:</h2>
<?php
if($this->rightsAvailable === true) {
- echo $this->formButton('linkright', 'Add Right', array(
+ echo $this->formButton('linkright', 'Add Rights', array(
'onclick' => 'self.location="/user/role/linkright/roleID/' . $this->role->getID() .'"',
'class' => 'addbutton'))?>
<br />