JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
image paste code works captionless, refactor
authorJason Woofenden <jason@jasonwoof.com>
Tue, 20 Sep 2011 02:53:52 +0000 (22:53 -0400)
committerJason Woofenden <jason@jasonwoof.com>
Tue, 20 Sep 2011 02:58:07 +0000 (22:58 -0400)
admin_images.html
admin_images.php
code/wfpl
style.less

index ab2136f..b5c56c8 100644 (file)
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 
-<html>
+<html lang="en">
 <head>
+       <meta charset="utf-8" />
        <title><!--~$title show {~-->Images<!--~}~--></title>
        <link rel="stylesheet" href="style.css" type="text/css">
 </head>
        <!--~display {~-->
                <h2>Image details</h2>
 
-               <p><a href="admin_images?admin_images_new=1">Add another image</a></p>
+               <p><a href="admin_images?new=1">Add another image</a></p>
 
                <p><a href="admin_images">Back to images</a></p>
 
-               <p><a href="admin_images?admin_images_edit_id=~id attr~">Edit</a></p>
+               <p><a href="admin_images?edit_id=~id attr~">Edit</a></p>
 
                <!--~references {~--><p><strong>Note:</strong> This image appears on the following page~count s~: <!--~data {~--><a href="~filename attr~">~title html~</a><!--~ sep {~-->, <!--~}~--><!--~}~--></p><!--~}~-->
 
                <h3>How to put one of these images on a page</h3>
                <ol>
-                       <li>Choose which size you want. If you want a size that is not shown below, <a href="admin_images?admin_images_edit_id=~id attr~">edit this image</a> and add a new display size.</li>
+                       <li>Choose which size you want. If you want a size that is not shown below, <a href="admin_images?edit_id=~id attr~">edit this image</a> and add a new display size.</li>
                        <li>Above the image (at your chosen size) you will see HTML code with a light gray background. Drag (or triple click) to select the HTML code for your desired alignment, and copy it to the clipboard.</li>
                        <li>Open the page editor in another tab (so you can refer to these instructions while you use it.)</li>
                        <li>In the page editor, type "HERE HERE HERE" where you'd like to insert the image, then click the "Source" button at the top/left of the editor.</li>
@@ -30,8 +31,8 @@
                </ol>
                
                <!--~smaller {~-->
-                       <div><strong>On the right: </strong>(with the page text to the left of it)</div><div><code class="html">&lt;span class="wfpl_ifr" style="background-image: url(~src~); width: ~width~px; padding-top: ~height~px"&gt;~caption html~&lt;/span&gt;</code></div>
-                       <div><strong>On the left: </strong>(with the page text to the right of it)</div><div><code class="html">&lt;span class="wfpl_ifl" style="background-image: url(~src~); width: ~width~px; padding-top: ~height~px"&gt;~caption html~&lt;/span&gt;</code></div>
+                       <div><strong>On the right: </strong>(with the page text to the left of it)</div><div><code class="html">&lt;span class="wfpl_ifr" style="background-image: url(~src~); width: ~width~px; padding-top: ~height~px"&gt;~caption empty {~&amp;nbsp;~}~~caption nonempty {~~caption html~&lt;br&gt;~}~&lt;/span&gt;</code></div>
+                       <div><strong>On the left: </strong>(with the page text to the right of it)</div><div><code class="html">&lt;span class="wfpl_ifl" style="background-image: url(~src~); width: ~width~px; padding-top: ~height~px"&gt;~caption empty {~&amp;nbsp;~}~~caption nonempty {~~caption html~&lt;br&gt;~}~&lt;/span&gt;</code></div>
                        <div><strong>Centered: </strong>(with nothing to either side)</div><div> <code class="html">&lt;div class="wfpl_ic" style="background-image: url(~src~); padding-top: ~height~px; width: ~width~px"&gt;~caption html~&lt;/div&gt;</code></div>
                        <div><img src="~src~" alt="" /></div>
                <!--~}~-->
                        <div><img src="~image image_src~" width="~image image_width~" height="~image image_height~" alt="" /></div>
 
                <!--~no_sizes {~-->
-                       <p>To display this image smaller, <a href="admin_images?admin_images_edit_id=~id attr~">edit this image</a> and enter display size(s).</p>
+                       <p>To display this image smaller, <a href="admin_images?edit_id=~id attr~">edit this image</a> and enter display size(s).</p>
                <!--~}~-->
 
 
 
                <p><a href="admin_images">Back to images</a></p>
 
-               <p><a href="admin_images?admin_images_edit_id=~id attr~">Edit</a></p>
+               <p><a href="admin_images?edit_id=~id attr~">Edit</a></p>
        <!--~}~-->
 
        <!--~form {~-->
-               <h2><!--~new_msg {~-->Add a new image<!--~}~--><!--~edit_msg {~-->Edit image "~name html~"<!--~}~--></h2>
+               <h2><!--~id unset {~-->Add a new image<!--~}~--><!--~id {~-->Edit image "~name html~"<!--~}~--></h2>
 
-               <form action="admin_images" method="post" enctype="multipart/form-data"><!--~editing {~--><div style="display: none"><input type="hidden" name="admin_images_edit_id" value="~admin_images_edit_id attr~"></div><!--~}~--><input type="hidden" name="MAX_FILE_SIZE" value="~upload_max_filesize~">
-                       <div style="display: none"><input type="hidden" name="" value="~ attr~"></div>
+               <form action="admin_images" method="post" enctype="multipart/form-data"><!--~id {~--><div style="display: none"><input type="hidden" name="edit_id" value="~id attr~"></div><!--~}~--><input type="hidden" name="MAX_FILE_SIZE" value="~upload_max_filesize~">
 
                        <div class="caption">Image</div>
                        <div class="field"><input type="file" name="image"><input type="hidden" name="old_image" value="~image attr~"></div>
                </form>
 
                <div class="caption">&nbsp;</div>
-               <div class="field"><!--~jam_edit_id {~--><a href="admin_images?admin_images_id=~admin_images_edit_id~"><!--~}~--><!--~jam_edit_id unset {~--><a href="admin_images"><!--~}~-->Cancel</a></div>
+               <div class="field"><a href="admin_images~id {~?id=~id~~}~">Cancel</a></div>
        <!--~}~-->
 
-       <!--~listings {~-->
+       <!--~listings once {~-->
                <h2>Images Listing</h2>
 
-               <!--~populated_listing {~-->
-                       <p><a href="admin_images?admin_images_new=1">[Add a new image]</a></p>
+               <!--~listings once_if {~-->
+                       <p><a href="admin_images?new=1">[Add a new image]</a></p>
 
                        <table cellspacing="0" cellpadding="4" border="1" summary="">
-                               <th>Image</th><th>Name</th><th>Caption</th><th>&nbsp;</th><!--~rows {~-->
+                               <tr><th>Image</th><th>Name</th><th>Caption</th><th>&nbsp;</th></tr><!--~listings {~-->
                                <tr>
-                                       <td class="listing"><a href="admin_images?admin_images_id=~id~"><!--~image nonempty {~--><img src="~image thumb_src~" width="~image thumb_width~" height="~image thumb_height~" alt=""><!--~}~--></a></td>
-                                       <td class="listing"><a href="admin_images?admin_images_id=~id~">~name html~</a></td>
-                                       <td class="listing"><a href="admin_images?admin_images_id=~id~">~caption html~</a></td>
+                                       <td class="listing"><a href="admin_images?id=~id~"><!--~image nonempty {~--><img src="~image thumb_src~" width="~image thumb_width~" height="~image thumb_height~" alt=""><!--~}~--></a></td>
+                                       <td class="listing"><a href="admin_images?id=~id~">~name html~<!--~name empty {~--><em>(blank)</em><!--~}~--></a></td>
+                                       <td class="listing"><a href="admin_images?id=~id~">~caption html~<!--~caption empty {~--><em>(blank)</em><!--~}~--></a></td>
                                        <td><a href="admin_images?admin_images_delete_id=~id~" onclick="return confirm('Permanently delete?')">[delete this image]</a></td>
                                </tr><!--~}~-->
 
                        </table>
                <!--~}~-->
-               <!--~empty_listing {~-->
+               <!--~listings once_else {~-->
                        <p>No images in database.</p>
                <!--~}~-->
 
-               <p><a href="admin_images?admin_images_new=1">[Add a new image]</a></p>
+               <p><a href="admin_images?new=1">[Add a new image]</a></p>
        <!--~}~-->
 
 <!--~}~-->
index a8c8a9b..d43255b 100644 (file)
@@ -51,66 +51,66 @@ function format_width_height($str) {
 function admin_images_get_fields() {
        $data = array();
 
-       $data['name'] = format_oneline($_REQUEST['name']);
-       $data['caption'] = format_oneline($_REQUEST['caption']);
-       $data['sizes'] = format_unix($_REQUEST['sizes']);
+       $data['name'] = format_oneline(_REQUEST_cut('name'));
+       $data['caption'] = format_oneline(_REQUEST_cut('caption'));
+       $data['sizes'] = format_unix(_REQUEST_cut('sizes'));
+
        if($_FILES['image'] && $_FILES['image']['error'] == 0) {
                $data['image'] = convert_uploaded_image('image', $GLOBALS['upload_directory'] . $GLOBALS['image_file_name'], $GLOBALS['image_max_width'], $GLOBALS['image_max_height'], $GLOBALS['image_thumb_max_width'], $GLOBALS['image_thumb_max_height']);
        } else {
-               if($_REQUEST['delete_image'] == 'Yes') {
+               if(_REQUEST_cut('delete_image') == 'Yes') {
                        $data['image'] = '';
                } else {
-                       $data['image'] = format_image_w_h_thumb_w_h($_REQUEST['old_image']);
+                       $data['image'] = format_image_w_h_thumb_w_h(_REQUEST_cut('old_image'));
                }
        }
+       unset($_FILES['image']);
 
        return $data;
 }
 
 
-# You may pass a "where clause" for the db query.
-function admin_images_display_listing($where = 'order by name, caption') {
-       $rows = db_get_assocs('cms_images', 'id,image,name,caption', $where);
-       if($rows == false || count($rows) == 0) {
-               tem_set('listings', array('empty_listing' => true));
-               return;
-       }
-
-       # make sure there's something clickable
-       foreach($rows as &$row) {
-               if($row['name'] == '') {
-                       $row['name'] = '--';
-               }
-       }
-       tem_set('listings', array(
-               'populated_listing' => true,
-               'rows' => $rows));
-       return true;
-}
-
 function admin_images_main() {
        if(!logged_in_as_admin()) {
                $_REQUEST['url'] = this_url();
                return 'admin_login';
        }
 
-       if(isset($_REQUEST['admin_images_id'])) {
-               return admin_images_display_main();
-       } else {
-               return admin_images_edit_main();
+       $id = _REQUEST_cut('edit_id');
+       if($id) {
+               return admin_images_main_form($id);
        }
-}
 
-function admin_images_display_main() {
-       $id = format_int($_REQUEST['admin_images_id']);
-       unset($_REQUEST['admin_images_id']);
-       if(!$id) {
-               message('Error: Broken link');
-               return './admin_images';
+       $id = _REQUEST_cut('admin_images_delete_id');
+       if($id) {
+               return admin_images_main_delete($id);
+       }
+
+       if(_REQUEST_cut('new')) {
+               return admin_images_main_form();
+       }
+
+       if(_REQUEST_cut('list')) {
+               return admin_images_main_listing();
+       }
+
+       $id = _REQUEST_cut('id');
+       if($id) {
+               return admin_images_main_display($id);
        }
+
+       if(isset($_POST['name'])) {
+               return admin_images_main_form();
+       }
+
+       # default action:
+       return admin_images_main_listing();
+}
+
+function admin_images_main_display($id) {
        $data = db_get_assoc('cms_images', 'id,'.ADMIN_IMAGES_DB_FIELDS, 'where id=%i', $id);
        if(!$data) {
-               message('Error: Image not found');
+               message("Error: Broken Link (Image #$id not found)");
                return './admin_images';
        }
 
@@ -161,39 +161,27 @@ function admin_images_display_main() {
        tem_set('display', $data);
 }
 
-function admin_images_edit_main() {
-       $edit_id = format_int($_REQUEST['admin_images_edit_id']);
-       unset($_REQUEST['admin_images_edit_id']);
-       if($edit_id) {
-               # add hidden field for database id of row we're editing
-               tem_set('admin_images_edit_id', $edit_id);
-               tem_set('editing', 'show');
-               tem_set('edit_msg', 'show');
-       }
-
-       $delete_id = format_int($_REQUEST['admin_images_delete_id']);
-       unset($_REQUEST['admin_images_delete_id']);
-       if($delete_id) {
-               db_delete('cms_images', 'where id=%i', $delete_id);
-               message('Image deleted.');
-
-               return './admin_images';
-       }
+function admin_images_main_delete($id) {
+       db_delete('cms_images', 'where id=%i', $id);
+       message('Image deleted.');
+       return './admin_images';
+}
 
-       if(!$edit_id) {
-               if(!isset($_REQUEST['admin_images_new']) && !isset($_REQUEST['name'])) {
-                       admin_images_display_listing();
-                       return;
-               }
+function admin_images_main_listing() {
+       $listing_rows = db_get_assocs('cms_images', 'id,image,name,caption', 'order by name, caption');
+       tem_set('listings', $listing_rows);
+}
 
-               tem_set('new_msg', 'show');
+function admin_images_main_form($id = false) {
+       if($id) {
+               tem_set('id', $id);
        }
 
        if(isset($_POST['name'])) {
                $data = admin_images_get_fields();
 
                # save anything
-               # Note: If you change this to re-display the form in some cases, be sure to handle image uploads well (don't make them upload it again.
+               # Note: If you change this to re-display the form in some cases, be sure to handle image uploads well (don't make them upload it again.)
 
                # resize image as needed
                if($data['image'] && $data['sizes']) {
@@ -213,10 +201,10 @@ function admin_images_edit_main() {
                }
 
                # save to database
-               if($edit_id) {
-                       db_update_assoc('cms_images', $data, 'where id=%i', $edit_id);
+               if($id) {
+                       db_update_assoc('cms_images', $data, 'where id=%i', $id);
                        message('Image updated.');
-                       $saved_id = $edit_id;
+                       $saved_id = $id;
                } else {
                        db_insert_assoc('cms_images', $data);
                        message('Image saved.');
@@ -224,11 +212,11 @@ function admin_images_edit_main() {
                }
 
                # return user to display page where they can see instructions, etc
-               return "./admin_images?admin_images_id=$saved_id";
+               return "./admin_images?id=$saved_id";
 
-       } elseif($edit_id) {
+       } elseif($id) {
                # we've recieved an edit id, but no data. So we grab the values to be edited from the database
-               $data = db_get_assoc('cms_images', ADMIN_IMAGES_DB_FIELDS, 'where id=%i', $edit_id);
+               $data = db_get_assoc('cms_images', ADMIN_IMAGES_DB_FIELDS, 'where id=%i', $id);
        } else {
                # form not submitted, set default values:
                $data = array('sizes' => '275x500');
@@ -238,5 +226,3 @@ function admin_images_edit_main() {
 
        tem_set('form', $data);
 }
-
-?>
index 2d753b1..7b6c6ac 160000 (submodule)
--- a/code/wfpl
+++ b/code/wfpl
@@ -1 +1 @@
-Subproject commit 2d753b1cb86b98e2995476b74f47cb5663670e4d
+Subproject commit 7b6c6ac8d6c1f53b85491ee455f2402da1d149ba
index f51cec5..ec55b52 100644 (file)
@@ -27,7 +27,7 @@ body {
 #centerer {
        position: relative;
        background: @nav-color;
-       margin: 13px auto;
+       margin: 15px auto;
        width: @site-width;
        -moz-box-shadow: 2px 2px 15px #777;
        -webkit-box-shadow: 2px 2px 15px #777;
@@ -137,7 +137,7 @@ span.wfpl_ifl {
        text-align: right;
        background-repeat: no-repeat;
        background-position: left top;
-       margin: 0 10px 17px 0;
+       margin: 0 10px 2px 0;
 }
 span.wfpl_ifr {
        display: block;
@@ -146,7 +146,7 @@ span.wfpl_ifr {
        text-align: right;
        background-repeat: no-repeat;
        background-position: left top;
-       margin: 0 0 10px 17px;
+       margin: 0 0 10px 2px;
 }
 div.wfpl_ic {
        margin: 15px auto;