mvhub-dev team mailing list archive

Thread
Date

[Merge] lp:~himabindu-sanagavarapu/mvhub/bad_inludes into lp:mvhub

To: mp+29127@xxxxxxxxxxxxxxxxxx
From: hsanagavarapu <hsanagav@xxxxxxxxxx>
Date: Fri, 02 Jul 2010 21:45:37 -0000
Reply-to: mp+29127@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

hsanagavarapu has proposed merging lp:~himabindu-sanagavarapu/mvhub/bad_inludes into lp:mvhub.

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


Added missing server side includes
-- 
https://code.launchpad.net/~himabindu-sanagavarapu/mvhub/bad_inludes/+merge/29127
Your team MVHub Developers is subscribed to branch lp:mvhub.

=== removed file 'app-mvhub/DocumentRoot/cgi-bin/mvhub/admin/report.shtml'
--- app-mvhub/DocumentRoot/cgi-bin/mvhub/admin/report.shtml	2010-05-26 17:56:33 +0000
+++ app-mvhub/DocumentRoot/cgi-bin/mvhub/admin/report.shtml	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- saved from url=(0036)http://mvh.mdadhania.testing123.net/ -->
-<!-- start doctype.inc --><!-- stop doctype.inc -->
-
-<html>
-<head>
-  <meta name="generator" content=
-  "HTML Tidy for Linux (vers 6 November 2007), see www.w3.org">
-
-  <title>Reports</title><!-- start head.inc -->
-  <!-- mvhub/mvh//inc/head.inc -->
-  <meta content="text/html; charset=us-ascii" http-equiv=
-  "Content-Type">
-  <link rel="shortcut icon" href="/favicon.ico">
-  <!-- cosmetic script to reset columns to equal lengths-->
-
-  <script type="text/javascript" src="/all/js/equalcolumns.js">
-</script><!--used by program.pl /program_form.tmpl -->
-
-  <script type="text/javascript" src="/all/js/areas_served.js">
-</script>
-<!-- where elements are positioned is the same for all sites -->
-  <link rel="stylesheet" type="text/css" href=
-  "/all/css/layout.css">
-  <!-- colors , fonts, sizes different between sites -->
-  <link rel="stylesheet" type="text/css" href="/css/format.css">
-  <!-- stop head.inc -->
-  <meta name="GENERATOR" content="MSHTML 8.00.6001.18783">
-</head>
-
-<body>
-  <div id="maincontainer">
-    <div id="topsection"></div>
-
-    <div id="contentwrapper">
-      <div id="contentcolumn">
-        <div class="innertube">
-          <br>
-          <!--#include virtual="/cgi-bin/mvhub/admin/reports.pl" -->
-        </div><!-- id=innertube -->
-      </div><!-- id='contentcolumn' -->
-    </div><!-- id='contentwrapper' -->
-
-    <div id="leftcolumn">
-      <div class="innertube">
-        <!--#include virtual="/all/inc/left_menu.inc"-->
-      </div>
-        <!--#include virtual="/inc/footer.inc"-->
-    </div>
-  </div>       <!-- id="maincontainer" -->
-</body>
-</html>

=== modified file 'app-mvhub/DocumentRoot/static/mvh/html/links.shtml'
--- app-mvhub/DocumentRoot/static/mvh/html/links.shtml	2010-05-26 17:56:33 +0000
+++ app-mvhub/DocumentRoot/static/mvh/html/links.shtml	2010-07-02 21:45:36 +0000
@@ -1,60 +1,42 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- saved from url=(0036)http://mvh.mdadhania.testing123.net/ -->
-<!-- start doctype.inc --><!-- stop doctype.inc --><HTML><HEAD><TITLE>Links to other pages</TITLE><!-- start head.inc --><!-- mvhub/mvh//inc/head.inc -->
-<META content="text/html; charset=iso-8859-1" http-equiv=Content-Type><LINK 
-rel="shortcut icon" href="/favicon.ico"><!-- cosmetic script to reset columns to equal lengths-->
-
-<SCRIPT type=text/javascript 
-src="/all/js/equalcolumns.js"></SCRIPT>
-
-<!--used by program.pl /program_form.tmpl -->
-<SCRIPT type=text/javascript 
-src="/all/js/areas_served.js"></SCRIPT>
-
-<!-- where elements are positioned is the same for all sites --><LINK 
-rel=stylesheet type=text/css 
-href="/all/css/layout.css">
-
-<!-- colors , fonts, sizes different between sites --><LINK 
-rel=stylesheet type=text/css 
-href="/css/format.css"><!-- stop head.inc -->
-
-<META name=GENERATOR content="MSHTML 8.00.6001.18783"></HEAD>
-<BODY>
-<DIV id=maincontainer>
-<DIV id=topsection>
-</DIV>
-<DIV id=contentwrapper>
-<DIV id=contentcolumn>
-<DIV class=innertube>
-
-<br>
-
-<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" -->
-  </BODY>
-  </HTML>
+<!--#include virtual="/all/inc/doctype.inc"-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+
+<html>
+<head>
+
+  <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" -->
+</body>
+</html>

=== modified file 'app-mvhub/DocumentRoot/static/nsp/html/links.shtml'
--- app-mvhub/DocumentRoot/static/nsp/html/links.shtml	2010-05-26 17:56:33 +0000
+++ app-mvhub/DocumentRoot/static/nsp/html/links.shtml	2010-07-02 21:45:36 +0000
@@ -1,61 +1,44 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>Directories of Social Services for Massachusetts North Shore</TITLE>
-
-
-<META content="text/html; charset=iso-8859-1" http-equiv=Content-Type><LINK 
-rel="shortcut icon" href="/favicon.ico"><!-- cosmetic script to reset columns to equal lengths-->
-
-<SCRIPT  type=text/javascript  
- src="/all/js/equalcolumns.js"></SCRIPT>
-<!--used by program.pl /program_form.tmpl -->
-
-<SCRIPT type=text/javascript 
-src="/all/js/areas_served.js"></SCRIPT>
-
-<!-- where elements are positioned is the same for all sites -->
-
-<!-- where elements are positioned is the same for all sites -->
-<link rel="stylesheet" type="text/css" href="/all/css/layout.css">
-<!-- colors , fonts, sizes different between sites -->
-<link rel="stylesheet" type="text/css" href="/css/format.css">
-<!-- stop head.inc -->
-
-<META name=GENERATOR content="MSHTML 8.00.6001.18812"></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 --></BODY></HTML>
+<!--#include virtual="/all/inc/doctype.inc"-->
+<html>
+<head>
+  <title>Directories of Social Services for Massachusetts North
+  Shore</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.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 -->
+</body>
+</html>

Follow ups

[Merge] lp:~himabindu-sanagavarapu/mvhub/bad_inludes into lp:mvhub
From: noreply, 2010-07-03
Re: [Merge] lp:~himabindu-sanagavarapu/mvhub/bad_inludes into lp:mvhub
From: Dan MacNeil, 2010-07-03