From 54a0550724feba6fe7541870d1788bb3b9287504 Mon Sep 17 00:00:00 2001 From: Manfred Kindl Date: Fri, 19 Jul 2013 15:52:02 +0000 Subject: [PATCH] Anpassungen an CIS-Redesign --- system/reset_usability_test.php | 58 +++++++---- .../templates/contentmittitel_xslt_xhtml.xslt | 11 ++- system/templates/news_xslt_xhtml.xslt | 96 ++++++++++--------- 3 files changed, 100 insertions(+), 65 deletions(-) diff --git a/system/reset_usability_test.php b/system/reset_usability_test.php index 7989e941d..e4e25e9ec 100644 --- a/system/reset_usability_test.php +++ b/system/reset_usability_test.php @@ -1,6 +1,6 @@

Reset Usability Test

+

+

+

-
+'; + +/** echo '

Abgabetool

@@ -31,33 +41,41 @@ echo ' -'; +'; */ if(isset($_POST['reset'])) { - echo '
Resetting Usability Test ... '; + /*echo ' ';*/ $db = new basis_db(); $qry = " - delete from public.tbl_konto where person_id in (6008,5821,22186,18441,17461,12749,21728,21297,17905,21768,1671,18572,16215,17469,1211,7938,16678,22731,15892,15732,15299,18396,752,5859,16370,18749,15812,23369); - delete from public.tbl_konto where person_id=2656 and betrag='363.36'; - update lehre.tbl_lehrveranstaltung set sort=NULL where studiengang_kz=10002 and semester=2; - delete from lehre.tbl_lehreinheitmitarbeiter where lehreinheit_id=26208; - delete from lehre.tbl_lehreinheitgruppe where lehreinheit_id=26260; - INSERT INTO lehre.tbl_lehreinheitgruppe (lehreinheitgruppe_id, lehreinheit_id, studiengang_kz, semester, verband, gruppe, gruppe_kurzbz, updateamum, updatevon, insertamum, insertvon, ext_id) VALUES ('23100', '26260', '10001', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - delete from public.tbl_prestudentstatus where prestudent_id=(select prestudent_id from public.tbl_prestudent where person_id=4095 and studiengang_kz=10001); delete from public.tbl_prestudent where person_id=4095 and studiengang_kz=10001; - delete from public.tbl_prestudentstatus where prestudent_id=(select prestudent_id from public.tbl_prestudent where person_id=(select person_id from public.tbl_person where nachname='Midler')); - delete from public.tbl_prestudent where person_id=(select person_id from public.tbl_person where nachname='Midler'); - delete from public.tbl_adresse where person_id=(select person_id from public.tbl_person where nachname='Midler'); - delete from public.tbl_person where nachname='Midler'; - "; + delete from public.tbl_person_fotostatus where person_id in (30566,453); + delete from public.tbl_ampel_benutzer_bestaetigt where uid in ('gl1','if10b066'); + update public.tbl_person set foto=NULL, foto_sperre=FALSE where person_id in (30566,453); + + + delete from campus.tbl_zeitsperre where mitarbeiter_uid='gl1'; + INSERT INTO campus.tbl_zeitsperre (zeitsperretyp_kurzbz,mitarbeiter_uid,bezeichnung,vondatum,vonstunde,bisdatum,bisstunde,vertretung_uid,updateamum,updatevon,insertamum,insertvon,erreichbarkeit_kurzbz,freigabeamum,freigabevon) VALUES ('Urlaub', 'gl1', 'Urlaub', '2013-05-01', NULL, '2013-05-03', NULL, NULL,NULL,NULL, now(), 'gl1',NULL,now(), 'kindlm'); + INSERT INTO campus.tbl_zeitsperre (zeitsperretyp_kurzbz,mitarbeiter_uid,bezeichnung,vondatum,vonstunde,bisdatum,bisstunde,vertretung_uid,updateamum,updatevon,insertamum,insertvon,erreichbarkeit_kurzbz,freigabeamum,freigabevon) VALUES ('Urlaub', 'gl1', 'Urlaub', '2013-05-06', NULL, '2013-05-10', NULL, NULL,NULL,NULL, now(), 'gl1',NULL,now(), 'kindlm'); + INSERT INTO campus.tbl_zeitsperre (zeitsperretyp_kurzbz,mitarbeiter_uid,bezeichnung,vondatum,vonstunde,bisdatum,bisstunde,vertretung_uid,updateamum,updatevon,insertamum,insertvon,erreichbarkeit_kurzbz,freigabeamum,freigabevon) VALUES ('Urlaub', 'gl1', 'Urlaub', '2013-07-22', NULL, '2013-07-26', NULL, NULL,NULL,NULL, now(), 'gl1',NULL,now(), 'kindlm'); + INSERT INTO campus.tbl_zeitsperre (zeitsperretyp_kurzbz,mitarbeiter_uid,bezeichnung,vondatum,vonstunde,bisdatum,bisstunde,vertretung_uid,updateamum,updatevon,insertamum,insertvon,erreichbarkeit_kurzbz,freigabeamum,freigabevon) VALUES ('Urlaub', 'gl1', 'Urlaub', '2013-07-29', NULL, '2013-08-02', NULL, NULL,NULL,NULL, now(), 'gl1',NULL,now(), 'kindlm'); + + delete from campus.tbl_news where insertvon='gl1'; + delete from campus.tbl_contentsprache where insertvon='gl1'; + delete from campus.tbl_content where insertvon='gl1'; + "; + if($db->db_query($qry)) - echo 'done'; + echo 'ERFOLGREICH BEENDET'; else - echo 'error'.$db->db_last_error(); + echo 'ERROR'.$db->db_last_error(); } -if(isset($_POST['reset_abgabe'])) +/* if(isset($_POST['reset_abgabe'])) { $uid=$_POST['uid']; echo '
Resetting Abgabetool '.$uid.'...'; @@ -78,5 +96,5 @@ if(isset($_POST['reset_abgabe'])) echo 'done'; else echo 'error'.$db->db_last_error(); -} +}*/ ?> \ No newline at end of file diff --git a/system/templates/contentmittitel_xslt_xhtml.xslt b/system/templates/contentmittitel_xslt_xhtml.xslt index 34d5d3553..3f9e01715 100644 --- a/system/templates/contentmittitel_xslt_xhtml.xslt +++ b/system/templates/contentmittitel_xslt_xhtml.xslt @@ -17,8 +17,11 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> { var col=0; var sort=0; + var no_sort=1; var classes = $(this).attr("class"); var class_arr = classes.split(" "); + var headersobj={}; + for(i in class_arr) { if(class_arr[i].indexOf("tablesorter_col_")!=-1) @@ -29,12 +32,18 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> { sort = class_arr[i].substr(17); } + if(class_arr[i].indexOf("tablesorter_no_sort_")!=-1) + { + no_sort = class_arr[i].substr(20); + headersobj[no_sort]={sorter:false}; + } } $(this).tablesorter( { sortList: [[col,sort]], - widgets: ["zebra"] + widgets: ["zebra"], + headers: headersobj }); }); }); diff --git a/system/templates/news_xslt_xhtml.xslt b/system/templates/news_xslt_xhtml.xslt index 16d286a5c..09acc8d5a 100755 --- a/system/templates/news_xslt_xhtml.xslt +++ b/system/templates/news_xslt_xhtml.xslt @@ -1,4 +1,3 @@ - @@ -6,12 +5,15 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> News + + - +
+

News

+
- - - + + + + +
-

News

+
@@ -24,13 +26,20 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ + +
+ @@ -65,75 +74,74 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-

+ -
-
+ +

-
+ -
+

-
+ -
+

-
+ -
+

-
+ -
-
+ +

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


+ T:
+ E: +

-
- -
- Tel.: -
+ +


+ T:
+ E: +

-
- -
- Tel.: -
+ +


+ T:
+ E: +

-
- -
- Tel.: -
+ +


+ T:
+ E: +

-
+
-
-
-
+

+

+