Merge remote-tracking branch 'origin/develop' into feature/es6_revamp

# Conflicts:
#	themes/grav/css-compiled/template.css
#	themes/grav/css-compiled/template.css.map
#	themes/grav/scss/template/_editor.scss
#	themes/grav/scss/template/_forms.scss
#	themes/grav/scss/template/_remodal.scss
#	themes/grav/templates/partials/base.html.twig
#	themes/grav/templates/partials/dashboard-statistics.html.twig
This commit is contained in:
Djamil Legato
2016-03-02 11:13:06 -08:00
89 changed files with 15841 additions and 890 deletions

View File

@@ -79,8 +79,6 @@ class AdminPlugin extends Plugin
'onAdminDashboard' => ['onAdminDashboard', 0],
];
}
return [];
}
@@ -514,6 +512,35 @@ class AdminPlugin extends Plugin
exit;
}
/**
* Get list of form field types specified in this plugin. Only special types needs to be listed.
*
* @return array
*/
public function getFormFieldTypes()
{
return [
'column' => [
'form_field' => false
],
'columns' => [
'form_field' => false
],
'fieldset' => [
'form_field' => false
],
'section' => [
'form_field' => false
],
'tab' => [
'form_field' => false
],
'tabs' => [
'form_field' => false
]
];
}
/**
* Initialize the admin.
*