mvhub-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Dan MacNeil (omacneil)
Related merge proposals:
  https://code.launchpad.net/~omacneil/mvhub/fix_ql_bug/+merge/31658
  proposed by: Dan MacNeil (omacneil)
  review: Approve - Priya Ravindran (priya)
------------------------------------------------------------
revno: 462 [merge]
committer: Priya Ravindran <pthirumal@xxxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-08-03 12:23:46 -0400
message:
  Fixed quick login url and merged the branch with trunk
removed:
  app-mvhub/conf/templates/html/agency_usage_report_html.tmpl
modified:
  app-mvhub/conf/templates/html/agency_home.tmpl
  lib-mvhub/lib/MVHub/AgencyAccount.pm


--
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/agency_home.tmpl'
--- app-mvhub/conf/templates/html/agency_home.tmpl	2010-02-01 23:43:18 +0000
+++ app-mvhub/conf/templates/html/agency_home.tmpl	2010-08-03 15:42:57 +0000
@@ -109,10 +109,10 @@
         <!--/TMPL_IF-->
     </td>
     <td>
-        <a href='program.pl?agency_id=<!--TMPL_VAR name="agency_id"-->&amp;program_id=<!--TMPL_VAR name="program_id"-->'><strong>Update</strong></a>
+        <a href='/cgi-bin/mvhub/program.pl?agency_id=<!--TMPL_VAR name="agency_id"-->&amp;program_id=<!--TMPL_VAR name="program_id"-->'><strong>Update</strong></a>
         
         &nbsp;&nbsp;|&nbsp;&nbsp;
-        <a href='program.pl?mode=show_existing_categories&amp;agency_id=<!--TMPL_VAR name="agency_id"-->&amp;program_id=<!--TMPL_VAR name="program_id"-->'>categorize</a>
+        <a href='/cgi-bin/mvhub/program.pl?mode=show_existing_categories&amp;agency_id=<!--TMPL_VAR name="agency_id"-->&amp;program_id=<!--TMPL_VAR name="program_id"-->'>categorize</a>
             <!--TMPL_UNLESS name="hidden_reason"-->
             &nbsp;&nbsp;|&nbsp;&nbsp;
             <a href='javascript:askWhyHiding(<!--TMPL_VAR name="agency_id"-->,<!--TMPL_VAR name="program_id"-->)'>
@@ -157,7 +157,7 @@
 <br>
 
 <p>
-<strong>Reminder:</strong> Please <a href='logout.pl' target='_top'>Log out</a> and close your browser when you are finished 
+<strong>Reminder:</strong> Please <a href='/cgi-bin/mvhub/logout.pl' target='_top'>Log out</a> and close your browser when you are finished 
 updating your account. This prevents others from changing your agency's information in your absence.
 </p>
 

=== removed file 'app-mvhub/conf/templates/html/agency_usage_report_html.tmpl'
--- app-mvhub/conf/templates/html/agency_usage_report_html.tmpl	2009-07-01 15:37:11 +0000
+++ app-mvhub/conf/templates/html/agency_usage_report_html.tmpl	1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
-
-<!-- start agency_usage_report_html.tmpl -->
-
-<style type="text/css">
-form#programs_nav
-{text-align: center;
- /* So the form can be unhidden via JavaScript.
-    Equivalent functionality still available using
-    <noscript> tags. */
- display: none;}
-
-p#log_out
-{position: relative;
- right: 10px;}
-
-table
-{}
-
-ul.programs_list
-{margin: 0;
- padding: 0;}
-
-ul.programs_list li
-{display: inline;
- margin: 0.75em;}
-
-th
-{border: 1px solid #000;
- border-top: 0;
- padding: 0.25em;}
-
-tr.start_program th
-{padding: 0.5em;
- color: #fff;
- border: 0;
- background-color: #014984;}
-
-tr.return_to_top td
-{padding-top: 1.5em;}
-
-th.categories
-{text-align: left;
- color: #fff;
- background-color: #316b9b;}
-
-td.category_name
-{border: solid 1px #000;
- border-top: 0;
- padding: 0.1em;
- padding-left: 0.25em;}
-
-td.one_month_hits
-{text-align: center;
- border-right: 1px solid #000;
- border-bottom: 1px solid #000;}
-
-td.six_months_hits
-{text-align: center;
- border-bottom: 1px solid #000;
- border-right: 1px solid #000;}
-</style>
-
-<a name="top"><h2><!--tmpl_var name='agency_name' -->: Traffic Statistics</h2></a>
-<p id="log_out">[<a href="logout.pl" target="_top">Log out</a>]</p>
-<p><a href="?rm=display_agency_home&agency_id=<!--tmpl_var name='agency_id'-->">Return to main agency page</a></p>
-<table cellspacing="0" cellpadding="0">
-	<tbody>
-	<tr class="start_program">
-		<th>&nbsp;</th>
-		<th>Past Month</th>
-		<th>Past Six Months</th>
-	</tr>
-	<!--tmpl_loop name='agency_usage_stats' -->
-	<tr>
-		<th scope="row"><!--tmpl_var name='report_type' --></th>
-		<td class="one_month_hits"><!--tmpl_var name='one_month' --></td>
-		<td class="six_months_hits"><!--tmpl_var name='six_months' --></td>
-	</tr>
-	<!--/tmpl_loop -->
-
-	<tr id='program_nav'><td style="padding-top: 3em;">
-		<h3>Programs</h3>
-		<ul class="programs_list">
-		<!--tmpl_loop name='programs_usage_stats'-->
-			<li><a href="#<!--tmpl_var name='program_id'-->"><!--tmpl_var name='program_name'--></a></li>
-		<!--/tmpl_loop-->
-		</ul>
-	</td></tr>
-
-	<!--tmpl_loop name='programs_usage_stats' -->
-	<tr class="return_to_top"><td colspan='3'><a name="<!--tmpl_var name='program_id'-->" href="#top">Return to top</a></td></tr>
-	<tr class="start_program">
-		<th><!--tmpl_var name='program_name' --></th>
-		<th>Past Month</th>
-		<th>Past Six Months</th>
-	</tr>
-	<tr>
-		<th scope="row"><!--tmpl_var name='report_type' --></th>
-		<td class="one_month_hits"><!--tmpl_var name='one_month' --></td>
-		<td class="six_months_hits"><!--tmpl_var name='six_months' --></td>
-	</tr>
-	<tr>
-		<th colspan="3" class="categories">Per-category views of program summary:</th>
-	</tr>
-	<!--tmpl_loop name='category_stats'-->
-	<tr>
-		<td class="category_name"><!--tmpl_var name='category_name'--></td>
-		<td class="one_month_hits"><!--tmpl_var name='one_month' --></td>
-		<td class="six_months_hits"><!--tmpl_var name='six_months' --></td>
-	</tr>
-	<!--/tmpl_loop-->
-<!--/tmpl_loop-->
-</tbody></table>
-
-<!-- stop agency_usage_report_html.tmpl -->
-

=== modified file 'lib-mvhub/lib/MVHub/AgencyAccount.pm'
--- lib-mvhub/lib/MVHub/AgencyAccount.pm	2010-07-15 16:45:36 +0000
+++ lib-mvhub/lib/MVHub/AgencyAccount.pm	2010-08-03 15:42:57 +0000
@@ -290,7 +290,7 @@
 
             # Success page
             return "We've sent you an email with your password. "
-                . '<a href="agency.pl?rm=show_login_page">Return to the log-in page<a>';
+                . '<a href="/cgi-bin/mvhub/agency.pl?rm=show_login_page">Return to the log-in page<a>';
         }
         else {
             $page_body
@@ -349,7 +349,7 @@
               "Note - we were unable to set a cookie in your browser. "
             . "In order for you to use the agency administration features, "
             . "you must have cookies enabled. Please enable them and try "
-            . 'to <a href="agency.pl">log in</a> again.';
+            . 'to <a href="/cgi-bin/mvhub/agency.pl">log in</a> again.';
     }
 
     if ( defined $error_code ) {