diff --git a/cms/admin.php b/cms/admin.php index f737cf48a..92a855320 100644 --- a/cms/admin.php +++ b/cms/admin.php @@ -79,8 +79,8 @@ $berechtigte_oe = $rechte->getOEkurzbz('basis/cms') theme_advanced_resizing : true, force_br_newlines : true, force_p_newlines : false, - forced_root_block : '' - + forced_root_block : '', + editor_deselector : "mceNoEditor" } ); function FHCFileBrowser(field_name, url, type, win) @@ -197,6 +197,7 @@ if(!is_null($method)) $content->sprache=DEFAULT_LANGUAGE; $content->insertvon = $user; $content->insertamum = date('Y-m-d H:i:s'); + $content->beschreibung = ''; if($content->save()) { @@ -336,6 +337,7 @@ if(!is_null($method)) $aktiv=isset($_POST['aktiv']); $menu_open=isset($_POST['menu_open']); $template_kurzbz = $_POST['template_kurzbz']; + $beschreibung = $_POST['beschreibung']; if($content->getContent($content_id, $sprache, $version)) { @@ -347,6 +349,7 @@ if(!is_null($method)) $content->template_kurzbz = $template_kurzbz; $content->updateamum=date('Y-m-d H:i:s'); $content->updatevon=$user; + $content->beschreibung = $beschreibung; if($content->save()) { @@ -1009,6 +1012,10 @@ function print_prefs() Menü offen menu_open?'checked':'').'> + + Beschreibung + +
diff --git a/cms/menu/menu_addon_spacer.inc.php b/cms/menu/menu_addon_spacer.inc.php new file mode 100755 index 000000000..3e2898d46 --- /dev/null +++ b/cms/menu/menu_addon_spacer.inc.php @@ -0,0 +1,42 @@ + + */ +/** + * Addon fuer Abstandhalter im Menuebaum + */ +require_once(dirname(__FILE__).'/menu_addon.class.php'); + +class menu_addon_spacer extends menu_addon +{ + public function __construct() + { + parent::__construct(); + + $this->link=false; + + $this->block=' +

+ '; + + $this->output(); + } +} + +new menu_addon_spacer(); +?> \ No newline at end of file diff --git a/include/content.class.php b/include/content.class.php index 80f7ddf21..dd36d4e87 100644 --- a/include/content.class.php +++ b/include/content.class.php @@ -37,6 +37,7 @@ class content extends basis_db public $oe_kurzbz; public $aktiv; public $menu_open; + public $beschreibung; public $contentsprache_id; public $sprache; @@ -124,6 +125,7 @@ class content extends basis_db $this->menu_open = ($row->menu_open=='t'?true:false); $this->aktiv = ($row->aktiv=='t'?true:false); $this->gesperrt_uid = $row->gesperrt_uid; + $this->beschreibung = $row->beschreibung; return true; } else @@ -385,7 +387,7 @@ class content extends basis_db if($new) { - $qry = "BEGIN;INSERT INTO campus.tbl_content(template_kurzbz, oe_kurzbz, updatevon, updateamum, insertvon, insertamum, aktiv, menu_open) VALUES(". + $qry = "BEGIN;INSERT INTO campus.tbl_content(template_kurzbz, oe_kurzbz, updatevon, updateamum, insertvon, insertamum, aktiv, menu_open, beschreibung) VALUES(". $this->addslashes($this->template_kurzbz).','. $this->addslashes($this->oe_kurzbz).','. $this->addslashes($this->updatevon).','. @@ -393,7 +395,8 @@ class content extends basis_db $this->addslashes($this->insertvon).','. $this->addslashes($this->insertamum).','. ($this->aktiv?'true':'false').','. - ($this->menu_open?'true':'false').');'; + ($this->menu_open?'true':'false').','. + $this->addslashes($this->beschreibung).');'; } else { @@ -403,7 +406,8 @@ class content extends basis_db " template_kurzbz=".$this->addslashes($this->template_kurzbz).','. " oe_kurzbz=".$this->addslashes($this->oe_kurzbz).','. " aktiv=".($this->aktiv?'true':'false').','. - " menu_open=".($this->menu_open?'true':'false'). + " menu_open=".($this->menu_open?'true':'false').','. + " beschreibung=".$this->addslashes($this->beschreibung). " WHERE content_id='".addslashes($this->content_id)."';"; } @@ -635,6 +639,7 @@ class content extends basis_db $obj->updatevon = $row->updatevon; $obj->insertamum = $row->insertamum; $obj->insertvon = $row->insertvon; + $obj->beschreibung = $row->beschreibung; $this->result[] = $obj; } @@ -751,6 +756,7 @@ class content extends basis_db $obj->insertvon = $row->insertvon; $obj->aktiv = ($row->aktiv=='t'?true:false); $obj->menu_open = ($row->menu_open=='t'?true:false); + $obj->beschreibung = $row->beschreibung; $this->result[] = $obj; } @@ -793,6 +799,7 @@ class content extends basis_db $obj->insertvon = $row->insertvon; $obj->aktiv = ($row->aktiv=='t'?true:false); $obj->menu_open = ($row->menu_open=='t'?true:false); + $obj->beschreibung = $row->beschreibung; $this->result[] = $obj; } diff --git a/system/FH-Complete.txp b/system/FH-Complete.txp index 513ed878e..d3992ce80 100644 --- a/system/FH-Complete.txp +++ b/system/FH-Complete.txp @@ -34916,7 +34916,7 @@ 6368 0 811 - 395 + 434 0 1 1 @@ -36017,7 +36017,7 @@ {E1C9E6E3-90B8-49A2-85A0-2C382A2DEEB0} 6166 - 1334 + 1347 6182 @@ -36029,11 +36029,11 @@ 6337 - 1333 + 1359 6368 - 1333 + 1359 @@ -36060,15 +36060,15 @@ {EA51A6CA-3B44-4BC2-A8BE-355113344D54} 6170 - 1037 + 1044 6368 - 1202 + 1215 6337 - 1202 + 1215 6221 @@ -36103,15 +36103,15 @@ {A98D91E4-4C4C-49F6-BBB7-DFB162F4DFA2} 6653 - 1482 + 1502 6774 - 1465 + 1504 6774 - 1496 + 1535 6748 @@ -36373,15 +36373,15 @@ {15453C36-D1FA-4853-B57E-FAB64B00021D} 7357 - 1673 + 1683 7179 - 1268 + 1287 7210 - 1268 + 1287 7704 @@ -43975,7 +43975,7 @@ Technikum Wien 2.0 2009-04-17T11:15:21.000+02:00 - 2011-06-06T15:18:19.958+02:00 + 2011-08-08T10:47:00.461+02:00 FH-Complete 2.0 <?xml-stylesheet type="text/xsl" href="FHCompleteTDM3PG83.xsl"?> @@ -56346,7 +56346,7 @@ Studiengang>0 und Semester>0 -> News fuer bestimmtes Semester im Studie - 16 + 32 0 @@ -68439,7 +68439,7 @@ Studiengang>0 und Semester>0 -> News fuer bestimmtes Semester im Studie - 16 + 32 0 @@ -76758,7 +76758,7 @@ Studiengang>0 und Semester>0 -> News fuer bestimmtes Semester im Studie - 16 + 32 0 @@ -78507,7 +78507,7 @@ Studiengang>0 und Semester>0 -> News fuer bestimmtes Semester im Studie - 16 + 32 0 @@ -86354,7 +86354,7 @@ art=tbl_benutzerrolle.art & tbl_rolleberechtigung.art - 16 + 32 0 @@ -92110,7 +92110,7 @@ art=tbl_benutzerrolle.art & tbl_rolleberechtigung.art - 16 + 32 0 @@ -131053,6 +131053,47 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a 0 + + {7F32B01F-6958-4A6E-B27A-EFDFB1562019} + beschreibung + 0 + {E415024B-4DB4-4AA8-A9E1-C252A37F9AD2} + 0 + 0 + 0 + 0 + 1 + + + + + + + 0 + + 0 + 0 + beschreibung + 0 + + + + + + + + + + {8D91E2A4-12F5-40E3-BAC2-BFCF7BE1C8B7} + + + + + + + + 0 + @@ -132598,7 +132639,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a - 16 + 32 0 diff --git a/system/checksystem.php b/system/checksystem.php index af226a1f8..7ef32a3c9 100644 --- a/system/checksystem.php +++ b/system/checksystem.php @@ -2592,6 +2592,16 @@ if($result = @$db->db_query("SELECT character_maximum_length as len FROM informa } } +//tbl_content beschreibung hinzufuegen +if(!$result = @$db->db_query("SELECT beschreibung FROM campus.tbl_content LIMIT 1;")) +{ + $qry = "ALTER TABLE campus.tbl_content ADD COLUMN beschreibung text;"; + + if(!$db->db_query($qry)) + echo 'campus.tbl_content: '.$db->db_last_error().'
'; + else + echo 'campus.tbl_content: Spalte beschreibung hinzugefuegt!
'; +} echo '
'; @@ -2620,7 +2630,7 @@ $tabellen=array( "campus.tbl_abgabe" => array("abgabe_id","abgabedatei","abgabezeit","anmerkung"), "campus.tbl_beispiel" => array("beispiel_id","uebung_id","nummer","bezeichnung","punkte","updateamum","updatevon","insertamum","insertvon"), "campus.tbl_benutzerlvstudiensemester" => array("uid","studiensemester_kurzbz","lehrveranstaltung_id"), - "campus.tbl_content" => array("content_id","template_kurzbz","updatevon","updateamum","insertamum","insertvon","oe_kurzbz","menu_open","aktiv"), + "campus.tbl_content" => array("content_id","template_kurzbz","updatevon","updateamum","insertamum","insertvon","oe_kurzbz","menu_open","aktiv","beschreibung"), "campus.tbl_contentchild" => array("contentchild_id","content_id","child_content_id","updatevon","updateamum","insertamum","insertvon","sort"), "campus.tbl_contentgruppe" => array("content_id","gruppe_kurzbz","insertamum","insertvon"), "campus.tbl_contentlog" => array("contentlog_id","contentsprache_id","uid","start","ende"),