Changeset 852


Ignore:
Timestamp:
Sep 11, 2006, 8:55:40 AM (15 years ago)
Author:
Dominic Hargreaves
Message:

More cleanups after nick in admin code:

  • remove unnecessary capitalization
  • fix all links to wiki.cgi
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/OpenGuides.pm

    r844 r852  
    214214        $tt_vars{common_categories} = $config->enable_common_categories;
    215215        $tt_vars{common_locales} = $config->enable_common_locales;
    216         $tt_vars{catloc_link} = $config->script_url . "?id=";
     216        $tt_vars{catloc_link} = $config->script_name . "?id=";
    217217    }
    218218
     
    13421342    my $wiki = $self->wiki;
    13431343    my $formatter = $self->wiki->formatter;
    1344     my $script_url = $self->config->script_url;
     1344    my $script_name = $self->config->script_name;
    13451345
    13461346    my ($metadata_type, $metadata_value, $exclude_locales, $exclude_categories)
     
    13821382        # Save into the hash
    13831383        $n{'name'} = $node;
    1384         $n{'view_url'} = $script_url . "?id=" . $node_param;
    1385         $n{'edit_url'} = $script_url . "?id=" . $node_param . ";action=edit";
     1384        $n{'view_url'} = $script_name . "?id=" . $node_param;
     1385        $n{'edit_url'} = $script_name . "?id=" . $node_param . ";action=edit";
    13861386        push @tt_nodes, \%n;
    13871387    }
     
    14231423    my $wiki = $self->wiki;
    14241424    my $formatter = $self->wiki->formatter;
    1425     my $script_url = $self->config->script_url;
     1425    my $script_name = $self->config->script_name;
    14261426
    14271427    # Grab all the nodes
     
    14371437        # Make the URLs
    14381438        my $node_param = uri_escape( $formatter->node_name_to_node_param( $node->{'name'} ) );
    1439         $node->{'view_url'} = $script_url . "?id=" . $node_param;
    1440         $node->{'versions_url'} = $script_url . "?action=list_all_versions;id=" . $node_param;
    1441         $node->{'moderation_url'} = $script_url . "?action=set_moderation;id=" . $node_param;
     1439        $node->{'view_url'} = $script_name . "?id=" . $node_param;
     1440        $node->{'versions_url'} = $script_name .
     1441                        "?action=list_all_versions;id=" . $node_param;
     1442        $node->{'moderation_url'} = $script_name .
     1443                        "?action=set_moderation;id=" . $node_param;
    14421444
    14431445        # Filter
     
    14591461    if($args{moderation_completed}) {
    14601462        if($args{moderation_completed} eq "moderation") {
    1461             $completed_action = "Version Moderated";
     1463            $completed_action = "Version moderated";
    14621464        }
    14631465        if($args{moderation_completed} eq "changed") {
    1464             $completed_action = "Node Moderate Flag Changed";
     1466            $completed_action = "Node moderation flag changed";
    14651467        }
    14661468    }
  • trunk/templates/admin_home.tt

    r835 r852  
    1313        <li><a href="#locales">Locales</a></li>
    1414        <li><a href="#categories">Categories</a></li>
    15         <li><a href="?action=show_needing_moderation">Pages Needing Moderation</a>
    16         <li><a href="?action=show_missing_metadata">Pages Missing Metadata</a>
     15        <li><a href="[% cgi_url %]?action=show_needing_moderation">Pages needing moderation</a>
     16        <li><a href="[% cgi_url %]?action=show_missing_metadata">Pages missing metadata</a>
    1717</ul>
    1818
     
    2626     <td class="admin_moderate">[% IF node.moderate %]yes[% ELSE %]no[% END %]</td>
    2727     <td class="admin_action">
    28          <a href="[% node.view_url %]">View</a> or
    2928         <a href="[% node.versions_url %]">View all versions</a> or
    30          <a href="[% node.moderation_url %]">Set Moderation</a>
     29         <a href="[% node.moderation_url %]">Set moderation</a>
    3130     </td>
    3231     </tr>
     
    4544     <td class="admin_moderate">[% IF node.moderate %]yes[% ELSE %]no[% END %]</td>
    4645     <td class="admin_action">
    47         <a href="[% locale.view_url %]">View</a> or
    4846        <a href="[% locale.versions_url %]">View all versions</a> or
    49         <a href="[% locale.moderation_url %]">Set Moderation</a>
     47        <a href="[% locale.moderation_url %]">Set moderation</a>
    5048     </td>
    5149     </tr>
     
    6462     <td class="admin_moderate">[% IF node.moderate %]yes[% ELSE %]no[% END %]</td>
    6563     <td class="admin_action">
    66          <a href="[% cat.view_url %]">View</a> or
    6764         <a href="[% cat.versions_url %]">View all versions</a> or
    68          <a href="[% cat.moderation_url %]">Set Moderation</a>
     65         <a href="[% cat.moderation_url %]">Set moderation</a>
    6966     </td>
    7067     </tr>
  • trunk/templates/moderate_confirm.tt

    r836 r852  
    3232  <strong>Password:</strong>
    3333  <input type="password" name="password" />
    34   <input type="submit" value="Action Moderation" />
     34  <input type="submit" value="Go!" />
    3535</form>
    3636
  • trunk/wiki.cgi

    r841 r852  
    402402        my $node_param =
    403403            uri_escape($formatter->node_name_to_node_param($node->{'name'}));
    404         $node->{'moderate_url'} = $script_url . "?action=moderate&id=".$node_param."&version=".$node->{'version'};
    405         $node->{'view_url'} = $script_url . "?id=".$node_param."&version=".$node->{'version'};
    406         $node->{'diff_url'} = $script_url . "?id=".$node_param."&version=".$node->{'moderated_version'}."&diffversion=".$node->{'version'};
     404        $node->{'moderate_url'} = $script_name . "?action=moderate&id=".$node_param."&version=".$node->{'version'};
     405        $node->{'view_url'} = $script_name . "?id=".$node_param."&version=".$node->{'version'};
     406        $node->{'diff_url'} = $script_name . "?id=".$node_param."&version=".$node->{'moderated_version'}."&diffversion=".$node->{'version'};
    407407    }
    408408
Note: See TracChangeset for help on using the changeset viewer.