Changeset 867


Ignore:
Timestamp:
Sep 17, 2006, 1:42:27 PM (15 years ago)
Author:
Dominic Hargreaves
Message:

&/& -> ;

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/OpenGuides.pm

    r862 r867  
    12341234            my $script_name = $self->config->script_name;
    12351235            my $q = CGI->new;
    1236             my $output = $q->redirect( $script_url.$script_name."?action=admin&moderation=changed" );
     1236            my $output = $q->redirect( $script_url.$script_name."?action=admin;moderation=changed" );
    12371237            return $output if $return_output;
    12381238            print $output;
     
    12781278                      version       => $version,
    12791279                      moderation_action => 'moderate',
    1280                       moderation_url_args => 'action=moderate&version='.$version
     1280                      moderation_url_args => 'action=moderate;version='.$version
    12811281                  );
    12821282
     
    13161316            my $script_name = $self->config->script_name;
    13171317            my $q = CGI->new;
    1318             my $output = $q->redirect( $script_url.$script_name."?action=admin&moderation=moderated" );
     1318            my $output = $q->redirect( $script_url.$script_name."?action=admin;moderation=moderated" );
    13191319            return $output if $return_output;
    13201320            print $output;
  • trunk/lib/OpenGuides/Utils.pm

    r785 r867  
    205205        pass_wiki_to_macros => 1,
    206206        node_prefix         => "$script_name?",
    207         edit_prefix         => "$script_name?action=edit&id=",
     207        edit_prefix         => "$script_name?action=edit;id=",
    208208        munge_urls          => 1,
    209209    );
  • trunk/templates/map_index.tt

    r751 r867  
    5454        var link = document.getElementById('permalink');
    5555        var zoom = map.getZoomLevel();
    56         link.href = "?action=index;format=map&long="+center.x+"&lat="+center.y+"&zoom="+zoom;
     56        link.href = "?action=index;format=map;long="+center.x+";lat="+center.y+";zoom="+zoom;
    5757      }
    5858      GEvent.addListener(map, "moveend", map_recenter );
  • trunk/templates/node.tt

    r844 r867  
    3030    <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>
    3131  [% ELSIF backlinks_in_title %]
    32     <h2 class="node_name"><a href="[% cgi_url %]?action=show_backlinks&id=[% CGI.escape(node_name) %]">[% node_name %]</a></h2>
     32    <h2 class="node_name"><a href="[% cgi_url %]?action=show_backlinks;id=[% CGI.escape(node_name) %]">[% node_name %]</a></h2>
    3333  [% ELSE %]
    3434    <h2 class="node_name">[% node_name %]</h2>
  • trunk/templates/node_history.tt

    r849 r867  
    1414[% FOREACH revision = history %]
    1515  <li>
    16       <a href="[% cgi_url %]?id=[% node_param %]&version=[% revision.version %]">Version [% revision.version %]</a>
     16      <a href="[% cgi_url %]?id=[% node_param %];version=[% revision.version %]">Version [% revision.version %]</a>
    1717      [% IF revision.version != version %]
    1818      (diff:
    19       [% UNLESS revision.version == 1 %]<a href="[% cgi_url %]?id=[% node_param %]&version=[% revision.version - 1 %]&diffversion=[% revision.version %]">previous</a> / [% END %]
    20       <a href="[% cgi_url %]?id=[% node_param %]&version=[% revision.version %]&diffversion=[% version %]">current</a>)
     19      [% UNLESS revision.version == 1 %]<a href="[% cgi_url %]?id=[% node_param %];version=[% revision.version - 1 %];diffversion=[% revision.version %]">previous</a> / [% END %]
     20      <a href="[% cgi_url %]?id=[% node_param %];version=[% revision.version %];diffversion=[% version %]">current</a>)
    2121      [% END %]
    2222      .....
    2323      [% revision.modified %]
    2424      [% IF revision.username %]
    25         by <a href="[% cgi_url %]?username=[% revision.username %]&action=userstats">[% revision.username %]</a>
     25        by <a href="[% cgi_url %]?username=[% revision.username %];action=userstats">[% revision.username %]</a>
    2626      [% END %]
    2727      [% IF revision.comment %]
  • trunk/templates/recent_changes.tt

    r811 r867  
    2525        <td class="recentchanges_meta">
    2626          [% IF node.version > 1 %]
    27             (<a href="[% cgi_url %]?id=[% node.name %]&version=[% node.version - 1 %]&diffversion=[% node.version %]">diff</a>)
     27            (<a href="[% cgi_url %]?id=[% node.name %];version=[% node.version - 1 %];diffversion=[% node.version %]">diff</a>)
    2828            (<a href="[% cgi_url %]?action=list_all_versions;id=[% node.name %]">history</a>)
    2929          [% ELSE %]
  • trunk/templates/search.tt

    r716 r867  
    8181      Matches [% first_num %] - [% last_num %] of [% total_num %].
    8282      [% IF (first_num > 20) %]
    83         <a href="search.cgi?search=[% search_terms %]&next=[% first_num - 21 %]">Previous 20 results</a>
     83        <a href="search.cgi?search=[% search_terms %];next=[% first_num - 21 %]">Previous 20 results</a>
    8484      [% END %]
    8585      [% IF ((first_num > 20) and next_page_startpos) %]
  • trunk/wiki.cgi

    r866 r867  
    406406        my $node_param =
    407407            uri_escape($formatter->node_name_to_node_param($node->{'name'}));
    408         $node->{'moderate_url'} = $script_name . "?action=moderate&id=".$node_param."&version=".$node->{'version'};
    409         $node->{'view_url'} = $script_name . "?id=".$node_param."&version=".$node->{'version'};
    410         $node->{'diff_url'} = $script_name . "?id=".$node_param."&version=".$node->{'moderated_version'}."&diffversion=".$node->{'version'};
     408        $node->{'moderate_url'} = $script_name . "?action=moderate;id=".$node_param.";version=".$node->{'version'};
     409        $node->{'view_url'} = $script_name . "?id=".$node_param.";version=".$node->{'version'};
     410        $node->{'diff_url'} = $script_name . "?id=".$node_param.";version=".$node->{'moderated_version'}.";diffversion=".$node->{'version'};
    411411        $node->{'delete_url'} = $script_name . "?action=delete;version=".$node->{'version'}.";id=".$node_param;
    412412    }
Note: See TracChangeset for help on using the changeset viewer.