瀏覽代碼

blueprint artiste

kevin tessier 5 年之前
父節點
當前提交
07da9e6a74
共有 33 個文件被更改,包括 250 次插入31 次删除
  1. 7 4
      user/config/system.yaml
  2. 二進制
      user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Detail_Lubion_box_Mania_Akbari_and_Douglas_White_2019.jpg
  3. 二進制
      user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Detail_Mr._Majidi_series_Mania_Akbari_and_Douglas_White_2019_I.jpg
  4. 二進制
      user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Detail_Mr._Majidi_series_Mania_Akbari_and_Douglas_White_2019_II.jpg
  5. 二進制
      user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Geometric_Resistance_Mania_Akbari_and_Douglas_White_2019.jpg
  6. 二進制
      user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/House_of_Sin_III_Mania_Akbari_and_Douglas_White_2019.jpg
  7. 二進制
      user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/House_of_Sin_II_Mania_Akbari_and_Douglas_White_2019.jpg
  8. 二進制
      user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/House_of_Sin_I_Mania_Akbari_and_Douglas_White_2019.jpg
  9. 二進制
      user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Installation_Mania_Akbari_and_Douglas_White_I.jpg
  10. 二進制
      user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Installation_Mania_Akbari_and_Douglas_White_II.jpg
  11. 二進制
      user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Installation_Mania_Akbari_and_Douglas_White_III.jpg
  12. 二進制
      user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Lubion_Mania_Akbari_and_Douglas_White_2019_I.jpg
  13. 二進制
      user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Lubion_Mania_Akbari_and_Douglas_White_2019_II.jpg
  14. 二進制
      user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Lubion_box_Mania_Akbari_and_Douglas_White_2019.jpg
  15. 0 0
      user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Mania_Akbari_and_Douglas_White_Electricity_Box_in_the_streets_of_Teheran.jpg
  16. 二進制
      user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Mr. Majidi_series_and_House_of_Sin_I_Mania_Akbari_and_Douglas_White_2019.jpg
  17. 二進制
      user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Mr._Majidi_series_Mania_Akbari_and_Douglas_White_2019.jpg
  18. 1 1
      user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/events.md
  19. 2 3
      user/pages/02.whats-on/02.events/current-upcoming/body-and-borders/events.en.md
  20. 11 0
      user/pages/04.residence/02.current-upcoming/testt-artiste/artistes.en.md
  21. 二進制
      user/pages/04.residence/02.current-upcoming/testt-artiste/les ateliers numériques.jpg
  22. 0 1
      user/pages/04.residence/02.current-upcoming/victor-man/artistes.en.md
  23. 11 0
      user/themes/vocurations/Artist Candidature-'Sara-Anstis'-2019-12-04-02-16-56.txt
  24. 8 1
      user/themes/vocurations/blueprints/artistes.yaml
  25. 7 6
      user/themes/vocurations/css-compiled/theme.css
  26. 0 0
      user/themes/vocurations/css-compiled/theme.min.css
  27. 11 4
      user/themes/vocurations/scss/theme/_blog.scss
  28. 3 3
      user/themes/vocurations/scss/theme/_mobile.scss
  29. 174 0
      user/themes/vocurations/templates/forms/form.html.twig
  30. 4 2
      user/themes/vocurations/templates/home.html.twig
  31. 4 0
      user/themes/vocurations/templates/partials/base.html.twig
  32. 5 4
      user/themes/vocurations/templates/partials/blog-item.html.twig
  33. 2 2
      user/themes/vocurations/templates/partials/blog-list-item.html.twig

+ 7 - 4
user/config/system.yaml

@@ -9,12 +9,15 @@ username_regex: '^[a-z0-9_-]{3,16}$'
 pwd_regex: '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}'
 pwd_regex: '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}'
 intl_enabled: true
 intl_enabled: true
 languages:
 languages:
-  include_default_lang: true
+  supported:
+    - en
+  default_lang: en
+  include_default_lang: false
   pages_fallback_only: false
   pages_fallback_only: false
-  translations: true
-  translations_fallback: true
+  translations: false
+  translations_fallback: false
   session_store_active: false
   session_store_active: false
-  http_accept_language: false
+  http_accept_language: true
   override_locale: false
   override_locale: false
 home:
 home:
   alias: /home
   alias: /home

二進制
user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Detail_Lubion_box_Mania_Akbari_and_Douglas_White_2019.jpg


二進制
user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Detail_Mr._Majidi_series_Mania_Akbari_and_Douglas_White_2019_I.jpg


二進制
user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Detail_Mr._Majidi_series_Mania_Akbari_and_Douglas_White_2019_II.jpg


二進制
user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Geometric_Resistance_Mania_Akbari_and_Douglas_White_2019.jpg


二進制
user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/House_of_Sin_III_Mania_Akbari_and_Douglas_White_2019.jpg


二進制
user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/House_of_Sin_II_Mania_Akbari_and_Douglas_White_2019.jpg


二進制
user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/House_of_Sin_I_Mania_Akbari_and_Douglas_White_2019.jpg


二進制
user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Installation_Mania_Akbari_and_Douglas_White_I.jpg


二進制
user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Installation_Mania_Akbari_and_Douglas_White_II.jpg


二進制
user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Installation_Mania_Akbari_and_Douglas_White_III.jpg


二進制
user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Lubion_Mania_Akbari_and_Douglas_White_2019_I.jpg


二進制
user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Lubion_Mania_Akbari_and_Douglas_White_2019_II.jpg


二進制
user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Lubion_box_Mania_Akbari_and_Douglas_White_2019.jpg


+ 0 - 0
user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Mania Akbari and Douglas White, Electricity Box in the streets of Teheran.jpg → user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Mania_Akbari_and_Douglas_White_Electricity_Box_in_the_streets_of_Teheran.jpg


二進制
user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Mr. Majidi_series_and_House_of_Sin_I_Mania_Akbari_and_Douglas_White_2019.jpg


二進制
user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/Mr._Majidi_series_Mania_Akbari_and_Douglas_White_2019.jpg


+ 1 - 1
user/pages/02.whats-on/01.exhibitions/current-upcoming/mr-majidi-and-the-electricity-box/events.md

@@ -5,7 +5,7 @@ date_end: '20-12-2019 18:26'
 lieux: '12th floor'
 lieux: '12th floor'
 artistes: 'Mania Akbari, Douglas White '
 artistes: 'Mania Akbari, Douglas White '
 title: '‘Mr. Majidi and the Electricity Box'''
 title: '‘Mr. Majidi and the Electricity Box'''
-media_order: 'Mania Akbari and Douglas White, Electricity Box in the streets of Teheran.jpg'
+media_order: 'Installation_Mania_Akbari_and_Douglas_White_II.jpg,Installation_Mania_Akbari_and_Douglas_White_I.jpg,Detail_Mr._Majidi_series_Mania_Akbari_and_Douglas_White_2019_I.jpg,Detail_Lubion_box_Mania_Akbari_and_Douglas_White_2019.jpg,Installation_Mania_Akbari_and_Douglas_White_III.jpg,House_of_Sin_I_Mania_Akbari_and_Douglas_White_2019.jpg,Lubion_Mania_Akbari_and_Douglas_White_2019_II.jpg,Mr._Majidi_series_Mania_Akbari_and_Douglas_White_2019.jpg,Lubion_box_Mania_Akbari_and_Douglas_White_2019.jpg,Mania_Akbari_and_Douglas_White_Electricity_Box_in_the_streets_of_Teheran.jpg,Lubion_Mania_Akbari_and_Douglas_White_2019_I.jpg,House_of_Sin_II_Mania_Akbari_and_Douglas_White_2019.jpg,Mr. Majidi_series_and_House_of_Sin_I_Mania_Akbari_and_Douglas_White_2019.jpg,Geometric_Resistance_Mania_Akbari_and_Douglas_White_2019.jpg,House_of_Sin_III_Mania_Akbari_and_Douglas_White_2019.jpg,Detail_Mr._Majidi_series_Mania_Akbari_and_Douglas_White_2019_II.jpg'
 show_sidebar: false
 show_sidebar: false
 aura:
 aura:
     pagetype: website
     pagetype: website

+ 2 - 3
user/pages/02.whats-on/02.events/current-upcoming/body-and-borders/events.md → user/pages/02.whats-on/02.events/current-upcoming/body-and-borders/events.en.md

@@ -1,6 +1,5 @@
 ---
 ---
 date: '07-12-2019 15:00'
 date: '07-12-2019 15:00'
-date_end: '14-01-2020 17:00'
 display_time: false
 display_time: false
 lieux: '12th floor'
 lieux: '12th floor'
 artistes: 'screenings + Panel Talk  3:00-6:30pm'
 artistes: 'screenings + Panel Talk  3:00-6:30pm'
@@ -8,11 +7,11 @@ title: '‘Body and Borders'':'
 media_order: 'Carlos Motta, The Devil’s Work (2018).jpg'
 media_order: 'Carlos Motta, The Devil’s Work (2018).jpg'
 buy: true
 buy: true
 url: 'https://www.eventbrite.co.uk/e/body-and-borders-i-film-screenings-panel-discussion-i-akbari-and-white-tickets-80867162861?fbclid=IwAR1td6U8NxmWyUOiYzFIW9vsXA2K2CXV2IXdbvTXW8g2YIMTgGsPKjgsSXg'
 url: 'https://www.eventbrite.co.uk/e/body-and-borders-i-film-screenings-panel-discussion-i-akbari-and-white-tickets-80867162861?fbclid=IwAR1td6U8NxmWyUOiYzFIW9vsXA2K2CXV2IXdbvTXW8g2YIMTgGsPKjgsSXg'
-recaptchacontact:
-    enabled: false
 show_sidebar: false
 show_sidebar: false
 aura:
 aura:
     pagetype: website
     pagetype: website
+recaptchacontact:
+    enabled: false
 ---
 ---
 
 
 [Saturday 7 December from 15:00-18:30pm](https://www.eventbrite.co.uk/e/body-and-borders-i-film-screenings-panel-discussion-i-akbari-and-white-tickets-80867162861?fbclid=IwAR1td6U8NxmWyUOiYzFIW9vsXA2K2CXV2IXdbvTXW8g2YIMTgGsPKjgsSXg) to accompany the exhibition ‘Mr. Majidi and the Electricity Box’, Iranian filmmaker Mania Akbari and British sculptor Douglas White have curated a cultural programme, encompassing further screenings from 10 contemporary artists, who also explore the physical, political, emotional and sensual borders of the modern corporeal experience. Screenings will include the work of Johann Arens, Mania Akbari, Lucy Clout, A K Dolve, Barbara Hammer, Carlos Mott, Lynne Sachs, Margaret Salmon, Mark Street, Jessica Sarah Rinlan, Miranda Pennel and Douglas White.
 [Saturday 7 December from 15:00-18:30pm](https://www.eventbrite.co.uk/e/body-and-borders-i-film-screenings-panel-discussion-i-akbari-and-white-tickets-80867162861?fbclid=IwAR1td6U8NxmWyUOiYzFIW9vsXA2K2CXV2IXdbvTXW8g2YIMTgGsPKjgsSXg) to accompany the exhibition ‘Mr. Majidi and the Electricity Box’, Iranian filmmaker Mania Akbari and British sculptor Douglas White have curated a cultural programme, encompassing further screenings from 10 contemporary artists, who also explore the physical, political, emotional and sensual borders of the modern corporeal experience. Screenings will include the work of Johann Arens, Mania Akbari, Lucy Clout, A K Dolve, Barbara Hammer, Carlos Mott, Lynne Sachs, Margaret Salmon, Mark Street, Jessica Sarah Rinlan, Miranda Pennel and Douglas White.

+ 11 - 0
user/pages/04.residence/02.current-upcoming/testt-artiste/artistes.en.md

@@ -0,0 +1,11 @@
+---
+date: '09-12-2019 14:58'
+date_end: '24-12-2019 14:59'
+title: 'Testt artiste'
+media_order: 'les ateliers numériques.jpg'
+show_sidebar: false
+aura:
+    pagetype: website
+---
+
+htr hrge

二進制
user/pages/04.residence/02.current-upcoming/testt-artiste/les ateliers numériques.jpg


+ 0 - 1
user/pages/04.residence/02.current-upcoming/victor-man/artistes.md → user/pages/04.residence/02.current-upcoming/victor-man/artistes.en.md

@@ -1,5 +1,4 @@
 ---
 ---
-date_start: '05-06-2019 11:05'
 date_end: '05-09-2019 19:43'
 date_end: '05-09-2019 19:43'
 title: 'Nour El Saleh'
 title: 'Nour El Saleh'
 media_order: 'Nour El Saleh, Detail ''Four Times as Big, Twice as Small'' 2018.jpeg'
 media_order: 'Nour El Saleh, Detail ''Four Times as Big, Twice as Small'' 2018.jpeg'

+ 11 - 0
user/themes/vocurations/Artist Candidature-'Sara-Anstis'-2019-12-04-02-16-56.txt

@@ -0,0 +1,11 @@
+first_name: Sara
+last_name: Anstis
+date_of_birth: '1991'
+phone_number: '07384593115'
+email: anstismagdalena@gmail.com
+move_in_date: ASAP
+website: 'saraanstis.com  / @saraanstis'
+portfolio: {"user\/data\/files\/Sara Anstis_VO Curations.pdf":{"name":"Sara Anstis_VO Curations.pdf","type":"application\/pdf","size":17337358,"path":"user\/data\/files\/Sara Anstis_VO Curations.pdf"}}
+studio: Either
+notes: "Hello, \r\n\r\nI was pointed in your direction by somaya Critchlow. We're currently on a residency Together in Italy and AS I AM ABOUT TO LOSE MY STUDIO IN LONDON, She mentioned you might still have some studios available for 2020. \r\n\r\nWould it be possible to organise a location visit for December 11th 2019? \r\n\r\nLooking forward to hearing from you and thank you for considering my Application \r\n\r\nall the best \r\nSara "
+

+ 8 - 1
user/themes/vocurations/blueprints/artistes.yaml

@@ -25,7 +25,8 @@ form:
                   validate:
                   validate:
                     type: bool
                     type: bool
 
 
-                header.date_start:
+                header.date:
+                  replace@: true
                   type: datetime
                   type: datetime
                   label: Start
                   label: Start
                   toggleable: true
                   toggleable: true
@@ -41,6 +42,12 @@ form:
               underline: true
               underline: true
               ordering@: 2
               ordering@: 2
 
 
+        options:
+          fields:
+            publishing:
+              fields:
+                header.date:
+                  unset@: true
 
 
         blog:
         blog:
           type: tab
           type: tab

文件差異過大導致無法顯示
+ 7 - 6
user/themes/vocurations/css-compiled/theme.css


文件差異過大導致無法顯示
+ 0 - 0
user/themes/vocurations/css-compiled/theme.min.css


+ 11 - 4
user/themes/vocurations/scss/theme/_blog.scss

@@ -112,6 +112,11 @@ body, html {
   }
   }
 }
 }
 
 
+.about{
+  .item_content{
+    width: calc((100% / 12) * 10)!important ;
+  }
+}
 .events, .default{
 .events, .default{
   #body-wrapper{
   #body-wrapper{
     .item{
     .item{
@@ -122,13 +127,15 @@ body, html {
         margin-bottom: 3rem;
         margin-bottom: 3rem;
       }
       }
       .item_content{
       .item_content{
-        width: 90%;
+        width: calc(100vw - 5.6rem);
         display: inline-flex;
         display: inline-flex;
         .content{
         .content{
-          width: 100%;
-          margin-right: 5rem;
+          width: 180%;
+          margin-right: 60px;
         }
         }
         .side{
         .side{
+          width: 100%;
+          text-align: center;
           padding-left: 1rem;
           padding-left: 1rem;
           margin-top: 1rem;
           margin-top: 1rem;
           position: relative;
           position: relative;
@@ -143,7 +150,7 @@ body, html {
 
 
 .buy{
 .buy{
   min-width: 300px;
   min-width: 300px;
-  position: absolute;
+  position: relative;
   a{
   a{
     font-family: $Bold;
     font-family: $Bold;
     text-transform: uppercase;
     text-transform: uppercase;

+ 3 - 3
user/themes/vocurations/scss/theme/_mobile.scss

@@ -3,9 +3,9 @@
     font-size: 13px;
     font-size: 13px;
     .navbar{
     .navbar{
       nav{
       nav{
-        li:nth-last-child(1){
-          width: 20px;
-        }
+        // li:nth-last-child(1){
+        //   width: 20px;
+        // }
       }
       }
     }
     }
   }
   }

+ 174 - 0
user/themes/vocurations/templates/forms/form.html.twig

@@ -0,0 +1,174 @@
+{% if form is null %}
+    {% set form = grav.session.getFlashObject('form') %}
+{% endif  %}
+
+{% set scope = scope ?: 'data.' %}
+{% set multipart = '' %}
+{% set blueprints = blueprints ?? form.blueprint() %}
+{% set method = form.method|upper|default('POST') %}
+{% set client_side_validation = form.client_side_validation is not null ? form.client_side_validation : config.plugins.form.client_side_validation|default(true) %}
+{% set inline_errors = form.inline_errors is not null ? form.inline_errors : config.plugins.form.inline_errors(false) %}
+
+{% set data = data ?? form.data %}
+{% set context = context ?? data %}
+
+{% for field in form.fields %}
+    {% if (method == 'POST' and field.type == 'file') %}
+        {% set multipart = ' enctype="multipart/form-data"' %}
+    {% endif %}
+{% endfor %}
+
+{% set action = form.action ?: page.route ~ uri.params %}
+{% set action = action starts with 'http' ? action : base_url ~ action %}
+
+{% if (action == base_url_relative) %}
+    {% set action = base_url_relative ~ '/' ~ page.slug %}
+{% endif %}
+
+{% if form.keep_alive %}
+    {% if grav.browser.browser == 'msie' and grav.browser.version < 12 %}
+        {% do assets.addJs('plugin://form/assets/object.assign.polyfill.js') %}
+    {% endif %}
+    {% do assets.addJs('plugin://form/assets/form.vendor.js', { 'group': 'bottom', 'loading': 'defer' }) %}
+    {% do assets.addJs('plugin://form/assets/form.min.js', { 'group': 'bottom', 'loading': 'defer' }) %}
+{% endif %}
+
+{% do assets.addInlineJs("
+    window.GravForm = window.GravForm || {};
+    window.GravForm.config = {
+        current_url: '" ~ uri.route(true) ~"',
+        base_url_relative: '" ~ base_url_relative ~ "',
+        param_sep: '"~ config.system.param_sep ~ "',
+        form_nonce: '" ~ form.getNonce() ~ "',
+        session_timeout: " ~ config.system.session.timeout ~ "
+    };
+    window.GravForm.translations = Object.assign({}, window.GravForm.translations || {}, { PLUGIN_FORM: {} });
+", {'group': 'bottom', 'position': 'before'}) %}
+
+{# Backwards Compatibility for block overrides #}
+{% set override_form_classes %}
+  {% block form_classes -%}
+    {{ form_outer_classes }} {{ form.classes }}
+  {%- endblock %}
+{% endset %}
+
+{% set override_inner_markup_fields_start %}
+  {% block inner_markup_fields_start %}{% endblock %}
+{% endset %}
+
+{% set override_inner_markup_fields_end %}
+  {% block inner_markup_fields_end %}{% endblock %}
+{% endset %}
+
+{% set override_inner_markup_fields %}
+  {% block inner_markup_fields %}
+    {% for field_name, field in form.fields %}
+      {% set field_name = field.name ?? field_name %}
+      {% if field_name and not field.validate.ignore %}
+        {%- if field_name starts with '.' -%}
+          {% set field_name = field_name[1:] %}
+          {% set field = field|merge({ name: field_name }) %}
+        {% endif %}
+
+        {% set value = form ? form.value(field_name) : data.value(field_name) %}
+        {% block inner_markup_field_open %}{% endblock %}
+        {% block field %}
+          {% include "forms/fields/#{field.type}/#{field.type}.html.twig" ignore missing %}
+        {% endblock %}
+        {% block inner_markup_field_close %}{% endblock %}
+      {% endif %}
+    {% endfor %}
+  {% endblock %}
+{% endset %}
+
+{% set override_inner_markup_buttons_start %}
+  {% block inner_markup_buttons_start %}
+  <div class="{{ form_button_outer_classes ?: 'buttons'}}">
+  {% endblock %}
+{% endset %}
+
+{% set override_inner_markup_buttons_end %}
+  {% block inner_markup_buttons_end %}
+  </div>
+  {% endblock %}
+{% endset %}
+
+{# Embed for HTML layout #}
+{% embed 'forms/layouts/form.html.twig' %}
+
+  {% block embed_form_core %}
+    name="{{ form.name }}"
+    action="{{ action | trim('/', 'right') }}"
+    method="{{ method }}"{{ multipart }}
+    {% if form.id %}id="{{ form.id }}"{% endif %}
+    {% if form.novalidate %}novalidate{% endif %}
+    {% if form.keep_alive %}data-grav-keepalive="true"{% endif %}
+  {% endblock %}
+
+  {% block embed_form_classes -%}
+    class="{{ parent() }} {{ override_form_classes|trim }}"
+  {%- endblock %}
+
+  {% block embed_fields %}
+    {{ override_inner_markup_fields_start|raw }}
+    {{ override_inner_markup_fields|raw }}
+
+    {% include "forms/fields/formname/formname.html.twig" %}
+    {% include "forms/fields/formtask/formtask.html.twig" %}
+    {% include 'forms/fields/uniqueid/uniqueid.html.twig' %}
+    {{ nonce_field(form.getNonceAction() ?? 'form', form.getNonceName() ?? 'form-nonce')|raw }}
+
+    {{ override_inner_markup_fields_end|raw }}
+  {% endblock %}
+
+  {% block embed_buttons %}
+    {{ override_inner_markup_buttons_start|raw }}
+
+    {% for button in form.buttons %}
+      {% if button.outerclasses is defined %}<div class="{{ button.outerclasses }}">{% endif %}
+
+      {% if button.url %}
+      {% set button_url = button.url starts with 'http' ? button.url : base_url ~ button.url %}
+      {% endif %}
+
+      {% embed 'forms/layouts/button.html.twig' %}
+        {% block embed_button_core %}
+          {% if button.id %}id="{{ button.id }}"{% endif %}
+          {% if button.disabled %}disabled="disabled"{% endif %}
+          {% if button.task %}name="task" value="{{ button.task }}"{% endif %}
+          type="{{ button.type|default('submit') }}"
+        {% endblock %}
+
+        {% block embed_button_classes %}
+          {% block button_classes %}
+            class="{{ form_button_classes ?: 'button' }} {{ button.classes }}"
+          {% endblock %}
+        {% endblock %}
+
+        {% block embed_button_content -%}
+          {%- set button_value = button.value|t|default('Submit') -%}
+          {%- if button.html -%}
+            {{- button_value|trim|raw -}}
+          {%- else -%}
+            {{- button_value|trim|e -}}
+          {%- endif -%}
+        {%- endblock %}
+
+      {% endembed %}
+      
+      {% include 'partials/form-messages.html.twig' %}
+
+      {% if button.outerclasses is defined %}</div>{% endif %}
+    {% endfor %}
+
+    {{ override_inner_markup_buttons_end }}
+  {% endblock %}
+
+{% endembed %}
+
+
+{% if config.forms.dropzone.enabled %}
+<div id="dropzone-template" style="display:none;">
+    {% include 'forms/dropzone/template.html.twig' %}
+</div>
+{% endif %}

+ 4 - 2
user/themes/vocurations/templates/home.html.twig

@@ -42,12 +42,14 @@
           {% for siblings in mergeCollectTT %}
           {% for siblings in mergeCollectTT %}
               {% if siblings.template == 'events' and  siblings.header.topH != true or siblings.template == 'artistes' or siblings.template == 'modular/news' %}
               {% if siblings.template == 'events' and  siblings.header.topH != true or siblings.template == 'artistes' or siblings.template == 'modular/news' %}
 
 
-                {% if siblings.header.date|date('Ymd') >= "now"|date('Ymd') or siblings.header.date_end|date('Ymd') >= "now"|date('Ymd') %}
+                {% if siblings.header.date|date('Ymd') >= "now"|date('Ymd') or siblings.header.date_end == true and siblings.header.date_end|date('Ymd') >= "now"|date("Ymd")  %}
                   {% set count = count + 1 %}
                   {% set count = count + 1 %}
                 {% endif %}
                 {% endif %}
 
 
                 {% if count <= 5 %}
                 {% if count <= 5 %}
-                  {% include 'partials/blog-list-item.html.twig' with {blog: page, page: siblings} %}
+                  {% if siblings.header.date|date('Ymd') >= "now"|date('Ymd') or siblings.header.date_end == true and siblings.header.date_end|date('Ymd') >= "now"|date("Ymd") %}
+                    {% include 'partials/blog-list-item.html.twig' with {blog: page, page: siblings} %}
+                  {% endif %}
                 {% endif %}
                 {% endif %}
 
 
             {% endif %}
             {% endif %}

+ 4 - 0
user/themes/vocurations/templates/partials/base.html.twig

@@ -21,14 +21,18 @@
     {% block stylesheets %}
     {% block stylesheets %}
         {% do assets.addCss('theme://css-compiled/theme'~compress) %}
         {% do assets.addCss('theme://css-compiled/theme'~compress) %}
         {% do assets.addCss('theme://css/custom.css') %}
         {% do assets.addCss('theme://css/custom.css') %}
+        {% do assets.addCss('theme://css/jquery.mCustomScrollbar.min.css') %}
     {% endblock %}
     {% endblock %}
 
 
     {% block javascripts %}
     {% block javascripts %}
+    
         {% do assets.addJs('jquery', 101) %}
         {% do assets.addJs('jquery', 101) %}
         <!-- upload -->
         <!-- upload -->
         {% do assets.addJs('theme://js/jquery.treemenu.js', {group:'bottom'}) %}
         {% do assets.addJs('theme://js/jquery.treemenu.js', {group:'bottom'}) %}
         <script src="https://unpkg.com/infinite-scroll@3/dist/infinite-scroll.pkgd.js"></script>
         <script src="https://unpkg.com/infinite-scroll@3/dist/infinite-scroll.pkgd.js"></script>
+        {% do assets.addJs('theme://js/jquery.mCustomScrollbar.js', {group:'bottom'}) %}
         {% do assets.addJs('theme://js/site.js', {group:'bottom'}) %}
         {% do assets.addJs('theme://js/site.js', {group:'bottom'}) %}
+
     {% endblock %}
     {% endblock %}
 
 
     {% block assets deferred %}
     {% block assets deferred %}

+ 5 - 4
user/themes/vocurations/templates/partials/blog-item.html.twig

@@ -18,9 +18,11 @@
       {% set captions = images.filename|humanize|regex_replace(['/.jpg/','/.png/','/.pdf/'], [' ',' ',' ']) %}
       {% set captions = images.filename|humanize|regex_replace(['/.jpg/','/.png/','/.pdf/'], [' ',' ',' ']) %}
         <div>
         <div>
           {{images.derivatives(320,1920,300).sizes('(max-width:100vw) 100vw, 50vw').html(captions, 'images article')}}
           {{images.derivatives(320,1920,300).sizes('(max-width:100vw) 100vw, 50vw').html(captions, 'images article')}}
-          <div class="caption">
-            {{captions}}
-          </div>
+          {% if page.template != "artistes" %}
+            <div class="caption">
+              {{captions}}
+            </div>
+          {% endif %}
         </div>
         </div>
       {% endfor %}
       {% endfor %}
     </div>
     </div>
@@ -41,6 +43,5 @@
       {% endblock %}
       {% endblock %}
     </div>
     </div>
 
 
-
   </div>
   </div>
 </div>
 </div>

+ 2 - 2
user/themes/vocurations/templates/partials/blog-list-item.html.twig

@@ -42,9 +42,9 @@
     {% if image %}
     {% if image %}
       <div class="card-image">
       <div class="card-image">
         {% if page.header.topH == true %}
         {% if page.header.topH == true %}
-            {{image.sizes('(max-width:100vw) 100vw, 50vw').html(page.title, 'image article')}}
+            {{image.cropZoom(1400, 1000).sizes('(max-width:100vw) 100vw, 50vw').html(page.title, 'image article')}}
           {% else %}
           {% else %}
-            {{image.cropZoom(800, 500).sizes('(max-width:100vw) 100vw, 50vw').html(page.title, 'image article')}}
+            {{image.cropZoom(1400, 1000).sizes('(max-width:100vw) 100vw, 50vw').html(page.title, 'image article')}}
         {% endif %}
         {% endif %}
       </div>
       </div>
     {% endif %}
     {% endif %}

部分文件因文件數量過多而無法顯示