From c7008c9ccd3000ef7b1ea3506534632e9829cfff Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 30 Jan 2018 16:52:43 +0100 Subject: [PATCH] added Bewerbung Zugang, bewerbung abgeschickt, collapsible menu, Statusgrund entering is compulsory, restyled (button/text positions, colors, zebra widget of tablesorter) --- .../views/system/infocenter/infocenter.php | 2 +- .../system/infocenter/infocenterDetails.php | 468 ++++++++++-------- application/views/widgets/navigationMenu.php | 51 +- skin/admintemplate.css | 9 + skin/tablesort_bootstrap.css | 29 +- 5 files changed, 336 insertions(+), 223 deletions(-) create mode 100644 skin/admintemplate.css diff --git a/application/views/system/infocenter/infocenter.php b/application/views/system/infocenter/infocenter.php index 87bee5b84..3b598203b 100644 --- a/application/views/system/infocenter/infocenter.php +++ b/application/views/system/infocenter/infocenter.php @@ -44,7 +44,7 @@ $("select").addClass("form-control"); $("input[type=text]").addClass("form-control"); $("input[type=button]").addClass("btn btn-default"); - $("#tableDataset").addClass('table table-bordered table-striped table-responsive table-condensed'); + $("#tableDataset").addClass('table table-bordered table-responsive table-condensed'); diff --git a/application/views/system/infocenter/infocenterDetails.php b/application/views/system/infocenter/infocenterDetails.php index e7014b2d6..be2b68906 100644 --- a/application/views/system/infocenter/infocenterDetails.php +++ b/application/views/system/infocenter/infocenterDetails.php @@ -1,28 +1,28 @@ load->view( - 'templates/FHC-Header', - array( - 'title' => 'InfocenterDetails', - 'jquery' => true, - 'bootstrap' => true, - 'fontawesome' => true, - 'jqueryui' => true, - 'tablesorter' => true, - 'sbadmintemplate' => true, - 'customCSSs' => 'skin/tablesort_bootstrap.css' - ) - ); +$this->load->view( + 'templates/FHC-Header', + array( + 'title' => 'InfocenterDetails', + 'jquery' => true, + 'bootstrap' => true, + 'fontawesome' => true, + 'jqueryui' => true, + 'tablesorter' => true, + 'sbadmintemplate' => true, + 'customCSSs' => array('skin/admintemplate.css', 'skin/tablesort_bootstrap.css') + ) +); ?>
widgetlib->widget( - 'NavigationWidget', - array( - 'navigationHeader' => $navigationHeaderArray, - 'navigationMenu' => $navigationMenuArray - ) - ); + echo $this->widgetlib->widget( + 'NavigationWidget', + array( + 'navigationHeader' => $navigationHeaderArray, + 'navigationMenu' => $navigationMenuArray + ) + ); ?>
@@ -35,7 +35,7 @@
-
+

Stammdaten

@@ -128,12 +128,17 @@ heimatadresse === true ? 'Heimatadresse' : '').($adresse->heimatadresse === true && $adresse->rechnungsadresse === true ? ', ' : '').($adresse->rechnungsadresse === true ? 'Rechnungsadresse' : ''); ?> - + -
-
+ zugangscode)): ?> + Zugang Bewerbung: zugangscode) ?> + +
+
@@ -142,12 +147,12 @@
-
+

Dokumentenprüfung

- +
@@ -180,7 +185,7 @@ 0): ?>

Nachzureichende Dokumente:

-
Name Typ
+
@@ -215,7 +220,7 @@
-
+

ZGV-Prüfung

@@ -225,19 +230,26 @@ infoonly; - $firstcolumns = array(3, 2, 2, 2, 3); //set bootstrap columns - if ($infoonly) - $columns = array(3, 2, 2, 5); - else - $columns = array(4, 3, 2, 3); + $columns = array(4, 3, 2, 3); ?> +
-

- studiengang.' - '.$zgvpruefung->studiengangbezeichnung ?> -

+
+
+

+ studiengang.' - '.$zgvpruefung->studiengangbezeichnung.' | '.(isset($zgvpruefung->prestudentstatus->status_kurzbz) ? $zgvpruefung->prestudentstatus->status_kurzbz : ''); + ?> +

+
+ prestudentstatus->status_kurzbz) && $zgvpruefung->prestudentstatus->status_kurzbz === 'Interessent' && !$infoonly): ?> +
+ prestudentstatus->bewerbung_abgeschicktamum) ? '' : ''); ?> +
+ +
@@ -245,13 +257,7 @@
-
-
- - prestudentstatus->bestaetigtam) ? "ja" : "nein" ?> -
-
-
+
-
+
prestudentstatus->studiensemester_kurzbz) ? $zgvpruefung->prestudentstatus->studiensemester_kurzbz : '' ?>
-
+
prestudentstatus->ausbildungssemester) ? $zgvpruefung->prestudentstatus->ausbildungssemester : '' ?>
-
+
@@ -405,7 +411,7 @@
-
+
@@ -413,147 +419,169 @@
+
- -
+ +
-
-
-
- - -
+
+
+ +
+ + + + +
+ + +
+
+
+
- - -
-
-
-
-
- -
-
- - -
-
-
+ +
+
+ prestudentstatus->status_kurzbz) && $zgvpruefung->prestudentstatus->status_kurzbz === 'Interessent'): ?> +
+
+
+ prestudentstatus->bestaetigtam) ? '' : '' ?> + +
+
+
+ +
+
-
-
-
-
-
+
+
+
+
+
-
+

Notizen & Aktivitäten

@@ -575,7 +603,9 @@ rows="10" cols="32">
- +
+ +
Typ Nachzureichen am
@@ -596,15 +626,6 @@
-
-
- - - - - -
-
@@ -624,15 +645,6 @@
-
-
- - - - - -
-
@@ -640,17 +652,17 @@
-
-
- + + + diff --git a/application/views/widgets/navigationMenu.php b/application/views/widgets/navigationMenu.php index d957be2b6..c67f90a55 100644 --- a/application/views/widgets/navigationMenu.php +++ b/application/views/widgets/navigationMenu.php @@ -1,7 +1,46 @@ -