Commit 0cbc4138 authored by Jyhem's avatar Jyhem

Small indentation fixes. Tiki standardises on tab indenting

parent 233ca687
......@@ -17,9 +17,9 @@
{tabset name="admin_features"}
{*
* The following section is typically for features that act like Tiki
* sections and add a configuration icon to the sections list
*}
* The following section is typically for features that act like Tiki
* sections and add a configuration icon to the sections list
*}
{* ---------- Main features ------------ *}
{tab name="{tr}Global features{/tr}" key=global}
<br>
......
......@@ -358,7 +358,7 @@
{/tabset}
<br>{* I cheated. *}
<div class="row">
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
<input type="submit" class="btn btn-primary btn-sm tips" title="{tr}Apply changes{/tr}" value="{tr}Apply{/tr}">
......
......@@ -10,7 +10,7 @@
<div class="t_navbar margin-bottom-md clearfix">
{button _icon_name='admin_wiki' _text="{tr}Pages{/tr}" _type="link" _class='btn btn-link' _script='tiki-listpages.php' _title="{tr}List wiki pages{/tr}"}
{if $prefs.feature_wiki_structure eq "y" and $tiki_p_view eq "y"}
{button _icon_name='structure' _text="{tr}Structures{/tr}" _type="link" _class='btn btn-link' _script='tiki-admin_structures.php' _title="{tr}List structures{/tr}"}
{button _icon_name='structure' _text="{tr}Structures{/tr}" _type="link" _class='btn btn-link' _script='tiki-admin_structures.php' _title="{tr}List structures{/tr}"}
{/if}
<div class="pull-right">
<input type="submit" class="btn btn-primary btn-sm tips" title=":{tr}Apply changes{/tr}" value="{tr}Apply{/tr}">
......
......@@ -110,7 +110,7 @@
{/jq}
{else}
{jq}
antibotVerification($("#antibotcode"), {
antibotVerification($("#antibotcode"), {
required: true,
remote: {
url: "validate-ajax.php",
......
......@@ -53,7 +53,7 @@
//Create your sharelet with desired properties and set button element to false
var object{/literal}{$postId}{literal} = SHARETHIS.addEntry({}, {button:false});
//Output your customized button
document.write('<a id="share{/literal}{$postId}{literal}" href="#">{/literal}{icon name="sharethis"} {tr}ShareThis{/tr}{literal}</a>');
document.write('<a id="share{/literal}{$postId}{literal}" href="#">{/literal}{icon name="sharethis"} {tr}ShareThis{/tr}{literal}</a>');
//Tie customized button to ShareThis button functionality.
var element{/literal}{$postId}{literal} = document.getElementById("share{/literal}{$postId}{literal}");
object{/literal}{$postId}{literal}.attachButton(element{/literal}{$postId}{literal});
......
......@@ -26,7 +26,7 @@
<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}">
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}"}
......@@ -48,7 +48,7 @@
<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}">
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}"}
......@@ -73,7 +73,7 @@
<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}">
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}"}
......@@ -98,7 +98,7 @@
<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}">
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}"}
......
......@@ -37,7 +37,7 @@
{/foreach}
{/foreach}
</ul>
{/foreach}
{/foreach}
{/remarksbox}
{else}
{remarksbox type='note' title="{tr}No permissions were changed{/tr}"}{/remarksbox}
......
......@@ -34,7 +34,7 @@
checked="checked"
{/if}
{if isset($edit_mode) and $edit_mode eq 'y' and $prefs.$pref_name neq 'y'}
disabled="disabled"
disabled="disabled"
{/if}
>
{$item.name}
......
......@@ -7,13 +7,21 @@
{block name="content"}
{if $uploadInModal}
<form class="file-uploader" enctype="multipart/form-data" method="post" action="{service controller=file action=upload galleryId=$galleryId image_max_size_x=$image_max_size_x image_max_size_y=$image_max_size_y}" data-gallery-id="{$galleryId|escape}" data-image_max_size_x="{$image_max_size_x|escape}" data-image_max_size_y="{$image_max_size_y|escape}">
<form class="file-uploader" enctype="multipart/form-data" method="post" action="{service controller=file action=upload galleryId=$galleryId image_max_size_x=$image_max_size_x image_max_size_y=$image_max_size_y}" data-gallery-id="{$galleryId|escape}" data-image_max_size_x="{$image_max_size_x|escape}" data-image_max_size_y="{$image_max_size_y|escape}">
<div class="progress hidden">
<div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%;">
<span class="sr-only"><span class="count">0</span>% Complete</span>
</div>
</div>
{if $image_max_size_x || $image_max_size_y }{remarksbox type="note" title="{tr}Note{/tr}"}{tr}Images will be resized to {if $image_max_size_x} {$image_max_size_x}px in width{/if}{if $image_max_size_y} and {$image_max_size_y}px in height{/if} {/tr}{/remarksbox}{else}{remarksbox type="note" title="{tr}Note{/tr}"}{tr}Images will not be resized, for resizing edit this tracker field and set image max width and height in "Options for files" section.{/tr}{/remarksbox}{/if}
{if $image_max_size_x || $image_max_size_y }
{remarksbox type="note" title="{tr}Note{/tr}"}
{tr}Images will be resized to {if $image_max_size_x} {$image_max_size_x}px in width{/if}{if $image_max_size_y} and {$image_max_size_y}px in height{/if} {/tr}
{/remarksbox}
{else}
{remarksbox type="note" title="{tr}Note{/tr}"}
{tr}Images will not be resized, for resizing edit this tracker field and set image max width and height in "Options for files" section.{/tr}
{/remarksbox}
{/if}
<input type="file" name="file[]" {if $limit !== 1}multiple{/if} {if $typeFilter}accept="{$typeFilter|escape}"{/if} />
<p class="drop-message text-center">
......@@ -31,13 +39,21 @@
{else}
<div class="file-uploader inline" data-action="{service controller=file action=upload galleryId=$galleryId image_max_size_x=$image_max_size_x image_max_size_y=$image_max_size_y}" data-gallery-id="{$galleryId|escape}" data-image_max_size_x="{$image_max_size_x|escape}" data-image_max_size_y="{$image_max_size_y|escape}">
<div class="file-uploader inline" data-action="{service controller=file action=upload galleryId=$galleryId image_max_size_x=$image_max_size_x image_max_size_y=$image_max_size_y}" data-gallery-id="{$galleryId|escape}" data-image_max_size_x="{$image_max_size_x|escape}" data-image_max_size_y="{$image_max_size_y|escape}">
<div class="progress hidden">
<div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%;">
<span class="sr-only"><span class="count">0</span>% Complete</span>
</div>
</div>
{if $image_max_size_x || $image_max_size_y }{remarksbox type="note" title="{tr}Note{/tr}"}{tr}Images will be resized to {if $image_max_size_x} {$image_max_size_x}px in width{/if}{if $image_max_size_y} and {$image_max_size_y}px in height{/if} {/tr}{/remarksbox}{else}{remarksbox type="note" title="{tr}Note{/tr}"}{tr}Images will not be resized, for resizing edit this tracker field and set image max width and height in "Options for files" section.{/tr}{/remarksbox}{/if}
{if $image_max_size_x || $image_max_size_y }
{remarksbox type="note" title="{tr}Note{/tr}"}
{tr}Images will be resized to {if $image_max_size_x} {$image_max_size_x}px in width{/if}{if $image_max_size_y} and {$image_max_size_y}px in height{/if} {/tr}
{/remarksbox}
{else}
{remarksbox type="note" title="{tr}Note{/tr}"}
{tr}Images will not be resized, for resizing edit this tracker field and set image max width and height in "Options for files" section.{/tr}
{/remarksbox}
{/if}
<input type="file" name="file[]" {if $limit !== 1}multiple{/if} {if $typeFilter}accept="{$typeFilter|escape}"{/if} />
<p class="drop-message text-center">
......
......@@ -12,7 +12,7 @@
{/if}
{if (empty($db_languages))}
{remarksbox type="note" title="{tr}Information{/tr}" close="n"}
{tr}No translations in the database available to export{/tr}
{tr}No translations in the database available to export{/tr}
{/remarksbox}
{else}
{if $tiki_p_admin eq 'y' and $langIsWritable}
......@@ -44,4 +44,4 @@
</div>
{/if}
</form>
{/block}
\ No newline at end of file
{/block}
{* $Id$ *}
{* this tpl is included in the various layout tpl's to show the *}
{* this tpl is included in the various layout tpl's to show the *}
{* clickable fullscreen icon if the full screen feature has been set *}
{if $prefs.feature_fullscreen eq 'y' and $filegals_manager eq '' and $print_page ne 'y'}
......
......@@ -12,7 +12,7 @@
&& $fgal_options.show_explorer.value eq 'y' && $tiki_p_view_fgal_explorer eq 'y'}
{if $prefs.javascript_enabled eq 'y'}
<div id="fgalexplorer_close" style="float:left; vertical-align:middle; display:{if ! isset($smarty.session.tiki_cookie_jar.show_fgalexplorer) or $smarty.session.tiki_cookie_jar.show_fgalexplorer eq 'y'}none{else}inline{/if};">
<a href="#"
<a href="#"
class="tips"
title=":{tr}Show Tree{/tr}"
onclick="flip('fgalexplorer','');hide('fgalexplorer_close',false);show('fgalexplorer_open',false);return false;">
......
{literal}
<div class="form-group">
<div class="input-group">
{input _filter="content" _field="title,contents" type="text" placeholder="Search... " class="form-control clearfield"}
{input _filter="content" _field="title,contents" type="text" placeholder="Search... " class="form-control clearfield"}
<span class="input-group-btn">
{input type=reset value="Clear" class="btn btn-default clearbox"}
{input type=submit value="Search" class="btn btn-search"}
{input type=submit value="Search" class="btn btn-search"}
</span>
</div>
</div>
{/literal}
{jq}
$(document).on('click', ".clearbox", function(e) {
$("#customsearch_announcementsearch .clearfield").val("").trigger("change");
$("#customsearch_announcementsearch .clearfield").val("").trigger("change");
});
{/jq}
\ No newline at end of file
{/jq}
......@@ -52,7 +52,7 @@
</div>
</form>
{jq}
$('#eventType').change(function(event) {
$('#eventType').change(function(event) {
var eventType = $('#eventType').val();
var result = $.ajax({
type: 'GET',
......
......@@ -54,8 +54,11 @@
{if isset($cell[w][d].items[0]) and ((isset($cell[w][d].items[0].modifiable)
and $cell[w][d].items[0].modifiable eq "y") || $cell[w][d].items[0].visible eq 'y')}
{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"}{/if}>
<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"}
{/if}
>
{if isset($day_cursor)}
{$day_cursor}
{/if}
......@@ -86,7 +89,7 @@
<p>
<a href="tiki-calendar_edit_item.php" style="display: block; margin: auto auto; width: 98px;">
{icon name="add"}
{tr}Add Event{/tr}
{tr}Add Event{/tr}
</a>
</p>
{/if}
......
......@@ -4,10 +4,10 @@
{tikimodule error=$module_params.error title=$tpl_module_title name="freetags_current" flip=$module_params.flip decorations=$module_params.decorations nobox=$module_params.nobox notitle=$module_params.notitle}
{if $modFreetagsCurrent.cant gt 0}
{section name=ix loop=$modFreetagsCurrent.data}
<div class="module">
{capture name=tagurl}{if (strstr($modFreetagsCurrent.data[ix].tag, ' '))}"{$modFreetagsCurrent.data[ix].tag}"{else}{$modFreetagsCurrent.data[ix].tag}{/if}{/capture}
<a class="linkmodule" href="tiki-browse_freetags.php?tag={$smarty.capture.tagurl|escape:'url'}">{$modFreetagsCurrent.data[ix].tag|escape}</a>
</div>
<div class="module">
{capture name=tagurl}{if (strstr($modFreetagsCurrent.data[ix].tag, ' '))}"{$modFreetagsCurrent.data[ix].tag}"{else}{$modFreetagsCurrent.data[ix].tag}{/if}{/capture}
<a class="linkmodule" href="tiki-browse_freetags.php?tag={$smarty.capture.tagurl|escape:'url'}">{$modFreetagsCurrent.data[ix].tag|escape}</a>
</div>
{/section}
{/if}
{if isset($addFreetags)}
......
......@@ -5,7 +5,7 @@
{if ($type ne 'cloud')}<li class="freetag">{/if}
{capture name=tagurl}{if (strstr($tag.tag, ' '))}"{$tag.tag}"{else}{$tag.tag}{/if}{/capture}
<a class="freetag_{$tag.size}" title="{tr}List everything tagged{/tr} {$tag.tag|escape}" href="tiki-browse_freetags.php?tag={$smarty.capture.tagurl|escape:'url'}{if !empty($module_params.where)}&amp;type={$module_params.where|escape:'url'}{/if}{if !empty($module_params.objectId)}&amp;objectId={$module_params.objectId|escape:'url'}{/if}">{$tag.tag|escape}</a>
&nbsp;
&nbsp;
{if ($type ne 'cloud')}</li>{/if}
{/foreach}
{if ($type ne 'cloud')}</ul>{/if}
......
......@@ -36,7 +36,7 @@
{tr}The path to a podcast player is required.{/tr}
{/if}
</div>
</li>
</li>
{/section}
{if $nonums != 'y'}</ol>{else}</ul>{/if}
......
......@@ -2,13 +2,17 @@
{if isset($modUnread)}
{tikimodule error=$module_params.error|default:null title=$tpl_module_title name="messages_unread_messages" flip=$module_params.flip|default:null decorations=$module_params.decorations|default:null nobox=$module_params.nobox notitle=$module_params.notitle|default:null}
{if $modUnread > 0}
<a class="linkmodule" href="messu-mailbox.php">{icon name='information' istyle="float:left"}
<span class="highlight">{tr}You have{/tr} {$modUnread} {if $modUnread !== '1'}{tr}new messages{/tr}{else}{tr}new message{/tr}{/if}.</span>
{else}
<a class="linkmodule" href="messu-mailbox.php">
{tr}You have 0 new messages{/tr}
{/if}
</a>
{if $modUnread > 0}
<a class="linkmodule" href="messu-mailbox.php">
{icon name='information' istyle="float:left"}
<span class="highlight">
{tr}You have{/tr} {$modUnread} {if $modUnread !== '1'}{tr}new messages{/tr}{else}{tr}new message{/tr}{/if}.
</span>
</a>
{else}
<a class="linkmodule" href="messu-mailbox.php">
{tr}You have 0 new messages{/tr}
</a>
{/if}
{/tikimodule}
{/if}
......@@ -102,7 +102,7 @@
</a>
</li>
<li>
<a href="tiki-plugins.php">
<a href="tiki-plugins.php">
{icon name="plugin"} {tr}Plugin approval{/tr}
</a>
</li>
......
This diff is collapsed.
......@@ -5,10 +5,10 @@
<div class="cvsup">{tr}Last update from SVN{/tr} ({$tiki_version}): {$lastup|tiki_long_datetime}
{/if}
{if !empty($svnrev)}
- REV {$svnrev}
- REV {$svnrev}
{/if}
{if !empty($lastup) or !empty($svnrev)}
</div>
</div>
{/if}
{/tikimodule}
{/strip}
{if $show_in_popup}
<a role="button" class="btn btn-default btn-multilike" data-target="#ml{$type}{$object}" data-placement="{$popup_placement}">Like</a>
<div class="screen hide">{* screen/hide the multilike inline, so that it only shows in the popup *}
<a role="button" class="btn btn-default btn-multilike" data-target="#ml{$type}{$object}" data-placement="{$popup_placement}">Like</a>
<div class="screen hide">{* screen/hide the multilike inline, so that it only shows in the popup *}
{/if}
<div id="ml{$type}{$object}" class="multilike">
{if $show_likes}
......@@ -30,15 +30,16 @@
<div class="title">{$choice_label}</div>
{foreach $buttons as $button}
<a class="{if $multilike_many eq 'y'}multilike_many{else}multilike_group{/if}"
data-relation="{$button.relation}"
data-relation_prefix="{$relation_prefix}"
data-target_type="{$type}"
data-user="{$user}"
data-target_id="{$object}"
{if $uses_values}
title="Worth {$button.value} Points"
{/if}
href="#"}>
data-relation="{$button.relation}"
data-relation_prefix="{$relation_prefix}"
data-target_type="{$type}"
data-user="{$user}"
data-target_id="{$object}"
{if $uses_values}
title="Worth {$button.value} Points"
{/if}
href="#"}
>
{if $button.selected eq '0'}
<i class="fa fa-thumbs-o-up"></i>
{else}
......@@ -54,15 +55,15 @@
</div>
</div>
{if $show_in_popup}
</div>
{jq}
$('a.btn-multilike').click(function(){
$(this).popover({
content: $($(this).data('target')),
placement: $(this).data('placement'),
html: true
</div>
{jq}
$('a.btn-multilike').click(function(){
$(this).popover({
content: $($(this).data('target')),
placement: $(this).data('placement'),
html: true
});
$(this).popover("toggle");
});
$(this).popover("toggle");
});
{/jq}
{/if}
\ No newline at end of file
{/jq}
{/if}
......@@ -2,14 +2,14 @@
<a class="tips {if $permission_link.active}tips bg-warning{/if}{if !empty($permission_link.addclass)} {$permission_link.addclass}{/if}" href="{$permission_link.url|escape}"{if $permission_link.active} title=":{tr}Individual permissions{/tr}"{/if}>
{icon name="permission"} {$permission_link.label|escape}
{if $permission_link.count}
<span class="badge">{$permission_link.count|escape}</span>
<span class="badge">{$permission_link.count|escape}</span>
{/if}
</a>
{elseif $permission_link.mode eq 'button'}
<a class="{if $permission_link.active and $permission_link.type ne 'file gallery'}btn btn-warning{else}btn btn-default{/if}{if !empty($permission_link.addclass)} {$permission_link.addclass}{/if}" href="{$permission_link.url|escape}">
{$permission_link.label|escape}
{if $permission_link.count}
<span class="badge">{$permission_link.count|escape}</span>
<span class="badge">{$permission_link.count|escape}</span>
{/if}
</a>
{elseif $permission_link.mode eq 'button_link'}
......@@ -17,14 +17,14 @@
{icon name="permission"}
{$permission_link.label|escape}
{if $permission_link.count}
<span class="badge">{$permission_link.count|escape}</span>
<span class="badge">{$permission_link.count|escape}</span>
{/if}
</a>
{elseif $permission_link.mode eq 'link'}
<a class="link{if !empty($permission_link.addclass)} {$permission_link.addclass}{/if}" href="{$permission_link.url|escape}">
{$permission_link.label|escape}
{if $permission_link.count}
<span class="badge">{$permission_link.count|escape}</span>
<span class="badge">{$permission_link.count|escape}</span>
{/if}
</a>
{elseif $permission_link.mode eq 'icon'}
......@@ -33,7 +33,7 @@
{icon name="permission"}
<span class="sr-only">{$permission_link.label|escape}</span>
{if $permission_link.count}
<span class="badge">{$permission_link.count|escape}</span>
<span class="badge">{$permission_link.count|escape}</span>
{/if}
</a>
{/strip}
......@@ -42,7 +42,7 @@
{icon name="permission"}
<span class="sr-only">{$permission_link.label|escape}</span>
{if $permission_link.count}
<span class="badge">{$permission_link.count|escape}</span>
<span class="badge">{$permission_link.count|escape}</span>
{/if}
</a>
{/if}
......@@ -50,7 +50,7 @@ $("#picker_{{$name|escape}}").parent().click(function () {
{if empty($param.separator)}
{object_selector type=$param.selector_type _simplevalue=$val _simplename=$name|escape _simpleid=$inputId _parent=$param.parent _parentkey=$param.parentkey}
{else}
{object_selector_multi type=$param.selector_type _simplevalue=$val _simplename=$name|escape _simpleid=$inputId _separator=$param.separator _parent=$param.parent _parentkey=$param.parentkey _sort=$param.sort_order}
{object_selector_multi type=$param.selector_type _simplevalue=$val _simplename=$name|escape _simpleid=$inputId _separator=$param.separator _parent=$param.parent _parentkey=$param.parentkey _sort=$param.sort_order}
{/if}
{else}
<input value="{$val}" class="form-control{$groupClass}" id="{$inputId}" type="text" name="params[{$name|escape}]"{$dataAttribute}>
......@@ -112,29 +112,29 @@ $("#picker_{{$name|escape}}").parent().click(function () {
</div>
{if $type eq 'module'}
{jq}$("#param_module_input").change(function () {
$(this).parents(".modal-content").load(
$.service("plugin", "edit", {
area_id: "{{$area_id}}",
type: "{{$type}}",
index: {{$index}},
page: "{{$pageName}}",
pluginArgs: {{$pluginArgsJSON}},
bodyContent: "{{$bodyContent}}",
edit_icon: "{{$edit_icon}}",
selectedMod: $(this).val(),
modal: 1
}),
function () {
$(this).tikiModal();
if (jqueryTiki.chosen) {
$(this).applyChosen();
{jq}
$("#param_module_input").change(function () {
$(this).parents(".modal-content").load(
$.service("plugin", "edit", {
area_id: "{{$area_id}}",
type: "{{$type}}",
index: {{$index}},
page: "{{$pageName}}",
pluginArgs: {{$pluginArgsJSON}},
bodyContent: "{{$bodyContent}}",
edit_icon: "{{$edit_icon}}",
selectedMod: $(this).val(),
modal: 1
}),
function () {
$(this).tikiModal();
if (jqueryTiki.chosen) {
$(this).applyChosen();
}
}
}
).tikiModal(tr("Loading..."));
});{/jq}
).tikiModal(tr("Loading..."));
});
{/jq}
{/if}
</form>
......
......@@ -168,12 +168,12 @@
</fieldset>
<input type="hidden" name="max" value="{$maxRecords}">
<span class="input_submit_container">
<input type="submit" class="btn btn-default btn-sm" name="list" value="{tr}Report{/tr}"></td>
</span>
<input type="submit" class="btn btn-default btn-sm" name="list" value="{tr}Report{/tr}">
</span>
{if $tiki_p_admin eq 'y'}
<span class="input_submit_container">
<input type="submit" class="btn btn-default btn-sm" name="export" value="{tr}Export{/tr}">
</span>
<input type="submit" class="btn btn-default btn-sm" name="export" value="{tr}Export{/tr}">
</span>
{/if}
{/if}
......@@ -181,25 +181,25 @@
{if isset($actionlogs)}
<h2 id="List">{tr}List{/tr}</h2>
{if $selectedUsers}
&nbsp;&mdash;&nbsp;
{tr}User:{/tr}
{foreach key=ix item=auser from=$users}
{if $selectedUsers[$ix] eq 'y'} {$auser|username}{/if}
{/foreach}
{/if}
{if $selectedUsers}
&nbsp;&mdash;&nbsp;
{tr}User:{/tr}
{foreach key=ix item=auser from=$users}
{if $selectedUsers[$ix] eq 'y'} {$auser|username}{/if}
{/foreach}
{/if}
{if $selectedGroups}
&nbsp;&mdash;&nbsp;
{tr}Group:{/tr}
{foreach key=ix item=group from=$groups}
{if $selectedGroups[$group] eq 'y'} {$group|escape}{/if}
{/foreach}
{/if}
{if $selectedGroups}
&nbsp;&mdash;&nbsp;
{tr}Group:{/tr}
{foreach key=ix item=group from=$groups}
{if $selectedGroups[$group] eq 'y'} {$group|escape}{/if}
{/foreach}
{/if}
{if $reportCategory}
&nbsp;&mdash;&nbsp;{tr}Category:{/tr} {$reportCateg}
{/if}
{if $reportCategory}
&nbsp;&mdash;&nbsp;{tr}Category:{/tr} {$reportCateg}
{/if}
{if $maxRecords gt 0}
{if $cant gt $maxRecords}
{self_link max=-1}{tr}All{/tr}{/self_link}
......@@ -274,8 +274,9 @@
{foreach from=$actionlogs item=actionlog}
<tr>
{if $prefs.feature_banning eq 'y'}
<td class="checkbox-cell"><input type="checkbox" name="checked[]"
value="{$actionlog.actionId}"></td>
<td class="checkbox-cell">
<input type="checkbox" name="checked[]" value="{$actionlog.actionId}">
</td>
{/if}
<td class="username">{if $actionlog.user}{$actionlog.user|username}{else}{tr}Anonymous{/tr}{/if}</td>
<td class="date">{$actionlog.lastModif|tiki_short_datetime}</td>
......@@ -817,13 +818,13 @@
{if $tiki_p_admin eq 'y'}
<td class="checkbox-cell">
<input type="checkbox" name="{$actionlog.code}"
{if $actionlog.status eq 'y' or $actionlog.status eq 'v'}checked="checked"{/if}>
{if $actionlog.status eq 'y' or $actionlog.status eq 'v'}checked="checked"{/if}>
</td>
{/if}
{if $tiki_p_admin eq 'y' or $actionlog.status eq 'y' or $actionlog.status eq 'v'}
<td class="checkbox-cell">
<input type="checkbox" name="v_{$actionlog.code}"
{if $actionlog.status eq 'v'}checked="checked"{/if}>
{if $actionlog.status eq 'v'}checked="checked"{/if}>
</td>
<td class="text text-center">{tr}{$actionlog.action}{/tr}</td>
<td class="text text-center">{tr}{$actionlog.objectType}{/tr}</td>
......@@ -832,8 +833,8 @@
{/foreach}
</tbody>
</table>
{*</div>*}
</div>
{*</div>*}
<div class="form-group">
<div class="col-sm-1 col-sm-offset-11">
<input type="submit" class="btn btn-default btn-sm" name="save" value="{tr}Set{/tr}">
......
......@@ -495,7 +495,7 @@ $("#add_object_type").change(function () {
{/section}
</select>
<span class="input-group-btn">
<input type="submit" class="btn btn-default" name="addtracker" value="{tr}Add{/tr}">
<input type="submit" class="btn btn-default" name="addtracker" value="{tr}Add{/tr}">
</span>
</div>
</div>
......
......@@ -39,7 +39,7 @@
{/if}
<form method='post' id="admin_forums">
<div id="{$ts.tableid}-div" class="{if $js === 'y'}table-responsive{/if} ts-wrapperdiv" {if $ts.enabled}style="visibility:hidden;"{/if}>
<table id="{$ts.tableid}" class="table table-striped table-hover" data-count="{$cant|escape}">
<table id="{$ts.tableid}" class="table table-striped table-hover" data-count="{$cant|escape}">
{$numbercol = 0}
<thead>
<tr>
......@@ -621,4 +621,4 @@
{/if}
{/tab}
{/if}
{/tabset}
\ No newline at end of file
{/tabset}
......@@ -10,12 +10,14 @@
{icon name="edit"} {tr}Edit This Menu{/tr}
</a>
<a class="btn btn-default" href="{bootstrap_modal controller=menu action=export_menu_options menuId=$menuId}"
title="{tr}Export menu options{/tr}">
title="{tr}Export menu options{/tr}"
>
{icon name="export"} {tr}Export{/tr}
</a>
<a class="btn btn-default no-ajax"
href="{bootstrap_modal controller=menu action=import_menu_options menuId=$menuId}"
title="{tr}Import menu options{/tr}">
href="{bootstrap_modal controller=menu action=import_menu_options menuId=$menuId}"
title="{tr}Import menu options{/tr}"
>
{icon name="import"} {tr}Import{/tr}
</a>
{/if}
......@@ -77,35 +79,41 @@
<tr>
<td class="checkbox-cell">
<input type="checkbox" name="checked[]" value="{$channels[user].optionId|escape}"
{if $smarty.request.checked and in_array($channels[user].optionId,$smarty.request.checked)}checked="checked"{/if}>
{if $smarty.request.checked and in_array($channels[user].optionId,$smarty.request.checked)}checked="checked"{/if}>
</td>
<td class="id">{$channels[user].optionId}</td>
<td class="id">{$channels[user].position}</td>
<td class="text">
<a
href="tiki-admin_menu_options.php?menuId={$menuId}&amp;offset={$offset}&amp;sort_mode={$sort_mode}&amp;optionId={$channels[user].optionId}&amp;maxRecords={$maxRecords}{if !empty($nbRecords)}&amp;nbRecords={$nbRecords}{/if}"
class="tips"
title=":{tr}Edit{/tr}">{$channels[user].name|escape}</a>
<span class="help-block">
{if $channels[user].url}
{tr}URL:{/tr}
<a href="{$channels[user].sefurl|escape}"
class="link tips" target="_blank"
title=":{$channels[user].canonic|escape}">{$channels[user].canonic|truncate:40:' ...'|escape}</a>
{/if}
{if $channels[user].section}
<br>
{tr}Sections:{/tr} {$channels[user].section}{/if}
{if $channels[user].perm}