Commit a0e9fe1e authored by jonnybradley's avatar jonnybradley

[MRG] Automatic merge, branches/15.x 57955 to 57977

parent 76f90469
{title help='Content+Templates' url='tiki-admin_content_templates.php'}{tr}Content templates{/tr}{/title}
{title help='Content Templates' url='tiki-admin_content_templates.php'}{tr}Content templates{/tr}{/title}
{tabset}
......
{title help="Admin+DSN"}{tr}Admin Content Sources{/tr}{/title}
{title help="Admin DSN"}{tr}Admin Content Sources{/tr}{/title}
{remarksbox type="tip" title="{tr}Tip{/tr}"}
{tr}Use Admin DSN to define the database to be used by the SQL plugin.{/tr}
......
{title help="External+Wikis" admpage="textarea"}{tr}Admin External Wikis{/tr}{/title}
{title help="External Wikis" admpage="textarea"}{tr}Admin External Wikis{/tr}{/title}
<h2>{tr}Create/Edit External Wiki{/tr}</h2>
<form action="tiki-admin_external_wikis.php" method="post" class="form-horizontal" role="form">
......
{title help="Html+Pages"}{tr}Admin HTML pages{/tr}{/title}
{title help="Html Pages"}{tr}Admin HTML pages{/tr}{/title}
{if $pageName ne ''}
<div class="navt_bar">
......
{* $Id$ *}
{title help="Mail+Notifications"}{tr}Mail notifications{/tr}{/title}
{title help="Mail Notifications"}{tr}Mail notifications{/tr}{/title}
{if empty($prefs.sender_email)}
{remarksbox type="warning" title="{tr}Warning{/tr}"}
......
{* $Id$ *}
{title help="Security+Admin" admpage="security"}{tr}Security Admin{/tr}{/title}
{title help="Security Admin" admpage="security"}{tr}Security Admin{/tr}{/title}
{remarksbox type="tip" title="{tr}Tip{/tr}"}
{tr}To <a class="rbox-link" target="tikihelp" href="http://security.tiki.org/tiki-contact.php">report any security issues</a>.{/tr}
......
{* $Id$ *}
{title help="Token+Access"}{tr}Admin Tokens{/tr}{/title}
{title help="Token Access"}{tr}Admin Tokens{/tr}{/title}
{tabset name="tabs_admtokens"}
{tab name="{tr}List tokens{/tr}"}
......
{* $Id$ *}
{title help="Groups+Management" admpage="login"}{tr}Admin groups{/tr}{/title}
{title help="Groups Management" admpage="login"}{tr}Admin groups{/tr}{/title}
<div class="t_navbar margin-bottom-md">
{button href="tiki-adminusers.php" class="btn btn-default" _type="link" _icon_name="user" _text="{tr}Admin Users{/tr}"}
......
......@@ -10,7 +10,7 @@
{$liend = ''}
{/if}
{if !$tsAjax}
{title help="Users+Management" admpage="login" url="tiki-adminusers.php"}{tr}Admin Users{/tr}{/title}
{title help="Users Management" admpage="login" url="tiki-adminusers.php"}{tr}Admin Users{/tr}{/title}
<div class="t_navbar margin-bottom-md">
{if $tiki_p_admin eq 'y'} {* only full admins can manage groups, not tiki_p_admin_users *}
......
{title help="Edit+CSS"}{tr}Edit CSS{/tr}{/title}
{title help="Edit CSS"}{tr}Edit CSS{/tr}{/title}
<div class="t_navbar">
{if ($prefs.feature_view_tpl eq 'y' || $prefs.feature_edit_templates eq 'y') && $tiki_p_edit_templates == 'y'}
{button href="tiki-edit_templates.php" class="btn btn-default" _text="{tr}View Templates{/tr}"}
......
{if isset($template)}
{title help="Edit+Templates" url="tiki-edit_templates.php?mode=listing&template=$template"}
{title help="Edit Templates" url="tiki-edit_templates.php?mode=listing&template=$template"}
{if $prefs.feature_edit_templates ne 'y' or $tiki_p_edit_templates ne 'y'}
{tr}View template:{/tr}
{else}
......@@ -8,7 +8,7 @@
{$template}
{/title}
{else}
{title help="Edit+Templates"}{tr}Edit templates{/tr}{/title}
{title help="Edit Templates"}{tr}Edit templates{/tr}{/title}
{/if}
<div class="t_navbar margin-bottom-md">
......
{* $Id$ *}
{title help="Image+Galleries" admpage="gal"}{tr}Galleries{/tr}{/title}
{title help="Image Galleries" admpage="gal"}{tr}Galleries{/tr}{/title}
{if $tiki_p_create_galleries eq 'y'}
{if $edit_mode ne 'y' or $galleryId ne 0}
<div class="t_navbar">
......
{title help="Tiki+Importer"}{tr}Tiki Importer{/tr}{/title}
{title help="Tiki Importer"}{tr}Tiki Importer{/tr}{/title}
<br>
......
{* $Id$ *}
{title admpage="wiki" help="Using+Wiki+Pages#Last_Changes" url="tiki-lastchanges.php?days=$days"}{tr}Last Changes{/tr}{/title}
{title admpage="wiki" help="Using Wiki Pages#Last_Changes" url="tiki-lastchanges.php?days=$days"}{tr}Last Changes{/tr}{/title}
<div class="t_navbar btn-group margin-bottom-md">
{if $days eq '1'}{assign var=thisclass value='active'}{else}{assign var=thisclass value=''}{/if}
......
{title help="Dynamic+Content"}{tr}Dynamic Content System{/tr}{/title}
{title help="Dynamic Content"}{tr}Dynamic Content System{/tr}{/title}
{remarksbox type="tip" title="{tr}Tip{/tr}"}{tr}To use content blocks in a text area (Wiki page, etc), a <a class="rbox-link" href="tiki-admin_modules.php">module</a> or a template, use {literal}{content id=x}{/literal}, where x is the ID of the content block.{/tr} {tr}You can also use {literal}{content label=x}{/literal}, where x is the label of the content block.{/tr}{/remarksbox}
{tabset}
......
{* $Id$ *}
{title help="File+Galleries" admpage="fgal"}
{title help="File Galleries" admpage="fgal"}
{if $edit_mode eq 'y' and $galleryId eq 0}
{tr}Create a File Gallery{/tr}
{else}
......
{title help="Image+Galleries"}{tr}Browsing Gallery:{/tr} {$name}{/title}
{title help="Image Galleries"}{tr}Browsing Gallery:{/tr} {$name}{/title}
<div class="galdesc">
{$description}
......
{* $Id$ *}
{title admpage="wiki" help="Using+Wiki+Pages#List_Pages"}{tr}Pages{/tr}{/title}
{title admpage="wiki" help="Using Wiki Pages#List_Pages"}{tr}Pages{/tr}{/title}
{tabset name='tabs_wikipages'}
{tab name="{tr}List Wiki Pages{/tr}"}
......
{title help="Live+Support"}{tr}Live support system{/tr}{/title}
{title help="Live Support"}{tr}Live support system{/tr}{/title}
<div class="t_navbar margin-bottom-md">
{button href='#' _onclick="javascript:window.open('tiki-live_support_console.php','','menubar=no,scrollbars=yes,resizable=yes,height=400,width=600');" class="btn btn-default" _text="{tr}Open operator console{/tr}"}
......
{title help="User+Calendar" url="tiki-minical.php?view=$view"}{tr}Mini Calendar{/tr}{/title}
{title help="User Calendar" url="tiki-minical.php?view=$view"}{tr}Mini Calendar{/tr}{/title}
{include file='tiki-mytiki_bar.tpl'}
......
{title help="User+Calendar"}{tr}Mini Calendar: Preferences{/tr}{/title}
{title help="User Calendar"}{tr}Mini Calendar: Preferences{/tr}{/title}
{include file='tiki-mytiki_bar.tpl'}
......
{* $Id$ *}
{title admpage="wiki" help="Using+Wiki+Pages#Backlinks_amp_Orphan_Pages"}{tr}Orphan Pages{/tr}{/title}
{title admpage="wiki" help="Using Wiki Pages#Backlinks_amp_Orphan_Pages"}{tr}Orphan Pages{/tr}{/title}
{if $listpages or ($find ne '')}
{include file='find.tpl' find_show_languages='y' find_show_categories='y' find_show_num_rows='y'}
......
{title url="tiki-plugins.php" help="Wiki+Plugins"}{tr}Plugin Approval{/tr}{/title}
{title url="tiki-plugins.php" help="Wiki Plugins"}{tr}Plugin Approval{/tr}{/title}
{remarksbox type="tip" title="{tr}Tip{/tr}"}
{tr}For security, grant the <strong>tiki_p_plugin_approve</strong> permission only to trusted user groups.{/tr} {tr}Use the <a href="tiki-admin.php?page=textarea">Admin: Text Area page</a> to deactivate potentially risky plugins.{/tr}
......
{* $Id$ *}
{title help="Communication+Center"}{tr}Received Pages{/tr}{/title}
{title help="Communication Center"}{tr}Received Pages{/tr}{/title}
{if !empty($errors)}
<div class="alert alert-warning">
......
{title help="Referer+Stats"}{tr}Referer stats{/tr}{/title}
{title help="Referer Stats"}{tr}Referer stats{/tr}{/title}
<div class="t_navbar">
{button href="tiki-referer_stats.php?clear=1" class="btn btn-default" _text="{tr}Clear Stats{/tr}"}
......
{* $Id$ *}
{title help="Communication+Center"}{tr}Send objects{/tr}{/title}
{title help="Communication Center"}{tr}Send objects{/tr}{/title}
{if $msg}
<div class="panel panel-default">
......
{* $Id$ *}
{title help="Social+networks"}{tr}Social networks{/tr}{/title}
{title help="Social networks"}{tr}Social networks{/tr}{/title}
{include file='tiki-mytiki_bar.tpl'}
......
{* $Id$ *}
{title help="System+Log"}{tr}Tiki Logs{/tr}{/title}
{title help="System Log"}{tr}Tiki Logs{/tr}{/title}
<div class="t_navbar margin-bottom-md">
<a href="tiki-sqllog.php" class="btn btn-link" title="{tr}Log SQL{/tr}">{icon name="pencil"} {tr}Log SQL{/tr}</a>
......
{* $Id$ *}
{title help="Theme+Control"}{tr}Theme Control{/tr}: {tr}Categories{/tr}{/title}
{title help="Theme Control"}{tr}Theme Control{/tr}: {tr}Categories{/tr}{/title}
<div class="t_navbar btn-group">
{button href="tiki-theme_control_objects.php" class="btn btn-default" _text="{tr}Control by Objects{/tr}"}
{button href="tiki-theme_control_sections.php" class="btn btn-default" _text="{tr}Control by Sections{/tr}"}
......
{* $Id$ *}
{title help="Theme+Control"}{tr}Theme Control{/tr}: {tr}Objects{/tr}{/title}
{title help="Theme Control"}{tr}Theme Control{/tr}: {tr}Objects{/tr}{/title}
<div class="t_navbar btn-group">
{button href="tiki-theme_control.php" class="btn btn-default" _text="{tr}Control by Categories{/tr}"}
{button href="tiki-theme_control_sections.php" class="btn btn-default" _text="{tr}Control by Sections{/tr}"}
......
{title help="Theme+Control"}{tr}Theme Control{/tr}: {tr}Sections{/tr}{/title}
{title help="Theme Control"}{tr}Theme Control{/tr}: {tr}Sections{/tr}{/title}
<div class="t_navbar btn-group">
{button href="tiki-theme_control.php" class="btn btn-default" _text="{tr}Control by Categories{/tr}"}
{button href="tiki-theme_control_objects.php" class="btn btn-default" _text="{tr}Control by Objects{/tr}"}
......
......@@ -6,7 +6,7 @@
{assign var=simpleMode value='n'}
{/if}
{title help="File+Galleries" admpage="fgal"}{if $editFileId}{tr}Edit File:{/tr} {$fileInfo.filename}{else}{tr}Upload File{/tr}{/if}{/title}
{title help="File Galleries" admpage="fgal"}{if $editFileId}{tr}Edit File:{/tr} {$fileInfo.filename}{else}{tr}Upload File{/tr}{/if}{/title}
{if !empty($galleryId) or (isset($galleries) and count($galleries) > 0 and $tiki_p_list_file_galleries eq 'y') or (isset($uploads) and count($uploads) > 0)}
<div class="t_navbar margin-bottom-md">
......
{* $Id$ *}
{title help="Image+Galleries"}{tr}Upload Image{/tr}{/title}
{title help="Image Galleries"}{tr}Upload Image{/tr}{/title}
<div class="navbar btn-group">
{if $galleryId ne ''}
......
{title help="User+Bookmarks"}{tr}My Bookmarks{/tr}{/title}
{title help="User Bookmarks"}{tr}My Bookmarks{/tr}{/title}
{include file='tiki-mytiki_bar.tpl'}
......
{title help="User+Contacts+Prefs"}{tr}User Contacts Preferences{/tr}{/title}
{title help="User Contacts Prefs"}{tr}User Contacts Preferences{/tr}{/title}
{include file='tiki-mytiki_bar.tpl'}
<div class="t_navbar">
......
{* $Id$ *}
{if $userwatch ne $user}
{title help="User+Preferences"}{tr}User Preferences:{/tr} {$userwatch}{/title}
{title help="User Preferences"}{tr}User Preferences:{/tr} {$userwatch}{/title}
{else}
{title help="User+Preferences"}{tr}User Preferences{/tr}{/title}
{title help="User Preferences"}{tr}User Preferences{/tr}{/title}
{/if}
{if $userwatch eq $user or $userwatch eq ""}
{include file='tiki-mytiki_bar.tpl'}
......
{title help="User+Tasks"}{tr}Tasks{/tr}{/title}
{title help="User Tasks"}{tr}Tasks{/tr}{/title}
{include file='tiki-mytiki_bar.tpl'}
......
{* $Id$ *}
{title help="User+Watches"}{tr}User Watches and preferences{/tr}{/title}
{title help="User Watches"}{tr}User Watches and preferences{/tr}{/title}
{include file='tiki-mytiki_bar.tpl'}
{if $email_ok eq 'n'}
......
{*Smarty template*}
{title help="User+Files"}{tr}User Files{/tr}{/title}
{title help="User Files"}{tr}User Files{/tr}{/title}
{include file='tiki-mytiki_bar.tpl'}
......
{title help="User+Menu"}{tr}User Menu{/tr}{/title}
{title help="User Menu"}{tr}User Menu{/tr}{/title}
{include file='tiki-mytiki_bar.tpl'}
<br>
......
......@@ -311,7 +311,6 @@ if (empty($info) && !($user && $prefs['feature_wiki_userpage'] == 'y' && strcase
/* if we have exactly one match, redirect to it */
if (isset($newPage) && !$isUserPage) {
$url = $wikilib->sefurl($newPage);
// Process prefix alias with itemId append for pretty tracker pages
$prefixes = explode(',', $prefs['wiki_prefixalias_tokens']);
......@@ -357,6 +356,13 @@ if (empty($info) && !($user && $prefs['feature_wiki_userpage'] == 'y' && strcase
}
}
}
// $info not found in prefixes but $newPage and $url was found so just a plain alias
if (!$info) {
$_REQUEST['page'] = $newPage;
$_GET['page'] = $newPage;
$page = $newPage;
$info = $tikilib->get_page_info($_REQUEST['page']);
}
} else {
$likepages = array_unique(array_merge($likepages, $referencedPages));
......
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