diff options
| author | Simon | 2011-03-09 12:20:55 +0100 |
|---|---|---|
| committer | Simon | 2011-03-09 12:20:55 +0100 |
| commit | 1ac1db9336fdfa2f32e775e390a3d9fdaa605c79 (patch) | |
| tree | bcb7fc97937b9db314b74903ffed61a1d75506ea /application/views/scripts | |
| parent | oberfläche verändert (diff) | |
| parent | ACHTUNG: Habe in einigen Mappern die find() Methode geändert, sie liefern je... (diff) | |
| download | pbs2-1ac1db9336fdfa2f32e775e390a3d9fdaa605c79.tar.gz pbs2-1ac1db9336fdfa2f32e775e390a3d9fdaa605c79.tar.xz pbs2-1ac1db9336fdfa2f32e775e390a3d9fdaa605c79.zip | |
Merge gefixxt
Diffstat (limited to 'application/views/scripts')
| -rw-r--r-- | application/views/scripts/bootiso/index.phtml | 2 | ||||
| -rw-r--r-- | application/views/scripts/bootmenu/index.phtml | 24 | ||||
| -rw-r--r-- | application/views/scripts/bootos/index.phtml | 2 | ||||
| -rw-r--r-- | application/views/scripts/config/index.phtml | 2 |
4 files changed, 23 insertions, 7 deletions
diff --git a/application/views/scripts/bootiso/index.phtml b/application/views/scripts/bootiso/index.phtml index 5b766a6..20de6a1 100644 --- a/application/views/scripts/bootiso/index.phtml +++ b/application/views/scripts/bootiso/index.phtml @@ -15,6 +15,8 @@ <th>Public</th> <th colspan=2>Actions</th> </tr> + <?php if(count($this->bootisolist)==0) + echo "</table> There are no BootISO's entries for the Bootmenuto display." ?> <?php foreach ($this->bootisolist as $bootiso): ?> <tr class=entry> <td><?php echo $this->escape($bootiso->getID()); ?></td> 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 @@ + diff --git a/application/views/scripts/bootos/index.phtml b/application/views/scripts/bootos/index.phtml index fd3e8cb..df4f072 100644 --- a/application/views/scripts/bootos/index.phtml +++ b/application/views/scripts/bootos/index.phtml @@ -19,6 +19,8 @@ <th>Public</th> <th colspan=2>Actions</th> </tr> + <?php if(count($this->bootoslist)==0) + echo "</table> There are no BootOs's to display." ?> <?php foreach ($this->bootoslist as $bootos): ?> <tr class=entry> <td><?php echo $this->escape($bootos->getID()); ?></td> diff --git a/application/views/scripts/config/index.phtml b/application/views/scripts/config/index.phtml index 3e220a0..6457d8f 100644 --- a/application/views/scripts/config/index.phtml +++ b/application/views/scripts/config/index.phtml @@ -13,6 +13,8 @@ <th>Changed</th> <th colspan=2>Actions</th> </tr> + <?php if(count($this->configlist)==0) + echo "</table> There are no Config's to display." ?> <?php foreach ($this->configlist as $config): ?> <tr class=entry> <td><?php echo $this->escape($config->getID()); ?></td> |