diff --git a/templates/error_ticket.tpl b/templates/error_ticket.tpl index f8847fc70e994192a66bac1060078d7edc8c815d..304e0072aaace9c8e475e23f579d9a580543a7c9 100644 --- a/templates/error_ticket.tpl +++ b/templates/error_ticket.tpl @@ -1,59 +1,127 @@ {* $Id$ *} - - {include file='header.tpl'} - - - {* Index we display a wiki page here *} - {if $prefs.feature_bidi eq 'y'} -
- {/if} - -
-
- - - {if $prefs.feature_left_column eq 'y'} - + + {include file='header.tpl'} + + + +
+ +
+ {if zone_is_empty('left') and zone_is_empty('right')} +
+
+
+ {icon name='error' alt="{tr}Error{/tr}" style="vertical-align:middle"} {$errortitle|default:"{tr}Error{/tr}"} +
+
+

{$msg}

+
+ {foreach key=k item=i from=$post} + + {/foreach} + + + {if $prefs.javascript_enabled eq 'y'} + {button href="javascript:history.back()" _text="{tr}Go back{/tr}"} {/if} -
- {if $prefs.feature_right_column eq 'y'} - + {button href="$prefs.tikiIndex" _text="{tr}Return to home page{/tr}"} + + + + {elseif zone_is_empty('left')} +
+
+
+ {icon name='error' alt="{tr}Error{/tr}" style="vertical-align:middle"} {$errortitle|default:"{tr}Error{/tr}"} +
+
+

{$msg}

+
+ {foreach key=k item=i from=$post} + + {/foreach} + + + {if $prefs.javascript_enabled eq 'y'} + {button href="javascript:history.back()" _text="{tr}Go back{/tr}"} {/if} -
-
- {section name=homeix loop=$left_modules} - {$left_modules[homeix].data} - {/section} -
-
-
-
{icon name='error' alt="{tr}Error{/tr}" style="vertical-align:middle"} {$errortitle|default:"{tr}Error{/tr}"} -
-
-
{$msg} -
- {foreach key=k item=i from=$post} - - {/foreach} - -


- {if $prefs.javascript_enabled eq 'y'}{button href="javascript:history.back()" _text="{tr}Go back{/tr}"}

{/if} - {button href="$prefs.tikiIndex" _text="{tr}Return to home page{/tr}"} -
-
-
-
- {section name=homeix loop=$right_modules} - {$right_modules[homeix].data} - {/section} -
+ {button href="$prefs.tikiIndex" _text="{tr}Return to home page{/tr}"} +
+
+ +
+ {modulelist zone=right} +
+ {elseif zone_is_empty('right')} +
+
+
+ {icon name='error' alt="{tr}Error{/tr}" style="vertical-align:middle"} {$errortitle|default:"{tr}Error{/tr}"} +
+
+

{$msg}

+
+ {foreach key=k item=i from=$post} + + {/foreach} + +
+ {if $prefs.javascript_enabled eq 'y'} + {button href="javascript:history.back()" _text="{tr}Go back{/tr}"} + {/if} + {button href="$prefs.tikiIndex" _text="{tr}Return to home page{/tr}"} +
+
+
+
+ {modulelist zone=left} +
+ {else} +
+
+
+ {icon name='error' alt="{tr}Error{/tr}" style="vertical-align:middle"} {$errortitle|default:"{tr}Error{/tr}"} +
+
+

{$msg}

+
+ {foreach key=k item=i from=$post} + + {/foreach} + +
+ {if $prefs.javascript_enabled eq 'y'} + {button href="javascript:history.back()" _text="{tr}Go back{/tr}"} + {/if} + {button href="$prefs.tikiIndex" _text="{tr}Return to home page{/tr}"} +
+
+
+
+ {modulelist zone=left} +
+
+ {modulelist zone=right}
- - {if $prefs.feature_bidi eq 'y'} -
{/if} - {include file='footer.tpl'} + + + +{include file='footer.tpl'} - + diff --git a/templates/filter.tpl b/templates/filter.tpl index 7a79b57b753a38dd713321b64a95265d75985b6d..09a705167eadb6bb5aef94fc7acb3214f96239e0 100644 --- a/templates/filter.tpl +++ b/templates/filter.tpl @@ -171,7 +171,7 @@ }); var categoryPicker = $('.category-picker', this).dialog({ - height: $(window).height()-200, + maxHeight: $(window).height()-50, width: 'auto', autoOpen: false, modal: true, @@ -214,6 +214,7 @@ var tagPicker = $('.tag-picker', this).dialog({ autoOpen: false, modal: true, + maxHeight: $window.height() - 50, buttons: { "{tr}Add to filter{/tr}": function () { $('.highlight', this).each(function () {