summaryrefslogtreecommitdiffstats
path: root/application/modules
diff options
context:
space:
mode:
Diffstat (limited to 'application/modules')
-rw-r--r--application/modules/fbgui/controllers/IndexController.php2
-rw-r--r--application/modules/fbgui/views/scripts/index/index.phtml1
-rw-r--r--application/modules/user/controllers/GroupController.php5
-rw-r--r--application/modules/user/controllers/PersonController.php2
-rw-r--r--application/modules/user/views/scripts/filter/index.phtml6
-rw-r--r--application/modules/user/views/scripts/group/show.phtml61
-rw-r--r--application/modules/user/views/scripts/group/showall.phtml57
-rw-r--r--application/modules/user/views/scripts/person/index.phtml69
-rw-r--r--application/modules/user/views/scripts/person/showall.phtml224
9 files changed, 220 insertions, 207 deletions
diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php
index 8c840ea..bfd2bec 100644
--- a/application/modules/fbgui/controllers/IndexController.php
+++ b/application/modules/fbgui/controllers/IndexController.php
@@ -62,7 +62,7 @@ class Fbgui_IndexController extends Zend_Controller_Action
'Your client is '.$session->getClientID(),
'goto bootmenu '.$bootmenuID);
$bootmenuentriesMapper = new Application_Model_BootMenuEntriesMapper();
- $res = $bootmenuentriesMapper->findBy(array('bootmenuID' => $bootmenuID),true);
+ $res = $bootmenuentriesMapper->findBy(array('bootmenuID' => $bootmenuID),false);
$this->view->entries = $res;
}
else{
diff --git a/application/modules/fbgui/views/scripts/index/index.phtml b/application/modules/fbgui/views/scripts/index/index.phtml
index 70d255c..1fe02d4 100644
--- a/application/modules/fbgui/views/scripts/index/index.phtml
+++ b/application/modules/fbgui/views/scripts/index/index.phtml
@@ -23,6 +23,7 @@
$bootosMapper = new Application_Model_BootOsMapper();
$bootos = new Application_Model_BootOs();
$bootos = $bootosMapper->find($entry->getBootosID());
+
?>
<div id="menu_item_1" class="menu" class="flexbox">
<img src="/media/img/os/ubuntu.png" />
diff --git a/application/modules/user/controllers/GroupController.php b/application/modules/user/controllers/GroupController.php
index 064ca60..d910707 100644
--- a/application/modules/user/controllers/GroupController.php
+++ b/application/modules/user/controllers/GroupController.php
@@ -147,9 +147,12 @@ class User_GroupController extends Zend_Controller_Action
if(isset($members)) {
foreach($members as $member) {
$person = $this->personmapper->find($member['personID']);
+ $membership_tmp = $this->membershipMapper->find($member['membershipID']);
+ $role = $this->rolemapper->find($membership_tmp->getRoleID());
$membersList[] = array(
'membershipID' => $member['membershipID'],
- 'person' => $person
+ 'person' => $person,
+ 'role' => $role
);
}
if(is_array($membersList)) {
diff --git a/application/modules/user/controllers/PersonController.php b/application/modules/user/controllers/PersonController.php
index 71a8c7d..c1e76d3 100644
--- a/application/modules/user/controllers/PersonController.php
+++ b/application/modules/user/controllers/PersonController.php
@@ -52,7 +52,7 @@ class user_PersonController extends Zend_Controller_Action
$this->view->person = $this->person;
// Pagination
$pagination = new Pbs_Pagination();
- $pagination->setPerPage(1);
+ $pagination->setPerPage(3);
$pagination->setElement($this->groups);
$pagination->setRequestPage($this->_request->getParam('page'));
$pagination->setPageUrl('/user/person/index' .((isset($this->view->search))?'/search/'.$this->view->search:''));
diff --git a/application/modules/user/views/scripts/filter/index.phtml b/application/modules/user/views/scripts/filter/index.phtml
index c76eae8..0164985 100644
--- a/application/modules/user/views/scripts/filter/index.phtml
+++ b/application/modules/user/views/scripts/filter/index.phtml
@@ -20,7 +20,7 @@
echo "There are no Filters to display." ?>
<?php foreach ($this->filters as $filter): ?>
<div class='element'>
- <div class='number'><?php echo $this->escape($filter->getID()) ?></div>
+ <div class='number'><acronym title='<?php echo $this->escape($filter->getID()) ?>'><?php echo $this->escape($filter->priority) ?></acronym></div>
<div class='content'>
<div class='actions'>
<a href="<?php echo $this->url(
@@ -56,12 +56,12 @@
</div>
<div class='title'><?php echo $this->escape($filter->title) ?></div>
<div class='subtitle'>
- <?php echo $this->escape($filter->bootmenuID) ?> - Priority: <?php echo $this->escape($filter->priority) ?><br />
+ <?php echo $this->escape($filter->bootmenuID) ?><br />
Created: <?php echo $this->escape($filter->created) ?><br />
<?php echo $this->escape($filter->Description) ?></div>
<?php
$fe = new Application_Model_FilterEntriesMapper();
- $erg = $fe->findBy(array('filterID' => $filter->getID()),true);
+ $erg = $fe->findBy(array('filterID' => $filter->getID()),true,array('filtertypeID'=>'ASC'));
?>
<div class='details dispnone'>
<?php foreach ($erg as $filterentry): ?>
diff --git a/application/modules/user/views/scripts/group/show.phtml b/application/modules/user/views/scripts/group/show.phtml
index 12c149f..a869c76 100644
--- a/application/modules/user/views/scripts/group/show.phtml
+++ b/application/modules/user/views/scripts/group/show.phtml
@@ -87,27 +87,19 @@ if($this->groupID) {
?>
<br />
<h2>Members:</h2>
-<table>
- <tr>
- <th>Firstname</th>
- <th>Name</th>
- <th>email</th>
- <th>city</th>
- <th>revoke</th>
- </tr>
-
- <?php
- foreach($this->membersList as $member) {
+<div class='listelement'>
+ <?php if(count($this->membersList)==0)
+ echo "This hroup has no members." ?>
+ <?php foreach ($this->membersList as $member): ?>
+ <?php
$membershipID = $member['membershipID'];
$person = $member['person'];
- ?>
- <tr class="entry">
- <td><?php echo $person->getFirstname(); ?></td>
- <td><?php echo $person->getName(); ?></td>
- <td><?php echo $person->getEmail(); ?></td>
- <td><?php echo $person->getCity(); ?></td>
- <td class='action'><a
- href="<?php echo $this->url(
+ $role = $member['role'];
+ ?>
+ <div class='element'>
+ <div class='content'>
+ <div class='actions'>
+ <a href="<?php echo $this->url(
array(
'module' => 'user',
'controller' => 'group',
@@ -115,13 +107,32 @@ if($this->groupID) {
'membershipID' => $membershipID,
),
'default',
- true) ?>"> <img src='/media/img/delete.png' alt='Delete Group' /></a>
- </td>
- </tr>
- <?php
+ true) ?>"> <img src='/media/img/delete.png' alt='Revoke Membership' /></a>
+ </div>
+ <div class='title'><?php echo $person->getFirstname(); ?> <?php echo $person->getName(); ?></div>
+ <div class='subtitle'>Role: <?php echo $role->getTitle(); ?></div>
+ <div class='details dispnone'>
+ <label>Email</label>
+ <div class='item'><?php echo $person->getEmail(); ?></div>
+ <label>City</label>
+ <div class='item'><?php echo $person->getCity(); ?></div>
+ </div>
+ </div>
+ <div class='clear'></div>
+ </div>
+ <?php endforeach ?>
+</div>
+<script>
+$(document).ready(function(){
+ if($('.element').find('.dispnone').length >= 1){
+ $(this).find('.title').css('cursor','pointer');
+
+ $('.title').click(function(){
+ $(this).siblings('.dispnone').toggle();
+ });
}
- ?>
-</table>
+});
+</script>
<?php echo $this->memberPagination; ?>
<?php
}
diff --git a/application/modules/user/views/scripts/group/showall.phtml b/application/modules/user/views/scripts/group/showall.phtml
index 7f6be67..9afedbb 100644
--- a/application/modules/user/views/scripts/group/showall.phtml
+++ b/application/modules/user/views/scripts/group/showall.phtml
@@ -4,20 +4,28 @@
'onclick' => 'self.location="/user/group/add"',
'class' => 'addbutton'))
?>
-<table>
- <tr>
- <th>Title <span class='code'>title</span></th>
- <th colspan=3>Actions</th>
- </tr>
+
+<div class='searchvars'>
+ <div class='head'>Available searchfilter:</div>
+ <div class='code'>title</div>
+ <div class='code'>description</div>
+</div>
+
+<div class='listelement'>
<?php
$count = 0;
- foreach($this->groupList as $group) {
+ if(count($this->groupList)==0)
+ echo "There are no groups" ?>
+ <?php foreach ($this->groupList as $group): ?>
+ <?php
+ $class='';
+ if($group->getID() == $this->userIDsNamespace['groupID'])
+ $class= 'highlight';
?>
- <tr
- <?php if($group->getID() == $this->userIDsNamespace['groupID']) echo 'class="selectedEntry"'; else echo 'class="entry"'; ?>>
- <td><?php echo $group->getTitle(); ?></td>
- <td class='action'><a
- href="<?php if($group->getID() == $this->userIDsNamespace['groupID']) echo $this->url(
+ <div class='element<?php echo " $class";?>'>
+ <div class='content'>
+ <div class='actions'>
+ <a href="<?php if($group->getID() == $this->userIDsNamespace['groupID']) echo $this->url(
array(
'module' => 'user',
'controller' => 'group',
@@ -33,8 +41,7 @@
),
'default',
true); ?>"> <img src='/media/img/show.png' alt='Show Group' /></a></td>
- <td class='action'><a
- href="<?php if($group->getID() == $this->userIDsNamespace['groupID']) echo $this->url(
+ <a href="<?php if($group->getID() == $this->userIDsNamespace['groupID']) echo $this->url(
array(
'module' => 'user',
'controller' => 'group',
@@ -50,8 +57,7 @@
),
'default',
true); ?>"> <img src='/media/img/edit.png' alt='Edit Group' /></a></td>
- <td class='action'><a
- href="<?php if($group->getID() == $this->userIDsNamespace['groupID']) echo $this->url(
+ <a href="<?php if($group->getID() == $this->userIDsNamespace['groupID']) echo $this->url(
array(
'module' => 'user',
'controller' => 'group',
@@ -67,15 +73,18 @@
),
'default',
true); ?>"> <img src='/media/img/delete.png' alt='Delete Group' /></a>
- </td>
- </tr>
- <?php
- $count++;
- }
- ?>
-</table>
- <?php echo $this->pagination; ?>
- <?php echo $this->formButton('linkgroups', 'Link Groups', array(
+ </div>
+ <div class='title'><?php echo $group->getTitle(); ?></div>
+ <div class='subtitle'><?php echo $group->getDescription(); ?></div>
+ </div>
+ <div class='clear'></div>
+ </div>
+ <?php $count++; ?>
+ <?php endforeach ?>
+</div>
+<?php echo $this->pagination; ?>
+
+<?php echo $this->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 824e7fb..7505954 100644
--- a/application/modules/user/views/scripts/person/index.phtml
+++ b/application/modules/user/views/scripts/person/index.phtml
@@ -22,45 +22,38 @@ if(isset($this->groups)) {
?>
<br />
<h2>Member in the following Groups:</h2>
-<table>
- <tr>
- <th>Title</th>
- <th>Description</th>
- <?php if($this->leaveRight === true) {
- ?>
- <th>Leave</th>
- <?php
- }
+
+<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';
?>
- </tr>
- <?php
- foreach($this->groups as $group) {
- ?>
- <tr
- <?php if($group['membershipID'] == $this->userIDsNamespace['membershipID']) echo 'class="selectedEntry"'; else echo 'class="entry"'; ?>>
- <td><?php echo $group['title']; ?></td>
- <td><?php echo $group['description']; ?></td>
- <?php if($this->leaveRight === true) {
- ?>
- <td class='action'><a
- href="<?php echo $this->url(
- array(
- 'module' => 'user',
- 'controller' => 'person',
- 'action' => 'leave',
- 'membershipID' => $group['membershipID']
- ),
- 'default',
- true) ?>"> <img src='/media/img/delete.png' alt='Delete Group' /></a>
- </td>
- <?php
- }
- ?>
- </tr>
- <?php
- }
- ?>
-</table>
+ <div class='element<?php echo " $class";?>'>
+ <div class='content'>
+ <div class='actions'>
+ <?php if($this->leaveRight === true): ?>
+ <a href="<?php echo $this->url(
+ array(
+ 'module' => 'user',
+ 'controller' => 'person',
+ 'action' => 'leave',
+ 'membershipID' => $group['membershipID']
+ ),
+ 'default',
+ true) ?>"> <img src='/media/img/delete.png' alt='Delete Group' /></a>
+ <?php endif; ?>
+ </div>
+ <div class='title'><?php echo $group['title']; ?></div>
+ <div class='subtitle'><?php echo $group['description']; ?></div>
+ </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(
diff --git a/application/modules/user/views/scripts/person/showall.phtml b/application/modules/user/views/scripts/person/showall.phtml
index 893e95b..f20f490 100644
--- a/application/modules/user/views/scripts/person/showall.phtml
+++ b/application/modules/user/views/scripts/person/showall.phtml
@@ -1,121 +1,117 @@
<h1>Persons Overview</h1>
-<br />
-<br />
<?php echo $this->searchform; ?>
-<table>
- <tr>
- <th>Title <span class='code'>title</span></th>
- <th>Name <span class='code'>name</span></th>
- <th>Firstname <span class='code'>firstname</span></th>
- <th>Email <span class='code'>email</span></th>
- <?php
- if($this->showRight === true || $this->editRight === true || $this->deleteRight === true) {
- ?>
- <th colspan=3>Actions</th>
- <?php
- }
- ?>
- </tr>
- <?php
- if(count($this->personList) > 0) {
- foreach($this->personList as $person) {
- ?>
- <tr
- <?php if($person->getID() == $this->userIDsNamespace['personID']) echo 'class="selectedEntry"'; else echo 'class="entry"'; ?>>
- <td><?php echo $person->getTitle(); ?></td>
- <td><?php echo $person->getName(); ?></td>
- <td><?php echo $person->getFirstname(); ?></td>
- <td><?php echo $person->getEmail(); ?></td>
- <?php
+<div class='searchvars'>
+ <div class='head'>Available searchfilter:</div>
+ <div class='code'>title</div>
+ <div class='code'>name</div>
+ <div class='code'>firstname</div>
+ <div class='code'>email</div>
+</div>
+
+<div class='listelement'>
+ <?php if(count($this->personList)==0)
+ echo "There are no Sessions to display." ?>
+ <?php foreach ($this->personList as $person): ?>
+ <div class='element'>
+ <div class='content'>
+ <div class='actions'>
+ <?php
if($person->getID() == $this->userIDsNamespace['personID']) {
if($this->showRight === true) {
?>
- <td class='action'><a
- href="<?php echo $this->url(
- array(
- 'module' => 'user',
- 'controller' => 'person',
- 'action' => 'index'
- ),
- 'default',
- true);?>"> <img src='/media/img/show.png' alt='Show Person' /></a></td>
- <?php
- }
- if($this->editRight === true) { ?>
- <td class='action'><a
- href="<?php echo $this->url(
- array(
- 'module' => 'user',
- 'controller' => 'person',
- 'action' => 'edit'
- ),
- 'default',
- true);?>"> <img src='/media/img/edit.png' alt='Edit Person' /></a></td>
- <?php
- }
- if($this->deleteRight === true) { ?>
- <td class='action'><a
- href="<?php echo $this->url(
- array(
- 'module' => 'user',
- 'controller' => 'auth',
- 'action' => 'delete'
- ),
- 'default',
- true);?>"> <img src='/media/img/delete.png' alt='Delete Account' /></a></td>
- <?php
- }
- } else {
- if($this->showOtherRight === true) {
- ?>
- <td class='action'><a
- href=" <?php echo $this->url(
- array(
- 'module' => 'user',
- 'controller' => 'person',
- 'action' => 'show',
- 'personID' => $person->getID()
- ),
- 'default',
- true); ?>"> <img src='/media/img/show.png' alt='Show Person' /></a></td>
- <?php
+ <a href="<?php echo $this->url(
+ array(
+ 'module' => 'user',
+ 'controller' => 'person',
+ 'action' => 'index'
+ ),
+ 'default',
+ true);?>"> <img src='/media/img/show.png' alt='Show Person' /></a>
+ <?php
+ }
+ if($this->editRight === true) { ?>
+ <a href="<?php echo $this->url(
+ array(
+ 'module' => 'user',
+ 'controller' => 'person',
+ 'action' => 'edit'
+ ),
+ 'default',
+ true);?>"> <img src='/media/img/edit.png' alt='Edit Person' /></a>
+ <?php
+ }
+ if($this->deleteRight === true) { ?>
+ <a href="<?php echo $this->url(
+ array(
+ 'module' => 'user',
+ 'controller' => 'auth',
+ 'action' => 'delete'
+ ),
+ 'default',
+ true);?>"> <img src='/media/img/delete.png' alt='Delete Account' /></a>
+ <?php
+ }
+ } else {
+ if($this->showOtherRight === true) {
+ ?>
+ <a href=" <?php echo $this->url(
+ array(
+ 'module' => 'user',
+ 'controller' => 'person',
+ 'action' => 'show',
+ 'personID' => $person->getID()
+ ),
+ 'default',
+ true); ?>"> <img src='/media/img/show.png' alt='Show Person' /></a>
+ <?php
+ }
+ if($this->editOtherRight === true) {
+ ?>
+ <a href=" <?php echo $this->url(
+ array(
+ 'module' => 'user',
+ 'controller' => 'person',
+ 'action' => 'edit',
+ 'personID' => $person->getID()
+ ),
+ 'default',
+ true); ?>"> <img src='/media/img/edit.png' alt='Edit Person' /></a>
+ <?php
+ }
+ if($this->deleteOtherRight === true) {
+ ?>
+ <a href=" <?php echo $this->url(
+ array(
+ 'module' => 'user',
+ 'controller' => 'auth',
+ 'action' => 'delete',
+ 'personID' => $person->getID()
+ ),
+ 'default',
+ true); ?>"> <img src='/media/img/delete.png' alt='Delete Account' /></a>
+ <?php
+ }
}
- if($this->editOtherRight === true) {
- ?>
- <td class='action'><a
- href=" <?php echo $this->url(
- array(
- 'module' => 'user',
- 'controller' => 'person',
- 'action' => 'edit',
- 'personID' => $person->getID()
- ),
- 'default',
- true); ?>"> <img src='/media/img/edit.png' alt='Edit Person' /></a></td>
- <?php
- }
- if($this->deleteOtherRight === true) {
- ?>
- <td class='action'><a
- href=" <?php echo $this->url(
- array(
- 'module' => 'user',
- 'controller' => 'auth',
- 'action' => 'delete',
- 'personID' => $person->getID()
- ),
- 'default',
- true); ?>"> <img src='/media/img/delete.png' alt='Delete Account' /></a></td>
- <?php
- }
- }
- ?>
- </tr>
- <?php
- }
+ ?>
+ </div>
+ <div class='title'><?php echo $person->getTitle(); ?> <?php echo $person->getFirstname(); ?> <?php echo $person->getName(); ?></div>
+ <div class='subtitle'><?php echo $person->getEmail(); ?></div>
+ </div>
+ <div class='clear'></div>
+ </div>
+ <?php endforeach ?>
+</div>
+
+<?php echo $this->pagination; ?>
+
+<script>
+$(document).ready(function(){
+ if($('.element').find('.dispnone').length >= 1){
+ $(this).find('.title').css('cursor','pointer');
+
+ $('.title').click(function(){
+ $(this).siblings('.dispnone').toggle();
+ });
}
- ?>
-</table>
- <?php echo $this->pagination; ?>
-<br />
-<br />
+});
+</script>