1
0

Changing design to mostly tableless code.

This commit is contained in:
Stefan Frech
2008-05-30 21:11:07 +00:00
committed by Jonas Kattendick
parent df60ffea39
commit 91468a4bed
21 changed files with 733 additions and 970 deletions

View File

@@ -8,137 +8,109 @@ else {
$user = set_get_string_var ('user');
}
$display_shared = false;
if (isset ($_GET['user']) && check_username ($user)) {
$title = $user . "'s Online Bookmarks";
}
else {
$title = "Shared Online-Bookmarks";
}
?>
<table class="caption">
<tr>
<td><span class="caption"><img src="./images/logo.png" alt=""> Shared Bookmarks</span>
</td>
<h1 id="caption"><?php echo $title; ?></h1>
<td class="captionright">
<div><?php object_count (); ?></div>
<div><?php print_footer (); ?></div>
</td>
</tr>
</table>
<table class="main">
<tr>
<td class="main1">
<table class="menu">
<tr>
<th class="menuhead">Bookmarks</th>
</tr>
<tr>
<td class="menu">
<a href="./index.php">My Bookmarks</a><br>
<a href="./shared.php">Shared Bookmarks</a><br>
</td>
</tr>
</table>
<br>
<table class="menu">
<tr>
<th class="menuhead">Tools</th>
</tr>
<tr>
<td class="menu">
<?php if (admin_only ()) { ?>
<a href="./admin.php">Admin</a><br>
<?php } ?>
<a href="./import.php">Import</a><br>
<a href="./export.php">Export</a><br>
<a href="./sidebar.php">View as Sidebar</a><br>
<a href="./settings.php">Settings</a><br>
<a href="javascript:chpw()">Change Password</a><br>
<?php
if (isset ($_SESSION['logged_in']) && $_SESSION['logged_in']) {
$link = '<a href="./index.php?logout=1">Logout</a>';
}
else {
$link = '<a href="./index.php">Login</a>';
}
?>
<!-- Wrapper starts here. -->
<div style="min-width: <?php echo 230 + $settings['column_width_folder']; ?>px;">
<!-- Menu starts here. -->
<div id="menu">
<h2 class="nav">Bookmarks</h2>
<ul class="nav">
<li><a href="./index.php">My Bookmarks</a></li>
<li><a href="./shared.php">Shared Bookmarks</a></li>
</ul>
<h2 class="nav">Tools</h2>
<ul class="nav">
<?php if (admin_only ()) { ?>
<li><a href="./admin.php">Admin</a></li>
<?php } ?>
<li><a href="./import.php">Import</a></li>
<li><a href="./export.php">Export</a></li>
<li><a href="./sidebar.php">View as Sidebar</a></li>
<li><a href="./settings.php">Settings</a></li>
<li><a href="javascript:chpw()">Change Password</a></li>
<li><a href="./index.php?logout=1">Logout</a></li>
</ul>
<!-- Menu ends here. -->
</div>
<?php echo $link; ?><br>
</td>
</tr>
</table>
<!-- Main content starts here. -->
<div id="main">
<td class="">
<img src="./images/spacer.gif" alt="" class="main2">
</td>
<td class="main4">
<?php
if (isset ($_GET['user']) && check_username ($user)) {
?>
<table>
<tr>
<td>
<div style="height: <?php echo $table_height; ?>; width: 400px; overflow:auto;">
<?php
require_once (ABSOLUTE_PATH . "folders.php");
$tree = & new folder ($user);
$tree->make_tree (0);
$tree->print_tree ();
?>
<!-- Folders starts here. -->
<div id="folders" style="width: <?php echo $column_width_folder; ?>; height: <?php echo $table_height; ?>;">
</div>
</td>
<td style="width: 100%;">
<div style="height: <?php echo $table_height; ?>; width: 100%; overflow:auto;">
<?php
require_once (ABSOLUTE_PATH . "folders.php");
$tree = & new folder ($user);
$tree->make_tree (0);
$tree->print_tree ();
?>
<?php
require_once (ABSOLUTE_PATH . "bookmarks.php");
$query = sprintf ("SELECT title, url, description, UNIX_TIMESTAMP(date) AS timestamp, id, favicon
FROM bookmark
WHERE user='%s'
AND childof='%d'
AND deleted!='1'
AND public='1'
ORDER BY title",
$mysql->escape ($user),
$mysql->escape ($folderid));
<!-- Folders ends here. -->
</div>
if ($mysql->query ($query)) {
$bookmarks = array ();
while ($row = mysql_fetch_assoc ($mysql->result)) {
array_push ($bookmarks, $row);
}
list_bookmarks ($bookmarks,
false,
false,
$settings['show_bookmark_icon'],
true,
$settings['show_bookmark_description'],
$settings['show_column_date'],
false,
false,
false,
false);
}
else {
message ($mysql->error);
}
?>
<!-- Bookmarks starts here. -->
<div id="bookmarks" style="height: <?php echo $table_height; ?>;">
</div>
</td>
</tr>
</table>
<?php
require_once (ABSOLUTE_PATH . "bookmarks.php");
$query = sprintf ("SELECT title, url, description, UNIX_TIMESTAMP(date) AS timestamp, id, favicon
FROM bookmark
WHERE user='%s'
AND childof='%d'
AND deleted!='1'
AND public='1'
ORDER BY title",
$mysql->escape ($user),
$mysql->escape ($folderid));
if ($mysql->query ($query)) {
$bookmarks = array ();
while ($row = mysql_fetch_assoc ($mysql->result)) {
array_push ($bookmarks, $row);
}
list_bookmarks ($bookmarks,
false,
false,
$settings['show_bookmark_icon'],
true,
$settings['show_bookmark_description'],
$settings['show_column_date'],
false,
false,
false,
false);
}
else {
message ($mysql->error);
}
?>
<!-- Bookmarks ends here. -->
</div>
<?php
}
else {
echo '<div id="content">';
$query = "SELECT user, SUM(bookmarks) AS bookmarks, SUM(folders) AS folders FROM (
SELECT user, 1 AS bookmarks, 0 AS folders FROM bookmark WHERE public='1' AND deleted!='1'
UNION ALL
@@ -146,22 +118,28 @@ else {
) AS tmp GROUP BY user";
if ($mysql->query ($query)) {
echo '<div style="height: ' . $table_height . '; width: 100%; padding-left: 20px;">' . "\n";
while ($row = mysql_fetch_object ($mysql->result)) {
echo '<p><a href="' . $_SERVER['SCRIPT_NAME'] . '?user=' . $row->user . '&folderid=0"><b>' . $row->user . "</b><br>\n";
echo "Shares $row->folders Folders and $row->bookmarks Bookmarks</a></p>\n";
}
echo "</div>";
}
else {
message ($mysql->error);
}
echo "<div>";
}
?>
</td>
</tr>
</table>
<!-- Main content ends here. -->
</div>
<!-- Wrapper ends here. -->
</div>
<?php
require_once (ABSOLUTE_PATH . "footer.php");