Commit c089c6cf authored by lindonb's avatar lindonb

[MRG] Automatic merge, branches/15.x 57982 to 58007

Conflict fixed manually:
        templates/tiki-adminusers.tpl
parent 9bb1e8d3
......@@ -5217,6 +5217,7 @@ templates/article/index.php -text
templates/article_trailer.tpl -text
templates/attachments.tpl -text
templates/attachments_tracker.tpl -text
templates/blog_actions.tpl -text
templates/blog_heading.tpl -text
templates/blog_post_actions.tpl -text
templates/blog_post_author_info.tpl -text
......
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.
......@@ -3413,7 +3413,7 @@ $(document).on('click', '.media[data-href]', function () {
document.location.href = $(this).data('href');
});
$(document).on('hidden.bs.modal', '.modal.fade', function () {
$(document).on('hidden.bs.modal', '.footer-modal.fade', function () {
// Required for bootstrap to allow changing the content of a modal
$(this).removeData('bs.modal').find('.modal-content').empty();
......
......@@ -37,6 +37,7 @@ function smarty_block_title($params, $content, $template, &$repeat)
if ( ! isset($params['help']) ) $params['help'] = '';
if ( ! isset($params['admpage']) ) $params['admpage'] = '';
if ( ! isset($params['actions']) ) $params['actions'] = '';
// Set the variable for the HTML title tag
$template->smarty->assign('headtitle', $content);
......@@ -93,6 +94,9 @@ function smarty_block_title($params, $content, $template, &$repeat)
. smarty_function_icon(array('name' => 'settings'), $template)
. "</a>\n";
}
if ($params['actions'] != '') {
$html .= $params['actions'];
}
}
$html .= '</h1>';
......
......@@ -215,7 +215,7 @@ function smarty_function_html_select_date($params, $smarty)
//tra('January') tra('February') tra('March') tra('April') tra('May') tra('June')
// tra('July') tra('August') tra('September') tra('October') tra('November') tra('December')
$month_names[$i] = ucfirst(tra(strftime($month_format, mktime(0, 0, 0, $i, 1, 2000))));
$month_names[$i] = ucfirst(tra(utf8_encode(strftime($month_format, mktime(0, 0, 0, $i, 1, 2000)))));
$month_values[$i] = strftime($month_value_format, mktime(0, 0, 0, $i, 1, 2000));
}
......
......@@ -18,7 +18,7 @@ function wikiplugin_category_info()
'id' => array(
'required' => false,
'name' => tra('Category IDs'),
'description' => tr('List of category IDs separated by + signs. ex: %0. Default will use category
'description' => tr('List of category IDs separated by "+", for example, %0. Default will use category
of the current page.', '<code>1+2+3</code>'),
'since' => '1',
'filter' => 'digits',
......@@ -29,7 +29,7 @@ function wikiplugin_category_info()
'types' => array(
'required' => false,
'name' => tra('Types'),
'description' => tra('List of object types to include in the list separated by plus signs. Example: ')
'description' => tra('List of object types to include in the list, separated by "+", for example, ')
. '<code>article+blog+blog post+fgal</code>',
'since' => '1',
'accepted' => 'article, blog, blog post, fgal, forum, igal, newsletter, event, poll, quiz, survey,
......
......@@ -28,7 +28,7 @@ function wikiplugin_exercise_info()
'incorrect' => array(
'required' => false,
'name' => tr('Incorrect'),
'description' => tr('Wrong answer to suggest. Several wrong answers can be suggested (+ separated)'),
'description' => tr('Incorrect answer to suggest. Several incorrect answers can be suggested (separated by "+")'),
'since' => '9.0',
'filter' => 'text',
),
......
This diff is collapsed.
......@@ -12,7 +12,7 @@ function wikiplugin_slider_info()
'documentation' => 'PluginSlider',
'description' => tra('Embed a mini-slideshow of content on a page'),
'prefs' => array( 'wikiplugin_slider' ),
'body' => tra('Content separated by /////'),
'body' => tra('Content separated by "/////"'),
'iconname' => 'tv',
'introduced' => 8,
'tags' => array( 'basic' ),
......@@ -20,7 +20,7 @@ function wikiplugin_slider_info()
'titles' => array(
'required' => false,
'name' => tra('Slider Titles'),
'description' => tr('Pipe separated list of slider titles. Example:')
'description' => tr('Pipe-separated list of slider titles. Example:')
. '<code>slider 1|slider 2|slider 3</code>',
'since' => '8.0',
'filter' => 'text',
......
......@@ -79,7 +79,7 @@ function wikiplugin_subscribegroups_info()
'groups' => array(
'required' => false,
'name' => tra('Groups'),
'description' => tra('Colon separated list of groups. By default the list of groups available to the user.'),
'description' => tra('Colon-separated list of groups. By default the list of groups available to the user.'),
'since' => '2.0',
'default' => '',
),
......
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