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

Kleine Formatierungen, Nachführen Änderung in ccm-cms. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@679 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2011-01-10 10:31:00 +00:00
parent 6366fe3494
commit a8a0bf72f7
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/authoring/FileDisplay.java
View File

@ -2,15 +2,16 @@ package com.arsdigita.cms.docmgr.ui.authoring;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.SimpleComponent; import com.arsdigita.bebop.SimpleComponent;
import com.arsdigita.cms.CMS;
import com.arsdigita.cms.FileAsset; import com.arsdigita.cms.FileAsset;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.dispatcher.CMSPage;
import com.arsdigita.cms.dispatcher.Utilities; import com.arsdigita.cms.dispatcher.Utilities;
import com.arsdigita.mimetypes.MimeType; import com.arsdigita.mimetypes.MimeType;
import com.arsdigita.xml.Element; import com.arsdigita.xml.Element;
/** /**
*
*/ */
public class FileDisplay extends SimpleComponent { public class FileDisplay extends SimpleComponent {
@ -30,10 +31,11 @@ public class FileDisplay extends SimpleComponent {
m_asset = asset; m_asset = asset;
} }
@Override
public void generateXML(PageState state, Element parent) { public void generateXML(PageState state, Element parent) {
if ( isVisible(state) && m_asset != null ) { if ( isVisible(state) && m_asset != null ) {
Element element = new Element("cms:FileDisplay", CMSPage.CMS_XML_NS); Element element = new Element("cms:FileDisplay", CMS.CMS_XML_NS);
generateFilePropertiesXML(m_asset, state, element); generateFilePropertiesXML(m_asset, state, element);
@ -43,8 +45,8 @@ public class FileDisplay extends SimpleComponent {
} }
protected void generateFilePropertiesXML(FileAsset asset, protected void generateFilePropertiesXML(FileAsset asset,
PageState state, PageState state,
Element element) { Element element) {
element.addAttribute("src", Utilities.getAssetURL(asset)); element.addAttribute("src", Utilities.getAssetURL(asset));

2
ccm-webpage/src/com/arsdigita/cms/webpage/ui/WebpageCMSEditorPage.java
View File

@ -33,7 +33,7 @@ import com.arsdigita.bebop.form.TextField;
import com.arsdigita.bebop.parameters.DateParameter; import com.arsdigita.bebop.parameters.DateParameter;
import com.arsdigita.bebop.parameters.IntegerParameter; import com.arsdigita.bebop.parameters.IntegerParameter;
import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.categorization.Category; // import com.arsdigita.categorization.Category;
import com.arsdigita.categorization.CategoryCollection; import com.arsdigita.categorization.CategoryCollection;
import com.arsdigita.cms.ContentBundle; import com.arsdigita.cms.ContentBundle;
import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.ContentSection;