Skip to content

Commit 635fcbd

Browse files
author
svuillet
committed
enhance share seletection
1 parent 04f3912 commit 635fcbd

File tree

4 files changed

+26
-15
lines changed

4 files changed

+26
-15
lines changed

mobile-war/src/main/java/org/silverpeas/mobile/client/apps/sharesbox/pages/SharesBoxPage.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ public void setSelectionMode(boolean selectionMode) {
109109
clearActions();
110110
buttonDelete.setCallback(new Command() {@Override public void execute() {deleteSelectedShares();}});
111111
addActionShortcut(buttonDelete);
112-
113112
} else {
114113
clearActions();
115114
}
@@ -123,7 +122,10 @@ public void execute() {
123122
List<TicketDTO> selection = getSelectedShares();
124123
DeleteSharesEvent deleteEvent = new DeleteSharesEvent();
125124
deleteEvent.setSelection(selection);
126-
if (!selection.isEmpty()) EventBus.getInstance().fireEvent(deleteEvent);
125+
if (!selection.isEmpty()) {
126+
removeActionShortcut(buttonDelete);
127+
EventBus.getInstance().fireEvent(deleteEvent);
128+
}
127129
}
128130
});
129131
popin.show();

mobile-war/src/main/java/org/silverpeas/mobile/client/apps/sharesbox/pages/widgets/ShareItem.java

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,11 @@
3535
import com.google.gwt.uibinder.client.UiField;
3636
import com.google.gwt.uibinder.client.UiHandler;
3737
import com.google.gwt.user.client.Command;
38-
import com.google.gwt.user.client.Window;
3938
import com.google.gwt.user.client.ui.Anchor;
4039
import com.google.gwt.user.client.ui.HTMLPanel;
4140
import com.google.gwt.user.client.ui.Widget;
42-
import org.silverpeas.mobile.client.apps.notificationsbox.events.app.NotificationReadenEvent;
4341
import org.silverpeas.mobile.client.apps.sharesbox.resources.ShareMessages;
44-
import org.silverpeas.mobile.client.common.EventBus;
4542
import org.silverpeas.mobile.client.components.base.widgets.SelectableItem;
46-
import org.silverpeas.mobile.shared.dto.notifications.NotificationReceivedDTO;
47-
import org.silverpeas.mobile.shared.dto.notifications.NotificationSendedDTO;
4843
import org.silverpeas.mobile.shared.dto.tickets.TicketDTO;
4944

5045
import java.util.Date;
@@ -88,6 +83,11 @@ protected void moveTouch(TouchMoveEvent event) {
8883

8984
@UiHandler("link")
9085
protected void endTouch(TouchEndEvent event) {
86+
if (isInSelectionMode()) {
87+
toogleDownload();
88+
} else {
89+
enableDownload();
90+
}
9191
endTouch(event, true, new Command() {
9292
@Override
9393
public void execute() {
@@ -96,6 +96,14 @@ public void execute() {
9696
});
9797
}
9898

99+
public void toogleDownload() {
100+
shareLink.toggleClassName("ui-disabled");
101+
}
102+
103+
public void enableDownload() {
104+
shareLink.removeClassName("ui-disabled");
105+
}
106+
99107
public void setData(TicketDTO data) {
100108
this.data = data;
101109
Date dt = new Date();

mobile-war/src/main/java/org/silverpeas/mobile/client/components/base/widgets/SelectableItem.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ public class SelectableItem extends Composite {
2121
private Timer timerSelection = null;
2222
private Timer timerScroll = null;
2323

24+
public boolean isInSelectionMode() { return parent.isSelectionMode(); }
25+
2426
public void setMultiSelection(boolean multiSelection) {
2527
this.multiSelection = multiSelection;
2628
}

mobile-war/src/main/java/org/silverpeas/mobile/public/spmobile.css

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2445,13 +2445,12 @@ form .forms .fields > li:nth-child(even) {
24452445
padding-top: 50%;
24462446
}
24472447
.popupContent {
2448-
background-color: #fbf7aa;
2449-
border:2px solid #f9e98e;
2448+
background-color: #333;
24502449
padding: 50px;
2451-
border-radius:8px;
2452-
color: var(--main-font-color);
2453-
width: calc( 90% - 104px );
2454-
margin:0 5%;
2450+
border-radius:4px;
2451+
color: var(--white);
2452+
width: calc( 99% - 104px );
2453+
margin:0 1%;
24552454
text-align: center;
24562455
z-index: 999;
24572456
position: absolute;
@@ -2462,10 +2461,10 @@ form .forms .fields > li:nth-child(even) {
24622461
}
24632462

24642463
a.popin-btn {
2465-
background:#ec9c01;
2464+
background:var(--main-color);
24662465
text-decoration: none;
24672466
color: var(--white);
2468-
border-radius:5px;
2467+
border-radius:4px;
24692468
padding:0.5em 1em;
24702469
margin: 1em;
24712470
}

0 commit comments

Comments
 (0)