DMC/scipro
7
0
Fork 0
Code Issues 20 Pull Requests 1 Actions Projects 1 Wiki Activity

Forum Message UI Improvement (Thesis Board #3470) #61

Merged
tozh4728 merged 20 commits from 3470-forum-msg-ui-improvement into develop 2024-12-19 15:28:23 +01:00
Conversation 3 Commits 20 Files Changed 12 +23 -4
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b58a8a2d8b - Show all commits

24
view/src/main/java/se/su/dsv/scipro/forum/panels/AbstractReadStatePanel.java
View File

@ -11,10 +11,24 @@ import java.util.Optional;
public abstract class AbstractReadStatePanel extends Panel { public abstract class AbstractReadStatePanel extends Panel {
public static final String TOGGLE = "toggle";
static final String ICON = "icon";
public enum ShowReadStateTooltip {
ENABLED,
DISABLED
}
private final Component icon; private final Component icon;
private final ShowReadStateTooltip showReadStateTooltip;
public AbstractReadStatePanel(final String id) { public AbstractReadStatePanel(final String id) {
this(id, ShowReadStateTooltip.DISABLED);
}
public AbstractReadStatePanel(final String id, final ShowReadStateTooltip showReadStateTooltip) {
super(id); super(id);
this.showReadStateTooltip = showReadStateTooltip;
AjaxFallbackLink<Void> link = new AjaxFallbackLink<>(TOGGLE) { AjaxFallbackLink<Void> link = new AjaxFallbackLink<>(TOGGLE) {
@Override @Override
@ -35,11 +49,11 @@ public abstract class AbstractReadStatePanel extends Panel {
protected abstract boolean isRead(); protected abstract boolean isRead();
protected abstract void onFlagClick(final AjaxRequestTarget target); protected abstract void onFlagClick(final AjaxRequestTarget target);
public static final String TOGGLE = "toggle"; public ShowReadStateTooltip getShowReadStateTooltip() {
static final String ICON = "icon"; return showReadStateTooltip;
}
private class UpdatingImage extends WebComponent { private class UpdatingImage extends WebComponent {
public UpdatingImage(String id) { public UpdatingImage(String id) {
super(id); super(id);
} }
@ -49,6 +63,10 @@ public abstract class AbstractReadStatePanel extends Panel {
super.onComponentTag(tag); super.onComponentTag(tag);
String state = isRead() ? "read" : "unread"; String state = isRead() ? "read" : "unread";
tag.append("class", state, " "); tag.append("class", state, " ");
if (getShowReadStateTooltip() == ShowReadStateTooltip.ENABLED && !isRead()) {
tag.put("title", getString("unread.msg"));
}
} }
} }
} }

1
view/src/main/java/se/su/dsv/scipro/forum/panels/AbstractReadStatePanel.utf8.properties Normal file
View File

@ -0,0 +1 @@
unread.msg=There are unread messages.

2
view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyProjectsPanel.java
View File

@ -194,7 +194,7 @@ public class SupervisorMyProjectsPanel extends Panel {
@Override @Override
public void populateItem(Item<ICellPopulator<Project>> item, String id, IModel<Project> projectModel) { public void populateItem(Item<ICellPopulator<Project>> item, String id, IModel<Project> projectModel) {
item.add(new AbstractReadStatePanel(id) { item.add(new AbstractReadStatePanel(id, AbstractReadStatePanel.ShowReadStateTooltip.ENABLED) {
@Override @Override
protected boolean isRead() { protected boolean isRead() {
return !projectForumService.hasUnreadThreads( return !projectForumService.hasUnreadThreads(