Update of /var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/render In directory james.mmbase.org:/tmp/cvs-serv26804/cmsc/taglib/src/java/com/finalist/cmsc/taglib/render
Modified Files: HeaderContentTag.java Log Message: CMSC-755 Navigation code refactored to use navigationitem See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/render See also: http://www.mmbase.org/jira/browse/CMSC-755 Index: HeaderContentTag.java =================================================================== RCS file: /var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/render/HeaderContentTag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- HeaderContentTag.java 17 Dec 2007 20:30:51 -0000 1.1 +++ HeaderContentTag.java 28 Jan 2008 21:15:44 -0000 1.2 @@ -17,8 +17,7 @@ import javax.servlet.jsp.PageContext; -import com.finalist.cmsc.beans.om.Page; -import com.finalist.cmsc.beans.om.Site; +import com.finalist.cmsc.beans.om.*; import com.finalist.cmsc.portalImpl.headerresource.HeaderResource; import com.finalist.cmsc.portalImpl.headerresource.LinkHeaderResource; import com.finalist.cmsc.portalImpl.headerresource.MetaHeaderResource; @@ -51,13 +50,15 @@ String path = getPath(); Site site = SiteManagement.getSiteFromPath(path); - Page page = SiteManagement.getPageFromPath(path); + NavigationItem item = SiteManagement.getNavigationItemFromPath(path); if (site != null) { String siteLanguage = site.getLanguage(); ArrayList<HeaderResource> headerResources = new ArrayList<HeaderResource>(); - headerResources.add(new MetaHeaderResource(false, "description", page.getDescription(), siteLanguage, null)); + if (item != null) { + headerResources.add(new MetaHeaderResource(false, "description", item.getDescription(), siteLanguage, null)); + } headerResources.add(new MetaHeaderResource(false, "author", site.getCreator(), siteLanguage, null)); headerResources.add(new MetaHeaderResource(false, "copyright", site.getRights(), siteLanguage, null)); headerResources.add(new MetaHeaderResource(false, "language", siteLanguage, null, "language")); @@ -84,10 +85,12 @@ headerResources.add(new MetaHeaderResource(true, "format", "text/html")); headerResources.add(new MetaHeaderResource(true, "type", "Collection")); headerResources.add(new MetaHeaderResource(true, "language", siteLanguage)); - headerResources.add(new MetaHeaderResource(true, "title", page.getTitle())); + if (item != null) { + headerResources.add(new MetaHeaderResource(true, "title", item.getTitle())); + headerResources.add(new MetaHeaderResource(true, "description", item.getDescription())); + } headerResources.add(new MetaHeaderResource(true, "creator", site.getCreator())); headerResources.add(new MetaHeaderResource(true, "publisher", site.getPublisher())); - headerResources.add(new MetaHeaderResource(true, "description", page.getDescription())); headerResources.add(new MetaHeaderResource(true, "rights", site.getRights())); headerResources.add(new MetaHeaderResource(true, "source", site.getSource())); } _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs