summaryrefslogtreecommitdiffstats
path: root/application/views/scripts/bootmenu
diff options
context:
space:
mode:
authorSimon2011-03-09 12:20:55 +0100
committerSimon2011-03-09 12:20:55 +0100
commit1ac1db9336fdfa2f32e775e390a3d9fdaa605c79 (patch)
treebcb7fc97937b9db314b74903ffed61a1d75506ea /application/views/scripts/bootmenu
parentoberfläche verändert (diff)
parentACHTUNG: Habe in einigen Mappern die find() Methode geändert, sie liefern je... (diff)
downloadpbs2-1ac1db9336fdfa2f32e775e390a3d9fdaa605c79.tar.gz
pbs2-1ac1db9336fdfa2f32e775e390a3d9fdaa605c79.tar.xz
pbs2-1ac1db9336fdfa2f32e775e390a3d9fdaa605c79.zip
Merge gefixxt
Diffstat (limited to 'application/views/scripts/bootmenu')
-rw-r--r--application/views/scripts/bootmenu/index.phtml24
1 files changed, 17 insertions, 7 deletions
diff --git a/application/views/scripts/bootmenu/index.phtml b/application/views/scripts/bootmenu/index.phtml
index 7e3a92e..f54f085 100644
--- a/application/views/scripts/bootmenu/index.phtml
+++ b/application/views/scripts/bootmenu/index.phtml
@@ -13,6 +13,8 @@
<th>Changed</th>
<th colspan=3>Actions</th>
</tr>
+ <?php if(count($this->bootmenulist)==0)
+ echo "</table> There are no BootMenus to display." ?>
<?php foreach ($this->bootmenulist as $bootmenu): ?>
<tr class=entry>
<td><?php echo $this->escape($bootmenu->getID()); ?></td>
@@ -46,29 +48,36 @@
'default',
true) ?>">Add Entry</a></td>
</tr>
+<<<<<<< HEAD
<?php if(count($this->bootmenuentrylist[$bootmenu->getID()]) > 0):?>
<tr class=detail>
<td></td>
<td colspan=7>
<table>
- <tr>
+ <tr>
+ <th></th>
+
<th>ID</th>
<th>Title</th>
<!-- <th>BootmenuID</th>-->
- <th>BootOSID</th>
+ <th>BootOS</th>
<th>kcl</th>
- <th>ConfigID</th>
- <th>order</th>
+
+ <th>Config</th>
+ <th>Position</th>
<th colspan=2>Actions</th>
+
</tr>
<?php foreach ($this->bootmenuentrylist[$bootmenu->getID()] as $bootmenuentry): ?>
- <tr>
+ <?php $bootos = $this->bootosmapper->find($bootmenuentry->getBootosID());?>
+ <?php $config = $this->configmapper->find($bootmenuentry->getConfigID());?>
+ <tr><td></td>
<td><?php echo $this->escape($bootmenuentry->getID()); ?></td>
<td><?php echo $this->escape($bootmenuentry->getTitle()); ?></td>
<!--<td><?php echo $this->escape($bootmenuentry->getBootmenuID()); ?></td>
- --><td><?php echo "[".$this->escape($bootmenuentry->getBootosID()."] ". $this->bootosmapper->find($bootmenuentry->getBootosID())->getTitle()); ?></td>
+ --><td><?php echo "[".$this->escape($bootmenuentry->getBootosID()."] ". $bootos->getTitle()); ?></td>
<td><?php echo $this->escape($bootmenuentry->getkcl()); ?></td>
- <td><?php echo $this->escape($bootmenuentry->getConfigID()); ?></td>
+ <td><?php echo "[".$this->escape($bootmenuentry->getConfigID()."] ". $config->getTitle()); ?></td>
<td><?php echo $this->escape($bootmenuentry->getOrder() + 1); ?></td>
<td><a href="<?php echo $this->url(
array(
@@ -100,6 +109,7 @@
+