From 2fa5c8c3885a0bcdd69fc91365a0b3d6cbb5d1cf Mon Sep 17 00:00:00 2001 From: Jason Woofenden Date: Mon, 19 Sep 2011 22:53:52 -0400 Subject: [PATCH] image paste code works captionless, refactor --- admin_images.html | 42 +++++++++--------- admin_images.php | 126 ++++++++++++++++++++++++----------------------------- code/wfpl | 2 +- style.less | 6 +-- 4 files changed, 81 insertions(+), 95 deletions(-) diff --git a/admin_images.html b/admin_images.html index ab2136f..b5c56c8 100644 --- a/admin_images.html +++ b/admin_images.html @@ -1,7 +1,8 @@ - + + <!--~$title show {~-->Images<!--~}~--> @@ -11,17 +12,17 @@

Image details

-

Add another image

+

Add another image

Back to images

-

Edit

+

Edit

Note: This image appears on the following page~count s~: ~title html~,

How to put one of these images on a page

    -
  1. Choose which size you want. If you want a size that is not shown below, edit this image and add a new display size.
    2. +
  2. Choose which size you want. If you want a size that is not shown below, edit this image and add a new display size.
  3. 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.
  4. Open the page editor in another tab (so you can refer to these instructions while you use it.)
  5. 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.
    6. @@ -30,8 +31,8 @@
-
On the right: (with the page text to the left of it)
<span class="wfpl_ifr" style="background-image: url(~src~); width: ~width~px; padding-top: ~height~px">~caption html~</span>
-
On the left: (with the page text to the right of it)
<span class="wfpl_ifl" style="background-image: url(~src~); width: ~width~px; padding-top: ~height~px">~caption html~</span>
+
On the right: (with the page text to the left of it)
<span class="wfpl_ifr" style="background-image: url(~src~); width: ~width~px; padding-top: ~height~px">~caption empty {~&nbsp;~}~~caption nonempty {~~caption html~<br>~}~</span>
+
On the left: (with the page text to the right of it)
<span class="wfpl_ifl" style="background-image: url(~src~); width: ~width~px; padding-top: ~height~px">~caption empty {~&nbsp;~}~~caption nonempty {~~caption html~<br>~}~</span>
Centered: (with nothing to either side)
<div class="wfpl_ic" style="background-image: url(~src~); padding-top: ~height~px; width: ~width~px">~caption html~</div>
@@ -40,21 +41,20 @@
-

To display this image smaller, edit this image and enter display size(s).

+

To display this image smaller, edit this image and enter display size(s).

Back to images

-

Edit

+

Edit

-

Add a new imageEdit image "~name html~"

+

Add a new imageEdit image "~name html~"

-
-
+
Image
@@ -77,31 +77,31 @@
 
-
Cancel
+
Cancel
- +

Images Listing

- -

[Add a new image]

+ +

[Add a new image]

- + - - - + + +
ImageNameCaption 
ImageNameCaption 
~name html~~caption html~~name html~(blank)~caption html~(blank) [delete this image]
- +

No images in database.

-

[Add a new image]

+

[Add a new image]

diff --git a/admin_images.php b/admin_images.php index a8c8a9b..d43255b 100644 --- a/admin_images.php +++ b/admin_images.php @@ -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); } - -?> diff --git a/code/wfpl b/code/wfpl index 2d753b1..7b6c6ac 160000 --- a/code/wfpl +++ b/code/wfpl @@ -1 +1 @@ -Subproject commit 2d753b1cb86b98e2995476b74f47cb5663670e4d +Subproject commit 7b6c6ac8d6c1f53b85491ee455f2402da1d149ba diff --git a/style.less b/style.less index f51cec5..ec55b52 100644 --- a/style.less +++ b/style.less @@ -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; -- 1.7.10.4