|
From: Tom S. <tom...@us...> - 2005-01-13 22:46:25
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23119 Modified Files: serendipity_admin.php Log Message: The admin looked like shit in both FireFox and IE. So lets do it right, no browser hacks and the admin looks exactly the same in both browsers Index: serendipity_admin.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- serendipity_admin.php 13 Jan 2005 18:09:38 -0000 1.60 +++ serendipity_admin.php 13 Jan 2005 22:46:15 -0000 1.61 @@ -52,24 +52,24 @@ </script> </head> <body id="serendipity_admin_page" onload="spawn()"> - <div id="serendipityAdminFrame"> - <div id="serendipityAdminBanner"> - <?php if ( IS_installed === true && IS_up2date === true ) { ?> - <h1><?php echo SERENDIPITY_ADMIN_SUITE ?></h1> - <h2><?php echo $serendipity['blogTitle'] ?></h2> - <?php } elseif ( IS_installed === false || IS_up2date === false ) { ?> - <h1><?php echo SERENDIPITY_INSTALLATION ?></h1> - <?php } ?> - </div> - - <div id="serendipityAdminInfopane"> - <?php if (serendipity_userLoggedIn()) { ?> - <?php echo sprintf(USER_SELF_INFO, $serendipity['serendipityUser'], $serendipity['serendipityUserlevel']) ?> - <?php } ?> - </div> - - <div id="serendipityAdminMainpane"> - <table width="100%" cellspacing="0" cellpadding="0"> + <table cellspacing="0" cellpadding="0" border="0" id="serendipityAdminFrame"> + <tr> + <td colspan="2" id="serendipityAdminBanner"> + <?php if ( IS_installed === true && IS_up2date === true ) { ?> + <h1><?php echo SERENDIPITY_ADMIN_SUITE ?></h1> + <h2><?php echo $serendipity['blogTitle'] ?></h2> + <?php } elseif ( IS_installed === false || IS_up2date === false ) { ?> + <h1><?php echo SERENDIPITY_INSTALLATION ?></h1> + <?php } ?> + </td> + </tr> + <tr> + <td colspan="2" id="serendipityAdminInfopane"> + <?php if (serendipity_userLoggedIn()) { ?> + <?php echo sprintf(USER_SELF_INFO, $serendipity['serendipityUser'], $serendipity['serendipityUserlevel']) ?> + <?php } ?> + </td> + </tr> <tr valign="top"> <?php if (!isset($serendipity['serendipityPath']) || IS_installed === false || IS_up2date === false ) { @@ -82,107 +82,101 @@ } ?> <td> - <p><?php require_once(S9Y_INCLUDE_PATH . $file); ?> + <?php require_once(S9Y_INCLUDE_PATH . $file); ?> <?php } elseif ( serendipity_userLoggedIn() == false ) { ?> - <td id="content"> - <div class="serendipityAdminContent"> - <div align="center"><?php echo WELCOME_TO_ADMIN ?><br /><?php echo PLEASE_ENTER_CREDENTIALS ?></div> - <br /> -<?php - if ( isset($serendipity['POST']['action']) && !serendipity_userLoggedIn() ) { -?> - <div class="serendipityAdminMsgError"><?php echo WRONG_USERNAME_OR_PASSWORD; ?></div> -<?php - } -?> - <form action="?" method="post"> - <input type="hidden" name="serendipity[action]" value="admin" /> - <table cellspacing="10" cellpadding="0" border="0" align="center"> - <tr> - <td><?php echo USERNAME ?></td> - <td><input type="text" name="serendipity[user]" /></td> - </tr> - <tr> - <td><?php echo PASSWORD ?></td> - <td><input type="password" name="serendipity[pass]" /></td> - </tr> - <tr> - <td colspan="2"><input id="autologin" type="checkbox" name="serendipity[auto]" /><label for="autologin"> <?php echo AUTOMATIC_LOGIN ?> - </tr> - <tr> - <td colspan="2" align="right"><input type="submit" name="submit" value="<?php echo LOGIN ?> >" /></td> - </tr> - </table> - </form> - <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>"><?php echo BACK_TO_BLOG;?></a> + <td id="content"> + <div class="serendipityAdminContent"> + <div align="center"><?php echo WELCOME_TO_ADMIN ?><br /><?php echo PLEASE_ENTER_CREDENTIALS ?></div> + <br /> + <?php if ( isset($serendipity['POST']['action']) && !serendipity_userLoggedIn() ) { ?> + <div class="serendipityAdminMsgError"><?php echo WRONG_USERNAME_OR_PASSWORD; ?></div> + <?php } ?> + <form action="?" method="post"> + <input type="hidden" name="serendipity[action]" value="admin" /> + <table cellspacing="10" cellpadding="0" border="0" align="center"> + <tr> + <td><?php echo USERNAME ?></td> + <td><input type="text" name="serendipity[user]" /></td> + </tr> + <tr> + <td><?php echo PASSWORD ?></td> + <td><input type="password" name="serendipity[pass]" /></td> + </tr> + <tr> + <td colspan="2"><input id="autologin" type="checkbox" name="serendipity[auto]" /><label for="autologin"> <?php echo AUTOMATIC_LOGIN ?> + </tr> + <tr> + <td colspan="2" align="right"><input type="submit" name="submit" value="<?php echo LOGIN ?> >" /></td> + </tr> + </table> + </form> + <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>"><?php echo BACK_TO_BLOG;?></a> <?php } else { ?> - <td id="serendipitySideBar"> - <div class="serendipitySideBarItem"> - <div class="serendipitySideBarContent"> - <a href="serendipity_admin.php"><?php echo ADMIN_INTERFACE; ?></a><br /> - <a href="serendipity_admin.php?serendipity[adminModule]=personal"><?php echo PERSONAL_SETTINGS; ?></a><br /> - </div> - </div> - - <ul class="serendipitySideBarMenu"> - <lh><?php echo serendipity_mb('ucfirst', ENTRIES); ?></lh> - <li><a href="serendipity_admin.php?serendipity[adminModule]=entries&serendipity[adminAction]=new"><?php echo NEW_ENTRY; ?></a></li> - <li><a href="serendipity_admin.php?serendipity[adminModule]=entries&serendipity[adminAction]=editSelect"><?php echo EDIT_ENTRIES; ?></a></li> - <li><a href="serendipity_admin.php?serendipity[adminModule]=comments"><?php echo COMMENTS; ?></a></li> - <li><a href="serendipity_admin.php?serendipity[adminModule]=category&serendipity[adminAction]=view"><?php echo CATEGORIES; ?></a></li> - <?php serendipity_plugin_api::hook_event('backend_sidebar_entries', $serendipity); ?> - </ul> + <td id="serendipitySideBar"> + <div class="serendipitySideBarItem"> + <div class="serendipitySideBarContent"> + <a href="serendipity_admin.php"><?php echo ADMIN_INTERFACE; ?></a><br /> + <a href="serendipity_admin.php?serendipity[adminModule]=personal"><?php echo PERSONAL_SETTINGS; ?></a><br /> + </div> + </div> - <ul class="serendipitySideBarMenu"> - <lh><?php echo MEDIA; ?></lh> - <li><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=addSelect"><?php echo ADD_MEDIA; ?></a></li> - <li><a href="serendipity_admin.php?serendipity[adminModule]=media"><?php echo MEDIA_LIBRARY; ?></a></li> -<?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?> - <li><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=directorySelect"><?php echo MANAGE_DIRECTORIES; ?></a></li> -<?php } ?> - <li><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=sync" onclick="return confirm('<?php echo WARNING_THIS_BLAHBLAH; ?>');"><?php echo CREATE_THUMBS; ?></a></li> - <?php serendipity_plugin_api::hook_event('backend_sidebar_entries_images', $serendipity); ?> - </ul> + <ul class="serendipitySideBarMenu"> + <lh><?php echo serendipity_mb('ucfirst', ENTRIES); ?></lh> + <li><a href="serendipity_admin.php?serendipity[adminModule]=entries&serendipity[adminAction]=new"><?php echo NEW_ENTRY; ?></a></li> + <li><a href="serendipity_admin.php?serendipity[adminModule]=entries&serendipity[adminAction]=editSelect"><?php echo EDIT_ENTRIES; ?></a></li> + <li><a href="serendipity_admin.php?serendipity[adminModule]=comments"><?php echo COMMENTS; ?></a></li> + <li><a href="serendipity_admin.php?serendipity[adminModule]=category&serendipity[adminAction]=view"><?php echo CATEGORIES; ?></a></li> + <?php serendipity_plugin_api::hook_event('backend_sidebar_entries', $serendipity); ?> + </ul> -<?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?> - <ul class="serendipitySideBarMenu"> - <lh><?php echo APPEARANCE; ?></lh> - <li><a href="serendipity_admin.php?serendipity[adminModule]=templates"><?php echo MANAGE_STYLES; ?></a></li> - <li><a href="serendipity_admin.php?serendipity[adminModule]=plugins"><?php echo CONFIGURE_PLUGINS; ?></a></li> - <?php serendipity_plugin_api::hook_event('backend_sidebar_admin_appearance', $serendipity); ?> - </ul> -<?php } ?> + <ul class="serendipitySideBarMenu"> + <lh><?php echo MEDIA; ?></lh> + <li><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=addSelect"><?php echo ADD_MEDIA; ?></a></li> + <li><a href="serendipity_admin.php?serendipity[adminModule]=media"><?php echo MEDIA_LIBRARY; ?></a></li> + <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?> + <li><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=directorySelect"><?php echo MANAGE_DIRECTORIES; ?></a></li> + <?php } ?> + <li><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=sync" onclick="return confirm('<?php echo WARNING_THIS_BLAHBLAH; ?>');"><?php echo CREATE_THUMBS; ?></a></li> + <?php serendipity_plugin_api::hook_event('backend_sidebar_entries_images', $serendipity); ?> + </ul> - <ul class="serendipitySideBarMenu"> - <lh><?php echo ADMIN; ?></lh> -<?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?> - <li><a href="serendipity_admin.php?serendipity[adminModule]=configuration"><?php echo CONFIGURATION; ?></a></li> -<?php } ?> <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?> - <li><a href="serendipity_admin.php?serendipity[adminModule]=users"><?php echo MANAGE_USERS; ?></a></li> + <ul class="serendipitySideBarMenu"> + <lh><?php echo APPEARANCE; ?></lh> + <li><a href="serendipity_admin.php?serendipity[adminModule]=templates"><?php echo MANAGE_STYLES; ?></a></li> + <li><a href="serendipity_admin.php?serendipity[adminModule]=plugins"><?php echo CONFIGURE_PLUGINS; ?></a></li> + <?php serendipity_plugin_api::hook_event('backend_sidebar_admin_appearance', $serendipity); ?> + </ul> <?php } ?> - <li><a href="serendipity_admin.php?serendipity[adminModule]=import"><?php echo IMPORT_ENTRIES; ?></a></li> - <li><a href="serendipity_admin.php?serendipity[adminModule]=export"><?php echo EXPORT_ENTRIES; ?></a></li> - <?php serendipity_plugin_api::hook_event('backend_sidebar_admin', $serendipity); ?> - </ul> + <ul class="serendipitySideBarMenu"> + <lh><?php echo ADMIN; ?></lh> + <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?> + <li><a href="serendipity_admin.php?serendipity[adminModule]=configuration"><?php echo CONFIGURATION; ?></a></li> + <?php } ?> + <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?> + <li><a href="serendipity_admin.php?serendipity[adminModule]=users"><?php echo MANAGE_USERS; ?></a></li> + <?php } ?> + <li><a href="serendipity_admin.php?serendipity[adminModule]=import"><?php echo IMPORT_ENTRIES; ?></a></li> + <li><a href="serendipity_admin.php?serendipity[adminModule]=export"><?php echo EXPORT_ENTRIES; ?></a></li> + <?php serendipity_plugin_api::hook_event('backend_sidebar_admin', $serendipity); ?> + </ul> - <ul class="serendipitySideBarMenu"> - <li><a href="<?php echo $serendipity['baseURL']; ?>"><?php echo BACK_TO_BLOG; ?></a></li> - <li><a href="serendipity_admin.php?serendipity[adminModule]=logout"><?php echo LOGOUT; ?></a></li> - </ul> + <ul class="serendipitySideBarMenu"> + <li><a href="<?php echo $serendipity['baseURL']; ?>"><?php echo BACK_TO_BLOG; ?></a></li> + <li><a href="serendipity_admin.php?serendipity[adminModule]=logout"><?php echo LOGOUT; ?></a></li> + </ul> </td> - <td id="content"> - <div class="serendipityAdminContent"> + <td class="serendipityAdminContent"> <?php if (!isset($serendipity['GET']['adminModule'])) { $serendipity['GET']['adminModule'] = (isset($serendipity['POST']['adminModule']) ? $serendipity['POST']['adminModule'] : ''); @@ -254,14 +248,11 @@ } } ?> - </div> </td> </tr> </table> - </div> <br /> <div id="serendipityAdminFooter"><?php echo sprintf(ADMIN_FOOTER_POWERED_BY, $serendipity['versionInstalled'], phpversion()); ?></div> - </div> </body> </html> <?php |
