Author: gmazza
Date: Mon Mar 10 02:30:20 2014
New Revision: 1575796
URL: http://svn.apache.org/r1575796
Log:
Reimplemented bookmark folder edit and delete, removed tab-spacing in
Bookmarks.java.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.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/resources/ApplicationResources_nl.properties
roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
roller/trunk/app/src/main/resources/ApplicationResources_sl.properties
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp
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=1575796&r1=1575795&r2=1575796&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
Mon Mar 10 02:30:20 2014
@@ -21,6 +21,7 @@ package org.apache.roller.weblogger.ui.s
import java.util.ArrayList;
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;
@@ -34,136 +35,160 @@ import org.apache.roller.weblogger.ui.st
import org.apache.roller.weblogger.util.cache.CacheManager;
/**
- * List bookmarks and folders and allow for moving them around and deleting
- * them.
+ * List bookmarks and folders and allow for moving them around and deleting
them.
*/
public class Bookmarks extends UIAction {
- private static Log log = LogFactory.getLog(Bookmarks.class);
+ private static Log log = LogFactory.getLog(Bookmarks.class);
- // the id of folder being viewed
- private String folderId = null;
+ // the id of folder being viewed
+ private String folderId = null;
- // the folder being viewed
- private WeblogBookmarkFolder folder = null;
+ // the folder being viewed
+ private WeblogBookmarkFolder folder = null;
- // the list of bookmarks to move or delete
- private String[] selectedBookmarks = null;
+ // the list of bookmarks to move or delete
+ private String[] selectedBookmarks = null;
- // the target folder to move items to
- private String targetFolderId = null;
+ // the target folder to move items to
+ private String targetFolderId = null;
// a new folder the user wishes to view
private String viewFolderId = null;
- // all folders from the action weblog
- private List<WeblogBookmarkFolder> allFolders = Collections.emptyList();
+ // all folders from the action weblog
+ private List<WeblogBookmarkFolder> allFolders = Collections.emptyList();
+
+ public Bookmarks() {
+ this.actionName = "bookmarks";
+ this.desiredMenu = "editor";
+ this.pageTitle = "bookmarksForm.rootTitle";
+ }
+
+ // admin perms required
+ public List<String> requiredWeblogPermissionActions() {
+ return Collections.singletonList(WeblogPermission.ADMIN);
+ }
- public Bookmarks() {
- this.actionName = "bookmarks";
- this.desiredMenu = "editor";
- this.pageTitle = "bookmarksForm.rootTitle";
- }
-
- // admin perms required
- public List<String> requiredWeblogPermissionActions() {
- return Collections.singletonList(WeblogPermission.ADMIN);
- }
-
- public void myPrepare() {
- try {
- BookmarkManager bmgr = WebloggerFactory.getWeblogger()
- .getBookmarkManager();
- if (!StringUtils.isEmpty(getFolderId())) {
- setFolder(bmgr.getFolder(getFolderId()));
- } else {
-
setFolder(bmgr.getDefaultFolder(getActionWeblog()));
+ public void myPrepare() {
+ try {
+ BookmarkManager bmgr = WebloggerFactory.getWeblogger()
+ .getBookmarkManager();
+ if (!StringUtils.isEmpty(getFolderId())) {
+ setFolder(bmgr.getFolder(getFolderId()));
+ } else {
+ setFolder(bmgr.getDefaultFolder(getActionWeblog()));
setFolderId(getFolder().getId());
- }
- } catch (WebloggerException ex) {
- log.error("Error looking up folder", ex);
- }
- }
-
- /**
- * Present the bookmarks available in the folder specified by the
request.
- */
- public String execute() {
+ }
+ } catch (WebloggerException ex) {
+ log.error("Error looking up folder", ex);
+ }
+ }
- // build list of folders that the user can navigate to
+ /**
+ * Present the bookmarks available in the folder specified by the request.
+ */
+ public String execute() {
+
+ // build list of folders that the user can navigate to
List<WeblogBookmarkFolder> newFolders = new
ArrayList<WeblogBookmarkFolder>();
- try {
- // Build list of all folders, except for current one
- BookmarkManager bmgr =
WebloggerFactory.getWeblogger().getBookmarkManager();
- List<WeblogBookmarkFolder> folders =
bmgr.getAllFolders(getActionWeblog());
- log.info("*** Folder ID is: " + getFolderId());
+ try {
+ // Build list of all folders, except for current one
+ BookmarkManager bmgr =
WebloggerFactory.getWeblogger().getBookmarkManager();
+ List<WeblogBookmarkFolder> folders =
bmgr.getAllFolders(getActionWeblog());
+ log.info("*** Folder ID is: " + getFolderId());
for (WeblogBookmarkFolder fd : folders) {
- if (!fd.getId().equals(getFolderId())) {
- newFolders.add(fd);
- }
- }
-
- } catch (WebloggerException ex) {
- log.error("Error building folders list", ex);
- addError("Error building folders list");
- }
-
- if (newFolders.size() > 0) {
- setAllFolders(newFolders);
- }
-
- return LIST;
- }
-
- /**
- * Delete folders and bookmarks.
- */
- public String delete() {
-
- BookmarkManager bmgr = WebloggerFactory.getWeblogger()
- .getBookmarkManager();
-
- log.debug("Deleting selected bookmarks.");
-
- try {
- WeblogBookmark bookmark;
- String bookmarks[] = getSelectedBookmarks();
- if (null != bookmarks && bookmarks.length > 0) {
- if (log.isDebugEnabled()) {
+ if (!fd.getId().equals(getFolderId())) {
+ newFolders.add(fd);
+ }
+ }
+
+ } catch (WebloggerException ex) {
+ log.error("Error building folders list", ex);
+ addError("Error building folders list");
+ }
+
+ if (newFolders.size() > 0) {
+ setAllFolders(newFolders);
+ }
+
+ return LIST;
+ }
+
+ /**
+ * Delete bookmarks.
+ */
+ public String delete() {
+
+ BookmarkManager bmgr =
WebloggerFactory.getWeblogger().getBookmarkManager();
+
+ log.info("Deleting selected bookmarks.");
+
+ try {
+ WeblogBookmark bookmark;
+ String bookmarks[] = getSelectedBookmarks();
+ if (null != bookmarks && bookmarks.length > 0) {
+ if (log.isDebugEnabled()) {
log.debug("Processing delete of " + bookmarks.length
+ " bookmarks.");
}
- for (int j = 0; j < bookmarks.length; j++) {
- if (log.isDebugEnabled()) {
- log.debug("Deleting bookmark -
" + bookmarks[j]);
+ for (int j = 0; j < bookmarks.length; j++) {
+ if (log.isDebugEnabled()) {
+ log.debug("Deleting bookmark - " + bookmarks[j]);
+ }
+ bookmark = bmgr.getBookmark(bookmarks[j]);
+ if (bookmark != null) {
+ bmgr.removeBookmark(bookmark);
}
- bookmark =
bmgr.getBookmark(bookmarks[j]);
- if (bookmark != null) {
- bmgr.removeBookmark(bookmark);
- }
-
- }
- }
-
- // flush changes
- WebloggerFactory.getWeblogger().flush();
-
- // notify caches
- CacheManager.invalidate(getActionWeblog());
-
- } catch (WebloggerException ex) {
- log.error("Error doing bookmark deletes", ex);
- addError("Error doing bookmark deletes");
- }
- return execute();
- }
+ }
+ }
+
+ // flush changes
+ WebloggerFactory.getWeblogger().flush();
+
+ // notify caches
+ CacheManager.invalidate(getActionWeblog());
+
+ } catch (WebloggerException ex) {
+ log.error("Error doing bookmark deletes", ex);
+ addError("Error doing bookmark deletes");
+ }
+
+ return execute();
+ }
+
+ public String deleteFolder() {
+
+ try {
+ BookmarkManager bmgr =
WebloggerFactory.getWeblogger().getBookmarkManager();
+ WeblogBookmarkFolder fd = bmgr.getFolder(getFolderId());
+ if (fd != null) {
+ bmgr.removeFolder(fd);
+
+ // flush changes
+ WebloggerFactory.getWeblogger().flush();
+
+ // notify caches
+ CacheManager.invalidate(getActionWeblog());
+
+ // re-route to default folder
+ setFolder(bmgr.getDefaultFolder(getActionWeblog()));
+ setFolderId(getFolder().getId());
+ }
+ } catch (WebloggerException ex) {
+ log.error("Error deleting folder", ex);
+ }
+ return execute();
+ }
+
/**
* View the contents of another bookmark folder.
*/
public String view() {
+
try {
BookmarkManager bmgr =
WebloggerFactory.getWeblogger().getBookmarkManager();
if (!StringUtils.isEmpty(viewFolderId)) {
@@ -176,85 +201,86 @@ public class Bookmarks extends UIAction
return execute();
}
- /**
- * Move bookmarks to a new folder.
- */
- public String move() {
-
- try {
- BookmarkManager bmgr = WebloggerFactory.getWeblogger()
- .getBookmarkManager();
+ /**
+ * Move bookmarks to a new folder.
+ */
+ public String move() {
+
+ try {
+ BookmarkManager bmgr = WebloggerFactory.getWeblogger()
+ .getBookmarkManager();
- if (log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Moving bookmarks to folder - "
+ getTargetFolderId());
}
- // Move bookmarks to new parent folder.
- WeblogBookmarkFolder parent = bmgr.getFolder(getTargetFolderId());
- String bookmarks[] = getSelectedBookmarks();
- if (null != bookmarks && bookmarks.length > 0) {
- for (int j = 0; j < bookmarks.length; j++) {
- // maybe we should be using
folder.addBookmark()?
- WeblogBookmark bd =
bmgr.getBookmark(bookmarks[j]);
- bd.setFolder(parent);
- bmgr.saveBookmark(bd);
- }
- }
-
- // flush changes
- WebloggerFactory.getWeblogger().flush();
-
- // notify caches
- CacheManager.invalidate(getActionWeblog());
-
- } catch (WebloggerException e) {
- log.error("Error doing bookmark move", e);
- addError("bookmarksForm.error.move");
- }
-
- return execute();
- }
-
- public String getFolderId() {
- return folderId;
- }
-
- public void setFolderId(String folderId) {
- this.folderId = folderId;
- }
-
- public String[] getSelectedBookmarks() {
- return selectedBookmarks;
- }
-
- public void setSelectedBookmarks(String[] bookmarks) {
- this.selectedBookmarks = bookmarks;
- }
-
- public String getTargetFolderId() {
- return targetFolderId;
- }
-
- public void setTargetFolderId(String targetFolderId) {
- this.targetFolderId = targetFolderId;
- }
-
- public List<WeblogBookmarkFolder> getAllFolders() {
- return allFolders;
- }
-
- public void setAllFolders(List<WeblogBookmarkFolder> allFolders) {
- this.allFolders = allFolders;
- }
-
- public WeblogBookmarkFolder getFolder() {
- return folder;
- }
-
- public void setFolder(WeblogBookmarkFolder folder) {
- this.folder = folder;
- }
+ // Move bookmarks to new parent folder.
+ WeblogBookmarkFolder newFolder =
bmgr.getFolder(getTargetFolderId());
+ String bookmarks[] = getSelectedBookmarks();
+ if (null != bookmarks && bookmarks.length > 0) {
+ for (int j = 0; j < bookmarks.length; j++) {
+ WeblogBookmark bd = bmgr.getBookmark(bookmarks[j]);
+ folder.getBookmarks().remove(bd);
+ newFolder.addBookmark(bd);
+ bd.setFolder(newFolder);
+ bmgr.saveBookmark(bd);
+ }
+ }
+
+ // flush changes
+ WebloggerFactory.getWeblogger().flush();
+
+ // notify caches
+ CacheManager.invalidate(getActionWeblog());
+
+ } catch (WebloggerException e) {
+ log.error("Error doing bookmark move", e);
+ addError("bookmarksForm.error.move");
+ }
+
+ return execute();
+ }
+
+ public String getFolderId() {
+ return folderId;
+ }
+
+ public void setFolderId(String folderId) {
+ this.folderId = folderId;
+ }
+
+ public String[] getSelectedBookmarks() {
+ return selectedBookmarks;
+ }
+
+ public void setSelectedBookmarks(String[] bookmarks) {
+ this.selectedBookmarks = bookmarks;
+ }
+
+ public String getTargetFolderId() {
+ return targetFolderId;
+ }
+
+ public void setTargetFolderId(String targetFolderId) {
+ this.targetFolderId = targetFolderId;
+ }
+
+ public List<WeblogBookmarkFolder> getAllFolders() {
+ return allFolders;
+ }
+
+ public void setAllFolders(List<WeblogBookmarkFolder> allFolders) {
+ this.allFolders = allFolders;
+ }
+
+ public WeblogBookmarkFolder getFolder() {
+ return folder;
+ }
+
+ public void setFolder(WeblogBookmarkFolder folder) {
+ this.folder = folder;
+ }
public String getViewFolderId() {
return viewFolderId;
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1575796&r1=1575795&r2=1575796&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Mon Mar
10 02:30:20 2014
@@ -87,12 +87,15 @@ bookmarksForm.checkAll=Select All
bookmarksForm.checkNone=Select None
bookmarksForm.delete=Delete selected
bookmarksForm.delete.confirm=Delete selected bookmarks?
+bookmarksForm.deleteFolder.confirm=Delete entire folder including all its
bookmarks?
bookmarksForm.description=URL
bookmarksForm.folder=Bookmark Folder
+bookmarksForm.deleteFolder=Delete folder
bookmarksForm.viewFolder=Switch to Folder
bookmarksForm.priority=Priority
bookmarksForm.edit=Edit
-bookmarksForm.edit.tip=Click to edit this folder or bookmark
+bookmarksForm.edit.tip=Click to modify this bookmark
+bookmarksForm.folder.edit.tip=Click to edit folder
bookmarksForm.move=Move Selected To\:
bookmarksForm.move.confirm=Move selected bookmarks?
bookmarksForm.name=Name
@@ -624,7 +627,7 @@ folderForm.add.title=Add Folder
folderForm.add.subtitle=Adding new bookmark folder
folderForm.edit.title=Edit Folder
-folderForm.edit.subtitle=Editing bookmark folder in folder [{0}]
+folderForm.edit.subtitle=Editing bookmark folder [{0}]
folderForm.correct.title=Correct Folder
folderForm.correct.subtitle=Correcting bookmark folder edits
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=1575796&r1=1575795&r2=1575796&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_da.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_da.properties Mon
Mar 10 02:30:20 2014
@@ -89,7 +89,7 @@ bookmarksForm.description=
bookmarksForm.folder=Bogm�rke samling
bookmarksForm.priority=Prioritet
bookmarksForm.edit=Ret
-bookmarksForm.edit.tip=Klik for at rette mappe eller bogm�rke
+bookmarksForm.edit.tip=Klik for at rette bogm\uFFFDrke
bookmarksForm.move=Flyt valgte
bookmarksForm.move.confirm=Flyt valgte bogm�rker?
bookmarksForm.name=Navn
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=1575796&r1=1575795&r2=1575796&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Mon
Mar 10 02:30:20 2014
@@ -118,7 +118,7 @@ bookmarksForm.delete=L\u00F6sche Auswahl
bookmarksForm.delete.confirm=Ausgew\u00E4hlte Lesezeichen l\u00F6schen?
bookmarksForm.description=
bookmarksForm.edit=Bearbeiten
-bookmarksForm.edit.tip=Anklicken um den Ordner oder das Lesezeichen zu
bearbeiten
+bookmarksForm.edit.tip=Anklicken um 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 hier anlegen, aber sie werden nicht in Ihrem Weblog angezeigt
werden, so lange Sie nicht die entsprechenden Lesezeichenanzeigemarcos zu Ihren
Weblog Schablonen hinzuf\u00FCgen.
@@ -489,7 +489,7 @@ folderForm.cancel=Abbrechen
folderForm.correct.subtitle=Korrigiere Lesezeichen Ordner Bearbeitungen
folderForm.correct.title=Ordner korrigieren
folderForm.description=Beschreibung
-folderForm.edit.subtitle=Bearbeite Lesezeichenordner in Ordner [{0}]
+folderForm.edit.subtitle=Bearbeite Lesezeichenordner [{0}]
folderForm.edit.title=Ordner bearbeiten
folderForm.error.duplicateName=Der Ordnername {0} wird bereits verwendet,
bitte w\u00E4hlen Sie einen anderen
# ------------------------------------------------------------ FolderForm.jsp
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=1575796&r1=1575795&r2=1575796&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_es.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_es.properties Mon
Mar 10 02:30:20 2014
@@ -34,7 +34,7 @@ bookmarksForm.delete = Borrar selecciona
bookmarksForm.description =
bookmarksForm.folder = Carpeta de marcador
bookmarksForm.edit = Editar
-bookmarksForm.edit.tip = Haga click para editar esta carpeta o marcador
+bookmarksForm.edit.tip = Haga click para editar esta marcador
bookmarksForm.move = Mover el seleccionado
bookmarksForm.name = Nombre
bookmarksForm.path = Carpeta de marcador
@@ -318,7 +318,7 @@ errorPage.noException = No hay trazo de
folderForm.add.title = A\u00F1adir carpeta
folderForm.add.subtitle = A\u00F1adir nuevo marcador
folderForm.edit.title = Editar carpeta
-folderForm.edit.subtitle = Editar carpeta de marcadores un carpeta [{0}]
+folderForm.edit.subtitle = Editar carpeta de marcadores [{0}]
folderForm.correct.title = Carpeta correcta
folderForm.correct.subtitle = Haciendo correcciones en la carpeta de marcadores
folderForm.name = Nombre
Modified: roller/trunk/app/src/main/resources/ApplicationResources_nl.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_nl.properties?rev=1575796&r1=1575795&r2=1575796&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_nl.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_nl.properties Mon
Mar 10 02:30:20 2014
@@ -78,7 +78,7 @@ bookmarksForm.checkNone=Selecteer Niets
bookmarksForm.delete=Verwijder selectie
bookmarksForm.description=
bookmarksForm.edit=Wijzig
-bookmarksForm.edit.tip=Klik om deze folder of favoriet te wijzigen.
+bookmarksForm.edit.tip=Klik om deze favoriet te wijzigen.
bookmarksForm.folder=Folder
bookmarksForm.move=Verplaats selectie
bookmarksForm.name=Naam
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ru.properties?rev=1575796&r1=1575795&r2=1575796&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ru.properties Mon
Mar 10 02:30:20 2014
@@ -400,7 +400,7 @@ folderForm.add.title=\u0421\u043e\u0437\
folderForm.add.subtitle=\u0421\u043E\u0437\u0434\u0430\u0439\u0442\u0435
\u043D\u043E\u0432\u0443\u044E \u043F\u0430\u043F\u043A\u0443
\u0437\u0430\u043A\u043B\u0430\u0434\u043E\u043A
folderForm.edit.title=\u041f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u0443\u0439\u0442\u0435
\u043f\u0430\u043f\u043a\u0443
-folderForm.edit.subtitle=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435
\u043f\u0430\u043f\u043a\u0438
\u0437\u0430\u043a\u043b\u0430\u0434\u043e\u043a \u0432
\u043f\u0430\u043f\u043a\u0435 [{0}]
+folderForm.edit.subtitle=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435
\u043F\u0430\u043F\u043A\u0438
\u0437\u0430\u043A\u043B\u0430\u0434\u043E\u043A [{0}]
folderForm.correct.title=\u041a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u044b\u0439
\u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a
\u043f\u0430\u043f\u043a\u0438
folderForm.correct.subtitle=\u041a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u043e\u0435
\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435
\u043f\u0430\u043f\u043a\u0438 \u0437\u0430\u043a\u043b\u0430\u0434\u043e\u043a
Modified: roller/trunk/app/src/main/resources/ApplicationResources_sl.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_sl.properties?rev=1575796&r1=1575795&r2=1575796&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_sl.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_sl.properties Mon
Mar 10 02:30:20 2014
@@ -90,7 +90,7 @@ bookmarksForm.description=
bookmarksForm.folder=Imenik Zaznamka
bookmarksForm.priority=Priority
bookmarksForm.edit=urejanje
-bookmarksForm.edit.tip=Klikni za urejanje tega imenika ali zaznamka
+bookmarksForm.edit.tip=Klikni za urejanje tega zaznamka
bookmarksForm.move=Premakni izbrano
bookmarksForm.move.confirm=Premakni izbrane zaznamke?
bookmarksForm.name=Ime
@@ -599,7 +599,7 @@ folderForm.add.title=Dodaj Imenik
folderForm.add.subtitle=Dodajanje novega imenika zaznamkov
folderForm.edit.title=urejanje Imenika
-folderForm.edit.subtitle=Urejanje imenika zaznamkov v imeniku [{0}]
+folderForm.edit.subtitle=Urejanje imenika zaznamkov [{0}]
folderForm.popravi.title=Popravi Imenik
folderForm.popravi.subtitle=Popravljanje urejanja imenika zaznamkov
Modified:
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties?rev=1575796&r1=1575795&r2=1575796&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
Mon Mar 10 02:30:20 2014
@@ -43,7 +43,7 @@ bookmarksForm.checkNone=\u4e00\u4e2a\u4e
bookmarksForm.delete=\u5220\u9664\u9009\u4e2d\u7684
bookmarksForm.description=
bookmarksForm.edit=\u7f16\u8f91
-bookmarksForm.edit.tip=\u70b9\u51fb\uff0c\u7136\u540e\u7f16\u8f91\u6b64\u4e66\u7b7e\u6216\u4e66\u7b7e\u5939
+bookmarksForm.edit.tip=\u70B9\u51FB\uFF0C\u7136\u540E\u7F16\u8F91\u6B64\u4E66\u7B7E
bookmarksForm.error.move=\u79fb\u52a8\u9519\u8bef\uff0c\u4e0d\u5141\u8bb8\u79fb\u52a8\u7236\u76ee\u5f55\u5230\u5b50\u76ee\u5f55
bookmarksForm.folder=\u4e66\u7b7e\u5939
bookmarksForm.folderPrompt=\u8fd9\u662f\u4e00\u4e2a\u4e66\u7b7e\u3002\u60a8\u53ef\u4ee5\u5728\u8fd9\u91cc\u6dfb\u52a0\u4e66\u7b7e\u6216\u8005\u4e66\u7b7e\u5939\uff0c\u4f46\u662f\u5982\u679c\u60a8\u4e0d\u5728\u7f51\u5fd7\u6a21\u677f\u4e2d\u5229\u7528\u5b8f\u6765\u5f15\u7528\uff0c\u4e66\u7b7e\u5c06\u4e0d\u663e\u793a\u3002
@@ -356,7 +356,7 @@ folderForm.correct.subtitle=\u6b63\u5728
folderForm.correct.title=\u4fee\u6539\u6587\u4ef6\u5939
folderForm.correctFolder=\u66f4\u6b63\u4e66\u7b7e\u5939
folderForm.description=\u63cf\u8ff0
-folderForm.edit.subtitle=\u6b63\u5728\u7f16\u8f91\u6587\u4ef6\u5939 [{0}]
\u4e2d\u7684\u4e66\u7b7e\u5939
+folderForm.edit.subtitle=\u6B63\u5728\u7F16\u8F91\u6587\u4EF6\u5939 [{0}]
folderForm.edit.title=\u7f16\u8f91\u6587\u4ef6\u5939
folderForm.editFolder=\u7f16\u8f91\u4e66\u7b7e\u5939
folderForm.name=\u540d\u5b57
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp?rev=1575796&r1=1575795&r2=1575796&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp Mon Mar
10 02:30:20 2014
@@ -17,22 +17,31 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<%-- JavaScript for bookmarks table --%>
+<%-- JavaScript for bookmarks table --%>
<script type="text/javascript">
// <!--
function onDelete()
{
if ( confirm("<s:text name='bookmarksForm.delete.confirm' />") )
{
- document.bookmarks.method.value = "deleteSelected";
document.bookmarks.submit();
}
- }
-function onMove()
+}
+
+function onDeleteFolder()
+{
+ if ( confirm("<s:text name='bookmarksForm.deleteFolder.confirm' />") )
+ {
+ document.bookmarks.action='<s:url action="bookmarks!deleteFolder" />';
+ document.bookmarks.submit();
+ }
+}
+
+function onMove()
{
if ( confirm("<s:text name='bookmarksForm.move.confirm' />") )
{
- document.bookmarks.method.value = "moveSelected";
+ document.bookmarks.action='<s:url action="bookmarks!move" />';
document.bookmarks.submit();
}
}
@@ -52,6 +61,12 @@ function onMove()
<s:else>
<p class="subtitle">
<s:text name="bookmarksForm.path" />: <s:text name="%{folder.name}" />
+ <s:url id="editUrl" action="folderEdit">
+ <s:param name="weblog" value="%{actionWeblog.handle}" />
+ <s:param name="bean.id" value="%{folder.id}" />
+ </s:url>
+ <s:a href="%{editUrl}"><img src='<s:url
value="/images/page_white_edit.png"/>' border="0" alt="icon" /
+ title="<s:text name='bookmarksForm.folder.edit.tip' />" /></s:a>
</s:else>
<%-- Form is a table of folders followed by bookmarks, each with checkbox --%>
@@ -154,6 +169,10 @@ function onMove()
<%-- Move-to combo-box --%>
<s:select name="targetFolderId" list="allFolders" listKey="id"
listValue="name" />
</s:if>
+
+ <s:if test="folder.name != 'default'">
+ <s:submit type="button" action="bookmarks!deleteFolder"
key="bookmarksForm.deleteFolder" onclick="onDeleteFolder();return false;"/>
+ </s:if>
</div>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp?rev=1575796&r1=1575795&r2=1575796&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp Mon Mar
10 02:30:20 2014
@@ -28,9 +28,9 @@
<s:hidden name="weblog" />
<s:hidden name="bean.id" />
- <%-- if we cancel then we may need this attribute --%>
+ <%-- if we cancel then we need this attribute --%>
<%-- (Need to test after folder edit re-implemented) --%>
- <%-- s:hidden name="folderId" value="%{folder.parent.id}" /--%>
+ <s:hidden name="folderId" value="%{folder.id}" />
<table>
<tr>
