aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/PULL_REQUEST_TEMPLATE/pull_request_template.md20
-rw-r--r--.mailmap8
-rw-r--r--example/src/Misc Media/A Trip to the Moon.mp4.yaml7
-rw-r--r--flake.nix13
-rw-r--r--viewer/ldgallery-viewer.7.md9
-rw-r--r--viewer/package.json16
-rw-r--r--viewer/src/components/async/AsyncLdMarkdown.vue14
-rw-r--r--viewer/src/views/ItemThumbnail.vue2
-rw-r--r--viewer/src/views/MainLayout.vue5
-rw-r--r--viewer/src/views/item_handlers/AudioViewer.vue11
-rw-r--r--viewer/src/views/layout/left/LayoutInformation.vue8
-rw-r--r--viewer/src/views/layout/left/LayoutTagInput.vue16
-rw-r--r--viewer/yarn.lock1490
13 files changed, 866 insertions, 753 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
new file mode 100644
index 0000000..7c48653
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
@@ -0,0 +1,20 @@
1---
2name: Generic pull request
3about: Create a pull request to propose some changes.
4title: ''
5labels: ''
6assignees: ''
7---
8
9### What changed
10
11
12### Why the changes
13
14
15### Before-merge checklist
16
17- [ ] Changes are tested.
18- [ ] Documentation is up to date with the changes.
19- [ ] Commit history is clean and descriptive.
20
diff --git a/.mailmap b/.mailmap
index f484a99..e5dab13 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,8 +2,8 @@
2# git config --global log.mailmap true 2# git config --global log.mailmap true
3# git log --use-mailmap 3# git log --use-mailmap
4 4
5zeroinformatique <10961896+zeroinformatique@users.noreply.github.com> <contact@zeroinformatique.fr> 5zeroinformatique <contact@zeroinformatique.fr> <contact@zeroinformatique.fr>
6zeroinformatique <10961896+zeroinformatique@users.noreply.github.com> <OzoneGrif@users.noreply.github.com> 6zeroinformatique <contact@zeroinformatique.fr> <10961896+zeroinformatique@users.noreply.github.com>
7zeroinformatique <contact@zeroinformatique.fr> <OzoneGrif@users.noreply.github.com>
7 8
8pacien <pacien@users.noreply.github.com> 9pacien <pacien.trangirard@pacien.net> <pacien@users.noreply.github.com>
9pacien <pacien@users.noreply.github.com> <pacien.trangirard@pacien.net>
diff --git a/example/src/Misc Media/A Trip to the Moon.mp4.yaml b/example/src/Misc Media/A Trip to the Moon.mp4.yaml
new file mode 100644
index 0000000..48ec714
--- /dev/null
+++ b/example/src/Misc Media/A Trip to the Moon.mp4.yaml
@@ -0,0 +1,7 @@
1description: |
2 From the 1902 short film « Le Voyage dans la Lune » by Georges Méliès.
3
4 It was based on:
5 - From the Earth to the Moon, and
6 - Around the Moon by Jules Verne.
7
diff --git a/flake.nix b/flake.nix
index 99221c7..688601c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -117,6 +117,19 @@
117 ]; 117 ];
118 }; 118 };
119 119
120 example = pkgs.stdenv.mkDerivation {
121 pname = "ldgallery-example";
122 version = ldgalleryVersion;
123 src = ./example;
124 nativeBuildInputs = [ ldgallery ];
125 buildPhase = ''
126 # Need UTF-8: https://github.com/ldgallery/ldgallery/issues/341
127 export LC_ALL=C.UTF-8
128 ldgallery --input-dir src --output-dir $out --with-viewer
129 '';
130 installPhase = ":";
131 };
132
120 default = ldgallery; 133 default = ldgallery;
121 }; 134 };
122 135
diff --git a/viewer/ldgallery-viewer.7.md b/viewer/ldgallery-viewer.7.md
index c0634b6..736f61f 100644
--- a/viewer/ldgallery-viewer.7.md
+++ b/viewer/ldgallery-viewer.7.md
@@ -2,7 +2,7 @@
2pagetitle: Viewer user manual - ldgallery 2pagetitle: Viewer user manual - ldgallery
3title: LDGALLERY-VIEWER(7) ldgallery 3title: LDGALLERY-VIEWER(7) ldgallery
4author: Pacien TRAN-GIRARD, Guillaume FOUET 4author: Pacien TRAN-GIRARD, Guillaume FOUET
5date: 2022-09-04 (v2.1) 5date: 2022-10-26 (v2.1-SNAPSHOT)
6--- 6---
7 7
8 8
@@ -43,6 +43,13 @@ Items of the following formats can be opened and visualised within the web appli
43Formats which are not listed above or which are not supported by the user's web browser are offered for download instead of being directly displayed in the same window. 43Formats which are not listed above or which are not supported by the user's web browser are offered for download instead of being directly displayed in the same window.
44 44
45 45
46# KEYBOARD SHORTCUTS
47
48`CTRL-K`
49: Moves the focus to the tag search field, opening the side search panel if it is closed.
50 Pressing again while in the search input field sets the focus to the browser's address bar.
51
52
46# SEARCH QUERIES 53# SEARCH QUERIES
47 54
48Items can be filtered based on their tags. 55Items can be filtered based on their tags.
diff --git a/viewer/package.json b/viewer/package.json
index c93b022..4850db6 100644
--- a/viewer/package.json
+++ b/viewer/package.json
@@ -12,21 +12,21 @@
12 "@fortawesome/fontawesome-svg-core": "6.1.2", 12 "@fortawesome/fontawesome-svg-core": "6.1.2",
13 "@fortawesome/free-solid-svg-icons": "6.1.2", 13 "@fortawesome/free-solid-svg-icons": "6.1.2",
14 "@fortawesome/vue-fontawesome": "3.0.1", 14 "@fortawesome/vue-fontawesome": "3.0.1",
15 "@vueuse/core": "9.1.1", 15 "@vueuse/core": "9.3.1",
16 "core-js": "3.25.0", 16 "core-js": "3.25.0",
17 "hammerjs": "2.0.8", 17 "hammerjs": "2.0.8",
18 "marked": "4.0.19", 18 "marked": "4.1.1",
19 "mosha-vue-toastify": "1.0.23", 19 "mosha-vue-toastify": "1.0.23",
20 "pinia": "2.0.21", 20 "pinia": "2.0.23",
21 "v-lazy-image": "2.1.1", 21 "v-lazy-image": "2.1.1",
22 "vue": "3.2.37", 22 "vue": "3.2.41",
23 "vue-dragscroll": "4.0.4", 23 "vue-dragscroll": "4.0.4",
24 "vue-i18n": "9.1.10", 24 "vue-i18n": "9.1.10",
25 "vue-router": "4.1.5" 25 "vue-router": "4.1.6"
26 }, 26 },
27 "devDependencies": { 27 "devDependencies": {
28 "@types/hammerjs": "2.0.41", 28 "@types/hammerjs": "2.0.41",
29 "@types/marked": "4.0.6", 29 "@types/marked": "4.0.7",
30 "@typescript-eslint/eslint-plugin": "5.31.0", 30 "@typescript-eslint/eslint-plugin": "5.31.0",
31 "@typescript-eslint/parser": "5.31.0", 31 "@typescript-eslint/parser": "5.31.0",
32 "@vue/cli-plugin-babel": "5.0.8", 32 "@vue/cli-plugin-babel": "5.0.8",
@@ -44,8 +44,8 @@
44 "js-yaml-loader": "1.2.2", 44 "js-yaml-loader": "1.2.2",
45 "sass": "1.54.0", 45 "sass": "1.54.0",
46 "sass-loader": "13.0.2", 46 "sass-loader": "13.0.2",
47 "typescript": "4.7.4", 47 "typescript": "4.8.4",
48 "vue-cli-plugin-pinia": "0.1.4" 48 "vue-cli-plugin-pinia": "0.1.6"
49 }, 49 },
50 "homepage": "https://ldgallery.pacien.org/", 50 "homepage": "https://ldgallery.pacien.org/",
51 "license": "AGPL-3" 51 "license": "AGPL-3"
diff --git a/viewer/src/components/async/AsyncLdMarkdown.vue b/viewer/src/components/async/AsyncLdMarkdown.vue
index 213c11c..c3f368a 100644
--- a/viewer/src/components/async/AsyncLdMarkdown.vue
+++ b/viewer/src/components/async/AsyncLdMarkdown.vue
@@ -40,7 +40,6 @@ const html = computed(() => marked(props.markdown));
40<style lang="scss" module> 40<style lang="scss" module>
41.markdown { 41.markdown {
42 color: white; 42 color: white;
43 line-height: 1.7;
44 word-wrap: break-word; 43 word-wrap: break-word;
45 44
46 a { 45 a {
@@ -52,19 +51,10 @@ const html = computed(() => marked(props.markdown));
52 background-color: #666; 51 background-color: #666;
53 } 52 }
54 53
55 p,
56 blockquote,
57 ul,
58 ol,
59 dl,
60 table,
61 pre {
62 margin: 15px 0;
63 }
64
65 ul, 54 ul,
66 ol { 55 ol {
67 padding-left: 30px; 56 list-style-type: disc;
57 padding-left: 1em;
68 } 58 }
69 59
70 h1 { 60 h1 {
diff --git a/viewer/src/views/ItemThumbnail.vue b/viewer/src/views/ItemThumbnail.vue
index 1c9e206..bf33043 100644
--- a/viewer/src/views/ItemThumbnail.vue
+++ b/viewer/src/views/ItemThumbnail.vue
@@ -40,7 +40,7 @@
40 size="4x" 40 size="4x"
41 /> 41 />
42 </div> 42 </div>
43 {{ item.title }} 43 <div v-text="item.title" />
44 </div> 44 </div>
45 </div> 45 </div>
46</template> 46</template>
diff --git a/viewer/src/views/MainLayout.vue b/viewer/src/views/MainLayout.vue
index d8b3300..30bfe97 100644
--- a/viewer/src/views/MainLayout.vue
+++ b/viewer/src/views/MainLayout.vue
@@ -26,7 +26,10 @@
26 /> 26 />
27 <template v-else-if="galleryStore.config && galleryStore.galleryIndex"> 27 <template v-else-if="galleryStore.config && galleryStore.galleryIndex">
28 <LayoutTop :class="[$style.layout, $style.layoutTop]" /> 28 <LayoutTop :class="[$style.layout, $style.layoutTop]" />
29 <LayoutLeft :class="[$style.layout, $style.layoutLeft]" /> 29 <LayoutLeft
30 v-show="!uiStore.fullWidth"
31 :class="[$style.layout, $style.layoutLeft]"
32 />
30 <router-view 33 <router-view
31 ref="content" 34 ref="content"
32 :class="[$style.layout, $style.layoutContent]" 35 :class="[$style.layout, $style.layoutContent]"
diff --git a/viewer/src/views/item_handlers/AudioViewer.vue b/viewer/src/views/item_handlers/AudioViewer.vue
index da9579f..bbba7e5 100644
--- a/viewer/src/views/item_handlers/AudioViewer.vue
+++ b/viewer/src/views/item_handlers/AudioViewer.vue
@@ -20,7 +20,10 @@
20 20
21<template>