SAK-51265 Sitestats switch to using css icons for tools (#13534)

Co-authored-by: Sam Ottenhoff <[email protected]>

Author: i-a-m-s-k

library/src/skins/default/src/sass/base/_icons.scss

@@ -187,7 +187,7 @@ $fa-font-path: "./fonts";
     question: bi-question,
     warning: bi-exclamation-lg,
     expanded: bi-chevron-down,
-    collapsed: bi-chevron-right,
+    collapsed: bi-chevron-right
   );
 
 

sitestats/sitestats-tool/src/java/org/sakaiproject/sitestats/tool/wicket/widget/ActivityWidget.java

@@ -100,9 +100,8 @@ public Panel getPanel(String panelId) {
 		});
 
 		// Final Widget object		
-		String icon = StatsManager.SILK_ICONS_DIR + "chart_pie.png";
 		String title = (String) new ResourceModel("overview_title_activity").getObject();
-		Widget widget = new Widget("widget", icon, title, widgetMiniStats, tabs, siteId);
+		Widget widget = new Widget("widget", "sakai-poll", title, widgetMiniStats, tabs, siteId);
 		add(widget);
 	}
 

sitestats/sitestats-tool/src/java/org/sakaiproject/sitestats/tool/wicket/widget/LessonsWidget.java

@@ -91,9 +91,8 @@ public Panel getPanel(String panelId) {
         });
 
         // Final Widget object
-        String icon = StatsManager.SILK_ICONS_DIR + "folder_page.png";
         String title = (String) new ResourceModel("overview_title_lessonpages").getObject();
-        Widget widget = new Widget("widget", icon, title, widgetMiniStats, tabs, siteId);
+        Widget widget = new Widget("widget", "sakai-gradebook-tool", title, widgetMiniStats, tabs, siteId);
         add(widget);
     }
 

sitestats/sitestats-tool/src/java/org/sakaiproject/sitestats/tool/wicket/widget/ResourcesWidget.java

@@ -96,9 +96,8 @@ public Panel getPanel(String panelId) {
 		});
 
 		// Final Widget object		
-		String icon = StatsManager.SILK_ICONS_DIR + "folder_page.png";
 		String title = (String) new ResourceModel("overview_title_resources").getObject();
-		Widget widget = new Widget("widget", icon, title, widgetMiniStats, tabs, siteId);
+		Widget widget = new Widget("widget", "sakai-resources", title, widgetMiniStats, tabs, siteId);
 		add(widget);
 	}
 

sitestats/sitestats-tool/src/java/org/sakaiproject/sitestats/tool/wicket/widget/VisitsWidget.java

@@ -110,10 +110,9 @@ public Panel getPanel(String panelId) {
 		});
 
 		// Final Widget object		
-		String icon = StatsManager.SILK_ICONS_DIR + "user_gray.png";
 		String title = (String) new ResourceModel("overview_title_visits").getObject();
 		if (siteStatsAll) {
-			add(new Widget("widget", icon, title, widgetMiniStats, tabs, siteId));
+			add(new Widget("widget", "sakai-singleuser", title, widgetMiniStats, tabs, siteId));
 		} else {
 			add(new StudentVisitsWidget("widget", widgetMiniStats));
 		}

sitestats/sitestats-tool/src/java/org/sakaiproject/sitestats/tool/wicket/widget/Widget.java

@@ -62,12 +62,13 @@ public class Widget extends Panel {
 	private boolean siteStatsView						= false;
 
 
-	public Widget(String id, String iconUrl, String title, List<WidgetMiniStat> widgetMiniStats, List<AbstractTab> widgetTabs, String siteId) {
+	public Widget(String id, String iconClass, String title, List<WidgetMiniStat> widgetMiniStats, List<AbstractTab> widgetTabs, String siteId) {
 		super(id);
-		this.iconUrl = iconUrl;
+		this.iconUrl = iconClass;
 		this.title = title;
 		this.widgetMiniStats = widgetMiniStats;
 		this.tabs = widgetTabs;
+		add(new Label("siteId", siteId));
 
 		StatsAuthz statsAuthz = Locator.getFacade().getStatsAuthz();
 		siteStatsView = statsAuthz.isUserAbleToViewSiteStats(siteId);
@@ -82,9 +83,14 @@ protected void onBeforeRender() {
 	private void renderWidget() {
 		setRenderBodyOnly(true);
 		removeAll();
-		
-		// Icon
-		add(new ExternalImage("icon", iconUrl));
+
+		WebMarkupContainer icon = new WebMarkupContainer("icon") {
+			@Override
+			protected void onRender() {
+				getResponse().write("<span class='si si-" + iconUrl + " alpha'></span>");
+			}
+		};
+		add(icon);
 
 		// Title
 		add(new Label("title", title));

sitestats/sitestats-tool/src/webapp/html/pages/ReportsPage.html

@@ -59,7 +59,7 @@ <h4 class="summaryHeader">
 	                <ul class="navIntraTool actionToolbar" style="margin: 1px 0 0 0; padding: 0 0 2px 5px;">
 	                    <li>
 		                    <!-- Add -->
-		                    <img src="/library/image/silk/add.png" border="0" alt="New report" style="vertical-align:middle"/>
+		                    <span class="si si-add icon-align-middle" aria-hidden="true"></span>
 		                    <a wicket:id="lnkNewReport" class="itemAction" style="margin: 0; display: inline; ">
 		                       <wicket:message key="report_new">[report_new]</wicket:message>
 		                    </a>
@@ -91,7 +91,7 @@ <h4 class="summaryHeader">
                     <ul wicket:id="adminAddContainer" class="navIntraTool actionToolbar" style="margin: 1px 0 0 0; padding: 0 0 2px 5px;">
                         <li>
                             <!-- Add -->
-                            <img src="/library/image/silk/add.png" border="0" alt="New report" style="vertical-align:middle"/>
+                            <span class="si si-add icon-align-middle" aria-hidden="true"></span>
                             <a wicket:id="lnkNewReport" class="itemAction" style="margin: 0; display: inline; ">
                                <wicket:message key="report_new">[report_new]</wicket:message>
                             </a>
@@ -113,7 +113,7 @@ <h4 class="summaryHeader">
                 <!-- Report table row Fragment -->
 		        <wicket:fragment wicket:id="reportRowFragment">
 		          <td style="width: 30%">
-		            <img wicket:id="icon" border="0" alt="Report" src="/library/image/silk/report_user.png"/>
+		            <span class="si si-sakai-lessonbuildertool" wicket:id="icon" aria-hidden="true"></span>
 		            <a wicket:id="link"><span wicket:id="title"></span></a>
 		            <div class="itemAction" style="margin:0; padding: 0 0 0 22px">
 		                <small>