From e5fcbd73596db87bb5cd24e1ba91cf735549b3c3 Mon Sep 17 00:00:00 2001 From: Björn Geiger Date: Tue, 12 Apr 2011 14:54:50 +0200 Subject: verschiedene Korrekturen --- .../modules/user/views/scripts/auth/delete.phtml | 2 +- .../modules/user/views/scripts/group/index.phtml | 105 ++++++++++ .../modules/user/views/scripts/group/show.phtml | 17 +- .../modules/user/views/scripts/person/index.phtml | 216 +++++++++++---------- .../user/views/scripts/person/owndetails.phtml | 108 +++++++++++ 5 files changed, 346 insertions(+), 102 deletions(-) create mode 100644 application/modules/user/views/scripts/group/index.phtml create mode 100644 application/modules/user/views/scripts/person/owndetails.phtml (limited to 'application/modules/user/views/scripts') diff --git a/application/modules/user/views/scripts/auth/delete.phtml b/application/modules/user/views/scripts/auth/delete.phtml index 62bf24e..83afc80 100644 --- a/application/modules/user/views/scripts/auth/delete.phtml +++ b/application/modules/user/views/scripts/auth/delete.phtml @@ -1,5 +1,5 @@

Delete Account

-Do you really want to delete this account? +Do you really want to delete account? deleteconfirmform->setAction($this->url()); echo $this->deleteconfirmform; diff --git a/application/modules/user/views/scripts/group/index.phtml b/application/modules/user/views/scripts/group/index.phtml new file mode 100644 index 0000000..2e376b3 --- /dev/null +++ b/application/modules/user/views/scripts/group/index.phtml @@ -0,0 +1,105 @@ +

Groups Overview

+searchform; ?> +formButton('addgroup', 'Add Group', array( + 'onclick' => 'self.location="/user/group/add"', + 'class' => 'addbutton')) +?> + +
+
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']) { + ?> +
+
Group
+ +
+ +
+
Show Group + Edit Group + Delete Group +
+
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/group/show.phtml b/application/modules/user/views/scripts/group/show.phtml index 19dc396..2bb200c 100644 --- a/application/modules/user/views/scripts/group/show.phtml +++ b/application/modules/user/views/scripts/group/show.phtml @@ -83,13 +83,26 @@ foreach($this->groupRequestList as $grouprequest) {

Members:

membersList)==0) -echo "This hroup has no members." ?> membersList as $member): ?> +echo "This hroup has no members." ?> membersList as $k => $member): ?> getID() == $this->userIDsNamespace['personID']) +$class= 'highlight checked'; +?> +
+getID() != $this->userIDsNamespace['personID']) { + ?> +
+
Person
+ +
+ -
'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'; ?>
-
-
-
-
-
-

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): ?> +

Persons Overview

+searchform; ?> +
+
Available searchfilter:
+
title
+
name
+
firstname
+
email
+
+ +
personList)==0) +echo "There are no Persons to display." ?> personList as $k => $person): ?> userIDsNamespace['membershipID']) +if($person->getID() == $this->userIDsNamespace['personID']) $class= 'highlight checked'; ?>
+getID() != $this->userIDsNamespace['personID']) { + ?> +
+
Person
+ +
+
-
leaveRight === true): ?> getID() == $this->userIDsNamespace['personID']) { + if($this->showRight === true) { + ?> Show Person + editRight === true) { ?> Delete Group -
-
- -
- -
 
-
+ array( + 'module' => 'user', + 'controller' => 'person', + 'action' => 'edit' + ), + 'default', + true);?>"> Edit Person + deleteRight === true) { ?> Delete Account + showOtherRight === true) { + ?> Show Person + editOtherRight === true) { + ?> Edit Person + deleteOtherRight === true) { + ?> Delete Account +
+
getTitle(); ?> getFirstname(); ?> getName(); ?>
+
getEmail(); ?>
+
-
- pagination; - ?> \ No newline at end of file +
+ +pagination; ?> + + diff --git a/application/modules/user/views/scripts/person/owndetails.phtml b/application/modules/user/views/scripts/person/owndetails.phtml new file mode 100644 index 0000000..8f91cfd --- /dev/null +++ b/application/modules/user/views/scripts/person/owndetails.phtml @@ -0,0 +1,108 @@ +

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'; ?>
+
+
+
+
+
+

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): ?> +userIDsNamespace['membershipID']) +$class= 'highlight checked'; +?> +
+
+
leaveRight === true): ?> Delete Group +
+
+ +
+ +
 
+
+
+
+
+ pagination; + ?> \ No newline at end of file -- cgit v1.2.3-55-g7522 From c3793b7244965044bb1bea9b2f61ca78380a9c2a Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 12 Apr 2011 14:58:27 +0200 Subject: Im Role-Bereich Klammern richtig gesetzt --- .../modules/user/views/scripts/role/index.phtml | 41 +++++++++++----------- 1 file changed, 20 insertions(+), 21 deletions(-) (limited to 'application/modules/user/views/scripts') diff --git a/application/modules/user/views/scripts/role/index.phtml b/application/modules/user/views/scripts/role/index.phtml index 0488211..80a4299 100644 --- a/application/modules/user/views/scripts/role/index.phtml +++ b/application/modules/user/views/scripts/role/index.phtml @@ -22,19 +22,18 @@ $class=''; if($role['roleID'] == $this->userIDsNamespace['roleID']) $class= 'highlight checked'; ?> -
userIDsNamespace['roleID']) { - ?> -
-
Role
- -
+
+ userIDsNamespace['roleID']) { ?> +
+
Role
+ +
-
-
detailsRight) { - ?> url( array( 'module' => 'user', 'controller' => 'role', @@ -43,10 +42,9 @@ $class= 'highlight checked'; ), 'default', true) ?>"> Show Group editRight) { - ?> url( array( 'module' => 'user', 'controller' => 'role', @@ -55,10 +53,9 @@ if($this->editRight) { ), 'default', true) ?>"> Edit Group deleteRight) { - ?> url( array( 'module' => 'user', 'controller' => 'role', @@ -67,6 +64,8 @@ if($this->deleteRight) { ), 'default', true) ?>"> Delete Group + +
deleteRight) {
-- cgit v1.2.3-55-g7522 From c2b00cf9182521b9b5b018d85bda230bfee945de Mon Sep 17 00:00:00 2001 From: Björn Geiger Date: Tue, 12 Apr 2011 15:00:09 +0200 Subject: 2 nicht mehr benötigte Dateien entfernen --- .../modules/user/views/scripts/group/showall.phtml | 105 ----------------- .../user/views/scripts/person/showall.phtml | 126 --------------------- 2 files changed, 231 deletions(-) delete mode 100644 application/modules/user/views/scripts/group/showall.phtml delete mode 100644 application/modules/user/views/scripts/person/showall.phtml (limited to 'application/modules/user/views/scripts') diff --git a/application/modules/user/views/scripts/group/showall.phtml b/application/modules/user/views/scripts/group/showall.phtml deleted file mode 100644 index 2e376b3..0000000 --- a/application/modules/user/views/scripts/group/showall.phtml +++ /dev/null @@ -1,105 +0,0 @@ -

Groups Overview

-searchform; ?> -formButton('addgroup', 'Add Group', array( - 'onclick' => 'self.location="/user/group/add"', - 'class' => 'addbutton')) -?> - -
-
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']) { - ?> -
-
Group
- -
- -
-
Show Group - Edit Group - Delete Group -
-
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/showall.phtml b/application/modules/user/views/scripts/person/showall.phtml deleted file mode 100644 index 1909782..0000000 --- a/application/modules/user/views/scripts/person/showall.phtml +++ /dev/null @@ -1,126 +0,0 @@ -

Persons Overview

-searchform; ?> -
-
Available searchfilter:
-
title
-
name
-
firstname
-
email
-
- -
personList)==0) -echo "There are no Persons to display." ?> personList as $k => $person): ?> -getID() == $this->userIDsNamespace['personID']) -$class= 'highlight checked'; -?> -
-getID() != $this->userIDsNamespace['personID']) { - ?> -
-
Person
- -
- -
-
getID() == $this->userIDsNamespace['personID']) { - if($this->showRight === true) { - ?> Show Person - editRight === true) { ?> Edit Person - deleteRight === true) { ?> Delete Account - showOtherRight === true) { - ?> Show Person - editOtherRight === true) { - ?> Edit Person - deleteOtherRight === true) { - ?> Delete Account -
-
getTitle(); ?> getFirstname(); ?> getName(); ?>
-
getEmail(); ?>
-
-
-
-
- -pagination; ?> - - -- cgit v1.2.3-55-g7522