From 50a4fe4c1eaeb1453f68d4c963170086ea171f09 Mon Sep 17 00:00:00 2001
From: kindlm <kindlm@technikum-wien.at>
Date: Tue, 1 Sep 2015 16:31:51 +0200
Subject: [PATCH] Tausch CIS-Logo

---
 cis/index.html         | 12 +++---------
 cis/index.php          |  7 +++----
 skin/styles/mobile.css |  6 ++++--
 skin/styles/tw.css     |  6 +++---
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/cis/index.html b/cis/index.html
index a4cfad8b2..9324bb0e5 100644
--- a/cis/index.html
+++ b/cis/index.html
@@ -15,15 +15,9 @@
 		<td class="boxshadow">
 		<table cellspacing="0" cellpadding="0" class="header">
 			<tr>
-				<td valign="top" align="left">
-					<img class="header_logo" src="../skin/images/logo.png" alt="logo">
-					<img class="header_left" src="../skin/images/header_left.png" alt="header_links">
-					<img class="header_right" src="../skin/images/header_right.png" alt="header_rechts">
-				</td>
-			</tr>
-			<tr>
-				<td align="center" valign="middle">					
-					<img src="../skin/images/cis_logo_400px.png" height="70" />
+				<td align="center" valign="middle" style="background-image: url(../skin/styles/tw/header.png); background-position: top; background-repeat: repeat-x;">					
+					<img class="header_logo" src="../skin/styles/tw/logo_250x130.png" alt="logo">
+					<img src="../skin/styles/tw/cis_logo_text_400x78.png" />
 					<br><br><br>
 					<!--Herzlich Willkommen im Campus Informationssystem (CIS)-->
 					<br>
diff --git a/cis/index.php b/cis/index.php
index 2346460e5..880e39647 100644
--- a/cis/index.php
+++ b/cis/index.php
@@ -161,10 +161,9 @@ function loadampel()
 <td class="boxshadow">
 	<table cellspacing="0" cellpadding="0" class="header">
 		<tr>
-		<td valign="top" align="left">
-		<a href="index.php"><img class="header_logo" src="../skin/images/logo.png" alt="logo"></a>
-		<img class="header_left" src="../skin/images/header_left.png" alt="header_links">
-		<img class="header_right" src="../skin/images/header_right.png" alt="header_rechts">   	 	
+		<td valign="top" align="left" style="background-image: url(<?php echo APP_ROOT.'skin/styles/'.EXT_FKT_PATH.'/header.png'; ?>); background-position: top; background-repeat: repeat-x;">
+		<a href="index.php"><img class="header_logo" src="<?php echo APP_ROOT.'skin/styles/'.EXT_FKT_PATH.'/logo_250x130.png'; ?>" alt="logo"></a>
+		<!--<img class="header" src="<?php echo APP_ROOT.'skin/styles/'.EXT_FKT_PATH.'/header.png'; ?>" alt="header">-->  	 	
 	   	 	<table class="header_content" cellpadding="0">
 		   	  <tr>
 		   	    <td width="20%" align="center">&nbsp;
diff --git a/skin/styles/mobile.css b/skin/styles/mobile.css
index 1e7c14254..186774433 100644
--- a/skin/styles/mobile.css
+++ b/skin/styles/mobile.css
@@ -35,10 +35,11 @@ iframe
 	padding:0px;
 	height: 100%;
 	top: 15%;
-	
+	/*
 	border-width:1px;
 	border-style:solid;
 	border-color: #A5AFB6;
+	*/
 }
 textarea
 {
@@ -692,7 +693,8 @@ img.header_logo
 	left: 16px;
 	top: 3%;
 	z-index: 5000;
-	height: 5%;
+	max-height: 7%;
+	max-width: 11%;
 }
 /*
 ==== Farben ====
diff --git a/skin/styles/tw.css b/skin/styles/tw.css
index 2bc597eaf..c0fd11719 100644
--- a/skin/styles/tw.css
+++ b/skin/styles/tw.css
@@ -695,7 +695,7 @@ img.lv
 	height: 40px;
 	padding-bottom: 5px;
 }
-img.header_left
+/*img.header_left
 {
 	position: absolute;
 	left: 0px;
@@ -710,14 +710,14 @@ img.header_right
 	z-index: 2;
 	max-width: 100%;
 	height: 16%;
-}
+}*/
 img.header_logo
 {
 	position: absolute;
 	left: 16px;
 	top: 3%;
 	z-index: 5000;
-	height: 7%;
+	height: 8%;
 }
 img.screenshot_boxshadow
 {