Commit 08134bb1 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Hide deprecated skin controls"

parents 043bce8e feae8cbc
......@@ -34,7 +34,7 @@ $string['element.files.addattachment'] = 'Add attachment';
$string['element.select.other'] = 'Other';
$string['element.color.transparent'] = 'Transparent or ';
$string['element.color.transparent'] = 'Default or ';
$string['rule.before.before'] = 'This cannot be after the field "%s"';
......
......@@ -73,10 +73,10 @@ $string['noskin'] = 'No skin';
// Create Skin Form Fieldsets
$string['skingeneraloptions'] = 'General';
$string['skinbackgroundoptions'] = 'Skin background';
$string['skinbackgroundoptions1'] = 'Background';
$string['viewbackgroundoptions'] = 'Page background';
$string['viewheaderoptions'] = 'Page header';
$string['viewcontentoptions'] = 'Page fonts and colours';
$string['viewcontentoptions1'] = 'Fonts and colours';
$string['viewtableoptions'] = 'Page tables and buttons';
$string['viewadvancedoptions'] = 'Advanced';
......@@ -90,7 +90,7 @@ $string['siteskinaccess'] = 'This is a site skin';
$string['Untitled'] = 'Untitled';
$string['backgroundcolor'] = 'Background colour';
$string['bodybgcolor'] = 'Skin background colour';
$string['bodybgcolor1'] = 'Background colour';
$string['viewbgcolor'] = 'Page background colour';
$string['textcolor'] = 'Text colour';
$string['textcolordescription'] = 'This is the colour of normal text.';
......@@ -98,7 +98,7 @@ $string['headingcolor'] = 'Heading text colour';
$string['headingcolordescription'] = 'This is the colour of a page heading.';
$string['emphasizedcolor'] = 'Emphasized text colour';
$string['emphasizedcolordescription'] = 'This is the colour of page sub-headings and emphasized text.';
$string['bodybgimage'] = 'Skin background image';
$string['bodybgimage1'] = 'Background image';
$string['viewbgimage'] = 'Page background image';
$string['backgroundrepeat'] = 'Background image repeat';
$string['backgroundrepeatboth'] = 'Repeat both directions';
......
......@@ -134,12 +134,12 @@ $elements['viewskin'] = array(
);
$elements['skinbg'] = array(
'type' => 'fieldset',
'legend' => get_string('skinbackgroundoptions', 'skin'),
'legend' => get_string('skinbackgroundoptions1', 'skin'),
'class' => $fieldset != 'skinbg' ? 'collapsed' : '',
'elements' => array(
'body_background_color' => array(
'type' => 'color',
'title' => get_string('bodybgcolor', 'skin'),
'title' => get_string('bodybgcolor1', 'skin'),
'defaultvalue' => (!empty($viewskin['body_background_color']) ? $viewskin['body_background_color'] : '#FFFFFF'),
'size' => 7,
'options' => array(
......@@ -154,7 +154,7 @@ if (!$designsiteskin) {
$elements['skinbg']['elements'] = array_merge($elements['skinbg']['elements'], array(
'body_background_image' => array(
'type' => 'filebrowser',
'title' => get_string('bodybgimage', 'skin'),
'title' => get_string('bodybgimage1', 'skin'),
'folder' => ((isset($folder)) ? $folder : 0),
'highlight' => $highlight,
'browse' => ((isset($folder)) ? 1 : 0),
......@@ -210,7 +210,7 @@ if (!$designsiteskin) {
$elements['viewbg'] = array(
'type' => 'fieldset',
'legend' => get_string('viewbackgroundoptions', 'skin'),
'class' => $fieldset != 'viewbg' ? 'collapsed' : '',
'class' => 'hidden',
'elements' => array(
'view_background_color' => array(
'type' => 'color',
......@@ -296,7 +296,7 @@ if (!$designsiteskin) {
$elements['viewheader'] = array(
'type' => 'fieldset',
'legend' => get_string('viewheaderoptions', 'skin'),
'class' => $fieldset != 'viewheader' ? 'collapsed' : '',
'class' => 'hidden',
'elements' => array(
'header_background_color' => array(
'type' => 'color',
......@@ -360,7 +360,7 @@ $elements['viewheader'] = array(
);
$elements['viewcontent'] = array(
'type' => 'fieldset',
'legend' => get_string('viewcontentoptions', 'skin'),
'legend' => get_string('viewcontentoptions1', 'skin'),
'class' => $fieldset != 'viewcontent' ? 'collapsed' : '',
'elements' => array(
'view_heading_font_family' => array(
......@@ -455,7 +455,7 @@ $elements['viewcontent'] = array(
$elements['viewtable'] = array(
'type' => 'fieldset',
'legend' => get_string('viewtableoptions', 'skin'),
'class' => $fieldset != 'viewtable' ? 'collapsed' : '',
'class' => 'hidden',
'elements' => array(
'view_table_border_color' => array(
'type' => 'color',
......
......@@ -26,9 +26,11 @@ jQuery(function($) {
id = $(tabcontent[i]).attr('id');
heading = $(tabcontent[i]).find('legend h4').first().text();
listitem = '<li role="presentation"><a href="#'+id+'" role="tab" data-toggle="tab">'+heading+'</a></li>';
mahara.tabnav.append(listitem);
// if the tab-pane isn't hidden
if (!$(tabcontent[i]).hasClass('hidden')) {
listitem = '<li role="presentation"><a href="#'+id+'" role="tab" data-toggle="tab">'+heading+'</a></li>';
mahara.tabnav.append(listitem);
}
}
// set first tab active
......
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