Commit eed9a8dc authored by chealer's avatar chealer

popup Smarty function: Fix handling of arguments such as "text" and remove plethora of workarounds

parent 1d8c6673
......@@ -106,9 +106,8 @@ function smarty_function_popup($params, $smarty)
$options['data-content'] = str_replace('<\/', '</', $options['data-content']);
$retval = '';
foreach ($options as $k => $v) {
$retval .= $k . '=' . json_encode($v, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE) . ' ';
$retval .= $k . '="' . (new Zend\Escaper\Escaper())->escapeHtmlAttr($v). '" ';
}
//handle delay param here since slashes added by the above break the code
......
......@@ -97,7 +97,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.att_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.att_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -156,7 +156,7 @@
{if !isset($gal_info.show_action) or $gal_info.show_action neq 'n'}
{if ( $prefs.use_context_menu_icon eq 'y' or $prefs.use_context_menu_text eq 'y' )
and $prefs.javascript_enabled eq 'y'}
<a class="fgalname tips" title="{tr}Actions{/tr}" href="#" {popup fullhtml="1" text=$smarty.capture.over_actions|escape:"javascript"|escape:"html"}>
<a class="fgalname tips" title="{tr}Actions{/tr}" href="#" {popup fullhtml="1" text=$smarty.capture.over_actions}>
{icon name='wrench' alt="{tr}Actions{/tr}"}
</a>
{else}
......@@ -197,7 +197,7 @@
{/if}
{/if}
{if $over_infos neq ''}
{popup fullhtml="1" text=$over_infos|escape:"javascript"|escape:"html"}
{popup fullhtml="1" text=$over_infos}
{else}
title="{if $files[changes].name neq ''}{$files[changes].name|escape}{/if}{if $files[changes].description neq ''} - {$files[changes].description|escape}{/if}"
{/if}>
......
......@@ -81,7 +81,7 @@
class="tips pull-right"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.comment_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.comment_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -131,7 +131,7 @@
{assign var=nbCols value=$nbCols+1}
<th style="width:1%">
{if !empty($other_columns)}
<a href='#' {popup fullhtml="1" text=$smarty.capture.over_other_columns|escape:"javascript"|escape:"html"} title="{tr}Other Sorts{/tr}">
<a href='#' {popup fullhtml="1" text=$smarty.capture.over_other_columns} title="{tr}Other Sorts{/tr}">
{/if}
{icon name='ranking' alt="{tr}Other Sorts{/tr}" title=''}
{if !empty($other_columns)}
......@@ -264,7 +264,7 @@
{if ( $prefs.use_context_menu_icon eq 'y' or $prefs.use_context_menu_text eq 'y' )
and (!isset($gal_info.show_action) or $gal_info.show_action neq 'n') and $prefs.javascript_enabled eq 'y'}
<td style="white-space: nowrap">
<a class="fgalname tips" title="{tr}Actions{/tr}" href="#" onclick="return false;" {popup fullhtml="1" center=true text=$smarty.capture.over_actions|escape:"javascript"|escape:"html"} style="padding:0; margin:0; border:0">
<a class="fgalname tips" title="{tr}Actions{/tr}" href="#" onclick="return false;" {popup fullhtml="1" center=true text=$smarty.capture.over_actions} style="padding:0; margin:0; border:0">
{icon name='wrench' alt="{tr}Actions{/tr}"}
</a>
</td>
......@@ -332,7 +332,7 @@
and $files[changes].p_download_files eq 'y')
or (!isset($files[changes].p_download_files)
and $files[changes].perms.tiki_p_download_files eq 'y')))}
{literal} {/literal}{popup fullhtml="1" text=$smarty.capture.over_preview|escape:"javascript"|escape:"html"}
{literal} {/literal}{popup fullhtml="1" text=$smarty.capture.over_preview}
{/if}
{/if}
{/strip}
......@@ -407,7 +407,7 @@
{assign var=share_nb value=$files[changes].share.nb}
{capture assign=share_capture}
{strip}
<a class='fgalname tips' title="{tr}Share{/tr}" href='#' onclick="return false;" {popup fullhtml=1 text=$over_share|escape:'javascript'|escape:'html' left=true} style='cursor:help'>
<a class='fgalname tips' title="{tr}Share{/tr}" href='#' onclick="return false;" {popup fullhtml=1 text=$over_share left=true} style='cursor:help'>
{icon name='group' alt=''}
</a> ({$share_nb}) {$share_string}
{/strip}
......@@ -465,7 +465,7 @@
{if $over_infos eq ''}
{icon name='minus' class='tips' title=":{tr}No information{/tr}"}
{else}
<a class="fgalname tips left" href="#" onclick="return false;" title="{tr}Information{/tr}" {popup fullhtml="1" text=$over_infos|escape:"javascript"|escape:"html" left=true} style="cursor:help">
<a class="fgalname tips left" href="#" onclick="return false;" title="{tr}Information{/tr}" {popup fullhtml="1" text=$over_infos left=true} style="cursor:help">
{icon name='information' class='' title=''}
</a>
{/if}
......
......@@ -140,7 +140,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.rule_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.rule_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -56,7 +56,7 @@
{if empty($calendar_popup) or $calendar_popup eq "y"}
<a href="{$myurl}?todate={$date}&amp;viewmode={$viewmodelink}" title="{tr}View{/tr}"
{if (isset($sticky_popup) and $sticky_popup eq 'y') or ($prefs.calendar_sticky_popup eq "y" and $cell[w][d].items[0].calitemId)}
{popup sticky=true fullhtml="1" text=$over|escape:"javascript"|escape:"html"}{else}{popup fullhtml="1" text=$over|escape:"javascript"|escape:"html"}
{popup sticky=true fullhtml="1" text=$over}{else}{popup fullhtml="1" text=$over}
{/if}
>
{if isset($day_cursor)}
......
......@@ -23,7 +23,7 @@
{/if}
{if !empty($p.popup_html)}
<a class="tips" title="{tr}Actions{/tr}" href="#" style="padding:0; margin:0; border:0" {popup fullhtml=1 center="true" text=$p.popup_html|escape:"javascript"|escape:"html"}>
<a class="tips" title="{tr}Actions{/tr}" href="#" style="padding:0; margin:0; border:0" {popup fullhtml=1 center="true" text=$p.popup_html}>
{icon name="actions"}
</a>
{/if}
......
......@@ -89,7 +89,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup center=true text=$smarty.capture.sent_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup center=true text=$smarty.capture.sent_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -333,7 +333,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.log_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.log_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -245,7 +245,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.banning_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.banning_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -135,7 +135,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.admin_calendar_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.admin_calendar_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -93,7 +93,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.template_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.template_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -139,7 +139,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.contribution_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.contribution_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -84,7 +84,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.coookies_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.coookies_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -75,7 +75,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.dsn_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.dsn_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -78,7 +78,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.externalwiki_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.externalwiki_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -128,7 +128,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.admin_forum_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.admin_forum_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -131,7 +131,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.html_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.html_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -82,7 +82,7 @@
<a
class="tips"
title="{tr}Actions{/tr}" href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.rule_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.rule_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -138,7 +138,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.integrator_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.integrator_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -199,7 +199,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.integrator_rules_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.integrator_rules_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -84,7 +84,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.keywords_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.keywords_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -51,7 +51,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.links_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.links_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -73,7 +73,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.mailin_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.mailin_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -148,7 +148,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.menu_options_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.menu_options_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -82,7 +82,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.menu_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.menu_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -117,7 +117,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.module_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.module_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......@@ -224,7 +224,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.custom_module_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.custom_module_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -79,7 +79,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.newsletters_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.newsletters_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -83,7 +83,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.poll_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.poll_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -175,7 +175,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.admin_poll_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.admin_poll_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -99,7 +99,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.rss_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.rss_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -96,7 +96,7 @@
<a
class="tips"
title="{tr}Actions{/tr}" href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.scheduler_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.scheduler_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -176,7 +176,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.admin_structure_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.admin_structure_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -71,7 +71,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.question_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.question_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -84,7 +84,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.survey_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.survey_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -102,7 +102,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.topic_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.topic_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -150,7 +150,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.transition_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.transition_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -119,7 +119,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.group_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.group_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......@@ -561,7 +561,7 @@
<a
class="tips"
title="{tr}Actions{/tr}" href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.members_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.members_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='settings'}
......
......@@ -282,7 +282,7 @@
<a
class="tips"
title="{tr}Actions{/tr}" href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.user_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.user_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -132,7 +132,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.assign_user_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.assign_user_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -161,11 +161,11 @@
<div class="thumbnail text-center">
{if $prefs.feature_shadowbox eq 'y'}
<a href="show_image.php?id={$item.imageId}&amp;scalesize={$defaultscale}" data-box="lightbox[gallery];type=img" title="{if $item.description neq ''}{$item.description}{elseif $item.name neq ''}{$item.name}{else}{$item.filename}{/if}" {if $prefs.gal_image_mouseover neq 'n'}{popup fullhtml="1" text=$over_info.$key|escape:"javascript"|escape:"html"}{/if} class="linkmenu tips">
<a href="show_image.php?id={$item.imageId}&amp;scalesize={$defaultscale}" data-box="lightbox[gallery];type=img" title="{if $item.description neq ''}{$item.description}{elseif $item.name neq ''}{$item.name}{else}{$item.filename}{/if}" {if $prefs.gal_image_mouseover neq 'n'}{popup fullhtml="1" text=$over_info.$key}{/if} class="linkmenu tips">
<img class="athumb" src="show_image.php?id={$item.imageId}&amp;thumb=1">
</a>
{else}
<a href="tiki-browse_image.php?galleryId={$galleryId}&amp;sort_mode={$sort_mode}&amp;imageId={$item.imageId}&amp;scalesize={$defaultscale}" {if $prefs.gal_image_mouseover neq 'n'}{popup fullhtml="1" text=$over_info.$key|escape:"javascript"|escape:"html"}{/if} class="linkmenu tips">
<a href="tiki-browse_image.php?galleryId={$galleryId}&amp;sort_mode={$sort_mode}&amp;imageId={$item.imageId}&amp;scalesize={$defaultscale}" {if $prefs.gal_image_mouseover neq 'n'}{popup fullhtml="1" text=$over_info.$key}{/if} class="linkmenu tips">
<img class="athumb" src="show_image.php?id={$item.imageId}&amp;thumb=1">
</a>
{/if}
......@@ -198,7 +198,7 @@
{$libeg}<a {jspopup href="tiki-browse_image.php?galleryId=$galleryId&amp;sort_mode=$sort_mode&amp;imageId="|cat:$item.imageId|cat:"&amp;scalesize=$defaultscale&amp;popup=1"} class="gallink">
{icon name='view' _menu_text='y' _menu_icon='y' alt="{tr}Popup{/tr}"}
</a>{$liend}
{$libeg}<a class="gallink tips" href="tiki-browse_image.php?galleryId={$galleryId}&amp;sort_mode={$sort_mode}&amp;imageId={$item.imageId}&amp;scalesize={$defaultscale}" {if $prefs.gal_image_mouseover neq 'n'}{popup fullhtml="1" text=$over_info.$key|escape:"javascript"|escape:"html"}{/if}>
{$libeg}<a class="gallink tips" href="tiki-browse_image.php?galleryId={$galleryId}&amp;sort_mode={$sort_mode}&amp;imageId={$item.imageId}&amp;scalesize={$defaultscale}" {if $prefs.gal_image_mouseover neq 'n'}{popup fullhtml="1" text=$over_info.$key}{/if}>
{icon name='list' _menu_text='y' _menu_icon='y' alt="{tr}Details{/tr}"}
</a>{$liend}
{if $tiki_p_admin_galleries eq 'y' or ($user and $user eq $owner)}
......@@ -226,7 +226,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.image_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.image_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -61,9 +61,9 @@
{if is_array($cell[w][d].items[item])}
<td class="Cal{$cell[w][d].items[item].type} calId{$cell[w][d].items[item].calendarId} viewcalitemId_{$cell[w][d].items[item].calitemId} tips" style="padding:0;height:14px;background-color:#{$infocals.$calendarId.custombgcolor};border-color:#{$infocals.$calendarId.customfgcolor};opacity:{if $cell[w][d].items[item].status eq '0'}0.8{else}1{/if};filter:Alpha(opacity={if $cell[w][d].items[item].status eq '0'}80{else}100{/if});text-align:left;border-width:1px {if $cell[w][d].items[item].endTimeStamp <= ($cell[w][d].day + 86400)}1{else}0{/if}px 1px {if $cell[w][d].items[item].startTimeStamp >= $cell[w][d].day}1{else}0{/if}px;cursor:pointer"
{if $prefs.calendar_sticky_popup eq 'y'}
{popup caption="{tr}Event{/tr}" vauto=true hauto=true sticky=true fullhtml="1" trigger="onClick" text=$over|escape:"javascript"|escape:"html"}
{popup caption="{tr}Event{/tr}" vauto=true hauto=true sticky=true fullhtml="1" trigger="onClick" text=$over}
{else}
{popup caption="{tr}Event{/tr}" vauto=true hauto=true sticky=false fullhtml="1" text=$over|escape:"javascript"|escape:"html"}
{popup caption="{tr}Event{/tr}" vauto=true hauto=true sticky=false fullhtml="1" text=$over}
{/if}>
{if $myurl eq "tiki-action_calendar.php" or ($cell[w][d].items[item].startTimeStamp >= $cell[w][d].day or $smarty.section.d.index eq '0' or $cell[w][d].firstDay or $infocals[$cell[w][d].items[item].calendarId].nameoneachday eq 'y')}
......
......@@ -23,9 +23,9 @@
{if $event.calitemId neq ''}
<div id="event_{$event.calitemId}" title="{tr}Details{/tr}" {if $hrows[$h][hr].calname ne ""}class="tips Cal{$event.type} vevent"{/if} style="position:absolute;z-index:100;top:{$event.top}px;left:{$event.left}%;width:{$event.width}%;height:{$event.duree}px;background-color:#{$infocals.$calendarId.custombgcolor};border-color:#{$infocals.$calendarId.customfgcolor};opacity:{if $event.status eq '0'}0.8{else}1{/if};filter:alpha(opacity={if $event.status eq '0'}80{else}100{/if});text-align:center;overflow:hidden;cursor:pointer"
{if $prefs.calendar_sticky_popup eq "y"}
{popup vauto=true hauto=true sticky=true trigger="onClick" fullhtml="1" text=$over|escape:"javascript"|escape:"html"}
{popup vauto=true hauto=true sticky=true trigger="onClick" fullhtml="1" text=$over}
{else}
{popup vauto=true hauto=true sticky=false fullhtml="1" text=$over|escape:"javascript"|escape:"html"}
{popup vauto=true hauto=true sticky=false fullhtml="1" text=$over}
{/if}>
<span style="padding-top:4px;padding-right:4px;float:right">
<a style="padding:0 3px;"
......
......@@ -58,7 +58,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.calendar_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.calendar_actions}{/if}
style="padding-left:0; margin:0; border:0; float:right;"
>
{icon name='wrench'}
......
......@@ -204,7 +204,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.contact_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.contact_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -160,7 +160,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.directory_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.directory_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -147,7 +147,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.site_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.site_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -64,7 +64,7 @@ var CHECKBOX_LIST = [{{section name=user loop=$items}'sites[{$items[user].siteId
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.validate_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.validate_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -49,7 +49,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.discount_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.discount_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -70,7 +70,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.perspective_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.perspective_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -121,7 +121,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.program_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.program_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -78,7 +78,7 @@
class="tips"
title="{tr}Actions{/tr}"
href="#"
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.question_option_actions|escape:"javascript"|escape:"html"}{/if}
{if $js === 'y'}{popup fullhtml="1" center=true text=$smarty.capture.question_option_actions}{/if}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
......
......@@ -67,7 +67,7 @@
{/capture}
<a class="tips"
title="{tr}Actions{/tr}"
href="#" {popup fullhtml="1" center=true text=$smarty.capture.edit_quiz_actions|escape:"javascript"|escape:"html"}
href="#" {popup fullhtml="1" center=true text=$smarty.capture.edit_quiz_actions}
style="padding:0; margin:0; border:0"
>