SAAS-1017: Move top nav bar to side
This commit is contained in:
drigato
parent
6c7a6aaad3
commit
e90fe728a2
13 changed files with 267 additions and 136 deletions
|
|
@ -8,27 +8,27 @@
|
|||
* the navigation container below.
|
||||
*/
|
||||
$pages = array(
|
||||
array(
|
||||
/*array(
|
||||
'label' => _('Now Playing'),
|
||||
'module' => 'default',
|
||||
'controller' => 'Showbuilder',
|
||||
'action' => 'index',
|
||||
'resource' => 'showbuilder'
|
||||
),
|
||||
),*/
|
||||
array(
|
||||
'label' => _('Add Media'),
|
||||
'module' => 'default',
|
||||
'controller' => 'Plupload',
|
||||
'action' => 'index',
|
||||
'resource' => 'plupload'
|
||||
),
|
||||
),/*
|
||||
array(
|
||||
'label' => _('Library'),
|
||||
'module' => 'default',
|
||||
'controller' => 'Library',
|
||||
'action' => 'index',
|
||||
'resource' => 'playlist'
|
||||
),
|
||||
),*/
|
||||
array(
|
||||
'label' => _('Calendar'),
|
||||
'module' => 'default',
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ class ShowBuilderController extends Zend_Controller_Action {
|
|||
$baseUrl = Application_Common_OsPath::getBaseDir();
|
||||
$userType = Application_Model_User::GetCurrentUser()->getType();
|
||||
|
||||
$this->_helper->layout->setLayout("showbuilder");
|
||||
//$this->_helper->layout->setLayout("showbuilder");
|
||||
|
||||
$this->view->headScript()->appendScript("localStorage.setItem( 'user-type', '$userType' );");
|
||||
$this->view->headScript()->appendScript(Application_Common_GoogleAnalytics::generateGoogleTagManagerDataLayerJavaScript());
|
||||
|
|
|
|||
|
|
@ -50,14 +50,13 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
|
|||
|
||||
</script>
|
||||
|
||||
<div id="nav">
|
||||
<!--<div id="nav">
|
||||
<div class="logo"></div>
|
||||
<div class="personal-block solo">
|
||||
<ol>
|
||||
<li>
|
||||
<!-- <span class="trial-box-button"><a title="Billing" href=<?php echo $baseUrl . 'billing/upgrade'?>>Upgrade</a></span> -->
|
||||
<a id="current-user" href=<?php echo $baseUrl . "user/edit-user"?>><span class="name"><?php echo $this->escape($this->loggedInAs()); ?></span></a>
|
||||
| <a href=<?php echo $baseUrl . "login/logout"?>><?php echo _("Logout")?></a>
|
||||
<a id="current-user" href=<?php /*echo $baseUrl . "user/edit-user"*/?>><span class="name"><?php /*echo $this->escape($this->loggedInAs()); */?></span></a>
|
||||
| <a href=<?php /*echo $baseUrl . "login/logout"*/?>><?php /*echo _("Logout")*/?></a>
|
||||
</li>
|
||||
</ol>
|
||||
</div>
|
||||
|
|
@ -70,14 +69,48 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
|
|||
</div>
|
||||
</div>
|
||||
<div class="responsive-menu">
|
||||
<?php echo $this->navigation()->menu() ?>
|
||||
<?php /*echo $this->navigation()->menu() */?>
|
||||
</div>
|
||||
|
||||
<div style="clear:both;"></div>
|
||||
</div>
|
||||
</div>-->
|
||||
<?php endif; //suspended ?>
|
||||
</div>
|
||||
|
||||
<div id="media_type_nav"> <!-- class="content-pane" -->
|
||||
<div class="btn-group">
|
||||
<button id="new_media_selector" class="btn btn-small dropdown-toggle" data-toggle="dropdown">
|
||||
New <span class="caret"></span>
|
||||
</button>
|
||||
<ul class="dropdown-menu">
|
||||
<li id="new-playlist">
|
||||
<a href="#"><?php echo _("Playlist") ?></a>
|
||||
</li>
|
||||
<li id="new-smart-block">
|
||||
<a href="#"><?php echo _("Smart Block") ?></a>
|
||||
</li>
|
||||
<li id="new-webstream">
|
||||
<a href="#"><?php echo _("Webstream") ?></a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="media_type_selector" selection_id="1">
|
||||
<a href="/show-builder"><?php echo _("Dashboard") ?></a></div>
|
||||
<div class="media_type_selector dashboard_sub_nav" selection_id="1">
|
||||
<a href="/show-builder#files"><?php echo _("Files") ?></a></div>
|
||||
<div class="media_type_selector dashboard_sub_nav" selection_id="2">
|
||||
<a href="/show-builder#playlists"><?php echo _("Playlists") ?></a></div>
|
||||
<div class="media_type_selector dashboard_sub_nav" selection_id="3">
|
||||
<a href="/show-builder#smart-blocks"><?php echo _("Smart Blocks") ?></a></div>
|
||||
<div class="media_type_selector dashboard_sub_nav" selection_id="4">
|
||||
<a href="/show-builder#webstreams"><?php echo _("Webstreams") ?></a></div>
|
||||
<hr style="margin-left: 5px; margin-right: 5px">
|
||||
<div id="nav">
|
||||
<?php echo $this->navigation()->menu() ?>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<?php $hint = Application_Common_UsabilityHints::getUsabilityHint(); ?>
|
||||
<div class="usability_hint" <?php if ($hint == "") { echo "style='display:none'"; } ?>><?php echo $hint; ?></div>
|
||||
|
||||
|
|
@ -129,3 +162,4 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
|
|||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
<?php echo $this->doctype() ?>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
|
|
@ -31,7 +36,7 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
|
|||
$scs = $this->SourceConnectionStatus();
|
||||
?>
|
||||
<?php echo $this->partial('partialviews/header.phtml', array("live_dj_switch"=>$sss['live_dj'], "live_dj_connection"=>$scs['live_dj'], "master_dj_switch"=>$sss['master_dj'], "master_dj_connection"=>$scs['master_dj'],
|
||||
"scheduled_play_switch"=>$sss['scheduled_play'])) ?>
|
||||
"scheduled_play_switch"=>$sss['scheduled_play'], "baseUrl"=>$baseUrl)) ?>
|
||||
<?php $partial = array('menu.phtml', 'default');
|
||||
$this->navigation()->menu()->setPartial($partial); ?>
|
||||
|
||||
|
|
@ -50,12 +55,13 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
|
|||
|
||||
</script>
|
||||
|
||||
<!--
|
||||
<div id="nav">
|
||||
<div class="logo"></div>
|
||||
<div class="personal-block solo">
|
||||
<ol>
|
||||
<li>
|
||||
<!-- <span class="trial-box-button"><a title="Billing" href=<?php echo $baseUrl . 'billing/upgrade'?>>Upgrade</a></span> -->
|
||||
<span class="trial-box-button"><a title="Billing" href=<?php echo $baseUrl . 'billing/upgrade'?>>Upgrade</a></span>
|
||||
<a id="current-user" href=<?php echo $baseUrl . "user/edit-user"?>><span class="name"><?php echo $this->escape($this->loggedInAs()); ?></span></a>
|
||||
| <a href=<?php echo $baseUrl . "login/logout"?>><?php echo _("Logout")?></a>
|
||||
</li>
|
||||
|
|
@ -69,12 +75,14 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
|
|||
<span></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="responsive-menu">
|
||||
<?php echo $this->navigation()->menu() ?>
|
||||
</div>
|
||||
|
||||
<div style="clear:both;"></div>
|
||||
</div>
|
||||
-->
|
||||
<?php endif; //suspended ?>
|
||||
</div>
|
||||
|
||||
|
|
@ -95,10 +103,20 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
|
|||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="media_type_selector selected" selection_id="1"><?php echo _("Files") ?></div>
|
||||
<div class="media_type_selector" selection_id="2"><?php echo _("Playlists") ?></div>
|
||||
<div class="media_type_selector" selection_id="3"><?php echo _("Smart Blocks") ?></div>
|
||||
<div class="media_type_selector" selection_id="4"><?php echo _("Webstreams") ?></div>
|
||||
<div class="media_type_selector" selection_id="1">
|
||||
<a href="/show-builder"><?php echo _("Dashboard") ?></a></div>
|
||||
<div class="media_type_selector dashboard_sub_nav" selection_id="1">
|
||||
<a href="/show-builder#files"><?php echo _("Files") ?></a></div>
|
||||
<div class="media_type_selector dashboard_sub_nav" selection_id="2">
|
||||
<a href="/show-builder#playlists"><?php echo _("Playlists") ?></a></div>
|
||||
<div class="media_type_selector dashboard_sub_nav" selection_id="3">
|
||||
<a href="/show-builder#smart-blocks"><?php echo _("Smart Blocks") ?></a></div>
|
||||
<div class="media_type_selector dashboard_sub_nav" selection_id="4">
|
||||
<a href="/show-builder#webstreams"><?php echo _("Webstreams") ?></a></div>
|
||||
<div id="nav">
|
||||
<?php echo $this->navigation()->menu() ?>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="wrapper dropzone" id="content">
|
||||
|
|
|
|||
|
|
@ -49,8 +49,16 @@
|
|||
<a href="#" class="listen-control-button"><span><?php echo _("Listen") ?></span></a>
|
||||
</div>
|
||||
<div class="time-info-block pull-right">
|
||||
<div class="logo"></div>
|
||||
<div class="personal-block solo">
|
||||
<ol>
|
||||
<li>
|
||||
<a id="current-user" href=<?php echo $this->baseUrl . "user/edit-user"?>><span class="name"><?php echo $this->escape($this->loggedInAs()); ?></span></a>
|
||||
| <a href=<?php echo $this->baseUrl . "login/logout"?>><?php echo _("Logout")?></a>
|
||||
</li>
|
||||
</ol>
|
||||
</div>
|
||||
<ul>
|
||||
<li><?php echo _("Station time") ?></li>
|
||||
<li class="time" id="time"></li>
|
||||
<li class="time-zone"><span id="time-zone"></span></li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
</div>
|
||||
|
||||
|
||||
<div id="recent_uploads_wrapper" class="lib-content ui-widget ui-widget-content block-shadow alpha-block">
|
||||
<div id="recent_uploads_wrapper" class="lib-content ui-widget ui-widget-content block-shadow">
|
||||
<div id="recent_uploads" class="padded">
|
||||
|
||||
<div id="recent_uploads_filter">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue