[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] conga ./conga.spec.in.in ./download_files luci ...



CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	EXPERIMENTAL
Changes by:	rmccabe sourceware org	2007-06-12 20:16:50

Modified files:
	.              : conga.spec.in.in download_files 
	luci/homebase  : index_html 
	luci/logs      : index_html 
	luci/site/luci/var: Data.fs 
	luci/storage   : index_html 
Added files:
	.              : Plone-2.5.3-final_CMFPlone.patch 
Removed files:
	.              : Plone-2.5.2-1_CMFPlone.patch 

Log message:
	Upgrade to the latest version of Plone (2.5.3-final), and update the database file.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Plone-2.5.3-final_CMFPlone.patch.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=NONE&r2=1.1.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.77.2.1&r2=1.77.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/download_files.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.7&r2=1.7.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Plone-2.5.2-1_CMFPlone.patch.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/index_html.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.21&r2=1.21.4.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/logs/index_html.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.3&r2=1.3.4.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/Data.fs.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.25.2.2&r2=1.25.2.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/index_html.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.7.8.1&r2=1.7.8.2

--- conga/conga.spec.in.in	2007/06/05 05:30:22	1.77.2.1
+++ conga/conga.spec.in.in	2007/06/12 20:16:38	1.77.2.2
@@ -31,7 +31,7 @@
 %if "%{include_zope_and_plone}" == "yes"
 Source1: @@ZOPE_ARCHIVE_TAR@@
 Source2: @@PLONE_ARCHIVE_TAR@@
-Patch2: Plone-2.5.2-1_CMFPlone.patch
+Patch2: Plone-2.5.3-final_CMFPlone.patch
 %endif
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
--- conga/download_files	2007/03/27 01:11:07	1.7
+++ conga/download_files	2007/06/12 20:16:38	1.7.2.1
@@ -7,10 +7,10 @@
 ZOPE_URLs="http://www.zope.org/Products/Zope/2.9.7/Zope-2.9.7-final.tgz";
 
 
-PLONE_ARCHIVE=Plone-2.5.2-1
-PLONE_ARCHIVE_TAR=Plone-2.5.2-1.tar.gz
-PLONE_MD5SUM=b4891a3f11a0eacb13b234d530ba9af1
-PLONE_URLs="http://plone.googlecode.com/files/Plone-2.5.2-1.tar.gz \
-	http://superb-west.dl.sourceforge.net/sourceforge/plone/Plone-2.5.2-1.tar.gz \
-	    http://superb-east.dl.sourceforge.net/sourceforge/plone/Plone-2.5.2-1.tar.gz \
-	    http://easynews.dl.sourceforge.net/sourceforge/plone/Plone-2.5.2-1.tar.gz";
+PLONE_ARCHIVE=Plone-2.5.3-final
+PLONE_ARCHIVE_TAR=Plone-2.5.3-final.tar.gz
+PLONE_MD5SUM=36117b0757982d66d445b6c6b9df0e25
+PLONE_URLs="http://plone.googlecode.com/files/Plone-2.5.3-final.tar.gz \
+	http://superb-west.dl.sourceforge.net/sourceforge/plone/Plone-2.5.3-final.tar.gz \
+	http://superb-east.dl.sourceforge.net/sourceforge/plone/Plone-2.5.3-final.tar.gz \
+	http://easynews.dl.sourceforge.net/sourceforge/plone/Plone-2.5.3-final.tar.gz";
--- conga/luci/homebase/index_html	2006/12/21 05:08:48	1.21
+++ conga/luci/homebase/index_html	2007/06/12 20:16:38	1.21.4.1
@@ -34,20 +34,16 @@
 	</metal:headslot>
 
 	<metal:cssslot fill-slot="css_slot">
-		<tal:comment replace="nothing"> A slot where you can insert CSS in the header from a template </tal:comment>
-
-<style type="text/css">
-	<!-- @import url(../cluster/clusterportlet.css); -->
-</style>
-
-<style type="text/css">
-	<!-- @import url(/luci/homebase/luci_homebase.css); -->
-</style>
-
-<tal:block tal:omit-tag=""
-	tal:define="global data python:here.homebaseControl(request)" />
-
-	<metal:cssslot define-slot="css_slot" />
+		<style type="text/css">
+			<!-- @import url(../cluster/clusterportlet.css); -->
+		</style>
+
+		<style type="text/css">
+			<!-- @import url(/luci/homebase/luci_homebase.css); -->
+		</style>
+		<tal:block
+			tal:define="global data python:here.homebaseControl(request)" />
+		<metal:cssslot define-slot="css_slot" />
 	</metal:cssslot>
 
 	<metal:javascriptslot fill-slot="javascript_head_slot">
@@ -66,18 +62,7 @@
 	<div id="visual-portal-wrapper">
 
 	<div id="portal-top" i18n:domain="plone">
-
 		<div id="portal-header">
-			<a	class="hiddenStructure"
-				accesskey="2"
-			 	tal:attributes="href string:${request/ACTUAL_URL}#documentContent"
-			 	i18n:translate="label_skiptocontent">Skip to content.</a>
-
-			<a	class="hiddenStructure"
-				accesskey="6"
-				tal:attributes="href string:${request/ACTUAL_URL}#portlet-navigation-tree"
-				i18n:translate="label_skiptonavigation">Skip to navigation</a>
-
 			 <a metal:use-macro="here/global_logo/macros/portal_logo">
 				The portal logo, linked to the portal root
 			 </a>
--- conga/luci/logs/index_html	2006/10/30 23:00:50	1.3
+++ conga/luci/logs/index_html	2007/06/12 20:16:38	1.3.4.1
@@ -117,15 +117,16 @@
 
 		
   <div id="log_entries">   
-   <table style="width: 100%;">
+   <table style="width: 100%">
+    <tr><td><div style="padding-bottom: 2cm;">&nbsp;</div></td></tr>
     <tr>
      <td align="center">
-      <img src="../storage/100wait.gif" style="padding-top: 1cm;"/>
+      <img src="../storage/100wait.gif">
      </td>
     </tr>
     <tr>
      <td align="center">
-      <div style="padding-bottom: 4cm;">Retrieving log info</div>
+      <div style="padding-top: 1cm;">Retrieving log info</div>
      </td>
     </tr>
    </table>
Binary files /cvs/cluster/conga/luci/site/luci/var/Data.fs	2007/05/30 22:39:28	1.25.2.2 and /cvs/cluster/conga/luci/site/luci/var/Data.fs	2007/06/12 20:16:39	1.25.2.3 differ
rcsdiff: /cvs/cluster/conga/luci/site/luci/var/Data.fs: diff failed
--- conga/luci/storage/index_html	2007/05/18 03:31:09	1.7.8.1
+++ conga/luci/storage/index_html	2007/06/12 20:16:50	1.7.8.2
@@ -10,10 +10,6 @@
 
   <head metal:use-macro="here/header/macros/html_header">
 
-
-                    
-  
-
     <metal:fillbase fill-slot="base">
       <metal:baseslot define-slot="base">
         <base href="" tal:attributes="href here/renderBase" />
@@ -227,23 +223,6 @@
               </metal:main-form-content>
             </td>
             <tal:comment replace="nothing"> End of main content block </tal:comment>
-
-<!--
-            <tal:comment replace="nothing"> Start of right column </tal:comment>
-            <td id="portal-column-two"
-                metal:define-slot="column_two_slot"
-                tal:condition="sr">
-              <div class="visualPadding">
-                <metal:portlets define-slot="portlets_two_slot">
-                  <metal:rightportlets use-macro="here/portlets_fetcher/macros/right_column">
-                    This instruction gets the portlets (boxes) for the right column.
-                  </metal:rightportlets>
-                </metal:portlets>
-                &nbsp;
-              </div>
-            </td>
-            <tal:comment replace="nothing"> End of the right column </tal:comment>
--->
           </tr>
         </tbody>
       </table>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]