From 44be65f08e191b536586ef043a01f6b8091f6568 Mon Sep 17 00:00:00 2001 From: kindlm Date: Fri, 17 Apr 2015 12:11:29 +0200 Subject: [PATCH] =?UTF-8?q?Pers=C3=B6nliche=20Daten?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- content/about.xul.php | 8 ++- content/fas.xul.php | 12 ++--- content/fasoverlay.js.php | 4 +- .../mitarbeiterdetailoverlay.xul.php | 27 ++++++---- .../mitarbeiter/mitarbeiteroverlay.xul.php | 48 ++++++++++-------- locale/de-AT/fas.dtd | 4 +- skin/images/fh_complete_logo_400x61.png | Bin 0 -> 14024 bytes 7 files changed, 61 insertions(+), 42 deletions(-) create mode 100644 skin/images/fh_complete_logo_400x61.png diff --git a/content/about.xul.php b/content/about.xul.php index c267e3208..bb94a0dad 100644 --- a/content/about.xul.php +++ b/content/about.xul.php @@ -38,12 +38,15 @@ echo ''; - + + + + - @@ -70,6 +73,7 @@ echo ''; Rudolf Hangl <rudolf.hangl@technikum-wien.at>, Gerald Raab <gerald.raab@technikum-wien.at> and Gerald Simane-Sequens <gerald.simane-sequence@technikum-wien.at> + Manfred Kindl <manfred.kindl@technikum-wien.at> diff --git a/content/fas.xul.php b/content/fas.xul.php index a4ff5f1ef..76ebf95c1 100644 --- a/content/fas.xul.php +++ b/content/fas.xul.php @@ -835,12 +835,6 @@ foreach($addon_obj->result as $addon) - result as $addon) label = "&menu-help-todo.label;" command = "menu-help-todo:command" accesskey = "&menu-help-todo.accesskey;"/> + diff --git a/content/fasoverlay.js.php b/content/fasoverlay.js.php index 93a9dadc1..25a698bb7 100644 --- a/content/fasoverlay.js.php +++ b/content/fasoverlay.js.php @@ -1405,7 +1405,7 @@ function OpenAboutDialog() // **** function OpenManual() { - window.open('content/FASo.pdf','Manual'); + window.open('http://fhcomplete.technikum-wien.at/dokuwiki/doku.php?','_blank'); } // **** @@ -1413,7 +1413,7 @@ function OpenManual() // **** function OpenToDoDialog() { - window.open('http://fhcomplete.technikum-wien.at/mantis/login.php?username=anonymous&return=%2Fmantis%2Froadmap_page.php%3F','ToDo','height=600,width=800,left=150,top=150,hotkeys=0,resizable=yes,status=yes,scrollbars=yes,toolbar=yes,location=yes,menubar=yes,dependent=yes'); + window.open('http://fhcomplete.technikum-wien.at/mantis/login.php?username=anonymous&return=%2Fmantis%2Froadmap_page.php%3F','_blank'); } // **** diff --git a/content/mitarbeiter/mitarbeiterdetailoverlay.xul.php b/content/mitarbeiter/mitarbeiterdetailoverlay.xul.php index 4ee59bf7f..63da3d978 100644 --- a/content/mitarbeiter/mitarbeiterdetailoverlay.xul.php +++ b/content/mitarbeiter/mitarbeiterdetailoverlay.xul.php @@ -26,6 +26,11 @@ header("Pragma: no-cache"); header("Content-type: application/vnd.mozilla.xul+xml"); require_once('../../config/vilesci.config.inc.php'); +require_once('../../include/benutzerberechtigung.class.php'); + +$user = get_uid(); +$rechte = new benutzerberechtigung(); +$rechte->getBerechtigungen($user); echo ''; ?> @@ -80,27 +85,28 @@ echo '';