roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r290536 - in /incubator/roller/branches/roller_2.0: src/org/roller/presentation/weblog/actions/ src/org/roller/presentation/website/actions/ web/WEB-INF/classes/ web/theme/ web/weblog/ web/website/
Date Tue, 20 Sep 2005 19:26:27 GMT
Author: snoopdave
Date: Tue Sep 20 12:26:12 2005
New Revision: 290536

URL: http://svn.apache.org/viewcvs?rev=290536&view=rev
Log:
Several minor bug fixes and UI tweaks

Modified:
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
    incubator/roller/branches/roller_2.0/web/theme/roller.css
    incubator/roller/branches/roller_2.0/web/weblog/Pings.jsp
    incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp
    incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp
    incubator/roller/branches/roller_2.0/web/website/edit-website.jsp
    incubator/roller/branches/roller_2.0/web/website/welcome.jsp

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java?rev=290536&r1=290535&r2=290536&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
(original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
Tue Sep 20 12:26:12 2005
@@ -711,6 +711,11 @@
 
                     return save(mapping, wf, request, response);
                 }
+                else 
+                {
+                    return display(WeblogEntryPageModel.EDIT_MODE, 
+                                mapping, actionForm, request, response);
+                }
             }
         }
         catch (Exception e)

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java?rev=290536&r1=290535&r2=290536&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java
(original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java
Tue Sep 20 12:26:12 2005
@@ -75,8 +75,12 @@
             throws Exception
     {
         CreateWebsiteForm form = (CreateWebsiteForm)actionForm;
-        form.setLocale( Locale.getDefault().toString() );
-        form.setTimeZone( TimeZone.getDefault().getID() );      
+        
+        RollerSession rses = RollerSession.getRollerSession(request);
+        UserData user = rses.getAuthenticatedUser();        
+        form.setLocale(user.getLocale());
+        form.setTimeZone(user.getTimeZone());         
+        form.setEmailAddress(user.getEmailAddress());
 
         request.setAttribute("model", 
             new CreateWebsitePageModel(request, response, mapping, null));

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java?rev=290536&r1=290535&r2=290536&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java
(original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java
Tue Sep 20 12:26:12 2005
@@ -67,11 +67,11 @@
             HttpServletResponse response)
             throws Exception
     {
-        return mapping.findForward("user");
+        return mapping.findForward("main");
     }
     
     //------------------------------------------------------------------------
-    /** Process GET of user registration page (allows users to register themselves. */
+    /** Process GET of user registration page (allows users to register themselves). */
     public ActionForward registerUser(
         ActionMapping       mapping,
         ActionForm          actionForm,
@@ -85,8 +85,10 @@
         try
         {
             UserFormEx userForm = (UserFormEx)actionForm;
-            userForm.setLocale( Locale.getDefault().getDisplayName() );
-            userForm.setTimeZone( TimeZone.getDefault().getID() );
+            
+            userForm.setLocale(Locale.getDefault().toString());
+            userForm.setTimeZone(TimeZone.getDefault().getID());
+            
             userForm.setPasswordText(null);
             userForm.setPasswordConfirm(null);            
             request.setAttribute("model", new BasePageModel(

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java?rev=290536&r1=290535&r2=290536&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java
(original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java
Tue Sep 20 12:26:12 2005
@@ -24,6 +24,7 @@
 import org.apache.struts.actions.DispatchAction;
 import org.roller.RollerException;
 import org.roller.RollerPermissionsException;
+import org.roller.config.RollerConfig;
 import org.roller.config.RollerRuntimeConfig;
 import org.roller.model.Roller;
 import org.roller.model.RollerFactory;
@@ -305,6 +306,7 @@
     public class WebsitePageModel extends BasePageModel 
     {
         private List permissions = new ArrayList();
+        private boolean groupBloggingEnabled = false;
         public WebsitePageModel(
                 String titleKey,
                 HttpServletRequest request,
@@ -318,6 +320,14 @@
             RollerSession rollerSession = RollerSession.getRollerSession(request);
             UserData user = rollerSession.getAuthenticatedUser();
             permissions = roller.getUserManager().getAllPermissions(website);
+            groupBloggingEnabled = 
+                RollerConfig.getBooleanProperty("groupblogging.enabled");
+        }
+        public boolean isGroupBloggingEnabled() {
+            return groupBloggingEnabled;
+        }
+        public void setGroupBloggingEnabled(boolean groupBloggingEnabled) {
+            this.groupBloggingEnabled = groupBloggingEnabled;
         }
     }
 }

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java?rev=290536&r1=290535&r2=290536&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java
(original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java
Tue Sep 20 12:26:12 2005
@@ -22,6 +22,7 @@
 import org.roller.pojos.UserData;
 import org.roller.pojos.WebsiteData;
 import org.roller.presentation.BasePageModel;
+import org.roller.presentation.RollerRequest;
 import org.roller.presentation.RollerSession;
 import org.roller.presentation.website.formbeans.YourWebsitesForm;
 
@@ -29,7 +30,7 @@
  * Allows user to view and pick from list of his/her websites.
  * 
  * @struts.action path="/editor/yourWebsites" name="yourWebsitesForm" parameter="method"
- * @struts.action-forward name="yourWebsites.page" path=".YourWebsites"
+ * @struts.action-forward name="yourWebsites.page" path=".yourWebsites"
  */
 public class YourWebsitesAction extends DispatchAction
 {
@@ -130,13 +131,13 @@
         Roller roller = RollerFactory.getRoller();
         RollerSession rses = RollerSession.getRollerSession(request);
         UserData user = rses.getAuthenticatedUser();
-        WebsiteData website = 
-            roller.getUserManager().retrieveWebsite(form.getWebsiteId());
+        RollerRequest rreq = RollerRequest.getRollerRequest(request);
+        WebsiteData website = rreq.getWebsite();
         PermissionsData perms = 
             roller.getUserManager().getPermissions(website, user);
         if (perms != null) 
         {
-            // ROLLER_2.0: notify website members that user has resigned  
+            // TODO: notify website members that user has resigned  
             perms.remove();
             roller.commit();
         }

Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties?rev=290536&r1=290535&r2=290536&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
(original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
Tue Sep 20 12:26:12 2005
@@ -1355,8 +1355,11 @@
 template and day template to same template
 
 websiteSettings.removeWebsiteHeading=Remove Weblog?
-websiteSettings.removeWebsite=You are the last user in this weblog, \
+websiteSettings.removeWebsite=You are the last contributor to this weblog, \
 would you like to remove it?
+websiteSettings.removeWebsiteWarning=WARNING: removing a weblog will remove \
+everything: all of the weblog entries, bookmarks, comments and settings. \
+Weblog removal is NOT REVERSABLE.
 
 websiteRemove.title=Confirm Weblog Remove
 websiteRemove.subtitle=Weblog removal is <b>NOT REVERSABLE</b>
@@ -1386,16 +1389,19 @@
 # ---------------------------------------------------------------- Your Weblogs
 
 yourWebsites.title=Main Menu
-yourWebsites.subtitle=Welcome to Roller. Use this main menu page to \
-edit and manage your weblogs, your user profile and (if you have global admin \
-permissions) administer the blog server.
-
+yourWebsites.subtitle=Welcome to Roller
+ 
 yourWebsites.actions=Actions
 
-yourWebsites.title.welcomeNoBlog=Welcome to Roller
-yourWebsites.subtitle.welcomeNoBlog=You've got a user account, but no weblog.
-yourWebsites.prompt.welcomeNoBlog=Would you like to
-yourWebsites.createOne=create a weblog
+yourWebsites.prompt.noBlog=You've got a user account, but no weblog. \
+Would you like to
+yourWebsites.createOne=create one?
+
+yourWebsites.prompt.noBlogNoCreate=You've got a user account, but no \
+weblog. Ask your administrator to create one for you.
+
+yourWebsites.prompt.hasBlog=Use this page to access and manage your blogs \
+(listed below) and your user profile.
 
 yourWebsites.weblogs.title=Your Weblogs
 
@@ -1409,13 +1415,10 @@
 yourWebsites.tableDescription=Description
 yourWebsites.select=Select
 yourWebsites.resign=Resign
-yourWebsites.permission=Your permission
+yourWebsites.permission=Permission
 yourWebsites.confirmResignation=Are you sure you wish to resign from weblog
-yourWebsites.youHaveNone=You have no weblogs, would you like to 
-yourWebsites.youCanCreateOne=create one
-yourWebsites.youCannot=Ask your administrator to create one for you.
 yourWebsites.notAllowed=Not allowed
-yourWebsites.weblog=Weblog
+yourWebsites.weblog=Link
 yourWebsites.description=Description
 
 yourWebsites.newEntry=New Entry

Modified: incubator/roller/branches/roller_2.0/web/theme/roller.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/roller.css?rev=290536&r1=290535&r2=290536&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/roller.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/roller.css Tue Sep 20 12:26:12 2005
@@ -14,7 +14,7 @@
     font: small/1.5em Verdana, Arial, Helvetica, sans-serif;
 }
 p {
-    margin: 0px 0px 0px 0px;
+    margin: 0px 0px 5px 0px;
     font-size: 1em;
     background: transparent;
     color: #000000;
@@ -218,6 +218,20 @@
    padding-right: 1em;
 }
 
+div.yourWeblogBox {
+   width: 95%;
+   padding: 5px 0px 5px 0px;
+}
+div.yourWeblogBox div.formrow {
+   float: left:
+   width: 80%;
+}
+div.yourWeblogBox label.formrow {
+   float: left;
+   text-align: left;
+   width: 20%;
+   padding-right: 1em;
+}
 
 /* ----------------------------------------------------------------------
 Table styles 
@@ -404,7 +418,7 @@
 }
 div.controlToggle {
     width: 100%; 
-    height: 20px;
+    height: 25px;
 }
 .control input { 
     margin: 5px; 
@@ -491,11 +505,6 @@
 
 p.websiteDescription {
    text-style: italics;
-}
-.yourWeblogBox {
-   width: 95%;
-   padding: 4px;
-   margin: 4px 0px 4px 0px;
 }
 .version {
    font-size: small;

Modified: incubator/roller/branches/roller_2.0/web/weblog/Pings.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/Pings.jsp?rev=290536&r1=290535&r2=290536&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/Pings.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/Pings.jsp Tue Sep 20 12:26:12 2005
@@ -26,9 +26,9 @@
   <%-- Headings --%>
   <tr class="rollertable">
   <th class="rollertable" width="20%"><fmt:message key="pingTarget.name" /></th>
-  <th class="rollertable" width="50%"><fmt:message key="pingTarget.pingUrl" /></th>
+  <th class="rollertable" width="40%"><fmt:message key="pingTarget.pingUrl" /></th>
   <th class="rollertable" width="20%" colspan=2><fmt:message key="pingTarget.auto"
/></th>
-  <th class="rollertable" width="10%"><fmt:message key="pingTarget.manual" /></th>
+  <th class="rollertable" width="20%"><fmt:message key="pingTarget.manual" /></th>
   </tr>
 
   <%-- Table of current common targets with actions --%>
@@ -123,9 +123,9 @@
      <%-- Headings --%>
      <tr class="rollertable">
      <th class="rollertable" width="20%"><fmt:message key="pingTarget.name" /></th>
-     <th class="rollertable" width="50%"><fmt:message key="pingTarget.pingUrl" /></th>
+     <th class="rollertable" width="40%"><fmt:message key="pingTarget.pingUrl" /></th>
      <th class="rollertable" width="20%" colspan=2><fmt:message key="pingTarget.auto"
/></th>
-     <th class="rollertable" width="10%"><fmt:message key="pingTarget.manual" /></th>
+     <th class="rollertable" width="20%"><fmt:message key="pingTarget.manual" /></th>
      </tr>
 
       <%-- Table of current custom targets with actions --%>

Modified: incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp?rev=290536&r1=290535&r2=290536&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp Tue Sep 20 12:26:12
2005
@@ -41,14 +41,15 @@
 <c:choose>
 
     <%-- PROMPT: Welcome... you have no blog --%>
-    <c:when test="${empty model.permissions && empty model.pendings}"> 
-        <p><fmt:message key="yourWebsites.subtitle.welcomeNoBlog" /></p>
       
-        <p>
-        <fmt:message key="yourWebsites.prompt.welcomeNoBlog" />
+    <c:when test="${model.groupBloggingEnabled && empty model.permissions &&
empty model.pendings}"> 
+        <p><fmt:message key="yourWebsites.prompt.noBlog" />
         <roller:link page="/editor/createWebsite.do">
            <fmt:message key="yourWebsites.createOne" />
-        </roller:link>?
-        </p>
+        </roller:link></p>
+    </c:when>
+    
+    <c:when test="${!model.groupBloggingEnabled && empty model.permissions &&
empty model.pendings}"> 
+        <p><fmt:message key="yourWebsites.prompt.noBlogNoCreate" /></p>
       
     </c:when>
     
     <%-- PROMPT: You have invitation(s) --%>
@@ -70,71 +71,73 @@
         <br />
     </c:when>
     
+    <c:otherwise> 
+        <p><fmt:message key="yourWebsites.prompt.hasBlog" /></p>      
 
+    </c:otherwise>
+
 </c:choose>
             
 <c:if test="${!empty model.permissions}">
+    <br />
+    <c:forEach var="perms" items="${model.permissions}">
 
-    <%-- SUBTITLE: Your weblogs --%>    
-    <h3><fmt:message key="yourWebsites.weblogs.title" /></h3>
+        <div class="yourWeblogBox">  
 
-        <c:forEach var="perms" items="${model.permissions}">
-
-            <div class="yourWeblogBox">  
-
-                   <table width="100%">
-                   <tr>
-                   <td width="80%" style="padding: 0px 10px 0px 10px">
-
-                       <h3 style="border-bottom: 1px #e5e5e5 solid; margin:0px; padding:5px">
-                           <img src='<c:url value="/images/Folder16.png"/>' />
-                           <c:out value="${perms.website.name}" />
-                           [<c:out value="${perms.website.handle}" />] 
-                       </h3>
-
-                       <div class="formrow">
-                           <label class="formrow"><fmt:message key='yourWebsites.weblog'
/> URL</b></label>
-                           <a href='<c:out value="${model.baseURL}" />/page/<c:out
value="${perms.website.handle}" />'>
-                               <c:out value="${model.baseURL}" />/page/<c:out value="${perms.website.handle}"
/>
-                           </a>                           
-                       </div>
-
-                       <div class="formrow">
-                           <label class="formrow"><fmt:message key='yourWebsites.permission'
/></label>
-                           <c:if test="${perms.permissionMask == 0}" >LIMITED</c:if>
+               <table width="100%">
+               <tr>
+               <td width="75%" style="padding: 0px 10px 0px 10px">
+
+                   <h3 style="border-bottom: 1px #e5e5e5 solid; margin:0px; padding:5px">
+                       <img src='<c:url value="/images/Folder16.png"/>' />
+                       <c:out value="${perms.website.name}" />
+                       [<c:out value="${perms.website.handle}" />] 
+                   </h3>
+
+                   <table>
+                       <tr>
+                           <td width="30%"><b><fmt:message key='yourWebsites.weblog'
/></b></td>
+                           <td width="80%"><a href='<c:out value="${model.baseURL}"
/>/page/<c:out value="${perms.website.handle}" />'>
+                               <c:out value="${perms.website.handle}" />
+                           </a></td>                          
+                       </tr>
+                       <tr>
+                           <td><b><fmt:message key='yourWebsites.permission'
/></b></td>
+                           <td><c:if test="${perms.permissionMask == 0}" >LIMITED</c:if>
                            <c:if test="${perms.permissionMask == 1}" >AUTHOR</c:if>
-                           <c:if test="${perms.permissionMask == 3}" >ADMIN</c:if>
-                       </div>
-
-                       <div class="formrow">
-                           <label class="formrow"><fmt:message key='yourWebsites.description'
/></label>    
-                           <c:out value="${perms.website.description}" />
-                       </div>
+                           <c:if test="${perms.permissionMask == 3}" >ADMIN</c:if></td>
+                       </tr>
+                       <tr>
+                           <td><b><fmt:message key='yourWebsites.description'
/></b></td>   
+                           <td><c:out value="${perms.website.description}" /></td>
+                       </tr>
+                   </table>
+
+               </td>
+
+               <td class="actions" width="25%" align="left">
+
+                       <fmt:message key='yourWebsites.actions' />                 
     
+                       <br />
+
+                       <c:url value="/editor/weblog.do" var="newEntry">
+                           <c:param name="method" value="create" />
+                           <c:param name="weblog" value="${perms.website.handle}" />
+                       </c:url>
+                       <img src='<c:url value="/images/New16.gif"/>' />
+                       <a href='<c:out value="${newEntry}" />'>
+                           <fmt:message key="yourWebsites.newEntry" /></a>
+                       <br />
+
+                       <c:url value="/editor/weblogQuery.do" var="editEntries">
+                           <c:param name="method" value="query" />
+                           <c:param name="weblog" value="${perms.website.handle}" />
+                       </c:url>
+                       <img src='<c:url value="/images/Edit16.png"/>' />
+                       <a href='<c:out value="${editEntries}" />'>
+                           <fmt:message key="yourWebsites.editEntries" /></a>

+                       <br />
 
-                   </td>
-
-                   <td class="actions" width="20%" align="left">
-
-                           <fmt:message key='yourWebsites.actions' />             
         
-                           <br />
-                           
-                           <c:url value="/editor/weblog.do" var="newEntry">
-                               <c:param name="method" value="create" />
-                               <c:param name="weblog" value="${perms.website.handle}"
/>
-                           </c:url>
-                           <img src='<c:url value="/images/New16.gif"/>' />
-                           <a href='<c:out value="${newEntry}" />'>
-                               <fmt:message key="yourWebsites.newEntry" /></a>
-                           <br />
-                           
-                           <c:url value="/editor/weblogQuery.do" var="editEntries">
-                               <c:param name="method" value="query" />
-                               <c:param name="weblog" value="${perms.website.handle}"
/>
-                           </c:url>
-                           <img src='<c:url value="/images/Edit16.png"/>' />
-                           <a href='<c:out value="${editEntries}" />'>
-                               <fmt:message key="yourWebsites.editEntries" /></a>

-                           <br />
-                           
+                       <c:if test="${perms.permissionMask == 3}">
                            <c:url value="/editor/website.do" var="manageWeblog">
                                <c:param name="method" value="edit" />
                                <c:param name="weblog" value="${perms.website.handle}"
/>
@@ -143,24 +146,30 @@
                            <a href='<c:out value="${manageWeblog}" />'>
                                <fmt:message key="yourWebsites.manage" /></a>

                            <br />
-                           
-                           <c:if test="${perms.website.adminUserCount > 1 &&
perms.permissionMask == 3}">
-                              <img src='<c:url value="/images/Remove16.gif"/>' />
-                              <a href='javascript:resignWebsite("<c:out value='${perms.website.id}'/>","<c:out
value="${perms.website.handle}" />")'>
-                                  <fmt:message key='yourWebsites.resign' />
-                              </a>
-                           </c:if>
-                           
-                       </div>
+                       </c:if>
 
-                   </td>
-                   </tr>
+                       <%-- authors and limited bloggers can resign, but admin cannot
resign if he/she is the last admin in the blog --%>
+                       <c:if test="${perms.permissionMask == 0 || perms.permissionMask
== 1 || perms.website.adminUserCount > 1 }">
+                          <img src='<c:url value="/images/Remove16.gif"/>' />
+                          <c:url value="/editor/yourWebsites.do" var="resignWeblog">
+                               <c:param name="method" value="resign" />
+                               <c:param name="weblog" value="${perms.website.handle}"
/>
+                           </c:url>
+                          <a href='<c:out value="${resignWeblog}" />'>
+                              <fmt:message key='yourWebsites.resign' />
+                          </a>
+                       </c:if>
 
-               </table>
+                   </div>
 
-            </div>
+               </td>
+               </tr>
 
-        </c:forEach>
+           </table>
+
+        </div>
+
+    </c:forEach>
 
 </c:if>
 

Modified: incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp?rev=290536&r1=290535&r2=290536&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp Tue Sep 20 12:26:12
2005
@@ -8,7 +8,7 @@
              <h3><fmt:message key="yourWebsites.actions" /></h3>
              <hr size="1" noshade="noshade" />
           
-            <c:if test="${!empty model.permissions && model.groupBloggingEnabled}">
              
+            <c:if test="${model.groupBloggingEnabled}">               
                 <h3>
                 <roller:link forward="createWebsite">
                    <fmt:message key="yourWebsites.createWeblog" />

Modified: incubator/roller/branches/roller_2.0/web/website/edit-website.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/edit-website.jsp?rev=290536&r1=290535&r2=290536&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/edit-website.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/edit-website.jsp Tue Sep 20 12:26:12
2005
@@ -163,13 +163,17 @@
     <input type="submit" value='<fmt:message key="websiteSettings.button.update" />'
/>
 </div>
         
-<c:if test="${model.website.adminUserCount == 1}">
+<c:if test="${model.website.adminUserCount == 1 && model.groupBloggingEnabled}">
     <br />
     <br />
     <h2><fmt:message key="websiteSettings.removeWebsiteHeading" /></h2>
     <p class="subtitle">
         <fmt:message key="websiteSettings.removeWebsite" />
+        <span class="warning">
+            <fmt:message key="websiteSettings.removeWebsiteWarning" />
+        </span>
     </p>
+    <br />
     <input type="button" value='<fmt:message key="websiteSettings.button.remove" />'
 
         onclick='document.websiteFormEx.method.value="removeOk"; document.websiteFormEx.submit()'
/>
     <br />

Modified: incubator/roller/branches/roller_2.0/web/website/welcome.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/welcome.jsp?rev=290536&r1=290535&r2=290536&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/welcome.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/welcome.jsp Tue Sep 20 12:26:12 2005
@@ -6,6 +6,9 @@
 
 <p><a href='<c:out value="${contextURL}"/>/login-redirect.jsp'><fmt:message
key="welcome.clickHere" /></a> 
 <fmt:message key="welcome.toLoginAndPost" /></p>
+<br />
+<br />
+<br />
 
 
 



Mime
View raw message