roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r538336 [2/2] - in /roller/trunk: src/org/apache/roller/ui/authoring/struts2/ web/WEB-INF/ web/WEB-INF/classes/ web/WEB-INF/jsps/authoring/struts2/ web/WEB-INF/jsps/tiles/struts2/
Date Tue, 15 May 2007 21:48:46 GMT
Added: roller/trunk/web/WEB-INF/jsps/authoring/struts2/CommentsSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/authoring/struts2/CommentsSidebar.jsp?view=auto&rev=538336
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/authoring/struts2/CommentsSidebar.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/authoring/struts2/CommentsSidebar.jsp Tue May 15 14:48:45
2007
@@ -0,0 +1,92 @@
+<%--
+  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="sidebarFade">
+    <div class="menu-tr">
+        <div class="menu-tl">
+
+<div class="sidebarInner">
+
+<h3><s:text name="commentManagement.sidebarTitle" /></h3>
+<hr size="1" noshade="noshade" />
+
+<p><s:text name="commentManagement.sidebarDescription" /></p>
+    
+ <s:form action="comments!query">
+    <s:hidden name="weblog" />
+    
+    <div class="sideformrow">
+        <label for="searchString" class="sideformrow"><s:text name="commentManagement.searchString"
/>:</label>   
+        <s:textfield name="bean.searchString" />
+    </div>
+    <br />
+    <br />
+    
+    <div class="sideformrow">
+        <label for="startDateString" class="sideformrow"><s:text name="commentManagement.startDate"
/>:</label>
+        <s:datetimepicker name="bean.startDate" />
+    </div>
+        
+    <div class="sideformrow">
+        <label for="endDateString" class="sideformrow"><s:text name="commentManagement.endDate"
/>:</label>
+        <s:datetimepicker name="bean.endDate" />
+    </div>
+    <br />
+    <br />
+  
+    <div class="sideformrow">
+        <label for="pendingString" class="sideformrow">
+            <s:text name="commentManagement.pendingStatus" />
+            <br />
+            <br />
+            <br />
+            <br />            
+            <br />
+        </label> 
+        <div>
+            <s:radio name="approvedString" list="commentStatusOptions" listKey="key" listValue="value"
/>
+        </div>
+    </div> 
+    <br />
+
+    <div class="sideformrow">
+        <label for="spamString" class="sideformrow">
+            <s:text name="commentManagement.spamStatus" />   
+            <br />
+            <br />
+            <br />
+            <br />
+        </label>
+        <div>
+            <s:radio name="spamString" list="spamStatusOptions" listKey="key" listValue="value"
/>
+        </div>
+    </div>
+    <br />
+    
+    <s:submit key="commentManagement.query" />
+            
+</s:form>
+
+<br />
+<br />
+</div> <!-- sidebarInner -->
+
+        </div>
+    </div>
+</div>

Added: roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntryAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntryAdd.jsp?view=auto&rev=538336
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntryAdd.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntryAdd.jsp Tue May 15 14:48:45 2007
@@ -0,0 +1,180 @@
+<%--
+  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" %>
+
+<p class="subtitle">
+    <s:text name="weblogEdit.subtitle.newEntry" >
+        <s:param value="actionWeblog.handle" />
+    </s:text>
+</p>
+
+<s:form id="entry" action="entryAdd!save">
+    <s:hidden name="weblog" />
+    
+    <%-- ================================================================== --%>
+    <%-- Title, category, dates and other metadata --%>
+    
+    <table class="entryEditTable" cellpadding="0" cellspacing="0" width="100%">   
+        
+        <tr>
+            <td class="entryEditFormLabel">
+                <label for="title"><s:text name="weblogEdit.title" /></label>
+            </td>
+            <td>
+                <s:textfield name="bean.title" size="70" maxlength="255" tabindex="1"
/>
+            </td>
+        </tr>
+        
+        <tr>
+            <td class="entryEditFormLabel">
+                <label for="status"><s:text name="weblogEdit.status" /></label>
+            </td>
+            <td>
+                <span style="color:red; font-weight:bold"><s:text name="weblogEdit.unsaved"
/></span>
+                <s:hidden name="bean.status" value="" />
+            </td>
+        </tr>
+        
+        <tr>
+            <td class="entryEditFormLabel">
+                <label for="categoryId"><s:text name="weblogEdit.category" /></label>
+            </td>
+            <td>
+                <s:select name="bean.categoryId" list="actionWeblog.weblogCategories"
listKey="id" listValue="path" size="1" />
+            </td>
+        </tr>
+        
+        <tr>
+            <td class="entryEditFormLabel">
+                <label for="title"><s:text name="weblogEdit.tags" /></label>
+            </td>
+            <td>
+                <s:textfield id="entryEditTags" cssClass="entryEditTags" name="bean.tagsAsString"
size="70" maxlength="255" tabindex="3" />
+                <div id="entryEditTagsChoices" style="display:none" class="autocomplete"></div>
+                <br/>
+                <script type="text/javascript">
+                <!--
+		new RollerTagsAutoCompleter("entryEditTags", "entryEditTagsChoices", "<s:property value="jsonAutocompleteUrl"
/>", { tokens : [' ',','], minChars: 2 });
+                // --></script>
+            </td>
+        </tr> 
+        
+        <s:if test="actionWeblog.enableMultiLang">
+            <tr>
+                <td class="entryEditFormLabel">
+                    <label for="locale"><s:text name="weblogEdit.locale" /></label>
+                </td>
+                <td>
+                    <s:select name="bean.locale" size="1" list="localesList" listValue="displayName"
/>
+                </td>
+            </tr>
+        </s:if>
+        <s:else>
+            <s:hidden name="bean.locale"/>
+        </s:else>
+        
+    </table>
+    
+    
+    <%-- ================================================================== --%>
+    <%-- Weblog edit or preview --%>
+    
+    <div style="width: 100%;"> <%-- need this div to control text-area size in IE
6 --%>
+        <%-- include edit page --%>
+        <div>
+            <s:include value="%{editor.jspPage}" />
+        </div>
+    </div>
+    
+    <br />
+    
+    
+    <%-- ================================================================== --%>
+    <%-- plugin chooser --%>
+    
+    <s:if test="!entryPlugins.isEmpty">
+        <div id="pluginControlToggle" class="controlToggle">
+            <span id="ipluginControl">+</span>
+            <a class="controlToggle" onclick="javascript:toggleControl('pluginControlToggle','pluginControl')">
+            <s:text name="weblogEdit.pluginsToApply" /></a>
+        </div>
+        <div id="pluginControl" class="miscControl" style="display:none">
+            <s:checkboxlist name="bean.plugins" list="entryPlugins" listKey="name" listValue="name"
/>
+        </div>
+    </s:if>
+
+    
+    <%-- ================================================================== --%>
+    <%-- advanced settings  --%>
+    
+    <div id="miscControlToggle" class="controlToggle">
+        <span id="imiscControl">+</span>
+        <a class="controlToggle" onclick="javascript:toggleControl('miscControlToggle','miscControl')">
+        <s:text name="weblogEdit.miscSettings" /></a>
+    </div>
+    <div id="miscControl" class="miscControl" style="display:none">
+        
+        <label for="link"><s:text name="weblogEdit.pubTime" /></label>
+        <div>
+            <s:select name="bean.hours" list="hoursList" />
+            :
+            <s:select name="bean.minutes" list="minutesList" />
+            :
+            <s:select name="bean.seconds" list="secondsList" />
+            &nbsp;&nbsp;
+            <s:datetimepicker name="bean.dateString" />
+            <s:property value="actionWeblog.timeZone" />
+        </div>   
+        <br />
+        
+        <s:checkbox name="bean.allowComments" onchange="onAllowCommentsChange()" />
+        <s:text name="weblogEdit.allowComments" />
+        <s:text name="weblogEdit.commentDays" />
+        <s:select name="bean.commentDays" list="commentDaysList" size="1" listKey="key"
listValue="value" />
+        <br />
+        
+        <s:checkbox name="bean.rightToLeft" />
+        <s:text name="weblogEdit.rightToLeft" />
+        <br />
+        
+        <s:if test="authenticatedUser.hasRole('admin')">
+            <s:checkbox name="bean.pinnedToMain" />
+            <s:text name="weblogEdit.pinnedToMain" />
+            <br />
+        </s:if>
+        <br />
+        
+        <s:text name="weblogEdit.enclosureURL" />: <s:textfield name="bean.enclosureURL"
size="40" maxlength="255" />
+    </div>
+    
+    
+    <%-- ================================================================== --%>
+    <%-- the button box --%>
+    
+    <br>
+    <div class="control">
+        <s:if test="userAnAuthor">
+            <s:submit key="weblogEdit.post" onclick="document.getElementById('entry_bean_status').value='PUBLISHED';"/>
+        </s:if>
+        <s:else>
+            <s:submit key="weblogEdit.submitForReview" onclick="document.getElementById('entry_bean_status').value='PENDING';"/>
+        </s:else>
+        <s:submit key="weblogEdit.save" onclick="document.getElementById('entry_bean_status').value='DRAFT';"
/>
+    </div>
+    
+</s:form>

Added: roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntryEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntryEdit.jsp?view=auto&rev=538336
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntryEdit.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntryEdit.jsp Tue May 15 14:48:45 2007
@@ -0,0 +1,237 @@
+<%--
+  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" %>
+
+<script type="text/javascript">
+<!--
+function fullPreviewMode() {
+    window.open('<s:property value="previewURL" />', '_preview', '');
+}
+-->
+</script>
+
+<p class="subtitle">
+    <s:text name="weblogEdit.subtitle.editEntry" >
+        <s:param value="actionWeblog.handle" />
+    </s:text>
+</p>
+
+<s:form id="entry" action="entryEdit!save">
+    <s:hidden name="weblog" />
+    <s:hidden name="bean.id" />
+    
+    <%-- ================================================================== --%>
+    <%-- Title, category, dates and other metadata --%>
+    
+    <table class="entryEditTable" cellpadding="0" cellspacing="0" width="100%">   
+        
+        <tr>
+            <td class="entryEditFormLabel">
+                <label for="title"><s:text name="weblogEdit.title" /></label>
+            </td>
+            <td>
+                <s:textfield name="bean.title" size="70" maxlength="255" tabindex="1"
/>
+            </td>
+        </tr>
+        
+        <tr>
+            <td class="entryEditFormLabel">
+                <label for="status"><s:text name="weblogEdit.status" /></label>
+            </td>
+            <td>
+                <s:if test="bean.published">
+                    <span style="color:green; font-weight:bold">
+                        <s:text name="weblogEdit.published" />
+                        (<s:text name="weblogEdit.updateTime" />
+                        <s:date name="entry.updateTime" format="dd/MM/yyyy hh:mm a" />)
+                        <a href='<s:property value="entry.permalink" />'>
+                            <s:property value="entry.permaLink" />
+                        </a>
+                    </span>
+                </s:if>
+                <s:elseif test="bean.draft">
+                    <span style="color:orange; font-weight:bold">
+                        <s:text name="weblogEdit.draft" />
+                        (<s:text name="weblogEdit.updateTime" />
+                        <s:date name="entry.updateTime" />)
+                    </span>
+                </s:elseif>
+                <s:elseif test="bean.pending">
+                    <span style="color:orange; font-weight:bold">
+                        <s:text name="weblogEdit.pending" />
+                        (<s:text name="weblogEdit.updateTime" />
+                        <s:date name="entry.updateTime" />)
+                    </span>
+                </s:elseif>
+                <s:hidden name="bean.status" />
+            </td>
+        </tr>
+    
+        <tr>
+            <td class="entryEditFormLabel">
+                <label for="categoryId"><s:text name="weblogEdit.category" /></label>
+            </td>
+            <td>
+                <s:select name="bean.categoryId" list="actionWeblog.weblogCategories"
listKey="id" listValue="path" size="1" />
+            </td>
+        </tr>
+        
+        <tr>
+            <td class="entryEditFormLabel">
+                <label for="title"><s:text name="weblogEdit.tags" /></label>
+            </td>
+            <td>
+                <s:textfield cssClass="entryEditTags" name="bean.tagsAsString" size="70"
maxlength="255" tabindex="3" />
+                <div id="entryEditTagsChoices" style="display:none" class="autocomplete"></div>
+                <br/>
+                <script type="text/javascript">
+                <!--
+		new RollerTagsAutoCompleter("entryEditTags", "entryEditTagsChoices", "<s:property value="jsonAutocompleteUrl"
/>", { tokens : [' ',','], minChars: 2 });
+                // --></script>
+            </td>
+        </tr> 
+        
+        <s:if test="actionWeblog.enableMultiLang">
+            <tr>
+                <td class="entryEditFormLabel">
+                    <label for="locale"><s:text name="weblogEdit.locale" /></label>
+                </td>
+                <td>
+                    <s:select name="bean.locale" size="1" list="localesList" listValue="displayName"
/>
+                </td>
+            </tr>
+        </s:if>
+        <s:else>
+            <s:hidden name="bean.locale"/>
+        </s:else>
+        
+    </table>
+    
+    
+    <%-- ================================================================== --%>
+    <%-- Weblog edit or preview --%>
+    
+    <div style="width: 100%;"> <%-- need this div to control text-area size in IE
6 --%>
+        <%-- include edit page --%>
+        <div >
+            <s:include value="%{editor.jspPage}" />
+        </div>
+    </div>
+    
+    <br />
+    
+    
+    <%-- ================================================================== --%>
+    <%-- plugin chooser --%>
+    
+    <s:if test="!entryPlugins.isEmpty">
+        <div id="pluginControlToggle" class="controlToggle">
+            <span id="ipluginControl">+</span>
+            <a class="controlToggle" onclick="javascript:toggleControl('pluginControlToggle','pluginControl')">
+            <s:text name="weblogEdit.pluginsToApply" /></a>
+        </div>
+        <div id="pluginControl" class="miscControl" style="display:none">
+            <s:checkboxlist name="bean.plugins" list="entryPlugins" listKey="name" listValue="name"
/>
+        </div>
+    </s:if>
+
+    
+    <%-- ================================================================== --%>
+    <%-- advanced settings  --%>
+    
+    <div id="miscControlToggle" class="controlToggle">
+        <span id="imiscControl">+</span>
+        <a class="controlToggle" onclick="javascript:toggleControl('miscControlToggle','miscControl')">
+        <s:text name="weblogEdit.miscSettings" /></a>
+    </div>
+    <div id="miscControl" class="miscControl" style="display:none">
+        
+        <label for="link"><s:text name="weblogEdit.pubTime" /></label>
+        <div>
+            <s:select name="bean.hours" list="hoursList" />
+            :
+            <s:select name="bean.minutes" list="minutesList" />
+            :
+            <s:select name="bean.seconds" list="secondsList" />
+            &nbsp;&nbsp;
+            <s:datetimepicker name="bean.dateString" />
+            <s:property value="actionWeblog.timeZone" />
+        </div>   
+        <br />
+        
+        <s:checkbox name="bean.allowComments" />
+        <s:text name="weblogEdit.allowComments" />
+        <s:text name="weblogEdit.commentDays" />
+        <s:select name="bean.commentDays" list="commentDaysList" size="1" listKey="key"
listValue="value" />
+        <br />
+        
+        <s:checkbox name="bean.rightToLeft" />
+        <s:text name="weblogEdit.rightToLeft" />
+        <br />
+        
+        <s:if test="authenticatedUser.hasRole('admin')">
+            <s:checkbox name="bean.pinnedToMain" />
+            <s:text name="weblogEdit.pinnedToMain" />
+            <br />
+        </s:if>
+        <br />
+        
+        <s:text name="weblogEdit.enclosureURL" />: <s:textfield name="bean.enclosureURL"
size="40" maxlength="255" />
+        <s:if test="bean.enclosureURL != null">
+            <s:text name="weblogEdit.enclosureType" />: <s:property value="entry.attributes['att_mediacast_type']"
/>
+            <s:text name="weblogEdit.enclosureLength" />: <s:property value="entry.attributes['att_mediacast_length']"
/>
+        </s:if>
+    </div>
+    
+    
+    <%-- ================================================================== --%>
+    <%-- the button box --%>
+    
+    <br>
+    <div class="control">
+        <s:if test="userAnAuthor">
+            <s:submit key="weblogEdit.post" onclick="document.getElementById('entryAdd_bean_status').value='PUBLISHED';"/>
+        </s:if>
+        <s:else>
+            <s:submit key="weblogEdit.submitForReview" onclick="document.getElementById('entryAdd_bean_status').value='PENDING';"/>
+        </s:else>
+        
+        <s:submit key="weblogEdit.save" onclick="document.getElementById('entryAdd_bean_status').value='DRAFT';"
/>
+        
+        <s:submit key="weblogEdit.deleteEntry" action="entryRemove" />
+        <s:hidden name="removeId" value="%{entry.id}" />
+        
+        <input type="button" name="fullPreview"
+                            value='<s:text name="weblogEdit.fullPreviewMode" />'
+                            onclick="fullPreviewMode()" />
+    </div>
+    
+    
+    <%-- ================================================================== --%>
+    <%-- Trackback control --%>
+    <s:if test="userAnAuthor">
+        <br />
+        <h2><s:text name="weblogEdit.trackback" /></h2>
+        <s:text name="weblogEdit.trackbackUrl" />
+        <br />
+        <s:textfield name="trackbackUrl" size="80" maxlength="255" />
+
+        <s:submit key="weblogEdit.sendTrackback" action="entryEdit!trackback" />
+    </s:if>
+    
+</s:form>

Added: roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntryRemove.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntryRemove.jsp?view=auto&rev=538336
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntryRemove.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntryRemove.jsp Tue May 15 14:48:45 2007
@@ -0,0 +1,48 @@
+<%--
+  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" %>
+
+<h2>
+    <s:text name="weblogEntryRemove.removeWeblogEntry" /> [<s:property value="removeEntry.title"/>]
+</h2>
+
+<p><s:text name="weblogEntryRemove.areYouSure" /></p>
+<p>
+    <s:text name="weblogEntryRemove.entryTitle" /> = [<s:property value="removeEntry.title"/>]<br
/>
+    <s:text name="weblogEntryRemove.entryId" /> = [<s:property value="removeEntry.id"/>]
+</p>
+
+<table>
+<tr>
+<td>
+    <s:form action="entryRemove!remove">
+        <s:hidden name="weblog" />
+        <s:hidden name="removeId" />
+        <s:submit key="weblogEntryRemove.yes" />
+    </s:form>
+    </div>
+</td>
+<td>
+    <s:form action="entryEdit">
+        <s:hidden name="weblog" />
+        <s:hidden name="bean.id" value="%{removeId}" />
+        <s:submit key="weblogEntryRemove.no" />
+    </s:form>
+</td>
+</tr>
+</table>

Added: roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntrySidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntrySidebar.jsp?view=auto&rev=538336
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntrySidebar.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntrySidebar.jsp Tue May 15 14:48:45 2007
@@ -0,0 +1,118 @@
+<%--
+  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="sidebarFade">
+    <div class="menu-tr">
+        <div class="menu-tl">
+            
+            <div class="sidebarInner">
+                
+                <h3><s:text name="weblogEdit.comments" /></h3>
+                <span><s:text name="application.none" /></span>
+                
+                <hr size="1" noshade="noshade" />  
+                <h3><s:text name="weblogEdit.pendingEntries" /></h3>
+                
+                <s:set name="pendingEntries" value="recentPendingEntries" />
+                <s:if test="#pendingEntries.isEmpty">
+                    <span><s:text name="application.none" /></span>
+                </s:if>
+                <s:iterator id="post" value="#pendingEntries">
+                    <span class="entryEditSidebarLink">
+                        <s:url id="editUrl" action="entryEdit">
+                            <s:param name="weblog" value="%{actionWeblog.handle}" />
+                            <s:param name="bean.id" value="#post.id" />
+                        </s:url>
+                        <img src='<s:url value="/images/table_error.png"/>' 
+                             align="absmiddle" border="0" alt="icon" title="Edit" />
+                             <s:a href="%{editUrl}"><str:truncateNicely lower="50"><s:property
value="#post.title" /></str:truncateNicely></s:a>
+                    </span><br />
+                </s:iterator>
+                
+                
+                <hr size="1" noshade="noshade" />            
+                <h3><s:text name="weblogEdit.draftEntries" /></h3>
+                
+                <s:set name="draftEntries" value="recentDraftEntries" />
+                <s:if test="#draftEntries.isEmpty">
+                    <span><s:text name="application.none" /></span>
+                </s:if>
+                <s:iterator id="post" value="#draftEntries">
+                    <span class="entryEditSidebarLink">
+                        <s:url id="editUrl" action="entryEdit">
+                            <s:param name="weblog" value="%{actionWeblog.handle}" />
+                            <s:param name="bean.id" value="#post.id" />
+                        </s:url>
+                        <img src='<s:url value="/images/table_edit.png"/>' 
+                             align="absmiddle" border="0" alt="icon" title="Edit" />
+                             <s:a href="%{editUrl}"><str:truncateNicely lower="50"><s:property
value="#post.title" /></str:truncateNicely></s:a>
+                    </span><br />
+                </s:iterator>
+                
+                
+                <s:if test="userAnAuthor">
+                    
+                    <hr size="1" noshade="noshade" />
+                    <h3><s:text name="weblogEdit.publishedEntries" /></h3>
+                    
+                    <s:set name="pubEntries" value="recentPublishedEntries" />
+                    <s:if test="#pubEntries.isEmpty">
+                        <span><s:text name="application.none" /></span>
+                    </s:if>
+                    <s:iterator id="post" value="#pubEntries">
+                        <span class="entryEditSidebarLink">
+                            <s:url id="editUrl" action="entryEdit">
+                                <s:param name="weblog" value="%{actionWeblog.handle}"
/>
+                                <s:param name="bean.id" value="#post.id" />
+                            </s:url>
+                            <img src='<s:url value="/images/table_edit.png"/>' 
+                                 align="absmiddle" border="0" alt="icon" title="Edit" />
+                            <s:a href="%{editUrl}"><str:truncateNicely lower="50"><s:property
value="#post.title" /></str:truncateNicely></s:a>
+                        </span><br />
+                    </s:iterator>
+                    
+                    
+                    <hr size="1" noshade="noshade" />            
+                    <h3><s:text name="weblogEdit.scheduledEntries" /></h3>
+                    
+                    <s:set name="schedEntries" value="recentScheduledEntries" />
+                    <s:if test="#schedEntries.isEmpty">
+                        <span><s:text name="application.none" /></span>
+                    </s:if>
+                    <s:iterator id="post" value="#schedEntries">
+                        <span class="entryEditSidebarLink">
+                            <s:url id="editUrl" action="entryEdit">
+                                <s:param name="weblog" value="%{actionWeblog.handle}"
/>
+                                <s:param name="bean.id" value="#post.id" />
+                            </s:url>
+                            <img src='<s:url value="/images/table_edit.png"/>' 
+                                 align="absmiddle" border="0" alt="icon" title="Edit" />
+                            <s:a href="%{editUrl}"><str:truncateNicely lower="50"><s:property
value="#post.title" /></str:truncateNicely></s:a>
+                        </span><br />
+                    </s:iterator>
+                    
+                </s:if>
+                
+                <br />
+                <br />
+            </div>
+            
+        </div>
+    </div>
+</div>

Modified: roller/trunk/web/WEB-INF/jsps/tiles/struts2/messages.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/messages.jsp?view=diff&rev=538336&r1=538335&r2=538336
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/messages.jsp (original)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/messages.jsp Tue May 15 14:48:45 2007
@@ -32,15 +32,18 @@
 </script>
 
 <%-- Success Messages --%>
-<s:if test="! actionMessages.isEmpty">
+<s:if test="!actionMessages.isEmpty">
     <div id="messages" class="messages">
         <s:actionmessage />
     </div>
 </s:if>
 
 <%-- Error Messages --%>
-<s:if test="! actionErrors.isEmpty">
+<s:if test="!actionErrors.isEmpty || !fieldErrors.isEmpty">
     <div id="errors" class="errors">
         <s:actionerror />
+        <s:iterator id="key" value="fieldErrors">
+            <s:property value="#key.value" />
+        </s:iterator>
     </div>
 </s:if>

Modified: roller/trunk/web/WEB-INF/tiles.xml
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/tiles.xml?view=diff&rev=538336&r1=538335&r2=538336
==============================================================================
--- roller/trunk/web/WEB-INF/tiles.xml (original)
+++ roller/trunk/web/WEB-INF/tiles.xml Tue May 15 14:48:45 2007
@@ -139,14 +139,22 @@
     
     
     <!-- weblog editor pages (and associates) -->
-    <definition name=".WeblogEdit" extends=".tiles-tabbedpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/WeblogEdit.jsp" />
-        <put name="sidebar" value="/WEB-INF/jsps/authoring/WeblogEditSidebar.jsp" />
+    <definition name=".EntryAdd" extends=".tiles-tabbedpage" >
+        <put name="head" value="/WEB-INF/jsps/tiles/struts2/head-ajax.jsp" />
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/EntryAdd.jsp" />
+        <put name="sidebar" value="/WEB-INF/jsps/authoring/struts2/EntrySidebar.jsp" />
         <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
     </definition>
     
-    <definition name=".WeblogEntryRemove" extends=".tiles-tabbedpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/WeblogEntryRemove.jsp" />
+    <definition name=".EntryEdit" extends=".tiles-tabbedpage" >
+        <put name="head" value="/WEB-INF/jsps/tiles/struts2/head-ajax.jsp" />
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/EntryEdit.jsp" />
+        <put name="sidebar" value="/WEB-INF/jsps/authoring/struts2/EntrySidebar.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
+    </definition>
+    
+    <definition name=".EntryRemove" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/EntryRemove.jsp" />
         <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
     </definition>
     
@@ -156,15 +164,10 @@
         <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
     </definition>
     
-    <definition name=".CommentManagement" extends=".tiles-tabbedpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/CommentManagement.jsp" />
-        <put name="sidebar" value="/WEB-INF/jsps/authoring/CommentManagementSidebar.jsp"
/>
-        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
-    </definition>
-    
-    <definition name=".CommentManagementGlobal" extends=".tiles-tabbedpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/CommentManagement.jsp" />
-        <put name="sidebar" value="/WEB-INF/jsps/authoring/CommentManagementSidebar.jsp"
/>
+    <definition name=".Comments" extends=".tiles-tabbedpage" >
+        <put name="head" value="/WEB-INF/jsps/tiles/struts2/head-ajax.jsp" />
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/Comments.jsp" />
+        <put name="sidebar" value="/WEB-INF/jsps/authoring/struts2/CommentsSidebar.jsp"
/>
         <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
     </definition>
     



Mime
View raw message