summaryrefslogtreecommitdiffstats
path: root/application/modules/user/views/scripts
diff options
context:
space:
mode:
authorSimon2011-04-21 17:13:59 +0200
committerSimon2011-04-21 17:13:59 +0200
commit851c7a2f0975f809c4ee603c902548180f55d0f1 (patch)
tree3b4f38af347660780910616260321e02d6880754 /application/modules/user/views/scripts
parentKleine Änderungen (diff)
parentcleanup (diff)
downloadpbs2-851c7a2f0975f809c4ee603c902548180f55d0f1.tar.gz
pbs2-851c7a2f0975f809c4ee603c902548180f55d0f1.tar.xz
pbs2-851c7a2f0975f809c4ee603c902548180f55d0f1.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user/views/scripts')
-rw-r--r--application/modules/user/views/scripts/bootos/index.phtml6
-rw-r--r--application/modules/user/views/scripts/preboot/index.phtml1
2 files changed, 1 insertions, 6 deletions
diff --git a/application/modules/user/views/scripts/bootos/index.phtml b/application/modules/user/views/scripts/bootos/index.phtml
index c0f201e..c39ac05 100644
--- a/application/modules/user/views/scripts/bootos/index.phtml
+++ b/application/modules/user/views/scripts/bootos/index.phtml
@@ -100,12 +100,6 @@
<?php if(Pbs_Acl::checkRight('boai')): ?>
<label>BootosID</label>
<div class='item'><?php echo $this->escape($bootos->getID()); ?>&nbsp;</div>
- <label>initPath</label>
- <div class='item'><?php echo $this->escape($bootos->getPath_init()); ?>&nbsp;</div>
- <label>kernelPath</label>
- <div class='item'><?php echo $this->escape($bootos->getPath_kernel()); ?>&nbsp;</div>
- <label>configPath</label>
- <div class='item'><?php echo $this->escape($bootos->getPath_config()); ?>&nbsp;</div>
<label>Default KCL</label>
<div class='item'><?php echo $this->escape($bootos->getDefaultkcl()); ?>&nbsp;</div>
<label>Source</label>
diff --git a/application/modules/user/views/scripts/preboot/index.phtml b/application/modules/user/views/scripts/preboot/index.phtml
index b714b75..415db2e 100644
--- a/application/modules/user/views/scripts/preboot/index.phtml
+++ b/application/modules/user/views/scripts/preboot/index.phtml
@@ -52,6 +52,7 @@
<?php endif; ?>
</div>
<div class='title'><?php echo $this->escape($preboot->getTitle()); ?></div>
+ <div class='subtitle'><?php echo $this->escape($preboot->getDescription()); ?></div>
<div class='details'>
<label>PrebootID</label>
<div class='item'><?php echo $this->escape($preboot->getID()); ?></div>