diff --git a/cross-device-showcase/pom.xml b/cross-device-showcase/pom.xml index 51915a7..128873d 100644 --- a/cross-device-showcase/pom.xml +++ b/cross-device-showcase/pom.xml @@ -10,7 +10,6 @@ UTF-8 - 5.5-SNAPSHOT 1.7 1.7 5.5-SNAPSHOT diff --git a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/carousel/Car.java b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/carousel/Car.java index bc59cb0..8ed0ffe 100644 --- a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/carousel/Car.java +++ b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/carousel/Car.java @@ -5,8 +5,7 @@ @DataObject("carCarousel") public class Car { - private static int idCounter = 0; - private int id; + private Integer id; private String brand; private String source; private int year; @@ -15,9 +14,9 @@ public Car() { } - public Car(String brand, String source, int year) + public Car(Integer id, String brand, String source, int year) { - this.id = idCounter++; + this.id = id; this.source = source; this.brand = brand; this.year = year; @@ -53,12 +52,12 @@ public void setYear(int year) this.year = year; } - public int getId() + public Integer getId() { return id; } - public void setId(int id) + public void setId(Integer id) { this.id = id; } diff --git a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/carousel/CarouselController.java b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/carousel/CarouselController.java index f4c0d02..0b46914 100644 --- a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/carousel/CarouselController.java +++ b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/carousel/CarouselController.java @@ -13,21 +13,20 @@ public class CarouselController public void onLoadData(EagerLoadEvent event) { ArrayList cars = new ArrayList(); - cars.add(new Car("Audi", "Germany", 1909)); - cars.add(new Car("BMW", "Germany", 1916)); - cars.add(new Car("Chevrolet", "EUA", 1911)); - cars.add(new Car("Ford", "EUA", 1919)); - cars.add(new Car("GMC", "EUA", 1908)); - cars.add(new Car("Honda Cars", "Japan", 1948)); - cars.add(new Car("Hyundai", "South Korea", 1967)); - cars.add(new Car("Mercedes", "Germany", 1926)); - cars.add(new Car("Peterbilt", "EUA", 1939)); - cars.add(new Car("Scania", "Sweden", 1891)); - cars.add(new Car("Volkswagen", "Germany", 1937)); - cars.add(new Car("Volvo", "Sweden", 1927)); - cars.add(new Car("Yamaha", "Japan", 1955)); - cars.add(new Car("Honda", "Japan", 1948)); - cars.add(new Car("Mitsubishi", "Japan", 1970)); + cars.add(new Car(0, "Audi", "Germany", 1909)); + cars.add(new Car(1, "BMW", "Germany", 1916)); + cars.add(new Car(2, "Chevrolet", "EUA", 1911)); + cars.add(new Car(3, "Ford", "EUA", 1919)); + cars.add(new Car(4, "GMC", "EUA", 1908)); + cars.add(new Car(5, "Honda Cars", "Japan", 1948)); + cars.add(new Car(6, "Hyundai", "South Korea", 1967)); + cars.add(new Car(7, "Mercedes", "Germany", 1926)); + cars.add(new Car(8, "Mitsubishi", "Japan", 1970)); + cars.add(new Car(9, "Peterbilt", "EUA", 1939)); + cars.add(new Car(10, "Scania", "Sweden", 1891)); + cars.add(new Car(11, "Volkswagen", "Germany", 1937)); + cars.add(new Car(12, "Volvo", "Sweden", 1927)); + cars.add(new Car(13, "Yamaha", "Japan", 1955)); event.getSource().setData(cars); } diff --git a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/combobox/ComboBoxController.java b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/combobox/ComboBoxController.java index 7b65acf..860c59e 100644 --- a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/combobox/ComboBoxController.java +++ b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/combobox/ComboBoxController.java @@ -20,23 +20,24 @@ public class ComboBoxController public void onLoadData(EagerLoadEvent event) { ArrayList countries = new ArrayList(); - countries.add(new Country("Algeria", "Argel")); - countries.add(new Country("Argentina", "Buenos Aires")); - countries.add(new Country("Australia", "Camberra")); - countries.add(new Country("Brazil", "Brasília")); - countries.add(new Country("Canada", "Ottawa")); - countries.add(new Country("Chile", "Santiago")); - countries.add(new Country("China", "Pequim")); - countries.add(new Country("CostaRica", "San José")); - countries.add(new Country("France", "Paris")); - countries.add(new Country("Germany", "Berlim")); - countries.add(new Country("Italy", "Roma")); - countries.add(new Country("Japan", "Tóquio")); - countries.add(new Country("Mexico", "México")); - countries.add(new Country("Morocco", "Rabat")); - countries.add(new Country("South Africa", "Pretória, Cabo, Bloemfontein")); - countries.add(new Country("South Korea", "Seul")); - countries.add(new Country("USA", "Washington, D.C.")); + countries.add(new Country(0, "Algeria", "Argel")); + countries.add(new Country(1, "Argentina", "Buenos Aires")); + countries.add(new Country(2, "Australia", "Camberra")); + countries.add(new Country(3, "Brazil", "Brasília")); + countries.add(new Country(4, "Canada", "Ottawa")); + countries.add(new Country(5, "Chile", "Santiago")); + countries.add(new Country(6, "China", "Pequim")); + countries.add(new Country(7, "CostaRica", "San José")); + countries.add(new Country(8, "France", "Paris")); + countries.add(new Country(9, "Germany", "Berlim")); + countries.add(new Country(10, "Italy", "Roma")); + countries.add(new Country(11, "Japan", "Tóquio")); + countries.add(new Country(12, "Mexico", "México")); + countries.add(new Country(13, "Morocco", "Rabat")); + countries.add(new Country(14, "South Africa", "Pretória, Cabo, Bloemfontein")); + countries.add(new Country(15, "South Korea", "Seul")); + countries.add(new Country(16, "Spain", "Madri")); + countries.add(new Country(17, "USA", "Washington, D.C.")); event.getSource().setData(countries); } diff --git a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/combobox/Country.java b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/combobox/Country.java index 72b51ef..a488070 100644 --- a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/combobox/Country.java +++ b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/combobox/Country.java @@ -5,8 +5,7 @@ @DataObject("countryComboBox") public class Country { - private static int idCounter = 0; - private int id; + private Integer id; private String name; private String capital; @@ -14,9 +13,9 @@ public Country() { } - public Country(String name, String capital) + public Country(Integer id, String name, String capital) { - this.id = idCounter++; + this.id = id; this.name = name; this.capital = capital; } @@ -41,12 +40,12 @@ public void setCapital(String capital) this.capital = capital; } - public int getId() + public Integer getId() { return id; } - public void setId(int id) + public void setId(Integer id) { this.id = id; } diff --git a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/numbertextbox/NumberTextBoxController.java b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/numbertextbox/NumberTextBoxController.java index c48234e..7828a7a 100644 --- a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/numbertextbox/NumberTextBoxController.java +++ b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/numbertextbox/NumberTextBoxController.java @@ -6,7 +6,6 @@ import org.cruxframework.crux.core.client.screen.views.BindView; import org.cruxframework.crux.core.client.screen.views.WidgetAccessor; import org.cruxframework.crux.smartfaces.client.input.NumberBox; -import org.cruxframework.crux.widgets.client.storyboard.Storyboard; import com.google.gwt.user.client.ui.RadioButton; @@ -53,7 +52,6 @@ else if(myWidgetAccessor.radioButton0999().getValue()) @BindView("numberTextBox") public static interface MyWidgetAccessor extends WidgetAccessor { - Storyboard radios(); NumberBox boxNumber(); RadioButton radioButton09(); diff --git a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/rest/RestController.java b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/rest/RestController.java index 3717b52..2bcbc72 100644 --- a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/rest/RestController.java +++ b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/rest/RestController.java @@ -67,7 +67,14 @@ public void onDataSelection(DataSelectionEvent event) @Override public void onComplete(PersonDTO result) { - View.of(RestController.this).write(result); + if(result == null) + { + MessageBox.show(messages.thisIsASample(), MessageType.INFO); + } + else + { + View.of(RestController.this).write(result); + } } }); } diff --git a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/rest/RestMessages.java b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/rest/RestMessages.java index bef995c..6c55dcb 100644 --- a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/rest/RestMessages.java +++ b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/rest/RestMessages.java @@ -39,4 +39,7 @@ public interface RestMessages extends Messages @DefaultMessage("Por favor, selecione uma pessoa para continuar.") String selectPerson(); + + @DefaultMessage("Este é um exemplo. Não existem dados reais salvos no servidor.") + String thisIsASample(); } diff --git a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/rollingpanel/RollingPanelController.java b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/rollingpanel/RollingPanelController.java deleted file mode 100644 index 015e732..0000000 --- a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/rollingpanel/RollingPanelController.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.cruxframework.crossdeviceshowcase.client.controller.samples.rollingpanel; - -import org.cruxframework.crossdeviceshowcase.client.resource.common.ShowcaseSamplesResourcesCommon; -import org.cruxframework.crux.core.client.controller.Controller; -import org.cruxframework.crux.core.client.controller.Expose; -import org.cruxframework.crux.core.client.ioc.Inject; -import org.cruxframework.crux.core.client.screen.views.BindView; -import org.cruxframework.crux.core.client.screen.views.WidgetAccessor; -import org.cruxframework.crux.smartfaces.client.rollingpanel.RollingPanel; - -import com.google.gwt.user.client.ui.FlowPanel; - -@Controller("rollingPanelController") -public class RollingPanelController -{ - @Inject - private MyWidgetAccessor myWidgetAccessor; - - @Inject - private ShowcaseSamplesResourcesCommon resources; - - /** Calls methods at rollingPanel view on Load moment. */ - @Expose - public void onLoad() - { - loadSaleItems(); - } - - /*Insert list components created to Sport Store*/ - private void loadSaleItems() - { - myWidgetAccessor.rollingPanelCustomizedWidget().add(new SaleItem("Football Boots", "$89,99", resources.footballboots())); - myWidgetAccessor.rollingPanelCustomizedWidget().add(new SaleItem("Pink Ball", "$12,99", resources.pinkball())); - myWidgetAccessor.rollingPanelCustomizedWidget().add(new SaleItem("Basketball shoes ", "$149,99", resources.basketballshoes())); - myWidgetAccessor.rollingPanelCustomizedWidget().add(new SaleItem("Back Pack", "$99,99", resources.backpack())); - myWidgetAccessor.rollingPanelCustomizedWidget().add(new SaleItem("Swim Shorts", "$59,99", resources.swimshorts())); - myWidgetAccessor.rollingPanelCustomizedWidget().add(new SaleItem("Baseball Bats", "$112,99", resources.baseballbats())); - myWidgetAccessor.rollingPanelCustomizedWidget().add(new SaleItem("Boxing Gloves", "$49,99", resources.gloves())); - } - - /** - * Interface that allows to access the widgets of the "rollingPanel" view. - */ - @BindView("rollingPanel") - public static interface MyWidgetAccessor extends WidgetAccessor - { - FlowPanel innerPanel(); - RollingPanel rollingPanelCustomizedWidget(); - } - - public void setMyWidgetAccessor(MyWidgetAccessor myWidgetAccessor) - { - this.myWidgetAccessor = myWidgetAccessor; - } - - public void setResources(ShowcaseSamplesResourcesCommon resources) - { - this.resources = resources; - } -} diff --git a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/rollingpanel/SaleItem.java b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/rollingpanel/SaleItem.java deleted file mode 100644 index 2987511..0000000 --- a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/rollingpanel/SaleItem.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.cruxframework.crossdeviceshowcase.client.controller.samples.rollingpanel; - -import org.cruxframework.crux.smartfaces.client.image.Image; -import org.cruxframework.crux.smartfaces.client.label.Label; - -import com.google.gwt.resources.client.ImageResource; -import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.FlowPanel; - -public class SaleItem extends Composite{ - - static final String DEFAULT_STYLE_NAME = "saleItem"; - private FlowPanel wrapper = new FlowPanel(); - private Label labelText = new Label(); - private Label labelPrice = new Label(); - - public SaleItem(final String text, String price, ImageResource imageResource) - { - labelText.setText(text); - labelPrice.setText(price); - labelPrice.addStyleName("label-price"); - wrapper.addStyleName("saleItem-wrapper-panel"); - wrapper.add(labelText); - wrapper.add(new Image(imageResource)); - wrapper.add(labelPrice); - initWidget(wrapper); - setStyleName(DEFAULT_STYLE_NAME, true); - } -} diff --git a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/swappanel/SwapPanelController.java b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/swappanel/SwapPanelController.java index 0d1d559..01a18f4 100644 --- a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/swappanel/SwapPanelController.java +++ b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/swappanel/SwapPanelController.java @@ -16,7 +16,7 @@ import org.cruxframework.crux.smartfaces.client.swappanel.SwapPanel; import org.cruxframework.crux.widgets.client.deviceadaptivegrid.DeviceAdaptiveGrid; import org.cruxframework.crux.widgets.client.formdisplay.FormDisplay; -import org.cruxframework.crux.widgets.client.image.Image; +import org.cruxframework.crux.widgets.client.styledpanel.StyledPanel; import com.google.gwt.user.client.ui.ListBox; @@ -49,7 +49,8 @@ public void swapPanel() { switch (status) { case 0: - myWidgetAccessor.swapPanel().transitTo(new Image(showcaseResourcesCommon.crux()), chooseAnimation()); + myWidgetAccessor.messagePanel().setVisible(true); + myWidgetAccessor.swapPanel().transitTo(myWidgetAccessor.messagePanel(), chooseAnimation()); status = 1; break; case 1: @@ -139,6 +140,7 @@ public void showMessage() public static interface MyWidgetAccessor extends WidgetAccessor { DeviceAdaptiveGrid grid(); + StyledPanel messagePanel(); FormDisplay form(); ListBox listAnimation(); SwapPanel swapPanel(); diff --git a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/swapviewcontainer/SwapViewContainerController.java b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/swapviewcontainer/SwapViewContainerController.java index 80b3ed7..d5948a4 100644 --- a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/swapviewcontainer/SwapViewContainerController.java +++ b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/swapviewcontainer/SwapViewContainerController.java @@ -60,7 +60,7 @@ private void setState1() myWidgetAccessor.viewContainer().setAnimationBackward(chooseAnimation()); myWidgetAccessor.viewContainer().showView("swapView1"); myWidgetAccessor.backButton().setVisible(false); - myWidgetAccessor.buyButton().setText("Buy Now"); + myWidgetAccessor.buyButton().setText("Next"); count = 1; } @@ -69,7 +69,7 @@ private void setState2() myWidgetAccessor.viewContainer().setAnimationBackward(chooseAnimation()); myWidgetAccessor.viewContainer().showView("swapView2"); myWidgetAccessor.backButton().setVisible(true); - myWidgetAccessor.buyButton().setText("Checkout"); + myWidgetAccessor.buyButton().setText("Last"); count = 2; } diff --git a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/tabpanel/TabPanelController.java b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/tabpanel/TabPanelController.java index 092917b..ea74210 100644 --- a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/tabpanel/TabPanelController.java +++ b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/tabpanel/TabPanelController.java @@ -7,7 +7,7 @@ import org.cruxframework.crux.core.client.screen.views.WidgetAccessor; import org.cruxframework.crux.smartfaces.client.dialog.MessageBox; import org.cruxframework.crux.smartfaces.client.dialog.MessageBox.MessageType; -import org.cruxframework.crux.widgets.client.rollingtabs.RollingTabPanel; +import org.cruxframework.crux.smartfaces.client.tab.TabPanel; @Controller("tabPanelController") public class TabPanelController @@ -18,6 +18,12 @@ public class TabPanelController @Inject private TabPanelMessages messages; + @Expose + public void onLoad() + { + myWidgetAccessor.tabPanel().selectTab(0); + } + @Expose public void onClickButton() { @@ -39,7 +45,7 @@ public void onClickTab3() @BindView("tabPanel") public interface MyWidgetAccessor extends WidgetAccessor { - RollingTabPanel rollingTabPanel(); + TabPanel tabPanel(); } public void setMyWidgetAccessor(MyWidgetAccessor myWidgetAccessor) diff --git a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/widgetlist/Car.java b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/widgetlist/Car.java index cca169e..3f86aa7 100644 --- a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/widgetlist/Car.java +++ b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/widgetlist/Car.java @@ -5,8 +5,7 @@ @DataObject("carWidgetList") public class Car { - private static int idCounter = 0; - private int id; + private Integer id; private String brand; private String source; private int year; @@ -15,9 +14,9 @@ public Car() { } - public Car(String brand, String source, int year) + public Car(Integer id, String brand, String source, int year) { - this.id = idCounter++; + this.id = id; this.source = source; this.brand = brand; this.year = year; @@ -53,12 +52,12 @@ public void setYear(int year) this.year = year; } - public int getId() + public Integer getId() { return id; } - public void setId(int id) + public void setId(Integer id) { this.id = id; } diff --git a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/widgetlist/WidgetListController.java b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/widgetlist/WidgetListController.java index 5d6c447..39e9e8c 100644 --- a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/widgetlist/WidgetListController.java +++ b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/controller/samples/widgetlist/WidgetListController.java @@ -2,6 +2,7 @@ import java.util.ArrayList; +import org.cruxframework.crossdeviceshowcase.client.controller.samples.widgetlist.Car; import org.cruxframework.crux.core.client.controller.Controller; import org.cruxframework.crux.core.client.controller.Expose; import org.cruxframework.crux.core.client.dataprovider.EagerLoadEvent; @@ -13,21 +14,20 @@ public class WidgetListController public void onLoadData(EagerLoadEvent event) { ArrayList cars = new ArrayList(); - cars.add(new Car("Audi", "Germany", 1909)); - cars.add(new Car("BMW", "Germany", 1916)); - cars.add(new Car("Chevrolet", "EUA", 1911)); - cars.add(new Car("Ford", "EUA", 1919)); - cars.add(new Car("GMC", "EUA", 1908)); - cars.add(new Car("Honda Cars", "Japan", 1948)); - cars.add(new Car("Hyundai", "South Korea", 1967)); - cars.add(new Car("Mercedes", "Germany", 1926)); - cars.add(new Car("Peterbilt", "EUA", 1939)); - cars.add(new Car("Scania", "Sweden", 1891)); - cars.add(new Car("Volkswagen", "Germany", 1937)); - cars.add(new Car("Volvo", "Sweden", 1927)); - cars.add(new Car("Yamaha", "Japan", 1955)); - cars.add(new Car("Honda", "Japan", 1948)); - cars.add(new Car("Mitsubishi", "Japan", 1970)); + cars.add(new Car(0, "Audi", "Germany", 1909)); + cars.add(new Car(1, "BMW", "Germany", 1916)); + cars.add(new Car(2, "Chevrolet", "EUA", 1911)); + cars.add(new Car(3, "Ford", "EUA", 1919)); + cars.add(new Car(4, "GMC", "EUA", 1908)); + cars.add(new Car(5, "Honda Cars", "Japan", 1948)); + cars.add(new Car(6, "Hyundai", "South Korea", 1967)); + cars.add(new Car(7, "Mercedes", "Germany", 1926)); + cars.add(new Car(8, "Mitsubishi", "Japan", 1970)); + cars.add(new Car(9, "Peterbilt", "EUA", 1939)); + cars.add(new Car(10, "Scania", "Sweden", 1891)); + cars.add(new Car(11, "Volkswagen", "Germany", 1937)); + cars.add(new Car(12, "Volvo", "Sweden", 1927)); + cars.add(new Car(13, "Yamaha", "Japan", 1955)); event.getSource().setData(cars); } diff --git a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/util/messages/DescriptionMessages_en_US.properties b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/util/messages/DescriptionMessages_en_US.properties index 91fcb83..7a62efb 100644 --- a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/util/messages/DescriptionMessages_en_US.properties +++ b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/util/messages/DescriptionMessages_en_US.properties @@ -13,7 +13,7 @@ downloadButtonDescription =

The Download Button widget allows saving files on pagersDescription =

The pagers are elements that interact with the Data Provider. Through them, we can move forward or backward pages. There are 2 main types of data providers: the first one is when we need to go on the server to retrieve new data on every page change. And the other one is considers the data page have been previously brought by the server. In both cases, there are 5 types of pagers that we can use:

  • Sequential Pager : Pager unaware that the data size and consists of forward and back buttons;
  • Bullets Pager : Pager who knows the size of the data, represents the pages as bullets;
  • Predictive Pager : Pager who knows the size of the data, represents the pages in a list box and has forward and back buttons;
  • Pager Swap : Pager that ignores the size of the data, allows the transition of the pages through animations;
  • Scrollable Pager : Pager who does not know the data size, and lets you bring new data when the scroll event happens.
-breadcrumbDescription =

The Breadcrumb component allows you to build a state between it's transitions. It controls a container of views and the page history. Thus, when changing between their states, the page history will be changed together with the current view. In addition, it works as a stack where we can determine and control the user steps.

+breadcrumbDescription =

The Breadcrumb component allows you to build a state between its transitions. It controls a container of views and the page history. Thus, when changing between their states, the page history will be changed together with the current view. In addition, it works as a stack where we can determine and control the user steps.

dateBoxDescription =

The DateBox component allows you to select dates to be assigned for a textBox. It uses the DatePicker component.

diff --git a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/util/messages/ShowcaseMessages.java b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/util/messages/ShowcaseMessages.java index c8e4fda..41588cc 100644 --- a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/util/messages/ShowcaseMessages.java +++ b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/util/messages/ShowcaseMessages.java @@ -74,4 +74,7 @@ public interface ShowcaseMessages extends Messages @DefaultMessage("Carregando") String loading(); + + @DefaultMessage("Buscar...") + String searchHere(); } diff --git a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/util/messages/ShowcaseMessages_en_US.properties b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/util/messages/ShowcaseMessages_en_US.properties index 61e8b59..2e20f36 100644 --- a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/util/messages/ShowcaseMessages_en_US.properties +++ b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/client/util/messages/ShowcaseMessages_en_US.properties @@ -41,4 +41,5 @@ logicalFeatures = Logical Features databaseNotSupportedError = Error, database not supported. loading = Loading - \ No newline at end of file + +searchHere = Search... \ No newline at end of file diff --git a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/server/service/samples/rest/PersonRestService.java b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/server/service/samples/rest/PersonRestService.java index 758f00e..f172208 100644 --- a/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/server/service/samples/rest/PersonRestService.java +++ b/cross-device-showcase/src/main/java/org/cruxframework/crossdeviceshowcase/server/service/samples/rest/PersonRestService.java @@ -16,9 +16,8 @@ @Path("/person") public class PersonRestService { - private static final int MAX_PERSON_TO_SAVE = 100; + private static ArrayList people = new ArrayList(); private static Random random = new Random(); - private static ArrayList persons = new ArrayList(); static { @@ -27,74 +26,41 @@ public class PersonRestService private static void mockMapFill() { - persons = new ArrayList(); - persons.add(new PersonDTO(random.nextInt(), "John", "Nash")); - persons.add(new PersonDTO(random.nextInt(), "Paul", "McCartney")); - persons.add(new PersonDTO(random.nextInt(), "Ravi", "Shankar")); + people = new ArrayList(); + people.add(new PersonDTO(random.nextInt(), "John", "Nash")); + people.add(new PersonDTO(random.nextInt(), "Paul", "McCartney")); + people.add(new PersonDTO(random.nextInt(), "Ravi", "Shankar")); } @DELETE @Path("{id}") public void remove(@PathParam("id") Integer id) { - if(persons != null) - { - PersonDTO personToRemove = null; - for(PersonDTO person : persons) - { - if(person.getId() != null && person.getId().equals(id)) - { - personToRemove = person; - } - } - - if(personToRemove != null) - { - persons.remove(personToRemove); - } - } + //code your remove person method } @POST @Path("add") public Integer save(PersonDTO person) { - int id = random.nextInt(); - person.setId(id); - addPerson(person); - return id; + //code your save person method + return random.nextInt(); } @PUT @Path("update/{id}") public void update(@PathParam("id") Integer id, PersonDTO personToSave) { - if(persons != null) - { - PersonDTO personToRemove = null; - for(PersonDTO person : persons) - { - if(person.getId() != null && person.getId().equals(id)) - { - personToRemove = person; - } - } - - if(personToRemove != null) - { - persons.remove(personToRemove); - addPerson(personToSave); - } - } + //code your update person method } @GET @Path("{id}") public PersonDTO get(@PathParam("id") Integer id) { - if(persons != null) + if(people != null) { - for(PersonDTO person : persons) + for(PersonDTO person : people) { if(person.getId() != null && person.getId().equals(id)) { @@ -109,15 +75,6 @@ public PersonDTO get(@PathParam("id") Integer id) @Path("all") public ArrayList search() { - return persons; - } - - private static void addPerson(PersonDTO person) - { - if(persons == null || persons.size() > MAX_PERSON_TO_SAVE) - { - persons = new ArrayList(); - } - persons.add(person); + return people; } } \ No newline at end of file diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/CrossDeviceShowcase.gwt.xml b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/CrossDeviceShowcase.gwt.xml index 58bb3bf..9a82d80 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/CrossDeviceShowcase.gwt.xml +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/CrossDeviceShowcase.gwt.xml @@ -4,26 +4,26 @@ - - - - - - + + + + + + - - - - - + + + + + - + - + diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/common/pagersCommon.css b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/common/pagersCommon.css index 3d1d899..12b0b5f 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/common/pagersCommon.css +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/common/pagersCommon.css @@ -1,16 +1,26 @@ @external * ; +.pagers +{ + text-align: center; +} + .dataProviderWrapper, .lazyDataProviderWrapper { display: inline-block; } .commonPagerWrapper, .swapPagerWrapper, .scrollablePagerWrapper { - float: left; - margin: 10px; - width: 30%; + margin: 10px auto; + width: 75%; min-width: 250px; } +.swapPagerWrapper .backPanel .faces-Button, +.swapPagerWrapper .nextPanel .faces-Button +{ + transform: inherit; +} + .dataProviderWrapper, .lazyDataProviderWrapper { width: 100%; } diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/common/swappanelCommon.css b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/common/swappanelCommon.css index b5f8907..072f781 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/common/swappanelCommon.css +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/common/swappanelCommon.css @@ -1 +1,8 @@ @external *; + +.baseWrapper.swapPanel .faces-SwapPanel +{ + height: 200px !important; + width: 80% !important; + text-align:center; +} \ No newline at end of file diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/common/swapviewcontainerCommon.css b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/common/swapviewcontainerCommon.css index d0456a1..12576ed 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/common/swapviewcontainerCommon.css +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/common/swapviewcontainerCommon.css @@ -1,5 +1 @@ @external * ; - -.faces-SwapViewContainer { - height: 640px !important; -} \ No newline at end of file diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/common/tabviewcontainerCommon.css b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/common/tabviewcontainerCommon.css index b5f8907..143c449 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/common/tabviewcontainerCommon.css +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/common/tabviewcontainerCommon.css @@ -1 +1 @@ -@external *; +@external *; \ No newline at end of file diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/large/selectablepanelLarge.css b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/large/selectablepanelLarge.css index 4ed25a0..b5f8907 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/large/selectablepanelLarge.css +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/large/selectablepanelLarge.css @@ -1,5 +1 @@ @external *; - -.selectablePanel { - line-height: 100px; -} \ No newline at end of file diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/large/swappanelLarge.css b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/large/swappanelLarge.css index e600fb4..8af84b6 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/large/swappanelLarge.css +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/large/swappanelLarge.css @@ -1,12 +1,5 @@ @external *; -.showcase-swapPanel -{ - width: 300px !important; - height: 280px !important; - text-align:center; -} - .swapPanel-input-size { width: 200px; diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/large/swapviewcontainerLarge.css b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/large/swapviewcontainerLarge.css index a6a87af..a130c05 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/large/swapviewcontainerLarge.css +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/large/swapviewcontainerLarge.css @@ -1,5 +1,10 @@ @external *; +.swapViewContainer .faces-SwapViewContainer +{ + height: 100px !important; +} + .showcase-swapViewContainer { width: 800px; diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/large/tabviewcontainerLarge.css b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/large/tabviewcontainerLarge.css index a742c4a..23598b1 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/large/tabviewcontainerLarge.css +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/large/tabviewcontainerLarge.css @@ -1,5 +1,11 @@ @external *; +.tabViewContainer +{ + height: 315px; + width: 600px; +} + .tabSimpleView1Title { text-align: center; @@ -16,8 +22,7 @@ vertical-align:middle !important; font-size: large; color:#1c5994; - line-height: 200%; - margin: 15%; + line-height: 100%; } .tabSimpleView1Background @@ -41,8 +46,7 @@ vertical-align:middle !important; font-size: large; color:#8B0000; - line-height: 200%; - margin: 15%; + line-height: 100%; } .tabSimpleView2Background diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/large/widgetlistLarge.css b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/large/widgetlistLarge.css index b5f8907..143c449 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/large/widgetlistLarge.css +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/large/widgetlistLarge.css @@ -1 +1 @@ -@external *; +@external *; \ No newline at end of file diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/small/sideMenuDisposalSmall.css b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/small/sideMenuDisposalSmall.css index 1abc876..7a2de97 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/small/sideMenuDisposalSmall.css +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/small/sideMenuDisposalSmall.css @@ -8,7 +8,7 @@ background-size: 100% !important; } -.baseWrapper +.baseWrapper.sideMenuDisposal { width: 100%; } \ No newline at end of file diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/small/swapviewcontainerSmall.css b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/small/swapviewcontainerSmall.css index 70e6b32..bda73f0 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/small/swapviewcontainerSmall.css +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/small/swapviewcontainerSmall.css @@ -6,6 +6,11 @@ height: 500px !important; } +.faces-SwapViewContainer +{ + height: 140px !important; +} + .swapView-image { width: 280px !important; diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/small/tabviewcontainerSmall.css b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/small/tabviewcontainerSmall.css index b5f8907..0fe0200 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/small/tabviewcontainerSmall.css +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/small/tabviewcontainerSmall.css @@ -1 +1,7 @@ @external *; + +.tabViewContainer +{ + height: 400px; + width: 300px; +} \ No newline at end of file diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/small/topmenudisposalSmall.css b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/small/topmenudisposalSmall.css index e66ec3e..243980e 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/small/topmenudisposalSmall.css +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/resource/small/topmenudisposalSmall.css @@ -12,7 +12,7 @@ background-size: 100% !important; } -.baseWrapper +.baseWrapper.topMenuDisposal { width: 100%; } \ No newline at end of file diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/index.crux.xml b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/index.crux.xml index 876d14a..6c5f0d7 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/index.crux.xml +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/index.crux.xml @@ -22,21 +22,18 @@ showcaseCoreResources, showcaseSamplesResources" height="100%" - onLoad="mainController.wellcome" + onLoad="mainController.onLoad" /> + + + + - - - - - - diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/numbertextbox/numberTextBox.view.xml b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/numbertextbox/numberTextBox.view.xml index bb692e6..bd6f050 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/numbertextbox/numberTextBox.view.xml +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/numbertextbox/numberTextBox.view.xml @@ -20,12 +20,10 @@
- - - - - - + + + +
diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/pagers/pagers.view.xml b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/pagers/pagers.view.xml index 0e9eb97..417d62d 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/pagers/pagers.view.xml +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/pagers/pagers.view.xml @@ -17,32 +17,8 @@
- - - - - - - - - - - - - - - - - - - - - - - - @@ -50,18 +26,7 @@ - - - - - - - - - - - - + diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/rollingpanel/rollingPanel.view.xml b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/rollingpanel/rollingPanel.view.xml index 2258a06..b0c4454 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/rollingpanel/rollingPanel.view.xml +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/rollingpanel/rollingPanel.view.xml @@ -7,8 +7,6 @@ xmlns:faces="http://www.cruxframework.org/crux/smart-faces" xmlns:showcase="http://www.cruxframework.org/templates/showcase" useResource="showcaseSamplesResources" - useController="rollingPanelController" - onLoad="rollingPanelController.onLoad" title="RollingPanel">
@@ -32,14 +30,6 @@
- - - - - - - -
- + @@ -44,6 +44,15 @@ + + + + +
+ + + + diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/swapviewcontainer/swapView1.view.xml b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/swapviewcontainer/swapView1.view.xml index 512a52e..533cb16 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/swapviewcontainer/swapView1.view.xml +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/swapviewcontainer/swapView1.view.xml @@ -10,13 +10,12 @@ title="Product">
- - - - - - - - + + + +
+ + +
\ No newline at end of file diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/swapviewcontainer/swapView2.view.xml b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/swapviewcontainer/swapView2.view.xml index 6ac5065..355a710 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/swapviewcontainer/swapView2.view.xml +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/swapviewcontainer/swapView2.view.xml @@ -10,13 +10,12 @@ title="Added Product">
- - - - - - - - -
+ + + +
+ + + + \ No newline at end of file diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/swapviewcontainer/swapView3.view.xml b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/swapviewcontainer/swapView3.view.xml index 0059bda..2988bf0 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/swapviewcontainer/swapView3.view.xml +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/swapviewcontainer/swapView3.view.xml @@ -10,13 +10,12 @@ title="Purchase Completed">
- - - - - - - - + + + +
+ + +
\ No newline at end of file diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/swapviewcontainer/swapViewContainer.view.xml b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/swapviewcontainer/swapViewContainer.view.xml index b53d8b5..e3a9050 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/swapviewcontainer/swapViewContainer.view.xml +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/swapviewcontainer/swapViewContainer.view.xml @@ -18,7 +18,7 @@ - +
diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/tabpanel/tabPanel.view.xml b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/tabpanel/tabPanel.view.xml index 69164bf..de8c781 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/tabpanel/tabPanel.view.xml +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/tabpanel/tabPanel.view.xml @@ -8,12 +8,13 @@ xmlns:showcase="http://www.cruxframework.org/templates/showcase" useResource="showcaseSamplesResources" useController="tabPanelController" + onLoad="tabPanelController.onLoad" title="${messages_tabPanel.title}">
- + diff --git a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/tabviewcontainer/tabViewContainer.view.xml b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/tabviewcontainer/tabViewContainer.view.xml index f0679f6..06c59fa 100644 --- a/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/tabviewcontainer/tabViewContainer.view.xml +++ b/cross-device-showcase/src/main/resources/org/cruxframework/crossdeviceshowcase/client/view/samples/tabviewcontainer/tabViewContainer.view.xml @@ -16,13 +16,13 @@
- + - +
- -