Author: pvollenweider
Date: Thu Oct 18 18:19:12 2007
New Revision: 18941

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18941&repname=
=3Djahia
Log:
Add templates merges

Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/html/startup/araxis_5.0.3.=
html
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/html/startup/changelog_5.0=
.3.html
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/html/startup/howtoupgrade5=
03.html

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/html/startup/araxis_=
5.0.3.html
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/html/startup/araxis_5.0.3.html&rev=3D18941&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/html/startup/araxis_5.0.3.=
html (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/html/startup/araxis_5.0.3.=
html Thu Oct 18 18:19:12 2007
@@ -206,16 +206,16 @@
 <B>Corporate template</B><BR>
 <hr><BR>
 <ul>
-  <li>See the difference online : <a href=3D"http://www.jahia.org/download=
/jahia5.0/stable/diff_corporatev1_5.0.2_5.0.3/index.html">diff_corporatev1_=
SP2_SP3.html</a><br></li><BR>
-  <li>Download the zip file : <a href=3D"http://www.jahia.org/download/jah=
ia5.0/stable/diff_corporatev1_5.0.2_5.0.3/diff_corporatev1_SP2_SP3.zip">dif=
f_corporatev1_SP2_SP3.zip</a></li>
+  <li>See the difference online : <a href=3D"http://www.jahia.org/download=
/jahia5.0/stable/diff_templates_503/diff_corporate_v1_502_503/index.html">d=
iff_corporatev1_SP2_SP3.html</a><br></li><BR>
+  <li>Download the zip file : <a href=3D"http://www.jahia.org/download/jah=
ia5.0/stable/diff_templates_503/diff_corporate_v1_502_503.zip">diff_corpora=
tev1_SP2_SP3.zip</a></li>
 =

 </ul>
 <BR><BR>
 <B>Corporate template V2</B><BR>
 <hr><BR>
 <ul>
-  <li>See the difference online : <a href=3D"http://www.jahia.org/download=
/jahia5.0/stable/diff_corporatev2_5.0.2_5.0.3/index.html">diff_corporatev2_=
SP2_SP3.html</a><br></li><BR>
-  <li>Download the zip file : <a href=3D"http://www.jahia.org/download/jah=
ia5.0/stable/diff_corporatev2_5.0.2_5.0.3/diff_corporatev2_SP2_SP3.zip">dif=
f_corporatev2_SP2_SP3.zip</a></li>
+  <li>See the difference online : <a href=3D"http://www.jahia.org/download=
/jahia5.0/stable/diff_templates_503/diff_corporate_v2_502_503/index.html">d=
iff_corporatev2_SP2_SP3.html</a><br></li><BR>
+  <li>Download the zip file : <a href=3D"http://www.jahia.org/download/jah=
ia5.0/stable/diff_templates_503/diff_corporate_v2_502_503.zip">diff_corpora=
tev2_SP2_SP3.zip</a></li>
 =

 </ul>
 <BR><BR>

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/html/startup/changel=
og_5.0.3.html
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/html/startup/changelog_5.0.3.html&rev=3D18941&repna=
me=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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/html/startup/changelog_5.0=
.3.html (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/html/startup/changelog_5.0=
.3.html Thu Oct 18 18:19:12 2007
@@ -422,7 +422,18 @@
 <B>Templates</B><BR>
 <hr><BR>
 <ul>
-       <li><a href=3D"changelog_templates_503.html">See the templates 
changelog<=
/a><br></li>
+       <li name=3D"stdview_section">Set 'Cache-control' and 'Expires' response 
h=
eaders to correctly cache static resources</li>
+       <li name=3D"stdview_section">Add expiration for news to 15 minutes</li>
+       <li name=3D"stdview_section">Added alias names to be able to import 
blogs=
 from templates using the previous definition names</li>
+       <li name=3D"stdview_section">Hide current language link in all 
operation =
modes</li>
+       <li>Link CSS files and the styles-XML file to the editor based on the 
con=
text</li>
+       <li name=3D"stdview_section">Check categories right while posting info 
on=
 blog </li>
+       <li name=3D"stdview_section">Add a blog watcher with mail 
notification</l=
i>
+       <li>Add the poll in box type</li>
+       <li name=3D"stdview_section">Display an icon next to the action menu 
when=
 an ACL on a content object is different from the one of its parent</li>
+       <li name=3D"stdview_section">Fix highLightDiffTitle property on page 
bean=
</li>
+       <li name=3D"stdview_section">Changed implementation of group and users 
co=
ntainers (no longer use of fields)</li>
+       <li name=3D"stdview_section">Several typo fix on resources bundles</li>
 </ul>
 <BR><BR>
 <B>Cluster / ESI / Cache Proxy</B><BR>

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/html/startup/howtoup=
grade503.html
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/html/startup/howtoupgrade503.html&rev=3D18941&repna=
me=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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/html/startup/howtoupgrade5=
03.html (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/html/startup/howtoupgrade5=
03.html Thu Oct 18 18:19:12 2007
@@ -497,13 +497,29 @@
         in <i>tomcat/webapps/jahia/WEB-INF/classes/jahiatemplates/</i>. Co=
py all the ".properties" files corresponding to your sets of templates.
     </p>
 </li>
-<!--li>
+
+<B> Fiy xour templates</B>
+<li>
     <p>
         Changes have been made to the corporate portal templates V1 and  V=
2 (the 2 sets of templates packaged with Jahia). Lots of
-        improvements have been made on each set, so we encourage you to ch=
eck the differences between the sets packaged with Jahia 5.0.1 and Jahia
-        5.0.2 and to port them in your set of templates. You can find the =
details of the differences <a href=3D"http://www.jahia.net/download/jahia5.=
0/diff_50_sp1/" target=3D"_blank">here</a>.
+        improvements have been made on each set, so we encourage you to ch=
eck the differences between the sets packaged with Jahia 5.0.0 or Jahia 5.0=
.1 or Jahia 5.0.2 and Jahia
+        5.0.2 and to port them in your set of templates. You can find the =
details of the differences:
+        <ul>
+            <li>Corporate portal templates V1: diff from
+                <a href=3D"http://www.jahia.org/download/jahia5.0/stable/d=
iff_templates_503/diff_corporate_v1_500_503/index.html">Jahia 5.0.0</a>,
+                <a href=3D"http://www.jahia.org/download/jahia5.0/stable/d=
iff_templates_503/diff_corporate_v1_501_503/index.html">Jahia 5.0.1</a>,
+                <a href=3D"http://www.jahia.org/download/jahia5.0/stable/d=
iff_templates_503/diff_corporate_v1_502_503/index.html">Jahia 5.0.2</a> and=
 Jahia 5.0.3<br>
+                Here are the mandatory diff from <a href=3D"http://www.jah=
ia.org/download/jahia5.0/stable/diff_templates_503/diff_corporate_v1_500_50=
3/index.html">Jahia 5.0.0</a> or <a href=3D"http://www.jahia.org/download/j=
ahia5.0/stable/diff_templates_503/diff_corporate_v1_501_503/index.html">Jah=
ia 5.0.1</a> and Jahia 5.0.3.
+             </li>
+            <li>Corporate portal templates V2: diff from
+                <a href=3D"http://www.jahia.org/download/jahia5.0/stable/d=
iff_templates_503/diff_corporate_v2_500_503/index.html">Jahia 5.0.0</a>,
+                <a href=3D"http://www.jahia.org/download/jahia5.0/stable/d=
iff_templates_503/diff_corporate_v2_501_503/index.html">Jahia 5.0.1</a>,
+                <a href=3D"http://www.jahia.org/download/jahia5.0/stable/d=
iff_templates_503/diff_corporate_v2_502_503/index.html">Jahia 5.0.2</a> and=
 Jahia 5.0.3<br/>
+                Here are the mandatory diff from <a href=3D"http://www.jah=
ia.org/download/jahia5.0/stable/diff_templates_503/minfix_corporate_v2_500/=
index.html">Jahia 5.0.0</a> or a <a href=3D"http://www.jahia.org/download/j=
ahia5.0/stable/diff_templates_503/minfix_corporate_v2_500/index.html">Jahia=
 5.0.1</a>.
+             </li>
+        </ul>
     </p>
-</li-->
+</li>
 =

 <li>
     <p>
@@ -533,6 +549,9 @@
 </li>
 =

 <BR>
+
+
+<BR>
 <B> Optimize your new Jahia </B>
 <li>
     <p>

_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

Reply via email to