Changeset 22300

Timestamp:

Apr 19, 2013, 3:49:00 PM (11 years ago)

Author:

plg

Message:

compatibility with Piwigo 2.5: display copyright on the picture page and on
picture edition page.

Location:

extensions/Copyrights

Files:

• image.php (modified) (1 diff)
• modify.php (modified) (4 diffs)

extensions/Copyrights/image.php

@@ -18 +18 @@
 {
         // Add the information after the author - so before the createdate
-        $search = '#<tr id="datecreate">#';
+        $search = '#class="imageInfoTable">#';
         
-        $replacement = '
-        <tr id="Copyrights_name">
-                <td class="label">{\'Copyright\'|@translate}</td>
-                <td class="value">
-                        {if $CR_INFO_NAME}
+        $replacement = 'class="imageInfoTable">
+        <div id="Copyrights_name" class="imageInfo">
+                <dt>{\'Copyright\'|@translate}</dt>
+                <dd>
+{if $CR_INFO_NAME}
                         <a target="_blanc" href="{$CR_INFO_URL}" title="{$CR_INFO_NAME}: {$CR_INFO_DESCR}">{$CR_INFO_NAME}</a>
-                        {else}{\'N/A\'|@translate}{/if}
-                </td>
-        </tr>
-        <tr id="datecreate">';
+{else}
+      {\'N/A\'|@translate}
+{/if}
+    </dd>
+        </div>';
 
         return preg_replace($search, $replacement, $content);

extensions/Copyrights/modify.php

@@ -3 +3 @@
 // Add a prefilter
 add_event_handler('loc_begin_admin', 'CR_set_prefilter_modify', 50 );
-add_event_handler('loc_begin_admin', 'CR_modify_submit', 45 );
+add_event_handler('loc_begin_admin_page', 'CR_modify_submit', 45 );
 
 // Change the variables used by the function that changes the template
-add_event_handler('loc_begin_admin', 'CR_add_modify_vars_to_template');
+add_event_handler('loc_begin_admin_page', 'CR_add_modify_vars_to_template');
 
 function CR_set_prefilter_modify()
@@ -16 +16 @@
 function CR_modify($content, &$smarty)
 {
-        $search = "#<td><strong>{'Creation date'#"; // Not ideal, but ok for now :)
+        $search = "#<strong>{'Creation date'#"; // Not ideal, but ok for now :)
 
         // We use the <tr> from the Creation date, and give them a new <tr>
-        $replacement = '<td><strong>{\'Copyright\'|@translate}</strong></td>
-                <td>
+        $replacement = '<strong>{\'Copyright\'|@translate}</strong>
+                <br>
                         <select id="copyrightID" name="copyrightID">
                                 <option value="">--</option>
                                 {html_options options=$CRoptions selected=$CRid}
                         </select>
-                </td>
-        </tr>
+                </p>
         
-        <tr>
-                <td><strong>{\'Creation date\'';
+        </p>
+  <p>
+                <strong>{\'Creation date\'';
 
     return preg_replace($search, $replacement, $content);
@@ -36 +36 @@
 function CR_add_modify_vars_to_template()
 {
-        // Check if we are at the modify page (the problem is that this will send the stuff to every admin page that has an ?image_id...
-        if (isset($_GET['image_id']))
+        if (isset($_GET['page']) and 'photo' == $_GET['page'] and isset($_GET['image_id']))
         {
                 global $template;
@@ -79 +78 @@
 function CR_modify_submit()
 {
-        // Check if we are at the modify page (the problem is that this will send the stuff to every admin page that has an ?image_id...
-        if (isset($_GET['image_id']))
+  if (isset($_GET['page']) and 'photo' == $_GET['page'] and isset($_GET['image_id']))
         {
                 if (isset($_POST['submit']))