blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-19 07:52:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Anpassungen an CIS-Redesign

Browse Source 
news.php: Wenn Student Incoming ist, wird bei den Studiengang-Details der ECI-Studiengang angezeigt
This commit is contained in:
Manfred Kindl
2013-07-19 15:36:59 +00:00
parent b5c3c6a8da
commit 5b4a9c50e4
5 changed files with 59 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cms/menu.inc.php
+14 -28
View File
@@ -115,34 +115,24 @@ function drawEntry($item)
if(isset($childsobject[$item->content_id]) && count($childsobject[$item->content_id])>0)
{
echo "\n<li>";
// Eintrag hat Untermenue -> Aufklappbar machen
echo '
<tr>
<td class="tdwidth10" nowrap>&nbsp;</td>
<td class="tdwrap">';
if($item->template_kurzbz=='include')
IncludeMenuAddon($item);
elseif($item->template_kurzbz=='redirect')
Redirect($item, $item->content_id);
else
DrawLink(APP_ROOT.'cms/content.php?content_id='.$item->content_id,'content',$item->titel, $item->content_id);
echo '
<table class="menue" id="Content'.$item->content_id.'" style="display: '.($item->menu_open?'visible':'none').'">';
DrawLink(APP_ROOT.'cms/content.php?content_id='.$item->content_id,'content',$item->titel, $item->content_id, $item->menu_open);
echo "\n<ul class=\"menu\">";
drawSubmenu1($item->content_id);
echo '
</table>
</td>
</tr>';
echo "\n</ul>";
echo "\n</li>";
}
else
{
// Normaler Eintrag ohne Untermenue
echo '
<tr>
<td class="tdwidth10" nowrap>&nbsp;</td>
<td class="tdwrap">';
echo "\n<li>";
if($item->template_kurzbz=='include')
IncludeMenuAddon($item);
elseif($item->template_kurzbz=='redirect')
@@ -150,9 +140,7 @@ function drawEntry($item)
else
DrawLink(APP_ROOT.'cms/content.php?content_id='.$item->content_id,'content',$item->titel);
echo '
</td>
</tr>';
echo "</li>";
}
}
@@ -163,18 +151,16 @@ function drawEntry($item)
* @param $name Anzeigename
* @param $content_id Wenn die Content_id uebergeben wird, oeffnet der Klick das Submenu
*/
function DrawLink($link, $target, $name, $content_id=null)
function DrawLink($link, $target, $name, $content_id=null, $open=null)
{
if($target=='')
$target='content';
if(!is_null($content_id))
$class = 'class="MenuItem" onClick="js_toggle_container(\'Content'.$content_id.'\');"';
if($open)
$class='class="selected"';
else
$class='class="Item"';
echo '<a '.$class.' href="'.$link.'" target="'.$target.'"><img src="../skin/images/menu_item.gif" alt="menu item" width="7" height="9">&nbsp;'.$name.'</a>';
$class='';
echo '<a '.$class.' href="'.$link.'" target="'.$target.'" title="'.$name.'">'.$name.'</a>';
}
/**
@@ -212,7 +198,7 @@ function Redirect($content, $content_id_Submenu=null)
else
$target='';
DrawLink($url, $target, $content->titel, $content_id_Submenu);
DrawLink($url, $target, $content->titel, $content_id_Submenu, $content->menu_open);
}
/**
cms/menu/menu_addon.class.php
+16 -7
View File
@@ -24,6 +24,7 @@
*/
require_once(dirname(__FILE__).'/../../include/basis_db.class.php');
require_once(dirname(__FILE__).'/../../include/functions.inc.php');
class menu_addon extends basis_db
{
@@ -79,14 +80,15 @@ class menu_addon extends basis_db
$content = $includeparams['content'];
if($this->link)
DrawLink($this->linkitem['link'],$this->linkitem['target'],$this->linkitem['name'],$this->linkitem['content_id']);
echo '
<table class="tabcontent" id="Content'.$content->content_id.'" style="display: '.($content->menu_open?'visible':'none').'"><tr><td>';
($content->menu_open?(DrawLink($this->linkitem['link'],$this->linkitem['target'],$this->linkitem['name'],$this->linkitem['content_id'])):'');
//Wenn Option "Menü öffen" angeklickt ist, erschein die Überschrift, sonst nicht -> Ist eine Pfusch-Lösung. Was kann man sonst machen damit Überschrift "Meine LV" nicht angezeigt wird?
//echo '
//<table class="tabcontent" id="Content'.$content->content_id.'" style="display: '.($content->menu_open?'visible':'none').'"><tr><td>';
$this->outputBlock();
$this->outputItems();
echo '</td></tr></table>';
//echo '</td></tr></table>';
}
/**
@@ -95,13 +97,20 @@ class menu_addon extends basis_db
*/
public function outputItems()
{
$user = get_uid();
$is_lector=check_lektor($user);
$sprache = getSprache();
$p=new phrasen($sprache);
if(count($this->items)>0)
{
echo '<ul style="margin-top: 0px; margin-bottom: 0px;">';
echo '<ul>';
foreach($this->items as $row)
{
echo '<li>
<a class="Item2" title="'.$row['title'].'" href="'.$row['link'].'" target="'.$row['target'].'">'.$row['name'].'</a>
echo '<li style="margin:0px;">
<a class="item2 " title="'.$row['title'].'" href="'.$row['link'].'" target="'.$row['target'].'">'.$row['name'].'</a>
</li>';
}
echo '</ul>';
cms/menu/menu_addon_lehrveranstaltungen.inc.php
+3 -3
View File
@@ -79,7 +79,7 @@ class menu_addon_lehrveranstaltungen extends menu_addon
<tr>
<td width="81" class="tdwrap">'.$p->t('global/studiengang').': </td>
<td class="tdwrap">
<select name="course" onChange="MM_jumpMenu(\'self\',this,0)">';
<select name="course" onChange="MM_jumpMenu(\'self\',this,0)" style="width: 100px;">';
$stg_obj = new studiengang();
$stg_obj->getAll('typ, kurzbz');
@@ -102,12 +102,12 @@ class menu_addon_lehrveranstaltungen extends menu_addon
{
if(isset($studiengang_kz) AND $studiengang_kz == $row->studiengang_kz)
{
$this->block.= '<option value="?content_id='.$_GET['content_id'].'&studiengang_kz='.$row->studiengang_kz.'&semester='.$semester.'" selected>'.$row->kuerzel .' ('.$row->kurzbzlang.')</option>';
$this->block.= '<option value="?content_id='.$_GET['content_id'].'&studiengang_kz='.$row->studiengang_kz.'&semester='.$semester.'" selected>'.$row->kuerzel .' ('.$row->bezeichnung.')</option>';
$sel_kurzbzlang=$row->kurzbzlang;
}
else
{
$this->block.='<option value="?content_id='.$_GET['content_id'].'&studiengang_kz='.$row->studiengang_kz.'&semester='.$semester.'">'.$row->kuerzel .' ('.$row->kurzbzlang.')</option>';
$this->block.='<option value="?content_id='.$_GET['content_id'].'&studiengang_kz='.$row->studiengang_kz.'&semester='.$semester.'">'.$row->kuerzel .' ('.$row->bezeichnung.')</option>';
}
if(!isset($studiengang_kz))
{
cms/menu/menu_addon_meinelv.inc.php
+1
View File
@@ -104,6 +104,7 @@ class menu_addon_meinelv extends menu_addon
if($result = $this->db_query($qry))
{
echo '<li style="margin-left:6px;"><a title="LV-Uebersicht" href="../cis/private/profile/lva_liste.php" target="content"><strong>'.$p->t("lvaliste/titel").'</strong></a></li>';
while($row = $this->db_fetch_object($result))
{
$lv_obj = new lehrveranstaltung();
cms/news.php
+25 -5
View File
@@ -42,6 +42,7 @@ require_once('../include/studiengang.class.php');
require_once('../include/mitarbeiter.class.php');
require_once('../include/datum.class.php');
require_once('../include/phrasen.class.php');
require_once('../include/student.class.php');
$sprache = getSprache();
@@ -49,9 +50,28 @@ $datum_obj = new datum();
//XML Content laden
$content = new content();
$db = new basis_db();
$user = get_uid();
$studiengang_kz = (isset($_GET['studiengang_kz'])?$_GET['studiengang_kz']:0);
$semester = (isset($_GET['semester'])?$_GET['semester']:null);
//Zum anzeigen der Studiengang-Details neben den News
$student = new student();
if($student->load($user))
{
$stg_kz=$student->studiengang_kz;
$sem=$student->semester;
$ver=$student->verband;
}
else
{
$stg_kz=0;
$sem=NULL;
$ver=NULL;
}
// Wenn Student Incoming ist, wird bei den Studiengang-Details der ECI-Studiengang angezeigt
if($sem==0 && $ver=='I')
$stg_kz=10006;
$studiengang_kz = (isset($_GET['studiengang_kz'])?$_GET['studiengang_kz']:$stg_kz);
$semester = (isset($_GET['semester'])?$_GET['semester']:$sem);
$infoscreen = isset($_GET['infoscreen']);
$editable = isset($_GET['edit']);
@@ -87,7 +107,7 @@ foreach($news->result as $row)
//$xml .= $content->content;
}
if($studiengang_kz!=0 && !$editable && !$infoscreen && $studiengang_kz!=10006)
if($studiengang_kz!=0 && !$editable && !$infoscreen) // && $studiengang_kz==10006 && !$semester)
$xml.=getStgContent($studiengang_kz, $semester, $sprache);
if($studiengang_kz!=0)
@@ -146,7 +166,7 @@ function getStgContent($studiengang_kz, $semester, $sprache)
//Studiengangsleitung
$stg_oe_obj = new studiengang();
$stgl = $stg_oe_obj->getLeitung($studiengang_kz);
$xml.='<stg_header><![CDATA['.$p->t('global/studiengangsmanagement').']]></stg_header>';
//$xml.='<stg_header><![CDATA['.$p->t('global/studiengangsmanagement').']]></stg_header>';
$xml.='<stg_ltg_name><![CDATA['.$p->t('global/studiengangsleitung').']]></stg_ltg_name>';
if(count($stgl)>0)
{
@@ -209,7 +229,7 @@ function getStgContent($studiengang_kz, $semester, $sprache)
}
}
//Studiengangsleiter Stellvertreter auselesen
//Studiengangsleiter Stellvertreter auslesen
$benutzerfkt = new benutzerfunktion();
$benutzerfkt->getBenutzerFunktionen('stvLtg', $studiengang->oe_kurzbz);
$xml.='<stv_ltg_name><![CDATA['.$p->t('global/stellvertreter').']]></stv_ltg_name>';