Everything nice and active now

remotes/origin/stable
Jakob Sack 14 years ago
parent 47223ae2d9
commit ee3d32b023
  1. 10
      admin/appinfo/app.php
  2. 5
      admin/apps.php
  3. 49
      admin/index.php
  4. 1
      admin/plugins.php
  5. 2
      admin/system.php
  6. 19
      admin/templates/index.php
  7. 1
      files/admin.php
  8. 3
      files/appinfo/app.php
  9. 2
      files/index.php
  10. 10
      help/appinfo/app.php
  11. 1
      help/index.php
  12. 2
      log/appinfo/app.php
  13. 1
      log/index.php
  14. 1
      settings/appinfo/app.php
  15. 2
      settings/index.php
  16. 8
      templates/layout.admin.php

@ -2,12 +2,12 @@
OC_APP::register( array( "order" => 1, "id" => "admin", "name" => "Administration" ));
OC_APP::addAdminPage( array( "id" => "core_system", "order" => 2, "href" => OC_HELPER::linkTo( "admin", "system.php" ), "name" => "System settings", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
OC_APP::addAdminPage( array( "id" => "core_users", "order" => 3, "href" => OC_HELPER::linkTo( "admin", "users.php" ), "name" => "Users", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
OC_APP::addAdminPage( array( "id" => "core_apps", "order" => 4, "href" => OC_HELPER::linkTo( "admin", "apps.php" ), "name" => "Apps", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
OC_APP::addAdminPage( array( "id" => "core_plugins", "order" => 5, "href" => OC_HELPER::linkTo( "admin", "plugins.php" ), "name" => "Plugins", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
OC_APP::addAdminPage( array( "id" => "core_system", "order" => 1, "href" => OC_HELPER::linkTo( "admin", "system.php" ), "name" => "System settings", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
OC_APP::addAdminPage( array( "id" => "core_users", "order" => 2, "href" => OC_HELPER::linkTo( "admin", "users.php" ), "name" => "Users", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
OC_APP::addAdminPage( array( "id" => "core_apps", "order" => 3, "href" => OC_HELPER::linkTo( "admin", "apps.php" ), "name" => "Apps", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
OC_APP::addAdminPage( array( "id" => "core_plugins", "order" => 4, "href" => OC_HELPER::linkTo( "admin", "plugins.php" ), "name" => "Plugins", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
// Add subentries for App installer
OC_APP::addNavigationSubEntry( "core_apps", array( "id" => "core_apps_installed", "order" => 4, "href" => OC_HELPER::linkTo( "admin", "apps.php" ), "name" => "Installed apps", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
OC_APP::addNavigationSubEntry( "core_apps", array( "id" => "core_apps_installed", "order" => 4, "href" => OC_HELPER::linkTo( "admin", "apps.php?add=some&parameters=here" ), "name" => "Installed apps", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
?>

@ -51,11 +51,13 @@ print_r($value);
*/
// OC_APP::setActiveNavigationEntry( "core_apps_installed" );
if($id==0) {
OC_APP::setActiveNavigationEntry( "core_apps" );
if($cat==0){
if($cat==0){
$numcats=array();
foreach($categories as $key=>$value) $numcats[]=$key;
$apps=OC_OCSCLIENT::getApplications($numcats);
@ -72,6 +74,7 @@ if($id==0) {
unset($tmpl);
}else{
OC_APP::setActiveNavigationEntry( "core_apps" );
$app=OC_OCSCLIENT::getApplication($id);

@ -1,49 +0,0 @@
<?php
/**
* ownCloud
*
* @author Frank Karlitschek
* @copyright 2010 Frank Karlitschek karlitschek@kde.org
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
* License as published by the Free Software Foundation; either
* version 3 of the License, or any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
*
* You should have received a copy of the GNU Affero General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
require_once('../lib/base.php');
require( 'template.php' );
if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( $_SESSION['user_id'], 'admin' )){
header( "Location: ".OC_HELPER::linkTo( "","index.php" ));
exit();
}
$apppages = array();
$syspages = array();
foreach( OC_APP::getAdminPages() as $i ){
if( substr( $i["id"], 0, 5 ) == "core_" ){
$syspages[] = $i;
}
else{
$apppages[] = $i;
}
}
$tmpl = new OC_TEMPLATE( "admin", "index", "admin" );
$tmpl->assign( "apppages", $apppages );
$tmpl->assign( "syspages", $syspages );
$tmpl->printPage();
?>

@ -28,6 +28,7 @@ if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( $_SESSION['user_id'], 'admin'
exit();
}
OC_APP::setActiveNavigationEntry( "core_plugins" );
$plugins=array();
$blacklist=OC_PLUGIN::loadBlackList();

@ -28,6 +28,8 @@ if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( $_SESSION['user_id'], 'admin'
exit();
}
OC_APP::setActiveNavigationEntry( "administration" );
$tmpl = new OC_TEMPLATE( "admin", "system", "admin" );
$tmpl->printPage();

@ -1,19 +0,0 @@
<?php
/*
* Template for admin pages
*/
?>
<h1>Administration</h1>
<h2>System</h2>
<ul>
<?php foreach($_["syspages"] as $i): ?>
<li><a href="<?php echo $i["href"]; ?>"><?php echo $i["name"]; ?></a></li>
<?php endforeach; ?>
</ul>
<h2>Applications</h2>
<ul>
<?php foreach($_["apppages"] as $i): ?>
<li><a href="<?php echo $i["href"]; ?>"><?php echo $i["name"]; ?></a></li>
<?php endforeach; ?>
</ul>

@ -32,6 +32,7 @@ if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( $_SESSION['user_id'], 'admin'
exit();
}
OC_APP::setActiveNavigationEntry( "files_administration" );
// return template
$tmpl = new OC_TEMPLATE( "files", "admin", "admin" );
$tmpl->printPage();

@ -5,4 +5,7 @@ OC_APP::register( array( "order" => 2, "id" => "files", "name" => "Files" ));
OC_APP::addNavigationEntry( array( "id" => "files_index", "order" => 1, "href" => OC_HELPER::linkTo( "files", "index.php" ), "icon" => OC_HELPER::imagePath( "files", "navicon.png" ), "name" => "Files" ));
OC_APP::addSettingsPage( array( "id" => "files_administration", "order" => 1, "href" => OC_HELPER::linkTo( "files", "admin.php" ), "name" => "Files" ));
// To add navigation sub entries use
// OC_APP::addNavigationSubEntry( "files_index", array( ... ));
?>

@ -35,7 +35,7 @@ if( !OC_USER::isLoggedIn()){
// Load the files we need
OC_UTIL::addStyle( "files", "files" );
OC_UTIL::addScript( "files", "files" );
OC_APP::setActiveNavigationEntry( "files_index" );
// Load the files
$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';

@ -1,6 +1,14 @@
<?php
OC_APP::register( array( "order" => 1, "id" => "help", "name" => "Help" ));
OC_APP::addSettingsPage( array( "id" => "help", "order" => 2, "href" => OC_HELPER::linkTo( "help", "index.php" ), "name" => "Help", "icon" => OC_HELPER::imagePath( "settings", "information.png" )));
// Workaround for having help as the last entry always
$entry = array( "id" => "help", "order" => 1000, "href" => OC_HELPER::linkTo( "help", "index.php" ), "name" => "Help", "icon" => OC_HELPER::imagePath( "settings", "information.png" ));
if( OC_GROUP::inGroup( $_SESSION["user_id"], "admin" )){
OC_APP::addAdminPage( $entry );
}
else{
OC_APP::addSettingsPage( $entry );
}
?>

@ -9,7 +9,6 @@ if( !OC_USER::isLoggedIn()){
// Load the files we need
OC_UTIL::addStyle( "help", "help" );
OC_APP::setActiveNavigationEntry( "help" );
$kbe=OC_OCSCLIENT::getKnownledgebaseEntries();

@ -1,6 +1,6 @@
<?php
OC_APP::register( array( "order" => 1, "id" => "log", "name" => "Log" ));
OC_APP::addSettingsPage( array( "id" => "log", "order" => 2, "href" => OC_HELPER::linkTo( "log", "index.php" ), "name" => "Log", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
OC_APP::addSettingsPage( array( "id" => "log", "order" => 999, "href" => OC_HELPER::linkTo( "log", "index.php" ), "name" => "Log", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
?>

@ -30,6 +30,7 @@ if( !OC_USER::isLoggedIn()){
exit();
}
OC_APP::setActiveNavigationEntry( "log" );
$logs=OC_LOG::get( $dir );
foreach( $logs as &$i ){

@ -1,5 +1,6 @@
<?php
OC_APP::register( array( "id" => "settings", "name" => "Settings" ));
OC_APP::addSettingsPage( array( "id" => "settings", "order" => -1000, "href" => OC_HELPER::linkTo( "settings", "index.php" ), "name" => "Information", "icon" => OC_HELPER::imagePath( "settings", "information.png" )));
?>

@ -7,7 +7,7 @@ if( !OC_USER::isLoggedIn()){
exit();
}
OC_APP::setActiveNavigationEntry( "settings" );
$tmpl = new OC_TEMPLATE( "settings", "index", "admin");
$used=OC_FILESYSTEM::filesize('/');
$free=OC_FILESYSTEM::free_space();

@ -25,9 +25,13 @@
<div id="main">
<div id="plugins">
<ul>
<li><a style="background-image:url(<?php echo image_path('settings', 'information.png'); ?>)" href="<?php echo link_to('settings', 'index.php'); ?>" title="">Information</a></li>
<?php foreach($_['settingsnavigation'] as $entry):?>
<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title=""><?php echo $entry['name'] ?></a></li>
<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title=""><?php echo $entry['name'] ?><?php if( $entry["active"] ) echo "I AM ACTIVE!!!"; ?></a></li>
<?php if( sizeof( $entry["subnavigation"] )): ?>
<?php foreach($entry["subnavigation"] as $subentry):?>
<li><a style="background-color:#FF8800;" href="<?php echo $subentry['href']; ?>" title=""><?php echo $subentry['name'] ?></a></li>
<?php endforeach; ?>
<?php endif; ?>
<?php endforeach; ?>
<?php foreach($_['adminnavigation'] as $entry):?>
<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title=""><?php echo $entry['name'] ?><?php if( $entry["active"] ) echo "I AM ACTIVE!!!"; ?></a></li>

Loading…
Cancel
Save