From: ivan <ivan>
Date: Wed, 29 Dec 2010 03:24:08 +0000 (+0000)
Subject: torrus skinning improvements, RT#10574
X-Git-Tag: freeside_2_3_0~803
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=4b1685d06af60d40ddf783cea4bdcef17cdaa84a

torrus skinning improvements, RT#10574
---

diff --git a/Makefile b/Makefile
index 2a8d93c2f..32e528480 100644
--- a/Makefile
+++ b/Makefile
@@ -290,7 +290,7 @@ update-selfservice:
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
 	done
 
-install: install-perl-modules install-docs install-init install-apache install-rt install-texmf
+install: install-perl-modules install-docs install-init install-apache install-rt install-torrus install-texmf
 
 deploy: install
 	${HTTPD_RESTART}
@@ -382,12 +382,13 @@ configure-torrus:
 	torrus_user=freeside var_user=freeside var_group=freeside ./configure
 
 install-torrus:
-	cd torrus; \
-	make; \
-	make install
-	perl -p -i -e "\
-	  s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
-	" /usr/local/etc/torrus/conf/torrus-siteconfig.pl
+	if [ ${TORRUS_ENABLED} -eq 1 ]; then ( cd torrus; \
+	  make; \
+	  make install; \
+	  perl -p -i -e "\
+	    s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
+	  " /usr/local/etc/torrus/conf/torrus-siteconfig.pl \
+	);fi
 
 clean:
 	rm -rf masondocs
diff --git a/torrus/sup/webplain/torrus.css b/torrus/sup/webplain/torrus.css
index 3bb973c4b..64b502cea 100644
--- a/torrus/sup/webplain/torrus.css
+++ b/torrus/sup/webplain/torrus.css
@@ -4,7 +4,7 @@
    Modified by Ian Holsman <ian@holsman.net>
    Optimised by Stanislav Sinyagin
 
-   $Id: torrus.css,v 1.2 2010-12-29 03:12:19 ivan Exp $
+   $Id: torrus.css,v 1.3 2010-12-29 03:22:37 ivan Exp $
    */
 BODY {
 /*  background-color : white; */
@@ -166,7 +166,7 @@ DIV.PathMenu {
   border-bottom : none;
   border-left : none;
   border-right : none;
-  border-top : 1px solid $7e0079;
+  border-top : 1px solid #7e0079;
   color : inherit;
   float : left;
   line-height : 17px;
diff --git a/torrus/templates/default-rrd.html b/torrus/templates/default-rrd.html
index 496410a33..7767f7d3c 100644
--- a/torrus/templates/default-rrd.html
+++ b/torrus/templates/default-rrd.html
@@ -8,9 +8,6 @@
    END;
 %]
 
-
- %]<H1>Graphs for [% xmlnorm(parentComment) %]</H1>[% END %]
-
 [% INCLUDE variables %]
 
 <P>[% xmlnorm(nodeParam(token,'comment')) %]</P>