Merge branch 'raceboardmodes'

This commit is contained in:
Axel Uhl committed 2016-07-21 19:34:31 +02:00
commit 44e69b6b16
5 files changed
+21 -18

No files matched your search

@@ -49,11 +49,7 @@
right: 8.666666666666667em;
}
.suggestionsSettingsMenuItemLabel {
padding-right: 8.666666666666667em
}
.suggestionsRemoveButton ,.suggestionsToggleButton {
.suggestionsRemoveButton {
padding: 0.433333333333333em 1em;
}
@@ -61,6 +57,13 @@
position: absolute;
right: 0.333333333333333em;
top: 0.333333333333333em;
width: 2em;
height: 2em;
}
.suggestionsToggleButton input {
width: 1.333333333333333em;
height: 2em;
}
.suggestionsAddFilter {
@@ -87,6 +90,7 @@
.suggestionsSettingsMenuItemLabel {
font-weight: 600;
padding-right: 2.666666666666667em
}
.suggestionsSettingsMenuItemLabel, .suggestionsItemDescription {
@@ -117,3 +121,9 @@
display: inline-block;
min-width: 5.5em;
}
.suggestionsContentSeparator {
border-bottom: 1px solid #dedede;
background-color: #f2f2f2;
height: 1.333333333333333em;
}
@@ -4,19 +4,13 @@
<ui:with field="i18n" type="com.sap.sailing.gwt.ui.client.StringMessages" />
<ui:with field="res" type="com.sap.sailing.gwt.common.client.SharedResources" />
<ui:with field="local_res" type="com.sap.sailing.gwt.home.shared.partials.multiselection.SuggestedMultiSelectionResources" />
<ui:style>
.noResults {
font-weight: bold;
font-style: italic;
padding: 1.2em;
}
</ui:style>
<g:HTMLPanel addStyleNames="{local_res.css.suggestions}">
<div class="{local_res.css.suggestionsHeader}">
<span class="{local_res.css.suggestionsHeaderTitle}" ui:field="headerTitleUi" />
</div>
<div class="{local_res.css.suggestionsContent}">
<g:FlowPanel ui:field="notificationToggleContainerUi" />
<div class="{local_res.css.suggestionsContentSeparator}"></div>
<div class="{local_res.css.suggestionsContentToolbar}">
<sp:filter.AbstractFilterWidget addStyleNames="{local_res.css.suggestionsAddFilter}" ui:field="suggestionWidgetUi" />
<g:Button addStyleNames="{res.mainCss.button} {res.mainCss.buttonred} {local_res.css.suggestionsRemoveButton}" ui:field="removeAllButtonUi">
@@ -5,13 +5,12 @@ import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.uibinder.client.UiHandler;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.CheckBox;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.HasEnabled;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.Widget;
import com.sap.sailing.gwt.common.client.SharedResources;
import com.sap.sailing.gwt.ui.client.StringMessages;
class SuggestedMultiSelectionNotificationToggle extends Composite implements HasEnabled {
@@ -22,7 +21,7 @@ class SuggestedMultiSelectionNotificationToggle extends Composite implements Has
@UiField SharedResources res;
@UiField Label labelUi;
@UiField Button toggleButtonUi;
@UiField CheckBox toggleButtonUi;
private boolean enabled = false;
SuggestedMultiSelectionNotificationToggle(String label) {
@@ -47,8 +46,7 @@ class SuggestedMultiSelectionNotificationToggle extends Composite implements Has
}
private void updateUiState() {
toggleButtonUi.setStyleName(res.mainCss().buttonred(), !enabled);
toggleButtonUi.setText(enabled ? StringMessages.INSTANCE.enabled() : StringMessages.INSTANCE.disabled());
toggleButtonUi.setValue(enabled);
}
}
@@ -5,6 +5,6 @@
<ui:with field="local_res" type="com.sap.sailing.gwt.home.shared.partials.multiselection.SuggestedMultiSelectionResources" />
<g:HTMLPanel addStyleNames="{local_res.css.suggestionsSettingsMenuItem}">
<g:Label addStyleNames="{local_res.css.suggestionsSettingsMenuItemLabel}" ui:field="labelUi"/>
<g:Button addStyleNames="{local_res.css.suggestionsToggleButton} {res.mainCss.button} {res.mainCss.buttonprimary}" ui:field="toggleButtonUi" />
<g:CheckBox addStyleNames="{local_res.css.suggestionsToggleButton}" ui:field="toggleButtonUi" />
</g:HTMLPanel>
</ui:UiBinder>
@@ -28,5 +28,6 @@ public interface SuggestedMultiSelectionResources extends ClientBundle {
String suggestionsItemDescription();
String suggestionsItemDescriptionImage();
String suggestionsItemDescriptionId();
String suggestionsContentSeparator();
}
}