diff options
| author | michael pereira | 2011-03-09 12:45:34 +0100 |
|---|---|---|
| committer | michael pereira | 2011-03-09 12:45:34 +0100 |
| commit | 84bf8e8f2b85de4b071472f506a972495ac5499f (patch) | |
| tree | ba317abe65cb4a2dbc3a67be695d0eb30a1c2fcc /application/views/scripts | |
| parent | htaccess (diff) | |
| parent | Fehler in BootosController (diff) | |
| download | pbs2-84bf8e8f2b85de4b071472f506a972495ac5499f.tar.gz pbs2-84bf8e8f2b85de4b071472f506a972495ac5499f.tar.xz pbs2-84bf8e8f2b85de4b071472f506a972495ac5499f.zip | |
htaccess
Diffstat (limited to 'application/views/scripts')
| -rw-r--r-- | application/views/scripts/bootmenu/index.phtml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/application/views/scripts/bootmenu/index.phtml b/application/views/scripts/bootmenu/index.phtml index f54f085..019a799 100644 --- a/application/views/scripts/bootmenu/index.phtml +++ b/application/views/scripts/bootmenu/index.phtml @@ -48,14 +48,13 @@ '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> - <th></th> <th>ID</th> <th>Title</th> @@ -71,7 +70,7 @@ <?php foreach ($this->bootmenuentrylist[$bootmenu->getID()] as $bootmenuentry): ?> <?php $bootos = $this->bootosmapper->find($bootmenuentry->getBootosID());?> <?php $config = $this->configmapper->find($bootmenuentry->getConfigID());?> - <tr><td></td> + <tr> <td><?php echo $this->escape($bootmenuentry->getID()); ?></td> <td><?php echo $this->escape($bootmenuentry->getTitle()); ?></td> <!--<td><?php echo $this->escape($bootmenuentry->getBootmenuID()); ?></td> |