diff --git a/1.sources/MyHealth/.classpath b/1.sources/MyHealth/.classpath index d3343bd..32e1501 100644 --- a/1.sources/MyHealth/.classpath +++ b/1.sources/MyHealth/.classpath @@ -4,6 +4,5 @@ - diff --git a/1.sources/MyHealth/docroot/WEB-INF/lib/all-themes-1.0.8.jar b/1.sources/MyHealth/docroot/WEB-INF/lib/all-themes-1.0.8.jar new file mode 100644 index 0000000..094e082 Binary files /dev/null and b/1.sources/MyHealth/docroot/WEB-INF/lib/all-themes-1.0.8.jar differ diff --git a/1.sources/MyHealth/docroot/WEB-INF/lib/bootstrap-1.0.10.jar b/1.sources/MyHealth/docroot/WEB-INF/lib/bootstrap-1.0.10.jar deleted file mode 100644 index 583e691..0000000 Binary files a/1.sources/MyHealth/docroot/WEB-INF/lib/bootstrap-1.0.10.jar and /dev/null differ diff --git a/1.sources/MyHealth/docroot/WEB-INF/web.xml b/1.sources/MyHealth/docroot/WEB-INF/web.xml index 172f965..eddc1df 100644 --- a/1.sources/MyHealth/docroot/WEB-INF/web.xml +++ b/1.sources/MyHealth/docroot/WEB-INF/web.xml @@ -25,7 +25,7 @@ primefaces.THEME - bootstrap + aristo @@ -72,48 +72,4 @@ home.xhtml - - ttf - application/font-sfnt - - - woff - application/font-woff - - - woff2 - application/font-woff2 - - - eot - application/vnd.ms-fontobject - - - eot?#iefix - application/vnd.ms-fontobject - - - svg - image/svg+xml - - - svg#latobold - image/svg+xml - - - svg#latoblack - image/svg+xml - - - svg#latolight - image/svg+xml - - - svg#latoregular - image/svg+xml - - - svg#fontawesomeregular - image/svg+xml - diff --git a/1.sources/MyHealth/docroot/header.xhtml b/1.sources/MyHealth/docroot/header.xhtml index a06025e..bf338cd 100644 --- a/1.sources/MyHealth/docroot/header.xhtml +++ b/1.sources/MyHealth/docroot/header.xhtml @@ -7,6 +7,7 @@ MyHealth Online Services + diff --git a/1.sources/MyHealth/docroot/home.xhtml b/1.sources/MyHealth/docroot/home.xhtml index a37395a..9d56947 100644 --- a/1.sources/MyHealth/docroot/home.xhtml +++ b/1.sources/MyHealth/docroot/home.xhtml @@ -11,6 +11,13 @@ + + + + + + + @@ -18,7 +25,7 @@ - + diff --git a/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml b/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml index 5e6bbcd..3561085 100644 --- a/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml +++ b/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml @@ -42,14 +42,14 @@ - + - + diff --git a/1.sources/MyHealth/src/managedbean/common/CurrentTheme.java b/1.sources/MyHealth/src/managedbean/common/CurrentTheme.java new file mode 100644 index 0000000..595b73b --- /dev/null +++ b/1.sources/MyHealth/src/managedbean/common/CurrentTheme.java @@ -0,0 +1,26 @@ +package managedbean.common; + +import java.io.Serializable; + +import javax.annotation.ManagedBean; +import javax.enterprise.context.SessionScoped; + +@ManagedBean +@SessionScoped +public class CurrentTheme implements Serializable { + + private Theme currentTheme; + + public CurrentTheme() { + } + + public Theme getCurrentTheme() { + return currentTheme; + } + + public void setCurrentTheme(Theme currentTheme) { + this.currentTheme = currentTheme; + } + + +} \ No newline at end of file diff --git a/1.sources/MyHealth/src/managedbean/common/Theme.java b/1.sources/MyHealth/src/managedbean/common/Theme.java new file mode 100644 index 0000000..95e3e11 --- /dev/null +++ b/1.sources/MyHealth/src/managedbean/common/Theme.java @@ -0,0 +1,46 @@ +package managedbean.common; + +public class Theme { + + private int id; + private String displayName; + private String name; + + public Theme() { + } + + public Theme(int id, String displayName, String name) { + this.id = id; + this.displayName = displayName; + this.name = name; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getDisplayName() { + return displayName; + } + + public void setDisplayName(String displayName) { + this.displayName = displayName; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public String toString() { + return name; + } +} \ No newline at end of file diff --git a/1.sources/MyHealth/src/managedbean/common/ThemeService.java b/1.sources/MyHealth/src/managedbean/common/ThemeService.java new file mode 100644 index 0000000..699ae0b --- /dev/null +++ b/1.sources/MyHealth/src/managedbean/common/ThemeService.java @@ -0,0 +1,53 @@ +package managedbean.common; + +import java.util.ArrayList; +import java.util.List; + +public class ThemeService { + /** + * + */ + private static final long serialVersionUID = 1L; + + public static final String DEFAULT_THEME = "aristo"; + public static final List THEMES = new ArrayList() { + { + add(new Theme(1, "afterdark", "afterdark")); + add(new Theme(2, "afternoon", "afternoon")); + add(new Theme(3, "afterwork", "afterwork")); + add(new Theme(4, "black-tie", "black-tie")); + add(new Theme(5, "blitzer", "blitzer")); + add(new Theme(6, "bluesky", "bluesky")); + add(new Theme(7, "bootstrap", "bootstrap")); + add(new Theme(8, "casablanca", "casablanca")); + add(new Theme(9, "cruze", "cruze")); + add(new Theme(10, "cupertino", "cupertino")); + add(new Theme(11, "dark-hive", "dark-hive")); + add(new Theme(12, "dot-luv", "dot-luv")); + add(new Theme(13, "eggplant", "eggplant")); + add(new Theme(14, "excite-bike", "excite-bike")); + add(new Theme(15, "flick", "flick")); + add(new Theme(16, "glass-x", "glass-x")); + add(new Theme(17, "home", "home")); + add(new Theme(18, "hot-sneaks", "hot-sneaks")); + add(new Theme(19, "humanity", "humanity")); + add(new Theme(20, "le-frog", "le-frog")); + add(new Theme(21, "midnight", "midnight")); + add(new Theme(22, "mint-choc", "mint-choc")); + add(new Theme(23, "overcast", "overcast")); + add(new Theme(24, "pepper-grinder", "pepper-grinder")); + add(new Theme(25, "redmond", "redmond")); + add(new Theme(26, "rocket", "rocket")); + add(new Theme(27, "sam", "sam")); + add(new Theme(28, "smoothness", "smoothness")); + add(new Theme(29, "south-street", "south-street")); + add(new Theme(30, "start", "start")); + add(new Theme(31, "sunny", "sunny")); + add(new Theme(32, "swanky-purse", "swanky-purse")); + add(new Theme(33, "trontastic", "trontastic")); + add(new Theme(34, "ui-darkness", "ui-darkness")); + add(new Theme(35, "ui-lightness", "ui-lightness")); + add(new Theme(36, "vader", "vader")); + } + }; +} diff --git a/1.sources/MyHealth/src/managedbean/common/homeMBean.java b/1.sources/MyHealth/src/managedbean/common/homeMBean.java index 50524ee..793d083 100644 --- a/1.sources/MyHealth/src/managedbean/common/homeMBean.java +++ b/1.sources/MyHealth/src/managedbean/common/homeMBean.java @@ -1,9 +1,11 @@ package managedbean.common; import java.io.Serializable; +import java.util.List; import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; +import javax.inject.Inject; import javax.inject.Named; /*** @@ -23,6 +25,10 @@ public class homeMBean implements Serializable { isLogedIn = SessionUtils.isLogedIn(); } + public List getThemes() { + return ThemeService.THEMES; + } + public boolean isLogedIn() { return this.isLogedIn; }