LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FolderBrowser 

Confirmation-Link globalisiert

git-svn-id: https://svn.libreccm.org/ccm/trunk@1582 8810af33-2d31-482b-a856-94f89814c4df
master
quasi 2012-04-11 10:52:11 +00:00
parent d70384d34f
commit 1c347be298
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ccm-cms/src/com/arsdigita/cms/ui/folder/CMSFolderResources.properties
View File

@ -71,3 +71,4 @@ cms.ui.folder.filter.all=All
cms.ui.folder.filter=Filter for work cms.ui.folder.filter=Filter for work
cms.ui.folder.filter_do=Filter cms.ui.folder.filter_do=Filter
cms.ui.folder.languages= cms.ui.folder.languages=
cms.ui.folder.delete_confirmation=Permanently delete this item?

1
ccm-cms/src/com/arsdigita/cms/ui/folder/CMSFolderResources_de.properties
View File

@ -67,3 +67,4 @@ cms.ui.folder.filter.all=Alle
cms.ui.folder.filter=Nach Begriff filtern cms.ui.folder.filter=Nach Begriff filtern
cms.ui.folder.filter_do=Filtern cms.ui.folder.filter_do=Filtern
cms.ui.folder.languages= cms.ui.folder.languages=
cms.ui.folder.delete_confirmation=Wollen Sie dieses Content-Item l\u00f6schen?

1
ccm-cms/src/com/arsdigita/cms/ui/folder/CMSFolderResources_fr.properties
View File

@ -66,3 +66,4 @@ cms.ui.folder.no_permission_for_item=Vous n'avez pas l'autorisation de supprimer
cms.ui.folder.no_such_item=L'identifiant fourni pour l'\u00e9l\u00e9ment ne correspond pas \u00e0 un contenu existant. cms.ui.folder.no_such_item=L'identifiant fourni pour l'\u00e9l\u00e9ment ne correspond pas \u00e0 un contenu existant.
cms.ui.folder.filter.all= cms.ui.folder.filter.all=
cms.ui.folder.languages= cms.ui.folder.languages=
cms.ui.folder.delete_confirmation=

17
ccm-cms/src/com/arsdigita/cms/ui/folder/FolderBrowser.java
View File

@ -427,7 +427,7 @@ public class FolderBrowser extends Table {
final boolean isCurrentKey = sortKey.equals(m_key); final boolean isCurrentKey = sortKey.equals(m_key);
final String currentSortDirection = (String) state.getValue( final String currentSortDirection = (String) state.getValue(
m_sortDirection); m_sortDirection);
String imageURLStub = null; String imageURLStub;
if (SORT_ACTION_UP.equals(currentSortDirection)) { if (SORT_ACTION_UP.equals(currentSortDirection)) {
imageURLStub = "gray-triangle-up.gif"; imageURLStub = "gray-triangle-up.gif";
@ -439,7 +439,7 @@ public class FolderBrowser extends Table {
@Override @Override
public void setControlEvent(PageState ps) { public void setControlEvent(PageState ps) {
String sortDirectionAction = null; String sortDirectionAction;
// by default, everything sorts "up" unless it // by default, everything sorts "up" unless it
// is the current key and it is already pointing up // is the current key and it is already pointing up
if (SORT_ACTION_UP.equals(currentSortDirection) if (SORT_ACTION_UP.equals(currentSortDirection)
@ -604,8 +604,8 @@ public class FolderBrowser extends Table {
*/ */
private static class ActionCellRenderer implements TableCellRenderer { private static class ActionCellRenderer implements TableCellRenderer {
private static Label s_noAction; private static final Label s_noAction;
private static ControlLink s_link; private static final ControlLink s_link;
private static final Logger logger = Logger.getLogger( private static final Logger logger = Logger.getLogger(
ActionCellRenderer.class); ActionCellRenderer.class);
@ -615,7 +615,7 @@ public class FolderBrowser extends Table {
s_noAction.lock(); s_noAction.lock();
s_link = new ControlLink( s_link = new ControlLink(
new Label(globalize("cms.ui.folder.delete"))); new Label(globalize("cms.ui.folder.delete")));
s_link.setConfirmation("Permanently delete this item?"); // XXX G11N ? s_link.setConfirmation(globalize("cms.ui.folder.delete_confirmation"));
logger.debug("Static initializer finished."); logger.debug("Static initializer finished.");
} }
@ -759,7 +759,7 @@ public class FolderBrowser extends Table {
return FormatStandards.formatDate(lastModified); return FormatStandards.formatDate(lastModified);
} }
case DELETABLE: case DELETABLE:
return new Boolean(isDeletable()); return isDeletable();
case IS_INDEX: { case IS_INDEX: {
if (hideIndexColumn()) { if (hideIndexColumn()) {
throw new IndexOutOfBoundsException( throw new IndexOutOfBoundsException(
@ -770,9 +770,9 @@ public class FolderBrowser extends Table {
return null; return null;
} }
if (m_folIndexID == null) { if (m_folIndexID == null) {
return new Boolean(false); return false;
} }
return new Boolean(m_folIndexID.compareTo(m_itemColl.getBundleID()) == 0); return m_folIndexID.compareTo(m_itemColl.getBundleID()) == 0;
} }
default: default:
throw new IndexOutOfBoundsException("Column index " throw new IndexOutOfBoundsException("Column index "
@ -828,6 +828,7 @@ public class FolderBrowser extends Table {
private class FolderChanger extends TableActionAdapter { private class FolderChanger extends TableActionAdapter {
@Override
public void cellSelected(TableActionEvent e) { public void cellSelected(TableActionEvent e) {
PageState s = e.getPageState(); PageState s = e.getPageState();
int col = e.getColumn().intValue(); int col = e.getColumn().intValue();