← Back to team overview

mvhub-dev team mailing list archive

[Merge] lp:~leegoodrich/mvhub/fix_google_ads_in_ie into lp:mvhub

 

Lee Goodrich has proposed merging lp:~leegoodrich/mvhub/fix_google_ads_in_ie into lp:mvhub.

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


Reworked the CSS for MVHub and Northshoreport to no longer need the javascript columns hack and generally clean up and get rid of unnecessary divs. Also spun off a seperate CSS file for IE fixes. 
-- 
https://code.launchpad.net/~leegoodrich/mvhub/fix_google_ads_in_ie/+merge/30319
Your team MVHub Developers is subscribed to branch lp:mvhub.
=== added file 'app-mvhub/DocumentRoot/static/all/css/ie_layout.css'
--- app-mvhub/DocumentRoot/static/all/css/ie_layout.css	1970-01-01 00:00:00 +0000
+++ app-mvhub/DocumentRoot/static/all/css/ie_layout.css	2010-07-19 18:32:43 +0000
@@ -0,0 +1,25 @@
+/* 
+  file: ie_layout.css
+  This file is where to put all IE-Specific CSS Hacks and Workarounds
+*/
+
+/* Left Column Padding Alignment Fix */
+
+#leftcolumn{
+ right: 150px; 
+}
+
+/*** Equal-height Columns IE Fix***/
+
+body {
+	overflow: hidden;
+}
+
+#footer-wrapper {
+	float: left;
+	position: relative;
+	width: 100%;
+	padding-bottom: 10010px;
+	margin-bottom: -10000px;
+	background: #FFF;         /*** Same as body background ***/
+}

=== modified file 'app-mvhub/DocumentRoot/static/all/css/layout.css'
--- app-mvhub/DocumentRoot/static/all/css/layout.css	2010-05-26 17:56:33 +0000
+++ app-mvhub/DocumentRoot/static/all/css/layout.css	2010-07-19 18:32:43 +0000
@@ -1,16 +1,32 @@
 /* 
   file: layout.css
-  credit: http://www.dynamicdrive.com/style/layouts/item/css-liquid-layout-21-fixed-fluid/
-*/
-
-/* 
-DO NOT USE ABSOLUTE POSITIONING, it will break the javascript
-that sets column heights to extend down the whole page
 */
 
 body{
-  margin:0;
-  padding:0;
+  min-width: 360px;
+}
+
+#maincontainer {
+  padding-left: 150px;
+  padding-right: 40px;
+}
+
+#maincontainer .column {
+  position: relative;
+  float: left;
+}
+
+#contentcolumn{
+  padding: 10px 20px;
+  width: 100%;
+}
+
+#leftcolumn{
+  width: 130px; /*Width of left column*/
+  padding: 0 10px;
+  right: 190px;
+  margin-left: -100%;
+  background-repeat: repeat-y;
 }
 
 #topsection{
@@ -18,36 +34,19 @@
   height: 76px; /*Height of top section*/
 }
 
-#contentwrapper{
-  float: right;
-  width: 100%;
-  
-}
-
-
-#contentcolumn{
-  margin-left: 160px; 
-  overflow: auto;
-}
-
-
-#leftcolumn{
-  float: right;
-  position: absolute;
-  margin-top: 0cm;
-  width: 150px; /*Width of left column*/
-  height: 100%;
-  background-repeat: repeat-y;
-}
-
 #footer {
-   float: clear;
-   
-}
-
-.innertube{
-  margin: 10px; /*Margins for inner DIV inside each column (to provide padding)*/
-  margin-top: 0;
-
-  
-}
+   clear: both;
+   position: relative;
+}
+
+/*** Equal-height Columns ***/
+
+#maincontainer {
+	overflow: hidden;
+}
+
+#maincontainer .column {
+	padding-bottom: 20010px;     /* X + padding-bottom */
+	margin-bottom: -20000px;     /* X */
+}
+

=== modified file 'app-mvhub/DocumentRoot/static/all/inc/head.inc'
--- app-mvhub/DocumentRoot/static/all/inc/head.inc	2009-07-01 15:32:40 +0000
+++ app-mvhub/DocumentRoot/static/all/inc/head.inc	2010-07-19 18:32:43 +0000
@@ -5,14 +5,17 @@
 
 <link rel="shortcut icon" href="/favicon.ico">
 
-<!-- cosmetic script to reset columns to equal lengths-->
-<script src="/all/js/equalcolumns.js" type="text/javascript"></script> 
-
 <!--used by program.pl /program_form.tmpl -->
 <script src="/all/js/areas_served.js" type="text/javascript"></script>
 
 <!-- where elements are positioned is the same for all sites -->
 <link rel="stylesheet" type="text/css" href="/all/css/layout.css">
+
+<!-- IE-Specific stylesheet that is ignored by other browsers -->
+<!--[if IE]>
+<link rel="stylesheet" type="text/css" href="/all/css/ie_layout.css">
+<![endif]-->
+
 <!-- colors , fonts, sizes different between sites -->
 <link rel="stylesheet" type="text/css" href="/css/format.css">
 <!-- stop head.inc -->

=== removed file 'app-mvhub/DocumentRoot/static/all/js/equalcolumns.js'
--- app-mvhub/DocumentRoot/static/all/js/equalcolumns.js	2009-03-04 18:11:56 +0000
+++ app-mvhub/DocumentRoot/static/all/js/equalcolumns.js	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-//** Dynamic Drive Equal Columns Height script v1.01 (Nov 2nd, 06)
-//** http://www.dynamicdrive.com/style/blog/entry/css-equal-columns-height-script/
-
-var ddequalcolumns=new Object()
-//Input IDs (id attr) of columns to equalize. Script will check if each corresponding column actually exists:
-ddequalcolumns.columnswatch=["leftcolumn", "rightcolumn", "contentwrapper"]
-
-ddequalcolumns.setHeights=function(reset){
-var tallest=0
-var resetit=(typeof reset=="string")? true : false
-for (var i=0; i<this.columnswatch.length; i++){
-  if (document.getElementById(this.columnswatch[i])!=null){
-    if (resetit)
-       document.getElementById(this.columnswatch[i]).style.height="auto"
-    if (document.getElementById(this.columnswatch[i]).offsetHeight>tallest)
-       tallest=document.getElementById(this.columnswatch[i]).offsetHeight
-  }
-}
-if (tallest>0){
-   for (var i=0; i<this.columnswatch.length; i++){
-     if (document.getElementById(this.columnswatch[i])!=null)
-       document.getElementById(this.columnswatch[i]).style.height=tallest+"px"
-      }
-    }
-}
-
-ddequalcolumns.resetHeights=function(){
-this.setHeights("reset")
-}
-
-ddequalcolumns.dotask=function(target, functionref, tasktype){ 
-  //assign a function to execute to an event handler (ie: onunload)
-  var tasktype=(window.addEventListener)? tasktype : "on"+tasktype
-  if (target.addEventListener)
-    target.addEventListener(tasktype, functionref, false)
-  else if (target.attachEvent)
-    target.attachEvent(tasktype, functionref)
-  }
-
-  ddequalcolumns.dotask(window, function(){ddequalcolumns.setHeights()}, "load")
-  ddequalcolumns.dotask(window, function(){if (typeof ddequalcolumns.timer!="undefined") clearTimeout(ddequalcolumns.timer); ddequalcolumns.timer=setTimeout("ddequalcolumns.resetHeights()", 200)}, "resize")
-

=== modified file 'app-mvhub/DocumentRoot/static/mvh/css/format.css'
--- app-mvhub/DocumentRoot/static/mvh/css/format.css	2009-10-09 21:49:40 +0000
+++ app-mvhub/DocumentRoot/static/mvh/css/format.css	2010-07-19 18:32:43 +0000
@@ -40,10 +40,9 @@
 { color: red; }
 
 #footer {
-  clear: left;
+  border-top: #000000 1px solid;
   width: 100%;
   text-align: center;
-  padding: 4px 0;
   font-weight: 400;
   font-size: 100%; 
 }

=== modified file 'app-mvhub/DocumentRoot/static/mvh/html/about.shtml'
--- app-mvhub/DocumentRoot/static/mvh/html/about.shtml	2010-05-19 16:01:14 +0000
+++ app-mvhub/DocumentRoot/static/mvh/html/about.shtml	2010-07-19 18:32:43 +0000
@@ -1,87 +1,79 @@
 <!--#include virtual='/all/inc/doctype.inc' -->
+
 <html>
 <head>
-  <title>
-       About us: (MVHub) Merrimack Valley Nonprofit Services Directory
-  </title>
-  <!--#include virtual="/all/inc/head.inc"-->
-</head>
-
-<!--<body>-->
-<body id="top">
-  <div id="maincontainer">
-    <div id="topsection">
-    </div>
-
-    <div id="contentwrapper">
-      <div id="contentcolumn">
-        <div class="innertube">
-
-          <h2>Our Purpose</h2>
-
-
-          <p>Since 2004, we have provided the Massachusetts Merrimack Valley with
-          easy to use, useful and accurate about social and
-          non-profit services.</p>
-
-
-          <p>We will share software with anyone who can download it
-          and data with anyone who shares our goals.</p>
-
-          <h2>How You can Help</h2>
-
-          <p>We welcome your questions or <a href=
-          "/cgi-bin/mvhub/contact_form.pl">comments</a>.</p>
-          <p>If you run a non profit agency or program and you are
-          not listed. You can <a href=
-          "/html/register.shtml">get listed</a></p>
-
-          <p>If you are a software developer or graphic designer, please
-          <a href="http://thecsl.org/go/vol/";>volunteer</a> Much of
-          MVHub is developed by volunteer labor. MVHub is free
-          software licensed under the <a href=
-          "http://www.gnu.org/licenses/agpl.html";>
-          GNU Affero General Public License, version 3</a></p>
-
-
-          <h2>Who We Are</h2>
-          <p>MVHub.com is maintained and developed by two non-profit
-          (501c3) organizations, the <a href=
-          "http://thecsl.org";>Community Software Lab</a> and <a href=
-          "http://LTC.org";>Lowell Telecommunications Corporation</a></p>
-
-
-          <h2>How we started</h2>
-          <p>The software was written by the Community Software
-          Lab.</p>
-
-          <p>LTC and Advancement Plus provided the feedback necessary
-          to make good software</p>
-
-          <p>Additional support was provided by The Greater Lowell
-          Community Resource Collaborative, UMASS Lowell, The Lowell
-          Police Department's Weed and Seed Program,</p>
-
-          <p>The Annie E. Casey Foundation (2004), The Merrimack
-          Valley Work Force Investment board (2007) and the Lowell
-          Work Force Investment board.(2007) paid for the work that
-          was not done by volunteers.</p>	  
-        </div>
-      </div>
-    </div>
-
-    <div id="leftcolumn">
-      <div class="innertube">
-        <!--#include virtual="/all/inc/left_menu.inc"-->
-      </div>
-    </div>
-
-<br>
-<p style="text-align:right;">
-
-<a href="#top"> Back To Top </a></p>
-
-    <!--#include virtual="/inc/footer.inc"-->
-</div> <!-- id="maincontainer" -->
+    <meta name="generator" content=
+    "HTML Tidy for Linux (vers 6 November 2007), see www.w3.org">
+
+    <title>About us: (MVHub) Merrimack Valley Nonprofit Services
+    Directory</title><!--#include virtual="/all/inc/head.inc"-->
+</head><!--<body>-->
+
+<body>
+    <div id="topsection"></div>
+
+    <div id="maincontainer">
+        <div id="contentcolumn" class="column">
+            <h2>Our Purpose</h2>
+
+            <p>Since 2004, we have provided the Massachusetts Merrimack
+            Valley with easy to use, useful and accurate about social
+            and non-profit services.</p>
+
+            <p>We will share software with anyone who can download it
+            and data with anyone who shares our goals.</p>
+
+            <h2>How You can Help</h2>
+
+            <p>We welcome your questions or <a href=
+            "/cgi-bin/mvhub/contact_form.pl">comments</a>.</p>
+
+            <p>If you run a non profit agency or program and you are
+            not listed. You can <a href="/html/register.shtml">get
+            listed</a></p>
+
+            <p>If you are a software developer or graphic designer,
+            please <a href="http://thecsl.org/go/vol/";>volunteer</a>
+            Much of MVHub is developed by volunteer labor. MVHub is
+            free software licensed under the <a href=
+            "http://www.gnu.org/licenses/agpl.html";>GNU Affero General
+            Public License, version 3</a></p>
+
+            <h2>Who We Are</h2>
+
+            <p>MVHub.com is maintained and developed by two non-profit
+            (501c3) organizations, the <a href=
+            "http://thecsl.org";>Community Software Lab</a> and <a href=
+            "http://LTC.org";>Lowell Telecommunications
+            Corporation</a></p>
+
+            <h2>How we started</h2>
+
+            <p>The software was written by the Community Software
+            Lab.</p>
+
+            <p>LTC and Advancement Plus provided the feedback necessary
+            to make good software</p>
+
+            <p>Additional support was provided by The Greater Lowell
+            Community Resource Collaborative, UMASS Lowell, The Lowell
+            Police Department's Weed and Seed Program,</p>
+
+            <p>The Annie E. Casey Foundation (2004), The Merrimack
+            Valley Work Force Investment board (2007) and the Lowell
+            Work Force Investment board.(2007) paid for the work that
+            was not done by volunteers.</p>
+
+            <p><a href="#top">Back To Top</a></p>
+        </div>
+
+        <div id="leftcolumn" class="column">
+            <!--#include virtual="/all/inc/left_menu.inc"-->
+        </div>
+    </div><!-- id="maincontainer" -->
+
+    <div id="footer-wrapper">
+        <!--#include virtual="/inc/footer.inc"-->
+    </div>
 </body>
 </html>

=== modified file 'app-mvhub/DocumentRoot/static/mvh/html/documents.shtml'
--- app-mvhub/DocumentRoot/static/mvh/html/documents.shtml	2010-05-19 16:01:14 +0000
+++ app-mvhub/DocumentRoot/static/mvh/html/documents.shtml	2010-07-19 18:32:43 +0000
@@ -1,41 +1,34 @@
 <!--#include virtual='/all/inc/doctype.inc' -->
+
 <html>
 <head>
-  <title>
-       Documents: MVHub
-  </title>
-  <!--#include virtual="/all/inc/head.inc"-->
+    <meta name="generator" content=
+    "HTML Tidy for Linux (vers 6 November 2007), see www.w3.org">
+
+    <title>Documents: MVHub</title>
+    <!--#include virtual="/all/inc/head.inc"-->
 </head>
 
 <body>
-  <div id="maincontainer">
-    <div id="topsection">
-    </div>
-
-    <div id="contentwrapper">
-      <div id="contentcolumn">
-        <div class="innertube">
-
-          <h2>Documents</h2>
-
-          <p>
-	  
-	  <p>
-	  <a href="documents/lowell_ma_food_panry_and_meals_schedule.doc">
-	  Food Pantry Schedule
-	  </a> (.doc) hours for Lowell Ma food pantries and soup kitchens</p>
-
-        </div>
-      </div>
-    </div>
-
-    <div id="leftcolumn">
-      <div class="innertube">
-        <!--#include virtual="/all/inc/left_menu.inc"-->
-    </div>
-    </div>
-
-    <!--#include virtual="/inc/footer.inc"-->
-</div> <!-- id="maincontainer" -->
+    <div id="topsection"></div>
+
+    <div id="maincontainer">
+        <div id="contentcolumn" class="column">
+            <h2>Documents</h2>
+
+            <p><a href=
+            "documents/lowell_ma_food_panry_and_meals_schedule.doc">Food
+            Pantry Schedule</a> (.doc) hours for Lowell Ma food
+            pantries and soup kitchens</p>
+        </div>
+
+        <div id="leftcolumn" class="column">
+            <!--#include virtual="/all/inc/left_menu.inc"-->
+        </div>
+    </div><!-- id="maincontainer" -->
+
+    <div id="footer-wrapper">
+        <!--#include virtual="/inc/footer.inc"-->
+    </div>
 </body>
 </html>

=== modified file 'app-mvhub/DocumentRoot/static/mvh/html/help.shtml'
--- app-mvhub/DocumentRoot/static/mvh/html/help.shtml	2010-05-19 16:01:14 +0000
+++ app-mvhub/DocumentRoot/static/mvh/html/help.shtml	2010-07-19 18:32:43 +0000
@@ -1,159 +1,158 @@
 <!--#include virtual='/all/inc/doctype.inc' -->
+
 <html>
 <head>
-  <title>Help with: (MVHub) Merrimack Valley Nonprofit Services
-  Directory</title>
-  <!--#include virtual="/all/inc/head.inc"-->
+    <meta name="generator" content=
+    "HTML Tidy for Linux (vers 6 November 2007), see www.w3.org">
 
+    <title>Help with: (MVHub) Merrimack Valley Nonprofit Services
+    Directory</title><!--#include virtual="/all/inc/head.inc"-->
 </head>
 
 <body>
-  <div id="maincontainer">
-    <div id="topsection">
-    </div>
-
-
-    <div id="contentwrapper">
-      <div id="contentcolumn">
-        <div class="innertube">
-          <!-- BEGIN TABLE OF CONTENTS -->
-
-          <p><a href="#merrimack_who">Where is the Merrimack Valley?
-          Is my town in it?</a>
-          </p>
-
-          <p><a href="#both_records">Why do I need to create both an
-          Agency record and Program record(s)?</a>
-          </p>
-
-
-          <p><a href="#selecting_programs">What if I am having
-          trouble identifying which categories I should select for my
-          program(s)?</a>
-          </p>
-
-          <p><a href="#change_password">How can I change my
-          password?</a>
-          </p>
-          <!-- END TABLE OF CONTENTS -->
-
-          <hr>
-          <!-- BEGIN ANSWER SECTIONS -->
-          <p class="question"><a name="merrimack_who" id=
-          "merrimack_who"></a>Q: Where is the Merrimack Valley? Is my
-          town in it?</p>
-
-          <p>A:The Merrimack Valley comprises all of
-          the towns along the Merrimack River within Massachusetts,
-          including:</p>
-
-
-          <div style="text-align: left; margin-left: 160px">
-            <table summary='cities in MVHub service area' cellpadding="4">
-              <tr>
-                <td>Amesbury</td>
-                <td>Dunstable</td>
-                <td>Methuen</td>
-              </tr>
-              <tr>
-                <td>Andover</td>
-                <td>Haverhill</td>
-                <td>Newburyport</td>
-              </tr>
-              <tr>
-                <td>Bedford</td>
-                <td>Lawrence</td>
-                <td>Salisbury</td>
-              </tr>
-              <tr>
-                <td>Billerica</td>
-                <td>Littleton</td>
-                <td>Tewksbury</td>
-              </tr>
-
-
-              <tr>
-                <td>Chelmsford</td>
-                <td>Lowell</td>
-                <td>Tyngsborough</td>
-              </tr>
-
-              <tr>
-                <td>Dracut</td>
-                <td>Merrimac</td>
-                <td>Westford</td>
-              </tr>
-            </table>
-          </div>
-
-          <hr>
-          <h1>Agency Account Help</h1>
-
-          <p class="question"><a name="both_records" id=
-          "both_records"></a>Q: Why do I need to create both an
-          Agency record and Program record(s)?</p>
-
-
-          <p>A:Your Agency record contains general
-          information about your organization. A Program record
-          contains more detailed information about a specific service
-          your Agency offers. When you submit a Program record form,
-          you're also asked to select categories (e.g. "child health
-          care", "handicapped housing", "credit counseling", etc.)
-          that describe it.<br>
-          <br>
-          These two kinds of records correspond to the 2 kinds of
-          searches that Directory users can conduct - Agency Name
-          Searches and Program Category Searches. Directory users
-          often prefer the latter, since they generally want to
-          describe their needs in their search terms. So it's crucial
-          you provide adequate Program record(s), and categorize them
-          well.<br>
-          <br>
-          If your Agency provides only one service, then you'll only
-          need to create one Program record. However, there is no
-          limit on the number of Programs an Agency can have.<br>
-          <br>
-          In general, seperating your distinct services into multiple
-          Programs is good, as it improves the accuracy and relevance
-          of search results for Directory users.</p>
-
-
-          <p class="question"><a name="selecting_programs" id=
-          "selecting_programs"></a>Q: What if I am having trouble
-          identifying which categories I should select for my
-          program(s)?</p>
-
-
-          <p>A: <a href=
-          "/cgi-bin/mvhub/contact_form.pl">contact
-          us</a>, leaving your name and contact number, and we will
-          call to assist you in selecting the categories that relate
-          to your program(s).</p>
-
-
-          <p class="question"><a name="change_password" id=
-          "change_password"></a>Q: How can I change my password?</p>
-
-
-          <p>A: There is currently no way to change
-          your password through the site. If all you really need is a
-          <a href=
-          "/cgi-bin/mvhub/agency.pl?rm=request_password">password
-          reminder sent to you, click here</a>. If you still want
-          your password changed, <a href=
-          "/cgi-bin/mvhub/contact_form.pl">contact
-          us</a> directly.</p>
-        </div><!-- id=innertube -->
-      </div><!-- id='contentcolumn' -->
-    </div><!-- id='contentwrapper' -->
-
-    <div id="leftcolumn">
-      <div class="innertube">
-        <!--#include virtual="/all/inc/left_menu.inc"-->
-      </div>
-    </div>
-    <!--#include virtual="/inc/footer.inc"-->
-  </div><!-- id="maincontainer" -->
+    <div id="topsection"></div>
+
+    <div id="maincontainer">
+        <div id="contentcolumn" class="column">
+            <!-- BEGIN TABLE OF CONTENTS -->
+
+            <p><a href="#merrimack_who">Where is the Merrimack Valley?
+            Is my town in it?</a></p>
+
+            <p><a href="#both_records">Why do I need to create both an
+            Agency record and Program record(s)?</a></p>
+
+            <p><a href="#selecting_programs">What if I am having
+            trouble identifying which categories I should select for my
+            program(s)?</a></p>
+
+            <p><a href="#change_password">How can I change my
+            password?</a></p><!-- END TABLE OF CONTENTS -->
+            <hr>
+            <!-- BEGIN ANSWER SECTIONS -->
+
+            <p class="question"><a name="merrimack_who" id=
+            "merrimack_who"></a>Q: Where is the Merrimack Valley? Is my
+            town in it?</p>
+
+            <p>A:The Merrimack Valley comprises all of the towns along
+            the Merrimack River within Massachusetts, including:</p>
+
+            <div style="text-align: left; margin-left: 160px">
+                <table summary='cities in MVHub service area'
+                cellpadding="4">
+                    <tr>
+                        <td>Amesbury</td>
+
+                        <td>Dunstable</td>
+
+                        <td>Methuen</td>
+                    </tr>
+
+                    <tr>
+                        <td>Andover</td>
+
+                        <td>Haverhill</td>
+
+                        <td>Newburyport</td>
+                    </tr>
+
+                    <tr>
+                        <td>Bedford</td>
+
+                        <td>Lawrence</td>
+
+                        <td>Salisbury</td>
+                    </tr>
+
+                    <tr>
+                        <td>Billerica</td>
+
+                        <td>Littleton</td>
+
+                        <td>Tewksbury</td>
+                    </tr>
+
+                    <tr>
+                        <td>Chelmsford</td>
+
+                        <td>Lowell</td>
+
+                        <td>Tyngsborough</td>
+                    </tr>
+
+                    <tr>
+                        <td>Dracut</td>
+
+                        <td>Merrimac</td>
+
+                        <td>Westford</td>
+                    </tr>
+                </table>
+            </div>
+            <hr>
+
+            <h1>Agency Account Help</h1>
+
+            <p class="question"><a name="both_records" id=
+            "both_records"></a>Q: Why do I need to create both an
+            Agency record and Program record(s)?</p>
+
+            <p>A:Your Agency record contains general information about
+            your organization. A Program record contains more detailed
+            information about a specific service your Agency offers.
+            When you submit a Program record form, you're also asked to
+            select categories (e.g. "child health care", "handicapped
+            housing", "credit counseling", etc.) that describe it.
+            <br>
+            <br>
+            These two kinds of records correspond to the 2 kinds of
+            searches that Directory users can conduct - Agency Name
+            Searches and Program Category Searches. Directory users
+            often prefer the latter, since they generally want to
+            describe their needs in their search terms. So it's crucial
+            you provide adequate Program record(s), and categorize them
+            well.
+            <br>
+            <br>
+            If your Agency provides only one service, then you'll only
+            need to create one Program record. However, there is no
+            limit on the number of Programs an Agency can have.
+            <br>
+            <br>
+            In general, seperating your distinct services into multiple
+            Programs is good, as it improves the accuracy and relevance
+            of search results for Directory users.</p>
+
+            <p class="question"><a name="selecting_programs" id=
+            "selecting_programs"></a>Q: What if I am having trouble
+            identifying which categories I should select for my
+            program(s)?</p>
+
+            <p>A: <a href="/cgi-bin/mvhub/contact_form.pl">contact
+            us</a>, leaving your name and contact number, and we will
+            call to assist you in selecting the categories that relate
+            to your program(s).</p>
+
+            <p class="question"><a name="change_password" id=
+            "change_password"></a>Q: How can I change my password?</p>
+
+            <p>A: There is currently no way to change your password
+            through the site. If all you really need is a <a href=
+            "/cgi-bin/mvhub/agency.pl?rm=request_password">password
+            reminder sent to you, click here</a>. If you still want
+            your password changed, <a href=
+            "/cgi-bin/mvhub/contact_form.pl">contact us</a>
+            directly.</p>
+        </div><!-- id='contentcolumn' -->
+
+        <div id="leftcolumn" class="column">
+            <!--#include virtual="/all/inc/left_menu.inc"-->
+        </div>
+    </div><!-- id="maincontainer" -->
+
+    <div id="footer-wrapper">
+        <!--#include virtual="/inc/footer.inc"-->
+    </div>
 </body>
 </html>

=== modified file 'app-mvhub/DocumentRoot/static/mvh/html/links.shtml'
--- app-mvhub/DocumentRoot/static/mvh/html/links.shtml	2010-07-02 21:35:01 +0000
+++ app-mvhub/DocumentRoot/static/mvh/html/links.shtml	2010-07-19 18:32:43 +0000
@@ -1,42 +1,43 @@
 <!--#include virtual="/all/inc/doctype.inc"-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
 <head>
+    <meta name="generator" content=
+    "HTML Tidy for Linux (vers 6 November 2007), see www.w3.org">
 
-  <title>Links to other pages</title>
-  <!--#include virtual="/all/inc/head.inc"-->
+    <title>Links to other pages</title>
+    <!--#include virtual="/all/inc/head.inc"-->
 </head>
+
 <body>
-  <div id="maincontainer">
     <div id="topsection"></div>
-    <div id="contentwrapper">
-      <div id="contentcolumn">
-        <div class="innertube">
-          <br>
-
-          <p><a href="http://www.northshoreport.org";>North Shore
-          Portal</a><br>
-          Our other website, North Shore Portal provides a
-          directory of social services for the North Shore
-          region.</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
-          appropriate organization or government agency.</p>
-        </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 -->
-    <!--#include virtual="/inc/footer.inc"-->
-  </div><!-- id="maincontainer" -->
+
+    <div id="maincontainer">
+        <div id="contentcolumn" class="column">
+            <br>
+
+            <p><a href="http://www.northshoreport.org";>North Shore
+            Portal</a>
+            <br>
+            Our other website, North Shore Portal provides a directory
+            of social services for the North Shore region.</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 appropriate
+            organization or government agency.</p>
+        </div><!-- id='contentcolumn' -->
+
+        <div id="leftcolumn" class="column">
+            <!-- start left_menu.inc -->
+            <!--#include virtual="/all/inc/left_menu.inc"-->
+            <!-- stop left_menu.inc -->
+        </div>
+    </div><!-- id="maincontainer" -->
+
+    <div id="footer-wrapper">
+        <!--#include virtual="/inc/footer.inc"-->
+    </div>
 </body>
 </html>

=== modified file 'app-mvhub/DocumentRoot/static/mvh/html/register.shtml'
--- app-mvhub/DocumentRoot/static/mvh/html/register.shtml	2010-05-19 16:01:14 +0000
+++ app-mvhub/DocumentRoot/static/mvh/html/register.shtml	2010-07-19 18:32:43 +0000
@@ -2,186 +2,195 @@
 
 <html>
 <head>
- <title>Get Listed: Merrimack Valley Nonprofit Services Directory (MVHub)</title>
-
-<!--#include virtual="/all/inc/head.inc"-->
-
+    <meta name="generator" content=
+    "HTML Tidy for Linux (vers 6 November 2007), see www.w3.org">
+
+    <title>Get Listed: Merrimack Valley Nonprofit Services Directory
+    (MVHub)</title><!--#include virtual="/all/inc/head.inc"-->
 </head>
-<body >
-
-  <div id="maincontainer">
-    <div id="topsection">
-    </div><!--id="topsection"-->     
-
-<div id ="contentwrapper">
-<div id ="contentcolumn">
-<div class="innertube">
-<h1>Add Your Agency</h1> 
-<p class="question">Click  <span class="nicebutton">
-	  <!-- javascript prevents spam -->
-	    <input type="button" value="Get Listed!"
-		   onclick="window.location.href='/cgi-bin/mvhub/agency_form.pl'">
-	  </span> to add your Agency. </p>
-	</div><!--id="innertube"-->
-	
-<hr>
-          <h1>Agency Account Help</h1>  
-<div>
-	<p><a href="#canbe_listed">Who can be listed?</a>
-          </p>
-	
-	<p><a href="#why_register">Why register your agency and its programs with MVHub.com?</a>
-          </p>
-
-	<p><a href="#how_long">How long will this take?</a>
-          </p>
-
-	<p><a href="#the_catch">What's the catch?</a>
-          </p>
-	 
-	 <p><a href="#both_records">Why do I need to create both an
-          Agency record and Program record(s)?</a>
-          </p>
-          
-	  <p><a href="#selecting_programs">What if I am having
-          trouble identifying which categories I should select for my
-          program(s)?</a>
-          </p>
-
-          <p><a href="#change_password">How can I change my
-          password?</a>
-          </p>
-</div>
-	
-	 <p class="question"><a id="canbe_listed"
-          ></a>Q: Who can be listed?</p>
-
-          <p>A: If you are a non-profit or charity organization, you are almost
-	certainly welcome and encouraged to add your listings to mvhub.com. You
-	don't need 501c3 status to be listed, you can be a small community group.</p>
-
-	<p>If you are a Nazi or otherwise obviously evil, you are not welcome to
-	add yourself. </p>
-
-	<p>If you are a for-profit group and you provide reduced cost or free
-	services ordinarily provided by non-profit groups, you <b>might</b> be
-	welcome to add your listing. For example immigration lawyers, home
-	health care aides and mental health counselors.
-	</p>
-
-	<p>If your exclusive purpose is to turn a profit by providing a
-	reasonable service at a reasonable price, you are probably not eligible
-	to be listed. For example if you rent tents, sell cars, provide lock
-	smithing services.</p>
-
-	<p>If you are not a Nazi but are otherwise not eligible to be listed in our free directory, you may be interested in sponsoring mvhub.com.Sponsors, get their logo and a link listed on each results page.contact info@xxxxxxxxx for more information.
-	</p>
-
-	<p class="question"><a id="why_register"
-          ></a>Q: Why register your agency and its programs with MVHub.com?</p>
-
-          <p>A:Two important reasons are:<ul> 
-            <li><strong>Help people</strong> who need your services find you</li>
-
-           <li><strong>Help other human service professionals</strong> learn about you</li></ul>         
-
-	<p class="question"><a id="how_long"
-          ></a>Q: How long will this take? </p>
-
-          <p>A: About 15-20 minutes total - approximately 10 minutes to tell us about your agency, and 5-10 minutes to tell us about each program your agency offers, with a minimum of 1 program.</p>
-
-	<p class="question"><a id="the_catch"
-          ></a>Q: What's the catch?</p>
-
-          <p>A :We can't think of one:
-          <ul>
-            <li>Registration is free.</li>
-            <li>We won't ever sell your information to anyone, or try to sell you anything.</li>
-	    
-            <li>We may occassionally email you a friendly reminder if/when your information ever goes too long without an update (we're talkin' maybe twice a year).</li>
-          </ul>
-         
-<p class="question"><a id="both_records"></a>Q: Why do I need to create both an Agency record and Program record(s)?</p>
-
-
-          <p>A:Your Agency record contains general
-          information about your organization. A Program record
-          contains more detailed information about a specific service
-          your Agency offers. When you submit a Program record form,
-          you're also asked to select categories (e.g. "child health
-          care", "handicapped housing", "credit counseling", etc.)
-          that describe it.<br>
-          <br>
-          These two kinds of records correspond to the 2 kinds of
-          searches that Directory users can conduct - Agency Name
-          Searches and Program Category Searches. Directory users
-          often prefer the latter, since they generally want to
-          describe their needs in their search terms. So it's crucial
-          you provide adequate Program record(s), and categorize them
-          well.<br>
-          <br>
-          If your Agency provides only one service, then you'll only
-          need to create one Program record. However, there is no
-          limit on the number of Programs an Agency can have.<br>
-          <br>
-          In general, seperating your distinct services into multiple
-          Programs is good, as it improves the accuracy and relevance
-          of search results for Directory users.</p>
-
-          <p class="question"><a id=
-          "selecting_programs"></a>Q: What if I am having trouble
-          identifying which categories I should select for my
-          program(s)?</p>
-
-          <p>A: <a href=
-          "/cgi-bin/mvhub/contact_form.pl">contact
-          us</a>, leaving your name and contact number, and we will
-          call to assist you in selecting the categories that relate
-          to your program(s).</p>
-
-          <p class="question"><a id=
-          "change_password"></a>Q: How can I change my password?</p>
-
-          <p>A: There is currently no way to change
-          your password through the site. If all you really need is a
-          <a href=
-          "/cgi-bin/mvhub/agency.pl?rm=request_password">password
-          reminder sent to you, click here</a>. If you still want
-          your password changed, <a href=
-          "/cgi-bin/mvhub/contact_form.pl">contact
-          us</a> directly.</p>
-	  <h3>Printable guide about information required to add agency.</h3>
-	  <p> The following document gives overview about the information required to add your agency, if you want to have the information ready before you start.</p>
-	  <ul>
-	    <li><u><a href= "/html/preparing_for_directory_submission.pdf">Preparing for Adding Agency (PDF)</a></u></li>
-	  </ul>
-<p align="center">
-
-	  <span class="nicebutton">
-	  <!-- javascript prevents spam -->
-	    <input type="button" value="Get Listed!"
-		   onclick="window.location.href='/cgi-bin/mvhub/agency_form.pl'">
-	  </span>
-          </p>
-   </div><!-- id=contentcolumn -->
-   </div><!-- id='contentwrapper' -->
-        <div id="leftcolumn">    
-	<div class="innertube">
-        
- <!--#include virtual="/all/inc/left_menu.inc"-->
-
-   </div><!-- id=innertube -->
-   </div><!-- id=leftcolumn -->
-<br>
-
-<p style="text-align:right;">
-<a href="#top"> Back To Top </a></p>
-   
-<!--#include virtual="/inc/footer.inc"--> 
-
-</div><!-- id="maincontainer" -->  
+
+<body>
+    <div id="topsection"></div><!--id="topsection"-->
+
+    <div id="maincontainer">
+        <div id="contentcolumn" class="column">
+            <h1>Add Your Agency</h1>
+
+            <p class="question">Click <span class="nicebutton">
+            <!-- javascript prevents spam -->
+             <input type="button" value="Get Listed!" onclick=
+            "window.location.href='/cgi-bin/mvhub/agency_form.pl'"></span>
+            to add your Agency.</p>
+            <hr>
+
+            <h1>Agency Account Help</h1>
+
+            <div>
+                <p><a href="#canbe_listed">Who can be listed?</a></p>
+
+                <p><a href="#why_register">Why register your agency and
+                its programs with MVHub.com?</a></p>
+
+                <p><a href="#how_long">How long will this take?</a></p>
+
+                <p><a href="#the_catch">What's the catch?</a></p>
+
+                <p><a href="#both_records">Why do I need to create both
+                an Agency record and Program record(s)?</a></p>
+
+                <p><a href="#selecting_programs">What if I am having
+                trouble identifying which categories I should select
+                for my program(s)?</a></p>
+
+                <p><a href="#change_password">How can I change my
+                password?</a></p>
+            </div>
+
+            <p class="question"><a id="canbe_listed" name=
+            "canbe_listed"></a>Q: Who can be listed?</p>
+
+            <p>A: If you are a non-profit or charity organization, you
+            are almost certainly welcome and encouraged to add your
+            listings to mvhub.com. You don't need 501c3 status to be
+            listed, you can be a small community group.</p>
+
+            <p>If you are a Nazi or otherwise obviously evil, you are
+            not welcome to add yourself.</p>
+
+            <p>If you are a for-profit group and you provide reduced
+            cost or free services ordinarily provided by non-profit
+            groups, you <b>might</b> be welcome to add your listing.
+            For example immigration lawyers, home health care aides and
+            mental health counselors.</p>
+
+            <p>If your exclusive purpose is to turn a profit by
+            providing a reasonable service at a reasonable price, you
+            are probably not eligible to be listed. For example if you
+            rent tents, sell cars, provide lock smithing services.</p>
+
+            <p>If you are not a Nazi but are otherwise not eligible to
+            be listed in our free directory, you may be interested in
+            sponsoring mvhub.com.Sponsors, get their logo and a link
+            listed on each results page.contact info@xxxxxxxxx for more
+            information.</p>
+
+            <p class="question"><a id="why_register" name=
+            "why_register"></a>Q: Why register your agency and its
+            programs with MVHub.com?</p>
+
+            <p>A:Two important reasons are:</p>
+
+            <ul>
+                <li><strong>Help people</strong> who need your services
+                find you</li>
+
+                <li><strong>Help other human service
+                professionals</strong> learn about you</li>
+            </ul>
+
+            <p class="question"><a id="how_long" name="how_long"></a>Q:
+            How long will this take?</p>
+
+            <p>A: About 15-20 minutes total - approximately 10 minutes
+            to tell us about your agency, and 5-10 minutes to tell us
+            about each program your agency offers, with a minimum of 1
+            program.</p>
+
+            <p class="question"><a id="the_catch" name=
+            "the_catch"></a>Q: What's the catch?</p>
+
+            <p>A :We can't think of one:</p>
+
+            <ul>
+                <li>Registration is free.</li>
+
+                <li>We won't ever sell your information to anyone, or
+                try to sell you anything.</li>
+
+                <li>We may occassionally email you a friendly reminder
+                if/when your information ever goes too long without an
+                update (we're talkin' maybe twice a year).</li>
+            </ul>
+
+            <p class="question"><a id="both_records" name=
+            "both_records"></a>Q: Why do I need to create both an
+            Agency record and Program record(s)?</p>
+
+            <p>A:Your Agency record contains general information about
+            your organization. A Program record contains more detailed
+            information about a specific service your Agency offers.
+            When you submit a Program record form, you're also asked to
+            select categories (e.g. "child health care", "handicapped
+            housing", "credit counseling", etc.) that describe it.
+            <br>
+            <br>
+            These two kinds of records correspond to the 2 kinds of
+            searches that Directory users can conduct - Agency Name
+            Searches and Program Category Searches. Directory users
+            often prefer the latter, since they generally want to
+            describe their needs in their search terms. So it's crucial
+            you provide adequate Program record(s), and categorize them
+            well.
+            <br>
+            <br>
+            If your Agency provides only one service, then you'll only
+            need to create one Program record. However, there is no
+            limit on the number of Programs an Agency can have.
+            <br>
+            <br>
+            In general, seperating your distinct services into multiple
+            Programs is good, as it improves the accuracy and relevance
+            of search results for Directory users.</p>
+
+            <p class="question"><a id="selecting_programs" name=
+            "selecting_programs"></a>Q: What if I am having trouble
+            identifying which categories I should select for my
+            program(s)?</p>
+
+            <p>A: <a href="/cgi-bin/mvhub/contact_form.pl">contact
+            us</a>, leaving your name and contact number, and we will
+            call to assist you in selecting the categories that relate
+            to your program(s).</p>
+
+            <p class="question"><a id="change_password" name=
+            "change_password"></a>Q: How can I change my password?</p>
+
+            <p>A: There is currently no way to change your password
+            through the site. If all you really need is a <a href=
+            "/cgi-bin/mvhub/agency.pl?rm=request_password">password
+            reminder sent to you, click here</a>. If you still want
+            your password changed, <a href=
+            "/cgi-bin/mvhub/contact_form.pl">contact us</a>
+            directly.</p>
+
+            <h3>Printable guide about information required to add
+            agency.</h3>
+
+            <p>The following document gives overview about the
+            information required to add your agency, if you want to
+            have the information ready before you start.</p>
+
+            <ul>
+                <li><u><a href=
+                "/html/preparing_for_directory_submission.pdf">Preparing
+                for Adding Agency (PDF)</a></u></li>
+            </ul>
+
+            <p align="center"><span class="nicebutton">
+            <!-- javascript prevents spam -->
+             <input type="button" value="Get Listed!" onclick=
+            "window.location.href='/cgi-bin/mvhub/agency_form.pl'"></span></p>
+
+            <p><a href="#top">Back To Top</a></p>
+        </div><!-- id=contentcolumn -->
+
+        <div id="leftcolumn" class="column">
+            <!--#include virtual="/all/inc/left_menu.inc"-->
+        </div><!-- id=leftcolumn -->
+    </div><!-- id="maincontainer" -->
+
+    <div id="footer-wrapper">
+        <!--#include virtual="/inc/footer.inc"-->
+    </div>
 </body>
 </html>
-
-
- 

=== modified file 'app-mvhub/DocumentRoot/static/mvh/html/reports.shtml'
--- app-mvhub/DocumentRoot/static/mvh/html/reports.shtml	2010-07-08 22:37:52 +0000
+++ app-mvhub/DocumentRoot/static/mvh/html/reports.shtml	2010-07-19 18:32:43 +0000
@@ -1,59 +1,51 @@
 <!--#include virtual='/all/inc/doctype.inc' -->
+
 <html>
 <head>
-  <title>
-   Reports generated from MVHub
-  </title>
-  <!--#include virtual="/all/inc/head.inc"-->
+    <meta name="generator" content=
+    "HTML Tidy for Linux (vers 6 November 2007), see www.w3.org">
+
+    <title>Reports generated from MVHub</title>
+    <!--#include virtual="/all/inc/head.inc"-->
 </head>
 
 <body>
-  <div id="maincontainer">
-    <div id="topsection">
-    </div>
-
-    <div id="contentwrapper">
-      <div id="contentcolumn">
-        <div class="innertube">
-       <h1>PDF Reports, print to paper</h1>
-	   <p> <a href='/reports/mvh/MVHub.com_agencies_and_all_programs.pdf'>
-	        All Agency and Program info
-	        </a> 
-	        formatted for printing (.pdf)
-	   </p>
-	   <p> 
-	       <a href='/reports/mvh/MVHub.com_agencies_only.pdf'>
-	           Agency info only
-	       </a> 
-	       formatted for printing (.pdf)
-	   </p>
-          <h1>External Reports</h1>
-          <p> 
-            These reports are generated from the raw, unedited web server logs by 3rd party tools every night.  
-          </p>
-	   <p> <a href='/reports/mvh/visitors/visitors.html'>
-	        Visitors Report
-	        </a> 
-	        Who has visited this web site, how often and from where.
-	   </p>
-	    <p> <a href='/reports/mvh/analog/analog.html'>
-	        Analog Report
-	        </a> 
-	        This is a full web statistics report.
-	   </p>
-
-    <!--#include virtual="/cgi-bin/mvhub/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>
-    </div>
-
-    <!--#include virtual="/inc/footer.inc"-->
-  </div><!-- id="maincontainer" -->
+    <div id="topsection"></div>
+
+    <div id="maincontainer">
+        <div id="contentcolumn" class="column">
+            <h1>PDF Reports, print to paper</h1>
+
+            <p><a href=
+            '/reports/mvh/MVHub.com_agencies_and_all_programs.pdf'>All
+            Agency and Program info</a> formatted for printing
+            (.pdf)</p>
+
+            <p><a href=
+            '/reports/mvh/MVHub.com_agencies_only.pdf'>Agency info
+            only</a> formatted for printing (.pdf)</p>
+
+            <h1>External Reports</h1>
+
+            <p>These reports are generated from the raw, unedited web
+            server logs by 3rd party tools every night.</p>
+
+            <p><a href='/reports/mvh/visitors/visitors.html'>Visitors
+            Report</a> Who has visited this web site, how often and
+            from where.</p>
+
+            <p><a href='/reports/mvh/analog/analog.html'>Analog
+            Report</a> This is a full web statistics report.</p>
+            <!--#include virtual="/cgi-bin/mvhub/reports.pl"-->
+        </div><!-- id='contentcolumn' -->
+
+        <div id="leftcolumn" class="column">
+            <!--#include virtual="/all/inc/left_menu.inc"-->
+        </div>
+    </div><!-- id="maincontainer" -->
+
+    <div id="footer-wrapper">
+        <!--#include virtual="/inc/footer.inc"-->
+    </div>
 </body>
 </html>

=== modified file 'app-mvhub/DocumentRoot/static/mvh/html/servicearea.shtml'
--- app-mvhub/DocumentRoot/static/mvh/html/servicearea.shtml	2010-05-19 16:01:14 +0000
+++ app-mvhub/DocumentRoot/static/mvh/html/servicearea.shtml	2010-07-19 18:32:43 +0000
@@ -2,88 +2,88 @@
 
 <html>
 <head>
-  <title>Help with: (MVHub) Merrimack Valley Nonprofit Services
-  Directory</title>
-
-<!--#include virtual="/all/inc/head.inc"-->
-
+    <meta name="generator" content=
+    "HTML Tidy for Linux (vers 6 November 2007), see www.w3.org">
+
+    <title>Help with: (MVHub) Merrimack Valley Nonprofit Services
+    Directory</title><!--#include virtual="/all/inc/head.inc"-->
 </head>
+
 <body>
-  <div id="maincontainer">
-    <div id="topsection">
-   </div><!--id="topsection"-->
-
-    <div id="contentwrapper">
-      <div id="contentcolumn">
-        <div class="innertube">
-          <!-- BEGIN QUESTION SECTION -->
-
-          <p>Where is the Merrimack Valley?
-          Is my town in it?
-          </p>
-          
-          <!-- END QUESTION SECTION -->
-
-          <!-- BEGIN ANSWER SECTIONS -->          
-
-          <p>A:The Merrimack Valley comprises all of
-          the towns along the Merrimack River within Massachusetts,
-          including:</p>
-
-          <div style="text-align: left; margin-left: 160px">
-            <table summary='cities in MVHub service area' cellpadding="4">
-              <tr>
-                <td>Amesbury</td>
-                <td>Dunstable</td>
-                <td>Methuen</td>
-              </tr>
-
-              <tr>
-                <td>Andover</td>
-                <td>Haverhill</td>
-                <td>Newburyport</td>
-              </tr>
-              
-	      <tr>
-                <td>Bedford</td>
-
-                <td>Lawrence</td>
-                <td>Salisbury</td>
-              </tr>
-              
-	      <tr>
-                <td>Billerica</td>
-                <td>Littleton</td>
-                <td>Tewksbury</td>
-              </tr>
-
-              <tr>
-                <td>Chelmsford</td>
-                <td>Lowell</td>
-                <td>Tyngsborough</td>
-              </tr>
-
-              <tr>
-                <td>Dracut</td>
-                <td>Merrimack</td>
-                <td>Westford</td>
-              </tr>
-            </table>
-          </div>
-	<!-- END ANSWER SECTIONS -->
-	  </div><!--id="innertube"-->
-	  </div><!--id="contentcolumn"-->
-	  </div><!--id="contentwrapper"-->
-      <div id="leftcolumn">     
-      <div class="innertube">
-        
-<!--#include virtual="/all/inc/left_menu.inc"-->
-
-     </div><!-- id="innertube" -->
-    </div><!-- id="leftcolumn" -->
-
- <!--#include virtual="/inc/footer.inc"-->
-  
-</div><!-- id="maincontainer" -->
+    <div id="topsection"></div><!--id="topsection"-->
+
+    <div id="maincontainer">
+        <div id="contentcolumn" class="column">
+            <!-- BEGIN QUESTION SECTION -->
+
+            <p>Where is the Merrimack Valley? Is my town in it?</p>
+            <!-- END QUESTION SECTION -->
+            <!-- BEGIN ANSWER SECTIONS -->
+
+            <p>A:The Merrimack Valley comprises all of the towns along
+            the Merrimack River within Massachusetts, including:</p>
+
+            <div style="text-align: left; margin-left: 160px">
+                <table summary='cities in MVHub service area'
+                cellpadding="4">
+                    <tr>
+                        <td>Amesbury</td>
+
+                        <td>Dunstable</td>
+
+                        <td>Methuen</td>
+                    </tr>
+
+                    <tr>
+                        <td>Andover</td>
+
+                        <td>Haverhill</td>
+
+                        <td>Newburyport</td>
+                    </tr>
+
+                    <tr>
+                        <td>Bedford</td>
+
+                        <td>Lawrence</td>
+
+                        <td>Salisbury</td>
+                    </tr>
+
+                    <tr>
+                        <td>Billerica</td>
+
+                        <td>Littleton</td>
+
+                        <td>Tewksbury</td>
+                    </tr>
+
+                    <tr>
+                        <td>Chelmsford</td>
+
+                        <td>Lowell</td>
+
+                        <td>Tyngsborough</td>
+                    </tr>
+
+                    <tr>
+                        <td>Dracut</td>
+
+                        <td>Merrimack</td>
+
+                        <td>Westford</td>
+                    </tr>
+                </table>
+            </div><!-- END ANSWER SECTIONS -->
+        </div><!--id="contentcolumn"-->
+
+        <div id="leftcolumn" class="column">
+            <!--#include virtual="/all/inc/left_menu.inc"-->
+        </div><!-- id="leftcolumn" -->
+    </div><!-- id="maincontainer" -->
+
+    <div id="footer-wrapper">
+        <!--#include virtual="/inc/footer.inc"-->
+    </div>
 </body>
 </html>

=== modified file 'app-mvhub/DocumentRoot/static/mvh/inc/footer.inc'
--- app-mvhub/DocumentRoot/static/mvh/inc/footer.inc	2010-05-19 15:52:40 +0000
+++ app-mvhub/DocumentRoot/static/mvh/inc/footer.inc	2010-07-19 18:32:43 +0000
@@ -1,13 +1,9 @@
 
 <!-- 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>
+  &copy; 2007-2010 <a href="http://thecsl.org";>Community Software Lab</a>
+ </div>
 <script type="text/javascript">
 
    google_ad_client = "pub-9563950056380149";
@@ -19,7 +15,6 @@
 
 </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/css/format.css'
--- app-mvhub/DocumentRoot/static/nsp/css/format.css	2010-06-29 21:50:11 +0000
+++ app-mvhub/DocumentRoot/static/nsp/css/format.css	2010-07-19 18:32:43 +0000
@@ -47,7 +47,6 @@
 
 #footer {
   border-top: #0378a9 1px solid;
-  clear: left;
   width: 100%;
   text-align: center;
   font-weight: 400;
@@ -59,10 +58,6 @@
     font-weight: normal;
 }
 
-#contentcolumn {
-    width: 			700px; 
-}
-
 #leftcolumn{
   text-align: right;
   border-right: #0378a9 1px solid;

=== modified file 'app-mvhub/DocumentRoot/static/nsp/html/about.shtml'
--- app-mvhub/DocumentRoot/static/nsp/html/about.shtml	2010-05-19 16:01:14 +0000
+++ app-mvhub/DocumentRoot/static/nsp/html/about.shtml	2010-07-19 18:32:43 +0000
@@ -1,84 +1,77 @@
 <!--#include virtual='/all/inc/doctype.inc' -->
+
 <html>
 <head>
-  <title>
-       About us: North Shore Portal 
-  </title>
-  <!--#include virtual="/all/inc/head.inc"-->
+    <meta name="generator" content=
+    "HTML Tidy for Linux (vers 6 November 2007), see www.w3.org">
+
+    <title>About us: North Shore Portal</title>
+    <!--#include virtual="/all/inc/head.inc"-->
 </head>
 
 <body>
-  <div id="maincontainer">
-    <div id="topsection">
-    </div>
-
-    <div id="contentwrapper">
-      <div id="contentcolumn">
-        <div class="innertube">
-
-          <h2>Our Purpose</h2>
-
-          <p>Since 2009, we have provided the Massachusetts North Shore 
-          information about non-profit services.</p>
-
-          <p>We will share software with anyone who can download it
-          and data with anyone who shares our goals.</p>
-
-          <h2>How You can Help</h2>
-
-          <p>We welcome your questions or <a href=
-          "/cgi-bin/mvhub/contact_form.pl">comments</a>.</p>
-          <p>If you run a non profit agency or program and you are
-          not listed. You can <a href=
-          "/html/register.shtml">get listed</a></p>
-
-          <p>If you are a software developer or graphic designer, please
-          <a href="http://thecsl.org/go/vol/";>volunteer</a> Much of
-          the North Shore Portal  is developed by volunteer labor. 
-          North Shore Portal is free software licensed under the <a href=
-          "http://www.gnu.org/licenses/agpl.html";>
-          GNU Affero General Public License, version 3</a></p>
-
-
-          <h2>Who We Are</h2>
-          <p>NorthShorePort.org is maintained and developed by two 
-          non-profit (501c3) organizations, the <a href="http://thecsl.org/";>Community Software Lab</a> and <a href=
-          "http://nscap.org";>the North Shore Community Action Programs</a></p> 
-
-          <h2>How we started</h2>
-          <p>The software was written by the Community Software
-          Lab.</p>
-
-          <p><a href="http://www.northshorewib.com/";>The North Shore WIB,</a> Peabody Ministerial 
-		Association and the city of <a href="http://www.peabody-ma.gov/";>
-		Peabody</a>, provided valuable advice and support.
-	  </p>
-	  
-	  
-	  <p>
-	   Massachusetts State Representative
-	  <a href='http://www.mass.gov/legis/member/mvf1.htm'> 
-	    Mark V. Falzone's </a> got us started with his 
-	    office's paper 
-	    directory.
-	    
-	    His staff and 2009 summer interns (led by Monica Crane)
-	    spent many hours calling agencies to ask them to
-	    list themselves.
-	   </p>
-
-        </div>
-      </div>
-    </div>
-
-    <div id="leftcolumn">
-      <div class="innertube">
-        <!--#include virtual="/all/inc/left_menu.inc"-->
-		<!--#include virtual="/inc/site_left_menu.inc"-->
-      </div>
-    </div>
-
-    <!--#include virtual="/inc/footer.inc"-->
-</div> <!-- id="maincontainer" -->
+    <div id="topsection"></div>
+
+    <div id="maincontainer">
+        <div id="contentcolumn" class="column">
+            <h2>Our Purpose</h2>
+
+            <p>Since 2009, we have provided the Massachusetts North
+            Shore information about non-profit services.</p>
+
+            <p>We will share software with anyone who can download it
+            and data with anyone who shares our goals.</p>
+
+            <h2>How You can Help</h2>
+
+            <p>We welcome your questions or <a href=
+            "/cgi-bin/mvhub/contact_form.pl">comments</a>.</p>
+
+            <p>If you run a non profit agency or program and you are
+            not listed. You can <a href="/html/register.shtml">get
+            listed</a></p>
+
+            <p>If you are a software developer or graphic designer,
+            please <a href="http://thecsl.org/go/vol/";>volunteer</a>
+            Much of the North Shore Portal is developed by volunteer
+            labor. North Shore Portal is free software licensed under
+            the <a href="http://www.gnu.org/licenses/agpl.html";>GNU
+            Affero General Public License, version 3</a></p>
+
+            <h2>Who We Are</h2>
+
+            <p>NorthShorePort.org is maintained and developed by two
+            non-profit (501c3) organizations, the <a href=
+            "http://thecsl.org/";>Community Software Lab</a> and
+            <a href="http://nscap.org";>the North Shore Community Action
+            Programs</a></p>
+
+            <h2>How we started</h2>
+
+            <p>The software was written by the Community Software
+            Lab.</p>
+
+            <p><a href="http://www.northshorewib.com/";>The North Shore
+            WIB,</a> Peabody Ministerial Association and the city of
+            <a href="http://www.peabody-ma.gov/";>Peabody</a>, provided
+            valuable advice and support.</p>
+
+            <p>Massachusetts State Representative <a href=
+            'http://www.mass.gov/legis/member/mvf1.htm'>Mark V.
+            Falzone's</a> got us started with his office's paper
+            directory. His staff and 2009 summer interns (led by Monica
+            Crane) spent many hours calling agencies to ask them to
+            list themselves.</p>
+        </div>
+
+        <div id="leftcolumn" class="column">
+            <!--#include virtual="/all/inc/left_menu.inc"-->
+            <!--#include virtual="/inc/site_left_menu.inc"-->
+        </div>
+    </div><!-- id="maincontainer" -->
+
+    <div id="footer-wrapper">
+        <!--#include virtual="/inc/footer.inc"-->
+    </div>
 </body>
 </html>

=== modified file 'app-mvhub/DocumentRoot/static/nsp/html/documents.shtml'
--- app-mvhub/DocumentRoot/static/nsp/html/documents.shtml	2010-05-19 16:01:14 +0000
+++ app-mvhub/DocumentRoot/static/nsp/html/documents.shtml	2010-07-19 18:32:43 +0000
@@ -1,45 +1,38 @@
 <!--#include virtual='/all/inc/doctype.inc' -->
+
 <html>
 <head>
-  <title>
-       Documents: North Shore Portal 
-  </title>
-  <!--#include virtual="/all/inc/head.inc"-->
+    <meta name="generator" content=
+    "HTML Tidy for Linux (vers 6 November 2007), see www.w3.org">
+
+    <title>Documents: North Shore Portal</title>
+    <!--#include virtual="/all/inc/head.inc"-->
 </head>
 
 <body>
-  <div id="maincontainer">
-    <div id="topsection">
-    </div>
-
-    <div id="contentwrapper">
-      <div id="contentcolumn">
-        <div class="innertube">
-
-          <h2>Documents</h2>
-
-          <p>
-	  <a href="documents/NSCAP_Community_Action_Plan_FY09_to_FY11.pdf">
-          NSCAP Community Action Plan FY09 to FY11
-          </a> (PDF)</p>
-          
-	  <p>
-	  <a href="documents/Plan_to_End_Homelessness_on_the_North_Shore.pdf">
-	  Plan to End Homelessness on the North Shore
-	  </a> (PDF)</p>
-
-        </div>
-      </div>
-    </div>
-
-    <div id="leftcolumn">
-      <div class="innertube">
-        <!--#include virtual="/all/inc/left_menu.inc"-->
-        <!--#include virtual="/inc/site_left_menu.inc"-->
-      </div>
-    </div>
-
-    <!--#include virtual="/inc/footer.inc"-->
-</div> <!-- id="maincontainer" -->
+    <div id="topsection"></div>
+
+    <div id="maincontainer">
+        <div id="contentcolumn" class="column">
+            <h2>Documents</h2>
+
+            <p><a href=
+            "documents/NSCAP_Community_Action_Plan_FY09_to_FY11.pdf">NSCAP
+            Community Action Plan FY09 to FY11</a> (PDF)</p>
+
+            <p><a href=
+            "documents/Plan_to_End_Homelessness_on_the_North_Shore.pdf">
+            Plan to End Homelessness on the North Shore</a> (PDF)</p>
+        </div>
+
+        <div id="leftcolumn" class="column">
+            <!--#include virtual="/all/inc/left_menu.inc"-->
+            <!--#include virtual="/inc/site_left_menu.inc"-->
+        </div>
+    </div><!-- id="maincontainer" -->
+
+    <div id="footer-wrapper">
+        <!--#include virtual="/inc/footer.inc"-->
+    </div>
 </body>
 </html>

=== modified file 'app-mvhub/DocumentRoot/static/nsp/html/help.shtml'
--- app-mvhub/DocumentRoot/static/nsp/html/help.shtml	2010-05-19 16:01:14 +0000
+++ app-mvhub/DocumentRoot/static/nsp/html/help.shtml	2010-07-19 18:32:43 +0000
@@ -1,165 +1,174 @@
 <!--#include virtual='/all/inc/doctype.inc' -->
+
 <html>
 <head>
-  <title>Help with: North Shore Portal </title>
-  <!--#include virtual="/all/inc/head.inc"-->
+    <meta name="generator" content=
+    "HTML Tidy for Linux (vers 6 November 2007), see www.w3.org">
 
+    <title>Help with: North Shore Portal</title>
+    <!--#include virtual="/all/inc/head.inc"-->
 </head>
 
 <body>
-  <div id="maincontainer">
-    <div id="topsection">
-    </div>
-
-
-    <div id="contentwrapper">
-      <div id="contentcolumn">
-        <div class="innertube">
-          <!-- BEGIN TABLE OF CONTENTS -->
-
-          <p><a href="#where_who">Where is the North Shore?
-          Is my town in it?</a>
-          </p>
-
-          <p><a href="#both_records">Why do I need to create both an
-          Agency record and Program record(s)?</a>
-          </p>
-
-
-          <p><a href="#selecting_programs">What if I am having
-          trouble identifying which categories I should select for my
-          program(s)?</a>
-          </p>
-
-          <p><a href="#change_password">How can I change my
-          password?</a>
-          </p>
-          <!-- END TABLE OF CONTENTS -->
-
-          <hr>
-          <!-- BEGIN ANSWER SECTIONS -->
-          <p class="question"><a name="where_who" id=
-          "where_who"></a>Q: Where is the North Shore? Is my
-          town in it?</p>
-
-          <p>A:The North Shore is these towns in Massachusetts:</p>
-
-
-          <div style="text-align: left; margin-left: 160px">
-            <table summary='cities in NorthShorePort service area' 
-            cellpadding="4">
-              <tr>
-                <td>Beverly</td>
-                <td>Danvers</td>
-                <td>Essex</td>
-              </tr>
-              <tr>
-                <td>Gloucester</td>
-                <td>Hamilton</td>
-                <td>Ipswich and Rowley</td>
-              </tr>
-              <tr>
-                <td> Lynn</td>
-                <td>Lynnfield</td>
-                <td>Magnolia</td>
-              </tr>
-              <tr>
-                <td>Manchester-by-the-Sea</td>
-                <td>Marblehead</td>
-                <td>Middleton</td>
-              </tr>
-              <tr>
-                <td>Nahant</td>
-                <td>Newbury</td>
-                <td>Newburyport</td>
-              </tr>
-              <tr>
-                <td> North Reading</td>
-                <td> Peabody</td>
-                <td>Rockport</td>
-              </tr>
-              <tr>
-		<td>Rowley</td>
-                <td>Salem</td>
-                <td>Salisbury</td>
-              </tr>
-              <tr>
-		<td>Swampscott</td>
-                <td>Topsfield</td>
-                <td>Wenham</td>
-              </tr>
-            </table>
-          </div>
-
-          <hr>
-          <h1>Agency Account Help</h1>
-
-          <p class="question"><a name="both_records" id=
-          "both_records"></a>Q: Why do I need to create both an
-          Agency record and Program record(s)?</p>
-
-
-          <p>A:Your Agency record contains general
-          information about your organization. A Program record
-          contains more detailed information about a specific service
-          your Agency offers. When you submit a Program record form,
-          you're also asked to select categories (e.g. "child health
-          care", "handicapped housing", "credit counseling", etc.)
-          that describe it.<br>
-          <br>
-          These two kinds of records correspond to the 2 kinds of
-          searches that Directory users can conduct - Agency Name
-          Searches and Program Category Searches. Directory users
-          often prefer the latter, since they generally want to
-          describe their needs in their search terms. So it's crucial
-          you provide adequate Program record(s), and categorize them
-          well.<br>
-          <br>
-          If your Agency provides only one service, then you'll only
-          need to create one Program record. However, there is no
-          limit on the number of Programs an Agency can have.<br>
-          <br>
-          In general, seperating your distinct services into multiple
-          Programs is good, as it improves the accuracy and relevance
-          of search results for Directory users.</p>
-
-
-          <p class="question"><a name="selecting_programs" id=
-          "selecting_programs"></a>Q: What if I am having trouble
-          identifying which categories I should select for my
-          program(s)?</p>
-
-
-          <p>A: <a href=
-          "/cgi-bin/mvhub/contact_form.pl">contact
-          us</a>, leaving your name and contact number, and we will
-          call to assist you in selecting the categories that relate
-          to your program(s).</p>
-
-
-          <p class="question"><a name="change_password" id=
-          "change_password"></a>Q: How can I change my password?</p>
-
-
-          <p>A: There is currently no way to change
-          your password through the site. If all you really need is a
-          <a href=
-          "/cgi-bin/mvhub/agency.pl?rm=request_password">password
-          reminder sent to you, click here</a>. If you still want
-          your password changed, <a href=
-          "/cgi-bin/mvhub/contact_form.pl">contact
-          us</a> directly.</p>
-        </div><!-- id=innertube -->
-      </div><!-- id='contentcolumn' -->
-    </div><!-- id='contentwrapper' -->
-
-    <div id="leftcolumn">
-      <div class="innertube">
-        <!--#include virtual="/all/inc/left_menu.inc"-->
-		<!--#include virtual="/inc/site_left_menu.inc"-->
-      </div>
-    </div>
-    <!--#include virtual="/inc/footer.inc"-->
-  </div><!-- id="maincontainer" -->
+    <div id="topsection"></div>
+
+    <div id="maincontainer">
+        <div id="contentcolumn" class="column">
+            <!-- BEGIN TABLE OF CONTENTS -->
+
+            <p><a href="#where_who">Where is the North Shore? Is my
+            town in it?</a></p>
+
+            <p><a href="#both_records">Why do I need to create both an
+            Agency record and Program record(s)?</a></p>
+
+            <p><a href="#selecting_programs">What if I am having
+            trouble identifying which categories I should select for my
+            program(s)?</a></p>
+
+            <p><a href="#change_password">How can I change my
+            password?</a></p><!-- END TABLE OF CONTENTS -->
+            <hr>
+            <!-- BEGIN ANSWER SECTIONS -->
+
+            <p class="question"><a name="where_who" id=
+            "where_who"></a>Q: Where is the North Shore? Is my town in
+            it?</p>
+
+            <p>A:The North Shore is these towns in Massachusetts:</p>
+
+            <div style="text-align: left; margin-left: 160px">
+                <table summary='cities in NorthShorePort service area'
+                cellpadding="4">
+                    <tr>
+                        <td>Beverly</td>
+
+                        <td>Danvers</td>
+
+                        <td>Essex</td>
+                    </tr>
+
+                    <tr>
+                        <td>Gloucester</td>
+
+                        <td>Hamilton</td>
+
+                        <td>Ipswich and Rowley</td>
+                    </tr>
+
+                    <tr>
+                        <td>Lynn</td>
+
+                        <td>Lynnfield</td>
+
+                        <td>Magnolia</td>
+                    </tr>
+
+                    <tr>
+                        <td>Manchester-by-the-Sea</td>
+
+                        <td>Marblehead</td>
+
+                        <td>Middleton</td>
+                    </tr>
+
+                    <tr>
+                        <td>Nahant</td>
+
+                        <td>Newbury</td>
+
+                        <td>Newburyport</td>
+                    </tr>
+
+                    <tr>
+                        <td>North Reading</td>
+
+                        <td>Peabody</td>
+
+                        <td>Rockport</td>
+                    </tr>
+
+                    <tr>
+                        <td>Rowley</td>
+
+                        <td>Salem</td>
+
+                        <td>Salisbury</td>
+                    </tr>
+
+                    <tr>
+                        <td>Swampscott</td>
+
+                        <td>Topsfield</td>
+
+                        <td>Wenham</td>
+                    </tr>
+                </table>
+            </div>
+            <hr>
+
+            <h1>Agency Account Help</h1>
+
+            <p class="question"><a name="both_records" id=
+            "both_records"></a>Q: Why do I need to create both an
+            Agency record and Program record(s)?</p>
+
+            <p>A:Your Agency record contains general information about
+            your organization. A Program record contains more detailed
+            information about a specific service your Agency offers.
+            When you submit a Program record form, you're also asked to
+            select categories (e.g. "child health care", "handicapped
+            housing", "credit counseling", etc.) that describe it.
+            <br>
+            <br>
+            These two kinds of records correspond to the 2 kinds of
+            searches that Directory users can conduct - Agency Name
+            Searches and Program Category Searches. Directory users
+            often prefer the latter, since they generally want to
+            describe their needs in their search terms. So it's crucial
+            you provide adequate Program record(s), and categorize them
+            well.
+            <br>
+            <br>
+            If your Agency provides only one service, then you'll only
+            need to create one Program record. However, there is no
+            limit on the number of Programs an Agency can have.
+            <br>
+            <br>
+            In general, seperating your distinct services into multiple
+            Programs is good, as it improves the accuracy and relevance
+            of search results for Directory users.</p>
+
+            <p class="question"><a name="selecting_programs" id=
+            "selecting_programs"></a>Q: What if I am having trouble
+            identifying which categories I should select for my
+            program(s)?</p>
+
+            <p>A: <a href="/cgi-bin/mvhub/contact_form.pl">contact
+            us</a>, leaving your name and contact number, and we will
+            call to assist you in selecting the categories that relate
+            to your program(s).</p>
+
+            <p class="question"><a name="change_password" id=
+            "change_password"></a>Q: How can I change my password?</p>
+
+            <p>A: There is currently no way to change your password
+            through the site. If all you really need is a <a href=
+            "/cgi-bin/mvhub/agency.pl?rm=request_password">password
+            reminder sent to you, click here</a>. If you still want
+            your password changed, <a href=
+            "/cgi-bin/mvhub/contact_form.pl">contact us</a>
+            directly.</p>
+        </div><!-- id='contentcolumn' -->
+
+        <div id="leftcolumn" class="column">
+            <!--#include virtual="/all/inc/left_menu.inc"-->
+            <!--#include virtual="/inc/site_left_menu.inc"-->
+        </div><!-- id="leftcolumn" -->
+    </div><!-- id="maincontainer" -->
+
+    <div id="footer-wrapper">
+        <!--#include virtual="/inc/footer.inc"-->
+    </div>
 </body>
 </html>

=== modified file 'app-mvhub/DocumentRoot/static/nsp/html/links.shtml'
--- app-mvhub/DocumentRoot/static/nsp/html/links.shtml	2010-07-02 21:35:01 +0000
+++ app-mvhub/DocumentRoot/static/nsp/html/links.shtml	2010-07-19 18:32:43 +0000
@@ -6,39 +6,38 @@
   <!--#include virtual="/all/inc/head.inc"-->
 </head>
 <body>
-  <div id="maincontainer">
     <div id="topsection"></div>
-    <div id="contentwrapper">
-      <div id="contentcolumn">
-        <div class="innertube">
-          <br>
-          <p><a href="http://www.mvhub.com";>MVHub</a><br>
-          Our other website, MVHub provides a directory of social
-          services for the 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>
-
-          <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>
-        </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"-->
-        <!--#include virtual="/inc/site_left_menu.inc"-->
-        <!-- stop left_menu.inc -->
-      </div>
-    </div><!--#include virtual="/inc/footer.inc" -->
-  </div><!-- id="maincontainer" --><!-- stop contact_form.tmpl -->
+    
+    <div id="maincontainer">
+        <div id="contentcolumn" class="column">
+	    <br>
+             <p><a href="http://www.mvhub.com";>MVHub</a><br>
+             Our other website, MVHub provides a directory of social
+             services for the 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>
+
+             <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>
+        </div><!-- id='contentcolumn' -->
+        
+        <div id="leftcolumn" class="column">
+            <!-- start left_menu.inc -->
+            <!--#include virtual="/all/inc/left_menu.inc"-->
+            <!--#include virtual="/inc/site_left_menu.inc"-->
+            <!-- stop left_menu.inc -->
+        </div>
+    </div><!-- id="maincontainer" -->
+    
+    <div id="footer-wrapper"> 
+        <!--#include virtual="/inc/footer.inc" -->
+    </div>
 </body>
 </html>

=== modified file 'app-mvhub/DocumentRoot/static/nsp/html/register.shtml'
--- app-mvhub/DocumentRoot/static/nsp/html/register.shtml	2010-05-19 16:01:14 +0000
+++ app-mvhub/DocumentRoot/static/nsp/html/register.shtml	2010-07-19 18:32:43 +0000
@@ -2,203 +2,195 @@
 
 <html>
 <head>
- <title>Get Listed: North Shore Portal Nonprofit Services Directory
-</title>
-
-<!--#include virtual="/all/inc/head.inc"-->
-
+    <meta name="generator" content=
+    "HTML Tidy for Linux (vers 6 November 2007), see www.w3.org">
+
+    <title>Get Listed: North Shore Portal Nonprofit Services
+    Directory</title><!--#include virtual="/all/inc/head.inc"-->
 </head>
-<body >
-
-  <div id="maincontainer">
-    <div id="topsection">
-    </div><!--id="topsection"-->
-
-<div id ="contentwrapper">
-<div id ="contentcolumn">
-<div class="innertube">
-<h1>Add Your Agency</h1>
-<p class="question">Click  <span class="nicebutton">
-	  <!-- javascript prevents spam -->
-	    <input type="button" value="Get Listed!"
-		   onclick="window.location.href='/cgi-bin/mvhub/agency_form.pl'">
-	  </span> to add your Agency. </p>
-
-	</div><!--id="innertube"-->
-	
-<hr>
-          <h1>Agency Account Help</h1>
-	
-	  <div>
-
-	<p><a href="#canbe_listed">Who can be listed?</a>
-          </p>
-	
-	<p><a href="#why_register">Why register your agency and its programs
-with northshoreport.org?</a>
-          </p>
-
-	<p><a href="#how_long">How long will this take?</a>
-          </p>
-
-	<p><a href="#the_catch">What's the catch?</a>
-          </p>
-	
-	 <p><a href="#both_records">Why do I need to create both an
-          Agency record and Program record(s)?</a>
-          </p>
-
-	  <p><a href="#selecting_programs">What if I am having
-          trouble identifying which categories I should select for my
-          program(s)?</a>
-          </p>
-
-          <p><a href="#change_password">How can I change my
-          password?</a>
-
-          </p>
-</div>
-	
-	 <p class="question"><a id="canbe_listed"
-          ></a>Q: Who can be listed?</p>
-
-          <p>A: If you are a non-profit or charity organization, you are
-almost
-	certainly welcome and encouraged to add your listings to northshoreport.org. You
-	don't need 501c3 status to be listed, you can be a small community
-group.</p>
-
-	<p>If you are a Nazi or otherwise obviously evil, you are not welcome to
-	add yourself. </p>
-
-	<p>If you are a for-profit group and you provide reduced cost or free
-	services ordinarily provided by non-profit groups, you <b>might</b> be
-	welcome to add your listing. For example immigration lawyers, home
-	health care aides and mental health counselors.
-	</p>
-
-	<p>If your exclusive purpose is to turn a profit by providing a
-	reasonable service at a reasonable price, you are probably not eligible
-	to be listed. For example if you rent tents, sell cars, provide lock
-	smithing services.</p>
-
-	<p>If you're interested in sponsoring our free directory (northshoreport.org), please contact info@xxxxxxxxxxxxxxxxxx. Sponsors will get their logo displayed on the northshoreport.org website as well as a link listed on each results page.
-	</p>
-
-	<p class="question"><a id="why_register"
-          ></a>Q: Why register your agency and its programs with
-northshoreport.org?</p>
-
-          <p>A: Two important reasons are:<ul>
-            <li><strong>Help people</strong> who need your services find
-you</li>
-
-           <li><strong>Help other human service professionals</strong>
-learn about you</li></ul>
-
-	<p class="question"><a id="how_long"
-          ></a>Q: How long will this take? </p>
-
-          <p>A: About 15-20 minutes total - approximately 10 minutes to
-tell us about your agency, and 5-10 minutes to tell us about each
-program your agency offers. Agencies must provide at least one program.</p>
-
-	<p class="question"><a id="the_catch"
-          ></a>Q: What's the catch?</p>
-
-          <p>A: We can't think of one:
-          <ul>
-            <li>Registration is free.</li>
-            <li>We won't ever sell your information to anyone, or try to
-sell you anything.</li>
-	
-            <li>We may occassionally email you a friendly reminder
-if/when your information ever goes too long without an update (maybe twice a year).</li>
-
-          </ul>
-
-<p class="question"><a id="both_records"></a>Q: Why do I need to create
-both an Agency record and Program record(s)?</p>
-
-
-          <p>A: Your Agency record contains general
-          information about your organization. A Program record
-          contains more detailed information about a specific service
-          your agency offers. When you submit a Program record form,
-          you're also asked to select categories to describe it (i.e. "child health
-          care", "handicapped housing", "credit counseling", etc.).<br>
-
-          <br>
-          The Agency record and the Program record correspond to the two
-          searches the directory users can conduct, ("Agency Name
-          Searches" and "Program Category Searches"). Directory users
-          often prefer the latter, since they generally want to
-          describe their needs in their search terms. So it's crucial
-          you provide adequate Program record(s), and categorize them
-          well.<br>
-          <br>
-          If your agency provides only one service, then you'll
-          need to create only one program record. However, there is no
-          limit on the number of programs an agency can submit.<br>
-          <br>
-          In general, separating your distinct services into multiple
-          programs is helpful because it provides directory users with more relevant search results.</p>
-
-          <p class="question"><a id=
-          "selecting_programs"></a>Q: What if I am having trouble
-          identifying which categories I should select for my
-          program(s)?</p>
-
-          <p>A: <a href=
-          "/cgi-bin/mvhub/contact_form.pl">contact
-          us</a>, leaving your name and contact number, and we will
-          call to assist you in selecting the categories that relate
-          to your program(s).</p>
-
-          <p class="question"><a id=
-          "change_password"></a>Q: How can I change my password?</p>
-
-          <p>A: If you need a
-          <a href=
-          "/cgi-bin/mvhub/agency.pl?rm=request_password">password
-          reminder sent to you, click here</a>. If you want
-          to change your password you must <a href=
-          "/cgi-bin/mvhub/contact_form.pl">contact
-          us</a> directly.</p>
-	  <h3>Printable guide about information required to add agency.</h3>
-	  <p> The following document gives an overview about the information
-required to add your agency, if you want to have the information ready
-before you start.</p>
-	  <ul>
-	    <li><u><a href=
-"/html/preparing_for_directory_submission.pdf">Preparing for Adding
-Agency (PDF)</a></u></li>
-	  </ul>
-<p align="center">
-
-	  <span class="nicebutton">
-	  <!-- javascript prevents spam -->
-	    <input type="button" value="Get Listed!"
-		   onclick="window.location.href='/cgi-bin/mvhub/agency_form.pl'">
-	  </span>
-          </p>
-   </div><!-- id=contentcolumn -->
-   </div><!-- id='contentwrapper' -->
-        <div id="leftcolumn">
-	<div class="innertube">
-
- <!--#include virtual="/all/inc/left_menu.inc"-->
- <!--#include virtual="/inc/site_left_menu.inc"-->
-
-   </div><!-- id=innertube -->
-   </div><!-- id=leftcolumn -->
-<br>
-
-<p style="text-align:right;">
-<a href="#top"> Back To Top </a></p>
-
-<!--#include virtual="/inc/footer.inc"-->
-
-</div><!-- id="maincontainer" -->
+
+<body>
+    <div id="topsection"></div><!--id="topsection"-->
+
+    <div id="maincontainer">
+        <div id="contentcolumn" class="column">
+            <h1>Add Your Agency</h1>
+
+            <p class="question">Click <span class="nicebutton">
+            <!-- javascript prevents spam -->
+             <input type="button" value="Get Listed!" onclick=
+            "window.location.href='/cgi-bin/mvhub/agency_form.pl'"></span>
+            to add your Agency.</p>
+            <hr>
+
+            <h1>Agency Account Help</h1>
+
+            <div>
+                <p><a href="#canbe_listed">Who can be listed?</a></p>
+
+                <p><a href="#why_register">Why register your agency and
+                its programs with northshoreport.org?</a></p>
+
+                <p><a href="#how_long">How long will this take?</a></p>
+
+                <p><a href="#the_catch">What's the catch?</a></p>
+
+                <p><a href="#both_records">Why do I need to create both
+                an Agency record and Program record(s)?</a></p>
+
+                <p><a href="#selecting_programs">What if I am having
+                trouble identifying which categories I should select
+                for my program(s)?</a></p>
+
+                <p><a href="#change_password">How can I change my
+                password?</a></p>
+            </div>
+
+            <p class="question"><a id="canbe_listed" name=
+            "canbe_listed"></a>Q: Who can be listed?</p>
+
+            <p>A: If you are a non-profit or charity organization, you
+            are almost certainly welcome and encouraged to add your
+            listings to northshoreport.org. You don't need 501c3 status
+            to be listed, you can be a small community group.</p>
+
+            <p>If you are a Nazi or otherwise obviously evil, you are
+            not welcome to add yourself.</p>
+
+            <p>If you are a for-profit group and you provide reduced
+            cost or free services ordinarily provided by non-profit
+            groups, you <b>might</b> be welcome to add your listing.
+            For example immigration lawyers, home health care aides and
+            mental health counselors.</p>
+
+            <p>If your exclusive purpose is to turn a profit by
+            providing a reasonable service at a reasonable price, you
+            are probably not eligible to be listed. For example if you
+            rent tents, sell cars, provide lock smithing services.</p>
+
+            <p>If you're interested in sponsoring our free directory
+            (northshoreport.org), please contact
+            info@xxxxxxxxxxxxxxxxxx. Sponsors will get their logo
+            displayed on the northshoreport.org website as well as a
+            link listed on each results page.</p>
+
+            <p class="question"><a id="why_register" name=
+            "why_register"></a>Q: Why register your agency and its
+            programs with northshoreport.org?</p>
+
+            <p>A: Two important reasons are:</p>
+
+            <ul>
+                <li><strong>Help people</strong> who need your services
+                find you</li>
+
+                <li><strong>Help other human service
+                professionals</strong> learn about you</li>
+            </ul>
+
+            <p class="question"><a id="how_long" name="how_long"></a>Q:
+            How long will this take?</p>
+
+            <p>A: About 15-20 minutes total - approximately 10 minutes
+            to tell us about your agency, and 5-10 minutes to tell us
+            about each program your agency offers. Agencies must
+            provide at least one program.</p>
+
+            <p class="question"><a id="the_catch" name=
+            "the_catch"></a>Q: What's the catch?</p>
+
+            <p>A: We can't think of one:</p>
+
+            <ul>
+                <li>Registration is free.</li>
+
+                <li>We won't ever sell your information to anyone, or
+                try to sell you anything.</li>
+
+                <li>We may occassionally email you a friendly reminder
+                if/when your information ever goes too long without an
+                update (maybe twice a year).</li>
+            </ul>
+
+            <p class="question"><a id="both_records" name=
+            "both_records"></a>Q: Why do I need to create both an
+            Agency record and Program record(s)?</p>
+
+            <p>A: Your Agency record contains general information about
+            your organization. A Program record contains more detailed
+            information about a specific service your agency offers.
+            When you submit a Program record form, you're also asked to
+            select categories to describe it (i.e. "child health care",
+            "handicapped housing", "credit counseling", etc.).
+            <br>
+            <br>
+            The Agency record and the Program record correspond to the
+            two searches the directory users can conduct, ("Agency Name
+            Searches" and "Program Category Searches"). Directory users
+            often prefer the latter, since they generally want to
+            describe their needs in their search terms. So it's crucial
+            you provide adequate Program record(s), and categorize them
+            well.
+            <br>
+            <br>
+            If your agency provides only one service, then you'll need
+            to create only one program record. However, there is no
+            limit on the number of programs an agency can submit.
+            <br>
+            <br>
+            In general, separating your distinct services into multiple
+            programs is helpful because it provides directory users
+            with more relevant search results.</p>
+
+            <p class="question"><a id="selecting_programs" name=
+            "selecting_programs"></a>Q: What if I am having trouble
+            identifying which categories I should select for my
+            program(s)?</p>
+
+            <p>A: <a href="/cgi-bin/mvhub/contact_form.pl">contact
+            us</a>, leaving your name and contact number, and we will
+            call to assist you in selecting the categories that relate
+            to your program(s).</p>
+
+            <p class="question"><a id="change_password" name=
+            "change_password"></a>Q: How can I change my password?</p>
+
+            <p>A: If you need a <a href=
+            "/cgi-bin/mvhub/agency.pl?rm=request_password">password
+            reminder sent to you, click here</a>. If you want to change
+            your password you must <a href=
+            "/cgi-bin/mvhub/contact_form.pl">contact us</a>
+            directly.</p>
+
+            <h3>Printable guide about information required to add
+            agency.</h3>
+
+            <p>The following document gives an overview about the
+            information required to add your agency, if you want to
+            have the information ready before you start.</p>
+
+            <ul>
+                <li><u><a href=
+                "/html/preparing_for_directory_submission.pdf">Preparing
+                for Adding Agency (PDF)</a></u></li>
+            </ul>
+
+            <p align="center"><span class="nicebutton">
+            <!-- javascript prevents spam -->
+             <input type="button" value="Get Listed!" onclick=
+            "window.location.href='/cgi-bin/mvhub/agency_form.pl'"></span></p>
+
+            <p><a href="#top">Back To Top</a></p>
+        </div><!-- id=contentcolumn -->
+
+        <div id="leftcolumn" class="column">
+            <!--#include virtual="/all/inc/left_menu.inc"-->
+            <!--#include virtual="/inc/site_left_menu.inc"-->
+        </div><!-- id=leftcolumn -->
+    </div><!-- id="maincontainer" -->
+
+    <div id="footer-wrapper">
+        <!--#include virtual="/inc/footer.inc"-->
+    </div>
 </body>
 </html>

=== modified file 'app-mvhub/DocumentRoot/static/nsp/html/reports.shtml'
--- app-mvhub/DocumentRoot/static/nsp/html/reports.shtml	2010-07-08 22:37:52 +0000
+++ app-mvhub/DocumentRoot/static/nsp/html/reports.shtml	2010-07-19 18:32:43 +0000
@@ -1,67 +1,54 @@
 <!--#include virtual='/all/inc/doctype.inc' -->
+
 <html>
 <head>
-  <title>
-   Reports generated from North Shore Portal
-  </title>
-  <!--#include virtual="/all/inc/head.inc"-->
+    <meta name="generator" content=
+    "HTML Tidy for Linux (vers 6 November 2007), see www.w3.org">
+
+    <title>Reports generated from North Shore Portal</title>
+    <!--#include virtual="/all/inc/head.inc"-->
 </head>
 
 <body>
-  <div id="maincontainer">
-    <div id="topsection">
-    </div>
-
-    <div id="contentwrapper">
-      <div id="contentcolumn">
-        <div class="innertube">
-<h1>PDF Reports, print these to paper </h1>
-<p>These reports are generated every night</p>
-
-	   <p> <a href='/reports/nsp/NorthShorePort.org_agencies_and_all_programs.pdf'>
-	      All Agency and Program info
-		</a>
-	       formatted for printing (.pdf)
-	   </p>
-	   <p> 
-	       <a href='/reports/nsp/NorthShorePort.org_agencies_only.pdf'>
-	           Agency info only
-	       </a> 
-	       formatted for printing (.pdf)
-	   </p>
-
-         <h1>External Reports</h1>
-         <p> 
-         These reports are generated from the raw, unedited web 
-         server logs by 3rd party tools every night. 
-         </p>
-	   <p> <a href='/reports/nsp/visitors/visitors.html'>
-	        Visitors Report. 
-	        </a> 
-	        Who has visited this web site, how often and from 
-	        where.
-	    </p>
-	    <p> <a href='/reports/nsp/analog/analog.html'>
-	        Analog Report
-	        </a> 
-	        This is a full web statistics report.
-	   </p>
-	  
-
-    <!--#include virtual="/cgi-bin/mvhub/reports.pl"-->
-
-	</div><!-- id=innertube -->
-      </div><!-- id='contentcolumn' -->
-    </div><!-- id='contentwrapper' -->
-
-     <div id="leftcolumn">
-      <div class="innertube">
-        <!--#include virtual="/all/inc/left_menu.inc"-->
-		<!--#include virtual="/inc/site_left_menu.inc"-->
-      </div>
-    </div>
-
-    <!--#include virtual="/inc/footer.inc"-->
-  </div><!-- id="maincontainer" -->
+    <div id="topsection"></div>
+
+    <div id="maincontainer">
+        <div id="contentcolumn" class="column">
+            <h1>PDF Reports, print these to paper</h1>
+
+            <p>These reports are generated every night</p>
+
+            <p><a href=
+            '/reports/nsp/NorthShorePort.org_agencies_and_all_programs.pdf'>
+            All Agency and Program info</a> formatted for printing
+            (.pdf)</p>
+
+            <p><a href=
+            '/reports/nsp/NorthShorePort.org_agencies_only.pdf'>Agency
+            info only</a> formatted for printing (.pdf)</p>
+
+            <h1>External Reports</h1>
+
+            <p>These reports are generated from the raw, unedited web
+            server logs by 3rd party tools every night.</p>
+
+            <p><a href='/reports/nsp/visitors/visitors.html'>Visitors
+            Report.</a> Who has visited this web site, how often and
+            from where.</p>
+
+            <p><a href='/reports/nsp/analog/analog.html'>Analog
+            Report</a> This is a full web statistics report.</p>
+            <!--#include virtual="/cgi-bin/mvhub/reports.pl"-->
+        </div><!-- id='contentcolumn' -->
+
+        <div id="leftcolumn" class="column">
+            <!--#include virtual="/all/inc/left_menu.inc"-->
+            <!--#include virtual="/inc/site_left_menu.inc"-->
+        </div><!-- id='leftcolumn' -->
+    </div><!-- id="maincontainer" -->
+
+    <div id="footer-wrapper">
+        <!--#include virtual="/inc/footer.inc"-->
+    </div>
 </body>
 </html>

=== modified file 'app-mvhub/DocumentRoot/static/nsp/html/servicearea.shtml'
--- app-mvhub/DocumentRoot/static/nsp/html/servicearea.shtml	2010-05-19 16:01:14 +0000
+++ app-mvhub/DocumentRoot/static/nsp/html/servicearea.shtml	2010-07-19 18:32:43 +0000
@@ -2,98 +2,105 @@
 
 <html>
 <head>
-  <title>Help with: North Shore Portal Nonprofit Services
-  Directory</title>
-
-<!--#include virtual="/all/inc/head.inc"-->
-
+    <meta name="generator" content=
+    "HTML Tidy for Linux (vers 6 November 2007), see www.w3.org">
+
+    <title>Help with: North Shore Portal Nonprofit Services
+    Directory</title><!--#include virtual="/all/inc/head.inc"-->
 </head>
+
 <body>
-  <div id="maincontainer">
-    <div id="topsection">
-   </div><!--id="topsection"-->
-
-    <div id="contentwrapper">
-      <div id="contentcolumn">
-        <div class="innertube">
-          <!-- BEGIN QUESTION SECTION -->
-
-          <p>Where is the North Shore Portal?
-          Is my town in it?
-          </p>
-          
-          <!-- END QUESTION SECTION -->
-
-          <!-- BEGIN ANSWER SECTIONS -->          
-
-          <p>A: The North Shore Portal comprises all of
-          the towns mentioned below:</p>
-
-          <div style="text-align: left; margin-left: 160px">
-            <table summary='cities in nsp service area' cellpadding="4">
-              <tr>
-                <td>Beverly</td>
-                <td>Mangolia</td>
-                <td>Peabody</td>
-              </tr>
-
-              <tr>
-                <td>Danvers</td>
-                <td>Manchester</td>
-                <td>Rockport</td>
-              </tr>
-              
-	      <tr>
-                <td>Essex County</td>
-
-                <td>Marblehead</td>
-                <td>Rowley</td>
-              </tr>
-              
-	      <tr>
-                <td>Gloucester</td>
-                <td>Middleton</td>
-                <td>Salem</td>
-              </tr>
-
-              <tr>
-                <td>Hamilton</td>
-                <td>Nahant</td>
-                <td>Salisbury</td>
-              </tr>
-
-              <tr>
-                <td>Ipswich</td>
-                <td>Newbury</td>
-                <td>Swampscott</td>
-              </tr>
-	      <tr>
-                <td>Lynn</td>
-                <td>Newburypoort</td>
-                <td>Topsfield</td>
-              </tr>
-	      <tr>
-                <td>Lynnfield</td>
-                <td>Saugus</td>
-                <td>Wenham</td>
-              </tr>
-            </table>
-          </div>
-	<!-- END ANSWER SECTIONS -->
-	  </div><!--id="innertube"-->
-	  </div><!--id="contentcolumn"-->
-	  </div><!--id="contentwrapper"-->
-      <div id="leftcolumn">     
-      <div class="innertube">
-        
-<!--#include virtual="/all/inc/left_menu.inc"-->
-<!--#include virtual="/inc/site_left_menu.inc"-->
-
-     </div><!-- id="innertube" -->
-    </div><!-- id="leftcolumn" -->
-
- <!--#include virtual="/inc/footer.inc"-->
-  
-</div><!-- id="maincontainer" -->
+    <div id="topsection"></div><!--id="topsection"-->
+
+    <div id="maincontainer">
+        <div id="contentcolumn" class="column">
+            <!-- BEGIN QUESTION SECTION -->
+
+            <p>Where is the North Shore Portal? Is my town in it?</p>
+            <!-- END QUESTION SECTION -->
+            <!-- BEGIN ANSWER SECTIONS -->
+
+            <p>A: The North Shore Portal comprises all of the towns
+            mentioned below:</p>
+
+            <div style="text-align: left; margin-left: 160px">
+                <table summary='cities in nsp service area'
+                cellpadding="4">
+                    <tr>
+                        <td>Beverly</td>
+
+                        <td>Mangolia</td>
+
+                        <td>Peabody</td>
+                    </tr>
+
+                    <tr>
+                        <td>Danvers</td>
+
+                        <td>Manchester</td>
+
+                        <td>Rockport</td>
+                    </tr>
+
+                    <tr>
+                        <td>Essex County</td>
+
+                        <td>Marblehead</td>
+
+                        <td>Rowley</td>
+                    </tr>
+
+                    <tr>
+                        <td>Gloucester</td>
+
+                        <td>Middleton</td>
+
+                        <td>Salem</td>
+                    </tr>
+
+                    <tr>
+                        <td>Hamilton</td>
+
+                        <td>Nahant</td>
+
+                        <td>Salisbury</td>
+                    </tr>
+
+                    <tr>
+                        <td>Ipswich</td>
+
+                        <td>Newbury</td>
+
+                        <td>Swampscott</td>
+                    </tr>
+
+                    <tr>
+                        <td>Lynn</td>
+
+                        <td>Newburypoort</td>
+
+                        <td>Topsfield</td>
+                    </tr>
+
+                    <tr>
+                        <td>Lynnfield</td>
+
+                        <td>Saugus</td>
+
+                        <td>Wenham</td>
+                    </tr>
+                </table>
+            </div><!-- END ANSWER SECTIONS -->
+        </div><!--id="contentcolumn"-->
+
+        <div id="leftcolumn" class="column">
+            <!--#include virtual="/all/inc/left_menu.inc"-->
+            <!--#include virtual="/inc/site_left_menu.inc"-->
+        </div><!-- id="leftcolumn" -->
+    </div><!-- id="maincontainer" -->
+
+    <div id="footer-wrapper">
+        <!--#include virtual="/inc/footer.inc"-->
+    </div>
 </body>
 </html>

=== modified file 'app-mvhub/conf/templates/html/contact_form.tmpl'
--- app-mvhub/conf/templates/html/contact_form.tmpl	2010-05-19 16:01:14 +0000
+++ app-mvhub/conf/templates/html/contact_form.tmpl	2010-07-19 18:32:43 +0000
@@ -1,144 +1,106 @@
 
 <!-- start contact_form.tmpl -->
 <!-- TMPL_INCLUDE NAME="inc/doctype.inc" -->
+
 <html>
-  <head>
-    <title>
-      Contact Us
-    </title>
-    <!-- tmpl_include name='inc/head.inc' -->
-  </head>
-  
-  <body>
-   <div id="maincontainer">
-    <div id="topsection">
-    </div>
-
-
-    <div id="contentwrapper">
-      <div id="contentcolumn">
-        <div class="innertube">
-    <h2>
-      Contact Us
-    </h2>
-
-    <p>
-      If you have any questions, suggestions or comments, please <strong>fill out the form below</strong>, and we will respond within 2 business days.
-    </p>
-    <!-- tmpl_var form-start -->
-
-    <table summary='contact form'>
-      <tr>
-        <td>
-          <!-- tmpl_var label-name -->:
-        </td>
-        <td>
-          <!-- tmpl_var field-name -->
-        </td>
-        <td>
-          <span class="warning">
-	    &nbsp; <!-- tmpl_var error-name -->
-	  </span>
-        </td>
-      </tr>
-
-      <tr>
-        <td>
-          <!-- tmpl_var label-liame -->:
-        </td>
-        <td>
-          <!-- tmpl_var field-liame -->
-        </td>
-        <td>
-          <span class="warning">
-	    &nbsp; <!-- tmpl_var error-liame -->
-	   </span>
-        </td>
-      </tr>
-
-      <tr>
-        <td>
-          <!-- tmpl_var label-question -->:
-        </td>
-        <td>
-          <!-- tmpl_var field-question -->
-        </td>
-        <td>
-          <span class="warning">
-	    &nbsp;
-	    <!-- tmpl_var error-question -->
-	  </span>
-        </td>
-      </tr>
-
-      <tr>
-        <td colspan="3">
-          <span class="nicebutton">
-            <!-- tmpl_var form-submit -->
-          </span>
-          &nbsp;&nbsp;(please click only once)
-        </td>
-      </tr>
-    </table>
-    <!-- tmpl_var form-end -->
-
-    <hr>
-    Or call us if you prefer:
-    <table summary='contact phones' cellpadding="5" cellspacing="5">
-      <tr>
-        <td>
-          If your issue is...
-        </td>
-        <td>
-          Call...
-        </td>
-      </tr>
-
-      <tr>
-        <td>
-          <strong>administrative</strong>
-        </td>
-        <td>
-          <!-- tmpl_var name="admin_name" -->
-        </td>
-        <td>
-          <!-- tmpl_var name="admin_phone" -->
-        </td>
-      </tr>
-
-      <tr>
-        <td>
-          <strong>technical</strong>
-        </td>
-        <td>
-          <!-- tmpl_var name="dev_name" -->
-        </td>
-        <td>
-          <!-- tmpl_var name="dev_phone" -->
-        </td>
-      </tr>
-    </table>
-	</div><!-- id=innertube -->
-      </div><!-- id='contentcolumn' -->
-    </div><!-- id='contentwrapper' -->
-
-     <div id="leftcolumn">
-      <div class="innertube">
-        <!--tmpl_include name="inc/left_menu.inc"-->
+<head>
+    <meta name="generator" content=
+    "HTML Tidy for Linux (vers 6 November 2007), see www.w3.org">
+
+    <title>Contact Us</title><!-- tmpl_include name='inc/head.inc' -->
+</head>
+
+<body>
+    <div id="topsection"></div>
+
+    <div id="maincontainer">
+        <div id="contentcolumn" class="column">
+            <h2>Contact Us</h2>
+
+            <p>If you have any questions, suggestions or comments,
+            please <strong>fill out the form below</strong>, and we
+            will respond within 2 business days.</p>
+            <!-- tmpl_var form-start -->
+
+            <table summary='contact form'>
+                <tr>
+                    <td><!-- tmpl_var label-name -->:</td>
+
+                    <td><!-- tmpl_var field-name --></td>
+
+                    <td><span class="warning">&nbsp; 
+                    <!-- tmpl_var error-name --></span></td>
+                </tr>
+
+                <tr>
+                    <td><!-- tmpl_var label-liame -->:</td>
+
+                    <td><!-- tmpl_var field-liame --></td>
+
+                    <td><span class="warning">&nbsp; 
+                    <!-- tmpl_var error-liame --></span></td>
+                </tr>
+
+                <tr>
+                    <td><!-- tmpl_var label-question -->:</td>
+
+                    <td><!-- tmpl_var field-question --></td>
+
+                    <td><span class="warning">&nbsp; 
+                    <!-- tmpl_var error-question --></span></td>
+                </tr>
+
+                <tr>
+                    <td colspan="3"><span class="nicebutton">
+                    <!-- tmpl_var form-submit --></span>
+                    &nbsp;&nbsp;(please click only once)</td>
+                </tr>
+            </table><!-- tmpl_var form-end -->
+            <hr>
+            Or call us if you prefer:
+
+            <table summary='contact phones' cellpadding="5"
+            cellspacing="5">
+                <tr>
+                    <td>If your issue is...</td>
+
+                    <td>Call...</td>
+                </tr>
+
+                <tr>
+                    <td><strong>administrative</strong></td>
+
+                    <td><!-- tmpl_var name="admin_name" --></td>
+
+                    <td><!-- tmpl_var name="admin_phone" --></td>
+                </tr>
+
+                <tr>
+                    <td><strong>technical</strong></td>
+
+                    <td><!-- tmpl_var name="dev_name" --></td>
+
+                    <td><!-- tmpl_var name="dev_phone" --></td>
+                </tr>
+            </table>
+        </div><!-- id='contentcolumn' -->
+
+        <div id="leftcolumn" class="column">
+            <!--tmpl_include name="inc/left_menu.inc"-->
+            <!-- tmpl_if name="show_nsp_left_menu" -->
+            <!-- tmpl_include name="nsp/inc/site_left_menu.inc" -->
+            <!--/tmpl_if-->
+        </div>
+    </div><!-- id="maincontainer" -->
+
+    <div id="footer-wrapper">
         <!-- tmpl_if name="show_nsp_left_menu" -->
-			<!-- tmpl_include name="nsp/inc/site_left_menu.inc" -->
-		<!--/tmpl_if-->
-      </div>
+        <!-- tmpl_include name="nsp/inc/footer.inc" -->
+        <!-- tmpl_else -->
+        <!-- tmpl_include name="mvh/inc/footer.inc" -->
+        <!--/tmpl_if-->
     </div>
-
-   <!-- 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>
+</body>
 </html>
 <!-- stop contact_form.tmpl -->
 

=== modified file 'app-mvhub/conf/templates/html/main.tmpl'
--- app-mvhub/conf/templates/html/main.tmpl	2010-05-19 16:01:14 +0000
+++ app-mvhub/conf/templates/html/main.tmpl	2010-07-19 18:32:43 +0000
@@ -1,51 +1,47 @@
 
-<!-- start main.tmpl --> 
+<!-- start main.tmpl -->
 <!-- $Revision: 1681 $ -->
 <!-- tmpl_include name="inc/doctype.inc" -->
+
 <html>
 <head>
+    <meta name="generator" content=
+    "HTML Tidy for Linux (vers 6 November 2007), see www.w3.org">
+
     <title><!--tmpl_var name="title_tag"--></title>
     <!-- tmpl_include name="inc/head.inc" -->
-<!-- TODO check tmpl_var javascript_tag for vestigual -->
-  <!-- tmpl_var name="javascript_tag" -->
+    <!-- TODO check tmpl_var javascript_tag for vestigual -->
+    <!-- tmpl_var name="javascript_tag" -->
 </head>
+
 <body>
-  <div id="maincontainer">
-    <div id="topsection">
-    </div>
-
-
-    <div id="contentwrapper">
-      <div id="contentcolumn">
-        <div class="innertube">
-	  <!--tmpl_if name="show_search_bar"-->
-	    <!-- tmpl_include name="search_bar.tmpl"--> 
-	  <!--/tmpl_if-->
-	  <!--tmpl_var name="mode_body"-->
-	</div><!-- id=innertube -->
-      </div><!-- id='contentcolumn' -->
-    </div><!-- id='contentwrapper' -->
-
-     <div id="leftcolumn">
-      <div class="innertube">
-      <!--TMPL_UNLESS name="omit_left_menu"-->
-		<!-- tmpl_include name="all/inc/left_menu.inc" -->
-		<!-- tmpl_if name="show_nsp_left_menu" -->
-			<!-- tmpl_include name="nsp/inc/site_left_menu.inc" -->
-		<!--/tmpl_if-->
-      <!--/TMPL_UNLESS-->
-      </div>
-    </div>
-
-    <!-- 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>
+    <div id="topsection"></div>
+
+    <div id="maincontainer">
+        <div id="contentcolumn" class="column">
+            <!--tmpl_if name="show_search_bar"-->
+            <!-- tmpl_include name="search_bar.tmpl"--><!--/tmpl_if-->
+            <!--tmpl_var name="mode_body"-->
+        </div><!-- id='contentcolumn' -->
+
+        <div id="leftcolumn" class="column">
+            <!--TMPL_UNLESS name="omit_left_menu"-->
+            <!-- tmpl_include name="all/inc/left_menu.inc" -->
+            <!-- tmpl_if name="show_nsp_left_menu" -->
+            <!-- tmpl_include name="nsp/inc/site_left_menu.inc" -->
+            <!--/tmpl_if-->
+            <!--/TMPL_UNLESS-->
+        </div><!-- id='leftcolumn' -->
+    </div><!-- id="maincontainer" -->
+
+    <div id="footer-wrapper">
+            <!-- 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>
+</body>
 </html>
 <!-- stop main.tmpl -->
 

=== modified file 'app-mvhub/t/mech/pages.t'
--- app-mvhub/t/mech/pages.t	2010-07-16 20:43:38 +0000
+++ app-mvhub/t/mech/pages.t	2010-07-19 18:32:43 +0000
@@ -78,11 +78,10 @@
             'tests_to_skip'    => '',
             'skip_reason'      => '',
         },
-        {   'url' => "http://$host/html/register.shtml";,
-            'expected_content' =>
-                "Why register your agency and its programs with",
-            'tests_to_skip' => '',
-            'skip_reason'   => '',
+        {   'url'              => "http://$host/html/register.shtml";,
+            'expected_content' => "Why register your agency",
+            'tests_to_skip'    => '',
+            'skip_reason'      => '',
         },
         {   'url'              => "http://$host/reports";,
             'expected_content' => "PDF Reports",


Follow ups