X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=source%2Fmircoders%2Fproducer%2FProducerNavigation.java;h=afbae4a6f5dc5a5452f4fa921ed69fe1981131ef;hb=95686b2525b7070e89a2bf7bd6781230f74a660e;hp=1c6cd17f2673661aaf09406278c775bb52d30e2f;hpb=3a661e8f0f659ab5ed2ac0e4d982ac0b398d11f1;p=mir.git

diff --git a/source/mircoders/producer/ProducerNavigation.java b/source/mircoders/producer/ProducerNavigation.java
index 1c6cd17f..afbae4a6 100755
--- a/source/mircoders/producer/ProducerNavigation.java
+++ b/source/mircoders/producer/ProducerNavigation.java
@@ -24,12 +24,12 @@ import mircoders.entity.*;
 
 public class ProducerNavigation extends Producer {
 
-  private static String naviPageTemplate = Configuration.getProperty("Producer.Navigation.Template");
+  private static String naviPageTemplate = MirConfig.getProp("Producer.Navigation.Template");
 
   public void handle(PrintWriter htmlout, EntityUsers user, boolean forced, boolean sync)
     throws mir.module.ModuleException, mir.storage.StorageObjectException {
 
-    printHTML(htmlout, "Producer.Navigation: started");
+        printHTML(htmlout, "Producer.Navigation: started");
 
 		long                sessionConnectTime = 0;
 		long                startTime = (new java.util.Date()).getTime();
@@ -42,13 +42,18 @@ public class ProducerNavigation extends Producer {
 		EntityList          entityList;
 		SimpleHash          naviPageModel;
 
-		// get the topiclist
-		entityList = topicsModule.getByWhereClause("","title",-1);
-		SimpleList topicList = HTMLTemplateProcessor.makeSimpleList(entityList);
+        // get the imclinks
+        entityList = linksImcsModule.getByWhereClause("", "sortpriority, title", -1);
+        SimpleList imcList = HTMLTemplateProcessor.makeSimpleList(entityList);
+
+        EntityList theParentList = linksImcsModule.getByWhereClause("to_parent_id=NULL", "sortpriority, title", -1);
+        SimpleList parentList = HTMLTemplateProcessor.makeSimpleList(theParentList);
 
 		// put the informations into the navipagemodel
 		naviPageModel = new SimpleHash();
-		naviPageModel.put("topics", topicList);
+		naviPageModel.put("topics", topicsModule.getTopicsList());
+        naviPageModel.put("imclist", imcList);
+        naviPageModel.put("parentlist", parentList);
 
 		htmlFileName = producerDocRoot + "/navigation.inc";
 
@@ -64,4 +69,4 @@ public class ProducerNavigation extends Producer {
 		}
 	}
 
-}
\ No newline at end of file
+}