pvollenweider 2005/04/29 14:48:47 CEST
Modified files:
src/java/jahiatemplates Corporate_portal_templates.properties
Corporate_portal_templates_en.properties
Corporate_portal_templates_fr.properties
src/view/jsp eventlistener.jsp templates.xml
web_css.jsp
src/view/jsp/include declarations.inc files.inc guestbook.inc
left_menu.inc page_title.inc sitemap.inc
Added files:
src/java/jahiatemplates
ContainerSorterByContainerDefinitionResBundleCapable$DataBean.class
ContainerSorterByContainerDefinitionResBundleCapable$StrDataBean.class
ContainerSorterByContainerDefinitionResBundleCapable$TempField.class
ContainerSorterByContainerDefinitionResBundleCapable.class
src/view/jsp blog.jsp blog_listing.jsp
blog_listing_rss_2_0.jsp blog_rss_2_0.jsp
src/view/jsp/include blog_addcomment_form.inc
blog_categories.inc blog_declarations.inc
blog_definitions.inc blog_entries.inc
blog_entry.inc blog_filters.inc
blog_list.inc blog_listing_filters.inc
blog_searchbox.inc blog_view_comments.inc
blog_view_pingurl.inc
blog_view_trackbacks.inc
src/view/jsp/images arrow.gif arrow_on.gif icon_comment.gif
icon_offsite.gif icon_pg.gif
Log:
Add blogs
Revision Changes Path
1.1 +5 -0
corporate_portal_templates/src/java/jahiatemplates/ContainerSorterByContainerDefinitionResBundleCapable$DataBean.class
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/java/jahiatemplates/ContainerSorterByContainerDefinitionResBundleCapable$DataBean.class?rev=1.1&content-type=text/plain
1.1 +8 -0
corporate_portal_templates/src/java/jahiatemplates/ContainerSorterByContainerDefinitionResBundleCapable$StrDataBean.class
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/java/jahiatemplates/ContainerSorterByContainerDefinitionResBundleCapable$StrDataBean.class?rev=1.1&content-type=text/plain
1.1 +5 -0
corporate_portal_templates/src/java/jahiatemplates/ContainerSorterByContainerDefinitionResBundleCapable$TempField.class
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/java/jahiatemplates/ContainerSorterByContainerDefinitionResBundleCapable$TempField.class?rev=1.1&content-type=text/plain
1.1 +65 -0
corporate_portal_templates/src/java/jahiatemplates/ContainerSorterByContainerDefinitionResBundleCapable.class
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/java/jahiatemplates/ContainerSorterByContainerDefinitionResBundleCapable.class?rev=1.1&content-type=text/plain
1.42 +56 -1
corporate_portal_templates/src/java/jahiatemplates/Corporate_portal_templates.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/java/jahiatemplates/Corporate_portal_templates.properties.diff?r1=1.41&r2=1.42&f=h
1.25 +55 -1
corporate_portal_templates/src/java/jahiatemplates/Corporate_portal_templates_en.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/java/jahiatemplates/Corporate_portal_templates_en.properties.diff?r1=1.24&r2=1.25&f=h
1.45 +55 -1
corporate_portal_templates/src/java/jahiatemplates/Corporate_portal_templates_fr.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/java/jahiatemplates/Corporate_portal_templates_fr.properties.diff?r1=1.44&r2=1.45&f=h
1.2 +64 -0 corporate_portal_templates/src/view/jsp/blog.jsp (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/blog.jsp?rev=1.2&content-type=text/plain
1.2 +276 -0 corporate_portal_templates/src/view/jsp/blog_listing.jsp
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/blog_listing.jsp?rev=1.2&content-type=text/plain
1.2 +168 -0
corporate_portal_templates/src/view/jsp/blog_listing_rss_2_0.jsp (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/blog_listing_rss_2_0.jsp?rev=1.2&content-type=text/plain
1.2 +125 -0 corporate_portal_templates/src/view/jsp/blog_rss_2_0.jsp
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/blog_rss_2_0.jsp?rev=1.2&content-type=text/plain
1.2 +144 -1 corporate_portal_templates/src/view/jsp/eventlistener.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/eventlistener.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -0 corporate_portal_templates/src/view/jsp/images/arrow.gif
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/images/arrow.gif?rev=1.2&content-type=text/plain
1.2 +1 -0
corporate_portal_templates/src/view/jsp/images/arrow_on.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/images/arrow_on.gif?rev=1.2&content-type=text/plain
1.2 +3 -0
corporate_portal_templates/src/view/jsp/images/icon_comment.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/images/icon_comment.gif?rev=1.2&content-type=text/plain
1.2 +1 -0
corporate_portal_templates/src/view/jsp/images/icon_offsite.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/images/icon_offsite.gif?rev=1.2&content-type=text/plain
1.2 +3 -0
corporate_portal_templates/src/view/jsp/images/icon_pg.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/images/icon_pg.gif?rev=1.2&content-type=text/plain
1.2 +42 -0
corporate_portal_templates/src/view/jsp/include/blog_addcomment_form.inc (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_addcomment_form.inc?rev=1.2&content-type=text/plain
1.2 +36 -0
corporate_portal_templates/src/view/jsp/include/blog_categories.inc (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_categories.inc?rev=1.2&content-type=text/plain
1.2 +271 -0
corporate_portal_templates/src/view/jsp/include/blog_declarations.inc (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_declarations.inc?rev=1.2&content-type=text/plain
1.2 +67 -0
corporate_portal_templates/src/view/jsp/include/blog_definitions.inc (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_definitions.inc?rev=1.2&content-type=text/plain
1.2 +247 -0
corporate_portal_templates/src/view/jsp/include/blog_entries.inc (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_entries.inc?rev=1.2&content-type=text/plain
1.2 +180 -0
corporate_portal_templates/src/view/jsp/include/blog_entry.inc (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_entry.inc?rev=1.2&content-type=text/plain
1.2 +112 -0
corporate_portal_templates/src/view/jsp/include/blog_filters.inc (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_filters.inc?rev=1.2&content-type=text/plain
1.2 +123 -0
corporate_portal_templates/src/view/jsp/include/blog_list.inc (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_list.inc?rev=1.2&content-type=text/plain
1.2 +117 -0
corporate_portal_templates/src/view/jsp/include/blog_listing_filters.inc (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_listing_filters.inc?rev=1.2&content-type=text/plain
1.2 +21 -0
corporate_portal_templates/src/view/jsp/include/blog_searchbox.inc (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_searchbox.inc?rev=1.2&content-type=text/plain
1.2 +63 -0
corporate_portal_templates/src/view/jsp/include/blog_view_comments.inc (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_view_comments.inc?rev=1.2&content-type=text/plain
1.2 +28 -0
corporate_portal_templates/src/view/jsp/include/blog_view_pingurl.inc (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_view_pingurl.inc?rev=1.2&content-type=text/plain
1.2 +54 -0
corporate_portal_templates/src/view/jsp/include/blog_view_trackbacks.inc (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_view_trackbacks.inc?rev=1.2&content-type=text/plain
1.8 +45 -0
corporate_portal_templates/src/view/jsp/include/declarations.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/declarations.inc.diff?r1=1.7&r2=1.8&f=h
1.5 +3 -0 corporate_portal_templates/src/view/jsp/include/files.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/files.inc.diff?r1=1.4&r2=1.5&f=h
1.2 +0 -45
corporate_portal_templates/src/view/jsp/include/guestbook.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/guestbook.inc.diff?r1=1.1&r2=1.2&f=h
1.16 +1 -1
corporate_portal_templates/src/view/jsp/include/left_menu.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/left_menu.inc.diff?r1=1.15&r2=1.16&f=h
1.4 +6 -0
corporate_portal_templates/src/view/jsp/include/page_title.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/page_title.inc.diff?r1=1.3&r2=1.4&f=h
1.10 +1 -2
corporate_portal_templates/src/view/jsp/include/sitemap.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/sitemap.inc.diff?r1=1.9&r2=1.10&f=h
1.12 +10 -0 corporate_portal_templates/src/view/jsp/templates.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/templates.xml.diff?r1=1.11&r2=1.12&f=h
1.31 +362 -49 corporate_portal_templates/src/view/jsp/web_css.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/web_css.jsp.diff?r1=1.30&r2=1.31&f=h
Index: ContainerSorterByContainerDefinitionResBundleCapable$DataBean.class
===================================================================
<<Binary file>>
Index: ContainerSorterByContainerDefinitionResBundleCapable$StrDataBean.class
===================================================================
<<Binary file>>
Index: ContainerSorterByContainerDefinitionResBundleCapable$TempField.class
===================================================================
<<Binary file>>
Index: ContainerSorterByContainerDefinitionResBundleCapable.class
===================================================================
<<Binary file>>
Index: Corporate_portal_templates.properties
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/java/jahiatemplates/Corporate_portal_templates.properties,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- Corporate_portal_templates.properties 28 Oct 2004 15:23:55 -0000
1.41
+++ Corporate_portal_templates.properties 29 Apr 2005 12:48:44 -0000
1.42
@@ -149,6 +149,7 @@
noPortlet = No box here
noTitle = No title
noPage = Page N/A
+paginationTo = to
of = of
orange = Orange
owner = Owner
@@ -207,4 +208,58 @@
webappsConrainer = Webapps Container
whichBestMachesFirst = with best matches first
workflow = Workflow
-updateHtmlFile=Select the HTML file
\ No newline at end of file
+updateHtmlFile=Select the HTML file
+blog.postedBy = Posted by
+blog.at = at
+blog.in = in
+blog.comments = comments
+blog.addBlog = Add blog
+blog.addComment = Add comment
+blog.forFar = so far
+blog.postYourOwn = Post your own
+blog.commentTitle = Title
+blog.commentAuthor = Author
+blog.commentBody = Body text
+blog.commentDate = Date
+blog.title = Title
+blog.body = Body
+blog.attachement = Attachment associated
+blog.date = Date
+blog.author = Author
+blog.permanentLink = Permanent link
+blog.categories = Categories
+blog.allCategories = All categories
+blog.addEntry = Add entry
+blog.noEntry = Could not found any entry
+blog.category = category
+blog.for = for
+blog.backTo = back to
+blog.the = the
+blog.from = from
+blog.to = to
+blog.blogs = Blogs
+blog.mo = mo
+blog.tu = tu
+blog.we = we
+blog.th = th
+blog.fr = fr
+blog.sa = sa
+blog.su = su
+blog.today = Today
+blog.thisWeek = This week
+blog.trackbacks = trackbacks
+blog.trackback = trackback
+blog.sentPingUrl = Sent ping urls
+blog.pingURL = URL to send the ping to
+blog.trackBackTitle = Title of the blog entry for this trackback
+blog.trackBackExcerpt = Excerpt of the blog entry for this trackback
+blog.trackBackUrl = Url (permalink) of the blog entry for this trackback
+blog.trackBackBlog_name= Name of the blog for this trackback
+blog.trackBackPing_IP = The IP address of the host that sent the ping
+blog.excerpt = The Excerpt of this post
+blog.keyWords = Comma seperated Keywords for this post
+blog.continued = Continued
+blog.on = on
+blog.wrote = wrote
+rss.title = Subscribe via RSS to this blog
+rss.titleALL = Combined RSS feed for all blogs
Index: Corporate_portal_templates_en.properties
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/java/jahiatemplates/Corporate_portal_templates_en.properties,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Corporate_portal_templates_en.properties 28 Oct 2004 15:23:55 -0000
1.24
+++ Corporate_portal_templates_en.properties 29 Apr 2005 12:48:44 -0000
1.25
@@ -208,4 +208,58 @@
webappsConrainer = Webapps Container
whichBestMachesFirst = with best matches first
workflow = Workflow
-updateHtmlFile=Select the HTML file
\ No newline at end of file
+updateHtmlFile=Select the HTML file
+blog.postedBy = Posted by
+blog.at = at
+blog.in = in
+blog.comments = comments
+blog.addBlog = Add blog
+blog.addComment = Add comment
+blog.forFar = so far
+blog.postYourOwn = Post your own
+blog.commentTitle = Title
+blog.commentAuthor = Author
+blog.commentBody = Body text
+blog.commentDate = Date
+blog.title = Title
+blog.body = Body
+blog.attachement = Attachment associated
+blog.date = Date
+blog.author = Author
+blog.permanentLink = Permanent link
+blog.categories = Categories
+blog.allCategories = All categories
+blog.addEntry = Add entry
+blog.noEntry = Could not found any entry
+blog.category = category
+blog.for = for
+blog.backTo = back to
+blog.the = the
+blog.from = from
+blog.to = to
+blog.blogs = Blogs
+blog.mo = mo
+blog.tu = tu
+blog.we = we
+blog.th = th
+blog.fr = fr
+blog.sa = sa
+blog.su = su
+blog.today = Today
+blog.thisWeek = This week
+blog.trackbacks = trackbacks
+blog.trackback = trackback
+blog.sentPingUrl = Sent ping urls
+blog.pingURL = URL to send the ping to
+blog.trackBackTitle = Title of the blog entry for this trackback
+blog.trackBackExcerpt = Excerpt of the blog entry for this trackback
+blog.trackBackUrl = Url (permalink) of the blog entry for this trackback
+blog.trackBackBlog_name= Name of the blog for this trackback
+blog.trackBackPing_IP = The IP address of the host that sent the ping
+blog.excerpt = The Excerpt of this post
+blog.keyWords = Comma seperated Keywords for this post
+blog.continued = Continued
+blog.on = on
+blog.wrote = wrote
+rss.title = Subscribe via RSS to this blog
+rss.titleALL = Combined RSS feed for all blogs
Index: Corporate_portal_templates_fr.properties
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/java/jahiatemplates/Corporate_portal_templates_fr.properties,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- Corporate_portal_templates_fr.properties 1 Nov 2004 10:28:42 -0000
1.44
+++ Corporate_portal_templates_fr.properties 29 Apr 2005 12:48:44 -0000
1.45
@@ -207,4 +207,58 @@
webappsConrainer=Container de Web application
whichBestMachesFirst=avec les meilleurs scores en premiers
workflow=Workflow
-updateHtmlFile=Sélectionner le fichier HTML
\ No newline at end of file
+updateHtmlFile=Sélectionner le fichier HTML
+blog.postedBy = Posté par
+blog.at = à
+blog.in = dans
+blog.comments = commentaires
+blog.addBlog = Ajouter blog
+blog.addComment = Ajouter commentaire
+blog.forFar = sur
+blog.postYourOwn = Poster votre commentaire
+blog.commentTitle = Titre
+blog.commentAuthor = Auteur
+blog.commentBody = Corps du text
+blog.commentDate = Date
+blog.title = Titre
+blog.body = Contenu
+blog.attachement = Attachement associé
+blog.date = Date
+blog.author = Auteur
+blog.permanentLink = Lien permanent
+blog.categories = Catégories
+blog.allCategories = Toutes les catégories
+blog.addEntry = Ajouter entrée
+blog.noEntry = Aucune entrée retournée
+blog.category = catégorie
+blog.for = pour
+blog.backTo = Retour vers
+blog.the = le
+blog.from = du
+blog.to = au
+blog.blogs = Blogs
+blog.mo = lu
+blog.tu = ma
+blog.we = me
+blog.th = je
+blog.fr = ve
+blog.sa = sa
+blog.su = di
+blog.today = Aujourd'hui
+blog.thisWeek = Cette semaine
+blog.trackbacks = trackbacks
+blog.trackback = trackback
+blog.sentPingUrl = Ping urls envoyés
+blog.pingURL = URL vers lequel envoyer le ping
+blog.trackBackTitle = Titre de l'entrée pour ce trackback
+blog.trackBackExcerpt = Résumé de l'entrée pour ce
trackback
+blog.trackBackUrl = Url (permalink) de l'entrée pour ce trackback
+blog.trackBackBlog_name= Nom du blog pour ce trackback
+blog.trackBackPing_IP = Adresse IP du client qui a envoyé le ping
+blog.excerpt = Le résumé de ce post
+blog.keyWords = Mots clés séparés par des
virgules
+blog.continued = A suivre
+blog.on = le
+blog.wrote = a écrit
+rss.title = Souscrire à ce blog via RSS
+rss.titleALL = Souscrire à tous les blogs via RSS
Index: eventlistener.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/eventlistener.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eventlistener.jsp 13 Nov 2003 14:38:23 -0000 1.1
+++ eventlistener.jsp 29 Apr 2005 12:48:45 -0000 1.2
@@ -29,20 +29,26 @@
String eventName = (String) request.getAttribute("eventName");
JahiaEvent jahiaEvent = (JahiaEvent) request.getAttribute("jahiaEvent");
ParamBean jParams = jahiaEvent.getParams();
-
+org.apache.log4j.Logger logger =
+ org.apache.log4j.Logger.getLogger(getClass());
// All theses constants are from ManageCategories Engine
String SELECTEDCATEGORIES_ENGINEMAPKEY = "selectedCategories";
String DEFAULTCATEGORIES_SESSIONKEYPREFIX = "defaultCategories_";
+logger.debug("Event name is " + eventName);
+
// add here your event processing code
// Proof of concept for Parlement Europeen
if ( eventsToTrap.contains(eventName)){
HashMap engineMap = (HashMap) jParams.getSession().getAttribute(
"jahia_session_engineMap" );
+
+ if (engineMap == null) { return; }
String languageCode = (String)engineMap.get("languageCode");
HashSet updatedFields = (HashSet)engineMap.get("updated.fields");
+
// Check if we are processing a "directoryDocContainer" container
JahiaContainer theContainer = (JahiaContainer)jahiaEvent.getObject();
if (
"ProjectNewsContainer".equals(theContainer.getDefinition().getName()) ){
@@ -54,6 +60,143 @@
theField.save(jParams);
}
}
+ }
+ if ( "blogs".equals(theContainer.getDefinition().getName()) ){
+ if ( "addContainerEngineAfterInit".equals(eventName) ) {
+ logger.debug("Start eventlistner for event
addContainerEngineAfterInit for blogs");
+ // we want to init the page field
+ JahiaField theField = theContainer.getField("blogPage");
+ JahiaPageEngineTempBean pageBean = null;
+
+ HashMap pageBeans = (HashMap)jParams.
+ getSession().getAttribute("Page_Field.PageBeans");
+ if ( pageBeans == null ){
+ pageBeans = new HashMap();
+ jParams.getSession().setAttribute("Page_Field.PageBeans",
pageBeans);
+ }
+
+ // Verify if this page field was not already edited in this
session.
+ pageBean =
(JahiaPageEngineTempBean)pageBeans.get(theField.getDefinition().getName());
+
+ if (pageBean == null) {
+ JahiaPage currentPage = jParams.getPage();
+ String currentTemplateName =
currentPage.getPageTemplate().getName();
+ logger.debug("Current templates = " + currentTemplateName);
+ String defaultTemplate = "";
+ if ("Blog listing".equals(currentTemplateName)) {
+ defaultTemplate = "Blog";
+ }
+ logger.debug("defaultTemplate is [" + defaultTemplate + "]");
+ if (! "".equals(defaultTemplate)) {
+ JahiaPageDefinition pageDef =
ServicesRegistry.getInstance().getJahiaPageTemplateService()
+ .lookupPageTemplateByName (defaultTemplate,
jParams.getSiteID());
+ logger.debug("pageDef ID is [" + pageDef.getID() + "]");
+
+ // First call or recall of engine.
+
jParams.getSession().removeAttribute(SelectPage_Engine.SESSION_PARAMS);
+ if (theField.getObject() == null) { // Is it a new page ?
+ logger.debug("First call or recall of engine. This
is a new page");
+ boolean isLinkOnly =
theField.getValue().toLowerCase().indexOf("jahia_linkonly") != -1;
+ pageBean = new JahiaPageEngineTempBean(
+ -1, // Page ID
+ theField.getJahiaID(),
+ theField.getPageID(),
+ isLinkOnly ? JahiaPage.TYPE_URL : // URL
type per default
+ JahiaPage.TYPE_DIRECT, // or
create a new page per default
+ pageDef.getID(),
+ "http://";, // URL undefined
+ -1, // Link ID undefined
+ jParams.getUser().getUserKey(),
+ theField.getID()); // value should be < 0 if
new field.
+ pageBean.setOperation(isLinkOnly ?
Page_Field.LINK_URL : Page_Field.CREATE_PAGE);
+ pageBean.sharedTitle(true);
+ pageBeans.put("blogPage", pageBean);
+ }
+ }
+ }
+ } else if ( "containerAdded".equals(eventName) ) {
+ JahiaPage blogPage = (JahiaPage)
theContainer.getFieldObject("blogPage");
+ if (blogPage != null) {
+ logger.debug("Activate blogPage ["+blogPage.getID()+"]");
+ // container validation
+ ArrayList locales = jParams.getSite().
+ getLanguageSettingsAsLocales(true);
+ Vector languageCodes = new Vector();
+ for (int j = 0; j < locales.size(); j++) {
+ Locale loc = (Locale) locales.get(j);
+ languageCodes.add(loc.toString());
+ }
+ ContentPage.getPage(blogPage.getID()).activeStagingEntries(
+ new HashSet(languageCodes), // languageCodes
+ true, //versioningActive,
+ ServicesRegistry.getInstance().getJahiaVersionService().
+ getSiteSaveVersion(jParams.getSiteID()), // saveVersion
+ jParams.getUser(),
+ jParams,
+ new StateModificationContext(new ContentPageKey(blogPage.
+ getID()), new HashSet(languageCodes)) //stateModifContext
+ );
+
+ }
+ }
+ } else if ( "entries".equals(theContainer.getDefinition().getName()) ){
+ if ( "addContainerEngineAfterInit".equals(eventName) ) {
+ logger.debug("Start eventlistner for event
addContainerEngineAfterInit for entries Container List");
+
+ JahiaField theField = theContainer.getField("date");
+ if (theField.getObject() == null) {
+ Calendar cal =
Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+ long now = cal.getTime().getTime();
+ String nowStr = String.valueOf(now);
+ theField.setObject(nowStr);
+ updatedFields.add(new Integer(theField.getID()));
+ logger.debug("Set value for field [date] to : [" +
theField.getObject() +"]");
+ }
+ theField = theContainer.getField("author");
+ if (theField.getObject() == null) {
+ String author = jParams.getUser().getUserKey();
+ theField.setObject(author);
+ updatedFields.add(new Integer(theField.getID()));
+ logger.debug("Set value for field [author] to [" +
theField.getObject() + "]");
+ } else if ("".equals(theField.getObject())) {
+ String author = jParams.getUser().getUserKey();
+ theField.setObject(author);
+ updatedFields.add(new Integer(theField.getID()));
+ logger.debug("Set value for field [author] to [" +
theField.getObject() + "]");
+ }
+ } else if ( "containerAdded".equals(eventName) ) {
+ logger.debug("Activate container ["+theContainer.getID()+"]");
+ // container validation
+ Set languageCodes = new HashSet();
+ languageCodes.add(ContentObject.SHARED_LANGUAGE);
+ languageCodes.add(jParams.getLocale().toString());
+
+ JahiaSaveVersion saveVersion =
+ ServicesRegistry.getInstance().getJahiaVersionService().
+ getSiteSaveVersion(jParams.getSiteID());
+
+ StateModificationContext smc = new StateModificationContext(
+ new ContentContainerKey(theContainer.getID()),
languageCodes);
+ smc.setDescendingInSubPages(false);
+
+ Enumeration childs = theContainer.getFields();
+ while (childs.hasMoreElements()) {
+ JahiaField child = (JahiaField)childs.nextElement();
+ ContentField field = child.getContentField();
+ if (field != null) {
+ field.activate(languageCodes,
saveVersion.getVersionID(),jParams, smc);
+ }
+ }
+ JahiaContainersService jahiaContainersService =
+ ServicesRegistry.getInstance().getJahiaContainersService();
+ if (jahiaContainersService != null) {
+ ActivationTestResults atr =
jahiaContainersService.activateStagedContainer(languageCodes,theContainer.getID(),
+ jParams.getUser(), saveVersion, jParams, smc);
+ logger.debug("ActivationTestResults is " + atr.toString());
+ }
+ }
+
+
} else if (
"directoryDocContainer".equals(theContainer.getDefinition().getName()) ){
if ( "addContainerEngineAfterInit".equals(eventName) ) {
Index: templates.xml
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/templates.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- templates.xml 15 Mar 2004 13:55:57 -0000 1.11
+++ templates.xml 29 Apr 2005 12:48:45 -0000 1.12
@@ -75,4 +75,14 @@
<parameter name="filename">html_file_clipping.jsp</parameter>
<parameter name="display-name">HTML file clipping</parameter>
</template>
+ <template browsable="1" visible="1">
+ <parameter name="name">Blog</parameter>
+ <parameter name="filename">blog.jsp</parameter>
+ <parameter name="display-name">Blog</parameter>
+ </template>
+ <template browsable="1" visible="1">
+ <parameter name="name">Blog listing</parameter>
+ <parameter name="filename">blog_listing.jsp</parameter>
+ <parameter name="display-name">Blog listing</parameter>
+ </template>
</tpml>
Index: web_css.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/web_css.jsp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- web_css.jsp 17 Mar 2005 14:46:48 -0000 1.30
+++ web_css.jsp 29 Apr 2005 12:48:45 -0000 1.31
@@ -176,6 +176,10 @@
background:url(images/remote.gif) no-repeat 0 2px;
padding-left: 10px;
}
+ .local {
+ background:url(images/local.gif) no-repeat 0 2px;
+ padding-left: 10px;
+ }
.menu<%=myColor%> .options<%=myColor%> {
display:block;
@@ -525,7 +529,286 @@
font-family: Arial, Helvetica, sans-serif;
font-size: 11px;
}
-## webapps
+/* blog */
+.blog {
+ font-size:12px;
+}
+.blog a {
+ font-size:12px;
+}
+.entry {
+ margin:0 0 1.75em;
+}
+.entry h3 {
+ margin:1em 0 .2em;
+ font:175%/1.3em Georgia,Serif;
+ line-height:1.3em;
+ color:#245;
+}
+.blog h2.date {
+ padding-bottom:.3em;
+ border-bottom:1px dotted #ccc;
+ margin-bottom:.5em;
+}
+.blog h3 {
+ margin:.75em 0 .5em;
+ border-bottom:1px dotted #ccc;
+ padding:0 0 .2em;
+ font-size:140%;
+ line-height:1.5em;
+}
+.posted {
+ color:#998;
+}
+.blog .posted,.blog .posted a {
+ font-size:85%;
+ line-height:1.6em;
+}
+.posted-top .commentlink, .posted-top .commentlink:visited {
+ margin-left:0;
+ border-left-width:0;
+ background-position:0 50%;
+ padding-left:14px;
+ }
+
+.blog dd.posted {
+ margin-top:.5em;
+ border-top:1px dotted #ccd;
+ padding-top:4px;
+}
+.posted strong {
+ color:#887;
+ font-weight:normal;
+}
+a.permalink {
+ background:url("images/icon_pg.gif") no-repeat 0 0;
+ float:left;
+ display:block;
+ width:9px;
+ height:10px;
+ margin:.3em 5px 0 0;
+ text-indent:-10000px;
+ border-width:0;
+}
+.commentlink, .commentlink:visited {
+ background:url("images/icon_comment.gif") no-repeat 8px 50%;
+ border-width:0;
+ padding-left:22px;
+ border-left:1px solid #ccb;
+ margin-left:.5em;
+ color:#359;
+ white-space:nowrap;
+}
+.posted-top .commentlink {
+ margin-left:0;
+ border-left-width:0;
+ background-position:0 50%;
+ padding-left:14px;
+}
+span.commentlink {
+ color:#887;
+}
+a.commentlink:hover {
+ color:#933;
+ border-color:#ccb;
+ text-decoration:none;
+}
+.commentlink img {
+ margin-top:.5em;
+}
+a.commentlink:hover img {
+ width:0;
+ padding-left:48px;
+}
+dl.previously {
+ margin-bottom:1.25em;
+}
+.previously dt a {
+ font:150%/1.4em Georgia,Serif;
+ border-width:0;
+}
+.previously dd {
+ margin-bottom:1em;
+ margin-left:0;
+}
+.previously dd.summary {
+ margin-bottom:0;
+}
+.blog .previously dd.posted {
+ margin-top:.7em;
+ margin-bottom:1.75em;
+}
+
+.blog a.continued {
+ background:url("images/arrow.gif") no-repeat 100% 5px;
+ border-width:0;
+ padding-right:16px;
+ color:<%=darkcolor2%>;
+ border-bottom: 1px <%=darkcolor2%> dotted;
+}
+.blog a.continued:hover {
+ background-image:url("images/arrow_on.gif");
+ color: <%=darkcolor1%>;
+ border-bottom: 1px <%=darkcolor1%> solid;
+}
+
+/* Comments
+----------------------------------------------- */
+#comments {
+ padding:10px;
+}
+#comments h4 {
+ font:140% Verdana,Sans-serif;
+ margin:0 0 1em;
+}
+#comments h4 span {
+ font:85% Verdana,Sans-serif;
+ color:#776;
+}
+#comments dl {
+ font-size:85%;
+ line-height:1.6em;
+}
+#comments dt {
+ padding:8px 6px .5em;
+ background:#eeeeee;
+ font-weight:normal;
+}
+#comments dd {
+ padding:2px 20px 8px;
+ margin:0 0 1.5em;
+ background:#eeeeee;
+}
+form table tr td {
+ vertical-align: top;
+}
+#comments dt.alt,
+#comments dd.alt {
+ background:#dddddd;
+}
+#comments dd h3 {
+ background-image: none;
+}
+#comments dd del:hover,
+#comments dd del:active {
+ color:#333;
+ text-decoration:none;
+}
+#comments .postno {
+ background:url("images/icon_comment.gif") no-repeat 0 55%;
+ border-width:0;
+ padding:0 5px 0 14px;
+ border-right:1px solid #ccc;
+ margin-right:2px;
+ font:180% Georgia,Serif;
+ color:#358;
+}
+#comments .alt .postno {
+ border-color:#bbb;
+}
+#comments dt.owner {
+ background:#357;
+ padding-bottom:1em;
+ color:#cde;
+}
+#comments dd.owner {
+ padding-top:8px;
+}
+#comments dt.owner .postno {
+ background-image:url("images/icon_comment.gif");
+ color:#9bd;
+ border-right-color:#579;
+ font-weight:normal;
+}
+#comments dt.owner a {
+ color:#eee;
+ border-width:0;
+ font-weight:bold;
+}
+#comment-notes p {
+ font-size:85%;
+ line-height:1.6em;
+ color:#554;
+}
+#subcol #comment-notes p {
+ font-size:100%;
+}
+h4#postcomment {
+ padding-top:.5em;
+ margin:0 0 .5em;
+}
+#comment-notes {
+ margin-top:2em;
+}
+
+/* Lists
+----------------------------------------------- */
+ul, dl {
+ margin:.5em 0 1em;
+ padding:0;
+ list-style:none;
+}
+ul li {
+ margin:0 0 2px;
+ padding:0 0 0 18px;
+ text-indent:-18px;
+}
+ul.offsite {
+ margin-bottom:.75em;
+}
+ul.offsite li {
+ background:url("images/icon_offsite.gif") no-repeat 1px .5em;
+ text-indent:0;
+}
+ul.bulleted li {
+ background:url("images/icon_s.gif") no-repeat 2px .35em;
+ padding-left:20px;
+ margin-top:0;
+ text-indent:0;
+}
+.entry ul {
+ margin-left:20px;
+ margin-right:20px;
+}
+dl dl {
+ margin:1em 20px;
+}
+dt {
+ font-weight:bold;
+}
+#maincol li em {
+ font-style:normal;
+ font-weight:normal;
+ font-size:85%;
+ line-height:1.6em;
+ color:#777;
+}
+dd {
+ margin:0 0 1em;
+ padding:0;
+}
+.teaser dd {
+ margin-bottom:.75em;
+}
+.links dt {
+ font:125%/1.4em Georgia,Serif;
+}
+.links dd {
+ font-size:85%;
+ line-height:1.6em;
+}
+dd ul {
+ margin:0;
+ padding:0;
+}
+dd li {
+ width:100%;
+ padding:0;
+ margin:0;
+ text-indent:0;
+}
+
+/* webapps */
.waMenu a ,a.waMenu{color: #000000; }
.waMenu a:hover, a.waMenu:hover {color: <%=color1%>; background-color:
<%=lightcolor1%>; }
@@ -575,58 +858,88 @@
.nfDate { font-size: 9px; font-style: normal; font-weight: bold; color:
<%=color1%> }
.nfSource { font-size: 9px; font-style: normal; color: <%=color1%> }
.nfMedia { font-size: 9px; font-style: italic; color: <%=color1%> }
-div.tree {
- font-family: Tahoma, Arial, Helvetica, sans-serif;
+
+ /* calendar */
+div.calendar {
+ background-color: #FFFFFF;
+ display: block;
+ /*float: left;*/
+ /*font-family: Arial, Helvetica, sans-serif;*/
+ font-family: Courrier;
font-size: 11px;
+ line-height: 17px;
+ margin-right: 10px; /* Invalid value: width: 170; */
}
-div.tree span {
- display: block;
+div.calendar div.pre {
+ white-space: pre;
}
-div.tree span.i {
- width: 16px;
- //height: 16px;
- background: url(images/tree_i.gif) repeat-y 0 0;
- padding-left: 16px;
-}
-div.tree span.t {
- width: 16px;
- //height: 16px;
- background: url(images/tree_t.gif) no-repeat 0 0;
- padding-left: 16px;
-}
-div.tree span.l {
- width: 16px;
- //height: 16px;
- background: url(images/tree_l.gif) no-repeat 0 0;
- padding-left: 16px;
-}
-div.tree span.pix {
- width: 16px;
- //height: 16px;
- padding-left: 16px;
-}
-div.tree a {
- color: #666;
- /*white-space: nowrap;*/
- display: block;
- width: 400px;
- padding-left: 32px;
- text-decoration: none;
- /*sets the height for all browsers to auto*/
- height: auto !important;
- /*sets height (which acts like min-height) to your set size
- for IE, since it doesn't understand !important */
- height: 20px;
- /*set min-height for other browsers that understand !important*/
- min-height: 20px;
+
+div.calendar a {
+ color: #000066;
+ text-decoration: none;
+ font-family: "Courier New", Courier, mono;
+ font-size: 11px;
}
-div.tree a:hover {
- text-decoration: underline;
+div.calendar a.weekOfYear {
+ color: #75777B;
}
-div.tree a.folderon {
- background: url(images/folder_on.gif) no-repeat;
- font-weight: bold;
+div.calendar .currentweek,
+div.calendar a.currentday {
+ background-color: #E7E7E7;
+ border: 1px solid #B42C29;
+ font-weight: bold;
+}
+
+div.calendar a:hover {
+ background-color: #E7E7E7;
}
-div.tree a.folderoff {
- background: url(images/folder_off.gif) no-repeat;
+
+div.calendar h2 {
+ color: #006699;
+ font-weight: bold;
+ font-size: 12px;
+ text-align: center;
+}
+
+div.calendar h2 a {
+ color: #006699;
+ padding: 0 5px 0 5px;
+}
+div.calendar span.days {
+ background-color: #E7E7E7;
+ font-weight: bold;
+ padding: 0 2px 0 2px;
+}
+
+div.xmlButton {
+ font-family: verdana,helvetica,arial,sans-serif;
+ font-size: 10px;
+ background-color: #ff6600;
+ color: #FFFFFF;
+ text-decoration: none;
+ padding: 0px 1px 0px 1px;
+}
+
+a.xmlButton {
+ font-family: verdana,helvetica,arial,sans-serif;
+ font-size: 10px;
+ font-weight: bold;
+ color: #FFFFFF;
+ text-decoration: none;
+}
+
+div.xmlWrap {
+ border: 1px solid #666;
+ padding: 1px;
+ text-decoration: none;
+ background-color: transparent;
+ margin: 0px 0px 0px 0px;
+ width: 34px;
+ text-align: center;
+}
+
+div.spacer {
+ clear: both;
+ font-size: 1px;
+ line-height: 0px;
}
\ No newline at end of file
Index: declarations.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/declarations.inc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- declarations.inc 11 Mar 2005 08:43:49 -0000 1.7
+++ declarations.inc 29 Apr 2005 12:48:46 -0000 1.8
@@ -12,6 +12,7 @@
<%@ page import="org.jahia.data.containers.*" %>
<%@ page import="org.jahia.data.fields.*" %>
<%@ page import="org.jahia.data.files.*" %>
+<%@ page import="org.jahia.data.viewhelper.sitemap.*" %>
<%@ page import="org.jahia.exceptions.*" %>
<%@ page import="org.jahia.gui.*" %>
<%@ page import="org.jahia.params.*" %>
@@ -46,6 +47,7 @@
jParams.setCacheStatus(ParamBean.CACHE_OFFONCE);
String actionURL = jParams.composePageUrl(jData.page().getID());
jParams.setCacheStatus(ParamBean.CACHE_BYPASS);
+ String bypassUrl = jParams.composePageUrl(jData.page().getID());
String savedOperationMode = jParams.getOperationMode();
//jParams.setOperationMode(jParams.NORMAL);
String actionCacheOffURL = jParams.composePageUrl(jData.page().getID());
@@ -75,6 +77,49 @@
%>
<%!
+static String emotionSymbol[] =
{">:D<",":-"","<):)","[-o<",":)>-",
+ "~:>",">-)","\\:D/",":\">","3:-O",
+ ":(|)","@};-","**==","(~~)","*-:)",
+ "<):)","[-o<",":-\"",":)>-",">:D<",
+ ":))",":-)",":((",":-(",";;)",
+ ":-/","X-(","B-)",":-s",">:)",
+ "/:)","O:)",":-B","I-)","8-|",
+ ":-&",":-$","[-(",":o)","8-}",
+ "(:|",":-?","#-o","=D>",":@)",
+ "~:>","%%-","%%-","~o)","8-X",
+ "=:)",">-)",":-L","@-)","$-)",
+ ":^o","b-(","[-X",":)",":(",
+ ";)",":D",":x",":p",":*",
+ ":O",":>",":|","=;"};
+
+static String emotionLabel[] =
{"hugs","whistling","cowboy","praying","peace",
+
"chicken","alien_2","dancing","blushing","cow",
+ "monkey","rose","flag","pumpkin","idea",
+ "cowboy","praying","whistling","peace","hugs",
+
"laughing","smile","crying","sad","batting_eyelashes",
+
"confused","angry","cool","worried","devilish",
+
"raised_eyebrow","angel","nerd","sleep","rolling_eyes",
+ "sick","shhh","not_talking","clown","silly",
+ "tired","thinking","d_oh","applause","pig",
+ "chicken","sad","good_luck","coffee","skull",
+
"alien_1","alien_2","frustrated","hypnotized","money_eyes",
+ "liar","beat_up","shame_on_you","smile","sad",
+
"wink","biggrin","love_struck","tongue","kiss",
+
"shock","smug","straight_face","talk_to_the_hand"};
+
+public static String toEmotion(String inputString,String folder) {
+ for (int i = 0; i < emotionSymbol.length; i++) {
+ int smileyIndex = inputString.indexOf(emotionSymbol[i]);
+ while (smileyIndex != -1) {
+ String url = "<img src=\"" + folder + emotionLabel[i] + ".gif\"
alt=\"" + emotionLabel[i] + "/\">";
+ inputString = inputString.substring(0, smileyIndex) + url +
+ inputString.substring(smileyIndex +
emotionSymbol[i].length());
+ smileyIndex = inputString.indexOf(emotionSymbol[i]);
+ }
+ }
+ return inputString;
+} // toEmotion
+
//String boxTypes[] = {"files", "links", "news", "newsLink", "freeText",
"webapps"};
String boxTypes[] = {"files", "links", "news", "freeText", "webapps"};
Index: files.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/files.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- files.inc 15 Feb 2005 16:01:32 -0000 1.4
+++ files.inc 29 Apr 2005 12:48:46 -0000 1.5
@@ -154,6 +154,9 @@
break;
}
}
+ if ("#".equals(downloadUrl)) {
+ displayLine = false;
+ }
}
if (jData.gui().isEditMode() || displayLine ) {
%>
Index: guestbook.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/guestbook.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- guestbook.inc 28 Oct 2003 22:56:41 -0000 1.1
+++ guestbook.inc 29 Apr 2005 12:48:46 -0000 1.2
@@ -1,48 +1,3 @@
-<%!
-static String emotionSymbol[] =
{">:D<",":-"","<):)","[-o<",":)>-",
- "~:>",">-)","\\:D/",":\">","3:-O",
- ":(|)","@};-","**==","(~~)","*-:)",
- "<):)","[-o<",":-\"",":)>-",">:D<",
- ":))",":-)",":((",":-(",";;)",
- ":-/","X-(","B-)",":-s",">:)",
- "/:)","O:)",":-B","I-)","8-|",
- ":-&",":-$","[-(",":o)","8-}",
- "(:|",":-?","#-o","=D>",":@)",
- "~:>","%%-","%%-","~o)","8-X",
- "=:)",">-)",":-L","@-)","$-)",
- ":^o","b-(","[-X",":)",":(",
- ";)",":D",":x",":p",":*",
- ":O",":>",":|","=;"};
-
-static String emotionLabel[] =
{"hugs","whistling","cowboy","praying","peace",
-
"chicken","alien_2","dancing","blushing","cow",
- "monkey","rose","flag","pumpkin","idea",
- "cowboy","praying","whistling","peace","hugs",
-
"laughing","smile","crying","sad","batting_eyelashes",
-
"confused","angry","cool","worried","devilish",
-
"raised_eyebrow","angel","nerd","sleep","rolling_eyes",
- "sick","shhh","not_talking","clown","silly",
- "tired","thinking","d_oh","applause","pig",
- "chicken","sad","good_luck","coffee","skull",
-
"alien_1","alien_2","frustrated","hypnotized","money_eyes",
- "liar","beat_up","shame_on_you","smile","sad",
-
"wink","biggrin","love_struck","tongue","kiss",
-
"shock","smug","straight_face","talk_to_the_hand"};
-
-public static String toEmotion(String inputString,String folder) {
- for (int i = 0; i < emotionSymbol.length; i++) {
- int smileyIndex = inputString.indexOf(emotionSymbol[i]);
- while (smileyIndex != -1) {
- String url = "<img src=\"" + folder + emotionLabel[i] + ".gif\"
alt=\"" + emotionLabel[i] + "\">";
- inputString = inputString.substring(0, smileyIndex) + url +
- inputString.substring(smileyIndex +
emotionSymbol[i].length());
- smileyIndex = inputString.indexOf(emotionSymbol[i]);
- }
- }
- return inputString;
-} // toEmotion
-
-%>
<content:declareContainerList name="guestbookContainer" title="Content
Container">
<content:declareContainer>
<content:declareField name="title" title="Title" type="SmallText" />
Index: left_menu.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/left_menu.inc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- left_menu.inc 4 Apr 2005 12:33:16 -0000 1.15
+++ left_menu.inc 29 Apr 2005 12:48:46 -0000 1.16
@@ -94,7 +94,7 @@
ContentPage currentPage = ContentPage.getPage(currentPageID);
ContainerListBean linksContainerListBean = new
ContainerListBean(linksContainerList,jData.params());
- logger.info("linksContainerListBean.isActionURIsEmpty() for page
" + currentPageID + " -> " + linksContainerListBean.isActionURIsEmpty());
+ logger.debug("linksContainerListBean.isActionURIsEmpty() for
page " + currentPageID + " -> " + linksContainerListBean.isActionURIsEmpty());
if (! linksContainerListBean.isActionURIsEmpty() ) {
out.println("<tr><td> </td><td class=\"left\">");
out.println("<span class=\"leftlevel" + currentLevel +"\">");
Index: page_title.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/page_title.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- page_title.inc 5 Nov 2004 13:47:48 -0000 1.3
+++ page_title.inc 29 Apr 2005 12:48:46 -0000 1.4
@@ -17,5 +17,11 @@
<logic:notEmpty name="pageTitleValue">
<bean:write name='pageTitleValue' filter='false'/>
</logic:notEmpty>
+<%
+if (pageContext.getAttribute("pageTitle") != null) {
+ %>
<jahiaHtml:actionMenu name="pageTitle" namePostFix=""
resourceBundle="jahiatemplates.Corporate_portal_templates" useFieldSet="false">
</jahiaHtml:actionMenu>
+ <%
+}
+%>
\ No newline at end of file
Index: sitemap.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/sitemap.inc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sitemap.inc 12 Oct 2004 11:37:41 -0000 1.9
+++ sitemap.inc 29 Apr 2005 12:48:46 -0000 1.10
@@ -1,5 +1,4 @@
<%@ page import="java.util.*" %>
-<%@ page import="org.jahia.data.viewhelper.sitemap.*" %>
<%
HashMap engineMap =
(HashMap)request.getAttribute("org.jahia.engines.EngineHashMap");
@@ -171,7 +170,7 @@
style += " font-weight: bold;";
}
%><span style="<%=style%>"
- ><%=JahiaTools.text2html(pageTitle2) %></span><%
+
><%=jData.gui().glueTitle(JahiaTools.text2html(pageTitle2),30) %></span><%
if (! isPageMarkedForDeletion) {
%></a><%
}
Index: arrow.gif
===================================================================
<<Binary file>>
Index: arrow_on.gif
===================================================================
<<Binary file>>
Index: icon_comment.gif
===================================================================
<<Binary file>>
Index: icon_offsite.gif
===================================================================
<<Binary file>>
Index: icon_pg.gif
===================================================================
<<Binary file>>
