More tweaks to layout and ASF logo display.
diff --git a/app/src/main/resources/ApplicationResources.properties b/app/src/main/resources/ApplicationResources.properties
index ba61cb0..9f6fc9d 100644
--- a/app/src/main/resources/ApplicationResources.properties
+++ b/app/src/main/resources/ApplicationResources.properties
@@ -42,7 +42,7 @@
generic.toggle=Toggle
generic.success=Success
generic.looksGood=Looks good!
-generic.apacheRoller=Apache Roller
+generic.poweredBy=Powered by Apache Roller
# ------------------------------------------------------------- BookmarkForm.jsp
diff --git a/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp b/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
index 1ea4873..d5c68ea 100644
--- a/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
@@ -59,11 +59,11 @@
<s:elseif test="#pd.type == 'boolean'">
<s:if test="properties[#pd.name].value == 'true'">
- <s:checkbox name="%{#pd.name}" label="%{getText(#pd.key)}" cssClass="boolean"
+ <s:checkbox name="%{#pd.name}" label="%{getText(#pd.key)}"
fieldValue="true" checked="true" onchange="formChanged()"/>
</s:if>
<s:if test="properties[#pd.name].value != 'true'">
- <s:checkbox name="%{#pd.name}" label="%{getText(#pd.key)}" cssClass="boolean"
+ <s:checkbox name="%{#pd.name}" label="%{getText(#pd.key)}"
fieldValue="false" onchange="formChanged()"/>
</s:if>
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp
index 7c832e0..93ddff3 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp
@@ -29,7 +29,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="#">Apache Roller</a>
+ <a class="navbar-brand" href="#"><s:property value="%{getProp('site.name')}" /></a>
</div>
<ul class="nav navbar-nav">
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
index 3b45fef..c8afe35 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
@@ -44,7 +44,7 @@
<img src='<s:url value="/roller-ui/images/feather.svg" />'
alt="ASF feat" height="100" align="center"/>
- <h4><s:text name="generic.apacheRoller" /></h4>
+ <h4><s:text name="generic.poweredBy" /></h4>
</div>
</div>
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
index 0cd917a..68adc18 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
@@ -44,7 +44,7 @@
<img src='<s:url value="/roller-ui/images/feather.svg" />'
alt="ASF feat" height="100" align="center"/>
- <h4><s:text name="generic.apacheRoller" /></h4>
+ <h4><s:text name="generic.poweredBy" /></h4>
<s:if test="authenticatedUser != null || actionWeblog != null">
<tiles:insertAttribute name="userStatus"/>
