integrated help to settings navigation

diff --git a/help/appinfo/app.php b/help/appinfo/app.php
index c4e9eb5717c6abbdd511dd9a5fa653c9a445c55c..12ae59b94c204fa718929814bc0c4f24827db1cc 100644 (file)
--- a/help/appinfo/app.php
+++ b/help/appinfo/app.php
@@ -1,6 +1,6 @@
 <?php
 
 OC_APP::register( array( "order" => 1, "id" => "help", "name" => "Help" ));
-OC_APP::addSettingsPage( array( "order" => 2, "href" => OC_HELPER::linkTo( "help", "index.php" ), "name" => "Help", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
+OC_APP::addSettingsPage( array( "order" => 2, "href" => OC_HELPER::linkTo( "help", "index.php" ), "name" => "Help", "icon" => OC_HELPER::imagePath( "settings", "information.png" )));
 
 ?>

diff --git a/help/index.php b/help/index.php
index bed0ac7b6bbced6126ec155326e831d7a2862857..426abe3956010af83f49e9934f78804e543b0c35 100644 (file)
--- a/help/index.php
+++ b/help/index.php
@@ -15,7 +15,7 @@ OC_APP::setActiveNavigationEntry( "help" );
 $kbe=OC_OCSCLIENT::getKnownledgebaseEntries();
 
 
-$tmpl = new OC_TEMPLATE( "help", "index", "user" );
+$tmpl = new OC_TEMPLATE( "help", "index", "admin" );
 $tmpl->assign( "kbe", $kbe );
 $tmpl->printPage();
 

diff --git a/help/templates/index.php b/help/templates/index.php
index 5ff414eb4a707c73230dab8db0bccce8aab7262f..51b673678d3da42c254bf887d2a734bf13b67c47 100644 (file)
--- a/help/templates/index.php
+++ b/help/templates/index.php
@@ -1,10 +1,3 @@
-<?php
-/*
- * Template for settings page
- */
-?>
-<h1>Help</h1>
-
 <table cellspacing="0">
        <tbody>
                <?php foreach($_["kbe"] as $kb): ?>

diff --git a/log/templates/index.php b/log/templates/index.php
index 02fea0f87b01b6eda1346c1425490059506dd791..e8a259cbaba20fe2adf383afe8f6d87a3d13aff8 100644 (file)
--- a/log/templates/index.php
+++ b/log/templates/index.php
@@ -1,10 +1,3 @@
-<?php
-/*
- * Template for admin pages
- */
-?>
-<h1>Logs</h1>
-
 <div class="controls">
        <form id="logs_options">
                <p>