Merge pull request #2526 from getkirby/release/3.3.5

3.3.5
getkirby · Mar 17, 2020 · a7f2f96 · a7f2f96
2 parents 0330c0a + 1ad77af
commit a7f2f96
Show file tree

Hide file tree

Showing 50 changed files with 774 additions and 242 deletions.
diff --git a/.github/README.md b/.github/README.md
@@ -1,6 +1,10 @@
 # Kirby
 
-[![Build Status](https://travis-ci.com/getkirby/kirby.svg?branch=master)](https://travis-ci.com/getkirby/kirby)
+[![Release](https://flat.badgen.net/github/release/getkirby/kirby/stable)](https://github.com/getkirby/kirby/releases/latest)
+[![Build Status](https://flat.badgen.net/travis/getkirby/kirby)](https://travis-ci.com/getkirby/kirby)
+[![Coverage Status](https://flat.badgen.net/coveralls/c/github/getkirby/kirby)](https://coveralls.io/github/getkirby/kirby)
+[![Downloads](https://flat.badgen.net/packagist/dt/getkirby/cms)](https://github.com/getkirby/kirby/releases/latest)
+[![Twitter](https://flat.badgen.net/twitter/follow/getkirby)](https://twitter.com/getkirby)
 
 This is Kirby's core application folder. Get started with one of the following repositories instead:
 

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "getkirby/cms",
   "description": "The Kirby 3 core",
-  "version": "3.3.4",
+  "version": "3.3.5",
   "license": "proprietary",
   "keywords": ["kirby", "cms", "core"],
   "homepage": "https://getkirby.com",

diff --git a/composer.lock b/composer.lock
diff --git a/config/fields/mixins/picker.php b/config/fields/mixins/picker.php
@@ -25,6 +25,13 @@
             return $info;
         },
 
+        /**
+         * Whether each item should be clickable
+         */
+        'link' => function (bool $link = true) {
+            return $link;
+        },
+
         /**
          * The minimum number of required selected
          */

diff --git a/config/helpers.php b/config/helpers.php
@@ -401,15 +401,25 @@ function kirby()
  * @param string|array $type
  * @param string $value
  * @param array $attr
+ * @param array $data
  * @return string
  */
-function kirbytag($type, string $value = null, array $attr = []): string
+function kirbytag($type, string $value = null, array $attr = [], array $data = []): string
 {
     if (is_array($type) === true) {
-        return App::instance()->kirbytag(key($type), current($type), $type);
+        $kirbytag = $type;
+        $type     = key($kirbytag);
+        $value    = current($kirbytag);
+        $attr     = $kirbytag;
+
+        // check data attribute and separate from attr data if exists
+        if (isset($attr['data']) === true) {
+            $data = $attr['data'];
+            unset($attr['data']);
+        }
     }
 
-    return App::instance()->kirbytag($type, $value, $attr);
+    return App::instance()->kirbytag($type, $value, $attr, $data);
 }
 
 /**

diff --git a/i18n/translations/cs.json b/i18n/translations/cs.json
@@ -43,7 +43,7 @@
   "error.avatar.create.fail": "Nebylo možné nahrát profilový obrázek",
   "error.avatar.delete.fail": "Nebylo mo\u017en\u00e9 smazat profilov\u00fd obr\u00e1zek",
   "error.avatar.dimensions.invalid":
-    "Výšku a šířka profilového obrázku by měla být pod 3000 pixelů",
+    "Šířka a výška obrázku musí být pod 3000 pixelů",
   "error.avatar.mime.forbidden":
     "Profilový obrázek musí být ve formátu JPEG nebo PNG",
 
@@ -61,21 +61,21 @@
     "Přípona souboru \"{extension}\" není povolena",
   "error.file.extension.missing":
     "Nem\u016f\u017eete nahr\u00e1t soubor bez p\u0159\u00edpony",
-  "error.file.maxheight": "The height of the image must not exceed {height} pixels",
-  "error.file.maxsize": "The file is too large",
-  "error.file.maxwidth": "The width of the image must not exceed {width} pixels",
+  "error.file.maxheight": "Výška obrázku nesmí přesáhnout {height} pixelů",
+  "error.file.maxsize": "Soubor je příliš velký",
+  "error.file.maxwidth": "Šířka obrázku nesmí přesáhnout {width} pixelů",
   "error.file.mime.differs":
     "Nahraný soubor musí být stejného typu \"{mime}\"",
   "error.file.mime.forbidden": "Soubor typu \"{mime}\" není povolený",
-  "error.file.mime.invalid": "Invalid mime type: {mime}",
+  "error.file.mime.invalid": "Neplatný MIME typ: {mime}",
   "error.file.mime.missing":
     "Nelze rozeznat mime typ souboru \"{filename}\"",
-  "error.file.minheight": "The height of the image must be at least {height} pixels",
-  "error.file.minsize": "The file is too small",
-  "error.file.minwidth": "The width of the image must be at least {width} pixels",
+  "error.file.minheight": "Výška obrázku musí být alespoň {height} pixelů",
+  "error.file.minsize": "Soubor je příliš malý",
+  "error.file.minwidth": "Šířka obrázku musí být alespoň {width} pixelů",
   "error.file.name.missing": "Název souboru nesmí být prázdný",
   "error.file.notFound": "Soubor se nepoda\u0159ilo nal\u00e9zt",
-  "error.file.orientation": "The orientation of the image must be \"{orientation}\"",
+  "error.file.orientation": "Orientace obrázku másí být \"{orientation}\"",
   "error.file.type.forbidden": "Nemáte povoleno nahrávat soubory typu {type} ",
   "error.file.undefined": "Soubor se nepoda\u0159ilo nal\u00e9zt",
 

diff --git a/panel/dist/css/app.css b/panel/dist/css/app.css
diff --git a/panel/dist/js/app.js b/panel/dist/js/app.js
diff --git a/panel/src/App.vue b/panel/src/App.vue
@@ -5,6 +5,8 @@
     :data-loading="$store.state.isLoading"
     :data-topbar="inside"
     :data-dialog="$store.state.dialog"
+    :data-translation="translation"
+    :data-translation-default="defaultTranslation"
     class="k-panel"
   >
     <keep-alive>
@@ -57,6 +59,12 @@ export default {
       return !this.$route.meta.outside && this.$store.state.user.current
         ? true
         : false;
+    },
+    defaultTranslation() {
+      return this.$store.state.languages.current ? this.$store.state.languages.current === this.$store.state.languages.default : false;
+    },
+    translation() {
+      return this.$store.state.languages.current ? this.$store.state.languages.current.code : false;
     }
   },
   created() {

diff --git a/panel/src/components/Dialogs/Dialog.vue b/panel/src/components/Dialogs/Dialog.vue
@@ -40,7 +40,10 @@
         type: String,
         default: "check"
       },
-      size: String,
+      size: {
+        type: String,
+        default: "default"
+      },
       theme: String,
       visible: Boolean
     },
@@ -176,7 +179,7 @@
 .k-dialog-box {
   position: relative;
   background: $color-light;
-  width: 22rem;
+  width: 100%;
   box-shadow: $box-shadow;
   border-radius: $border-radius;
   line-height: 1;
@@ -186,16 +189,28 @@
   flex-direction: column;
 }
 
-.k-dialog-box[data-size="small"] {
-  width: 20rem;
+@media screen and (min-width: 20rem) {
+  .k-dialog-box[data-size="small"] {
+    width: 20rem;
+  }
 }
 
-.k-dialog-box[data-size="medium"] {
-  width: 30rem;
+@media screen and (min-width: 22rem) {
+  .k-dialog-box[data-size="default"] {
+    width: 22rem;
+  }
 }
 
-.k-dialog-box[data-size="large"] {
-  width: 40rem;
+@media screen and (min-width: 30rem) {
+  .k-dialog-box[data-size="medium"] {
+    width: 30rem;
+  }
+}
+
+@media screen and (min-width: 40rem) {
+  .k-dialog-box[data-size="large"] {
+    width: 40rem;
+  }
 }
 
 .k-dialog-notification {

diff --git a/panel/src/components/Dialogs/LanguageCreateDialog.vue b/panel/src/components/Dialogs/LanguageCreateDialog.vue
@@ -94,6 +94,10 @@ export default {
       this.$refs.dialog.open();
     },
     submit() {
+      if (this.language.locale) {
+        this.language.locale = this.language.locale.trim() || null;
+      }
+
       this.$api
         .post("languages", {
           name: this.language.name,

diff --git a/panel/src/components/Dialogs/LanguageUpdateDialog.vue b/panel/src/components/Dialogs/LanguageUpdateDialog.vue
@@ -64,6 +64,10 @@ export default {
         return;
       }
 
+      if (typeof this.language.locale === "string") {
+        this.language.locale = this.language.locale.trim() || null;
+      }
+
       this.$api
         .patch("languages/" + this.language.code, {
           name: this.language.name,

diff --git a/panel/src/components/Forms/Field.vue b/panel/src/components/Forms/Field.vue
@@ -1,6 +1,7 @@
 <template>
   <div
     :data-disabled="disabled"
+    :data-translate="translate"
     :class="'k-field k-field-name-' + name"
     @focusin="$emit('focus', $event)"
     @focusout="$emit('blur', $event)"
@@ -49,6 +50,7 @@ export default {
     label: String,
     name: [String, Number],
     required: Boolean,
+    translate: Boolean,
     type: String
   },
   computed: {

diff --git a/panel/src/components/Forms/Field/FilesField.vue b/panel/src/components/Forms/Field/FilesField.vue
@@ -7,11 +7,11 @@
           <k-dropdown>
             <k-button
               ref="pickerToggle"
-              icon="add"
+              :icon="btnIcon"
               class="k-field-options-button"
               @click="$refs.picker.toggle()"
             >
-              {{ $t('add') }}
+              {{ btnLabel }}
             </k-button>
             <k-dropdown-content ref="picker" align="right">
               <k-dropdown-item icon="check" @click="open">{{ $t('select') }}</k-dropdown-item>
@@ -40,7 +40,7 @@
           :key="file.filename"
           :sortable="!disabled && selected.length > 1"
           :text="file.text"
-          :link="file.link"
+          :link="link ? file.link : null"
           :info="file.info"
           :image="file.image"
           :icon="file.icon"
@@ -62,7 +62,7 @@
       icon="image"
       @click="open"
     >
-      {{ empty || $t('field.files.empty') }}
+      {{ empty || $t("field.files.empty") }}
     </k-empty>
 
     <k-files-dialog ref="selector" @submit="select" />
@@ -78,7 +78,7 @@ import picker from "@/mixins/picker/field.js";
 export default {
   mixins: [picker],
   props: {
-    uploads: [Boolean, Object, Array],
+    uploads: [Boolean, Object, Array]
   },
   created() {
     this.$events.$on("file.delete", this.removeById);

diff --git a/panel/src/components/Forms/Field/PagesField.vue b/panel/src/components/Forms/Field/PagesField.vue
@@ -3,11 +3,11 @@
     <k-button-group slot="options" class="k-field-options">
       <k-button
         v-if="more && !disabled"
-        icon="add"
+        :icon="btnIcon"
         class="k-field-options-button"
         @click="open"
       >
-        {{ $t('select') }}
+        {{ btnLabel }}
       </k-button>
     </k-button-group>
     <template v-if="selected.length">
@@ -26,7 +26,7 @@
           :sortable="!disabled && selected.length > 1"
           :text="page.text"
           :info="page.info"
-          :link="page.link"
+          :link="link ? page.link : null"
           :icon="page.icon"
           :image="page.image"
         >
@@ -46,7 +46,7 @@
       icon="page"
       @click="open"
     >
-      {{ empty || $t('field.pages.empty') }}
+      {{ empty || $t("field.pages.empty") }}
     </k-empty>
     <k-pages-dialog ref="selector" @submit="select" />
   </k-field>
@@ -68,7 +68,7 @@ export default {
         max: this.max,
         multiple: this.multiple,
         search: this.search,
-        selected: this.selected.map(page => page.id),
+        selected: this.selected.map(page => page.id)
       });
     }
   }

diff --git a/panel/src/components/Forms/Field/UsersField.vue b/panel/src/components/Forms/Field/UsersField.vue
@@ -4,11 +4,11 @@
     <k-button-group slot="options" class="k-field-options">
       <k-button
         v-if="more && !disabled"
-        icon="add"
+        :icon="btnIcon"
         class="k-field-options-button"
         @click="open"
       >
-        {{ $t('select') }}
+        {{ btnLabel }}
       </k-button>
     </k-button-group>
 
@@ -27,7 +27,7 @@
           :sortable="!disabled && selected.length > 1"
           :text="user.text"
           :info="user.info"
-          :link="$api.users.link(user.id)"
+          :link="link ? $api.users.link(user.id) : null"
           :image="user.image"
           :icon="user.icon"
         >
@@ -40,13 +40,8 @@
         </component>
       </k-draggable>
     </template>
-    <k-empty
-      v-else
-      :data-invalid="isInvalid"
-      icon="users"
-      @click="open"
-    >
-      {{ empty || $t('field.users.empty') }}
+    <k-empty v-else :data-invalid="isInvalid" icon="users" @click="open">
+      {{ empty || $t("field.users.empty") }}
     </k-empty>
     <k-users-dialog ref="selector" @submit="select" />
   </k-field>

diff --git a/panel/src/components/Forms/Input/TextareaInput.vue b/panel/src/components/Forms/Input/TextareaInput.vue
@@ -174,7 +174,7 @@ export default {
     },
     onDrop($event) {
       // dropping files
-      if (this.$helper.isUploadEvent($event)) {
+      if (this.uploads && this.$helper.isUploadEvent($event)) {
         return this.$refs.fileUpload.drop($event.dataTransfer.files, {
           url: config.api + "/" + this.endpoints.field + "/upload",
           multiple: false
@@ -203,7 +203,6 @@ export default {
       this.over = false;
     },
     onOver($event) {
-
       // drag & drop for files
       if (this.uploads && this.$helper.isUploadEvent($event)) {
         $event.dataTransfer.dropEffect = "copy";

diff --git a/panel/src/components/Forms/Toolbar.vue b/panel/src/components/Forms/Toolbar.vue
@@ -208,7 +208,7 @@ export default {
         link: {
           label: this.$t("toolbar.button.link"),
           icon: "url",
-          shortcut: "l",
+          shortcut: "k",
           command: "dialog",
           args: "link"
         },