From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 30 Jun 2006 17:45:21 -0000 Subject: [Cluster-devel] conga/luci Makefile load_site.py homebase/inde ... Message-ID: <20060630174521.9917.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: conga Changes by: rmccabe at sourceware.org 2006-06-30 17:45:20 Modified files: luci : Makefile load_site.py luci/homebase : index_html Log message: fix importing and exporting of page templates/css/js/imgs Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/load_site.py.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/index_html.diff?cvsroot=cluster&r1=1.8&r2=1.9 --- conga/luci/Makefile 2006/06/30 17:00:02 1.6 +++ conga/luci/Makefile 2006/06/30 17:45:20 1.7 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.6 2006/06/30 17:00:02 rmccabe Exp $ +# $Id: Makefile,v 1.7 2006/06/30 17:45:20 rmccabe Exp $ all: luci @@ -62,19 +62,36 @@ ZOPEFTP=localhost:8021 ZOPEHTTP=http://localhost:25639/ ZOPEDIRS=cluster storage homebase +HBDIR=homebase +CLUSTERDIR=cluster +STORAGEDIR=storage all_old: tar tar: -export_pts: - @./make_tools/load_site.py $(ZOPEHTTP)/$(PLONEINSTANCE)/ $(PT_DIR)/* +# import page local page templates to the Luci server -import_pts: +import_storage: + @find $(STORAGEDIR) -follow -maxdepth 1 -type f -print0 | xargs -0 ./load_site.py http://localhost:25639/luci/storage/ + +import_cluster: + @find $(CLUSTERDIR) -follow -maxdepth 1 -type f -print0 | xargs -0 ./load_site.py http://localhost:25639/luci/cluster/ + +import_homebase: + @find $(HBDIR) -follow -maxdepth 1 -type f -print0 | xargs -0 ./load_site.py http://localhost:25639/luci/homebase/ + +import_pts: import_storage import_cluster import_homebase + +pt_dir: + @mkdir pts >& /dev/null + +# export page templates from the Luci server +export_pts: pt_dir @pwd=`pwd` ; cd $(PT_DIR) && \ - ( for i in $(ZOPEDIRS) ; do wget -r -nH --cut-dirs=1 "ftp://$(ZOPEUSER):$(ZOPEPASS)@$(ZOPEFTP)/$(PLONEINSTANCE)/$$i/*" ; done) ; cd $$pwd + ( for i in $(ZOPEDIRS) ; do wget -q -r -nH --cut-dirs=1 "ftp://$(ZOPEUSER):$(ZOPEPASS)@$(ZOPEFTP)/$(PLONEINSTANCE)/$$i/*" ; done) ; cd $$pwd pack: - @./make_tools/pack.py $(ZOPEINSTANCE)/var/Data.fs + @./pack.py $(ZOPEINSTANCE)/var/Data.fs cert: --- conga/luci/load_site.py 2006/06/19 19:31:08 1.6 +++ conga/luci/load_site.py 2006/06/30 17:45:20 1.7 @@ -1,5 +1,5 @@ #!/usr/bin/python -# $Id: load_site.py,v 1.6 2006/06/19 19:31:08 rmccabe Exp $ +# $Id: load_site.py,v 1.7 2006/06/30 17:45:20 rmccabe Exp $ ############################################################################## # @@ -135,6 +135,9 @@ def upload_css(object, f): upload_txt(object, f, t='text/css') +def upload_js(object, f): + upload_txt(object, f, t='text/javascript') + def upload_pt(object, f): dir, name = os.path.split(f) --- conga/luci/homebase/index_html 2006/06/20 23:05:41 1.8 +++ conga/luci/homebase/index_html 2006/06/30 17:45:20 1.9 @@ -15,7 +15,7 @@ xml:lang language"> - $Id: index_html,v 1.8 2006/06/20 23:05:41 rmccabe Exp $ + $Id: index_html,v 1.9 2006/06/30 17:45:20 rmccabe Exp $ @@ -51,215 +51,17 @@ - + A slot where you can insert javascript in the header from a template - - - - + +