X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=admin_images.html;h=b5c56c8c94025cf0eba6d2f404ed159d7847a914;hb=ec61ce4d7e2c966cb85ee8c4269443f390bc62df;hp=ab2136ffc6696477f45cb0083af13da91aa7df06;hpb=1e96693d7c35f9a92395aa023b02749f4be05917;p=wfpl-cms.git

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 @@
 <!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>
@@ -11,17 +12,17 @@
 	<!--~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>
 		<!--~}~-->
@@ -40,21 +41,20 @@
 			<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>
@@ -77,31 +77,31 @@
 		</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>
 	<!--~}~-->
 
 <!--~}~-->

Image	Name	Caption
Image	Name	Caption
	~name html~	~caption html~		~name html~(blank)	~caption html~(blank)	[delete this image]