summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/Bootstrap.php2
-rw-r--r--application/layouts/main.phtml20
-rw-r--r--application/views/scripts/bootiso/index.phtml1
-rw-r--r--application/views/scripts/bootmenu/index.phtml20
-rw-r--r--application/views/scripts/bootos/index.phtml1
-rw-r--r--application/views/scripts/client/index.phtml5
-rw-r--r--application/views/scripts/config/index.phtml1
-rw-r--r--application/views/scripts/filter/index.phtml13
-rw-r--r--application/views/scripts/pool/index.phtml20
-rw-r--r--application/views/scripts/session/index.phtml5
-rw-r--r--public/.htaccess3
-rw-r--r--public/media/css/style.css1
-rw-r--r--public/media/test1
13 files changed, 68 insertions, 25 deletions
diff --git a/application/Bootstrap.php b/application/Bootstrap.php
index 7f24b84..654499e 100644
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@@ -24,7 +24,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
$view->headMeta()->appendHttpEquiv('Content-Type', 'text/html;charset=utf-8');
$view->headLink()->appendStylesheet('/media/css/styles.css');
$view->headTitle()->setSeparator(' - ');
- $view->headTitle('pbs2');
+ $view->headTitle('pbs²');
}
}
function print_a(){
diff --git a/application/layouts/main.phtml b/application/layouts/main.phtml
index 4a3ba7f..4efe394 100644
--- a/application/layouts/main.phtml
+++ b/application/layouts/main.phtml
@@ -14,7 +14,20 @@ echo $this->headScript();
html{background-color:#E5F3FF}
#wrapper{width:800px;margin:10px auto;border:1px solid black;background-color:#FFF;}
#innerwrapper{padding:20px;font-family:verdana, arial;}
- #nav{border-bottom:1px solid #000;background-color:#CCE7FF;padding:5px 10px;}
+ #logo{text-align:center;font-family:Verdana,Arial;font-size:3em;font-weight:bold;padding:5px;height:1.5em;
+ background-image: -webkit-gradient(
+ linear,
+ left bottom,
+ left top,
+ color-stop(0, rgb(204,231,255)),
+ color-stop(1, rgb(179,220,255))
+);
+background-image: -moz-linear-gradient(
+ center bottom,
+ rgb(204,231,255) 0%,
+ rgb(179,220,255) 100%
+);}
+ #nav{border-bottom:1px solid #000;border-top:1px solid #000;background-color:#CCE7FF;padding:5px 10px;}
#nav ul {margin:2px;}
#nav li{ display: inline;list-style-type: none;padding-right: 10px;font-family:verdana;font-size:12px;}
#nav li a{color:#000;}
@@ -28,11 +41,16 @@ echo $this->headScript();
dl.zend_form dt{width:120px;float:left;font-family:verdana, arial;font-size:12px;}
dl.zend_form dd{margin-left:120px;}
dl.zend_form dd *{font-size:12px;}
+ tr.entry{background-color:#FFF5CC;}
+ tr.detail>td{border:none;}
+ tr.detail table tr td{background-color:#E2EFE1;}
+
</style>
</head>
<body>
<div id='wrapper'>
+ <div id='logo'>pbs<sup style='font-size:0.7em;'>2</sup></div>
<div id='nav'>
<ul>
<li>Controller:</li>
diff --git a/application/views/scripts/bootiso/index.phtml b/application/views/scripts/bootiso/index.phtml
index f529ff3..5b766a6 100644
--- a/application/views/scripts/bootiso/index.phtml
+++ b/application/views/scripts/bootiso/index.phtml
@@ -13,6 +13,7 @@
<th>Created</th>
<th>Expires</th>
<th>Public</th>
+ <th colspan=2>Actions</th>
</tr>
<?php foreach ($this->bootisolist as $bootiso): ?>
<tr class=entry>
diff --git a/application/views/scripts/bootmenu/index.phtml b/application/views/scripts/bootmenu/index.phtml
index 70bb134..7e3a92e 100644
--- a/application/views/scripts/bootmenu/index.phtml
+++ b/application/views/scripts/bootmenu/index.phtml
@@ -11,9 +11,10 @@
<th>GroupID</th>
<th>MembershipID</th>
<th>Changed</th>
+ <th colspan=3>Actions</th>
</tr>
<?php foreach ($this->bootmenulist as $bootmenu): ?>
- <tr class=bootmenu>
+ <tr class=entry>
<td><?php echo $this->escape($bootmenu->getID()); ?></td>
<td><?php echo $this->escape($bootmenu->getTitle()); ?></td>
<td><?php echo $this->escape($bootmenu->getGroupID()); ?></td>
@@ -45,18 +46,23 @@
'default',
true) ?>">Add Entry</a></td>
</tr>
- <tr>
- <th></th>
+<?php if(count($this->bootmenuentrylist[$bootmenu->getID()]) > 0):?>
+ <tr class=detail>
+ <td></td>
+ <td colspan=7>
+ <table>
+ <tr>
<th>ID</th>
<th>Title</th>
<!-- <th>BootmenuID</th>-->
<th>BootOSID</th>
<th>kcl</th>
<th>ConfigID</th>
- <th>order</th>
+ <th>order</th>
+ <th colspan=2>Actions</th>
</tr>
<?php foreach ($this->bootmenuentrylist[$bootmenu->getID()] as $bootmenuentry): ?>
- <tr class=bootentry><td class=nostyle></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>
@@ -85,6 +91,10 @@
true) ?>">Remove Entry</a></td>
</tr>
<?php endforeach; ?>
+ </table>
+ </td>
+ </tr>
+ <?php endif; ?>
<?php endforeach; ?>
</table>
diff --git a/application/views/scripts/bootos/index.phtml b/application/views/scripts/bootos/index.phtml
index fefd219..fd3e8cb 100644
--- a/application/views/scripts/bootos/index.phtml
+++ b/application/views/scripts/bootos/index.phtml
@@ -17,6 +17,7 @@
<th>Changed</th>
<th>Expires</th>
<th>Public</th>
+ <th colspan=2>Actions</th>
</tr>
<?php foreach ($this->bootoslist as $bootos): ?>
<tr class=entry>
diff --git a/application/views/scripts/client/index.phtml b/application/views/scripts/client/index.phtml
index e9de06b..9ef344b 100644
--- a/application/views/scripts/client/index.phtml
+++ b/application/views/scripts/client/index.phtml
@@ -6,12 +6,13 @@
<?php if ($this->clients): ?>
<table>
<tr>
- <th>clientID</th>
+ <th>ID</th>
<th>MAC</th>
<th>Hardwarehash</th>
+ <th colspan=2>Actions</th>
</tr>
<?php foreach ($this->clients as $client): ?>
- <tr class='client'>
+ <tr class=entry>
<td><?php echo $this->escape($client->getID()) ?></td>
<td class='monospace'><?php echo $this->escape($client->getMacadress()) ?></td>
<td class='monospace'><?php echo $this->escape($client->getHardwarehash()) ?></td>
diff --git a/application/views/scripts/config/index.phtml b/application/views/scripts/config/index.phtml
index 62ab1d4..3e220a0 100644
--- a/application/views/scripts/config/index.phtml
+++ b/application/views/scripts/config/index.phtml
@@ -11,6 +11,7 @@
<th>MembershipID</th>
<th>Shellscript</th>
<th>Changed</th>
+ <th colspan=2>Actions</th>
</tr>
<?php foreach ($this->configlist as $config): ?>
<tr class=entry>
diff --git a/application/views/scripts/filter/index.phtml b/application/views/scripts/filter/index.phtml
index 0de30a0..253d14d 100644
--- a/application/views/scripts/filter/index.phtml
+++ b/application/views/scripts/filter/index.phtml
@@ -6,13 +6,14 @@
<?php if ($this->filters): ?>
<table>
<tr>
- <th>filterID</th>
+ <th>ID</th>
<th>Title</th>
<th>Priority</th>
<th>TargetBootMenu</th>
+ <th colspan=3>Actions</th>
</tr>
<?php foreach ($this->filters as $filter): ?>
- <tr class='filter'>
+ <tr class='entry'>
<td><?php echo $this->escape($filter->getID()) ?></td>
<td><?php echo $this->escape($filter->title) ?></td>
<td><?php echo $this->escape($filter->priority) ?></td>
@@ -42,20 +43,22 @@
'default',
true) ?>">add filterentry</a></td>
</tr>
- <tr><td></td>
+ <tr class=detail>
+ <td></td>
<td colspan=6>
<?php
$fe = new Application_Model_FilterEntriesMapper();
# print_a($erg = $fe->findBy('filterID',$filter->getID()));
$erg = $fe->findBy('filterID',$filter->getID());
?>
- <table style='width:100%;'>
+ <table>
<tr>
<th>Filtertype</th>
<th>Value</th>
<th>Value2</th>
+ <th colspan=2>Actions</th>
</tr>
- <?php foreach ($erg as $filterentry): ?>
+ <?php foreach ($erg as $filterentry): ?>
<tr>
<td><?php
diff --git a/application/views/scripts/pool/index.phtml b/application/views/scripts/pool/index.phtml
index 2df3e52..68fcbc4 100644
--- a/application/views/scripts/pool/index.phtml
+++ b/application/views/scripts/pool/index.phtml
@@ -6,13 +6,14 @@
<?php if ($this->pools): ?>
<table >
<tr>
- <th>poolID</th>
+ <th>ID</th>
<th>Title</th>
<th>Description</th>
<th>Location</th>
+ <th colspan=3>Actions</th>
</tr>
<?php foreach ($this->pools as $pool): ?>
- <tr class='pool'>
+ <tr class=entry>
<td><?php echo $this->escape($pool->getID()) ?></td>
<td><?php echo $this->escape($pool->getTitle()) ?></td>
<td><?php echo $this->escape($pool->getDescription()) ?></td>
@@ -42,14 +43,15 @@
'default',
true) ?>">link client</a></td>
</tr>
- <tr>
- <td>
- </td>
- <td colspan=6><table>
+ <tr class=detail>
+ <td></td>
+ <td colspan=6>
+ <table>
<tr>
- <th>clientID</th>
- <th>mac</th>
- <th>hardwarehash</th>
+ <th>ClientID</th>
+ <th>Mac</th>
+ <th>Hardwarehash</th>
+ <th>Actions</th>
</tr>
<?php
$poolentriesMapper = new Application_Model_PoolEntriesMapper();
diff --git a/application/views/scripts/session/index.phtml b/application/views/scripts/session/index.phtml
index 1d2506b..f98fa48 100644
--- a/application/views/scripts/session/index.phtml
+++ b/application/views/scripts/session/index.phtml
@@ -4,16 +4,17 @@
'class' => 'addbutton'))?>
<table>
<tr>
- <th>SessionID</th>
+ <th>ID</th>
<th>ClientID</th>
<th>BootosID</th>
<th>BootIsoID</th>
<th>Time</th>
<th>IP</th>
<th>IPv6</th>
+ <th colspan=2>Actions</th>
</tr>
<?php foreach ($this->sessions as $session): ?>
- <tr>
+ <tr class=entry>
<td><?php echo $this->escape($session->getID()) ?></td>
<td><?php echo $this->escape($session->getClientID()) ?></td>
<td><?php echo $this->escape($session->getBootosID()) ?></td>
diff --git a/public/.htaccess b/public/.htaccess
index 7fb009b..3f7bfd7 100644
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -1,5 +1,8 @@
RewriteEngine On
+
+RewriteRule ^(media) - [GL]
+
RewriteCond %{REQUEST_FILENAME} -s [OR]
RewriteCond %{REQUEST_FILENAME} -l [OR]
RewriteCond %{REQUEST_FILENAME} -d
diff --git a/public/media/css/style.css b/public/media/css/style.css
new file mode 100644
index 0000000..36a587d
--- /dev/null
+++ b/public/media/css/style.css
@@ -0,0 +1 @@
+crappo
diff --git a/public/media/test b/public/media/test
new file mode 100644
index 0000000..9daeafb
--- /dev/null
+++ b/public/media/test
@@ -0,0 +1 @@
+test