Implement Fiksgatami's norwegian_frontpage branch in Catalyst templates.

5 files changed, 27 insertions, 16 deletions

diff --git a/templates/web/default/front/news.html b/templates/web/default/front/news.html
new file mode 100644
index 000000000..080034a28
--- /dev/null
+++ b/templates/web/default/front/news.html
@@ -0,0 +1,11 @@
+[%#
+    news = [
+        { date = '2008-12-11', text = '<a href="' _ c.config.IPHONE_URL _ '">' _ loc('Get FixMyStreet on your iPhone') _ '</a>' },
+    ]
+%]
+[% FOREACH item IN news %]
+    <p align="center" style="margin-bottom:0">
+        <img width="23" height="12" alt="[% loc('New!') %]" src="/i/new.png" border="0">[% item.date %] [% item.text %]</p>
+    </p>
+[% END %]
+
diff --git a/templates/web/default/front_stats.html b/templates/web/default/front/stats.html
index 4b98ef31e..4b98ef31e 100644
--- a/templates/web/default/front_stats.html
+++ b/templates/web/default/front/stats.html
diff --git a/templates/web/default/index.html b/templates/web/default/index.html
index ec07e2e91..4443e060f 100644
--- a/templates/web/default/index.html
+++ b/templates/web/default/index.html
@@ -19,21 +19,7 @@
     [% END %]
 </p>
 
-
-[% #  --- insert iPhone details, not converted from old cgi script yet 
-   #
-   # if (my $url = mySociety::Config::get('IPHONE_URL')) {
-   #     my $getiphone = _("Get FixMyStreet on your iPhone");
-   #     my $new = _("New!");
-   #     if ($q->{site} eq 'fixmystreet') {
-   #         $out .= <<EOF
-   # <p align="center" style="margin-bottom:0">
-   # <img width="23" height="12" alt="$new" src="/i/new.png" border="0">
-   # <a href="$url">$getiphone</a>
-   # </p>
-   # EOF
-   # }
-%]
+[% TRY %][% INCLUDE 'front/news.html' %][% CATCH file %][% END %]
 
 [%
     question
@@ -60,7 +46,8 @@
         <li>[% loc('We send it to the council on your behalf') %]</li>
     </ol>
     
-    [% INCLUDE "front_stats.html" %]
+    [% INCLUDE "front/stats.html" %]
+    [% TRY %][% INCLUDE "front/tips.html" %][% CATCH file %][% END %]
 
 </div>
 
diff --git a/templates/web/fiksgatami/front/news.html b/templates/web/fiksgatami/front/news.html
new file mode 100644
index 000000000..8ebee90f8
--- /dev/null
+++ b/templates/web/fiksgatami/front/news.html
@@ -0,0 +1,12 @@
+[%
+    news = [
+        { date = '2011-04-26', text = '<a href="' _ c.config.ANDROID_URL _ '">Last ned FiksGataMi-app for din Android-telefon.</a>' },
+        { date = '2011-04-23', text = 'FiksGataMi sender n&aring; veisaker ogs&aring; til vegvesenet slik at kommuner ikke trenger sende saker videre.' },
+    ]
+%]
+[% FOREACH item IN news %]
+    <p align="center" style="margin-bottom:0">
+        <img width="23" height="12" alt="[% loc('New!') %]" src="/i/new.png" border="0">[% item.date %] [% item.text %]</p>
+    </p>
+[% END %]
+
diff --git a/templates/web/fiksgatami/front/tips.html b/templates/web/fiksgatami/front/tips.html
new file mode 100644
index 000000000..fcf765c4a
--- /dev/null
+++ b/templates/web/fiksgatami/front/tips.html
@@ -0,0 +1 @@
+<p><a href="http://wiki.nuug.no/grupper/fiksgatami/tips">Tips til deg som har mottatt en sak fra FiksGataMi.</a></p>