diff --git a/www-client/src/main/java/fr/agrometinfo/www/client/App.java b/www-client/src/main/java/fr/agrometinfo/www/client/App.java index fabf9d0a8fb5ac9fa0d1f2dce25519abd6801c04..13438ffa4442b10aa213c4e52a49b45a18e3dff4 100644 --- a/www-client/src/main/java/fr/agrometinfo/www/client/App.java +++ b/www-client/src/main/java/fr/agrometinfo/www/client/App.java @@ -12,11 +12,9 @@ import org.pepstock.charba.client.Charba; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; -import com.google.gwt.user.client.Cookies; import com.google.gwt.user.client.Window; import fr.agrometinfo.www.client.presenter.LayoutPresenter; -import fr.agrometinfo.www.client.presenter.LoginPresenter; /** * Entry point classes define <code>onModuleLoad()</code>. @@ -52,11 +50,6 @@ public class App implements EntryPoint { return EVENT_BUS; } - private boolean isLoggedIn() { - // fake check - return "true".equals(Cookies.getCookie("agrometinfo-logged")); - } - /** * This is the entry point method. */ @@ -71,10 +64,6 @@ public class App implements EntryPoint { // enabling Charba Charba.enable(); - if (isLoggedIn()) { - new LayoutPresenter().start(); - } else { - new LoginPresenter().start(); - } + new LayoutPresenter().start(); } } diff --git a/www-client/src/main/java/fr/agrometinfo/www/client/i18n/AppConstants.java b/www-client/src/main/java/fr/agrometinfo/www/client/i18n/AppConstants.java index d1e39992a45f7808c8dddbb88795f4480e77a2c5..bf5f0b257b6a70bf7c11cb3bc406ca4b78b78c61 100644 --- a/www-client/src/main/java/fr/agrometinfo/www/client/i18n/AppConstants.java +++ b/www-client/src/main/java/fr/agrometinfo/www/client/i18n/AppConstants.java @@ -14,25 +14,12 @@ public interface AppConstants extends com.google.gwt.i18n.client.ConstantsWithLo @DefaultStringValue("About") String about(); - /** - * @return translation - */ - @DefaultStringValue("By logging in, you agree to AgroMetInfo's terms of use and privacy policy.") - String acceptEULA(); - /** * @return translation */ @DefaultStringValue("AgroClim's applications") String agroclimApps(); - /** - * @return translation - */ - @DefaultStringValue("AgroMetInfo provides agroclimatic indicators and winter crop monitoring indicators " - + "(soft wheat type crop) and spring crop (corn type crop) updated daily in the form of maps and graphs.") - String agrometinfoIntro(); - /** * @return translation */ @@ -178,24 +165,6 @@ public interface AppConstants extends com.google.gwt.i18n.client.ConstantsWithLo @DefaultStringValue("Invalid e-mail address") String invalidEmailAddress(); - /** - * @return translation - */ - @DefaultStringValue("Login") - String login(); - - /** - * @return translation - */ - @DefaultStringValue("Login or sign in") - String loginOrSignIn(); - - /** - * @return translation - */ - @DefaultStringValue("Log out") - String logout(); - /** * @return translation */ @@ -252,19 +221,6 @@ public interface AppConstants extends com.google.gwt.i18n.client.ConstantsWithLo @DefaultStringValue("Toggle right panel") String toggleRightPanel(); - /** - * @return translation - */ - @DefaultStringValue("Profile and settings") - String userProfile(); - - /** - * @return translation - */ - @DefaultStringValue("You must be identified to access AgroMetInfo due to Meteo-France agreements related to " - + "SAFRAN data exchanges with AgroClim.") - String whyConnectionIsRequired(); - /** * @return translation */ diff --git a/www-client/src/main/java/fr/agrometinfo/www/client/i18n/AppMessages.java b/www-client/src/main/java/fr/agrometinfo/www/client/i18n/AppMessages.java index 0eb4dd502f617d2a077a45c4d6c58a3471e17f6c..819ce012a4eb6bc88ad8e10aa51248595c9699c1 100644 --- a/www-client/src/main/java/fr/agrometinfo/www/client/i18n/AppMessages.java +++ b/www-client/src/main/java/fr/agrometinfo/www/client/i18n/AppMessages.java @@ -11,14 +11,6 @@ import com.google.gwt.i18n.client.Messages; */ public interface AppMessages extends Messages { - /** - * @param username user's full name - * @param email user's email - * @return translation - */ - @DefaultMessage("{0}''s account ({1})") - String account(String username, String email); - /** * @param indicator chosen indicator * @param period chosen period diff --git a/www-client/src/main/java/fr/agrometinfo/www/client/presenter/LayoutPresenter.java b/www-client/src/main/java/fr/agrometinfo/www/client/presenter/LayoutPresenter.java index b58c8e14c07f236af38409c4f99bdb2d792aaa14..d01795f48933c7d2391329d472d992cffbb05615 100644 --- a/www-client/src/main/java/fr/agrometinfo/www/client/presenter/LayoutPresenter.java +++ b/www-client/src/main/java/fr/agrometinfo/www/client/presenter/LayoutPresenter.java @@ -8,7 +8,6 @@ import java.util.Objects; import org.dominokit.rest.shared.request.FailedResponseBean; import com.google.gwt.core.client.GWT; -import com.google.gwt.user.client.Cookies; import fr.agrometinfo.www.client.i18n.AppConstants; import fr.agrometinfo.www.client.view.BaseView; @@ -98,14 +97,6 @@ public final class LayoutPresenter implements Presenter { return !Objects.equals(GWT.getModuleBaseURL(), GWT.getModuleBaseForStaticFiles()); } - /** - * Logout the user. - */ - public void logout() { - // fake logout - Cookies.removeCookie("agrometinfo-logged"); - } - /** * @param choice the user's choice */ diff --git a/www-client/src/main/java/fr/agrometinfo/www/client/presenter/LoginPresenter.java b/www-client/src/main/java/fr/agrometinfo/www/client/presenter/LoginPresenter.java deleted file mode 100644 index 28782203552616364ccd619d70fd6f07b4abc100..0000000000000000000000000000000000000000 --- a/www-client/src/main/java/fr/agrometinfo/www/client/presenter/LoginPresenter.java +++ /dev/null @@ -1,77 +0,0 @@ -package fr.agrometinfo.www.client.presenter; - -import java.util.Arrays; -import java.util.List; - -import com.google.gwt.core.client.GWT; -import com.google.gwt.user.client.Cookies; - -import fr.agrometinfo.www.client.view.BaseView; -import fr.agrometinfo.www.client.view.LoginView; -import fr.agrometinfo.www.shared.dto.IdentityProviderDTO; - -/** - * Presenter to login the user. - * - * @author Olivier Maury - */ -public final class LoginPresenter implements Presenter { - - /** - * Interface for the related view. - */ - public interface View extends BaseView<LoginPresenter> { - - /** - * Close modal. - */ - void close(); - - /** - * @param list list of available identity providers - */ - void setIdentityProviders(List<IdentityProviderDTO> list); - } - - /** - * Related view. - */ - private final LoginView view = new LoginView(); - - /** - * Log the user using the IDP. - * - * @param idp IDP chosen by the user. - */ - public void login(final IdentityProviderDTO idp) { - GWT.log("Item: " + idp); - view.close(); - // check user - // fake login - Cookies.setCookie("agrometinfo-logged", "true"); - // display the app - new LayoutPresenter().start(); - } - - @Override - public void start() { - view.setPresenter(this); - view.init(); - - int id = 1; - // get from database - final IdentityProviderDTO orcid = new IdentityProviderDTO(); - orcid.setId(id++); - orcid.setLogoUrl("https://data.pheno.fr/img/LOGO_ORCID.png"); - orcid.setName("ORCID"); - final IdentityProviderDTO google = new IdentityProviderDTO(); - google.setId(id++); - google.setLogoUrl("https://data.pheno.fr/img/LOGO_GOOGLE.png"); - google.setName("Google"); - final IdentityProviderDTO inrae = new IdentityProviderDTO(); - inrae.setId(id++); - inrae.setLogoUrl("https://data.pheno.fr/img/LOGO_AE.png"); - inrae.setName("INRAE"); - view.setIdentityProviders(Arrays.asList(orcid, google, inrae)); - } -} diff --git a/www-client/src/main/java/fr/agrometinfo/www/client/view/LayoutView.java b/www-client/src/main/java/fr/agrometinfo/www/client/view/LayoutView.java index f93e4d1e24510efe7ac234298d397d73852a0778..ce7538bef24977b367aca974b4dbdd6f02217cf5 100644 --- a/www-client/src/main/java/fr/agrometinfo/www/client/view/LayoutView.java +++ b/www-client/src/main/java/fr/agrometinfo/www/client/view/LayoutView.java @@ -56,9 +56,9 @@ import fr.agrometinfo.www.shared.dto.PeriodDTO; */ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implements LayoutPresenter.View { /** - * The minimum screen width to display panels on startup. + * I18N constants. */ - public static final int MIN_WIDTH_FOR_PANELS = 1000; + private static final AppConstants CSTS = GWT.create(AppConstants.class); /** * Code of indicator to show by default. @@ -71,9 +71,9 @@ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implemen private static final String DEFAULT_PERIOD = "year"; /** - * I18N constants. + * The minimum screen width to display panels on startup. */ - private static final AppConstants CSTS = GWT.create(AppConstants.class); + public static final int MIN_WIDTH_FOR_PANELS = 1000; /** * I18N messages. @@ -116,6 +116,11 @@ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implemen */ private final ChoiceDTO choice = new ChoiceDTO(); + /** + * Drop down menu for user actions. + */ + private final Menu<String> devDropMenu = Menu.<String>create(); + /** * Menu displayed on small screen with vertical "...". */ @@ -126,50 +131,45 @@ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implemen */ private final Select<IndicatorDTO> indicatorSelect = Select.create(CSTS.chooseIndicator()); - /** - * Selector for indicator periods. - */ - private final Select<PeriodDTO> periodSelect = Select.create(CSTS.choosePeriod()); - /** * Application layout. */ private Layout layout; /** - * Selector for regions. + * Presenter for {@link MapView}. */ - private final Select<Entry<String, String>> regionSelect = Select.create(CSTS.chooseRegion()); + private MapPresenter mapPresenter; /** - * Summary of available indicators. + * Available indicator periods with indicators. */ - private final HtmlContentBuilder<HTMLDivElement> summary = div().css("p-b-15"); + private List<PeriodDTO> periods; /** - * Selector for year. + * Selector for indicator periods. */ - private final Select<Entry<String, String>> yearSelect = Select.create(CSTS.chooseYear()); + private final Select<PeriodDTO> periodSelect = Select.create(CSTS.choosePeriod()); /** - * Drop down menu for user actions. + * Selector for regions. */ - private final Menu<String> userDropMenu = Menu.<String>create(); + private final Select<Entry<String, String>> regionSelect = Select.create(CSTS.chooseRegion()); /** - * Presenter for {@link MapView}. + * Presenter for {@link RightPanelView}. */ - private MapPresenter mapPresenter; + private RightPanelPresenter rightPanelPresenter; /** - * Available indicator periods with indicators. + * Summary of available indicators. */ - private List<PeriodDTO> periods; + private final HtmlContentBuilder<HTMLDivElement> summary = div().css("p-b-15"); /** - * Presenter for {@link RightPanelView}. + * Selector for year. */ - private RightPanelPresenter rightPanelPresenter; + private final Select<Entry<String, String>> yearSelect = Select.create(CSTS.chooseYear()); /** * @param text link text @@ -327,8 +327,6 @@ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implemen private void initTopBar() { GWT.log("LayoutView.initTopBar()"); - initUserDropMenu(); - layout.getTopBar() // .css("agrometinfo-topbar") // .appendChild(DominoElement.of(li() // @@ -336,37 +334,7 @@ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implemen .add(a() // .on(EventType.click, e -> toggleRightPanel()) // .title(CSTS.toggleRightPanel()) // - .add(Icons.ALL.menu_open_mdi().clickable())))) // - .appendChild(DominoElement.of(li() // - .css(Styles.pull_right) // - .add(a() // - .title(MSGS.account("TOTO", "TODO")) // - .add(Icons.SOCIAL_ICONS.person().clickable()))) // - .showOn(ScreenMedia.MEDIUM_AND_UP) // - .hideOn(ScreenMedia.SMALL_AND_DOWN) // - .setDropMenu(userDropMenu)) // - .appendChild(DominoElement.of(li() // - .css(Styles.pull_right) // - .add(a()// - .title(CSTS.agroclimApps()) // - .add(Icons.ALL.apps().clickable()))) // - .showOn(ScreenMedia.MEDIUM_AND_UP) // - .hideOn(ScreenMedia.SMALL_AND_DOWN) // - .setDropMenu(new AgroclimAppsMenu())) // - .appendChild(DominoElement.of(li() // - .css(Styles.pull_right).add(a() // - .add(Icons.ALL.dots_vertical_mdi().clickable()))) - .showOn(ScreenMedia.SMALL_AND_DOWN) // - .hideOn(ScreenMedia.MEDIUM_AND_UP) // - .setDropMenu(dotDropMenu)); - } - - private void initUserDropMenu() { - GWT.log("LayoutView.initUserDropMenu()"); - addMenuItem(userDropMenu, CSTS.userProfile(), Icons.ALL.settings_mdi(), () -> GWT.log("not implemented")); - addMenuItem(userDropMenu, CSTS.logout(), Icons.ALL.exit_to_app_mdi(), () -> getPresenter().logout()); - addMenuItem(dotDropMenu, CSTS.userProfile(), Icons.ALL.settings_mdi(), () -> GWT.log("not implemented")); - addMenuItem(dotDropMenu, CSTS.logout(), Icons.ALL.exit_to_app_mdi(), () -> getPresenter().logout()); + .add(Icons.ALL.menu_open_mdi().clickable())))); } /** @@ -469,14 +437,38 @@ public final class LayoutView extends AbstractBaseView<LayoutPresenter> implemen @Override public void setDevMode(final boolean isDevMode) { if (isDevMode) { - addMenuItem(userDropMenu, "Démo rapport", Icons.ALL.email_box_mdi(), + layout.getTopBar()// + .appendChild(DominoElement.of(li() // + .css(Styles.pull_right) // + .add(a() // + .title("Dev") // + .add(Icons.ALL.settings_applications().clickable()))) // + .showOn(ScreenMedia.MEDIUM_AND_UP) // + .hideOn(ScreenMedia.SMALL_AND_DOWN) // + .setDropMenu(devDropMenu)) // + .appendChild(DominoElement.of(li() // + .css(Styles.pull_right) // + .add(a()// + .title(CSTS.agroclimApps()) // + .add(Icons.ALL.apps().clickable()))) // + .showOn(ScreenMedia.MEDIUM_AND_UP) // + .hideOn(ScreenMedia.SMALL_AND_DOWN) // + .setDropMenu(new AgroclimAppsMenu())) // + .appendChild(DominoElement.of(li() // + .css(Styles.pull_right).add(a() // + .add(Icons.ALL.dots_vertical_mdi().clickable()))) + .showOn(ScreenMedia.SMALL_AND_DOWN) // + .hideOn(ScreenMedia.MEDIUM_AND_UP) // + .setDropMenu(dotDropMenu)); + + addMenuItem(devDropMenu, "Démo rapport", Icons.ALL.email_box_mdi(), "https://www.agrometinfo.fr/demo_rapport/"); final String compileUrl = "javascript:%7B%20window.__gwt_bookmarklet_params%20%3D%20%7Bserver_url%3A'" + "http%3A%2F%2F127.0.0.1%3A9876%2F'%2Cmodule_name%3A'app'%7D%3B%20var%20s%20%3D%20" + "document.createElement('script')%3B%20s.src%20%3D%20'http%3A%2F%2F127.0.0.1%3A9876%2F" + "dev_mode_on.js'%3B%20void(document.getElementsByTagName('head')%5B0%5D." + "appendChild(s))%3B%7D"; - addMenuItem(userDropMenu, "Compile", Icons.ALL.code_parentheses_box_mdi(), compileUrl); + addMenuItem(devDropMenu, "Compile", Icons.ALL.code_parentheses_box_mdi(), compileUrl); addMenuItem(dotDropMenu, "Compile", Icons.ALL.code_parentheses_box_mdi(), compileUrl); } } diff --git a/www-client/src/main/java/fr/agrometinfo/www/client/view/LoginView.java b/www-client/src/main/java/fr/agrometinfo/www/client/view/LoginView.java deleted file mode 100644 index 31e0b9ddc20e8d36b4091414d483279d8c9e4c54..0000000000000000000000000000000000000000 --- a/www-client/src/main/java/fr/agrometinfo/www/client/view/LoginView.java +++ /dev/null @@ -1,130 +0,0 @@ -package fr.agrometinfo.www.client.view; - -import static org.jboss.elemento.Elements.a; -import static org.jboss.elemento.Elements.div; -import static org.jboss.elemento.Elements.p; -import static org.jboss.elemento.Elements.span; - -import java.util.List; -import java.util.Map.Entry; - -import org.dominokit.domino.ui.forms.Select; -import org.dominokit.domino.ui.grid.Column; -import org.dominokit.domino.ui.grid.Row; -import org.dominokit.domino.ui.lists.ListGroup; -import org.dominokit.domino.ui.modals.ModalDialog; -import org.dominokit.domino.ui.style.Styles; -import org.dominokit.domino.ui.utils.TextNode; -import org.gwtproject.i18n.shared.cldr.LocaleInfo; -import org.jboss.elemento.Elements; - -import com.google.gwt.core.client.GWT; - -import elemental2.dom.DomGlobal; -import fr.agrometinfo.www.client.i18n.AppConstants; -import fr.agrometinfo.www.client.presenter.LoginPresenter; -import fr.agrometinfo.www.client.ui.DominoSelectBuilder; -import fr.agrometinfo.www.client.util.ApplicationUtils; -import fr.agrometinfo.www.shared.dto.IdentityProviderDTO; - -/** - * View to login the user. - * - * @author Olivier Maury - */ -public final class LoginView extends AbstractBaseView<LoginPresenter> implements LoginPresenter.View { - - /** - * Size for {@link Elements#h(int)}. - */ - private static final int H3 = 3; - - /** - * Size for {@link Elements#h(int)}. - */ - private static final int H1 = 1; - - /** - * I18N constants. - */ - private static final AppConstants CSTS = GWT.create(AppConstants.class); - - /** - * Logo for AgroMetInfo. - */ - private static final String LOGO_AGROMETINFO = "app/img/logo_etat-agrometinfo.svg"; - - /** - * The modal used to display the login form. - */ - private ModalDialog modal; - /** - * To display IdP. - */ - private final ListGroup<IdentityProviderDTO> selectListGroup = ListGroup.create(); - - @Override - public void close() { - modal.close(); - } - - @Override - public void init() { - selectListGroup.setItemRenderer((listGroup, item) -> { - item.setSelectable(true) - .appendChild( - div().css("idp") - .add(Elements.img(item.getValue().getLogoUrl())) - .add(span().textContent(item.getValue().getName())) - ) - .onSelectionChange((i, selected) -> getPresenter().login(i.getValue())); - }); - - final String currentLocaleName = LocaleInfo.getCurrentLocale().getLocaleName(); - Entry<String, String> currentLocale = null; - for (final Entry<String, String> entry : ApplicationUtils.getAvailableLocales().entrySet()) { - final String tag = entry.getKey(); - if (tag.equals(currentLocaleName)) { - currentLocale = entry; - } - } - final Select<Entry<String, String>> localeSelect = new DominoSelectBuilder<Entry<String, String>>() // - .setTextFunction(Entry::getValue) // - .setValueFunction(Entry::getKey) // - .addOptions(ApplicationUtils.getAvailableLocales().entrySet()) // - .select(currentLocale) // - .addValueChangeHandler(l -> DomGlobal.window.open("?locale=" + l, "self")) // - .build() // - .setSearchable(false); - modal = ModalDialog.create() // - .large() // - .setAutoClose(false) // - .appendChild(// - Row.create() // - .appendChild(Column.span10()) // - .appendChild(Column.span2() // - .appendChild(localeSelect))) // - .appendChild(p().css(Styles.LEAD).textContent(CSTS.agrometinfoIntro())) // - .appendChild(p().css(Styles.LEAD).textContent(CSTS.whyConnectionIsRequired())) // - .appendChild(Row.create() - .appendChild( - Column.span6() - .condense() - .appendChild(Elements.img(LOGO_AGROMETINFO).css(Styles.img_responsive))) - .appendChild( - Column.span6() - .condense() - .appendChild(Elements.h(H1).textContent(CSTS.login())) - .appendChild(Elements.h(H3).textContent(CSTS.loginOrSignIn())) - .appendChild(selectListGroup))) // - .appendChild(TextNode.of(CSTS.acceptEULA() + " ")) // - .appendChild(a(".").textContent(CSTS.seePrivacyPolicy())) // - .open(); - } - - @Override - public void setIdentityProviders(final List<IdentityProviderDTO> list) { - selectListGroup.setItems(list); - } - -} diff --git a/www-client/src/main/resources/fr/agrometinfo/www/client/i18n/AppConstants_fr.properties b/www-client/src/main/resources/fr/agrometinfo/www/client/i18n/AppConstants_fr.properties index a027dbb4eb1dd4066645a0da69282bb2cc65acdb..2eb03d278f1432210f9bc9d3ab7ab247df569968 100644 --- a/www-client/src/main/resources/fr/agrometinfo/www/client/i18n/AppConstants_fr.properties +++ b/www-client/src/main/resources/fr/agrometinfo/www/client/i18n/AppConstants_fr.properties @@ -1,7 +1,5 @@ # Ce fichier est encodé en UTF-8. about = À propos -acceptEULA = En vous connectant, vous acceptez les conditions d’utilisation et la politique de confidentialité de AgroMetInfo. -agrometinfoIntro = AgroMetInfo met à disposition des indicateurs agroclimatiques et des indicateurs de suivi de culture d'hiver (culture type blé tendre) et de printemps (culture type maïs) actualisés quotidiennement sous forme de cartes et de graphiques. agroclimApps = Les applications d’AgroClim applicationLoading = Chargement de l’application… averageMonthlyValues = Valeurs moyennes mensuelles @@ -27,9 +25,6 @@ failureBody = Corps : failureHeaders = Entêtes HTTP : failureStatusText = Texte d’état HTTP : invalidEmailAddress = Adresse courriel invalide -login = Se connecter -loginOrSignIn = ou s’inscrire avec -logout = Se déconnecter metropolitanFrance = France métropolitaine monthlyValues = Valeurs mensuelles no= Non @@ -39,6 +34,4 @@ otherAgroclimApps = Autres services et outils d’AgroClim requiredErrorMessage = * Ce champ est obligatoire. seePrivacyPolicy = Consultez le paragraphe « Données personnelles » dans les mentions légales. toggleRightPanel = Afficher / masquer le panneau de droite -userProfile = Compte et paramètres -whyConnectionIsRequired = Vous devez vous identifier pour accéder à AgroMetInfo en raison des accords avec Météo-France relatifs aux échanges de données SAFRAN avec AgroClim. yes= Oui diff --git a/www-client/src/main/resources/fr/agrometinfo/www/client/i18n/AppMessages_fr.properties b/www-client/src/main/resources/fr/agrometinfo/www/client/i18n/AppMessages_fr.properties index 9fdfc3c10021c28177d708f7619b4f37a0e5f91c..d68e9dc8d1963270ed2e43d74836e1283ce014a5 100644 --- a/www-client/src/main/resources/fr/agrometinfo/www/client/i18n/AppMessages_fr.properties +++ b/www-client/src/main/resources/fr/agrometinfo/www/client/i18n/AppMessages_fr.properties @@ -1,5 +1,4 @@ # Ce fichier est encodé en UTF-8. -account = Compte de {0} ({1}) averageValue = Valeur moyenne de l’indicateur {0} ({1}) en {2} sur {3} cell = Maille n°{0} chartSubtitle = {0,date,medium}. Unité : {1} diff --git a/www-client/src/main/resources/fr/agrometinfo/www/client/public/style.css b/www-client/src/main/resources/fr/agrometinfo/www/client/public/style.css index 51886973bff09a59ce3417246efdbde49ed4776c..5e9dc11e4bad0e110921ee7cd186c2b58f8db766 100644 --- a/www-client/src/main/resources/fr/agrometinfo/www/client/public/style.css +++ b/www-client/src/main/resources/fr/agrometinfo/www/client/public/style.css @@ -122,15 +122,6 @@ select { .float-right { float: right; } -div.idp { - padding: 0.5em; -} -.idp img { - padding-right: 1em; -} -.idp span { - font-weight: bold; -} .indicator-categories > i { font-size: 40px; padding-left: 5px; diff --git a/www-shared/src/main/java/fr/agrometinfo/www/shared/dto/IdentityProviderDTO.java b/www-shared/src/main/java/fr/agrometinfo/www/shared/dto/IdentityProviderDTO.java deleted file mode 100644 index 61a7fcf04aba6f8d8034298defd40c75857c42e2..0000000000000000000000000000000000000000 --- a/www-shared/src/main/java/fr/agrometinfo/www/shared/dto/IdentityProviderDTO.java +++ /dev/null @@ -1,66 +0,0 @@ -package fr.agrometinfo.www.shared.dto; - -/** - * Identity provider. - * - * @author Olivier Maury - */ -public final class IdentityProviderDTO implements HasId, HasName { - /** - * ID. - */ - private Integer id; - /** - * URL of logo to display to the user. - */ - private String logoUrl; - /** - * Name, shown to the user. - */ - private String name; - - @Override - public Integer getId() { - return id; - } - - /** - * @return URL of logo to display to the user. - */ - public String getLogoUrl() { - return logoUrl; - } - - /** - * @return Name, shown to the user. - */ - @Override - public String getName() { - return name; - } - - @Override - public void setId(final Integer value) { - this.id = value; - } - - /** - * @param value URL of logo to display to the user. - */ - public void setLogoUrl(final String value) { - this.logoUrl = value; - } - - /** - * @param value Name, shown to the user. - */ - @Override - public void setName(final String value) { - this.name = value; - } - - @Override - public String toString() { - return "IdentityProviderDTO{" + "id=" + id + ", name=" + name + ", logoUrl=" + logoUrl + '}'; - } -}