Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added link functionality to tinymce #1946

Merged
merged 3 commits into from
Jul 2, 2024
Merged

added link functionality to tinymce #1946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b46c4a
added link functionality to tinymce
cstarcher Jun 22, 2024
bf25e1a
Merge branch 'main' into 1912-tinymce-link
cstarcher Jun 29, 2024
496f774
added functionality and edited notes
cstarcher Jun 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/webapp/app/directives/lockingTextAreaDirective.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ vireo.directive("lockingtextarea", function ($timeout) {
save();
});
},
toolbar1: "formatselect bold italic underline | bullist numlist undo redo",
toolbar1: "formatselect bold italic underline | bullist numlist undo redo | link unlink | code",
theme: "silver",
plugins: "autoresize",
plugins: "autoresize lists advlist link autolink code",
menubar: false,
statusbar: false,
image_advtab: true,
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/app/views/admin/settings/application/lookAndFeel.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@
<!-- FRONT PAGE INSTRUCTIONS BEFORE BUTTON -->
<lockingtextarea
label="Front Page Instructions (before button)"
hint="These instructions are show on the front page of Vireo to all users. New lines are converted to paragraphs automatically."
hint="These instructions are shown on the front page of Vireo to all users. New lines are converted to paragraphs automatically."
scope-value="settings.configurable.lookAndFeel.front_page_instructions_before.value"
on-blur="updateConfiguration('lookAndFeel', 'front_page_instructions_before')"
key-down="confirmEdit(event, prop)">
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/app/views/directives/lockingTextArea.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ <h4>{{ label }}<div tooltip="{{hint}}"><span class="glyphicon glyphicon-info-sig
</a>

<p ng-if="!locked" ng-click="toggleLock()" class="hover-pointer">
<span class="glyphicon glyphicon-pencil"></span> This field is unlocked and may be edited. Leaving the editable area will save and re-lock the field. Save and re-lock will occur after 5 seconds of inactivity after editing.
<span class="glyphicon glyphicon-pencil"></span> This field is unlocked and may be edited. Leaving the editable area will save and re-lock the field.
</p>

<div ng-show="!locked">
Expand Down
Loading