Commit 6eae7784 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Easier viewing of of artefact->file plugin config (Bug #1326160)"

parents cdb7d2a1 9a82de84
......@@ -1494,7 +1494,8 @@ class ArtefactTypeFile extends ArtefactTypeFileBase {
'type' => 'checkbox',
)
),
'collapsible' => true
'collapsible' => true,
'collapsed' => true
);
$override = get_config_plugin('artefact', 'file', 'institutionaloverride');
......@@ -1512,6 +1513,7 @@ class ArtefactTypeFile extends ArtefactTypeFileBase {
),
),
'collapsible' => true,
'collapsed' => true
);
$maxquota = get_config_plugin('artefact', 'file', 'maxquota');
......@@ -1537,7 +1539,8 @@ class ArtefactTypeFile extends ArtefactTypeFileBase {
'defaultvalue' => $maxquota,
),
),
'collapsible' => true
'collapsible' => true,
'collapsed' => true
);
$defaultgroupquota = get_config_plugin('artefact', 'file', 'defaultgroupquota');
......@@ -1562,7 +1565,8 @@ class ArtefactTypeFile extends ArtefactTypeFileBase {
'type' => 'checkbox',
)
),
'collapsible' => true
'collapsible' => true,
'collapsed' => true
);
// Require user agreement before uploading files
......@@ -1601,7 +1605,8 @@ class ArtefactTypeFile extends ArtefactTypeFileBase {
'rules' => array('maxlength' => 65536),
),
),
'collapsible' => true
'collapsible' => true,
'collapsed' => true
);
// Option to resize images on upload
......@@ -1617,49 +1622,51 @@ class ArtefactTypeFile extends ArtefactTypeFileBase {
}
$elements['resizeonuploadfieldset'] = array(
'type' => 'fieldset',
'legend' => get_string('resizeonupload', 'artefact.file'),
'elements' => array(
'resizeonuploaddescription' => array(
'value' => get_string('resizeonuploaddescription', 'artefact.file'),
),
'resizeonuploadenable' => array(
'type' => 'checkbox',
'title' => get_string('resizeonuploadenable1', 'artefact.file'),
'defaultvalue' => $resizeonuploadenable,
'description' => get_string('resizeonuploadenabledescription1', 'artefact.file'),
),
'resizeonuploaduseroption' => array(
'title' => get_string('resizeonuploaduseroption1', 'artefact.file'),
'type' => 'checkbox',
'defaultvalue' => $resizeonuploaduseroption,
'description' => get_string('resizeonuploaduseroptiondescription1', 'artefact.file'),
),
'resizeonuploadmaxwidth' => array(
'type' => 'text',
'size' => 4,
'suffix' => get_string('widthshort'),
'title' => get_string('resizeonuploadmaxwidth', 'artefact.file'),
'defaultvalue' => $currentmaxwidth,
'rules' => array(
'required' => true,
'integer' => true,
)
),
'resizeonuploadmaxheight' => array(
'type' => 'text',
'suffix' => get_string('heightshort'),
'size' => 4,
'title' => get_string('resizeonuploadmaxheight', 'artefact.file'),
'defaultvalue' => $currentmaxheight,
'rules' => array(
'required' => true,
'integer' => true,
),
'help' => true,
),
'type' => 'fieldset',
'legend' => get_string('resizeonupload', 'artefact.file'),
'elements' => array(
'resizeonuploaddescription' => array(
'type' => 'html',
'value' => get_string('resizeonuploaddescription', 'artefact.file'),
),
'resizeonuploadenable' => array(
'type' => 'checkbox',
'title' => get_string('resizeonuploadenable1', 'artefact.file'),
'defaultvalue' => $resizeonuploadenable,
'description' => get_string('resizeonuploadenabledescription1', 'artefact.file'),
),
'resizeonuploaduseroption' => array(
'title' => get_string('resizeonuploaduseroption1', 'artefact.file'),
'type' => 'checkbox',
'defaultvalue' => $resizeonuploaduseroption,
'description' => get_string('resizeonuploaduseroptiondescription1', 'artefact.file'),
),
'resizeonuploadmaxwidth' => array(
'type' => 'text',
'size' => 4,
'suffix' => get_string('widthshort'),
'title' => get_string('resizeonuploadmaxwidth', 'artefact.file'),
'defaultvalue' => $currentmaxwidth,
'rules' => array(
'required' => true,
'integer' => true,
)
),
'resizeonuploadmaxheight' => array(
'type' => 'text',
'suffix' => get_string('heightshort'),
'size' => 4,
'title' => get_string('resizeonuploadmaxheight', 'artefact.file'),
'defaultvalue' => $currentmaxheight,
'rules' => array(
'required' => true,
'integer' => true,
),
'collapsible' => true
'help' => true,
),
),
'collapsible' => true,
'collapsed' => true
);
// Profile icon size
......@@ -1693,7 +1700,8 @@ class ArtefactTypeFile extends ArtefactTypeFileBase {
'help' => true,
),
),
'collapsible' => true
'collapsible' => true,
'collapsed' => true
);
$commentdefaults = array();
......@@ -1717,6 +1725,7 @@ class ArtefactTypeFile extends ArtefactTypeFileBase {
),
),
'collapsible' => true,
'collapsed' => true
);
$keepfor = get_config_plugin('artefact', 'file', 'folderdownloadkeepzipfor');
......@@ -1738,6 +1747,7 @@ class ArtefactTypeFile extends ArtefactTypeFileBase {
),
),
'collapsible' => true,
'collapsed' => true
);
$elements['quotanotification'] = array(
......@@ -1763,6 +1773,7 @@ class ArtefactTypeFile extends ArtefactTypeFileBase {
),
),
'collapsible' => true,
'collapsed' => true
);
return array(
......
......@@ -772,6 +772,18 @@ input#institution_suspend_submit {
margin: 0 0 3px 15px;
}
/* Extensions > Plugin administration > Configure */
#pluginconfig table {
width: 100%;
}
#pluginconfig th {
width: 20%;
}
#pluginconfig legend {
font-size: 1em;
}
#pluginconfig fieldset {
border-color: #D1D1D1;
}
#pluginconfig table td fieldset table {
margin: 0;
}
......
Supports Markdown
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