From a6cc06c6205fa58df37596735a80f595b1417347 Mon Sep 17 00:00:00 2001 From: knagasaki Date: Fri, 17 Jun 2016 11:04:31 +0900 Subject: [PATCH 01/18] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 0af1ab4f34..4fbefdf7e4 100644 --- a/index.html +++ b/index.html @@ -49,7 +49,7 @@ { "manifestUri": "http://iiif.biblissima.fr/manifests/ark:/12148/btv1b10500687r/manifest.json", "location": 'BnF'}, { "manifestUri": "http://www.e-codices.unifr.ch/metadata/iiif/sl-0002/manifest.json", "location": 'e-codices'}, { "manifestUri": "http://www.e-codices.unifr.ch/metadata/iiif/bge-cl0015/manifest.json", "location": 'e-codices'}, - { "manifestUri": "http://dzkimgs.l.u-tokyo.ac.jp/iiif/zuzoubu/01/manifest.json", "location": "University of Tokyo"} + { "manifestUri": "http://dzkimgs.l.u-tokyo.ac.jp/iiif/zuzoubu/12b02/manifest.json", "location": "University of Tokyo"} ], "windowObjects": [], "annotationEndpoint": { "name":"Local Storage", "module": "LocalStorageEndpoint" } From d0e1bd292ee186e2fdef318157b76c3483de657b Mon Sep 17 00:00:00 2001 From: knagasaki Date: Fri, 17 Jun 2016 14:00:18 +0900 Subject: [PATCH 02/18] Create translation.json --- locales/ja/translation.json | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 locales/ja/translation.json diff --git a/locales/ja/translation.json b/locales/ja/translation.json new file mode 100644 index 0000000000..5c3d6b75df --- /dev/null +++ b/locales/ja/translation.json @@ -0,0 +1,36 @@ +{ + "addItem": "アイテム追加", + "changeLayout": "レイアウト変更", + "selectGrid": "以下のグリッドから選択", + "bookmark": "しおり", + "close": "閉じる", + "bookmarkTitle": "ワークスペースを共有する", + "filterObjects": "フィルタをかける対象", + "addNewObject": "URLで新規オブジェクト追加", + "more": "more", + "item": "アイテム", + "items": "アイテム", + "details": "詳細", + "rights": "権利関係", + "rightsStatus": "権利状態", + "unspecified": "Unspecified", + "links": "リンク", + "addSlotRight": "右にスロット追加", + "addSlotLeft": "左にスロット追加", + "addSlotAbove": "上にスロット追加", + "addSlotBelow": "下にスロット追加", + "imageView": "画像表示モード", + "bookView": "Book表示モード", + "scrollView": "スクロール表示モード", + "comments": "コメント", + "addTagsHere": "ここでタグを追加", + "save": "保存", + "cancel": "キャンセル", + "edit": "編集", + "delete": "削除", + "url": "URL", + "newObject": "新しいオブジェクト", + "objectMetadata": "オブジェクトのメタデータ", + "fullScreen": "全画面表示", + "logo": "ロゴ" +} From f16ab36dc37989c8afae5f1c2aee901e64a2a6d7 Mon Sep 17 00:00:00 2001 From: knagasaki Date: Fri, 17 Jun 2016 14:04:33 +0900 Subject: [PATCH 03/18] Update translation.json --- locales/ja/translation.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/ja/translation.json b/locales/ja/translation.json index 5c3d6b75df..e3f3a9399f 100644 --- a/locales/ja/translation.json +++ b/locales/ja/translation.json @@ -4,10 +4,10 @@ "selectGrid": "以下のグリッドから選択", "bookmark": "しおり", "close": "閉じる", - "bookmarkTitle": "ワークスペースを共有する", + "bookmarkTitle": "現在の表示内容を共有する", "filterObjects": "フィルタをかける対象", "addNewObject": "URLで新規オブジェクト追加", - "more": "more", + "more": "もっと", "item": "アイテム", "items": "アイテム", "details": "詳細", From 9c73c1b71edc6bfae1326ca3da0189531e2fcd9f Mon Sep 17 00:00:00 2001 From: regisrob Date: Fri, 17 Jun 2016 14:06:50 +0200 Subject: [PATCH 04/18] Make "Load" button translatable --- js/src/viewer/manifestsPanel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/viewer/manifestsPanel.js b/js/src/viewer/manifestsPanel.js index 0d2df58182..157a3248db 100644 --- a/js/src/viewer/manifestsPanel.js +++ b/js/src/viewer/manifestsPanel.js @@ -150,7 +150,7 @@ '
', '', '', - '', + '', '
', '{{/if}}', '
', From 3b2988643d2c1ef6c0f677d3aee11b4791d7c838 Mon Sep 17 00:00:00 2001 From: regisrob Date: Fri, 17 Jun 2016 14:10:33 +0200 Subject: [PATCH 05/18] Update/add french translations --- locales/fr/translation.json | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/locales/fr/translation.json b/locales/fr/translation.json index 2075b7a432..e2db081080 100644 --- a/locales/fr/translation.json +++ b/locales/fr/translation.json @@ -1,10 +1,13 @@ { - "addItem": "Ajouter un objet", + "addItem": "Ajouter un objet", "changeLayout": "Changer la disposition", - "selectGrid": "Sélectionner une grille", - "bookmark": "Ajouter aux favoris", + "changeLayoutTooltip": "Changer le nombre de fenêtres visibles", + "selectGrid": "Sélectionner la grille de votre choix", + "bookmark": "Sauvegarder / Partager", + "bookmarkTooltip": "Obtenir le lien vers cet espace de travail", "close": "Fermer", - "bookmarkTitle": "Ajouter aux favoris ou partager son espace de travail", + "closeTooltip": "Fermer cette fenêtre", + "bookmarkTitle": "Sauvegarder ou partager cet espace de travail", "filterObjects": "Filtrer la liste", "addNewObject": "Ajouter un objet à partir d'une URL", "more": "restants", @@ -33,7 +36,12 @@ "newObject": "Nouvel objet", "objectMetadata": "Métadonnées", "fullScreen": "Plein écran", + "fullScreenTooltip": "Ouvrir en plein écran", + "fullScreenWindowTooltip": "Ouvrir cette fenêtre en plein écran", "logo": "Logo", - "load": "Charger", - "dropToLoad": "Déposer ici pour ajouter l'objet" -} + "load": "Ajouter", + "dropToLoad": "Déposer ici pour ajouter l'objet", + "viewTypeTooltip": "Changer le type de vue", + "metadataTooltip": "Afficher les informations/métadonnées", + "sidePanelTooltip": "Ouvrir le panneau latéral" +} \ No newline at end of file From c4110ad27456140407b537d644a2dab9dd7a2032 Mon Sep 17 00:00:00 2001 From: knagasaki Date: Sat, 18 Jun 2016 00:29:49 +0900 Subject: [PATCH 06/18] Update thumbnailsView.js --- js/src/widgets/thumbnailsView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/widgets/thumbnailsView.js b/js/src/widgets/thumbnailsView.js index dc1a48ff64..5e8fb95278 100755 --- a/js/src/widgets/thumbnailsView.js +++ b/js/src/widgets/thumbnailsView.js @@ -17,7 +17,7 @@ lazyLoadingFactor: 1.5, //should be >= 1 eventEmitter: null }, options); - + this.imagesList.reverse(); this.init(); }; From d0c3cefbdbd8c1e504d7771bb2922d1a939c839c Mon Sep 17 00:00:00 2001 From: knagasaki Date: Sat, 18 Jun 2016 00:34:49 +0900 Subject: [PATCH 07/18] Update mirador.css --- css/mirador.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/css/mirador.css b/css/mirador.css index 1c1ba522d1..1bba134a94 100644 --- a/css/mirador.css +++ b/css/mirador.css @@ -1814,8 +1814,6 @@ a.mirador-icon-window-menu, a.mirador-icon-view-type { clear: both; } .qtip-viewer .qtip-content { - min-width: 275px; - max-height: 200px; overflow: auto; } .annotation-tooltip { From 7ef0d6b776dd7d9663b5e67f33ecc93030896c06 Mon Sep 17 00:00:00 2001 From: knagasaki Date: Sat, 18 Jun 2016 00:36:16 +0900 Subject: [PATCH 08/18] Update index.html --- index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/index.html b/index.html index 4fbefdf7e4..9dbfd6d12c 100644 --- a/index.html +++ b/index.html @@ -7,6 +7,8 @@ Mirador Viewer From ad1787082075cd13e2f03d160ca9b1c50d285d1b Mon Sep 17 00:00:00 2001 From: knagasaki Date: Sat, 18 Jun 2016 01:06:32 +0900 Subject: [PATCH 09/18] Update index.html --- index.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/index.html b/index.html index 9dbfd6d12c..4fbefdf7e4 100644 --- a/index.html +++ b/index.html @@ -7,8 +7,6 @@ Mirador Viewer From e9fb372fb55b9c80a82415de52bf619ab30bb651 Mon Sep 17 00:00:00 2001 From: knagasaki Date: Sat, 18 Jun 2016 01:07:49 +0900 Subject: [PATCH 10/18] Update thumbnailsView.js --- js/src/widgets/thumbnailsView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/widgets/thumbnailsView.js b/js/src/widgets/thumbnailsView.js index 5e8fb95278..7f5716bb75 100755 --- a/js/src/widgets/thumbnailsView.js +++ b/js/src/widgets/thumbnailsView.js @@ -17,7 +17,7 @@ lazyLoadingFactor: 1.5, //should be >= 1 eventEmitter: null }, options); - this.imagesList.reverse(); + this.init(); }; From d725d7905e437c60bad19fa3c3549b40aa1e86d0 Mon Sep 17 00:00:00 2001 From: knagasaki Date: Sat, 18 Jun 2016 01:11:50 +0900 Subject: [PATCH 11/18] Update mirador.css --- css/mirador.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/css/mirador.css b/css/mirador.css index 1bba134a94..97b4663927 100644 --- a/css/mirador.css +++ b/css/mirador.css @@ -567,7 +567,7 @@ li.highlight { .grid-item.hovered .grid-icon { background:deepSkyBlue; box-shadow: 0 0 10px black; - transform: scale(1.1) translateY(-10px) translateX(-5px); + transform: scale(1.1) translateY(-10px) translateqX(-5px); transition: all 0.2s ease-out; } .grid-text { @@ -1814,6 +1814,8 @@ a.mirador-icon-window-menu, a.mirador-icon-view-type { clear: both; } .qtip-viewer .qtip-content { + min-width: 275px; + max-height: 200px; overflow: auto; } .annotation-tooltip { From 64b404ba21ca5dbd310445ebb5e0f58d9ae47979 Mon Sep 17 00:00:00 2001 From: knagasaki Date: Sat, 18 Jun 2016 01:14:10 +0900 Subject: [PATCH 12/18] Update mirador.css --- css/mirador.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/mirador.css b/css/mirador.css index 97b4663927..1c1ba522d1 100644 --- a/css/mirador.css +++ b/css/mirador.css @@ -567,7 +567,7 @@ li.highlight { .grid-item.hovered .grid-icon { background:deepSkyBlue; box-shadow: 0 0 10px black; - transform: scale(1.1) translateY(-10px) translateqX(-5px); + transform: scale(1.1) translateY(-10px) translateX(-5px); transition: all 0.2s ease-out; } .grid-text { From a725b525a921c47d3721b064bac9e05341519c26 Mon Sep 17 00:00:00 2001 From: knagasaki Date: Sat, 18 Jun 2016 01:15:27 +0900 Subject: [PATCH 13/18] Update thumbnailsView.js --- js/src/widgets/thumbnailsView.js | 1 - 1 file changed, 1 deletion(-) diff --git a/js/src/widgets/thumbnailsView.js b/js/src/widgets/thumbnailsView.js index 7f5716bb75..f67d8c576e 100755 --- a/js/src/widgets/thumbnailsView.js +++ b/js/src/widgets/thumbnailsView.js @@ -17,7 +17,6 @@ lazyLoadingFactor: 1.5, //should be >= 1 eventEmitter: null }, options); - this.init(); }; From 7519a4aa62998f84ea661d6c9efd227b46b1bf6f Mon Sep 17 00:00:00 2001 From: knagasaki Date: Sat, 18 Jun 2016 01:16:23 +0900 Subject: [PATCH 14/18] Update thumbnailsView.js --- js/src/widgets/thumbnailsView.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/src/widgets/thumbnailsView.js b/js/src/widgets/thumbnailsView.js index f67d8c576e..7f5716bb75 100755 --- a/js/src/widgets/thumbnailsView.js +++ b/js/src/widgets/thumbnailsView.js @@ -17,6 +17,7 @@ lazyLoadingFactor: 1.5, //should be >= 1 eventEmitter: null }, options); + this.init(); }; From 83c57dd32737e64b1c9c32e5fa9ef5f0eaec198b Mon Sep 17 00:00:00 2001 From: knagasaki Date: Sat, 18 Jun 2016 01:16:37 +0900 Subject: [PATCH 15/18] Update thumbnailsView.js --- js/src/widgets/thumbnailsView.js | 1 - 1 file changed, 1 deletion(-) diff --git a/js/src/widgets/thumbnailsView.js b/js/src/widgets/thumbnailsView.js index 7f5716bb75..f67d8c576e 100755 --- a/js/src/widgets/thumbnailsView.js +++ b/js/src/widgets/thumbnailsView.js @@ -17,7 +17,6 @@ lazyLoadingFactor: 1.5, //should be >= 1 eventEmitter: null }, options); - this.init(); }; From 365cdeb0cba02fc46094a2a55295da8080c074cf Mon Sep 17 00:00:00 2001 From: knagasaki Date: Sat, 18 Jun 2016 01:17:22 +0900 Subject: [PATCH 16/18] Update thumbnailsView.js --- js/src/widgets/thumbnailsView.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/src/widgets/thumbnailsView.js b/js/src/widgets/thumbnailsView.js index f67d8c576e..dc1a48ff64 100755 --- a/js/src/widgets/thumbnailsView.js +++ b/js/src/widgets/thumbnailsView.js @@ -17,6 +17,7 @@ lazyLoadingFactor: 1.5, //should be >= 1 eventEmitter: null }, options); + this.init(); }; From f09f5c13bf561715ffdb8abb2c4ccf8df281ce65 Mon Sep 17 00:00:00 2001 From: knagasaki Date: Mon, 20 Jun 2016 02:22:29 +0900 Subject: [PATCH 17/18] Update translation.json --- locales/ja/translation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/ja/translation.json b/locales/ja/translation.json index e3f3a9399f..f86b380204 100644 --- a/locales/ja/translation.json +++ b/locales/ja/translation.json @@ -13,7 +13,7 @@ "details": "詳細", "rights": "権利関係", "rightsStatus": "権利状態", - "unspecified": "Unspecified", + "unspecified": "未特定の", "links": "リンク", "addSlotRight": "右にスロット追加", "addSlotLeft": "左にスロット追加", From 39ba6e5b95ed00fcaa8f7bd963afd8e82ba85aee Mon Sep 17 00:00:00 2001 From: Rashmi Singhal Date: Tue, 21 Jun 2016 14:15:54 -0400 Subject: [PATCH 18/18] fixes #969 --- js/src/widgets/imageView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/widgets/imageView.js b/js/src/widgets/imageView.js index 8785657933..611f757ec7 100755 --- a/js/src/widgets/imageView.js +++ b/js/src/widgets/imageView.js @@ -410,9 +410,9 @@ hideHUD(); jQuery(_this.element).on('mousemove', function() { window.clearTimeout(timeoutID); + _this.element.find(".hud-control").stop(true, true).removeClass('hidden', fadeDuration); // When a user is in annotation create mode, force show the controls so they don't disappear when in a qtip, so check for that if (!_this.forceShowControls) { - _this.element.find(".hud-control").stop(true, true).removeClass('hidden', fadeDuration); timeoutID = window.setTimeout(hideHUD, timeoutDuration); } }).on('mouseleave', function() {