SAK-32729 - Add shopping cart icon to External Tools that support Con…

…tent Item (sakaiproject#4648)
susowrc · Jul 28, 2017 · 952230c · 952230c
1 parent d22035d
commit 952230c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/BltiEntity.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/BltiEntity.java
@@ -366,8 +366,10 @@ public List<UrlItem> createNewUrls(SimplePageBean bean, Integer bltiToolId) {
 		String url = ServerConfigurationService.getToolUrl() + "/" + toolId + "/sakai.basiclti.admin.helper.helper?panel=ContentConfig&tool_id=" 
 			+ tool.get(LTIService.LTI_ID) + "&returnUrl=" + URLEncoder.encode(returnUrl);
 		String fa_icon = (String) tool.get(LTIService.LTI_FA_ICON);
+		Long ls = getLong(tool.get(LTIService.LTI_PL_LINKSELECTION));
+		Boolean selector = (new Long(1)).equals(ls);
 
-		list.add(new UrlItem(url, (String) tool.get(LTIService.LTI_TITLE), fa_icon));
+		list.add(new UrlItem(url, (String) tool.get(LTIService.LTI_TITLE), fa_icon, selector));
 	}
 
 	String url = ServerConfigurationService.getToolUrl() + "/" + toolId + "/sakai.basiclti.admin.helper.helper?panel=Main" + 

diff --git a/...onbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean.java b/...onbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean.java
@@ -447,14 +447,16 @@ public static class UrlItem {
 		public String Url;
 		public String label;
 		public String fa_icon = null;
+		public Boolean search = Boolean.FALSE;
 		public UrlItem(String Url, String label) {
 			this.Url = Url;
 			this.label = label;
 		}
-		public UrlItem(String Url, String label, String fa_icon) {
+		public UrlItem(String Url, String label, String fa_icon, Boolean search) {
 			this.Url = Url;
 			this.label = label;
 			this.fa_icon = fa_icon;
+			this.search = search;
 		}
 	}
 

diff --git a/...r/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/BltiPickerProducer.java b/...r/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/BltiPickerProducer.java
@@ -183,6 +183,10 @@ public void fillComponents(UIContainer tofill, ViewParameters viewparams, Compon
 				    .decorate(new UIFreeAttributeDecorator("class", "fa " + createLink.fa_icon));
 			    }
 
+			    if ( createLink.search ) {
+				UIOutput.make(link, "blti-search-icon");
+			    }
+
 			}
 
 			if ( toolcount > 0 ) {

diff --git a/lessonbuilder/tool/src/webapp/templates/BltiPicker.html b/lessonbuilder/tool/src/webapp/templates/BltiPicker.html
@@ -33,6 +33,7 @@ <h2 rsf:id="mainhead" id="mainhead"></h2>
 		<div rsf:id="blti-create:" style="margin-left:2em">
 		  <i class="" rsf:id="blti-create-icon"></i>
 		  <a href="#" target="sakai-basiclti-admin-iframe" onclick="showIframe(this.title);" rsf:id="blti-create-link"></a>
+		  <i class="fa fa-shopping-cart lessons-shopping-cart" rsf:id="blti-search-icon"></i>
 		</div>
 
 		<form action="#" rsf:id="blti-autosubmit" id="blti-autosubmit">