[php-blog-cvs] serendipity serendipity_functions.inc.php,1.155,1.156

[<tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv9468

Modified Files:
	serendipity_functions.inc.php 
Log Message:
* Changed how previous & next page was displayed
* Fixed layout in the Authoring Suite -> Entries


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- serendipity_functions.inc.php	20 Sep 2003 12:19:06 -0000	1.155
+++ serendipity_functions.inc.php	20 Sep 2003 13:37:18 -0000	1.156
@@ -640,21 +640,18 @@
     }
 ?>
 <div class='serendipity_entryFooter' style="text-align: center">
-<br />
-&nbsp;&nbsp;
-(<?php printf(PAGE_BROWSE, $serendipity['GET']['page'], $totalPages, $totalEntries); ?>)<br />
-&nbsp;&nbsp;
 <?php
     if ($serendipity['GET']['page'] > 1) {
 ?>
-<a href="<?php echo $serendipity['baseURL'] . $serendipity['indexFile'] . '?serendipity[page]=' . ($serendipity['GET']['page'] - 1) . $add_query; ?>">&laquo; <?php echo PREVIOUS_PAGE; ?></a>&nbsp;&nbsp;|&nbsp;&nbsp;
+<a href="<?php echo $serendipity['baseURL'] . $serendipity['indexFile'] . '?serendipity[page]=' . ($serendipity['GET']['page'] - 1) . $add_query; ?>">&laquo; <?php echo PREVIOUS_PAGE; ?></a>&nbsp;&nbsp;
 <?php
     }
 ?>
+(<?php printf(PAGE_BROWSE, $serendipity['GET']['page'], $totalPages, $totalEntries); ?>)
 <?php
     if ($serendipity['GET']['page'] < $totalPages) {
 ?>
-<a href="<?php echo $serendipity['baseURL'] . $serendipity['indexFile'] . '?serendipity[page]=' . ($serendipity['GET']['page'] + 1) . $add_query; ?>"><?php echo NEXT_PAGE; ?> &raquo;</a>
+&nbsp;&nbsp;<a href="<?php echo $serendipity['baseURL'] . $serendipity['indexFile'] . '?serendipity[page]=' . ($serendipity['GET']['page'] + 1) . $add_query; ?>"><?php echo NEXT_PAGE; ?> &raquo;</a>
 <?php
     }
 ?>
@@ -1951,41 +1948,51 @@
 
         <table class="serendipityEntryEdit" border="0">
             <tr>
-                <td align="left" <?php echo (!$serendipity['wysiwyg'] ? 'colspan="2"' : ''); ?>>
-                    <div>
-                        <b><?php echo TITLE?>:</b> <input type="text" name="serendipity[title]" value="<?php echo isset($entry['title']) ? htmlentities($entry['title']) : ''; ?>" size="<?php echo ($serendipity['wysiwyg'] ? '30' : '80'); ?>" />
-                    </div>
+                <td>
+                   <b><?php echo TITLE; ?>:</b>
+                </td>
+                <td colspan="2">
+                    <table width="100%" cellspacing="0" cellpadding="0" border="0">
+                        <tr>
+                            <td><input type="text" name="serendipity[title]" value="<?php echo isset($entry['title']) ? htmlentities($entry['title']) : ''; ?>" size="72" /></td>
+                            <td align="right align="right""><select name="serendipity[isdraft]">
+                                <option  value="false" <?php echo $draftP; ?>><?php echo PUBLISH; ?></option>
+                                <option  value="true"  <?php echo $draftD; ?>><?php echo DRAFT; ?></option>
+                                </select>
+                            </td>
+                        </tr>
+                    </table>
                 </td>
-
-                <?php echo ($serendipity['wysiwyg'] ? '<td>' . CATEGORY . ' ' . $cat_list . '</td>' : ''); ?>
             </tr>
             <tr>
-                    <td><b><?php echo TYPE; ?>:</b>
-                        <select name="serendipity[isdraft]">
-                            <option  value="false" <?php echo $draftP; ?>><?php echo PUBLISH; ?></option>
-                            <option  value="true"  <?php echo $draftD; ?>><?php echo DRAFT; ?></option>
-                        </select>
-                        <?php
-                        if (isset($serendipity['allowDateManipulation']) && $serendipity['allowDateManipulation']) {
-                        ?>
-                        &nbsp;<b><?php echo DATE; ?>:</b>
-                        <input type="hidden" name="serendipity[chk_timestamp]" value="<?php echo (isset($entry['timestamp']) && $entry['timestamp'] > 0 ? $entry['timestamp'] : time()); ?>" />
-                        <input type="text" name="serendipity[new_timestamp]" value="<?php echo date(DATE_FORMAT_2, (isset($entry['timestamp']) && $entry['timestamp'] > 0 ? $entry['timestamp'] : time())); ?>" />
-                        <?php
-                        }
-                        ?>
-                    </td>
-                    <td align="right"><b><?php echo CATEGORY; ?></b> <?php echo $cat_list ; ?></td>
+<?php
+        if (isset($serendipity['allowDateManipulation']) && $serendipity['allowDateManipulation']) {
+?>
+                <td>
+                    <b><?php echo DATE; ?>:</b>
+                </td>
+                <td>
+                    <input type="hidden" name="serendipity[chk_timestamp]" value="<?php echo (isset($entry['timestamp']) && $entry['timestamp'] > 0 ? $entry['timestamp'] : time()); ?>" />
+                    <input type="text" name="serendipity[new_timestamp]" value="<?php echo date(DATE_FORMAT_2, (isset($entry['timestamp']) && $entry['timestamp'] > 0 ? $entry['timestamp'] : time())); ?>" />
+                </td>
+                <td align="right">
+<?php
+        } else {
+?>
+                <td align="right" colspan="3">
+<?php   
+        }
+?>
+                    <b><?php echo CATEGORY; ?></b> <?php echo $cat_list ; ?></td>
             </tr>
             <tr>
-                <td><b><?php echo ENTRY_BODY; ?></b></td>
-                <td align="right">
 <?php
     if (!$serendipity['wysiwyg']) {
 ?>
-                    <div>
+                <td colspan="2"><b><?php echo ENTRY_BODY; ?></b></td>
+                <td align="right">
 <?php
-        // Since the user has WYSIWYG editor disabled, we want to check if we should use the "better" non-WYSIWYG editor
+        /* Since the user has WYSIWYG editor disabled, we want to check if we should use the "better" non-WYSIWYG editor */
         if (!$serendipity['wysiwyg'] && eregi($serendipity['EditorBrowsers'], $_SERVER['HTTP_USER_AGENT']) ) {
 ?>
                         <input type="button" name="insI" value="I" accesskey="i" style="font-style: italic" onClick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<i>','</i>')" />
@@ -1994,40 +2001,43 @@
                         <input type="button" name="insJ" value="img" accesskey="j" onClick="wrapInsImage(document.forms['serendipityEntry']['serendipity[body]'])" />
                         <input type="button" name="insImage" value="<?php echo IMAGE ; ?>" style="" onClick="window.open('serendipity_admin_image_selector.php', 'ImageSel', 'width=800, height=600, toolbar=no');" />
                         <input type="button" name="insU" value="URL" accesskey="l" style="color: blue; text-decoration: underline;" onClick="wrapSelectionWithLink(document.forms['serendipityEntry']['serendipity[body]'])" />
-<?php   } elseif (!$serendipity['wysiwyg']) { ?>
+<?php   
+        /* Do the "old" non-WYSIWYG editor */
+        } elseif (!$serendipity['wysiwyg']) { ?>
                         <input type="button" value=" B " onClick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'b')">
                         <input type="button" value=" U " onClick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'u')">
                         <input type="button" value=" I " onClick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'i')">
                         <input type="button" value="<img>" onClick="serendipity_insImage(document.forms['serendipityEntry']['serendipity[body]'])">
                         <input type="button" value="<?php echo IMAGE; ?>" onClick="window.open('serendipity_admin_image_selector.php', 'ImageSel', 'width=800,height=600,toolbar=no');">
                         <input type="button" value="Link" onClick="serendipity_insLink(document.forms['serendipityEntry']['serendipity[body]'])">
-<?php   } ?>
-                    </div>
-<?php
-    }
+<?php   } 
+    } else {
 ?>
+            <td colspan="3"><b><?php echo ENTRY_BODY; ?></b>
+
+<?php } ?>
                 </td>
             </tr>
 
             <tr>
-                <td colspan="2">
+                <td colspan="3">
                     <textarea name="serendipity[body]" id="serendipity[body]" cols="80" rows="20"><?php echo isset($entry['body']) ? htmlentities($entry['body']) : ''; ?></textarea>
                 </td>
             </tr>
 
             <tr>
-                <td colspan="2" align="right">
+                <td colspan="3" align="right">
                     <input type="button" value="- <?php echo PREVIEW; ?> -" style="font-weight: bold;" onClick="document.forms['serendipityEntry'].elements['serendipity[preview]'].value='true'; document.forms['serendipityEntry'].submit();"/>
                     <input type="submit" value="- <?php echo SAVE; ?> -" style="font-weight: bold;" />
                 </td>
             </tr>
 
             <tr>
-                <td colspan="2"><b><?php echo EXTENDED_BODY; ?></b></td>
+                <td colspan="3"><b><?php echo EXTENDED_BODY; ?></b></td>
             </tr>
 
             <tr>
-                <td colspan="2">
+                <td colspan="3">
                     <textarea name="serendipity[extended]" id="serendipity[extended]" cols="80" rows="20"><?php echo isset($entry['extended']) ? htmlentities($entry['extended']) : ''; ?></textarea>
                 </td>
             </tr>