From b43ff296c311076e8970b40aae80ec79de24adf1 Mon Sep 17 00:00:00 2001 From: Björn Geiger Date: Mon, 11 Apr 2011 13:51:05 +0200 Subject: verschiedene Layouts korrigiert --- .../modules/user/views/scripts/group/show.phtml | 94 ++++++++------- .../modules/user/views/scripts/group/showall.phtml | 70 ++++++----- .../modules/user/views/scripts/person/index.phtml | 104 ++++++++++++----- .../modules/user/views/scripts/person/show.phtml | 115 ++++++++++++------ .../user/views/scripts/person/showall.phtml | 98 ++++++++-------- .../modules/user/views/scripts/role/index.phtml | 95 ++++++++------- .../modules/user/views/scripts/role/show.phtml | 128 +++++++++++---------- 7 files changed, 416 insertions(+), 288 deletions(-) (limited to 'application/modules/user/views/scripts') diff --git a/application/modules/user/views/scripts/group/show.phtml b/application/modules/user/views/scripts/group/show.phtml index ea677ac..19dc396 100644 --- a/application/modules/user/views/scripts/group/show.phtml +++ b/application/modules/user/views/scripts/group/show.phtml @@ -2,7 +2,7 @@ if($this->groupID) { if(isset($this->userIDsNamespace['groupID'])) { ?> -

Group

+

Own Group

formButton('deletegroup', 'Delete', array( 'onclick' => 'self.location="/user/group/delete/"', @@ -22,63 +22,61 @@ if($this->groupID) { 'class' => 'rightbutton')); } ?> - - - - - - - - - - +
+
+
+
Title: group->getTitle(); ?>
+
+
+
+
+
+
Description: group->getDescription(); ?>
+
+
+
-
- - - - +
+
Superordinated Group: parentGroup->getTitle(); ?>
+
+
+ + -
TitleDescription
group->getTitle(); ?>group->getDescription(); ?>
Superordinated Group:parentGroup->getTitle(); ?>
+ ?> groupRequestList)) { ?>

Requests:

- - - - - - - - - groupRequestList as $grouprequest) { - $grouprequestID = $grouprequest['grouprequestID']; - $person = $grouprequest['person']; - ?> - - - - - - - - groupRequestList as $grouprequest) { + $grouprequestID = $grouprequest['grouprequestID']; + $person = $grouprequest['person']; ?> -
FirstnameNameemailcitygrant
getFirstname(); ?>getName(); ?>getEmail(); ?>getCity(); ?> -
roleList); ?> -
-
+
+
+
+
roleList); ?> +
+
+
getTitle(); ?> getFirstname(); ?> getName(); ?>
+
getCity(); ?>
+
+
getEmail(); ?>
+
+
+
+membersList)) { ?> @@ -132,5 +130,3 @@ function printRoleSelect($roleList) { echo ""; } ?> -
-
diff --git a/application/modules/user/views/scripts/group/showall.phtml b/application/modules/user/views/scripts/group/showall.phtml index 2ed777a..5e53f87 100644 --- a/application/modules/user/views/scripts/group/showall.phtml +++ b/application/modules/user/views/scripts/group/showall.phtml @@ -6,26 +6,28 @@ ?>
-
Available searchfilter:
-
title
-
description
+
Available searchfilter:
+
title
+
description
-
+
groupList)==0) +echo "There are no groups" ?> groupList as $k => $group): ?> +getID() == $this->userIDsNamespace['groupID']) +$class= 'highlight checked'; +?> +
getID() != $this->userIDsNamespace['groupID']) { + ?> +
groupList)==0) - echo "There are no groups" ?> - groupList as $group): ?> - getID() == $this->userIDsNamespace['groupID']) - $class= 'highlight checked'; - ?> -
-
-
- getID() == $this->userIDsNamespace['groupID']) echo $this->url( array( 'module' => 'user', 'controller' => 'group', @@ -40,8 +42,9 @@ 'groupID' => $group->getID() ), 'default', - true); ?>"> Show Group - Show Group + Edit Group - Edit Group + Delete Group -
-
getTitle(); ?>
-
getDescription(); ?>
-
-
-
- -
+
getTitle(); ?>
+ getDescription()) { + ?> +
getDescription(); ?>
+ +
 
+
+
+
+ pagination; ?> formButton('linkgroups', 'Link Groups', array( 'onclick' => 'self.location="/user/group/link"', 'class' => 'addbutton')) - ?> +?>

diff --git a/application/modules/user/views/scripts/person/index.phtml b/application/modules/user/views/scripts/person/index.phtml index c285ece..8f91cfd 100644 --- a/application/modules/user/views/scripts/person/index.phtml +++ b/application/modules/user/views/scripts/person/index.phtml @@ -1,25 +1,75 @@ -

Person

+

Own Details

editRight === true) echo $this->formButton('editperson', 'Edit', array( 'onclick' => 'self.location="/user/person/edit/"', 'class' => 'rightbutton'))?> -
-
-
Title: person->getTitle(); ?>
-
Name: person->getName(); ?>
-
Firstname: person->getFirstname(); ?>
-
Street: person->getStreet(); ?>
-
Housenumber: person->getHousenumber(); ?>
-
City: person->getCity(); ?>
-
Postalcode: person->getPostalcode(); ?>
-
Email: person->getEmail(); ?>
-
Last Login Date: person->getLogindate()) echo date ('d. F Y - H:i', $this->person->getLogindate()) . " Uhr"; ?>
-
Register Date: person->getRegisterdate()) . ' Uhr'; ?>
-groups)) { - ?> +
+
+
+
Title: person->getTitle(); ?>
+
+
+
+
+
+
Name: person->getName(); ?>
+
+
+
+
+
+
Firstname: person->getFirstname(); ?>
+
+
+
+
+
+
Street: person->getStreet(); ?>
+
+
+
+
+
+
Housenumber: person->getHousenumber(); ?>
+
+
+
+
+
+
City: person->getCity(); ?>
+
+
+
+
+
+
Postalcode: person->getPostalcode(); ?>
+
+
+
+
+
+
Email: person->getEmail(); ?>
+
+
+
+
+
+
Last Login Date: person->getLogindate()) echo date ('d. F Y - H:i', $this->person->getLogindate()) . " Uhr"; ?>
+
+
+
+
+
+
Register Date: person->getRegisterdate()) . ' Uhr'; ?>
+
+
+
+

Member in the following Groups:

- +groupRequestRight === true) echo $this->formButton('addtogroup', 'Add to additional +Groups', array( + 'onclick' => 'self.location="/user/person/request/"', + 'class' => 'addbutton')); ?>
groups)==0) echo "You are in no group." ?> groups as $group): ?> "> Delete Group
+
- + +
 
+
pagination; - -} -if($this->groupRequestRight === true) echo $this->formButton('addtogroup', 'Add to additional -Groups', array( - 'onclick' => 'self.location="/user/person/request/"', - 'class' => 'addbutton')); -?> -
-
+ ?> \ No newline at end of file diff --git a/application/modules/user/views/scripts/person/show.phtml b/application/modules/user/views/scripts/person/show.phtml index 8ebb371..5fb4bde 100644 --- a/application/modules/user/views/scripts/person/show.phtml +++ b/application/modules/user/views/scripts/person/show.phtml @@ -5,41 +5,92 @@ deleteRight === true) echo $this->formButton('deleteperson', 'Delete', array( 'onclick' => 'self.location="/user/auth/delete/personID/' . $this->personID . '"', 'class' => 'rightbutton')) ?> +
+
+
+
Title: person->getTitle(); ?>
+
+
+
+
+
+
Name: person->getName(); ?>
+
+
+
+
+
+
Firstname: person->getFirstname(); ?>
+
+
+
+
+
+
Street: person->getStreet(); ?>
+
+
+
+
+
+
Housenumber: person->getHousenumber(); ?>
+
+
+
+
+
+
City: person->getCity(); ?>
+
+
+
+
+
+
Postalcode: person->getPostalcode(); ?>
+
+
+
+
+
+
Email: person->getEmail(); ?>
+
+
+
+
+
+
Last Login Date: person->getLogindate()) echo date ('d. F Y - H:i', $this->person->getLogindate()) . " Uhr"; ?>
+
+
+
+
+
+
Register Date: person->getRegisterdate()) . ' Uhr'; ?>
+
+
+
+

-
-
Title: person->getTitle(); ?>
-
Name: person->getName(); ?>
-
Firstname: person->getFirstname(); ?>
-
Street: person->getStreet(); ?>
-
Housenumber: person->getHousenumber(); ?>
-
City: person->getCity(); ?>
-
Postalcode: person->getPostalcode(); ?>
-
Email: person->getEmail(); ?>
-
Last Login Date: person->getLogindate()) echo date ('d. F Y - H:i', $this->person->getLogindate()) . " Uhr"; ?>
-
Register Date: person->getRegisterdate()) . ' Uhr'; ?>
+

Member in the following Groups:

+
groups)==0) +echo "You are in no group." ?> groups as $group): ?> groups)) { +$class=''; +if($group['membershipID'] == $this->userIDsNamespace['membershipID']) +$class= 'highlight checked'; +?> +
+
+
+ -
-

Member in the following Groups:

- - - - - +
groups as $group) { - ?> - - - - - -
TitleDescription
- pagination; +
 
+ -
-
+?>
+
+
+
+pagination; +?> \ No newline at end of file diff --git a/application/modules/user/views/scripts/person/showall.phtml b/application/modules/user/views/scripts/person/showall.phtml index f20f490..1521744 100644 --- a/application/modules/user/views/scripts/person/showall.phtml +++ b/application/modules/user/views/scripts/person/showall.phtml @@ -1,25 +1,33 @@

Persons Overview

searchform; ?>
-
Available searchfilter:
-
title
-
name
-
firstname
-
email
+
Available searchfilter:
+
title
+
name
+
firstname
+
email
-
- personList)==0) - echo "There are no Sessions to display." ?> - personList as $person): ?> -
-
-
- getID() == $this->userIDsNamespace['personID']) { - if($this->showRight === true) { - ?> - personList as $k => $person): ?> +getID() == $this->userIDsNamespace['personID']) +$class= 'highlight checked'; +?> +
+getID() != $this->userIDsNamespace['personID']) { + ?> +
+ +
+
getID() == $this->userIDsNamespace['personID']) { + if($this->showRight === true) { + ?> Show Person editRight === true) { ?> - url( array( 'module' => 'user', 'controller' => 'person', @@ -39,9 +47,9 @@ 'default', true);?>"> Edit Person deleteRight === true) { ?> - url( array( 'module' => 'user', 'controller' => 'auth', @@ -50,11 +58,11 @@ 'default', true);?>"> Delete Account showOtherRight === true) { - ?> - url( array( 'module' => 'user', 'controller' => 'person', @@ -64,10 +72,10 @@ 'default', true); ?>"> Show Person editOtherRight === true) { - ?> - url( array( 'module' => 'user', 'controller' => 'person', @@ -77,10 +85,10 @@ 'default', true); ?>"> Edit Person deleteOtherRight === true) { - ?> - url( array( 'module' => 'user', 'controller' => 'auth', @@ -90,17 +98,15 @@ 'default', true); ?>"> Delete Account -
-
getTitle(); ?> getFirstname(); ?> getName(); ?>
-
getEmail(); ?>
-
-
-
- + } +} +?>
+
getTitle(); ?> getFirstname(); ?> getName(); ?>
+
getEmail(); ?>
+
+
+
pagination; ?> diff --git a/application/modules/user/views/scripts/role/index.phtml b/application/modules/user/views/scripts/role/index.phtml index baee6e4..cc34869 100644 --- a/application/modules/user/views/scripts/role/index.phtml +++ b/application/modules/user/views/scripts/role/index.phtml @@ -8,26 +8,30 @@ if($this->userIDsNamespace['groupID']) { 'onclick' => 'self.location="/user/role/add"', 'class' => 'addbutton')); ?> - - - - detailsRight || $this->editRight || $this->deleteRight) { - echo ''; - } - ?> - +
+
Available searchfilter:
+
title
+
description
+
+ +
roleList)==0) +echo "There are no roles" ?> roleList as $k => $role): ?> +userIDsNamespace['roleID']) +$class= 'highlight checked'; +?> +
userIDsNamespace['roleID']) { + ?> +
roleList as $role) { - ?> -
userIDsNamespace['roleID']) echo 'class="selectedEntry"'; else echo 'class="entry"'; ?>> - - detailsRight) { - ?> - - editRight) { - ?> - - deleteRight) { - ?> - - - - -
Title titleActions
url( array( 'module' => 'user', 'controller' => 'role', @@ -35,13 +39,11 @@ if($this->userIDsNamespace['groupID']) { 'roleID' => $role['roleID'] ), 'default', - true) ?>"> Show Group Show Group editRight) { + ?> Edit Group Edit Group deleteRight) { + ?> Delete Group -
- pagination; + +
+ +
+ +
 
+ +
+ + +pagination; } ?>
diff --git a/application/modules/user/views/scripts/role/show.phtml b/application/modules/user/views/scripts/role/show.phtml index e91c106..8f4bb50 100644 --- a/application/modules/user/views/scripts/role/show.phtml +++ b/application/modules/user/views/scripts/role/show.phtml @@ -16,54 +16,63 @@ if($this->roleID) { 'onclick' => 'self.location="/user/role/edit/roleID/' . $this->role->getID() .'"', 'class' => 'rightbutton')); ?> - - - - - - - - - - - - -
TitleDescriptionInheritance
role->getTitle(); ?>role->getDescription(); ?>role->getInheritance() == 1) echo "yes"; else echo "no"; ?>
+
+
+
+
Title: role->getTitle(); ?>
+
+
+
+
+
+
Description: role->getDescription(); ?>
+
+
+
+
+
role->getInheritance()) { + ?> +
Inheritance: yes
+ + +
Inheritance: no
+
+
+
+

Rights:

- rightsAvailable === true) { - if($this->addRightToRoleRight) echo $this->formButton('linkright', 'Add Rights', array( +rightsAvailable === true) { + if($this->addRightToRoleRight) { + echo $this->formButton('linkright', 'Add Rights', array( 'onclick' => 'self.location="/user/role/linkright/roleID/' . $this->role->getID() .'"', 'class' => 'addbutton'))?>
- rightsList)) { - if(isset($this->rightcategorieslist)) { - foreach($this->rightcategorieslist as $k => $v) { - $rights = $this->rightsList[$k]; - if(count($rights) > 0) { - ?> -

- - - - - removeRightOfRoleRight) echo ''; ?> - - - rightsList)==0) +echo "There are no Rights to display."; +if(isset($this->rightcategorieslist)) { + foreach($this->rightcategorieslist as $k => $v): + $rights = $this->rightsList[$k]; + if(count($rights) > 0) { ?> - - - - removeRightOfRoleRight) { - ?> - - - - + +
getTitle(); ?>
+getDescription()) { ?> -
TitleDescriptionRemove
getTitle(); ?>getDescription(); ?>url( array( 'module' => 'user', 'controller' => 'role', @@ -72,28 +81,27 @@ if($this->roleID) { ), 'default', true) ?>"> Remove Right -
+
getDescription(); ?>
-
-
-

No Rights have been added!

-
- +
+ + +
+ -
-
-- cgit v1.2.3-55-g7522