Merge branch 'doryphore-dev' into 1141-image-par-défaut-dans-les-form…

…ulaires-bazar
YesWiki · May 10, 2024 · 3078bd7 · 3078bd7
2 parents b5f261d + 75f0af4
commit 3078bd7
Show file tree

Hide file tree

Showing 152 changed files with 8,492 additions and 4,062 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -5,12 +5,13 @@ on:
     paths:
       - docker/dockerfile
       - docker/docker-compose*.yml
+      - .github/workflows/docker.yml
 
 jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Build a Docker image able to run yeswiki
-        run: export UID=$(id -u) && export GID=$(id -g) && docker build -f docker/dockerfile -t yeswiki/yeswiki .
+        run: docker build -f docker/dockerfile-prod -t yeswiki/yeswiki .
diff --git a/.gitignore b/.gitignore
@@ -124,5 +124,5 @@ docker-compose.local.yml
 
 # Other
 .phpintel/
-
+*.old
 TODO
diff --git a/cache/.gitkeep b/cache/.gitkeep
diff --git a/composer.lock b/composer.lock
diff --git a/docker/docker-compose-prod.yml b/docker/docker-compose-prod.yml
@@ -11,7 +11,7 @@ services:
   yeswiki-app:
     build:
       context: ..
-      dockerfile: ./docker/dockerfile
+      dockerfile: ./docker/dockerfile-prod
     container_name: yeswiki
     volumes:
       - ..:/var/www/html

diff --git a/docs/actions/bazarliste.yaml b/docs/actions/bazarliste.yaml
@@ -317,6 +317,7 @@ actions:
               - date_maj_fiche
             label: _t(AB_bazarliste_displayfields_visual_label)
             default: ""
+
 
   bazarcard:
     label: _t(AB_bazarcard_label)
@@ -338,6 +339,17 @@ actions:
           vertical: _t(AB_bazarcard_style_vertical)
           square: _t(AB_bazarcard_style_square)
           horizontal: _t(AB_bazarcard_style_horizontal)
+      imgstyle:
+        type: list
+        label: _t(AB_bazarcard_imgstyle_label)
+        icon: image
+        default: cover
+        options:
+          contain: _t(AB_bazarcard_imgstyle_contain)
+          cover:  _t(AB_bazarcard_imgstyle_cover)
+      nblines:
+        type: number
+        label: _t(AB_bazarcard_nblines_label)
       div:
         type: divider
         label: _t(AB_bazarliste_displayfields_title)

diff --git a/docs/actions/lang/actionsbuilder_en.inc.php b/docs/actions/lang/actionsbuilder_en.inc.php
@@ -1,5 +1,4 @@
 <?php
-
 return [
     // AB stands for ActionsBuilder
     // Commons
@@ -113,13 +112,17 @@
     // "AB_bazarliste_displayfields_floating_label" => "Zone flottante",
     // "AB_bazarliste_displayfields_visual_label" => "Zone visuelle",
     // BazarCard
-    // "AB_bazarcard_label" => "Blocs (agenda, actus, trombinoscope, damier...)",
+    'AB_bazarcard_label' => "Card grid",
     // "AB_bazarcard_description" => "Les fiches seront sous forme de cartes",
     // "AB_bazarliste_displayfields_footer_label" => "Zone footer",
     // "AB_bazarcard_style_label" => "Type de rendu",
     // "AB_bazarcard_style_vertical" => 'Vertical',
     // "AB_bazarcard_style_square" => 'Carré',
     // "AB_bazarcard_style_horizontal" => 'Horizontal',
+    'AB_bazarcard_imgstyle_label' => 'Image size',
+    'AB_bazarcard_imgstyle_contain' => 'Full size',
+    'AB_bazarcard_imgstyle_cover' => 'Crop to cover',
+    'AB_bazarcard_nblines_label' => 'Number of lines for subtitle',
     // BazarTable
     'AB_BAZAR_MAP_AND_TABLE_LABEL' => 'Map and table',
     'AB_BAZAR_MAP_AND_TABLE_TABLEWITH_LABEL' => 'Table with all entries',
@@ -249,13 +252,14 @@
     'AB_attach_video_label' => "Embeded video",
     'AB_attach_video_description' => "Embeding of youtube, vimeo or peertube video.",
     // "AB_attach_video_hint" => "L'identifiant de la vidéo correspond aux chiffres ou lettres à la fin de son URL",
-    'AB_attach_video_serveur_label' => "Video hostname",
-    'AB_attach_video_id_label' => "Video ID",
-    'AB_attach_video_peertubeinstance_label' => "PeerTube instance hostname (url)",
-    'AB_attach_video_ratio_label' => "Video ratio",
-    'AB_attach_video_position_label' => "Position",
-    'AB_attach_video_largeur_max_label' => "Maximum width",
-    'AB_attach_video_hauteur_max_label' => "Maximum height",
+    // "AB_attach_video_url_hint" => "Remplace serveur et id",
+    "AB_attach_video_serveur_label" => "Video hostname",
+    "AB_attach_video_id_label" => "Video ID",
+    "AB_attach_video_peertubeinstance_label" => "PeerTube instance hostname (url)",
+    "AB_attach_video_ratio_label" => "Video ratio",
+    "AB_attach_video_position_label" => "Position",
+    "AB_attach_video_largeur_max_label" => "Maximum width",
+    "AB_attach_video_hauteur_max_label" => "Maximum height",
     //pdf
     'AB_attach_pdf_label' => "Embeded pdf file",
     'AB_attach_pdf_description' => "Embeding a pdf file from this website.",
@@ -467,25 +471,25 @@
     'AB_bazartableau_columnswidth_width_label' => "Width",
     'AB_bazartableau_exportallcolumns_label' => "Also export hidden columns",
     'AB_bazartableau_displayimagesasthumbnails_label' => "Display images as thumbnails",
-    'AB_bazar_commons_subproperty_id_label' => "Value",
-    'AB_bazar_commons_minical' => "Show content in a minimal calendar",
-    'AB_bazar_commons_dynamic_label' => "Clientside rendering",
-    'AB_bazar_commons_colorfield_label' => "Color field",
-    'AB_bazar_commons_colormapping_color_label' => "Color",
+    // AB stands for ActionsBuilder
+    // Commons
+    'AB_LEFT' => "Left",
+    'AB_bazar_commons_colorfield_label' => "Field for color",
+    'AB_bazar_commons_dynamic_label' => "Dynamic rendering",
     'AB_bazar_commons_iconfield_icon_label' => "Icon",
-    'AB_bazar_commons_pagination_label' => "Number of entries per page",
-    'AB_bazar_commons2_champ_hint' => "It is possible to do advanced queries, learn more",
-    'AB_bazar_commons2_champ_label' => "Field for sorting",
+    'AB_bazar_commons_search_label_dynamic' => "Dynamic search",
     'AB_bazar_commons_title' => "Display",
-    'AB_bazar_commons_iconfield_iconprefix_hint' => "If you use the icon selector, you don't need this field",
-    'AB_bazar_commons_iconfield_label' => "Icon field",
     'AB_RIGHT' => "Right",
-    'AB_bazar_commons_iconfield_iconprefix_label' => "Prefix for icons",
-    'AB_bazar_commons_search_label_dynamic' => "Dynamic search",
+    'AB_bazar_commons_colormapping_color_label' => "Color",
+    'AB_bazar_commons_subproperty_id_label' => "Value",
     'AB_bazar_commons2_filter_on_date_on_current_month' => "in the coming month",
-    'AB_bazar_commons_search_fields_label' => "Fields for search",
-    // AB stands for ActionsBuilder
-    // Commons
-    'AB_LEFT' => "Left",
-    'AB_bazar_commons_pagination_hint' => "Leave empty for not using paging",
+    'AB_bazar_commons_iconfield_label' => "Field for icon",
+    'AB_bazar_commons_iconfield_iconprefix_label' => "Icon prefix",
+    'AB_bazar_commons_iconfield_iconprefix_hint' => "If you are using the icon selector, you don't need this field",
+    'AB_bazar_commons_minical' => "Show the content in a minimal calendar",
+    'AB_bazar_commons_pagination_label' => "Number of entries per page",
+    'AB_bazar_commons_pagination_hint' => "Leave empty for not using pagination",
+    'AB_bazar_commons_search_fields_label' => "Fields for searching",
+    'AB_bazar_commons2_champ_label' => "Field for sorting",
+    'AB_bazar_commons2_champ_hint' => "It is possible to do advanced queries, learn more",
 ];