Author: gmazza
Date: Sat Mar 8 17:06:55 2014
New Revision: 1575567
URL: http://svn.apache.org/r1575567
Log:
Removed ability to create Bookmark folders under a non-root folder, all new
folders now created at the bookmark root.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/ApplicationResources_da.properties
roller/trunk/app/src/main/resources/ApplicationResources_de.properties
roller/trunk/app/src/main/resources/ApplicationResources_es.properties
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp
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=1575567&r1=1575566&r2=1575567&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
Sat Mar 8 17:06:55 2014
@@ -40,12 +40,6 @@ public class FolderAdd extends UIAction
private static Log log = LogFactory.getLog(FolderAdd.class);
- // the id of the folder we are adding the new subfolder into
- private String folderId = null;
-
- // the folder we are adding the new subfolder into
- private WeblogBookmarkFolder folder = null;
-
// bean for managing form data
private FolderBean bean = new FolderBean();
@@ -62,52 +56,26 @@ public class FolderAdd extends UIAction
}
- public void myPrepare() {
- try {
- BookmarkManager bmgr =
WebloggerFactory.getWeblogger().getBookmarkManager();
- if(!StringUtils.isEmpty(getFolderId())) {
- setFolder(bmgr.getFolder(getFolderId()));
- }
- } catch (WebloggerException ex) {
- log.error("Error looking up folder - "+getFolderId(), ex);
- }
- }
-
-
@SkipValidation
public String execute() {
-
- if(getFolder() == null) {
- // TODO: i18n
- addError("Cannot add folder to null parent folder");
- return ERROR;
- }
-
return INPUT;
}
public String save() {
-
- if(getFolder() == null) {
- // TODO: i18n
- addError("Cannot add folder to null parent folder");
- return ERROR;
- }
-
// validation
myValidate();
if(!hasActionErrors()) {
try {
WeblogBookmarkFolder newFolder = new WeblogBookmarkFolder(
- getFolder(),
+ getActionWeblog().getBookmarkFolder(null),
getBean().getName(),
getBean().getDescription(),
getActionWeblog());
- // add new folder to parent
- getFolder().addFolder(newFolder);
+ // add new folder to weblog
+ getActionWeblog().getBookmarkFolder(null).addFolder(newFolder);
// save changes
BookmarkManager bmgr =
WebloggerFactory.getWeblogger().getBookmarkManager();
@@ -143,28 +111,12 @@ public class FolderAdd extends UIAction
// name is required, has max length, no html
// make sure new name is not a duplicate of an existing folder
- if(getFolder().hasFolder(getBean().getName())) {
+
if(getActionWeblog().getBookmarkFolder(null).hasFolder(getBean().getName())) {
addError("folderForm.error.duplicateName", getBean().getName());
}
}
- public String getFolderId() {
- return folderId;
- }
-
- public void setFolderId(String folderId) {
- this.folderId = folderId;
- }
-
- public WeblogBookmarkFolder getFolder() {
- return folder;
- }
-
- public void setFolder(WeblogBookmarkFolder folder) {
- this.folder = folder;
- }
-
public FolderBean getBean() {
return bean;
}
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1575567&r1=1575566&r2=1575567&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Sat Mar
8 17:06:55 2014
@@ -75,14 +75,14 @@ The bookmarks you keep here will appear
bookmark folders here, but you will have to add corresponding bookmark display
\
macros to your weblog''s templates if you wish to display their contents.
bookmarksForm.folderPrompt=\
-This is a bookmark directory. You can add bookmarks here and even bookmark \
-folders, but they will not be displayed on your blog unless you add the \
+This is a bookmark directory. You can add bookmarks here \
+but they will not be displayed on your blog unless you add the \
appropriate bookmark display macros to your weblog''s templates.
bookmarksForm.subtitle=Manage bookmarks in weblog <span>{0}</span>
bookmarksForm.addBookmark=Add Bookmark
-bookmarksForm.addFolder=Add Bookmark Folder
+bookmarksForm.addFolder=New Bookmark Folder
bookmarksForm.checkAll=Select All
bookmarksForm.checkNone=Select None
bookmarksForm.delete=Delete selected
Modified: roller/trunk/app/src/main/resources/ApplicationResources_da.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_da.properties?rev=1575567&r1=1575566&r2=1575567&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_da.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_da.properties Sat
Mar 8 17:06:55 2014
@@ -73,8 +73,8 @@ Bogm�rker, som du gemmer her, vil o
bogm�rke mapper her, men du skal bruge de tilsvarende makroer til at vise \
bogm�rker i dine weblog's skabeloner, hvis indholdet skal vises.
bookmarksForm.folderPrompt=\
-Dette er et bogm�rke. Du kan tilf�je b�de bogm�rker og bogm�rke \
-mapper her, men de vil kun blive vist i din blog, hvis du tilf�jer de
tilsvarende \
+Dette er et bogm�rke. Du kan tilf�je b�de bogm�rker \
+her, men de vil kun blive vist i din blog, hvis du tilf�jer de tilsvarende \
makroer til at vise bogm�rker i dine weblog's skabeloner.
bookmarksForm.subtitle=Organiser bogm�rkerne i weblog <span>{0}</span>
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=1575567&r1=1575566&r2=1575567&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Sat
Mar 8 17:06:55 2014
@@ -121,7 +121,7 @@ bookmarksForm.edit=Bearbeiten
bookmarksForm.edit.tip=Anklicken um den Ordner oder das Lesezeichen zu
bearbeiten
bookmarksForm.error.move=Fehler beim Verschieben, Elternknoten nach Kindknoten
zu verschieben ist nicht erlaubt
bookmarksForm.folder=Ordner
-bookmarksForm.folderPrompt=Dies ist ein Lesezeichen. Sie k\u00F6nnen andere
Lesezeichen und sogar Ordner hier anlegen, aber sie werden nicht in Ihrem
Weblog angezeigt werden, so lange Sie nicht die entsprechenden
Lesezeichenanzeigemarcos zu Ihren Weblog Schablonen hinzuf\u00FCgen.
+bookmarksForm.folderPrompt=Dies ist ein Lesezeichen. Sie k\u00F6nnen andere
Lesezeichen hier anlegen, aber sie werden nicht in Ihrem Weblog angezeigt
werden, so lange Sie nicht die entsprechenden Lesezeichenanzeigemarcos zu Ihren
Weblog Schablonen hinzuf\u00FCgen.
bookmarksForm.folderTitle=Lesezeichenordner [{0}]
bookmarksForm.importBookmarks=Lesezeichen via OPML importieren
bookmarksForm.move=Verschiebe Auswahl
Modified: roller/trunk/app/src/main/resources/ApplicationResources_es.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_es.properties?rev=1575567&r1=1575566&r2=1575567&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_es.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_es.properties Sat
Mar 8 17:06:55 2014
@@ -24,7 +24,7 @@ bookmarksForm.root = ra\u00EDz
bookmarksForm.rootTitle = Blogroll
bookmarksForm.folderTitle = Carpeta de marcadores [{0}]
bookmarksForm.rootPrompt = Esta es la carpeta de marcadores de nivel superior.
Los marcadores que ponga aqu\u00ED aparecer\u00E1n en la secci\u00F3n blogroll
de su blog (suponiendo que est\u00E9 usando uno de los temas por defecto).
Puede crear carpetas de marcadores aqu\u00ED, pero tendr\u00E1 que a\u00F1adir
los correspondientes macros de visualizaci\u00F3n a sus plantillas del weblog
si desea mostrar sus contenidos.
-bookmarksForm.folderPrompt = Este es un marcador. Puede a\u00F1adir marcadores
aqu\u00ED e incluso carpetas de marcadores, pero no se ver\u00E1n en su blog a
menos que a\u00F1ada el macro de visualizaci\u00F3n apropiado para sus
plantillas del weblog.
+bookmarksForm.folderPrompt = Este es un marcador. Puede a\u00F1adir marcadores
aqu\u00ED, pero no se ver\u00E1n en su blog a menos que a\u00F1ada el macro de
visualizaci\u00F3n apropiado para sus plantillas del weblog.
bookmarksForm.subtitle = Administrar marcadores en el weblog <span>{0}</span>
bookmarksForm.addBookmark = A\u00F1adir marcador
bookmarksForm.addFolder = A\u00F1adir carpeta de marcador
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp?rev=1575567&r1=1575566&r2=1575567&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp
Sat Mar 8 17:06:55 2014
@@ -41,7 +41,6 @@
<img src='<s:url value="/images/folder_add.png"/>'
border="0"alt="icon" />
<s:url id="addFolder" action="folderAdd">
<s:param name="weblog" value="%{actionWeblog.handle}"
/>
- <s:param name="folderId" value="%{folder.id}" />
</s:url>
<s:a href="%{addFolder}"><s:text
name="bookmarksForm.addFolder" /></s:a>
</p>
