Changeset 572 for trunk

Timestamp:

08/01/08 14:30:36 (4 months ago)

Author:

sidtheduck

Message:

+ Miscellaneous accessibility fixes for admin panel
+ Better 404 error / empty collection or album handling

Location:

trunk

Files:

• plog-admin/plog-admin-functions.php (modified) (5 diffs)
• plog-admin/plog-admin.php (modified) (1 diff)
• plog-admin/plog-import.php (modified) (7 diffs)
• plog-admin/plog-themes.php (modified) (1 diff)
• plog-admin/plog-upload.php (modified) (1 diff)
• 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/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/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/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/picture.php (modified) (1 diff)
• plog-content/themes/lucid/search.php (modified) (1 diff)
• plog-content/themes/lucid/slideshow.php (modified) (1 diff)
• plog-includes/plog-functions.php (modified) (10 diffs)

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

@@ -63 +63 @@
         }
         $output.= "\n\t\t\t".'</select>';
+        $output.= "\n\t\t\t".'<input id="pagination-go" class="submit" type="submit" value="' . plog_tr('Go') . '" />';
+        $output.= "\n\t\t\t<script type=\"text/javascript\">toggle('pagination-go');</script>\n";;
         return $output;
 }
@@ -1181 +1183 @@
 // so plugins could add new fields to all those forms.
 function plog_add_collection_form() {
-        $output = "\n\t\t" . '<input type="button" class="submit" id="show-collection" onclick="toggle(\'create-collection\'); toggle(\'show-collection\')" value="' . plog_tr('Create a Collection') . '" />';
+        $output = "\n\t\t" . '<input type="button" class="submit" id="show-collection" onclick="toggle(\'create-collection\'); toggle(\'show-collection\')" value="' . plog_tr('Create a Collection') . '" style="display: none;" />';
         $output .= "\n\t\t" . '<form action="'.$_SERVER["PHP_SELF"].'" method="post">
-                        <div id="create-collection" class="cssbox-green" style="width: 385px !important; display: none;">
+                        <div id="create-collection" class="cssbox-green" style="width: 385px !important;">
                                 <div class="cssbox_head-green"><h2>' . plog_tr('Create a Collection') . '</h2></div>
                                 <div class="cssbox_body-green">
@@ -1195 +1197 @@
                         </div>
                 </form>' . "\n";
+        $output .= "\n\t\t<script type=\"text/javascript\">toggle('create-collection'); toggle('show-collection');</script>\n";
         return $output;
 }
@@ -1200 +1203 @@
 function plog_add_album_form($parent_collection) {
         $parent_collection = intval($parent_collection);
-        $output = "\n\t\t" . '<input type="button" class="submit" id="show-album" onclick="toggle(\'create-album\'); toggle(\'show-album\')" value="' . plog_tr('Create an Album') . '" />';
+        $output = "\n\t\t" . '<input type="button" class="submit" id="show-album" onclick="toggle(\'create-album\'); toggle(\'show-album\')" value="' . plog_tr('Create an Album') . '" style="display: none;" />';
         $output .= "\n\t\t" . '<form action="'.$_SERVER["REQUEST_URI"].'" method="post">
-                        <div id="create-album" class="cssbox-green" style="width: 385px !important; display: none;">
+                        <div id="create-album" class="cssbox-green" style="width: 385px !important;">
                                 <div class="cssbox_head-green"><h2>' . plog_tr('Create an Album') . '</h2></div>
                                 <div class="cssbox_body-green">
@@ -1215 +1218 @@
                         </div>
                 </form>' . "\n";
+        $output .= "\n\t\t<script type=\"text/javascript\">toggle('create-album'); toggle('show-album');</script>\n";
          return $output;
 }

trunk/plog-admin/plog-admin.php

@@ -34 +34 @@
         $tabs = array();
         $tabs['upload']         = array('url' => 'plog-upload.php','caption' => plog_tr('<em>U</em>pload'));
-        $tabs['import']         = array('url' => 'plog-import.php','caption' => plog_tr('<em>I</em>mport'));
+        $tabs['import']         = array('url' => 'plog-import.php?nojs=1','caption' => plog_tr('<em>I</em>mport'), 'onclick' => "window.location='plog-import.php'; return false;");
         $tabs['manage']         = array('url' => 'plog-manage.php','caption' => plog_tr('<em>M</em>anage'));
-        $tabs['feedback'] = array('url' => 'plog-feedback.php','caption' => plog_tr('<em>F</em>eedback'));
+        $tabs['feedback']       = array('url' => 'plog-feedback.php','caption' => plog_tr('<em>F</em>eedback'));
         $tabs['options']        = array('url' => 'plog-options.php','caption' => plog_tr('<em>O</em>ptions'));
-        $tabs['themes'] = array('url' => 'plog-themes.php','caption' => plog_tr('<em>T</em>hemes'));
+        $tabs['themes']         = array('url' => 'plog-themes.php','caption' => plog_tr('<em>T</em>hemes'));
         $tabs['view']           = array('url' => $config['gallery_url'],'caption' => plog_tr('<em>V</em>iew'), 'target' => '_blank');
         $tabs['support']        = array('url' => 'http://www.plogger.org/forum/','caption' => plog_tr('<em>S</em>upport'), 'target' => '_blank');

trunk/plog-admin/plog-import.php

@@ -43 +43 @@
 $output = '';
 $counter = $imported = 0;
+
+// see if the 'nojs' flag has been set if javascript disabled and create query & separator strings for URLs
+$query = (isset($_GET['nojs'])) ? "?nojs=".$_GET['nojs'] : '';
+$sep = (isset($_GET['nojs'])) ? "&" : '?';
 
 // Check if update has been clicked, handle erroneous conditions, or upload
@@ -159 +163 @@
 
                 foreach ($directories as $dirkey => $group) {
-                        $output .= "\n\t\t\t" . '<li><a class="folder" href="'.$_SERVER['PHP_SELF']."?directory=$dirkey".'">'.basename($group).'</a></li>';
+                        $output .= "\n\t\t\t" . '<li><a class="folder" href="'.$_SERVER['PHP_SELF'].$query.$sep.'directory='.$dirkey.'">'.basename($group).'</a></li>';
                 }
 
                 $upload_directory = $config['basedir'] . 'plog-content/uploads';
                 $dirkey = md5($upload_directory);
-                $output .= "\n\t\t\t" . '<li><a class="folder" href="'.$_SERVER['PHP_SELF']."?directory=$dirkey".'">' . plog_tr('All Pictures') . '</a></li>';
+                $output .= "\n\t\t\t" . '<li><a class="folder" href="'.$_SERVER['PHP_SELF'].$query.$sep.'directory='.$dirkey.'">' . plog_tr('All Pictures') . '</a></li>';
                 $output .= "\n\t\t</ul>\n\t</div>\n";
 
@@ -208 +212 @@
                 $output .= "\n\t\t\t<ul>";
                 foreach ($directories as $dirkey => $group) {
-                        $output .= "\n\t\t\t\t" . '<li><a class="folder" href="'.$_SERVER['PHP_SELF']."?directory=$dirkey".'">'.basename($group).'</a></li>';
+                        $output .= "\n\t\t\t\t" . '<li><a class="folder" href="'.$_SERVER['PHP_SELF'].$query.$sep.'directory='.$dirkey.'">'.basename($group).'</a></li>';
                 }
                 //$dirkey = md5($upload_directory);
-                // $output .= '<li><a class="folder" href="'.$_SERVER['PHP_SELF'].'?directory='.$dirkey.'">All pictures</a></li>';
+                // $output .= '<li><a class="folder" href="'.$_SERVER['PHP_SELF'].$query.$sep.'directory='.$dirkey.'">All pictures</a></li>';
                 $output .= "\n\t\t\t</ul>\n\t\t</div>\n";
 
@@ -229 +233 @@
                 $files = get_files($real_directory);
 
-                if (count($files) > 0)
-                $output .= "\n\n\t\t" . '<p class="actions">' . sprintf(plog_tr('You are currently looking at <strong>%d</strong> image(s) within the <strong>%s</strong> directory.<br />' . "\n\t\t" . 'Creating thumbnails: %s done.'),count($files),$show_directory,'<span id="progress">0%</span>') . '</p>' . "\n";
+                if (count($files) > 0) {
+                        $percent = (isset($_GET['nojs'])) ? '100%': '0%';
+                        $output .= "\n\n\t\t" . '<p class="actions">' . sprintf(plog_tr('You are currently looking at <strong>%d</strong> image(s) within the <strong>%s</strong> directory.<br />' . "\n\t\t" . 'Creating thumbnails: %s done.'), count($files), $show_directory, '<span id="progress">'.$percent.'</span>') . '</p>' . "\n";
+                }
 
                 // check to make sure album is writable and readable, and issue warning
@@ -245 +251 @@
                         $relative_name = substr($files[$i],strlen($upload_directory)+1);
                         if ($i == 0)
-                        $output.= "\n\t\t\t" . '<form id="uploadForm" action="'.$_SERVER["PHP_SELF"].'" method="post" enctype="multipart/form-data">
+                        $output.= "\n\t\t\t" . '<form id="uploadForm" action="'.$_SERVER["PHP_SELF"].$query.'" method="post" enctype="multipart/form-data">
                         <table>
                                 <tr class="header">
@@ -258 +264 @@
 // new loop code - it works - yea!
                         $table_row_color = ($counter%2) ? "color-1" : "color-2";
+                        if (isset($_GET['nojs'])) {
+                                $thumbpath = generate_thumb($upload_directory.'/'.$relative_name,"import-".substr($file_key,0,2),THUMB_SMALL);
+                        } else {
+                                $thumbpath = $config['gallery_url'].'plog-admin/images/ajax-loader.gif';
+                        }
                         // start a new table row (alternating colors) and generate XHTML with thumbnail and link to picture view.
                         $output .= "\n\t\t\t\t" . '<tr class="'.$table_row_color.'">
                                         <td><input type="checkbox" name="Selected[]" value="'.$file_key.'" checked="checked" /></td>
-                                        <td><div class="img-shadow" id="pic_'.$file_key . '"><img src="'.$config['gallery_url'].'plog-admin/images/ajax-loader.gif" alt="loading" /></div></td>
+                                        <td><div class="img-shadow" id="pic_'.$file_key . '"><img src="'.$thumbpath.'" alt="thumbnail" /></div></td>
                                         <td>'.basename($files[$i]).'</td>
                                         <td>
@@ -340 +351 @@
 
                         $output .= "\n\t</form>";
-                        $key_arr = join(",\n\t\t",$keys);
-
-                        $output .= "\n\n\t<script type=\"text/javascript\">\n\tvar importThumbs=[\n\t\t";
-                        $output .= $key_arr;
-                        $output .= "];\n";
-                        $output .="\trequestImportThumb();\n\t</script>\n";
+                        if (!isset($_GET['nojs'])) {
+                                $key_arr = join(",\n\t\t",$keys);
+
+                                $output .= "\n\n\t<script type=\"text/javascript\">\n\tvar importThumbs=[\n\t\t";
+                                $output .= $key_arr;
+                                $output .= "];\n";
+                                $output .="\trequestImportThumb();\n\t</script>\n";
+                        }
                 }
         }

trunk/plog-admin/plog-themes.php

@@ -87 +87 @@
                 // generate large Lightbox preview thumb, update thumb if preview.png has been updated
                 $thumbnail_config[THUMB_LARGE]['timestamp'] = $timestamp;
+                $thumbnail_config[THUMB_LARGE]['disabled'] = 0;
                 $preview_thumb_large = generate_thumb($theme_folder_name . "preview.png", $theme_name, THUMB_LARGE);
 

trunk/plog-admin/plog-upload.php

@@ -13 +13 @@
         $albums_menu = isset($_REQUEST['albums_menu']) ?  $_REQUEST['albums_menu'] : '';
         $new_album_name = isset($_REQUEST['new_album_name']) ?  $_REQUEST['new_album_name'] : '';
-        $output = "\n\t\t\t\t\t\t<select name=\"albums_menu\" onclick=\"var k=document.getElementsByName(\'destination_radio\');k[0].checked=true;\">";
+        $output = "\n\t\t\t\t\t\t<select name=\"albums_menu\" onclick=\"var k=document.getElementsByName('destination_radio');k[0].checked=true;\">";
         foreach($albums as $album_id => $album) {
 

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

@@ -22 +22 @@
                 </ul><!-- /slides -->
 <?php else : ?>
-                <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 id="no-pictures-msg">
+                        <h2><?php echo plog_tr('No Images') ?></h2>
+                        <p><?php echo plog_tr('Sorry, but there are no images in this album yet.') ?></p>
                 </div>
 <?php endif; ?>

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

@@ -24 +24 @@
 
 <?php else : ?>
-                <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 id="no-pictures-msg">
+                        <h2><?php echo plog_tr('No Albums') ?></h2>
+                        <p><?php echo plog_tr('Sorry, but there are no images or albums in this collection yet.') ?></p>
                 </div>
 <?php endif; ?>

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

@@ -23 +23 @@
 
         <?php else : ?>
-                <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 id="no-pictures-msg">
+                        <h2><?php echo plog_tr('No Images') ?></h2>
+                        <p><?php echo plog_tr('Sorry, but there are no images in this gallery yet.') ?></p>
                 </div>
         <?php endif; ?>

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

@@ -131 +131 @@
 #no-pictures-msg {
         /* #no-pictures-msg controls the "no collections", "no albums", and "no picture" messages displayed when a visitor goes to a page without collections, albums, or a picture */
-        margin: 0 0 200px;
-        padding: 80px 0;
-        font-size: 1.4em;
-        text-align: center;
+        margin: 50px;
+        text-align: justify;
 }
 

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

@@ -14 +14 @@
 
                         </div>
-                        <?php echo generate_breadcrumb(); ?>
+                        <?php echo generate_breadcrumb("Home", " | "); ?>
 
                 </div><!-- /breadcrumbs -->

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

@@ -45 +45 @@
 <?php endwhile; ?>
 <?php else : ?>
-                <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 id="no-pictures-msg">
+                        <h2><?php echo plog_tr('Not Found') ?></h2>
+                        <p><?php echo plog_tr('Sorry, but the image that you requested does not exist.') ?></p>
                 </div>
         <?php endif; ?>

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

@@ -22 +22 @@
                 </ul><!-- /slides -->
 <?php else : ?>
-                <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 id="no-pictures-msg">
+                        <h2><?php echo plog_tr('Search Results') ?></h2>
+                        <p><?php echo plog_tr('Sorry, but there are no images that matched your search terms.') ?></p>
                 </div>
 <?php endif; ?>

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

@@ -25 +25 @@
 <?php echo generate_slideshow_interface(); ?>
 <?php else : ?>
-                <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 id="no-pictures-msg">
+                        <h2><?php echo plog_tr('No Images') ?></h2>
+                        <p><?php echo plog_tr('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 : ?>
-                        <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 id="no-pictures-msg">
+                                <h2><?php echo plog_tr('No Images') ?></h2>
+                                <p><?php echo plog_tr('Sorry, but there are no images in this album yet.') ?></p>
                         </div>
-
 <?php endif; ?>
                 </div><!-- /thumbnail container -->

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

@@ -23 +23 @@
                         </ul><!-- /slides -->
 <?php else : ?>
-                        <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 id="no-pictures-msg">
+                                <h2><?php echo plog_tr('No Albums') ?></h2>
+                                <p><?php echo plog_tr('Sorry, but there are no images or albums in this collection yet.') ?></p>
                         </div>
-
 <?php endif; ?>
                 </div><!-- /thumbnail container -->

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

@@ -22 +22 @@
                         </ul><!-- /slides -->
 <?php else : ?>
-                        <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 id="no-pictures-msg">
+                                <h2><?php echo plog_tr('No Images') ?></h2>
+                                <p><?php echo plog_tr('Sorry, but there are no images in this gallery yet.') ?></p>
                         </div>
-
 <?php endif; ?>
                 </div><!-- /thumbnail container -->

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

@@ -252 +252 @@
 }
 
-#error-404 {
+#error-404, #no-pictures-msg {
         margin: 50px 75px;
         text-align: justify;
@@ -419 +419 @@
 /* Success/Error Messages */
 
-#no-pictures-msg {
-        text-align: center;
-        padding: 15px 0;
-}
-
 .errors {
         width: 500px;

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

@@ -49 +49 @@
 <?php endwhile; ?>
 <?php else : ?>
-                        <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 id="no-pictures-msg">
+                                <h2><?php echo plog_tr('Not Found') ?></h2>
+                                <p><?php echo plog_tr('Sorry, but the image that you requested does not exist.') ?></p>
                         </div>
 <?php endif; ?>

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

@@ -26 +26 @@
                         </ul><!-- /slides -->
 <?php else : ?>
-                        <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 id="no-pictures-msg">
+                                <h2><?php echo plog_tr('Search Results') ?></h2>
+                                <p><?php echo plog_tr('Sorry, but there are no images that matched your search terms.') ?></p>
                         </div>
 <?php endif; ?>

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

@@ -33 +33 @@
 <?php echo generate_slideshow_interface(); ?>
 <?php else : ?>
-                        <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 id="no-pictures-msg">
+                                <h2><?php echo plog_tr('No Images') ?></h2>
+                                <p><?php echo plog_tr('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 : ?>
-                        <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 id="no-pictures-msg">
+                                <h2><?php echo plog_tr('No Images') ?></h2>
+                                <p><?php echo plog_tr('Sorry, but there are no images in this album yet.') ?></p>
                         </div>
-
 <?php endif; ?>
                 </div><!-- /thumbnail container -->

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

@@ -24 +24 @@
                         </div><!-- /collections -->
 <?php else : ?>
-                        <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 id="no-pictures-msg">
+                                <h2><?php echo plog_tr('No Albums') ?></h2>
+                                <p><?php echo plog_tr('Sorry, but there are no images or albums in this collection yet.') ?></p>
                         </div>
 <?php endif; ?>

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

@@ -23 +23 @@
                         </div><!-- /collections -->
 <?php else : ?>
-                        <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 id="no-pictures-msg">
+                                <h2><?php echo plog_tr('No Images') ?></h2>
+                                <p><?php echo plog_tr('Sorry, but there are no images in this gallery yet.') ?></p>
                         </div>
 <?php endif; ?>