diff --git a/admin_lte.info.yml b/admin_lte.info.yml index 7997df7..cdfe254 100644 --- a/admin_lte.info.yml +++ b/admin_lte.info.yml @@ -22,6 +22,9 @@ core: 8.x libraries: - admin_lte/global-styling libraries-override: + core/drupal: + js: + misc/drupal.init.js: js/drupal.init.js classy/base: css: component: diff --git a/admin_lte.libraries.yml b/admin_lte.libraries.yml index 0d9a47f..cc6752e 100644 --- a/admin_lte.libraries.yml +++ b/admin_lte.libraries.yml @@ -5,7 +5,6 @@ global-styling: bootstrap/css/bootstrap.min.css: {} css/font-awesome.min.css: {} css/ionicons.min.css: {} - css/custom.css: {} dist/css/AdminLTE.min.css: {} dist/css/skins/_all-skins.min.css: {} css/base/typography.css: {} @@ -39,7 +38,7 @@ global-styling: css/layout/layout.css: {} js: bootstrap/js/bootstrap.min.js: {} - dist/js/app.js: {} + dist/js/app.min.js: {} dependencies: - system/admin diff --git a/admin_lte.theme b/admin_lte.theme index 7a3cb84..bede2f5 100644 --- a/admin_lte.theme +++ b/admin_lte.theme @@ -6,7 +6,6 @@ */ use Drupal\Core\Form\FormStateInterface; -use Drupal\Core\Render\Markup; /** * Implements hook_preprocess_HOOK() for HTML document templates. @@ -207,49 +206,3 @@ function admin_lte_preprocess_page(&$variables) { function admin_lte_preprocess_select(&$variables) { $variables['attributes']['class'][] = 'form-control'; } - -function admin_lte_preprocess_input__number(&$variables) { - $variables['attributes']['class'][] = 'form-text form-control'; -} - -function admin_lte_preprocess_input__date(&$variables) { - $variables['attributes']['class'][] = 'form-text form-control'; -} - -function admin_lte_preprocess_container(&$variables) { - $id = $variables['attributes']['id']; - if (preg_match('/edit-.*?-date.*?-wrapper/i',$id)) { - $variables['attributes']['class'][] = 'js-form-item form-item'; - } -} - -/* - * 临时解决办法 - */ -function admin_lte_preprocess_form(&$variables) { - $element = $variables['element']; - $id = $variables['attributes']['id']; - $variables['footer'] = true; - if (strpos($id,'views-form') !== false || strpos($id,'views-exposed') !== false ) { - $variables['footer'] = false; - return; - } - if (!empty($element['actions']['#children']) && !empty($element['#children'])) { - $formStr = $element['#children']->__toString(); - $actionStr = $element['actions']['#children']->__toString(); - $formStr = str_replace($actionStr,'',$formStr); - $element['#children'] = Markup::create($formStr); - $variables['children'] = $element['#children']; - } -} - -function admin_lte_preprocess_fieldset(&$variables) { - $element = $variables['element']; - $variables['legend']['display'] =true; - if (!empty($element['entities']) && !empty($element['entities']['#theme'])) { - $theme = $element['entities']['#theme']; - if ($theme == 'inline_entity_form_entity_table') { - $variables['legend']['display'] =false; - } - } -} diff --git a/css/custom.css b/css/custom.css deleted file mode 100644 index 4aa6f2f..0000000 --- a/css/custom.css +++ /dev/null @@ -1,5 +0,0 @@ -.views-exposed-form .form--inline .form-actions { - clear: none; - margin-top: 31px; -} - diff --git a/dist/js/app.js b/dist/js/app.js index da6dcec..8759426 100644 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -25,7 +25,6 @@ if (typeof jQuery === "undefined") { * prevents conflict with other plugins and is a better * way to organize our code. */ -(function ($) { $.AdminLTE = {}; /* -------------------- @@ -602,7 +601,7 @@ function _init() { } }; } -})(jQuery); + /* ------------------ * - Custom Plugins - * ------------------ diff --git a/fonts/ionicons.ttf b/fonts/ionicons.ttf new file mode 100644 index 0000000..c4e4632 Binary files /dev/null and b/fonts/ionicons.ttf differ diff --git a/fonts/ionicons.woff b/fonts/ionicons.woff new file mode 100644 index 0000000..5f3a14e Binary files /dev/null and b/fonts/ionicons.woff differ diff --git a/templates/form/datetime-wrapper.html.twig b/templates/form/datetime-wrapper.html.twig deleted file mode 100644 index e31ba97..0000000 --- a/templates/form/datetime-wrapper.html.twig +++ /dev/null @@ -1,35 +0,0 @@ -{# -/** - * @file - * Theme override of a datetime form wrapper. - * - * Available variables: - * - content: The form element to be output, usually a datelist, or datetime. - * - title: The title of the form element. - * - title_attributes: HTML attributes for the title wrapper. - * - description: Description text for the form element. - * - required: An indicator for whether the associated form element is required. - * - * @see template_preprocess_datetime_wrapper() - */ -#} -{% -set title_classes = [ -required ? 'js-form-required', -required ? 'form-required', -] -%} -{% if title %} - {{ title }} -{% endif %} -{{ content }} -{% if errors %} -
- {{ errors }} -
-{% endif %} -{% if description %} - - {{ description }} - -{% endif %} \ No newline at end of file diff --git a/templates/form/fieldset.html.twig b/templates/form/fieldset.html.twig deleted file mode 100644 index 7a4a818..0000000 --- a/templates/form/fieldset.html.twig +++ /dev/null @@ -1,62 +0,0 @@ -{# -/** - * @file - * Theme override for a fieldset element and its children. - * - * Available variables: - * - attributes: HTML attributes for the fieldset element. - * - errors: (optional) Any errors for this fieldset element, may not be set. - * - required: Boolean indicating whether the fieldeset element is required. - * - legend: The legend element containing the following properties: - * - title: Title of the fieldset, intended for use as the text of the legend. - * - attributes: HTML attributes to apply to the legend. - * - description: The description element containing the following properties: - * - content: The description content of the fieldset. - * - attributes: HTML attributes to apply to the description container. - * - children: The rendered child elements of the fieldset. - * - prefix: The content to add before the fieldset children. - * - suffix: The content to add after the fieldset children. - * - * @see template_preprocess_fieldset() - */ -#} -{% - set classes = [ - 'js-form-item', - 'form-item', - 'js-form-wrapper', - 'form-wrapper', - ] -%} - - {% - set legend_span_classes = [ - 'fieldset-legend', - required ? 'js-form-required', - required ? 'form-required', - ] - %} - {# Always wrap fieldset legends in a for CSS positioning. #} - {% if legend.display %} - - {{ legend.title }} - - {% endif %} -
- {% if errors %} -
- {{ errors }} -
- {% endif %} - {% if prefix %} - {{ prefix }} - {% endif %} - {{ children }} - {% if suffix %} - {{ suffix }} - {% endif %} - {% if description.content %} - {{ description.content }}
- {% endif %} - - diff --git a/templates/form/form-element.html.twig b/templates/form/form-element.html.twig deleted file mode 100644 index 57269f9..0000000 --- a/templates/form/form-element.html.twig +++ /dev/null @@ -1,96 +0,0 @@ -{# -/** - * @file - * Theme override for a form element. - * - * Available variables: - * - attributes: HTML attributes for the containing element. - * - errors: (optional) Any errors for this form element, may not be set. - * - prefix: (optional) The form element prefix, may not be set. - * - suffix: (optional) The form element suffix, may not be set. - * - required: The required marker, or empty if the associated form element is - * not required. - * - type: The type of the element. - * - name: The name of the element. - * - label: A rendered label element. - * - label_display: Label display setting. It can have these values: - * - before: The label is output before the element. This is the default. - * The label includes the #title and the required marker, if #required. - * - after: The label is output after the element. For example, this is used - * for radio and checkbox #type elements. If the #title is empty but the - * field is #required, the label will contain only the required marker. - * - invisible: Labels are critical for screen readers to enable them to - * properly navigate through forms but can be visually distracting. This - * property hides the label for everyone except screen readers. - * - attribute: Set the title attribute on the element to create a tooltip but - * output no label element. This is supported only for checkboxes and radios - * in \Drupal\Core\Render\Element\CompositeFormElementTrait::preRenderCompositeFormElement(). - * It is used where a visual label is not needed, such as a table of - * checkboxes where the row and column provide the context. The tooltip will - * include the title and required marker. - * - description: (optional) A list of description properties containing: - * - content: A description of the form element, may not be set. - * - attributes: (optional) A list of HTML attributes to apply to the - * description content wrapper. Will only be set when description is set. - * - description_display: Description display setting. It can have these values: - * - before: The description is output before the element. - * - after: The description is output after the element. This is the default - * value. - * - invisible: The description is output after the element, hidden visually - * but available to screen readers. - * - disabled: True if the element is disabled. - * - title_display: Title display setting. - * - * @see template_preprocess_form_element() - */ -#} -{% - set classes = [ - 'js-form-item', - 'form-item', - 'js-form-type-' ~ type|clean_class, - 'form-type-' ~ type|clean_class, - 'js-form-item-' ~ name|clean_class, - 'form-item-' ~ name|clean_class, - title_display not in ['after', 'before'] ? 'form-no-label', - disabled == 'disabled' ? 'form-disabled', - errors ? 'form-item--error', - 'form-group', - ] -%} -{% - set description_classes = [ - 'description', - description_display == 'invisible' ? 'visually-hidden', - ] -%} - - {% if label_display in ['before', 'invisible'] %} - {{ label }} - {% endif %} - {% if prefix is not empty %} - {{ prefix }} - {% endif %} - {% if description_display == 'before' and description.content %} - - {{ description.content }} - - {% endif %} - {{ children }} - {% if suffix is not empty %} - {{ suffix }} - {% endif %} - {% if label_display == 'after' %} - {{ label }} - {% endif %} - {% if errors %} -
- {{ errors }} -
- {% endif %} - {% if description_display in ['after', 'invisible'] and description.content %} - - {{ description.content }} - - {% endif %} - diff --git a/templates/form/form.html.twig b/templates/form/form.html.twig deleted file mode 100644 index 9a566d6..0000000 --- a/templates/form/form.html.twig +++ /dev/null @@ -1,24 +0,0 @@ -{# -/** - * @file - * Theme override for a 'form' element. - * - * Available variables - * - attributes: A list of HTML attributes for the wrapper element. - * - children: The child elements of the form. - * - * @see template_preprocess_form() - */ -#} -
- -
- {{ children }} -
- {% if footer %} -
- {{ element.actions }} -
- {% endif %} - -