grupppentemplate away

diff --git a/templates-dist/de/content.template b/templates-dist/de/content.template
index 31631b5..08bb6f7 100755 (executable)
--- a/templates-dist/de/content.template
+++ b/templates-dist/de/content.template
@@ -109,12 +109,7 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
                <a href="${docRoot}/help/content.html">
                <img src="${docRoot}/img/help.gif" border="0" align="absmiddle"></a></font>
        </td>
-       <td colspan="4" >
-               <select name="to_creator">
-               <list gruppenPopupData as u>
-                       <option value="${u.key}" <if (u.key == to_creator || (to_creator=="" && u.key==login_user.to_creator))>selected</if>>${u.value}</option>
-               </list>
-               </select> oder:<br>
+       <td colspan="4">
                <input type="text" size="40" name="creator" value="${creator}"><br>
        </td>
 </tr>

diff --git a/templates-dist/de/start_admin.template b/templates-dist/de/start_admin.template
index aea62da..b29b19d 100755 (executable)
--- a/templates-dist/de/start_admin.template
+++ b/templates-dist/de/start_admin.template
@@ -171,16 +171,6 @@
 
                <p>
                        <font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
-                 <b>GRUPPEN</b></font>
-
-    <p>
-                       <a href="${actionRoot}?module=Groups&do=list">
-      <img src="${docRoot}/img/pointgris.gif" border=0> bearbeiten</a><br>
-      <a href="${actionRoot}?module=Groups&do=add" >
-                       <img src="${docRoot}/img/pointgris.gif" border=0> hinzuf&uuml;gen</a>
-
-               <p>
-                       <font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
                  <b>BILDER</b></font>
 
     <p>

diff --git a/templates-dist/en/bilder.template b/templates-dist/en/bilder.template
index dcca99d..e915dd5 100755 (executable)
--- a/templates-dist/en/bilder.template
+++ b/templates-dist/en/bilder.template
@@ -84,11 +84,6 @@ function openWin(url) {
         <B>author:</B></font></td>\r
     <td>\r
                <input type="text" size="40" maxlength="80" name="creator" value="${creator}">\r
-               <!-- <select name="to_creator">\r
-               <list gruppenPopupData as u>\r
-                       <option value="${u.key}" <if u.key == to_creator>selected</if>>${u.value}</option>\r
-               </list>\r
-               </select></td> -->\r
        </tr>\r
 \r
        <tr> \r

diff --git a/templates-dist/en/content.template b/templates-dist/en/content.template
index 50f6fb2..6b867ff 100755 (executable)
--- a/templates-dist/en/content.template
+++ b/templates-dist/en/content.template
@@ -110,11 +110,6 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
                <img src="${docRoot}/img/help.gif" border="0" align="absmiddle"></a></font>\r
        </td>\r
        <td colspan="4" >\r
-               <select name="to_creator">\r
-               <list gruppenPopupData as u>\r
-                       <option value="${u.key}" <if (u.key == to_creator || (to_creator=="" && u.key==login_user.to_creator))>selected</if>>${u.value}</option>\r
-               </list>\r
-               </select> or:<br>\r
                <input type="text" size="40" name="creator" value="${creator}"><br>\r
        </td>\r
 </tr>\r

diff --git a/templates-dist/en/contentlist.template b/templates-dist/en/contentlist.template
index fbebc6e..aafd12f 100755 (executable)
--- a/templates-dist/en/contentlist.template
+++ b/templates-dist/en/contentlist.template
@@ -31,7 +31,7 @@
                        </font></td>\r
            <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1"><b>\r
                        <font size="-2">${articletypeHash[entry.to_article_type]["name"]} -- </font><if entry.place>${entry.place}: </if>${entry.title}</b><br>\r
-                       <if entry.to_creator!="0">${gruppenHashData[entry.to_creator]["name"]}<else>${entry.creator}</if>&nbsp;\r
+                       ${entry.creator}&nbsp;\r
                        <a href="${actionRoot}?module=Content&do=edit&id=${entry.id}&where=${where_encoded}&order=${order_encoded}&offset=${offset}">edit</a>\r
                        <if entry.to_article_type=="0">&nbsp;|&nbsp;<a href="${actionRoot}?module=Content&do=newswire&id=${entry.id}&where=${where_encoded}&order=${order_encoded}&offset=${offset}">newswire</a></if></font></td>\r
            <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">\r

diff --git a/templates-dist/en/gruppen.template b/templates-dist/en/gruppen.template
deleted file mode 100755 (executable)
index 08cdd6a..0000000
--- a/templates-dist/en/gruppen.template
+++ /dev/null
@@ -1,59 +0,0 @@
-<html>\r
-<head>\r
-<title>\r
-indymedia.de | groups\r
-</title>\r
-<head>\r
-\r
-<body bgcolor="#FFFFFF">\r
-<include "head.template">\r
-<form method="post" action="${actionRoot}">\r
-       <input type=hidden name=module value=Gruppen>\r
-       <input type="hidden" name="id" value="${id}">\r
-       <if new>\r
-               <input type="hidden" name="do" value="insert">\r
-       <else>\r
-               <input type="hidden" name="do" value="update">\r
-       </if>\r
-<table border="0">\r
-  <tr> \r
-    <td align="right" bgcolor="#006600"><font color="#ffffff"><B>name:</B></font></td>\r
-    <td>\r
-      <input type="text" size="40" name="name" value="${name}">\r
-    </td>\r
-  </tr>\r
-  <tr> \r
-    <td align="right" bgcolor="#006600"><font color="#ffffff"><B>email:</B></font></td>\r
-    <td> \r
-      <input type="text" size="40" name="email" value="${email}">\r
-    </td>\r
-  </tr>\r
-  <tr> \r
-    <td align="right" bgcolor="#006600"><font color="#ffffff"><B>homepage:</B></font></td>\r
-    <td>\r
-      <input type="text" size="40" name="main_url" value="${main_url}">\r
-    </td>\r
-  </tr>\r
-  <tr> \r
-    <td align="right" bgcolor="#006600"><font color="#ffffff"><B>adresse:</B></font></td>\r
-    <td>\r
-      <input type="text" size="40" name="address" value="${address}">\r
-    </td>\r
-  </tr>\r
-  <tr> \r
-    <td align="right" bgcolor="#006600"><font color="#ffffff"><B>telefon:</B></font></td>\r
-    <td>\r
-      <input type="text" size="40" name="phone" value="${phone}">\r
-    </td>\r
-  </tr>\r
-  <tr> \r
-    <td colspan="2" align="right"> <font color="#ffffff"><if new> \r
-      <input type="submit" name="save" value="einfügen">\r
-    <else> \r
-    <input type="submit" name="save" value="speichern">\r
-    </if> </font></form></font>\r
-    </td>\r
-</table>\r
-<include "foot.template">\r
-</body>\r
-</html>\r

diff --git a/templates-dist/en/gruppenlist.template b/templates-dist/en/gruppenlist.template
deleted file mode 100755 (executable)
index d2ffcd6..0000000
--- a/templates-dist/en/gruppenlist.template
+++ /dev/null
@@ -1,44 +0,0 @@
-<html>\r
-<head>\r
-       <title>indymedia.de | grouplist</title>\r
-</head>\r
-\r
-<body bgcolor="#FFFFFF">\r
-<include "head.template">\r
-<if contentlist>\r
-       <table border="0">\r
-               <tr bgcolor="##006600">\r
-               <td><font color="#ffffff"><b>name</b></font></td>\r
-                   <td><font color="#ffffff"><b>email</b></font></td>\r
-               <td><font color="#ffffff"><b>homepage</b></font></td>\r
-                </tr>\r
-         <list contentlist as entry>\r
-                 <tr <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if> >\r
-                       <td>${entry.name}&nbsp;</td>\r
-                       <td>${entry.email}&nbsp;</td>\r
-                       <td>${entry.homepage}&nbsp;</td>\r
-                       <td><font size="1">&nbsp;<a href="${actionRoot}?module=Gruppen&do=delete&id=${entry.id}">delete</a>\r
-                       | <a href="${actionRoot}?module=Gruppen&do=edit&id=${entry.id}">edit</a></font></td>\r
-                 </tr>\r
-         </list>\r
-               <tr>\r
-       <td colspan="3" bgcolor="#006600"><font color="#ffffff">${count} entries\r
-       / show from ${from} to ${to}</font></td>\r
-       <td>&nbsp;</td>\r
-               </tr>\r
-       </table>\r
-      <P>\r
-       <if prev>\r
-       <a href="${actionRoot}?module=Gruppen&do=list&where=${where}&prevoffset=${prev}&prev=zur&uuml;ck">back</a>&nbsp;\r
-       </if>\r
-       <if next>\r
-       <a href="${actionRoot}?module=Gruppen&do=list&where=${where}&nextoffset=${next}&next=weiter">go on</a>\r
-       </if>\r
-<else>\r
-  <P align="center"> No maching entries!</p>\r
-</if>\r
-<include "foot.template">\r
-</body>\r
-</html>\r
-\r
-\r

diff --git a/templates-dist/en/start_admin.template b/templates-dist/en/start_admin.template
index 70eb670..e62f539 100755 (executable)
--- a/templates-dist/en/start_admin.template
+++ b/templates-dist/en/start_admin.template
@@ -171,16 +171,6 @@
 \r
                <p>\r
                        <font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">\r
-                 <b>ADMIN-GROUPS</b></font>\r
-\r
-    <p>\r
-                       <a href="${actionRoot}?module=Groups&do=list">\r
-      <img src="${docRoot}/img/pointgris.gif" border=0> edit</a><br>\r
-      <a href="${actionRoot}?module=Groups&do=add" >\r
-                       <img src="${docRoot}/img/pointgris.gif" border=0> add</a>\r
-\r
-               <p>\r
-                       <font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">\r
                  <b>PICTURES</b></font>\r
 \r
     <p>\r