Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2

1 files changed, 77 insertions, 26 deletions

diff --git a/application/modules/user/views/scripts/person/index.phtml b/application/modules/user/views/scripts/person/index.phtml
index 7c6fc8d..8f91cfd 100644
--- a/application/modules/user/views/scripts/person/index.phtml
+++ b/application/modules/user/views/scripts/person/index.phtml
@@ -1,25 +1,75 @@
-<h1>Person</h1>
+<h1>Own Details</h1>
 <?php if($this->editRight === true) echo $this->formButton('editperson', 'Edit', array(
 							'onclick' => 'self.location="/user/person/edit/"',
 							'class' => 'rightbutton'))?>
-<br />
-<br />
-<div class="personColorDiv"><span class="bold">Title:</span>&nbsp;<?php echo $this->person->getTitle(); ?></div>
-<div class="personDiv"><span class="bold">Name:</span>&nbsp;<?php echo $this->person->getName(); ?></div>
-<div class="personColorDiv"><span class="bold">Firstname:</span>&nbsp;<?php echo $this->person->getFirstname(); ?></div>
-<div class="personDiv"><span class="bold">Street:</span>&nbsp;<?php echo $this->person->getStreet(); ?></div>
-<div class="personColorDiv"><span class="bold">Housenumber:</span>&nbsp;<?php echo $this->person->getHousenumber(); ?></div>
-<div class="personDiv"><span class="bold">City:</span>&nbsp;<?php echo $this->person->getCity(); ?></div>
-<div class="personColorDiv"><span class="bold">Postalcode:</span>&nbsp;<?php echo $this->person->getPostalcode(); ?></div>
-<div class="personDiv"><span class="bold">Email:</span>&nbsp;<?php echo $this->person->getEmail(); ?></div>
-<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(isset($this->groups)) {
-	?>
+<div class='detailelement'>
+<div class='element'>
+<div class='content'>
+<div class="title">Title:&nbsp;<span class="noBold"><?php echo $this->person->getTitle(); ?></span></div>
+</div>
+<div class='clear'></div>
+</div>
+<div class='element'>
+<div class='content'>
+<div class="title">Name:&nbsp;<span class="noBold"><?php echo $this->person->getName(); ?></span></div>
+</div>
+<div class='clear'></div>
+</div>
+<div class='element'>
+<div class='content'>
+<div class="title">Firstname:&nbsp;<span class="noBold"><?php echo $this->person->getFirstname(); ?></span></div>
+</div>
+<div class='clear'></div>
+</div>
+<div class='element'>
+<div class='content'>
+<div class="title">Street:&nbsp;<span class="noBold"><?php echo $this->person->getStreet(); ?></span></div>
+</div>
+<div class='clear'></div>
+</div>
+<div class='element'>
+<div class='content'>
+<div class="title">Housenumber:&nbsp;<span class="noBold"><?php echo $this->person->getHousenumber(); ?></span></div>
+</div>
+<div class='clear'></div>
+</div>
+<div class='element'>
+<div class='content'>
+<div class="title">City:&nbsp;<span class="noBold"><?php echo $this->person->getCity(); ?></span></div>
+</div>
+<div class='clear'></div>
+</div>
+<div class='element'>
+<div class='content'>
+<div class="title">Postalcode:&nbsp;<span class="noBold"><?php echo $this->person->getPostalcode(); ?></span></div>
+</div>
+<div class='clear'></div>
+</div>
+<div class='element'>
+<div class='content'>
+<div class="title">Email:&nbsp;<span class="noBold"><?php echo $this->person->getEmail(); ?></span></div>
+</div>
+<div class='clear'></div>
+</div>
+<div class='element'>
+<div class='content'>
+<div class="title">Last Login Date:&nbsp;<span class="noBold"><?php if( $this->person->getLogindate()) echo date ('d. F Y - H:i', $this->person->getLogindate()) . " Uhr"; ?></span></div>
+</div>
+<div class='clear'></div>
+</div>
+<div class='element'>
+<div class='content'>
+<div class="title">Register Date:&nbsp;<span class="noBold"><?php echo date ('d. F Y - H:i', $this->person->getRegisterdate()) . ' Uhr'; ?></span></div>
+</div>
+<div class='clear'></div>
+</div>
+</div>
 <br />
 <h2>Member in the following Groups:</h2>
-
+<?php if($this->groupRequestRight === true) echo $this->formButton('addtogroup', 'Add to additional
+Groups', array(
+							'onclick' => 'self.location="/user/person/request/"',
+							'class' => 'addbutton')); ?>
 <div class='listelement'><?php if(count($this->groups)==0)
 echo "You are in no group." ?> <?php foreach ($this->groups as $group): ?>
 <?php
@@ -41,17 +91,18 @@ $class= 'highlight checked';
 							true) ?>"> <img src='/media/img/delete.png' alt='Delete Group' /></a>
 							<?php endif; ?></div>
 <div class='title'><?php echo $group['title']; ?></div>
+							<?php if($group['description']) {
+								?>
 <div class='subtitle'><?php echo $group['description']; ?></div>
-</div>
+								<?php
+							} else {
+								?>
+<div class='subtitle'>&nbsp;</div>
+								<?php
+							}
+							?></div>
 <div class='clear'></div>
 </div>
 							<?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'));
-}
-?>
-<br />
-<br />
+							?>
\ No newline at end of file