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

Some navbar and page title fixes

This commit is contained in:
Albert Santoni 2015-08-18 17:52:23 -04:00
parent a84c33f0ed
commit 2c443bd27a
6 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/configs/navigation.php
View File

@ -30,7 +30,7 @@ $pages = array(
'controller' => 'preference',
'pages' => array(
array(
'label' => _('Preferences'),
'label' => _('General'),
'module' => 'default',
'controller' => 'Preference'
),

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

@ -120,8 +120,8 @@
<div class="wrapper" id="content">
<div id="sub-menu">
<?php //parent_page is passed in from controller
echo $this->layout()->parent_page; ?>
<h3><?php //parent_page is passed in from controller
echo $this->layout()->parent_page; ?></h3>
<hr>
<?php
$page = $this->navigation()->findOneBy('label', $this->layout()->parent_page);

1
airtime_mvc/application/views/scripts/playouthistory/index.phtml
View File

@ -1,4 +1,5 @@
<div id="history_content" class="ui-widget ui-widget-content block-shadow alpha-block padded">
<h2><?php echo(_("Playout History"));?></h2>
<?php echo $this->date_form; ?>
<div id="his-tabs">

3
airtime_mvc/application/views/scripts/playouthistorytemplate/index.phtml
View File

@ -1,6 +1,7 @@
<div id="history_template" class="ui-widget ui-widget-content block-shadow alpha-block padded-strong">
<div>
<h2><?php echo(_("Playout History Templates"));?></h2>
<div><h4><?php echo _("Log Sheet Templates") ?></h4></div>
<button id="new_item_template" class="btn"><?php echo _("New Log Sheet Template") ?></button>
<ul id="template_list">

2
airtime_mvc/application/views/scripts/preference/index.phtml
View File

@ -1,5 +1,5 @@
<div class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong preferences">
<h2 style="float:left"><?php echo _("Preferences") ?></h2>
<h2 style="float:left"><?php echo _("General") ?></h2>
<?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
<form method="post" id="pref_form" enctype="multipart/form-data">

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

@ -3610,6 +3610,10 @@ button.btn-icon-text > i.icon-white {
padding: 10px;
}
#sub-menu h3 {
padding: 0px;
}
#sub-menu .navigation {
list-style: none;
padding-left: 0px;
@ -3646,3 +3650,9 @@ button.btn-icon-text > i.icon-white {
height: 19px;
margin-top: -2px;
}
hr {
border: 0;
height: 1px;
background: rgba(255,255,255,0.2);
}