Changeset 840 in ExiteCMS for modules/common/gallery/php-files/modules/gallery/lib/content.php

Timestamp:

09/26/07 00:39:24 (5 years ago)

Author:

hverton

Message:

minor bugfixes
further work on Gallery integration

File:

• modules/common/gallery/php-files/modules/gallery/lib/content.php (modified) (4 diffs)

modules/common/gallery/php-files/modules/gallery/lib/content.php

@@ -40 +40 @@
         $buf .= '</a>';
     }
+    $buf .= '&nbsp;';
 
     if ($gallery->user->canChangeTextOfAlbum($album)) {
@@ -45 +46 @@
             $buf = "<i>&lt;". gTranslate('common', "Empty") . "&gt;</i>";
         }
-        $url = "edit_field.php?set_albumName={$album->fields['name']}&field=$field"; // should replace with &amp; for validatation
-        $buf .= ' <span class="editlink">';
-        $buf .= popup_link( "[". sprintf(gTranslate('common', "edit %s"), gTranslate('common', $field)) . "]", $url) ;
-        $buf .= '</span>';
+        $iconText = getIconText('page_edit.gif', gTranslate('core', sprintf(gTranslate('common', "edit %s"), gTranslate('common', $field))), 'yes');
+        $buf .= popup_link($iconText, "edit_field.php?set_albumName={$album->fields['name']}&field=$field");
+
     }
 
@@ -149 +149 @@
 </tr>
 <tr>
-    <td colspan="2" class="commentboxfooter" align="right"><input name="save" type="submit" value="<?php echo gTranslate('common', "Post comment") ?>"></td>
+    <td colspan="2" class="commentboxfooter" align="right"><input name="save" type="submit" class="button" value="<?php echo gTranslate('common', "Post comment") ?>"></td>
 </tr>
 </table>
@@ -557 +557 @@
         }
 
-        if (file_exists("$base/images/icons/$iconName")) {
+        if (file_exists(PATH_THEME."images/$iconName")) {
+            $imgSrc = THEME .'images/'. $iconName;
+            $linkText = "<img src=\"$imgSrc\" title=\"$altText\" alt=\"$altText\" style=\"border: none;\">";
+
+            if ($iconMode == "both") {
+                $linkText .= "<br>$text";
+            }
+        } elseif (file_exists("$base/images/icons/$iconName")) {
             $imgSrc = $gallery->app->photoAlbumURL .'/images/icons/'. $iconName;
             $linkText = "<img src=\"$imgSrc\" title=\"$altText\" alt=\"$altText\" style=\"border: none;\">";