From 6ed09e1d396c40e6afcf8468aea2634a90fc6dcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 23 Dec 2008 14:51:27 +0000
Subject: [PATCH]

---
 .../lehrveranstaltungoverlay.xul.php          |   2 +-
 skin/images/application_form_delete.png       | Bin 0 -> 605 bytes
 skin/images/application_form_edit.png         | Bin 0 -> 714 bytes
 skin/vilesci.css                              |   6 ++++
 vilesci/stammdaten/firma_details.php          |  34 +++++++++++-------
 vilesci/stammdaten/firma_frameset.html        |   2 +-
 vilesci/stammdaten/firma_uebersicht.php       |   2 +-
 7 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100644 skin/images/application_form_delete.png
 create mode 100644 skin/images/application_form_edit.png

diff --git a/content/lvplanung/lehrveranstaltungoverlay.xul.php b/content/lvplanung/lehrveranstaltungoverlay.xul.php
index 8ed10335a..205fe83d2 100644
--- a/content/lvplanung/lehrveranstaltungoverlay.xul.php
+++ b/content/lvplanung/lehrveranstaltungoverlay.xul.php
@@ -138,7 +138,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/lvplanung/lehrveranstaltungnotenov
 					class="sortDirectionIndicator"
 					sort="rdf:http://www.technikum-wien.at/lehrveranstaltung_einheiten/rdf#anmerkung"/>
 				<splitter class="tree-splitter"/>
-				<treecol id="lehrveranstaltung-treecol-fachbereich" label="Fachbereich" flex="1" hidden="false" persist="hidden, width, ordinal"
+				<treecol id="lehrveranstaltung-treecol-fachbereich" label="Institut" flex="1" hidden="false" persist="hidden, width, ordinal"
 					class="sortDirectionIndicator"
 					sort="rdf:http://www.technikum-wien.at/lehrveranstaltung_einheiten/rdf#fachbereich"/>
 				<splitter class="tree-splitter"/>
diff --git a/skin/images/application_form_delete.png b/skin/images/application_form_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd305ec83b6a7560de21a287fa7a780bad893efe
GIT binary patch
literal 605
zcmV-j0;2tiP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz?@2^KR2Uhh
z!M{t?aU93-=jZOLT^;=*N<-?@Xu1}|ts5eOAZVyTq&X}M5nBq15Q?BBQ4p#A0wWxR
z7Hf!pKr~piSVO4c9ZH~*dRE_izhC)91cQD_k4KQi{|KkM1}_$lHs78tD=Pu+$Q^S-
zE?kbxa0!`V?rf`$m&V45mxu1O^heD{n)|9U*;Gx2jmR#Qtq<sr%CS=A*+n*LIaZ1l
zkxX1WQ^!Vi^iGn9Bu5e=ArKG(Z$?M?ox@E{m>Y=*2{WUucY-zdJL^dl3I%>;ad8o^
z7>UT-aEZGeIS2v;T;fmM9XBTt$%UH}0?1h*2qK@)Ge19v#5w^G0dO}Gk-On;h*g0V
zg0c5w{A6?(dp$&D`V;BhwH(@f3^+wpiDS%+&U-Vg>20eaQ79BhObrh(SA506v+ZnZ
z$g})zgzWPtJU(945y>2Pr{~-rKqTCq^~N9e(A;`~%*Utj>?T{b@1P-<WAuZ%B6r7K
zfD-_*s<H6^rBVq9d@oIqscnFhmsk^Z?<MV_J}Qn+KDaR$x40Q@j+x=^SRCW-xI{~4
zC*`+~$PTyjZF!n9u<#{~r6~nT{LPEjy6)<&*{l0@RiY?0#lq(b6EkUxzv_CB#J_mi
ry8p`3Z0UU3LeA1E3I<M$RBrtMF3c7U8sGJe00000NkvXXu0mjf%W((U

literal 0
HcmV?d00001

diff --git a/skin/images/application_form_edit.png b/skin/images/application_form_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..af486c940c60b746d56e757686d51801bf18ae72
GIT binary patch
literal 714
zcmV;*0yX`KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!TuDShR5;6}
zlkZDYQ5eVXztG$0RWBlt>MscT0g(~ZNI{bH#Y_Utm11j?0+FF&hK-qRX-TePYY3~f
zgtoM;)~2M+AJew!(sr+7^KN&$cgxoJcJAGZGzzQ(AD(j#=leYm&p8hTfchUO*=18r
zr!~koJq|$qh+zB()q@3G>7PU6y;(H$c~Nhe#3lU)C~l9VR_BJ=;N(S}WT3GGbJ~$L
zY!^k>SWYq!Z~hmmJ4PWHsEvN4)9Gy^Z?)wOR0E3;1OdDR51!|xxx?Z3jR~6$3lGcS
zw`wrecMQ|rMHQ4-uw*icvKH@8Qe-U(ejNgB1!Gqt;e8II!iak<aNRh*Mv2u<a2&V<
zflCx3x5+@DhrrG^V`KFxn9&ZTX9n>t<iyPV>I@}570bpEkH@7b5obwc$sUX75)sc{
zLoV$^I#`Q!&qeqK<Z$cd@MvXwsD|EY#9}c-3yAYrG$v)>v2}x;Q6ZOcK?qbLvr>-a
zyc(hY)2O@Nn=hiGX9AH(WK#{q_3OcQFyqRCxB{6^XTi-jVaae3jL(UZMoZqHPUiu`
zFod;2WZ-*e#Qe)flJ*;9mgV@eat;ZSNkD%BUpZPjbEd(ZH>lOVM>tFq!k`K6p&rZ)
zt1<ne3!mMk5SGiaK6MrTyQi?aI0>2-&(V<8oA9F-Oc!oCq@PvQW{0``D3A<c!B7Ib
zdMDoADaLT~A=Ie!B<&~UW)p};#3UJP?XH&dMcECP4jb-UaBB|3T(v7TqS}ApkKMR+
wqx9g8Ol#%dtgWp$`>ONE*fZt6-G6K6?>+q?gw;DtTL1t607*qoM6N<$g3ymi=>Px#

literal 0
HcmV?d00001

diff --git a/skin/vilesci.css b/skin/vilesci.css
index f77aa03fa..2f2458e54 100644
--- a/skin/vilesci.css
+++ b/skin/vilesci.css
@@ -564,6 +564,12 @@ input, textarea, select
 	width:100%;
 	text-align:center;
 }
+.insertok
+{
+	background-color:#68AC50;
+	width:100%;
+	text-align:center;
+}
 
 /* Sortable tables */
 table.sortable thead 
diff --git a/vilesci/stammdaten/firma_details.php b/vilesci/stammdaten/firma_details.php
index c5bbfc68e..44632239a 100644
--- a/vilesci/stammdaten/firma_details.php
+++ b/vilesci/stammdaten/firma_details.php
@@ -45,6 +45,7 @@
 	
 	$htmlstr = '';
 	$errorstr = '';
+	$messagestr='';
 	$reloadstr = '';
 	$error = false;
 	$firma_id = (isset($_REQUEST["firma_id"])?$_REQUEST['firma_id']:'');
@@ -128,7 +129,7 @@
 			}
 			else
 			{
-				$errorstr = 'Daten wurden gespeichert';
+				$messagestr = 'Adressdaten wurden erfolgreich gespeichert';
 			}
 		}
 	}
@@ -175,6 +176,7 @@
 				$reloadstr .= "	parent.uebersicht_firma.location.href='firma_uebersicht.php?filter='+parent.uebersicht_firma.filter+'&firmentypfilter='+parent.uebersicht_firma.firmentypfilter;";
 				$reloadstr .= " window.top.opener.StudentProjektarbeitFirmaRefresh();";
 				$reloadstr .= "</script>\n";
+				$messagestr='Firmendaten wurden erfolgreich gespeichert';
 			}
 			else
 			{
@@ -191,6 +193,7 @@
 <html>
 <head>
 <title>Firma - Details</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
 <link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
 <script src="../../include/js/mailcheck.js"></script>
 <script src="../../include/js/datecheck.js"></script>
@@ -198,7 +201,7 @@
 
 function confdel()
 {
-	if(confirm("Diesen Datensatz wirklick loeschen?"))
+	if(confirm("Diesen Datensatz wirklich loeschen?"))
 	  return true;
 	return false;
 }
@@ -209,6 +212,10 @@ function confdel()
 
 <?php
 	//Formular fuer die Firmendaten
+	if($errorstr!='')
+		echo "<div class='inserterror'>".$errorstr."</div>\n";
+	elseif($messagestr!='')
+		echo "<div class='insertok'>".$messagestr."</div>\n";
 	
 	$firma = new firma($conn);
 	if($firma_id!='')
@@ -249,7 +256,11 @@ function confdel()
 			echo "				<option value='".$row->firmentyp_kurzbz."' ".$sel.">".$row->firmentyp_kurzbz."</option>";
 		}
 	}
-	echo "		</select></td></tr><tr>\n";
+	echo "		</select></td>";
+	
+	echo "		<td>Schule: </td>";
+	echo "		<td><input type='checkbox' name='schule' ".($firma->schule?'checked':'')."></td>\n";
+	echo "</tr><tr>\n";
 		
 	echo "		<td>EMail: </td>";
 	echo "		<td><input type='text' name='email' value='".htmlentities($firma->email)."' size='40' maxlength='128' /></td>\n";
@@ -262,13 +273,10 @@ function confdel()
 	echo "</tr><tr valign='top'>";
 	echo "		<td>Anmerkung: </td>";
 	echo "		<td colspan='5'><textarea style='width:100%' name='anmerkung'/>".htmlentities($firma->anmerkung)."</textarea></td>\n";
-	echo "		<td>Schule: </td>";
-	echo "		<td><input type='checkbox' name='schule' ".($firma->schule?'checked':'')."<br><input type='submit' name='save' value='speichern'></td>";
+	echo "		<td></td><td valign='bottom'><input type='submit' name='save' value='speichern'></td>\n";
 	echo "	</tr></table>\n";
 	echo "</form>\n";
-				
-	echo "<div class='inserterror'>".$errorstr."</div>\n";
-	
+		
 	//Nationen laden
 	$nation_arr = array();
 	$nation = new nation($conn);
@@ -280,9 +288,9 @@ function confdel()
 	$adresstyp_arr = array('h'=>'Hauptwohnsitz','n'=>'Nebenwohnsitz','f'=>'Firma',''=>'');
 
 	// Formular fuer die Adressdaten
-	echo "<h3>Adressen:</h3>";
+	//echo "<h3>Adressen:</h3>";
 	echo "<form action='".$_SERVER['PHP_SELF']."?firma_id=$firma_id' method='POST' />";
-	echo "<table class='liste'><tr><th>STRASSE</th><th>PLZ</th><th>ORT</th><th>GEMEINDE</th><th>NATION</th><th>TYP</th><th>HEIMAT</th><th>ZUSTELLUNG</th></tr>";
+	echo "<table class='liste'><tr><th>STRASSE</th><th>PLZ</th><th>ORT</th><th>GEMEINDE</th><th>NATION</th><th>TYP</th><th><font size='0'>Heimatadr.</font></th><th><font size='0'>Zustelladr.</font></th></tr>";
 	$adresse_obj = new adresse($conn);
 	$adresse_obj->load_firma($firma_id);
 
@@ -298,8 +306,8 @@ function confdel()
 		echo "<td>".$adresstyp_arr[$row->typ]."</td>";
 		echo "<td>".($row->heimatadresse?'Ja':'Nein')."</td>";
 		echo "<td>".($row->zustelladresse?'Ja':'Nein')."</td>";
-		echo "<td><a href='".$_SERVER['PHP_SELF']."?editadresse=true&adresse_id=$row->adresse_id&firma_id=$firma_id'>bearbeiten</a></td>";
-		echo "<td><a href='".$_SERVER['PHP_SELF']."?deleteadresse=true&adresse_id=$row->adresse_id&firma_id=$firma_id' onclick='return confdel()'>loeschen</a></td>";
+		echo "<td><a href='".$_SERVER['PHP_SELF']."?editadresse=true&adresse_id=$row->adresse_id&firma_id=$firma_id'><img src='../../skin/images/application_form_edit.png' alt='bearbeiten' title='bearbeiten' /></a></td>";
+		echo "<td><a href='".$_SERVER['PHP_SELF']."?deleteadresse=true&adresse_id=$row->adresse_id&firma_id=$firma_id' onclick='return confdel()'><img src='../../skin/images/application_form_delete.png' alt='loeschen' title='loeschen'/></a></td>";
 	}
 
 	$savebuttonvalue='Neu';
@@ -366,7 +374,7 @@ function confdel()
 	echo "</SELECT></td>";
 	echo "<td><input type='checkbox' name='heimatadresse' ".($heimatadresse?'checked':'')." /></td>";
 	echo "<td><input type='checkbox' name='zustelladresse' ".($zustelladresse?'checked':'')." /></td>";
-	echo "<td><input type='submit' name='saveadresse' value='$savebuttonvalue' /></td>";
+	echo "<td colspan='2'><input type='submit' name='saveadresse' value='$savebuttonvalue' /></td>";
 
 	echo "</table>";
 	echo "</form>";
diff --git a/vilesci/stammdaten/firma_frameset.html b/vilesci/stammdaten/firma_frameset.html
index fdfd4f0c5..8ca88f9b4 100644
--- a/vilesci/stammdaten/firma_frameset.html
+++ b/vilesci/stammdaten/firma_frameset.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>VileSci</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-15" />
 	<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css" />
 </head>
 
diff --git a/vilesci/stammdaten/firma_uebersicht.php b/vilesci/stammdaten/firma_uebersicht.php
index 99114449b..fdc057b47 100644
--- a/vilesci/stammdaten/firma_uebersicht.php
+++ b/vilesci/stammdaten/firma_uebersicht.php
@@ -77,7 +77,7 @@
 <html>
 <head>
 <title>Firma Uebersicht</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
 <link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
 <link rel="stylesheet" href="../../include/js/tablesort/table.css" type="text/css">
 <script src="../../include/js/tablesort/table.js" type="text/javascript"></script>