Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More navbar and submenu layout fixes

This commit is contained in:
Albert Santoni 2015-08-18 17:13:17 -04:00
parent 1f8e8f85b9
commit a04f5afcbd
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
View File

@ -121,15 +121,16 @@
<div class="wrapper" id="content"> <div class="wrapper" id="content">
<div id="sub-menu"> <div id="sub-menu">
<?php //parent_page is passed in from controller <?php //parent_page is passed in from controller
echo $this->layout()->parent_page; ?> echo $this->layout()->parent_page; ?>
<hr> <hr>
<?php <?php
$page = $this->navigation()->findOneBy('label', $this->layout()->parent_page); $page = $this->navigation()->findOneBy('label', $this->layout()->parent_page);
echo $this->navigation()->menu()->renderMenu($page); echo $this->navigation()->menu()->renderMenu($page);
?> ?>
</div> </div>
<div style="width:87%"> <div>
<?php echo $this->layout()->content ?></div> <?php echo $this->layout()->content ?>
</div>
</div> </div>
<script id="tmpl-pl-cues" type="text/template"> <script id="tmpl-pl-cues" type="text/template">

1
airtime_mvc/application/views/scripts/preference/stream-setting.phtml
View File

@ -114,6 +114,7 @@
?> ?>
</fieldset> </fieldset>
<br /> <br />
<div style="clear: both"></div>
<button name="stream_save" id="stream_save_bottom" type="button" class="btn btn-small right-floated"><?php echo _("Save") ?></button> <button name="stream_save" id="stream_save_bottom" type="button" class="btn btn-small right-floated"><?php echo _("Save") ?></button>
</div> </div>
</form> </form>

8
airtime_mvc/public/css/pro_dropdown_3.css
View File

@ -26,11 +26,9 @@ way to fit your requirements.
} }
#nav li.top { #nav li.top {
/*margin:0 5px 0 0;*/ /*margin:0 5px 0 0;*/
padding: 10px;
padding-left: 0px;
} }
#nav li a.top_link { #nav li a.top_link {
padding: 10px; padding: 0px;
height:18px; height:18px;
color:#ccc; color:#ccc;
text-decoration:none; text-decoration:none;
@ -39,6 +37,9 @@ way to fit your requirements.
/*font-weight:bold;*/ /*font-weight:bold;*/
/*padding:4px 0 0 10px;*/ /*padding:4px 0 0 10px;*/
cursor:pointer; cursor:pointer;
display: block;
padding: 10px;
white-space: nowrap;
} }
#nav li a.top_link span { #nav li a.top_link span {
padding: 0 14px 0 0; padding: 0 14px 0 0;
@ -55,6 +56,7 @@ way to fit your requirements.
{ {
color: #fff; color: #fff;
background-color: #444; background-color: #444;
border-right: 2px solid #FF5D1A;
} }
#nav li:hover { #nav li:hover {

11
airtime_mvc/public/css/styles.css
View File

@ -1667,7 +1667,6 @@ h2#scheduled_playlist_name span {
/*---//////////////////// USERS ////////////////////---*/ /*---//////////////////// USERS ////////////////////---*/
.simple-formblock { .simple-formblock {
width: 30%;
} }
.simple-formblock dl, .simple-formblock dl.zend_form { .simple-formblock dl, .simple-formblock dl.zend_form {
@ -2335,7 +2334,7 @@ span.errors.sp-errors{
} }
.stream-config { .stream-config {
width: 85%; min-width: 800px;
} }
#stream_save_bottom { #stream_save_bottom {
@ -3513,6 +3512,7 @@ button.btn-icon-text > i.icon-white {
.media_type_selector.selected, .media_type_selector.selected a { .media_type_selector.selected, .media_type_selector.selected a {
color: #fff; color: #fff;
background-color: #444; background-color: #444;
border-right: 1px solid #FF5D1A;
-webkit-transition: color 0.1s linear; -webkit-transition: color 0.1s linear;
-moz-transition: color 0.1s linear; -moz-transition: color 0.1s linear;
-o-transition: color 0.1s linear; -o-transition: color 0.1s linear;
@ -3603,7 +3603,7 @@ button.btn-icon-text > i.icon-white {
} }
#sub-menu { #sub-menu {
width: 10%; width: 130px;
border-right: 1px solid #5b5b5b; border-right: 1px solid #5b5b5b;
font-size: 14px; font-size: 14px;
color: #cecece; color: #cecece;
@ -3624,6 +3624,11 @@ button.btn-icon-text > i.icon-white {
text-decoration: none; text-decoration: none;
} }
#sub-menu .navigation .active a {
color: #fff;
text-decoration: none;
}
#listenerstat_content { #listenerstat_content {
width: 100%; width: 100%;
} }