openguides-commits

openguides-commits@lists.openguides.org

873 discussions

r1204 - in trunk: . t templates
by svnadmin＠urchin.earth.li 08 Aug '08

08 Aug '08

Author: dom Date: 2008-08-08 11:42:57 +0100 (Fri, 08 Aug 2008) New Revision: 1204 Modified: trunk/Changes trunk/t/48_google_analytics.t trunk/templates/footer.tt Log: Fix Google Analytics by not trying to escape the key Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-08-05 20:36:03 UTC (rev 1203) +++ trunk/Changes 2008-08-08 10:42:57 UTC (rev 1204) @@ -22,6 +22,7 @@ Added a Universal Edit Link (http://universaleditbutton.org/) (#254) Update references to http://openguides.org moved URLs Update Google Analytics code to support new version (#255) + Some pages didn't properly include Google Analyatics; fix this (#257) 0.62 8 June 2008 Allow wiki page links (simple: [[Foo]], title: [[Foo|bar]]) in Modified: trunk/t/48_google_analytics.t =================================================================== --- trunk/t/48_google_analytics.t 2008-08-05 20:36:03 UTC (rev 1203) +++ trunk/t/48_google_analytics.t 2008-08-08 10:42:57 UTC (rev 1204) @@ -10,7 +10,7 @@ exit 0; } -plan tests => 5; +plan tests => 9; my ( $config, $guide, $wiki, $cookie, $output ); @@ -57,3 +57,18 @@ ); like( $output, qr/ga.js/, "does show up if key is provided" ); like( $output, qr/ThisIsNotAKey/, "...correct key" ); +# Make sure analytics stuff only shows up if we want it to on recent changes +# recent changes doesnt use CGI. which we dont need anymore but we should test in case we change our mind again. + +$config->google_analytics_key( "" ); +$output = $guide->display_recent_changes( return_output => 1 ); +unlike( $output, qr/ga.js/, "...also if analytics key is blank" ); + +$config->google_analytics_key( 0 ); +$output = $guide->display_recent_changes( return_output => 1 ); +unlike( $output, qr/ga.js/, "...also if analytics key is zero" ); + +$config->google_analytics_key( "ThisIsNotAKey" ); +$output = $guide->display_recent_changes( return_output => 1 ); +like( $output, qr/ga.js/, "does show up if key is provided" ); +like( $output, qr/ThisIsNotAKey/, "...correct key" ); Modified: trunk/templates/footer.tt =================================================================== --- trunk/templates/footer.tt 2008-08-05 20:36:03 UTC (rev 1203) +++ trunk/templates/footer.tt 2008-08-08 10:42:57 UTC (rev 1204) @@ -52,7 +52,7 @@ </script> <script type="text/javascript"> - var pageTracker = _gat._getTracker("[% CGI.escapeHTML( config.google_analytics_key ) %]"); + var pageTracker = _gat._getTracker("[% config.google_analytics_key %]"); pageTracker._trackPageview(); </script> [% END %]

1 0

r1203 - in trunk: . t templates
by svnadmin＠urchin.earth.li 05 Aug '08

05 Aug '08

Author: dom Date: 2008-08-05 21:36:03 +0100 (Tue, 05 Aug 2008) New Revision: 1203 Modified: trunk/Changes trunk/t/48_google_analytics.t trunk/templates/footer.tt Log: Update Google Analytics code to support new version (closes #255) Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-07-30 22:40:38 UTC (rev 1202) +++ trunk/Changes 2008-08-05 20:36:03 UTC (rev 1203) @@ -21,6 +21,7 @@ * Reduce acres of whitespace in output and clean up indenting. Added a Universal Edit Link (http://universaleditbutton.org/) (#254) Update references to http://openguides.org moved URLs + Update Google Analytics code to support new version (#255) 0.62 8 June 2008 Allow wiki page links (simple: [[Foo]], title: [[Foo|bar]]) in Modified: trunk/t/48_google_analytics.t =================================================================== --- trunk/t/48_google_analytics.t 2008-07-30 22:40:38 UTC (rev 1202) +++ trunk/t/48_google_analytics.t 2008-08-05 20:36:03 UTC (rev 1203) @@ -34,26 +34,26 @@ id => "Red Lion", return_output => 1, ); -unlike( $output, qr/urchinTracker/, "Google analytics omitted by default" ); +unlike( $output, qr/ga.js/, "Google analytics omitted by default" ); $config->google_analytics_key( "" ); $output = $guide->display_node( id => "Red Lion", return_output => 1, ); -unlike( $output, qr/urchinTracker/, "...also if analytics key is blank" ); +unlike( $output, qr/ga.js/, "...also if analytics key is blank" ); $config->google_analytics_key( 0 ); $output = $guide->display_node( id => "Red Lion", return_output => 1, ); -unlike( $output, qr/urchinTracker/, "...also if analytics key is zero" ); +unlike( $output, qr/ga.js/, "...also if analytics key is zero" ); $config->google_analytics_key( "ThisIsNotAKey" ); $output = $guide->display_node( id => "Red Lion", return_output => 1, ); -like( $output, qr/urchinTracker/, "does show up if key is provided" ); +like( $output, qr/ga.js/, "does show up if key is provided" ); like( $output, qr/ThisIsNotAKey/, "...correct key" ); Modified: trunk/templates/footer.tt =================================================================== --- trunk/templates/footer.tt 2008-07-30 22:40:38 UTC (rev 1202) +++ trunk/templates/footer.tt 2008-08-05 20:36:03 UTC (rev 1203) @@ -46,12 +46,14 @@ </div> [% IF config.google_analytics_key %] - <script src="http://www.google-analytics.com/urchin.js" - type="text/javascript"> + <script type="text/javascript"> + var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); + document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); </script> + <script type="text/javascript"> - _uacct = "[% CGI.escapeHTML( config.google_analytics_key ) %]"; - if ( typeof urchinTracker == 'function' ) urchinTracker(); + var pageTracker = _gat._getTracker("[% CGI.escapeHTML( config.google_analytics_key ) %]"); + pageTracker._trackPageview(); </script> [% END %]

1 0

r1202 - website/publish/includes
by svnadmin＠urchin.earth.li 30 Jul '08

30 Jul '08

Author: dom Date: 2008-07-30 23:40:38 +0100 (Wed, 30 Jul 2008) New Revision: 1202 Modified: website/publish/includes/header.inc Log: merge to publish Modified: website/publish/includes/header.inc =================================================================== --- website/publish/includes/header.inc 2008-07-30 21:54:54 UTC (rev 1201) +++ website/publish/includes/header.inc 2008-07-30 22:40:38 UTC (rev 1202) @@ -23,7 +23,7 @@ <a class="hide" href="information">Project</a>  <ul>

1 0

r1201 - website/preview/includes
by svnadmin＠urchin.earth.li 30 Jul '08

30 Jul '08

Author: katstevens Date: 2008-07-30 22:54:54 +0100 (Wed, 30 Jul 2008) New Revision: 1201 Modified: website/preview/includes/header.inc Log: edited broken hyperlink Modified: website/preview/includes/header.inc =================================================================== --- website/preview/includes/header.inc 2008-07-26 17:11:00 UTC (rev 1200) +++ website/preview/includes/header.inc 2008-07-30 21:54:54 UTC (rev 1201) @@ -23,7 +23,7 @@ <a class="hide" href="information">Project</a>  <ul>

1 0

r1200 - in website/publish: . css includes
by svnadmin＠urchin.earth.li 26 Jul '08

26 Jul '08

Author: dom Date: 2008-07-26 18:11:00 +0100 (Sat, 26 Jul 2008) New Revision: 1200 Added: website/publish/favicon.ico Modified: website/publish/css/openguides.css website/publish/includes/cities_list.inc Log: merge into publish Modified: website/publish/css/openguides.css =================================================================== --- website/publish/css/openguides.css 2008-07-26 17:08:49 UTC (rev 1199) +++ website/publish/css/openguides.css 2008-07-26 17:11:00 UTC (rev 1200) @@ -10,7 +10,6 @@ body, div, p, th, td { font-family: Helvetica, Arial, sans-serif; - font-size: 12px; line-height: 1.3em; } @@ -73,6 +72,7 @@ #cities_list table { margin: auto; + font-size: 0.8em; } #cities_list table td @@ -84,7 +84,7 @@ { width: 100%; text-align: center; - font-size: 1.2em; + font-size: 1.5em; font-weight: bold; letter-spacing: -0.05em; } @@ -100,7 +100,7 @@ { vertical-align: top; padding: 0px 5px 0px 5px; - line-height: 1.1em; + line-height: 1em; } /* ****** latest news styles ****** */ Copied: website/publish/favicon.ico (from rev 1199, website/preview/favicon.ico) =================================================================== Modified: website/publish/includes/cities_list.inc =================================================================== --- website/publish/includes/cities_list.inc 2008-07-26 17:08:49 UTC (rev 1199) +++ website/publish/includes/cities_list.inc 2008-07-26 17:11:00 UTC (rev 1200) @@ -3,7 +3,7 @@ <div id="cities_list"> <table> <tr> - <td colspan="2" id="cities_list_header">Take me there...</td> + <td colspan="2"><div id="cities_list_header">Take me there...</div></td> </tr> <tr> <th colspan="2">UK</th>

1 0

r1199 - website/preview
by svnadmin＠urchin.earth.li 26 Jul '08

26 Jul '08

Author: dom Date: 2008-07-26 18:08:49 +0100 (Sat, 26 Jul 2008) New Revision: 1199 Added: website/preview/favicon.ico Log: add this back from old site Copied: website/preview/favicon.ico (from rev 1189, website-old/favicon.ico) ===================================================================

1 0

r1198 - in website/preview: css includes
by svnadmin＠urchin.earth.li 26 Jul '08

26 Jul '08

Author: kake Date: 2008-07-26 18:05:17 +0100 (Sat, 26 Jul 2008) New Revision: 1198 Modified: website/preview/css/openguides.css website/preview/includes/cities_list.inc Log: Removed hardcoded font size for the main text. Modified: website/preview/css/openguides.css =================================================================== --- website/preview/css/openguides.css 2008-07-26 16:30:43 UTC (rev 1197) +++ website/preview/css/openguides.css 2008-07-26 17:05:17 UTC (rev 1198) @@ -10,7 +10,6 @@ body, div, p, th, td { font-family: Helvetica, Arial, sans-serif; - font-size: 12px; line-height: 1.3em; } @@ -73,6 +72,7 @@ #cities_list table { margin: auto; + font-size: 0.8em; } #cities_list table td @@ -84,7 +84,7 @@ { width: 100%; text-align: center; - font-size: 1.2em; + font-size: 1.5em; font-weight: bold; letter-spacing: -0.05em; } @@ -100,7 +100,7 @@ { vertical-align: top; padding: 0px 5px 0px 5px; - line-height: 1.1em; + line-height: 1em; } /* ****** latest news styles ****** */ Modified: website/preview/includes/cities_list.inc =================================================================== --- website/preview/includes/cities_list.inc 2008-07-26 16:30:43 UTC (rev 1197) +++ website/preview/includes/cities_list.inc 2008-07-26 17:05:17 UTC (rev 1198) @@ -3,7 +3,7 @@ <div id="cities_list"> <table> <tr> - <td colspan="2" id="cities_list_header">Take me there...</td> + <td colspan="2"><div id="cities_list_header">Take me there...</div></td> </tr> <tr> <th colspan="2">UK</th>

1 0

r1197 - in trunk: . lib lib/OpenGuides
by svnadmin＠urchin.earth.li 26 Jul '08

26 Jul '08

Author: dom Date: 2008-07-26 17:30:43 +0100 (Sat, 26 Jul 2008) New Revision: 1197 Modified: trunk/Changes trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Config.pm trunk/lib/OpenGuides/Search.pm Log: Update references to http://openguides.org moved URLs Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-07-26 16:26:42 UTC (rev 1196) +++ trunk/Changes 2008-07-26 16:30:43 UTC (rev 1197) @@ -20,6 +20,7 @@ * Model relationship of neighborhood to parent city. * Reduce acres of whitespace in output and clean up indenting. Added a Universal Edit Link (http://universaleditbutton.org/) (#254) + Update references to http://openguides.org moved URLs 0.62 8 June 2008 Allow wiki page links (simple: [[Foo]], title: [[Foo|bar]]) in Modified: trunk/lib/OpenGuides/Config.pm =================================================================== --- trunk/lib/OpenGuides/Config.pm 2008-07-26 16:26:42 UTC (rev 1196) +++ trunk/lib/OpenGuides/Config.pm 2008-07-26 16:30:43 UTC (rev 1197) @@ -98,7 +98,7 @@ default_language => "en", http_charset => "", formatting_rules_node => "Text Formatting Examples", - formatting_rules_link => "http://openguides.org/page/text_formatting", + formatting_rules_link => "http://openguides.org/text_formatting", backlinks_in_title => 0, geo_handler => 1, ellipsoid => "WGS-84", @@ -294,7 +294,7 @@ =item * formatting_rules_node (default: C<Text Formatting Examples>) -=item * formatting_rules_link (default: C<http://openguides.org/page/text_formatting> +=item * formatting_rules_link (default: C<http://openguides.org/text_formatting> =item * backlinks_in_title (default: false) Modified: trunk/lib/OpenGuides/Search.pm =================================================================== --- trunk/lib/OpenGuides/Search.pm 2008-07-26 16:26:42 UTC (rev 1196) +++ trunk/lib/OpenGuides/Search.pm 2008-07-26 16:30:43 UTC (rev 1197) @@ -184,7 +184,7 @@ my %tt_vars = ( format => $args{'vars'}->{'format'}, ss_version => $VERSION, - ss_info_url => 'http://openguides.org/page/search_help' + ss_info_url => 'http://openguides.org/search_help' ); my $doing_search; Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2008-07-26 16:26:42 UTC (rev 1196) +++ trunk/lib/OpenGuides.pm 2008-07-26 16:30:43 UTC (rev 1197) @@ -1214,7 +1214,7 @@ </description> <homepage rdf:resource="http://openguides.org/" /> - <mailing-list rdf:resource="http://openguides.org/mm/listinfo/openguides-dev/" /> + <mailing-list rdf:resource="http://lists.openguides.org/mailman/listinfo/openguides-dev/" /> <mailing-list rdf:resource="http://urchin.earth.li/mailman/listinfo/openguides-commits/" /> <maintainer> @@ -1324,7 +1324,7 @@ development site</a>. </p> <p> -Copyright ©2003-2007, <a href="http://openguides.org/">The OpenGuides +Copyright ©2003-2008, <a href="http://openguides.org/">The OpenGuides Project</a>. "OpenGuides", "[The] Open Guide To..." and "The guides made by you" are trademarks of The OpenGuides Project. Any uses on this site are made with permission.

1 0

r1196 - in website: preview publish
by svnadmin＠urchin.earth.li 26 Jul '08

26 Jul '08

Author: dom Date: 2008-07-26 17:26:42 +0100 (Sat, 26 Jul 2008) New Revision: 1196 Modified: website/preview/.htaccess website/publish/.htaccess Log: link hard-coded into OpenGuides Modified: website/preview/.htaccess =================================================================== --- website/preview/.htaccess 2008-07-26 15:15:31 UTC (rev 1195) +++ website/preview/.htaccess 2008-07-26 16:26:42 UTC (rev 1196) @@ -1,3 +1,4 @@ Options +MultiViews Redirect permanent /page/ http://openguides.org/ Redirect permanent /london http://london.openguides.org +Redirect permanent /mm/listinfo http://lists.openguides.org/mailman/listinfo Modified: website/publish/.htaccess =================================================================== --- website/publish/.htaccess 2008-07-26 15:15:31 UTC (rev 1195) +++ website/publish/.htaccess 2008-07-26 16:26:42 UTC (rev 1196) @@ -1,3 +1,4 @@ Options +MultiViews Redirect permanent /page/ http://openguides.org/ Redirect permanent /london http://london.openguides.org +Redirect permanent /mm/listinfo http://lists.openguides.org/mailman/listinfo

1 0

r1195 - in website: preview publish
by svnadmin＠urchin.earth.li 26 Jul '08

26 Jul '08

Author: dom Date: 2008-07-26 16:15:31 +0100 (Sat, 26 Jul 2008) New Revision: 1195 Modified: website/preview/.htaccess website/publish/.htaccess Log: fix redirect Modified: website/preview/.htaccess =================================================================== --- website/preview/.htaccess 2008-07-26 15:14:18 UTC (rev 1194) +++ website/preview/.htaccess 2008-07-26 15:15:31 UTC (rev 1195) @@ -1,3 +1,3 @@ Options +MultiViews Redirect permanent /page/ http://openguides.org/ -Redirect permanent /london/ http://london.openguide.org/ +Redirect permanent /london http://london.openguides.org Modified: website/publish/.htaccess =================================================================== --- website/publish/.htaccess 2008-07-26 15:14:18 UTC (rev 1194) +++ website/publish/.htaccess 2008-07-26 15:15:31 UTC (rev 1195) @@ -1,3 +1,3 @@ Options +MultiViews Redirect permanent /page/ http://openguides.org/ -Redirect permanent /london/ http://london.openguide.org/ +Redirect permanent /london http://london.openguides.org

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits