From a05cca8861371264ef5245fb7227fe71c02a29ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Wed, 18 Apr 2012 12:44:34 +0000 Subject: [PATCH] Infoscreen Anpassungen --- cis/infoterminal/infoscreen.php | 16 +- cms/news.php | 23 ++- skin/infoscreen.css | 12 +- system/templates/news_infoscreen.xsd | 8 + .../templates/news_infoscreen_xslt_xhtml.xslt | 139 ++++++++++++++++++ 5 files changed, 187 insertions(+), 11 deletions(-) create mode 100755 system/templates/news_infoscreen.xsd create mode 100755 system/templates/news_infoscreen_xslt_xhtml.xslt diff --git a/cis/infoterminal/infoscreen.php b/cis/infoterminal/infoscreen.php index 0fb0bed4a..995247648 100644 --- a/cis/infoterminal/infoscreen.php +++ b/cis/infoterminal/infoscreen.php @@ -30,7 +30,13 @@ header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past if(isset($_GET['ipadresse'])) $ip = $_GET['ipadresse']; else - $ip = $_SERVER["REMOTE_ADDR"]; +{ + if(isset($_SERVER['HTTP_X_FORWARDED_FOR'])) + $ip = $_SERVER['HTTP_X_FORWARDED_FOR']; + else + $ip = $_SERVER["REMOTE_ADDR"]; +} + $infoscreen = new infoscreen(); $i=0; $refreshzeit = 40; // Default Refreshzeit @@ -87,8 +93,7 @@ if(isset($refreshzeiten[$aktuellerContentIdx]) && $refreshzeiten[$aktuellerConte // Cookie enthaelt die zuletzt angezeigte Seite setcookie($cookie,$infoscreen_content[$aktuellerContentIdx],time()+3600*24); -echo ' - +echo ' @@ -104,7 +109,7 @@ var speed=1 '; +echo ''; if($aktuellerContentIdx!=0) { diff --git a/cms/news.php b/cms/news.php index f9a10ae6c..03c5d5e32 100755 --- a/cms/news.php +++ b/cms/news.php @@ -53,6 +53,7 @@ $db = new basis_db(); $studiengang_kz = (isset($_GET['studiengang_kz'])?$_GET['studiengang_kz']:0); $semester = (isset($_GET['semester'])?$_GET['semester']:null); +$infoscreen = isset($_GET['infoscreen']); $editable = isset($_GET['edit']); $news = new news(); $all=false; @@ -86,9 +87,16 @@ foreach($news->result as $row) //$xml .= $content->content; } -if($studiengang_kz!=0 && $studiengang_kz!=10006 && !$editable) +if($studiengang_kz!=0 && !$editable && !$infoscreen) $xml.=getStgContent($studiengang_kz, $semester, $sprache); +if($studiengang_kz!=0) +{ + $stg_obj = new studiengang(); + $stg_obj->load($studiengang_kz); + $xml.=''.$stg_obj->bezeichnung.''; +} + $xml .= ''; $doc = new DOMDocument(); @@ -96,8 +104,17 @@ $doc->loadXML($xml); //XSLT Vorlage laden $template = new template(); -if(!$template->load('news')) - die($template->errormsg); + +if($infoscreen) +{ + if(!$template->load('news_infoscreen')) + die($template->errormsg); +} +else +{ + if(!$template->load('news')) + die($template->errormsg); +} $xsltemplate = new DOMDocument(); $xsltemplate->loadXML($template->xslt_xhtml); diff --git a/skin/infoscreen.css b/skin/infoscreen.css index c6126d7ce..631fdd190 100644 --- a/skin/infoscreen.css +++ b/skin/infoscreen.css @@ -93,12 +93,14 @@ address,pre /* Adresse, Rohdaten */ } h1 /* Überschrift 1 */ { - background-color: #CCCCCC; /*mittel-grau */ + color: #ffffff; + background-color: #008381; /*gruen*/ font-weight: bold; padding-top: 2px; padding-bottom: 2px; padding-left: 4px; - font-size: 16px; + font-size: 1.8em; + text-align: center; } h2 /* Überschrift 2 */ { @@ -152,6 +154,12 @@ h5, h6 /* Überschrift 5,6 - Werden nicht speziell formatiert, sondern dem norma white-space: nowrap; background-color: #C6C6C6; } +#news .news .titel table +{ + font-weight: bold; + padding: 0px 10px 0px 10px; + white-space: nowrap; +} #news .news .text { background-color: #FCFCFC; diff --git a/system/templates/news_infoscreen.xsd b/system/templates/news_infoscreen.xsd new file mode 100755 index 000000000..b58d63cbd --- /dev/null +++ b/system/templates/news_infoscreen.xsd @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/system/templates/news_infoscreen_xslt_xhtml.xslt b/system/templates/news_infoscreen_xslt_xhtml.xslt new file mode 100755 index 000000000..d4468ea9e --- /dev/null +++ b/system/templates/news_infoscreen_xslt_xhtml.xslt @@ -0,0 +1,139 @@ + + + + + + News + + + + + + + + + + +
+

News

+
+ + + + + + + + +
+ 		+ +
+ + + + +
+
+ + + + + +
+ + ( ) + + + edit + delete + + +
+
+
+ +
+
+
+ + +

+ +
+
+ +
+ +
+ +
+ + +
+ +
+ + +
+ +
+ + + +
+
+ +
+ + + + + + +
+ +
+ Tel.: +
+ + +
+ +
+ Tel.: +
+ + +
+ +
+ Tel.: +
+ + +
+ +
+ Tel.: +
+ + + +
+ + + + +
+
+
+ + +