Commit c7a27d43 authored by Jyhem's avatar Jyhem

Indentation fixes. Tiki standardises on tab indenting

parent 2fcc8506
......@@ -55,7 +55,7 @@
{preference name=categories_used_in_tpl}
{preference name=categories_add_class_to_body_tag}
{preference name=categories_cache_refresh_on_object_cat}
<div class="adminoptionboxchild" id="categories_used_in_tpl_childcontainer">
{preference name=feature_areas}
{preference name=areas_root}
......
......@@ -111,13 +111,13 @@
</td>
<td>
<input type="text" class="form-control tips" id="known_hosts_key" name="known_hosts[{$k}][key]" value="{$i.key}"
readonly="readonly" title="|{tr}To change the host key you need to remove and add it as a new one{/tr}">
readonly="readonly" title="|{tr}To change the host key you need to remove and add it as a new one{/tr}">
</td>
<td>
<input type="text" class="form-control" id="known_hosts_ip" name="known_hosts[{$k}][ip]" value="{$i.ip}">
</td>
<td>
<input type="text" class="form-control" id="known_hosts_contact" name="known_hosts[{$k}][contact]" value="{$i.contact}">
<input type="text" class="form-control" id="known_hosts_contact" name="known_hosts[{$k}][contact]" value="{$i.contact}">
</td>
<td>
<input type="checkbox" class="form-control" id="known_hosts_can_register" name="known_hosts[{$k}][allowusersregister]" {if isset($i.allowusersregister) && $i.allowusersregister eq 'y'}checked="checked"{/if} />
......
......@@ -197,20 +197,22 @@
</div>
</fieldset>
{/tab}
{tab name="{tr}Remote Tiki Autologin{/tr}"}
<br>
<fieldset>
{preference name=login_autologin}
{preference name=login_autologin_user}
{preference name=login_autologin_group}
{preference name=login_autologin_createnew}
{preference name=login_autologin_allowedgroups}
{preference name=login_autologin_syncgroups}
{preference name=login_autologin_logoutremote}
{preference name=login_autologin_redirectlogin}
{preference name=login_autologin_redirectlogin_url}
{preference name=login_autologin}
{preference name=login_autologin_user}
{preference name=login_autologin_group}
{preference name=login_autologin_createnew}
{preference name=login_autologin_allowedgroups}
{preference name=login_autologin_syncgroups}
{preference name=login_autologin_logoutremote}
{preference name=login_autologin_redirectlogin}
{preference name=login_autologin_redirectlogin_url}
</fieldset>
{/tab}
{tab name="{tr}LDAP{/tr}"}
<br>
<fieldset>
......@@ -254,6 +256,7 @@
{preference name=auth_ldap_adminpass}
</fieldset>
{/tab}
{tab name="{tr}LDAP external groups{/tr}"}
<br>
<fieldset>
......@@ -304,6 +307,7 @@
{preference name=auth_ldap_group_adminpass}
</fieldset>
{/tab}
{tab name="{tr}PAM{/tr}"}
<br>
<fieldset>
......@@ -318,6 +322,7 @@
{preference name=pam_service}
</fieldset>
{/tab}
{tab name="{tr}Shibboleth{/tr}"}
<br>
<fieldset>
......@@ -422,6 +427,7 @@
</fieldset>
</fieldset>
{/tab}
{tab name="{tr}phpBB{/tr}"}
<br>
<fieldset>
......@@ -450,6 +456,7 @@
{preference name=auth_phpbb_table_prefix}
</fieldset>
{/tab}
{tab name="{tr}Web Server{/tr}"}
<br>
<fieldset>
......@@ -463,15 +470,15 @@
</fieldset>
{/tab}
<input type="submit" class="btn btn-primary btn-sm tips" title=":{tr}Apply changes{/tr}" value="{tr}Apply{/tr}" />
<input type="submit" class="btn btn-primary btn-sm tips" title=":{tr}Apply changes{/tr}" value="{tr}Apply{/tr}" />
</form>
{tab name="{tr}Password Blacklist{/tr}"}
<br>
{tab name="{tr}Password Blacklist{/tr}"}
<br>
<fieldset>
<fieldset>
<legend>{tr}Password{/tr}</legend>
<legend>{tr}Password{/tr}</legend>
{preference name=pass_blacklist_file}
{preference name=pass_blacklist_file}
<legend>{tr}Password Blacklist Tools{/tr}</legend>
......@@ -486,35 +493,35 @@
Tiki's defaut password blacklist files were generated from Missler's top 1 million password file.</p>
<form action="tiki-admin.php?page=login" class="admin form-horizontal" method="post" name="PassForm" enctype="multipart/form-data">
<input type="hidden" name="password_blacklist" />
<input type="hidden" name="password_blacklist" />
<input type="file" name="passwordlist" accept="text/plain" />
Use 'LOAD DATA INFILE': <input type="checkbox" name="loaddata" /> {help desc="Allows much larger files to be uploaded, but requires MySQL on localhost with extra permissions."}<br>
<input type="submit" value="Create or Replace Word Index" name="uploadIndex" class="btn btn-primary btn-sm" />
{help desc="Text files with one word per line accepted.
The word list will be converted to all lowe case. Duplicate entries will be removed.
Typically passwords lists should be arranged with the most commonly used passwords first."}<br>
<input type="submit" value="Delete Temporary Index" name="deleteIndex" class="btn btn-primary btn-sm" />
<input type="submit" value="Delete Temporary Index" name="deleteIndex" class="btn btn-primary btn-sm" />
{help desc="It is recomended that you delete indexed passwords from your database after your done generating your password lists.
They can take up quite a lot of space and serve no pourpose after processing is complete."}
<p>Blaklist Currently Using: {$file_using}</p>
{if $num_indexed}
<h3>Generate and Save a Password Blacklist</h3>
Assuming your word list was arranged in order of most commonly used, the 'Limit' field will provide you with that many of the most commonly used passwords.
The other fields default to the password standards set in tiki. You should not have to change these, unless you plan on changing your password
requirements in the future. Saving places a text file with the generated passwords in your password blacklist folder and enables it as an option for use.
Number of passwords (limit): <input type="number" name="limit" value="{$limit}" />
{help desc="Typical usage ranges between 1,000 & 10,000, although many more could be used. Twitter blacklists 396."}<br>
Minmum Password Length: <input type="number" name="length" value="{$length}" />
{help desc="The minimum password length for your password. This will filter out any password that has an illegal length."}<br>
Require Numbers & Letters: <input type="checkbox" name="charnum" {if $charnum}checked{/if} />
{help desc="If checked, will filter out any password that does not have both upper and lower case letters."}<br>
Require Special Characters: <input type="checkbox" name="special" {if $special}checked{/if} />
{help desc="If checked, will filter out any passwords that do not have special characters."}<br>
<input type="submit" value="Save & Set as Default" name="saveblacklist" class="btn btn-primary btn-sm" />
<input type="submit" value="View Password List" name="viewblacklist" class="btn btn-primary btn-sm" formtarget="_blank" />
{/if}
</form>
<p>Blacklist Currently Using: {$file_using}</p>
{if $num_indexed}
<h3>Generate and Save a Password Blacklist</h3>
Assuming your word list was arranged in order of most commonly used, the 'Limit' field will provide you with that many of the most commonly used passwords.
The other fields default to the password standards set in tiki. You should not have to change these, unless you plan on changing your password
requirements in the future. Saving places a text file with the generated passwords in your password blacklist folder and enables it as an option for use.
Number of passwords (limit): <input type="number" name="limit" value="{$limit}" />
{help desc="Typical usage ranges between 1,000 & 10,000, although many more could be used. Twitter blacklists 396."}<br>
Minmum Password Length: <input type="number" name="length" value="{$length}" />
{help desc="The minimum password length for your password. This will filter out any password that has an illegal length."}<br>
Require Numbers &amp; Letters: <input type="checkbox" name="charnum" {if $charnum}checked{/if} />
{help desc="If checked, will filter out any password that does not have both upper and lower case letters."}<br>
Require Special Characters: <input type="checkbox" name="special" {if $special}checked{/if} />
{help desc="If checked, will filter out any passwords that do not have special characters."}<br>
<input type="submit" value="Save & Set as Default" name="saveblacklist" class="btn btn-primary btn-sm" />
<input type="submit" value="View Password List" name="viewblacklist" class="btn btn-primary btn-sm" formtarget="_blank" />
{/if}
</form>
</div>
</fieldset>
{/tab}
......
......@@ -218,7 +218,7 @@
<div class="adminoptionboxchild" id="feature_tabs_childcontainer">
{preference name=layout_tabs_optional}
</div>
{preference name=site_favicon_enable}
{preference name=site_favicon_enable}
{preference name=image_responsive_class}
<div class="adminoptionbox">
<fieldset class="table">
......
......@@ -2,60 +2,59 @@
<form class="form-horizontal" action="tiki-admin.php?page=print" class="admin" method="post">
{include file='access/include_ticket.tpl'}
<input type="hidden" name="new_prefs" />
<fieldset>
<legend>{tr}PDF Settings{/tr}</legend>
{preference name=print_pdf_from_url}
<div class="adminoptionboxchild print_pdf_from_url_childcontainer webkit">
{preference name=print_pdf_webkit_path}
</div>
<div class="adminoptionboxchild print_pdf_from_url_childcontainer weasyprint">
{preference name=print_pdf_weasyprint_path}
</div>
<div class="adminoptionboxchild print_pdf_from_url_childcontainer webservice">
{preference name=print_pdf_webservice_url}
</div>
<div class="adminoptionboxchild print_pdf_from_url_childcontainer mpdf">
{preference name=print_pdf_mpdf_path}
{preference name=print_pdf_mpdf_printfriendly}
{preference name=print_pdf_mpdf_orientation}
{preference name=print_pdf_mpdf_size}
{preference name=print_pdf_mpdf_header}
{preference name=print_pdf_mpdf_footer}
{preference name=print_pdf_mpdf_margin_left}
{preference name=print_pdf_mpdf_margin_right}
{preference name=print_pdf_mpdf_margin_top}
{preference name=print_pdf_mpdf_margin_bottom}
{preference name=print_pdf_mpdf_margin_header}
{preference name=print_pdf_mpdf_margin_footer}
<input style="display:none">{* This seems to be required for the Chromium browser to prevent autofill the password with some password stored in the user's browser *}
<input type="password" style="display:none" name="print_pdf_mpdf_password_autocomplete_off">{* This seems to be required for the Chromium browser to prevent autofill password with some password stored in the user's browser *}
{preference name=print_pdf_mpdf_password}
</div>
</fieldset>
<fieldset>
<legend>{tr}Wiki Print Version{/tr}</legend>
{preference name=print_wiki_authors}
{preference name=feature_wiki_print}
<div class="adminoptionboxchild" id="feature_wiki_print_childcontainer">
{preference name=feature_wiki_multiprint}
</div>
{preference name=feature_print_indexed}
{preference name=print_original_url_wiki}
</fieldset>
<fieldset>
<legend>{tr}Articles{/tr}</legend>
{preference name=feature_cms_print}
</fieldset>
<fieldset>
<legend>{tr}Miscellaneous Settings{/tr}</legend>
{preference name=print_original_url_tracker}
{preference name=print_original_url_forum}
</fieldset>
<fieldset>
<legend>{tr}PDF Settings{/tr}</legend>
{preference name=print_pdf_from_url}
<div class="adminoptionboxchild print_pdf_from_url_childcontainer webkit">
{preference name=print_pdf_webkit_path}
</div>
<div class="adminoptionboxchild print_pdf_from_url_childcontainer weasyprint">
{preference name=print_pdf_weasyprint_path}
</div>
<div class="adminoptionboxchild print_pdf_from_url_childcontainer webservice">
{preference name=print_pdf_webservice_url}
</div>
<div class="adminoptionboxchild print_pdf_from_url_childcontainer mpdf">
{preference name=print_pdf_mpdf_path}
{preference name=print_pdf_mpdf_printfriendly}
{preference name=print_pdf_mpdf_orientation}
{preference name=print_pdf_mpdf_size}
{preference name=print_pdf_mpdf_header}
{preference name=print_pdf_mpdf_footer}
{preference name=print_pdf_mpdf_margin_left}
{preference name=print_pdf_mpdf_margin_right}
{preference name=print_pdf_mpdf_margin_top}
{preference name=print_pdf_mpdf_margin_bottom}
{preference name=print_pdf_mpdf_margin_header}
{preference name=print_pdf_mpdf_margin_footer}
<input style="display:none">{* This seems to be required for the Chromium browser to prevent autofill the password with some password stored in the user's browser *}
<input type="password" style="display:none" name="print_pdf_mpdf_password_autocomplete_off">{* This seems to be required for the Chromium browser to prevent autofill password with some password stored in the user's browser *}
{preference name=print_pdf_mpdf_password}
</div>
</fieldset>
<fieldset>
<legend>{tr}Wiki Print Version{/tr}</legend>
{preference name=print_wiki_authors}
{preference name=feature_wiki_print}
<div class="adminoptionboxchild" id="feature_wiki_print_childcontainer">
{preference name=feature_wiki_multiprint}
</div>
{preference name=feature_print_indexed}
{preference name=print_original_url_wiki}
</fieldset>
<fieldset>
<legend>{tr}Articles{/tr}</legend>
{preference name=feature_cms_print}
</fieldset>
<fieldset>
<legend>{tr}Miscellaneous Settings{/tr}</legend>
{preference name=print_original_url_tracker}
{preference name=print_original_url_forum}
</fieldset>
<div class="t_navbar margin-bottom-md text-center">
<input type="submit" class="btn btn-primary btn-sm tips" title=":{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
......
......@@ -137,7 +137,7 @@
{/remarksbox}
</div>
</div>
{preference name=search_index_outdated}
{preference name=search_index_outdated}
</fieldset>
<fieldset>
......
......@@ -50,7 +50,6 @@
{preference name=wiki_authors_style label="{tr}List authors{/tr}"}
<div class="adminoptionbox wiki_authors_style_childcontainer classic business collaborative lastmodif">
{preference name=wiki_authors_style_by_page label="{tr}Allow override per page{/tr}"}
</div>
{preference name=feature_wiki_show_hide_before}
{preference name=wiki_actions_bar}
......
......@@ -294,9 +294,9 @@
{/if}
</div> {* thumbinfos *}
{/if}
{if $view neq 'page'}
{$smarty.capture.thumbactions}
{/if}
{if $view neq 'page'}
{$smarty.capture.thumbactions}
{/if}
</div> {* thumbnail *}
{* property table in page file view *}
{if $view eq 'page'}
......@@ -310,10 +310,10 @@
{if isset($metarray) and $metarray|count gt 0}
<br>
<div class="text-left">
{remarksbox type="tip" title="{tr}Metadata{/tr}"}
{include file='metadata/meta_view_tabs.tpl'}
{/remarksbox}
</div>
{remarksbox type="tip" title="{tr}Metadata{/tr}"}
{include file='metadata/meta_view_tabs.tpl'}
{/remarksbox}
</div>
{/if}
{/if}
</div> {* thumbnailcontener *}
......
......@@ -3,8 +3,8 @@
{if $mid eq 'tiki-show_page.tpl' or $mid eq 'tiki-index_p.tpl' or $mid eq 'tiki-show_page_raw.tpl' or $mid eq 'tiki-all_languages.tpl' or $mid eq 'tiki-show_content.tpl'}
<link rel="canonical" href="{$base_url_canonical}{$page|sefurl}{if not empty($canonical_ending)}{$canonical_ending}{/if}">
<meta content="{$base_url_canonical}{$page|sefurl}{if not empty($canonical_ending)}{$canonical_ending}{/if}" property="og:url">
{elseif $mid eq 'extends:layouts/internal/layout_view.tpl|tiki-show_page.tpl'}
<link rel="canonical" href="{$base_url_canonical}{$page|sefurl}{if not empty($canonical_ending)}{$canonical_ending}{/if}">
{elseif $mid eq 'extends:layouts/internal/layout_view.tpl|tiki-show_page.tpl'}
<link rel="canonical" href="{$base_url_canonical}{$page|sefurl}{if not empty($canonical_ending)}{$canonical_ending}{/if}">
<meta content="{$base_url_canonical}{$page|sefurl}{if not empty($canonical_ending)}{$canonical_ending}{/if}" property="og:url">
{elseif $mid eq 'tiki-view_tracker_item.tpl'}
<link rel="canonical" href="{$base_url_canonical}{$itemId|sefurl:trackeritem}">
......@@ -17,7 +17,7 @@
<meta content="{$base_url_canonical}{$comments_parentId|sefurl:forumthread}" property="og:url">
{elseif $mid eq 'tiki-print_forum_thread.tpl'}
<link rel="canonical" href="{$base_url_canonical}{$comments_parentId|sefurl:forumthread}">
<meta content="{$base_url_canonical}{$comments_parentId|sefurl:forumthread}" property="og:url">
<meta content="{$base_url_canonical}{$comments_parentId|sefurl:forumthread}" property="og:url">
{elseif $mid eq 'tiki-view_blog.tpl'}
<link rel="canonical" href="{$base_url_canonical}{$blogId|sefurl:blog}">
<meta content="{$base_url_canonical}{$blogId|sefurl:blog}" property="og:url">
......
......@@ -8,12 +8,12 @@
{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}">
<div class="progress hidden">
<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">
......@@ -37,9 +37,9 @@
<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">
{if $limit !== 1}{tr}Or drop files here from your file manager.{/tr}{else}{tr}Or drop file here from your file manager.{/tr}{/if}
</p>
......
......@@ -6,7 +6,7 @@
</head>
<body{html_body_attributes}>
{$cookie_consent_html}
{include file="layout_fullscreen_check.tpl"}
{if $prefs.feature_ajax eq 'y'}
......
......@@ -64,13 +64,13 @@
<input type="submit" class="btn btn-primary" value="{tr}Save{/tr}"/>
</div>
</form>
{jq}
$("#notification_checkbox").change(function(){
if (this.checked){
$(".priority-div").removeClass("hidden");
}else{
$(".priority-div").addClass("hidden");
}
});
{/jq}
{jq}
$("#notification_checkbox").change(function(){
if (this.checked){
$(".priority-div").removeClass("hidden");
}else{
$(".priority-div").addClass("hidden");
}
});
{/jq}
{/block}
......@@ -67,6 +67,6 @@
$('#sample').html(data);
}
});
});
});
{/jq}
{/block}
\ No newline at end of file
{/block}
......@@ -45,7 +45,7 @@
<form action="messu-archive.php" method="post" name="form_messu_archive">
<div class="form-group">
<div class="form-group">
<input type="hidden" name="offset" value="{$offset|escape}">
<input type="hidden" name="find" value="{$find|escape}">
<input type="hidden" name="sort_mode" value="{$sort_mode|escape}">
......@@ -54,7 +54,7 @@
<input type="hidden" name="priority" value="{$priority|escape}">
<input type="submit" class="btn btn-warning btn-sm" name="delete" value="{tr}Delete{/tr}">
<input type="submit" class="btn btn-default btn-sm" name="download" value="{tr}Download{/tr}">
</div>
</div>
{jq notonready=true}
var CHECKBOX_LIST = [{{section name=user loop=$items}'msg[{$items[user].msgId}]'{if not $smarty.section.user.last},{/if}{/section}}];
{/jq}
......
......@@ -4,7 +4,7 @@
<div class="row"><div class="col-xs-12">{include file='messu-nav.tpl'}</div></div>
<br>
{if $legend}
{$legend}
{$legend}
{else}
<div class="row" style="padding-bottom:10px;">
<div class="col-xs-4 col-sm-5">
......@@ -32,42 +32,42 @@
</div>
</div>
</div>
<div class="col-xs-3 col-xs-offset-4 col-md-2 col-md-offset-5" style="padding-top: 4px;">
<form method="post" action="messu-read_sent.php">
<input type="hidden" name="offset" value="{$offset|escape}">
<input type="hidden" name="find" value="{$find|escape}">
<input type="hidden" name="sort_mode" value="{$sort_mode|escape}">
<input type="hidden" name="flag" value="{$flag|escape}">
<input type="hidden" name="flagval" value="{$flagval|escape}">
<input type="hidden" name="priority" value="{$priority|escape}">
<input type="hidden" name="msgdel" value="{$msgId|escape}">
{if $next}
<input type="hidden" name="msgId" value="{$next|escape}">
{elseif $prev}
<input type="hidden" name="msgId" value="{$prev|escape}">
{else}
<input type="hidden" name="msgId" value="">
{/if}
<input type="submit" class="btn btn-default btn-sm pull-right" name="delete" value="{tr}Delete{/tr}">
</form>
</div>
<div class="col-xs-3 col-xs-offset-4 col-md-2 col-md-offset-5" style="padding-top: 4px;">
<form method="post" action="messu-read_sent.php">
<input type="hidden" name="offset" value="{$offset|escape}">
<input type="hidden" name="find" value="{$find|escape}">
<input type="hidden" name="sort_mode" value="{$sort_mode|escape}">
<input type="hidden" name="flag" value="{$flag|escape}">
<input type="hidden" name="flagval" value="{$flagval|escape}">
<input type="hidden" name="priority" value="{$priority|escape}">
<input type="hidden" name="msgdel" value="{$msgId|escape}">
{if $next}
<input type="hidden" name="msgId" value="{$next|escape}">
{elseif $prev}
<input type="hidden" name="msgId" value="{$prev|escape}">
{else}
<input type="hidden" name="msgId" value="">
{/if}
<input type="submit" class="btn btn-default btn-sm pull-right" name="delete" value="{tr}Delete{/tr}">
</form>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="messureadhead">
<table>
<tr><td style="font-weight:bold;">{tr}From:{/tr}</td><td>{$msg.user_from|escape}</td></tr>
<tr><td style="font-weight:bold;">{tr}To:{/tr}</td><td>{$msg.user_to|escape}</td></tr>
<tr><td style="font-weight:bold;">{tr}Cc:{/tr}</td><td>{$msg.user_cc|escape}</td></tr>
<tr><td style="font-weight:bold;">{tr}Subject:{/tr}</td><td>{$msg.subject|escape}</td></tr>
<tr><td style="font-weight:bold;">{tr}Date:{/tr}</td><td>{$msg.date|tiki_short_datetime}</td></tr><!--date_format:"%a %b %Y [%H:%I]"-->
</table>
</div>
</div>
<div class="col-xs-12">
<div class="messureadbody">
{$msg.parsed}
</div>
</div>
<div class="col-xs-12">
<div class="messureadhead">
<table>
<tr><td style="font-weight:bold;">{tr}From:{/tr}</td><td>{$msg.user_from|escape}</td></tr>
<tr><td style="font-weight:bold;">{tr}To:{/tr}</td><td>{$msg.user_to|escape}</td></tr>
<tr><td style="font-weight:bold;">{tr}Cc:{/tr}</td><td>{$msg.user_cc|escape}</td></tr>
<tr><td style="font-weight:bold;">{tr}Subject:{/tr}</td><td>{$msg.subject|escape}</td></tr>
<tr><td style="font-weight:bold;">{tr}Date:{/tr}</td><td>{$msg.date|tiki_short_datetime}</td></tr><!--date_format:"%a %b %Y [%H:%I]"-->
</table>
</div>
</div>
<div class="col-xs-12">
<div class="messureadbody">
{$msg.parsed}
</div>
</div>
</div>
{/if}
This diff is collapsed.
......@@ -3,7 +3,7 @@
{tikimodule error=$module_params.error title=$tpl_module_title name="logo" flip=$module_params.flip decorations=$module_params.decorations nobox=$module_params.nobox notitle=$module_params.notitle}
{if $module_params.src}
<div {if $module_params.bgcolor ne ''} style="background-color: {$module_params.bgcolor};" {/if} class="pull-left {$module_params.class_image|escape}">
<a href="{$module_params.link}" title="{$module_params.title_attr|escape}">
<a href="{$module_params.link}" title="{$module_params.title_attr|escape}">
<img src="{$module_params.src}" alt="{$module_params.alt_attr|escape}" style="max-width: 100%; height: auto">
</a>
</div>
......@@ -11,15 +11,15 @@
{if !empty($module_params.sitetitle) or !empty($module_params.sitesubtitle)}
<div class="pull-left {$module_params.class_titles|escape}">
{if !empty($module_params.sitetitle)}
<h1 class="sitetitle">
<h1 class="sitetitle">
<a href="{$module_params.link}">
{tr}{$module_params.sitetitle|escape}{/tr}
</a>
</h1>
</h1>
{/if}
{if !empty($module_params.sitesubtitle)}
<h2 class="sitesubtitle">{tr}{$module_params.sitesubtitle|escape}{/tr}</h2>
{/if}
{if !empty($module_params.sitesubtitle)}
<h2 class="sitesubtitle">{tr}{$module_params.sitesubtitle|escape}{/tr}</h2>
{/if}
</div>
{/if}
{/tikimodule}
......
{tikimodule error=$module_params.error title=$tpl_module_title name="minichat" flip=$module_params.flip decorations=$module_params.decorations nobox=$module_params.nobox notitle=$module_params.notitle}
<div id='minichatchans' class='btn-group minichatchans margin-bottom-xs'{if $module_params.nochannelbar && $module_params.nochannelbar != "n"} style="height: 0; visibility: hidden"{/if}></div>
<div id='minichat' class='minichat well well-sm' style='overflow-x: hidden; overflow-y: auto; height: {$module_rows}em;'></div>
<div class="minichatinputs">
......
......@@ -5,9 +5,9 @@
{if !isset($module_params.tiki) or $module_params.tiki neq 'n'}
{tr}Powered by{/tr} <a href="http://tiki.org" title="&#169; 2002&#8211;{$smarty.now|date_format:"%Y"} {tr}The Tiki Community{/tr}">{tr}Tiki Wiki CMS Groupware{/tr} </a>
{/if}
{if !isset($module_params.version) or $module_params.version neq 'n'}
v{$tiki_version} {if $tiki_uses_svn eq 'y'} (SVN){/if} &quot;{$tiki_star}&quot;
{/if}
{if !isset($module_params.version) or $module_params.version neq 'n'}
v{$tiki_version} {if $tiki_uses_svn eq 'y'} (SVN){/if} &quot;{$tiki_star}&quot;
{/if}
{if !isset($module_params.credits) or $module_params.credits neq 'n'}
<span id="credits">
&nbsp;| {include file='credits.tpl'}
......
......@@ -46,7 +46,7 @@
</ul>
{/if}
{if $showbutton eq 'y'}
<button class="add-friend btn btn-default"><i class="fa fa-user-plus"></i>&nbsp;{tr}Add Friend{/tr}</button>
<button class="add-friend btn btn-default"><i class="fa fa-user-plus"></i>&nbsp;{tr}Add Friend{/tr}</button>
{/if}
</div>
{/block}
......@@ -32,7 +32,7 @@
{remarksbox type="error" title="{tr}Installer not locked{/tr}"}
{tr} The installer allows a user to change or destroy the site's database through the browser so it is very important to keep it locked. {/tr}
{tr}<br />You can re-run the installer (tiki-install.php), skip to the last step and select <strong>LOCK THE INSTALLER</strong>. Alternatively, you can simply <strong>add a lock file</strong> (file without any extension) in your db/ folder.{/tr}
{/remarksbox}
{/if}
......
This diff is collapsed.
......@@ -6,24 +6,24 @@
<form method="post" action="tiki-admin_hotwords.php" class="form-horizontal">
<div class="form-group">
<div class="form-group">
<label class="col-sm-3 control-label">{tr}Word{/tr}</label>
<div class="col-sm-7 col-sm-offset-1">
<input type="text" name="word" class="form-control">
</div>
</div>
<div class="form-group">
<input type="text" name="word" class="form-control">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tr}URL{/tr}</label>
<div class="col-sm-7 col-sm-offset-1">
<input type="text" name="url" class="form-control">
</div>
</div>
<div class="form-group">
<input type="text" name="url" class="form-control">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-7 col-sm-offset-1">
<input type="submit" class="btn btn-default btn-sm" name="add" value="{tr}Add{/tr}">
</div>
</div>
<input type="submit" class="btn btn-default btn-sm" name="add" value="{tr}Add{/tr}">
</div>
</div>
</form>
<h2>{tr}Hotwords{/tr}</h2>
......
......@@ -17,20 +17,20 @@
<div class="form-group">
<label class="col-sm-3 control-label">{tr}Zone{/tr}</label>
<div class=