projects / plack-app-gruntmaster.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 27eae7c)
Move header / footer to a separate module and update MANIFEST
authorMarius Gavrilescu <marius@ieval.ro>
Sun, 1 Dec 2013 20:09:49 +0000 (22:09 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Sun, 1 Dec 2013 20:09:49 +0000 (22:09 +0200)
MANIFEST patch | blob | blame | history
lib/Gruntmaster/Page.pm patch | blob | blame | history
lib/Gruntmaster/Page/Common.pm [new file with mode: 0644] patch | blob
lib/Gruntmaster/Page/Ct.pm patch | blob | blame | history
lib/Gruntmaster/Page/Ct/Entry.pm patch | blob | blame | history
lib/Gruntmaster/Page/Index.pm patch | blob | blame | history
lib/Gruntmaster/Page/Log.pm patch | blob | blame | history
lib/Gruntmaster/Page/Log/Entry.pm patch | blob | blame | history
lib/Gruntmaster/Page/Pb.pm patch | blob | blame | history
lib/Gruntmaster/Page/Pb/Entry.pm patch | blob | blame | history
lib/Gruntmaster/Page/Submit.pm patch | blob | blame | history

diff --git a/MANIFEST b/MANIFEST
index 1464eb1959c949a14e6d9c3f6e608ca5568595a9..80ce6d43105082ba0ad14e0ac9ad43731cf6a8e6 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,6 +1,9 @@
-
 Changes
+gruntmaster-genallpages
 gruntmaster-genpage
+lib/Gruntmaster/Page/Common.pm
+lib/Gruntmaster/Page/Ct/Entry.pm
+lib/Gruntmaster/Page/Ct.pm
 lib/Gruntmaster/Page/Index.pm
 lib/Gruntmaster/Page/Log/Entry.pm
 lib/Gruntmaster/Page/Log.pm
diff --git a/lib/Gruntmaster/Page.pm b/lib/Gruntmaster/Page.pm
index d014ac18fa8064ca71d15db4c24edc3e356e6d11..12e732958878d9fd6a7fc855b97194ec7b5816e0 100644 (file)
--- a/lib/Gruntmaster/Page.pm
+++ b/lib/Gruntmaster/Page.pm
@@ -4,7 +4,7 @@ use 5.014000;
 use strict;
 use warnings;
 use parent qw/Exporter/;
-our @EXPORT_OK = qw/generate header footer/;
+our @EXPORT_OK = qw/generate/;
 
 use File::Basename qw/fileparse/;
 use File::Slurp qw/write_file/;
@@ -19,44 +19,6 @@ use constant CONTENT_TYPES => {
   txt => 'text/plain; charset=UTF-8',
 };
 
-my %header_templates = (
-  en => <<'HTML',
-<!DOCTYPE html>
-<title>TITLE_GOES_HERE</title>
-<link rel="stylesheet" href="/gm.css">
-<script src="/jquery-2.0.3.min.js"></script>
-<script src="/view.js"></script>
-<meta charset="utf-8">
-
-<span id="admin"></span>
-<div id="title"><span class="i">i</span><span class="Eval">Eval</span></div>
-<div id="subtitle">TITLE_GOES_HERE</div>
-
-<nav><ul><li><a href="/">Home</a><li><a href="/log/">View job log</a><li><a href="/submit.var">Submit job</a><li><a href="/pb/">Problem list</a><li><a href="/ct/">Contests</a></ul></nav>
-
-HTML
-);
-
-my %footer_templates = (
-  en => <<'HTML',
-
-<footer>
-Dilmom: Why don't you call your product the Gruntmaster 6000?
-Dilbert: What kind of product do you see when you imagine a Gruntmaster 6000?
-Dilmom: Well, it's a stripped-down version of the Gruntmaster 9000, of course. But it's software-upgradeable.
-</footer>
-HTML
-);
-
-sub header{
-  my ($language, $title) = @_;
-  $header_templates{$language} =~ s/TITLE_GOES_HERE/$title/ger;
-}
-
-sub footer{
-  $footer_templates{$_[0]};
-}
-
 sub declaregen{
   my ($generator, $regex) = @_;
   $generator = "Gruntmaster::Page::$generator";
diff --git a/lib/Gruntmaster/Page/Common.pm b/lib/Gruntmaster/Page/Common.pm
new file mode 100644 (file)
index 0000000..5ed4050
--- /dev/null
+++ b/lib/Gruntmaster/Page/Common.pm
@@ -0,0 +1,47 @@
+package Gruntmaster::Page::Common;
+
+use 5.014000;
+use strict;
+use warnings;
+use parent qw/Exporter/;
+our @EXPORT_OK = qw/header footer/;
+
+my %header_templates = (
+  en => <<'HTML',
+<!DOCTYPE html>
+<title>TITLE_GOES_HERE</title>
+<link rel="stylesheet" href="/gm.css">
+<script src="/jquery-2.0.3.min.js"></script>
+<script src="/view.js"></script>
+<meta charset="utf-8">
+
+<span id="admin"></span>
+<div id="title"><span class="i">i</span><span class="Eval">Eval</span></div>
+<div id="subtitle">TITLE_GOES_HERE</div>
+
+<nav><ul><li><a href="/">Home</a><li><a href="/log/">View job log</a><li><a href="/submit.var">Submit job</a><li><a href="/pb/">Problem list</a><li><a href="/ct/">Contests</a></ul></nav>
+
+HTML
+);
+
+my %footer_templates = (
+  en => <<'HTML',
+
+<footer>
+Dilmom: Why don't you call your product the Gruntmaster 6000?
+Dilbert: What kind of product do you see when you imagine a Gruntmaster 6000?
+Dilmom: Well, it's a stripped-down version of the Gruntmaster 9000, of course. But it's software-upgradeable.
+</footer>
+HTML
+);
+
+sub header{
+  my ($language, $title) = @_;
+  $header_templates{$language} =~ s/TITLE_GOES_HERE/$title/ger;
+}
+
+sub footer{
+  $footer_templates{$_[0]};
+}
+
+1;
diff --git a/lib/Gruntmaster/Page/Ct.pm b/lib/Gruntmaster/Page/Ct.pm
index c222e62217b05a2d8a16f3617b1c00a76ea252ad..5a04b3adc20cbe33a4b8c307b80ad8e4df28ec91 100644 (file)
--- a/lib/Gruntmaster/Page/Ct.pm
+++ b/lib/Gruntmaster/Page/Ct.pm
@@ -14,7 +14,7 @@ use HTML::Template::Compiled;
 use IO::File;
 use POSIX qw/strftime/;
 use YAML::Any qw/LoadFile/;
-use Gruntmaster::Page qw/header footer/;
+use Gruntmaster::Page::Common qw/header footer/;
 
 my %templates = (
   en => <<'HTML',
diff --git a/lib/Gruntmaster/Page/Ct/Entry.pm b/lib/Gruntmaster/Page/Ct/Entry.pm
index 625020d8372e1ee0f01f8cb1e468c1c898c28b43..50ee0c2b259d1879f77e5233cea04e91df776b38 100644 (file)
--- a/lib/Gruntmaster/Page/Ct/Entry.pm
+++ b/lib/Gruntmaster/Page/Ct/Entry.pm
@@ -14,7 +14,7 @@ use POSIX qw/strftime/;
 use YAML::Any qw/LoadFile/;
 use File::Basename qw/fileparse/;
 use File::Slurp qw/slurp/;
-use Gruntmaster::Page qw/header footer/;
+use Gruntmaster::Page::Common qw/header footer/;
 
 use constant TITLE => '<tmpl_var name>';
 
diff --git a/lib/Gruntmaster/Page/Index.pm b/lib/Gruntmaster/Page/Index.pm
index 5cf282de00963fe064b7b68ef79fbc491181cb0f..604be12c057c27eb721687b12e3d39b043eb7101 100644 (file)
--- a/lib/Gruntmaster/Page/Index.pm
+++ b/lib/Gruntmaster/Page/Index.pm
@@ -12,7 +12,7 @@ use constant TITLE => 'Gruntmaster 6000';
 use Fcntl qw/:flock/;
 use HTML::Template::Compiled;
 use IO::File;
-use Gruntmaster::Page qw/header footer/;
+use Gruntmaster::Page::Common qw/header footer/;
 
 my %templates = (
   en => <<'HTML',
diff --git a/lib/Gruntmaster/Page/Log.pm b/lib/Gruntmaster/Page/Log.pm
index 957b5102e64b031b2d11b914a9a50de9a6dcf91d..c92bf4d82ab962cfbab64f9df3a31b1ddd6db562 100644 (file)
--- a/lib/Gruntmaster/Page/Log.pm
+++ b/lib/Gruntmaster/Page/Log.pm
@@ -14,7 +14,7 @@ use HTML::Template::Compiled;
 use IO::File;
 use POSIX qw/strftime/;
 use YAML::Any qw/LoadFile/;
-use Gruntmaster::Page qw/header footer/;
+use Gruntmaster::Page::Common qw/header footer/;
 
 my %templates = (
   en => <<'HTML',
diff --git a/lib/Gruntmaster/Page/Log/Entry.pm b/lib/Gruntmaster/Page/Log/Entry.pm
index 4dd13baaef7eeb54fdd4952cdef894e857a778a6..e849876d2a67a32f9abe138457c63d4242e652a8 100644 (file)
--- a/lib/Gruntmaster/Page/Log/Entry.pm
+++ b/lib/Gruntmaster/Page/Log/Entry.pm
@@ -14,7 +14,7 @@ use HTML::Template::Compiled;
 use IO::File;
 use POSIX qw/strftime/;
 use YAML::Any qw/LoadFile/;
-use Gruntmaster::Page qw/header footer/;
+use Gruntmaster::Page::Common qw/header footer/;
 
 my %templates = (
   en => <<'HTML',
diff --git a/lib/Gruntmaster/Page/Pb.pm b/lib/Gruntmaster/Page/Pb.pm
index de9db879d98e3cea0171240c8d906e3410e68cc4..617112a539c99a73a3361e8a4e429914f7078754 100644 (file)
--- a/lib/Gruntmaster/Page/Pb.pm
+++ b/lib/Gruntmaster/Page/Pb.pm
@@ -14,7 +14,7 @@ use HTML::Template::Compiled;
 use IO::File;
 use POSIX qw/strftime/;
 use YAML::Any qw/LoadFile/;
-use Gruntmaster::Page qw/header footer/;
+use Gruntmaster::Page::Common qw/header footer/;
 
 my %templates = (
   en => <<'HTML',
diff --git a/lib/Gruntmaster/Page/Pb/Entry.pm b/lib/Gruntmaster/Page/Pb/Entry.pm
index 6252b99877334bad5a3bffb7d218167d6c1f27ee..53cc2102babd8a53c1a4ba73564906be0d924742 100644 (file)
--- a/lib/Gruntmaster/Page/Pb/Entry.pm
+++ b/lib/Gruntmaster/Page/Pb/Entry.pm
@@ -14,7 +14,7 @@ use POSIX qw/strftime/;
 use YAML::Any qw/LoadFile/;
 use File::Basename qw/fileparse/;
 use File::Slurp qw/slurp/;
-use Gruntmaster::Page qw/header footer/;
+use Gruntmaster::Page::Common qw/header footer/;
 
 use constant FORMATS => [qw/CPP/];
 use constant TITLE => '<tmpl_var name>';
diff --git a/lib/Gruntmaster/Page/Submit.pm b/lib/Gruntmaster/Page/Submit.pm
index e6f44deebfcee2e889a78cd2f5d613b5ffec5da8..a57b7b177b05d52f27e77eb0aa219f254f77a320 100644 (file)
--- a/lib/Gruntmaster/Page/Submit.pm
+++ b/lib/Gruntmaster/Page/Submit.pm
@@ -14,7 +14,7 @@ use Fcntl qw/:flock/;
 use HTML::Template::Compiled;
 use IO::File;
 use YAML::Any qw/LoadFile/;
-use Gruntmaster::Page qw/header footer/;
+use Gruntmaster::Page::Common qw/header footer/;
 
 my %templates = (
   en => <<'HTML',
Gruntmaster page generators
This page took 0.018493 seconds and 4 git commands to generate.