diff --git a/application/config/navigation.php b/application/config/navigation.php index 092c00cc5..928f5bae3 100644 --- a/application/config/navigation.php +++ b/application/config/navigation.php @@ -164,7 +164,14 @@ $config['navigation_header'] = array( 'expand' => true, 'sort' => 20, 'requiredPermissions' => 'system/developer:r' - ) + ), + 'anrechnungen' => array( + 'link' => site_url('lehre/anrechnung/AdminAnrechnung'), + 'description' => 'Anrechnungen', + 'expand' => true, + 'sort' => 30, + 'requiredPermissions' => 'lehre/anrechnungszeitfenster:rw' + ) ) ) ) @@ -184,6 +191,15 @@ $config['navigation_menu']['Vilesci/index'] = array( ) ); +$config['navigation_menu']['Vilesci/index'] = array( + 'dashboard' => array( + 'link' => '#', + 'description' => 'Dashboard', + 'icon' => 'dashboard', + 'sort' => 1 + ) +); + $config['navigation_menu']['organisation/Reihungstest/index'] = array( 'reihungstestverwalung' => array( 'link' => base_url('vilesci/stammdaten/reihungstestverwaltung.php'), diff --git a/application/views/lehre/anrechnung/adminAnrechnung.php b/application/views/lehre/anrechnung/adminAnrechnung.php index 3f0cd65b5..ae41bcf8b 100644 --- a/application/views/lehre/anrechnung/adminAnrechnung.php +++ b/application/views/lehre/anrechnung/adminAnrechnung.php @@ -1,6 +1,6 @@ $this->p->t('anrechnung', 'neueAnrechnung'), + 'title' => $this->p->t('anrechnung', 'anrechnungenVerwalten'), 'jquery3' => true, 'jqueryui1' => true, 'bootstrap3' => true, @@ -9,6 +9,8 @@ $includesArray = array( 'dialoglib' => true, 'tabulator4' => true, 'tablewidget' => true, + 'sbadmintemplate3' => true, + 'navigationwidget' => true, 'phrases' => array( 'anrechnung' => array( 'anrechnungenVerwalten', @@ -39,33 +41,38 @@ $includesArray = array( $this->load->view('templates/FHC-Header', $includesArray); ?> +
-
-
+ widgetlib->widget('NavigationWidget'); ?> - -
+
+
- -

p->t('anrechnung', 'anrechnungszeitraumFestlegen'); ?>


+ +
-
- -
+ +

p->t('anrechnung', 'anrechnungszeitraumFestlegen'); ?>


- -
-
- load->view('lehre/anrechnung/adminAnrechnungData.php'); ?> +
+
+ +
-
- -
diff --git a/application/views/lehre/anrechnung/adminAnrechnungData.php b/application/views/lehre/anrechnung/adminAnrechnungData.php index cafd33dfa..652c349d8 100644 --- a/application/views/lehre/anrechnung/adminAnrechnungData.php +++ b/application/views/lehre/anrechnung/adminAnrechnungData.php @@ -21,7 +21,7 @@ $filterWidgetArray = array( ), 'datasetRepOptions' => '{ height: func_height(this), - layout: "fitColumns", // fit columns to width of table + layout: "fitDataFill", persistentLayout:true, autoResize: false, // prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated headerFilterPlaceholder: " ",