diff options
| author | Björn Geiger | 2011-04-05 18:13:19 +0200 |
|---|---|---|
| committer | Björn Geiger | 2011-04-05 18:13:19 +0200 |
| commit | 9af50098ab0cd1412c8db21da090ef526b9da592 (patch) | |
| tree | 09717998529795c7abc085b423667e942797f106 /application/modules/user/views/scripts | |
| parent | Search in Group, Person und Role (diff) | |
| parent | filter table repariert (diff) | |
| download | pbs2-9af50098ab0cd1412c8db21da090ef526b9da592.tar.gz pbs2-9af50098ab0cd1412c8db21da090ef526b9da592.tar.xz pbs2-9af50098ab0cd1412c8db21da090ef526b9da592.zip | |
Merge branch 'master' of ssh://git.openslx.org/lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user/views/scripts')
3 files changed, 5 insertions, 3 deletions
diff --git a/application/modules/user/views/scripts/config/index.phtml b/application/modules/user/views/scripts/config/index.phtml index 91177f4..b651f63 100644 --- a/application/modules/user/views/scripts/config/index.phtml +++ b/application/modules/user/views/scripts/config/index.phtml @@ -22,7 +22,7 @@ <td><?php echo $this->escape($config->getTitle()); ?></td> <td><?php echo $this->escape($config->getGroupID()); ?></td> <td><?php echo $this->escape($config->getShellscript()); ?></td> - <td><?php echo $this->escape(date('Y-m-d H:i:s', $config->getCreated())); ?></td> + <td><?php echo $this->escape($config->getCreated()); ?></td> <td class='action'><a href="<?php echo $this->url( array( 'module' => 'user', diff --git a/application/modules/user/views/scripts/filter/index.phtml b/application/modules/user/views/scripts/filter/index.phtml index 7f8bad8..5d3646d 100644 --- a/application/modules/user/views/scripts/filter/index.phtml +++ b/application/modules/user/views/scripts/filter/index.phtml @@ -13,6 +13,7 @@ <th>Description <span class='code'>description</span></th> <th>Priority <span class='code'>priority</span></th> <th>TargetBootMenu <span class='code'>bootmenuID</span></th> + <th>Created <span class='code'>created</span></th> <th colspan=3>Actions</th> </tr> <?php foreach ($this->filters as $filter): ?> @@ -22,6 +23,7 @@ <td><?php echo $this->escape($filter->Description) ?></td> <td><?php echo $this->escape($filter->priority) ?></td> <td><?php echo $this->escape($filter->bootmenuID) ?></td> + <td><?php echo $this->escape($filter->created) ?></td> <td class='action'><a href="<?php echo $this->url( array( 'module' => 'user', @@ -61,7 +63,7 @@ <?php if (count($erg)>0): ?> <tr class=detail> <td class=arrowtop>↳</td> - <td colspan=7> + <td colspan=8> <?php ?> diff --git a/application/modules/user/views/scripts/session/index.phtml b/application/modules/user/views/scripts/session/index.phtml index bb9f1e2..32c8e04 100644 --- a/application/modules/user/views/scripts/session/index.phtml +++ b/application/modules/user/views/scripts/session/index.phtml @@ -22,7 +22,7 @@ <td><?php echo $this->escape($session->getBootosID()) ?></td> <td><?php echo $this->escape($session->getBootisoID()) ?></td> <td><?php echo $this->escape($session->getMembershipID()) ?></td> - <td><?php echo date('d.m.Y H:i',$this->escape($session->getTime())) ?></td> + <td><?php echo $this->escape($session->getTime()) ?></td> <td><?php echo $this->escape($session->getIp()) ?></td> <td><?php echo $this->escape($session->getIp6()) ?></td> </tr> |