mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-08 13:20:57 +00:00
Merge remote-tracking branch 'origin/newhome' into boatclasses_masterdata
This commit is contained in:
fmittag committed
commit
7166194b85
13 files changed
+27
-29
No files matched your search
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
+1
-1
@@ -11,7 +11,7 @@
|
||||
text-align: center;
|
||||
text-transform: uppercase;
|
||||
cursor: pointer;
|
||||
margin-top: 2.5em;
|
||||
margin-top: 0.5em;
|
||||
margin-bottom: 0.5em;
|
||||
}
|
||||
.action_link {
|
||||
|
||||
+6
-4
@@ -111,16 +111,18 @@
|
||||
background-color: #f0ab00;
|
||||
}
|
||||
.regatta_intro_phases_leaderboardlink {
|
||||
font-size: 0.933333333333333em;
|
||||
font-weight: 700;
|
||||
border: 1px solid #ccc;
|
||||
padding: 0.714285714285714em 0.928571428571429em;
|
||||
text-transform: uppercase;
|
||||
z-index: 2;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 0;
|
||||
background-color: #008FCC;
|
||||
color: white;
|
||||
}
|
||||
.regatta_intro_phases_leaderboardlink:hover {
|
||||
background-color: #0177ab;
|
||||
}
|
||||
|
||||
.regatta_intro_scheduled {
|
||||
padding-top: 0.8em;
|
||||
}
|
||||
|
||||
+1
-3
@@ -43,9 +43,7 @@
|
||||
</div>
|
||||
<div ui:field="regattaPhasesInfoDiv" class="{local_res.css.regatta_intro_phases}">
|
||||
<div ui:field="regattaPhasesPanel" />
|
||||
<div class="{local_res.css.regatta_intro_phases_leaderboardlink}">
|
||||
<a href="javascript:;" ui:field="leaderboardLink"><ui:text from='{i18n.leaderBoard}'/></a>
|
||||
</div>
|
||||
<a href="javascript:;" ui:field="leaderboardLink" class="{local_res.css.regatta_intro_phases_leaderboardlink} {res.mainCss.button}"><ui:text from='{i18n.leaderBoard}'/></a>
|
||||
</div>
|
||||
<!--
|
||||
<div ui:field="isScheduledDiv" class="{local_res.css.regatta_intro_scheduled}">
|
||||
|
||||
-3
@@ -28,9 +28,6 @@
|
||||
|
||||
<p:recent.EventsOverviewRecent ui:field='recentEventsWidget'/>
|
||||
<p:upcoming.EventsOverviewUpcoming ui:field='upcomingEventsWidget'/>
|
||||
<!--
|
||||
<s:socialfooter.SocialFooter ui:field='socialFooter'/>
|
||||
-->
|
||||
</g:HTMLPanel>
|
||||
|
||||
</ui:UiBinder>
|
||||
-2
@@ -11,7 +11,6 @@ import com.sap.sailing.gwt.home.client.app.PlaceNavigator;
|
||||
import com.sap.sailing.gwt.home.client.shared.mainevents.MainEvents;
|
||||
import com.sap.sailing.gwt.home.client.shared.mainmedia.MainMedia;
|
||||
import com.sap.sailing.gwt.home.client.shared.mainsponsors.MainSponsors;
|
||||
import com.sap.sailing.gwt.home.client.shared.socialfooter.SocialFooter;
|
||||
import com.sap.sailing.gwt.home.client.shared.stage.Stage;
|
||||
import com.sap.sailing.gwt.home.client.shared.stage.StageEventType;
|
||||
import com.sap.sailing.gwt.ui.shared.EventBaseDTO;
|
||||
@@ -27,7 +26,6 @@ public class SmartphoneStartView extends Composite implements StartView {
|
||||
@UiField(provided=true) MainSponsors mainSponsors;
|
||||
@UiField(provided=true) MainEvents mainEvents;
|
||||
@UiField(provided=true) MainMedia mainMedia;
|
||||
@UiField SocialFooter socialFooter;
|
||||
|
||||
public SmartphoneStartView(PlaceNavigator navigator) {
|
||||
stage = new Stage(navigator);
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
<s:mainsponsors.MainSponsors ui:field='mainSponsors'/>
|
||||
<s:mainevents.MainEvents ui:field='mainEvents'/>
|
||||
<s:mainmedia.MainMedia ui:field='mainMedia'/>
|
||||
<s:socialfooter.SocialFooter ui:field='socialFooter'/>
|
||||
<s:socialfooter.SocialFooter />
|
||||
</g:HTMLPanel>
|
||||
|
||||
</ui:UiBinder>
|
||||
-1
@@ -25,7 +25,6 @@ public class TabletAndDesktopStartView extends Composite implements StartView {
|
||||
// @UiField(provided=true) MainSponsors mainSponsors;
|
||||
@UiField(provided=true) MainEvents mainEvents;
|
||||
@UiField(provided=true) MainMedia mainMedia;
|
||||
// @UiField SocialFooter socialFooter;
|
||||
|
||||
public TabletAndDesktopStartView(PlaceNavigator navigator) {
|
||||
stage = new Stage(navigator);
|
||||
|
||||
+1
-3
@@ -11,9 +11,7 @@
|
||||
-->
|
||||
<s:mainevents.MainEvents ui:field='mainEvents'/>
|
||||
<s:mainmedia.MainMedia ui:field='mainMedia'/>
|
||||
<!--
|
||||
<s:socialfooter.SocialFooter ui:field='socialFooter'/>
|
||||
-->
|
||||
<s:socialfooter.SocialFooter/>
|
||||
</g:HTMLPanel>
|
||||
|
||||
</ui:UiBinder>
|
||||
+4
@@ -5,6 +5,8 @@ import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import com.google.gwt.core.client.GWT;
|
||||
import com.google.gwt.dom.client.DivElement;
|
||||
import com.google.gwt.dom.client.Style.Display;
|
||||
import com.google.gwt.dom.client.StyleInjector;
|
||||
import com.google.gwt.event.dom.client.ClickEvent;
|
||||
import com.google.gwt.http.client.UrlBuilder;
|
||||
@@ -22,6 +24,7 @@ public class Footer extends Composite {
|
||||
private static FooterPanelUiBinder uiBinder = GWT.create(FooterPanelUiBinder.class);
|
||||
|
||||
@UiField Anchor changeLanguageLink;
|
||||
@UiField DivElement languageSelectionDiv;
|
||||
|
||||
private final Map<String, String> localeAndLanguages;
|
||||
|
||||
@@ -40,6 +43,7 @@ public class Footer extends Composite {
|
||||
|
||||
initWidget(uiBinder.createAndBindUi(this));
|
||||
|
||||
languageSelectionDiv.getStyle().setDisplay(Display.NONE);
|
||||
updateUI();
|
||||
}
|
||||
|
||||
|
||||
+3
-1
@@ -23,7 +23,9 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="{res.mediaCss.small12} {res.mediaCss.medium4} {res.mediaCss.columns} {local_res.css.sitefooter_language}">
|
||||
<ui:text from='{i18n.footerLanguage}'/>:<g:Anchor ui:field="changeLanguageLink" styleName="{local_res.css.sitefooter_language_link}" />
|
||||
<div ui:field="languageSelectionDiv">
|
||||
<ui:text from='{i18n.footerLanguage}'/>:<g:Anchor ui:field="changeLanguageLink" styleName="{local_res.css.sitefooter_language_link}" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@
|
||||
width: 3.125em;
|
||||
height: 3.75em;
|
||||
left: 0;
|
||||
background: url("../images/social--icons.png");
|
||||
background: url("images/home/social-icons.png");
|
||||
}
|
||||
.socialfooter_buttontwitter {
|
||||
background: #58aeee;
|
||||
|
||||
+9
-9
@@ -11,17 +11,17 @@
|
||||
<div class="{res.mainCss.grid}">
|
||||
<div class="{res.mediaCss.small12} {res.mediaCss.columns}">
|
||||
<header class="{res.mainCss.mainsection_header}">
|
||||
<h3 class="{local_res.css.mainsection_header_title}">Recommend SAP Sailing Analytics</h3>
|
||||
<h3 class="{local_res.css.mainsection_header_title}">Follow SAP Sports</h3>
|
||||
</header>
|
||||
<div class="{res.mainCss.mainsection_navigation}">
|
||||
<div class="{local_res.css.socialfooter_button} {local_res.css.socialfooter_buttontwitter}">
|
||||
<div class="{local_res.css.socialfooter_button_text}">Share this on <span>Twitter</span></div>
|
||||
<div class="{local_res.css.socialfooter_button_widget}"><img src="images/temp--twitter-badge.png" /></div>
|
||||
</div>
|
||||
<div class="{local_res.css.socialfooter_button} {local_res.css.socialfooter_buttonfacebook}">
|
||||
<div class="{local_res.css.socialfooter_button_text}">Share this on <span>Facebook</span></div>
|
||||
<div class="{local_res.css.socialfooter_button_widget}"><img src="images/temp--facebook-badge.png" /></div>
|
||||
</div>
|
||||
<a href="http://twitter.com/SAPSports" target="_blank" class="{local_res.css.socialfooter_button} {local_res.css.socialfooter_buttontwitter}" style="color:white;">
|
||||
<div class="{local_res.css.socialfooter_button_text}">SAP Sports on <span>Twitter</span></div>
|
||||
<div class="{local_res.css.socialfooter_button_widget}"></div>
|
||||
</a>
|
||||
<a href="http://www.facebook.com/SAPSports" target="_blank" class="{local_res.css.socialfooter_button} {local_res.css.socialfooter_buttonfacebook}" style="color:white;">
|
||||
<div class="{local_res.css.socialfooter_button_text}">SAP Sports on <span>Facebook</span></div>
|
||||
<div class="{local_res.css.socialfooter_button_widget}"></div>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in new issue
Block a user