Alexander Wels has posted comments on this change.
Change subject: userportal, webadmin: branding support.
......................................................................
Patch Set 19: (9 inline comments)
....................................................
File
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/branding/BrandingManager.java
Line 132: ObjectNode node = new ObjectMapper().createObjectNode();
Line 133: for (Map.Entry<String, String> entry : keyValues.entrySet()) {
Line 134: node.put(entry.getKey(), entry.getValue());
Line 135: }
Line 136: return node.size() > 0 ? node.toString() : null;
Yes it does check.
Line 137: }
Line 138:
Line 139: /**
Line 140: * Get the root path of the branding files.
....................................................
File
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/branding/BrandingTheme.java
Line 113: * @param brandingRootPath The root of the path to the branding
theme,
Line 114: * @param brandingVersion The version to load, if the version
don't match the load will fail.
Line 115: * @return {@code true} if successfully loaded, {@code false}
otherwise.
Line 116: */
Line 117: public boolean load(final String brandingPath, final File
brandingRootPath, final int brandingVersion) {
Done
Line 118: path = brandingPath.substring(
Line 119: brandingRootPath.getAbsolutePath().
Line 120: length());
Line 121: filePath = brandingPath;
Line 124: try {
Line 125: propertiesFile = new FileInputStream(brandingPath
Line 126: + "/" + BRANDING_PROPERTIES_NAME); //$NON-NLS-1$
Line 127: brandingProperties.load(propertiesFile);
Line 128: available = brandingVersion == getVersion();
No isAvailable or getVersion is not used outside of this class.
Line 129: if (!available) {
Line 130: log.warn("Unable to load branding theme, mismatched
version: " //$NON-NLS-1$
Line 131: + getVersion() + " wanted version: " +
brandingVersion); //$NON-NLS-1$
Line 132: }
Line 229: new URL[] {
Line 230: themeDirectory.toURI().toURL() });
Line 231: result = ResourceBundle.getBundle(
Line 232: brandingProperties.getProperty(MESSAGES_KEY).
Line 233: replaceAll("\\.properties", ""),
//$NON-NLS-1$ //$NON-NLS-2$
Done
Line 234: locale,
Line 235: urlLoader);
Line 236: } catch (IOException e) {
Line 237: // Unable to load messages resource bundle.
Line 235: urlLoader);
Line 236: } catch (IOException e) {
Line 237: // Unable to load messages resource bundle.
Line 238: log.warn("Unable to read message resource " //$NON-NLS-1$
Line 239: + "bundle, returning null"); //$NON-NLS-1$
Done
Line 240: }
Line 241: return result;
Line 242: }
Line 243:
....................................................
File
frontend/webadmin/modules/frontend/src/main/resources/META-INF/resources/GwtHostPage.jsp
Line 8: <meta name="gwt:property"
content="locale=${requestScope['locale']}">
Line 9: <c:if test="${requestScope['brandingStyle'] != null}">
Line 10: <c:forEach items="${requestScope['brandingStyle']}"
var="theme">
Line 11: <c:if
test="${theme.getThemeStyleSheet(requestScope['applicationType']) != null}">
Line 12: <link rel="stylesheet" type="text/css"
href="${pageContext.request.contextPath}/${requestScope['theme']}${theme.path}/${theme.getThemeStyleSheet(requestScope['applicationType'])}">
Okay I will fix indentation.
Line 13: </c:if>
Line 14: </c:forEach>
Line 15: </c:if>
Line 16: <script type="text/javascript">
....................................................
File
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/tab/DialogTab.java
Line 30:
Line 31: interface Style extends CssResource {
Line 32: String obrand_active();
Line 33:
Line 34: String inactive();
You are right, like I said I just did the ones downstream, I am sure this will
be changed shortly.
Line 35: }
Line 36:
Line 37: @UiField
Line 38: FocusPanel tabContainer;
....................................................
File
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainSectionView.ui.xml
Line 1
Line 2
Line 3
Line 4
Line 5
I did.
....................................................
File frontend/webadmin/modules/webadmin/src/main/webapp/WEB-INF/web.xml
Line 4: <display-name>oVirt WebAdmin UI</display-name>
Line 5: <!-- Filters -->
Line 6: <filter>
Line 7: <filter-name>LocaleFilter</filter-name>
Line 8:
<filter-class>org.ovirt.engine.core.utils.servlet.LocaleFilter</filter-class>
Done
Line 9: </filter>
Line 10: <filter-mapping>
Line 11: <filter-name>LocaleFilter</filter-name>
Line 12: <url-pattern>/webadmin/*</url-pattern>
--
To view, visit http://gerrit.ovirt.org/13181
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I4a8a426ce7d688d33c5ae2b70632c836843106b2
Gerrit-PatchSet: 19
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alexander Wels <[email protected]>
Gerrit-Reviewer: Alex Lourie <[email protected]>
Gerrit-Reviewer: Alexander Wels <[email protected]>
Gerrit-Reviewer: Alon Bar-Lev <[email protected]>
Gerrit-Reviewer: Barak Azulay <[email protected]>
Gerrit-Reviewer: Daniel Erez <[email protected]>
Gerrit-Reviewer: Einav Cohen <[email protected]>
Gerrit-Reviewer: Eyal Edri <[email protected]>
Gerrit-Reviewer: Itamar Heim <[email protected]>
Gerrit-Reviewer: Kanagaraj M <[email protected]>
Gerrit-Reviewer: Michal Skrivanek <[email protected]>
Gerrit-Reviewer: Moran Goldboim <[email protected]>
Gerrit-Reviewer: Ofer Schreiber <[email protected]>
Gerrit-Reviewer: Sahina Bose <[email protected]>
Gerrit-Reviewer: Sandro Bonazzola <[email protected]>
Gerrit-Reviewer: Vojtech Szocs <[email protected]>
Gerrit-Reviewer: Yair Zaslavsky <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
