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

CC-6071: Icons for navigation bar

This commit is contained in:
drigato 2015-08-19 12:58:31 -04:00
parent 59a9862ba3
commit 8dcd0a2595
5 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,25 +9,26 @@
*/ */
$pages = array( $pages = array(
array( array(
'label' => _('Calendar'), 'label' => "<i class='icon-calendar icon-white'></i>"._('Calendar'),
'module' => 'default', 'module' => 'default',
'controller' => 'Schedule', 'controller' => 'Schedule',
'action' => 'index', 'action' => 'index',
'resource' => 'schedule' 'resource' => 'schedule'
), ),
array( array(
'label' => _('Radio Page'), 'label' => "<i class='icon-globe icon-white'></i>"._('Radio Page'),
'uri' => '/', 'uri' => '/',
'resource' => '', 'resource' => '',
'pages' => array( 'pages' => array(
) )
), ),
array( array(
'label' => _("Settings"), 'label' => "<i class='icon-cog icon-white'></i>"._("Settings"),
'resource' => 'preference', 'resource' => 'preference',
'action' => 'index', 'action' => 'index',
'module' => 'default', 'module' => 'default',
'controller' => 'preference', 'controller' => 'preference',
'title' => 'Settings',
'pages' => array( 'pages' => array(
array( array(
'label' => _('General'), 'label' => _('General'),
@ -56,11 +57,12 @@ $pages = array(
) )
), ),
array( array(
'label' => _("Analytics"), 'label' => "<i class='icon-signal icon-white'></i>"._("Analytics"),
'module' => 'default', 'module' => 'default',
'controller' => 'listenerstat', 'controller' => 'listenerstat',
'action' => 'index', 'action' => 'index',
'resource' => 'listenerstat', 'resource' => 'listenerstat',
'title' => 'Analytics',
'pages' => array( 'pages' => array(
array( array(
'label' => _('Listener Stats'), 'label' => _('Listener Stats'),
@ -86,10 +88,11 @@ $pages = array(
) )
), ),
array( array(
'label' => _('Widgets'), 'label' => "<i class='icon-wrench icon-white'></i>"._('Widgets'),
'module' => 'default', 'module' => 'default',
'controller' => 'embeddablewidgets', 'controller' => 'embeddablewidgets',
'action' => 'player', 'action' => 'player',
'title' => 'Widgets',
'pages' => array( 'pages' => array(
array( array(
'label' => _('Player'), 'label' => _('Player'),
@ -106,10 +109,11 @@ $pages = array(
) )
), ),
array( array(
'label' => _('Help'), 'label' => "<i class='icon-question-sign icon-white'></i>"._('Help'),
'controller' => 'dashboard', 'controller' => 'dashboard',
'action' => 'help', 'action' => 'help',
'resource' => 'dashboard', 'resource' => 'dashboard',
'title' => 'Help',
'pages' => array( 'pages' => array(
array( array(
'label' => _('Getting Started'), 'label' => _('Getting Started'),
@ -148,10 +152,11 @@ $pages = array(
) )
), ),
array( array(
'label' => _('Billing'), 'label' => "<i class='icon-user icon-white'></i>"._('Billing'),
'controller' => 'billing', 'controller' => 'billing',
'action' => 'client', 'action' => 'client',
'resource' => 'billing', 'resource' => 'billing',
'title' => 'Billing',
'pages' => array( 'pages' => array(
array( array(
'label' => _('Account Details'), '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> </a>
</div> </div>
<div class="media_type_selector" selection_id="1"> <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"> <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"> <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"> <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"> <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"> <hr style="margin-left: 5px; margin-right: 5px">
<div id="nav"> <div id="nav">
<?php echo $this->navigation()->menu(); ?> <?php echo $this->navigation()->menu(); ?>

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

@ -98,15 +98,15 @@
</a> </a>
</div> </div>
<div class="media_type_selector" selection_id="1"> <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"> <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"> <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"> <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"> <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"> <hr style="margin-left: 5px; margin-right: 5px">
<div id="nav"> <div id="nav">
<?php echo $this->navigation()->menu(); ?> <?php echo $this->navigation()->menu(); ?>
@ -124,7 +124,7 @@
echo $this->layout()->parent_page; ?></h3> echo $this->layout()->parent_page; ?></h3>
<hr> <hr>
<?php <?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); echo $this->navigation()->menu()->renderMenu($page);
?> ?>
</div> </div>

4
airtime_mvc/public/css/add-show.css
View File

@ -158,10 +158,6 @@ label.wrapp-label input[type="checkbox"] {
cursor: pointer; cursor: pointer;
} }
/* Hack for calendar page icons */
.icon-white {
margin-right: 4px;
}
/* /*
.add-button { .add-button {
border: 1px solid #5b5b5b; border: 1px solid #5b5b5b;

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

@ -3467,7 +3467,7 @@ button.btn-icon-text > i.icon-white {
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
width: 130px; width: 150px;
flex: 1 auto; flex: 1 auto;
padding: 0; padding: 0;
@ -3545,7 +3545,7 @@ button.btn-icon-text > i.icon-white {
position: absolute; position: absolute;
top: 102px; top: 102px;
left: 130px; left: 150px;
right: 0; right: 0;
bottom: 0; bottom: 0;
padding: 10px 10px 40px; padding: 10px 10px 40px;
@ -3575,7 +3575,7 @@ button.btn-icon-text > i.icon-white {
.usability_hint { .usability_hint {
position: fixed; position: fixed;
top: 102px; top: 102px;
left: 130px; left: 150px;
width: 100%; width: 100%;
flex: 0 100%; flex: 0 100%;
@ -3662,3 +3662,13 @@ hr {
height: 1px; height: 1px;
background: rgba(255,255,255,0.2); background: rgba(255,255,255,0.2);
} }
.icon-white {
margin-right: 4px;
}
.nav-ui-icon-formatter {
width:16px !important;
display:inline;
margin-right:4px
}