[torrus-commit] plugins/overview overview-torruscfg.pl,NONE,1.1 Makefile.am,1.4,1.5 configure.ac,1.2,1.3 ov_substvars.sh.in,1.3,1.4 tp-overview.apache.conf.in,1.1,1.2

[Stanislav S. <ssi...@us...>]

Update of /cvsroot/torrus/plugins/overview
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8572/plugins/overview

Modified Files:
	Makefile.am configure.ac ov_substvars.sh.in 
	tp-overview.apache.conf.in 
Added Files:
	overview-torruscfg.pl 
Log Message:
plugins updated

Index: tp-overview.apache.conf.in
===================================================================
RCS file: /cvsroot/torrus/plugins/overview/tp-overview.apache.conf.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tp-overview.apache.conf.in	14 Dec 2004 23:03:08 -0000	1.1
+++ tp-overview.apache.conf.in	15 Dec 2004 17:05:57 -0000	1.2
@@ -1,5 +1,5 @@
-ScriptAlias /menu/ "@webplaindir@/menu/"
-ScriptAlias /overviews/ "@webplaindir@/overviews/"
+ScriptAlias /menu/      "@webscriptsdir@/tp-overview/"
+ScriptAlias /overviews/ "@webscriptsdir@/tp-overview/"
 
 PerlModule Apache::ASP
 

Index: configure.ac
===================================================================
RCS file: /cvsroot/torrus/plugins/overview/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- configure.ac	14 Dec 2004 15:02:41 -0000	1.2
+++ configure.ac	15 Dec 2004 17:05:56 -0000	1.3
@@ -76,6 +76,7 @@
 AC_ARG_VAR(scriptsdir, [[PKGHOME/scripts] Script files])
 AC_ARG_VAR(supdir, [[PKGHOME/sup] Supplementary files])
 AC_ARG_VAR(webplaindir, [[SUPDIR/webplain] Web interface plain files path])
+AC_ARG_VAR(webscriptsdir, [[SUPDIR/webscripts] Directory for web scripts])
 AC_ARG_VAR(tmpldir, [[PKGHOME/templates] Template files])
 AC_ARG_VAR(tmpluserdir, [[SITEDIR/templates] User-defined Template files])
 AC_ARG_VAR(distxmldir, [[PKGHOME/xmlconfig] Distribution XML config files])

Index: ov_substvars.sh.in
===================================================================
RCS file: /cvsroot/torrus/plugins/overview/ov_substvars.sh.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ov_substvars.sh.in	14 Dec 2004 23:03:07 -0000	1.3
+++ ov_substvars.sh.in	15 Dec 2004 17:05:56 -0000	1.4
@@ -22,13 +22,16 @@
 prefix=@prefix@
 pkghome=@pkghome@
 supdir=@supdir@
+varprefix=@varprefix@
 
 rendererUrl=@rendererUrl@
 
 @SED@ \
     -e "s,\@webplaindir\@,@webplaindir@,g" \
+    -e "s,\@webscriptsdir\@,@webscriptsdir@,g" \
     -e "s,\@rendererUrl\@,${rendererUrl},g" \
     -e "s,\@plainUrl\@,@plainUrl@,g" \
+    -e "s,\@aspglobal\@,@aspglobal@,g" \
     $1
 
 # Local Variables:

--- NEW FILE: overview-torruscfg.pl ---
# Overview Torrus plugin configuration

$Torrus::Renderer::styling{'default'}{'ovStylesheet'} = 'ov.css';
$Torrus::Renderer::styling{'printer'}{'ovStylesheet'} = 'ov-printer.css';
$Torrus::Renderer::Chooser::template = 'ov/ov-chooser.html';

1;

Index: Makefile.am
===================================================================
RCS file: /cvsroot/torrus/plugins/overview/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	14 Dec 2004 23:03:07 -0000	1.4
+++ Makefile.am	15 Dec 2004 17:05:56 -0000	1.5
@@ -22,20 +22,18 @@
 
 SUBST = @abs_top_builddir@/ov_substvars.sh
 
+CLEANFILES = \
+	ov_substvars.sh \
+	tp-overview.apache.conf
+
 noinst_SCRIPTS = \
 	ov_substvars.sh
 
 EXTRA_DIST = \
-	menu/bg.jpg \
 	menu/credits.htm \
-	menu/menu.css \
-	menu/menu.js \
 	menu/menu.xsl.in \
-	menu/sampleMenu.xml \
 	menu/welcome.htm \
-	overview/common.inc \
 	overview/overview.xsl.in \
-	overview/sampleOverview.xml \
 	xtree/xtree.css \
 	xtree/xtree.js.in  \
 	ov_substvars.sh.in \
@@ -67,28 +65,33 @@
 .pod.txt:
 	pod2text $< $@
 
+
+#####   XSLT scripts  #####
+scriptsdir = $(webscriptsdir)/tp-overview
+scripts_DATA = \
+	menu/menu.xsl \
+	overview/overview.xsl
+
+menu/menu.xsl: menu/menu.xsl.in
+	$(SUBST) menu/menu.xsl.in > menu/menu.xsl
+
+overview/overview.xsl: overview/overview.xsl.in
+	$(SUBST) overview/overview.xsl.in > overview/overview.xsl
+
 #####   Menu files   #####
 menudir	= $(webplaindir)/menu
-menu_DATA = \
+dist_menu_DATA = \
 	menu/bg.jpg \
 	menu/menu.css \
 	menu/menu.js \
-	menu/menu.xsl \
 	menu/sampleMenu.xml
 
-menu/menu.xsl: menu/menu.xsl.in
-	$(SUBST) menu/menu.xsl.in > menu/menu.xsl
-
 #####   Overview files   #####
 overviewsdir	= $(webplaindir)/overviews
-overviews_DATA = \
+dist_overviews_DATA = \
 	overview/common.inc \
-	overview/overview.xsl \
 	overview/sampleOverview.xml
 
-overview/overview.xsl: overview/overview.xsl.in
-	$(SUBST) overview/overview.xsl.in > overview/overview.xsl
-
 #####   xtree files   #####
 xtreedir	= $(webplaindir)/xtree
 xtree_DATA = xtree/xtree.js xtree/xtree.css