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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
alex
2019-02-21 17:18:35 +01:00
parent 0cb86f84ed 1474400a3c
commit e9757016fe
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/person/gradelist/gradelist.php
+2 -1
View File
@@ -9,7 +9,8 @@
'fontawesome' => true,
'ajaxlib' => true,
'customCSSs' => array(
'public/css/tools/gradelist.css'
'public/css/tools/gradelist.css',
'public/css/fhcomplete.css'
),
'customJSs' => array(
'public/js/bootstrapper.js'
application/views/templates/FHC-Header.php
-2
View File
@@ -93,8 +93,6 @@
// NavigationWidget CSS
if ($navigationwidget === true) generateCSSsInclude('public/css/NavigationWidget.css');
generateCSSsInclude('public/css/fhcomplete.css');
// Eventually required CSS
generateCSSsInclude($customCSSs); // Eventually required CSS
rdf/diplomasupplement.xml.php
+1 -1
View File
@@ -291,7 +291,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
echo ' <niveau_deutsch>Doktoratsstudium (UNESCO ISCED 8)</niveau_deutsch>';
echo ' <niveau_englisch>University doctoral studies (UNESCO ISCED 8)</niveau_englisch>';
}
elseif($row->typ=='l' || $row->typ=='k')
elseif($row->typ=='l' || $row->typ=='k' || $row->typ=='e')
{
echo ' <niveau_code>UNESCO ISCED 7</niveau_code>';
echo ' <niveau_deutsch>Lehrgang zur Weiterbildung nach §9 FHStG idgF.</niveau_deutsch>';