SAK-50493 Lessons remove Print All and further refine Lessons printing (

#12957)
sakaiproject · Oct 13, 2024 · 9212ee0 · 9212ee0
1 parent d12a8e7
commit 9212ee0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 25 deletions.
diff --git a/lessonbuilder/api/src/resources/lessons.properties b/lessonbuilder/api/src/resources/lessons.properties
@@ -458,8 +458,7 @@ simplepage.edit_youtubelink=Edit YouTube Link
 simplepage.edit_youtube=Edit YouTube Link Below
 simplepage.edit_movie=Edit Item Below
 simplepage.open_new_window=Open in new window
-simplepage.print_view=Print view
-simplepage.print_all=Print all
+simplepage.print_view=Print
 simplepage.edititems=Edit Items
 simplepage.itemstatus=Item Status
 simplepage.items=Items

diff --git a/...der/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java b/...der/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java
@@ -688,8 +688,6 @@ public void fillComponents(UIContainer tofill, ViewParameters viewParams, Compon
 		showAll.setSource("summary");
 		UIInternalLink.make(tofill, "print-view", showAll)
 		    .decorate(new UITooltipDecorator(messageLocator.getMessage("simplepage.print_view")));
-		UIInternalLink.make(tofill, "print-all", showAll)
-		    .decorate(new UITooltipDecorator(messageLocator.getMessage("simplepage.print_all")));
 		UIInternalLink.make(tofill, "show-pages", showAll)
 		    .decorate(new UITooltipDecorator(messageLocator.getMessage("simplepage.showallpages")));
 

diff --git a/lessonbuilder/tool/src/webapp/js/show-page.js b/lessonbuilder/tool/src/webapp/js/show-page.js
@@ -34,21 +34,9 @@ $(window).load(function () {
   }
 
   // Print the current page
-  document.getElementById('print-view').addEventListener('click', function() {
-    const url = printView(window.location.href);
-    const win = window.open(url, '_blank');
-    win.focus();
-    win.print();
-    return false;
-  });
-
-  // Print all pages
-  document.getElementById('print-all').addEventListener('click', function() {
-    const url = printViewWithParameter(window.location.href);
-    const win = window.open(url, '_blank');
-    win.focus();
-    win.print();
-    return false;
+  document.getElementById('print-view').addEventListener('click', function(event) {
+    event.preventDefault();
+    window.print();
   });
 
 });

diff --git a/lessonbuilder/tool/src/webapp/templates/ShowPage.html b/lessonbuilder/tool/src/webapp/templates/ShowPage.html
@@ -154,12 +154,6 @@ <h2 id="toolbar-label" rsf:id="msg=simplepage.toolbar" class="lb-offscreen"></h2
           <span class="bi-printer" aria-hidden="true"></span>
         </a>
       </span>
-      <span class="contentButton">
-        <a role="button" href="#" rsf:id="print-all" id="print-all" class="btn btn-link my-1 Mrphs-toolTitleNav__link top-icon">
-          <span rsf:id="msg=simplepage.print_all" class="Mrphs-itemTitle me-1 d-none d-xl-inline-block"></span>
-          <span class="bi-printer-fill" aria-hidden="true"></span>
-        </a>
-      </span>        
       <span class="contentButton">
         <a role="button" href="#" rsf:id="show-pages" id="show-pages" class="btn btn-link my-1 Mrphs-toolTitleNav__link top-icon">
           <span rsf:id="msg=simplepage.showallpages" class="Mrphs-itemTitle me-1 d-none d-lg-inline-block"></span>

diff --git a/library/src/skins/default/src/sass/print.scss b/library/src/skins/default/src/sass/print.scss
@@ -25,6 +25,7 @@ footer,
 .jump-to-top,
 nav.sakai-pageNav,
 .actionToolBar,
+.modal-dialog,
 sakai-picture-changer,
 #select-site-sidebar,
 #portal-nav-sidebar,
@@ -70,6 +71,7 @@ div.portletBody {
     .sectionedit,
     img.question-image,
     .editsection,
+
     .showPollGraph {
       display: none !important;
     }