Skip to content

Fix style for badge #23

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 1 commit into
base: master
Choose a base branch
from
Open

Fix style for badge #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 9 additions & 5 deletions modules/web/src/de/diedavids/cuba/userinbox/web/screens/UserInboxMessageMenuBadge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public void initMessagesMenuItem(SideMenu sideMenu, Timer updateCountersTimer, F
.withScreenClass(UserInbox.class)
.show()
);
messagesMenuItem.setStyleName("messages-item");

sideMenu.addMenuItem(messagesMenuItem, 0);

Expand All @@ -53,14 +54,17 @@ private void initUpdateCounterTimerDelay(Timer updateCountersTimer) {
}

public void updateMessageCounter(SideMenu sideMenu) {
sideMenu.getMenuItemNN("messages")
.setBadgeText(
messages.formatMainMessage("menu-config.ddcui$user-inbox.badge", getMessageCounter())
);
final long messageCounter = getMessageCounter();
final SideMenu.MenuItem messagesItem = sideMenu.getMenuItemNN("messages");
messagesItem.setBadgeText(
this.messages.formatMainMessage("menu-config.ddcui$user-inbox.badge", messageCounter)
);
if (messageCounter == 0)
messagesItem.removeStyleName("new-messages");
else messagesItem.addStyleName("new-messages");
}

private long getMessageCounter() {
return messageService.countUnreadMessagesForCurrentUser();
}

}
8 changes: 8 additions & 0 deletions ...les/web/src/de/diedavids/cuba/userinbox/web/screens/main/UserInboxSideMenuMainScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import com.haulmont.cuba.gui.screen.UiController;
import com.haulmont.cuba.gui.screen.UiDescriptor;
import com.haulmont.cuba.web.app.main.MainScreen;
import com.haulmont.cuba.web.gui.screen.ScreenDependencyUtils;
import com.vaadin.ui.Dependency;
import de.diedavids.cuba.userinbox.web.screens.UserInboxMessageMenuBadge;

import javax.inject.Inject;
Expand All @@ -30,6 +32,8 @@ protected void onInit(InitEvent event) {
updateCountersTimer,
this
);

loadStyles();
}

@Subscribe
Expand All @@ -42,4 +46,8 @@ protected void onUpdateCountersTimerTimerAction(Timer.TimerActionEvent event) {
userInboxMessageMenuBadge.updateMessageCounter(sideMenu);
}

protected void loadStyles() {
ScreenDependencyUtils.addScreenDependency(this,
"vaadin://user-inbox-main-menu-screen/messages-badge.css", Dependency.Type.STYLESHEET);
}
}
11 changes: 11 additions & 0 deletions modules/web/web/VAADIN/user-inbox-main-menu-screen/messages-badge.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.messages-item.c-sidemenu-item .c-sidemenu-item-caption .c-sidemenu-item-badge {
padding: 2px 5px;
top: unset;
height: 100%;
position: relative;
right: -70px;
}
.messages-item.new-messages .v-icon,
.messages-item.new-messages .c-sidemenu-item-thumbnail-icon {
color: #7ba8cb;
}