*** empty log message ***

diff --git a/etc/open/editarticle.template b/etc/open/editarticle.template
index dc0a1f3..0764ed1 100755 (executable)
--- a/etc/open/editarticle.template
+++ b/etc/open/editarticle.template
@@ -520,7 +520,7 @@
              
          </comment>
          
-         <p class="title">
+         <p class="pageTitle">
             ${lang("posting.form.title")}
          </p>
          
@@ -540,7 +540,7 @@
          <form enctype="multipart/form-data" action="${actionURL}&do=opensession&sessiontype=article" method="post">
          
             <comment>
-               what the heck is this? --patrick
+               not sure what this is --patrick
             </comment>
                <if password>
                   ${password}<br />
@@ -548,20 +548,25 @@
                   <input type="password" class="formPassword" id="" name="password" value="" size="20" maxlength="" tabindex="" />
                </if>
          
-         <div class="mediaUploadCount">
-            <p>
-               ${lang("posting.nr_of_media")}<br />
-               ${lang("posting.nr_of_media.info")}
-            </p>
-            <input type="text" name="nrmediaitems" size="8" value="${utility.encodeHTML(nrmediaitems)}">
-            <input type="submit" value="${lang("posting.nr_of_media.submit")}">
-         </div>
          <table class="formWrap" id="publishForm" cellspacing="0">
             <tr>
                <td colspan="3">
+                  <p>
+                     ${lang("posting.nr_of_media")}<br />
+                     ${lang("posting.nr_of_media.info")}
+                  </p>
+                  <input type="text" name="nrmediaitems" size="8" value="${utility.encodeHTML(nrmediaitems)}">
+                  <input type="submit" value="${lang("posting.nr_of_media.submit")}">
+               </td>
+            </tr>
+            <tr>
+               <td class="margin" colspan="3"><div><!-- --></div></td>
+            </tr>
+            <tr>
+               <td colspan="3">
                   <input type="text" class="formText" id="" name="title" value="${utility.encodeHTML(title)}" size="45" maxlength="45" tabindex="" />  
-                  <p class="title">
-                     <span class="required">${lang("posting.title")}</span>
+                  <p class="headline">
+                     <span class="title">${lang("posting.title")}</span>
                      <span class="prompt">${lang("posting.title.info")}</span>
                      <if errors>
                         <span class="errors"><call showErrors("title")></span>
@@ -570,7 +575,10 @@
                </td>
             </tr>
             <tr>
-               <td class="author">
+               <td class="margin" colspan="3"><div><!-- --></div></td>
+            </tr>
+            <tr>
+               <td class="authorWrap">
                   <input type="text" class="formText" id="" name="creator" value="${utility.encodeHTML(creator)}" size="45" maxlength="45" tabindex="" />  
                </td>
                <td><div class="spacer"><!-- --></div></td>
@@ -586,33 +594,47 @@
             <tr>
                <td colspan="3">
                   <p class="author">
-                     <span class="required">${lang("posting.author")}</span>
+                     <span class="title">${lang("posting.author")}</span>
                      <if errors>
                         <span class="errors"><call showErrors("creator")></span>
                      </if>
                   </p>
-         
-                  <div class="lead">
-                     <textarea class="formTextarea" id="lead" name="subtitle" value="" rows="2" cols="100" wrap="virtual" tabindex="">${utility.encodeHTML(subtitle)}</textarea>
-                     <p>
-                        ${lang("posting.lead")}
-                        <span class="prompt">${lang("posting.lead.info")}
-                        ${lang("posting.lead.constraint")}</span>
-                     </p>
-                  </div>
-               
-                  <div class="summary">
-                     <textarea class="formTextarea" id="summary" name="description" value="" rows="10" cols="100" wrap="virtual" tabindex="">${utility.encodeHTML(description)}</textarea>
-                     <p>
-                        <span class="required">${lang("posting.abstract")}</span>
-                        <span class="prompt">${lang("posting.abstract.info")}
-                        ${lang("posting.abstract.constraint")}</span>
-                        <if errors>
-                           <span class="errors"><call showErrors("description")></span>
-                        </if>
-                     </p>
-                  </div>
-         
+               </td>
+            </tr>
+            <tr>
+               <td class="margin" colspan="3"><div><!-- --></div></td>
+            </tr>
+            <tr>
+               <td colspan="3">
+                  <textarea class="formTextarea" id="lead" name="subtitle" value="" rows="2" cols="100" wrap="virtual" tabindex="">${utility.encodeHTML(subtitle)}</textarea>
+                  <p class="lead">
+                     <span class="title">${lang("posting.lead")}</span>
+                     <span class="prompt">${lang("posting.lead.info")}
+                     ${lang("posting.lead.constraint")}</span>
+                  </p>
+               </td>
+            </tr>
+            <tr>
+               <td class="margin" colspan="3"><div><!-- --></div></td>
+            </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")}
+                     ${lang("posting.abstract.constraint")}</span>
+                     <if errors>
+                        <span class="errors"><call showErrors("description")></span>
+                     </if>
+                  </p>
+               </td>
+            </tr>
+            <tr>
+               <td class="margin" colspan="3"><div><!-- --></div></td>
+            </tr>
+            <tr>
+               <td colspan="3">
                   <table class="formWrap" id="location" cellspacing="0">
                      <tr>
                         <td>
@@ -688,12 +710,17 @@
                         </td>
                      </tr>
                   </table>
-         
-         <div style="clear: both;"></div>
-         
+                  <div class="spacer" style="clear: both;"><!-- --></div>
+               </td>
+            </tr>
+            <tr>
+               <td class="margin" colspan="3"><div><!-- --></div></td>
+            </tr>
+            <tr>
+               <td colspan="3">
                   <p class="body">
-                     <span class="required">${lang("posting.text")}</span>
-                     ${lang("posting.text.info")}
+                     <span class="title">${lang("posting.text")}</span>
+                     <span class="prompt">${lang("posting.text.info")}</span>
                      <!-- ${lang("posting.html")} -->
                      <if errors>
                         <span class="errors"><call showErrors("content_data")></span>
@@ -730,12 +757,19 @@
                         <option value="1" <if is_html=="1">selected</if>>html</option>
                      </select>
                   </comment>
+               </td>
+            </tr>
+            <tr>
+               <td class="margin" colspan="3"><div><!-- --></div></td>
+            </tr>
+            <tr>
+               <td colspan="3">
          
                   <table class="formWrap" id="topics" cellspacing="0">
                      <tr>
                         <td class="categories">
                            <p class="category">
-                              ${lang("posting.topic")}
+                              <span class="title">${lang("posting.topic")}</span>
                            </p>
                            <list topics as t>
                               <if (t.archiv_url == "Category")>
@@ -753,8 +787,8 @@
                   <table class="formWrap" id="topics" cellspacing="0">
                      <tr>
                         <td class="subcategories">
-                           <p>
-                              ${lang("posting.subcategory")}
+                           <p class="subcategory">
+                              <span class="title">${lang("posting.subcategory")}</span>
                            </p>
                            <!-- ${lang("posting.topic.info")} -->
                            <select class="formSelect" id="" name="to_topic" size="15" multiple="multiple">
@@ -767,14 +801,17 @@
                         </td>
                      </tr>
                   </table>
-         
-         <div style="clear: both;"></div>
-         
-                  <p>
-                     ${lang("posting.contact")} 
-                  </p>
-                  <p>
-                     ${lang("posting.contact.info")} 
+                  <div class="spacer" style="clear: both;"><!-- --></div>
+               </td>
+            </tr>
+            <tr>
+               <td class="margin" colspan="3"><div><!-- --></div></td>
+            </tr>
+            <tr>
+               <td colspan="3">
+                  <p class="contact">
+                     <span class="title">${lang("posting.contact")}</span>
+                     <span class="prompt">${lang("posting.contact.info")}</span>
                   </p>
          
                   <div class="contactWrap">
@@ -799,8 +836,7 @@
                            </td>
                         </tr>
                      </table>
-            
-            <div style="clear: both;"></div>
+                     <div class="spacer" style="clear: both;"><!-- --></div>
             
                      <table class="formWrap" id="contactPhone" cellspacing="0">
                         <tr>
@@ -824,63 +860,69 @@
                         </tr>
                      </table>
                   </div>    
+
+               </td>
+            </tr>
+            <tr>
+               <td class="margin" colspan="3"><div><!-- --></div></td>
+            </tr>
+            <tr>
+               <td colspan="3">
          
-                  <p>
-                     ${lang("posting.media")}
+                  <p class="media">
+                     <span class="title">${lang("posting.media")}</span>
+                     <span class="prompt">${lang("posting.media.info")}
+                     ${lang("posting.media.howto")}</span>
                   </p>
-         
-         <list attachments as a>
-             <p>  ${utility.encodeHTML(a.filename)}</p>
-             <input type="checkbox" name="${a.fieldname}_cancel"> ${lang("posting.media.cancel")}
-               <p>${lang("posting.media.title")}</p>
-             <input type="text" class="preq" name="${a.fieldname}_title" size="40" maxlength="80" value="${utility.encodeHTML(a.title)}">
+                  <list attachments as a>
+                      <p>  ${utility.encodeHTML(a.filename)}</p>
+                      <input type="checkbox" name="${a.fieldname}_cancel"> ${lang("posting.media.cancel")}
+                        <p>${lang("posting.media.title")}</p>
+                      <input type="text" class="preq" name="${a.fieldname}_title" size="40" maxlength="80" value="${utility.encodeHTML(a.title)}">
+                           </list>
+                           
+                  
+                  <list mediaitems as m>
+                      <p>${lang("posting.media.media")} ${m}</p>
+                      <input type="file" name="media${m}">
+                      <p>${lang("posting.media.title")} ${m}</p>
+                      <input type="text" class="preq" name="media${m}_title" size="40" maxlength="80" value="">
                   </list>
                   
-                  <p>
-                     ${lang("posting.media.info")}
-                  </p>
-                  <p>
-                     ${lang("posting.media.howto")}
-                  </p>
-         
-         <list mediaitems as m>
-             <p>${lang("posting.media.media")} ${m}</p>
-             <input type="file" name="media${m}">
-             <p>${lang("posting.media.title")} ${m}</p>
-             <input type="text" class="preq" name="media${m}_title" size="40" maxlength="80" value="">
-         </list>
-         
-         <if config["Localizer.OpenSession.AllowFTPUploads"]!="0">
-           <if config["Localizer.OpenSession.AllowFTPUploadSelection"]!="0" && ftpfiles>
-               <p>${lang("posting.media.ftpmedia")}</p>
-             <select name="ftpupload">
-               <option value="">&nbsp;</option>
-               <list ftpfiles as f>
-                 <option value="${utility.encodeHTML(f)}">${f}</option>
-               </list>
-             </select>
-         
-               <p>${lang("posting.media.title")}</p>
-             <input type="text" class="preq" name="ftpupload_title" size="40" maxlength="80" value="">
-           <else>
-               <p>${lang("posting.media.ftpmedia")}</p>
-             <input type="text" name="ftpupload"  size="40" maxlength="80" value="">
-               <p>${lang("posting.media.title")}</p>
-             <input type="text" class="preq" name="ftpupload_title" size="40" maxlength="80" value="">
-           </if>
-         </if>
-         
-         
-               <p>
-                  ${lang("posting.submit.info")}
-               </p>
-               <p>
-                  ${lang("posting.criteria")}
-               </p>
-               <input type="submit" name="post" class="psubmit" value="${lang("posting.submit")}">
+                  <if config["Localizer.OpenSession.AllowFTPUploads"]!="0">
+                    <if config["Localizer.OpenSession.AllowFTPUploadSelection"]!="0" && ftpfiles>
+                        <p>${lang("posting.media.ftpmedia")}</p>
+                      <select name="ftpupload">
+                        <option value="">&#160;</option>
+                        <list ftpfiles as f>
+                          <option value="${utility.encodeHTML(f)}">${f}</option>
+                        </list>
+                      </select>
+                  
+                        <p>${lang("posting.media.title")}</p>
+                      <input type="text" class="preq" name="ftpupload_title" size="40" maxlength="80" value="">
+                    <else>
+                        <p>${lang("posting.media.ftpmedia")}</p>
+                      <input type="text" name="ftpupload"  size="40" maxlength="80" value="">
+                        <p>${lang("posting.media.title")}</p>
+                      <input type="text" class="preq" name="ftpupload_title" size="40" maxlength="80" value="">
+                    </if>
+                  </if>
          
                </td>
             </tr>
+            <tr>
+               <td class="margin" colspan="3"><div><!-- --></div></td>
+            </tr>
+            <tr>
+               <td colspan="3">
+                  <p class="submit">
+                     <span class="title">${lang("posting.submit.info")}</span>
+                     <span class="prompt">${lang("posting.criteria")}</span>
+                  </p>
+                  <input type="submit" class="formSubmit" id="" name="post" value="${lang("posting.submit")}" tabindex=""  />
+               </td>
+            </tr>
          </table>
          </form>