WIP: Dodaj confige.

pojmov

.envrc

@@ -0,0 +1,2 @@
+PATH_add vendor/bin
+

.gitignore

@@ -7,8 +7,7 @@
 
 # Ignore configuration files that may contain sensitive information
 /web/sites/*/*settings*.php
-/web/sites/default/settings.php
-/web/sites/*/*services*.yml
+!/web/sites/default/settings.php
 
 # Ignore paths that may contain user-generated content
 /web/sites/*/files
@@ -29,7 +28,6 @@
 /web/modules/contrib/
 !/web/modules/custom
 /web/profiles/README.txt
-/web/sites/development.services.yml
 /web/sites/example.settings.local.php
 /web/sites/example.sites.php
 /web/sites/README.txt

composer.json

@@ -18,6 +18,7 @@
         "composer/installers": "^2.0",
         "cweagans/composer-patches": "^1.7",
         "drupal/cer": "^5.0@beta",
+        "drupal/config_ignore": "^3.1",
         "drupal/content_as_config": "^1.0",
         "drupal/core-composer-scaffold": "^10.0",
         "drupal/core-project-message": "^10.0",

config/sync/config_ignore.settings.yml

@@ -0,0 +1,5 @@
+_core:
+  default_config_hash: IgOVnECx6lbVt6JVFnadoEEugneDf3UblPZnOzov43Q
+mode: simple
+ignored_config_entities:
+  - etherpad_api.settings

config/sync/core.entity_form_display.node.concept.default.yml

@@ -6,7 +6,6 @@ dependencies:
     - field.field.node.concept.body
     - field.field.node.concept.field_media
     - field.field.node.concept.field_related_concept
-    - field.field.node.concept.field_tags
     - node.type.concept
     - workflows.workflow.concept_workflow
   module:
@@ -52,16 +51,6 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  field_tags:
-    type: entity_reference_autocomplete
-    weight: 4
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
   langcode:
     type: language_select
     weight: 3

config/sync/core.entity_form_display.node.page.default.yml

@@ -4,8 +4,11 @@ status: true
 dependencies:
   config:
     - field.field.node.page.body
+    - field.field.node.page.field_media
     - node.type.page
   module:
+    - content_moderation
+    - media_library
     - path
     - text
 _core:
@@ -31,6 +34,13 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
+  field_media:
+    type: media_library_widget
+    weight: 5
+    region: content
+    settings:
+      media_types: {  }
+    third_party_settings: {  }
   langcode:
     type: language_select
     weight: 2
@@ -38,6 +48,12 @@ content:
     settings:
       include_locked: true
     third_party_settings: {  }
+  moderation_state:
+    type: moderation_state_default
+    weight: 100
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   path:
     type: path
     weight: 30

config/sync/core.entity_view_display.media.remote_video.default.yml

@@ -20,6 +20,8 @@ content:
     settings:
       max_width: 0
       max_height: 0
+      loading:
+        attribute: eager
     third_party_settings: {  }
     weight: 0
     region: content

config/sync/core.entity_view_display.node.concept.default.yml

@@ -6,7 +6,6 @@ dependencies:
     - field.field.node.concept.body
     - field.field.node.concept.field_media
     - field.field.node.concept.field_related_concept
-    - field.field.node.concept.field_tags
     - node.type.concept
   module:
     - text
@@ -45,14 +44,6 @@ content:
     third_party_settings: {  }
     weight: 103
     region: content
-  field_tags:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 104
-    region: content
   links:
     settings: {  }
     third_party_settings: {  }

config/sync/core.entity_view_display.node.concept.teaser.yml

@@ -7,7 +7,6 @@ dependencies:
     - field.field.node.concept.body
     - field.field.node.concept.field_media
     - field.field.node.concept.field_related_concept
-    - field.field.node.concept.field_tags
     - node.type.concept
   module:
     - text
@@ -38,5 +37,4 @@ content:
 hidden:
   field_media: true
   field_related_concept: true
-  field_tags: true
   langcode: true

config/sync/core.entity_view_display.node.page.default.yml

@@ -4,6 +4,7 @@ status: true
 dependencies:
   config:
     - field.field.node.page.body
+    - field.field.node.page.field_media
     - node.type.page
   module:
     - text
@@ -20,10 +21,21 @@ content:
     label: hidden
     settings: {  }
     third_party_settings: {  }
-    weight: 100
+    weight: 1
+    region: content
+  field_media:
+    type: entity_reference_entity_view
+    label: hidden
+    settings:
+      view_mode: default
+      link: false
+    third_party_settings: {  }
+    weight: 0
     region: content
   links:
-    weight: 101
+    settings: {  }
+    third_party_settings: {  }
+    weight: 2
     region: content
 hidden:
   langcode: true

config/sync/core.entity_view_display.node.page.teaser.yml

@@ -5,6 +5,7 @@ dependencies:
   config:
     - core.entity_view_mode.node.teaser
     - field.field.node.page.body
+    - field.field.node.page.field_media
     - node.type.page
   module:
     - text
@@ -28,4 +29,5 @@ content:
     weight: 101
     region: content
 hidden:
+  field_media: true
   langcode: true

config/sync/core.extension.yml

@@ -10,6 +10,7 @@ module:
   ckeditor5: 0
   comment: 0
   config: 0
+  config_ignore: 0
   config_translation: 0
   content_as_config: 0
   content_moderation: 0
@@ -19,6 +20,7 @@ module:
   diff: 0
   dynamic_page_cache: 0
   editor: 0
+  etherpad_api: 0
   field: 0
   field_ui: 0
   file: 0

config/sync/field.field.node.concept.field_tags.yml

@@ -1,29 +0,0 @@
-uuid: f5fade64-73dc-420b-8c1f-ab4fe3355a52
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_tags
-    - node.type.concept
-    - taxonomy.vocabulary.tags
-id: node.concept.field_tags
-field_name: field_tags
-entity_type: node
-bundle: concept
-label: Tags
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      tags: tags
-    sort:
-      field: name
-      direction: asc
-    auto_create: true
-    auto_create_bundle: ''
-field_type: entity_reference

config/sync/field.field.node.page.field_media.yml

@@ -0,0 +1,33 @@
+uuid: 4b96f193-d32d-4d67-80cd-992d2ec02e6b
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_media
+    - media.type.audio
+    - media.type.image
+    - media.type.remote_video
+    - node.type.page
+id: node.page.field_media
+field_name: field_media
+entity_type: node
+bundle: page
+label: Media
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:media'
+  handler_settings:
+    target_bundles:
+      audio: audio
+      image: image
+      remote_video: remote_video
+    sort:
+      field: _none
+      direction: ASC
+    auto_create: false
+    auto_create_bundle: audio
+field_type: entity_reference

config/sync/language/en/views.view.content.yml

@@ -0,0 +1,69 @@
+label: Content
+description: 'Find and manage content.'
+display:
+  default:
+    display_title: Default
+    display_options:
+      title: Content
+      fields:
+        title:
+          label: Title
+        type:
+          label: 'Content type'
+          separator: ', '
+        name:
+          label: Author
+        status:
+          label: Status
+          settings:
+            format_custom_false: Unpublished
+            format_custom_true: Published
+        changed:
+          label: Updated
+        operations:
+          label: Operations
+      pager:
+        options:
+          tags:
+            next: 'Next ›'
+            previous: '‹ Previous'
+            first: '« First'
+            last: 'Last »'
+      exposed_form:
+        options:
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      empty:
+        area_text_custom:
+          content: 'No content available.'
+      filters:
+        title:
+          expose:
+            label: Title
+        type:
+          expose:
+            label: 'Content type'
+        status:
+          expose:
+            label: Status
+          group_info:
+            label: 'Published status'
+            group_items:
+              1:
+                title: Published
+              2:
+                title: Unpublished
+        langcode:
+          expose:
+            label: Language
+  page_1:
+    display_title: Page
+    display_options:
+      menu:
+        title: Content
+      tab_options:
+        title: Content
+        description: 'Find and manage content'

config/sync/language/hr/block.block.olivero_syndicate.yml

@@ -1,2 +0,0 @@
-settings:
-  label: 'RSS feed'

config/sync/language/hr/core.entity_view_mode.node.rss.yml

@@ -1 +0,0 @@
-label: RSS

config/sync/language/hr/views.view.block_content.yml

@@ -1,13 +1,13 @@
+label: 'Custom block library'
+description: 'Find and manage custom blocks.'
 display:
   default:
     display_title: Zadano
     display_options:
+      title: 'Custom block library'
       fields:
         info:
           label: 'Opis bloka'
-          separator: ', '
-        type:
-          separator: ', '
         changed:
           label: Osvježeno
         operations:
@@ -19,9 +19,15 @@ display:
           exposed_sorts_label: 'Rasporedi po'
           sort_asc_label: Uzlazno
           sort_desc_label: Silazno
+      empty:
+        area_text_custom:
+          content: 'There are no custom blocks available.'
       filters:
         info:
           expose:
             label: 'Opis bloka'
   page_1:
     display_title: Stranica
+    display_options:
+      menu:
+        title: 'Custom block library'

config/sync/language/hr/views.view.comment.yml

@@ -9,22 +9,14 @@ display:
           action_title: Akcija
         subject:
           label: Naziv
-          separator: ', '
-        uid:
-          separator: ', '
         name:
           label: Autor
-          separator: ', '
         entity_id:
           label: 'Objavljeno u'
-          separator: ', '
         changed:
           label: Osvježeno
-          separator: ', '
         operations:
           label: Operacije
-        name_1:
-          separator: ', '
       pager:
         options:
           tags:
@@ -63,22 +55,14 @@ display:
           action_title: Akcija
         subject:
           label: Naziv
-          separator: ', '
-        uid:
-          separator: ', '
         name:
           label: Autor
-          separator: ', '
         entity_id:
           label: 'Objavljeno u'
-          separator: ', '
         changed:
           label: Osvježeno
-          separator: ', '
         operations:
           label: Operacije
-        name_1:
-          separator: ', '
       filters:
         subject:
           expose:

config/sync/language/hr/views.view.content.yml

@@ -0,0 +1,49 @@
+label: Sadržaj
+display:
+  default:
+    display_title: Zadano
+    display_options:
+      title: Sadržaj
+      fields:
+        title:
+          label: Naziv
+        type:
+          label: 'Vrsta sadržaja'
+        name:
+          label: Autor
+        status:
+          settings:
+            format_custom_true: Objavljeno
+        changed:
+          label: Osvježeno
+        operations:
+          label: Operacije
+      exposed_form:
+        options:
+          submit_button: Pročisti
+          reset_button_label: Poništi
+          exposed_sorts_label: 'Rasporedi po'
+          sort_asc_label: Uzlazno
+          sort_desc_label: Silazno
+      filters:
+        title:
+          expose:
+            label: Naziv
+        type:
+          expose:
+            label: 'Vrsta sadržaja'
+        status:
+          group_info:
+            group_items:
+              1:
+                title: Objavljeno
+        langcode:
+          expose:
+            label: Jezik
+  page_1:
+    display_title: Stranica
+    display_options:
+      menu:
+        title: Sadržaj
+      tab_options:
+        title: Sadržaj

config/sync/language/hr/views.view.media.yml

@@ -7,25 +7,15 @@ display:
       fields:
         media_bulk_form:
           action_title: Akcija
-        thumbnail__target_id:
-          label: Thumbnail
-          separator: ', '
-        name:
-          separator: ', '
         bundle:
           label: Vrsta
-          separator: ', '
         uid:
           label: Autor
-          separator: ', '
         status:
-          label: Status
           settings:
             format_custom_true: Objavljeno
-          separator: ', '
         changed:
           label: Osvježeno
-          separator: ', '
         operations:
           label: Operacije
       exposed_form:

config/sync/language/hr/views.view.media_library.yml

@@ -6,11 +6,6 @@ display:
       fields:
         media_bulk_form:
           action_title: Akcija
-      pager:
-        options:
-          tags:
-            next: ››
-            previous: ‹‹
       exposed_form:
         options:
           reset_button_label: Poništi
@@ -36,8 +31,6 @@ display:
       fields:
         media_bulk_form:
           action_title: Akcija
-        name:
-          separator: ', '
         edit_media:
           text: Uredi
         delete_media:
@@ -60,8 +53,6 @@ display:
   widget_table:
     display_options:
       fields:
-        thumbnail__target_id:
-          label: Thumbnail
         name:
           label: Naziv
         uid:

config/sync/language/hr/views.view.taxonomy_term.yml

@@ -3,11 +3,6 @@ display:
   default:
     display_title: Zadano
     display_options:
-      pager:
-        options:
-          tags:
-            next: ››
-            previous: ‹‹
       exposed_form:
         options:
           submit_button: Primjeni
@@ -19,7 +14,5 @@ display:
         tid:
           exception:
             title: Svi
-  feed_1:
-    display_title: Feed
   page_1:
     display_title: Stranica

config/sync/language/sl/block.block.olivero_syndicate.yml

@@ -1,2 +0,0 @@
-settings:
-  label: 'RSS feed'

config/sync/language/sl/core.entity_view_mode.node.rss.yml

@@ -1 +0,0 @@
-label: RSS

config/sync/language/sl/views.view.block_content.yml

@@ -1,15 +1,15 @@
+label: 'Custom block library'
+description: 'Find and manage custom blocks.'
 display:
   default:
     display_title: Zadano
     display_options:
+      title: 'Custom block library'
       fields:
         info:
           label: 'Opis bloka'
-          separator: ', '
-        type:
-          separator: ', '
         changed:
-          label: Osvježeno
+          label: Posodobljeno
         operations:
           label: Operacije
       exposed_form:
@@ -19,9 +19,15 @@ display:
           exposed_sorts_label: 'Rasporedi po'
           sort_asc_label: Uzlazno
           sort_desc_label: Silazno
+      empty:
+        area_text_custom:
+          content: 'There are no custom blocks available.'
       filters:
         info:
           expose:
             label: 'Opis bloka'
   page_1:
     display_title: Stranica
+    display_options:
+      menu:
+        title: 'Custom block library'

config/sync/language/sl/views.view.comment.yml

@@ -9,22 +9,14 @@ display:
           action_title: Akcija
         subject:
           label: Naziv
-          separator: ', '
-        uid:
-          separator: ', '
         name:
-          label: Autor
-          separator: ', '
+          label: Avtor
         entity_id:
           label: 'Objavljeno u'
-          separator: ', '
         changed:
-          label: Osvježeno
-          separator: ', '
+          label: Posodobljeno
         operations:
           label: Operacije
-        name_1:
-          separator: ', '
       pager:
         options:
           tags:
@@ -34,7 +26,7 @@ display:
             last: 'posljednja »'
       exposed_form:
         options:
-          submit_button: Pročisti
+          submit_button: Počisti
           reset_button_label: Poništi
           exposed_sorts_label: 'Rasporedi po'
           sort_asc_label: Uzlazno
@@ -63,22 +55,14 @@ display:
           action_title: Akcija
         subject:
           label: Naziv
-          separator: ', '
-        uid:
-          separator: ', '
         name:
-          label: Autor
-          separator: ', '
+          label: Avtor
         entity_id:
           label: 'Objavljeno u'
-          separator: ', '
         changed:
-          label: Osvježeno
-          separator: ', '
+          label: Posodobljeno
         operations:
           label: Operacije
-        name_1:
-          separator: ', '
       filters:
         subject:
           expose:

config/sync/language/sl/views.view.media.yml

@@ -7,30 +7,20 @@ display:
       fields:
         media_bulk_form:
           action_title: Akcija
-        thumbnail__target_id:
-          label: Thumbnail
-          separator: ', '
-        name:
-          separator: ', '
         bundle:
           label: Vrsta
-          separator: ', '
         uid:
-          label: Autor
-          separator: ', '
+          label: Avtor
         status:
-          label: Status
           settings:
             format_custom_true: Objavljeno
-          separator: ', '
         changed:
-          label: Osvježeno
-          separator: ', '
+          label: Posodobljeno
         operations:
           label: Operacije
       exposed_form:
         options:
-          submit_button: Pročisti
+          submit_button: Počisti
           reset_button_label: Poništi
           exposed_sorts_label: 'Rasporedi po'
           sort_asc_label: Uzlazno

config/sync/language/sl/views.view.media_library.yml

@@ -6,11 +6,6 @@ display:
       fields:
         media_bulk_form:
           action_title: Akcija
-      pager:
-        options:
-          tags:
-            next: ››
-            previous: ‹‹
       exposed_form:
         options:
           reset_button_label: Poništi
@@ -36,8 +31,6 @@ display:
       fields:
         media_bulk_form:
           action_title: Akcija
-        name:
-          separator: ', '
         edit_media:
           text: Uredi
         delete_media:
@@ -60,14 +53,12 @@ display:
   widget_table:
     display_options:
       fields:
-        thumbnail__target_id:
-          label: Thumbnail
         name:
           label: Naziv
         uid:
-          label: Autor
+          label: Avtor
         changed:
-          label: Osvježeno
+          label: Posodobljeno
       arguments:
         bundle:
           exception:

config/sync/language/sl/views.view.taxonomy_term.yml

@@ -3,11 +3,6 @@ display:
   default:
     display_title: Zadano
     display_options:
-      pager:
-        options:
-          tags:
-            next: ››
-            previous: ‹‹
       exposed_form:
         options:
           submit_button: Primjeni
@@ -19,7 +14,5 @@ display:
         tid:
           exception:
             title: Svi
-  feed_1:
-    display_title: Feed
   page_1:
     display_title: Stranica

config/sync/language/sr/block.block.olivero_syndicate.yml

@@ -1,2 +0,0 @@
-settings:
-  label: 'RSS feed'

config/sync/language/sr/core.entity_view_mode.node.rss.yml

@@ -1 +0,0 @@
-label: RSS

config/sync/language/sr/views.view.block_content.yml

@@ -1,13 +1,13 @@
+label: 'Custom block library'
+description: 'Find and manage custom blocks.'
 display:
   default:
     display_title: Zadano
     display_options:
+      title: 'Custom block library'
       fields:
         info:
           label: 'Opis bloka'
-          separator: ', '
-        type:
-          separator: ', '
         changed:
           label: Osvježeno
         operations:
@@ -19,9 +19,15 @@ display:
           exposed_sorts_label: 'Rasporedi po'
           sort_asc_label: Uzlazno
           sort_desc_label: Silazno
+      empty:
+        area_text_custom:
+          content: 'There are no custom blocks available.'
       filters:
         info:
           expose:
             label: 'Opis bloka'
   page_1:
     display_title: Stranica
+    display_options:
+      menu:
+        title: 'Custom block library'

config/sync/language/sr/views.view.comment.yml

@@ -9,22 +9,14 @@ display:
           action_title: Akcija
         subject:
           label: Naziv
-          separator: ', '
-        uid:
-          separator: ', '
         name:
           label: Autor
-          separator: ', '
         entity_id:
           label: 'Objavljeno u'
-          separator: ', '
         changed:
           label: Osvježeno
-          separator: ', '
         operations:
           label: Operacije
-        name_1:
-          separator: ', '
       pager:
         options:
           tags:
@@ -63,22 +55,14 @@ display:
           action_title: Akcija
         subject:
           label: Naziv
-          separator: ', '
-        uid:
-          separator: ', '
         name:
           label: Autor
-          separator: ', '
         entity_id:
           label: 'Objavljeno u'
-          separator: ', '
         changed:
           label: Osvježeno
-          separator: ', '
         operations:
           label: Operacije
-        name_1:
-          separator: ', '
       filters:
         subject:
           expose:

config/sync/language/sr/views.view.content.yml

@@ -0,0 +1,49 @@
+label: Sadržaj
+display:
+  default:
+    display_title: Zadano
+    display_options:
+      title: Sadržaj
+      fields:
+        title:
+          label: Naziv
+        type:
+          label: 'Vrsta sadržaja'
+        name:
+          label: Autor
+        status:
+          settings:
+            format_custom_true: Objavljeno
+        changed:
+          label: Osvježeno
+        operations:
+          label: Operacije
+      exposed_form:
+        options:
+          submit_button: Pročisti
+          reset_button_label: Poništi
+          exposed_sorts_label: 'Rasporedi po'
+          sort_asc_label: Uzlazno
+          sort_desc_label: Silazno
+      filters:
+        title:
+          expose:
+            label: Naziv
+        type:
+          expose:
+            label: 'Vrsta sadržaja'
+        status:
+          group_info:
+            group_items:
+              1:
+                title: Objavljeno
+        langcode:
+          expose:
+            label: Jezik
+  page_1:
+    display_title: Stranica
+    display_options:
+      menu:
+        title: Sadržaj
+      tab_options:
+        title: Sadržaj

config/sync/language/sr/views.view.media.yml

@@ -7,25 +7,15 @@ display:
       fields:
         media_bulk_form:
           action_title: Akcija
-        thumbnail__target_id:
-          label: Thumbnail
-          separator: ', '
-        name:
-          separator: ', '
         bundle:
           label: Vrsta
-          separator: ', '
         uid:
           label: Autor
-          separator: ', '
         status:
-          label: Status
           settings:
             format_custom_true: Objavljeno
-          separator: ', '
         changed:
           label: Osvježeno
-          separator: ', '
         operations:
           label: Operacije
       exposed_form:

config/sync/language/sr/views.view.media_library.yml

@@ -6,11 +6,6 @@ display:
       fields:
         media_bulk_form:
           action_title: Akcija
-      pager:
-        options:
-          tags:
-            next: ››
-            previous: ‹‹
       exposed_form:
         options:
           reset_button_label: Poništi
@@ -36,8 +31,6 @@ display:
       fields:
         media_bulk_form:
           action_title: Akcija
-        name:
-          separator: ', '
         edit_media:
           text: Uredi
         delete_media:
@@ -60,8 +53,6 @@ display:
   widget_table:
     display_options:
       fields:
-        thumbnail__target_id:
-          label: Thumbnail
         name:
           label: Naziv
         uid:

config/sync/language/sr/views.view.taxonomy_term.yml

@@ -3,11 +3,6 @@ display:
   default:
     display_title: Zadano
     display_options:
-      pager:
-        options:
-          tags:
-            next: ››
-            previous: ‹‹
       exposed_form:
         options:
           submit_button: Primjeni
@@ -19,7 +14,5 @@ display:
         tid:
           exception:
             title: Svi
-  feed_1:
-    display_title: Feed
   page_1:
     display_title: Stranica

config/sync/system.action.user_add_role_action.admin.yml

@@ -0,0 +1,14 @@
+uuid: 8e67cfee-ac5f-46c9-a0a1-3fd6126e00eb
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.admin
+  module:
+    - user
+id: user_add_role_action.admin
+label: 'Add the Admin role to the selected user(s)'
+type: user
+plugin: user_add_role_action
+configuration:
+  rid: admin

config/sync/system.action.user_remove_role_action.admin.yml

@@ -0,0 +1,14 @@
+uuid: 57d93d75-2b6c-42d7-bcfe-eb104ca9a8f4
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.admin
+  module:
+    - user
+id: user_remove_role_action.admin
+label: 'Remove the Admin role from the selected user(s)'
+type: user
+plugin: user_remove_role_action
+configuration:
+  rid: admin

config/sync/user.role.admin.yml

@@ -0,0 +1,9 @@
+uuid: 121b382b-91b2-40dd-a104-abbbcaca7c7e
+langcode: en
+status: true
+dependencies: {  }
+id: admin
+label: Admin
+weight: 4
+is_admin: null
+permissions: {  }

config/sync/views.view.block_content.yml

@@ -209,6 +209,15 @@ display:
             date_format: short
             custom_date_format: ''
             timezone: ''
+            tooltip:
+              date_format: ''
+              custom_date_format: ''
+            time_diff:
+              enabled: false
+              future_format: '@interval hence'
+              past_format: '@interval ago'
+              granularity: 2
+              refresh: 60
         operations:
           id: operations
           table: block_content

config/sync/views.view.comment.yml

@@ -394,6 +394,15 @@ display:
             date_format: short
             custom_date_format: ''
             timezone: ''
+            tooltip:
+              date_format: ''
+              custom_date_format: ''
+            time_diff:
+              enabled: false
+              future_format: '@interval hence'
+              past_format: '@interval ago'
+              granularity: 2
+              refresh: 60
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -1272,6 +1281,15 @@ display:
             date_format: short
             custom_date_format: ''
             timezone: ''
+            tooltip:
+              date_format: ''
+              custom_date_format: ''
+            time_diff:
+              enabled: false
+              future_format: '@interval hence'
+              past_format: '@interval ago'
+              granularity: 2
+              refresh: 60
           group_column: value
           group_columns: {  }
           group_rows: true

config/sync/views.view.content.yml

@@ -17,11 +17,11 @@ base_field: nid
 display:
   default:
     id: default
-    display_title: Default
+    display_title: Zadano
     display_plugin: default
     position: 0
     display_options:
-      title: Vsebine
+      title: Sadržaj
       fields:
         node_bulk_form:
           id: node_bulk_form
@@ -198,7 +198,7 @@ display:
           entity_type: user
           entity_field: name
           plugin_id: field
-          label: Author
+          label: Avtor
           exclude: false
           alter:
             alter_text: false
@@ -230,7 +230,7 @@ display:
           settings:
             format: custom
             format_custom_false: Unpublished
-            format_custom_true: Published
+            format_custom_true: Objavljeno
         changed:
           id: changed
           table: node_field_data
@@ -238,7 +238,7 @@ display:
           entity_type: node
           entity_field: changed
           plugin_id: field
-          label: Updated
+          label: Posodobljeno
           exclude: false
           alter:
             alter_text: false
@@ -270,7 +270,7 @@ display:
           group_type: group
           admin_label: ''
           plugin_id: entity_operations
-          label: Operations
+          label: Operacije
           exclude: false
           alter:
             alter_text: false
@@ -324,13 +324,13 @@ display:
       exposed_form:
         type: basic
         options:
-          submit_button: Filter
+          submit_button: Počisti
           reset_button: true
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
+          reset_button_label: Poništi
+          exposed_sorts_label: 'Rasporedi po'
           expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
+          sort_asc_label: Uzlazno
+          sort_desc_label: Silazno
       access:
         type: perm
         options:
@@ -474,7 +474,7 @@ display:
             default_group_multiple: {  }
             group_items:
               1:
-                title: Published
+                title: Objavljeno
                 operator: '='
                 value: '1'
               2:
@@ -497,7 +497,7 @@ display:
           exposed: true
           expose:
             operator_id: langcode_op
-            label: Language
+            label: Jezik
             description: ''
             use_operator: false
             operator: langcode_op
@@ -660,7 +660,7 @@ display:
       tags: {  }
   page_1:
     id: page_1
-    display_title: Page
+    display_title: Stranica
     display_plugin: page
     position: 1
     display_options:
@@ -668,14 +668,14 @@ display:
       path: admin/content/node
       menu:
         type: 'default tab'
-        title: Vsebine
+        title: Sadržaj
         description: ''
         weight: -10
         menu_name: admin
         context: ''
       tab_options:
         type: normal
-        title: Vsebine
+        title: Sadržaj
         description: 'Find and manage content'
         weight: -10
         menu_name: admin

config/sync/views.view.media.yml

@@ -448,6 +448,15 @@ display:
             date_format: short
             custom_date_format: ''
             timezone: ''
+            tooltip:
+              date_format: ''
+              custom_date_format: ''
+            time_diff:
+              enabled: false
+              future_format: '@interval hence'
+              past_format: '@interval ago'
+              granularity: 2
+              refresh: 60
           group_column: value
           group_columns: {  }
           group_rows: true

config/sync/views.view.media_library.yml

@@ -1172,6 +1172,15 @@ display:
             date_format: short
             custom_date_format: ''
             timezone: ''
+            tooltip:
+              date_format: ''
+              custom_date_format: ''
+            time_diff:
+              enabled: false
+              future_format: '@interval hence'
+              past_format: '@interval ago'
+              granularity: 2
+              refresh: 60
       access:
         type: perm
         options:

doc/dodajanje_pojma.pdf

@@ -0,0 +1,140 @@
+%PDF-1.3
+4 0 obj
+<<
+/Type /Page
+/Resources
+<<
+/XObject
+<< /PAGE0001 7 0 R >>
+/ProcSet 6 0 R
+>>
+/MediaBox [ 0 0 594 840]
+/Parent 3 0 R
+/Contents 5 0 R
+>>
+endobj
+5 0 obj
+<<
+/Length 40
+>>
+stream
+q
+594.4 0 0 841.0 0 0 cm
+/PAGE0001 Do
+Q
+endstream
+endobj
+6 0 obj
+[/PDF /ImageB]
+endobj
+7 0 obj
+<<
+/Type /XObject
+/Subtype /Image
+/Name /Page0001
+/Width 1651
+/Height 2336
+/BitsPerComponent 1
+/ColorSpace /DeviceGray
+/Filter /CCITTFaxDecode
+/DecodeParms
+<<
+/K -1 /Columns  1651 /Rows  2336
+>>
+/Length 15775
+>>
+stream
+ÿÿÿÿþMÕ
fMÊ€ðÊ“qPW.ònÎã#Åò8jÁÆʈeµ°"&Ílj™"È2Žv©"'#Dj‚„Œ…²8”œA
+G*C!Z¥Ò+àJEr¤W¬MÁ„“d¹"ºA:•ÆÅôW(;¤“P“PÃôH®J{É|}+aô°Ãþ},?¸aÝ*nº”dtE0î–"mACø‰š1A‡ÒÄA¯oÓ‹xÄ7É„Þ³µ¡C}NÔÁ/ç`€<>ë;ôvöv3·ó±<C3B3>‡Õ"B¯Š8çp›ô;u[ýíò.ƒúƒ¿WºÓ¿Û¿ÃðD}àŽ.¿‹ü_ÆEWûïGë}üzÎæÿ"¨˜× Á«|bj
«ù'”ᡬ‰ÿLöl3<6C>ùÇ©pÙ¥ã¶A6E~Ä–ÆAù~² R _ä0ÿ;TG
‰<07>ƒ ƒžBžr-÷{ë×äQý}ßÿúþ— Køÿ kÿ×ò(¿<>ÿäMuÇ_¯ÿ"]õ¸ÿÿ××ßÈš¯ß_ÿëßÿþô¸þÈ¢û§×õÿ÷ÿÿ½-ÿÿ÷uß]¿ÿÿz÷kwýýkþ-®úúöý]w%i|5ûiW`É0‹pÄ/l/ƒ!›²U̦/±Kÿ¶—ÿzëë¬zZ¬´!%,´DqK¢ùˆŽÊ¥‘HU’ƒqÎ9ܨ(q!‚•,‚qpÎG<10>‘á5‚„¥‘@(6ˆèDNɆp”²hŽDìÈ@JY‰<>ÌŽÈà’n–Ä‚“u@Ð#&à€Ä›”òn6I¹€^MÂ$Ý8$›†&ó“xI±˜$›,†$ÙL“bÐ^M…€‰6I°$›“jÃl€Ä›`bM‡–ë@òÜ<C3B2><·ŠÙ2-ÊÇE¶¸ T
+?ÿÿÿÿÿÿÿü²¤¨3²ª½;N“}-týta󰪲,· e}Wª]/„ÊÄ—gS#®ðCš
+þíRoüîî½Rëa¸"=¤Üîÿ[tý׃(«Ÿ¾wu@ƒþµÓo¾¨?p²6‹ˆ»}“H"onÎt¨ò¬ööÂj¨¤Åq`÷¿	<09>ý*~†BƒöûÌ;¡ÿI…*¢{tÚNQá{×0k½ôÝÄ/´’ƒikí{ªÁ‡[{kðUÅTíþ‡ü[yÙavS¿û×AU¼‹á¸Aí¥~këia¿–ïÑáþëCàõoT ßÑ‚üŒú¾ßTþ/ñ·ýoÊMoÿDxµUÜoëï}pMîÿÛ^÷úø[úKßÿýuûúä³õOú:ÿ]õºÿKôºÿ]}ëüïÿ×ú_[¯_÷¥ýiXõÔ}ýgõÏõý½ÚM6N½·õº}VŸZ]+ÿÝ*î®´õúõvQzÅ5·«ßÿêÒÒöšoþ–ûhÃõý}¶†úýúZ_]t½kß®ÿõ¥Ö’n=ßéj–·¯µ~¾º­×ô’wYûÿär´˜­DIX(ßÿÕÿÒY^ hïý¥ÕéJŠôƒ•ÿµëPÃm!K+Øe5}ñý†%EALŒÁ¸ïô¿pÅhÉdÞ¯þìG2wüvŒ…
¦ÿkô&AZÊ	ú­I±Ï.
+ñ_öòÜÈ´Ûj¹.‚E¸ØüÏÿŠêLŽ†Ým6+ÈÁ•Ä€ðÕí„ÚwaêÃ,ÆsÓ=¬D®à¦^:£x<C2A3>Z±¹Hjˆ<6A>e¸a–qR-ÍA¨keu@ÒÓ•ÅC^••Ë†Ñ«•ðBdJ<0C>‘\§CU²<04>Pˆl–‚U í’RÑ<>^vÓ’¦,<10>	i•¹“S¯ÿÿÿÿ̹‘Þ ì§ÂL“‹paÃpaÃ¶I{pᲺ2° í<C2A0>ÏÂ@Ý°A<C2B0>Œü7nÒĴ̶´l…æw•]0Ý׫ÊàùV•[Ý:†î/M­‡m+o‰O³?W™|ûí²+k¦Y¦^Ý;¯Ã!À÷yf­$3¶êëîL~ýŠTôgmýþŒõÖ»ÿþÿ}¥íÒÉq¿¤ÒU½+ô¿¯~énçf/oÁo¾®¿ßi}rãÿ¿¤“Ýwô<77>ï~úëï´¯úîº[ô’îŒ=T·ýX¯ÿ]~•ûZK<5A>æõm/´ªïú­};Ö¿¥úø‹×ýzý%§«]_^ýë½/µÉ„º_÷ר­[K,âÝu¸_^ÚÖÙÅ¿ô´ßaVÅ~ƒ‡Wÿÿ^š½°›
xõþ£\`Á×ÿXwO²o&éY^˜a«køz؆<C398>NéØn·ûõ)ÃÒÇQPÃ]ë†
×x#ºeü0ö÷ÿV}>’
Óÿ°aÚB)“¥ Ãú‘	?ða±“q¤<71>Õ°Òoƒ÷¥ƒl$ò„Pßð÷ª–ÃÛäÜî{JÇ«…†ò*Lx<4C>ü:éŽÆ¼0Ò
+E¿[ê4–‚ö=´ßÿIz<49>†úm7þëÒI+j?o[׬7èÏ*6õúIa*aÿª8ïù¯K++S(oöÔÑ+ïþ$Au½kªtß]ê­#À](">Ãé­U_[ŠJ9prJ7Ô×ú0ôé²[¿ÒЄ)¹Ÿþª•*¹(¯®´ˆNI_¾—ëÎýB»IL•C®¿úô–ºJS¥ûÑ’¿24
+ÊuzýÕ%KÒ!éë]z2*òJ¶D)©×U¤’Òº[†‰?^•òÁV•ŠkéºKKT•ƒ<&µm*PE92=$jú×ÁcJ+IÅ*GÒºKãI+Þu_Z@´•uÜÎ¥§â]%ÖÖ’Ò„uA*uaød<C3B8>%¯éh|Øa"'ÿo¯‚#tž•a&Ó±×HR„µH!
/×KKH QªUÓn=uXA~lœu«ô•¤‚’ ‡	1ú]U*¨<>rª®¿„Ÿ*°‹vlVÂL.*ÒXKT
+<EFBFBD>t“ô´<EFBFBD>I6b0Hzp•B^AŠv5¢'¥]´X÷è%¡	Ø…	Šv°’Â	pŸ,<2C>~—ÞZ
+ É‹‚ÆÐU2#Ò&ïªõÂ_áÂe%œÃ	%‚Èø@ßZý¥þ	p„v+†Pá-êä<C3AA>ªú3Ü%¾ X‹	(<28>„ÝßP}v[º„b¾]³²5]é-‡®Ä/Ñ<>‚®ÞµÞþÁé[	ÆÂðZ]·½'ïH=v´„	þßõãYXKb®¥ØÿõÁ‘Ò}„é:\>«½dÌ´­Åºº»Oz@ݤÛ߯Aõç*â7.,B±ï[F‡ú„Ÿí6"!+i¯>÷Ö!‡WI»;v¿†óR_ uØH7§Ò[vš3³3ÒJÝ=%]/õa?Ka-JƒÿßÂNét½2Œö—¤ït¬K·¯a„è=WñÝL'ô­¤º.ÚH&•R3ÿ„Þè+ ©R}V´¯è}F0’ºW¤–ûkÓãbJ¿ÿ/¤Ú[O•E*"OÕ`Š~¶¸Ž”A$ˆÿú¥Çi1	Üa¦G5IVµØ Â¾<C382>" X Á}}VÊš W&íGQ^«ÁñÄcÂyÝ^—XZ^¬Wÿ[ý/û×IR×ßPG~–Œ?þ´—¥‚Zþø¯ÞðD½W¥u<>Ú»zC×Û	‚(ucø¦â)ÌŠ×Ãf-cGø5Ù‘Jþ;#’Ïû
+ŸãkúÚÿÿ]WÖö?Èëÿþÿ×ã­kÙý7_R—{׶·Ø ^ëPÒØM'†2púMê>•úgw×oÖßðßÃ{ý÷þ®/÷¿+¥çHî÷苳]ÓL–Cù¬2,šMÚÃ<0C>†<EFBFBD>í†Á äboÛ Vëm„	ïí†æ·í÷<7§lûoóɹXeïoorn4¶<>²FºY7÷ÚI{dß@Ï÷ÂþMðÓ·¥®MŒƒFý´ÖM•Q3ûЯrlL5þà—Ùn@*˜ÈàQû„þEÑ‹äqHã.!‘tGÃ_¾Nõr$†Qs;EÃTŽ!Œ"à`ÁÿúÂ!	ÉJq!˜Ô4ïoù=†Lr
‡0äìÉV®¿·à˜‰¬"ã6¿L=TÊ°mþÈ.#„†ú¿÷¿.¾øðˆ÷ô¸¿ÚZ5‡þ·ßKÁ}ÕGö•ôŠ—Ý—–˜‡%è<S}–꽂´‰±–‹2Ü× JÈ#ñcNƒdº2,<2C>i™Ù÷†Ð4Ê}ß„*vËu§MÙ'¦BiÝø@­ZjÚ|ÐÍ°ƒ™ßÞCH<43>XÙØRFpöï;J[½ïúI¶v]2€ˆ<•Ûv玚J4gíÖª¯™Ýà<C39D>7·¶¾“îsóËú‚íØJÌ#Xcou|…ð›ôý5½Pm÷]4GµR•.Såemþu@‚+?c×úi;U_mÛt	m±AíÖ<C3AD><C396>ƒõÿû×ïÝ’q1wçe›d[Û5mÞµ¨A^•}ׯ¥"<22>“q-ܧ|†ØÓ„·oííýi{Dÿ “Òœw\q][B	F†/Û·ý"~_¿ÐTgê¬oU1L’·ÉÄï°<C3AF>a<EFBFBD>Š"€ÿ÷·ÒÿÿõÈÑ…^òÖɸ¸c*ël"Ïö³«ooÈË}uý/X¤«^º¹7—ÂW}ƒ
õ­ôŸÒM¥ÏýI$…$ÖÃz"<22>žB¥o#õ¯nîþ½¯¥÷Úé$ûU"#@‚fEÖ^Åöîßãú3÷Â
+ô­ÿcˆO<08>(Ễ¬ìÑ'‚°Úÿ3ß#<<3C>_Õÿéf±¾“Ó)Â
 WBkoIYªá'pÁÿx¶º¦ú«×¤Úí¿ì!®†è·ÌìíFDvúìåûoêü©ª¯ÐÝ,0bébß‹ÒÒì[ì%¿ûß· õ¿…l…2ûŽÝiy¯Ð[h<>
+7û®¿Ä<EFBFBD>úk0rÝZU„¯ÖâŸÚ^l6/»cÿï&õÒa1t:X¤Ýÿ;	wéz ‚]ïúü-[ýúè&íÚ_vÝ%òÇ,[…ÿ_ÃS<C383>
×l¸{iI‡ÿßõñ=ÖÝi}{Ðö?¥A‡þgwÓþÝ/ÿ÷«zPDvû,8õ¯ßß·zýúOþôv+êÃö<C383>¿eõ×nûý‡i%ºéWâ"+Lì'èD:÷ðÈ›Wí‘+½štê=u†Ø<>Auß²	±pÈPÅliZIz©;Ëÿíød4m°i­ªÂ»èGú_·Ø0ý±…†…µKa¤-÷ÿo¢ &“,B*ð–çf‰&½}¿V=´Ä0®›.¤Ø°>¿ì:»I<C2BB>èZ±m&: ÜOìtvZa…J.éÁÒýðÐd{«‰X3ªö~Ä~
+=øk+„èG<C3A8>øëöþÞ¢Áûß`éöø~ßJ>!Š¾Ô\cÿÿÿËYmBÆàшòÕáZ=8Díá<´€Å!4ºzYè»jwKì—Tƒz{“Õtn•U5$I<>+³T…HJ
2’5÷UxK²
+-<Ó´gá$wt’r±’<C2B1>²Î/ ÒK©õá$<24>RÅÈ %3°¤‹Àø*˜{kv“ô$g¶RôÐeô<65>º%KþÂ}.Ü—(±éi: ©+éâµUôC²VYè’ÐcOú¿óÒ_£›<>EáKA×ë]¡äeZJ¦¡sýä_S\·
oé-Ó×T°ÛíØ‚	%iiwé^ƒét‚]m¯&âÃÑç·´î•5Ë÷¥T<C2A5>$Êxd9ׂ­8O^:ºSÙ[Gô<47>…Xü–P¢ ¸A%Ú¶«|_J>’ЂMB	'Fý:¢ñûúÈ:(u<>ø ¿ozK¬ßô™ Œ›•¥£ í’¥×¥ýkñB.”¶C
:IA‰/Wÿè7ê­×Ô›j@Ñšù\ô
.½p– Žú_i…_&ÅŠÌÄ¡0"b ÃÐUÝa½7è"?ˆ¤ˆ&Fîq}zé$<24>º×Giø?¨„Ù„ú¥Ö•›L«_ýÁ<C3BD>Bµ¿ëp“ÛeEG¶¸ÓtúIWiv)2‡Uí7Y¶%#?é®ÂY;¡¿Òþ;­ñaüÏ¡¥Sè¼»O¤ÈŒ‚+07%×Y<C397>Rżìµ+!<21>’‰•!&š\A%é]º©µÐ/m(¢ºžGû!v7m%’T*Ð<>#w„ªI¯ì4ºÐCo¶),RþÂð–ÛÇPA_?d¯W@­Ã»¬vÅ;¶°¤;Qi±pöÄ—â?ÿþY•"?,áH¨	, ¡ ªèAK)@4Ì<0B>ðŽ8(DöV§ˆM#ÀÅ„¨ÑÛ:PEOHè!®8aá <20>·û”˜®9zH.áÒJ¾Þ—ò.—ì$Â_ó¥kÐ…Óþ
++ú4jÿŸí¾ô2	]YÜmýÔñ7ôÊ<C3B4>Å¿¸JÿØ$íþÈcþÁ‘Áþ!‰eì[ÕãÃQÿÿÿ-<2D>o<EFBFBD>.[	8h? å¥TwæRf¨téÁÝ–èù <2ïÊêªß
á§w‘È¥Œ?Vó;Nh
[Ó"_öûiéï®<C3AF>?»}»y<C2BB>ß<EFBFBD>‘ê<E28098>ú·Ãa?m¤<7F>.®ÝÛ_onó³_ÕV·í¢Þ­®øù/U~ܲ†Ü“Ýݺüì}Q‡®½¶ôÊê…n£b­ýákúë(þ<>'Pÿo¾õIõ¯?ÐD‡nêÞÚO«ý§ý'ý3{söû~×õüà%…¥@ÃÛ<C383>ëCþ’×û“ÇP¸Hvç~´­7Zæ——
+×›uÒÛý·DXè˜áÚê—ñ
+hXú% ÿÿË›~ؤ$Db¹á\ ¤Ü-¤¤H4mÿO_L Ò¬þHØ= DÙM¾ÿÿÞ·á~ôúD&Âïoñý툦ãk«ú-ߢ=ªïþ¿Vº¤…ÿúM¤T<C2A4>½î¾ýÅ<>íþ¤Cb´Ÿ…Ù©ö¥™Ãíþ¯öšÒoõƒÕèÛ£Ôß×DÝþ/JÃJºEŽA
„Ò}h§W†ûú½ÿ^˜ªA<C2AA>\ØÒ«ú­‚Þ>ªÜ<C2AA>}.£@^“}i7¯°D{hÜ<68>o¼%ŠCí¥GPOùQëe<™qþé
+
_¾´±ð‘-&ûÝ&Ú*®ße@¦V_A×Õ„”¤eº<65>úÓ½ÆñXmÇŽ–ÅBëÖ“l”ª½1GEÐ×´7I¼è´µl?j
+¾ÖÂ
ɼÐ@ü¤wM¾ÚCMâÓb@оŸ„¬;WQnM‚Á½k0ïûýE<1D>\VÞ<56>oThzMÞÓÙÇ&X¿§Òí&#ô•Ý-¶ªÚ†~üHAŸ~’lía$-ÖÖC
+=í©ÙHŒ8a&õÓ"Ž¿â’`Èì2vgTQÝ+î<>)ˆVÞ¾õõjr€@ÂMºþÿtЈÙ3ïºOûí#;%ydÒ|cï;êÃoÓ}µM’ýÂ
ÿê]Û»º°ÅUÂ#ÉmÜZÍKd#Po¤? ¸ì§ƒ!Z†!-¯¾ã!_¦a]ÃBZv‚#ý}:ƒZ\ÓGëïÆΩ*ýûó>¾¹láêazJ—O¾“H<E2809C>i*Yí/®tkË—¬µ†ÔðúÔÔ>ÂQ	'á%ý4ƒ<08>Ô4¡kÒï	y¦>Ä&õSHîô³º™Óë^Ô4)_-jÒT¦~äL<C3A4>§zHúYi¬á:O ¤òÖ˜íô™Sƒ&z¤CÎÍe ©,*arzúZÄz©iŠ  êšú	=Uw¿„’k! HxAÐæš0ê—It‘1ÖõúXßK&àšªé:úKTjâßK­}U|ˆZI*^‘ÔïPš-×·ú^<5E>ð‚,‚I=H<<3C>j—I$<24>LÓGŽ<47>m[oÕ ’Õ-“`£M?T/¥×Ò	§úN‚\~>×¥¯´[ékKÒDñÒú\Ïj×i&ÒJ•¤—ÒUéi}#ŸÕÅ{võ¦+¤<>¥ôëQúAu^é+KðÂ’öÞ¾¨*T’ªø]VŠ5þAâ]-ºÑÇý.–—I%ëjy¤þ	x¥öÕ —i
i%JºK¤žØ/z"UIú[š³±Þ—ù¯]%¯HkÁ-°<>·ÍDRîÚßÿKÇL*<2A>z­ëß­.šzcúô¢½w;û@ˆûuZÓz¥ºÒUU;²ƒÇúI½„—þgjŽâýR„ºÁ—%{ÒÆÁ…jµºi};¥…j—‰cÒ·Å&b…kÜÃöÒŠ¸_¤+X`›HêÇ	i-.“íࡾøªZVð‚“ý¥Òa¿J¿bx@’ªìÖ¯ö)!ßi} â*Ô4’š/‘Â.—Oó6*K&ÊI—¸fCQ81þ­$üBÁ‚KÌ;!œÃ½û	¥Bª¦”U„´ãü:xlî-Ø׈eÒ<65>°««÷OwTXçrÖ4£ª^<5E>
=vÍÿ‹éiRýÕû*<2A>»¶¨/® ¿Ónä°'Úü-h}/¥þ‰SÝi%0¾º¤º¹!	üV’WÐëØëü ]õ­7­¯)çÓ@¿¤®ÿú¦´’M›|-,WúJ‘ÕõºâúUªQá-Uýko‚	EÿÒßõ²1ÿ<14>ð}kÒÇuŠG|»Ò_×Bë´ŸÝ/×5Fžý<C5BE>\Fú¥¥kØ*‰ÛþõõÖ!íÕ$“›A~ïÔ»}Ž¾¿Ô´kMíõÆ·øvvÕµÕªöàÛ¾ØÝ5ÿÞÛöñ/Ûzøû°Ú^ïá†×¼{1¯«`ë~±þºÞ“½$Ýq„ÈV´Û;1‚OÃ+ˆÄŽ¼å²<C3A5>Ó°èðÃ}¹k©vÝ5o
ƒz{{(öó?i¾Ú«gjßl§2–‚û²¤‚¿ÛöÓÐCþ<43>ï)iýþÝkWÿm_J¤Â;T×ý$¸Mõ·]¥ÎšH¼íùIEzI
<0A>ƒ"£ÒÿþZIKT©³½
s7¯m*n·ÚJÙÝ9
+
ê¿®²Ò(ëI$›&Oÿ]>‘êY¸“OÔŒvª—®¶’W~Îþ_Ò=´ŸÒJ«ôŸ÷ýi"Çk“ëúëî’Øz<ãIëО}{ÿ^‚~ 囉QcëÒªZßë­t( »3·×úJ©*WZZÿPêùf5Ký²>«ý„¢½Ruež²Êæ?K^–,%⯥<C2AF>;íiÒ–UrÂuQç£V”îÂ¥ÚUÒ¶ØK×w8ì"+ÕV:T–+é´«]‡a}~<7E>¢~¾kÈWª–ÂZâ—¤<E28094>Š}|ïÐK¤•L}'Ä*µZÓl+ÑŸ,†Ž•¼Õ ¿]*`ô¦ëA„•$l5®š_ÚKõúIUŠM<C5A0>ˆK¶7Imýr²’Kÿå¹z[<?^¬ …»/3‡tý^ÖµOú—Òðúém†÷Öüƒ/¥áë^.	}ô‚
+„Øb¹d­¿ëït¶º«Ò†_Ib¡—ºÈÏ öïõ6×­‡ß_Kê‹ð<>7Tý­>•<1D>i=~Â].¡mënÿ¤gw†~x6<78><36>á‚ékק·q÷‹xÿ<78>¤¸ÕgÇßýúoMµÕ$µÆ¯¶Ü¼::Wjß[OŠ[<5B>öúý¿Iüq•Aéö_}7¶4&A –Ãéa»ûõŠÄ!	Çì6¯ÿk`„7ivÿ¢6
±Þí´«·í¡;(k
J¶'jaã•o3[!e
qÛÃÊŠ»´#öb±½GûQÿÿËBÐàˆ`!Ú…Ñtœ²©ätBÒ,QÁv‚NwKEÿY<C3BF>êöÒôý«Öö½5ŠÙ¥U!Ýa?¢(JºäKiå
+µ²Ò>u9.‹~q⡵ÐUa/Š_¬WéôWëªH0¿ýãñUƒKÙ	õ5ÿ¥^#ý{$ÿ¥Ibýþ’[ý"°ûêªÃÚL4™
+å9M@GböƒE@–Ct0þ?ÿò˜5^ZŹ]>žÌ•‘UËXï½\§rÕ	 èìP)Ù<©Y:ëìº	œî²Jõ^<5E>;×<>аµÒ"";O¤N¨0ÖÈ=!¤´›	èBå¨c%‹Vúê•h:.</a9«¾•u]¥¶—P¸?mu]-!Kë–¢LgáTÞLìÖUªª¯U-3àž1í뤽}R
ÿ©;‘{ú »JÕQo­j¤˜DÌä_ßuz[­Õ$«ºÒ!ÎïƽõÉÅ®•U¨A}e¤–¨Öá½~ßtõ@ˆòYPbÿRÌAŠH…;Õ/ÕùÍ%ÒKô«mi«XoÝ/ûП<Wi$‘õ®–ëMÛ×_Ý(%ê<>zþÁ*3ÕÝÒ´¿õzÚJÒÚŠ¦+NE:ÇûõúI‡¶©i1X¾×II;[mߤ«ý!ô’­¬~uÔŽ“(]U§}×ÿ¥]5<>J‰PðÒÕ7u××oõoé"nóM}%aÐÓ¥¥ìVªAú]$~jŸê”ˆ8ÉÒÒ«kÕ[ñ ƒÖ¾f¨%¸_		­$\Uƒ/zÓþ“Á—E$–£<E28093><C2A3>Õ
!U"„«ï²CˆUlQ0•­/áªJ+¤º´aé¼Bôg;KðÅ%\´	a/Ñž—á…øãªOgñJ’¤<E28099>ëÚý†b«K»Hy7R”Ñ EÒT“×ì*„¶νŠK‚¨|×ÿk¿^<5E>b†¶¥AŸIX¨I%\%ÿ¥†¶Ø$’£{@ÎÂ?Òª¦+ép¸ap†‚÷@ÐizKì'þ'})V¹ 0ßÒTª×<C2AA>¤%Ž<>×Û$òL<C3B2>´¾–’ë(D¾´–ÂM®º_íaE¡í>Sˆõú]>6<>è …¼ÏaYNÈII*·‘G[ûN©¥Ui(¾Åh ­R…ÜWÆ]W°»é-iv«xì__™Üî-ZN?Õ+.«V±mGý6yXþ;&ã‘r~•T$¶•›,ƒº ‘Œ	Wà‚)È'ü!º…ñ¤‰…ýjI×T”X+ý‚0uã<75>Ô°Eÿþ–©W~?úÖß«ékÐî½xí+þëL†XÒßUTÿ<54>HÄ5úƆýR—p®-1CaFMÁ]üygV¥Ÿ28*K@¨rÑ\GÁbZ$5¥”Ì5ÎÒig&¥”)²ùÙ lJYECPº³@\²­Jurn$ì´5DÊ ÀHÉä¤Ü™È(Ýf†œ‚ƒ&äË#y2>ºEÖ$5V<04>yæõE<>AšÂŠ(sÃÐ!²xR5 ¦½l·
™	„D–Ø­¯BK<42>àà忇C¥Æ’!-+Á 8‚gp)	¥:AÙ«:T¤ÂrâI
<01>‹<>„ÈØOHzÐpúA¤<41>š”I¹8Ø"&†H(i6©îªB	tKáþöÐ#	vºz.ܳmBl±7Ø ZèøÒ´½µÑŸ ž˜«î.­1Û¥Iº°º¥úìPZõƒi.ÿ~¼³
‹¥½t¾šT“ihzu5òuu«kn©míË·£¿¢7dÌ€„ÒM°AÿG]â•m-|0º:@¾íÝ^h6Ý*u´š× ¶³³BFÚ4®‹ç«¤p#aŠØ§µé*M®Aê–ªÚEÅ鸒$
¤é†¿úÍ]艱£?êSÛŠû…JrõA¦FwêµÒI`Ó
¤ê»h®ˆöí,Ch›öú×<
Ò­°DMΖaÒC·ÃÒ–ÕzVT=[6;h--§J«Ø<%‰³]V<>é-¥ôê»Zö•2_ývÕ'f‡¶uVúÓTLV]µÕkz:PD}¾ößUÛKÐoëÿ:J˜‰Ýí¬P%äýPaRuT©	êÎéþ©Å6’ˆË)Bî´¿]††Ø·MíBkÞY
+…O}ÂIWXb…¿Æ]pA<16>ú_ÑV°Âu¬GZ„F£þØ%¯§†·]/‚$‘WÔuê‚zÕ-R ¿¥‡ÿº©^Ð_ü»
*ô®½'AjC?èÖÒIµIÊš,0’ Y$<24>.ýjï+'CUïO/%î–é(mÂL+_M$~z•}Z¤=…u–ýëþ³ÞìÎâJi©Ý­_ø+’`Á#½pA5pA*½!öLwéqMlBSd\]ZImúÝ0’a1Cˆ*Øü[ú¶І
+Âö®ºÒ†8à•&µúKJMÕQ×üt’ô¥ï¹+µö«à“UŠúÒKH$<0MÒ¶•U1¯´<C2AF>Eˆ_¦(ìø@˜/JÐaðÊØÀ_Äx×_þ/ò×è:{2(êB£µ L·¦ƒ–CUÝ¢y‰gQÕXšTÈùOß-LèÑ_‚<19>÷G“Ô'}3±@¾HçÕmaØA—ß‚[¸¤N=RwyÐTM˹!‰é.MÚûÎT*[¤½ëNM
º_øUùØXëÈ.Bô
ºô¾ÁêYƒHËTû!+_Pþ¿tRÌH6ðÌ `’-ßZìfâ?3´„Bxÿ¡aÚë\EÂ%ÍúžZY¤'Ÿj<C5B8>‡zZü³«×§í‘[˜¦Ñ±éu·û(u’×ÌÜH´^¯†ë\(ú‹05Ø ^•aZMëDÉá.©kFq]rʧë[}ÄR_Ö¡…ZUÉtþ“)Át©dz’R=ÿ5}ýÕl`µ®$jô¾_×õ¾­¯øñü:Ò§þÎ;UUYsi<73>%
+Y¿L$HKU×BÝUUcK†~´ƒ×¯Wýwõ—Z	>ªýX×ý{ü,Õhü—Mõ^+__ªwÒÿöýR²¯­/ë¥í¯¦¾Þ¿cõT<08>פ¼0_ŠÒo­&+û_ýÂ
všß¤’ˆª’é?é{§î;e
+þd(]*÷úU·%°þ›Ž$¹ªõ¯Ò÷Iý»îÏøè-Uç…ýTg;_ƒ¦›	8¥þ‚Ò¾×°ÔX¡;’–Jô’~Ö(Ã!v­4š
+MÌ¢AdFŸ<EFBFBD>%Oþ
„„FÄ/ŠU~’ïïD–‰<>ô¶gýx¢N¬„A kö*•}¸(ý~Âj»¡z^i
%­oÖ…vý Eô¿	m¥éŠëJƒ
,<1A>æ\‚b²Gø0<C3B8>ƒk^„1®œjØŽºCérÑK) <>¤ÉTIä6Di©%è$<24>j·- Q„	 ŸªËH¤0v•$‘õ*4ª@ä©é‰›ð‹<C3B0>ËH‘áRßGz[us´ú¤[뤤!Úú¨„¿Zºn—;ô;	ÕV!Y«ž¥,¸õ'É}a/ÕaÇ–ꙢÈM-vU­i‘×inµAÒK^ªJ<>õOUëéU~­.:‘ă‚#É-.©iuºPLŠF\Ö ðI$äÄ–¿„¾õt¨0¨4BPQiëHØA%¿ÚYÜ6VÑĤ¤NÒ¥<ÅjÝ¥­tÜs;»ÂJ|º@­„´ÞnµYÂ#hÓAí<41>oK%®wG‘o¤¾Htì*¡ÂQUè&4­[O^ºê×QQ)Òì:k©
+-ÁãG{NŠ‡ž•}cëÒ­ˆUôÒG°’ü^¨%Oz	ªÒ{QiªN
+–5[{á¡_ékØ¡kª'ª¡_¨QT—¤Âþè~‚IQ™ÂT½GZzý%ZÕc^õZÃ
kK´Ž™¡jQ¯×¥Õ¥Jé‚ú´¶ý¿¯ý	(ƒt´½¨ê¼w¥zò¥¤Þ:<3A>_¯ÂS§	ZR<ž›ª¶¾¡¸¬aG¨þò…ÝPna<02>‚auê›ZסÒýí.+Ä}öØKkëöÅl-×Ó†¡‹ïŽÅöƯB=±¤”²,h±çÁhBI…acÒ·Øá­GþW§aØv¯ça™*+k
¥m+gaÃa–ÎõJè«gt½ÖÚ/Y” ?	iÒ Ãa!ÙžÚlƒÒ‚†À@ˆ»ª’ÚH‹àÎÔd©S´‡Z$ȨZ5ÛISJ<53>aT:†ô¦wÕƒFú!á ,<2C>“t–ßEXE]'M•
<01>{Òr*i0Ð#YÒÈÀØþý0ĺÒè}°ˆJm$½[JÒ`ˆµ7÷´®<08>o×AýL8:Òòõ'.é+uÎK’î­Šö–ÿá*Oi;ÒÚþ¿Q]5ÛÓ<C39B>Ú»u×¥²#Zµþû×^xi7c×[×ÐDO~ºÚÁ®¶ÚúÈg,^Ú_ÿØÔ‚‚‹ñ]T¯Ã¿LÁ‡ZµØ%­-ƒJír3UÇB÷EVBSô”k®I¬
]%ƒÖÝ×Dwø_󹇒§K™ÄˆG­k<C2AD>×#?<3F>ªþ=Sxõ©£¯éoí9¶¯ÿª][#Bõÿûµ<0C> ÚýCé%UbÃ	Uû"µ†~¾ÈQ}dk#KKÙôø´†Æ´u¤¸pR1µ_ɘ!NI`£u¤¼H?m¯Z^8¾•RÞ«Õ«Q<C2AB>uõ2:@Ìjq(šHL<48>xœï;´•m˜(A!F˜*<2A>¥é}RôµZTµÿÿÿÿÿùg)ý})gÒÿtŽýÊáZë+•ªR¸°„Ø[ép“U Q×@¢µL=*“ÞB0Ú¥Âé[v”"ÇÞ¨ÒêчõW ¤Þ­i&ÕWÒ–ê¾–È}këܘë­z¤´
+Wd
]éa-=Nˆ„íéšÅ0×­zI%¬ÎyHÅù J+=ÿúUÓ³³ý"	#TÕE×¥¥¢B÷OÙrôÂÁ†©j–”Ȩ¨oÈ~Á¤.‹p¼-V”"¢I4•§k†ñJ»¸JƒA÷º¶—ÔBÒÒ¢ý£Ø÷G¿õà•[ª@é7ÿ;öéá%øºQZtƒw­«{j¿
+¼$Ö–žýöëô’	u„ªª/Õi}¥@ŠU\Bk–ßà·±í.#MNÖè­¿á¾×¤,Í5ƒ²°…ÂÎæ7†$P=,…ÚÚ#ãB
+ƒj—3¼z¢z¼{óêðÂù¤9Ú¡P’ðß…èÑéXìиòOVûKW¯±¯|Wê¼--ú÷ꨃ@Õ$›¦—_d”i'qÚÕn–kã­õǤº]Õÿ_ŠD	%fvõ×[¦Â_Izì,W´Š„•%¶“_X`ªû†Ûi1Gf½µôƒ
+Ô{a `›«±X¨´ñÿ+¬þ<®°«ÿõúÿúëúýsRè:Ãá‡áù‡zÃ{ß<>Æø¥°U‡F)R¥J„¡
+‚ÁGÿòÕ&©ÞU“H<E2809C>ð„…jMB*g‚5ÄÑ5ˆƒŽÅk~WTáµÖÝwß_·¤žD{ëÂwÒÔÚ¥ãõ^ýo½gÞª5ÿ8÷úõþ–ýÿ_×Ô”w2YªÿÃ;V¿JCF<>úð×j
ÙÚW¥¼
H›ôÞw˜ý$H=‡ÿ5+, Œ<C2A0>ÿ·°EóÒÎõÑ9%™TË}$/ó¢#ä;2Jý¼?èbO¶¦ARd_	ý(’¡„éòœ›ŽvjðGrÂ!äS»“Çõa‘îÂa“‘aJG<…_“é¹*ù#³ªÐ/×D®‚µ{'nŒï¾«…)f¤H±'0ízüîý º·[„G<E2809E>/à›áxò
+BH•‚ÓWÔÈTͤ´ŒÂ u!LDï´{:kÄ/a÷úS°Ö±XH#Ÿ£ÈÚÛZ;K´@º›í<11>#M?[ðÁ{ßóªZÂK¤®µw“º©R+óc	[a4<61>WØ-n=Õétè'úΨ%¿¦ú\üB‚t¬7¨#Åê•]a‚z~÷ë«iy<69>I&ï'5ë	úüÉAáÒñ3iuºøÿúÊ@¿Óa+Ðé_·I~’ý#>ó§ÚJÚÿ×\Œ	‹KâÚIwëêŒû´±é~aõ¥Z3<%¥·ÿä š×VŸFw¡o¢­×ÒVøKÒíR×õ\ØZM×öcÿ¢e.¿ÃiCT‡§ýÛˆ_JÿéRN!¤˜3öõ×ÛÖ–¡_IµDAßÒ×uêŒ?^¯Ôb]ý&×ßûöiz-ã<><C3A3>LT¿=Uýp»rÄ«I>’Uë˜Uê	[M×;5Ò÷Q	H}‘¥<E28098> 3¤»¢ýP·~–¶Ò<C2B6>ý8^Ä!ÃÇ)T	8ì‚‚T¯Uþ´
½/KŠõ]&ô!”=ëôKâ°¹¢€›¦Ds™Å%Ò­/í¶ÿKi÷@ˆúðØCÞ¾ÒéCKQ[K_D¸Ò?ÿØDm¾¯TÈÃ<Ÿ×õ¯à¡?¯Ö½}$Û¥‹w¥°¶ׯ1ô–µ„:ôÝ1U®H—2†
+Ãü%vúBÖ7×øºïëªõ­k	 Eý
+
× °Ýá!Òÿ‡(¾¼k×I­.Â_™Q<E284A2>º»ŠÓx×_ëU)%±	&è~Ò؇~½ê¿­Òð©ûð‚l0mW­ÿ¥š	mBe?ÛK;„+×óCSK$‹ý¡õìSŽº¿D$¯Æ…Åka2<61>ˆU_áu]
ˆþŸÍV½Øþ•ßúõ菉#ª^Û[ëoIiïÿd…õç·é6Tª?ÿ°Ë<C2B0>¤µ¸°ÿb²n]$•oaþXõ¯aýMÆ$’«²Š<08>lu¤µ‰-˜e
'UâÅ^•}„+KJÁ‚mRÓ<52>Io×¢s·¥bëúãI{KéwKÅz<C385>Ìú°Õ«"'CvP’<50>Õ,Ôª4–$¼äS¥¯	ÿcË@LÊ¿Vê©S—á¹eU®5_©\ªþ–Þ’ý¥õJ뮵ÿÌ<C3BF>=iRÑ’Ð"×]f²¶ªµó±î"—®J´™
+"´µô“N’‚
j’èºDÝýwZäa¥ŠOĉ¤µ\ÈTôýô^¼ ÕwZüÈfKKZÓ¥_J¡FÁ%ý2$‘|?Þ¾œ*^ƒÉ><3E>*ÊŽÒKÍnbt³Úá0‘	¢=褴ߥÒ}R¥­/©¤’6ÆpE:Ô£3ïU×·A%H—óI$	RP¢©F—ÿ‚U¦î+H§××HAIz꿾“t’ŪGz£‘	”ï­vÖõ¤¿¾ºÛ¢ö¢‘ÒBP†ºXn©.+ëv[@ßµuÖõ<C396>Œ&‰ÇHé%º^Œ=ªÕúÖ¤ûj<C3BB>I$<08>ôv®T
+°ºX¤~^ª	¿<7F>z­¿I*}Èyå>ºk_CIx/_º©ª;PµÃB¿ÁôÍ´<13>ëxéx]'ú·þ¹Ø<C2B9>þßZZ­&‡¡]*é-"ßÿJŽ8;Ûé	Þ<>ö’·õ­/§®«lSÚKUþ¡þú„	¿¦ô´¾’©¬·eOHð¥ñç{µz	ú[CïÂR /JÛü$ú¨z"gåI}qA'T¿Âûzíÿ|é™88¯It’aPª·<C2AA>±_ì?¦ööc«ì%VØA=2!	t<>?Ã&u¥»Â½-‘“ëíé½p·Â@<40>™˜ìRZU]7v	t¸kŠooªëÛÀìEáK‚%í*¦Â‹lKÓ¤âõÛÒ£§¥UÄ%ÄAŠt±ˆ[NšV4;T•6ú	%M6-Ö«‚4 ¨+a*PÁgp<67>¨¬XczV4L¤<>VK ®…!°ÛŠº-Ó°Ç‹m¯Ò„°¶ª›…â±ÇÁ‹ÝBè}PA>¼p—×BáØ ÊØ\x<>õõÿÿÿÿùhJ_ÒÿÓîë·Ûí¥c&ëy¢.)†‰¹ÑB8W&Ä<>¬GËåë—Eòä]‘Á¹.­a@Ú1ˆˆˆˆ‰àED&Ë›'
Q“":–Ðà\ŽEЈ„gL"9Ëd‘
…Јˆ(—å²U—
9Kd˜eˆœå³™‘À¹.†[<04>®#-€ U–ºP‘ék”²8+C-rh¸i—C-zDpjk%YKXËã-a0Í0†ZÄÃ0e­¨7–µ<E28093>yj¬EÀĵJ3Ñ-TìŽòÔËÅÀò–¡€<YjjˆàÊGEùj<G2ÓS˃T´Œ"†I£Â‘Ù¥™)dvpdp„r#†s
<01>å<>H2@ ¿,âQt\Â>\Hæ^6†YìÄDFZATº–‚Ài¸Ú+‰òÑÀn©Ë@á Ž2ãîYVQG@ˆü²©à„ŒÛ4æ)eõ<>,ªÀ¿\²ˆß,º‡Ì‰1å–<C3A5>û%k–WUùdZ+Y&ˇ#Šb#¢8þMÖ€ÿù7+ˆa.ˆù|à>¼›‰
‚>""+òn2‡¾Müjqü›
‚ʤü›T?òl8këò¹F\6Š2œÿåsx6Êã(<28>ÑuUò¼À¸<C380>ü®87]y’ eIå}ù<7F><C3B9>i~•<12>™V×ÿó#†oþ¹¥2pØïÿÙS´°]t—ô<E28094>M9ÚÈ&@Õ¿ý§”ôíH>˜æZz^O;+ÈiÔ'þŒ=íÖv(Ru<52>¥jRú“õ;¨7¼ Ó	WõøYÚ3ß;TÒ@ˆú®KÛ¤Ÿk;Àuô
+4_R(Ó«ÑŸó:“ |<7C>¬ìká Dy/TïJ<C3AF>T©,’D+F‘Ò?¥U~Œþ)á,ÖT$ÚiÖêK]{A/¥ò6…ô—ªõ} KtÁzñUK×^ÐFºX\"<z-Ëõª^¯_ÒKé‰h°ù_KÿI---ìWXJqz$åW¯Ò<C2AF>ÿö*•´˜„•DÉA‘®ú@ˆÿ
+£ÒÝ‚t¢#×ýÿÕ-Gˆa{CëÓÕWÑ’vœl$<›ÎÅáR‘ÞŸõÿUÇUòGkf|ñ¯®¿
l$µÿZkÿÿT8`º½^v
+—_ý½Æ¸þšN©ÿýÿ÷«ô<08>ý/^“<>ý}ßûõ‹øò¹lV?ýëÖÿ[½>a_]=-/§þŸÐ"ë„ÿãõþ;mêú/úµÿôíÚOÒtÿCqOø·…ý9ZWõz¿¦¤>­WÞ)¶žŸ8…Ö‘xê—ñák¥pZÿB8°¹"¯é[ÿÄgjk	ÙIõîûGf=€Õ=WõÄipƒüJ½”‚f‹HTžâ«VÅüS±¢;Èþi)CÓÕF»ô8MztƒE<'ÁúV÷à<C3B7>DcÎÒŽZi&ºõj•ÿ@ˆú[Vó»Ñ±ïDÝëI$ÿÒ <C392>a«Ÿ×T Ÿô’÷Õ*CI»¤³Ë¯ôŽ½.5A´¾¼]+ªB¨¯­e^þª©?¸A/ž4“AuzÕE.¬0Š/Hî’Z×붟ñçsµô[×K<C397>ZÖ¾T’¥¯ßÒk¢ÿOIt!WIu¨ÿü-%PЦ_…Æõ뤥;êÐÛâX÷ÿ¯¤60oÓOa¬UmÞŽ‡adtõÿKŠö7XÆ5ýt<C3BD>'4ƒíWþMÕ
+[jâ#]z¬º¥
µÿëô°ú_ôøu_®µÒ×IRÿ½t©R_ô=:l%^ºœz©ÜÒýíz-Ã	„	}t¶LPÙ¦?ö¬¹„š°‚§ªµ±0˜`–Ÿ–ú®á„,BV5N4!ªõ8ŽÒDˈÿVÙQ¦t_®ú×Zûi¯¿ÿúU[e;oOïú@Ñž¿Ê䮹ÝÙÕÇH ÿmЄº_EŽÖ•É'ÁWô¨¶»«¥Å&û¬•Õõú۪ܞO¶–ÒÑè?­Þµu¬›
+æCÕÕå"Vû®þá.”S\ÖÝk¥‚#É}|›
+Ê•‚ æQÿ´¿ÒÒëàˆ»ÿ‚¬Ãÿ×´¼ÏHìONqý-$›IÒͤõë:I'I˜´<${BÇ ø®¾@ÿ„‚;d[±
+—ª§,	5-Ôßò"Oý½V†xÒ†r}%»!ùÿUß…P¤ãפ4õ;Öé Ê¹(cõ·Z;¸ZM+Í"Ç<>r[én
+©<>òM.«þÃ_$©<>¤ªÿHÓ¯Y1Ãn§¡¤©_í¤ézZT<5A>=¾Õ-èúT—×è~¶%éOý[ÛÛI`ˆýYm¯±ZýW¯ëJ©Þ’^‹wZ¡÷
tK¯K£VÓÿÖÛàŒ+ý$<24>| ›¥RÇ^—0ÿô*¯ÙDé¿Ò"ìcª{Û§Mýõ¨ú^’Ô–Á!„ú‹z^µt¾ºó‹H Žu¶âa˜¯Zþÿu<0B>Ñ7N•E/‹Luد×é(-i8þˆ›
+Ö-u­¯[ÿA:ÿ¢n’ÎÓŠ?Ý×AgeW<65>ƒ¯¾º‚#¿™×ÿZécI!ÉõëL?IzZãÿéïá»ø§¯ö¿ì¾Uþ?Ü:ÿ†¿áÿ¿
·õø·¯[þ<>»ö›×þµþ®¶,ˆ9‹ñ¨[Ý7ׯïmŠ[ƒ«U¿ýX0¼~Ü26iWõû¨<C3BB>=ÜïV½küW{{?züÁ´v…¶r²ùÙÿ±ö!´ªÅ1`«¤£ø¾Ó"nÿÆJBE:íl;§û
+1ç/Hkwô߸ŽÇ¥ïºUoÜ<6F>bØM¿
œva{OÈú\WYuû÷öB;KÓ骴%Ð÷õþ>·Kÿùj<C3B9>£ZÒ„¾•5]Ò:|µHõ_¥WËHkõþ^úAÿ¯¥_\È]W¥æ¬ìQýU_è`ƒ¯_ñ„ɤ«ª_è'„NýioËH'§h,¨¿ÿ®«Z¥õ-*ߦE<C2A6>KµZIoTµ!‚]?ZþYšÑ@ƒœj<C593>ÿ˜}zÐ^<5E>þèˆ0¼ö•$ëJÿÕ-:ªé.?‘jþk½i#¹áÒ­$m­:è<¤(Ÿ‹ª]èRý ÿ–Lµ×úúöŸ—`Ò#¯ ×á.Þ’ƒi~<7E>0Èþ?EóK­%é$¾?D1פœ®]k¤•V€Té_Aµú	µ4YWk¾µÿâ¤ä'˜/꽇ºÚO†>—ĺ×禿Ûm¯ù*H<>Þù‡Èz{
¯]¿KuA$<24>þ*ŸíQäÚ‡¨\™?­5’ª®¥úG’Úl6õé?ë´œëõÖú#J4PiW_¶´ª¼ÈO&u*
+•ÓFæjÖkÿÅzáºþ¿¤Ù"Ñ	æ©è6™üu]?ºÃ)פ½ÈÝ"ìÅ΢këJ駥×ZØâýqVœ<>šª]U.wwåÅ¥zþŸ´—<C2B4>”å ÈMGïà´¨“=í¯®Ò‘‰µ[¨‹›A*é Dt¦´<C2A6>Þ”%ISZZÒm#ÕÁv‡¯i;Cð‚0iòîïõÒÿé×z]Ôkðˆ€O=öµ0î’©£¥¯ºß[sZª¨„<‰åeâ„uI'¾¸}%Jô¾«â•Ï°Õ°•_ÞäFr¿uwþÚŸ¾½*ôú„ö<E2809E>¿†_‚UH}S_×È᎓Òú¯kpŸÝcÃ{„«êwþôÜKpÒ[Òõ[ljoHX¯²TÕÕÿô§u.ßß^”½>õÛª…úú0úí~!I¯KD}¤Âm ×Ø=ÒÒ®®µúICëéTJg]bý_?ߺÿöõ¡þwÒñvèk²NôîýU×KoJÿþ¹Üø‹\7ûoôþÞ<C3BE>KéKæŸqñjïÖ6ºVô°ô•mz¾%VÇöÆ6²òÔ†­i-7ýðWÙN¬Ü’ôª¶%þ­ë·²$ÛðÃúìè«HÇ
+ñÒ^v“JÈVo9H×ûxׄ*’±­‡Ðoé¾A‚íøzôô´ƒë®ul?ÈÚÈ#<23>ОømzÜ%ä;­\0{Ãt”qéÁÿKס
ô;!”cÿûi0zKii!Œlˆ9Ê·ý«·°ô«I´°ñú<>c‡¥Ã¨è–eêô«BÂ’€z]«B#û¯
º[	&×­Øè/HuÒ_°Ä%v¯ë[i9F	kÒô›JÒb»j»Ni°HkÕSJcKÒQá…Ý$¨A‚¥zXÒô†“•&‚Tš ʤ0‚„ XQÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿùšñþ 
+endstream
+endobj
+1 0 obj
+<<
+/Producer (MFPImgLib V1.0)
+/CreationDate (D:20231113001946+01'00')
+/Creator (TOSHIBA e-STUDIO)
+>>
+endobj
+2 0 obj
+<<
+/Type /Catalog
+/Pages 3 0 R
+>>
+endobj
+3 0 obj
+<<
+/Type /Pages
+/Kids [ 4 0 R ]
+/Count 1
+>>
+endobj
+xref
+0 8
+0000000000 65535 f 
+0000016299 00000 n 
+0000016415 00000 n 
+0000016464 00000 n 
+0000000009 00000 n 
+0000000160 00000 n 
+0000000249 00000 n 
+0000000279 00000 n 
+trailer
+<<
+/Size 8
+/Info 1 0 R
+/Root 2 0 R
+>>
+startxref
+16523
+%%EOF

doc/etherpad_api.rest

@@ -0,0 +1 @@
+../web/modules/custom/etherpad_api/doc/api.rest

doc/yufu_concept_api.rest

@@ -0,0 +1 @@
+../web/modules/custom/yufu_concept/tests/local-emacs-test.rest

nuxt/.env

@@ -0,0 +1,5 @@
+BASE_URL="http://yufu-manifest.ddev.site"
+JSONAPI_PATH="/jsonapi"
+FILE_PATH="/sites/default/files"
+ETHERPAD_URL="https://pisi.kompot.si"
+ETHERPAD_PREFIX="yufu-"

nuxt/.env.dist

@@ -1,3 +0,0 @@
-BASE_URL="https://yufu-manifest.ddev.site"
-JSONAPI_PATH="/jsonapi"
-FILE_PATH="/sites/default/files"

nuxt/.env.production

@@ -0,0 +1 @@
+BASE_URL="https://yugofuturism.kompot.si"

nuxt/.gitignore

@@ -4,5 +4,5 @@ node_modules
 .nitro
 .cache
 .output
-.env
+.env.local
 dist

nuxt/app.vue

@@ -1,14 +1,117 @@
 <template>
   <section class="yufu">
     <Glava />
-    <section class="body">
+    <div class="vsebina">
       <NuxtPage />
-    </section>
+    </div>
+    <footer>
+      <Noga />
+    </footer>
   </section>
 </template>
 
 <style>
 
+:root {
+    --siva: #D9D9D9;
+    --bela: #fff;
+    --crna: #000;
+    --rdeca: #f00;
+    --roza: #ED008C;
+  }
+
+  body {
+    font-family: Inter;
+    margin: 0;
+    background: var(--siva);
+  }
+
+  a {
+    color: var(--crna);
+  }
+
+  h1 {
+    text-align: center;
+    font-size: 5rem;
+    margin: .2rem 0 1rem 0;
+  }
+
+  h2 {
+    text-transform: uppercase;
+    margin-top: 0;
+  }
+
+  .vsebina {
+    position: relative;
+    z-index: 50;
+    padding: 0 32px;
+  }
+
+  a.gumb {
+    text-decoration: underline;
+    font-size: 3rem;
+    position: relative;
+    display: flex;
+    width: 100%;
+    justify-content: center;
+  }
+
+  .stran {
+    position: relative;
+    background: var(--bela);
+    margin: 2rem;
+    border-radius: 3rem;
+    padding: 2rem;
+  }
+
+  form {
+    display: flex;
+    flex-direction: column;
+  }
+
+  input[type=submit] { margin-top: 1rem; }
+
+  details > summary {
+    list-style: none;
+  }
+
+  .gumb {
+    font-family: Trailers;
+    font-size: 3rem;
+    cursor: pointer;
+    border: none;
+    background: none;
+    text-decoration: underline;
+    width: fit-content;
+  }
+
+  footer {
+    position: relative;
+    z-index: 100;
+  }
 
 
+  @media screen and (max-width: 420px) {
+    .vsebina {
+      padding-right: 0;
+      padding-left: 0;
+    }
+    .stran {
+      margin: 0;
+    }
+  }
+
+  .okvir {
+    position: relative;
+    background: var(--bela);
+    margin: 2rem;
+    border-radius: 24px;
+    padding: 2rem;
+    display: flex;
+    flex-wrap: wrap;
+    box-sizing: border-box;
+    max-width: 1216px;
+    margin-left: auto;
+    margin-right: auto;
+  }
 </style>

nuxt/components/EtherpadTextarea.vue

@@ -0,0 +1,25 @@
+<script setup="setup">
+
+import { ref } from 'vue'
+
+const { etherpadUrl, etherpadPrefix } = useRuntimeConfig().public
+
+const props = defineProps({
+  revisionId: String,
+  onLoad: Function
+})
+
+const embed = ref(null)
+
+onMounted(() => {
+  // Ce ni revisionId propertyja, se random generira.
+  const uuid = props.revisionId ? props.revisionId : crypto.randomUUID()
+  const padUrl = `${etherpadUrl}/p/${etherpadPrefix}${uuid}?showChat=false&showLineNumbers=false&toc=false`
+  embed.value.src = padUrl
+})
+
+</script>
+
+<template>
+  <iframe ref="embed" class="etherpad-textarea" @load="props.onLoad" />
+</template>

nuxt/components/Glava.vue

@@ -1,20 +1,129 @@
 <script setup="setup">
-  const api = useApi()
+const route = useRoute()
 
-  onMounted(() => {
-    if (window) {
-      window.api = api
-    }
-  })
+const pot = computed(() => route.path)
+const naManifestu = computed(() => route.path.indexOf('/manifest') === 0)
 </script>
 
 <template>
-    <section class="glava">
-        <h1>YUFU</h1>
-        <ul class="meni">
-            <li><NuxtLink to="/">Domov</NuxtLink></li>
-            <li><NuxtLink to="/pojmi">Manifest</NuxtLink></li>
-            <li><NuxtLink to="https://yugofuturism.kompot.si/user" target="_blank">admin</NuxtLink></li>
-        </ul>
-    </section>
+  <section class="glava" :class="{ manifest: naManifestu }">
+    <ul class="meni">
+      <li>
+        <NuxtLink to="/">
+          Domov
+        </NuxtLink>
+      </li>
+      <li>
+        <NuxtLink to="/manifest">
+          Manifest
+        </NuxtLink>
+      </li>
+      <li>
+        <NuxtLink to="https://yugofuturism.kompot.si/user" target="_blank">
+          admin
+        </NuxtLink>
+      </li>
+    </ul>
+
+    <img src="/images/zvezda.png">
+
+    <h1 v-if="naManifestu">MANIFEST</h1>
+    <h1 v-else>JUGOFUTURIZEM</h1>
+  </section>
 </template>
+
+<style scoped>
+
+.glava {
+  height: 100vh;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.glava.manifest {
+  background: var(--rdeca)
+}
+
+h1 {
+  font-family: Trailers;
+  font-size: 16rem;
+  z-index: 50;
+}
+
+@media screen and (max-width: 1090px) {
+  h1 { font-size: 10rem; }
+}
+@media screen and (max-width: 768px) {
+  h1 { font-size: 8rem; }
+}
+@media screen and (max-width: 560px) {
+  h1 { font-size: 5rem; }
+}
+
+img {
+  position: fixed;
+  top: -10vh;
+  left: -10vw;
+  width: 120vw;
+  height: 120vh;
+  z-index: 10;
+  object-fit: cover;
+}
+
+@media screen and (min-width: 1980px) {
+  img {
+    width: 100vw;
+    height: 100vh;
+    left: 0;
+    top: 0;
+  }
+}
+
+
+
+.meni {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  display: flex;
+  margin: 0;
+  justify-content: space-between;
+  z-index: 100;
+}
+
+.meni a {
+  display: block;
+  text-decoration: none;
+  text-transform: uppercase;
+  font-weight: bold;
+  color: black;
+  padding: 10px 30px;
+}
+
+ul {
+  list-style: none;
+  padding: 0%;
+  width: 100%;
+}
+
+@media screen and (max-width: 768px) {
+  .meni {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+}
+
+@media screen and (min-width: 768px) {
+  .glava img {
+    width: 768px;
+    height: auto;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
+}
+
+</style>

nuxt/components/Noga.vue

@@ -0,0 +1,118 @@
+<script setup="setup">
+const route = useRoute()
+
+const pot = computed(() => route.path)
+const naManifestu = computed(() => route.path.indexOf('/pojmi') === 0)
+</script>
+
+<template>
+<section class="noga">
+    <div class="maska">
+        <a href="https://maska.si" target="_blank">
+            <img src="/images/maska-logo.svg" />
+        </a>
+    </div>
+    <div class="kompot">
+        <p>
+          <a href="https://kompot.si" target="_blank">
+            <img src="/images/kompot_sm.png">
+            2024
+            Kompot
+          </a>
+        </p>
+    </div>
+    <div class="eu-projekti">
+      <div class="eu-projekti-logos">
+        <img src="/images/peripheralvisions.png" />
+        <img src="/images/eu-logo.svg" />
+      </div>
+      <p>Funded by the European Union. Views and opinions expressed are however those of the author(s) only and do not necessarily reflect those of the European Union or European Education and Culture Executive Agency (EACEA). Neither the European Union nor the granting authority can be held responsible for them.</p>
+    </div>
+</section>
+</template>
+
+<style scoped>
+.noga {
+  background-color: black;
+  z-index: 100;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-around;
+  align-content: center;
+  flex-wrap: wrap;
+  padding: 2rem;
+  align-content: center;
+}
+
+p, a {
+    color: white;
+    text-decoration: none;
+}
+
+a {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.noga > div {
+    position: relative;
+    display: block;
+    height: 70%;
+    max-width: 30%;
+    margin-top: auto;
+    margin-bottom: auto;
+    min-height: 2rem;
+    height: fit-content;
+}
+img {
+    width: 100%;
+    height: auto;
+    max-width: 300px;
+}
+
+.eu-projekti {
+    padding: 1rem;
+    display: flex;
+    flex-direction: column;
+
+    background-color: #D9D9D9;
+    border-radius: 16px;
+
+}
+
+a {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.eu-projekti-logos {
+    position: relative;
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+}
+
+.eu-projekti-logos img {
+    max-width: 40%;
+}
+
+.eu-projekti p {
+    color: black;
+}
+
+@media screen and (max-width: 764px) {
+    .noga {
+        display: block;
+    }
+    .noga div {
+        max-width: 100%;
+    }
+
+    .kompot {
+        text-align: center;
+    }
+}
+
+
+</style>

nuxt/components/Pojem.vue

@@ -1,19 +1,108 @@
 <script setup="setup">
+
+import { stripHtml } from 'string-strip-html'
+
+const { etherFetch } = useEtherpadApi()
 const store = usePojmiStore()
+const route = useRoute()
 
 const props = defineProps({
   naslov: String
 })
 
-const pojem = computed(() => store.pojmi[props.naslov])
+if (props.naslov && !(props.naslov in store.pojmi)) {
+  await store.naloziPojme()
+}
 
-await store.naloziPojme()
+const pojem = computed(() => store.pojmi[props.naslov])
+const revisionId = computed(() => pojem.value ? pojem.value.id : null)
+
+const urejanje = ref(false)
+const container = ref(null)
+const obrazec = ref(null)
+
+const urediPojem = async () => {
+  // Ustvari pad s tekstom pojma, ce se ne obstaja
+  const tekstPojma = stripHtml(pojem.value.tekst).result
+  const resp = await etherFetch('/createPad', {
+    padID: revisionId.value,
+    text: tekstPojma
+  })
+  urejanje.value = true
+}
+
+onMounted(() => {
+  // Prazen pojem? Nazaj na manifest
+  if (!pojem.value.id) {
+    navigateTo('/manifest#skrol')
+  }
+
+  // Link na editiranje pojma? Poskrolaj nanj + odpri editiranje
+  if (route.params.guid === revisionId.value) {
+    urejanje.value = true
+    setTimeout(() => obrazec.value.scrollIntoView({ behavior: 'smooth' }), 50)
+  } else {
+    // Sicer samo poskrolaj na pojem
+    setTimeout(() => container.value.parentNode.scrollIntoView({ behavior: 'smooth' }), 50)
+  }
+})
 
 </script>
 
 <template>
-  <section class="pojem">
-    <h2>{{ pojem.naslov }}</h2>
-    <div class="tekst" v-html="pojem.tekst" />
+  <section ref="container">
+    <div v-if="!urejanje" class="gumb" @click="urediPojem">Uredi</div>
+    <div v-if="pojem" class="pojem">
+      <h2>{{ naslov }}</h2>
+      <div class="tekst" v-html="pojem.tekst" />
+    </div>
+    <PojemForm v-if="urejanje"
+     ref="obrazec"
+     :revisionId="revisionId"
+     :pojem="pojem"
+     :onZapri="() => { urejanje = false; store.naloziPojme() }" />
   </section>
 </template>
+
+<style scoped>
+  section {
+    width: 100%;
+  }
+
+  .pojem {
+    position: relative;
+    width: 50%;
+    float: left;
+  }
+
+  h2 {
+    text-transform: uppercase;
+    margin-top: 0;
+  }
+
+  form.pojem {
+    width: calc(50% - 32px);
+    margin-left: 32px;
+    gap: 1rem;
+    float: right;
+  }
+
+  .gumb {
+    position: sticky;
+    top: 0;
+    right: 0;
+    float: right;
+  }
+
+  @media screen and (max-width: 768px) {
+    .pojem {
+      min-height: 4rem;
+      width: 100%;
+    }
+
+    form.pojem {
+      margin-left: 0;
+      min-height: 70vh;
+    }
+  }
+</style>

nuxt/components/PojemForm.vue

@@ -0,0 +1,117 @@
+<script setup="setup">
+
+const { etherFetch } = useEtherpadApi()
+
+const store = usePojmiStore()
+
+const props = defineProps({
+  revisionId: String,
+  pojem: Object,
+  onZapri: Function
+})
+
+let naslov = ref(props.pojem.naslov)
+let email = ref('')
+
+const oddajPredlog = async data => {
+  // @TODO vsebina pada v tekst, testirat
+  if (!naslov.value) {
+    alert("Manjka naslov pojma!")
+    return
+  }
+
+  const starNaslov = props.pojem.naslov
+
+  const resp = await etherFetch('/getText', { padID: props.revisionId })
+  const stvarjenje = store.ustvariPojem({
+    title: naslov.value,
+    email: email.value,
+    text: resp.data.text,
+    uuid: props.revisionId
+  })
+  console.log(stvarjenje)
+  alert("sprememba predlagana!")
+
+  stvarjenje.then(() => {
+    console.log('NOV NASLOV?', starNaslov, props.pojem.naslov)
+    if (starNaslov !== props.pojem.naslov) {
+      navigateTo('/manifest/' + encodeURIComponent(props.pojem.naslov))
+    }
+  })
+
+  props.onZapri()
+}
+
+// @TODO tole raje v pojmi.vue oz nov_pojem.vue - page!
+const etherNalozen = ev => {
+  if (props.pojem.nov) {
+    navigateTo('/manifest/dodaj/' + props.revisionId, {
+      replace: true
+    })
+  } else {
+    navigateTo('/manifest/' + encodeURIComponent(props.pojem.naslov) + '/uredi/' + props.revisionId, {
+      replace: true
+    })
+  }
+  //window.location.hash = props.revisionId
+}
+
+</script>
+
+<template>
+  <form class="pojem" @submit.prevent>
+    <input name="naslov" type="text" placeholder="Naslov" v-model="naslov">
+
+    <EtherpadTextarea :onLoad="etherNalozen" :revisionId="props.revisionId" />
+
+    <input name="email" type="email" placeholder="E-poštni naslov" v-model="email">
+    <div class="gumbi">
+      <button class="gumb" @click="props.onZapri">
+        {{ props.zapriLabel ?? 'Zapri' }}
+      </button>
+      <button class="gumb oddaj" @click="oddajPredlog">
+        Predlagaj
+      </button>
+    </div>
+
+  </form>
+</template>
+
+<style>
+.etherpad-textarea {
+  width: 100%;
+  flex-grow: 1;
+  border-radius: 16px;
+  border: 2px solid var(--siva);
+  box-sizing: border-box;
+  min-height: 500px;
+}
+
+input {
+  border: 2px solid var(--siva);
+  border-radius: 8px;
+  padding: 15px;
+}
+
+.gumbi {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+.gumb,
+.gumbi input,
+.gumbi button {
+  text-transform: uppercase;
+  padding: 0;
+  margin: 0;
+}
+
+.pojem.form .gumb {
+  width: 50%;
+}
+
+.pojem button.oddaj {
+  color: var(--roza);
+}
+
+</style>

nuxt/composables/api.js

@@ -1,8 +1,7 @@
 import jsonapi from 'jsonapi-serializer'
 
 export const useApi = () => {
-  const baseUrl = useRuntimeConfig().public.baseUrl
-  const jsonapiPath = useRuntimeConfig().public.jsonapiPath
+  const { baseUrl, jsonapiPath } = useRuntimeConfig().public
 
   const apiBaseUrl = `${baseUrl}${jsonapiPath}`
   const headers = {
@@ -18,7 +17,8 @@ export const useApi = () => {
   }
 
   return {
-    baseUrl: apiBaseUrl,
+    baseUrl: baseUrl,
+    jsonApiUrl: apiBaseUrl,
     headers,
     deserialize
   }

nuxt/composables/crypto.js

@@ -0,0 +1,10 @@
+import * as cryptoServer from 'crypto'
+
+export const useCrypto = () => {
+
+  return {
+    getRandomUUID: () => (typeof window === 'undefined')
+      ? cryptoServer.randomBytes(16).toString('hex') // Server code
+      : crypto.randomUUID()                          // Browser code
+  }
+}

nuxt/composables/etherpadApi.js

@@ -0,0 +1,21 @@
+export const useEtherpadApi = () => {
+  const { baseUrl } = useRuntimeConfig().public
+  const etherpadApiUrl = `${baseUrl}/etherpad-api`
+
+  const etherFetch = (path, params) => {
+
+    // Convert to form key-value pairs
+    const formBody = Object.keys(params)
+      .map(key => `${key}=${encodeURIComponent(params[key])}`)
+      .join('&')
+
+    // Call API
+    return $fetch(etherpadApiUrl + path, {
+      method: 'POST',
+      headers: {'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'},
+      body: formBody
+    })
+  }
+
+  return { etherpadApiUrl, etherFetch }
+}

nuxt/nuxt.config.js

@@ -2,7 +2,7 @@ export default defineNuxtConfig({
   // Global page headers: https://go.nuxtjs.dev/config-head
   app: {
     head: {
-      title: '...Hm!',
+      title: 'Jugofuturistični manifest',
       meta: [
         { charset: 'utf-8' },
         { name: 'viewport', content: 'width=device-width, initial-scale=1' },
@@ -11,7 +11,7 @@ export default defineNuxtConfig({
       ],
       link: [
         { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' },
-        { rel: 'stylesheet', type: 'text/css', href: '/css/stajl.css' }
+        { rel: 'stylesheet', type: 'text/css', href: '/css/fonti.css' }
       ]
     }
   },
@@ -28,13 +28,31 @@ export default defineNuxtConfig({
       changeOrigin: true,
       pathFilter:
         process.env.FILE_PATH
-
     }
   },
   runtimeConfig: {
     public: {
       baseUrl: process.env.BASE_URL,
       jsonapiPath: process.env.JSONAPI_PATH,
+      etherpadUrl: process.env.ETHERPAD_URL,
+      etherpadPrefix: process.env.ETHERPAD_PREFIX
+    }
+  },
+  hooks: {
+    'pages:extend' (pages) {
+      pages.push({
+        name: 'poglej_pojem',
+        path: '/manifest/:naslov',
+        file: '~/pages/manifest/pojem.vue'
+      }, {
+        name: 'uredi_pojem',
+        path: '/manifest/:naslov/uredi/:guid',
+        file: '~/pages/manifest/pojem.vue'
+      }, {
+        name: 'nov_pojem_guid',
+        path: '/manifest/dodaj/:guid',
+        file: '~/pages/manifest/dodaj.vue'
+      })
     }
   }
 })

nuxt/package.json

@@ -9,16 +9,16 @@
     "start": "nuxt preview"
   },
   "devDependencies": {
-    "nuxt": "^3.2.2",
-    "@pinia/nuxt": "^0.4.7",
     "@nuxtjs/eslint-config": "^6.0.1",
-    "@nuxtjs/eslint-module": "^3.0.2"
+    "@nuxtjs/eslint-module": "^3.0.2",
+    "@pinia/nuxt": "^0.5.1",
+    "nuxt": "^3.8.2"
   },
   "dependencies": {
-    "druxt": "^0.21.0",
-    "jsonapi-serializer": "^3.6.7",
+    "druxt": "^0.24.0",
+    "jsonapi-serializer": "^3.6.9",
     "nuxt-proxy": "^0.4.1",
-    "pinia": "^2.0.32",
-    "lodash": "^4.17.21"
+    "pinia": "^2.1.7",
+    "string-strip-html": "^13.4.3"
   }
 }

nuxt/pages/index.vue

@@ -1,6 +1,8 @@
 <script setup="setup">
 const store = useStraniStore()
+
 const stran = computed(() => store.strani['YuFu'])
+useHead({meta: [{title: "jugofuturizem"}]})
 
 await store.naloziStrani()
 </script>

nuxt/pages/manifest/dodaj.vue

@@ -0,0 +1,47 @@
+<script setup="setup">
+
+const { getRandomUUID } = useCrypto()
+
+const { etherpadApiUrl } = useEtherpadApi()
+const route = useRoute()
+
+const revisionId = ref(null)
+const obrazec = ref(null)
+
+revisionId.value = route.params.guid ? route.params.guid : getRandomUUID()
+
+// Ustvari nov, prazen pad
+// @TODO parameter za seranje linka?
+const padId = revisionId.value
+const resp = await $fetch(`${etherpadApiUrl}/createPad?padID=${padId}`)
+
+const onZapri = () => { navigateTo('/manifest#skrol') }
+
+onMounted(() => {
+  setTimeout(() => {
+    console.log('element?', obrazec.value)
+    debugger
+    obrazec.value.scrollIntoView({ behavior: 'smooth' })
+  }, 50)
+})
+
+</script>
+
+<template>
+  <section class="okvir" ref="obrazec">
+    <PojemForm
+      :pojem="{ nov: true }"
+      :revisionId="revisionId"
+      zapriLabel="Nazaj"
+      :onZapri="onZapri" />
+  </section>
+</template>
+
+<style scoped>
+section.okvir {
+  max-width: 608px;
+}
+form.pojem {
+  width: 100%;
+}
+</style>

nuxt/pages/manifest/index.vue

@@ -0,0 +1,45 @@
+<script setup="setup">
+
+const store = usePojmiStore()
+await store.naloziPojme()
+
+const navodila = ref(null)
+
+onMounted(() => {
+  if (location && location.hash == '#skrol') {
+    setTimeout(() => {
+      navodila.value.scrollIntoView({ behavior: 'smooth' })
+    }, 50)
+  }
+})
+
+</script>
+
+<template>
+  <h3 class="navodila" ref="navodila">Vsak lahko prispeva k vsebinam manifesta. Predlaga lahko nov pojem ali ureja, dopolni ali predela obstoječe.</h3>
+  <NuxtLink class="gumb" to="/manifest/dodaj">
+    Dodaj Nov Pojem
+  </NuxtLink>
+  <NuxtLink
+    v-for="pojem in Object.keys(store.pojmi)"
+    :naslov="pojem"
+    :to="`/manifest/${encodeURIComponent(pojem)}`"
+    class="okvir">
+    <h2>{{ pojem }}</h2>
+  </NuxtLink>
+</template>
+
+<style scoped>
+  a {
+    clear: both;
+  }
+  h2 {
+    margin-bottom: 0;
+  }
+
+  .navodila {
+    padding-left: 2rem;
+    padding-right: 2rem;
+    text-align: center;
+  }
+</style>

nuxt/pages/manifest/pojem.vue

@@ -0,0 +1,30 @@
+<script setup="setup">
+
+const { etherpadApiUrl } = useEtherpadApi()
+const { naslov, guid } = useRoute().params
+const { getRandomUUID } = useCrypto()
+
+const revisionId = ref(null)
+
+revisionId.value = guid ?? getRandomUUID()
+
+// Ustvari nov, prazen pad
+// @TODO parameter za seranje linka?
+const padId = revisionId.value
+const resp = await $fetch(`${etherpadApiUrl}/createPad?padID=${padId}`)
+
+</script>
+
+<template>
+  <div class="okvir">
+    <Pojem :naslov="naslov" />
+  </div>
+
+  <NuxtLink class="gumb" to="/manifest#skrol">
+    Manifest
+  </NuxtLink>
+
+  <br>
+  <br>
+
+</template>

nuxt/pages/pojmi.vue

@@ -1,9 +0,0 @@
-<script setup="setup">
-const store = usePojmiStore()
-</script>
-
-<template>
-  <Pojem naslov="Yugofuturist manifesto" />
-  <Pojem naslov="Jadran potem" />
-  <Pojem naslov="JUGA 2023" />
-</template>

nuxt/prod-build.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+BASE_URL=https://yugofuturism.kompot.si npm run build

nuxt/public/css/fonti.css

@@ -0,0 +1,20 @@
+@font-face {
+  font-family: 'Trailers';
+  font-weight: bold;
+  font-style: normal;
+  src: url('/fonts/TT_trailers/TT Trailers Trial Bold.ttf') format("truetype");
+}
+
+@font-face {
+  font-family: Inter;
+  font-weight: normal;
+  font-style: normal;
+  src: url('/fonts/Inter/Inter-Medium.ttf') format("truetype");
+}
+
+@font-face {
+  font-family: Inter;
+  font-weight: bold;
+  font-style: normal;
+  src: url('/fonts/Inter/Inter-Bold.ttf') format("truetype");
+}

nuxt/public/css/stajl.css

@@ -1,27 +0,0 @@
-body {
-  margin: 0;
-  padding: 1rem;
-}
-
-.yufu {
-  max-width: 500px;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-@media screen and (min-width: 260px) {
-  .meni {
-    display: flex;
-    padding: 0;
-    justify-content: space-between;
-  }
-}
-.meni li {
-  margin-left: 1.2rem;
-}
-
-h1 {
-  text-align: center;
-  font-size: 2.5rem;
-  margin: .2rem 0 1rem 0;
-}

nuxt/public/fonts/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

nuxt/public/fonts/README.txt

@@ -0,0 +1,72 @@
+Inter Variable Font
+===================
+
+This download contains Inter as both a variable font and static fonts.
+
+Inter is a variable font with these axes:
+  slnt
+  wght
+
+This means all the styles are contained in a single file:
+  Inter-VariableFont_slnt,wght.ttf
+
+If your app fully supports variable fonts, you can now pick intermediate styles
+that aren’t available as static fonts. Not all apps support variable fonts, and
+in those cases you can use the static font files for Inter:
+  static/Inter-Thin.ttf
+  static/Inter-ExtraLight.ttf
+  static/Inter-Light.ttf
+  static/Inter-Regular.ttf
+  static/Inter-Medium.ttf
+  static/Inter-SemiBold.ttf
+  static/Inter-Bold.ttf
+  static/Inter-ExtraBold.ttf
+  static/Inter-Black.ttf
+
+Get started
+-----------
+
+1. Install the font files you want to use
+
+2. Use your app's font picker to view the font family and all the
+available styles
+
+Learn more about variable fonts
+-------------------------------
+
+  https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
+  https://variablefonts.typenetwork.com
+  https://medium.com/variable-fonts
+
+In desktop apps
+
+  https://theblog.adobe.com/can-variable-fonts-illustrator-cc
+  https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
+
+Online
+
+  https://developers.google.com/fonts/docs/getting_started
+  https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
+  https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
+
+Installing fonts
+
+  MacOS: https://support.apple.com/en-us/HT201749
+  Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
+  Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
+
+Android Apps
+
+  https://developers.google.com/fonts/docs/android
+  https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
+
+License
+-------
+Please read the full license text (OFL.txt) to understand the permissions,
+restrictions and requirements for usage, redistribution, and modification.
+
+You can use them in your products & projects – print or digital,
+commercial or otherwise.
+
+This isn't legal advice, please consider consulting a lawyer and see the full
+license for all details.