|
From: <we...@us...> - 2003-03-09 02:27:59
|
Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv28017
Modified Files:
jBlog_admin.php jBlog_admin_entries.inc.php
jBlog_admin_images.inc.php
Log Message:
CSS-ify the admin section, and rearrange the links slightly.
(See my stylesheet for ideas).
Index: jBlog_admin.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- jBlog_admin.php 6 Mar 2003 01:15:18 -0000 1.10
+++ jBlog_admin.php 9 Mar 2003 02:27:55 -0000 1.11
@@ -17,50 +17,81 @@
<link rel="stylesheet" type="text/css" href="jBlog.css.php">
</head>
<body>
- <table height="100%" width="100%"><tr><td valign="top" align="left" class="jBlogGreyBox" height="100%" width="100%">
- <div styles='border:1px solid #cdcdcd;'>
- <?php
- // User has to log in
- if ($_SESSION["jBlogAuthedUser"] !== true && file_exists($jBlog["jBlogPath"]."jBlog_config_local.inc.php")) {
- ?>
- You have to be logged on to view this page:
- <form action="?" method="post">
- <input type="hidden" name="jBlog[action]" value="admin">
- <input type="text" value="username" name="jBlog[user]" onfocus="value='';">
- <input type="password" value="password" name="jBlog[pass]" onfocus="value='';">
- <input type="submit" value=">">
- </form>
- <?php
- }
+ <table class="jBlog_banner">
+ <tr>
+ <td><?= htmlentities($jBlog['blogTitle']) ?></td>
+ </tr>
+<?php if($jBlog['blogSubTitle']) { ?>
+ <td class="jBlog_subbanner"><?= $jBlog['blogSubTitle'] ?></td>
+<?php } else { ?>
+ <td class="jBlog_subbanner"><?= $jBlog['blogDescription'] ?></td>
+ </tr>
+<?php } ?>
+ </table>
- // User just installed jBlog, let him go to configure mode
- elseif (!file_exists($jBlog["jBlogPath"]."jBlog_config_local.inc.php")) {
- echo "<div class='jBlog_date'>jBlog klickibunti Installation</div><p>";
- //echo "<b>Your jBlog_config_local.inc.php does not exist, please configure jBlog:</b><br>";
+<?php
+ // User has to log in
+ if ($_SESSION["jBlogAuthedUser"] !== true
+ && file_exists($jBlog["jBlogPath"]."jBlog_config_local.inc.php")) {
+?>
+ <div class='jBlog_auth_required'>
+ You have to be logged on to view this page:
+ <form action="?" method="post">
+ <input type="hidden" name="jBlog[action]" value="admin">
+ <input type="text" value="username" name="jBlog[user]" onfocus="value='';">
+ <input type="password" value="password" name="jBlog[pass]" onfocus="value='';">
+ <input type="submit" value=">">
+ </form>
+ </div>
+<?php
+ } elseif (!file_exists($jBlog["jBlogPath"]."jBlog_config_local.inc.php")) {
+ // User just installed jBlog, let him go to configure mode
+ echo "<div class='jBlog_date'>jBlog klickibunti Installation</div><p>";
include("./jBlog_admin_installer.inc.php");
- }
-
+ } else {
// User is logged in
- else {
- ?>
+?>
<table>
- <tr>
- <td valign="top" style="width:150px" nowrap='nowrap'>
- <b>jBlog Admin:</b><br>
- • <a href='?jBlog[adminModule]=installer'>Configuration</a></br>
+ <tr valign="top">
+ <td class="jBlogSideBar">
+
+ <div class="jBlogSideBarItem">
+ <div class="jBlogSideBarTitle">Entries:</div>
+ <div class="jBlogSideBarContent">
• <a href='?jBlog[adminModule]=entries&jBlog[adminAction]=new'>New entry</a><br>
• <a href='?jBlog[adminModule]=entries&jBlog[adminAction]=editSelect'>Edit entries</a><br>
• <a href='?jBlog[adminModule]=entries&jBlog[adminAction]=deleteSelect'>Delete entries</a><br>
+ </div>
+ </div>
+
+ <div class="jBlogSideBarItem">
+ <div class="jBlogSideBarTitle">Images:</div>
+ <div class="jBlogSideBarContent">
+ • <a href='?jBlog[adminModule]=images&jBlog[adminAction]=addSelect'>Add images</a><br>
• <a href='?jBlog[adminModule]=images'>Manage images</a><br>
+ • <a href='?jBlog[adminModule]=images&jBlog[adminAction]=genThumbs' onClick="return confirm('WARNING:\nThis may take a long time if there are many images without thumbnails.');">Create Thumbs</a><br>
+ </div>
+ </div>
+
+ <div class="jBlogSideBarItem">
+ <div class="jBlogSideBarTitle">Appearance:</div>
+ <div class="jBlogSideBarContent">
• <a href='?jBlog[adminModule]=css'>Manage css</a><br>
- • <a href='?jBlog[adminModule]=images&jBlog[adminAction]=addSelect'>Add images</a><br>
- • <a href='?jBlog[adminModule]=images&jBlog[adminAction]=genThumbs' onClick="alert('WARNING:\nThis may take a long time if there are many images without thumbnails.');">Create Thumbs</a><br>
+ </div>
+ </div>
+
+ <div class="jBlogSideBarItem">
+ <div class="jBlogSideBarTitle">Admin:</div>
+ <div class="jBlogSideBarContent">
+ • <a href='?jBlog[adminModule]=installer'>Configuration</a></br>
• <a href='?jBlog[adminModule]=logout'>Log out</a><br>
• <a href='<?= $jBlog['jBlogHTTPPath'] ?>'>Back to Blog...</a><br>
+ </div>
+ </div>
</td>
- <td align="left" valign="top">
- <div class='jBlog_date' width='100%'>jBlog adminSuite</div>
+ <td class="jBlog_admin">
+ <div class='jBlog_admin_title'>jBlog adminSuite</div>
<?php
if (!$jBlog["GET"]["adminModule"]) $jBlog["GET"]["adminModule"] = $jBlog["POST"]["adminModule"];
switch($jBlog["GET"]["adminModule"]) {
@@ -97,8 +128,6 @@
<?php
}
?>
- </div>
- </td></tr></table>
</body>
</html>
Index: jBlog_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_entries.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- jBlog_admin_entries.inc.php 5 Mar 2003 04:22:13 -0000 1.4
+++ jBlog_admin_entries.inc.php 9 Mar 2003 02:27:55 -0000 1.5
@@ -23,17 +23,20 @@
$entries = jBlog_fetchEntries(false, false, $jBlog["GET"]["offset"].", $perPage");
// Prepare table
- echo "<b>".ucfirst($action).":</b><br><table width='100%'>";
+ echo "<div class='jBlog_admin_list'>";
+ echo "<div class='jBlog_admin_list_title'>".ucfirst($action)." Entries:</div>";
+ echo "<table width='100%' class='jBlog_admin_list'>";
+
$half = (int) ((count($entries) + 1)/2);
// Print the browse buttons
echo "<tr><td align='left'>";
if ($jBlog["GET"]["offset"] > 0) {
- echo '<input type="button" value="<<<" onClick="location.href=\'?jBlog[adminModule]=entries&jBlog[adminAction]='.$jBlog["GET"]["adminAction"].'&jBlog[offset]='.max(0,($jBlog["GET"]["offset"]-$perPage)).'\';">';
+ echo '<input type="button" value="<<<" onClick="location.href=\'?jBlog[adminModule]=entries&jBlog[adminAction]='.$jBlog["GET"]["adminAction"].'&jBlog[offset]='.max(0,($jBlog["GET"]["offset"]-$perPage)).'\';">';
}
- echo "</td><td></td><td align='right'>";
+ echo "</td><td align='right'>";
if (count($entries) == $perPage) {
- echo '<input type="button" value=">>>" onClick="location.href=\'?jBlog[adminModule]=entries&jBlog[adminAction]='.$jBlog["GET"]["adminAction"].'&jBlog[offset]='.($jBlog["GET"]["offset"]+$perPage).'\';">';
+ echo '<input type="button" value=">>>" onClick="location.href=\'?jBlog[adminModule]=entries&jBlog[adminAction]='.$jBlog["GET"]["adminAction"].'&jBlog[offset]='.($jBlog["GET"]["offset"]+$perPage).'\';">';
}
echo "</td></tr>";
// Print the entries
@@ -41,14 +44,13 @@
for ($x=0; $x<$half; $x++) {
?>
<tr>
- <td>
+ <td class="jBlog_admin_list_item">
<?= date("d.m.y, H:i", $entries[$x]["timestamp"]).": " ?>
<br><a href='?jBlog[action]=admin&jBlog[adminModule]=entries&jBlog[adminAction]=<?= $action ?>&jBlog[id]=<?= $entries[$x]["id"] ?>'>
<?= htmlentities(substr($entries[$x]["title"],0,40)) ?></a>
</a>
</td>
- <td><?= str_repeat(" ", 7)?></td>
- <td>
+ <td class="jBlog_admin_list_item">
<?php if ($x + $half < $count) { ?>
<?= date("d.m.y, H:i", $entries[$x+$half]["timestamp"]).": "?>
<br><a href='?jBlog[action]=admin&jBlog[adminModule]=entries&jBlog[adminAction]=<?= $action ?>&jBlog[id]=<?= $entries[$x+$half]["id"] ?>'>
@@ -59,7 +61,7 @@
</tr>
<?php
}
- echo "</table>";
+ echo "</table></div>";
}
Index: jBlog_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_images.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jBlog_admin_images.inc.php 6 Mar 2003 21:11:38 -0000 1.2
+++ jBlog_admin_images.inc.php 9 Mar 2003 02:27:55 -0000 1.3
@@ -27,6 +27,8 @@
}
//-->
</script>
+ <div class="jBlog_admin_list">
+ <div class="jBlog_admin_list_title">Image manager:</div>
<?php
if ($start > 0) {
@@ -37,7 +39,7 @@
$right = "<input type='button' value='>>>' onClick=\"location.href='{$_SERVER['REQUEST_URI']}&start=$end&end=" . ($end + $inc) . "'\">\n";
}
- echo "<table>";
+ echo "<table class='jBlog_admin_list'>";
echo "<tr><td align='left' colspan='2'>$left</td><td align='right' colspan='2'>$right</td></tr><tr>";
for ($x=0; $x<count($files); $x++) {
@@ -45,15 +47,14 @@
$f = jBlog_parseFileName($files[$x]);
$i = getimagesize($jBlog["jBlogPath"].$jBlog["uploadPath"]."/".$files[$x]);
+ echo "<td class='jBlog_admin_list_item'>";
+
// Display a thumbnail?
if (file_exists($jBlog["jBlogPath"] . $jBlog["uploadPath"] . $f[0] . "." . $jBlog["thumbSuffix"] . "." . $f[1])) {
- echo "<td height='".$jBlog["thumbSize"]."' align='center' valign='middle'>";
- echo "<img src='".$jBlog['jBlogHTTPPath'] . $jBlog["uploadHTTPPath"].$f[0].".".$jBlog["thumbSuffix"].".".$f[1]."' hspace='15'>";
- echo "</td>";
+ echo "<img align='left' src='".$jBlog['jBlogHTTPPath'] . $jBlog["uploadHTTPPath"].$f[0].".".$jBlog["thumbSuffix"].".".$f[1]."' hspace='15'>";
}
// Display image name and resolution
- echo "<td nowrap='nowrap' valign='top'>";
echo "<b>".$files[$x]."</b><br>";
echo $i[0]."x".$i[1]."<br>";
@@ -65,10 +66,10 @@
echo "</td>";
// Linebreak?
- if (($x+1)%3 == 0) echo "</tr><tr>";
+ if (($x+1)%2 == 0) echo "</tr><tr>";
}
echo "</tr><tr><td align='left' colspan='2'>$left</td><td align='right' colspan='2'>$right</td></tr>";
- echo "</table>";
+ echo "</table></div>";
}
@@ -242,7 +243,6 @@
break;
default:
- echo "<b>Image manager:</b><p>";
if (isset($_GET['start'])) {
jBlog_displayImageList($_GET['start'], $_GET['end'] ? $_GET['end'] : NULL);
} else {
|
