summaryrefslogtreecommitdiffstats
path: root/application/modules/user
diff options
context:
space:
mode:
authorBjörn Geiger2011-04-13 16:32:27 +0200
committerBjörn Geiger2011-04-13 16:32:27 +0200
commiteefbdc02309e29e5993d376c968bbf279715fba0 (patch)
treeb770c67ec194c8cac8a7ff22e8556b7ec15b845f /application/modules/user
parentSuspend auf 0 gesetzt in Membership (diff)
downloadpbs2-eefbdc02309e29e5993d376c968bbf279715fba0.tar.gz
pbs2-eefbdc02309e29e5993d376c968bbf279715fba0.tar.xz
pbs2-eefbdc02309e29e5993d376c968bbf279715fba0.zip
Bei Details anderer Personen gleiches Layout wie bei OwnDetails
Diffstat (limited to 'application/modules/user')
-rw-r--r--application/modules/user/views/scripts/person/owndetails.phtml4
-rw-r--r--application/modules/user/views/scripts/person/show.phtml181
2 files changed, 69 insertions, 116 deletions
diff --git a/application/modules/user/views/scripts/person/owndetails.phtml b/application/modules/user/views/scripts/person/owndetails.phtml
index 0430623..74d00cf 100644
--- a/application/modules/user/views/scripts/person/owndetails.phtml
+++ b/application/modules/user/views/scripts/person/owndetails.phtml
@@ -33,7 +33,8 @@ label {
<?php
}
?>
- </div>
+ </div>
+ </div>
<div class='clear'></div>
</div>
</div>
@@ -74,7 +75,6 @@ if(count($this->groups)==0)
</div>
<?php endforeach ?>
</div>
-</div>
<?php echo $this->pagination;
if(isset($this->groupRequestList)) {
diff --git a/application/modules/user/views/scripts/person/show.phtml b/application/modules/user/views/scripts/person/show.phtml
index 2f2ef56..e82c4d9 100644
--- a/application/modules/user/views/scripts/person/show.phtml
+++ b/application/modules/user/views/scripts/person/show.phtml
@@ -5,131 +5,84 @@
<?php if($this->deleteRight === true) echo $this->formButton('deleteperson', 'Delete', array(
'onclick' => 'self.location="/user/auth/delete/personID/' . $this->personID . '"',
'class' => 'rightbutton')) ?>
-<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 class='listelement'>
+ <div class='element'>
+ <div class='content'>
+ <div class='title'><?php echo $this->person->getTitle()." ".$this->person->getFirstname()." ".$this->person->getName(); ?></div>
+ <div class='subtitle'><?php echo $this->person->getEmail(); ?></div>
+ <div class='details'><label>Street:</label>
+ <div class='item'><?php echo $this->person->getStreet(); ?>&nbsp;</div>
+ <label>Housenumber:</label>
+ <div class='item'><?php echo $this->person->getHousenumber(); ?>&nbsp;</div>
+ <label>City:</label>
+ <div class='item'><?php echo $this->person->getCity(); ?>&nbsp;</div>
+ <label>Postalcode:</label>
+ <div class='item'><?php echo $this->person->getPostalcode(); ?>&nbsp;</div>
+ <label>Email:</label>
+ <div class='item'><?php echo $this->person->getEmail(); ?>&nbsp;</div>
+ <label>Last Login:</label>
+ <div class='item'><?php if( $this->person->getLogindate()) echo date ('d. F Y - H:i', $this->person->getLogindate()) . " Uhr"; ?>&nbsp;</div>
+ <label>Register Date:</label>
+ <div class='item'><?php echo date ('d. F Y - H:i', $this->person->getRegisterdate()) . ' Uhr'; ?>&nbsp;</div>
+ <?php if($this->suspendRight === true)
+ {
+ ?> <label>Suspended:</label>
+ <div class='item'><?php if($this->person->getSuspended() == 1) echo "yes"; else echo "no"; ?></div>
+ <?php
+ }
+ ?>
+ </div>
+ </div>
+ <div class='clear'></div>
+ </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>
-<?php if($this->suspendRight === true)
-{
- ?>
-<div class='element'>
-<div class='content'>
-<div class="title">Suspended:&nbsp;<span class="noBold"><?php if($this->person->getSuspended() == 1) echo "yes"; else echo "no"; ?></span></div>
-</div>
-<div class='clear'></div>
-</div>
- <?php
-}
-?></div>
<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='title'><?php echo $group['title']; ?></div>
-<?php if($group['description']) {
- ?>
-<div class='subtitle'><?php echo $group['description']; ?></div>
+<div class='listelement'>
+<?php
+if(count($this->groups)==0)
+ echo "You are in no group." ?>
+ <?php foreach ($this->groups as $group): ?>
<?php
-} else {
+ $class='';
+ if($group['membershipID'] == $this->userIDsNamespace['membershipID'])
+ $class= 'highlight checked';
?>
-<div class='subtitle'>&nbsp;</div>
- <?php
-}
-?></div>
-<div class='clear'></div>
+ <div class='element<?php echo " $class";?>'>
+ <div class='content'>
+ <div class='title'><?php echo $group['title']; ?></div>
+ <div class='subtitle'><?php echo $group['description']; ?>&nbsp;</div>
+ </div>
+ <div class='clear'></div>
+ </div>
+ <?php endforeach ?>
</div>
-<?php endforeach ?></div>
<?php echo $this->pagination;
+
+
if(isset($this->groupRequestList)) {
- ?>
+?>
<br />
+
<h2>Requests:</h2>
-<div class='listelement'><?php
-foreach($this->groupRequestList as $grouprequest) {
- $grouprequestID = $grouprequest['grouprequestID'];
- $group = $grouprequest['group'];
+<div class='listelement'>
+<?php
+ foreach($this->groupRequestList as $grouprequest):
+ $grouprequestID = $grouprequest['grouprequestID'];
+ $group = $grouprequest['group'];
?>
-<div class='element'>
-<div class='content'>
-<div class='title'><?php echo $group->getTitle(); ?></div>
- <?php if($group->getDescription()) {
- ?>
-<div class='subtitle'><?php echo $group->getDescription(); ?></div>
- <?php
- } else {
- ?>
-<div class='subtitle'>&nbsp;</div>
- <?php
- }
- ?></div>
+ <div class='element'>
+ <div class='content'>
+ <div class='title'><?php echo $group->getTitle(); ?></div>
+ <div class='subtitle'><?php echo $group->getDescription(); ?>&nbsp;</div>
+ </div>
+ <div class='clear'></div>
+ </div>
+<?php
+endforeach
+?>
</div>
- <?php
-}
-?></div>
+
<?php
}
-?> \ No newline at end of file
+?>