diff options
-rw-r--r-- | package-lock.json | 28 | ||||
-rw-r--r-- | templates/viewer.php | 47 |
2 files changed, 63 insertions, 12 deletions
diff --git a/package-lock.json b/package-lock.json index c5277fd..6567381 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3426,15 +3426,21 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001296", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001296.tgz", - "integrity": "sha512-WfrtPEoNSoeATDlf4y3QvkwiELl9GyPLISV5GejTbbQRtQx4LhsXmc9IQ6XCL2d7UxCyEzToEZNMeqR79OUw8Q==", + "version": "1.0.30001374", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001374.tgz", + "integrity": "sha512-mWvzatRx3w+j5wx/mpFN5v5twlPrabG8NqX2c6e45LCpymdoGqNvRkRutFUqpRTXKFQFNQJasvK0YT7suW6/Hw==", "devOptional": true, - "peer": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - } + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + } + ], + "peer": true }, "node_modules/caseless": { "version": "0.12.0", @@ -14654,9 +14660,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001296", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001296.tgz", - "integrity": "sha512-WfrtPEoNSoeATDlf4y3QvkwiELl9GyPLISV5GejTbbQRtQx4LhsXmc9IQ6XCL2d7UxCyEzToEZNMeqR79OUw8Q==", + "version": "1.0.30001374", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001374.tgz", + "integrity": "sha512-mWvzatRx3w+j5wx/mpFN5v5twlPrabG8NqX2c6e45LCpymdoGqNvRkRutFUqpRTXKFQFNQJasvK0YT7suW6/Hw==", "devOptional": true, "peer": true }, diff --git a/templates/viewer.php b/templates/viewer.php index 8cd8de1..a80d68d 100644 --- a/templates/viewer.php +++ b/templates/viewer.php @@ -128,6 +128,36 @@ See https://github.com/adobe-type-tools/cmap-resources </div> </div> <!-- findbar --> + <div class="editorParamsToolbar hidden doorHangerRight" id="editorFreeTextParamsToolbar"> + <div class="editorParamsToolbarContainer"> + <div class="editorParamsSetter"> + <label for="editorFreeTextColor" class="editorParamsLabel" data-l10n-id="editor_free_text_color">Color</label> + <input type="color" id="editorFreeTextColor" class="editorParamsColor" tabindex="100"> + </div> + <div class="editorParamsSetter"> + <label for="editorFreeTextFontSize" class="editorParamsLabel" data-l10n-id="editor_free_text_size">Size</label> + <input type="range" id="editorFreeTextFontSize" class="editorParamsSlider" value="10" min="5" max="100" step="1" tabindex="101"> + </div> + </div> + </div> + + <div class="editorParamsToolbar hidden doorHangerRight" id="editorInkParamsToolbar"> + <div class="editorParamsToolbarContainer"> + <div class="editorParamsSetter"> + <label for="editorInkColor" class="editorParamsLabel" data-l10n-id="editor_ink_color">Color</label> + <input type="color" id="editorInkColor" class="editorParamsColor" tabindex="102"> + </div> + <div class="editorParamsSetter"> + <label for="editorInkThickness" class="editorParamsLabel" data-l10n-id="editor_ink_thickness">Thickness</label> + <input type="range" id="editorInkThickness" class="editorParamsSlider" value="1" min="1" max="20" step="1" tabindex="103"> + </div> + <div class="editorParamsSetter"> + <label for="editorInkOpacity" class="editorParamsLabel" data-l10n-id="editor_ink_opacity">Opacity</label> + <input type="range" id="editorInkOpacity" class="editorParamsSlider" value="100" min="1" max="100" step="1" tabindex="104"> + </div> + </div> + </div> + <div id="secondaryToolbar" class="secondaryToolbar hidden doorHangerRight"> <div id="secondaryToolbarButtonContainer"> <button id="secondaryPresentationMode" class="secondaryToolbarButton visibleLargeView" title="Switch to Presentation Mode" tabindex="51" data-l10n-id="presentation_mode"> @@ -263,7 +293,22 @@ See https://github.com/adobe-type-tools/cmap-resources <div class="verticalToolbarSeparator hiddenSmallView"></div> - <button id="secondaryToolbarToggle" class="toolbarButton" title="Tools" tabindex="36" data-l10n-id="tools" aria-expanded="false" aria-controls="secondaryToolbar"> + <div id="editorModeButtons" class="splitToolbarButton toggled hidden" role="radiogroup"> + <button id="editorNone" class="toolbarButton toggled" disabled="disabled" title="Disable Annotation Editing" role="radio" aria-checked="true" tabindex="36" data-l10n-id="editor_none"> + <span data-l10n-id="editor_none_label">Disable Editing</span> + </button> + <button id="editorFreeText" class="toolbarButton" disabled="disabled" title="Add FreeText Annotation" role="radio" aria-checked="false" tabindex="37" data-l10n-id="editor_free_text"> + <span data-l10n-id="editor_free_text_label">FreeText Annotation</span> + </button> + <button id="editorInk" class="toolbarButton" disabled="disabled" title="Add Ink Annotation" role="radio" aria-checked="false" tabindex="38" data-l10n-id="editor_ink"> + <span data-l10n-id="editor_ink_label">Ink Annotation</span> + </button> + </div> + + <!-- Should be visible when the "editorModeButtons" are visible. --> + <div id="editorModeSeparator" class="verticalToolbarSeparator hidden"></div> + + <button id="secondaryToolbarToggle" class="toolbarButton" title="Tools" tabindex="48" data-l10n-id="tools" aria-expanded="false" aria-controls="secondaryToolbar"> <span data-l10n-id="tools_label">Tools</span> </button> </div> |