Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27646 Modified Files: serendipity_admin.php serendipity_entries.php serendipity_functions.inc.php serendipity_functions_images.inc.php Log Message: Fix some layout stuff in image manager Change administration layouts to follow frontend CSS styles (check your themes!) Index: serendipity_admin.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- serendipity_admin.php 13 Feb 2004 16:50:39 -0000 1.27 +++ serendipity_admin.php 17 Feb 2004 16:39:55 -0000 1.28 @@ -38,7 +38,7 @@ ?> </div> <table id="mainpane"> - <tr id="content" valign="top"> + <tr valign="top"> <?php if (!isset($serendipity['serendipityPath']) || IS_installed === false ) { ?> @@ -50,7 +50,7 @@ serendipity_printLogin(); } else { ?> - <td class="serendipitySideBar"> + <td id="serendipityLeftSideBar"> <div class="serendipitySideBarItem"> <div class="serendipitySideBarTitle"><?php echo APPEARANCE; ?>:</div> <div class="serendipitySideBarContent"> @@ -66,16 +66,18 @@ • <a href="?serendipity[adminModule]=interop"><?php echo IMPORT_EXPORT_ENTRIES; ?></a><br /> </div> </div> - - <div class="serendipitySideBarContent"> - • <a href="<?php echo $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : ''); ?>entries"><?php echo AUTHOR_SUITE; ?></a><br /> - • <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>"><?php echo BACK_TO_BLOG; ?></a><br /> - • <a href="?serendipity[adminModule]=logout"><?php echo LOGOUT; ?></a><br /> + <div class="serendipitySideBarItem"> + <div class="serendipitySideBarContent"> + • <a href="<?php echo $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : ''); ?>entries"><?php echo AUTHOR_SUITE; ?></a><br /> + • <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>"><?php echo BACK_TO_BLOG; ?></a><br /> + • <a href="?serendipity[adminModule]=logout"><?php echo LOGOUT; ?></a><br /> + </div> </div> </td> - <td class="serendipity_admin"> + <td id="content"> <div class="serendipity_admin_title"><?php echo SERENDIPITY_ADMIN_SUITE; ?></div> + <div class="serendipity_admin"> <?php if (!isset($serendipity['GET']['adminModule'])) { $serendipity['GET']['adminModule'] = (isset($serendipity['POST']['adminModule']) ? $serendipity['POST']['adminModule'] : ''); @@ -111,6 +113,7 @@ } } ?> + </div> </td> </tr> </table> Index: serendipity_entries.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- serendipity_entries.php 8 Feb 2004 17:56:27 -0000 1.22 +++ serendipity_entries.php 17 Feb 2004 16:39:55 -0000 1.23 @@ -45,13 +45,13 @@ </div> <table id="mainpane"> - <tr id="content" valign="top"> + <tr valign="top"> <?php if ( !serendipity_userLoggedIn() ) { serendipity_printLogin(); } else { ?> - <td class="serendipitySideBar"> + <td id="serendipityLeftSideBar"> <div class="serendipitySideBarItem"> <div class="serendipitySideBarTitle"><?php echo ENTRIES; ?></div> <div class="serendipitySideBarContent"> @@ -76,16 +76,18 @@ • <a href="?serendipity[adminModule]=images&serendipity[adminAction]=sync" onclick="return confirm('<?php echo WARNING_THIS_BLAHBLAH; ?>');"><?php echo CREATE_THUMBS; ?></a><br /> </div> </div> - - <div class="serendipitySideBarContent"> - • <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_admin.php"><?php echo ADMIN_INTERFACE; ?></a><br /> - • <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>" ><?php echo BACK_TO_BLOG; ?></a><br /> - • <a href="?serendipity[adminModule]=logout" ><?php echo LOGOUT; ?></a><br /> + <div class="serendipitySideBarItem"> + <div class="serendipitySideBarContent"> + • <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_admin.php"><?php echo ADMIN_INTERFACE; ?></a><br /> + • <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>" ><?php echo BACK_TO_BLOG; ?></a><br /> + • <a href="?serendipity[adminModule]=logout" ><?php echo LOGOUT; ?></a><br /> + </div> </div> </td> - <td class="serendipity_admin"> - <div class="serendipity_admin_title"><?php echo SERENDIPITY_AUTHORING_SUITE; ?></div> + <td id="content"> + <div class="serendipity_Admin_title"><?php echo SERENDIPITY_AUTHORING_SUITE; ?></div> + <div class="serendipity_Admin"> <?php if (!isset($serendipity['GET']['adminModule'])) { $serendipity['GET']['adminModule'] = (isset($serendipity['POST']['adminModule']) ? $serendipity['POST']['adminModule'] : ''); @@ -113,6 +115,7 @@ } } ?> + </div> </td> </tr> </table> Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.210 retrieving revision 1.211 diff -u -d -r1.210 -r1.211 --- serendipity_functions.inc.php 16 Feb 2004 19:32:11 -0000 1.210 +++ serendipity_functions.inc.php 17 Feb 2004 16:39:55 -0000 1.211 @@ -60,8 +60,9 @@ function serendipity_printLogin() { global $serendipity; ?> - <td class="serendipity_admin"> - <div class="serendipity_auth_required"> + <td id="content"> + <div class="serendipity_admin_title"><?php echo HAVE_TO_BE_LOGGED_ON ?></div> + <div class="serendipity_admin"> <?php if ( isset($serendipity['POST']['action']) && !serendipity_userLoggedIn() ) { ?> @@ -71,10 +72,7 @@ ?> <form action="?" method="post"> <input type="hidden" name="serendipity[action]" value="admin" /> - <table cellspacing="3" cellpadding="0" border="0" align="center"> - <tr> - <td colspan="2" height="30" valign="middle" nowrap="nowrap"><?php echo HAVE_TO_BE_LOGGED_ON ?></td> - </tr> + <table cellspacing="3" cellpadding="0" border="0" align="center" width="300"> <tr> <td><?php echo USERNAME ?></td> <td><input type="text" name="serendipity[user]" /></td> Index: serendipity_functions_images.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- serendipity_functions_images.inc.php 17 Feb 2004 12:10:04 -0000 1.3 +++ serendipity_functions_images.inc.php 17 Feb 2004 16:39:56 -0000 1.4 @@ -408,11 +408,10 @@ echo $preview; if ($manage) { ?> +<div align="center"><?php echo $file['name'] . '.' . $file['extension']; ?></div> <table border="0" width="300"> <tr> <td valign="middle"><font size="1"> - <?php echo $file['name'] . '.' . $file['extension']; ?><br /> - <?php echo strftime(DATE_FORMAT_ENTRY . ' %H:%M', $file['date']); ?><br /> <?php echo ORIGINAL_SHORT . ': ' . $file['dimensions_width'] . 'x' . $file['dimensions_height']; ?><br /> <?php echo THUMBNAIL_SHORT . ': ' . $i[0] . 'x' . $i[1]; ?></font></td> <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo IMAGE_FULLSIZE; ?>" alt="<?php echo IMAGE_FULLSIZE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/zoom.png" border="0" onclick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['name'] . '.'. $file['extension']; ?>','Zoom','height=<?php echo ($file['dimensions_height'] + 20); ?>,width=<?php echo ($file['dimensions_width'] + 20); ?>,toolbar=no,menubar=no,location=no');" /></td> |
