Changeset 24010 for extensions/header_manager

Timestamp:

Jul 21, 2013, 2:13:42 PM (11 years ago)

Author:

mistic100

Message:

"Add banner" in album page make the user redirected to the same page after cropping

Location:

extensions/header_manager

Files:

• admin/add.php (modified) (2 diffs)
• admin/album.php (modified) (1 diff)
• admin/template/add.tpl (modified) (5 diffs)
• admin/template/album.tpl (modified) (1 diff)
• admin/template/style.css (modified) (1 diff)
• main.inc.php (modified) (1 diff)

extensions/header_manager/admin/add.php

@@ -40 +40 @@
   pwg_set_session_var('added_banner', $_POST['picture_file']);
   
-  redirect(HEADER_MANAGER_ADMIN);
+  if (!empty($_GET['redirect']))
+  {
+    redirect($_GET['redirect']);
+  }
+  else
+  {
+    redirect(HEADER_MANAGER_ADMIN);
+  }
 }
 
@@ -142 +149 @@
 }
 
+$template->assign('F_ACTION', HEADER_MANAGER_ADMIN . '-add' .(!empty($_GET['redirect']) ? '&redirect='.urlencode($_GET['redirect']) : ''));
+
 $template->set_filename('header_manager', dirname(__FILE__).'/template/add.tpl');
 

extensions/header_manager/admin/album.php

@@ -30 +30 @@
 check_status(ACCESS_ADMINISTRATOR);
 
-check_input_parameter('cat_id', $_GET, false, PATTERN_ID);
+check_input_parameter('cat_id', $_GET, false, PATTERN_ID, true);
 
 $admin_album_base_url = get_root_url().'admin.php?page=album-'.$_GET['cat_id'];

extensions/header_manager/admin/template/add.tpl

@@ -38 +38 @@
 {/footer_script}
 
-<form method="post" action="">
+<form method="post" action="{$F_ACTION}">
 <fieldset>
   <legend>{'Crop banner image'|@translate}</legend>
@@ -81 +81 @@
 {/literal}{/footer_script}
 
-<form method="post" action="" ENCTYPE="multipart/form-data">
+<form method="post" action="{$F_ACTION}" ENCTYPE="multipart/form-data">
   <fieldset>
     <legend>{'Default banner size'|@translate}</legend>
@@ -87 +87 @@
     <label>
       {'Width'|@translate}:
-      <input type="text" name="width" size="4" value="{$BANNER_WIDTH}">px
+      <input type="text" name="width" size="4" value="{$BANNER_WIDTH}"> px
     </label>
     <br>
@@ -93 +93 @@
     <label>
       {'Height'|@translate}:
-      <input type="text" name="height" size="4" value="{$BANNER_HEIGHT}">px
+      <input type="text" name="height" size="4" value="{$BANNER_HEIGHT}"> px
     </label>
     <br>
@@ -115 +115 @@
     <b>{'or choose a picture from the gallery'|@translate}</b>
     <blockquote>
-      {'Picture id.'|@translate} <a class="showInfo" title="{'The numeric identifier can be found on the picture edition page, near the thumbnail.'|@translate}">i</a>
+      {'Picture id.'|@translate} <a class="icon-info-circled-1 showInfo" title="{'The numeric identifier can be found on the picture edition page, near the thumbnail.'|@translate}"></a>
       <input type="text" name="picture_id" size="5">
       <input type="submit" name="upload_gallery_image" value="{'Use'|@translate}" class="submit">

extensions/header_manager/admin/template/album.tpl

@@ -23 +23 @@
     {/foreach}
   {else}
-    <p style="text-align:left;">
-      {'No banner added yet'|@translate}<br>
-      <a href="{$ADD_IMAGE_URL}">{'Add a banner'|@translate}</a>
-    </p>
+    <p style="text-align:left;">{'No banner added yet'|@translate}</p>
   {/if}
+  
+  <p style="text-align:left;">
+    <a href="{$ADD_IMAGE_URL}&redirect={$F_ACTION|urlencode}">{'Add a banner'|@translate}</a>
+  </p>
     
   {if $banners}

extensions/header_manager/admin/template/style.css

@@ -52 +52 @@
     }
 
-.showInfo {
-  position:static;
-  display:inline-block;
-  padding:1px 6px;
-  width:auto;
-  font-size:0.8em;
-}
-
 #album_banners {
   list-style:disc;

extensions/header_manager/main.inc.php

@@ -4 +4 @@
 Version: auto
 Description: Header Manager allows to simply manage gallery banners. You can upload a picture from your computer or use a picture already in the gallery.
-Plugin URI: http://piwigo.org/ext/extension_view.php?eid=608
+Plugin URI: auto
 Author: Mistic
 Author URI: http://www.strangeplanet.fr