indynl updates

diff --git a/source/config.properties-dist b/source/config.properties-dist
index f52effe..7bcb1c9 100755 (executable)
--- a/source/config.properties-dist
+++ b/source/config.properties-dist
@@ -35,7 +35,7 @@
 # GENERAL SETUP
 #
 
-Mir.Version=pre-1.0
+Mir.Version=localizer-0
 ClearXslCache=no
 StandardLanguage=de
 DirectOpenposting=yes
@@ -47,7 +47,7 @@ GenerateFO=yes
 GeneratePDF=yes
 
 #on-time-password-protection
-PasswdProtection=yes
+PasswdProtection=no
 
 #use rsync to mirror the website to a remote-host
 Rsync=no

diff --git a/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java b/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java
index df74e2d..4ca7e03 100755 (executable)
--- a/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java
+++ b/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java
@@ -38,15 +38,39 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
               )
             } )
           );
+
+      contentNode.addVerb( "all", "is_published='1' and to_article_type<>${articletype.trashed} and to_article_type<>${articletype.static}", "" );
+      contentNode.addVerb( "new", "is_published='1' and is_produced='f' and to_article_type<>${articletype.trashed} and to_article_type<>${articletype.static}", "" );
+
+      aProducerNode.addSubNode( contentNode );
+
+
+      contentNode =
+          new EntityEnumeratingProducerNode( "content", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
+            new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+              new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
+                  new CompositeProducerNode( new ProducerNode[] {
+                    new GeneratingProducerNode(
+                        "/producer/indymedia.nl/trashed.template",
+                        "${config.storageRoot}/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml"
+                    ),
+                    new FileDateSettingProducerNode(
+                        "${config.storageRoot}/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml",
+                        "content.date.date"
+                    )
+                  } )
+              )
+            )
+          );
+      contentNode.addVerb( "all", "is_published='1' and to_article_type=${articletype.trashed}", "" );
+      contentNode.addVerb( "new", "is_published='1' and is_produced='f' and to_article_type=${articletype.trashed}", "" );
+
+      aProducerNode.addSubNode( contentNode );
     }
     catch (Throwable t) {
       logger.printError("IndyNLProducerLocalizer.setupContentFactory: Exception "+t.getMessage());
     }
 
-    contentNode.addVerb( "all", "is_published='1' and to_article_type<>${articletype.trashed} and to_article_type<>${articletype.static}", "" );
-    contentNode.addVerb( "new", "is_published='1' and is_produced='f' and to_article_type<>${articletype.trashed} and to_article_type<>${articletype.static}", "" );
-
-    aProducerNode.addSubNode( contentNode );
   }
 
   protected void setupStartPageFactory(CompositeProducerNode aProducerNode) {
@@ -170,6 +194,10 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                         "${config.storageRoot}/${language.code}/style.css"
                     ),
                     new GeneratingProducerNode(
+                        "/producer/indymedia.nl/style2.template",
+                        "${config.storageRoot}/${language.code}/style2.css"
+                    ),
+                    new GeneratingProducerNode(
                         "/producer/indymedia.nl/top.template",
                         "${config.storageRoot}/${language.code}/top.inc"
                     ),