Changeset 120

Timestamp:

12/25/2005 07:51:45 PM (6 years ago)

Author:

Winner

Message:

Add: Smarty php modifier - stripslashes.
Bug fix: You can now select values from pages >1 on pickup pages.
Change: Pickup windows size. Better visibility. Closes #19

Location:

trunk

Files:

• globals/common.php (modified) (1 diff)
• templates/basic/constructors/form.tpl (modified) (2 diffs)
• templates/basic/constructors/table.tpl (modified) (1 diff)
• templates/basic/includes/pages/hostmaster/hostmaster_dnszone_form_zone.tpl (modified) (1 diff)
• templates/basic/includes/pages/mynodes/mynodes_link_form_link.tpl (modified) (2 diffs)
• templates/basic/includes/pages/nodes/node_info.tpl (modified) (1 diff)
• templates/basic/includes/pages/nodes/nodes_plot_link.tpl (modified) (2 diffs)

trunk/globals/common.php

@@ -51 +51 @@
 $smarty->plugins_dir = array($vars['templates']['path'].$vars['templates']['default'].'/plugins/', 'plugins');
 $smarty->compile_dir = $vars['templates']['compiled_path'].$vars['templates']['default'].'/';
+$smarty->register_modifier('stripslashes', 'stripslashes');
 reset_smarty();
 

trunk/templates/basic/constructors/form.tpl

@@ -70 +70 @@
                         <input type="hidden" name="{$data[d].fullField}" value="{$data[d].Type_Pickup.value|escape}" />
                         <input type="text" disabled="disabled" class="fld-form-input-pickup" name="{$data[d].fullField}_output" value="{$data[d].Type_Pickup.output|escape}" />
-                        {include file=generic/link.tpl content="`$lang.change`" onclick="javascript: t = window.open('`$data[d].Pickup_url`', 'popup_pickup', 'width=500,height=400,toolbar=0,resizable=1,scrollbars=1'); t.focus(); return false;"}
+                        {include file=generic/link.tpl content="`$lang.change`" onclick="javascript: t = window.open('`$data[d].Pickup_url`', 'popup_pickup', 'width=700,height=600,toolbar=0,resizable=1,scrollbars=1'); t.focus(); return false;"}
                         {if $data[d].Null == 'YES'}{include file=generic/link.tpl content="`$lang.delete`" onclick="javascript: `$data[d].fullField`.value = ''; `$data[d].fullField`_output.innerText = ''; return false;"}{/if}
                 </td>   
@@ -83 +83 @@
                                 {/section}
                         </select>
-                        {include file=generic/link.tpl content="`$lang.add`" onclick="javascript: t = window.open('`$data[d].Pickup_url`', 'popup_pickup', 'width=500,height=400,toolbar=0,resizable=1,scrollbars=1'); t.focus(); return false;"}
+                        {include file=generic/link.tpl content="`$lang.add`" onclick="javascript: t = window.open('`$data[d].Pickup_url`', 'popup_pickup', 'width=700,height=600,toolbar=0,resizable=1,scrollbars=1'); t.focus(); return false;"}
                         {include file=generic/link.tpl content="`$lang.remove`" onclick="javascript: remove_selected(window.document.`$extra_data.FORM_NAME`.elements['`$data[d].fullField`[]']); return false;"}
                 </td>   

trunk/templates/basic/constructors/table.tpl

@@ -69 +69 @@
                 {assign var=edit_column value="`$extra_data.PICKUP_COLUMN`"}
                 {assign var=edit value=""}
-                {assign var=onclick value="javascript: window.opener.pickup(window.opener.document.`$extra_data.PICKUP_OBJECT`,'`$extra_data.PICKUP_OUTPUT[row]`','`$extra_data.PICKUP_VALUE[row]`', window); return false;"}
+                {assign var=onclick value="javascript: window.opener.pickup(window.opener.document.`$extra_data.PICKUP_OBJECT`,'`$extra_data.PICKUP_OUTPUT[row]`','`$extra_data.PICKUP_VALUE[row]`', window); return false;"|stripslashes}
         {/if}
         <td class="{$cellclass}">{if $key==$edit_column && $smarty.section.row.index != 0}<a href="{$edit}"{if $extra_data.PICKUP_COLUMN != ''} onclick="{$onclick}"{/if}>{$cell|escape}</a>{else}{$cell|escape}{/if}</td>

trunk/templates/basic/includes/pages/hostmaster/hostmaster_dnszone_form_zone.tpl

@@ -85 +85 @@
                         {/section}
                 </select>
-                {include file=generic/link.tpl content="`$lang.add`" onclick="javascript: t = window.open('`$data.2.Pickup_url`', 'popup_pickup', 'width=500,height=400,toolbar=0,resizable=1,scrollbars=1'); t.focus(); return false;"}
+                {include file=generic/link.tpl content="`$lang.add`" onclick="javascript: t = window.open('`$data.2.Pickup_url`', 'popup_pickup', 'width=700,height=600,toolbar=0,resizable=1,scrollbars=1'); t.focus(); return false;"}
                 {include file=generic/link.tpl content="`$lang.remove`" onclick="javascript: remove_selected(window.document.`$extra_data.FORM_NAME`.elements['`$data.2.fullField`[]']); return false;"}
         </td>   

trunk/templates/basic/includes/pages/mynodes/mynodes_link_form_link.tpl

@@ -92 +92 @@
                         <input type="hidden" name="{$data[1].fullField}" value="{$data[1].Type_Pickup.value|escape}" />
                         <input type="text" disabled="disabled" class="fld-form-input-pickup" name="{$data[1].fullField}_output" value="{$data[1].Type_Pickup.output|escape}" />
-                        {include file=generic/link.tpl content="`$lang.change`" onclick="javascript: t = window.open('`$data[1].Pickup_url`', 'popup_pickup', 'width=500,height=400,toolbar=0,resizable=1,scrollbars=1'); t.focus(); return false;"}
+                        {include file=generic/link.tpl content="`$lang.change`" onclick="javascript: t = window.open('`$data[1].Pickup_url`', 'popup_pickup', 'width=700,height=600,toolbar=0,resizable=1,scrollbars=1'); t.focus(); return false;"}
                         {if $data[1].Null == 'YES'}{include file=generic/link.tpl content="`$lang.delete`" onclick="javascript: `$data[1].fullField`.value = ''; `$data[1].fullField`_output.innerText = ''; return false;"}{/if}
                 </td>   
@@ -101 +101 @@
                         <input type="hidden" name="{$data[2].fullField}" value="{$data[2].Type_Pickup.value|escape}" />
                         <input type="text" disabled="disabled" class="fld-form-input-pickup" name="{$data[2].fullField}_output" value="{$data[2].Type_Pickup.output|escape}" />
-                        {include file=generic/link.tpl content="`$lang.change`" onclick="javascript: t = window.open('`$data[2].Pickup_url`', 'popup_pickup', 'width=500,height=400,toolbar=0,resizable=1,scrollbars=1'); t.focus(); return false;"}
+                        {include file=generic/link.tpl content="`$lang.change`" onclick="javascript: t = window.open('`$data[2].Pickup_url`', 'popup_pickup', 'width=700,height=600,toolbar=0,resizable=1,scrollbars=1'); t.focus(); return false;"}
                         {if $data[2].Null == 'YES'}{include file=generic/link.tpl content="`$lang.delete`" onclick="javascript: `$data[2].fullField`.value = ''; `$data[2].fullField`_output.innerText = ''; return false;"}{/if}
                 </td>   

trunk/templates/basic/includes/pages/nodes/node_info.tpl

@@ -42 +42 @@
 <tr>
 <td class="table-node-key">{$lang.db.user_id_owner}</td>
-<td class="table-node-value">{$node.owner_username|escape} {include file="generic/link.tpl" onclick="javascript: t = window.open('$link_contact', 'contact', 'width=600,height=400,toolbar=0,resizable=1,scrollbars=1'); t.focus(); return false;" content=$lang.contact}</td>
+<td class="table-node-value">{$node.owner_username|escape} {include file="generic/link.tpl" onclick="javascript: t = window.open('$link_contact', 'contact', 'width=700,height=600,toolbar=0,resizable=1,scrollbars=1'); t.focus(); return false;" content=$lang.contact}</td>
 </tr>
 </table>

trunk/templates/basic/includes/pages/nodes/nodes_plot_link.tpl

@@ -30 +30 @@
 <tr>
 <td width="25%" align="left">
-        {include file=generic/link.tpl content="`$lang.change`" onclick="javascript: t = window.open('?page=pickup&subpage=nodes&object=form_nodes_plot_link.a_node', 'popup_pickup', 'width=500,height=400,toolbar=0,resizable=1,scrollbars=1'); t.focus(); return false;"}
+        {include file=generic/link.tpl content="`$lang.change`" onclick="javascript: t = window.open('?page=pickup&subpage=nodes&object=form_nodes_plot_link.a_node', 'popup_pickup', 'width=700,height=600,toolbar=0,resizable=1,scrollbars=1'); t.focus(); return false;"}
         <br />
         <input type="hidden" name="a_node" value="{$a_node}" />
@@ -37 +37 @@
 <td width="50%" align="center"><input class="fld-form-submit" type="submit" name="submit" value="{$lang.submit}" /></td>
 <td width="25%" align="right">
-        {include file=generic/link.tpl content="`$lang.change`" onclick="javascript: t = window.open('?page=pickup&subpage=nodes&object=form_nodes_plot_link.b_node', 'popup_pickup', 'width=500,height=400,toolbar=0,resizable=1,scrollbars=1'); t.focus(); return false;"}
+        {include file=generic/link.tpl content="`$lang.change`" onclick="javascript: t = window.open('?page=pickup&subpage=nodes&object=form_nodes_plot_link.b_node', 'popup_pickup', 'width=700,height=600,toolbar=0,resizable=1,scrollbars=1'); t.focus(); return false;"}
         <br />
         <input type="hidden" name="b_node" value="{$b_node}" />