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

Some small enhancements 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2761 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2014-07-17 10:44:24 +00:00
parent e34ba310c8
commit 0ab4e576e6
4 changed files with 104 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-sci-bundle/bundles/devel/cfg/project.xml
View File

@ -9,7 +9,7 @@
name="ScientificCMS"
prettyName="Scientific CMS"
version="2.3.0"
release="devel-SNAPSHOT-r2755"
release="devel-SNAPSHOT-r2758"
webxml="sci-web.xml"
portletxml="sci-portlet.xml"
webapp="libreccm"

2
ccm-sci-bundle/web/themes/mandalay/css/screen/admin.css
View File

@ -889,7 +889,7 @@ span.cmsGlobalNavigationHelp :before {
content:url('../../images/cms/help.png');
}
span.cmsPreview :before {
span.cmsPreview a:before {
content:url('../../images/cms/preview.png');
}

7
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorAddForm.java
View File

@ -89,9 +89,10 @@ public class PublicationAuthorAddForm
add(selectedAuthorLabel);
isEditor = new CheckboxGroup("isEditorGroup");
isEditor.addOption(new Option(ISEDITOR, ""));
isEditor.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.authors.author.is_editor"));
isEditor.addOption(new Option(ISEDITOR, new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.authors.author.is_editor"))));
// isEditor.setLabel(PublicationGlobalizationUtil.globalize(
// "publications.ui.authors.author.is_editor"));
add(isEditor);
}

46
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsTable.java
View File

@ -54,17 +54,15 @@ public class PublicationAuthorsTable
extends Table
implements TableActionListener {
private static final Logger s_log =
Logger.getLogger(PublicationAuthorsTable.class);
private static final Logger s_log = Logger.getLogger(PublicationAuthorsTable.class);
private final String TABLE_COL_EDIT = "table_col_edit";
private final String TABLE_COL_EDIT_ASSOC = "table_col_edit_assoc";
private final String TABLE_COL_DEL = "table_col_del";
private final String TABLE_COL_UP = "table_col_up";
private final String TABLE_COL_DOWN = "table_col_down";
public static final String SELECTED_PUBLICATION =
"selected_publication_author_association_publication";
public static final String SELECTED_AUTHOR =
"selected_publication_author_association_author";
public static final String SELECTED_PUBLICATION
= "selected_publication_author_association_publication";
public static final String SELECTED_AUTHOR = "selected_publication_author_association_author";
private ItemSelectionModel m_itemModel;
private SimpleEditStep editStep;
@ -135,8 +133,7 @@ public class PublicationAuthorsTable
@Override
public TableModel makeModel(Table table, PageState state) {
table.getRowSelectionModel().clearSelection(state);
Publication publication =
(Publication) m_itemModel.getSelectedObject(state);
Publication publication = (Publication) m_itemModel.getSelectedObject(state);
return new PublicationAuthorsTableModel(table, state, publication);
}
@ -219,8 +216,7 @@ public class PublicationAuthorsTable
Object key,
int row,
int col) {
SecurityManager securityManager =
CMS.getSecurityManager(state);
SecurityManager securityManager = CMS.getSecurityManager(state);
Publication publication = (Publication) m_itemModel.
getSelectedObject(state);
@ -239,7 +235,7 @@ public class PublicationAuthorsTable
ex);
if (value instanceof GlobalizedMessage) {
return new Label((GlobalizedMessage) value);
} else if(value instanceof Label) {
} else if (value instanceof Label) {
return (Component) value;
} else {
return new Label(value.toString());
@ -250,29 +246,25 @@ public class PublicationAuthorsTable
ItemResolver resolver = section.getItemResolver();
Link link;
if (value instanceof GlobalizedMessage) {
link =
new Link(new Label((GlobalizedMessage) value),
link = new Link(new Label((GlobalizedMessage) value),
resolver.generateItemURL(state,
author,
section,
author.getVersion()));
} else if(value instanceof Label) {
link =
new Link((Label) value,
} else if (value instanceof Label) {
link = new Link((Label) value,
resolver.generateItemURL(state,
author,
section,
author.getVersion()));
} else {
link =
new Link(value.toString(),
link = new Link(value.toString(),
resolver.generateItemURL(state,
author,
section,
author.getVersion()));
}
return link;
} else {
GenericPerson author;
@ -304,8 +296,7 @@ public class PublicationAuthorsTable
Object key,
int row,
int col) {
SecurityManager securityManager =
CMS.getSecurityManager(state);
SecurityManager securityManager = CMS.getSecurityManager(state);
Publication publication = (Publication) m_itemModel.
getSelectedObject(state);
@ -315,11 +306,10 @@ public class PublicationAuthorsTable
publication);
if (canEdit) {
ControlLink link = new ControlLink(value.toString());
ControlLink link = new ControlLink((Label) value);
return link;
} else {
Label label = new Label(value.toString());
return label;
return (Label) value;
}
}
@ -337,8 +327,7 @@ public class PublicationAuthorsTable
Object key,
int row,
int col) {
SecurityManager securityManager =
CMS.getSecurityManager(state);
SecurityManager securityManager = CMS.getSecurityManager(state);
Publication publication = (Publication) m_itemModel.
getSelectedObject(state);
@ -348,13 +337,12 @@ public class PublicationAuthorsTable
publication);
if (canDelete) {
ControlLink link = new ControlLink(value.toString());
ControlLink link = new ControlLink((Label) value);
link.setConfirmation(PublicationGlobalizationUtil.globalize(
"publications.ui.authors.author.confirm_remove"));
return link;
} else {
Label label = new Label(value.toString());
return label;
return (Label) value;
}
}