Skip to content

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

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec2735b
SAK-51265 Sitestats Add Sakai Icons
i-a-m-s-k Apr 1, 2025
130c280
SAK-51265 Sitestats Add Sakai Icons
i-a-m-s-k Apr 8, 2025
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
14 changes: 13 additions & 1 deletion library/src/skins/default/src/sass/base/_icons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
);


Expand All @@ -198,6 +198,18 @@ $fa-font-path: "./fonts";
.#{$iconBaseClass}-#{$sakaiIcon} {
@extend .#{$assignedIcon};
}

// Apply widget icon styles to all Sakai icons
.#{$sakaiIcon} {
.widget-icon {
@extend .#{$iconBaseClass};
@extend .#{$iconBaseClass}-#{$sakaiIcon};
}
.widget-icon:hover {
@extend .#{$iconBaseClass};
@extend .#{$iconBaseClass}-#{$sakaiIcon};
}
}
Comment on lines +203 to +212
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this in use, if yes, what is it for? I think it generates a lot of additional CSS.

}

//Assing icon base class
Expand Down
3 changes: 1 addition & 2 deletions ...sitestats-tool/src/java/org/sakaiproject/sitestats/tool/wicket/widget/ActivityWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
3 changes: 1 addition & 2 deletions .../sitestats-tool/src/java/org/sakaiproject/sitestats/tool/wicket/widget/LessonsWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
3 changes: 1 addition & 2 deletions ...itestats-tool/src/java/org/sakaiproject/sitestats/tool/wicket/widget/ResourcesWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
3 changes: 1 addition & 2 deletions ...s/sitestats-tool/src/java/org/sakaiproject/sitestats/tool/wicket/widget/VisitsWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
16 changes: 11 additions & 5 deletions sitestats/sitestats-tool/src/java/org/sakaiproject/sitestats/tool/wicket/widget/Widget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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("<i class='si si-" + iconUrl + " alpha'></i>");
}
};
add(icon);

// Title
add(new Label("title", title));
Expand Down
6 changes: 3 additions & 3 deletions sitestats/sitestats-tool/src/webapp/html/pages/ReportsPage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
<i class="si si-add" border="0" alt="New report" style="vertical-align:middle"></i>
Copy link
Contributor

@ern ern Apr 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why use the tag <i> is <span> a better choice?

<a wicket:id="lnkNewReport" class="itemAction" style="margin: 0; display: inline; ">
<wicket:message key="report_new">[report_new]</wicket:message>
</a>
Expand Down Expand Up @@ -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"/>
<i class="si si-add" border="0" alt="New report" style="vertical-align:middle"></i>
<a wicket:id="lnkNewReport" class="itemAction" style="margin: 0; display: inline; ">
<wicket:message key="report_new">[report_new]</wicket:message>
</a>
Expand All @@ -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"/>
<i class="si si-sakai-lessonbuildertool" wicket:id="icon"></i>
<a wicket:id="link"><span wicket:id="title"></span></a>
<div class="itemAction" style="margin:0; padding: 0 0 0 22px">
<small>
Expand Down
Loading