roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ghu...@apache.org
Subject svn commit: r1239569 - in /roller/trunk: weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ weblogger-web/src/main/resources/ weblogger-web/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/ weblogger-webapp/src/m...
Date Thu, 02 Feb 2012 12:14:08 GMT
Author: ghuber
Date: Thu Feb  2 12:14:07 2012
New Revision: 1239569

URL: http://svn.apache.org/viewvc?rev=1239569&view=rev
Log:
Template testing/mods.....

Added:
    roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java
  (with props)
    roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplatesRemove.jsp
  (with props)
Modified:
    roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
    roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties
    roller/trunk/weblogger-web/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
    roller/trunk/weblogger-web/src/main/resources/struts.xml
    roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp
    roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/tiles.xml
    roller/trunk/weblogger-webapp/src/main/webapp/theme/scripts/roller.js
    roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/theme.xml
    roller/trunk/weblogger-webapp/src/main/webapp/themes/brushedmetal/theme.xml
    roller/trunk/weblogger-webapp/src/main/webapp/themes/sotto/theme.xml

Modified: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java?rev=1239569&r1=1239568&r2=1239569&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
(original)
+++ roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
Thu Feb  2 12:14:07 2012
@@ -53,7 +53,6 @@ public class Templates extends UIAction 
     private String newTmplAction = null;
     private String type = null;
     
-    
     public Templates() {
         this.actionName = "templates";
         this.desiredMenu = "editor";
@@ -98,6 +97,8 @@ public class Templates extends UIAction 
                         availableActions.remove(tmpPage.getAction());
                     }
                 }
+            } else if (pages.isEmpty()) {
+                availableActions.add(WeblogTemplate.ACTION_WEBLOG);
             }
             setAvailableActions(availableActions);
 
@@ -169,6 +170,10 @@ public class Templates extends UIAction 
             // flush results to db
             WebloggerFactory.getWeblogger().flush();
             
+            // reset form fields
+            setNewTmplName(null);
+            setNewTmplAction(null);
+            
         } catch (WebloggerException ex) {
             log.error("Error adding new template for weblog - "+getActionWeblog().getHandle(),
ex);
             // TODO: i18n
@@ -248,5 +253,4 @@ public class Templates extends UIAction 
         this.newTmplAction = newTmplAction;
     }
 
-
 }

Added: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java?rev=1239569&view=auto
==============================================================================
--- roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java
(added)
+++ roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java
Thu Feb  2 12:14:07 2012
@@ -0,0 +1,268 @@
+/*
+ * 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.
+ */
+
+package org.apache.roller.weblogger.ui.struts2.editor;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.pojos.ThemeTemplate;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.pojos.WeblogTemplate;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.util.Utilities;
+import org.apache.roller.weblogger.util.cache.CacheManager;
+
+/**
+ * Remove templates.
+ */
+public class TemplatesRemove extends UIAction {
+
+	private static final long serialVersionUID = 895186156151331087L;
+	private static Log log = LogFactory.getLog(TemplatesRemove.class);
+
+	// Templates to remove
+	private String[] idSelections = null;
+
+	// Limit updates to just this set of comma-separated IDs
+	private String ids = null;
+
+	// list of templates to display
+	private List<WeblogTemplate> templates = Collections.emptyList();;
+
+	public TemplatesRemove() {
+		this.actionName = "templatesRemove";
+		this.desiredMenu = "editor";
+		this.pageTitle = "editPages.title.removeOK";
+	}
+
+	@Override
+	public List<String> requiredWeblogPermissionActions() {
+		return Collections.singletonList(WeblogPermission.ADMIN);
+	}
+
+	public void myPrepare() {
+
+		if (getIdSelections() != null) {
+
+			// query for templates list
+			try {
+
+				WeblogManager mgr = WebloggerFactory.getWeblogger()
+						.getWeblogManager();
+
+				List<WeblogTemplate> pages = new ArrayList<WeblogTemplate>();
+				WeblogTemplate template = null;
+
+				String[] idsToDelete = getIdSelections();
+				if (idsToDelete != null && idsToDelete.length > 0) {
+
+					for (int i = 0; i < idsToDelete.length; i++) {
+						if (!idsToDelete[i].equals("")) {
+							template = mgr.getPage(idsToDelete[i]);
+							if (template != null) {
+								pages.add(template);
+							}
+						}
+					}
+
+				}
+
+				// Set page data
+				setTemplates(pages);
+				setIds(Utilities.stringArrayToString(idsToDelete, ","));
+
+				// Flush for operation
+				WebloggerFactory.getWeblogger().flush();
+
+			} catch (Exception ex) {
+				log.error("Error getting templates for weblog - "
+						+ getActionWeblog().getHandle(), ex);
+				addError("error.unexpected");
+			}
+
+		}
+	}
+
+	/**
+	 * Display the remove template confirmation.
+	 */
+	public String execute() {
+
+		if (getIds() != null && getTemplates() != null
+				&& getTemplates().size() > 0) {
+			return "confirm";
+		} else {
+			return SUCCESS;
+		}
+
+	}
+
+	/**
+	 * Remove Selected templates
+	 */
+	public String remove() {
+
+		if (getIds() != null)
+
+			try {
+
+				WeblogManager mgr = WebloggerFactory.getWeblogger()
+						.getWeblogManager();
+
+				String[] idsToDelete = Utilities.stringToStringArray(getIds(),
+						",");
+				if (idsToDelete != null && idsToDelete.length > 0) {
+
+					Weblog weblog = getActionWeblog();
+					WeblogTemplate template = null;
+
+					for (int i = 0; i < idsToDelete.length; i++) {
+						if (!idsToDelete[i].equals("")) {
+
+							template = mgr.getPage(idsToDelete[i]);
+							if (!template.isRequired()
+									|| !WeblogTemplate.ACTION_CUSTOM
+											.equals(getActionWeblog()
+													.getEditorTheme())) {
+
+								// if weblog template remove custom style sheet also
+								if (template.getName().equals(
+										WeblogTemplate.DEFAULT_PAGE)) {
+
+									ThemeTemplate stylesheet = getActionWeblog()
+											.getTheme().getStylesheet();
+
+									// Delete style sheet if the same if found
+									if (stylesheet != null
+											&& getActionWeblog().getTheme()
+													.getStylesheet() != null
+											&& stylesheet.getLink().equals(
+													getActionWeblog()
+															.getTheme()
+															.getStylesheet()
+															.getLink())) {
+										// Same so OK to delete
+										WeblogTemplate css = mgr.getPageByLink(
+												getActionWeblog(),
+												stylesheet.getLink());
+
+										if (css != null) {
+											mgr.removePage(css);
+										}
+									}
+
+									// Clear for next custom theme
+									weblog.setCustomStylesheetPath(null);
+
+								}
+
+								mgr.removePage(template);
+
+							}
+						}
+					}
+
+					// Save for changes
+					mgr.saveWeblog(weblog);
+					
+					WebloggerFactory.getWeblogger().flush();
+
+					// notify caches
+					CacheManager.invalidate(getActionWeblog());
+
+					addMessage("referers.deletedTemplates");
+
+				}
+
+				return SUCCESS;
+
+			} catch (Exception e) {
+				log.error("Error deleting templates for weblog - "
+						+ getActionWeblog().getHandle(), e);
+
+				addError("error.unexpected");
+
+			}
+
+		return "confirm";
+	}
+
+	/**
+	 * Cancel.
+	 * 
+	 * @return the string
+	 */
+	public String cancel() {
+		return "cancel";
+	}
+
+	/**
+	 * Gets the templates.
+	 * 
+	 * @return the templates
+	 */
+	public List<WeblogTemplate> getTemplates() {
+		return templates;
+	}
+
+	/**
+	 * Sets the templates.
+	 * 
+	 * @param templates
+	 *            the new templates
+	 */
+	public void setTemplates(List<WeblogTemplate> templates) {
+		this.templates = templates;
+	}
+
+	/**
+	 * Select check boxes for deleting records
+	 */
+	public String[] getIdSelections() {
+		return idSelections;
+	}
+
+	/**
+	 * Select check boxes for deleting records
+	 */
+	public void setIdSelections(String[] idSelections) {
+		this.idSelections = idSelections;
+	}
+
+	/**
+	 * Comma separated list if ids to remove
+	 */
+	public String getIds() {
+		return ids;
+	}
+
+	/**
+	 * Comma separated list if ids to remove
+	 */
+	public void setIds(String ids) {
+		this.ids = ids;
+	}
+
+}

Propchange: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties?rev=1239569&r1=1239568&r2=1239569&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties Thu Feb
 2 12:14:07 2012
@@ -585,7 +585,7 @@ correct username.
 error.permissionDenied.reason3=Your blog server''s database connection is \
 misconfigured. To resolve this problem, see your system administrator.
 
-
+error.unexpected=Unexpected error. If this error occurs again, please contact the administrator.
 #-------------------------------------------------------------- Struts Validator
 
 errors.header=<div class="error"><ul>
@@ -1279,6 +1279,7 @@ They will not be shown in the navigation
 pagesForm.addNewPage=Add a new template
 pagesForm.addNewPage.success=New template <strong>{0}</strong> added successfully.
 pagesForm.add=Add
+pagesForm.deleteselected=Delete Selected
 pagesForm.emptyPage=Empty template...
 pagesForm.themesReminder=<b>Reminder:</b> You are currently using the {0} shared
\
 theme, so some template edits may not effect how your blog looks.
@@ -1292,6 +1293,7 @@ pagesForm.column.hidden=Hidden page
 pageCache.flushed=Page cache has been successfully flushed.
 
 pagesForm.error.alreadyExists=The template {0} already exists.
+pagesForm.deletedtemplates=Deleted specified templates.
 
 # -------------------------------------------------------------------- Page edit
 
@@ -1323,7 +1325,8 @@ pageForm.save.success=Template updated s
 pageForm.launch=launch
 pageForm.useAutoContentType=Automatically set content type
 pageForm.useManualContentType=Use manually specified content-type
-pageForm.notemplates=There are currently no templates defined
+pageForm.notemplates=No templates defined. Select action ''weblog'' to create from \
+scratch or a predefined theme from the Theme tab.
 pageForm.templateLanguage=Template Language
 
 pageForm.outputContentType=Content-Type
@@ -1334,7 +1337,11 @@ pageForm.outputContentTypeStyle=CSS (tes
 pageForm.outputContentTypeCustom=Custom...
 
 pageRemove.subtitle=Confirm removal of page
+pageRemoves.subtitle=Confirm removal of pages
 pageRemove.youSure=Are you sure you want to remove this page?
+pageRemoves.youSure=Are you sure you want to remove these pages?
+pageRemoves.youSureWarning=<b>WARNING</b>: this will may remove custom html/css
design and is <b>NOT REVERSIBLE</b>. \
+You might want to backup your stylesheet if you are not sure.
 pageRemove.pageId=Page ID
 pageRemove.pageName=Page Name
 

Modified: roller/trunk/weblogger-web/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml?rev=1239569&r1=1239568&r2=1239569&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
(original)
+++ roller/trunk/weblogger-web/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
Thu Feb  2 12:14:07 2012
@@ -90,7 +90,7 @@ Each menu or menu item is governed by fo
                    name="tabbedmenu.website.pages" 
                    globalPerms="login"
                    weblogPerms="admin" 
-                   subactions="templateAdd,templateEdit,templateRemove" />
+                   subactions="templateAdd,templateEdit,templateRemove,templatesRemove" />
                    
     </menu>
     

Modified: roller/trunk/weblogger-web/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/resources/struts.xml?rev=1239569&r1=1239568&r2=1239569&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/resources/struts.xml (original)
+++ roller/trunk/weblogger-web/src/main/resources/struts.xml Thu Feb  2 12:14:07 2012
@@ -422,6 +422,20 @@
             <result name="success" type="chain">templates</result>
         </action>
         
+        <action name="templatesRemove!*" method="{1}"
+                class="org.apache.roller.weblogger.ui.struts2.editor.TemplatesRemove">
+            <result name="input" type="tiles">.TemplatesRemove</result>
+            <result name="confirm" type="tiles">.TemplatesRemove</result>
+            <result name="success" type="chain">templates</result>
+            <result name="cancel" type="redirectAction">
+                <param name="actionName">templates</param>
+                <param name="parse">true</param>
+                <param name="weblog">${weblog}</param>
+                <param name="suppressEmptyParameters">true</param>
+            </result>
+            <result name="error" type="chain">templates</result>
+        </action>
+        
         <action name="members!*" method="{1}"
                 class="org.apache.roller.weblogger.ui.struts2.editor.Members">
             <result name="list" type="tiles">.Members</result>

Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp?rev=1239569&r1=1239568&r2=1239569&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp Thu Feb
 2 12:14:07 2012
@@ -30,13 +30,17 @@
     <p><s:text name="pagesForm.themesReminder"><s:param value="actionWeblog.editorTheme"/></s:text></p>
 </s:if>
 
+<s:form action="templatesRemove">
+<s:hidden name="weblog" value="%{actionWeblog.handle}" />
+
 <%-- table of pages --%>
 <table class="rollertable">
     <tr>
         <th width="30%"><s:text name="pagesForm.name" /></th>
         <th width="10"><s:text name="pagesForm.action" /></th>
-        <th width="60%"><s:text name="pagesForm.description" /></th>
+        <th width="55%"><s:text name="pagesForm.description" /></th>
         <th width="10"><s:text name="pagesForm.remove" /></th>
+        <th width="5"><input type="checkbox" onclick="toggleFunction(this.checked,'idSelections');"/></th>
     </tr>
     <s:iterator id="p" value="templates" status="rowstatus">
         <s:if test="#rowstatus.odd == true">
@@ -77,14 +81,31 @@
                         title='<s:text name="pagesForm.required"/>' />
                  </s:else>
             </td>
-
+            <td class="center" style="vertical-align:middle">
+                <s:if test="!#p.required || !customTheme" >
+                    <input type="checkbox" name="idSelections" value="<s:property value="#p.id"
/>" />
+                </s:if>
+                 <s:else>
+                    <input type="checkbox" name="idSelections" value="<s:property value="#p.id"
/>" disabled="disabled"/>
+                 </s:else>
+            </td>
         </tr>
     </s:iterator>
     <s:if test="templates.isEmpty">
         <tr class="rollertable_odd">
-            <td style="vertical-align:middle" colspan="4" >
+            <td style="vertical-align:middle" colspan="5" >
                 <s:text name="pageForm.notemplates"/>
             </td>
         </tr>
     </s:if>
 </table>
+
+<br/>
+
+<s:if test="!templates.isEmpty">
+	<div class="control">
+		<s:submit value="%{getText('pagesForm.deleteselected')}" />
+	</div>
+</s:if>
+
+</s:form>

Added: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplatesRemove.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplatesRemove.jsp?rev=1239569&view=auto
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplatesRemove.jsp
(added)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplatesRemove.jsp
Thu Feb  2 12:14:07 2012
@@ -0,0 +1,53 @@
+<%--
+  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="pageRemoves.subtitle" />
+</p>
+
+<p>
+	<s:text name="pageRemoves.youSure" />
+	<br/>
+	<br/>
+	<span class="warning">
+		<s:text name="pageRemoves.youSureWarning" />
+	</span>
+</p>
+
+<s:form action="templatesRemove">
+	<s:hidden name="ids" />
+	<s:hidden name="weblog" value="%{actionWeblog.handle}" />
+	
+	<s:iterator id="p" value="templates" status="rowstatus">
+		<p>
+			<s:text name="pageRemove.pageId" /> = [<s:property value="#p.id" />]
+			<s:text name="pageRemove.pageName" /> = [<s:property value="#p.name" />]
+		</p>
+	</s:iterator>
+
+	<table>
+		<tr>
+			<td>
+				<s:submit value="%{getText('application.yes')}" action="templatesRemove!remove" />&nbsp;
+				<s:submit value="%{getText('application.no')}" action="templatesRemove!cancel" />
+			</td>
+		</tr>
+	</table>
+
+</s:form>
\ No newline at end of file

Propchange: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplatesRemove.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/tiles.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/tiles.xml?rev=1239569&r1=1239568&r2=1239569&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/tiles.xml (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/tiles.xml Thu Feb  2 12:14:07 2012
@@ -432,6 +432,11 @@
         <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
     </definition>
     
+    <definition name=".TemplatesRemove" extends=".tiles-tabbedpage"  >
+        <put-attribute name="content" value="/WEB-INF/jsps/editor/TemplatesRemove.jsp"
/>
+        <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
+    </definition>
+    
     <definition name=".Members" extends=".tiles-tabbedpage" >
         <put-attribute name="content" value="/WEB-INF/jsps/editor/Members.jsp" />
         <put-attribute name="sidebar" value="/WEB-INF/jsps/editor/MembersSidebar.jsp"
/>

Modified: roller/trunk/weblogger-webapp/src/main/webapp/theme/scripts/roller.js
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/theme/scripts/roller.js?rev=1239569&r1=1239568&r2=1239569&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/theme/scripts/roller.js (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/theme/scripts/roller.js Thu Feb  2 12:14:07
2012
@@ -177,4 +177,18 @@ function isblank(s) {
 }
 
 // Show the document's title on the status bar
-window.defaultStatus=document.title;
\ No newline at end of file
+window.defaultStatus=document.title;
+
+// Toggle check boxes
+function toggleFunction(toggle,name) {;
+	var inputs = document.getElementsByName(name);
+	for(var i = 0; i < inputs.length ; i++) {
+		if(inputs[i].type == 'checkbox' && inputs[i].disabled == false) {
+			if (inputs[i].checked==true){
+				inputs[i].checked = !inputs[i].checked;
+			} else{
+				inputs[i].checked = toggle;
+			}
+		}
+	}
+};
\ No newline at end of file

Modified: roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/theme.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/theme.xml?rev=1239569&r1=1239568&r2=1239569&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/theme.xml (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/theme.xml Thu Feb  2 12:14:07
2012
@@ -24,7 +24,7 @@
     
     <!-- templates -->
     <template action="weblog">
-        <name>weblog</name>
+        <name>Weblog</name>
         <description>weblog</description>
 	<link></link>
         <navbar>false</navbar>

Modified: roller/trunk/weblogger-webapp/src/main/webapp/themes/brushedmetal/theme.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/themes/brushedmetal/theme.xml?rev=1239569&r1=1239568&r2=1239569&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/themes/brushedmetal/theme.xml (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/themes/brushedmetal/theme.xml Thu Feb  2
12:14:07 2012
@@ -24,7 +24,7 @@
     
     <!-- templates -->
     <template action="weblog">
-        <name>weblog</name>
+        <name>Weblog</name>
         <description>weblog</description>
 	<link></link>
         <navbar>false</navbar>

Modified: roller/trunk/weblogger-webapp/src/main/webapp/themes/sotto/theme.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/themes/sotto/theme.xml?rev=1239569&r1=1239568&r2=1239569&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/themes/sotto/theme.xml (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/themes/sotto/theme.xml Thu Feb  2 12:14:07
2012
@@ -24,7 +24,7 @@
     
     <!-- templates -->
     <template action="weblog">
-        <name>weblog</name>
+        <name>Weblog</name>
         <description>weblog</description>
 	<link></link>
         <navbar>false</navbar>



Mime
View raw message