r867 - in trunk: . lib lib/OpenGuides templates - openguides-commits

17 Sep 2006

Author: dom
Date: 2006-09-17 13:42:27 +0100 (Sun, 17 Sep 2006)
New Revision: 867
Modified:
   trunk/lib/OpenGuides.pm
   trunk/lib/OpenGuides/Utils.pm
   trunk/templates/map_index.tt
   trunk/templates/node.tt
   trunk/templates/node_history.tt
   trunk/templates/recent_changes.tt
   trunk/templates/search.tt
   trunk/wiki.cgi
Log:
&/&amp; -> ;
Modified: trunk/lib/OpenGuides/Utils.pm
===================================================================

--- trunk/lib/OpenGuides/Utils.pm	2006-09-14 07:42:36 UTC (rev 866)
+++ trunk/lib/OpenGuides/Utils.pm	2006-09-17 12:42:27 UTC (rev 867)
@@ -204,7 +204,7 @@
         macros              => %macros,
         pass_wiki_to_macros => 1,
         node_prefix         => "$script_name?",
-        edit_prefix         => "$script_name?action=edit&id=",
+        edit_prefix         => "$script_name?action=edit;id=",
         munge_urls          => 1,
     );
Modified: trunk/lib/OpenGuides.pm
===================================================================
--- trunk/lib/OpenGuides.pm	2006-09-14 07:42:36 UTC (rev 866)
+++ trunk/lib/OpenGuides.pm	2006-09-17 12:42:27 UTC (rev 867)
@@ -1233,7 +1233,7 @@
             my $script_url = $self->config->script_url;
             my $script_name = $self->config->script_name;
             my $q = CGI->new;
-            my $output = $q->redirect( $script_url.$script_name."?action=admin&moderation=changed" );
+            my $output = $q->redirect( $script_url.$script_name."?action=admin;moderation=changed" );
             return $output if $return_output;
             print $output;
         }
@@ -1277,7 +1277,7 @@
                       deter_robots  => 1,
                       version       => $version,
                       moderation_action => 'moderate',
-                      moderation_url_args => 'action=moderate&version='.$version
+                      moderation_url_args => 'action=moderate;version='.$version
                   );
my $password = $args{password};
@@ -1315,7 +1315,7 @@
             my $script_url = $self->config->script_url;
             my $script_name = $self->config->script_name;
             my $q = CGI->new;
-            my $output = $q->redirect( $script_url.$script_name."?action=admin&moderation=moderated" );
+            my $output = $q->redirect( $script_url.$script_name."?action=admin;moderation=moderated" );
             return $output if $return_output;
             print $output;
         }
Modified: trunk/templates/map_index.tt
===================================================================
--- trunk/templates/map_index.tt	2006-09-14 07:42:36 UTC (rev 866)
+++ trunk/templates/map_index.tt	2006-09-17 12:42:27 UTC (rev 867)
@@ -53,7 +53,7 @@
         var center = map.getCenterLatLng();
         var link = document.getElementById('permalink');
         var zoom = map.getZoomLevel();
-        link.href = "?action=index;format=map&long="+center.x+"&lat="+center.y+"&zoom="+zoom;
+        link.href = "?action=index;format=map;long="+center.x+";lat="+center.y+";zoom="+zoom;
       }
       GEvent.addListener(map, "moveend", map_recenter );
     //]]>
Modified: trunk/templates/node.tt
===================================================================
--- trunk/templates/node.tt	2006-09-14 07:42:36 UTC (rev 866)
+++ trunk/templates/node.tt	2006-09-17 12:42:27 UTC (rev 867)
@@ -29,7 +29,7 @@
   [% IF backlinks_in_title AND is_indexable_node %]
     <h2 class="node_name"><a href="[% cgi_url %]?action=index;index_type=[% CGI.escape(index_type) %];index_value=[% CGI.escape(index_value) %]">[% node_name %]</a></h2>
   [% ELSIF backlinks_in_title %]
-    <h2 class="node_name"><a href="[% cgi_url %]?action=show_backlinks&id=[% CGI.escape(node_name) %]">[% node_name %]</a></h2>
+    <h2 class="node_name"><a href="[% cgi_url %]?action=show_backlinks;id=[% CGI.escape(node_name) %]">[% node_name %]</a></h2>
   [% ELSE %]
     <h2 class="node_name">[% node_name %]</h2>
   [% END %]
Modified: trunk/templates/node_history.tt
===================================================================
--- trunk/templates/node_history.tt	2006-09-14 07:42:36 UTC (rev 866)
+++ trunk/templates/node_history.tt	2006-09-17 12:42:27 UTC (rev 867)
@@ -13,16 +13,16 @@
 <ul>
 [% FOREACH revision = history %]
   <li>
-      <a href="[% cgi_url %]?id=[% node_param %]&version=[% revision.version %]">Version [% revision.version %]</a>
+      <a href="[% cgi_url %]?id=[% node_param %];version=[% revision.version %]">Version [% revision.version %]</a>
       [% IF revision.version != version %]
       (diff:
-      [% UNLESS revision.version == 1 %]<a href="[% cgi_url %]?id=[% node_param %]&version=[% revision.version - 1 %]&diffversion=[% revision.version %]">previous</a> / [% END %] 
-      <a href="[% cgi_url %]?id=[% node_param %]&version=[% revision.version %]&diffversion=[% version %]">current</a>)
+      [% UNLESS revision.version == 1 %]<a href="[% cgi_url %]?id=[% node_param %];version=[% revision.version - 1 %];diffversion=[% revision.version %]">previous</a> / [% END %] 
+      <a href="[% cgi_url %]?id=[% node_param %];version=[% revision.version %];diffversion=[% version %]">current</a>)
       [% END %] 
       .....
       [% revision.modified %]
       [% IF revision.username %]
-        by <a href="[% cgi_url %]?username=[% revision.username %]&action=userstats">[% revision.username %]</a>
+        by <a href="[% cgi_url %]?username=[% revision.username %];action=userstats">[% revision.username %]</a>
       [% END %]
       [% IF revision.comment %]
         <b>[[% revision.comment %]]</b>
Modified: trunk/templates/recent_changes.tt
===================================================================
--- trunk/templates/recent_changes.tt	2006-09-14 07:42:36 UTC (rev 866)
+++ trunk/templates/recent_changes.tt	2006-09-17 12:42:27 UTC (rev 867)
@@ -24,7 +24,7 @@
         <td class="recentchanges_node_name"><a href="[% node.url %]">[% node.name %]</a></td>
         <td class="recentchanges_meta">
           [% IF node.version > 1 %]
-            (<a href="[% cgi_url %]?id=[% node.name %]&version=[% node.version - 1 %]&diffversion=[% node.version %]">diff</a>)
+            (<a href="[% cgi_url %]?id=[% node.name %];version=[% node.version - 1 %];diffversion=[% node.version %]">diff</a>)
             (<a href="[% cgi_url %]?action=list_all_versions;id=[% node.name %]">history</a>) 
           [% ELSE %]
             (new page)
Modified: trunk/templates/search.tt
===================================================================
--- trunk/templates/search.tt	2006-09-14 07:42:36 UTC (rev 866)
+++ trunk/templates/search.tt	2006-09-17 12:42:27 UTC (rev 867)
@@ -80,7 +80,7 @@
       <p>
       Matches [% first_num %] - [% last_num %] of [% total_num %]. 
       [% IF (first_num > 20) %]
-        <a href="search.cgi?search=[% search_terms %]&next=[% first_num - 21 %]">Previous 20 results</a> 
+        <a href="search.cgi?search=[% search_terms %];next=[% first_num - 21 %]">Previous 20 results</a> 
       [% END %] 
       [% IF ((first_num > 20) and next_page_startpos) %]
       /
Modified: trunk/wiki.cgi
===================================================================
--- trunk/wiki.cgi	2006-09-14 07:42:36 UTC (rev 866)
+++ trunk/wiki.cgi	2006-09-17 12:42:27 UTC (rev 867)
@@ -405,9 +405,9 @@
     foreach my $node (@nodes) {
         my $node_param =
             uri_escape($formatter->node_name_to_node_param($node->{'name'}));
-        $node->{'moderate_url'} = $script_name . "?action=moderate&id=".$node_param."&version=".$node->{'version'};
-        $node->{'view_url'} = $script_name . "?id=".$node_param."&version=".$node->{'version'};
-        $node->{'diff_url'} = $script_name . "?id=".$node_param."&version=".$node->{'moderated_version'}."&diffversion=".$node->{'version'};
+        $node->{'moderate_url'} = $script_name . "?action=moderate;id=".$node_param.";version=".$node->{'version'};
+        $node->{'view_url'} = $script_name . "?id=".$node_param.";version=".$node->{'version'};
+        $node->{'diff_url'} = $script_name . "?id=".$node_param.";version=".$node->{'moderated_version'}.";diffversion=".$node->{'version'};
         $node->{'delete_url'} = $script_name . "?action=delete;version=".$node->{'version'}.";id=".$node_param;
     }

    