Download as
Browse Code »

Commit 7170c4c4a0880ce592de86b9c68e5edec25fbe1a

Authored by Victor Costa
1 parent 84bbcd40
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

rails3: rename rhtml to html.erb

Showing 12 changed files with 94 additions and 94 deletions   Show diff stats
app/views/content_viewer/_addthis.html.erb 0 → 100644
  Diff comments   View file @7170c4c
... ... @@ -0,0 +1,8 @@
  1 +<div id="addThis">
  2 + <script type="text/javascript">
  3 + addthis_pub = '<%= escape_javascript( NOOSFERO_CONF['addthis_pub'] ) %>';
  4 + addthis_logo = '<%= escape_javascript( NOOSFERO_CONF['addthis_logo'] ) %>';
  5 + addthis_options = '<%= escape_javascript( NOOSFERO_CONF['addthis_options'] ) %>';
  6 + </script>
  7 + <a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><%= addthis_image_tag %></a>
  8 +</div>
... ...
app/views/content_viewer/_addthis.rhtml
View file @84bbcd4
... ... @@ -1,8 +0,0 @@
1   -<div id="addThis">
2   - <script type="text/javascript">
3   - addthis_pub = '<%= escape_javascript( NOOSFERO_CONF['addthis_pub'] ) %>';
4   - addthis_logo = '<%= escape_javascript( NOOSFERO_CONF['addthis_logo'] ) %>';
5   - addthis_options = '<%= escape_javascript( NOOSFERO_CONF['addthis_options'] ) %>';
6   - </script>
7   - <a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><%= addthis_image_tag %></a>
8   -</div>
app/views/embed/not_found.html.erb 0 → 100644
  Diff comments   View file @7170c4c
... ... @@ -0,0 +1,6 @@
  1 +<div id='not-found'>
  2 + <p>
  3 + <%= _('You may have clicked an expired link or mistyped the address.') %>
  4 + <%= _('If you clicked a link that was in another site, or was given to you by someone else, it would be nice if you tell them that their link is not valid anymore.') %>
  5 + </p>
  6 +</div>
... ...
app/views/embed/not_found.rhtml
View file @84bbcd4
... ... @@ -1,6 +0,0 @@
1   -<div id='not-found'>
2   - <p>
3   - <%= _('You may have clicked an expired link or mistyped the address.') %>
4   - <%= _('If you clicked a link that was in another site, or was given to you by someone else, it would be nice if you tell them that their link is not valid anymore.') %>
5   - </p>
6   -</div>
app/views/embed/unavailable.html.erb 0 → 100644
  Diff comments   View file @7170c4c
... ... @@ -0,0 +1,3 @@
  1 +<div id='unavailable'>
  2 + <p><%= _('Embed unavailable.') %></p>
  3 +</div>
... ...
app/views/embed/unavailable.rhtml
View file @84bbcd4
... ... @@ -1,3 +0,0 @@
1   -<div id='unavailable'>
2   - <p><%= _('Embed unavailable.') %></p>
3   -</div>
app/views/layouts/embed.html.erb 0 → 100644
  Diff comments   View file @7170c4c
... ... @@ -0,0 +1,35 @@
  1 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  2 +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= html_language %>" lang="<%= html_language %>">
  3 + <head>
  4 + <title>Noosfero embed block</title>
  5 + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
  6 + <%= noosfero_stylesheets %>
  7 + <%= noosfero_javascript %>
  8 + </head>
  9 + <body class="<%= h body_classes %>">
  10 + <div id="embed">
  11 + <div id="wrap-1">
  12 + <div id="wrap-2">
  13 + <div id="content">
  14 + <div id="content-inner">
  15 + <div class="boxes" id="boxes">
  16 + <div class="box box-1" id="box-1">
  17 + <div class="blocks">
  18 + <%= yield %>
  19 + </div>
  20 + </div>
  21 + </div>
  22 + </div>
  23 + </div>
  24 + </div>
  25 + </div>
  26 + </div>
  27 +
  28 + <script type="text/javascript">
  29 + jQuery(document).ready(function(){
  30 + jQuery('a').attr('target','_blank');
  31 + });
  32 + </script>
  33 +
  34 + </body>
  35 +</html>
... ...
app/views/layouts/embed.rhtml
View file @84bbcd4
... ... @@ -1,35 +0,0 @@
1   -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2   -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= html_language %>" lang="<%= html_language %>">
3   - <head>
4   - <title>Noosfero embed block</title>
5   - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
6   - <%= noosfero_stylesheets %>
7   - <%= noosfero_javascript %>
8   - </head>
9   - <body class="<%= h body_classes %>">
10   - <div id="embed">
11   - <div id="wrap-1">
12   - <div id="wrap-2">
13   - <div id="content">
14   - <div id="content-inner">
15   - <div class="boxes" id="boxes">
16   - <div class="box box-1" id="box-1">
17   - <div class="blocks">
18   - <%= yield %>
19   - </div>
20   - </div>
21   - </div>
22   - </div>
23   - </div>
24   - </div>
25   - </div>
26   - </div>
27   -
28   - <script type="text/javascript">
29   - jQuery(document).ready(function(){
30   - jQuery('a').attr('target','_blank');
31   - });
32   - </script>
33   -
34   - </body>
35   -</html>
app/views/shared/_select_categories_top.html.erb 0 → 100644
  Diff comments   View file @7170c4c
... ... @@ -0,0 +1,26 @@
  1 +<% categories_selected ||= nil %>
  2 +<% title ||= nil %>
  3 +
  4 +<% extend CategoriesHelper %>
  5 +
  6 +<%= content_tag "h#{title_size}", title, :class => "box-title" %>
  7 +
  8 +<%= hidden_field_tag "#{object_name}[category_ids][]", nil %>
  9 +
  10 +<div id="category-ajax-selector">
  11 +<% unless categories_selected.nil? %>
  12 +<div id="selected-categories">
  13 + <div class="label"><%= _('Selected categories:') %></div>
  14 + <% categories_selected.each do |cat| %>
  15 + <div id="selected-category-<%= cat.id %>">
  16 + <%= hidden_field_tag("#{object_name}[category_ids][]", cat.id) %>
  17 + <%= selected_category_link(cat) %>
  18 + </div>
  19 + <% end %>
  20 +</div>
  21 +<% end %>
  22 +<div id="select-categories">
  23 + <%= render :partial => 'shared/select_categories', :locals => {:object_name => object_name, :multiple => true, :categories_selected => categories_selected }, :layout => false %>
  24 +</div>
  25 +
  26 +</div>
... ...
app/views/shared/_select_categories_top.rhtml
View file @84bbcd4
... ... @@ -1,26 +0,0 @@
1   -<% categories_selected ||= nil %>
2   -<% title ||= nil %>
3   -
4   -<% extend CategoriesHelper %>
5   -
6   -<%= content_tag "h#{title_size}", title, :class => "box-title" %>
7   -
8   -<%= hidden_field_tag "#{object_name}[category_ids][]", nil %>
9   -
10   -<div id="category-ajax-selector">
11   -<% unless categories_selected.nil? %>
12   -<div id="selected-categories">
13   - <div class="label"><%= _('Selected categories:') %></div>
14   - <% categories_selected.each do |cat| %>
15   - <div id="selected-category-<%= cat.id %>">
16   - <%= hidden_field_tag("#{object_name}[category_ids][]", cat.id) %>
17   - <%= selected_category_link(cat) %>
18   - </div>
19   - <% end %>
20   -</div>
21   -<% end %>
22   -<div id="select-categories">
23   - <%= render :partial => 'shared/select_categories', :locals => {:object_name => object_name, :multiple => true, :categories_selected => categories_selected }, :layout => false %>
24   -</div>
25   -
26   -</div>
app/views/shared/_select_subcategories.html.erb 0 → 100644
  Diff comments   View file @7170c4c
... ... @@ -0,0 +1,16 @@
  1 +<% if !categories.nil? && !categories.empty? && !@object.nil? %>
  2 + <hr>
  3 + <div class="category-helper-label"><%= _('Click to select a category') %></div>
  4 +
  5 + <% categories.select{|i| @object.accept_category?(i)}.each do |category| %>
  6 +
  7 + <%= link_to_remote category.name,
  8 + { :update => "select-categories",
  9 + :url => { :action => "update_categories", :category_id => category.id, :id => @object},
  10 + :loaded => visual_effect(:highlight, "select-categories")
  11 + },
  12 + :class => 'select-subcategory-link',
  13 + :id => "select-category-#{category.id}-link"
  14 + %>
  15 + <% end %>
  16 +<% end %>
... ...
app/views/shared/_select_subcategories.rhtml
View file @84bbcd4
... ... @@ -1,16 +0,0 @@
1   -<% if !categories.nil? && !categories.empty? && !@object.nil? %>
2   - <hr>
3   - <div class="category-helper-label"><%= _('Click to select a category') %></div>
4   -
5   - <% categories.select{|i| @object.accept_category?(i)}.each do |category| %>
6   -
7   - <%= link_to_remote category.name,
8   - { :update => "select-categories",
9   - :url => { :action => "update_categories", :category_id => category.id, :id => @object},
10   - :loaded => visual_effect(:highlight, "select-categories")
11   - },
12   - :class => 'select-subcategory-link',
13   - :id => "select-category-#{category.id}-link"
14   - %>
15   - <% end %>
16   -<% end %>