From b67d819d3cedc999bd03e6b07eaf0a084745b3e1 Mon Sep 17 00:00:00 2001
From: Mark Longair <mhl@pobox.com>
Date: Tue, 9 Apr 2013 17:10:32 +0100
Subject: Rename the .rhtml files to .html.erb for Rails 3

---
 lib/views/general/_before_head_end.html.erb          | 1 +
 lib/views/general/_before_head_end.rhtml             | 1 -
 lib/views/general/_frontpage_intro_sentence.html.erb | 4 ++++
 lib/views/general/_frontpage_intro_sentence.rhtml    | 4 ----
 lib/views/general/_orglink.html.erb                  | 1 +
 lib/views/general/_orglink.rhtml                     | 1 -
 lib/views/general/_popup_banner.html.erb             | 1 +
 lib/views/general/_popup_banner.rhtml                | 1 -
 lib/views/general/mycontroller.html.erb              | 7 +++++++
 lib/views/general/mycontroller.rhtml                 | 7 -------
 10 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 lib/views/general/_before_head_end.html.erb
 delete mode 100644 lib/views/general/_before_head_end.rhtml
 create mode 100644 lib/views/general/_frontpage_intro_sentence.html.erb
 delete mode 100644 lib/views/general/_frontpage_intro_sentence.rhtml
 create mode 100644 lib/views/general/_orglink.html.erb
 delete mode 100644 lib/views/general/_orglink.rhtml
 create mode 100644 lib/views/general/_popup_banner.html.erb
 delete mode 100644 lib/views/general/_popup_banner.rhtml
 create mode 100644 lib/views/general/mycontroller.html.erb
 delete mode 100644 lib/views/general/mycontroller.rhtml

(limited to 'lib/views/general')

diff --git a/lib/views/general/_before_head_end.html.erb b/lib/views/general/_before_head_end.html.erb
new file mode 100644
index 0000000..1644299
--- /dev/null
+++ b/lib/views/general/_before_head_end.html.erb
@@ -0,0 +1 @@
+<%= stylesheet_link_tag "/alavetelitheme/stylesheets/custom" %>
diff --git a/lib/views/general/_before_head_end.rhtml b/lib/views/general/_before_head_end.rhtml
deleted file mode 100644
index 1644299..0000000
--- a/lib/views/general/_before_head_end.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-<%= stylesheet_link_tag "/alavetelitheme/stylesheets/custom" %>
diff --git a/lib/views/general/_frontpage_intro_sentence.html.erb b/lib/views/general/_frontpage_intro_sentence.html.erb
new file mode 100644
index 0000000..cfba8f6
--- /dev/null
+++ b/lib/views/general/_frontpage_intro_sentence.html.erb
@@ -0,0 +1,4 @@
+<h2>
+  Your <strong>Right to Know</strong>
+</h2>
+<p>Every citizen has the right to access information held by public bodies. <strong>By law, they have to respond</strong>. <a href="<%= help_about_url %>">Find out more about Freedom of Information.</a></p>
diff --git a/lib/views/general/_frontpage_intro_sentence.rhtml b/lib/views/general/_frontpage_intro_sentence.rhtml
deleted file mode 100644
index cfba8f6..0000000
--- a/lib/views/general/_frontpage_intro_sentence.rhtml
+++ /dev/null
@@ -1,4 +0,0 @@
-<h2>
-  Your <strong>Right to Know</strong>
-</h2>
-<p>Every citizen has the right to access information held by public bodies. <strong>By law, they have to respond</strong>. <a href="<%= help_about_url %>">Find out more about Freedom of Information.</a></p>
diff --git a/lib/views/general/_orglink.html.erb b/lib/views/general/_orglink.html.erb
new file mode 100644
index 0000000..9535a79
--- /dev/null
+++ b/lib/views/general/_orglink.html.erb
@@ -0,0 +1 @@
+<%= link_to image_tag('/alavetelitheme/images/logo.png'), frontpage_url, :id=>'logo' %>
diff --git a/lib/views/general/_orglink.rhtml b/lib/views/general/_orglink.rhtml
deleted file mode 100644
index 9535a79..0000000
--- a/lib/views/general/_orglink.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-<%= link_to image_tag('/alavetelitheme/images/logo.png'), frontpage_url, :id=>'logo' %>
diff --git a/lib/views/general/_popup_banner.html.erb b/lib/views/general/_popup_banner.html.erb
new file mode 100644
index 0000000..49c9ec2
--- /dev/null
+++ b/lib/views/general/_popup_banner.html.erb
@@ -0,0 +1 @@
+<%#- anything you put here will appear as a popup warning on every screen in Alaveteli -%>
diff --git a/lib/views/general/_popup_banner.rhtml b/lib/views/general/_popup_banner.rhtml
deleted file mode 100644
index 49c9ec2..0000000
--- a/lib/views/general/_popup_banner.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-<%#- anything you put here will appear as a popup warning on every screen in Alaveteli -%>
diff --git a/lib/views/general/mycontroller.html.erb b/lib/views/general/mycontroller.html.erb
new file mode 100644
index 0000000..ad642d3
--- /dev/null
+++ b/lib/views/general/mycontroller.html.erb
@@ -0,0 +1,7 @@
+<% @title = "My new controller" %>
+
+<h1>My new controller</h1>
+
+<p>This is a view of a controller that does almost nothing, except output the words <code><%= @say_something %></code></p>
+
+
diff --git a/lib/views/general/mycontroller.rhtml b/lib/views/general/mycontroller.rhtml
deleted file mode 100644
index ad642d3..0000000
--- a/lib/views/general/mycontroller.rhtml
+++ /dev/null
@@ -1,7 +0,0 @@
-<% @title = "My new controller" %>
-
-<h1>My new controller</h1>
-
-<p>This is a view of a controller that does almost nothing, except output the words <code><%= @say_something %></code></p>
-
-
-- 
cgit v1.2.3