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

Merge branch 'master' of https://github.com/FH-Complete/FHC-Core

Browse Source
This commit is contained in:
kindlm
2016-05-23 12:07:34 +02:00
parent fc932b464d b231caca13
commit abae24b0aa
42 changed files with 2447 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/tw/cis_menu_lv.inc.php
+14 -11
View File
@@ -439,17 +439,20 @@ function checkZeilenUmbruch()
}
}
}
$menu[]=array
(
'id'=>'core_menu_moodle',
'position'=>'70',
'name'=>$p->t('lehre/moodle'),
'icon'=>'../../../skin/images/button_moodle.png',
'link'=>$link,
'link_target'=>$link_target,
'link_onclick'=>$link_onclick,
'text'=>$text
);
if (MOODLE)
{
$menu[]=array
(
'id'=>'core_menu_moodle',
'position'=>'70',
'name'=>$p->t('lehre/moodle'),
'icon'=>'../../../skin/images/button_moodle.png',
'link'=>$link,
'link_target'=>$link_target,
'link_onclick'=>$link_onclick,
'text'=>$text
);
}
//Gesamtnote
if($is_lector && ((!defined('CIS_LEHRVERANSTALTUNG_GESAMTNOTE_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_GESAMTNOTE_ANZEIGEN) && $angemeldet))
include/tw/vilesci_menu_main.inc.php
+1
View File
@@ -193,6 +193,7 @@ $menu=array
'Firmenwartung'=>array('name'=>'Firmenwartung', 'link'=>'stammdaten/firma_zusammen_uebersicht.php', 'target'=>'main','permissions'=>array('basis/firma')),
'checkStudenten'=>array('name'=>'CheckStudenten', 'link'=>'../system/checkStudenten.php', 'target'=>'main'),
'StudienplanZuteilung'=>array('name'=>'Studienplan Zuteilung', 'link'=>'lehre/studienplan_zuteilung.php', 'target'=>'main','permissions'=>array('assistenz')),
'lv_merge'=>array('name'=>'LVs zusammenlegen', 'link'=>'lehre/lv_merge.php', 'target'=>'main','permissions'=>array('admin','lv-plan')),
),
'Auswertung'=> array
(