summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon2011-03-12 16:19:13 +0100
committerSimon2011-03-12 16:19:13 +0100
commitce03c3beb219c803e4c1ab7f1cd34768843f2b29 (patch)
tree8fc46115818a62a161ac5f9706d7cbd28f6c39b3
parentlayout geƤndert (diff)
downloadpbs2-ce03c3beb219c803e4c1ab7f1cd34768843f2b29.tar.gz
pbs2-ce03c3beb219c803e4c1ab7f1cd34768843f2b29.tar.xz
pbs2-ce03c3beb219c803e4c1ab7f1cd34768843f2b29.zip
sql korrigiert, layout angepasst, .htaccess angepasst
-rw-r--r--application/layouts/main.phtml15
-rw-r--r--pbs.sql10
-rw-r--r--public/.htaccess1
-rw-r--r--public/media/css/style.css7
4 files changed, 20 insertions, 13 deletions
diff --git a/application/layouts/main.phtml b/application/layouts/main.phtml
index f870566..525de9e 100644
--- a/application/layouts/main.phtml
+++ b/application/layouts/main.phtml
@@ -61,8 +61,10 @@ echo $this->headScript()."\n";
</div>
</div>
<div id="logo-bar-red"></div>
- <div id="head-titlebar">
- Name des Controllers
+ <div id="head-titlebar">
+ <?php
+ echo ucwords($request->getControllerName()) . " > " . ucwords($request->getActionName());
+ ?>
</div>
<div id="content">
<?php echo $this->layout()->content; ?>
@@ -70,8 +72,11 @@ echo $this->headScript()."\n";
</div>
<div id="footer" class="footer flexbox flex">
- <div style='padding:5px;'> <i>last edit: 03/2011 // version: 0.1.1</i>
-</div>
-
+ <div style='padding:5px;'>
+ <a onclick="$('#debug').slideToggle();">display Debug</a> // <i>last edit: <?php echo date("m\/Y",filectime('index.php'));?> // version: 0.1.1</i>
+ </div>
+</div>
+<div id='debug'>
+<?php print_a('Session',$_SESSION,'GET',$_GET,'POST',$_POST); ?>
</body>
</html>
diff --git a/pbs.sql b/pbs.sql
index 15d8fe3..9a14bb2 100644
--- a/pbs.sql
+++ b/pbs.sql
@@ -235,10 +235,7 @@ CREATE TABLE IF NOT EXISTS `pbs_pool` (
CREATE TABLE IF NOT EXISTS `pbs_poolentries` (
`poolID` int(11) NOT NULL,
- `clientID` int(11) NOT NULL,
- PRIMARY KEY (`poolID`,`clientID`),
- KEY `poolID` (`poolID`),
- KEY `clientID` (`clientID`)
+ `clientID` int(11) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
ALTER TABLE `pbs_poolentries` ADD `poolentriesID` INT NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST;
@@ -300,10 +297,7 @@ CREATE TABLE IF NOT EXISTS `pbs_filterentries` (
`filterID` int(11) NOT NULL,
`filtertypeID` int(11) NOT NULL,
`filtervalue` varchar(140) NOT NULL,
- `filtervalue2` varchar(140) NOT NULL,
- PRIMARY KEY (`filterID`,`filtertypeID`),
- KEY `filterID` (`filterID`),
- KEY `filtertypeID` (`filtertypeID`)
+ `filtervalue2` varchar(140) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
ALTER TABLE `pbs_filterentries` ADD `filterentriesID` INT NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST;
diff --git a/public/.htaccess b/public/.htaccess
index 27c7eea..bafabf4 100644
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -1,6 +1,7 @@
Deny from all
Allow from 132.230.0.0/255.255.0.0
Allow from 127.0.0.0/255.0.0.0
+Allow from 192.168.0.0/255.255.0.0
RewriteEngine On
diff --git a/public/media/css/style.css b/public/media/css/style.css
index 6c749bb..08d3f29 100644
--- a/public/media/css/style.css
+++ b/public/media/css/style.css
@@ -118,6 +118,13 @@ body{font-family:sans,arial;
padding: 10px;
font-size:13px;
}
+#debug{
+ text-align:left;
+ position:absolute;
+ top:0px; right:0px;
+ width:400px;
+ display:none;
+}
/* ###################################################### */
#nav {