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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
James 2011-09-02 15:24:53 -04:00
parent 903c3474c7 aa58225e68
commit 0c72b8b6bf
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,7 @@ $pages = array(
'resource' => 'schedule' 'resource' => 'schedule'
), ),
array( array(
'label' => 'Configure', 'label' => 'System',
'uri' => '#', 'uri' => '#',
'resource' => 'preference', 'resource' => 'preference',
'pages' => array( 'pages' => array(
@ -70,6 +70,13 @@ $pages = array(
'module' => 'default', 'module' => 'default',
'controller' => 'Preference', 'controller' => 'Preference',
'action' => 'support-setting' 'action' => 'support-setting'
),
array(
'label' => 'Status',
'module' => 'default',
'controller' => 'systemstatus',
'action' => 'index',
'resource' => 'systemstatus'
) )
) )
), ),
@ -79,18 +86,16 @@ $pages = array(
'resource' => 'dashboard', 'resource' => 'dashboard',
'pages' => array( 'pages' => array(
array( array(
'label' => 'About', 'label' => 'Getting Started',
'module' => 'default', 'module' => 'default',
'controller' => 'dashboard', 'controller' => 'dashboard',
'action' => 'help', 'action' => 'help',
'resource' => 'dashboard' 'resource' => 'dashboard'
), ),
array( array(
'label' => 'System Status', 'label' => 'User Manual',
'module' => 'default', 'uri' => "http://en.flossmanuals.net/airtime/",
'controller' => 'systemstatus', 'target' => "_blank"
'action' => 'index',
'resource' => 'systemstatus'
) )
) )
) )

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

@ -11,6 +11,6 @@
<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>
<p><strong>Then you're good to go!</strong><br /> <p><strong>Then you're good to go!</strong><br />
For more detailed help, read the <a href="http://manuals.sourcefabric.org">user manual</a></p> For more detailed help, read the <a href="http://manuals.sourcefabric.org" target="_blank">user manual</a>.</p>
</div> </div>

2
airtime_mvc/application/views/scripts/menu.phtml
View File

@ -18,7 +18,7 @@
continue; continue;
} ?> } ?>
<li> <li>
<a href="<?php echo $sub->getHref(); ?>"><?php echo $sub->getLabel(); ?></a> <a href="<?php echo $sub->getHref(); ?>" <?php echo ($sub->getTarget() != "")?"target=\"".$sub->getTarget()."\"":""; ?>><?php echo $sub->getLabel(); ?></a>
</li> </li>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>