Commit 53d7e55e authored by Jonny Bradley's avatar Jonny Bradley

[MRG] Automatic merge, branches/16.x 60191 to 60200

parents f54c2de8 992c27f6
{* $Id$ *}<!DOCTYPE html> {* $Id$ *}<!DOCTYPE html>
<html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"> <html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}">
<head> <head>
{include file='header.tpl'} {include file='header.tpl'}
</head> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<body{html_body_attributes}> </head>
{* Index we display a wiki page here *} <body{html_body_attributes}>
{if $prefs.feature_bidi eq 'y'} <div class="container">
<table dir="rtl" ><tr><td> <div class="page-header" id="page-header">
{/if} {modulelist zone=top class='row top_modules'}
<div class="topbar row" id="topbar">
<div id="tiki-main"> {modulelist zone=topbar}
<div id="tiki-mid"> </div>
<table border="0" cellpadding="0" cellspacing="0" id="tikimidtbl"> </div>
<tr> <div class="row row-middle" id="row-middle">
{if $prefs.feature_left_column eq 'y'} {if zone_is_empty('left') and zone_is_empty('right')}
<td id="leftcolumn"> <div class="col-md-12 col1" id="col1" style="padding-top: 15px;">
{section name=homeix loop=$left_modules} <div class="panel panel-danger">
{$left_modules[homeix].data} <div class="panel-heading">
{/section} {icon name='error' alt="{tr}Error{/tr}" style="vertical-align:middle"} {$errortitle|default:"{tr}Error{/tr}"}
</td> </div>
<div class="panel-body">
<p>{$msg}</p>
<form action="{$self}{if $query}?{$query|escape}{/if}" method="post" class="margin-bottom-sm">
{foreach key=k item=i from=$post}
<input type="hidden" name="{$k}" value="{$i|escape}">
{/foreach}
<input type="submit" class="btn btn-success" name="ticket_action_button"
value="{tr}Click here to confirm your action{/tr}">
</form>
{if $prefs.javascript_enabled eq 'y'}
{button href="javascript:history.back()" _text="{tr}Go back{/tr}"}
{/if} {/if}
<td id="centercolumn"><div id="tiki-center"> {button href="$prefs.tikiIndex" _text="{tr}Return to home page{/tr}"}
<br> </div>
<div class="panel panel-default"> </div>
<div class="panel-heading">{icon name='error' alt="{tr}Error{/tr}" style="vertical-align:middle"} {$errortitle|default:"{tr}Error{/tr}"} </div>
</div> {elseif zone_is_empty('left')}
<div class="panel-body"> <div class="col-md-9 col1" id="col1" style="padding-top: 15px;">
<br>{$msg} <div class="panel panel-danger">
<form action="{$self}{if $query}?{$query|escape}{/if}" method="post"> <div class="panel-heading">
{foreach key=k item=i from=$post} {icon name='error' alt="{tr}Error{/tr}" style="vertical-align:middle"} {$errortitle|default:"{tr}Error{/tr}"}
<input type="hidden" name="{$k}" value="{$i|escape}"> </div>
{/foreach} <div class="panel-body">
<input type="submit" class="btn btn-default btn-sm" name="ticket_action_button" value="{tr}Click here to confirm your action{/tr}"> <p>{$msg}</p>
</form><br><br> <form action="{$self}{if $query}?{$query|escape}{/if}" method="post" class="margin-bottom-sm">
{if $prefs.javascript_enabled eq 'y'}{button href="javascript:history.back()" _text="{tr}Go back{/tr}"}<br><br>{/if} {foreach key=k item=i from=$post}
{button href="$prefs.tikiIndex" _text="{tr}Return to home page{/tr}"} <input type="hidden" name="{$k}" value="{$i|escape}">
</div> {/foreach}
</div> <input type="submit" class="btn btn-success" name="ticket_action_button"
</div> value="{tr}Click here to confirm your action{/tr}">
</td> </form>
{if $prefs.feature_right_column eq 'y'} {if $prefs.javascript_enabled eq 'y'}
<td id="rightcolumn"> {button href="javascript:history.back()" _text="{tr}Go back{/tr}"}
{section name=homeix loop=$right_modules}
{$right_modules[homeix].data}
{/section}
</td>
{/if} {/if}
</tr> {button href="$prefs.tikiIndex" _text="{tr}Return to home page{/tr}"}
</table> </div>
</div>
</div>
<div class="col-md-3" id="col3">
{modulelist zone=right}
</div>
{elseif zone_is_empty('right')}
<div class="col-md-9 col-md-push-3 col1" id="col1" style="padding-top: 15px;">
<div class="panel panel-danger">
<div class="panel-heading">
{icon name='error' alt="{tr}Error{/tr}" style="vertical-align:middle"} {$errortitle|default:"{tr}Error{/tr}"}
</div>
<div class="panel-body">
<p>{$msg}</p>
<form action="{$self}{if $query}?{$query|escape}{/if}" method="post" class="margin-bottom-sm">
{foreach key=k item=i from=$post}
<input type="hidden" name="{$k}" value="{$i|escape}">
{/foreach}
<input type="submit" class="btn btn-success" name="ticket_action_button"
value="{tr}Click here to confirm your action{/tr}">
</form>
{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}"}
</div>
</div>
</div>
<div class="col-md-3 col-md-pull-9" id="col2">
{modulelist zone=left}
</div>
{else}
<div class="col-md-8 col-md-push-2 col1" id="col1" style="padding-top: 15px;">
<div class="panel panel-danger">
<div class="panel-heading">
{icon name='error' alt="{tr}Error{/tr}" style="vertical-align:middle"} {$errortitle|default:"{tr}Error{/tr}"}
</div>
<div class="panel-body">
<p>{$msg}</p>
<form action="{$self}{if $query}?{$query|escape}{/if}" method="post" class="margin-bottom-sm">
{foreach key=k item=i from=$post}
<input type="hidden" name="{$k}" value="{$i|escape}">
{/foreach}
<input type="submit" class="btn btn-success" name="ticket_action_button"
value="{tr}Click here to confirm your action{/tr}">
</form>
{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}"}
</div>
</div>
</div>
<div class="col-md-2 col-md-pull-8" id="col2">
{modulelist zone=left}
</div>
<div class="col-md-2" id="col3">
{modulelist zone=right}
</div> </div>
</div>
{if $prefs.feature_bidi eq 'y'}
</td></tr></table>
{/if} {/if}
{include file='footer.tpl'} </div>
<footer class="footer" id="footer">
<div class="footer_liner">
{modulelist zone=bottom class='row row-sidemargins-zero'}
</div>
</footer>
</div>
{include file='footer.tpl'}
</body> </body>
</html> </html>
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
}); });
var categoryPicker = $('.category-picker', this).dialog({ var categoryPicker = $('.category-picker', this).dialog({
height: $(window).height()-200, maxHeight: $(window).height()-50,
width: 'auto', width: 'auto',
autoOpen: false, autoOpen: false,
modal: true, modal: true,
...@@ -214,6 +214,7 @@ ...@@ -214,6 +214,7 @@
var tagPicker = $('.tag-picker', this).dialog({ var tagPicker = $('.tag-picker', this).dialog({
autoOpen: false, autoOpen: false,
modal: true, modal: true,
maxHeight: $window.height() - 50,
buttons: { buttons: {
"{tr}Add to filter{/tr}": function () { "{tr}Add to filter{/tr}": function () {
$('.highlight', this).each(function () { $('.highlight', this).each(function () {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment