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

Fixed merge conflicts

This commit is contained in:
paul.baranowski 2011-02-14 13:16:57 +01:00
parent 6c273739b4 dcc3d57647
commit b6d117d456
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
application/configs/navigation.php
View File

@ -16,11 +16,11 @@ $pages = array(
'resource' => 'nowplaying' 'resource' => 'nowplaying'
), ),
array( array(
'label' => 'Calendar', 'label' => 'Add Audio',
'module' => 'default', 'module' => 'default',
'controller' => 'Schedule', 'controller' => 'Plupload',
'action' => 'index', 'action' => 'plupload',
'resource' => 'schedule' 'resource' => 'plupload'
), ),
array( array(
'label' => 'Playlist Builder', 'label' => 'Playlist Builder',
@ -30,15 +30,15 @@ $pages = array(
'resource' => 'library' 'resource' => 'library'
), ),
array( array(
'label' => 'Add Audio', 'label' => 'Calendar',
'module' => 'default', 'module' => 'default',
'controller' => 'Plupload', 'controller' => 'Schedule',
'action' => 'plupload', 'action' => 'index',
'resource' => 'plupload' 'resource' => 'schedule'
), ),
array( array(
'label' => 'Configure', 'label' => 'Configure',
'uri' => 'javascript:void(null)', 'uri' => '#',
'resource' => 'preference', 'resource' => 'preference',
'pages' => array( 'pages' => array(
array( array(

2
application/views/scripts/dashboard/help.phtml
View File

@ -5,8 +5,8 @@
<ol> <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>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 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>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> <li>Select your playlist and drag and drop it to the "Items in this show" area.</li>
</ol> </ol>

2
application/views/scripts/nowplaying/day-view.phtml
View File

@ -1,4 +1,4 @@
<div class="button-bar-top"> <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> </div>
<table cellpadding="0" cellspacing="0" border="0" class="datatable" id="nowplayingtable"></table> <table cellpadding="0" cellspacing="0" border="0" class="datatable" id="nowplayingtable"></table>

2
application/views/scripts/nowplaying/index.phtml
View File

@ -1,4 +1,4 @@
<div class="button-bar-top"> <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> </div>
<table cellpadding="0" cellspacing="0" border="0" class="datatable" id="nowplayingtable"></table> <table cellpadding="0" cellspacing="0" border="0" class="datatable" id="nowplayingtable"></table>