-
+
diff --git a/fhcomplete_cis.html b/fhcomplete_cis.html
index 37ba2a2d9..295078ea5 100644
--- a/fhcomplete_cis.html
+++ b/fhcomplete_cis.html
@@ -2,132 +2,50 @@
FH Complete
+
-
+
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fhcomplete_community.html b/fhcomplete_community.html
new file mode 100644
index 000000000..e6b17082c
--- /dev/null
+++ b/fhcomplete_community.html
@@ -0,0 +1,102 @@
+
+
+
+ FH Complete
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ COMMUNITY
+
+
+
+
+
+
+
+
+
+
+ Roadmap FH-Complete in Mantis
+
+
+
+
+
+
+
+
+
+
+
+
+
+
FH Complete
+
-
+
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fhcomplete_impressum.html b/fhcomplete_impressum.html
index c8a4f8242..65848e74b 100644
--- a/fhcomplete_impressum.html
+++ b/fhcomplete_impressum.html
@@ -2,140 +2,59 @@
FH Complete
+
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
IMPRESSUM
-
+
Offenlegungspflicht gemäß § 25 Mediengesetz und Informationspflicht gemäß § 5 E-Commerce-Gesetz:
-
-
+
diff --git a/fhcomplete_kontakt.html b/fhcomplete_kontakt.html
index e630ced87..5fb8b9ff0 100644
--- a/fhcomplete_kontakt.html
+++ b/fhcomplete_kontakt.html
@@ -2,7 +2,10 @@
FH Complete
+
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
KONTAKT
-
-
+
+
E-Mail Koordination LV-Planung Systemadministration E-Mail
-
-
+
diff --git a/fhcomplete_tempus.html b/fhcomplete_tempus.html
index 0b47cc1d9..7f9347623 100644
--- a/fhcomplete_tempus.html
+++ b/fhcomplete_tempus.html
@@ -2,143 +2,61 @@
FH Complete
+
-
+
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
@@ -204,7 +122,7 @@
-
+
Zugangsdaten und Einstellungen
@@ -215,10 +133,10 @@
-
-
+
diff --git a/fhcomplete_vilesci.html b/fhcomplete_vilesci.html
index a6c6f43ec..860f65faf 100644
--- a/fhcomplete_vilesci.html
+++ b/fhcomplete_vilesci.html
@@ -2,143 +2,61 @@
FH Complete
+
-
+
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
@@ -205,7 +123,7 @@
-
+
Zugangsdaten und Einstellungen
@@ -216,10 +134,10 @@
-
-
+
diff --git a/fhcomplete_wawi.html b/fhcomplete_wawi.html
index 81221b7b1..87ad6b46f 100644
--- a/fhcomplete_wawi.html
+++ b/fhcomplete_wawi.html
@@ -2,143 +2,61 @@
FH Complete
+
-
+
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
@@ -199,7 +117,7 @@
-
-
+
diff --git a/include/tw/vilesci_menu_main.inc.php b/include/tw/vilesci_menu_main.inc.php
index 66b861e22..cacb176d5 100644
--- a/include/tw/vilesci_menu_main.inc.php
+++ b/include/tw/vilesci_menu_main.inc.php
@@ -166,6 +166,7 @@ $menu=array
'Statistik'=>array('name'=>'Statistik', 'link'=>'stammdaten/statistik_frameset.html', 'target'=>'main','permissions'=>array('basis/statistik')),
'Ampel'=>array('name'=>'Ampel', 'link'=>'stammdaten/ampel_frameset.html', 'target'=>'main','permissions'=>array('basis/ampel')),
'Infoscreen'=>array('name'=>'Infoscreen', 'link'=>'stammdaten/infoscreen_frameset.html', 'target'=>'main','permissions'=>array('basis/infoscreen')),
+ 'Ferien'=>array('name'=>'Ferien', 'link'=>'lehre/ferienverwaltung.php', 'target'=>'main','permissions'=>array('admin')),
'ImExport'=>array
(
'name'=>'ImExport','permissions'=>array('admin'),
diff --git a/index.fhcomplete_ueberblick.html b/index.fhcomplete_ueberblick.html
index ce5df073c..4720f4eaa 100644
--- a/index.fhcomplete_ueberblick.html
+++ b/index.fhcomplete_ueberblick.html
@@ -2,120 +2,48 @@
FH Complete
-
+
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
Das Produktpaket FH Complete 2.0 beinhaltet fünf Applikationen,
welche mit einer zentralen Datenbank arbeiten und
@@ -135,7 +63,7 @@
-
+
@@ -145,7 +73,7 @@
-
+
Das Campus Informations-System ist die Web-Oberfläche
für Studierende und LektorInnen. Hier finden sie News,
@@ -155,17 +83,17 @@
-
+
-
-
+
Das FH Adminstrations-System dient als Oberfläche zur Verwaltung
aller relevanten Daten für Studierende, LektorInnen
@@ -174,17 +102,17 @@
-
+
-
-
+
Tempus dient dazu, die Lehraufträge in konkreten Lehreinheiten
abzubilden. Hier werden Kollisionen erkannt,
@@ -195,17 +123,17 @@
-
+
-
-
+
Im WaWi werden neben dem Inventar auch Bestellungen und
Rechnungen verwaltet. Ein ausgeklügeltes Freigabesystem
@@ -215,17 +143,17 @@
-
+
-
-
+
Vilesci bietet für AdministratorInnen eine Oberfläche für
die Bearbeitung und Pflege von Hintergrunddaten, für eine
@@ -235,14 +163,14 @@
-
+
-
+
diff --git a/skin/fhcomplete_website.css b/skin/fhcomplete_website.css
new file mode 100644
index 000000000..9375ce887
--- /dev/null
+++ b/skin/fhcomplete_website.css
@@ -0,0 +1,129 @@
+/* Copyright (C) 2010 Technikum-Wien
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Christian Paminger ,
+ * Andreas Oesterreicher ,
+ * Manfred Kindl and
+ * Karl Burkhart .
+ */
+@charset "utf-8";
+
+body
+ {
+ background-color: #006095;
+ }
+ div
+ {
+ font-size:12px;
+ font-family:Arial;
+ }
+ p
+ {
+ font-size:14px;
+ font-family:Arial;
+ padding-left:50px;
+ padding-right:50px;
+ color:#D1D7DA;
+ text-align: justify;
+ }
+ td,tr
+ {
+ align:center;
+ text-align:center;
+ }
+ a
+ {
+ text-decoration:underline;
+ cursor:pointer;
+ font-size:14px;
+ color:#D1D7DA;
+ font-family:Arial;
+ border:0;
+ }
+ ul
+ {
+ list-style-type:square;
+ list-style-position:inside;
+ color:#FFF;
+ text-align:left;
+ font-size:14px;
+ font-family:Arial;
+ padding-left:50px;
+ padding-right:50px;
+ color:#D1D7DA;
+ text-align: justify;
+ }
+ img
+ {
+ border:0;
+ }
+ td.menu
+ {
+ text-align:center;
+ vertical-align:bottom;
+ width:170px;
+ background:url(images/menue.png);
+ background-position:top left;
+ background-repeat:no-repeat;
+ border-bottom:1px solid #FFF;
+ padding-bottom:5px;
+ }
+ td.menu_spacer
+ {
+ text-align:center;
+ vertical-align:bottom;
+ width:20px;
+ border-bottom:1px solid #FFF;
+ padding-bottom:5px;
+ }
+ td:hover.menu, td:active.menu, td:focus.menu, td.menuselected
+ {
+ text-align:center;
+ vertical-align:bottom;
+ width:170px;
+ background:url(images/menue_hover.png);
+ background-position:top left;
+ background-repeat:no-repeat;
+ border-bottom:1px solid #FFF;
+ padding-bottom:5px;
+ text-decoration:none;
+ cursor:pointer;
+ }
+ a.menu
+ {
+ padding-top:40px;
+ width:170px;
+ vertical-align:bottom;
+ color:#FFF;
+ text-decoration:none;
+ cursor:pointer;
+ display:block;
+ font-size:16px;
+ font-family:Arial;
+ }
+ a:hover.menu, a:active.menu, a:focus.menu, a.menuselected
+ {
+ padding-top:40px;
+ width:170px;
+ vertical-align:bottom;
+ text-decoration:none;
+ font-size:16px;
+ color:#006095;
+ cursor:pointer;
+ display:block;
+ }
+
+
\ No newline at end of file
diff --git a/system/sync/sync_stpldev_stpl.php b/system/sync/sync_stpldev_stpl.php
index cae399d58..6966f394e 100644
--- a/system/sync/sync_stpldev_stpl.php
+++ b/system/sync/sync_stpldev_stpl.php
@@ -89,6 +89,17 @@ if(isset($_GET['custom']))
$datum_begin = $_GET['von'];
$datum_ende = $_GET['bis'];
}
+$db =new basis_db();
+// Beginnzeiten holen
+$qry = "SELECT stunde,to_char(beginn, 'HH24:MI') AS beginn FROM lehre.tbl_stunde";
+$beginnzeit_arr=array();
+if($result = $db->db_query($qry))
+{
+ while($row = $db->db_fetch_object($result))
+ {
+ $beginnzeit_arr[$row->stunde]=$row->beginn;
+ }
+}
// ************* FUNCTIONS **************** //
function getStudentsFromGroup($studiengang_kz, $semester, $verband, $gruppe, $gruppe_kurzbz, $studiensemester_kurzbz)
@@ -142,6 +153,10 @@ function getStudentsFromGroup($studiengang_kz, $semester, $verband, $gruppe, $gr
// **************************************** //
$message_begin='
