fixed / clean ups

[mir.git] / source / default.properties

diff --git a/source/default.properties b/source/default.properties
index be0990c..15136d9 100755 (executable)
--- a/source/default.properties
+++ b/source/default.properties
@@ -94,6 +94,13 @@ Mir.Admin.LogAdminActivity=0
 # Which usernames have admin priviliges (, seperated usernames)
 AccessControl.SuperUsers = admin
 
+# Locking enabled?
+AccessControl.LockingEnabled = 0
+
+# If locking enabled, should users lock articles before they 
+#    can edit?
+AccessControl.LockingOptional = 1
+
 # the templates
 Mir.Localizer.Producer.GeneratorLibrary= default=freemarker(etc/producer/)
 Mir.Localizer.Admin.GeneratorLibrary= default=freemarker(templates/admin/)
@@ -107,10 +114,12 @@ Mir.Localizer.Admin.ListOperationsFlavor=1
 
 
 # How should the topics be presented on the article edit page?
+#
 # <key>:<listtype>:<listparameter>:<condition>:<order>
+# multiple entries can be specified, can be seperated by a ,
 #
 # key:
-#     a unique key per topic category
+#     the bundle key to use for the field label
 # listtype:
 #     0 = in a multiselect list box, 1 = checkboxes, 2 = a dropdown listbox
 # listparameter:
@@ -121,18 +130,7 @@ Mir.Localizer.Admin.ListOperationsFlavor=1
 #     what sql order should the topics be ordered by
 
 Mir.Localizer.Admin.TopicLists = \
-   topic:1:3:archiv_url='bla':title   ,\
-   rest:1:3:archiv_url<>'bla':title   \
-
-# How should the topics be presented on the article edit page?
-# 0 = in a multiselect list box, 1 = checkboxes
-Mir.Localizer.Admin.TopicListFlavor=1
-
-# For the checkboxes flavour, how many columns should there be?
-Mir.Localizer.Admin.TopicListColumns=3
-
-# In which order should the topic appear?
-Mir.Localizer.Admin.TopicListOrder=title
+   content.topic:1:3::title
 
 # enable deletion of comments/articles?
 Mir.Localizer.Admin.AllowDeleteComment=1
@@ -140,27 +138,21 @@ Mir.Localizer.Admin.AllowDeleteArticle=1
 
 # Article Preview Link URL (Link to produced articles from within admin)
 Comment.PublicUrl=/en/${date.formatted.yyyy}/${date.formatted.MM}/${id}.shtml
-Article.PublicUrl=/en/${co_content.date.formatted.yyyy}/${to_content.date.formatted.MM}/${to_content.id}.shtml
+Article.PublicUrl=/en/${to_content.date.formatted.yyyy}/${to_content.date.formatted.MM}/${to_content.id}.shtml
 
-# enable deletion of comments/articles?
+# which 'quick' operations should be available in the top-left box?
 Mir.Localizer.Admin.AdministerOperations= \
    comments:module=Comment&do=list
 
-
 # Which producers need to be called after an article (resp. a comment) is posted
 Mir.Localizer.OpenPosting.ContentProducers= media.new;articles.changed;startpage.generate;synchronization.run
 Mir.Localizer.OpenPosting.CommentProducers= articles.changed;synchronization.run
 
 # Which producers need to be called after the "produce all new" link is clicked from admin
-Mir.Localizer.Producer.AllNewProducers= media.new;articles.changed;startpage.run;synchronization.run
+Mir.Localizer.Producer.ProducerRecipes= 
+  allnew = media.new;articles.changed;startpage.run;synchronization.run
 
 
-#note that you can't make pdf's without making fo's
-#this is actually now set in producers.xml
-#but these summarize what is said in there for the benefit of OpenMir
-GenerateFO=yes
-GeneratePDF=yes
-
 #use rsync to mirror the website to a remote-host
 Rsync=no
 Rsync.Script.Path=/var/www/bin/rsync-copy
@@ -528,16 +520,20 @@ ServletModule.CommentStatus.DeleteConfirmationTemplate=confirm.template
 ServletModule.CommentStatus.EditTemplate=commentstatus.template
 ServletModule.CommentStatus.ListTemplate=commentstatuslist.template
 
+ServletModule.MediaType.DeleteConfirmationTemplate=confirm.template
+ServletModule.MediaType.EditTemplate=mediatype.template
+ServletModule.MediaType.ListTemplate=mediatypelist.template
+
 
 
 
 
 #
 # config for abuse
-ServletModule.Abuse.EditFilter.Template = abuse.filter.template\r
-ServletModule.Abuse.ListFilters.Template = abuse.filters.template\r
-ServletModule.Abuse.ViewLog.Template = abuse.log.template\r
-ServletModule.Abuse.Main.Template = abuse.template\r
+ServletModule.Abuse.EditFilter.Template = abuse.filter.template
+ServletModule.Abuse.ListFilters.Template = abuse.filters.template
+ServletModule.Abuse.ViewLog.Template = abuse.log.template
+ServletModule.Abuse.Main.Template = abuse.template
 
 #
 # producer-related configs below