Author: dom Date: 2006-09-12 09:37:13 +0100 (Tue, 12 Sep 2006) New Revision: 856

Modified: trunk/lib/OpenGuides.pm trunk/templates/admin_home.tt Log: Fix bugs introduced by me (readd moderate variable, fix up template to use correct variables

Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-09-12 07:47:51 UTC (rev 855) +++ trunk/lib/OpenGuides.pm 2006-09-12 08:37:13 UTC (rev 856) @@ -1432,6 +1432,9 @@ my @categories; my @locales; for my $node (@all_nodes) { + # Add moderation status + $node->{'moderate'} = $wiki->node_required_moderation($node->{'name'}); + # Make the URLs my $node_param = uri_escape( $formatter->node_name_to_node_param( $node->{'name'} ) ); $node->{'view_url'} = $script_name . "?id=" . $node_param;

Modified: trunk/templates/admin_home.tt =================================================================== --- trunk/templates/admin_home.tt 2006-09-12 07:47:51 UTC (rev 855) +++ trunk/templates/admin_home.tt 2006-09-12 08:37:13 UTC (rev 856) @@ -5,7 +5,7 @@ <div id="maincontent"> [% IF completed_action %] <br /> - <div style="color: #A0C745">[% completed_action %]</div> + <div class="admin_completed_action">[% completed_action %]</div> [% END %] <h2>Site Administration</h2> <ul> @@ -45,7 +45,7 @@ <td class="admin_name"><a href="[% locale.view_url %]">[% locale.name %]</a></td> <td class="admin_version">[% locale.version %]</td> <td class="admin_lastmode">[% locale.last_modified %]</td> - <td class="admin_moderate">[% IF node.moderate %]yes[% ELSE %]no[% END %]</td> + <td class="admin_moderate">[% IF locale.moderate %]yes[% ELSE %]no[% END %]</td> <td class="admin_action"> <a href="[% locale.versions_url %]">View all versions</a> or <a href="[% locale.moderation_url %]">Set moderation</a> @@ -64,7 +64,7 @@ <td class="admin_name"><a href="[% cat.view_url %]">[% cat.name %]</a></td> <td class="admin_version">[% cat.version %]</td> <td class="admin_lastmode">[% cat.last_modified %]</td> - <td class="admin_moderate">[% IF node.moderate %]yes[% ELSE %]no[% END %]</td> + <td class="admin_moderate">[% IF cat.moderate %]yes[% ELSE %]no[% END %]</td> <td class="admin_action"> <a href="[% cat.versions_url %]">View all versions</a> or <a href="[% cat.moderation_url %]">Set moderation</a>