diff --git a/assets/js/Components/Admin/Header.vue b/assets/js/Components/Admin/Header.vue index 703afabd..1e7cfad4 100644 --- a/assets/js/Components/Admin/Header.vue +++ b/assets/js/Components/Admin/Header.vue @@ -5,7 +5,7 @@ \ No newline at end of file diff --git a/assets/js/Components/Listing/Filter.vue b/assets/js/Components/Listing/Filter.vue index a28181a6..1cb4d208 100644 --- a/assets/js/Components/Listing/Filter.vue +++ b/assets/js/Components/Listing/Filter.vue @@ -24,7 +24,7 @@ \ No newline at end of file diff --git a/assets/js/Components/Listing/Row/_Meta.vue b/assets/js/Components/Listing/Row/_Meta.vue new file mode 100644 index 00000000..f1aa77f8 --- /dev/null +++ b/assets/js/Components/Listing/Row/_Meta.vue @@ -0,0 +1,22 @@ + + + \ No newline at end of file diff --git a/assets/js/Components/Listing/Row/_QuickEditor.vue b/assets/js/Components/Listing/Row/_QuickEditor.vue new file mode 100644 index 00000000..b2a70f14 --- /dev/null +++ b/assets/js/Components/Listing/Row/_QuickEditor.vue @@ -0,0 +1,26 @@ + + + \ No newline at end of file diff --git a/assets/scss/modules/listing/_filter.scss b/assets/scss/modules/listing/_filter.scss index 7aaa16fc..c29532cc 100644 --- a/assets/scss/modules/listing/_filter.scss +++ b/assets/scss/modules/listing/_filter.scss @@ -56,8 +56,9 @@ } } &.is-selected{ + background: var(--primary); svg g{ - fill: var(--primary); + fill: var(--foreground); } } &.is-active{ diff --git a/assets/scss/modules/listing/_row.scss b/assets/scss/modules/listing/_row.scss index 8f4c2cc6..7d4387a7 100644 --- a/assets/scss/modules/listing/_row.scss +++ b/assets/scss/modules/listing/_row.scss @@ -1,8 +1,6 @@ //** Lisitng | Row .listing__row{ - transition: all 0.2s ease-in-out; - transform-origin: center; box-shadow: $card-box-shadow; background: var(--foreground); border-radius: $border-radius; @@ -101,6 +99,7 @@ color: theme-color('secondary'); } } + &--move{ flex: 0 0 15px; padding: 0; @@ -127,5 +126,54 @@ color: var(--secondary); } } + &--quickedit{ + background: transparent; + border: 0; + color: var(--primary); + padding: 0; + &:hover{ + cursor: pointer; + text-decoration: underline; + } + } } } + +.quickedit__row{ + min-height: 200px; + display: flex; + justify-content: space-between; + flex-direction: column; + background: var(--foreground); + margin-bottom: $spacer / 1.25; + width: 100%; + &--item{ + padding: $spacer; + &.is-content{ + + } + &.is-actions{ + background: var(--shade-100); + display: flex; + align-items: center; + padding: $spacer / 2; + justify-content: space-between; + } + } +} + +.listing--container{ + position: relative; + overflow: hidden; +} + +.quickeditor-enter-active, .quickeditor-leave-active { + transition: transform 0.45s, opacity 0.25s; +} + +.quickeditor-enter, .quickeditor-leave-to{ + opacity: 0; + transform: translateY(30px); + transform-origin: top; + position: absolute; +} \ No newline at end of file diff --git a/templates/_partials/_content_actions.twig b/templates/_partials/_content_actions.twig deleted file mode 100644 index 2eee82d9..00000000 --- a/templates/_partials/_content_actions.twig +++ /dev/null @@ -1,97 +0,0 @@ -{% import '@bolt/_macro/_macro.twig' as macro %} - -{% set modifiable = true %} -{% set permissions = { 'publish': true, 'depublish': true, 'create': true, 'delete': true } %} - -
- - {{ 'edit'|trans }} - - -
- - {% if record.status == "published" and record.link is not empty %} - - {{ 'general.view-on-site'|trans }} - - {% endif %} - - {% if modifiable %} - {% if record.status != 'published' %} - {% if permissions.publish %} - {{ macro.actionform(record, 'publish', 'fa-circle status-published', __('contenttypes.generic.publish',{'%contenttype%':record.definition.singular_name})) }} - {% endif %} - {% else %} - {% if permissions.depublish %} - {{ macro.actionform(record, 'held', 'fa-circle status-held', __('general.status-change-held')) }} - {% endif %} - {% endif %} - {% if permissions.create %} - - {{ 'contenttypes.generic.duplicate', {'%contenttype%': record.definition.singular_name}|trans }} - - {% endif %} - {% if permissions.delete %} - {{ macro.actionform(record, 'delete', - 'fa-trash', - __('contenttypes.generic.delete', {'%contenttype%': record.definition.singular_name}), - "Are you sure you want to delete '" ~ record.title ~ "'?" ) }} - {% endif %} -
- {% endif %} - - - {{ 'general.author'|trans }}: - {% set owner = record.author %} - {% if owner %} - {{ owner[:15] }} - {% else %} - user {{ record.ownerid }} - {% endif %} - - - - {{ 'general.status-current'|trans }}: - {{ record.status }} - {{ 'general.slug'|trans }}: - {{ record.slug|excerpt(24) }} - - {{ 'general.created-on'|trans }}: - {{ record.datecreated|date("Y-m-d H:i") }} - - {{ 'general.published-on'|trans }}: - {{ record.datepublish|date("Y-m-d H:i") }} - - {{ 'general.last-edited-on'|trans }}: - {{ record.datechanged|date("Y-m-d H:i") }} - - -{# -- - {% set taxonomytypes = record.taxonomy.grouped|default %} - {% for type, taxonomies in taxonomytypes %} - {% if taxonomies|length > 1 %} - {% set taxlist = [] %} - {% for taxonomy in taxonomies %} - {% set taxlist = taxlist|merge([taxonomy.name]) %} - {% endfor %} -
- {{ app.config.get('taxonomy')[type].name }}: - {{ taxlist|join(", ")[:24] }} - -
- {% else %} -
- {% set taxonomy = taxonomies|first %} - {{ app.config.get('taxonomy')[type].singular_name }}: - {{ taxonomy.name[:24] }} - -
- {% endif %} - {% endfor %} --- #} - -
-
- diff --git a/templates/_partials/_content_listing.twig b/templates/_partials/_content_listing.twig index bfcf0413..6975877b 100644 --- a/templates/_partials/_content_listing.twig +++ b/templates/_partials/_content_listing.twig @@ -6,17 +6,17 @@ {% for record in records %} {% endfor %} diff --git a/templates/_partials/_content_record_default.twig b/templates/_partials/_content_record_default.twig deleted file mode 100644 index b541dd37..00000000 --- a/templates/_partials/_content_record_default.twig +++ /dev/null @@ -1,42 +0,0 @@ - - -
{{ record.excerpt(400, true) }}
- - - - {% set icon = record.definition.icon_one|default('fa-adjust') %} - - - {% if not app.request.get('contenttype')|default() %} - - {{ record.definition.name }} - - {% else %} - {{ record.definition.name }} - {% endif %} - {% if not record.definition.singleton %}№ {{ record.id }}{% endif %} - - - - - {{ record.author }} - - - - {{ record.publishedAt|localizeddate('medium', 'none', null, 'UTC') }}
- {##} - {##} - {#Volgorde: 81#} - {##} - - - - - - - - {% include '@bolt/_partials/_content_actions.twig' %} - - - - diff --git a/webpack.config.js b/webpack.config.js index 00e555c5..63da9153 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -24,7 +24,7 @@ Encore .enableSassLoader() .enablePostCssLoader() - .addPlugin(new WebpackBar()) + // .addPlugin(new WebpackBar()) if(Encore.isProduction()){ Encore.configureFilenames({