refix ZK-2931

src/main/java/org/zkoss/theme/atlantic/AtlanticThemeProvider.java → src/main/java/org/zkoss/theme/atlantic/AtlanticCEThemeProvider.java

@@ -8,7 +8,7 @@
 import org.zkoss.zk.ui.Execution;
 import org.zkoss.zul.theme.StandardThemeProvider;
 
-public class AtlanticThemeProvider extends StandardThemeProvider {
+public class AtlanticCEThemeProvider extends StandardThemeProvider {
 
 	/** Library property key. */
 	private static final String DONT_USE_GOOGLE_FONT = "org.zkoss.theme.atlantic.useGoogleFont.disabled";

src/main/java/org/zkoss/theme/atlantic/AtlanticEEThemeProvider.java

@@ -0,0 +1,25 @@
+package org.zkoss.theme.atlantic;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.zkoss.html.StyleSheet;
+import org.zkoss.lang.Library;
+import org.zkoss.zk.ui.Execution;
+import org.zkoss.zkmax.theme.StandardThemeProvider;
+
+public class AtlanticEEThemeProvider extends StandardThemeProvider {
+
+	/** Library property key. */
+	private static final String DONT_USE_GOOGLE_FONT = "org.zkoss.theme.atlantic.useGoogleFont.disabled";
+
+	@Override
+	public Collection<Object> getThemeURIs(Execution exec, List<Object> uris) {
+		if (!Boolean.parseBoolean(Library.getProperty(DONT_USE_GOOGLE_FONT))) { //false by default
+			//ZK-2931 can't start the url with "//", encodeURL will prepend
+			//current context path if no scheme were given 
+			uris.add(new StyleSheet(exec.getScheme() + "://fonts.googleapis.com/css?family=Open+Sans", "text/css"));
+		}
+		return super.getThemeURIs(exec, uris);
+	}
+}

src/main/java/org/zkoss/theme/atlantic/AtlanticPEThemeProvider.java

@@ -0,0 +1,25 @@
+package org.zkoss.theme.atlantic;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.zkoss.html.StyleSheet;
+import org.zkoss.lang.Library;
+import org.zkoss.zk.ui.Execution;
+import org.zkoss.zkex.theme.StandardThemeProvider;
+
+public class AtlanticPEThemeProvider extends StandardThemeProvider {
+
+	/** Library property key. */
+	private static final String DONT_USE_GOOGLE_FONT = "org.zkoss.theme.atlantic.useGoogleFont.disabled";
+
+	@Override
+	public Collection<Object> getThemeURIs(Execution exec, List<Object> uris) {
+		if (!Boolean.parseBoolean(Library.getProperty(DONT_USE_GOOGLE_FONT))) { //false by default
+			//ZK-2931 can't start the url with "//", encodeURL will prepend
+			//current context path if no scheme were given 
+			uris.add(new StyleSheet(exec.getScheme() + "://fonts.googleapis.com/css?family=Open+Sans", "text/css"));
+		}
+		return super.getThemeURIs(exec, uris);
+	}
+}

src/main/java/org/zkoss/theme/atlantic/AtlanticThemeWebAppInit.java

@@ -14,10 +14,14 @@ public class AtlanticThemeWebAppInit implements WebAppInit {
 
 	public void init(WebApp wapp) throws Exception {
 		//ZK-2931 custom theme provider and library property for turning on/off the usage of google font
-		wapp.getConfiguration().setThemeProvider(new AtlanticThemeProvider());
+		wapp.getConfiguration().setThemeProvider(new AtlanticCEThemeProvider());
 		Themes.register(ATLANTIC_NAME, ATLANTIC_DISPLAY, ATLANTIC_PRIORITY);
 		String edition = WebApps.getEdition();
+		if ("PE".equals(edition)) {
+			wapp.getConfiguration().setThemeProvider(new AtlanticPEThemeProvider());
+		}
 		if ("EE".equals(edition)) {
+			wapp.getConfiguration().setThemeProvider(new AtlanticEEThemeProvider());
 			Themes.register(ResponsiveThemeRegistry.TABLET_PREFIX + ATLANTIC_NAME, ATLANTIC_DISPLAY, ATLANTIC_PRIORITY);
 		}
 	}