From owner-svn-src-user@FreeBSD.ORG Wed May 21 16:44:37 2014 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2C650253; Wed, 21 May 2014 16:44:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1905A288D; Wed, 21 May 2014 16:44:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4LGia1u097857; Wed, 21 May 2014 16:44:36 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4LGia14097850; Wed, 21 May 2014 16:44:36 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201405211644.s4LGia14097850@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Wed, 21 May 2014 16:44:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r266502 - in user/des/fbce: lib/FBCE/Schema/Result lib/FBCE/View lib/Template root/run root/see X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 May 2014 16:44:37 -0000 Author: des Date: Wed May 21 16:44:35 2014 New Revision: 266502 URL: http://svnweb.freebsd.org/changeset/base/266502 Log: Backport the WikiFormat TT filter from FBP. Added: user/des/fbce/lib/Template/ - copied from r266473, user/des/fbp/lib/Template/ Modified: user/des/fbce/lib/FBCE/Schema/Result/Statement.pm user/des/fbce/lib/FBCE/View/HTML.pm user/des/fbce/root/run/index.tt user/des/fbce/root/run/register.tt user/des/fbce/root/see/candidate.tt Modified: user/des/fbce/lib/FBCE/Schema/Result/Statement.pm ============================================================================== --- user/des/fbce/lib/FBCE/Schema/Result/Statement.pm Wed May 21 16:43:26 2014 (r266501) +++ user/des/fbce/lib/FBCE/Schema/Result/Statement.pm Wed May 21 16:44:35 2014 (r266502) @@ -124,15 +124,6 @@ __PACKAGE__->belongs_to( # Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-03-10 19:05:50 # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:8wDb6dHYSG6Eoe9bdNnm8Q -use Text::WikiFormat; - -sub long_html($) { - my ($self) = @_; - - return Text::WikiFormat::format($self->long, {}, { - implicit_links => 0, extended => 1, absolute_links => 1 }); -} - 1; # $FreeBSD$ Modified: user/des/fbce/lib/FBCE/View/HTML.pm ============================================================================== --- user/des/fbce/lib/FBCE/View/HTML.pm Wed May 21 16:43:26 2014 (r266501) +++ user/des/fbce/lib/FBCE/View/HTML.pm Wed May 21 16:44:35 2014 (r266502) @@ -1,9 +1,9 @@ +use utf8; package FBCE::View::HTML; +use Moose; +use namespace::autoclean; -use strict; -use warnings; - -use base 'Catalyst::View::TT'; +extends 'Catalyst::View::TT'; __PACKAGE__->config( TEMPLATE_EXTENSION => '.tt', @@ -25,7 +25,7 @@ L =head1 AUTHOR -Dag-Erling Smørgrav +Dag-Erling Smørgrav =head1 LICENSE Modified: user/des/fbce/root/run/index.tt ============================================================================== --- user/des/fbce/root/run/index.tt Wed May 21 16:43:26 2014 (r266501) +++ user/des/fbce/root/run/index.tt Wed May 21 16:44:35 2014 (r266502) @@ -1,3 +1,4 @@ +[% USE WikiFormat %] [% PROCESS lib/html_top %] [% PROCESS lib/header %] [% WRAPPER lib/main %] @@ -10,9 +11,9 @@

You have registered as a candidate in the [% title %]. You have provided the following statement:

-

[% user.statement.short | html %]

+

[% user.statement.short | wiki %]

- [% user.statement.long_html %] + [% user.statement.long | wiki %]
[% IF nominating == 0 %] Modified: user/des/fbce/root/run/register.tt ============================================================================== --- user/des/fbce/root/run/register.tt Wed May 21 16:43:26 2014 (r266501) +++ user/des/fbce/root/run/register.tt Wed May 21 16:44:35 2014 (r266502) @@ -16,7 +16,7 @@

Slogan

-

Statement (WikiFormat)

+

Statement (WikiFormat)

Modified: user/des/fbce/root/see/candidate.tt ============================================================================== --- user/des/fbce/root/see/candidate.tt Wed May 21 16:43:26 2014 (r266501) +++ user/des/fbce/root/see/candidate.tt Wed May 21 16:44:35 2014 (r266502) @@ -1,3 +1,4 @@ +[% USE WikiFormat %] [% PROCESS lib/html_top %] [% PROCESS lib/header %] [% WRAPPER lib/main %] @@ -8,9 +9,9 @@ [% IF candidate.incumbent %]

(incumbent)

[% END %]
-

[% candidate.statement.short | html %]

+

[% candidate.statement.short | wiki %]

- [% candidate.statement.long_html %] + [% candidate.statement.long | wiki %]