Merge pull request #1946 from TexasDigitalLibrary/1912-tinymce-link

added link functionality to tinymce
TexasDigitalLibrary · Jul 2, 2024 · 4cb3b5d · 4cb3b5d
2 parents 48986a8 + 496f774
commit 4cb3b5d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/main/webapp/app/directives/lockingTextAreaDirective.js b/src/main/webapp/app/directives/lockingTextAreaDirective.js
@@ -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,

diff --git a/src/main/webapp/app/views/admin/settings/application/lookAndFeel.html b/src/main/webapp/app/views/admin/settings/application/lookAndFeel.html
@@ -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)">

diff --git a/src/main/webapp/app/views/directives/lockingTextArea.html b/src/main/webapp/app/views/directives/lockingTextArea.html
@@ -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">