Author: bpapez Date: Fri Jun 15 14:33:46 2007 New Revision: 17578 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17578&repname= =3Djahia Log: issue TEMPLATES-212: 4.2 (certainly 5.x): adding a new blog could not be di= rectly done by the users =
(url: http://www.jahia.net/jira/browse/TEMPLATES-212) * add validation to blog container (title and date must be mandatory) * set proper ACLs on adding blog pages for users * make containerlist action menu available only to admins * TEMPLATES-213, TEMPLATES-218: Make trackbacks work Modified: trunk/core/src/conf/java/ApplicationResources.properties trunk/core/src/conf/java/ApplicationResources_de.properties trunk/core/src/conf/java/ApplicationResources_en.properties trunk/core/src/conf/java/ApplicationResources_fr.properties trunk/core/src/java/org/jahia/blogs/BlogPingListener.java trunk/core/src/java/org/jahia/blogs/actions/AddTrackBackPingAction.java trunk/core/src/webapp/WEB-INF/etc/config/blogs.properties trunk/core/src/webapp/WEB-INF/etc/struts/corporateportal-validation.xml trunk/core/src/webapp/WEB-INF/etc/struts/corporateportal-validationv2.x= ml Modified: trunk/core/src/conf/java/ApplicationResources.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/ApplicationResources.properties&rev=3D17578&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/conf/java/ApplicationResources.properties (original) +++ trunk/core/src/conf/java/ApplicationResources.properties Fri Jun 15 14:= 33:46 2007 @@ -86,7 +86,7 @@ init =3D init initDescription =3D initDescription initManager =3D initManager -#!! don't change this value +#!! don't translate this value wizard =3D wizard = #Configuration @@ -136,6 +136,7 @@ = #wizard wizard.title =3D Wizard steps +#!! don't translate this value wizard.description =3D wizard wizard.browse =3D wizard wizard.selectPart =3D wizard @@ -261,6 +262,7 @@ edit.useAsDefault.false =3D false edit.button.extract =3D Extract and preview edit.button.chew.cut =3D Cut +#!! don't translate this value edit.button.chew.autoCut =3D autoCut = edit.chew.preview =3D chewPreview @@ -368,4 +370,5 @@ error.sql =3D Error: check values of parameters error.sql.Numberformat =3D Error: Table size value must be a positive inte= ger. = - +label.title =3D Title +label.date =3D Date Modified: trunk/core/src/conf/java/ApplicationResources_de.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/ApplicationResources_de.properties&rev=3D17578&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/conf/java/ApplicationResources_de.properties (original) +++ trunk/core/src/conf/java/ApplicationResources_de.properties Fri Jun 15 = 14:33:46 2007 @@ -260,6 +260,7 @@ edit.useAsDefault.false =3D falsch edit.button.extract =3D Extrahieren und Vorschau anzeigen edit.button.chew.cut =3D Ausschneiden +#!! don't translate this value edit.button.chew.autoCut =3D autoCut = edit.chew.preview =3D chewPreview @@ -367,4 +368,5 @@ error.sql =3D Fehler: Pr=C3=BCfen Sie die Parameterwerte. error.sql.Numberformat =3D Fehler: Der Wert f=C3=BCr die Tabellenzeilen mu= ss eine positive ganze Zahl sein. = - +label.title =3D Titel +label.date =3D Datum Modified: trunk/core/src/conf/java/ApplicationResources_en.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/ApplicationResources_en.properties&rev=3D17578&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/conf/java/ApplicationResources_en.properties (original) +++ trunk/core/src/conf/java/ApplicationResources_en.properties Fri Jun 15 = 14:33:46 2007 @@ -86,7 +86,7 @@ init =3D init initDescription =3D initDescription initManager =3D initManager -#!! don't change this value +#!! don't translate this value wizard =3D wizard = #Configuration @@ -261,6 +261,7 @@ edit.useAsDefault.false =3D false edit.button.extract =3D Extract and preview edit.button.chew.cut =3D Cut +#!! don't translate this value edit.button.chew.autoCut =3D autoCut = edit.chew.preview =3D chewPreview @@ -367,3 +368,6 @@ sql.preview =3D Preview error.sql =3D Error: check values of parameters error.sql.Numberformat =3D Error: Table size value must be a positive inte= ger. + +label.title =3D Title +label.date =3D Date Modified: trunk/core/src/conf/java/ApplicationResources_fr.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/ApplicationResources_fr.properties&rev=3D17578&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/conf/java/ApplicationResources_fr.properties (original) +++ trunk/core/src/conf/java/ApplicationResources_fr.properties Fri Jun 15 = 14:33:46 2007 @@ -86,8 +86,8 @@ init =3D init initDescription =3D initDescription initManager =3D initManager -#!! don't change this value -wizard =3D assistant +#!! don't translate this value +wizard =3D wizard = #Configuration configuration.title =3D Configuration @@ -136,10 +136,11 @@ = #wizard wizard.title =3D =C3=89tapes de l'Assistant -wizard.description =3D assistant -wizard.browse =3D assistant -wizard.selectPart =3D assistant -wizard.preview =3D assistant +#!! don't translate this value +wizard.description =3D wizard +wizard.browse =3D wizard +wizard.selectPart =3D wizard +wizard.preview =3D wizard wizard.help =3D Aide wizard.quit =3D Quitter = @@ -261,7 +262,8 @@ edit.useAsDefault.false =3D faux edit.button.extract =3D Extraire et pr=C3=A9visualiser edit.button.chew.cut =3D Couper -edit.button.chew.autoCut =3D Couper automatiquement +#!! don't translate this value +edit.button.chew.autoCut =3D autoCut = edit.chew.preview =3D chewPreview edit.button.rules.config =3D Config @@ -275,7 +277,7 @@ testClipper.parameter =3D Param=C3=A8tre testClipper.value =3D Valeur testClipper.select.url =3D S=C3=A9lectionner une URL -testClipper.webBrowserSimulator.mode =3D =C3=89muler l'utilisateur : +testClipper.webBrowserSimulator.mode =3D Simuler l'utilisateur : testClipper.webBrowserSimulator.mode.onload =3D avec Javascript testClipper.webBrowserSimulator.mode.loop =3D sans Javascript testClipper.error.parameter =3D Valeur d'un param=C3=A8tre d'entr=C3=A9e n= on d=C3=A9finie @@ -335,7 +337,6 @@ help.configuration.actifPopup =3D L'utilisateur peut cliquer sur n'importe= quel lien ou bouton. Le r=C3=A9sultat sera affich=C3=A9 dans une fen=C3=AA= tre distincte. De plus, le code HMTL est trait=C3=A9 par le client Web. help.configuration.passifPopup =3D L'utilisateur peut cliquer sur n'import= e quel lien ou bouton. Le r=C3=A9sultat sera affich=C3=A9 dans une fen=C3= =AAtre distincte. De plus, le code HMTL n'est PAS trait=C3=A9 par le client= Web. = - #sql manage.button.add.sql =3D Ajouter un portlet SQL sql.title =3D Cr=C3=A9ateur de portlets SQL @@ -364,5 +365,8 @@ sql.query.nbResultPerTable =3D Nombre max. de lignes par table sql.messages.database.empty =3D aucune configuration par d=C3=A9faut. sql.preview =3D Aper=C3=A7u -error.sql =3D Erreur : v=C3=A9rifiez la valeur des param=C3=A8tres. -error.sql.Numberformat =3D Erreur : le nombre max. de lignes doit =C3= =AAtre un nombre entier positif. +error.sql =3D Erreur: v=C3=A9rifiez la valeur des param=C3=A8tres. +error.sql.Numberformat =3D Erreur: le nombre max. de lignes doit =C3=AAtre= un nombre entier positif. + +label.title =3D Titre +label.date =3D Date Modified: trunk/core/src/java/org/jahia/blogs/BlogPingListener.java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o= rg/jahia/blogs/BlogPingListener.java&rev=3D17578&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/java/org/jahia/blogs/BlogPingListener.java (original) +++ trunk/core/src/java/org/jahia/blogs/BlogPingListener.java Fri Jun 15 14= :33:46 2007 @@ -157,15 +157,12 @@ String fieldName =3D containerNames.getValue(BlogDefinitionNames.P= OST_TITLE); field =3D postContainer.getField(fieldName); // set the postTitle - String postTitle =3D ""; - if(field!=3Dnull) - postTitle =3D field.getValue(); + final String postTitle =3D field !=3D null ? field.getValue() : ""; = fieldName =3D containerNames.getValue(BlogDefinitionNames.POST_EXC= ERPT); field =3D postContainer.getField(fieldName); // set the excerpt - String postExcerpt =3D ""; - if(field!=3Dnull) field.getValue(); + final String postExcerpt =3D field !=3D null ? field.getValue() : = ""; = // set the blogName final String blogName =3D blogContentPage.getTitle(je.getProcessi= ngContext()); Modified: trunk/core/src/java/org/jahia/blogs/actions/AddTrackBackPingActio= n.java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o= rg/jahia/blogs/actions/AddTrackBackPingAction.java&rev=3D17578&repname=3Dja= hia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/java/org/jahia/blogs/actions/AddTrackBackPingAction.java= (original) +++ trunk/core/src/java/org/jahia/blogs/actions/AddTrackBackPingAction.java= Fri Jun 15 14:33:46 2007 @@ -28,9 +28,12 @@ import org.jahia.data.containers.JahiaContainerDefinition; = import org.jahia.data.fields.JahiaField; +import org.jahia.data.fields.JahiaFieldDefinition; = import org.jahia.services.version.EntryLoadRequest; = +import org.jahia.services.fields.ContentBigTextField; +import org.jahia.services.fields.ContentSmallTextSharedLangField; import org.jahia.services.usermanager.JahiaUser; import org.jahia.services.usermanager.JahiaGroup; import org.jahia.services.usermanager.JahiaGroupManagerService; @@ -39,134 +42,164 @@ = import org.apache.log4j.Logger; = - /** * Action used to Add a TrackBack ping to a given post - * + * = * @author Xavier Lawrence */ public class AddTrackBackPingAction extends AbstractAction { - = - // log4j logger - static Logger log =3D Logger.getLogger(AddTrackBackPingAction.class); - = - private String postID; - private String title; - private String excerpt; - private String url; - private String blogName; - = - /** Creates a new instance of AddTrackBackPingAction */ - public AddTrackBackPingAction(String postID, String title, String exce= rpt, = - String url, String blogName) { - this.postID =3D postID; - this.title =3D title; - this.excerpt =3D excerpt; - this.url =3D url; - this.blogName =3D blogName; - } - = - /** - * Adds a TrackBack ping to the given post - */ - public Object execute() throws JahiaException { - // Create commmon resources - super.init(); = - = - // Load the Container and check the structure - final JahiaContainer postContainer =3D super.getContainer( - Integer.parseInt(postID)); = - = - if (postContainer =3D=3D null) { - throw new JahiaException("Post: "+postID+ - " does not exist", "Container: "+postID+ " does not ex= ist", - JahiaException.ENTRY_NOT_FOUND, - JahiaException.WARNING_SEVERITY); - } = - = - log.debug("Working on post: "+postContainer.getID()); - = - super.changePage(postContainer.getPageID()); - = - JahiaContainerDefinition def =3D JahiaContainerDefinitionsRegistry. - getInstance().getDefinition(jParams.getSiteID(), - containerNames.getValue(BlogDefinitionNames.BLOG_TB_LIST)); - = - JahiaContainerList trackBacks =3D postContainer.getContainerList( - super.containerNames.getValue(BlogDefinitionNames.BLOG_TB_= LIST)); - JahiaGroup rootGroup =3D servicesRegistry.getJahiaGroupManagerServ= ice(). - lookupGroup(jParams.getSiteID(), - JahiaGroupManagerService.ADMINISTRATORS_GROUPNAME); - - JahiaUser user =3D (JahiaUser)rootGroup.getRecursiveUserMembers(). - iterator().next(); - jParams.setUser(user); - int listID, aclID; - if (trackBacks =3D=3D null || trackBacks.getID() < 1) { = - log.debug("Storing the first TB..."); - listID =3D aclID =3D 0; - = - } else { - listID =3D trackBacks.getID(); - aclID =3D trackBacks.getAclID(); - } - = - JahiaContainer pingContainer =3D new JahiaContainer( - 0, jParams.getJahiaID(), jParams.getPageID(), - listID, 0, aclID, def.getID(), 0, - EntryLoadRequest.STAGING_WORKFLOW_STATE); - = - // Save the new Container - containerService.saveContainer(pingContainer, - postContainer.getID(), jParams); - = - // Load the Container and check the structure - pingContainer =3D super.getContainer(pingContainer.getID(), - jParams.getLocale().toString()); - = - log.debug("Working on container: "+pingContainer.getID()); - = - String fieldName =3D containerNames.getValue(BlogDefinitionNames.T= B_URL); - JahiaField field =3D pingContainer.getField(fieldName); - field.setValue(url); - = - fieldName =3D containerNames.getValue(BlogDefinitionNames.TB_PING_= IP); - field =3D pingContainer.getField(fieldName); = - String senderIP =3D ServletResources.getCurrentRequest().getRemote= Addr(); = - field.setValue(senderIP); - = - if (title !=3D null && title.length() > 0) { - fieldName =3D containerNames.getValue(BlogDefinitionNames.TB_T= ITLE); - field =3D pingContainer.getField(fieldName); - field.setValue(title); - } - = - if (excerpt !=3D null && excerpt.length() > 0) { - fieldName =3D containerNames.getValue(BlogDefinitionNames.TB_E= XCERPT); - field =3D pingContainer.getField(fieldName); - super.setValue(field, excerpt); - } - = - if (blogName !=3D null && blogName.length() > 0) { - fieldName =3D containerNames.getValue(BlogDefinitionNames.TB_B= LOG_NAME); - field =3D pingContainer.getField(fieldName); - field.setValue(blogName); - } - - if (listID =3D=3D 0) { - super.activateContainerList(pingContainer.getListID(), - user, pingContainer.getPageID()); - } - = - containerService.saveContainer(postContainer, 0, jParams); - ServicesRegistry.getInstance().getJahiaEventService().fireAggregat= edEvents(); - containerService.saveContainer(pingContainer, postContainer.getID(= ), = - jParams); = - = - super.activateContainer(pingContainer.getID(), user); - super.activateContainer(postContainer.getID(), user); - = - log.debug("Trackback added..."); - return Boolean.TRUE; - } + + // log4j logger + static Logger log =3D Logger.getLogger(AddTrackBackPingAction.class); + + private String postID; + private String title; + private String excerpt; + private String url; + private String blogName; + + /** Creates a new instance of AddTrackBackPingAction */ + public AddTrackBackPingAction(String postID, String title, String excerpt, + String url, String blogName) { + this.postID =3D postID; + this.title =3D title; + this.excerpt =3D excerpt; + this.url =3D url; + this.blogName =3D blogName; + } + + /** + * Adds a TrackBack ping to the given post + */ + public Object execute() throws JahiaException { + // Create commmon resources + super.init(); + EntryLoadRequest elr =3D new EntryLoadRequest( + EntryLoadRequest.STAGING_WORKFLOW_STATE, 0, jParams + .getEntryLoadRequest().getLocales()); + this.jParams.setSubstituteEntryLoadRequest(elr); + + // Load the Container and check the structure + final JahiaContainer postContainer =3D super.getContainer(Integer + .parseInt(postID)); + + if (postContainer =3D=3D null) { + throw new JahiaException("Post: " + postID + " does not exist", + "Container: " + postID + " does not exist", + JahiaException.ENTRY_NOT_FOUND, + JahiaException.WARNING_SEVERITY); + } + + log.debug("Working on post: " + postContainer.getID()); + + super.changePage(postContainer.getPageID()); + + JahiaContainerDefinition def =3D JahiaContainerDefinitionsRegistry + .getInstance().getDefinition( + jParams.getSiteID(), + containerNames + .getValue(BlogDefinitionNames.BLOG_TB_LIST)); + + JahiaContainerList trackBacks =3D postContainer + .getContainerList(super.containerNames + .getValue(BlogDefinitionNames.BLOG_TB_LIST)); + JahiaGroup rootGroup =3D servicesRegistry.getJahiaGroupManagerService() + .lookupGroup(jParams.getSiteID(), + JahiaGroupManagerService.ADMINISTRATORS_GROUPNAME); + + JahiaUser user =3D (JahiaUser) rootGroup.getRecursiveUserMembers() + .iterator().next(); + jParams.setUser(user); + int listID, aclID; + if (trackBacks =3D=3D null || trackBacks.getID() < 1) { + log.debug("Storing the first TB..."); + listID =3D aclID =3D 0; + + } else { + listID =3D trackBacks.getID(); + aclID =3D trackBacks.getAclID(); + } + + JahiaContainer pingContainer =3D new JahiaContainer(0, jParams + .getJahiaID(), jParams.getPageID(), listID, 0, aclID, def + .getID(), 0, EntryLoadRequest.STAGING_WORKFLOW_STATE); + + // Save the new Container + containerService.saveContainer(pingContainer, postContainer.getID(), + jParams); + + log.debug("Working on container: " + pingContainer.getID()); + + int pageDefID =3D 0; + if (jParams.getContentPage().hasActiveEntries()) { + pageDefID =3D jParams.getContentPage().getPageTemplateID(jParams); + } else { + pageDefID =3D jParams.getContentPage().getPageTemplateID(elr); + } + + int siteId =3D jParams.getJahiaID(); + int pageId =3D jParams.getPageID(); + + JahiaFieldDefinition tbUrlFieldDefinition =3D trackBacks.getDefinition() + .findFieldInStructure( + containerNames.getValue(containerNames.TB_URL), + pageDefID); + ContentSmallTextSharedLangField.createSmallText(siteId, pageId, + pingContainer.getID(), tbUrlFieldDefinition.getID(), + pingContainer.getAclID(), 0, url, jParams); + + JahiaFieldDefinition tbPingIPFieldDefinition =3D trackBacks + .getDefinition().findFieldInStructure( + containerNames.getValue(containerNames.TB_PING_IP), + pageDefID); + ContentSmallTextSharedLangField.createSmallText(siteId, pageId, + pingContainer.getID(), tbPingIPFieldDefinition.getID(), + pingContainer.getAclID(), 0, ServletResources + .getCurrentRequest().getRemoteAddr(), jParams); + + if (title !=3D null && title.length() > 0) { + JahiaFieldDefinition tbTitleFieldDefinition =3D trackBacks + .getDefinition().findFieldInStructure( + containerNames.getValue(containerNames.TB_TITLE), + pageDefID); + ContentSmallTextSharedLangField.createSmallText(siteId, pageId, + pingContainer.getID(), tbTitleFieldDefinition.getID(), + pingContainer.getAclID(), 0, title, jParams); + } + + if (excerpt !=3D null && excerpt.length() > 0) { + JahiaFieldDefinition tbExcerptFieldDefinition =3D trackBacks + .getDefinition().findFieldInStructure( + containerNames.getValue(containerNames.TB_EXCERPT), + pageDefID); + ContentBigTextField.createBigText(siteId, pageId, pingContainer + .getID(), tbExcerptFieldDefinition.getID(), pingContainer + .getAclID(), 0, "<html>" + excerpt + "</html>", jParams); + } + + if (blogName !=3D null && blogName.length() > 0) { + JahiaFieldDefinition tbBlogNameFieldDefinition =3D trackBacks + .getDefinition().findFieldInStructure( + containerNames + .getValue(containerNames.TB_BLOG_NAME), + pageDefID); + ContentSmallTextSharedLangField.createSmallText(siteId, pageId, + pingContainer.getID(), tbBlogNameFieldDefinition.getID(), + pingContainer.getAclID(), 0, blogName, jParams); + } + + if (listID =3D=3D 0) { + super.activateContainerList(pingContainer.getListID(), user, + pingContainer.getPageID()); + } + + ServicesRegistry.getInstance().getJahiaEventService() + .fireAggregatedEvents(); + = + super.activateContainer(pingContainer.getID(), user); + super.activateContainer(postContainer.getID(), user); + + log.debug("Trackback added..."); + return Boolean.TRUE; + } } Modified: trunk/core/src/webapp/WEB-INF/etc/config/blogs.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /WEB-INF/etc/config/blogs.properties&rev=3D17578&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/webapp/WEB-INF/etc/config/blogs.properties (original) +++ trunk/core/src/webapp/WEB-INF/etc/config/blogs.properties Fri Jun 15 14= :33:46 2007 @@ -6,15 +6,15 @@ pingIP=3DtrackBackPing_IP postTB_Pings=3Dtrackbacks trackBackTitle=3DtrackBackTitle -postBody=3Dbody -postExcerpt=3Dexcerpt -postKeyWords=3DkeyWords -postContainerList=3Dentries +postBody=3DblogBody +postExcerpt=3DblogExcerpt +postKeyWords=3DblogKeyWords +postContainerList=3DblogEntries trackBackUrl=3DtrackBackUrl tbPingURL=3DpingURL trackBackBlogName=3DtrackBackBlog_name trackBackExcerpt=3DtrackBackExcerpt tbPings=3DtrackBackPingURLs -postAuthor=3Dauthor -postTitle=3Dtitle -postDate=3Ddate +postAuthor=3DblogAuthor +postTitle=3DblogTitle +postDate=3DblogDate Modified: trunk/core/src/webapp/WEB-INF/etc/struts/corporateportal-validati= on.xml URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /WEB-INF/etc/struts/corporateportal-validation.xml&rev=3D17578&repname=3Dja= hia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/webapp/WEB-INF/etc/struts/corporateportal-validation.xml= (original) +++ trunk/core/src/webapp/WEB-INF/etc/struts/corporateportal-validation.xml= Fri Jun 15 14:33:46 2007 @@ -33,5 +33,13 @@ <arg0 key=3D"Title" resource=3D"false"/> </field> </form> + <form name=3D"blogValidationBean"> + <field property=3D"blogTitle" depends=3D"required"> + <arg0 key=3D"label.title"/> = + </field> + <field property=3D"blogDate" depends=3D"required"> + <arg0 key=3D"label.date"/> = + </field> + </form> = </formset> </form-validation> \ No newline at end of file Modified: trunk/core/src/webapp/WEB-INF/etc/struts/corporateportal-validati= onv2.xml URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /WEB-INF/etc/struts/corporateportal-validationv2.xml&rev=3D17578&repname=3D= jahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/webapp/WEB-INF/etc/struts/corporateportal-validationv2.x= ml (original) +++ trunk/core/src/webapp/WEB-INF/etc/struts/corporateportal-validationv2.x= ml Fri Jun 15 14:33:46 2007 @@ -14,6 +14,14 @@ <field property=3D"navigationLink" depends=3D"required"> <arg0 key=3D"Title" resource=3D"false"/> </field> - </form> + </form> + <form name=3D"blogValidationBean"> + <field property=3D"blogTitle" depends=3D"required"> + <arg0 key=3D"label.title"/> = + </field> + <field property=3D"blogDate" depends=3D"required"> + <arg0 key=3D"label.date"/> = + </field> + </form> = </formset> </form-validation> \ No newline at end of file _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
