update

diff --git a/doc/TODO.txt b/doc/TODO.txt
index d8dae10..36028dd 100755 (executable)
--- a/doc/TODO.txt
+++ b/doc/TODO.txt
@@ -33,13 +33,13 @@ m) re-tweak media infrastructure (underway, -mh)
     - handle generic media (underway, mh)
         - better extension handling
     - handle external meta links
     - handle generic media (underway, mh)
         - better extension handling
     - handle external meta links

-    - rework creation of audio (video too?) meta-data
-        - make getUrl() return a list of SimpleHashes
-    - use added flexibility in templates
+    - rework creation of audio (video too?) meta-data (done, mh)
+        - make getUrl() return a SimpleList (done, mh)
+    - use added flexibility in templates (done, mh)

     - add miless code for better secondary content-type guessing. i.e read the
     bytes
 n) CVS id, author stamps 
     - add miless code for better secondary content-type guessing. i.e read the
     bytes
 n) CVS id, author stamps 

-o) make Entity implement freemarke TemplateModel (done, rk)
+o) make Entity implement freemarker TemplateModel (done, rk)

 p) don't use deprecated methods. specifically the SimpleList stuff (done, mh, rk)
 
 
 p) don't use deprecated methods. specifically the SimpleList stuff (done, mh, rk)
 
 


@@ -53,7 +53,7 @@ done, idfx).
 g) "Upcoming Events"-include-file (ha) 
 h) indymedia-links (done, fh) 
 i) objectStore (underway, -rk)
 g) "Upcoming Events"-include-file (ha) 
 h) indymedia-links (done, fh) 
 i) objectStore (underway, -rk)

-j) Templates should be made common for all languages. (underway, kellan, br1, idfx)
+j) Templates should be made common for all languages. (done, kellan, br1, idfx)

 
 
 Version 1.1: 
 
 
 Version 1.1: 


@@ -66,13 +66,11 @@ New Features:
 a) Multilanguage-Support (Step 2): Separate OpenMir-servlet to publish a tranlation of an
 article. If a article has translations, only the translated versions are produced in the language
 the translated article is. 
 a) Multilanguage-Support (Step 2): Separate OpenMir-servlet to publish a tranlation of an
 article. If a article has translations, only the translated versions are produced in the language
 the translated article is. 

-b) single template for all languages. i.e use gettext like system for templates.
-(underway, kellan, br1)

 b) P2P-Data-Transfer/Content-Syndication: Implementing RDF/RSS-Support or a own
 indymedia-protocoll. 
 c) dynamically creating "internal"-templates for new languages. 
 d) email-article-to-a-friend-servlet 
 b) P2P-Data-Transfer/Content-Syndication: Implementing RDF/RSS-Support or a own
 indymedia-protocoll. 
 c) dynamically creating "internal"-templates for new languages. 
 d) email-article-to-a-friend-servlet 

-e) semidynamic create-pdf-from-article-servlet: every requested pdf should be cached 
+e) semidynamic create-pdf-from-article-servlet: every requested pdf should be cached (underway, john)

 f) servletapi-2.3: Filters for file upload (also in cos.jar)
 g) servletapi-2.3: use web.xml for simpler/better error handling.
 h) servletapi-2.3: set character encoding properly based on what the template
 f) servletapi-2.3: Filters for file upload (also in cos.jar)
 g) servletapi-2.3: use web.xml for simpler/better error handling.
 h) servletapi-2.3: set character encoding properly based on what the template


@@ -82,8 +80,15 @@ j) use some JMF (Java Media Framework at sun.com) features for nifty media
 tricks
 k) better transaction support in the DB/Persistance layer for more efficient
 use of DB.
 tricks
 k) better transaction support in the DB/Persistance layer for more efficient
 use of DB.

-l) - config.porperties has to be cleaned and has to be better documentated. (half done, mh) --> config.properties is being replaced with new config system.
+l) - config.porperties has to be cleaned and has to be better documentated. (half done, mj) --> config.properties is being replaced with new config system. (mh, zapata)

 m) Editing producer-templates in the mir-servlet. (idfx) 
 m) Editing producer-templates in the mir-servlet. (idfx) 

+n) Media infrastructure stuff:
+  - make a sort of Factory to get handler perhaps in EntiyMediaType
+  - MediaHandler should take care of storage tablename, the entry in SQL is
+    redundant. -> get rid of it
+  - maybe get rid of the MediaTypeTable entirely and have it in a config file?
+  - use FM's TemplateMethodModel to access the MediaHandler method in templates
+    instead of the crude way it's done now.

 
 Version 2: 
 Database-Layer 
 
 Version 2: 
 Database-Layer 

diff --git a/templates-dist/admin/topic.template b/templates-dist/admin/topic.template
index ee00939..9ed1cd7 100755 (executable)
--- a/templates-dist/admin/topic.template
+++ b/templates-dist/admin/topic.template
@@ -10,7 +10,7 @@ ${lang("topic.htmltitle")}
 <form action="${config.actionRoot}" method="post">
        <input type=hidden name=module value=Topics>
        <input type="hidden" name="id" value="${data.id}">
 <form action="${config.actionRoot}" method="post">
        <input type=hidden name=module value=Topics>
        <input type="hidden" name="id" value="${data.id}">

-       <if new><input type="hidden" name="do" value="insert">
+       <if data.new><input type="hidden" name="do" value="insert">

        <else><input type="hidden" name="do" value="update"></if>
 <table border="0">
   <tr>
        <else><input type="hidden" name="do" value="update"></if>
 <table border="0">
   <tr>