Commit bc5c0600 authored by Jonny Bradley's avatar Jonny Bradley

[MRG] Automatic merge, branches/6.x 31284 to 31312

parent b35597a7
......@@ -20,8 +20,8 @@ function prefs_display_list() {
),
),
'display_html_in_menus' => array(
'name' => tra('Allow HTML in menu options'),
'description' => tra('Use to "escape" and display HTML in menu options. If disabled, the literal code will be shown instead.'),
'name' => tra('Escape HTML in menu options'),
'description' => tra('Use to "escape" or render HTML in menu options. If disabled, HTML will be allowed in menu options. Your code must be valid. If enabled, HTML code will be "escaped" and shown literally (as code) instead.'),
'help' => 'Menus',
'type' => 'flag',
),
......
......@@ -362,30 +362,10 @@ function getTASelection( textarea ) {
if (cked) {
var sel = cked.getSelection();
if (sel && sel.getType() === CKEDITOR.SELECTION_TEXT) { // why so fiddly?
r = sel.getRanges();
// collect all included elements from ranges
var output = "", el;
if (r[0].collapsed) {
return output;
} else if (r[0].startContainer.$ === r[0].endContainer.$) {
output += r[0].startContainer.getText().substring(r[0].startOffset, r[0].endOffset);
if (CKEDITOR.env.ie) {
output = sel.document.$.selection.createRange().text;
} else {
el = sel.getStartElement();
if (el) {
if (!el.$.nextSibling) {
el = el.getChildren().getItem(0); // for node lists
}
while (el.$.nextSibling) { // loop through selection if multiple elements
if (el.$ === r[0].startContainer.$) {
output += el.getText().substring(r[0].startOffset);
} else if (el.$ === r[0].endContainer.$) {
output += el.getText().substring(0, r[0].endOffset);
} else {
output += el.getText();
}
el = new CKEDITOR.dom.element(el.$.nextSibling);
}
}
output = sel.getNative().toString();
}
return output;
}
......
......@@ -100,7 +100,9 @@ h1, h2, h3, h4, h5 {
font-weight: bold;
letter-spacing: -1px;
margin: 0 0 15px;
padding: 0}
padding: 0;
line-height: 1.1;
}
h1 {font-size:1.6em}
h2 {font-size: 1.5em}
......@@ -492,7 +494,7 @@ html>body .box:hover {background: #0e1d10}
height: 13px;
overflow: hidden;
background: #586858 url(abse/titlebgoff.png) repeat-x 0 1px;
color: #b3b3b3;
color: #c2c2c2;
font-size: 1em;
font-weight: normal;
margin: 0 0 12px}
......
......@@ -94,6 +94,7 @@ h5 {
color: #000;
font-family: "Trebuchet MS",Verdana,Arial,Helvetica,sans-serif;
font-weight: bold;
line-height: 1.1;
}
h1 {
......
......@@ -35,6 +35,7 @@ h1 {
font-weight: bold;
font-size: 1.8em;
margin: 0;
line-height: 1;
}
h2 {
......@@ -255,6 +256,7 @@ body.tiki_wiki_page.manage #c1c2 #wrapper #col1 #tiki-center {
#col3 .content {
margin-left: 0;
padding-top: 1px;
padding-right: 18px;
}
#footer {
......
......@@ -1148,15 +1148,16 @@ a.wiki {
text-decoration: underline;
}
.wikitext h1,
.wikitext h2,
.wikitext h3,
.wikitext h4 {
h1,
h2,
h3,
h4 {
color: #b2b2b2;
font-weight: bold;
letter-spacing: -1px;
margin: 0 0 15px;
padding: 0;
line-height: 1.1;
}
.wikitext h2 {
......
......@@ -78,6 +78,10 @@ a:active, a:hover {
text-decoration: none;
}
h1, h2, h3, h4, h5 {
line-height: 1.1;
}
h1 {
font-size: 180%;
}
......
......@@ -183,6 +183,15 @@ li.login_link ul li a {
background: none !important;
}
/* Input fields autofill */
/* Webkit based browser specific (Google Chrome, Chromium, etc.) */
input:-webkit-autofill {
background-color: #FAFFBD !important; /* needs important because Chrome has it already important */
background-image: none !important;
color: #000 !important; /* the Google guys they forgot the number one rule... when they specify background they should specify forgeround color too ;) */
}
/* Center column */
.tellafriend,
......@@ -218,8 +227,7 @@ a.flip:hover,
}
.openid_url {
background: #fff url(../../img/icons/login-OpenID-bg.gif) no-repeat;
padding-left: 18px;
background: #fff url(../../img/icons/login-OpenID-bg.gif) 1px 1px no-repeat;
}
.bannertext {
......
......@@ -91,6 +91,13 @@ input[type=submit] {
width: 95%;
}
#col2 input.openid_url,
#col3 input.openid_url {
padding: 1px 1px 1px 18px;
min-height: 16px;
width: 85%;
}
label {
cursor: pointer;
vertical-align: middle;
......
......@@ -99,6 +99,10 @@ a:hover {
.wikitext a.link:hover {
color: #f4f4f4 !important;
text-decoration: none !important}
h1, h2, h3, h4, h5, h6 {
line-height: 1.1;
}
h1 {
font-weight: bold;
......
......@@ -72,7 +72,9 @@ dt {font-weight: bold}
h1, h2, h3, h4, h5 {
font-weight: bold;
color: #6c7b8c}
color: #6c7b8c;
line-height: 1.1;
}
h1 {font-size: 1.7em}
......@@ -497,7 +499,8 @@ h3.box-title {
color: #393e51;
font-size: 120%;
overflow: hidden;
border-bottom: 1px solid #6c7b8c;
border-bottom: 1px solid #6c7b8c;
line-height: normal;
}
#col2 h3.box-title,
......
......@@ -1020,6 +1020,7 @@ h1 a.pagetitle {
.wikitext h4 {
margin: 0 0 15px;
padding: 0;
line-height: 1.1;
}
.wikitext h2 {
......
......@@ -104,6 +104,7 @@ h1, h2, h3, h4, h5, h6 {
margin: 0;
margin-bottom: 3px;
color: #234956;
line-height: 1.1;
}
h1 {
......
......@@ -893,8 +893,10 @@ a.forumspagetitle:hover {
.wikitext h2,
.wikitext h3,
.wikitext h4 {
margin: 0 0 15px;
padding: 0}
margin: 7px 0 15px;
padding: 0;
line-height: 1.1;
}
.wikitext h2 {margin-bottom: 10px}
......
......@@ -2,6 +2,11 @@
{* wrapper for site header top items (div#header-top start/end tags, site identity options. login form is custom in this theme.) *}
{include file='tiki-site_header_top_begin.tpl'}
{include file='tiki-secondary_sitemenu.tpl'}
{include file='tiki-site_header_login.tpl'}
<div id="login_search">
<div class="wrapper">
{include file='tiki-site_header_login.tpl'}
{include file='tiki-sitesearchbar.tpl'}
</div>
</div>
{include file='tiki-site_header_options.tpl'}
{include file='tiki-site_header_top_end.tpl'}
\ No newline at end of file
......@@ -135,12 +135,12 @@
{/if}
{if $pages > 1 and $prefs.wiki_page_navigation_bar neq 'bottom'}
<div align="center">
<div class="center navigation_bar pagination position_top">
<a href="tiki-index.php?{if $page_info}page_ref_id={$page_info.page_ref_id}{else}page={$page|escape:"url"}{/if}&amp;pagenum={$first_page}">{icon _id='resultset_first' alt="{tr}First page{/tr}"}</a>
<a href="tiki-index.php?{if $page_info}page_ref_id={$page_info.page_ref_id}{else}page={$page|escape:"url"}{/if}&amp;pagenum={$prev_page}">{icon _id='resultset_previous' alt="{tr}Previous page{/tr}"}</a>
<small>{tr}page{/tr}:{$pagenum}/{$pages}</small>
<small>{tr 0=$pagenum 1=$pages}page: %0/%1{/tr}</small>
<a href="tiki-index.php?{if $page_info}page_ref_id={$page_info.page_ref_id}{else}page={$page|escape:"url"}{/if}&amp;pagenum={$next_page}">{icon _id='resultset_next' alt="{tr}Next page{/tr}"}</a>
......@@ -190,7 +190,7 @@
{if $pages > 1 and $prefs.wiki_page_navigation_bar neq 'top'}
<br />
<div align="center">
<div class="center navigation_bar pagination position_bottom">
<a href="tiki-index.php?{if $page_info}page_ref_id={$page_info.page_ref_id}{else}page={$page|escape:"url"}{/if}&amp;pagenum={$first_page}">{icon _id='resultset_first' alt="{tr}First page{/tr}"}</a>
<a href="tiki-index.php?{if $page_info}page_ref_id={$page_info.page_ref_id}{else}page={$page|escape:"url"}{/if}&amp;pagenum={$prev_page}">{icon _id='resultset_previous' alt="{tr}Previous page{/tr}"}</a>
......
......@@ -46,7 +46,7 @@
{if $prefs.feature_layoutshadows eq 'y'}<div id="middle-shadow">{eval var=$prefs.middle_shadow_start}{/if}<div class="clearfix" id="middle">
<div class="clearfix {if $prefs.feature_fullscreen != 'y' or $smarty.session.fullscreen != 'y'}nofullscreen{else}fullscreen{/if}" id="c1c2">
<div class="clearfix" id="wrapper">
<div id="col1" class="{if $prefs.feature_left_column eq 'fixed' or ($prefs.feature_left_column ne 'n' && $left_modules|@count > 0 && $show_columns.left_modules ne 'n')}marginleft{/if}{if $prefs.feature_left_column eq 'fixed' or ($prefs.feature_right_column ne 'n' && $right_modules|@count > 0 && $show_columns.right_modules ne 'n')} marginright{/if}"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}>
<div id="col1" class="{if $prefs.feature_left_column eq 'fixed' or ($prefs.feature_left_column ne 'n' && $left_modules|@count > 0 && $show_columns.left_modules ne 'n')}marginleft{/if}{if $prefs.feature_right_column eq 'fixed' or ($prefs.feature_right_column ne 'n' && $right_modules|@count > 0 && $show_columns.right_modules ne 'n')} marginright{/if}"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}>
{if $smarty.session.fullscreen neq 'y'}
{if $prefs.feature_left_column eq 'user' or $prefs.feature_right_column eq 'user'}
......
......@@ -125,15 +125,6 @@ if (!$skip) {
die;
}
}
$gal_info = $filegallib->get_file_gallery_info((int) $info['galleryId']);
if ($gal_info['user'] != $user && $gal_info['visible'] != 'y' && $tiki_p_admin_file_galleries != 'y') {
$smarty->assign('errortype', 401);
$smarty->assign('msg', tra('You do not have permission to view files in this gallery'));
$smarty->display('error_simple.tpl');
die;
}
} else {
$gal_info = null;
}
// Add hits ( if download or display only ) + lock if set
......
......@@ -58,12 +58,6 @@ if ( empty($_REQUEST['galleryId']) && isset($_REQUEST['parentId']) ) {
if ($userlib->object_has_one_permission($_REQUEST['galleryId'], 'file gallery')) {
$smarty->assign('individual', 'y');
}
if ($gal_info['user'] != $user && $gal_info['visible'] != 'y' && $tiki_p_admin_file_galleries != 'y') {
$smarty->assign('errortype', 401);
$smarty->assign('msg', tra('You do not have permission to view this gallery'));
$smarty->display('error.tpl');
die;
}
$podCastGallery = $filegallib->isPodCastGallery($_REQUEST['galleryId'], $gal_info);
} else {
$smarty->assign('msg', tra('Non-existent gallery'));
......
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