This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a commit to branch bootstrap-ui
in repository https://gitbox.apache.org/repos/asf/roller.git
The following commit(s) were added to refs/heads/bootstrap-ui by this push:
new 5918db4 Polish auto-installer, login and other pages.
5918db4 is described below
commit 5918db4a001313941c3ff97cc5bd0e3204cfd653
Author: Dave Johnson <[email protected]>
AuthorDate: Sun Jan 20 10:50:57 2019 -0500
Polish auto-installer, login and other pages.
---
.gitignore | 1 +
.../main/resources/ApplicationResources.properties | 2 +-
.../roller/weblogger/config/roller.properties | 6 +-
.../webapp/WEB-INF/jsps/core/CreateDatabase.jsp | 2 +-
.../main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp | 2 +
.../main/webapp/WEB-INF/jsps/core/Login-css.jsp | 2 +-
app/src/main/webapp/WEB-INF/jsps/core/Register.jsp | 2 +-
app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp | 147 ++++++++++++---------
.../WEB-INF/jsps/tiles/bannerInstallation.jsp | 40 +++---
.../webapp/WEB-INF/jsps/tiles/bannerStatus.jsp | 16 +--
.../main/webapp/WEB-INF/jsps/tiles/messages.jsp | 3 +
.../webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp | 3 +
.../WEB-INF/jsps/tiles/tiles-installpage.jsp | 65 ++++-----
.../webapp/WEB-INF/jsps/tiles/tiles-loginpage.jsp | 5 +-
.../WEB-INF/jsps/tiles/tiles-mainmenupage.jsp | 2 +-
.../webapp/WEB-INF/jsps/tiles/tiles-popuppage.jsp | 3 +
.../WEB-INF/jsps/tiles/tiles-simple-tabbedpage.jsp | 6 +-
.../webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp | 15 ++-
.../webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp | 6 +-
app/src/main/webapp/WEB-INF/tiles.xml | 14 +-
20 files changed, 185 insertions(+), 157 deletions(-)
diff --git a/.gitignore b/.gitignore
index 24a37b6..b7b9c8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ velocity.log
tomcat-base
deployment/docker-compose/postgresql-data
deployment/docker-compose/roller-data
+deployment/data
diff --git a/app/src/main/resources/ApplicationResources.properties
b/app/src/main/resources/ApplicationResources.properties
index 9f6fc9d..054edaf 100644
--- a/app/src/main/resources/ApplicationResources.properties
+++ b/app/src/main/resources/ApplicationResources.properties
@@ -584,7 +584,7 @@ inviteMember.disabled=invitations disabled
# ------------------------------------------------------------------- Installer
-installer.bannerTitleLeft=Apache Roller Weblogger
+installer.bannerTitleLeft=Apache Roller
installer.bannerTitleRight=Auto-Installer
# database error
diff --git
a/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
b/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
index 5b7c35c..9ea2484 100644
---
a/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
+++
b/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
@@ -209,7 +209,7 @@ trackback.allowedURLs=
# Set to true to enable the Planet aggregator. You also need to enable the
# RefreshRollerPlanetTask task below to get the feed fetcher running.
-planet.aggregator.enabled=false
+planet.aggregator.enabled=true
# Planet backend guice module, customized for use with Weblogger
planet.aggregator.guice.module=\
@@ -553,11 +553,11 @@ org.apache.roller.weblogger.ui.core.plugins.TextEditor,\
org.apache.roller.weblogger.ui.core.plugins.Summernote
# The "id" of the default editor to use. NOT the class name
-plugins.defaultEditor=editor-text.jsp
+plugins.defaultEditor=editor-summernote.jsp
# Default weblog editor
# The list of available editors is in rollerRuntimeConfigDefs.xml
-newweblog.editor=editor-text.jsp
+newweblog.editor=editor-summernote.jsp
#-----------------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/CreateDatabase.jsp
b/app/src/main/webapp/WEB-INF/jsps/core/CreateDatabase.jsp
index 85bf5ed..66db1ca 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/CreateDatabase.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/CreateDatabase.jsp
@@ -55,7 +55,7 @@
<s:form action="install!create">
<s:hidden name="salt" />
- <s:submit value="%{getText('installer.yesCreateTables')}" />
+ <s:submit value="%{getText('installer.yesCreateTables')}"
cssClass="btn btn-default" />
</s:form>
</s:else>
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
b/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
index b5e973f..2c0b92d 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
@@ -93,6 +93,8 @@
<s:else>
previewImage('<s:property value="bean.theme"/>');
</s:else>
+
+ formChanged()
});
function formChanged() {
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/Login-css.jsp
b/app/src/main/webapp/WEB-INF/jsps/core/Login-css.jsp
index 1cd65ea..a08fc73 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/Login-css.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/Login-css.jsp
@@ -18,6 +18,6 @@
.roller-page-title {
margin-top: 0px;
- margin-bottom: 5px;
+ margin-bottom: 2em;
text-align: center;
}
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp
b/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp
index dc91e69..5b0f99a 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp
@@ -132,7 +132,7 @@
<p id="readytip"><s:text name="userRegister.tip.ready" /></p>
<s:submit id="submit" key="userRegister.button.save" cssClass="btn
btn-default" />
- <input type="button" class=btn"
+ <input type="button" class="btn btn-cancel"
value="<s:text name="generic.cancel"/>"
onclick="window.location='<s:url value="/"/>'" />
</s:form>
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp
b/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp
index 929a353..f43aaba 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp
@@ -17,79 +17,100 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<s:text name="index.prompt"/><br/><br/>
-<div style="width:75%">
- <ul>
- <%--
- Index page on Roller startup; tell the user how to complete
their Roller install,
- with helpful notes and links to the appropriate places in the
Roller UI.
- --%>
-
- <%-- STEP 1: Create a user if you don't already have one --%>
- <li>
- <b>
- <s:text name="index.createUser"/>
- <s:if test="userCount > 0"> -
- <s:text name="index.createUserDone">
- <s:param value="userCount"/>
- </s:text>
- </s:if>
- </b>
- <s:text name="index.createUserHelp"/><br/><br/>
- <s:if test="userCount == 0">
- <s:text name="index.createUserBy"/>
- <a id="a_createUser" href='<s:url action="register"/>'>
- <s:text name="index.createUserPage"/></a>.
+<p style="margin-bottom:2em"><s:text name="index.prompt"/> </p>
+
+<%--
+ Index page on Roller startup; tell the user how to complete their Roller
install,
+ with helpful notes and links to the appropriate places in the Roller UI.
+--%>
+
+
+<%-- STEP 1: Create a user if you don't already have one --%>
+
+<div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">
+ <s:text name="index.createUser"/>
+ <s:if test="userCount > 0"> -
+ <s:text name="index.createUserDone">
+ <s:param value="userCount"/>
+ </s:text>
</s:if>
- </li>
-
- <%-- STEP 2: Create a weblog if you don't already have one --%>
- <li>
- <b>
- <s:text name="index.createWeblog"/>
- <s:if test="blogCount > 0"> -
- <s:text name="index.createWeblogDone">
- <s:param value="blogCount"/>
- </s:text>
- </s:if>
- </b>
- <s:text name="index.createWeblogHelp"/><br/><br/>
- <s:if test="userCount > 0 && blogCount == 0">
- <s:text name="index.createWeblogBy"/>
- <a id="a_createBlog" href='<s:url action="createWeblog"/>'>
- <s:text name="index.createWeblogPage"/></a>.
+ </h3>
+ </div>
+
+ <div class="panel-body">
+
+ <p><s:text name="index.createUserHelp"/></p>
+ <p><s:if test="userCount == 0">
+ <s:text name="index.createUserBy"/>
+ <a id="a_createUser" href='<s:url action="register"/>'>
+ <s:text name="index.createUserPage"/></a>.
+ </s:if></p>
+
+ </div>
+</div>
+
+<%-- STEP 2: Create a weblog if you don't already have one --%>
+
+<div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">
+ <s:text name="index.createWeblog"/>
+ <s:if test="blogCount > 0"> -
+ <s:text name="index.createWeblogDone">
+ <s:param value="blogCount"/>
+ </s:text>
</s:if>
- </li>
+ </h3>
+ </div>
- <%-- STEP 3: Designate a weblog to be the frontpage weblog --%>
- <li>
- <b>
- <s:text name="index.setFrontpage"/>
- </b>
- <p><s:text name="index.setFrontpageHelp"/></p>
+ <div class="panel-body">
- <s:if test="blogCount > 0">
+ <s:text name="index.createWeblogHelp"/><br/><br/>
+ <s:if test="userCount > 0 && blogCount == 0">
+ <s:text name="index.createWeblogBy"/>
+ <a id="a_createBlog" href='<s:url action="createWeblog"/>'>
+ <s:text name="index.createWeblogPage"/></a>.
+ </s:if>
- <s:form action="setup!save" theme="bootstrap"
cssClass="form-horizontal">
- <s:hidden name="salt"/>
+ </div>
+</div>
- <s:select list="weblogs"
- listKey="handle"
- listValue="name"
-
label="%{getText('frontpageConfig.frontpageBlogName')}"
- name="frontpageBlog"
- value="frontpageBlog"/>
- <s:checkbox name="aggregated" value="aggregated"
-
label="%{getText('frontpageConfig.frontpageAggregated')}"/>
+<%-- STEP 3: Designate a weblog to be the frontpage weblog --%>
- <s:submit value="%{getText('generic.save')}" cssClass="btn
btn-default"/>
+<div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">
+ <s:text name="index.setFrontpage"/>
+ </h3>
+ </div>
- </s:form>
+ <div class="panel-body">
- </s:if>
+ <p><s:text name="index.setFrontpageHelp"/></p>
+
+ <s:if test="blogCount > 0">
- </li>
+ <s:form action="setup!save" theme="bootstrap"
cssClass="form-horizontal">
+ <s:hidden name="salt"/>
- </ul>
+ <s:select list="weblogs"
+ listKey="handle"
+ listValue="name"
+
label="%{getText('frontpageConfig.frontpageBlogName')}"
+ name="frontpageBlog"
+ value="frontpageBlog"/>
+
+ <s:checkbox name="aggregated" value="aggregated"
+
label="%{getText('frontpageConfig.frontpageAggregated')}"/>
+
+ <s:submit value="%{getText('generic.save')}" cssClass="btn
btn-default"/>
+
+ </s:form>
+
+ </s:if>
+ </div>
</div>
+
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/bannerInstallation.jsp
b/app/src/main/webapp/WEB-INF/jsps/tiles/bannerInstallation.jsp
index 2ccf92a..8773ea5 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/bannerInstallation.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/bannerInstallation.jsp
@@ -17,18 +17,28 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<div class="bannerStatusBox">
-
- <table class="bannerStatusBox" cellpadding="0" cellspacing="0">
- <tr>
- <td class="bannerLeft">
- <s:text name="installer.bannerTitleLeft" />
- </td>
-
- <td class="bannerRight">
- <s:text name="installer.bannerTitleRight" />
- </td>
- </tr>
- </table>
-
-</div>
+<nav class="navbar navbar-default navbar-static-top navbar-inverse">
+ <div class="container-fluid">
+ <div id="navbar" class="navbar-collapse collapse">
+
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle collapsed"
+ data-toggle="collapse" data-target="#navbar"
aria-expanded="false" aria-controls="navbar">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="#"><s:text
name="installer.bannerTitleLeft" /></a>
+ </div>
+
+ <ul class="nav navbar-nav">
+ </ul>
+
+ <ul class="nav navbar-nav navbar-right">
+ <li><a href="<s:url value='/'/>"><s:text
name="installer.bannerTitleRight" /></a></li>
+ </ul>
+
+ </div>
+ </div>
+</nav>
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 93ddff3..9c2b78e 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp
@@ -33,23 +33,9 @@
</div>
<ul class="nav navbar-nav">
-i
- <%-- <s:if test="authenticatedUser != null">
- <li>
- <a href="<s:url action="menu" namespace="/roller-ui"
/>">
- <s:text name="mainPage.loggedInAs" />: <s:property
value="authenticatedUser.userName"/>
- </a>
- </li>
- </s:if> --%>
-
+
<s:if test="actionWeblog != null">
- <%-- <li>
- <a href='<s:property value="actionWeblog.absoluteURL"
/>'>
- <s:text name="mainPage.currentWebsite" />:
<s:property value="actionWeblog.handle" />
- </a>
- </li> --%>
-
<s:set var="tabMenu" value="menu"/>
<s:if test="#tabMenu != null">
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp
b/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp
index ce8898e..bb8c58b 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp
@@ -28,14 +28,17 @@
<s:if test="!actionErrors.isEmpty || !fieldErrors.isEmpty">
<div id="errors" class="alert alert-danger">
<ul>
+
<s:iterator var="actionError" value="actionErrors">
<li><s:property value="#actionError" escapeHtml="false" /></li>
</s:iterator>
+
<s:iterator var="fieldErrorName" value="fieldErrors.keySet()">
<s:iterator var="fieldErrorValue"
value="fieldErrors[#fieldErrorName]">
<li><s:property value="#fieldErrorValue"
escapeHtml="false" /></li>
</s:iterator>
</s:iterator>
+
</ul>
</div>
</s:if>
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp
b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp
index fc599f4..0ce7edc 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp
@@ -24,6 +24,9 @@
<link rel="icon" href="<%= request.getContextPath() %>/favicon.ico"
type="image/x-icon">
<title><s:text name="error" /></title>
<tiles:insertAttribute name="head" />
+ <style>
+ <tiles:insertAttribute name="styles" />
+ </style>
</head>
<body>
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp
b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp
index 01abda9..059a985 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp
@@ -18,41 +18,34 @@
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
<!doctype html>
<html>
- <head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <link rel="icon" href="<%= request.getContextPath() %>/favicon.ico"
type="image/x-icon">
- <title><s:property value="pageTitle" /></title>
- <tiles:insertAttribute name="head" />
- </head>
- <body>
-
- <div id="banner">
- <tiles:insertAttribute name="banner" />
- </div>
-
- <div id="wrapper" class="container-fluid">
- <div id="leftcontent_wrap">
- <div id="leftcontent">
- </div>
- </div>
-
- <div id="centercontent_wrap">
- <div id="centercontent">
- <tiles:insertAttribute name="messages" />
- <tiles:insertAttribute name="content" />
- </div>
- </div>
-
- <div id="rightcontent_wrap">
- <div id="rightcontent">
- </div>
- </div>
- </div>
-
- <div id="footer">
- <tiles:insertAttribute name="footer" />
+<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <link rel="icon" href="<%= request.getContextPath() %>/favicon.ico"
type="image/x-icon">
+ <title><s:property value="pageTitle"/></title>
+ <tiles:insertAttribute name="head"/>
+ <style>
+ <tiles:insertAttribute name="styles" />
+ </style>
+</head>
+<body>
+
+<tiles:insertAttribute name="banner"/>
+
+<div id="wrapper" class="container-fluid" style="margin-top:5em">
+
+ <div class="row">
+ <div class="col-md-1"></div>
+ <div class="col-md-10">
+ <tiles:insertAttribute name="messages"/>
+ <tiles:insertAttribute name="content"/>
</div>
-
- </body>
+ <div class="col-md-1"></div>
+ </div>
+
+ <div id="footer">
+ <tiles:insertAttribute name="footer"/>
+ </div>
+
+</body>
</html>
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-loginpage.jsp
b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-loginpage.jsp
index 08cd90b..94cb7c7 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-loginpage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-loginpage.jsp
@@ -25,12 +25,13 @@
<link rel="icon" href="<%= request.getContextPath() %>/favicon.ico"
type="image/x-icon">
<title><s:property value="getProp('site.shortName')"/>: <s:property
value="pageTitle"/></title>
<tiles:insertAttribute name="head"/>
- <style> <tiles:insertAttribute name="styles" /> </style>
+ <style>
+ <tiles:insertAttribute name="styles" />
+ </style>
</head>
<body>
<tiles:insertAttribute name="banner"/>
-<tiles:insertAttribute name="bannerStatus"/>
<div class="container-fluid">
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 c8afe35..6750d79 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
@@ -31,7 +31,7 @@
</head>
<body>
-<tiles:insertAttribute name="bannerStatus"/>
+<tiles:insertAttribute name="banner"/>
<div class="container-fluid">
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-popuppage.jsp
b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-popuppage.jsp
index a8703ed..7d99207 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-popuppage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-popuppage.jsp
@@ -23,6 +23,9 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<link rel="icon" href="<%= request.getContextPath() %>/favicon.ico"
type="image/x-icon">
<tiles:insertAttribute name="head" />
+ <style>
+ <tiles:insertAttribute name="styles" />
+ </style>
</head>
<body>
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simple-tabbedpage.jsp
b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simple-tabbedpage.jsp
index 9a1100e..f123444 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simple-tabbedpage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simple-tabbedpage.jsp
@@ -24,11 +24,13 @@
<link rel="icon" href="<%= request.getContextPath() %>/favicon.ico"
type="image/x-icon">
<title><s:property value="getProp('site.shortName')"/>: <s:property
value="pageTitle"/></title>
<tiles:insertAttribute name="head"/>
- <style> <tiles:insertAttribute name="styles" /> </style>
+ <style>
+ <tiles:insertAttribute name="styles" />
+ </style>
</head>
<body>
-<tiles:insertAttribute name="bannerStatus"/>
+<tiles:insertAttribute name="banner"/>
<div class="container-fluid">
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp
b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp
index 0076aaf..55d8113 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp
@@ -25,29 +25,30 @@
<link rel="icon" href="<%= request.getContextPath() %>/favicon.ico"
type="image/x-icon">
<title><s:property value="getProp('site.shortName')"/>: <s:property
value="pageTitle"/></title>
<tiles:insertAttribute name="head"/>
- <style> <tiles:insertAttribute name="styles" /> </style>
+ <style>
+ <tiles:insertAttribute name="styles" />
+ </style>
</head>
<body>
<tiles:insertAttribute name="banner"/>
-<tiles:insertAttribute name="bannerStatus"/>
<div class="container-fluid">
<div class="row">
- <div class="col-md-2"></div>
+ <div class="col-md-1"></div>
+ <div class="col-md-10">
- <div class="col-md-8">
<h1 class="roller-page-title"><s:property value="pageTitle"/></h1>
- <tiles:insertAttribute name="messages"/>
+ <p><tiles:insertAttribute name="messages"/>
<div class="panel">
<div class="panel-body">
<tiles:insertAttribute name="content"/>
</div>
</div>
- </div>
- <div class="col-md-2"></div>
+ </div>
+ <div class="col-md-1"></div>
</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 68adc18..7a028ac 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
@@ -25,11 +25,13 @@
<link rel="icon" href="<%= request.getContextPath() %>/favicon.ico"
type="image/x-icon">
<title><s:property value="getProp('site.shortName')"/>: <s:property
value="pageTitle"/></title>
<tiles:insertAttribute name="head"/>
- <style> <tiles:insertAttribute name="styles" /> </style>
+ <style>
+ <tiles:insertAttribute name="styles" />
+ </style>
</head>
<body>
-<tiles:insertAttribute name="bannerStatus"/>
+<tiles:insertAttribute name="banner"/>
<tilesx:useAttribute name="sidebar" id="sidebar" classname="java.lang.String"/>
diff --git a/app/src/main/webapp/WEB-INF/tiles.xml
b/app/src/main/webapp/WEB-INF/tiles.xml
index 4f38a19..7cb69f6 100644
--- a/app/src/main/webapp/WEB-INF/tiles.xml
+++ b/app/src/main/webapp/WEB-INF/tiles.xml
@@ -22,8 +22,8 @@
<tiles-definitions>
<definition name=".tiles-mainmenupage"
template="/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp">
- <put-attribute name="bannerStatus"
value="/WEB-INF/jsps/tiles/bannerStatus.jsp" />
- <put-attribute name="head" value="/WEB-INF/jsps/tiles/head.jsp"
/>
+ <put-attribute name="banner"
value="/WEB-INF/jsps/tiles/bannerStatus.jsp" />
+ <put-attribute name="head"
value="/WEB-INF/jsps/tiles/head.jsp" />
<put-attribute name="styles"
value="/WEB-INF/jsps/tiles/empty.jsp" />
<put-attribute name="messages"
value="/WEB-INF/jsps/tiles/messages.jsp" />
<put-attribute name="content" value="${content}" />
@@ -32,7 +32,7 @@
</definition>
<definition name=".tiles-tabbedpage"
template="/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp">
- <put-attribute name="bannerStatus"
value="/WEB-INF/jsps/tiles/bannerStatus.jsp" />
+ <put-attribute name="banner"
value="/WEB-INF/jsps/tiles/bannerStatus.jsp" />
<put-attribute name="userStatus"
value="/WEB-INF/jsps/tiles/userStatus.jsp" />
<put-attribute name="head"
value="/WEB-INF/jsps/tiles/head.jsp" />
<put-attribute name="styles"
value="/WEB-INF/jsps/tiles/empty.jsp" />
@@ -45,8 +45,7 @@
</definition>
<definition name=".tiles-simplepage"
template="/WEB-INF/jsps/tiles/tiles-simplepage.jsp">
- <put-attribute name="banner"
value="/WEB-INF/jsps/tiles/empty.jsp" />
- <put-attribute name="bannerStatus"
value="/WEB-INF/jsps/tiles/bannerStatus.jsp" />
+ <put-attribute name="banner"
value="/WEB-INF/jsps/tiles/bannerStatus.jsp" />
<put-attribute name="head"
value="/WEB-INF/jsps/tiles/head.jsp" />
<put-attribute name="styles"
value="/WEB-INF/jsps/tiles/empty.jsp" />
<put-attribute name="messages"
value="/WEB-INF/jsps/tiles/messages.jsp" />
@@ -55,8 +54,7 @@
</definition>
<definition name=".tiles-loginpage"
template="/WEB-INF/jsps/tiles/tiles-loginpage.jsp">
- <put-attribute name="banner"
value="/WEB-INF/jsps/tiles/empty.jsp" />
- <put-attribute name="bannerStatus"
value="/WEB-INF/jsps/tiles/bannerStatus.jsp" />
+ <put-attribute name="banner"
value="/WEB-INF/jsps/tiles/bannerStatus.jsp" />
<put-attribute name="head"
value="/WEB-INF/jsps/tiles/head.jsp" />
<put-attribute name="styles"
value="/WEB-INF/jsps/tiles/empty.jsp" />
<put-attribute name="messages"
value="/WEB-INF/jsps/tiles/messages.jsp" />
@@ -67,6 +65,7 @@
<definition name=".tiles-installpage"
template="/WEB-INF/jsps/tiles/tiles-installpage.jsp">
<put-attribute name="banner"
value="/WEB-INF/jsps/tiles/empty.jsp" />
<put-attribute name="head"
value="/WEB-INF/jsps/tiles/head.jsp" />
+ <put-attribute name="styles"
value="/WEB-INF/jsps/tiles/empty.jsp" />
<put-attribute name="messages"
value="/WEB-INF/jsps/tiles/messages.jsp" />
<put-attribute name="content" value="${content}" />
<put-attribute name="footer"
value="/WEB-INF/jsps/tiles/footer.jsp" />
@@ -75,6 +74,7 @@
<definition name=".tiles-errorpage"
template="/WEB-INF/jsps/tiles/tiles-errorpage.jsp">
<put-attribute name="banner"
value="/WEB-INF/jsps/tiles/empty.jsp" />
<put-attribute name="head"
value="/WEB-INF/jsps/tiles/head.jsp" />
+ <put-attribute name="styles"
value="/WEB-INF/jsps/tiles/empty.jsp" />
<put-attribute name="messages"
value="/WEB-INF/jsps/tiles/messages.jsp" />
<put-attribute name="content" value="${content}" />
<put-attribute name="footer"
value="/WEB-INF/jsps/tiles/footer.jsp" />
