Changeset 568

Timestamp:

07/25/08 08:31:16 (4 months ago)

Author:

kimparsell

Message:

+ Fix added to resolve ticket #124 (404 error) - proper 404 errors are now generated with both default and cruft-free URLs (joint effort between sidtheduck and kimparsell)
+ Themes updated to include 404.php and stylesheet change for new page
+ Minor markup change to plog-themes.php to provide alt text for theme thumbnails
+ Added dropdown menu to plog-manage.php for selection entries/page
+ Minor changes to admin.css
+ Misc. cleanup

Location:

trunk

Files:

• plog-admin/css/admin.css (modified) (3 diffs)
• plog-admin/plog-admin-functions.php (modified) (2 diffs)
• plog-admin/plog-feedback.php (modified) (2 diffs)
• plog-admin/plog-manage.php (modified) (8 diffs)
• plog-admin/plog-themes.php (modified) (2 diffs)
• plog-content/themes/air/404.php (added)
• plog-content/themes/air/album.php (modified) (1 diff)
• plog-content/themes/air/collection.php (modified) (1 diff)
• plog-content/themes/air/collections.php (modified) (1 diff)
• plog-content/themes/air/gallery.css (modified) (1 diff)
• plog-content/themes/air/header.php (modified) (1 diff)
• plog-content/themes/air/picture.php (modified) (1 diff)
• plog-content/themes/air/search.php (modified) (1 diff)
• plog-content/themes/air/slideshow.php (modified) (1 diff)
• plog-content/themes/default/404.php (added)
• plog-content/themes/default/album.php (modified) (1 diff)
• plog-content/themes/default/collection.php (modified) (1 diff)
• plog-content/themes/default/collections.php (modified) (1 diff)
• plog-content/themes/default/gallery.css (modified) (2 diffs)
• plog-content/themes/default/header.php (modified) (2 diffs)
• plog-content/themes/default/picture.php (modified) (1 diff)
• plog-content/themes/default/search.php (modified) (1 diff)
• plog-content/themes/default/slideshow.php (modified) (1 diff)
• plog-content/themes/lucid/404.php (added)
• plog-content/themes/lucid/album.php (modified) (1 diff)
• plog-content/themes/lucid/collection.php (modified) (1 diff)
• plog-content/themes/lucid/collections.php (modified) (1 diff)
• plog-content/themes/lucid/gallery.css (modified) (1 diff)
• plog-content/themes/lucid/header.php (modified) (1 diff)
• plog-content/themes/lucid/picture.php (modified) (1 diff)
• plog-content/themes/lucid/search.php (modified) (1 diff)
• plog-content/themes/lucid/slideshow.php (modified) (1 diff)
• plog-download.php (modified) (2 diffs)
• plog-globals.php (modified) (1 diff)
• plog-includes/plog-functions.php (modified) (20 diffs)
• plog-print.php (modified) (1 diff)
• plog-rss.php (modified) (2 diffs)
• plog-xml.php (modified) (1 diff)
• plogger.php (modified) (7 diffs)

trunk/plog-admin/css/admin.css

@@ -11 +11 @@
 
 #theme-table td {
-        padding: 15px;
-}
-
-#theme-table tr.header td {
+        padding: 8px;
+}
+
+#theme-table tr.header th {
         padding: 8px;
 }
@@ -305 +305 @@
         border-top: 2px solid #ccc;
         border-bottom: 2px solid #ccc;
-        width: 100%;
+        width: 98%;
 }
 
@@ -404 +404 @@
 
 #contentList #breadcrumb_links {
-        font-size: 1.1em;
-        padding: 5px 3px 5px 0;
+        font-size: 1.0em;
+        padding: 3px;
 }
 
 #contentList .pagination {
-        font-size: 1.3em;
-        padding: 5px 3px 5px 0;
-        font-weight: bold;
+        font-size: 1.0em;
+        margin-right: 5px;
+        padding: 3px;
+        font-weight: bold;
+        text-align: right;
+}
+
+#contentList label, select, option {
+        font-weight: normal;
+}
+
+#contentList .entries-page {
+        text-align: right;
+}
+
+#contentList .entries-page label, select {
+        display: block inline;
+        margin-bottom: auto;
+}
+
+#contentList .move-del-manage input, select {
+        display: block inline;
+        margin-bottom: auto;
 }
 

trunk/plog-admin/plog-admin-functions.php

@@ -1001 +1001 @@
 }
 
-// 
+//
 function configure_htaccess_fullpic($allow = false) {
         $cfg = "";
@@ -1072 +1072 @@
                 $cfg .= "RewriteEngine on\n";
                 $cfg .= "RewriteBase ".$rewritebase."\n";
-    $cfg .= "RewriteCond %{REQUEST_URI} !(\.|/\$)\n";
+                $cfg .= "RewriteCond %{REQUEST_URI} !(\.|/\$)\n";
                 $cfg .= "RewriteRule ^.*\$ http://".parse_url($config['gallery_url'], PHP_URL_HOST)."%{REQUEST_URI}/ [R=301,L]\n";
-    /*$cfg .= "RewriteCond %{HTTP_HOST} !^www [NC]\n";
+                /*$cfg .= "RewriteCond %{HTTP_HOST} !^www [NC]\n";
                 $cfg .= "RewriteRule ^(.*)\$ ".$config['gallery_url']."\$1 [R=301,L]\n";*/
                 $cfg .= "RewriteCond %{REQUEST_FILENAME} -d [OR]\n";

trunk/plog-admin/plog-feedback.php

@@ -14 +14 @@
 
         $possible_values = array("5"=>5, "10"=>10, "20"=>20, "50"=>50);
-        $output = plog_tr('Entries per page') . ' 
-                                        <select onchange="'.$java.'" name="entries_per_page">';
+        $output = "\n\t\t\t\t\t" . '<label accesskey="e" for="entries_on_page">' .plog_tr('<em>E</em>ntries per page') . '</label>
+                                        <select class="entries-page" onchange="'.$java.'" name="entries_per_page" style="width: 60px;">';
         foreach ($possible_values as $key => $value)
                 if ($_SESSION['entries_per_page'] == $key)
@@ -283 +283 @@
 }
 
-$output .= "\n\n\t\t" . '</form>'. "\n";
+$output .= "\n\t\t" . '</form>'. "\n";
 
 display($output, "feedback");

trunk/plog-admin/plog-manage.php

@@ -11 +11 @@
 function generate_pagination_view_menu() {
 
-        $java = 'document.location.href = \''.$_SERVER["PHP_SELF"].'?level='.$_REQUEST["level"].
-        '&id='.$_REQUEST["id"].'&entries_per_page=\'+this.options[this.selectedIndex].value';
+        $java = 'document.location.href = \''.$_SERVER["PHP_SELF"].'?level='.$_REQUEST["level"].'&id='.$_REQUEST["id"].'&entries_per_page=\'+this.options[this.selectedIndex].value';
 
         $possible_values = array("5"=>5, "10"=>10, "20"=>20, "50"=>50);
-        $output= '<label accesskey="e" for="entries_on_page"><em>E</em>ntries per page</label>
-        <select onchange="'.$java.'" name="entries_per_page">';
+        $output= "\n\t\t\t" . '<label accesskey="e" for="entries_on_page">' .plog_tr('<em>E</em>ntries per page') . '</label>
+                        <select class="entries-page" onchange="'.$java.'" name="entries_per_page" style="width: 60px;">';
         foreach ($possible_values as $key => $value)
         if ($_SESSION['entries_per_page'] == $key)
-        $output .= "<option value=\"$value\" selected>$key</option>";
+        $output .= "\n\t\t\t\t<option value=\"$value\" selected=\"selected\">$key</option>";
         else
-        $output .= "<option value=\"$value\">$key</option>";
-        $output.= '</select>';
+        $output .= "\n\t\t\t\t<option value=\"$value\">$key</option>";
+        $output.= "\n\t\t\t</select>";
         return $output;
 }
@@ -29 +28 @@
         if ($level == "albums") $parent = "collections";
         if ($level == "pictures") $parent = "albums";
-        $output = "\n\t\t" . '<input class="submit" type="submit" name="move_checked" value="' . plog_tr("Move Checked To") . '" />';
+        $output = "\n\t\t\t" . '<input class="submit" type="submit" name="move_checked" value="' . plog_tr("Move Checked To") . '" />';
 
         if ($level == "pictures") {
@@ -35 +34 @@
                 $output .= generate_albums_menu($albums);
         } else {
-                $output .= "\n\t\t\t" . '<select id="group_id" name="group_id">';
+                $output .= "\n\t\t\t\t" . '<select class="move-del-manage" id="group_id" name="group_id">';
                 $collections = get_collections();
                 foreach($collections as $collection) {
-                        $output .= "\n\t\t\t\t" . '<option value="'.$collection["id"].'">'.SmartStripSlashes($collection["name"]);
+                        $output .= "\n\t\t\t\t\t" . '<option value="'.$collection["id"].'">'.SmartStripSlashes($collection["name"]);
                         $output .= '</option>';
                 }
-                $output .= "\n\t\t\t" . '</select>';
+                $output .= "\n\t\t\t\t" . '</select>';
         }
 
@@ -54 +53 @@
                 if (isset($_REQUEST["albums_menu"]) && isset($_REQUEST["new_album_name"])){
                         if ($albums_menu == $album_id || $new_album_name == $album['album_name']){
-                                $selected = " selected";
+                                $selected = " selected=\"selected\"";
                         }
                 }
@@ -125 +124 @@
 $output = "\n\t" . '<h1>' . plog_tr('Manage Content') . '</h1>' . "\n";
 
-/* if ($level == "collections") { // display some high level statistics on the main page.
-$output .= '<p class="highlight">You have a total of <strong>'. count_pictures().'</strong> images within <strong>'.count_albums() .'</strong> album(s).  Users have posted <strong>'. count_comments().'</strong> comment(s) to your gallery</p>'; } */
+/*if ($level == "collections") { // display some high level statistics on the main page.
+$output .= "\n\t" . '<p class="highlight">You have a total of <strong>'. count_pictures().'</strong> images within <strong>'.count_albums() .'</strong> album(s).  Users have posted <strong>'. count_comments().'</strong> comment(s) to your gallery</p>' . "\n"; } */
 
 global $config;
@@ -329 +328 @@
         $totalRows = mysql_result($totalRowsResult,'num_items');
 
-        $pagination_menu = "\n\t\t" . '<div class="pagination">'.generate_pagination("admin", "manage", $plog_page, $totalRows, $_SESSION['entries_per_page'], array("level" => $level, "id" => $id, "entries_per_page" => $_SESSION['entries_per_page'])).'</div>';
+        $pagination_menu = "\n\t\t" . '<div class="entries-page">'.generate_pagination_view_menu().'</div>
+                        <div class="pagination">'.generate_pagination("admin", "manage", $plog_page, $totalRows, $_SESSION['entries_per_page'], array("level" => $level, "id" => $id, "entries_per_page" => $_SESSION['entries_per_page'])).'
+                </div>';
 
         $output .= "\n\t\t" . '<form id="contentList" action="'.$_SERVER["PHP_SELF"].'" method="get">';
@@ -336 +337 @@
 
         if (empty($level) || $level == "collections") {
-                $output .= generate_breadcrumb_admin("").$pagination_menu;
+                $output .= $pagination_menu.generate_breadcrumb_admin("");
                 $output .= plog_collection_manager($first_item,$_SESSION['entries_per_page']);
         }
 
         if ($level == "albums") {
-                $output .= generate_breadcrumb_admin("albums", $id).$pagination_menu;
+                $output .= $pagination_menu.generate_breadcrumb_admin("albums", $id);
                 $output .= plog_album_manager($id,$first_item,$_SESSION['entries_per_page']);
         };
 
         if ($level == "pictures") {
-                $output .= generate_breadcrumb_admin("pictures", $id).$pagination_menu;
+                $output .= $pagination_menu.generate_breadcrumb_admin("pictures", $id);
                 $output .= plog_picture_manager($id,$first_item,$_SESSION['entries_per_page']);
 
@@ -352 +353 @@
 
         if ($level == "comments") {
-                $output .= generate_breadcrumb_admin("comments", $id).$pagination_menu;
+                $output .= $pagination_menu.generate_breadcrumb_admin("comments", $id);
                 $output .= plog_comment_manager($id,$first_item,$_SESSION['entries_per_page']);
         };
 
         $output .= "\n\t\t" . '<div><a href="#" onclick="checkAll(document.getElementById(\'contentList\')); return false; ">' . plog_tr('Invert Checkbox Selection') . '</a></div>
-                '.$pagination_menu.'
-                <div><input type="hidden" name="level" value="'.$level.'" />
-                <input type="hidden" name="id" value="'.$id.'" />
-                <input type="hidden" name="action" value="1" />
-                <input class="submit" type="submit" name="delete_checked" onclick="return confirm(\'' . plog_tr('Are you sure you want to delete selected items?') . '\');" value="' . plog_tr('Delete Checked') . '" />';
+                <div class="pagination">'.generate_pagination("admin", "manage", $plog_page, $totalRows, $_SESSION['entries_per_page'], array("level" => $level, "id" => $id, "entries_per_page" => $_SESSION['entries_per_page'])).'</div>
+                <div class="move-del-manage">
+                        <input type="hidden" name="level" value="'.$level.'" />
+                        <input type="hidden" name="id" value="'.$id.'" />
+                        <input type="hidden" name="action" value="1" />
+                        <input class="submit" type="submit" name="delete_checked" onclick="return confirm(\'' . plog_tr('Are you sure you want to delete selected items?') . '\');" value="' . plog_tr('Delete Checked') . '" />';
         if (!empty($level) && $level != "collections" && $level != "comments"){
                 $output .= generate_move_menu($level);

trunk/plog-admin/plog-themes.php

@@ -58 +58 @@
 
 // Output table header
-$output .= "\n\n\t\t" . '<table id="theme-table" cellpadding="5" width="100%">
+$output .= "\n\n\t\t" . '<table id="theme-table" cellpadding="1" width="100%">
                         <tr class="header">
                                 <th class="table-header-left">&nbsp;</th>
@@ -98 +98 @@
 
                 $output .= "\t\t\t\t<td>";
-                
+
                 if ($preview_thumb)
-                        $output .= "<div class=\"img-shadow\"><a rel=\"lightbox\" href=\"$preview_thumb_large\"><img src=\"$preview_thumb\"/></a></div>";
-                
-                $output .= "</td><td><strong>$theme_name</strong><br /> Version $version</td>
+                        $output .= "<div class=\"img-shadow\"><a rel=\"lightbox\" href=\"$preview_thumb_large\"><img src=\"$preview_thumb\" alt=\"$theme_name\" /></a></div>";
+
+                $output .= "</td>
+                                <td><strong>$theme_name</strong><br /> Version $version</td>
                                 <td>$description</td>
                                 <td><a href=\"$url\">$author</a></td>\n";

trunk/plog-content/themes/air/album.php

@@ -22 +22 @@
                 </ul><!-- /slides -->
 <?php else : ?>
-                <p id="no-pictures-msg"><?php echo plog_tr('There are no pictures in this album')?>.</p>
+                <div id="error-404">
+                        <h2><?php echo plog_tr('404 - Not Found')?></h2>
+                        <p><?php echo plog_tr('We are sorry, but the image that you requested does not exist. You might try using the <strong>Search</strong> feature to locate the image you are looking for.')?></p>
+                </div>
 <?php endif; ?>
 

trunk/plog-content/themes/air/collection.php

@@ -24 +24 @@
 
 <?php else : ?>
-                <p id="no-pictures-msg"><?php echo plog_tr('No albums yet')?>.</p>
+                <div id="error-404">
+                        <h2><?php echo plog_tr('404 - Not Found')?></h2>
+                        <p><?php echo plog_tr('We are sorry, but the collection that you requested does not exist.')?></p>
+                </div>
 <?php endif; ?>
         </div><!-- /thumbnail-container -->

trunk/plog-content/themes/air/collections.php

@@ -23 +23 @@
 
         <?php else : ?>
-                <p id="no-pictures-msg"><?php echo plog_tr('No collections yet')?>.</p>
+                <div id="error-404">
+                        <h2><?php echo plog_tr('404 - Not Found')?></h2>
+                        <p><?php echo plog_tr('We are sorry, but the collection that you requested does not exist.')?></p>
+                </div>
         <?php endif; ?>
 </div><!-- /thumbnail-container -->

trunk/plog-content/themes/air/gallery.css

@@ -135 +135 @@
         font-size: 1.4em;
         text-align: center;
+}
+
+#error-404 {
+        /* error-404 controls the "not found" message received when going to a non-existent URL */
+        margin: 50px;
+        text-align: justify;
 }
 

trunk/plog-content/themes/air/header.php

@@ -1 @@
-<?php plogger_init(); ?>
 <div id="wrapper">
 

trunk/plog-content/themes/air/picture.php

@@ -45 +45 @@
 <?php endwhile; ?>
 <?php else : ?>
-                <p id="no-pictures-msg"><?php echo plog_tr('No such image')?>.</p>
+                <div id="error-404">
+                        <h2><?php echo plog_tr('404 - Not Found')?></h2>
+                        <p><?php echo plog_tr('We are sorry, but the image that you requested does not exist. You might try using the <strong>Search</strong> feature to locate the image you are looking for.')?></p>
+                </div>
         <?php endif; ?>
         </div><!-- /big-picture-container -->

trunk/plog-content/themes/air/search.php

@@ -22 +22 @@
                 </ul><!-- /slides -->
 <?php else : ?>
-                <p id="no-pictures-msg"><?php echo plog_tr('There are no pictures that match this search')?>.</p>
+                <div id="error-404">
+                        <h2><?php echo plog_tr('Search Results')?></h2>
+                        <p><?php echo plog_tr('We are sorry, but there are no pictures that matched your search.')?></p>
+                </div>
 <?php endif; ?>
 

trunk/plog-content/themes/air/slideshow.php

@@ -25 +25 @@
 <?php echo generate_slideshow_interface(); ?>
 <?php else : ?>
-                <p id="no-pictures-msg"><?php echo plog_tr('There are no pictures to show')?>.</p>
+                <div id="error-404">
+                        <h2><?php echo plog_tr('404 - Not Found')?></h2>
+                        <p><?php echo plog_tr('We are sorry, but there are no images in this album to create a slideshow with.')?></p>
+                </div>
 
 <?php endif; ?>

trunk/plog-content/themes/default/album.php

@@ -29 +29 @@
                         </ul><!-- /slides -->
 <?php else : ?>
-                        <p id="no-pictures-msg"><?php echo plog_tr('There are no pictures in this album')?>.</p>
+                        <div id="error-404">
+                                <h2><?php echo plog_tr('404 - Not Found')?></h2>
+                                <p><?php echo plog_tr('We are sorry, but the image that you requested does not exist. You might try using the <strong>Search</strong> feature to locate the image you are looking for.')?></p>
+                        </div>
 
 <?php endif; ?>

trunk/plog-content/themes/default/collection.php

@@ -23 +23 @@
                         </ul><!-- /slides -->
 <?php else : ?>
-                        <p id="no-pictures-msg"><?php echo plog_tr('No albums yet')?>.</p>
+                        <div id="error-404">
+                                <h2><?php echo plog_tr('404 - Not Found')?></h2>
+                                <p><?php echo plog_tr('We are sorry, but the collection that you requested does not exist.')?></p>
+                        </div>
 
 <?php endif; ?>

trunk/plog-content/themes/default/collections.php

@@ -22 +22 @@
                         </ul><!-- /slides -->
 <?php else : ?>
-                        <p id="no-pictures-msg"><?php echo plog_tr('No collections yet')?>.</p>
+                        <div id="error-404">
+                                <h2><?php echo plog_tr('404 - Not Found')?></h2>
+                                <p><?php echo plog_tr('We are sorry, but the collection that you requested does not exist.')?></p>
+                        </div>
 
 <?php endif; ?>

trunk/plog-content/themes/default/gallery.css

@@ -252 +252 @@
 }
 
+#error-404 {
+        margin: 50px 75px;
+        text-align: justify;
+}
+
 /* Form Structure/Elements */
 
 #jump_menu {
-        float: right;
+        text-align: right;
 }
 
@@ -264 +269 @@
 
 #search_box {
-        margin-left: 5px;
-        float: right;
+        text-align: right;
 }
 

trunk/plog-content/themes/default/header.php

@@ -1 @@
-<?php plogger_init(); ?>
 <!--Output highest level container division-->
 <div id="wrapper">
@@ -7 +6 @@
                         <td id="jump-search-container">
                                 <?php echo generate_jump_menu(); ?>
-                                <br /><br />
+                                <br />
                                 <?php echo generate_search_box(); ?>
                         </td>

trunk/plog-content/themes/default/picture.php

@@ -49 +49 @@
 <?php endwhile; ?>
 <?php else : ?>
-                        <p id="no-pictures-msg"><?php echo plog_tr('No such image')?>.</p>
+                        <div id="error-404">
+                                <h2><?php echo plog_tr('404 - Not Found')?></h2>
+                                <p><?php echo plog_tr('We are sorry, but the image that you requested does not exist. You might try using the <strong>Search</strong> feature to locate the image you are looking for.')?></p>
+                        </div>
 <?php endif; ?>
                 </div><!-- /inner_wrapper -->

trunk/plog-content/themes/default/search.php

@@ -26 +26 @@
                         </ul><!-- /slides -->
 <?php else : ?>
-                        <p id="no-pictures-msg"><?php echo plog_tr('There are no pictures that matched your search')?>.</p>
-
+                        <div id="error-404">
+                                <h2><?php echo plog_tr('Search Results')?></h2>
+                                <p><?php echo plog_tr('We are sorry, but there are no pictures that matched your search.')?></p>
+                        </div>
 <?php endif; ?>
                 </div><!-- /thumbnail container -->

trunk/plog-content/themes/default/slideshow.php

@@ -33 +33 @@
 <?php echo generate_slideshow_interface(); ?>
 <?php else : ?>
-                        <p id="no-pictures-msg"><?php echo plog_tr('There are no pictures to show')?>.</p>
+                        <div id="error-404">
+                                <h2><?php echo plog_tr('404 - Not Found')?></h2>
+                                <p><?php echo plog_tr('We are sorry, but there are no images in this album to create a slideshow with.')?></p>
+                        </div>
 
 <?php endif; ?>

trunk/plog-content/themes/lucid/album.php

@@ -27 +27 @@
                         </ul><!-- /slides -->
 <?php else : ?>
-                        <p id="no-pictures-msg"><?php echo plog_tr('There are no pictures in this album')?>.</p>
+                        <div id="error-404">
+                                <h2><?php ec