Author: agilliland
Date: Wed Jun 6 11:40:16 2007
New Revision: 544916
URL: http://svn.apache.org/viewvc?view=rev&rev=544916
Log:
provide a more appropriate and visible notification to users when registrations
are disabled or when their weblog theme does not support a custom stylesheet.
Added:
roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/RegisterDisabled.jsp
Modified:
roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/StylesheetEditError.jsp
roller/trunk/apps/weblogger/web/WEB-INF/tiles.xml
roller/trunk/apps/weblogger/web/roller-ui/styles/roller.css
Modified:
roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties?view=diff&rev=544916&r1=544915&r2=544916
==============================================================================
---
roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
(original)
+++
roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
Wed Jun 6 11:40:16 2007
@@ -1496,6 +1496,10 @@
userRegister.tip.password=Your password.
userRegister.tip.passwordConfirm=Confirm your password.
+Register.disabled=The administrator of this site has disabled user
registrations \
+at this time. Please contact the system administrators if you think this is \
+incorrect.
+
# errors from validation
Register.error.nameNull=User Name is a required field
Register.error.nameSize=User Name cannot be more than 255 characters
Modified: roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml?view=diff&rev=544916&r1=544915&r2=544916
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml Wed Jun 6
11:40:16 2007
@@ -97,6 +97,7 @@
<action name="register!*" method="{1}"
class="org.apache.roller.weblogger.ui.struts2.core.Register">
<result name="input" type="tiles">.Register</result>
+ <result name="disabled" type="tiles">.RegisterDisabled</result>
<result name="success" type="tiles">.Welcome</result>
</action>
Added: roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/RegisterDisabled.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/RegisterDisabled.jsp?view=auto&rev=544916
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/RegisterDisabled.jsp
(added)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/RegisterDisabled.jsp Wed
Jun 6 11:40:16 2007
@@ -0,0 +1,20 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. The ASF licenses this file to You
+ under the Apache License, Version 2.0 (the "License"); you may not
+ use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. For additional information regarding
+ copyright in this work, please see the NOTICE file in the top level
+ directory of this distribution.
+--%>
+<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+
+<div class="notification"><s:text name="Register.disabled" /></div>
Modified:
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/StylesheetEditError.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/StylesheetEditError.jsp?view=diff&rev=544916&r1=544915&r2=544916
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/StylesheetEditError.jsp
(original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/StylesheetEditError.jsp
Wed Jun 6 11:40:16 2007
@@ -19,4 +19,4 @@
<p class="subtitle"><s:text name="stylesheetEdit.subtitle" /></p>
-<p class="pagetip"><s:text name="stylesheetEdit.noStylesheetOverride" /></p>
+<div class="notification"><s:text name="stylesheetEdit.noStylesheetOverride"
/></div>
Modified: roller/trunk/apps/weblogger/web/WEB-INF/tiles.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/tiles.xml?view=diff&rev=544916&r1=544915&r2=544916
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/tiles.xml (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/tiles.xml Wed Jun 6 11:40:16 2007
@@ -79,6 +79,10 @@
<put name="content" value="/WEB-INF/jsps/core/Register.jsp" />
</definition>
+ <definition name=".RegisterDisabled" extends=".tiles-simplepage" >
+ <put name="content" value="/WEB-INF/jsps/core/RegisterDisabled.jsp" />
+ </definition>
+
<definition name=".Welcome" extends=".tiles-simplepage" >
<put name="content" value="/WEB-INF/jsps/core/Welcome.jsp" />
</definition>
Modified: roller/trunk/apps/weblogger/web/roller-ui/styles/roller.css
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/roller-ui/styles/roller.css?view=diff&rev=544916&r1=544915&r2=544916
==============================================================================
--- roller/trunk/apps/weblogger/web/roller-ui/styles/roller.css (original)
+++ roller/trunk/apps/weblogger/web/roller-ui/styles/roller.css Wed Jun 6
11:40:16 2007
@@ -445,8 +445,17 @@
border: 1px solid green;
}
.warnings {
- background-color: #FFFFAA;
- border: 1px solid yellow;
+ background-color: #ffffce;
+ border: 1px solid #f0c000;
+}
+div.notification {
+ width: 80%;
+ margin-left: auto;
+ margin-right: auto;
+ padding: 25px;
+ font-size: larger;
+ background-color: #ffffce;
+ border: 1px solid #f0c000;
}
div.error {
background-color: #ffcccc;
