Index: openacs-4/packages/photo-album/www/photo.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo.adp,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/photo-album/www/photo.adp	9 Oct 2003 10:01:09 -0000	1.2
+++ openacs-4/packages/photo-album/www/photo.adp	3 Dec 2003 22:52:33 -0000	1.2.2.1
@@ -10,6 +10,12 @@
       </if><else>
         <img src="images/@path@/@title@" height="@height@" width="@width@" alt="@title@" />
       </else>
+	<if @show_html_p@ eq 1>
+		<center>
+			&lt;img src="images/@path@/@title@" height="@height@" width="@width@" alt="@title@"/&gt;
+		</center>
+	</if>
+       <center></center>
       <if @caption@ not nil>
         <p>@caption@</p>
       </if>
@@ -18,18 +24,33 @@
       <p>@description@</p>
     </if>
     <if @story@ not nil>
-      <p>Story: @story@</p>
+      <p>#photo-album.Story_story#</p>
     </if>
     <if @write_p@ eq 1 or @move_p@ eq 1 or @delete_p@ eq 1><ul>
+	<if @show_html_p@ eq 1>
+        	<li><a href="photo.tcl?photo_id=@photo_id@&show_html_p=0">Hide the html source code of the image</a></li>  
+	</if>
+	<else>
+        	<li><a href="photo.tcl?photo_id=@photo_id@&show_html_p=1">Show the html source code of the image for copy&paste</a></li>  
+	</else>
         <if @write_p@ eq 1>
-          <li><a href="photo-iconic?photo_id=@photo_id@">Make this photo the iconic photo for this album</a>
-            <li><a href="photo-edit?photo_id=@photo_id@">Edit photo attributes</a>
+          <li><a href="photo-iconic?photo_id=@photo_id@">#photo-album.lt_Make_this_photo_the_i#</a>
+            <li><a href="photo-edit?photo_id=@photo_id@">#photo-album.lt_Edit_photo_attributes#</a>
         </if>
-        <if @move_p@ eq 1>
-          <li><a href="photo-move?photo_id=@photo_id@">Move photo to another album</a>
+        <if @move_p@ eq 1 and @albums_list@ ne "">
+          <li>
+	    <formtemplate id="move_photo">
+	      #photo-album._Move_photo_to_album#
+	      <formwidget id="new_album_id">
+		<if @formerror.new_album_id@ not nil>
+		  @formerror.new_album_id@ 
+		</if>
+	      </formwidget>
+	      <formwidget id="move_button"></formwidget>
+	    </formtemplate>
         </if>
         <if @delete_p@ eq 1>
-          <li><a href="photo-delete?photo_id=@photo_id@">Delete this photo</a>
+          <li><a href="photo-delete?photo_id=@photo_id@">#photo-album.Delete_this_photo#</a>
         </if>
       </ul>
     </if>
@@ -38,42 +59,43 @@
 
     @photo_nav_html;noquote@
     <div style="text-align: center">
-      <a href="album?album_id=@album_id@&amp;page=@page_num@">Image thumbnail index</a>
+      <a href="album?album_id=@album_id@&amp;page=@page_num@">#photo-album.lt_Image_thumbnail_index#</a>
     </div>
     <if @clipboards:rowcount@ eq 1>
       <multiple name="clipboards">
-        <a href="clipboard-attach?photo_id=@photo_id@&amp;collection_id=@clipboards.collection_id@">Save this photo to print or view later</a>
+        <a href="clipboard-attach?photo_id=@photo_id@&amp;collection_id=@clipboards.collection_id@">#photo-album.lt_Save_this_photo_to_pr#</a>
       </multiple>
     </if>
     <if @clipboards:rowcount@ gt 1>
       <form class="inline" action="clipboard-attach">
         <if @collection_id@ gt 0>
-          <strong>Image saved to clipboard.</strong>
+          <strong>#photo-album.lt_Image_saved_to_clipbo#</strong>
         </if>
         <else> 
           <if @collection_id@ not nil>
-            <strong>Image removed from clipboard.</strong>
+            <strong>#photo-album.lt_Image_removed_from_cl#</strong>
           </if>
         </else>
-        Save this photo to print or view later.  Place in folder 
+        #photo-album.lt_Save_this_photo_to_pr_1# 
         <input type="hidden" name="photo_id" value="@photo_id@"></input>
         <select name="collection_id">
           <multiple name="clipboards">
             <option value="@clipboards.collection_id@" @clipboards.selected@>@clipboards.title@</option>
           </multiple>
         </select>
-        <input type="submit" value="Save"></input>
+        <input type="submit" value="#photo-album._Save#"></input>
       </form>
     </if>
     <if @clipped:rowcount@ gt 0> 
-      This photo clipped to: 
+      #photo-album.lt_This_photo_clipped_to# 
       <multiple name="clipped"> 
-        <a href="clipboard-view?collection_id=@clipped.collection_id@">@clipped.title@</a>&nbsp;[<a href="clipboard-remove?collection_id=@clipped.collection_id@&photo_id=@photo_id@">remove</a>]&nbsp;
+        <a href="clipboard-view?collection_id=@clipped.collection_id@">@clipped.title@</a>&nbsp;[<a href="clipboard-remove?collection_id=@clipped.collection_id@&photo_id=@photo_id@">#photo-album.remove#</a>]&nbsp;
       </multiple>
     </if>
     <if @clipboards:rowcount@ gt 1>
-      <br /><a href="clipboards">View all your clipboards</a>
+      <br /><a href="clipboards">#photo-album.lt_View_all_your_clipboa#</a>
     </if>
     
     
     
+