Fixed merge conflicts
This commit is contained in:
commit
b6d117d456
|
@ -16,11 +16,11 @@ $pages = array(
|
|||
'resource' => 'nowplaying'
|
||||
),
|
||||
array(
|
||||
'label' => 'Calendar',
|
||||
'module' => 'default',
|
||||
'controller' => 'Schedule',
|
||||
'action' => 'index',
|
||||
'resource' => 'schedule'
|
||||
'label' => 'Add Audio',
|
||||
'module' => 'default',
|
||||
'controller' => 'Plupload',
|
||||
'action' => 'plupload',
|
||||
'resource' => 'plupload'
|
||||
),
|
||||
array(
|
||||
'label' => 'Playlist Builder',
|
||||
|
@ -30,15 +30,15 @@ $pages = array(
|
|||
'resource' => 'library'
|
||||
),
|
||||
array(
|
||||
'label' => 'Add Audio',
|
||||
'module' => 'default',
|
||||
'controller' => 'Plupload',
|
||||
'action' => 'plupload',
|
||||
'resource' => 'plupload'
|
||||
'label' => 'Calendar',
|
||||
'module' => 'default',
|
||||
'controller' => 'Schedule',
|
||||
'action' => 'index',
|
||||
'resource' => 'schedule'
|
||||
),
|
||||
array(
|
||||
'label' => 'Configure',
|
||||
'uri' => 'javascript:void(null)',
|
||||
'uri' => '#',
|
||||
'resource' => 'preference',
|
||||
'pages' => array(
|
||||
array(
|
||||
|
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
<ol>
|
||||
<li>Add your files to the library using the "Add Audio" button. You can drag and drop your files to this window too. </li>
|
||||
<li>Create a show by going to "Calendar" in the menu bar, and then clicking the "+ Show" icon. This can be either a one-time or repeating show. Only admins can add shows.</li>
|
||||
<li>Create a playlist in the Playlist Builder menu using your audio files. </li>
|
||||
<li>Create a show by going to "Calendar" in the menu bar, and then clicking the "+ Show" icon. This can be either a one-time or repeating show. Only admins can add shows.</li>
|
||||
<li>Add the playlist to the show by going to your show in the Schedule calendar, right-clicking on it and selecting "Add Content." </li>
|
||||
<li>Select your playlist and drag and drop it to the "Items in this show" area.</li>
|
||||
</ol>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<div class="button-bar-top">
|
||||
<a href="javascript:void(0)" class="toggle-button end-button" id="now_view">Now View</a><a href="javascript:void(0)" class="toggle-button-active" id="day_view">Day View</a><input type="text" id="datepicker" class="input_text">
|
||||
<span class="toggle-button end-button" id="now_view">Now View</span><span class="toggle-button-active" id="day_view">Day View</span><input type="text" id="datepicker" class="input_text">
|
||||
</div>
|
||||
<table cellpadding="0" cellspacing="0" border="0" class="datatable" id="nowplayingtable"></table>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<div class="button-bar-top">
|
||||
<a href="javascript:void(0)" class="toggle-button-active end-button" id="now_view">Now View</a><a href="javascript:void(0)" class="toggle-button" id="day_view">Day View</a>
|
||||
<span class="toggle-button-active end-button" id="now_view">Now View</span><span class="toggle-button" id="day_view">Day View</span>
|
||||
</div>
|
||||
<table cellpadding="0" cellspacing="0" border="0" class="datatable" id="nowplayingtable"></table>
|
||||
|
|
Loading…
Reference in New Issue