Commit bd69a0ce authored by Jonny Bradley's avatar Jonny Bradley

[MRG] Automatic merge, branches/7.x 35623 to 35708

parent 0c0e75d2
......@@ -197,8 +197,8 @@ class TikiDb_LegacyErrorHandler implements TikiDb_ErrorHandler
} // }}}
function log($msg) {
global $user, $tikilib;
$query = 'insert into `tiki_actionlog` (`objectType`,`action`,`object`,`user`,`ip`,`lastModif`, `comment`) values (?,?,?,?,?,?,?)';
$result = $tikilib->query($query, array('system', 'db error', 'system', $user, $tikilib->get_ip_address(), $tikilib->now, $msg));
$query = 'insert into `tiki_actionlog` (`objectType`,`action`,`object`,`user`,`ip`,`lastModif`, `comment`, `client`) values (?,?,?,?,?,?,?,?)';
$result = $tikilib->query($query, array('system', 'db error', 'system', $user, $tikilib->get_ip_address(), $tikilib->now, $msg, substr($_SERVER['HTTP_USER_AGENT'],0,200)));
} // }}}
}
......
......@@ -2029,7 +2029,7 @@ function dialogReplaceReplace( area_id ) {
.css('display', 'block')
.css('cursor', 'pointer')
.click(function () {
var address = prompt(tr('What address are you looking for?', ''));
var address = prompt(tr('What address are you looking for?'));
if (address) {
$.getJSON('tiki-ajax_services.php', {geocode: address}, function (data) {
......
......@@ -35,7 +35,7 @@ function initThemeGenDialog() { // closure for colorpicker code
$(this).ColorPickerSetColor(c);
if ($(".tgLivePreview:checked", $(colorPickerListItem).parent().parent()).length) {
tgLivePreviews = []
tgLivePreviews = [];
m = $(colorInput, colorPickerListItem).attr("name");
m = m.match(/\[(.*?)\]/); // colour type
if (m) {m = m[1];}
......@@ -175,7 +175,7 @@ function initThemeGenDialog() { // closure for colorpicker code
});
}
}
}
};
if ("em|ex|in|cm|mm".indexOf(unit) > -1 ) {
options.min = 0;
options.max = val * 5;
......@@ -201,7 +201,7 @@ function initThemeGenDialog() { // closure for colorpicker code
"border-top-left-radius", "-webkit-border-top-left-radius", "-moz-border-radius-topleft",
"border-top-right-radius", "-webkit-border-top-right-radius", "-moz-border-radius-topright",
"border-bottom-left-radius", "-webkit-border-bottom-left-radius", "-moz-border-radius-bottomleft",
"border-bottom-right-radius", "-webkit-border-bottom-right-radius", "-moz-border-radius-bottomright",
"border-bottom-right-radius", "-webkit-border-bottom-right-radius", "-moz-border-radius-bottomright"
];
}
var zall = $(":visible:not(#themegenerator_container *)");
......@@ -234,10 +234,10 @@ function initThemeGenDialog() { // closure for colorpicker code
} else {
return 0;
}
}
};
var setNumber = function ($el, val) {
$el.val(val + getUnit($el));
}
};
var getUnit = function ($el) {
var m = $el.val().match(/[\d\.\-+]+(px|em|ex|%|in|cm|mm|pt|pc)?/);
if (m) {
......@@ -270,7 +270,7 @@ function initThemeGenDialog() { // closure for colorpicker code
$("#tg_css_file", "#themegenerator_container").change(function() {
openThemeGenDialog();
});
};
}
function openThemeGenDialog( themename ) {
......@@ -283,7 +283,7 @@ function openThemeGenDialog( themename ) {
var t = getCookie("top", "themegen");
var w = getCookie("width", "themegen", 660);
var h = getCookie("height", "themegen", 500);
var p = "center"
var p = "center";
if (l !== null && t !== null) {
p = [ parseInt(l, 10), parseInt(t, 10) ];
......
......@@ -921,7 +921,7 @@ class NlLib extends TikiLib
$smarty->assign("nlArticleClipAuthorName", $art["authorName"]);
$articleClip .= $smarty->fetch("mail/newsletter_articleclip.tpl");
}
return $articleClip;
return '<div class="articleclip">'.$articleClip.'</div>';
}
// functions for getting email addresses from wiki pages
......
......@@ -46,9 +46,12 @@ $base_url = $url_scheme.'://'.$url_host.(($url_port!='')?':'.$url_port:'').$url_
$base_url_http = 'http://'.$url_host.(($prefs['http_port']!='')?':'.$prefs['http_port']:'').$url_path;
$base_url_https = 'https://'.$url_host.(($prefs['https_port']!='')?':'.$prefs['https_port']:'').$url_path;
// for <base> tag, which needs the " absolute URI that acts as the base URI for resolving relative URIs", not just the root of the site
$base_uri = !empty($_SERVER['REDIRECT_SCRIPT_URI']) ? $_SERVER['REDIRECT_SCRIPT_URI'] : isset($_SERVER['SCRIPT_URI']) ? $_SERVER['SCRIPT_URI'] : $base_url;
$base_uri = !empty($_SERVER['REDIRECT_SCRIPT_URI']) ?
$_SERVER['REDIRECT_SCRIPT_URI'] : isset($_SERVER['SCRIPT_URI']) ?
$_SERVER['SCRIPT_URI'] : isset($_SERVER['REQUEST_URI']) ?
$base_host . $_SERVER['REQUEST_URI'] : '';
global $smarty;
if (is_object($smarty)) {
if (!empty($base_uri) && is_object($smarty)) {
$smarty->assign('base_uri', $base_uri);
}
......
......@@ -145,6 +145,7 @@ class TWVersion
'7.0RC1',
'7.0',
'7.1RC1',
'7.1RC2',
);
}
......
......@@ -3,7 +3,7 @@
//
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// $Id: resource.wiki.php 33381 2011-03-14 20:13:10Z luciash $
// $Id$
if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) {
header("location: index.php");
......
......@@ -89,9 +89,9 @@ function wikiplugin_fancytable($data, $params) {
//mask tiki tag content during processing and bring back at the end so that any pipes (| or ~|~)
//inside of tags aren't mistaken for cell dividers
//pattern covers (( )), [ ], ~np~ ~/np~, ~tc~ ~/tc~, ~hc~ ~/hc~, { = } (plugins with parameters)
//pattern covers (( )), [ ], ~np~ ~/np~, ~tc~ ~/tc~, ~hc~ ~/hc~, { }
$pattern = '/(\(\([^\)\)]+\)\)|\[[^\]]+\]|~np~(?:(?!~\/np~).)*~\/np~|~tc~(?:(?!~\/tc~).)*~\/tc~'
. '|~hc~(?:(?!~\/hc~).)*~\/hc~|\{[^\=]+[\=]+[^\=\}]+\})/';
. '|~hc~(?:(?!~\/hc~).)*~\/hc~|\{(?:(?!\}).)*\})/';
//process header
if (isset($head)) {
if (!empty($headclass)) {
......
......@@ -1123,7 +1123,7 @@ function wikiplugin_img_info() {
$javaset = '';
}
// Set link to user setting or to image itself if thumb is set
if (!empty($imgdata['link']) || !empty($imgdata['thumb'])) {
if (!empty($imgdata['link']) || (!empty($imgdata['thumb']) && !(isset($params['link']) && empty($params['link'])))) {
$mouseover = '';
if (!empty($imgdata['link'])) {
$link = $imgdata['link'];
......
......@@ -454,6 +454,15 @@ select {
font-size: 12px;
}
#top_modules #secondary_site_menu ul ul a,
#top_modules #secondary_site_menu ul ul a:visited {
color: #fff;
font-weight: normal;
text-decoration: none;
text-transform: none;
font-size: 12px;
}
#sitesearchbar {
color: #fff;
height: 45px;
......@@ -762,7 +771,8 @@ li.login_link ul li a {
text-transform: none;
}
#tiki-top .cssmenu_horiz ul li:hover a {
#tiki-top .cssmenu_horiz ul li:hover a,
#secondary_site_menu .cssmenu_horiz ul li:hover a {
text-decoration: none;
}
......
......@@ -74,14 +74,19 @@
<input type = "submit" class = "wikiaction tips{if $smod_params.default_button eq 'go'} button_default{/if}"
name = "go" value = "{$smod_params.go_submit}"
title="{tr}Search{/tr}|{tr}Go directly to a page, or search in page titles if exact match is not found.{/tr}"
onclick = "$('#search-module-form{$search_mod_usage_counter}').attr('action', '{$smod_params.go_action}').attr('page_selected','');" />
onclick = "$('#search-module-form{$search_mod_usage_counter}').attr('action', '{$smod_params.go_action}').attr('page_selected','');
{if $smod_params.search_action eq 'tiki-searchindex.php'}
$('#search-module-form{$search_mod_usage_counter} input[name=\'filter~content\']').attr('name', 'find');
{/if}" />
<input type="hidden" name="exact_match" value="" />
{/if}
{if $smod_params.show_edit_button eq 'y' and $tiki_p_edit eq 'y'}
<input type = "submit" class = "wikiaction tips{if $smod_params.default_button eq 'edit'} button_default{/if}"
name = "edit" value = "{$smod_params.edit_submit}"
title="{tr}Search{/tr}|{tr}Edit existing page or create a new one.{/tr}"
onclick = "$('#search-module-form{$search_mod_usage_counter} input[name!=find]').attr('name', ''); $('#search-module-form{$search_mod_usage_counter} input[name=find]').attr('name', 'page'); $('#search-module-form{$search_mod_usage_counter}').attr('action', '{$smod_params.edit_action}').attr('page_selected','');" />
onclick = "$('#search-module-form{$search_mod_usage_counter} input[name!={if $smod_params.search_action eq 'tiki-searchindex.php'}\'filter~content\'{else}\'find\'{/if}]').attr('name', '');
$('#search-module-form{$search_mod_usage_counter} input[name={if $smod_params.search_action eq 'tiki-searchindex.php'}\'filter~content\'{else}\'find\'{/if}]').attr('name', 'page');
$('#search-module-form{$search_mod_usage_counter}').attr('action', '{$smod_params.edit_action}').attr('page_selected','');" />
{/if}
{if $smod_params.compact eq "y"}
</div>
......
......@@ -49,7 +49,10 @@ if ($calendarViewMode['casedefault'] == 'day') {
} else {
$smarty->assign('currMonth', $focusdate);
}
$smarty->assign('daysnames', $daysnames);
$smarty->assign('daysnames_abr', $daysnames_abr);
$viewdays = array(0,1,2,3,4,5,6);
$smarty->assign('viewdays', $viewdays);
$smarty->assign('hrows', $hrows);
$smarty->assign('hours', $hours);
......
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