Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2026-05-07 11:56:32 +02:00
Code Issues Packages Projects Releases Activity

Update changelog and remove form fields that are now in Form plugin

Browse Source
This commit is contained in:
Andy Miller
2018-12-19 11:42:46 -07:00
parent a7c040942c
commit 8fd2247887
5 changed files with 10 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@@ -1,3 +1,11 @@
# v1.9.0-beta.8
## mm/dd/2018
1. [](#improved)
* Unset state from user if not super or user admin
1. [](#bugfix)
* Removed `tabs`, `tab`, and `toggle` fields as they are now in Form plugin
# v1.9.0-beta.7
## 12/14/2018

4
blueprints.yaml
View File

@@ -14,8 +14,8 @@ docs: https://github.com/getgrav/grav-plugin-admin/blob/develop/README.md
license: MIT
dependencies:
- { name: grav, version: '>=1.6.0-beta.4' }
- { name: form, version: '>=3.0.0-beta.1' }
- { name: grav, version: '>=1.6.0-beta.8' }
- { name: form, version: '>=3.0.0-beta.5' }
- { name: login, version: '>=2.7.0' }
- { name: email, version: '>=2.7.0' }

18
themes/grav/templates/forms/fields/tab/tab.html.twig
View File

@@ -1,18 +0,0 @@
{% extends "forms/field.html.twig" %}
{% block field %}
{% if field.fields %}
<div class="form-tab">
{% for childName, child in field.fields %}
{% if child.type and not child.validate.ignore %}
{%- if childName starts with '.' -%}
{% set child = child|merge({ name: field.name ~ childName }) %}
{% endif %}
{% set value = child.name ? data.value(child.name) : data.toArray %}
{% include ["forms/fields/#{child.type}/#{child.type}.html.twig", 'forms/fields/text/text.html.twig'] with { field: child, value: data.value(child.name) } %}
{% endif %}
{% endfor %}
</div>
{% endif %}
{% endblock %}

47
themes/grav/templates/forms/fields/tabs/tabs.html.twig
View File

@@ -1,47 +0,0 @@
{% extends "forms/field.html.twig" %}
{% block field %}
<div class="form-tabs {{ field.class }} {{ field.classes }}">
{% if field.fields %}
{% set tabsKey = field.fields|keys|join('.') %}
{% set storedValue = get_cookie('grav-tabs-state')|default('{}')|json_decode %}
{% set storedTab = attribute(storedValue, 'tab-' ~ tabsKey) %}
{% if storedTab is empty %}
{% if uri.params.tab %}
{% set active = uri.params.tab %}
{% elseif field.active %}
{% set active = field.active %}
{% else %}
{% set active = 1 %}
{% endif %}
{% endif %}
<div class="tabs-nav">
{% for tab in field.fields %}
{% if tab.type == 'tab' and not tab.validate.ignore and (tab.security is empty or authorize(array(tab.security))) %}
<a class="tab__link {{ (storedTab == scope ~ tab.name) or active == loop.index ? 'active' : '' }}" data-tabid="tab-{{ tabsKey ~ loop.index }}" data-tabkey="tab-{{ tabsKey }}" data-scope="{{ scope ~ tab.name }}">
<span>
{% if grav.twig.twig.filters['tu'] is defined %}{{ tab.title|tu }}{% else %}{{ tab.title|t }}{% endif %}
</span>
</a>
{% endif %}
{% endfor %}
</div>
<div class="tabs-content">
{% for child in field.fields %}
{% if child.type == 'tab' and not tab.validate.ignore %}
{% if child.security is empty or authorize(array(child.security)) %}
{% set value = child.name ? data.value(child.name) : data.toArray %}
<div id="tab-{{ tabsKey ~ loop.index }}" class="tab__content {{ (storedTab == scope ~ child.name) or active == loop.index ? 'active' : '' }}">
{% include ["forms/fields/#{child.type}/#{child.type}.html.twig", 'forms/fields/text/text.html.twig'] with {field: child} %}
</div>
{% endif %}
{% endif %}
{% endfor %}
</div>
{% endif %}
</div>
{% endblock %}

62
themes/grav/templates/forms/fields/toggle/toggle.html.twig
View File

@@ -1,62 +0,0 @@
{% extends "forms/field.html.twig" %}
{% macro spanToggle(input, length) %}
{% set space = repeat('&nbsp;&nbsp;', (length - input|length) / 2) %}
{{ (space ~ input ~ space)|raw }}
{% endmacro %}
{% import _self as macro %}
{% set value = (value is null ? field.default : value) %}
{% set value = (value is same as(false) ? 0 : value) %}
{% set has_hidden = false %}
{% for key, text in field.options %}
{% if key is empty %}
{% set has_hidden = true %}
{% endif %}
{% endfor %}
{% block global_attributes %}
{{ parent() }}
data-grav-field-name="{{ (scope ~ field.name)|fieldName }}"
{% endblock %}
{% block input %}
<div class="switch-toggle switch-grav {{ field.size }} switch-{{ field.options|length }} {{ field.classes }}">
{% set maxLen = 0 %}
{% for text in field.options %}
{% set translation = grav.twig.twig.filters['tu'] is defined ? text|tu : text|t %}
{% set maxLen = max(translation|length, maxLen) %}
{% endfor %}
{% for key, text in field.options %}
{% set id = "toggle_" ~ field.name ~ key %}
{% set translation = (grav.twig.twig.filters['tu'] is defined ? text|tu : text|t)|trim %}
<input type="radio"
value="{{ key }}"
id="{{ id }}"
name="{{ (scope ~ field.name)|fieldName }}"
{% if field.highlight is defined %}
class="{{ field.highlight == '' ~ key ? 'highlight' : '' }}"
{% endif %}
{% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
{% if field.toggleable %}
{% if '' ~ key == '' ~ value %}
checked="checked"
{% elseif value is defined and (key == 1 or key == '1') %}
checked="checked"
{% endif %}
{% else %}
{% if '' ~ key == '' ~ value %}
checked="checked"
{% endif %}
{% endif %}
{% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %}
/>
<label for="{{ id }}">{{ (macro.spanToggle(translation, maxLen)|trim)|raw }}</label>
{% endfor %}
</div>
{% endblock %}