summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/modules/user/views/scripts/filter/index.phtml2
-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--public/media/css/user.css3
4 files changed, 68 insertions, 63 deletions
diff --git a/application/modules/user/views/scripts/filter/index.phtml b/application/modules/user/views/scripts/filter/index.phtml
index c76eae8..b9595f1 100644
--- a/application/modules/user/views/scripts/filter/index.phtml
+++ b/application/modules/user/views/scripts/filter/index.phtml
@@ -61,7 +61,7 @@
<?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/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/public/media/css/user.css b/public/media/css/user.css
index bb959c6..8886fa0 100644
--- a/public/media/css/user.css
+++ b/public/media/css/user.css
@@ -126,6 +126,9 @@ tr.selectedEntry td {
.listelement .element .details div.item{
display:block;
}
+.listelement .highlight {
+ background-color:#FFF5CC;
+}
.searchvars{
border:1px solid #000;
background-color:#FFFFBB;