diff options
| -rw-r--r-- | application/modules/user/views/scripts/group/show.phtml | 41 | ||||
| -rw-r--r-- | application/modules/user/views/scripts/person/owndetails.phtml | 76 | ||||
| -rw-r--r-- | public/media/js/user.js | 10 |
3 files changed, 39 insertions, 88 deletions
diff --git a/application/modules/user/views/scripts/group/show.phtml b/application/modules/user/views/scripts/group/show.phtml index 2bb200c..26cb97c 100644 --- a/application/modules/user/views/scripts/group/show.phtml +++ b/application/modules/user/views/scripts/group/show.phtml @@ -22,31 +22,24 @@ if($this->groupID) { 'class' => 'rightbutton')); } ?> -<div class='detailelement'> -<div class='element'> -<div class='content'> -<div class='title'>Title: <span class="noBold"><?php echo $this->group->getTitle(); ?></span></div> -</div> -<div class='clear'></div> -</div> -<div class='element'> -<div class='content'> -<div class='title'>Description: <span class="noBold"><?php echo $this->group->getDescription(); ?></span></div> -</div> -<div class='clear'></div> -</div> - <?php - if(isset($parentGroup) && is_object($parentGroup)) { - ?> -<div class='element'> -<div class='content'> -<div class='title'>Superordinated Group: <span class="noBold"><?php echo $this->parentGroup->getTitle(); ?></span></div> -</div> -<div class='clear'></div> +<div class='listelement'> + <div class='element'> + <div class='number'> + <div class='smallnumber'>Your Group</div> + </div> + <div class='content'> + <div class='title'><?php echo $this->group->getTitle(); ?></div> + <div class='subtitle'><?php echo $this->group->getDescription(); ?></div> + <?php if(isset($parentGroup) && is_object($parentGroup)): ?> + <div class='details'> + <label>Superordinated Group:</label><div class='item'><?php echo $this->parentGroup->getTitle(); ?></div> + </div> + <?php endif ;?> + </div> + <div class='clear'></div> + </div> </div> - <?php - } - ?></div> + <?php if(isset($this->groupRequestList)) { ?> diff --git a/application/modules/user/views/scripts/person/owndetails.phtml b/application/modules/user/views/scripts/person/owndetails.phtml index ac96d25..89be623 100644 --- a/application/modules/user/views/scripts/person/owndetails.phtml +++ b/application/modules/user/views/scripts/person/owndetails.phtml @@ -2,66 +2,22 @@ <?php if($this->editRight === true) echo $this->formButton('editperson', 'Edit', array( 'onclick' => 'self.location="/user/person/edit/"', 'class' => 'rightbutton'))?> -<div class='detailelement'> +<div class='listelement'> <div class='element'> -<div class='content'> -<div class="title">Title: <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: <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: <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: <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: <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: <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: <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: <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: <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: <span class="noBold"><?php echo date ('d. F Y - H:i', $this->person->getRegisterdate()) . ' Uhr'; ?></span></div> -</div> -<div class='clear'></div> + <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(); ?> </div> + <label>Housenumber:</label><div class='item'><?php echo $this->person->getHousenumber(); ?> </div> + <label>City:</label><div class='item'><?php echo $this->person->getCity(); ?> </div> + <label>Postalcode:</label><div class='item'><?php echo $this->person->getPostalcode(); ?> </div> + <label>Email:</label><div class='item'><?php echo $this->person->getEmail(); ?> </div> + <label>Last Login:</label><div class='item'><?php if( $this->person->getLogindate()) echo date ('d. F Y - H:i', $this->person->getLogindate()) . " Uhr"; ?> </div> + <label>Register Date:</label><div class='item'><?php echo date ('d. F Y - H:i', $this->person->getRegisterdate()) . ' Uhr'; ?> </div> + </div> + </div> + <div class='clear'> </div> </div> <br /> @@ -144,4 +100,4 @@ foreach($this->groupRequestList as $grouprequest) { ?></div> <?php } - ?>
\ No newline at end of file + ?> diff --git a/public/media/js/user.js b/public/media/js/user.js index fdd942f..15c3075 100644 --- a/public/media/js/user.js +++ b/public/media/js/user.js @@ -1,8 +1,10 @@ $(document).ready(function(){ if($('.listelement .element').find('.dispnone').length >= 1){ - $(this).find('.listelement .title').css('cursor','pointer'); - $(this).find('.listelement .title').prepend("<span class='toggler'><img src='/media/img/right.png'></span> "); - $(this).find('.listelement .title').data('toggle','0'); + console.log($(this)); + $('.listelement .element').find('.dispnone').parent().find('.title') + .css('cursor','pointer') + .prepend("<span class='toggler'><img src='/media/img/right.png'></span> ") + .data('toggle','0'); $('.listelement .title').click(function(){ $(this).siblings('.dispnone').toggle(); @@ -104,4 +106,4 @@ function uncheckAllCheckBoxes(exceptions) { } } } -}
\ No newline at end of file +} |