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

Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder

This commit is contained in:
Duncan Sommerville 2015-08-18 18:45:58 -04:00
parent 63f9403b11 95cfe463d5
commit 11652da40b
7 changed files with 24 additions and 7 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', 'controller' => 'preference',
'pages' => array( 'pages' => array(
array( array(
'label' => _('Preferences'), 'label' => _('General'),
'module' => 'default', 'module' => 'default',
'controller' => 'Preference' 'controller' => 'Preference'
), ),

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

@ -8,7 +8,7 @@
<?php echo isset($this->google_analytics)?$this->google_analytics:"" ?> <?php echo isset($this->google_analytics)?$this->google_analytics:"" ?>
<?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?> <?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
</head> </head>
<body> <body class="page-sub-menu">
<!-- Google Tag Manager --> <!-- Google Tag Manager -->
<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-55N6NH" <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-55N6NH"
height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
@ -120,8 +120,8 @@
<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 <h3><?php //parent_page is passed in from controller
echo $this->layout()->parent_page; ?> echo $this->layout()->parent_page; ?></h3>
<hr> <hr>
<?php <?php
$page = $this->navigation()->findOneBy('label', $this->layout()->parent_page); $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"> <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; ?> <?php echo $this->date_form; ?>
<div id="his-tabs"> <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 id="history_template" class="ui-widget ui-widget-content block-shadow alpha-block padded-strong">
<div> <div>
<h2><?php echo(_("Playout History Templates"));?></h2>
<div><h4><?php echo _("Log Sheet Templates") ?></h4></div> <div><h4><?php echo _("Log Sheet Templates") ?></h4></div>
<button id="new_item_template" class="btn"><?php echo _("New Log Sheet Template") ?></button> <button id="new_item_template" class="btn"><?php echo _("New Log Sheet Template") ?></button>
<ul id="template_list"> <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"> <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(); ?> <?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
<form method="post" id="pref_form" enctype="multipart/form-data"> <form method="post" id="pref_form" enctype="multipart/form-data">

2
airtime_mvc/public/css/redmond/jquery-ui-1.8.8.custom.css vendored
View File

@ -111,7 +111,7 @@
border: 1px solid #202020; border: 1px solid #202020;
border-top: 1px solid #353535; border-top: 1px solid #353535;
border-left: 1px solid #2a2a2a; border-left: 1px solid #2a2a2a;
background-color: #242424; background-color: #2F2F2F; /*#242424*/
color: #e2e2e2; color: #e2e2e2;
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.65); -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.65);

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

@ -3605,11 +3605,16 @@ button.btn-icon-text > i.icon-white {
#sub-menu { #sub-menu {
width: 130px; width: 130px;
border-right: 1px solid #5b5b5b; border-right: 1px solid #5b5b5b;
background: #212121;
font-size: 14px; font-size: 14px;
color: #cecece; color: #cecece;
padding: 10px; padding: 10px;
} }
#sub-menu h3 {
padding: 0px;
}
#sub-menu .navigation { #sub-menu .navigation {
list-style: none; list-style: none;
padding-left: 0px; padding-left: 0px;
@ -3629,6 +3634,10 @@ button.btn-icon-text > i.icon-white {
text-decoration: none; text-decoration: none;
} }
.page-sub-menu {
/*background-color: #252525;*/
}
#listenerstat_content { #listenerstat_content {
width: 100%; width: 100%;
} }
@ -3646,3 +3655,9 @@ button.btn-icon-text > i.icon-white {
height: 19px; height: 19px;
margin-top: -2px; margin-top: -2px;
} }
hr {
border: 0;
height: 1px;
background: rgba(255,255,255,0.2);
}