diff --git a/content/fasoverlay.js.php b/content/fasoverlay.js.php
index b2f45e4f1..747971341 100644
--- a/content/fasoverlay.js.php
+++ b/content/fasoverlay.js.php
@@ -481,6 +481,7 @@ function onFachbereichSelect(event)
var kurzbz=tree.view.getCellText(idx,col);
}
// Lehrveranstaltung
+ document.getElementById('statusbar-progressmeter').setAttribute('mode','undetermined');
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
try
{
@@ -1616,4 +1617,4 @@ function FachbereichTreeRefresh()
fb_datasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
fb_datasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
tree.database.AddDataSource(fb_datasource);
-}
\ No newline at end of file
+}
diff --git a/content/lvplanung/lehrveranstaltungoverlay.js.php b/content/lvplanung/lehrveranstaltungoverlay.js.php
index 909fcd4cb..c35a880c3 100644
--- a/content/lvplanung/lehrveranstaltungoverlay.js.php
+++ b/content/lvplanung/lehrveranstaltungoverlay.js.php
@@ -78,7 +78,7 @@ var LvTreeListener =
//ohne dem setTimeout
window.setTimeout(LvTreeSelectLehreinheit,10);
// Progressmeter stoppen
- //document.getElementById('statusbar-progressmeter').setAttribute('mode','determined');
+ document.getElementById('statusbar-progressmeter').setAttribute('mode','determined');
}
};
@@ -1831,4 +1831,4 @@ function LeMitarbeiterGesamtkosten()
document.getElementById('lehrveranstaltung-lehreinheitmitarbeiter-label-gesamtkosten').setAttribute("style",'color: red');
else
document.getElementById('lehrveranstaltung-lehreinheitmitarbeiter-label-gesamtkosten').setAttribute("style",'color: black');
-}
\ No newline at end of file
+}
diff --git a/content/lvplanung/lehrveranstaltungoverlay.xul.php b/content/lvplanung/lehrveranstaltungoverlay.xul.php
index b829b26fe..b3a85161b 100644
--- a/content/lvplanung/lehrveranstaltungoverlay.xul.php
+++ b/content/lvplanung/lehrveranstaltungoverlay.xul.php
@@ -66,7 +66,7 @@ echo '
+
+
+
+
+
+
-
-
+
+
@@ -195,6 +207,9 @@ echo '
+
+
+
@@ -223,4 +238,4 @@ echo '
-
\ No newline at end of file
+
diff --git a/include/rdf.class.php b/include/rdf.class.php
index 23c77812b..d72f8142a 100755
--- a/include/rdf.class.php
+++ b/include/rdf.class.php
@@ -169,12 +169,12 @@ class rdf
{
if(is_null($id))
{
- $this->rdf_text.=''."\n";
+ $this->rdf_text.="\n\t\t".''."\n";
foreach ($this->sequence as $id)
{
$this->createRDFSequence($id);
}
- $this->rdf_text.=''."\n";
+ $this->rdf_text.="\n\t\t".''."\n";
}
else
{
diff --git a/rdf/lehrverbandsgruppe.rdf.php b/rdf/lehrverbandsgruppe.rdf.php
index ebf05fc58..392ba856a 100644
--- a/rdf/lehrverbandsgruppe.rdf.php
+++ b/rdf/lehrverbandsgruppe.rdf.php
@@ -398,11 +398,14 @@ function draw_orgformsubmenu($stg_kz, $orgform)
';
}
- //Semester schliessen
- $orgform_sequence[$stg_kz].='
-
-
- ';
+ if($sem!='')
+ {
+ //Semester schliessen
+ $orgform_sequence[$stg_kz].='
+
+
+ ';
+ }
}
//Orgform schliessen
$orgform_sequence[$stg_kz].='
diff --git a/skin/fas.css b/skin/fas.css
index 783689abf..ec59824a2 100644
--- a/skin/fas.css
+++ b/skin/fas.css
@@ -11,6 +11,29 @@ treechildren::-moz-tree-row(even, selected) { background-color: #50D1E1; }
treechildren::-moz-tree-cell-text(selected) { color: #000000; }
treechildren::-moz-tree-cell-text(odd, selected) { color: #000000; }
+/* Lehrveranstaltung */
+treechildren::-moz-tree-row(lehrveranstaltung_lv)
+{
+ background-color: yellow;
+}
+
+/* Modul */
+treechildren::-moz-tree-row(lehrveranstaltung_modul)
+{
+ background-color: blue;
+}
+
+/* Lehrfach */
+treechildren::-moz-tree-row(lehrveranstaltung_lf)
+{
+ background-color: green;
+}
+
+/* Lehreinheit */
+treechildren::-moz-tree-row(lehrveranstaltung_)
+{
+ background-color: red;
+}
menubar,menulist,toolbar,tabpanels,tabbox,iframe,box,hbox,vbox,tree,description
{
border-width: 0px;
diff --git a/skin/images/lv.png b/skin/images/lv.png
new file mode 100644
index 000000000..5b27ba5e9
Binary files /dev/null and b/skin/images/lv.png differ
diff --git a/skin/images/modul.png b/skin/images/modul.png
new file mode 100644
index 000000000..e69599e84
Binary files /dev/null and b/skin/images/modul.png differ
diff --git a/skin/tempus.css b/skin/tempus.css
index 8c1189936..aca345ce6 100644
--- a/skin/tempus.css
+++ b/skin/tempus.css
@@ -76,4 +76,29 @@ treechildren::-moz-tree-row(odd) { background-color: #EEEEEE; }
treechildren::-moz-tree-row(odd, selected) { background-color: #FFFFAA; }
treechildren::-moz-tree-row(even, selected) { background-color: #FFFFAA; }
treechildren::-moz-tree-cell-text(selected) { color: #000000; }
-treechildren::-moz-tree-cell-text(odd, selected) { color: #000000; }
\ No newline at end of file
+treechildren::-moz-tree-cell-text(odd, selected) { color: #000000; }
+
+
+/* Lehrveranstaltung */
+treechildren::-moz-tree-row(lehrveranstaltung_lv)
+{
+ background-color: #FFFFFF;
+}
+
+/* Modul */
+treechildren::-moz-tree-row(lehrveranstaltung_modul)
+{
+ background-color: #EEEEEE;
+}
+
+/* Lehrfach */
+treechildren::-moz-tree-row(lehrveranstaltung_lf)
+{
+
+}
+
+/* Lehreinheit */
+treechildren::-moz-tree-row(lehrveranstaltung_)
+{
+ background-color: #EDF5FF;
+}