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

airtime_mvc/application/configs/navigation.php

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

airtime_mvc/application/views/scripts/dashboard/help.phtml

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

airtime_mvc/application/views/scripts/menu.phtml

@@ -18,7 +18,7 @@
 			                 continue;
 			             } ?>
 			    <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>
 			    <?php endforeach; ?>
 		    </ul>