Changeset 852 in ExiteCMS

Timestamp:

09/28/07 23:00:52 (4 years ago)

Author:

hverton

Message:

fixed some bugs in site_links.php

Location:

trunk

Files:

• administration/site_links.php (modified) (2 diffs)
• includes/templates/admin.site_links.tpl (modified) (2 diffs)

trunk/administration/site_links.php

@@ -94 +94 @@
         $data['menu_last'] = $current == $total ? 1 : 0;
         $data['menu_depth'] = $depth;
-        $data['external'] = (strstr($data['link_url'], "http://") || strstr($data['link_url'], "https://")  ? 1 : 0);
+        $data['external'] = $data['link_window'] == 1;
         $data['link_visibility_name'] = getgroupname($data['link_visibility'], '-1');
         $current++;
@@ -174 +174 @@
         $panel_filename = isset($_POST['panel_filename']) ? $_POST['panel_filename'] : "";
         $link_parent = isset($_POST['link_parent']) ? $_POST['link_parent'] : "0";
+        // if a protocol is specified in the URL, force it to open in a new window
+        if (strstr($link_url, "://")) {
+            $link_window = 1;
+        }
         if ($action == "edit") {
             $data = dbarray(dbquery("SELECT * FROM ".$db_prefix."site_links WHERE link_id='$link_id'"));

trunk/includes/templates/admin.site_links.tpl

@@ -147 +147 @@
                     <img src='{$smarty.const.THEME}images/bullet.gif' alt='' /> 
                     {if $panels[id].links[id2].external}
-                        <a href='{$panels[id].links[id2].link_url}'>$panels[id].links[id2].link_name}</a>
+                        <a href='{$panels[id].links[id2].link_url}'>{$panels[id].links[id2].link_name}</a>
+                        <img src='{$smarty.const.THEME}images/external_link.jpg' alt='' />
                     {else}
                         <a href='{$smarty.const.BASEDIR}{$panels[id].links[id2].link_url}'>{$panels[id].links[id2].link_name}</a>
@@ -175 +176 @@
             </td>
             <td align='center' width='1%' class='tbl1' style='white-space:nowrap'>
-                <a href='{$smarty.const.FUSION_SELF}{$aidlink}&amp;action=edit&amp;link_id={$panels[id].links[id2].link_id}&amp;panel={$panels[id].panel}'>{$locale.434}</a> |
-                <a href='{$smarty.const.FUSION_SELF}{$aidlink}&amp;action=delete&amp;link_id={$panels[id].links[id2].link_id}&amp;panel={$panels[id].panel}' onclick='return confirm("{$locale.449}");'>{$locale.435}</a>
+                <a href='{$smarty.const.FUSION_SELF}{$aidlink}&amp;action=edit&amp;link_id={$panels[id].links[id2].link_id}&amp;panel={$panels[id].panel}'>
+                    <img src='{$smarty.const.THEME}images/page_edit.gif' alt='{$locale.434}' title='{$locale.434}' style='border:0px;'>
+                </a>
+                <a href='{$smarty.const.FUSION_SELF}{$aidlink}&amp;action=delete&amp;link_id={$panels[id].links[id2].link_id}&amp;panel={$panels[id].panel}' onclick='return confirm("{$locale.449}");'>
+                    <img src='{$smarty.const.THEME}images/page_delete.gif' alt='{$locale.435}' title='{$locale.435}' style='border:0px;'>
+                </a>
             </td>
         </tr>