Commit bba275c3 authored by Jyhem's avatar Jyhem

[REF] Clean templates formatting so they are legible and maintainable again

parent 6b1b1159
......@@ -26,7 +26,7 @@
<!-- left column -->
{if $prefs.feature_left_column ne 'n' || count($modules_l) > 0}
<td>
<table class="table normal">
<table class="table normal">
<tr>
<th>{tr}#{/tr}</th>
<th>{tr}Name{/tr}</th>
......@@ -57,7 +57,7 @@
<!-- right column -->
{if $prefs.feature_right_column ne 'n' || count($modules_r) > 0}
<td >
<table class="table normal">
<table class="table normal">
<tr>
<th>{tr}#{/tr}</th>
<th>{tr}Name{/tr}</th>
......@@ -89,7 +89,7 @@
</table>
{if $canassign eq 'y'}
<br>
<br>
<form action="tiki-user_assigned_modules.php" method="post">
<h2>{tr}Assign module{/tr}</h2>
<table class="formcolor">
......
......@@ -83,7 +83,7 @@
<tr>
<td>&nbsp;</td>
<td>
<input type="submit" class="btn btn-primary btn-sm" name="addfolder" value="{tr}Add{/tr}"></td>
<input type="submit" class="btn btn-primary btn-sm" name="addfolder" value="{tr}Add{/tr}"></td>
</tr>
</form>
</table>
......@@ -98,9 +98,9 @@
<form action="tiki-user_bookmarks.php" method="post">
<input type="hidden" name="editurl" value="{$editurl|escape}">
<input type="hidden" name="parentId" value="{$parentId|escape}">
<tr>
<tr>
<td>{tr}Name:{/tr}</td>
<td><input type="text" size = "40" name="urlname" value="{$urlname|escape}"></td>
<td><input type="text" size = "40" name="urlname" value="{$urlname|escape}"></td>
</tr>
<tr>
<td>{tr}URL:{/tr}</td>
......
......@@ -7,7 +7,7 @@
{tabset name="contact_prefs"}
{tab name="{tr}Options{/tr}"}
<h2>{tr}Options{/tr}</h2>
<h2>{tr}Options{/tr}</h2>
<div class="panel panel-default">
<div class="panel-body">
<form method='post' action='tiki-user_contacts_prefs.php'>
......@@ -33,48 +33,48 @@
{/tab}
{tab name="{tr}Manage Fields{/tr}"}
<h2>{tr}Manage Fields{/tr}</h2>
<h2>{tr}Manage Fields{/tr}</h2>
<div class="panel panel-default">
<div class="panel-body">
<form method='post' action='tiki-user_contacts_prefs.php'>
<div class="table-responsive">
<table class="table normal">
<tr>
<th colspan="2">{tr}Order{/tr}</th>
<th>{tr}Field{/tr}</th>
<th>{tr}Action{/tr}</th>
</tr>
{foreach from=$exts item=ext key=k name=e}
<div class="table-responsive">
<table class="table normal">
<tr>
<td width="2%">
{if not $smarty.foreach.e.first}
<a href="?ext_up={$ext.fieldId}" title="{tr}Up{/tr}">{icon _id='resultset_up'}</a>
{/if}
</td>
<td width="2%">
{if not $smarty.foreach.e.last}
<a href="?ext_down={$ext.fieldId}" title="{tr}Down{/tr}">{icon _id='resultset_down'}</a>
{/if}
</td>
<td>{tr}{$ext.fieldname|escape}{/tr}</td>
<td class="action">
{if $ext.flagsPublic eq 'y'}
<a href="?ext_private={$ext.fieldId}" style="margin-left:20px;" title="{tr}Private{/tr}">{icon _id='user' alt="{tr}Private{/tr}"}</a>
{else}
<a href="?ext_public={$ext.fieldId}" style="margin-left:20px;" title="{tr}Public{/tr}">{icon _id='group' alt="{tr}Public{/tr}"}</a>
{/if}
{if $ext.show eq 'y'}
<a href="?ext_hide={$ext.fieldId}" style="margin-left:20px;" title="{tr}Hide{/tr}">{icon _id='no_eye' alt="{tr}Hide{/tr}"}</a>
{else}
<a href="?ext_show={$ext.fieldId}" style="margin-left:20px;" title="{tr}Show{/tr}">{icon _id='eye' alt="{tr}Show{/tr}"}</a>
{/if}
<a href="?ext_remove={$ext.fieldId}" style="margin-left:20px;" title="{tr}Delete{/tr}">{icon _id='cross' alt="{tr}Delete{/tr}"}</a>
</td>
<th colspan="2">{tr}Order{/tr}</th>
<th>{tr}Field{/tr}</th>
<th>{tr}Action{/tr}</th>
</tr>
{/foreach}
</table>
</div>
{foreach from=$exts item=ext key=k name=e}
<tr>
<td width="2%">
{if not $smarty.foreach.e.first}
<a href="?ext_up={$ext.fieldId}" title="{tr}Up{/tr}">{icon _id='resultset_up'}</a>
{/if}
</td>
<td width="2%">
{if not $smarty.foreach.e.last}
<a href="?ext_down={$ext.fieldId}" title="{tr}Down{/tr}">{icon _id='resultset_down'}</a>
{/if}
</td>
<td>{tr}{$ext.fieldname|escape}{/tr}</td>
<td class="action">
{if $ext.flagsPublic eq 'y'}
<a href="?ext_private={$ext.fieldId}" style="margin-left:20px;" title="{tr}Private{/tr}">{icon _id='user' alt="{tr}Private{/tr}"}</a>
{else}
<a href="?ext_public={$ext.fieldId}" style="margin-left:20px;" title="{tr}Public{/tr}">{icon _id='group' alt="{tr}Public{/tr}"}</a>
{/if}
{if $ext.show eq 'y'}
<a href="?ext_hide={$ext.fieldId}" style="margin-left:20px;" title="{tr}Hide{/tr}">{icon _id='no_eye' alt="{tr}Hide{/tr}"}</a>
{else}
<a href="?ext_show={$ext.fieldId}" style="margin-left:20px;" title="{tr}Show{/tr}">{icon _id='eye' alt="{tr}Show{/tr}"}</a>
{/if}
<a href="?ext_remove={$ext.fieldId}" style="margin-left:20px;" title="{tr}Delete{/tr}">{icon _id='cross' alt="{tr}Delete{/tr}"}</a>
</td>
</tr>
{/foreach}
</table>
</div>
<div>{tr}Add:{/tr} <input type='text' name='ext_add' /> <input type='submit' name='add_fields' value="{tr}Add{/tr}"></div>
</form>
</div>
......
......@@ -5,124 +5,125 @@
{strip}
{if !isset($drilldownmenu) or $drilldownmenu neq 'y'}
{assign var="menuId" value="cssmenu{$idCssmenu}"}
{assign var="menuClass" value="cssmenu{if $menu_type}_{$menu_type}{/if} menu{$menu_info.menuId}"}
{else}
{assign var="menuId" value="drilldownmenu{$idCssmenu}"}
{assign var="menuClass" value="drilldownmenu{if $menu_type}_{$menu_type}{/if} menu{$menu_info.menuId}"}
{/if}
<ul id="{$menuId}" class="{$menuClass}">
{if !isset($drilldownmenu) or $drilldownmenu neq 'y'}
{assign var="menuId" value="cssmenu{$idCssmenu}"}
{assign var="menuClass" value="cssmenu{if $menu_type}_{$menu_type}{/if} menu{$menu_info.menuId}"}
{else}
{assign var="menuId" value="drilldownmenu{$idCssmenu}"}
{assign var="menuClass" value="drilldownmenu{if $menu_type}_{$menu_type}{/if} menu{$menu_info.menuId}"}
{/if}
{foreach key=pos item=chdata from=$menu_channels}
<ul id="{$menuId}" class="{$menuClass}">
{* ----------------------------- section *}
{if $chdata.type ne 'o' and $chdata.type ne '-'}
{foreach key=pos item=chdata from=$menu_channels}
{if $opensec > 0}
{if $chdata.type eq 's' or $chdata.type eq 'r'}
{assign var=sectionType value=0}
{else}
{assign var=sectionType value=$chdata.type}
{/if}
{if $opensec > $sectionType}
{assign var=nb_opensec value=$opensec-$sectionType}
{repeat count=$nb_opensec}</ul></li>{/repeat}
{assign var=opensec value=$sectionType}
{/if}
{/if}
{* ----------------------------- section *}
{if $chdata.type ne 'o' and $chdata.type ne '-'}
<li class="option{$chdata.optionId} menuSection menuSection{$opensec} menuLevel{$opensec}{if isset($chdata.selected) and $chdata.selected} selected{/if}{if isset($chdata.selectedAscendant) and $chdata.selectedAscendant} selectedAscendant{/if}">
{if empty($chdata.block)}
<a{if !empty($chdata.url)} href="{if $prefs.feature_sefurl eq 'y' and $chdata.sefurl}
{if $prefs.menus_item_names_raw eq 'n'}
{$chdata.sefurl|escape}
{else}
{$chdata.sefurl}
{/if}
{if $opensec > 0}
{if $chdata.type eq 's' or $chdata.type eq 'r'}
{assign var=sectionType value=0}
{else}
{if $prefs.menus_item_names_raw eq 'n'}
{$chdata.url|escape}
{else}
{$chdata.url}
{/if}
{/if}"
{/if}>
{if $menu_type eq 'vert' and $prefs.menus_items_icons eq 'y' and $menu_info.use_items_icons eq 'y' and $opensec eq 0}
{icon _id=$chdata.icon alt='' _defaultdir=$prefs.menus_items_icons_path}
{elseif isset($icon) and $icon}
{icon _id='folder' align="left"}
{assign var=sectionType value=$chdata.type}
{/if}
{if $opensec > $sectionType}
{assign var=nb_opensec value=$opensec-$sectionType}
{repeat count=$nb_opensec}</ul></li>{/repeat}
{assign var=opensec value=$sectionType}
{/if}
{/if}
<span class="menuText">
<li class="option{$chdata.optionId} menuSection menuSection{$opensec} menuLevel{$opensec}{if isset($chdata.selected) and $chdata.selected} selected{/if}{if isset($chdata.selectedAscendant) and $chdata.selectedAscendant} selectedAscendant{/if}">
{if empty($chdata.block)}
<a{if !empty($chdata.url)} href="{if $prefs.feature_sefurl eq 'y' and $chdata.sefurl}
{if $prefs.menus_item_names_raw eq 'n'}
{$chdata.sefurl|escape}
{else}
{$chdata.sefurl}
{/if}
{else}
{if $prefs.menus_item_names_raw eq 'n'}
{$chdata.url|escape}
{else}
{$chdata.url}
{/if}
{/if}"
{/if}>
{if $menu_type eq 'vert' and $prefs.menus_items_icons eq 'y' and $menu_info.use_items_icons eq 'y' and $opensec eq 0}
{icon _id=$chdata.icon alt='' _defaultdir=$prefs.menus_items_icons_path}
{elseif isset($icon) and $icon}
{icon _id='folder' align="left"}
{/if}
<span class="menuText">
{if $translate eq 'n'}
{if $escape_menu_labels}{$chdata.name|escape}{else}{$chdata.name}{/if}
{else}
{tr}{if $escape_menu_labels}{$chdata.name|escape}{else}{$chdata.name}{/if}{/tr}
{/if}
</span>
{if $link_on_section ne 'n'}</a>{/if}
{else}
{if $translate eq 'n'}
{if $escape_menu_labels}{$chdata.name|escape}{else}{$chdata.name}{/if}
{else}
{tr}{if $escape_menu_labels}{$chdata.name|escape}{else}{$chdata.name}{/if}{/tr}
{/if}
</span>
{if $link_on_section ne 'n'}</a>{/if}
{else}
{if $translate eq 'n'}
{if $escape_menu_labels}{$chdata.name|escape}{else}{$chdata.name}{/if}
{else}
{tr}{if $escape_menu_labels}{$chdata.name|escape}{else}{$chdata.name}{/if}{/tr}
{/if}
{/if}
{assign var=opensec value=$opensec+1}
<ul>
{/if}
{assign var=opensec value=$opensec+1}
<ul>
{* ----------------------------- option *}
{elseif $chdata.type eq 'o'}
<li class="option{$chdata.optionId} menuOption menuLevel{$opensec}{if isset($chdata.selected) and $chdata.selected} selected{/if}{if isset($chdata.selectedAscendant) and $chdata.selectedAscendant} selectedAscendant{/if}">
{if empty($chdata.block)}
<a href="{if $prefs.feature_sefurl eq 'y' and $chdata.sefurl}
{if $prefs.menus_item_names_raw eq 'n'}
{$chdata.sefurl|escape}
{else}
{$chdata.sefurl}
{/if}
{* ----------------------------- option *}
{elseif $chdata.type eq 'o'}
<li class="option{$chdata.optionId} menuOption menuLevel{$opensec}{if isset($chdata.selected) and $chdata.selected} selected{/if}{if isset($chdata.selectedAscendant) and $chdata.selectedAscendant} selectedAscendant{/if}">
{if empty($chdata.block)}
<a href="{if $prefs.feature_sefurl eq 'y' and $chdata.sefurl}
{if $prefs.menus_item_names_raw eq 'n'}
{$chdata.sefurl|escape}
{else}
{$chdata.sefurl}
{/if}
{else}
{if $prefs.menus_item_names_raw eq 'n'}
{$chdata.url|escape}
{else}
{$chdata.url}
{/if}
{/if}"
>
{if $menu_type eq 'vert' and $prefs.menus_items_icons eq 'y' and $menu_info.use_items_icons eq 'y' and $opensec eq 0}
{icon _id=$chdata.icon alt='' _defaultdir=$prefs.menus_items_icons_path}
{/if}
<span class="menuText">
{if $translate eq 'n'}
{if $escape_menu_labels}{$chdata.name|escape}{else}{$chdata.name}{/if}
{else}
{tr}{if $escape_menu_labels}{$chdata.name|escape}{else}{$chdata.name}{/if}{/tr}
{/if}
</span>
</a>
{else}
{if $prefs.menus_item_names_raw eq 'n'}
{$chdata.url|escape}
{else}
{$chdata.url}
{/if}
{/if}">
{if $menu_type eq 'vert' and $prefs.menus_items_icons eq 'y' and $menu_info.use_items_icons eq 'y' and $opensec eq 0}
{icon _id=$chdata.icon alt='' _defaultdir=$prefs.menus_items_icons_path}
{/if}
<span class="menuText">
{if $translate eq 'n'}
{if $escape_menu_labels}{$chdata.name|escape}{else}{$chdata.name}{/if}
{else}
{tr}{if $escape_menu_labels}{$chdata.name|escape}{else}{$chdata.name}{/if}{/tr}
{/if}
</span>
</a>
{else}
{if $translate eq 'n'}
{if $escape_menu_labels}{$chdata.name|escape}{else}{$chdata.name}{/if}
{else}
{tr}{if $escape_menu_labels}{$chdata.name|escape}{else}{$chdata.name}{/if}{/tr}
{/if}
{/if}
</li>
{if $sep eq 'line'}{assign var=sep value=''}{/if}
{/if}
</li>
{if $sep eq 'line'}{assign var=sep value=''}{/if}
{* ----------------------------- separator *}
{elseif $chdata.type eq '-'}
{if $opensec > 0}</ul></li>{assign var=opensec value=$opensec-1}{/if}
{assign var=sep value="line"}
{/if}
{* ----------------------------- separator *}
{elseif $chdata.type eq '-'}
{if $opensec > 0}</ul></li>{assign var=opensec value=$opensec-1}{/if}
{assign var=sep value="line"}
{/if}
{/foreach}
{/foreach}
{if $opensec > 0}
{repeat count=$opensec}</ul></li>{/repeat}
{assign var=opensec value=0}
{/if}
{if $opensec > 0}
{repeat count=$opensec}</ul></li>{/repeat}
{assign var=opensec value=0}
{/if}
</ul>
</ul>
{/strip}
{/if}
This diff is collapsed.
......@@ -2,105 +2,104 @@
{title}{tr}My Mail-in{/tr}{/title}
{include file='tiki-mytiki_bar.tpl'}
<script type="text/javascript">
function structSelChanged(itemNr)
{
var elem = document.getElementById('changed_'+itemNr);
if (elem != null) {
elem.value='y';
<script type="text/javascript">
function structSelChanged(itemNr)
{
var elem = document.getElementById('changed_'+itemNr);
if (elem != null) {
elem.value='y';
}
}
}
function confirm_delete()
{
if (confirm('{tr}Are you sure you want to delete the routing rule?{/tr}')) {
return true;
} else {
return false;
function confirm_delete()
{
if (confirm('{tr}Are you sure you want to delete the routing rule?{/tr}')) {
return true;
} else {
return false;
}
}
}
</script>
{if $tikifeedback}
<br>
{section name=n loop=$tikifeedback}<div class="alert alert-info {if $tikifeedback[n].num > 0} alert-warning{/if}">{$tikifeedback[n].mes}</div>{/section}
<br>
<br>
{section name=n loop=$tikifeedback}<div class="alert alert-info {if $tikifeedback[n].num > 0} alert-warning{/if}">{$tikifeedback[n].mes}</div>{/section}
<br>
{/if}
<p>
Configure how your mailed-in wiki pages are to be linked / organized.
</p>
<p>{tr}Configure how your mailed-in wiki pages are to be linked / organized.{/tr}</p>
{tabset name="user_mailin"}
{tab name="{tr}Structure Routing{/tr}"}
<h2>{tr}Structure Routing{/tr}</h2>
<p>
{tr}Structure routing will link mailed-in pages as a child to the specified structure node. Only email matching the filters are linked.{/tr}<br/>
{tr}Only newly created pages, using the mail-in wiki-put function, are affected.{/tr}
</p>
{if $prefs.feature_wiki_structure eq 'y'}
<form action="#" method="POST">
<table id="table_user_mailin">
<tr>
<th>Subject pattern</th>
<th>Body pattern</th>
<th>Structure</th>
<th>Parent page name</th>
<th>Active</th>
</tr>
{foreach from=$userStructs item=ustruct name=mstruct}
<tr>
<td><input type="text" name="mailinSubjPatt{$smarty.foreach.mstruct.iteration}" size="25" value="{$ustruct.subj_pattern}" onchange="structSelChanged({$smarty.foreach.mstruct.iteration});"/></td>
<td><input type="text" name="mailinBodyPatt{$smarty.foreach.mstruct.iteration}" size="25" value="{$ustruct.body_pattern}" onchange="structSelChanged({$smarty.foreach.mstruct.iteration});"/></td>
<td>
<select name="mailinStruct{$smarty.foreach.mstruct.iteration}" onchange="structSelChanged({$smarty.foreach.mstruct.iteration});">
{foreach from=$structs item=struct}
<option value="{$struct.structure_id}" {if $struct.structure_id eq $ustruct.structure_id}selected='selected'"{/if}">{$struct.pageName}</option>
{/foreach}
</select>
</td>
<td><input type="text" name="mailinPar{$smarty.foreach.mstruct.iteration}" value="{$ustruct.pageName}" onchange="structSelChanged({$smarty.foreach.mstruct.iteration});" /></td>
<td>
<input type="checkbox" name="mailinAct{$smarty.foreach.mstruct.iteration}" {if $ustruct.is_active eq 'y'}checked="checked"{/if} onchange="structSelChanged({$smarty.foreach.mstruct.iteration});" />
&nbsp;
<a href="?delete=y&mailin_struct_id={$ustruct.mailin_struct_id}" onclick="return confirm_delete();"><img src="img/icons/delete.gif" /></a>
{tab name="{tr}Structure Routing{/tr}"}
<h2>{tr}Structure Routing{/tr}</h2>
<p>
{tr}Structure routing will link mailed-in pages as a child to the specified structure node. Only email matching the filters are linked.{/tr}<br/>
{tr}Only newly created pages, using the mail-in wiki-put function, are affected.{/tr}
</p>
{if $prefs.feature_wiki_structure eq 'y'}
<form action="#" method="POST">
<table id="table_user_mailin">
<tr>
<th>Subject pattern</th>
<th>Body pattern</th>
<th>Structure</th>
<th>Parent page name</th>
<th>Active</th>
</tr>
{foreach from=$userStructs item=ustruct name=mstruct}
<tr>
<td><input type="text" name="mailinSubjPatt{$smarty.foreach.mstruct.iteration}" size="25" value="{$ustruct.subj_pattern}" onchange="structSelChanged({$smarty.foreach.mstruct.iteration});"/></td>
<td><input type="text" name="mailinBodyPatt{$smarty.foreach.mstruct.iteration}" size="25" value="{$ustruct.body_pattern}" onchange="structSelChanged({$smarty.foreach.mstruct.iteration});"/></td>
<td>
<select name="mailinStruct{$smarty.foreach.mstruct.iteration}" onchange="structSelChanged({$smarty.foreach.mstruct.iteration});">
{foreach from=$structs item=struct}
<option value="{$struct.structure_id}" {if $struct.structure_id eq $ustruct.structure_id}selected='selected'"{/if}">{$struct.pageName}</option>
{/foreach}
</select>
</td>
<td><input type="text" name="mailinPar{$smarty.foreach.mstruct.iteration}" value="{$ustruct.pageName}" onchange="structSelChanged({$smarty.foreach.mstruct.iteration});" /></td>
<td>
<input type="checkbox" name="mailinAct{$smarty.foreach.mstruct.iteration}" {if $ustruct.is_active eq 'y'}checked="checked"{/if} onchange="structSelChanged({$smarty.foreach.mstruct.iteration});" />
&nbsp;
<a href="?delete=y&mailin_struct_id={$ustruct.mailin_struct_id}" onclick="return confirm_delete();"><img src="img/icons/delete.gif" /></a>
{* Hidden field to track changes *}
<input type="hidden" id="changed_{$smarty.foreach.mstruct.iteration}" name="changed_{$smarty.foreach.mstruct.iteration}" />
{* Hidden field to remember mailin_struct_id *}
<input type="hidden" name="mailin_struct_id_{$smarty.foreach.mstruct.iteration}" value="{$ustruct.mailin_struct_id}" />
</td>
</tr>
{/foreach}
{if isset($addNewRoute)}
<tr>
<td><input type="text" name="mailinSubjPattNew" size="25" /></td>
<td><input type="text" name="mailinBodyPattNew" size="25" /></td>
<td>
<select name="mailinNewStruct">
<option value="0" selected></option>
{foreach from=$structs item=struct2}
<option value="{$struct2.structure_id}">{$struct2.pageName}</option>
{/foreach}
</select>
</td>
<td><input type="text" name="mailinParNew" /></td>
<td><input type="checkbox" name="mailinActNew" /></td>
</tr>
{/if}
</table>
<input type="submit" class="btn btn-default btn-sm" value="Save" />
</form>
{else}
<p>
{tr}Wiki structures feature is not enabled{/tr}
{if $tiki_p_admin eq 'y'}
<blockquote>
<a href="tiki-admin.php?page=wiki&highlight=feature_wiki_structure&cookietab=2">{tr}Go to wiki structure setting{/tr} {icon _id='wrench'}</a>
</blockquote>
{* Hidden field to track changes *}
<input type="hidden" id="changed_{$smarty.foreach.mstruct.iteration}" name="changed_{$smarty.foreach.mstruct.iteration}" />
{* Hidden field to remember mailin_struct_id *}
<input type="hidden" name="mailin_struct_id_{$smarty.foreach.mstruct.iteration}" value="{$ustruct.mailin_struct_id}" />
</td>
</tr>
{/foreach}
{if isset($addNewRoute)}
<tr>
<td><input type="text" name="mailinSubjPattNew" size="25" /></td>
<td><input type="text" name="mailinBodyPattNew" size="25" /></td>
<td>
<select name="mailinNewStruct">
<option value="0" selected></option>
{foreach from=$structs item=struct2}
<option value="{$struct2.structure_id}">{$struct2.pageName}</option>
{/foreach}
</select>
</td>
<td><input type="text" name="mailinParNew" /></td>
<td><input type="checkbox" name="mailinActNew" /></td>
</tr>
{/if}
</table>
<input type="submit" class="btn btn-default btn-sm" value="Save" />
</form>
{else}
<p>
{tr}Wiki structures feature is not enabled{/tr}
{if $tiki_p_admin eq 'y'}
<blockquote>
<a href="tiki-admin.php?page=wiki&highlight=feature_wiki_structure&cookietab=2">{tr}Go to wiki structure setting{/tr} {icon _id='wrench'}</a>
</blockquote>
{/if}
</p>
{/if}
</p>
{/if}
{/tab}
{/tab}
{/tabset}
{$testing}
......@@ -6,7 +6,7 @@
{foreach key=pos item=chdata from=$menu_channels}
{assign var=cname value=$menu_info.menuId|cat:'__'|cat:$chdata.position}
{* ----------------------------- section *}
{if $chdata.type ne 'o' and $chdata.type ne '-'}
{if $chdata.type ne 'o' and $chdata.type ne '-'}
{if $opensec > 0}
{assign var=sectionType value=$chdata.type}
......@@ -16,7 +16,7 @@
{if $opensec > $sectionType}
{assign var=m value=$opensec-$sectionType}
{section loop=$menu_channels name=close max=$m}
</div>
</div>
{/section}
{assign var=opensec value=$sectionType}
{/if}
......
This diff is collapsed.
......@@ -21,9 +21,9 @@
{/if}
</div>
{* start ************ Search ***************}
{* start ************ Search ***************}
{if (not $show_form)}
{include file='find.tpl'}
{include file='find.tpl'}
{/if}
{if $cant eq 1}
<span class="taskcount">{$cant}&nbsp;{tr}Task{/tr}</span>
......@@ -31,81 +31,82 @@
<span class="taskcount">{$cant}&nbsp;{tr}Tasks{/tr}</span>
{/if}
<div class="wiki-edithelp" id='edithelpzone' >
<table width="100%">
{if $tiki_p_tasks_receive eq 'y'}
<tr>
<td>
{icon _id='task_received' title="{tr}Task received{/tr}" alt="{tr}Task received{/tr}"}
</td>
<td>
{tr}You received this task{/tr}.
</td>
</tr>
{/if}
{if $tiki_p_tasks_send eq 'y'}
<tr>
<td>
{icon _id='task_submitted' title="{tr}Task sent{/tr}" alt="{tr}Task sent{/tr}"}
</td>
<td>
{tr}You sent this task to another user{/tr}.
</td>
</tr>
{/if}
{if $tiki_p_tasks_receive eq 'y' or $tiki_p_tasks_send eq 'y'}
<tr>
<td>
{icon _id='group' title="{tr}Task shared by a group{/tr}" alt="{tr}Task shared by a group{/tr}"}
</td>
<td>
{tr}Task is shared by a group{/tr}.
</td>
</tr>
{/if}
<tr>
<td>
{icon _id='accept' title="{tr}Accepted by task user and creator{/tr}" alt="{tr}Accepted by task user and creator{/tr}"}
</td>
<td>
{tr}Task has been accepted by user and creator{/tr}.
</td>
</tr>
<tr>
<td>
{icon _id='delete' title="{tr}Rejected by a user{/tr}" alt="{tr}Rejected by a user{/tr}"}
</td>
<td>
{tr}Task has been rejected by a user{/tr}.
</td>
</tr>
{if $tiki_p_tasks_receive eq 'y'}
<tr>
<td>
{icon _id='hourglass' title="{tr}Waiting for me{/tr}" alt="{tr}Waiting for me{/tr}"}
</td>
<td>
{tr}Task has not yet been accepted or rejected by you{/tr}.
</td>
</tr>
{/if}
{if $tiki_p_tasks_receive eq 'y' or $tiki_p_tasks_send eq 'y'}
<tr>
<td>
{icon _id='user_comment' title="{tr}Waiting for other user{/tr}" alt="{tr}Waiting for other user{/tr}"}
</td>
<td>
{tr}Task has not yet been accepted or rejected by another user{/tr}.
</td>
</tr>
{/if}
</table>
<div class="wiki-edithelp" id='edithelpzone' >
<table width="100%">
{if $tiki_p_tasks_receive eq 'y'}
<tr>
<td>
{icon _id='task_received' title="{tr}Task received{/tr}" alt="{tr}Task received{/tr}"}
</td>
<td>
{tr}You received this task{/tr}.
</td>
</tr>
{/if}
{if $tiki_p_tasks_send eq 'y'}
<tr>
<td>
{icon _id='task_submitted' title="{tr}Task sent{/tr}" alt="{tr}Task sent{/tr}"}
</td>
<td>
{tr}You sent this task to another user{/tr}.
</td>
</tr>
{/if}
{if $tiki_p_tasks_receive eq