diff --git a/application/views/organisation/studienjahrNew.php b/application/views/organisation/studienjahrNew.php
index 61c11b12e..31fe78630 100644
--- a/application/views/organisation/studienjahrNew.php
+++ b/application/views/organisation/studienjahrNew.php
@@ -1,5 +1,5 @@
load->view('templates/header', array('title' => 'StudienjahrNew', 'jqueryComposer' => true));
+$this->load->view('templates/header', array('title' => 'StudienjahrNew', 'jqueryCurrent' => true));
?>
diff --git a/application/views/organisation/studiensemesterNew.php b/application/views/organisation/studiensemesterNew.php
index 15494ed98..76da57afb 100644
--- a/application/views/organisation/studiensemesterNew.php
+++ b/application/views/organisation/studiensemesterNew.php
@@ -1,5 +1,5 @@
load->view('templates/header', array('title' => 'StudiensemesterNew', 'jqueryComposer' => true, 'datepicker' => true, 'datepickerclass' => 'dateinput'));
+$this->load->view('templates/header', array('title' => 'StudiensemesterNew', 'jqueryCurrent' => true, 'datepicker' => true, 'datepickerclass' => 'dateinput'));
?>
diff --git a/application/views/system/aufnahme/prestudentMultiAssign.php b/application/views/system/aufnahme/prestudentMultiAssign.php
index 2223f3386..85395db47 100644
--- a/application/views/system/aufnahme/prestudentMultiAssign.php
+++ b/application/views/system/aufnahme/prestudentMultiAssign.php
@@ -1,4 +1,4 @@
-load->view("templates/header", array("title" => "Users manager", "jquery19" => true, "tablesort" => true, "jquery_checkboxes" => true, "jquery_custom" => true)); ?>
+load->view("templates/header", array("title" => "Users manager", "jqueryV1" => true, "tablesort" => true, "jquery_checkboxes" => true, "jquery_custom" => true)); ?>
-
+
-
+
-
+
-
+
-
+
load->view("templates/footer"); ?>
diff --git a/application/views/system/messageWrite.php b/application/views/system/messageWrite.php
index b5424e09f..940e097ad 100644
--- a/application/views/system/messageWrite.php
+++ b/application/views/system/messageWrite.php
@@ -1,13 +1,13 @@
-load->view("templates/header", array("title" => "MessageReply", "jquery19" => true, "tinymce" => true)); ?>
+load->view("templates/header", array("title" => "MessageReply", "jqueryV1" => true, "tinymce" => true)); ?>
-
+
-
+
-
+
-
+
-
+
load->view("templates/footer"); ?>
diff --git a/application/views/templates/header.php b/application/views/templates/header.php
index 59ddde80f..e995fb7f3 100644
--- a/application/views/templates/header.php
+++ b/application/views/templates/header.php
@@ -2,8 +2,8 @@
if (! defined('BASEPATH')) exit('No direct script access allowed');
isset($title) ? $title = 'VileSci - '.$title : $title = 'VileSci';
-!isset($jquery19) ? $jquery19 = false : $jquery19 = $jquery19;
-!isset($jqueryComposer) ? $jqueryComposer = false : $jqueryComposer = $jqueryComposer;
+!isset($jqueryV1) ? $jqueryV1 = false : $jqueryV1 = $jqueryV1;
+!isset($jqueryCurrent) ? $jqueryCurrent = false : $jqueryCurrent = $jqueryCurrent;
!isset($jqueryui) ? $jqueryui = false : $jqueryui = $jqueryui;
!isset($jquery_checkboxes) ? $jquery_checkboxes = false : $jquery_checkboxes = $jquery_checkboxes;
!isset($jquery_custom) ? $jquery_custom = false : $jquery_custom = $jquery_custom;
@@ -19,15 +19,15 @@ isset($title) ? $title = 'VileSci - '.$title : $title = 'VileSci';
!isset($datepicker) ? $datepicker = false : $datepicker = $datepicker;
if ($tablesort || $jquery_checkboxes || $jquery_custom)
- $jquery19 = true;
+ $jqueryV1 = true;
if($datepicker)
$jqueryui = true;
if($jqueryui)
- $jqueryComposer = true;
+ $jqueryCurrent = true;
-if($jquery19 && $jqueryComposer)
+if($jqueryV1 && $jqueryCurrent)
show_error("Two JQuery versions used: composer and include folder version");
?>
@@ -42,17 +42,19 @@ if($jquery19 && $jqueryComposer)
-
-
+
+
+
-
+
-
+
+
diff --git a/cis/ampel.php b/cis/ampel.php
index 27b4571d2..3036bcb2b 100755
--- a/cis/ampel.php
+++ b/cis/ampel.php
@@ -8,7 +8,7 @@ require_once('../include/phrasen.class.php');
$sprache = getSprache();
$p = new phrasen($sprache);
?>
-
+
+
+
+
+
+
+
@@ -15,7 +20,7 @@
|
-
\ No newline at end of file
+ |