mvhub-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Dan MacNeil (omacneil)
  Kamala Kalluri <kamalavathi@brave>
  Priya Ravindran (priya)
------------------------------------------------------------
revno: 408 [merge]
committer: Dan MacNeil <dan@xxxxxxxxxx>
branch nick: trunk
timestamp: Sun 2010-06-13 19:17:58 -0400
message:
  merged search_box_help_text
modified:
  app-mvhub/conf/templates/html/search_bar.tmpl
  app-mvhub/project-tools/templates/template.conf
  lib-mvhub/lib/MVHub/AgencyAccount.pm
  lib-mvhub/lib/MVHub/Common.pm
  lib-mvhub/lib/MVHub/Guide.pm
  lib-mvhub/lib/MVHub/Page.pm
  lib-mvhub/lib/MVHub/Utils/Setup.pm
  lib-mvhub/t/conf/all.conf


--
lp:mvhub
https://code.launchpad.net/~mvhub-commit/mvhub/trunk

Your team MVHub Developers is subscribed to branch lp:mvhub.
To unsubscribe from this branch go to https://code.launchpad.net/~mvhub-commit/mvhub/trunk/+edit-subscription

=== modified file 'app-mvhub/conf/templates/html/search_bar.tmpl'
--- app-mvhub/conf/templates/html/search_bar.tmpl	2010-01-31 23:15:07 +0000
+++ app-mvhub/conf/templates/html/search_bar.tmpl	2010-05-07 18:06:48 +0000
@@ -2,9 +2,11 @@
 <!-- start search_bar.tmpl -->
 <div id='searchbar'>
 <p> &nbsp;</p>
+
+
 <h1> Search for Social Services in <!--TMPL_VAR ESCAPE=HTML NAME=site_location --> </h1>
-     <b>services</b>.  (family counseling,job training, health care,food,shelter...)<br />
-     or <b>organizations</b> (YMCA, NSCAP,UTEC,House of Hope)<br />
+You can search for services by <b>key word:</b>
+				   <!--TMPL_VAR  NAME=search_box_help_text -->
 
      <form  method="GET" action="/cgi-bin/mvhub/guide.pl">
          <input name="rm" 

=== modified file 'app-mvhub/project-tools/templates/template.conf'
--- app-mvhub/project-tools/templates/template.conf	2010-05-14 14:24:57 +0000
+++ app-mvhub/project-tools/templates/template.conf	2010-06-13 22:41:22 +0000
@@ -88,6 +88,8 @@
 # or Merrimack Valley
 location="Massachusetts Merrimack Valley"
 
+search_box_help_text=BAD_SEARCH_BOX_HELP_TEXT_FIX_IN_CONFIG_FILE
+
 # right now either "North Shore Portal"
 # or "Merrimack Valley Hub"
 website_description=North Shore Portal

=== modified file 'lib-mvhub/lib/MVHub/AgencyAccount.pm'
--- lib-mvhub/lib/MVHub/AgencyAccount.pm	2010-04-26 19:58:07 +0000
+++ lib-mvhub/lib/MVHub/AgencyAccount.pm	2010-05-24 19:44:00 +0000
@@ -122,6 +122,8 @@
         show_search_bar               => 0,
         site_code     => $self->get_config_param('SITE.website_code'),
         site_location => $self->get_config_param('SITE.location'),
+        search_box_help_text =>
+            $self->get_config_param('SITE.search_box_help_text'),
     );
 }
 

=== modified file 'lib-mvhub/lib/MVHub/Common.pm'
--- lib-mvhub/lib/MVHub/Common.pm	2010-05-08 17:04:15 +0000
+++ lib-mvhub/lib/MVHub/Common.pm	2010-06-13 22:41:22 +0000
@@ -31,7 +31,6 @@
     encode_quick_login_id
     get_agency_select_list
     prepare_form
-    print_page_and_exit
     sendmail
 );
 

=== modified file 'lib-mvhub/lib/MVHub/Guide.pm'
--- lib-mvhub/lib/MVHub/Guide.pm	2010-04-26 19:58:07 +0000
+++ lib-mvhub/lib/MVHub/Guide.pm	2010-05-24 19:44:00 +0000
@@ -57,10 +57,12 @@
     my $search_phrase = $self->query()->param('search_phrase');
 
     $$output_ref = MVHub::Page::prepare_page(
-        body            => $$output_ref,
-        title           => $self->param('title'),
-        site_code       => $self->get_config_param('SITE.website_code'),
-        site_location   => $self->get_config_param('SITE.location'),
+        body          => $$output_ref,
+        title         => $self->param('title'),
+        site_code     => $self->get_config_param('SITE.website_code'),
+        site_location => $self->get_config_param('SITE.location'),
+        search_box_help_text =>
+            $self->get_config_param('SITE.search_box_help_text'),
         show_left_menu  => 1,
         show_search_bar => 1,
         search_phrase   => $search_phrase,
@@ -395,7 +397,11 @@
     # needed by search_bar.tmpl
     $self->param( 'site_location', $self->get_config_param('SITE.location') );
 
+    $self->param( 'search_box_help_text',
+        $self->get_config_param('SITE.search_box_help_text') );
+
     return $tmpl->output();
+
 }
 
 sub _add_program_urls_to {

=== modified file 'lib-mvhub/lib/MVHub/Page.pm'
--- lib-mvhub/lib/MVHub/Page.pm	2010-04-26 19:58:07 +0000
+++ lib-mvhub/lib/MVHub/Page.pm	2010-05-24 19:44:00 +0000
@@ -57,12 +57,13 @@
     my $javascript = delete $args{javascript};
     my $transfer_internal_style_sheet
         = delete $args{transfer_internal_style_sheet};
-    my $show_left_menu  = delete $args{show_left_menu};
-    my $show_search_bar = delete $args{show_search_bar};
-    my $search_phrase   = delete $args{search_phrase};
-    my $site_code       = delete $args{site_code};
-    my $site_location   = delete $args{site_location};
-    my $agency_search   = delete
+    my $show_left_menu       = delete $args{show_left_menu};
+    my $show_search_bar      = delete $args{show_search_bar};
+    my $search_phrase        = delete $args{search_phrase};
+    my $site_code            = delete $args{site_code};
+    my $site_location        = delete $args{site_location};
+    my $search_box_help_text = delete $args{search_box_help_text};
+    my $agency_search        = delete
         $args{agency_search};  # 1: agency search, 0 (default): program search
     assert( ( scalar keys %args ) == 0, "Unknown arguments: @{[%args]}" );
 
@@ -100,8 +101,10 @@
         if ($agency_search) {
             $tmpl->param( $SB_CHECK_BY_AGENCY_TAG, $agency_search );
         }
-        $tmpl->param( $SEARCH_PHRASE_TAG, $search_phrase );
-        $tmpl->param( 'site_location',    $site_location );
+
+        $tmpl->param( $SEARCH_PHRASE_TAG,     $search_phrase );
+        $tmpl->param( 'site_location',        $site_location );
+        $tmpl->param( 'search_box_help_text', $search_box_help_text );
     }
 
     return $tmpl->output();

=== modified file 'lib-mvhub/lib/MVHub/Utils/Setup.pm'
--- lib-mvhub/lib/MVHub/Utils/Setup.pm	2010-06-03 15:08:23 +0000
+++ lib-mvhub/lib/MVHub/Utils/Setup.pm	2010-06-13 23:15:16 +0000
@@ -222,12 +222,16 @@
 
     my %hash_of_site_specific_values = (
         'mvh' => {
-            'SITE.location'            => '"Massachusetts Merrimack Valley"',
+            'SITE.location' => '"Massachusetts Merrimack Valley"',
+            'SITE.search_box_help_text' =>
+                q/"(e.g. family counseling, job training, health care, food, shelter, childcare ...) or organizations (YMCA, UTEC, House of Hope) "/,
             'SITE.website_description' => 'Merrimack Valley Hub',
             'NOTIFICATION.team_name'   => 'Merrimack Valley Hub Team'
         },
         'nsp' => {
-            'SITE.location'            => '"Massachusetts North Shore"',
+            'SITE.location' => '"Massachusetts North Shore"',
+            'SITE.search_box_help_text' =>
+                q/"(e.g. family counseling , job training, health care, shelter ...) or organizations (YMCA, NSCAP)"/,
             'SITE.website_description' => 'North Shore Portal',
             'NOTIFICATION.team_name'   => 'North Shore Portal Team'
         }

=== modified file 'lib-mvhub/t/conf/all.conf'
--- lib-mvhub/t/conf/all.conf	2010-05-14 14:24:57 +0000
+++ lib-mvhub/t/conf/all.conf	2010-06-13 22:41:22 +0000
@@ -75,7 +75,7 @@
 # or Merrimack Valley
 location="Massachusetts Merrimack Valley"
 website_description=
-
+search_box_help_text=ignore
 ############################ DANGER DANGER DANGER ####################
 # 	constants BELOW used **internally** by application, 
 # 	DON'T mess with them unless you know what you are doing