diff options
| author | Simon | 2011-03-09 12:34:15 +0100 |
|---|---|---|
| committer | Simon | 2011-03-09 12:34:15 +0100 |
| commit | 0f9439ca9131a01844f5df8c37af1c51f07e376a (patch) | |
| tree | bd075afff5fa4c20db54e7c9a443e0d2b5f93e61 /application | |
| parent | Merge gefixxt (diff) | |
| download | pbs2-0f9439ca9131a01844f5df8c37af1c51f07e376a.tar.gz pbs2-0f9439ca9131a01844f5df8c37af1c51f07e376a.tar.xz pbs2-0f9439ca9131a01844f5df8c37af1c51f07e376a.zip | |
styles hinzugefügt
Diffstat (limited to 'application')
| -rw-r--r-- | application/Bootstrap.php | 8 | ||||
| -rw-r--r-- | application/layouts/main.phtml | 46 | ||||
| -rw-r--r-- | application/views/scripts/bootmenu/index.phtml | 5 |
3 files changed, 11 insertions, 48 deletions
diff --git a/application/Bootstrap.php b/application/Bootstrap.php index 654499e..c286ad1 100644 --- a/application/Bootstrap.php +++ b/application/Bootstrap.php @@ -11,8 +11,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $this->bootstrap('View'); $view = $this->getResource('View'); $view->doctype('XHTML1_STRICT'); - $view->headTitle('pbs2') - ->setSeparator(' :: '); + } function _initViewHelpers() { @@ -22,9 +21,10 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $view->doctype('XHTML1_STRICT'); $view->headMeta()->appendHttpEquiv('Content-Type', 'text/html;charset=utf-8'); - $view->headLink()->appendStylesheet('/media/css/styles.css'); + $view->headLink()->appendStylesheet('/media/css/style.css'); $view->headTitle()->setSeparator(' - '); - $view->headTitle('pbs²'); + $view->headTitle('pbs²') + ->setSeparator(' :: '); } } function print_a(){ diff --git a/application/layouts/main.phtml b/application/layouts/main.phtml index 4efe394..3d95f2f 100644 --- a/application/layouts/main.phtml +++ b/application/layouts/main.phtml @@ -4,49 +4,13 @@ <head> <?php -echo $this->headTitle(); -echo $this->headMeta(); -echo $this->headStyle(); -echo $this->headLink(); -echo $this->headScript(); +echo $this->headTitle()."\n"; +echo $this->headMeta()."\n"; +echo $this->headStyle()."\n"; +echo $this->headLink()."\n"; +echo $this->headScript()."\n"; ?> -<style> - html{background-color:#E5F3FF} - #wrapper{width:800px;margin:10px auto;border:1px solid black;background-color:#FFF;} - #innerwrapper{padding:20px;font-family:verdana, arial;} - #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;} - h1{display:block;width:400px;margin:5px auto;text-align:center;} - table{width:100%;} - th{font-size:12px;border:1px solid #999;} - td{font-size:12px;border:1px solid #CCC;} - .addbutton{float:right;} - .monospace{font-family:Courier New, monospace;} - - 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'> diff --git a/application/views/scripts/bootmenu/index.phtml b/application/views/scripts/bootmenu/index.phtml index f54f085..019a799 100644 --- a/application/views/scripts/bootmenu/index.phtml +++ b/application/views/scripts/bootmenu/index.phtml @@ -48,14 +48,13 @@ '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> - <th></th> <th>ID</th> <th>Title</th> @@ -71,7 +70,7 @@ <?php foreach ($this->bootmenuentrylist[$bootmenu->getID()] as $bootmenuentry): ?> <?php $bootos = $this->bootosmapper->find($bootmenuentry->getBootosID());?> <?php $config = $this->configmapper->find($bootmenuentry->getConfigID());?> - <tr><td></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> |