Produced by Araxis Merge on Fri Jun 13 14:30:54 2008 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | Fri Jun 13 14:30:54 2008 UTC | ||
| 2 | C:\devel_jahia\corp_V2TemplatesSP4\src\jsp\blogs | definitions.inc | Fri Jun 13 14:30:10 2008 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 1 | 99 |
| Removed | 0 | 0 |
| Whitespace | All differences in whitespace within lines are ignored |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | <%-- | |||||
| 2 | Copyright 2002-2006 Jahia Ltd | |||||
| 3 | ||||||
| 4 | Licensed u nder the J AHIA COMMO N DEVELOPM ENT AND DI STRIBUTION LICENSE ( JCDDL), | |||||
| 5 | Version 1. 0 (the "Li cense"), o r (at your option) a ny later v ersion; yo u may | |||||
| 6 | not use th is file ex cept in co mpliance w ith the Li cense. You should ha ve | |||||
| 7 | received a copy of t he License along wit h this pro gram; if n ot, you ma y obtain | |||||
| 8 | a copy of the Licens e at | |||||
| 9 | ||||||
| 10 | http://ww w.jahia.or g/license/ | |||||
| 11 | ||||||
| 12 | Unless req uired by a pplicable law or agr eed to in writing, s oftware | |||||
| 13 | distribute d under th e License is distrib uted on an "AS IS" B ASIS, | |||||
| 14 | WITHOUT WA RRANTIES O R CONDITIO NS OF ANY KIND, eith er express or implie d. | |||||
| 15 | See the Li cense for the specif ic languag e governin g permissi ons and | |||||
| 16 | limitation s under th e License. | |||||
| 17 | --%> | |||||
| 18 | <%@page im port="org. jahia.data .fields.Ja hiaFieldDe finitionPr operties"% > | |||||
| 19 | <% | |||||
| 20 | jData.cont ainers().d eclareFiel dDefProp(" blogBody", | |||||
| 21 | Ja hiaFieldDe finitionPr operties.F IELD_STYLE SHEET_ID_P ROP, | |||||
| 22 | "c orpv2_blog "); | |||||
| 23 | %> | |||||
| 24 | ||||||
| 25 | <content:d eclareCont ainerList name="blog Entries" t itle="List of entrie s" | |||||
| 26 | contai nerBeanNam e="jahiate mplates.or g.jahia.co rporatepor talv2.vali dation.bea ns.BlogVal idationBea n" | |||||
| 27 | valida torKey="bl ogValidati onBean" al iasNames=" entries"> | |||||
| 28 | <content:d eclareCont ainer> | |||||
| 29 | <conte nt:declare Field name ="blogTitl e" title=" Title" typ e="SmallTe xt" | |||||
| 30 | ti tleKey="bl og.title" bundleKey= "<%=resBun dleID%>" a liasNames= "title"/> | |||||
| 31 | <conte nt:declare Field name ="blogBody " title="B ody" type= "BigText" | |||||
| 32 | ti tleKey="bl og.body" b undleKey=" <%=resBund leID%>" al iasNames=" body"/> | |||||
| 33 | <conte nt:declare Field name ="blogAtta chement" t itle="Atta chment ass ociated" t ype="File" | |||||
| 34 | ti tleKey="bl og.attache ment" bund leKey="<%= resBundleI D%>" alias Names="att achement"/ > | |||||
| 35 | <conte nt:declare Field name ="blogDate " title="D ate" type= "Date" | |||||
| 36 | va lue="<jahi a_calendar [dd.MM.yyy y / hh:mm] >now" | |||||
| 37 | ti tleKey="bl og.date" b undleKey=" <%=resBund leID%>" al iasNames=" date"/> | |||||
| 38 | <conte nt:declare Field name ="blogAuth or" title= "Author" t ype="Share dSmallText " | |||||
| 39 | ti tleKey="bl og.author" bundleKey ="<%=resBu ndleID%>" aliasNames ="author"/ > | |||||
| 40 | <conte nt:declare Field name ="blogExce rpt" | |||||
| 41 | title="T he Excerpt of this p ost" type= "BigText" | |||||
| 42 | titleKey ="blog.exc erpt" bund leKey="<%= resBundleI D%>" alias Names="exc erpt"/> | |||||
| 43 | <conte nt:declare Field name ="blogKeyW ords" | |||||
| 44 | title="C omma seper ated Keywo rds for th is post" t ype="Small Text" | |||||
| 45 | titleKey ="blog.key Words" bun dleKey="<% =resBundle ID%>" alia sNames="ke yWords"/> | |||||
| 46 | ||||||
| 47 | <conte nt:declare ContainerL ist name=" comments" title="Lis t of comme nts"> | |||||
| 48 | <conte nt:declare Container> | |||||
| 49 | <c ontent:dec lareField name="comm entAuthor" title="Au thor" type ="SharedSm allText" | |||||
| 50 | titleKey ="blog.aut hor" bundl eKey="<%=r esBundleID %>" aliasN ames="auth or"/> | |||||
| 51 | <c ontent:dec lareField name="comm entTitle" title="Tit le" type=" SmallText" | |||||
| 52 | titleKey ="blog.tit le" bundle Key="<%=re sBundleID% >" aliasNa mes="title "/> | |||||
| 53 | <c ontent:dec lareField name="comm entBody" t itle="Body " type="Bi gText" | |||||
| 54 | titleKey ="blog.bod y" bundleK ey="<%=res BundleID%> " aliasNam es="body"/ > | |||||
| 55 | <c ontent:dec lareField name="comm entDate" t itle="Date " type="Da te" | |||||
| 56 | value="< jahia_cale ndar[dd.MM .yyyy / hh :mm]>" | |||||
| 57 | titleKey ="news.dat e" bundleK ey="<%=res BundleID%> " aliasNam es="date"/ > | |||||
| 58 | </cont ent:declar eContainer > | |||||
| 59 | </cont ent:declar eContainer List> | |||||
| 60 | ||||||
| 61 | <conte nt:declare ContainerL ist name=" trackBackP ingURLs" | |||||
| 62 | ti tle="List of TrackBa cks Ping U RLs"> | |||||
| 63 | <conte nt:declare Container> | |||||
| 64 | <c ontent:dec lareField name="ping URL" | |||||
| 65 | title="U RL to send the ping to" type=" SharedSmal lText" | |||||
| 66 | titleKey ="blog.pin gURL" bund leKey="<%= resBundleI D%>"/> | |||||
| 67 | </cont ent:declar eContainer > | |||||
| 68 | </cont ent:declar eContainer List> | |||||
| 69 | ||||||
| 70 | <conte nt:declare ContainerL ist name=" trackbacks " | |||||
| 71 | ti tle="List of Movable Type Track Backs Ping data"> | |||||
| 72 | <conte nt:declare Container> | |||||
| 73 | <c ontent:dec lareField name="trac kBackTitle " | |||||
| 74 | title="T itle of th e blog ent ry for thi s trackbac k" type="S haredSmall Text" | |||||
| 75 | titleKey ="blog.tra ckBackTitl e" bundleK ey="<%=res BundleID%> "/> | |||||
| 76 | <c ontent:dec lareField name="trac kBackExcer pt" | |||||
| 77 | title="E xcerpt of the blog e ntry for t his trackb ack." type ="BigText" | |||||
| 78 | titleKey ="blog.tra ckBackExce rpt" bundl eKey="<%=r esBundleID %>"/> | |||||
| 79 | <c ontent:dec lareField name="trac kBackUrl" | |||||
| 80 | title="U rl (permal ink) of th e blog ent ry for thi s trackbac k" type="S haredSmall Text" | |||||
| 81 | titleKey ="blog.tra ckBackUrl" bundleKey ="<%=resBu ndleID%>"/ > | |||||
| 82 | <c ontent:dec lareField name="trac kBackBlog_ name" | |||||
| 83 | title="N ame of the blog for this track back" type ="SharedSm allText" | |||||
| 84 | titleKey ="blog.tra ckBackBlog _name" bun dleKey="<% =resBundle ID%>"/> | |||||
| 85 | <c ontent:dec lareField name="trac kBackPing_ IP" | |||||
| 86 | title="T he IP addr ess of the host that sent the ping" type ="SharedSm allText" | |||||
| 87 | titleKey ="blog.tra ckBackPing _IP" bundl eKey="<%=r esBundleID %>"/> | |||||
| 88 | </cont ent:declar eContainer > | |||||
| 89 | </cont ent:declar eContainer List> | |||||
| 90 | ||||||
| 91 | </content: declareCon tainer> | |||||
| 92 | </content: declareCon tainerList > | |||||
| 93 | ||||||
| 94 | <content:d eclareCont ainerList name="subs criber_lis t" title=" subscriber list"> | |||||
| 95 | <conte nt:declare Container> | |||||
| 96 | <c ontent:dec lareField name="subs criber_use rname" tit le="subscr iber_usern ame" type= "SharedSma llText" ti tleKey="bl og.subscri ber_userna me" bundle Key="<%=re sBundleID% >"/> | |||||
| 97 | <c ontent:dec lareField name="subs criber_mai l" title=" subscriber _mail" typ e="SharedS mallText" titleKey=" blog.subsc riber_mail " bundleKe y="<%=resB undleID%>" /> | |||||
| 98 | </cont ent:declar eContainer > | |||||
| 99 | </cont ent:declar eContainer List> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2007 Araxis Ltd (www.araxis.com). All rights reserved.