diff options
| -rw-r--r-- | application/layouts/default.phtml | 19 | ||||
| -rw-r--r-- | application/modules/dev/layouts/dev.phtml | 19 | ||||
| -rw-r--r-- | application/modules/fbgui/controllers/IndexController.php | 2 | ||||
| -rw-r--r-- | application/modules/fbgui/layouts/fbgui.phtml | 17 | ||||
| -rw-r--r-- | application/modules/user/controllers/FilterController.php | 3 | ||||
| -rw-r--r-- | application/modules/user/layouts/user.phtml | 17 | ||||
| -rw-r--r-- | library/Pbs/Graph.php | 2 | ||||
| -rw-r--r-- | public/media/css/style.css | 24 | ||||
| -rw-r--r-- | public/media/img/sub-logo-small-transparent.gif | bin | 0 -> 1591 bytes |
9 files changed, 53 insertions, 50 deletions
diff --git a/application/layouts/default.phtml b/application/layouts/default.phtml index 463be5d..86c4155 100644 --- a/application/layouts/default.phtml +++ b/application/layouts/default.phtml @@ -44,15 +44,16 @@ echo $this->headScript()."\n"; <div id="content"> <?php echo $this->layout()->content; ?> </div> -</div> - -<div id="footer" class="footer flexbox flex"> - <div style='padding:5px;'> - <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();">display Debug</a> // - <i>last edit: <?php echo date("m\/Y",filectime('index.php'));?></i> // - <i>version: 0.1.1</i> - </div> -</div> + + <div id="footer" class="footer flexbox flex"> + <div style='padding:5px;'> + <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();">display Debug</a> // + <i>last edit: <?php echo date("m\/Y",filectime('index.php'));?></i> // + <i>version: 0.1.1</i> + </div> + </div> +</div> + <div id='debug'> <div class='v1'> <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();"> diff --git a/application/modules/dev/layouts/dev.phtml b/application/modules/dev/layouts/dev.phtml index 29b5306..b9bd27a 100644 --- a/application/modules/dev/layouts/dev.phtml +++ b/application/modules/dev/layouts/dev.phtml @@ -70,15 +70,16 @@ echo $this->headScript()."\n"; <div id="content"> <?php echo $this->layout()->content; ?> </div> -</div> - -<div id="footer" class="footer flexbox flex"> - <div style='padding:5px;'> - <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();">display Debug</a> // - <i>last edit: <?php echo date("m\/Y",filectime('index.php'));?></i> // - <i>version: 0.1.1</i> - </div> -</div> + + <div id="footer" class="footer flexbox flex"> + <div style='padding:5px;'> + <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();">display Debug</a> // + <i>last edit: <?php echo date("m\/Y",filectime('index.php'));?></i> // + <i>version: 0.1.1</i> + </div> + </div> +</div> + <div id='debug'> <div class='v1'> <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();"> diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php index 809ecae..c70386f 100644 --- a/application/modules/fbgui/controllers/IndexController.php +++ b/application/modules/fbgui/controllers/IndexController.php @@ -76,7 +76,7 @@ class Fbgui_IndexController extends Zend_Controller_Action } } else{ - echo "<h1>Not Welcome</h1>"; + echo "<h1>Not Welcome</h1>"; } } diff --git a/application/modules/fbgui/layouts/fbgui.phtml b/application/modules/fbgui/layouts/fbgui.phtml index 7bb59fa..09f2f9d 100644 --- a/application/modules/fbgui/layouts/fbgui.phtml +++ b/application/modules/fbgui/layouts/fbgui.phtml @@ -49,15 +49,16 @@ echo $this->headScript()."\n"; <div id="content"> <?php echo $this->layout()->content; ?> </div> + + <div id="footer" class="footer flexbox flex"> + <div style='padding:5px;'> + <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();">display Debug</a> // + <i>last edit: <?php echo date("m\/Y",filectime('index.php'));?></i> // + <i>version: 0.1.1</i> + </div> + </div> </div> - -<div id="footer" class="footer flexbox flex"> - <div style='padding:5px;'> - <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();">display Debug</a> // - <i>last edit: <?php echo date("m\/Y",filectime('index.php'));?></i> // - <i>version: 0.1.1</i> - </div> -</div> + <div id='debug'> <div class='v1'> <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();"> diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php index 70aa60b..ad69ce9 100644 --- a/application/modules/user/controllers/FilterController.php +++ b/application/modules/user/controllers/FilterController.php @@ -171,10 +171,9 @@ class User_FilterController extends Zend_Controller_Action $filtermapper->find($this->_request->getParam('filterID'),$DBfilterentry); $compareresult = $filtermapper->compare($newfilterentry,$DBfilterentry); - print_a($compareresult); if(isset($compareresult['priority']) && count($compareresult) == 1){ $filtermapper->save($newfilterentry); - #$this->_redirect('/user/filter/index/modifyresult/ok'); + $this->_redirect('/user/filter/index/modifyresult/ok'); } else{ $this->_redirect('/user/filter/index/modifyresult/forbidden'); diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml index c7f54dc..b8ab8a7 100644 --- a/application/modules/user/layouts/user.phtml +++ b/application/modules/user/layouts/user.phtml @@ -68,15 +68,16 @@ echo $this->headScript()."\n"; <div id="content"> <?php echo $this->layout()->content; ?> </div> + + <div id="footer" class="footer flexbox flex"> + <div style='padding:5px;'> + <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();">display Debug</a> // + <i>last edit: <?php echo date("m\/Y",filectime('index.php'));?></i> // + <i>version: 0.1.1</i> + </div> + </div> </div> - -<div id="footer" class="footer flexbox flex"> - <div style='padding:5px;'> - <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();">display Debug</a> // - <i>last edit: <?php echo date("m\/Y",filectime('index.php'));?></i> // - <i>version: 0.1.1</i> - </div> -</div> + <div id='debug'> <div class='v1'> <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();"> diff --git a/library/Pbs/Graph.php b/library/Pbs/Graph.php index fc21336..df36ac4 100644 --- a/library/Pbs/Graph.php +++ b/library/Pbs/Graph.php @@ -17,7 +17,7 @@ class Pbs_Graph{ size="5,5"; graph[ bgcolor=transparent ]; node [ style=filled fillcolor="#ffffffff" ]; - "'.$this->getGroupTitle($groupID).'" [ fontcolor="#ffffffff", style=filled, fillcolor="#003592FF"]; + "'.$this->getGroupTitle($groupID).'" [ fontcolor="#ffffffff", style=filled, fillcolor="#004A99FF"]; '; $this->getParentGroups($groupID); $this->getChildGroups($groupID); diff --git a/public/media/css/style.css b/public/media/css/style.css index 7e147d0..0cfb17a 100644 --- a/public/media/css/style.css +++ b/public/media/css/style.css @@ -40,15 +40,20 @@ body { #footer { margin: 0; - width: 1000px; clear: both; bottom: 0px; border-top: 1px solid #ccc; - background-color: #eee; + background-color: #004A99; text-align: right; font-size: 10.5px; - line-height: 16px; - color: #666; + line-height: 12px; + color: #FFF; +} +.footer { + text-align: right; + font-size: 10px; + font-family: Verdana, Arial; + padding: 5px 2px 5px 0px; } #main { @@ -58,13 +63,14 @@ body { #head-bg { height: 116px; - background-color: #003592; + background-color: #004A99; + } #head { height: 116px; background: url(/media/img/siegel-93x55.png) bottom left no-repeat, - url(/media/img/sub-logo-small.gif) bottom right no-repeat; + url(/media/img/sub-logo-small-transparent.gif) bottom right no-repeat; } #head h1,h2 { @@ -389,12 +395,6 @@ td.action img { font-weight: bold; } -.footer { - text-align: right; - font-size: 10px; - font-family: Verdana, Arial; - padding: 10px 0px 10px 0px; -} /* boxes */ .okbox,.warningbox,.errorbox,.infobox { diff --git a/public/media/img/sub-logo-small-transparent.gif b/public/media/img/sub-logo-small-transparent.gif Binary files differnew file mode 100644 index 0000000..6ac7b92 --- /dev/null +++ b/public/media/img/sub-logo-small-transparent.gif |
