Commit 5486a2d6 authored by Jonny Bradley's avatar Jonny Bradley

[MRG] Automatic merge, branches/15.x 58166 to 58200

parent a8d26c62
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -99,7 +99,6 @@ class Search_Elastic_Index implements Search_Index_Interface, Search_Index_Query
} elseif ($entry instanceof Search_Type_Whole || $entry instanceof Search_Type_MultivaluePlain) {
return array(
"type" => "string",
"term_vector" => "with_positions_offsets",
"index" => "not_analyzed",
"fields" => array(
"sort" => array(
......
......@@ -99,11 +99,16 @@ function smarty_block_textarea($params, $content, $smarty, $repeat)
$editWarning = $prefs['wiki_timeout_warning'] === 'y' && isset($tmp_var) && $tmp_var !== 'sandbox';
if ($params['_simple'] === 'n' && $editWarning) {
$remrepeat = false;
if ($prefs['ajax_autosave'] === 'y' and $section === 'wiki page') {
$hint = '<strong>Save</strong> your work to restart the edit session timer';
} else {
$hint = '<strong>Preview</strong> (if available) or <strong>Save</strong> your work to restart the edit session timer';
}
$html .= smarty_block_remarksbox(
array( 'type'=>'warning', 'title'=>tra('Warning')),
'<p>' . tra('This edit session will expire in') .
' <span id="edittimeout">' . (ini_get('session.gc_maxlifetime') / 60) .'</span> '. tra('minutes') . '. ' .
tra('<strong>Preview</strong> (if available) or <strong>Save</strong> your work to restart the edit session timer') . '</p>',
tra($hint) . '</p>',
$smarty,
$remrepeat
)."\n";
......
......@@ -92,6 +92,7 @@ class TikiDate
'Libya',
'localtime', // because PHP Fatal error was observed in Apache2 logfile
// not mentioned here: https://bugs.php.net/bug.php?id=66985
'leap-seconds.list', // same here
'MST7MDT',
'Navajo',
'NZ-CHAT',
......
......@@ -22,7 +22,7 @@ function wikiplugin_annotation_info()
'src' => array(
'required' => true,
'name' => tra('Location'),
'description' => tra('Absolute URL to the image or relative path from Tiki site root.'),
'description' => tra('Absolute URL to the image, relative path from Tiki site root or an image from the file gallery <code>display1</code>.'),
'filter' => 'url',
'default' => '',
'since' => '3.0',
......
......@@ -423,7 +423,7 @@ function wikiplugin_img_info()
'class' => array(
'required' => false,
'name' => tra('CSS Class'),
'filter' => 'style',
'filter' => 'text',
'description' => tr('CSS class to apply to the image. %0class="fixedSize"%1 prevents the image from being
automatically resized and relocated in Tiki SlideShows', '<code>', '</code>'),
'since' => '3.0',
......
This diff is collapsed.
......@@ -2,14 +2,14 @@
<header class="clearfix panel-heading">
<div class="blog-postbody-title">
{if $blog_post_context eq 'view_blog'}
<h2>
<h2 class="panel-title">
{object_link type="blog post" id=$post_info.postId title=$post_info.title}{if $post_info.priv eq 'y'} <span class="label label-warning">{tr}private{/tr}</span>{/if}
{include file='blog_post_actions.tpl'}
</h2>
{elseif $blog_post_context eq 'excerpt'}
<bold>{object_link type="blog post" id=$post_info.postId title=$post_info.title}</bold>
{else}
<h2>
<h2 class="panel-title">
{object_link type="blog post" id=$post_info.postId title=$post_info.title}{if $post_info.priv eq 'y'} <span class="label label-warning">{tr}private{/tr}</span>{/if}
<a aria-hidden="true" class="tiki_anchor" href="{$post_info.postId|sefurl:blogpost}" title="{tr}permanent link{/tr}">{icon name="link"}</a>
{include file='blog_post_actions.tpl'}
......
......@@ -7,7 +7,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=Edge">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="generator" content="Tiki Wiki CMS Groupware - http://tiki.org">
<meta name="generator" content="Tiki Wiki CMS Groupware - https://tiki.org">
{* --- Canonical URL --- *}
{include file="canonical.tpl"}
......
......@@ -96,7 +96,7 @@ if (jqueryTiki.no_cookie) {
</button>
<ul class="dropdown-menu">
<li>
<a href="tiki-user_information.php" title="{tr}My Account{/tr}">{tr}My Account{/tr}</a>
<a href="tiki-user_information.php" title="{tr}My Account{/tr}">{if isset($module_params.show_user_name) && $module_params.show_user_name eq 'y'}{tr}My Account{/tr}{else}{tr}{$user|username|escape:"html"}{/tr}{/if}</a>
</li>
<li>
<a href="tiki-logout.php" title="{tr}Log out{/tr}">{tr}Log out{/tr}</a>
......
......@@ -19,8 +19,8 @@
<ul class="nav nav-tabs">
{foreach key=pos item=slvn_item from=$slvn_info.items}
{if $slvn_item.count > 0}
<li style="width:{$slvn_info.li_width}%;">
<a data-toggle="tab" href="#fragment-{$fragment}" style="padding: 0;">
<li class="text-center">
<a data-toggle="tab" href="#fragment-{$fragment}">
{if $pos eq "blogs"}
{icon name="bold" size=1 ititle="Blogs"}
{elseif $pos eq "blogPosts"}
......
{* $Id$ *}
{if $prefs.user_register_prettytracker eq 'y' and $prefs.user_register_prettytracker_tpl and $prefs.socialnetworks_user_firstlogin != 'y'}
<input type="text" id="email" name="email">
<input type="text" id="email" name="email" class="form-control" >
&nbsp;<strong class='mandatory_star'>*</strong>
{else}
{if $prefs.login_is_email ne 'y'}
......
......@@ -11,7 +11,7 @@
<div class="form-group">
<label class="col-sm-4 control-label" for="{$customfields[ir].prefName}">{tr}{$customfields[ir].label}:{/tr}</label>
<div class="col-sm-8">
<input type="{$customfields[ir].type}" name="{$customfields[ir].prefName}" value="{$customfields[ir].value}" size="{$customfields[ir].size}" id="{$customfields[ir].prefName}">
<input type="{$customfields[ir].type}" name="{$customfields[ir].prefName}" value="{$customfields[ir].value}" size="{$customfields[ir].size}" id="{$customfields[ir].prefName}" class="form-control" >
</div>
</div>
{/if}
......
......@@ -2,16 +2,17 @@
{if $prefs.login_autogenerate eq 'y'}
{*do nothing*}
{elseif $prefs.user_register_prettytracker eq 'y' and $prefs.user_register_prettytracker_tpl and $prefs.socialnetworks_user_firstlogin != 'y'}
<input type="text" name="name" id="name">
<span class='text-danger'>*</span>
<input type="text" name="name" id="name" class="form-control" >
<span class='text-danger tips' title=":{tr}This field is mandatory{/tr}">*</span>
{else}
<div class="form-group">
<label class="col-sm-4 control-label" for="name">{if $prefs.login_is_email eq 'y'}{tr}Email{/tr}{else}{tr}Username{/tr}{/if} {if $trackerEditFormId}<span class='text-danger tips' title=":{tr}This field is mandatory{/tr}">*</span>{/if}</label>
<div class="col-sm-8">
<input class="form-control" type="text" name="name" id="name" value="{if !empty($smarty.post.name)}{$smarty.post.name}{/if}">
{if $prefs.login_is_email eq 'y'}
<input type="email" name="name" id="name" value="{if !empty($smarty.post.name)}{$smarty.post.name}{/if}" class="form-control" >
<div class="help-block">{tr}Use your email address as your log-in name{/tr}</div>
{else}
<input type="text" name="name" id="name" value="{if !empty($smarty.post.name)}{$smarty.post.name}{/if}" class="form-control" >
{if $prefs.min_username_length > 1}
<div class="highlight">
<em>{tr _0=$prefs.min_username_length}Minimum %0 characters long{/tr}</em>
......
{* $Id$ *}
{if $prefs.user_register_prettytracker eq 'y' and $prefs.user_register_prettytracker_tpl}
<input id='pass1' type="password" name="pass" onkeypress="regCapsLock(event)">
&nbsp;<strong class='mandatory_star'>*</strong>
<input id='pass1' type="password" name="pass" onkeypress="regCapsLock(event)" class="form-control" >
&nbsp;<strong class='mandatory_star text-danger tips' title=":{tr}This field is mandatory{/tr}">*</strong>
{else}
{if !isset($openid_associate) || $openid_associate neq 'y'}
<div class="form-group">
......
{* $Id$ *}
{if $prefs.user_register_prettytracker eq 'y' and $prefs.user_register_prettytracker_tpl}
<input id='pass2' type="password" name="passAgain" onkeypress="regCapsLock(event)">
&nbsp;<strong class='mandatory_star'>*</strong>
<input id='pass2' type="password" name="passAgain" onkeypress="regCapsLock(event)" class="form-control" >
&nbsp;<strong class='mandatory_star text-danger tips' title=":{tr}This field is mandatory{/tr}">*</strong>
{else}
{if !isset($openid_associate) || $openid_associate neq 'y'}
<div class="form-group">
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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