diff options
| author | Simon | 2011-03-28 12:09:01 +0200 |
|---|---|---|
| committer | Simon | 2011-03-28 12:09:01 +0200 |
| commit | 3136e350dad1b093fd000c902bf88af9bf59073e (patch) | |
| tree | 5efd802dac2dd0807b07bf1e11dc7ef338cb370c | |
| parent | Filter anders gelöst, fbgui startbutton geändert (diff) | |
| download | pbs2-3136e350dad1b093fd000c902bf88af9bf59073e.tar.gz pbs2-3136e350dad1b093fd000c902bf88af9bf59073e.tar.xz pbs2-3136e350dad1b093fd000c902bf88af9bf59073e.zip | |
Navigation und fbgui angepasst
| -rw-r--r-- | application/modules/fbgui/controllers/IndexController.php | 1 | ||||
| -rw-r--r-- | application/modules/fbgui/layouts/fbgui.phtml | 2 | ||||
| -rw-r--r-- | application/modules/fbgui/views/scripts/index/index.phtml | 9 | ||||
| -rw-r--r-- | public/media/css/dev.css | 0 | ||||
| -rw-r--r-- | public/media/css/fbgui.css | 4 | ||||
| -rw-r--r-- | public/media/css/style.css | 2 | ||||
| -rw-r--r-- | public/media/img/iconset | 8 |
7 files changed, 16 insertions, 10 deletions
diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php index c66a3f5..809ecae 100644 --- a/application/modules/fbgui/controllers/IndexController.php +++ b/application/modules/fbgui/controllers/IndexController.php @@ -72,6 +72,7 @@ class Fbgui_IndexController extends Zend_Controller_Action 'Your alphasessionID is '.$session->getAlphasessionID(), 'Your client is '.$session->getClientID(), 'there is no bootmenu for you'); + echo "<a href='/fbgui/auth/login/'>Goto Login to get a Bootmenu</a>"; } } else{ diff --git a/application/modules/fbgui/layouts/fbgui.phtml b/application/modules/fbgui/layouts/fbgui.phtml index 3e20794..7bb59fa 100644 --- a/application/modules/fbgui/layouts/fbgui.phtml +++ b/application/modules/fbgui/layouts/fbgui.phtml @@ -20,7 +20,7 @@ echo $this->headScript()."\n"; <body> <div id='sidepannel'> <div id="logo"><div id="logo-bar-gray"></div></div> - <div id="sidepannel-top"> + <div id="sidepannel-top"> <!-- <h1><a href=/><</a> <a href=/fbgui/>fbgui</a></h1> --> <!-- <ul> <li> diff --git a/application/modules/fbgui/views/scripts/index/index.phtml b/application/modules/fbgui/views/scripts/index/index.phtml index 4ed489c..cfd5e6d 100644 --- a/application/modules/fbgui/views/scripts/index/index.phtml +++ b/application/modules/fbgui/views/scripts/index/index.phtml @@ -23,20 +23,19 @@ $bootosMapper = new Application_Model_BootOsMapper(); $bootos = new Application_Model_BootOs(); $bootos = $bootosMapper->find($entry->getBootosID()); - #print_a($entry->getBootosID(),$bootos); ?> <div id="menu_item_1" class="menu" class="flexbox"> - <img src="/media/img/os/ubuntu.png"/> + <img src="/media/img/os/ubuntu.png" /> <h2><?php echo $entry->getTitle(); ?></h2> - <i><?php echo $bootos->getTitle();?></i> - <p><?php echo $bootos->getDescription();?></p> + <i>BootOs-Name: <?php echo $bootos->getTitle();?></i> + <p>Description: <?php echo $bootos->getDescription();?></p> <input type="hidden" class="id" value="<?php echo $entry->getID();?>"/> </div> <?php endforeach; ?> <input style="display:none;" type='text' id="selectedBootOs" /> - <button style='cursor:pointer;float:right;' onClick="start();"> + <button style='cursor:pointer;float:right;margin-top:10px;' onClick="start();"> <img id='startball' style='vertical-align:-3px;' src='/media/img/button-red.png'> <span style='font-size:14px;'>Start System</span> </button> diff --git a/public/media/css/dev.css b/public/media/css/dev.css new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/public/media/css/dev.css diff --git a/public/media/css/fbgui.css b/public/media/css/fbgui.css index 81f2448..ceae559 100644 --- a/public/media/css/fbgui.css +++ b/public/media/css/fbgui.css @@ -6,13 +6,13 @@ div.menu>img { float: left; - margin-right: 10px; + margin: 5px 10px 5px 5px; } .menu h2 { color:#000033; text-align:left !important; - display:inline; + display:block; font-size:14px; } diff --git a/public/media/css/style.css b/public/media/css/style.css index 6a66eb1..49cb1f7 100644 --- a/public/media/css/style.css +++ b/public/media/css/style.css @@ -135,7 +135,7 @@ body { /* ###################################################### */ .portletNavigationTree { - width: 180px; + width: 160px; padding: 0; margin: 0 0 21px 0; background-color: #ffffff; diff --git a/public/media/img/iconset b/public/media/img/iconset index fd47af8..720af80 100644 --- a/public/media/img/iconset +++ b/public/media/img/iconset @@ -1 +1,7 @@ -http://www.iconfinder.com/search/1/?q=iconset:diagona +icons + http://www.iconfinder.com/search/1/?q=iconset:diagona + http://creativecommons.org/licenses/by/3.0/ + +buttons + http://www.iconfinder.com/search/?q=iconset:vector_social_media_icons + http://creativecommons.org/licenses/by-sa/3.0/ |