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

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

Browse source 
Conflicts:
	airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
This commit is contained in:
Albert Santoni 2015-08-19 15:00:35 -04:00
commit 93d2d8ad67
8 changed files with 52 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

1
airtime_mvc/application/configs/constants.php
View file

@ -17,6 +17,7 @@ define('WHOS_USING_URL' , 'http://sourcefabric.org/en/airtime/whosus
define('TERMS_AND_CONDITIONS_URL' , 'http://www.sourcefabric.org/en/about/policy/');
define('PRIVACY_POLICY_URL' , 'http://www.sourcefabric.org/en/about/policy/');
define('USER_MANUAL_URL' , 'http://sourcefabric.booktype.pro/airtime-pro-for-broadcasters');
define('ABOUT_AIRTIME_URL' , 'https://www.airtime.pro/support/');
define('AIRTIME_TRANSIFEX_URL' , 'https://www.transifex.com/projects/p/airtime/');
define('WHMCS_PASSWORD_RESET_URL' , 'https://account.sourcefabric.com/pwreset.php');

27
airtime_mvc/application/configs/navigation.php
View file

@ -9,25 +9,26 @@
*/
$pages = array(
array(
'label' => _('Calendar'),
'label' => "<i class='icon-calendar icon-white'></i>"._('Calendar'),
'module' => 'default',
'controller' => 'Schedule',
'action' => 'index',
'resource' => 'schedule'
),
array(
'label' => _('Radio Page'),
'label' => "<i class='icon-globe icon-white'></i>"._('Radio Page'),
'uri' => '/',
'resource' => '',
'pages' => array(
)
),
array(
'label' => _("Settings"),
'label' => "<i class='icon-cog icon-white'></i>"._("Settings"),
'resource' => 'preference',
'action' => 'index',
'module' => 'default',
'controller' => 'preference',
'title' => 'Settings',
'pages' => array(
array(
'label' => _('General'),
@ -56,11 +57,12 @@ $pages = array(
)
),
array(
'label' => _("Analytics"),
'label' => "<i class='icon-signal icon-white'></i>"._("Analytics"),
'module' => 'default',
'controller' => 'listenerstat',
'action' => 'index',
'resource' => 'listenerstat',
'title' => 'Analytics',
'pages' => array(
array(
'label' => _('Listener Stats'),
@ -86,10 +88,11 @@ $pages = array(
)
),
array(
'label' => _('Widgets'),
'label' => "<i class='icon-wrench icon-white'></i>"._('Widgets'),
'module' => 'default',
'controller' => 'embeddablewidgets',
'action' => 'player',
'title' => 'Widgets',
'pages' => array(
array(
'label' => _('Player'),
@ -106,10 +109,11 @@ $pages = array(
)
),
array(
'label' => _('Help'),
'label' => "<i class='icon-question-sign icon-white'></i>"._('Help'),
'controller' => 'dashboard',
'action' => 'help',
'resource' => 'dashboard',
'title' => 'Help',
'pages' => array(
array(
'label' => _('Getting Started'),
@ -134,11 +138,9 @@ $pages = array(
'target' => "_blank"
),
array(
'label' => _('About'),
'module' => 'default',
'controller' => 'dashboard',
'action' => 'about',
'resource' => 'dashboard'
'label' => _(sprintf("About %s", PRODUCT_NAME)),
'uri' => ABOUT_AIRTIME_URL,
'target' => "_blank"
),
array(
'label' => _(sprintf("Help Translate %s", PRODUCT_NAME)),
@ -148,10 +150,11 @@ $pages = array(
)
),
array(
'label' => _('Billing'),
'label' => "<i class='icon-user icon-white'></i>"._('Billing'),
'controller' => 'billing',
'action' => 'client',
'resource' => 'billing',
'title' => 'Billing',
'pages' => array(
array(
'label' => _('Account Details'),

10
airtime_mvc/application/layouts/scripts/layout.phtml
View file

@ -74,15 +74,15 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
</a>
</div>
<div class="media_type_selector" selection_id="1">
<a href="/showbuilder#"><?php echo _("Dashboard") ?></a></div>
<a href="/showbuilder#"><i class='icon-home icon-white'></i><?php echo _("Dashboard") ?></a></div>
<div class="media_type_selector dashboard_sub_nav" selection_id="1">
<a href="/showbuilder#files"><?php echo _("Files") ?></a></div>
<a href="/showbuilder#files"><i class='icon-file icon-white'></i><?php echo _("Files") ?></a></div>
<div class="media_type_selector dashboard_sub_nav" selection_id="2">
<a href="/showbuilder#playlists"><?php echo _("Playlists") ?></a></div>
<a href="/showbuilder#playlists"><i class='icon-list icon-white'></i><?php echo _("Playlists") ?></a></div>
<div class="media_type_selector dashboard_sub_nav" selection_id="3">
<a href="/showbuilder#smart-blocks"><?php echo _("Smart Blocks") ?></a></div>
<a href="/showbuilder#smart-blocks"><i class='icon-time icon-white'></i><?php echo _("Smart Blocks") ?></a></div>
<div class="media_type_selector dashboard_sub_nav" selection_id="4">
<a href="/showbuilder#webstreams"><?php echo _("Webstreams") ?></a></div>
<a href="/showbuilder#webstreams"><i class='icon-random icon-white'></i><?php echo _("Webstreams") ?></a></div>
<hr style="margin-left: 5px; margin-right: 5px">
<div id="nav">
<?php echo $this->navigation()->menu(); ?>

12
airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
View file

@ -98,15 +98,15 @@
</a>
</div>
<div class="media_type_selector" selection_id="1">
<a href="/showbuilder"><?php echo _("Dashboard") ?></a></div>
<a href="/showbuilder#"><i class='icon-home icon-white'></i><?php echo _("Dashboard") ?></a></div>
<div class="media_type_selector dashboard_sub_nav" selection_id="1">
<a href="/showbuilder#files"><?php echo _("Files") ?></a></div>
<a href="/showbuilder#files"><i class='icon-file icon-white'></i><?php echo _("Files") ?></a></div>
<div class="media_type_selector dashboard_sub_nav" selection_id="2">
<a href="/showbuilder#playlists"><?php echo _("Playlists") ?></a></div>
<a href="/showbuilder#playlists"><i class='icon-list icon-white'></i><?php echo _("Playlists") ?></a></div>
<div class="media_type_selector dashboard_sub_nav" selection_id="3">
<a href="/showbuilder#smart-blocks"><?php echo _("Smart Blocks") ?></a></div>
<a href="/showbuilder#smart-blocks"><i class='icon-time icon-white'></i><?php echo _("Smart Blocks") ?></a></div>
<div class="media_type_selector dashboard_sub_nav" selection_id="4">
<a href="/showbuilder#webstreams"><?php echo _("Webstreams") ?></a></div>
<a href="/showbuilder#webstreams"><i class='icon-random icon-white'></i><?php echo _("Webstreams") ?></a></div>
<hr style="margin-left: 5px; margin-right: 5px">
<div id="nav">
<?php echo $this->navigation()->menu(); ?>
@ -125,7 +125,7 @@
echo $this->layout()->parent_page; ?></h3>
<hr>
<?php
$page = $this->navigation()->findOneBy('label', $this->layout()->parent_page);
$page = $this->navigation()->findOneBy('title', $this->layout()->parent_page);
echo $this->navigation()->menu()->renderMenu($page);
?>
</div>