diff --git a/content/fas.xul.php b/content/fas.xul.php
index 63a7af120..a037eeedc 100644
--- a/content/fas.xul.php
+++ b/content/fas.xul.php
@@ -118,10 +118,10 @@ foreach($addon_obj->result as $addon)
-
-
+
+
-
+
diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
index 760f00f75..5a99dc979 100644
--- a/content/student/studentenoverlay.xul.php
+++ b/content/student/studentenoverlay.xul.php
@@ -345,7 +345,7 @@ else
-
+
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index 6ce4390d5..92736bba9 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -2653,10 +2653,10 @@ function StudentKontoZahlungsbestaetigung()
// ****
// * Erstellt das Zeugnis fuer einen oder mehrere Studenten
// ****
-function StudentCreateZeugnis(xsl)
+function StudentCreateZeugnis(xsl,event)
{
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
+
tree = document.getElementById('student-tree');
//Markierte Studenten holen
@@ -2683,9 +2683,24 @@ function StudentCreateZeugnis(xsl)
alert('Bitte einen Studenten auswaehlen');
return false;
}
-
+ var output = 'pdf';
+ if(typeof(event)!=='undefined')
+ {
+ if (event.shiftKey)
+ {
+ var output = 'odt';
+ }
+ else if (event.ctrlKey)
+ {
+ var output = 'doc';
+ }
+ else
+ {
+ var output = 'pdf';
+ }
+ }
//PDF erzeugen
- window.open('content/pdfExport.php?xml=zeugnis.rdf.php&output=pdf&xsl='+xsl+'&uid='+paramList+'&ss='+ss+'&xsl_stg_kz='+xsl_stg_kz,'Zeugnis', 'height=200,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes');
+ window.open('content/pdfExport.php?xml=zeugnis.rdf.php&output='+output+'&xsl='+xsl+'&uid='+paramList+'&ss='+ss+'&xsl_stg_kz='+xsl_stg_kz,'Zeugnis', 'height=200,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes');
}
// ****
@@ -2754,7 +2769,7 @@ function StudentZeugnisAnzeigen()
}
// ****
-// * Loescht ein Zeugnis
+// * Loescht ein Dokument aus dem Archiv
// ****
function StudentAkteDel()
{
@@ -2778,7 +2793,7 @@ function StudentAkteDel()
studiengang_kz = document.getElementById('student-detail-menulist-studiengang_kz').value;
//Abfrage ob wirklich geloescht werden soll
- if (confirm('Zeugnis wirklich entfernen?'))
+ if (confirm('Dokument wirklich entfernen?'))
{
//Script zum loeschen aufrufen
var req = new phpRequest('student/studentDBDML.php','','');
@@ -4373,7 +4388,7 @@ function StudentShowPersonendetails()
// ****
// * Erstellt das Diploma Supplement fuer einen oder mehrere Studenten
// ****
-function StudentCreateDiplSupplement()
+function StudentCreateDiplSupplement(event)
{
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
@@ -4402,9 +4417,20 @@ function StudentCreateDiplSupplement()
alert('Bitte einen Studenten auswaehlen');
return false;
}
-
+ if (event.shiftKey)
+ {
+ var output='odt';
+ }
+ else if (event.ctrlKey)
+ {
+ var output='doc';
+ }
+ else
+ {
+ var output='pdf';
+ }
//PDF erzeugen
- window.open('content/pdfExport.php?xml=diplomasupplement.xml.php&output=pdf&xsl=DiplSupplement&xsl_stg_kz='+stg_kz+'&uid='+paramList,'DiplomaSupplement', 'height=200,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes');
+ window.open('content/pdfExport.php?xml=diplomasupplement.xml.php&output='+output+'&xsl=DiplSupplement&xsl_stg_kz='+stg_kz+'&uid='+paramList,'DiplomaSupplement', 'height=200,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes');
}
// ****
diff --git a/content/student/studentzeugnisoverlay.xul.php b/content/student/studentzeugnisoverlay.xul.php
index 3799ffbab..0d8887cc3 100644
--- a/content/student/studentzeugnisoverlay.xul.php
+++ b/content/student/studentzeugnisoverlay.xul.php
@@ -43,7 +43,7 @@ echo '';
-
+
+
+
+
+
@@ -310,7 +314,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
-
+
@@ -323,42 +327,50 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
-
-
-
-
-
-
-
-
- Vienna,
-
-
-
-
-
-
-
-
-
-
- Place, Date
-
-
-
-
-
-
- Program Director
-
-
-
-
-
-
-
-
- Transcript of Records
+
+
+
+
+
+
+
+
+
+
+
+
+ Vienna,
+
+
+
+
+
+
+
+
+
+
+ Place, Date
+
+
+
+
+
+
+ Program Director
+
+
+
+
+
+
+
+
+
+
+ Transcript of Records
diff --git a/system/xsl/Zeugnis_0_v8.xsl b/system/xsl/Zeugnis_0_v8.xsl
index a1062b734..b356e51e3 100644
--- a/system/xsl/Zeugnis_0_v8.xsl
+++ b/system/xsl/Zeugnis_0_v8.xsl
@@ -327,10 +327,12 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
-
+
-
+