Author: gmazza
Date: Thu Jul 31 19:29:46 2014
New Revision: 1614967
URL: http://svn.apache.org/r1614967
Log:
Fixed prob with theme preview (right-click w/open in new tab option wasn't
working), human-readable property added to new template language and component
type enums & used on theme pages, unnecessary requiredWeblogPermissionActions()
overrides removed, unused ThemeEditSharedThemesOnly.jsp deleted, DB migration
script updated to accommodate new user.account.email.activation
roller_properties constant.
Removed:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEditSharedThemesOnly.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TemplateRendition.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MemberResign.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/ApplicationResources_de.properties
roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
roller/trunk/app/src/main/resources/struts.xml
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
roller/trunk/app/src/main/webapp/themes/gaurav/std_footer.vm
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java
Thu Jul 31 19:29:46 2014
@@ -17,7 +17,6 @@
package org.apache.roller.weblogger.planet.ui;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
@@ -25,7 +24,6 @@ import org.apache.commons.logging.LogFac
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.planet.pojos.PlanetGroup;
import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
/**
@@ -50,11 +48,6 @@ public class PlanetGroups extends Planet
@Override
- public List<String> requiredWeblogPermissionActions() {
- return Collections.singletonList(WeblogPermission.ADMIN);
- }
-
- @Override
public boolean isWeblogRequired() {
return false;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TemplateRendition.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TemplateRendition.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TemplateRendition.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TemplateRendition.java
Thu Jul 31 19:29:46 2014
@@ -25,7 +25,19 @@ public interface TemplateRendition {
public enum RenditionType {STANDARD, MOBILE}
- public enum TemplateLanguage {VELOCITY}
+ public enum TemplateLanguage {
+ VELOCITY("Velocity");
+
+ private final String readableName;
+
+ TemplateLanguage(String readableName) {
+ this.readableName = readableName;
+ }
+
+ public String getReadableName() {
+ return readableName;
+ }
+ }
String getTemplate();
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java
Thu Jul 31 19:29:46 2014
@@ -26,7 +26,24 @@ package org.apache.roller.weblogger.pojo
*/
public interface ThemeTemplate extends Template {
- public enum ComponentType {WEBLOG, PERMALINK, SEARCH, TAGSINDEX,
STYLESHEET, CUSTOM}
+ public enum ComponentType {
+ WEBLOG("Weblog"),
+ PERMALINK("Permalink"),
+ SEARCH("Search"),
+ TAGSINDEX("Tag Index"),
+ STYLESHEET("Stylesheet"),
+ CUSTOM("Custom");
+
+ private final String readableName;
+
+ ComponentType(String readableName) {
+ this.readableName = readableName;
+ }
+
+ public String getReadableName() {
+ return readableName;
+ }
+ }
/**
* The action this template is defined for.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
Thu Jul 31 19:29:46 2014
@@ -20,8 +20,6 @@ package org.apache.roller.weblogger.ui.s
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.Collections;
-import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
@@ -31,7 +29,6 @@ import org.apache.roller.weblogger.busin
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.WeblogBookmark;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
import org.apache.roller.weblogger.util.cache.CacheManager;
import org.apache.struts2.interceptor.validation.SkipValidation;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
Thu Jul 31 19:29:46 2014
@@ -20,8 +20,6 @@ package org.apache.roller.weblogger.ui.s
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.Collections;
-import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
@@ -30,7 +28,6 @@ import org.apache.roller.weblogger.Weblo
import org.apache.roller.weblogger.business.BookmarkManager;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.WeblogBookmark;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
import org.apache.roller.weblogger.util.cache.CacheManager;
import org.apache.struts2.interceptor.validation.SkipValidation;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
Thu Jul 31 19:29:46 2014
@@ -30,7 +30,6 @@ import org.apache.roller.weblogger.busin
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.WeblogBookmark;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
import org.apache.roller.weblogger.util.cache.CacheManager;
@@ -65,11 +64,6 @@ public class Bookmarks extends UIAction
this.pageTitle = "bookmarksForm.rootTitle";
}
- // admin perms required
- public List<String> requiredWeblogPermissionActions() {
- return Collections.singletonList(WeblogPermission.ADMIN);
- }
-
public void myPrepare() {
try {
BookmarkManager bmgr = WebloggerFactory.getWeblogger()
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
Thu Jul 31 19:29:46 2014
@@ -23,15 +23,12 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.text.SimpleDateFormat;
-import java.util.Collections;
import java.util.Date;
-import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.business.BookmarkManager;
import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
import org.apache.roller.weblogger.util.cache.CacheManager;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java
Thu Jul 31 19:29:46 2014
@@ -45,7 +45,7 @@ public class Categories extends UIAction
this.pageTitle = "categoriesForm.rootTitle";
}
- // author perms required
+ @Override
public List<String> requiredWeblogPermissionActions() {
return Collections.singletonList(WeblogPermission.POST);
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
Thu Jul 31 19:29:46 2014
@@ -48,6 +48,7 @@ public class CategoryAdd extends UIActio
this.pageTitle = "categoryForm.add.title";
}
+ @Override
public List<String> requiredWeblogPermissionActions() {
return Collections.singletonList(WeblogPermission.POST);
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
Thu Jul 31 19:29:46 2014
@@ -52,8 +52,9 @@ public class CategoryEdit extends UIActi
this.desiredMenu = "editor";
this.pageTitle = "categoryForm.edit.title";
}
-
-
+
+
+ @Override
public List<String> requiredWeblogPermissionActions() {
return Collections.singletonList(WeblogPermission.POST);
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
Thu Jul 31 19:29:46 2014
@@ -59,8 +59,8 @@ public class CategoryRemove extends UIAc
this.desiredMenu = "editor";
this.pageTitle = "categoriesForm.rootTitle";
}
-
-
+
+ @Override
public List<String> requiredWeblogPermissionActions() {
return Collections.singletonList(WeblogPermission.POST);
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
Thu Jul 31 19:29:46 2014
@@ -143,6 +143,7 @@ public class EntryRemove extends EntryBa
}
// allow LIMITED users to delete their own draft/pending blog entries
+ @Override
public List<String> requiredWeblogPermissionActions() {
return Collections.singletonList(WeblogPermission.EDIT_DRAFT);
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java
Thu Jul 31 19:29:46 2014
@@ -18,15 +18,11 @@
package org.apache.roller.weblogger.ui.struts2.editor;
-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.BookmarkManager;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
import org.apache.roller.weblogger.util.cache.CacheManager;
import org.apache.struts2.interceptor.validation.SkipValidation;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
Thu Jul 31 19:29:46 2014
@@ -18,9 +18,6 @@
package org.apache.roller.weblogger.ui.struts2.editor;
-import java.util.Collections;
-import java.util.List;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -29,7 +26,6 @@ import org.apache.roller.weblogger.busin
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
import org.apache.roller.weblogger.util.cache.CacheManager;
import org.apache.struts2.interceptor.validation.SkipValidation;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java
Thu Jul 31 19:29:46 2014
@@ -18,9 +18,7 @@
package org.apache.roller.weblogger.ui.struts2.editor;
-import java.util.Collections;
import java.util.Date;
-import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -28,7 +26,6 @@ import org.apache.roller.weblogger.busin
import org.apache.roller.weblogger.business.WeblogEntryManager;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
import org.apache.roller.weblogger.util.cache.CacheManager;
@@ -46,11 +43,6 @@ public class Maintenance extends UIActio
this.pageTitle = "maintenance.title";
}
- // admin perms required
- public List<String> requiredWeblogPermissionActions() {
- return Collections.singletonList(WeblogPermission.ADMIN);
- }
-
public String execute() {
return SUCCESS;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java
Thu Jul 31 19:29:46 2014
@@ -48,6 +48,7 @@ public class MediaFileBase extends UIAct
private List<MediaFileDirectory> allDirectories;
private boolean overlayMode;
+ @Override
public List<String> requiredWeblogPermissionActions() {
return Collections.singletonList(WeblogPermission.POST);
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
Thu Jul 31 19:29:46 2014
@@ -60,6 +60,7 @@ public class MediaFileImageChooser exten
public void myPrepare() {
}
+ @Override
public List<String> requiredWeblogPermissionActions() {
return Collections.singletonList(WeblogPermission.EDIT_DRAFT);
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MemberResign.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MemberResign.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MemberResign.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MemberResign.java
Thu Jul 31 19:29:46 2014
@@ -41,6 +41,7 @@ public class MemberResign extends UIActi
this.pageTitle = "yourWebsites.resign";
}
+ @Override
public List<String> requiredWeblogPermissionActions() {
return Collections.singletonList(WeblogPermission.EDIT_DRAFT);
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
Thu Jul 31 19:29:46 2014
@@ -56,17 +56,8 @@ public class Members extends UIAction im
this.pageTitle = "memberPermissions.title";
}
-
- // admin perms required
- public List<String> requiredWeblogPermissionActions() {
- return Collections.singletonList(WeblogPermission.ADMIN);
- }
-
-
public String execute() {
-
log.debug("Showing weblog members page");
-
return LIST;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
Thu Jul 31 19:29:46 2014
@@ -19,7 +19,6 @@
package org.apache.roller.weblogger.ui.struts2.editor;
import java.util.Collections;
-import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -54,14 +53,7 @@ public class MembersInvite extends UIAct
this.desiredMenu = "editor";
this.pageTitle = "inviteMember.title";
}
-
-
- // admin perms required
- public List<String> requiredWeblogPermissionActions() {
- return Collections.singletonList(WeblogPermission.ADMIN);
- }
-
-
+
public String execute() {
// if group blogging is disabled then you can't change permissions
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
Thu Jul 31 19:29:46 2014
@@ -18,9 +18,7 @@
package org.apache.roller.weblogger.ui.struts2.editor;
-import java.util.Collections;
import java.util.Date;
-import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -35,7 +33,6 @@ import org.apache.roller.weblogger.pojos
import org.apache.roller.weblogger.pojos.ThemeTemplate;
import org.apache.roller.weblogger.pojos.ThemeTemplate.ComponentType;
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.pojos.WeblogTheme;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -67,11 +64,6 @@ public class StylesheetEdit extends UIAc
}
@Override
- public List<String> requiredWeblogPermissionActions() {
- return Collections.singletonList(WeblogPermission.ADMIN);
- }
-
- @Override
public void myPrepare() {
ThemeTemplate stylesheet = null;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
Thu Jul 31 19:29:46 2014
@@ -24,16 +24,16 @@ import org.apache.commons.logging.LogFac
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.TemplateRendition.TemplateLanguage;
-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.cache.CacheManager;
import org.apache.struts2.interceptor.validation.SkipValidation;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Date;
+import java.util.EnumMap;
import java.util.List;
+import java.util.Map;
/**
@@ -55,13 +55,6 @@ public class TemplateEdit extends UIActi
this.pageTitle = "pagesForm.title";
}
-
- @Override
- public List<String> requiredWeblogPermissionActions() {
- return Collections.singletonList(WeblogPermission.ADMIN);
- }
-
-
public void myPrepare() {
try {
setTemplate(WebloggerFactory.getWeblogger().getWeblogManager().getTemplate(getBean().getId()));
@@ -180,12 +173,12 @@ public class TemplateEdit extends UIActi
}
}
- public List<String> getTemplateLanguages() {
- List<String> langList = new ArrayList<String>();
+ public Map<TemplateLanguage, String> getTemplateLanguages() {
+ Map<TemplateLanguage, String> langMap = new EnumMap<TemplateLanguage,
String>(TemplateLanguage.class);
for (TemplateLanguage lang : TemplateLanguage.values()) {
- langList.add(lang.name());
+ langMap.put(lang, lang.getReadableName());
}
- return langList;
+ return langMap;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
Thu Jul 31 19:29:46 2014
@@ -18,9 +18,6 @@
package org.apache.roller.weblogger.ui.struts2.editor;
-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.WebloggerException;
@@ -28,7 +25,6 @@ import org.apache.roller.weblogger.busin
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.pojos.WeblogTheme;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -53,11 +49,6 @@ public class TemplateRemove extends UIAc
this.pageTitle = "editPages.title.removeOK";
}
- // must be a weblog admin to use this action
- public List<String> requiredWeblogPermissionActions() {
- return Collections.singletonList(WeblogPermission.ADMIN);
- }
-
public void myPrepare() {
if (getRemoveId() != null) {
try {
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
Thu Jul 31 19:29:46 2014
@@ -28,7 +28,6 @@ import org.apache.roller.weblogger.pojos
import org.apache.roller.weblogger.pojos.TemplateRendition.RenditionType;
import org.apache.roller.weblogger.pojos.TemplateRendition.TemplateLanguage;
import org.apache.roller.weblogger.pojos.ThemeTemplate.ComponentType;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.WeblogTemplate;
import org.apache.roller.weblogger.pojos.WeblogTheme;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -36,7 +35,9 @@ import org.apache.roller.weblogger.ui.st
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
+import java.util.EnumMap;
import java.util.List;
+import java.util.Map;
/**
* Templates listing page.
@@ -49,7 +50,7 @@ public class Templates extends UIAction
private List<WeblogTemplate> templates = Collections.emptyList();
// list of template action types user is allowed to create
- private List<ComponentType> availableActions = Collections.emptyList();
+ private Map<ComponentType, String> availableActions =
Collections.emptyMap();
// name and action of new template if we are adding a template
private String newTmplName = null;
@@ -61,10 +62,6 @@ public class Templates extends UIAction
this.pageTitle = "pagesForm.title";
}
- public List<String> requiredWeblogPermissionActions() {
- return Collections.singletonList(WeblogPermission.ADMIN);
- }
-
public String execute() {
// query for templates list
@@ -89,38 +86,38 @@ public class Templates extends UIAction
setTemplates(pages);
// build list of action types that may be added
- List<ComponentType> actionsList = new
ArrayList<ComponentType>();
- actionsList.add(ComponentType.CUSTOM);
+ Map<ComponentType, String> actionsMap = new
EnumMap<ComponentType, String>(ComponentType.class);
+ addComponentTypeToMap(actionsMap, ComponentType.CUSTOM);
if
(WeblogTheme.CUSTOM.equals(getActionWeblog().getEditorTheme())) {
// if the weblog is using a custom theme then
determine which
// action templates are still available to be
created
- actionsList.add(ComponentType.PERMALINK);
- actionsList.add(ComponentType.SEARCH);
- actionsList.add(ComponentType.WEBLOG);
- actionsList.add(ComponentType.TAGSINDEX);
+ addComponentTypeToMap(actionsMap,
ComponentType.PERMALINK);
+ addComponentTypeToMap(actionsMap,
ComponentType.SEARCH);
+ addComponentTypeToMap(actionsMap,
ComponentType.WEBLOG);
+ addComponentTypeToMap(actionsMap,
ComponentType.TAGSINDEX);
for (WeblogTemplate tmpPage : getTemplates()) {
if (!ComponentType.CUSTOM.equals(tmpPage
.getAction())) {
-
actionsList.remove(tmpPage.getAction());
+
actionsMap.remove(tmpPage.getAction());
}
}
} else {
// Make sure we have an option for the default
web page
- actionsList.add(ComponentType.WEBLOG);
+ addComponentTypeToMap(actionsMap,
ComponentType.WEBLOG);
if (getNewTmplAction() == null) {
setNewTmplAction(ComponentType.WEBLOG);
}
for (WeblogTemplate tmpPage : getTemplates()) {
if
(ComponentType.WEBLOG.equals(tmpPage.getAction())) {
-
actionsList.remove(ComponentType.WEBLOG);
+
actionsMap.remove(ComponentType.WEBLOG);
setNewTmplAction(null);
break;
}
}
}
- setAvailableActions(actionsList);
+ setAvailableActions(actionsMap);
} catch (WebloggerException ex) {
log.error("Error getting templates for weblog - "
@@ -131,6 +128,10 @@ public class Templates extends UIAction
return LIST;
}
+ private void addComponentTypeToMap(Map<ComponentType, String> map,
ComponentType component) {
+ map.put(component, component.getReadableName());
+ }
+
/**
* Save a new template.
*/
@@ -146,7 +147,6 @@ public class Templates extends UIAction
newTemplate.setWeblog(getActionWeblog());
newTemplate.setAction(getNewTmplAction());
newTemplate.setName(getNewTmplName());
- newTemplate.setDescription(newTemplate.getName());
newTemplate.setHidden(false);
newTemplate.setNavbar(false);
newTemplate.setLastModified(new Date());
@@ -253,11 +253,11 @@ public class Templates extends UIAction
this.templates = templates;
}
- public List<ComponentType> getAvailableActions() {
+ public Map<ComponentType, String> getAvailableActions() {
return availableActions;
}
- public void setAvailableActions(List<ComponentType> availableActions) {
+ public void setAvailableActions(Map<ComponentType, String>
availableActions) {
this.availableActions = availableActions;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java
Thu Jul 31 19:29:46 2014
@@ -28,7 +28,6 @@ import org.apache.roller.weblogger.busin
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;
@@ -57,11 +56,6 @@ public class TemplatesRemove extends UIA
this.pageTitle = "editPages.title.removeOK";
}
- @Override
- public List<String> requiredWeblogPermissionActions() {
- return Collections.singletonList(WeblogPermission.ADMIN);
- }
-
public void myPrepare() {
if (getIdSelections() != null) {
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
Thu Jul 31 19:29:46 2014
@@ -35,7 +35,6 @@ import org.apache.roller.weblogger.pojos
import org.apache.roller.weblogger.pojos.ThemeTemplate.ComponentType;
import org.apache.roller.weblogger.pojos.WeblogTheme;
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.cache.CacheManager;
@@ -73,10 +72,6 @@ public class ThemeEdit extends UIAction
this.pageTitle = "themeEditor.title";
}
- public List<String> requiredWeblogPermissionActions() {
- return Collections.singletonList(WeblogPermission.ADMIN);
- }
-
public void myPrepare() {
ThemeManager themeMgr = WebloggerFactory.getWeblogger()
@@ -115,12 +110,7 @@ public class ThemeEdit extends UIAction
+ getActionWeblog().getHandle(), ex);
}
- if (!WebloggerRuntimeConfig
- .getBooleanProperty("themes.customtheme.allowed")) {
- return "input-sharedonly";
- } else {
- return INPUT;
- }
+ return INPUT;
}
/**
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
Thu Jul 31 19:29:46 2014
@@ -31,7 +31,6 @@ import org.apache.roller.weblogger.busin
import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.ui.core.RollerContext;
import org.apache.roller.weblogger.ui.core.plugins.UIPluginManager;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -67,12 +66,6 @@ public class WeblogConfig extends UIActi
}
- // admin perms required
- public List<String> requiredWeblogPermissionActions() {
- return Collections.singletonList(WeblogPermission.ADMIN);
- }
-
-
public void myPrepare() {
try {
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java
Thu Jul 31 19:29:46 2014
@@ -18,12 +18,9 @@
package org.apache.roller.weblogger.ui.struts2.editor;
-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.WebloggerFactory;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
import org.apache.roller.weblogger.util.cache.CacheManager;
@@ -41,11 +38,6 @@ public class WeblogRemove extends UIActi
this.pageTitle = "websiteRemove.title";
}
- // admin perms required
- public List<String> requiredWeblogPermissionActions() {
- return Collections.singletonList(WeblogPermission.ADMIN);
- }
-
/**
* Show weblog remove confirmation.
*/
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Thu Jul
31 19:29:46 2014
@@ -550,7 +550,7 @@ inviteMember.error.userAlreadyMember=Use
inviteMember.userInvited=User successfully invited
-inviteMember.notificationSubject=Roller: invitation to join weblog "{0}" ({1})
+inviteMember.notificationSubject=Roller: Invitation to join weblog "{0}" ({1})
inviteMember.notificationContent=You have been invited to join weblog "{0}"
({1}). \
Click the following link and login as user [{2}] to accept or decline this \
invitation <{3}>.
@@ -806,13 +806,11 @@ This page shows the media files that you
copied in when you chose to customize a theme. You can use folders \
to organize your files, and you do not have to worry about "breaking \
URLs" when you move or rename files.
-mediaFileView.dirPageTip=\
-This is a media file folder. You can return to the default folder \
-by using the Switch to Folder drop-down below.
+mediaFileView.dirPageTip=This is a media file subfolder.
-mediaFileView.viewFolder=Switch to Folder
+mediaFileView.viewFolder=View Folder
-mediaFileView.sortby=Sort by:
+mediaFileView.sortBy=Sort by
mediaFileView.deleteSelected=Delete selected
mediaFileView.moveSelected=Move selected to:
@@ -1287,16 +1285,11 @@ design of your blog is defined entirely
You can modify your templates as much as you like and if you ever decide you \
want to start over you can do so by copying one of the existing themes.
-themeEditor.previewLink=See how your blog will look with this theme.
-themeEditor.previewDescription=How can you know if this is really the \
-theme for you until you see it on your blog right? Click the link above \
-to launch a full page preview of how your blog will look with the selected
theme.
-
-themeEditor.customStylesheetLink=Modify the styling of your selected theme.
-themeEditor.customStylesheetDescription=If you are happy with your theme \
-but want to make a few styling choices of your own such as choosing \
-different fonts, colors, etc, then try making your own stylesheet or \
-borrow one from someoone else using your theme.
+themeEditor.preview=Preview Theme
+themeEditor.save=Update Theme
+
+themeEditor.previewDescription=Use the preview option below to see how your
blog \
+will look with the new theme prior to switching to it.
themeEditor.import=I want to copy the templates from an existing theme into my
weblog.
themeEditor.importWarning=WARNING: this operation may overwrite some of your \
@@ -1305,8 +1298,6 @@ themeEditor.importRequired=Since this is
custom theme you must copy the templates from an existing theme. \
Please select the theme you would like to use as a starting point for your
customizations.
-themeEditor.save=Update Theme
-
themeEditor.setTheme.success=Successfully set theme to - {0}
themeEditor.customTheme.disallowed=Sorry, custom themes are not allowed
Modified: roller/trunk/app/src/main/resources/ApplicationResources_de.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_de.properties?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Thu
Jul 31 19:29:46 2014
@@ -663,15 +663,11 @@ tabbedmenu.website.members=Mitglieder
tabbedmenu.website.pages=Seiten Schablonen
tabbedmenu.website.settings=Einstellungen
tabbedmenu.website.themes=Thema
-themeEditor.customStylesheetDescription=Wenn Sie mit Ihrem Thema zufrieden
sind, aber kleine gestalterische Anpassungen, wie eine andere Schriftart, Farbe
usw., vornehmen wollen, versuchen Sie Ihr eigenes Stylesheet zu erstellen oder
verwenden Sie das Thema von anderen Nutzern.
-themeEditor.customStylesheetLink=Gestaltung des ausgew\u00E4hlten Themas
modifizieren.
themeEditor.customTheme=Angepasstes Thema
themeEditor.customThemeDescription=Diese Option ist f\u00FCr kreative Blogger,
die sich ein eigenes Design erstellen wollen. Bedenken Sie bitte, dass die
Verwaltung eines eigenen Blogdesigns aufwendig sein kann.
themeEditor.import=Ich m\u00F6chte die Schablonen eines existierenden Themas
in mein Weblog kopieren.
themeEditor.importRequired=Da dies das erste Mal ist, dass Sie ein Thema
anpassen, m\u00FCssen Sie die Schablonen eines existierenden Themas kopieren.
Bitte w\u00E4hlen Sie das Thema, das Sie als Grundlage f\u00FCr Ihre
Anpassungen verwenden m\u00F6chten.
themeEditor.importWarning=Warnung: Diese Aktion k\u00F6nnte existierende
Schablonen \u00FCberschreiben.
-themeEditor.previewDescription=Woher wissen Sie, ob dieses Thema das richtige
f\u00FCr Sie ist, bevor Sie es in Ihrem Blog sehen? Klicken Sie auf den obigen
Link zum Starten der Vollbildvorschau Ihres Blogs mit dem ausgew\u00E4hlten
Thema.
-themeEditor.previewLink=Schauen Sie sich an, wie Ihr Blog mit diesem Thema
aussehen wird.
themeEditor.save=Thema setzen
# ------------------------------------------------------------ PlanetGroups.jsp
themeEditor.selectTheme=W\u00E4hlen Sie ein neues Thema f\u00FCr die Vorschau
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ko.properties?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ko.properties Thu
Jul 31 19:29:46 2014
@@ -922,16 +922,6 @@ themeEditor.templatesDescription=\uc774\
\uc6d0\ud558\ub294\ub300\ub85c \ud15c\ud50c\ub9bf\uc744 \ubcc0\uacbd\ud560
\uc218 \uc788\uc73c\uba70, \ud544\uc694\ud55c \uacbd\uc6b0 \uae30\uc874\uc5d0
\uc874\uc7ac\ud558\ub294 \ud14c\ub9c8\ub97c \ubcf5\uc0ac\ud558\uc5ec \
\ubcc0\uacbd \uc791\uc5c5\uc744 \uc2dc\uc791\ud560 \uc218
\uc788\uc2b5\ub2c8\ub2e4.
-themeEditor.previewLink=\ube14\ub85c\uadf8\uac00 \uc5b4\ub5bb\uac8c
\ubcf4\uc774\ub294\uc9c0 \ubbf8\ub9ac \ubcf4\uae30
-themeEditor.previewDescription=\uadc0\ud558\uc758
\ube14\ub85c\uadf8\uc5d0\uc11c \ud655\uc778\ud558\uae30 \uc804\uc5d0 \
-\uc5b4\ub5bb\uac8c \uc774 \ud14c\ub9c8\uac00 \uc801\uc6a9\ub420\uc9c0\ub97c
\uc54c \uc218 \uc788\uc744\uae4c\uc694? \
-\uc704\uc758 \ub9c1\ud06c\ub97c \ud074\ub9ad\ud558\uc5ec \uc804\uccb4
\ud398\uc774\uc9c0 \ubbf8\ub9ac\ubcf4\uae30\ub97c \ub744\uc6cc
\ube14\ub85c\uadf8\uac00 \ud574\ub2f9 \ud14c\ub9c8\ub97c \ud1b5\ud574
\uc5b4\ub5bb\uac8c \ubcf4\uc774\ub294\uc9c0
\ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-
-themeEditor.customStylesheetLink=\uadc0\ud558\uac00 \uc120\ud0dd\ud55c
\ud14c\ub9c8 \uc2a4\ud0c0\uc77c \ubcc0\uacbd
-themeEditor.customStylesheetDescription=\uadc0\ud558\uac00 \uc120\ud0dd\ud55c
\ud14c\ub9c8\uc5d0 \ub9cc\uc871\ud558\ub098 \
-\uba87 \uac00\uc9c0 \uc2a4\ud0c0\uc77c\uc744 \ubcc0\uacbd\ud558\uace0\uc790
\ud55c\ub2e4\uba74 (\uc608: \ud3f0\ud2b8, \uc0c9\uae54 \ub4f1),
\uadc0\ud558\ub9cc\uc758 \ubcc4\ub3c4 \uc2a4\ud0c0\uc77c\uc2dc\ud2b8\ub97c
\ub9cc\ub4e4\uac70\ub098 \
-\uadc0\ud558\uc758 \ud14c\ub9c8\ub97c \uc0ac\uc6a9\ud558\ub294 \ub2e4\ub978
\uacf3\uc5d0\uc11c \ube4c\uc5b4\uc62c \uc218 \uc788\uc2b5\ub2c8\ub2e4.
-
themeEditor.import=\uae30\uc874 \ud14c\ub9c8\ub85c\ubd80\ud130
\ud15c\ud50c\ub9bf\uc744 \ubcf5\uc0ac\ud558\uc5ec \ub0b4
\uc6f9\ub85c\uadf8\ub85c \ub123\uc74c.
themeEditor.importWarning=\uc8fc\uc758: \uc774 \uc791\uc5c5\uc740
\uadc0\ud558\uc758 \uae30\uc874 \ud15c\ud50c\ub9bf\ub4e4\uc744 \ub36e\uc5b4
\uc4f8 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
themeEditor.importRequired=\uadc0\ud558\uac00 \ucee4\uc2a4\ud140
\ud14c\ub9c8\ub97c \ub9cc\ub4dc\ub824 \ud558\ub294 \uccab\ubc88\uc9f8
\uc2dc\ub3c4\uc774\uae30 \ub54c\ubb38\uc5d0, \
Modified: roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm (original)
+++ roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm Thu Jul 31
19:29:46 2014
@@ -4,6 +4,9 @@
DON'T RUN THIS, IT'S NOT A DATABASE CREATION SCRIPT!!!
**#
+-- roller_permission constant updated to be more clear
+update roller_properties set name = 'user.account.email.activation' where name
= 'user.account.activation.enabled';
+
-- website table was renamed to weblog and several unused columns dropped
#renameTable('website' 'weblog')
#dropColumn('weblog' 'emailfromaddress')
Modified: roller/trunk/app/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/struts.xml?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/struts.xml (original)
+++ roller/trunk/app/src/main/resources/struts.xml Thu Jul 31 19:29:46 2014
@@ -454,7 +454,6 @@
<action name="themeEdit!*" method="{1}"
class="org.apache.roller.weblogger.ui.struts2.editor.ThemeEdit">
<result name="input" type="tiles">.ThemeEdit</result>
- <result name="input-sharedonly"
type="tiles">.ThemeEditSharedThemesOnly</result>
</action>
<action name="stylesheetEdit!*" method="{1}"
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp Thu Jul
31 19:29:46 2014
@@ -31,7 +31,7 @@
<script>
function fullPreviewMode() {
- window.open('<s:property value="previewURL" />', '_preview', '');
+ window.open('<s:property value="previewURL" />');
}
</script>
@@ -258,24 +258,29 @@ function fullPreviewMode() {
<br>
<div class="control">
- <s:submit value="%{getText('weblogEdit.save')}"
onclick="document.getElementById('entry_bean_status').value='DRAFT';" />
+ <span style="padding-left:7px">
+ <s:submit value="%{getText('weblogEdit.save')}"
onclick="document.getElementById('entry_bean_status').value='DRAFT';" />
+
+ <input type="button" name="fullPreview"
+ value="<s:text
name='weblogEdit.fullPreviewMode' />"
+ onclick="fullPreviewMode()" />
+
+ <s:if test="userAnAuthor">
+ <s:submit value="%{getText('weblogEdit.post')}"
onclick="document.getElementById('entry_bean_status').value='PUBLISHED';"/>
+ </s:if>
+ <s:else>
+ <s:submit value="%{getText('weblogEdit.submitForReview')}"
onclick="document.getElementById('entry_bean_status').value='PENDING';"/>
+ </s:else>
+ </span>
+
+ <span style="float:right">
+ <s:url id="removeUrl" action="entryRemove">
+ <s:param name="weblog" value="actionWeblog.handle" />
+ <s:param name="removeId" value="%{entry.id}" />
+ </s:url>
+ <input type="button" value="<s:text
name='weblogEdit.deleteEntry'/>" onclick="window.location='<s:property
value="removeUrl" escape="false" />'" />
+ </span>
- <s:if test="userAnAuthor">
- <s:submit value="%{getText('weblogEdit.post')}"
onclick="document.getElementById('entry_bean_status').value='PUBLISHED';"/>
- </s:if>
- <s:else>
- <s:submit value="%{getText('weblogEdit.submitForReview')}"
onclick="document.getElementById('entry_bean_status').value='PENDING';"/>
- </s:else>
-
- <s:url id="removeUrl" action="entryRemove">
- <s:param name="weblog" value="actionWeblog.handle" />
- <s:param name="removeId" value="%{entry.id}" />
- </s:url>
- <input type="button" value="<s:text name="weblogEdit.deleteEntry"/>"
onclick="window.location='<s:property value="removeUrl" escape="false" />'" />
-
- <input type="button" name="fullPreview"
- value='<s:text name="weblogEdit.fullPreviewMode"
/>'
- onclick="fullPreviewMode()" />
</div>
@@ -286,7 +291,7 @@ function fullPreviewMode() {
<h2><s:text name="weblogEdit.trackback" /></h2>
<s:text name="weblogEdit.trackbackUrl" />
<br />
- <s:textfield name="trackbackUrl" size="80" maxlength="255" />
+ <s:textfield name="trackbackUrl" size="80" maxlength="255"
style="width:35%"/>
<s:submit value="%{getText('weblogEdit.sendTrackback')}"
action="entryEdit!trackback" />
</s:if>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp Thu
Jul 31 19:29:46 2014
@@ -229,7 +229,7 @@
<div class="control">
<span style="padding-left:7px">
- <s:text name="mediaFileView.sortby" />
+ <s:text name="mediaFileView.sortBy" />:
<s:select id="sortByMenu" name="sortBy" list="sortOptions"
listKey="key"
listValue="value"
onchange="document.mediaFileViewForm.submit();" />
@@ -237,12 +237,9 @@
<span style="float:right">
<s:if test="!allDirectories.isEmpty">
- <%-- View button
- <s:submit type="button" action="mediaFileView!view"
key="mediaFileView.viewFolder" /> --%>
-
<%-- Folder to View combo-box --%>
+ <s:text name="mediaFileView.viewFolder" />:
<s:select name="viewDirectoryId" list="allDirectories"
listKey="id" listValue="name" onchange="onView()" />
-
</s:if>
</span>
</div>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp Thu Jul
31 19:29:46 2014
@@ -68,7 +68,7 @@
<s:a href="%{edit}"><s:property value="#p.name" /></s:a>
</td>
- <td style="vertical-align:middle"><s:property value="#p.action"
/></td>
+ <td style="vertical-align:middle"><s:property
value="#p.action.readableName" /></td>
<td style="vertical-align:middle"><s:property
value="#p.description" /></td>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp Thu Jul
31 19:29:46 2014
@@ -27,7 +27,7 @@ function previewImage(q, theme) {
}
function fullPreview(selector) {
selected = selector.selectedIndex;
- window.open('<s:url
value="/roller-ui/authoring/preview/%{actionWeblog.handle}"/>?theme='+selector.options[selected].value,
'_preview', '');
+ window.open('<s:url
value="/roller-ui/authoring/preview/%{actionWeblog.handle}"/>?theme='+selector.options[selected].value);
}
function updateThemeChooser(selected) {
if (selected[0].value == 'shared') {
@@ -124,21 +124,19 @@ function toggleImportThemeDisplay() {
</script>
</p>
<p>
- » <a href="#"
onclick="fullPreview($('#sharedSelector').get(0))">
- <s:text name="themeEditor.previewLink" /></a><br/>
<s:text name="themeEditor.previewDescription" />
</p>
- <s:if test="!customTheme && actionWeblog.theme.customStylesheet !=
null">
- <p>
- <s:url action="stylesheetEdit" id="stylesheetEdit" >
- <s:param name="weblog" value="%{actionWeblog.handle}" />
- </s:url>
- » <s:a href="%{stylesheetEdit}"><s:text
name="themeEditor.customStylesheetLink" /></s:a><br/>
- <s:text name="themeEditor.customStylesheetDescription" />
- </p>
- </s:if>
- <p><s:submit value="%{getText('themeEditor.save')}" /></p>
+ <div class="control">
+ <span style="padding-left:7px">
+ <input type="button" name="themePreview"
+ value="<s:text name='themeEditor.preview' />"
+
onclick="fullPreview($('#sharedSelector').get(0))" />
+
+ <s:submit value="%{getText('themeEditor.save')}" />
+ </span>
+ </div>
+
</div>
<div id="customOptioner" class="optioner" style="display:none;">
@@ -191,13 +189,20 @@ function toggleImportThemeDisplay() {
</script>
</p>
<p>
- » <a href="#"
onclick="fullPreview($('#customSelector').get(0))">
- <s:text name="themeEditor.previewLink" /></a><br/>
<s:text name="themeEditor.previewDescription" />
</p>
</div>
- <p><s:submit value="%{getText('themeEditor.save')}" /></p>
+ <div class="control">
+ <span style="padding-left:7px">
+ <input type="button" name="themePreview"
+ value="<s:text name='themeEditor.preview' />"
+
onclick="fullPreview($('#customSelector').get(0))" />
+
+ <s:submit value="%{getText('themeEditor.save')}" />
+ </span>
+ </div>
+
</div>
</s:form>
Modified: roller/trunk/app/src/main/webapp/themes/gaurav/std_footer.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/gaurav/std_footer.vm?rev=1614967&r1=1614966&r2=1614967&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/gaurav/std_footer.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/gaurav/std_footer.vm Thu Jul 31
19:29:46 2014
@@ -13,5 +13,4 @@
</div>
<!-- Placed at the end of the document so the pages load faster -->
<script src="$url.resource('js/jquery.js')"></script>
-<script tye="text/javascript" src="$url.resource('js/bootstrap.js')"></script>
-
+<script src="$url.resource('js/bootstrap.js')"></script>
