rails3: rename files from rhtml to html.erb

Victor Costa
1 parent ef0730cc
Showing 10 changed files with 94 additions and 94 deletions Show diff stats
app/views/blocks/members.html.erb
app/views/blocks/members.rhtml
app/views/blocks/profile_info_actions/_join_leave_community.html.erb
app/views/blocks/profile_info_actions/_join_leave_community.rhtml
app/views/content_viewer/article_versions.html.erb
app/views/content_viewer/article_versions.rhtml
app/views/content_viewer/versioned_article.html.erb
app/views/content_viewer/versioned_article.rhtml
app/views/profile/_reply_scrap_on_self.html.erb
app/views/profile/_reply_scrap_on_self.rhtml
@@ -0,0 +1,5 @@
+<%= link_to _('View all'), :profile => profile.identifier, :controller => 'profile', :action => 'members' %>
+
+<% if show_join_leave_button %>
+  <%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>
+<% end %>
@@ -1,5 +0,0 @@
-<%= link_to _('View all'), :profile => profile.identifier, :controller => 'profile', :action => 'members' %>
-
-<% if show_join_leave_button %>
-  <%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>
-<% end %>
@@ -0,0 +1,29 @@
+<div class='join-leave-button'>
+  <% if logged_in? %>
+    <% if profile.members.include?(user) %>
+      <%= button(:delete, content_tag('span', _('Leave community')), profile.leave_url,
+        :class => 'leave-community',
+        :title => _("Leave community"),
+        :style => 'position: relative;') %>
+      <%= button(:add, content_tag('span', _('Join')), profile.join_url,
+        :class => 'join-community',
+        :title => _("Join community"),
+        :style => 'position: relative; display: none;') %>
+    <% else %>
+      <% unless profile.already_request_membership?(user) %>
+        <%= button(:delete, content_tag('span', _('Leave community')), profile.leave_url,
+          :class => 'leave-community',
+          :title => _("Leave community"),
+          :style => 'position: relative; display: none;') %>
+        <%= button(:add, content_tag('span', _('Join')), profile.join_url,
+          :class => 'join-community',
+          :title => _("Join community"),
+          :style => 'position: relative;') %>
+      <% end %>
+    <% end %>
+  <% else %>
+    <%= link_to content_tag('span', _('Join')), profile.join_not_logged_url,
+      :class => 'button with-text icon-add',
+      :title => _('Join this community') %>
+  <% end %>
+</div>
@@ -1,29 +0,0 @@
-<div class='join-leave-button'>
-  <% if logged_in? %>
-    <% if profile.members.include?(user) %>
-      <%= button(:delete, content_tag('span', _('Leave community')), profile.leave_url,
-        :class => 'leave-community',
-        :title => _("Leave community"),
-        :style => 'position: relative;') %>
-      <%= button(:add, content_tag('span', _('Join')), profile.join_url,
-        :class => 'join-community',
-        :title => _("Join community"),
-        :style => 'position: relative; display: none;') %>
-    <% else %>
-      <% unless profile.already_request_membership?(user) %>
-        <%= button(:delete, content_tag('span', _('Leave community')), profile.leave_url,
-          :class => 'leave-community',
-          :title => _("Leave community"),
-          :style => 'position: relative; display: none;') %>
-        <%= button(:add, content_tag('span', _('Join')), profile.join_url,
-          :class => 'join-community',
-          :title => _("Join community"),
-          :style => 'position: relative;') %>
-      <% end %>
-    <% end %>
-  <% else %>
-    <%= link_to content_tag('span', _('Join')), profile.join_not_logged_url,
-      :class => 'button with-text icon-add',
-      :title => _('Join this community') %>
-  <% end %>
-</div>
@@ -0,0 +1,16 @@
+<%= article_title(@page, :no_link => true) %>
+
+<p><%= _('This is the list of all versions of this content. Select a version to see it and then revert to it.') %>.</p>
+
+<ul class='article-versions'>
+  <% @versions.each do |v| %>
+    <li>
+      <%= link_to(_("Version #{v.version}"), @page.url.merge(:version => v.version)) %>
+      <%= @page.version == v.version ? _('(current)') : '' %>
+      <span class='updated-by'><%= _('by %{author}') % {:author => link_to(@page.author_name(v.version), @page.author_url)} %></span>
+      <div class='updated-on'><%= show_time(v.updated_at) %></div>
+    </li>
+  <% end %>
+</ul>
+
+<%= pagination_links @versions, :param_name => 'npage' %>
@@ -1,16 +0,0 @@
-<%= article_title(@page, :no_link => true) %>
-
-<p><%= _('This is the list of all versions of this content. Select a version to see it and then revert to it.') %>.</p>
-
-<ul class='article-versions'>
-  <% @versions.each do |v| %>
-    <li>
-      <%= link_to(_("Version #{v.version}"), @page.url.merge(:version => v.version)) %>
-      <%= @page.version == v.version ? _('(current)') : '' %>
-      <span class='updated-by'><%= _('by %{author}') % {:author => link_to(@page.author_name(v.version), @page.author_url)} %></span>
-      <div class='updated-on'><%= show_time(v.updated_at) %></div>
-    </li>
-  <% end %>
-</ul>
-
-<%= pagination_links @versions, :param_name => 'npage' %>
@@ -0,0 +1,43 @@
+<div id="article" class="<%= @page.css_class_name %>">
+
+  <div id="article-actions">
+    <%= button(:clock, _('All versions'), {:controller => 'content_viewer', :profile => profile.identifier, :action => 'article_versions'}, :id => 'article-versions-link') %>
+
+    <% if @page.allow_edit?(user) && !remove_content_button(:edit) %>
+      <% content = content_tag('span', _('Revert to this version')) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id, :version => @version }) %>
+      <%= expirable_button @page, :edit, content, url, :id => 'article-revert-version-link' %>
+    <% end %>
+  </div>
+
+  <div id="article-header">
+    <h1 class='title'><%= @versioned_article.name %></h1>
+    <%= _("Version %{version} - %{author} on %{date}") % {:version => @version, :author => @page.author_name(@version), :date => show_time(@versioned_article.updated_at) } %>
+  </div>
+
+  <% version_license = @page.version_license(@version) %>
+  <%# This seemingly doubled verification exists because the article-sub-header
+      div must appear only if at least one content inside it will appeart.
+      Although we have only one content now, we might have others in the future.
+      So we're keeping it like that to avoid mistakes. %>
+  <% if version_license.present? %>
+    <div id='article-sub-header'>
+      <% if version_license.present? %>
+        <div id="article-license">
+          <%= _('Licensed under %s') % (version_license.url.present? ? link_to(version_license.name, version_license.url, :target => '_blank') : version_license.name) %>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+
+  <% cache(@page.cache_key(params, user, language)) do %>
+    <div class="<%="article-body article-body-" + @page.css_class_name %>">
+      <%= @versioned_article.body %>
+      <br style="clear:both" />
+    </div> <!-- end class="article-body" -->
+  <% end %>
+
+  <%= display_source_info(@page) %>
+
+</div><!-- end id="article" -->
+<%= add_zoom_to_article_images %>
@@ -1,43 +0,0 @@
-<div id="article" class="<%= @page.css_class_name %>">
-
-  <div id="article-actions">
-    <%= button(:clock, _('All versions'), {:controller => 'content_viewer', :profile => profile.identifier, :action => 'article_versions'}, :id => 'article-versions-link') %>
-
-    <% if @page.allow_edit?(user) && !remove_content_button(:edit) %>
-      <% content = content_tag('span', _('Revert to this version')) %>
-      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id, :version => @version }) %>
-      <%= expirable_button @page, :edit, content, url, :id => 'article-revert-version-link' %>
-    <% end %>
-  </div>
-
-  <div id="article-header">
-    <h1 class='title'><%= @versioned_article.name %></h1>
-    <%= _("Version %{version} - %{author} on %{date}") % {:version => @version, :author => @page.author_name(@version), :date => show_time(@versioned_article.updated_at) } %>
-  </div>
-
-  <% version_license = @page.version_license(@version) %>
-  <%# This seemingly doubled verification exists because the article-sub-header
-      div must appear only if at least one content inside it will appeart.
-      Although we have only one content now, we might have others in the future.
-      So we're keeping it like that to avoid mistakes. %>
-  <% if version_license.present? %>
-    <div id='article-sub-header'>
-      <% if version_license.present? %>
-        <div id="article-license">
-          <%= _('Licensed under %s') % (version_license.url.present? ? link_to(version_license.name, version_license.url, :target => '_blank') : version_license.name) %>
-        </div>
-      <% end %>
-    </div>
-  <% end %>
-
-  <% cache(@page.cache_key(params, user, language)) do %>
-    <div class="<%="article-body article-body-" + @page.css_class_name %>">
-      <%= @versioned_article.body %>
-      <br style="clear:both" />
-    </div> <!-- end class="article-body" -->
-  <% end %>
-
-  <%= display_source_info(@page) %>
-
-</div><!-- end id="article" -->
-<%= add_zoom_to_article_images %>
@@ -0,0 +1 @@
+_leave_scrap.html.erb
 \ No newline at end of file
@@ -1 +0,0 @@
-_leave_scrap.html.erb
 \ No newline at end of file
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+<%= link_to _('View all'), :profile => profile.identifier, :controller => 'profile', :action => 'members' %>
	2	+
	3	+<% if show_join_leave_button %>
	4	+ <%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>
	5	+<% end %>
	@@ -1,5 +0,0 @@	@@ -1,5 +0,0 @@
1	-<%= link_to _('View all'), :profile => profile.identifier, :controller => 'profile', :action => 'members' %>
2	-
3	-<% if show_join_leave_button %>
4	- <%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>
5	-<% end %>
@@ -0,0 +1,29 @@		@@ -0,0 +1,29 @@
	1	+<div class='join-leave-button'>
	2	+ <% if logged_in? %>
	3	+ <% if profile.members.include?(user) %>
	4	+ <%= button(:delete, content_tag('span', _('Leave community')), profile.leave_url,
	5	+ :class => 'leave-community',
	6	+ :title => _("Leave community"),
	7	+ :style => 'position: relative;') %>
	8	+ <%= button(:add, content_tag('span', _('Join')), profile.join_url,
	9	+ :class => 'join-community',
	10	+ :title => _("Join community"),
	11	+ :style => 'position: relative; display: none;') %>
	12	+ <% else %>
	13	+ <% unless profile.already_request_membership?(user) %>
	14	+ <%= button(:delete, content_tag('span', _('Leave community')), profile.leave_url,
	15	+ :class => 'leave-community',
	16	+ :title => _("Leave community"),
	17	+ :style => 'position: relative; display: none;') %>
	18	+ <%= button(:add, content_tag('span', _('Join')), profile.join_url,
	19	+ :class => 'join-community',
	20	+ :title => _("Join community"),
	21	+ :style => 'position: relative;') %>
	22	+ <% end %>
	23	+ <% end %>
	24	+ <% else %>
	25	+ <%= link_to content_tag('span', _('Join')), profile.join_not_logged_url,
	26	+ :class => 'button with-text icon-add',
	27	+ :title => _('Join this community') %>
	28	+ <% end %>
	29	+</div>
	@@ -1,29 +0,0 @@	@@ -1,29 +0,0 @@
1	-<div class='join-leave-button'>
2	- <% if logged_in? %>
3	- <% if profile.members.include?(user) %>
4	- <%= button(:delete, content_tag('span', _('Leave community')), profile.leave_url,
5	- :class => 'leave-community',
6	- :title => _("Leave community"),
7	- :style => 'position: relative;') %>
8	- <%= button(:add, content_tag('span', _('Join')), profile.join_url,
9	- :class => 'join-community',
10	- :title => _("Join community"),
11	- :style => 'position: relative; display: none;') %>
12	- <% else %>
13	- <% unless profile.already_request_membership?(user) %>
14	- <%= button(:delete, content_tag('span', _('Leave community')), profile.leave_url,
15	- :class => 'leave-community',
16	- :title => _("Leave community"),
17	- :style => 'position: relative; display: none;') %>
18	- <%= button(:add, content_tag('span', _('Join')), profile.join_url,
19	- :class => 'join-community',
20	- :title => _("Join community"),
21	- :style => 'position: relative;') %>
22	- <% end %>
23	- <% end %>
24	- <% else %>
25	- <%= link_to content_tag('span', _('Join')), profile.join_not_logged_url,
26	- :class => 'button with-text icon-add',
27	- :title => _('Join this community') %>
28	- <% end %>
29	-</div>
@@ -0,0 +1,16 @@		@@ -0,0 +1,16 @@
	1	+<%= article_title(@page, :no_link => true) %>
	2	+
	3	+<p><%= _('This is the list of all versions of this content. Select a version to see it and then revert to it.') %>.</p>
	4	+
	5	+<ul class='article-versions'>
	6	+ <% @versions.each do \|v\| %>
	7	+ <li>
	8	+ <%= link_to(_("Version #{v.version}"), @page.url.merge(:version => v.version)) %>
	9	+ <%= @page.version == v.version ? _('(current)') : '' %>
	10	+ <span class='updated-by'><%= _('by %{author}') % {:author => link_to(@page.author_name(v.version), @page.author_url)} %></span>
	11	+ <div class='updated-on'><%= show_time(v.updated_at) %></div>
	12	+ </li>
	13	+ <% end %>
	14	+</ul>
	15	+
	16	+<%= pagination_links @versions, :param_name => 'npage' %>
	@@ -1,16 +0,0 @@	@@ -1,16 +0,0 @@
1	-<%= article_title(@page, :no_link => true) %>
2	-
3	-<p><%= _('This is the list of all versions of this content. Select a version to see it and then revert to it.') %>.</p>
4	-
5	-<ul class='article-versions'>
6	- <% @versions.each do \|v\| %>
7	- <li>
8	- <%= link_to(_("Version #{v.version}"), @page.url.merge(:version => v.version)) %>
9	- <%= @page.version == v.version ? _('(current)') : '' %>
10	- <span class='updated-by'><%= _('by %{author}') % {:author => link_to(@page.author_name(v.version), @page.author_url)} %></span>
11	- <div class='updated-on'><%= show_time(v.updated_at) %></div>
12	- </li>
13	- <% end %>
14	-</ul>
15	-
16	-<%= pagination_links @versions, :param_name => 'npage' %>
@@ -0,0 +1,43 @@		@@ -0,0 +1,43 @@
	1	+<div id="article" class="<%= @page.css_class_name %>">
	2	+
	3	+ <div id="article-actions">
	4	+ <%= button(:clock, _('All versions'), {:controller => 'content_viewer', :profile => profile.identifier, :action => 'article_versions'}, :id => 'article-versions-link') %>
	5	+
	6	+ <% if @page.allow_edit?(user) && !remove_content_button(:edit) %>
	7	+ <% content = content_tag('span', _('Revert to this version')) %>
	8	+ <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id, :version => @version }) %>
	9	+ <%= expirable_button @page, :edit, content, url, :id => 'article-revert-version-link' %>
	10	+ <% end %>
	11	+ </div>
	12	+
	13	+ <div id="article-header">
	14	+ <h1 class='title'><%= @versioned_article.name %></h1>
	15	+ <%= _("Version %{version} - %{author} on %{date}") % {:version => @version, :author => @page.author_name(@version), :date => show_time(@versioned_article.updated_at) } %>
	16	+ </div>
	17	+
	18	+ <% version_license = @page.version_license(@version) %>
	19	+ <%# This seemingly doubled verification exists because the article-sub-header
	20	+ div must appear only if at least one content inside it will appeart.
	21	+ Although we have only one content now, we might have others in the future.
	22	+ So we're keeping it like that to avoid mistakes. %>
	23	+ <% if version_license.present? %>
	24	+ <div id='article-sub-header'>
	25	+ <% if version_license.present? %>
	26	+ <div id="article-license">
	27	+ <%= _('Licensed under %s') % (version_license.url.present? ? link_to(version_license.name, version_license.url, :target => '_blank') : version_license.name) %>
	28	+ </div>
	29	+ <% end %>
	30	+ </div>
	31	+ <% end %>
	32	+
	33	+ <% cache(@page.cache_key(params, user, language)) do %>
	34	+ <div class="<%="article-body article-body-" + @page.css_class_name %>">
	35	+ <%= @versioned_article.body %>
	36	+ <br style="clear:both" />
	37	+ </div> <!-- end class="article-body" -->
	38	+ <% end %>
	39	+
	40	+ <%= display_source_info(@page) %>
	41	+
	42	+</div><!-- end id="article" -->
	43	+<%= add_zoom_to_article_images %>
	@@ -1,43 +0,0 @@	@@ -1,43 +0,0 @@
1	-<div id="article" class="<%= @page.css_class_name %>">
2	-
3	- <div id="article-actions">
4	- <%= button(:clock, _('All versions'), {:controller => 'content_viewer', :profile => profile.identifier, :action => 'article_versions'}, :id => 'article-versions-link') %>
5	-
6	- <% if @page.allow_edit?(user) && !remove_content_button(:edit) %>
7	- <% content = content_tag('span', _('Revert to this version')) %>
8	- <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id, :version => @version }) %>
9	- <%= expirable_button @page, :edit, content, url, :id => 'article-revert-version-link' %>
10	- <% end %>
11	- </div>
12	-
13	- <div id="article-header">
14	- <h1 class='title'><%= @versioned_article.name %></h1>
15	- <%= _("Version %{version} - %{author} on %{date}") % {:version => @version, :author => @page.author_name(@version), :date => show_time(@versioned_article.updated_at) } %>
16	- </div>
17	-
18	- <% version_license = @page.version_license(@version) %>
19	- <%# This seemingly doubled verification exists because the article-sub-header
20	- div must appear only if at least one content inside it will appeart.
21	- Although we have only one content now, we might have others in the future.
22	- So we're keeping it like that to avoid mistakes. %>
23	- <% if version_license.present? %>
24	- <div id='article-sub-header'>
25	- <% if version_license.present? %>
26	- <div id="article-license">
27	- <%= _('Licensed under %s') % (version_license.url.present? ? link_to(version_license.name, version_license.url, :target => '_blank') : version_license.name) %>
28	- </div>
29	- <% end %>
30	- </div>
31	- <% end %>
32	-
33	- <% cache(@page.cache_key(params, user, language)) do %>
34	- <div class="<%="article-body article-body-" + @page.css_class_name %>">
35	- <%= @versioned_article.body %>
36	- <br style="clear:both" />
37	- </div> <!-- end class="article-body" -->
38	- <% end %>
39	-
40	- <%= display_source_info(@page) %>
41	-
42	-</div><!-- end id="article" -->
43	-<%= add_zoom_to_article_images %>
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+_leave_scrap.html.erb
0	\ No newline at end of file	2	\ No newline at end of file
	@@ -1 +0,0 @@		@@ -1 +0,0 @@
1	-_leave_scrap.html.erb
2	\ No newline at end of file	0	\ No newline at end of file