X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=etc%2Fopen%2Feditarticle.template;h=57f71b676c30e35b8f7d70edfc98af52352dc417;hb=e49e45e5fdef1537705ebf7b285eaeb51cd1cdfe;hp=68d3ea67ae086597f39483e0439b337bac485063;hpb=a6c770ead61332a2238523cf576b9924051b216e;p=nyc.indymedia.org.git

diff --git a/etc/open/editarticle.template b/etc/open/editarticle.template
index 68d3ea6..57f71b6 100755
--- a/etc/open/editarticle.template
+++ b/etc/open/editarticle.template
@@ -586,7 +586,6 @@
             </tr>
             <tr>
                <td colspan="3">
-                  <input type="text" class="formText" id="" name="title" value="${utility.encodeHTML(title)}" size="45" maxlength="80" tabindex="" />  
                   <p class="headline">
                      <span class="title">${lang("posting.title")}</span>
                      <span class="prompt">${lang("posting.title.info")}</span>
@@ -594,12 +593,23 @@
                         <span class="errors"><call showErrors("title")></span>
                      </if>
                   </p>
+                  <input type="text" class="formText" id="" name="title" value="${utility.encodeHTML(title)}" size="45" maxlength="80" tabindex="" />  
                </td>
             </tr>
             <tr>
                <td class="margin" colspan="3"><div><!-- --></div></td>
             </tr>
             <tr>
+               <td colspan="3">
+                  <p class="author">
+                     <span class="title">${lang("posting.author")}</span>
+                     <if errors>
+                        <span class="errors"><call showErrors("creator")></span>
+                     </if>
+                  </p>
+               </td>
+            </tr>
+ 			<tr>
                <td class="authorWrap">
                   <input type="text" class="formText" id="" name="creator" value="${utility.encodeHTML(creator)}" size="45" maxlength="45" tabindex="" />  
                </td>
@@ -614,26 +624,16 @@
                </td>
             </tr>
             <tr>
-               <td colspan="3">
-                  <p class="author">
-                     <span class="title">${lang("posting.author")}</span>
-                     <if errors>
-                        <span class="errors"><call showErrors("creator")></span>
-                     </if>
-                  </p>
-               </td>
-            </tr>
-            <tr>
                <td class="margin" colspan="3"><div><!-- --></div></td>
             </tr>
             <tr>
                <td colspan="3">
-                  <input type="text" class="formText" id="lead" name="subtitle" value="${utility.encodeHTML(subtitle)}" size="45" maxlength="100" tabindex="" />  
                   <p class="lead">
                      <span class="title">${lang("posting.lead")}</span>
                      <span class="prompt">${lang("posting.lead.info")}
                      ${lang("posting.lead.constraint")}</span>
                   </p>
+                  <input type="text" class="formText" id="lead" name="subtitle" value="${utility.encodeHTML(subtitle)}" size="45" maxlength="100" tabindex="" />  
                </td>
             </tr>
             <tr>
@@ -641,7 +641,6 @@
             </tr>
             <tr>
                <td colspan="3">
-                  <textarea class="formTextarea" id="summary" name="description" value="" rows="10" cols="100" wrap="virtual" tabindex="">${utility.encodeHTML(description)}</textarea>
                   <p class="summary">
                      <span class="title">${lang("posting.abstract")}</span>
                      <span class="prompt">${lang("posting.abstract.info")}
@@ -650,21 +649,27 @@
                         <span class="errors"><call showErrors("description")></span>
                      </if>
                   </p>
+                  <textarea class="formTextarea" id="summary" name="description" value="" rows="10" cols="100" wrap="virtual" tabindex="">${utility.encodeHTML(description)}</textarea>
                </td>
             </tr>
             <tr>
                <td class="margin" colspan="3"><div><!-- --></div></td>
             </tr>
             <tr>
+            	<td colspan="3">
+            		<p class="lead">
+            		<span class="title">${lang("posting.location")}</span>
+            		</p>
+            	</td>
+            </tr>
+            <tr>
                <td colspan="3">
                   <table class="formWrap" id="location" cellspacing="0">
                      <tr>
                         <td>
-                           <select class="formSelect" id="location" name="to_topic">
-                              <list topics as t>
-                                 <if (t.archiv_url == "Location")>
-                                 <option value="${t.id}" <list to_topic as to><if (t.id == to)>selected="selected"</if></list>>${t.title}</option>
-                                 </if>
+                           <select class="formSelect" id="location" name="to_location">
+                              <list locations as l>
+                                 <option value="${l.id}" <list to_location as to><if (l.id == to)>selected="selected"</if></list>>${l.title}</option>
                               </list>
                            </select>
                         </td>
@@ -748,6 +753,7 @@
                         <span class="errors"><call showErrors("content_data")></span>
                      </if>
                   </p>
+                  <textarea class="formTextarea" id="body" name="content_data" value="" rows="40" cols="100" wrap="soft" tabindex="">${utility.encodeHTML(content_data)}</textarea>
                   <div class="formWrap" id="textFormat">
                      <table cellspacing="0">
                         <tr>
@@ -761,7 +767,7 @@
                            </td>
                            <td><div class="spacer"><!-- --></div></td>
                            <td>
-                              <input type="radio" class="formRadio" id="" name="is_html" value="1" tabindex="" />
+                              <input type="radio" class="formRadio" id="" name="is_html" value="1" tabindex="" />  
                            </td>
                            <td>
                               <p>
@@ -770,7 +776,7 @@
                            </td>
                         </tr>
                      </table>
-                  </div>
+                  </div>         
                   <comment>
                      Replacing this with radio buttons --patrick
                      <select name="is_html">
@@ -778,7 +784,6 @@
                         <option value="1" <if is_html=="1">selected</if>>html</option>
                      </select>
                   </comment>
-                  <textarea class="formTextarea" id="body" name="content_data" value="" rows="40" cols="100" wrap="soft" tabindex="">${utility.encodeHTML(content_data)}</textarea>
                </td>
             </tr>
             <tr>
@@ -793,14 +798,17 @@
                            <p class="category">
                               <span class="title">${lang("posting.topic")}</span>
                            </p>
-                           <list topics as t>
-                              <if (t.archiv_url == "Category")>
-                                 <input type="checkbox" class="formCheckbox" id="" name="to_topic" value="${t.id}" />  
+                           <p>
+                     <if errors>
+                        <span class="errors"><call showErrors("to_category")></span>
+                     </if>
+                           </p>
+                           <list categories as c>
+                              <input type="checkbox" class="formCheckbox" id="" name="to_category" value="${c.id}" <list to_category as to><if (c.id == to)>checked="checked"</if></list> />  
                                  <p class="topic">
-                                    ${t.title}
+                                    ${c.title}
                                  </p>
                                  <div class="spacer"><!-- --></div>
-                              </if>
                            </list>
                         </td>
                         </td>
@@ -812,11 +820,14 @@
                            <p class="subcategory">
                               <span class="title">${lang("posting.subcategory")}</span>
                            </p>
-                           <select class="formSelect" id="" name="to_topic" size="15" multiple="multiple">
-                              <list topics as t>
-                                 <if (t.archiv_url == "Subcategory")>
-                                 <option value="${t.id}" <list to_topic as to><if (t.id == to)>selected="selected"</if></list>>${t.title}</option>
-                                 </if>
+                           <p>
+                     	   	  <if errors>
+                        		<span class="errors"><call showErrors("to_subcategory")></span>
+                     		  </if>
+                           </p>
+                           <select class="formSelect" id="" name="to_subcategory" size="15" multiple="multiple">
+                              <list subcategories as sc>
+                                 <option value="${sc.id}" <list to_subcategory as to><if (sc.id == to)>selected="selected"</if></list>>${sc.title}</option>
                               </list>
                            </select>
                         </td>
@@ -844,10 +855,10 @@
                      <table class="formWrap" id="contactEmail" cellspacing="0">
                         <tr>
                            <td>
-                              <input type="text" class="formText" id="email" name="creator_email" value="${utility.encodeHTML(creator_email)}" size="20" maxlength="80" tabindex="" />  
                               <p>
                                  ${lang("posting.email")}
                               </p>
+                              <input type="text" class="formText" id="email" name="creator_email" value="${utility.encodeHTML(creator_email)}" size="20" maxlength="80" tabindex="" />  
                            </td>
                            <td><div class="spacer"><!-- --></div></td>
                         </tr>
@@ -855,10 +866,10 @@
                      <table class="formWrap" id="contactURL" cellspacing="0">
                         <tr>
                            <td>
-                              <input type="text" class="formText" id="url" name="creator_main_url" value="${utility.encodeHTML(creator_main_url)}" size="75" maxlength="160" tabindex="" />  
                               <p>
                                  ${lang("posting.url")}
                               </p>
+                              <input type="text" class="formText" id="url" name="creator_main_url" value="${utility.encodeHTML(creator_main_url)}" size="75" maxlength="160" tabindex="" />  
                            </td>
                         </tr>
                      </table>
@@ -867,10 +878,10 @@
                      <table class="formWrap" id="contactPhone" cellspacing="0">
                         <tr>
                            <td>
-                              <input type="text" class="formText" id="phone" name="creator_phone" value="${utility.encodeHTML(creator_address)}" size="20" maxlength="20" tabindex="" />  
                               <p>
                                  ${lang("posting.phone")}
                               </p>
+                              <input type="text" class="formText" id="phone" name="creator_phone" value="${utility.encodeHTML(creator_address)}" size="20" maxlength="20" tabindex="" />  
                            </td>
                            <td><div class="spacer"><!-- --></div></td>
                         </tr>
@@ -878,10 +889,10 @@
                     <table class="formWrap" id="contactAddress" cellspacing="0">
                         <tr>
                            <td>
-                              <input type="text" class="formText" id="address" name="creator_address" value="${utility.encodeHTML(creator_address)}" size="20" maxlength="160" tabindex="" />  
                               <p>
                                  ${lang("posting.address")}
                               </p>
+                              <input type="text" class="formText" id="address" name="creator_address" value="${utility.encodeHTML(creator_address)}" size="20" maxlength="160" tabindex="" />  
                            </td>
                         </tr>
                      </table>
@@ -970,8 +981,8 @@
             <p class="contact">
                <!-- copy<a href="#">Left</a>&#160;| -->
                imc-nyc at lists.indymedia.org&#160;|
-               (212) 684-8112<br />
-               34 E. 29th ST, 2nd FL, NY, NY 10016
+               (212) 221-0521<br />
+               4 W. 43rd ST, NY, NY 10036
             </p>
          </small>
       </td>