From 2beba613e6501ac5f4e06a25a2c57b73e5827d3e Mon Sep 17 00:00:00 2001 From: Paolo Date: Fri, 25 Aug 2017 14:13:46 +0200 Subject: [PATCH] - Renamed parameter jquery into jquery19 in file application/views/templates/header.php - Fixed includes in prestudentMultiAssign.php and messageWrite.php - Fixed new lines in prestudentMultiAssign.php and messageWrite.php --- .../system/aufnahme/prestudentMultiAssign.php | 646 +++++++++--------- application/views/system/messageWrite.php | 572 ++++++++-------- application/views/templates/header.php | 8 +- 3 files changed, 613 insertions(+), 613 deletions(-) diff --git a/application/views/system/aufnahme/prestudentMultiAssign.php b/application/views/system/aufnahme/prestudentMultiAssign.php index f90ea208c..2223f3386 100644 --- a/application/views/system/aufnahme/prestudentMultiAssign.php +++ b/application/views/system/aufnahme/prestudentMultiAssign.php @@ -1,323 +1,323 @@ -load->view("templates/header", array("title" => "Users manager", "jquery" => true, "tablesort" => true, "jquery_checkboxes" => true, "jquery_custom" => true)); ?> - - -
- - - - - - - - -
- widgetlib->widget( - 'Studiengang_widget', - array(DropdownWidget::SELECTED_ELEMENT => $studiengang), - array('name' => 'studiengang', 'id' => 'studiengangFilter') - ); - ?> - - widgetlib->widget( - 'Studiensemester_widget', - array(DropdownWidget::SELECTED_ELEMENT => $studiensemester), - array('name' => 'studiensemester', 'id' => 'studiensemesterFilter') - ); - ?> - - widgetlib->widget( - 'Reihungstest_widget', - array( - DropdownWidget::SELECTED_ELEMENT => $reihungstest, - 'studiengang' => $studiengang, - 'studiensemester' => $studiensemester - ), - array('name' => 'reihungstest', 'id' => 'reihungstestFilter') - ); - ?> - - widgetlib->widget( - 'Aufnahmegruppe_widget', - array(DropdownWidget::SELECTED_ELEMENT => $aufnahmegruppe), - array('name' => 'aufnahmegruppe', 'id' => 'aufnahmegruppeFilter') - ); - ?> - - widgetlib->widget( - 'Stufe_widget', - array(DropdownWidget::SELECTED_ELEMENT => $stufe), - array('name' => 'stufe', 'id' => 'stufeFilter') - ); - ?> -
-
- -
- -
- - - - - - - - - - - - - - - - - -
- Assign to: -
- widgetlib->widget( - 'Stufe_widget', - array('stufe' => $stufe), - array('name' => 'stufe', 'id' => 'stufeAssign') - ); - ?> -   - -
- widgetlib->widget( - 'Aufnahmegruppe_widget', - array('aufnahmegruppe' => $aufnahmegruppe), - array('name' => 'aufnahmegruppe', 'id' => 'aufnahmegruppeAssign') - ); - ?> -   - -
- -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Prestudent IDPerson IDVornameNachnameGeschlechtStudiengangOrgFormStudienplanGeburtsdatumEmailStufeGruppePunkte
- - - prestudent_id; ?> - - person_id; ?> - - vorname; ?> - - nachname; ?> - - geschlecht; ?> - - kurzbzlang; ?> - - orgform_kurzbz; ?> - - studienplan; ?> - - gebdatum; ?> - - email; ?> - - rt_stufe; ?> - - aufnahmegruppe_kurzbz; ?> - - punkte; ?> -
- -
-
- - - - - - -load->view("templates/footer"); ?> \ No newline at end of file +load->view("templates/header", array("title" => "Users manager", "jquery19" => true, "tablesort" => true, "jquery_checkboxes" => true, "jquery_custom" => true)); ?> + + +
+ + + + + + + + +
+ widgetlib->widget( + 'Studiengang_widget', + array(DropdownWidget::SELECTED_ELEMENT => $studiengang), + array('name' => 'studiengang', 'id' => 'studiengangFilter') + ); + ?> + + widgetlib->widget( + 'Studiensemester_widget', + array(DropdownWidget::SELECTED_ELEMENT => $studiensemester), + array('name' => 'studiensemester', 'id' => 'studiensemesterFilter') + ); + ?> + + widgetlib->widget( + 'Reihungstest_widget', + array( + DropdownWidget::SELECTED_ELEMENT => $reihungstest, + 'studiengang' => $studiengang, + 'studiensemester' => $studiensemester + ), + array('name' => 'reihungstest', 'id' => 'reihungstestFilter') + ); + ?> + + widgetlib->widget( + 'Aufnahmegruppe_widget', + array(DropdownWidget::SELECTED_ELEMENT => $aufnahmegruppe), + array('name' => 'aufnahmegruppe', 'id' => 'aufnahmegruppeFilter') + ); + ?> + + widgetlib->widget( + 'Stufe_widget', + array(DropdownWidget::SELECTED_ELEMENT => $stufe), + array('name' => 'stufe', 'id' => 'stufeFilter') + ); + ?> +
+
+ +
+ +
+ + + + + + + + + + + + + + + + + +
+ Assign to: +
+ widgetlib->widget( + 'Stufe_widget', + array('stufe' => $stufe), + array('name' => 'stufe', 'id' => 'stufeAssign') + ); + ?> +   + +
+ widgetlib->widget( + 'Aufnahmegruppe_widget', + array('aufnahmegruppe' => $aufnahmegruppe), + array('name' => 'aufnahmegruppe', 'id' => 'aufnahmegruppeAssign') + ); + ?> +   + +
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 Prestudent IDPerson IDVornameNachnameGeschlechtStudiengangOrgFormStudienplanGeburtsdatumEmailStufeGruppePunkte
+ + + prestudent_id; ?> + + person_id; ?> + + vorname; ?> + + nachname; ?> + + geschlecht; ?> + + kurzbzlang; ?> + + orgform_kurzbz; ?> + + studienplan; ?> + + gebdatum; ?> + + email; ?> + + rt_stufe; ?> + + aufnahmegruppe_kurzbz; ?> + + punkte; ?> +
+ +
+
+ + + + + + +load->view("templates/footer"); ?> diff --git a/application/views/system/messageWrite.php b/application/views/system/messageWrite.php index 4f4ea7427..b5424e09f 100644 --- a/application/views/system/messageWrite.php +++ b/application/views/system/messageWrite.php @@ -1,286 +1,286 @@ -load->view("templates/header", array("title" => "MessageReply", "jquery" => true, "tinymce" => true)); ?> - - - - - -
- - - - - - - - - - - - - -
- To: - - 1 && $i % 10 == 0) - { - echo '
'; - } - echo $receiver->Vorname . " " . $receiver->Nachname . "; "; - } - ?> -
- Subject:  - - subject; - } - ?> - -
- - - - - - - -
- Message:
- body; - } - ?> - - 		  - -
- Variables:
- -
- -
- - - - - - - -
- widgetlib->widget( - 'Vorlage_widget', - array('oe_kurzbz' => $oe_kurzbz, 'isAdmin' => $isAdmin), - array('name' => 'vorlage', 'id' => 'vorlageDnD') - ); - ?> - -   - - -
- -
- - 0) - { - ?> -
- Preview: -
-
- - - - - - - - - - -
- Recipient: - -   - Refresh -
-   -
- -
-
- - - prestudent_id . '">' . "\n"; - } - ?> - - - - - -
- - - - - -load->view("templates/footer"); ?> \ No newline at end of file +load->view("templates/header", array("title" => "MessageReply", "jquery19" => true, "tinymce" => true)); ?> + + + + + +
+ + + + + + + + + + + + + +
+ To: + + 1 && $i % 10 == 0) + { + echo '
'; + } + echo $receiver->Vorname . " " . $receiver->Nachname . "; "; + } + ?> +
+ Subject:  + + subject; + } + ?> + +
+ + + + + + + +
+ Message:
+ body; + } + ?> + + 		  + +
+ Variables:
+ +
+ +
+ + + + + + + +
+ widgetlib->widget( + 'Vorlage_widget', + array('oe_kurzbz' => $oe_kurzbz, 'isAdmin' => $isAdmin), + array('name' => 'vorlage', 'id' => 'vorlageDnD') + ); + ?> + +   + + +
+ +
+ + 0) + { + ?> +
+ Preview: +
+
+ + + + + + + + + + +
+ Recipient: + +   + Refresh +
+   +
+ +
+
+ + + prestudent_id . '">' . "\n"; + } + ?> + + + + + +
+ + + + + +load->view("templates/footer"); ?> diff --git a/application/views/templates/header.php b/application/views/templates/header.php index 9e47c6fff..59ddde80f 100644 --- a/application/views/templates/header.php +++ b/application/views/templates/header.php @@ -2,7 +2,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); isset($title) ? $title = 'VileSci - '.$title : $title = 'VileSci'; -!isset($jquery) ? $jquery = false : $jquery = $jquery; +!isset($jquery19) ? $jquery19 = false : $jquery19 = $jquery19; !isset($jqueryComposer) ? $jqueryComposer = false : $jqueryComposer = $jqueryComposer; !isset($jqueryui) ? $jqueryui = false : $jqueryui = $jqueryui; !isset($jquery_checkboxes) ? $jquery_checkboxes = false : $jquery_checkboxes = $jquery_checkboxes; @@ -19,7 +19,7 @@ isset($title) ? $title = 'VileSci - '.$title : $title = 'VileSci'; !isset($datepicker) ? $datepicker = false : $datepicker = $datepicker; if ($tablesort || $jquery_checkboxes || $jquery_custom) - $jquery = true; + $jquery19 = true; if($datepicker) $jqueryui = true; @@ -27,7 +27,7 @@ if($datepicker) if($jqueryui) $jqueryComposer = true; -if($jquery && $jqueryComposer) +if($jquery19 && $jqueryComposer) show_error("Two JQuery versions used: composer and include folder version"); ?> @@ -42,7 +42,7 @@ if($jquery && $jqueryComposer) - +