← Back to team overview

mvhub-dev team mailing list archive

  1. mvhub-dev team
  2. Mailing list archive
  3. Message #00190

[Merge] lp:~omacneil/mvhub/add_google_ads_back into lp:mvhub

  Thread Previous • Date Previous • • Thread Next 
Dan MacNeil has proposed merging lp:~omacneil/mvhub/add_google_ads_back into lp:mvhub.

Requested reviews:
  MVHub devs with commit rights (mvhub-commit)


Put google ads back in mvhub.com 

In process created site specific footers, replace hard coded footers

Big bug is that this code assumes only nsp / mvh if we add another site, if/else block will give all non nsp sites google ads
-- 
https://code.launchpad.net/~omacneil/mvhub/add_google_ads_back/+merge/25621
Your team MVHub Developers is subscribed to branch lp:mvhub.

=== modified file 'app-mvhub/DocumentRoot/cgi-bin/mvhub/admin/report.shtml'
--- app-mvhub/DocumentRoot/cgi-bin/mvhub/admin/report.shtml	2009-10-09 21:49:40 +0000
+++ app-mvhub/DocumentRoot/cgi-bin/mvhub/admin/report.shtml	2010-05-19 16:27:28 +0000
@@ -1,56 +1,52 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!-- saved from url=(0036)http://mvh.mdadhania.testing123.net/ -->
-<!-- start doctype.inc --><!-- stop doctype.inc --><HTML><HEAD><TITLE>Reports</TITLE><!-- start head.inc --><!-- mvhub/mvh//inc/head.inc -->
-<META content="text/html; charset=iso-8859-1" http-equiv=Content-Type><LINK 
-rel="shortcut icon" href="/favicon.ico"><!-- cosmetic script to reset columns to equal lengths-->
-
-<SCRIPT type=text/javascript 
-src="/all/js/equalcolumns.js"></SCRIPT>
-
-<!--used by program.pl /program_form.tmpl -->
-<SCRIPT type=text/javascript 
-src="/all/js/areas_served.js"></SCRIPT>
-
-<!-- where elements are positioned is the same for all sites --><LINK 
-rel=stylesheet type=text/css 
-href="/all/css/layout.css">
-
-<!-- colors , fonts, sizes different between sites --><LINK 
-rel=stylesheet type=text/css 
-href="/css/format.css"><!-- stop head.inc -->
-
-<META name=GENERATOR content="MSHTML 8.00.6001.18783"></HEAD>
-<BODY>
-<DIV id=maincontainer>
-<DIV id=topsection>
-</DIV>
-<DIV id=contentwrapper>
-<DIV id=contentcolumn>
-<DIV class=innertube>
-
-<br>
-
-
-<!--#include virtual="/cgi-bin/mvhub/admin/reports.pl" -->
-
-
-
-
-
-
-</DIV><!-- id=innertube --></DIV><!-- id='contentcolumn' --></DIV><!-- id='contentwrapper' -->
-<DIV id=leftcolumn>
-<DIV class=innertube><!-- start left_menu.inc -->
- 
-<!--#include virtual="/all/inc/left_menu.inc"-->
-
-
-<!-- stop left_menu.inc --></DIV></DIV><!-- start footer.inc -->
-<DIV id=footer>
-<HR>
-<img src='/img/copyright.gif' width='400' height='35' alt='copyright'>
- <!--
-  &copy; 2004 <a href="http://ltc.org";>Lowell Telecommunications
-                   Corporation</a> 
-     &amp; <a href="http://advancementplus.org/";>Advancement Plus </a> &copy; 2007-2009 <a href="http://thecsl.org";>Community Software Lab</a>
-  --></DIV><!-- stop footer.inc --></DIV><!-- id="maincontainer" --></BODY></HTML>
+<!-- start doctype.inc --><!-- stop doctype.inc -->
+
+<html>
+<head>
+  <meta name="generator" content=
+  "HTML Tidy for Linux (vers 6 November 2007), see www.w3.org">
+
+  <title>Reports</title><!-- start head.inc -->
+  <!-- mvhub/mvh//inc/head.inc -->
+  <meta content="text/html; charset=us-ascii" http-equiv=
+  "Content-Type">
+  <link rel="shortcut icon" href="/favicon.ico">
+  <!-- cosmetic script to reset columns to equal lengths-->
+
+  <script type="text/javascript" src="/all/js/equalcolumns.js">
+</script><!--used by program.pl /program_form.tmpl -->
+
+  <script type="text/javascript" src="/all/js/areas_served.js">
+</script>
+<!-- where elements are positioned is the same for all sites -->
+  <link rel="stylesheet" type="text/css" href=
+  "/all/css/layout.css">
+  <!-- colors , fonts, sizes different between sites -->
+  <link rel="stylesheet" type="text/css" href="/css/format.css">
+  <!-- stop head.inc -->
+  <meta name="GENERATOR" content="MSHTML 8.00.6001.18783">
+</head>
+
+<body>
+  <div id="maincontainer">
+    <div id="topsection"></div>
+
+    <div id="contentwrapper">
+      <div id="contentcolumn">
+        <div class="innertube">
+          <br>
+          <!--#include virtual="/cgi-bin/mvhub/admin/reports.pl" -->
+        </div><!-- id=innertube -->
+      </div><!-- id='contentcolumn' -->
+    </div><!-- id='contentwrapper' -->
+
+    <div id="leftcolumn">
+      <div class="innertube">
+        <!--#include virtual="/all/inc/left_menu.inc"-->
+      </div>
+        <!--#include virtual="inc/footer.inc"-->
+    </div>
+  </div>       <!-- id="maincontainer" -->
+</body>
+</html>

=== removed file 'app-mvhub/DocumentRoot/static/all/inc/footer.inc'
--- app-mvhub/DocumentRoot/static/all/inc/footer.inc	2009-10-09 21:49:40 +0000
+++ app-mvhub/DocumentRoot/static/all/inc/footer.inc	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-
-<!-- start footer.inc -->
- <div id='footer'>
-  <img src='/img/copyright.gif' width='400' height='35' alt='copyright'>
-  <!--
-  &copy; 2004 <a href="http://ltc.org";>Lowell Telecommunications
-                   Corporation</a> 
-     &amp; <a href="http://advancementplus.org/";>Advancement Plus </a> &copy; 2007-2009 <a href="http://thecsl.org";>Community Software Lab</a>
-  -->
-  </div>
-<!-- stop footer.inc -->
-

=== modified file 'app-mvhub/DocumentRoot/static/mvh/html/about.shtml'
--- app-mvhub/DocumentRoot/static/mvh/html/about.shtml	2009-10-09 21:49:40 +0000
+++ app-mvhub/DocumentRoot/static/mvh/html/about.shtml	2010-05-19 16:27:28 +0000
@@ -81,7 +81,7 @@
 
 <a href="#top"> Back To Top </a></p>
 
-    <!--#include virtual="/all/inc/footer.inc"-->
+    <!--#include virtual="/inc/footer.inc"-->
 </div> <!-- id="maincontainer" -->
 </body>
 </html>

=== modified file 'app-mvhub/DocumentRoot/static/mvh/html/documents.shtml'
--- app-mvhub/DocumentRoot/static/mvh/html/documents.shtml	2010-05-14 18:00:27 +0000
+++ app-mvhub/DocumentRoot/static/mvh/html/documents.shtml	2010-05-19 16:27:28 +0000
@@ -35,7 +35,7 @@
     </div>
     </div>
 
-    <!--#include virtual="/all/inc/footer.inc"-->
+    <!--#include virtual="/inc/footer.inc"-->
 </div> <!-- id="maincontainer" -->
 </body>
 </html>

=== modified file 'app-mvhub/DocumentRoot/static/mvh/html/help.shtml'
--- app-mvhub/DocumentRoot/static/mvh/html/help.shtml	2009-10-09 21:49:40 +0000
+++ app-mvhub/DocumentRoot/static/mvh/html/help.shtml	2010-05-19 16:27:28 +0000
@@ -153,7 +153,7 @@
         <!--#include virtual="/all/inc/left_menu.inc"-->
       </div>
     </div>
-    <!--#include virtual="/all/inc/footer.inc"-->
+    <!--#include virtual="/inc/footer.inc"-->
   </div><!-- id="maincontainer" -->
 </body>
 </html>

=== modified file 'app-mvhub/DocumentRoot/static/mvh/html/links.shtml'
--- app-mvhub/DocumentRoot/static/mvh/html/links.shtml	2010-01-07 19:16:56 +0000
+++ app-mvhub/DocumentRoot/static/mvh/html/links.shtml	2010-05-19 16:27:28 +0000
@@ -52,11 +52,9 @@
 
 
 <!-- stop left_menu.inc --></DIV></DIV><!-- start footer.inc -->
-<DIV id=footer>
-<HR>
-<img src='/img/copyright.gif' width='400' height='35' alt='copyright'>
- <!--
-  &copy; 2004 <a href="http://ltc.org";>Lowell Telecommunications
-                   Corporation</a> 
-     &amp; <a href="http://advancementplus.org/";>Advancement Plus </a> &copy; 2007-2009 <a href="http://thecsl.org";>Community Software Lab</a>
-  --></DIV><!-- stop footer.inc --></DIV><!-- id="maincontainer" --></BODY></HTML>
+
+<!--#include virtual="/inc/left_menu.inc"-->
+
+  </DIV> <!-- id="maincontainer" -->
+  </BODY>
+  </HTML>

=== modified file 'app-mvhub/DocumentRoot/static/mvh/html/register.shtml'
--- app-mvhub/DocumentRoot/static/mvh/html/register.shtml	2009-10-09 21:49:40 +0000
+++ app-mvhub/DocumentRoot/static/mvh/html/register.shtml	2010-05-19 16:27:28 +0000
@@ -177,7 +177,7 @@
 <p style="text-align:right;">
 <a href="#top"> Back To Top </a></p>
    
-<!--#include virtual="/all/inc/footer.inc"--> 
+<!--#include virtual="/inc/footer.inc"--> 
 
 </div><!-- id="maincontainer" -->  
 </body>

=== modified file 'app-mvhub/DocumentRoot/static/mvh/html/reports.shtml'
--- app-mvhub/DocumentRoot/static/mvh/html/reports.shtml	2010-02-01 02:16:47 +0000
+++ app-mvhub/DocumentRoot/static/mvh/html/reports.shtml	2010-05-19 16:27:28 +0000
@@ -38,7 +38,7 @@
       </div>
     </div>
 
-    <!--#include virtual="/all/inc/footer.inc"-->
+    <!--#include virtual="/inc/footer.inc"-->
   </div><!-- id="maincontainer" -->
 </body>
 </html>

=== modified file 'app-mvhub/DocumentRoot/static/mvh/html/servicearea.shtml'
--- app-mvhub/DocumentRoot/static/mvh/html/servicearea.shtml	2009-10-09 21:49:40 +0000
+++ app-mvhub/DocumentRoot/static/mvh/html/servicearea.shtml	2010-05-19 16:27:28 +0000
@@ -82,7 +82,7 @@
      </div><!-- id="innertube" -->
     </div><!-- id="leftcolumn" -->
 
- <!--#include virtual="/all/inc/footer.inc"-->
+ <!--#include virtual="/inc/footer.inc"-->
   
 </div><!-- id="maincontainer" -->
 </body>

=== removed file 'app-mvhub/DocumentRoot/static/mvh/img/copyright.gif'
Binary files app-mvhub/DocumentRoot/static/mvh/img/copyright.gif	2009-03-04 18:11:56 +0000 and app-mvhub/DocumentRoot/static/mvh/img/copyright.gif	1970-01-01 00:00:00 +0000 differ
=== added file 'app-mvhub/DocumentRoot/static/mvh/inc/footer.inc'
--- app-mvhub/DocumentRoot/static/mvh/inc/footer.inc	1970-01-01 00:00:00 +0000
+++ app-mvhub/DocumentRoot/static/mvh/inc/footer.inc	2010-05-19 16:27:28 +0000
@@ -0,0 +1,25 @@
+
+<!-- start footer.inc -->
+ <div id='footer'>
+
+  &copy; 2004  <a href="http://advancementplus.org/";>Advancement Plus </a> 
+  &copy; 2007-2010 <a href="http://thecsl.org";>Community 
+     Software Lab</a>
+  </div>
+<hr />
+<p>&nbsp;</p>
+<script type="text/javascript">
+
+   google_ad_client = "pub-9563950056380149";
+
+   //category_results_below_results
+   google_ad_slot = "0745380539";
+   google_ad_width = 468;
+   google_ad_height = 60;
+
+</script>
+<script type="text/javascript"  src="http://pagead2.googlesyndication.com/pagead/show_ads.js";></script>
+
+<!-- stop footer.inc -->
+
+

=== modified file 'app-mvhub/DocumentRoot/static/nsp/html/about.shtml'
--- app-mvhub/DocumentRoot/static/nsp/html/about.shtml	2010-04-06 20:52:15 +0000
+++ app-mvhub/DocumentRoot/static/nsp/html/about.shtml	2010-05-19 16:27:28 +0000
@@ -78,7 +78,7 @@
       </div>
     </div>
 
-    <!--#include virtual="/all/inc/footer.inc"-->
+    <!--#include virtual="/inc/footer.inc"-->
 </div> <!-- id="maincontainer" -->
 </body>
 </html>

=== modified file 'app-mvhub/DocumentRoot/static/nsp/html/documents.shtml'
--- app-mvhub/DocumentRoot/static/nsp/html/documents.shtml	2010-04-06 20:52:15 +0000
+++ app-mvhub/DocumentRoot/static/nsp/html/documents.shtml	2010-05-19 16:27:28 +0000
@@ -39,7 +39,7 @@
       </div>
     </div>
 
-    <!--#include virtual="/all/inc/footer.inc"-->
+    <!--#include virtual="/inc/footer.inc"-->
 </div> <!-- id="maincontainer" -->
 </body>
 </html>

=== modified file 'app-mvhub/DocumentRoot/static/nsp/html/help.shtml'
--- app-mvhub/DocumentRoot/static/nsp/html/help.shtml	2010-04-06 20:52:15 +0000
+++ app-mvhub/DocumentRoot/static/nsp/html/help.shtml	2010-05-19 16:27:28 +0000
@@ -159,7 +159,7 @@
 		<!--#include virtual="/inc/site_left_menu.inc"-->
       </div>
     </div>
-    <!--#include virtual="/all/inc/footer.inc"-->
+    <!--#include virtual="/inc/footer.inc"-->
   </div><!-- id="maincontainer" -->
 </body>
 </html>

=== modified file 'app-mvhub/DocumentRoot/static/nsp/html/links.shtml'
--- app-mvhub/DocumentRoot/static/nsp/html/links.shtml	2010-04-26 15:01:50 +0000
+++ app-mvhub/DocumentRoot/static/nsp/html/links.shtml	2010-05-19 16:27:28 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <HTML>
 <HEAD>
-<TITLE>Directories of Social Services for Massachusetts North Shore</TITLE>
+<TITLE>Directories of Social Services for Massachusetts North Shore</TITLE>
 
 
 <META content="text/html; charset=iso-8859-1" http-equiv=Content-Type><LINK 
@@ -39,10 +39,10 @@
 Merrimack Valley region, in Massachusetts.</P>
 <P><A href="http://www.mass211.org";>Mass 211</A><br>
 A phone service and online directory run by the United Way. It connects 
-people seeking services to the Massachusetts' organizations or government agencies. </P>
+people seeking services to the Massachusetts' organizations or government agencies. </P>
 
-<P><A href="http://eccf.org/nonprofitdirectory113.html";>ECCF Nonprofit Directory</A><br>
-Essex Count Community Foundation's Directory of Non-Profits in Essex County Massachusetts, including the North Shore.
+<P><A href="http://eccf.org/nonprofitdirectory113.html";>ECCF Nonprofit Directory</A><br>
+Essex Count Community Foundation's Directory of Non-Profits in Essex County Massachusetts, including the North Shore.
 </P>
 
 
@@ -50,16 +50,12 @@
 <DIV id=leftcolumn>
 <DIV class=innertube><!-- start left_menu.inc -->
 
- <!--#include virtual="/all/inc/left_menu.inc"-->
+ <!--#include virtual="/all/inc/left_menu.inc"-->
  <!--#include virtual="/inc/site_left_menu.inc"-->
 
 
-<!-- stop left_menu.inc --></DIV></DIV><!-- start footer.inc -->
-<DIV id=footer>
-<HR>
-<img src='/img/copyright.gif' width='400' height='35' alt='copyright'>
- <!--
-  &copy; 2004 <a href="http://ltc.org";>Lowell Telecommunications
-                   Corporation</a> 
-     &amp; <a href="http://advancementplus.org/";>Advancement Plus </a> &copy; 2007-2009 <a href="http://thecsl.org";>Community Software Lab</a>
-  --></DIV><!-- stop footer.inc --></DIV><!-- id="maincontainer" --><!-- stop contact_form.tmpl --></BODY></HTML>
+<!-- stop left_menu.inc --></DIV></DIV>
+
+ <!--#include virtual="/inc/footer.inc -->
+ 
+  </DIV><!-- id="maincontainer" --><!-- stop contact_form.tmpl --></BODY></HTML>

=== modified file 'app-mvhub/DocumentRoot/static/nsp/html/register.shtml'
--- app-mvhub/DocumentRoot/static/nsp/html/register.shtml	2010-04-06 20:52:15 +0000
+++ app-mvhub/DocumentRoot/static/nsp/html/register.shtml	2010-05-19 16:27:28 +0000
@@ -197,7 +197,7 @@
 <p style="text-align:right;">
 <a href="#top"> Back To Top </a></p>
 
-<!--#include virtual="/all/inc/footer.inc"-->
+<!--#include virtual="/inc/footer.inc"-->
 
 </div><!-- id="maincontainer" -->
 </body>

=== modified file 'app-mvhub/DocumentRoot/static/nsp/html/reports.shtml'
--- app-mvhub/DocumentRoot/static/nsp/html/reports.shtml	2010-04-06 20:52:15 +0000
+++ app-mvhub/DocumentRoot/static/nsp/html/reports.shtml	2010-05-19 16:27:28 +0000
@@ -39,7 +39,7 @@
       </div>
     </div>
 
-    <!--#include virtual="/all/inc/footer.inc"-->
+    <!--#include virtual="/inc/footer.inc"-->
   </div><!-- id="maincontainer" -->
 </body>
 </html>

=== modified file 'app-mvhub/DocumentRoot/static/nsp/html/servicearea.shtml'
--- app-mvhub/DocumentRoot/static/nsp/html/servicearea.shtml	2010-04-06 20:52:15 +0000
+++ app-mvhub/DocumentRoot/static/nsp/html/servicearea.shtml	2010-05-19 16:27:28 +0000
@@ -92,7 +92,7 @@
      </div><!-- id="innertube" -->
     </div><!-- id="leftcolumn" -->
 
- <!--#include virtual="/all/inc/footer.inc"-->
+ <!--#include virtual="/inc/footer.inc"-->
   
 </div><!-- id="maincontainer" -->
 </body>

=== removed file 'app-mvhub/DocumentRoot/static/nsp/img/copyright.gif'
Binary files app-mvhub/DocumentRoot/static/nsp/img/copyright.gif	2009-03-04 18:11:56 +0000 and app-mvhub/DocumentRoot/static/nsp/img/copyright.gif	1970-01-01 00:00:00 +0000 differ
=== added file 'app-mvhub/DocumentRoot/static/nsp/inc/footer.inc'
--- app-mvhub/DocumentRoot/static/nsp/inc/footer.inc	1970-01-01 00:00:00 +0000
+++ app-mvhub/DocumentRoot/static/nsp/inc/footer.inc	2010-05-19 16:27:28 +0000
@@ -0,0 +1,8 @@
+
+<!-- start footer.inc -->
+ <div id='footer'>
+    &copy; 2009-2010 <a href="http://nscap.org/";>North Shore Community Action Programs </a>
+    &copy; 2002-2010  <a href="http://thecsl.org";>Community  Software Lab</a>
+  </div>
+<!-- stop footer.inc -->
+

=== modified file 'app-mvhub/conf/templates/html/contact_form.tmpl'
--- app-mvhub/conf/templates/html/contact_form.tmpl	2010-04-06 20:52:15 +0000
+++ app-mvhub/conf/templates/html/contact_form.tmpl	2010-05-19 16:27:28 +0000
@@ -131,7 +131,12 @@
       </div>
     </div>
 
-    <!-- tmpl_include name="inc/footer.inc"-->
+   <!-- tmpl_if name="show_nsp_left_menu" -->
+   	<!-- tmpl_include name="nsp/inc/footer.inc" -->
+   <!-- tmpl_else -->
+     	<!-- tmpl_include name="mvh/inc/footer.inc" -->
+   <!--/tmpl_if-->
+   
   </div><!-- id="maincontainer" -->
   </body>
 </html>

=== modified file 'app-mvhub/conf/templates/html/main.tmpl'
--- app-mvhub/conf/templates/html/main.tmpl	2010-04-06 20:52:15 +0000
+++ app-mvhub/conf/templates/html/main.tmpl	2010-05-19 16:27:28 +0000
@@ -37,7 +37,12 @@
       </div>
     </div>
 
-    <!--tmpl_include name="inc/footer.inc"-->
+    <!-- tmpl_if name="show_nsp_left_menu" -->
+	<!-- tmpl_include name="nsp/inc/footer.inc" -->
+    <!-- tmpl_else -->
+	<!-- tmpl_include name="mvh/inc/footer.inc" -->
+    <!--/tmpl_if-->
+
   </div><!-- id="maincontainer" -->
 
  </body>

=== added symlink 'app-mvhub/conf/templates/html/mvh'
=== target is u'../../../DocumentRoot/static/mvh/'
=== modified file 'app-mvhub/project-tools/templates/template.shtml'
--- app-mvhub/project-tools/templates/template.shtml	2009-10-09 21:49:40 +0000
+++ app-mvhub/project-tools/templates/template.shtml	2010-05-19 16:27:28 +0000
@@ -27,7 +27,7 @@
       </div>
     </div>
 
-    <!--#include virtual="/all/inc/footer.inc"-->
+    <!--#include virtual="/inc/footer.inc"-->
   </div><!-- id="maincontainer" -->
 </body>
 </html>

Follow ups

  Thread Previous • Date Previous • • Thread Next