blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-26 09:04:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into permissions

Browse Source
This commit is contained in:
Paolo
2018-04-18 17:35:33 +02:00
parent 88a7228555 5b68f54328
commit 9d5c9b443e
93 changed files with 6590 additions and 4328 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/config/fhcomplete.php
+1 -2
View File
@@ -4,6 +4,5 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
$config['fhc_version'] = '3.2';
//
$config['addons_aufnahme_url'] = array();
$config['addons_aufnahme_url']['OE_ROOT'] = 'http://debian.dev/addons/aufnahme/OE_ROOT/cis/index.php';
$config['addons_aufnahme_url']['OE_ROOT'] = 'https://SERVER-NAME/addons/aufnahme/OE_ROOT/cis/index.php';
application/config/navigation.php
+29 -16
View File
@@ -1,17 +1,12 @@
<?php
$config['navigation_header'] = array(
'Vilesci/index' => array(
'FH-Complete' => base_url('index.ci.php/'),
'*' => array(
'FH-Complete' => site_url(''),
'Vilesci' => base_url('/vilesci'),
'CIS' => CIS_ROOT
),
'system/infocenter/InfoCenter/index' => array(
'FH-Complete' => base_url('index.ci.php/'),
'Vilesci' => base_url('/vilesci'),
'CIS' => CIS_ROOT
),
'system/infocenter/InfoCenter/showDetails' => array(
'system/infocenter/InfoCenter/infocenterFreigegeben' => array(
'FH-Complete' => base_url('index.ci.php/'),
'Vilesci' => base_url('/vilesci'),
'CIS' => CIS_ROOT
@@ -39,7 +34,7 @@ $config['navigation_menu']['Vilesci/index'] = array(
'expand' => true
),
'Infocenter' => array(
'link' => base_url('index.ci.php/system/infocenter/InfoCenter'),
'link' => site_url('/system/infocenter/InfoCenter'),
'icon' => 'info',
'description' => 'Infocenter',
'expand' => true
@@ -59,17 +54,35 @@ $config['navigation_menu']['Vilesci/index'] = array(
'expand' => true
),
'Extensions' => array(
'link' => base_url('index.ci.php/system/extensions/Manager'),
'link' => site_url('/system/extensions/Manager'),
'icon' => 'cubes',
'description' => 'Extensions Manager',
'expand' => true
),
'Datenschutz' => array(
'link' => base_url('index.ci.php/extensions/FHC-Core-DSMS/export'),
'description' => 'Datenschutz',
'icon' => 'legal',
'expand' => true
)
)
)
);
//HIDDEN as long as filter is revised
//$config['navigation_menu']['system/infocenter/InfoCenter/index'] = array(
// 'Freigegeben' => array(
// 'link' => base_url('index.ci.php/system/infocenter/InfoCenter/infocenterFreigegeben'),
// 'description' => 'Freigegeben',
// 'icon' => 'thumbs-up'
// ));
$config['navigation_menu']['system/infocenter/InfoCenter/showDetails'] = array(
'Freigegeben' => array(
'link' => base_url('index.ci.php/system/infocenter/InfoCenter/infocenterFreigegeben'),
'description' => 'Freigegeben',
'icon' => 'thumbs-up'
));
$config['navigation_menu']['system/infocenter/InfoCenter/infocenterFreigegeben'] = array(
'Zurück' => array(
'link' => base_url('index.ci.php/system/infocenter/InfoCenter/index'),
'description' => 'Zurück',
'icon' => 'angle-left'
));