+
+
+ <% if @page.allow_edit?(user) && !remove_content_button(:edit) %>
+ <% content = content_tag('span', label_for_edit_article(@page)) %>
+ <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id }) %>
+ <%= expirable_button @page, :edit, content, url %>
+ <% end %>
+
+ <% if @page != profile.home_page && !@page.has_posts? && @page.allow_delete?(user) && !remove_content_button(:delete)%>
+ <% content = content_tag( 'span', _('Delete') ) %>
+ <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page}) %>
+ <% options = {:method => :post, :confirm => delete_article_message(@page)} %>
+ <%= expirable_button @page, :delete, content, url, options %>
+ <% end %>
+
+ <% if !@page.folder? && @page.allow_spread?(user) && !remove_content_button(:spread) %>
+ <% content = content_tag( 'span', _('Spread this') ) %>
+ <% url = nil %>
+ <% if profile.kind_of?(Person) %>
+ <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page }) %>
+ <% elsif profile.kind_of?(Community) && environment.portal_community %>
+ <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page }) %>
+ <% end %>
+ <%= expirable_button @page, :spread, content, url if url %>
+ <% end %>
+
+ <% if !@page.gallery? && @page.allow_create?(user) %>
+ <% if @page.translatable? && !@page.native_translation.language.blank? && !remove_content_button(:locale) %>
+ <% content = _('Add translation') %>
+ <% parent_id = (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)) %>
+ <% url = profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => parent_id, :type => @page.type, :article => { :translation_of_id => @page.native_translation.id })%>
+ <%= expirable_button @page, :locale, content, url %>
+ <% end %>
+
+ <%= colorbox_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) unless remove_content_button(:new) %>
+ <% end %>
+
+ <% if @page.accept_uploads? && @page.allow_create?(user) %>
+ <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) unless remove_content_button(:upload)%>
+ <% end %>
+
+ <% if !@page.allow_create?(user) && profile.community? && (@page.blog? || @page.parent && @page.parent.blog?) && !remove_content_button(:suggest) %>
+ <% content = content_tag( 'span', _('Suggest an article') ) %>
+ <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'suggest_an_article'}) %>
+ <% options = {:id => 'suggest-article-link'} %>
+ <%= expirable_button @page, :suggest, content, url, options %>
+ <% end %>
+
+ <%= report_abuse(profile, :link, @page) %>
+
+
+
+ <%= link_to(image_tag('icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
+ <%= article_title(@page, :no_link => true) %>
+ <%= article_translations(@page) %>
+
+
diff --git a/app/views/content_viewer/_article_toolbar.rhtml b/app/views/content_viewer/_article_toolbar.rhtml
deleted file mode 100644
index aee80d5..0000000
--- a/app/views/content_viewer/_article_toolbar.rhtml
+++ /dev/null
@@ -1,59 +0,0 @@
->
-
-
-
- <% if @page.allow_edit?(user) && !remove_content_button(:edit) %>
- <% content = content_tag('span', label_for_edit_article(@page)) %>
- <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id }) %>
- <%= expirable_button @page, :edit, content, url %>
- <% end %>
-
- <% if @page != profile.home_page && !@page.has_posts? && @page.allow_delete?(user) && !remove_content_button(:delete)%>
- <% content = content_tag( 'span', _('Delete') ) %>
- <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page}) %>
- <% options = {:method => :post, :confirm => delete_article_message(@page)} %>
- <%= expirable_button @page, :delete, content, url, options %>
- <% end %>
-
- <% if !@page.folder? && @page.allow_spread?(user) && !remove_content_button(:spread) %>
- <% content = content_tag( 'span', _('Spread this') ) %>
- <% url = nil %>
- <% if profile.kind_of?(Person) %>
- <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page }) %>
- <% elsif profile.kind_of?(Community) && environment.portal_community %>
- <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page }) %>
- <% end %>
- <%= expirable_button @page, :spread, content, url if url %>
- <% end %>
-
- <% if !@page.gallery? && @page.allow_create?(user) %>
- <% if @page.translatable? && !@page.native_translation.language.blank? && !remove_content_button(:locale) %>
- <% content = _('Add translation') %>
- <% parent_id = (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)) %>
- <% url = profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => parent_id, :type => @page.type, :article => { :translation_of_id => @page.native_translation.id })%>
- <%= expirable_button @page, :locale, content, url %>
- <% end %>
-
- <%= colorbox_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) unless remove_content_button(:new) %>
- <% end %>
-
- <% if @page.accept_uploads? && @page.allow_create?(user) %>
- <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) unless remove_content_button(:upload)%>
- <% end %>
-
- <% if !@page.allow_create?(user) && profile.community? && (@page.blog? || @page.parent && @page.parent.blog?) && !remove_content_button(:suggest) %>
- <% content = content_tag( 'span', _('Suggest an article') ) %>
- <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'suggest_an_article'}) %>
- <% options = {:id => 'suggest-article-link'} %>
- <%= expirable_button @page, :suggest, content, url, options %>
- <% end %>
-
- <%= report_abuse(profile, :link, @page) %>
-
-
-
- <%= link_to(image_tag('icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
- <%= article_title(@page, :no_link => true) %>
- <%= article_translations(@page) %>
-
-
diff --git a/app/views/content_viewer/_comment.html.erb b/app/views/content_viewer/_comment.html.erb
new file mode 100644
index 0000000..403de25
--- /dev/null
+++ b/app/views/content_viewer/_comment.html.erb
@@ -0,0 +1,99 @@
+
+
+
+
+
+ <% unless comment.replies.blank? || comment.spam? %>
+
+ <% end %>
+
+
+
diff --git a/app/views/content_viewer/_comment.rhtml b/app/views/content_viewer/_comment.rhtml
deleted file mode 100644
index 403de25..0000000
--- a/app/views/content_viewer/_comment.rhtml
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-
-
- <% unless comment.replies.blank? || comment.spam? %>
-
- <% end %>
-
-
-
diff --git a/app/views/content_viewer/_comment_form.html.erb b/app/views/content_viewer/_comment_form.html.erb
new file mode 100644
index 0000000..c19a877
--- /dev/null
+++ b/app/views/content_viewer/_comment_form.html.erb
@@ -0,0 +1,97 @@
+
+
+<% focus_on = logged_in? ? 'title' : 'name' %>
+
+<% if @comment && @comment.errors.any? && @comment.reply_of_id.blank? %>
+ <%= error_messages_for :comment %>
+
+<% end %>
+
+<% @form_div ||= 'closed' %>
+
+
diff --git a/app/views/content_viewer/_comment_form.rhtml b/app/views/content_viewer/_comment_form.rhtml
deleted file mode 100644
index c19a877..0000000
--- a/app/views/content_viewer/_comment_form.rhtml
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-<% focus_on = logged_in? ? 'title' : 'name' %>
-
-<% if @comment && @comment.errors.any? && @comment.reply_of_id.blank? %>
- <%= error_messages_for :comment %>
-
-<% end %>
-
-<% @form_div ||= 'closed' %>
-
-
diff --git a/app/views/content_viewer/_confirm_unfollow.html.erb b/app/views/content_viewer/_confirm_unfollow.html.erb
new file mode 100644
index 0000000..e224228
--- /dev/null
+++ b/app/views/content_viewer/_confirm_unfollow.html.erb
@@ -0,0 +1,13 @@
+<% if @unfollow_form %>
+
+
<%= _('Cancel notification of new comments') %>
+
<%= _("Fill in the following field with your e-mail if you don't want to be notified when this content receives new comments anymore.") %>
+ <% form_tag(@page.view_url.merge({:only_path => true}), {:method => 'post', :class => 'comment_form'}) do %>
+ <%= hidden_field_tag(:unfollow, 'commit') %>
+ <%= labelled_form_field(_('Enter your e-Mail'), text_field_tag(:email, nil, {:size => 40})) %>
+ <% button_bar do %>
+ <%= submit_button(:ok, _('Cancel notifications for e-mail above') ) %>
+ <% end %>
+ <% end %>
+
-
<%= _('Cancel notification of new comments') %>
-
<%= _("Fill in the following field with your e-mail if you don't want to be notified when this content receives new comments anymore.") %>
- <% form_tag(@page.view_url.merge({:only_path => true}), {:method => 'post', :class => 'comment_form'}) do %>
- <%= hidden_field_tag(:unfollow, 'commit') %>
- <%= labelled_form_field(_('Enter your e-Mail'), text_field_tag(:email, nil, {:size => 40})) %>
- <% button_bar do %>
- <%= submit_button(:ok, _('Cancel notifications for e-mail above') ) %>
- <% end %>
- <% end %>
-
<%= enterprise_homepage.body %>
+<%= render :file => 'catalog/index' unless enterprise_homepage.profile.environment.enabled?('disable_products_for_enterprises') %>
diff --git a/app/views/content_viewer/_enterprise_homepage.rhtml b/app/views/content_viewer/_enterprise_homepage.rhtml
deleted file mode 100644
index 154890e..0000000
--- a/app/views/content_viewer/_enterprise_homepage.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= display_profile_info enterprise_homepage.profile %>
-<%= enterprise_homepage.body %>
-<%= render :file => 'catalog/index' unless enterprise_homepage.profile.environment.enabled?('disable_products_for_enterprises') %>
diff --git a/app/views/content_viewer/_published_article.html.erb b/app/views/content_viewer/_published_article.html.erb
new file mode 100644
index 0000000..ebd0660
--- /dev/null
+++ b/app/views/content_viewer/_published_article.html.erb
@@ -0,0 +1,7 @@
+<% article = published_article.reference_article %>
+<% if article.image? %>
+ <%= link_to image_tag(article.public_filename(:thumb)), article.view_url %>
+<% else %>
+ <%= render :partial => 'article', :object => article %>
+<% end %>
+
diff --git a/app/views/content_viewer/_published_article.rhtml b/app/views/content_viewer/_published_article.rhtml
deleted file mode 100644
index ebd0660..0000000
--- a/app/views/content_viewer/_published_article.rhtml
+++ /dev/null
@@ -1,7 +0,0 @@
-<% article = published_article.reference_article %>
-<% if article.image? %>
- <%= link_to image_tag(article.public_filename(:thumb)), article.view_url %>
-<% else %>
- <%= render :partial => 'article', :object => article %>
-<% end %>
-
diff --git a/app/views/content_viewer/_uploaded_file.html.erb b/app/views/content_viewer/_uploaded_file.html.erb
new file mode 100644
index 0000000..b32ec6c
--- /dev/null
+++ b/app/views/content_viewer/_uploaded_file.html.erb
@@ -0,0 +1,10 @@
+<% if uploaded_file.image? %>
+ <%= link_to '',
+ uploaded_file.view_url,
+ :class => 'image',
+ :style => 'background-image: url(%s)'% uploaded_file.public_filename(:thumb)
+ %>
+ <%=h uploaded_file.title %>
+<% else %>
+ <%= render :partial => 'article', :object => uploaded_file %>
+<% end %>
diff --git a/app/views/content_viewer/_uploaded_file.rhtml b/app/views/content_viewer/_uploaded_file.rhtml
deleted file mode 100644
index b32ec6c..0000000
--- a/app/views/content_viewer/_uploaded_file.rhtml
+++ /dev/null
@@ -1,10 +0,0 @@
-<% if uploaded_file.image? %>
- <%= link_to '',
- uploaded_file.view_url,
- :class => 'image',
- :style => 'background-image: url(%s)'% uploaded_file.public_filename(:thumb)
- %>
- <%=h uploaded_file.title %>
-<% else %>
- <%= render :partial => 'article', :object => uploaded_file %>
-<% end %>
diff --git a/app/views/content_viewer/blog_page.html.erb b/app/views/content_viewer/blog_page.html.erb
new file mode 100644
index 0000000..4eba287
--- /dev/null
+++ b/app/views/content_viewer/blog_page.html.erb
@@ -0,0 +1,13 @@
+<% add_rss_feed_to_head(@page.name, @page.feed.url) if @page.blog? && @page.feed %>
+
+<%= content_tag('em', _('(external feed was not loaded yet)'), :id => 'external-feed-info', :class => 'metadata') if @page.blog? && @page.external_feed && @page.external_feed.enabled && @page.external_feed.fetched_at.nil? %>
+
+
+
+ <%= @page.body %>
+
+
+ <%= (@page.empty? ? content_tag('em', _('(no posts)')) : list_posts(@posts, @page.visualization_format)) %>
+
diff --git a/app/views/content_viewer/blog_page.rhtml b/app/views/content_viewer/blog_page.rhtml
deleted file mode 100644
index 4eba287..0000000
--- a/app/views/content_viewer/blog_page.rhtml
+++ /dev/null
@@ -1,13 +0,0 @@
-<% add_rss_feed_to_head(@page.name, @page.feed.url) if @page.blog? && @page.feed %>
-
-<%= content_tag('em', _('(external feed was not loaded yet)'), :id => 'external-feed-info', :class => 'metadata') if @page.blog? && @page.external_feed && @page.external_feed.enabled && @page.external_feed.fetched_at.nil? %>
-
-
-
- <%= @page.body %>
-
-
- <%= (@page.empty? ? content_tag('em', _('(no posts)')) : list_posts(@posts, @page.visualization_format)) %>
-
diff --git a/app/views/content_viewer/folder.html.erb b/app/views/content_viewer/folder.html.erb
new file mode 100644
index 0000000..a670b39
--- /dev/null
+++ b/app/views/content_viewer/folder.html.erb
@@ -0,0 +1,12 @@
+<% unless folder.body.blank? %>
+
+ <%= folder.body %>
+
+ <%= _('(empty folder)') %>
+<% else %>
+ <%= list_articles(folder.children) %>
+<% end %>
diff --git a/app/views/content_viewer/folder.rhtml b/app/views/content_viewer/folder.rhtml
deleted file mode 100644
index a670b39..0000000
--- a/app/views/content_viewer/folder.rhtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<% unless folder.body.blank? %>
-
- <%= folder.body %>
-
- <%= _('(empty folder)') %>
-<% else %>
- <%= list_articles(folder.children) %>
-<% end %>
diff --git a/app/views/content_viewer/forum_page.html.erb b/app/views/content_viewer/forum_page.html.erb
new file mode 100644
index 0000000..21938dd
--- /dev/null
+++ b/app/views/content_viewer/forum_page.html.erb
@@ -0,0 +1,11 @@
+<% add_rss_feed_to_head(@page.name, @page.feed.url) if @page.forum? && @page.feed %>
+
+
+
+ <%= @page.body %>
+
+
+ <%= (@posts.compact.empty? ? content_tag('em', _('(no posts)')) : list_forum_posts(@posts)) %>
+
diff --git a/app/views/content_viewer/forum_page.rhtml b/app/views/content_viewer/forum_page.rhtml
deleted file mode 100644
index 21938dd..0000000
--- a/app/views/content_viewer/forum_page.rhtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<% add_rss_feed_to_head(@page.name, @page.feed.url) if @page.forum? && @page.feed %>
-
-
-
- <%= @page.body %>
-
-
- <%= (@posts.compact.empty? ? content_tag('em', _('(no posts)')) : list_forum_posts(@posts)) %>
-
diff --git a/app/views/content_viewer/image_gallery.html.erb b/app/views/content_viewer/image_gallery.html.erb
new file mode 100644
index 0000000..585adbd
--- /dev/null
+++ b/app/views/content_viewer/image_gallery.html.erb
@@ -0,0 +1,20 @@
+
+ <%= @page.body %>
+
+
+
+ <% if @images.empty? %>
+
<%= _('This gallery contains no images yet') %>
+ <% else %>
+
<%= button(:slideshow, _('View slideshow'), @page.url.merge(:slideshow => true))%>
+ <% end %>
+
+ <% @images.each do |a| %>
+ <% content_tag('li', :title => a.title, :class => 'image-gallery-item' ) do %>
+ <%= render :partial => partial_for_class(a.class), :object => a %>
+ <% end %>
+ <% end %>
+
+
+ <%= pagination_links @images, :param_name => 'npage' %>
+
- <%= @page.body %>
-
-
-
- <% if @images.empty? %>
-
<%= _('This gallery contains no images yet') %>
- <% else %>
-
<%= button(:slideshow, _('View slideshow'), @page.url.merge(:slideshow => true))%>
- <% end %>
-
- <% @images.each do |a| %>
- <% content_tag('li', :title => a.title, :class => 'image-gallery-item' ) do %>
- <%= render :partial => partial_for_class(a.class), :object => a %>
- <% end %>
- <% end %>
-
-
- <%= pagination_links @images, :param_name => 'npage' %>
-
<%= button('', _('Back to gallery'), @page.url)%>
+
+ <% @images.each do |img| -%>
+ <% if img.image? -%>
+ <%= image_tag(url_for(img.public_filename(:display)), :title => (img.abstract.blank? ? img.name : img.abstract)) %>
+ <% end -%>
+ <% end unless @images.blank? -%>
+
diff --git a/app/views/content_viewer/slideshow.rhtml b/app/views/content_viewer/slideshow.rhtml
deleted file mode 100644
index 079fbf9..0000000
--- a/app/views/content_viewer/slideshow.rhtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<%= button('', _('Back to gallery'), @page.url)%>
-
- <% @images.each do |img| -%>
- <% if img.image? -%>
- <%= image_tag(url_for(img.public_filename(:display)), :title => (img.abstract.blank? ? img.name : img.abstract)) %>
- <% end -%>
- <% end unless @images.blank? -%>
-
diff --git a/app/views/content_viewer/view_page.html.erb b/app/views/content_viewer/view_page.html.erb
new file mode 100644
index 0000000..15023a4
--- /dev/null
+++ b/app/views/content_viewer/view_page.html.erb
@@ -0,0 +1,106 @@
+<%
+ if @page.parent && @page.parent.has_posts? && @page.parent.feed
+ add_rss_feed_to_head(@page.parent.name, @page.parent.feed.url)
+ end
+%>
+
+
+
+<%= render :partial => 'confirm_unfollow' %>
+
+
+
+
+
+<% if @page.display_hits? || @page.license.present? %>
+
+ <% if @page.display_hits? %>
+
+ <%= n_('Viewed one time', 'Viewed %{num} times', @page.hits) % { :num => @page.hits } %>
+
+ <% end %>
+
+ <% if @page.license.present? %>
+
+ <%= _('Licensed under %s') % (@page.license.url.present? ? link_to(@page.license.name, @page.license.url, :target => '_blank') : @page.license.name) %>
+
+ <% end %>
+
+<% end %>
+
+<% if !@page.tags.empty? %>
+
+ <%= _("This article's tags:") %>
+ <%= @page.tags.map { |t| link_to(t, :controller => 'profile', :profile => @profile.identifier, :action => 'tags', :id => t.name ) }.join("\n") %>
+
+<% end %>
+
+<% if @page.parent && !@page.parent.path.blank? %>
+
+ <%= button(:back, _('Go back to %s') % @page.parent.short_title, @page.parent.url) %>
+
+<% end %>
+
+<%= render :partial => 'shared/disabled_enterprise' %>
+
+<% if NOOSFERO_CONF['addthis_enabled'] %>
+
+<% end %>
+
+<% cache(@page.cache_key(params, user, language)) do %>
+
">
+ <% options = @page.image? ? {:gallery_view => true} : {} %>
+ <%= article_to_html(@page, options) %>
+
+<% end %>
+
+<% if ! @page.categories.empty? %>
+
+
<%= _('Categories') %>
+ <%= @page.categories.map {|item| link_to_category(item, false) }.join(", ") %>
+
+<% end %>
+
+<%= display_source_info(@page) %>
+
+
+
+
-
-<%= render :partial => 'confirm_unfollow' %>
-
-
-
-
-
-<% if @page.display_hits? || @page.license.present? %>
-
- <% if @page.display_hits? %>
-
- <%= n_('Viewed one time', 'Viewed %{num} times', @page.hits) % { :num => @page.hits } %>
-
- <% end %>
-
- <% if @page.license.present? %>
-
- <%= _('Licensed under %s') % (@page.license.url.present? ? link_to(@page.license.name, @page.license.url, :target => '_blank') : @page.license.name) %>
-
- <% end %>
-
-<% end %>
-
-<% if !@page.tags.empty? %>
-
- <%= _("This article's tags:") %>
- <%= @page.tags.map { |t| link_to(t, :controller => 'profile', :profile => @profile.identifier, :action => 'tags', :id => t.name ) }.join("\n") %>
-
-<% end %>
-
-<% if @page.parent && !@page.parent.path.blank? %>
-
- <%= button(:back, _('Go back to %s') % @page.parent.short_title, @page.parent.url) %>
-
-<% end %>
-
-<%= render :partial => 'shared/disabled_enterprise' %>
-
-<% if NOOSFERO_CONF['addthis_enabled'] %>
-
-<% end %>
-
-<% cache(@page.cache_key(params, user, language)) do %>
-
">
- <% options = @page.image? ? {:gallery_view => true} : {} %>
- <%= article_to_html(@page, options) %>
-
-<% end %>
-
-<% if ! @page.categories.empty? %>
-
-
<%= _('Categories') %>
- <%= @page.categories.map {|item| link_to_category(item, false) }.join(", ") %>
-
-<% end %>
-
-<%= display_source_info(@page) %>
-
-
-
-
<%= __('Enterprise registration') %>
+
+
+<% if @validation == :region && @regions.empty? %>
+
+ <%= __('There are no validators to validate the registration of this new enterprise. Contact your administrator for instructions.') %>
+
+
+ <% button_bar do %>
+ <%= button :back, _('Go back'), { :profile => current_user.person.identifier, :action=>"enterprises", :controller=>"profile" }%>
+ <% end %>
+<% else %>
+
+ <%= __('To register a new enterprise, fill in the form and hit the Register button. Then the enterprise will be submitted for evaluation at the validation entitiy of your choice (within your state) and when the enterprise is aproved you will be able to activate its profile.') %>
+
+
+ <%= required_fields_message %>
+
+ <% labelled_form_for(:create_enterprise, @create_enterprise) do |f| %>
+ <%= required f.text_field 'name', :onchange => "updateUrlField(this, 'create_enterprise_identifier')", :size => 40 %>
+ <%= required labelled_form_field(_('Address'), content_tag('code', environment.top_url + "/" + text_field(:create_enterprise, 'identifier', :size => 26))) %>
+ <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => :create_enterprise, :profile => @create_enterprise } %>
+ <%= required labelled_form_field(_('Region'), f.select('region_id', @regions)) if @validation == :region %>
+
+ <% if @validation == :admin %>
+ <%= hidden_field_tag 'create_enterprise[target_id]', environment.id %>
+ <% end %>
+
+ <% @plugins.dispatch(:enterprise_registration_hidden_fields).each do |field| %>
+ <% field.each do |key, value| %>
+ <%= f.hidden_field(key, :value => value) %>
+ <% end %>
+ <% end %>
+
+ <%= template_options(Enterprise, 'create_enterprise')%>
+
+ <% button_bar do %>
+ <%= submit_button('next', _('Next'), :cancel => {:profile => current_user.person.identifier, :action=>"enterprises", :controller=>"profile"}) %>
+ <% end %>
+ <% end %>
+<% end %>
diff --git a/app/views/enterprise_registration/basic_information.rhtml b/app/views/enterprise_registration/basic_information.rhtml
deleted file mode 100644
index 8f375ab..0000000
--- a/app/views/enterprise_registration/basic_information.rhtml
+++ /dev/null
@@ -1,43 +0,0 @@
-<%= error_messages_for 'create_enterprise' %>
-
-<%= __('Enterprise registration') %>
-
-
-<% if @validation == :region && @regions.empty? %>
-
- <%= __('There are no validators to validate the registration of this new enterprise. Contact your administrator for instructions.') %>
-
-
- <% button_bar do %>
- <%= button :back, _('Go back'), { :profile => current_user.person.identifier, :action=>"enterprises", :controller=>"profile" }%>
- <% end %>
-<% else %>
-
- <%= __('To register a new enterprise, fill in the form and hit the Register button. Then the enterprise will be submitted for evaluation at the validation entitiy of your choice (within your state) and when the enterprise is aproved you will be able to activate its profile.') %>
-
-
- <%= required_fields_message %>
-
- <% labelled_form_for(:create_enterprise, @create_enterprise) do |f| %>
- <%= required f.text_field 'name', :onchange => "updateUrlField(this, 'create_enterprise_identifier')", :size => 40 %>
- <%= required labelled_form_field(_('Address'), content_tag('code', environment.top_url + "/" + text_field(:create_enterprise, 'identifier', :size => 26))) %>
- <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => :create_enterprise, :profile => @create_enterprise } %>
- <%= required labelled_form_field(_('Region'), f.select('region_id', @regions)) if @validation == :region %>
-
- <% if @validation == :admin %>
- <%= hidden_field_tag 'create_enterprise[target_id]', environment.id %>
- <% end %>
-
- <% @plugins.dispatch(:enterprise_registration_hidden_fields).each do |field| %>
- <% field.each do |key, value| %>
- <%= f.hidden_field(key, :value => value) %>
- <% end %>
- <% end %>
-
- <%= template_options(Enterprise, 'create_enterprise')%>
-
- <% button_bar do %>
- <%= submit_button('next', _('Next'), :cancel => {:profile => current_user.person.identifier, :action=>"enterprises", :controller=>"profile"}) %>
- <% end %>
- <% end %>
-<% end %>
diff --git a/app/views/enterprise_registration/confirmation.html.erb b/app/views/enterprise_registration/confirmation.html.erb
new file mode 100644
index 0000000..f7e2b15
--- /dev/null
+++ b/app/views/enterprise_registration/confirmation.html.erb
@@ -0,0 +1,9 @@
+<%= __('Enterprise registration completed') %>
+
+
+<%= __("Your enterprise registration request was successfully registered. The validator organization you choose (%s) should get in touch with to start the validation process. As soon as the validators approve (or reject) your request, you will be notified by e-mail.") % @create_enterprise.target.name %>
+
+
+
+<%= link_to _('You can continue to browse this environment.'), :controller => 'home' %>
+
diff --git a/app/views/enterprise_registration/confirmation.rhtml b/app/views/enterprise_registration/confirmation.rhtml
deleted file mode 100644
index f7e2b15..0000000
--- a/app/views/enterprise_registration/confirmation.rhtml
+++ /dev/null
@@ -1,9 +0,0 @@
-<%= __('Enterprise registration completed') %>
-
-
-<%= __("Your enterprise registration request was successfully registered. The validator organization you choose (%s) should get in touch with to start the validation process. As soon as the validators approve (or reject) your request, you will be notified by e-mail.") % @create_enterprise.target.name %>
-
-
-
-<%= link_to _('You can continue to browse this environment.'), :controller => 'home' %>
-
diff --git a/app/views/enterprise_registration/creation.html.erb b/app/views/enterprise_registration/creation.html.erb
new file mode 100644
index 0000000..77e742c
--- /dev/null
+++ b/app/views/enterprise_registration/creation.html.erb
@@ -0,0 +1,9 @@
+<%= __('Enterprise registration completed') %>
+
+
+<%= __("Your enterprise (%s) was successfully registered.") % @enterprise.name %>
+
+
+
+<%= link_to __('You can manage your enterprise now.'), @enterprise.admin_url %>
+
diff --git a/app/views/enterprise_registration/creation.rhtml b/app/views/enterprise_registration/creation.rhtml
deleted file mode 100644
index 77e742c..0000000
--- a/app/views/enterprise_registration/creation.rhtml
+++ /dev/null
@@ -1,9 +0,0 @@
-<%= __('Enterprise registration completed') %>
-
-
-<%= __("Your enterprise (%s) was successfully registered.") % @enterprise.name %>
-
-
-
-<%= link_to __('You can manage your enterprise now.'), @enterprise.admin_url %>
-
diff --git a/app/views/enterprise_registration/select_validator.html.erb b/app/views/enterprise_registration/select_validator.html.erb
new file mode 100644
index 0000000..689486c
--- /dev/null
+++ b/app/views/enterprise_registration/select_validator.html.erb
@@ -0,0 +1,28 @@
+<%= __('Enterprise registration: validator organization') %>
+
+
+<%= __('Select one organization to validate your enterprise registration request. Check the provided information about their validation methodoly and criteria.') %>
+
+
+<% form_tag do %>
+ <%= render :partial => 'hidden_fields' %>
+
+
+
+ <%= _('Name') %>
+ <%= _('Validation Methodology:') %>
+ <%= _('Restrictions (if any):') %>
+
+ <% @validators.each do |validator| %>
+
+ <%= labelled_radio_button validator.name, 'create_enterprise[target_id]', validator.id %>
+ <%= validator.validation_methodology || _("(not informed)") %>
+ <%= validator.validation_restrictions || _("(not informed)") %>
+
+ <% end %>
+
+
+ <% button_bar do %>
+ <%= submit_button 'save', _('Confirm') %>
+ <% end %>
+<% end %>
diff --git a/app/views/enterprise_registration/select_validator.rhtml b/app/views/enterprise_registration/select_validator.rhtml
deleted file mode 100644
index 689486c..0000000
--- a/app/views/enterprise_registration/select_validator.rhtml
+++ /dev/null
@@ -1,28 +0,0 @@
-<%= __('Enterprise registration: validator organization') %>
-
-
-<%= __('Select one organization to validate your enterprise registration request. Check the provided information about their validation methodoly and criteria.') %>
-
-
-<% form_tag do %>
- <%= render :partial => 'hidden_fields' %>
-
-
-
- <%= _('Name') %>
- <%= _('Validation Methodology:') %>
- <%= _('Restrictions (if any):') %>
-
- <% @validators.each do |validator| %>
-
- <%= labelled_radio_button validator.name, 'create_enterprise[target_id]', validator.id %>
- <%= validator.validation_methodology || _("(not informed)") %>
- <%= validator.validation_restrictions || _("(not informed)") %>
-
- <% end %>
-
-
- <% button_bar do %>
- <%= submit_button 'save', _('Confirm') %>
- <% end %>
-<% end %>
diff --git a/app/views/enterprise_validation/_details.html.erb b/app/views/enterprise_validation/_details.html.erb
new file mode 100644
index 0000000..ff1a910
--- /dev/null
+++ b/app/views/enterprise_validation/_details.html.erb
@@ -0,0 +1,42 @@
+
+
+ <%= _('Name') %>
+ <%= request.name %>
+
+
+ <%= _('Address') %>
+ <%= request.address %>
+
+
+ <%= _('Contact Phone') %>
+ <%= request.contact_phone %>
+
+
+ <%= _('Contact Person') %>
+ <%= request.contact_person %>
+
+
+ <%= _('Acronym') %>
+ <%= request.acronym %>
+
+
+ <%= _('Identifier') %>
+ <%= request.identifier %>
+
+
+ <%= _('Foundation Year') %>
+ <%= request.foundation_year %>
+
+
+ <%= _('Legal Form') %>
+ <%= request.legal_form %>
+
+
+ <%= _('Economic Activity') %>
+ <%= request.economic_activity %>
+
+
+ <%= _('Management Information') %>
+ <%= request.management_information %>
+
+
diff --git a/app/views/enterprise_validation/_details.rhtml b/app/views/enterprise_validation/_details.rhtml
deleted file mode 100644
index ff1a910..0000000
--- a/app/views/enterprise_validation/_details.rhtml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
- <%= _('Name') %>
- <%= request.name %>
-
-
- <%= _('Address') %>
- <%= request.address %>
-
-
- <%= _('Contact Phone') %>
- <%= request.contact_phone %>
-
-
- <%= _('Contact Person') %>
- <%= request.contact_person %>
-
-
- <%= _('Acronym') %>
- <%= request.acronym %>
-
-
- <%= _('Identifier') %>
- <%= request.identifier %>
-
-
- <%= _('Foundation Year') %>
- <%= request.foundation_year %>
-
-
- <%= _('Legal Form') %>
- <%= request.legal_form %>
-
-
- <%= _('Economic Activity') %>
- <%= request.economic_activity %>
-
-
- <%= _('Management Information') %>
- <%= request.management_information %>
-
-
diff --git a/app/views/enterprise_validation/details.html.erb b/app/views/enterprise_validation/details.html.erb
new file mode 100644
index 0000000..5d46c4d
--- /dev/null
+++ b/app/views/enterprise_validation/details.html.erb
@@ -0,0 +1,34 @@
+<%= _("%s's validation") % @pending.name %>
+
+<%= link_to _('Back'), :action => 'index' %>
+
+<%= error_messages_for 'pending' %>
+
+<%= _('Provided information') %>
+
+<%= render :partial => 'details', :locals => { :request => @pending } %>
+
+<%= _('Final decision:') %>
+
+<%= _('Approve') %>
+
+<%= __('If this enterprise passes the criteria to be considered an solidarity enconomy enterprise, you can approve it by click the button below.') %>
+
+<% form_tag :action => 'approve', :id => @pending.code do %>
+ <% button_bar do %>
+ <%= submit_button('approve', _('Approve')) %>
+ <% end %>
+<% end %>
+
+<%= _('Reject') %>
+
+<%= __('If this enterprise does not pass the criteria do be considered, use this form.') %>
+
+<% form_tag :action => 'reject', :id => @pending.code do %>
+ <%= labelled_form_field(_('Please provide an explanation for the rejection. This explanation will be sent to the requestor (required).'), text_area_tag('reject_explanation'))%>
+
+ <% button_bar do %>
+ <%= submit_button('reject', _('Reject')) %>
+ <% end %>
+
+<% end %>
diff --git a/app/views/enterprise_validation/details.rhtml b/app/views/enterprise_validation/details.rhtml
deleted file mode 100644
index 5d46c4d..0000000
--- a/app/views/enterprise_validation/details.rhtml
+++ /dev/null
@@ -1,34 +0,0 @@
-<%= _("%s's validation") % @pending.name %>
-
-<%= link_to _('Back'), :action => 'index' %>
-
-<%= error_messages_for 'pending' %>
-
-<%= _('Provided information') %>
-
-<%= render :partial => 'details', :locals => { :request => @pending } %>
-
-<%= _('Final decision:') %>
-
-<%= _('Approve') %>
-
-<%= __('If this enterprise passes the criteria to be considered an solidarity enconomy enterprise, you can approve it by click the button below.') %>
-
-<% form_tag :action => 'approve', :id => @pending.code do %>
- <% button_bar do %>
- <%= submit_button('approve', _('Approve')) %>
- <% end %>
-<% end %>
-
-<%= _('Reject') %>
-
-<%= __('If this enterprise does not pass the criteria do be considered, use this form.') %>
-
-<% form_tag :action => 'reject', :id => @pending.code do %>
- <%= labelled_form_field(_('Please provide an explanation for the rejection. This explanation will be sent to the requestor (required).'), text_area_tag('reject_explanation'))%>
-
- <% button_bar do %>
- <%= submit_button('reject', _('Reject')) %>
- <% end %>
-
-<% end %>
diff --git a/app/views/enterprise_validation/edit_validation_info.html.erb b/app/views/enterprise_validation/edit_validation_info.html.erb
new file mode 100644
index 0000000..b669a99
--- /dev/null
+++ b/app/views/enterprise_validation/edit_validation_info.html.erb
@@ -0,0 +1,11 @@
+<% _('Editing the validation info') %>
+
+<%= error_messages_for :info %>
+
+<% labelled_form_for :info, @info do |f| %>
+ <%= f.text_area(:validation_methodology, :cols => 50, :rows => 10) %>
+ <%= f.text_area(:restrictions, :cols => 50, :rows => 7) %>
+ <% button_bar do %>
+ <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}) %>
+ <% end %>
+<% end %>
diff --git a/app/views/enterprise_validation/edit_validation_info.rhtml b/app/views/enterprise_validation/edit_validation_info.rhtml
deleted file mode 100644
index b669a99..0000000
--- a/app/views/enterprise_validation/edit_validation_info.rhtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<% _('Editing the validation info') %>
-
-<%= error_messages_for :info %>
-
-<% labelled_form_for :info, @info do |f| %>
- <%= f.text_area(:validation_methodology, :cols => 50, :rows => 10) %>
- <%= f.text_area(:restrictions, :cols => 50, :rows => 7) %>
- <% button_bar do %>
- <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}) %>
- <% end %>
-<% end %>
diff --git a/app/views/enterprise_validation/index.html.erb b/app/views/enterprise_validation/index.html.erb
new file mode 100644
index 0000000..90d3152
--- /dev/null
+++ b/app/views/enterprise_validation/index.html.erb
@@ -0,0 +1,33 @@
+<%= __('Enterprise validations') %>
+
+<% button_bar do %>
+ <%= button(:edit, _('Edit validation info'), { :action => 'edit_validation_info' }) %>
+ <%= button(:back, _('Go Back'), { :controller => 'profile_editor' }) %>
+<% end %>
+
+<%= __("Pending enterprise validations") %>
+
+<% for pending in @pending_validations %>
+ <%= pending.name %>
+
+
+ <%= _('Address') %>:
+ <%= pending.address %>
+
+
+ <%= _('Contact Phone') %>:
+ <%= pending.contact_phone %>
+
+
+ <%= _('Contact Person') %>:
+ <%= pending.contact_person %>
+
+
+
+ <%= link_to _("See details/approve/reject"), :action => 'details', :id => pending.code %>
+<% end %>
+
+<%= __('Processed enterprise validations') %>
+
+<%= link_to __("See the list of processed enterprise validations"), :action => 'list_processed' %>
+
diff --git a/app/views/enterprise_validation/index.rhtml b/app/views/enterprise_validation/index.rhtml
deleted file mode 100644
index 90d3152..0000000
--- a/app/views/enterprise_validation/index.rhtml
+++ /dev/null
@@ -1,33 +0,0 @@
-<%= __('Enterprise validations') %>
-
-<% button_bar do %>
- <%= button(:edit, _('Edit validation info'), { :action => 'edit_validation_info' }) %>
- <%= button(:back, _('Go Back'), { :controller => 'profile_editor' }) %>
-<% end %>
-
-<%= __("Pending enterprise validations") %>
-
-<% for pending in @pending_validations %>
- <%= pending.name %>
-
-
- <%= _('Address') %>:
- <%= pending.address %>
-
-
- <%= _('Contact Phone') %>:
- <%= pending.contact_phone %>
-
-
- <%= _('Contact Person') %>:
- <%= pending.contact_person %>
-
-
-
- <%= link_to _("See details/approve/reject"), :action => 'details', :id => pending.code %>
-<% end %>
-
-<%= __('Processed enterprise validations') %>
-
-<%= link_to __("See the list of processed enterprise validations"), :action => 'list_processed' %>
-
diff --git a/app/views/enterprise_validation/list_processed.html.erb b/app/views/enterprise_validation/list_processed.html.erb
new file mode 100644
index 0000000..c3dcc8e
--- /dev/null
+++ b/app/views/enterprise_validation/list_processed.html.erb
@@ -0,0 +1,24 @@
+<%= __("Processed enterprise validations") %>
+
+<%= link_to _("Back"), :action => 'index' %>
+
+<% for processed in @processed_validations %>
+ <%= processed.name %> (<%=status(processed)%>)
+
+
+ <%= _('Address') %>:
+ <%= processed.address %>
+
+
+ <%= _('Contact Phone') %>:
+ <%= processed.contact_phone %>
+
+
+ <%= _('Contact Person') %>:
+ <%= processed.contact_person %>
+
+
+
+
+ <%= link_to _("See details"), :action => 'view_processed', :id => processed.code %>
+<% end %>
diff --git a/app/views/enterprise_validation/list_processed.rhtml b/app/views/enterprise_validation/list_processed.rhtml
deleted file mode 100644
index c3dcc8e..0000000
--- a/app/views/enterprise_validation/list_processed.rhtml
+++ /dev/null
@@ -1,24 +0,0 @@
-<%= __("Processed enterprise validations") %>
-
-<%= link_to _("Back"), :action => 'index' %>
-
-<% for processed in @processed_validations %>
- <%= processed.name %> (<%=status(processed)%>)
-
-
- <%= _('Address') %>:
- <%= processed.address %>
-
-
- <%= _('Contact Phone') %>:
- <%= processed.contact_phone %>
-
-
- <%= _('Contact Person') %>:
- <%= processed.contact_person %>
-
-
-
-
- <%= link_to _("See details"), :action => 'view_processed', :id => processed.code %>
-<% end %>
diff --git a/app/views/enterprise_validation/view_processed.html.erb b/app/views/enterprise_validation/view_processed.html.erb
new file mode 100644
index 0000000..fe2ae3a
--- /dev/null
+++ b/app/views/enterprise_validation/view_processed.html.erb
@@ -0,0 +1,6 @@
+<%= _('Processed validation request for %s ') % @processed.name %> (<%= status(@processed) %>)
+
+<%= link_to _('Back'), :action => 'index' %>
+
+<%= render :partial => 'details', :locals => { :request => @processed } %>
+
diff --git a/app/views/enterprise_validation/view_processed.rhtml b/app/views/enterprise_validation/view_processed.rhtml
deleted file mode 100644
index fe2ae3a..0000000
--- a/app/views/enterprise_validation/view_processed.rhtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<%= _('Processed validation request for %s ') % @processed.name %> (<%= status(@processed) %>)
-
-<%= link_to _('Back'), :action => 'index' %>
-
-<%= render :partial => 'details', :locals => { :request => @processed } %>
-
diff --git a/app/views/environment_role_manager/affiliate.html.erb b/app/views/environment_role_manager/affiliate.html.erb
new file mode 100644
index 0000000..8d0d83d
--- /dev/null
+++ b/app/views/environment_role_manager/affiliate.html.erb
@@ -0,0 +1,9 @@
+ <%= @member.name %>
+
+<% form_tag( {:action => 'give_role'}, {:method => :post}) do %>
+ <%= select_tag 'role', options_for_select(@roles.map{|r|[r.name,r.id]}) %>
+ <%= hidden_field_tag 'person', current_user.person.id %>
+ <% button_bar do %>
+ <%= submit_button('affiliate', _('Affiliate', :cancel => {:action => 'index'}) %>
+ <% end %>
+<% end %>
diff --git a/app/views/environment_role_manager/affiliate.rhtml b/app/views/environment_role_manager/affiliate.rhtml
deleted file mode 100644
index 8d0d83d..0000000
--- a/app/views/environment_role_manager/affiliate.rhtml
+++ /dev/null
@@ -1,9 +0,0 @@
- <%= @member.name %>
-
-<% form_tag( {:action => 'give_role'}, {:method => :post}) do %>
- <%= select_tag 'role', options_for_select(@roles.map{|r|[r.name,r.id]}) %>
- <%= hidden_field_tag 'person', current_user.person.id %>
- <% button_bar do %>
- <%= submit_button('affiliate', _('Affiliate', :cancel => {:action => 'index'}) %>
- <% end %>
-<% end %>
diff --git a/app/views/environment_role_manager/change_role.html.erb b/app/views/environment_role_manager/change_role.html.erb
new file mode 100644
index 0000000..f147166
--- /dev/null
+++ b/app/views/environment_role_manager/change_role.html.erb
@@ -0,0 +1,14 @@
+<%= _('Changing role of %s') % @admin.name %>
+
+<% labelled_form_for :member, @admin, :url => {:action => 'update_roles'} do |f| %>
+
+ <%= _('Roles:') %> <%= _('Listing Administrators') %>
+
+<%= link_to _('Make new admin'), :action => 'make_admin' %>
+
+
+ <% @admins.each do |a| %>
+ <%= a.name %>
+ <%= link_to _('Edit member role'), :action => 'change_role', :id => a %>
+ <%= link_to _('Remove member'), :action => 'unassociate', :id => a %>
+ <% end %>
+
+
+<%= link_to _('Back'), :controller => 'admin_panel' %>
diff --git a/app/views/environment_role_manager/index.rhtml b/app/views/environment_role_manager/index.rhtml
deleted file mode 100644
index aa9c919..0000000
--- a/app/views/environment_role_manager/index.rhtml
+++ /dev/null
@@ -1,13 +0,0 @@
- <%= _('Listing Administrators') %>
-
-<%= link_to _('Make new admin'), :action => 'make_admin' %>
-
-
- <% @admins.each do |a| %>
- <%= a.name %>
- <%= link_to _('Edit member role'), :action => 'change_role', :id => a %>
- <%= link_to _('Remove member'), :action => 'unassociate', :id => a %>
- <% end %>
-
-
-<%= link_to _('Back'), :controller => 'admin_panel' %>
diff --git a/app/views/environment_role_manager/make_admin.html.erb b/app/views/environment_role_manager/make_admin.html.erb
new file mode 100644
index 0000000..43547ca
--- /dev/null
+++ b/app/views/environment_role_manager/make_admin.html.erb
@@ -0,0 +1,15 @@
+ <% _('Make new admin') %>
+
+<% labelled_form_for :person, @person, :url => {:action => 'update_roles'} do |f| %>
+ <%= _('Admin') %> <% _('Make new admin') %>
-
-<% labelled_form_for :person, @person, :url => {:action => 'update_roles'} do |f| %>
- <%= _('Admin') %>
+
+
+
+ <%= show_month(params[:year], params[:month]) %>
+ <%= link_to_previous_month(params[:year], params[:month], '« %s' % _('previous')) %>
+ <%= link_to_next_month(params[:year], params[:month], '%s »' % _('next')) %>
+
+ <%= render :partial => 'events/month', :locals => {:calendar => @calendar, :abbreviated => true} %>
+
+
+ <%= link_to_previous_month(params[:year], params[:month], show_month(params[:year], params[:month], :previous => true)) %>
+
+ <%= link_to_next_month(params[:year], params[:month], show_month(params[:year], params[:month], :next => true)) %>
+
+
+
+ <%= render :partial => 'events/events_by_day' %>
+
+
-
-
-
- <%= show_month(params[:year], params[:month]) %>
- <%= link_to_previous_month(params[:year], params[:month], '« %s' % _('previous')) %>
- <%= link_to_next_month(params[:year], params[:month], '%s »' % _('next')) %>
-
- <%= render :partial => 'events/month', :locals => {:calendar => @calendar, :abbreviated => true} %>
-
-
- <%= link_to_previous_month(params[:year], params[:month], show_month(params[:year], params[:month], :previous => true)) %>
-
- <%= link_to_next_month(params[:year], params[:month], show_month(params[:year], params[:month], :next => true)) %>
-
-
-
- <%= render :partial => 'events/events_by_day' %>
-
-
+ <% calendar.first(7).each do |day,event| %>
+ <%= show_day_of_week(day, abbreviated) %>
+ <% end %>
+
+ <% calendar.in_groups_of(7).each do |week| %>
+
+ <% week.each do |date, has_events, this_month| %>
+
+
+ <%= has_events ?
+ link_to_remote(
+ date.day,
+ :url => {:action => 'events_by_day', :year => date.year, :month => date.month, :day => date.day, :category_id => @category_id},
+ :update => 'events-of-the-day',
+ :loading => '$("events-of-the-day").addClassName("loading")',
+ :complete => '$("events-of-the-day").removeClassName("loading")'
+ ) :
+ date.day
+ %>
+
+
+ <% end %>
+
+ <% end %>
diff --git a/app/views/events/_month.rhtml b/app/views/events/_month.rhtml
deleted file mode 100644
index a1aa702..0000000
--- a/app/views/events/_month.rhtml
+++ /dev/null
@@ -1,25 +0,0 @@
-
- <% calendar.first(7).each do |day,event| %>
- <%= show_day_of_week(day, abbreviated) %>
- <% end %>
-
- <% calendar.in_groups_of(7).each do |week| %>
-
- <% week.each do |date, has_events, this_month| %>
-
-
- <%= has_events ?
- link_to_remote(
- date.day,
- :url => {:action => 'events_by_day', :year => date.year, :month => date.month, :day => date.day, :category_id => @category_id},
- :update => 'events-of-the-day',
- :loading => '$("events-of-the-day").addClassName("loading")',
- :complete => '$("events-of-the-day").removeClassName("loading")'
- ) :
- date.day
- %>
-
-
- <% end %>
-
- <% end %>
diff --git a/app/views/events/events.html.erb b/app/views/events/events.html.erb
new file mode 100644
index 0000000..316f114
--- /dev/null
+++ b/app/views/events/events.html.erb
@@ -0,0 +1,12 @@
+<%= _("%s's events") % profile.name %>
+
+
+ <%= button :back, _('Back to %s') % profile.name, profile.url %>
+ <% if user && user.has_permission?('post_content', profile) %>
+ <%= button :new, _('New event'), myprofile_url(:controller => 'cms', :action => 'new', :type => 'Event') %>
+ <% end %>
+
+
+
+
+<%= render :partial => 'agenda' %>
diff --git a/app/views/events/events.rhtml b/app/views/events/events.rhtml
deleted file mode 100644
index 316f114..0000000
--- a/app/views/events/events.rhtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<%= _("%s's events") % profile.name %>
-
-
- <%= button :back, _('Back to %s') % profile.name, profile.url %>
- <% if user && user.has_permission?('post_content', profile) %>
- <%= button :new, _('New event'), myprofile_url(:controller => 'cms', :action => 'new', :type => 'Event') %>
- <% end %>
-
-
-
-
-<%= render :partial => 'agenda' %>
diff --git a/app/views/favorite_enterprises/add.html.erb b/app/views/favorite_enterprises/add.html.erb
new file mode 100644
index 0000000..b75d1bd
--- /dev/null
+++ b/app/views/favorite_enterprises/add.html.erb
@@ -0,0 +1,12 @@
+<%= __('Adding %s as a favorite enterprise') % @favorite_enterprise.name %>
+
+
+<%= __('Are you sure you want to add %s as your favorite enterprise?') % @favorite_enterprise.name %>
+
+
+<% form_tag do %>
+ <%= hidden_field_tag(:confirmation, 1) %>
+
+ <%= submit_button(:ok, __("Yes, I am sure"), :title => _("I want to add %s as a favorite enterprise") % @favorite_enterprise.name) %>
+ <%= button(:cancel, _("No, I don't want"), :action => 'index') %>
+<% end %>
diff --git a/app/views/favorite_enterprises/add.rhtml b/app/views/favorite_enterprises/add.rhtml
deleted file mode 100644
index b75d1bd..0000000
--- a/app/views/favorite_enterprises/add.rhtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<%= __('Adding %s as a favorite enterprise') % @favorite_enterprise.name %>
-
-
-<%= __('Are you sure you want to add %s as your favorite enterprise?') % @favorite_enterprise.name %>
-
-
-<% form_tag do %>
- <%= hidden_field_tag(:confirmation, 1) %>
-
- <%= submit_button(:ok, __("Yes, I am sure"), :title => _("I want to add %s as a favorite enterprise") % @favorite_enterprise.name) %>
- <%= button(:cancel, _("No, I don't want"), :action => 'index') %>
-<% end %>
diff --git a/app/views/favorite_enterprises/index.html.erb b/app/views/favorite_enterprises/index.html.erb
new file mode 100644
index 0000000..aded584
--- /dev/null
+++ b/app/views/favorite_enterprises/index.html.erb
@@ -0,0 +1,34 @@
+
+
+
<%= __("%s's favorite enterprises") % profile.name %>
+
+
+<% @favorite_enterprises.each do |enterprise| %>
+
+ <%= link_to_profile profile_image(enterprise) + '
+ <%= link_to content_tag('span',_('remove')),
+ { :action => 'remove', :id => enterprise.id },
+ :class => 'button icon-delete',
+ :title => _('remove') %>
+
+
+<% end %>
+
+
+<% if @favorite_enterprises.empty? %>
+
+
+ <%= __('You have no favorite enterprises yet.') %>
+
+
+<% end %>
+
+<% button_bar do %>
+ <%= button(:back, _('Go back'), :controller => 'profile_editor') %>
+<% end %>
+
+
-
-
<%= __("%s's favorite enterprises") % profile.name %>
-
-
-<% @favorite_enterprises.each do |enterprise| %>
-
- <%= link_to_profile profile_image(enterprise) + '
- <%= link_to content_tag('span',_('remove')),
- { :action => 'remove', :id => enterprise.id },
- :class => 'button icon-delete',
- :title => _('remove') %>
-
-
-<% end %>
-
-
-<% if @favorite_enterprises.empty? %>
-
-
- <%= __('You have no favorite enterprises yet.') %>
-
-
-<% end %>
-
-<% button_bar do %>
- <%= button(:back, _('Go back'), :controller => 'profile_editor') %>
-<% end %>
-
-
+
+
<%= __('Removing favorite enterprise: %s') % @favorite_enterprise.name %>
+
+<%= profile_image @favorite_enterprise, :thumb, :class => 'favorite_enterprise_picture' %>
+
+
+<%= __('Are you sure you want to remove %s from your favorite enterprise list?') % @favorite_enterprise.name %>
+
+
+<% form_tag do %>
+ <%= hidden_field_tag(:confirmation, 1) %>
+
+ <%= submit_button(:ok, __("Yes, I want to remove %s from my favorite enterprise list") % @favorite_enterprise.name) %>
+ <%= button(:cancel, _("No, I don't want"), :action => 'index') %>
+<% end %>
+
+
-
-
<%= __('Removing favorite enterprise: %s') % @favorite_enterprise.name %>
-
-<%= profile_image @favorite_enterprise, :thumb, :class => 'favorite_enterprise_picture' %>
-
-
-<%= __('Are you sure you want to remove %s from your favorite enterprise list?') % @favorite_enterprise.name %>
-
-
-<% form_tag do %>
- <%= hidden_field_tag(:confirmation, 1) %>
-
- <%= submit_button(:ok, __("Yes, I want to remove %s from my favorite enterprise list") % @favorite_enterprise.name) %>
- <%= button(:cancel, _("No, I don't want"), :action => 'index') %>
-<% end %>
-
-
<%= __('Manage community fields') %>
+
+<% labelled_form_for(:environment, @environment, :url => {:action => 'manage_community_fields'}) do |f| %>
+
+
+
+
+
+
+ <% button_bar do %>
+ <%= submit_button('save', _('Save changes')) %>
+ <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
+ <% end %>
+
+
+<% end %>
+
+
+
+
diff --git a/app/views/features/_manage_community_fields.rhtml b/app/views/features/_manage_community_fields.rhtml
deleted file mode 100644
index f5972be..0000000
--- a/app/views/features/_manage_community_fields.rhtml
+++ /dev/null
@@ -1,54 +0,0 @@
-<%= __('Manage community fields') %>
-
-<% labelled_form_for(:environment, @environment, :url => {:action => 'manage_community_fields'}) do |f| %>
-
-
-
-
-
-
- <% button_bar do %>
- <%= submit_button('save', _('Save changes')) %>
- <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
- <% end %>
-
-
-<% end %>
-
-
-
-
diff --git a/app/views/features/_manage_enterprise_fields.html.erb b/app/views/features/_manage_enterprise_fields.html.erb
new file mode 100644
index 0000000..6c4b731
--- /dev/null
+++ b/app/views/features/_manage_enterprise_fields.html.erb
@@ -0,0 +1,54 @@
+<%= __('Manage enterprise fields') %>
+
+<% labelled_form_for(:environment, @environment, :url => {:action => 'manage_enterprise_fields'}) do |f| %>
+
+
+
+ <%= _('Field') %>
+ <%= _('Active') %>
+ <%= _('Required') %>
+ <%= _('Display on registration?') %>
+
+ <% @enterprise_fields.each do |field| %>
+
+
+ <%= _(field.humanize) %>
+ <%= hidden_field_tag "enterprise_fields[#{field}][active]", false %>
+ <%= check_box_tag "enterprise_fields[#{field}][active]", true, environment.custom_enterprise_field(field, 'active'), :onclick => "$('enterprise_fields[#{field}][required]').disabled=$('enterprise_fields[#{field}][signup]').disabled=!this.checked;" %>
+
+
+ <%= hidden_field_tag "enterprise_fields[#{field}][required]", false %>
+ <%= check_box_tag "enterprise_fields[#{field}][required]", true, environment.custom_enterprise_field(field, 'required'), :onclick => "if(this.checked) $('enterprise_fields[#{field}][signup]').checked = true;" %>
+
+
+ <%= hidden_field_tag "enterprise_fields[#{field}][signup]", false %>
+ <%= check_box_tag "enterprise_fields[#{field}][signup]", true, environment.custom_enterprise_field(field, 'signup'), :onclick => "if(!this.checked) $('enterprise_fields[#{field}][required]').checked = false;" %>
+
+
+
+ <% end %>
+
+
+
+
+
+ <% button_bar do %>
+ <%= submit_button('save', _('Save changes')) %>
+ <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
+ <% end %>
+
+
+<% end %>
+
+
+
+
diff --git a/app/views/features/_manage_enterprise_fields.rhtml b/app/views/features/_manage_enterprise_fields.rhtml
deleted file mode 100644
index 6c4b731..0000000
--- a/app/views/features/_manage_enterprise_fields.rhtml
+++ /dev/null
@@ -1,54 +0,0 @@
-<%= __('Manage enterprise fields') %>
-
-<% labelled_form_for(:environment, @environment, :url => {:action => 'manage_enterprise_fields'}) do |f| %>
-
-
-
- <%= _('Field') %>
- <%= _('Active') %>
- <%= _('Required') %>
- <%= _('Display on registration?') %>
-
- <% @enterprise_fields.each do |field| %>
-
-
- <%= _(field.humanize) %>
- <%= hidden_field_tag "enterprise_fields[#{field}][active]", false %>
- <%= check_box_tag "enterprise_fields[#{field}][active]", true, environment.custom_enterprise_field(field, 'active'), :onclick => "$('enterprise_fields[#{field}][required]').disabled=$('enterprise_fields[#{field}][signup]').disabled=!this.checked;" %>
-
-
- <%= hidden_field_tag "enterprise_fields[#{field}][required]", false %>
- <%= check_box_tag "enterprise_fields[#{field}][required]", true, environment.custom_enterprise_field(field, 'required'), :onclick => "if(this.checked) $('enterprise_fields[#{field}][signup]').checked = true;" %>
-
-
- <%= hidden_field_tag "enterprise_fields[#{field}][signup]", false %>
- <%= check_box_tag "enterprise_fields[#{field}][signup]", true, environment.custom_enterprise_field(field, 'signup'), :onclick => "if(!this.checked) $('enterprise_fields[#{field}][required]').checked = false;" %>
-
-
-
- <% end %>
-
-
-
-
-
- <% button_bar do %>
- <%= submit_button('save', _('Save changes')) %>
- <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
- <% end %>
-
-
-<% end %>
-
-
-
-
diff --git a/app/views/features/_manage_person_fields.html.erb b/app/views/features/_manage_person_fields.html.erb
new file mode 100644
index 0000000..39f879b
--- /dev/null
+++ b/app/views/features/_manage_person_fields.html.erb
@@ -0,0 +1,53 @@
+<%= _('Manage person fields') %>
+
+<% labelled_form_for(:environment, @environment, :url => {:action => 'manage_person_fields'}) do |f| %>
+
+
+
+ <%= _('Field') %>
+ <%= _('Active') %>
+ <%= _('Required') %>
+ <%= _('Display on signup?') %>
+
+ <% @person_fields.each do |field| %>
+
+ <%= _(field.humanize) %>
+ <%= hidden_field_tag "person_fields[#{field}][active]", false %>
+ <%= check_box_tag "person_fields[#{field}][active]", true, environment.custom_person_field(field, 'active'), :onclick => "$('person_fields[#{field}][required]').disabled=$('person_fields[#{field}][signup]').disabled=!this.checked;" %>
+
+
+ <%= hidden_field_tag "person_fields[#{field}][required]", false %>
+ <%= check_box_tag "person_fields[#{field}][required]", true, environment.custom_person_field(field, 'required'), :onclick => "if(this.checked) $('person_fields[#{field}][signup]').checked = true;" %>
+
+
+ <%= hidden_field_tag "person_fields[#{field}][signup]", false %>
+ <%= check_box_tag "person_fields[#{field}][signup]", true, environment.custom_person_field(field, 'signup'), :onclick => "if(!this.checked) $('person_fields[#{field}][required]').checked = false;" %>
+
+
+ <% end %>
+
+
+
+
+
+ <% button_bar do %>
+ <%= submit_button('save', _('Save changes')) %>
+ <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
+ <% end %>
+
+
+<% end %>
+
+
+
+
diff --git a/app/views/features/_manage_person_fields.rhtml b/app/views/features/_manage_person_fields.rhtml
deleted file mode 100644
index 39f879b..0000000
--- a/app/views/features/_manage_person_fields.rhtml
+++ /dev/null
@@ -1,53 +0,0 @@
-<%= _('Manage person fields') %>
-
-<% labelled_form_for(:environment, @environment, :url => {:action => 'manage_person_fields'}) do |f| %>
-
-
-
- <%= _('Field') %>
- <%= _('Active') %>
- <%= _('Required') %>
- <%= _('Display on signup?') %>
-
- <% @person_fields.each do |field| %>
-
- <%= _(field.humanize) %>
- <%= hidden_field_tag "person_fields[#{field}][active]", false %>
- <%= check_box_tag "person_fields[#{field}][active]", true, environment.custom_person_field(field, 'active'), :onclick => "$('person_fields[#{field}][required]').disabled=$('person_fields[#{field}][signup]').disabled=!this.checked;" %>
-
-
- <%= hidden_field_tag "person_fields[#{field}][required]", false %>
- <%= check_box_tag "person_fields[#{field}][required]", true, environment.custom_person_field(field, 'required'), :onclick => "if(this.checked) $('person_fields[#{field}][signup]').checked = true;" %>
-
-
- <%= hidden_field_tag "person_fields[#{field}][signup]", false %>
- <%= check_box_tag "person_fields[#{field}][signup]", true, environment.custom_person_field(field, 'signup'), :onclick => "if(!this.checked) $('person_fields[#{field}][required]').checked = false;" %>
-
-
- <% end %>
-
-
-
-
-
- <% button_bar do %>
- <%= submit_button('save', _('Save changes')) %>
- <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
- <% end %>
-
-
-<% end %>
-
-
-
-
diff --git a/app/views/features/index.html.erb b/app/views/features/index.html.erb
new file mode 100644
index 0000000..796e632
--- /dev/null
+++ b/app/views/features/index.html.erb
@@ -0,0 +1,43 @@
+<%= _('System features') %>
+
+<%= _('Enable/Disable features') %>
+
+
+<%= _('Here you can enable or disable several features of your environment. Each feature represents some funcionality that your environment can use if you enable it.
+
+Check all the features you want to enable for your environment, uncheck all the ones you don\'t want, and use the "Save changes" button to confirm your changes.') %>
+
+
+<% labelled_form_for(:environment, @environment, :url => {:action => 'update'}) do |f| %>
+
+
+
+ <%= _('Feature') %>
+ <%= _('Enabled?') %>
+
+ <%= hidden_field_tag('environment[enabled_features][]', '') %>
+ <% @features.each do |feature, text| %>
+
+ <%= text %>
+ <%= check_box_tag "environment[enabled_features][]", feature, @environment.enabled?(feature) %>
+
+ <% end %>
+
+
+<%= _('Configure features') %>
+
+<%= _('Page to redirect after login') %>
+ <%= select 'environment', 'redirection_after_login', Environment.login_redirection_options.map{|key,value|[value,key]} %>
+<%= _('Organization Approval Method') %>
+ <%= select_organization_approval_method('environment', 'organization_approval_method') %>
+
+ <% button_bar do %>
+ <%= submit_button('save', _('Save changes')) %>
+ <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
+ <% end %>
+
+
+<% end %>
diff --git a/app/views/features/index.rhtml b/app/views/features/index.rhtml
deleted file mode 100644
index 796e632..0000000
--- a/app/views/features/index.rhtml
+++ /dev/null
@@ -1,43 +0,0 @@
-<%= _('System features') %>
-
-<%= _('Enable/Disable features') %>
-
-
-<%= _('Here you can enable or disable several features of your environment. Each feature represents some funcionality that your environment can use if you enable it.
-
-Check all the features you want to enable for your environment, uncheck all the ones you don\'t want, and use the "Save changes" button to confirm your changes.') %>
-
-
-<% labelled_form_for(:environment, @environment, :url => {:action => 'update'}) do |f| %>
-
-
-
- <%= _('Feature') %>
- <%= _('Enabled?') %>
-
- <%= hidden_field_tag('environment[enabled_features][]', '') %>
- <% @features.each do |feature, text| %>
-
- <%= text %>
- <%= check_box_tag "environment[enabled_features][]", feature, @environment.enabled?(feature) %>
-
- <% end %>
-
-
-<%= _('Configure features') %>
-
-<%= _('Page to redirect after login') %>
- <%= select 'environment', 'redirection_after_login', Environment.login_redirection_options.map{|key,value|[value,key]} %>
-<%= _('Organization Approval Method') %>
- <%= select_organization_approval_method('environment', 'organization_approval_method') %>
-
- <% button_bar do %>
- <%= submit_button('save', _('Save changes')) %>
- <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
- <% end %>
-
-
-<% end %>
diff --git a/app/views/features/manage_fields.html.erb b/app/views/features/manage_fields.html.erb
new file mode 100644
index 0000000..e6db213
--- /dev/null
+++ b/app/views/features/manage_fields.html.erb
@@ -0,0 +1,7 @@
+<%= render :partial => 'manage_person_fields' %>
+
+<% if !environment.enabled?('disable_asset_enterprises') %>
+ <%= render :partial => 'manage_enterprise_fields' %>
+<% end %>
+
+<%= render :partial => 'manage_community_fields' %>
diff --git a/app/views/features/manage_fields.rhtml b/app/views/features/manage_fields.rhtml
deleted file mode 100644
index e6db213..0000000
--- a/app/views/features/manage_fields.rhtml
+++ /dev/null
@@ -1,7 +0,0 @@
-<%= render :partial => 'manage_person_fields' %>
-
-<% if !environment.enabled?('disable_asset_enterprises') %>
- <%= render :partial => 'manage_enterprise_fields' %>
-<% end %>
-
-<%= render :partial => 'manage_community_fields' %>
diff --git a/app/views/friends/index.html.erb b/app/views/friends/index.html.erb
new file mode 100644
index 0000000..710cd30
--- /dev/null
+++ b/app/views/friends/index.html.erb
@@ -0,0 +1,55 @@
+
+
+
<%= __("%s's friends") % profile.name %>
+
+<% cache_timeout(profile.manage_friends_cache_key(params), 4.hours) do %>
+ <% if @friends.empty? %>
+
+
+ <%= __('You have no friends yet.') %>
+ <%= link_to _('Do you want to see other people in this environment?'), :controller => 'search', :action => 'assets', :asset => 'people' %>
+
+
+ <% else %>
+ <% button_bar do %>
+ <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
+ <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
+ <% unless @plugins.dispatch(:remove_invite_friends_button).include?(true) %>
+ <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
+ <% end %>
+ <% end %>
+ <% end %>
+
+
+ <% @friends.each do |friend| %>
+
+ <%= link_to_profile profile_image(friend) + '
+ <%= link_to content_tag('span',_('remove')),
+ { :action => 'remove', :id => friend.id },
+ :class => 'button icon-remove',
+ :title => _('remove') %>
+ <%= link_to content_tag('span',_('contact')),
+ friend.url.merge(:controller => 'contact', :action => 'new', :profile => friend.identifier),
+ :class => 'button icon-menu-mail',
+ :title => _('contact') %>
+
+
+ <% end %>
+
+
+
+ <% button_bar do %>
+ <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
+ <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
+ <% unless @plugins.dispatch(:remove_invite_friends_button).include?(true) %>
+ <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
+ <% end %>
+ <% end %>
+<% end %>
+
+
-
-
<%= __("%s's friends") % profile.name %>
-
-<% cache_timeout(profile.manage_friends_cache_key(params), 4.hours) do %>
- <% if @friends.empty? %>
-
-
- <%= __('You have no friends yet.') %>
- <%= link_to _('Do you want to see other people in this environment?'), :controller => 'search', :action => 'assets', :asset => 'people' %>
-
-
- <% else %>
- <% button_bar do %>
- <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
- <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
- <% unless @plugins.dispatch(:remove_invite_friends_button).include?(true) %>
- <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
- <% end %>
- <% end %>
- <% end %>
-
-
- <% @friends.each do |friend| %>
-
- <%= link_to_profile profile_image(friend) + '
- <%= link_to content_tag('span',_('remove')),
- { :action => 'remove', :id => friend.id },
- :class => 'button icon-remove',
- :title => _('remove') %>
- <%= link_to content_tag('span',_('contact')),
- friend.url.merge(:controller => 'contact', :action => 'new', :profile => friend.identifier),
- :class => 'button icon-menu-mail',
- :title => _('contact') %>
-
-
- <% end %>
-
-
-
- <% button_bar do %>
- <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
- <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
- <% unless @plugins.dispatch(:remove_invite_friends_button).include?(true) %>
- <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
- <% end %>
- <% end %>
-<% end %>
-
-
+
+
<%= __('Removing friend: %s') % @friend.name %>
+
+<%= profile_image @friend, :thumb, :class => 'friend_picture' %>
+
+
+<%= __('Are you sure you want to remove %s from your friends list?') % @friend.name %>
+
+
+
+
+<%= __('Note that %s will still have you as a friend, unless he/she also wants to remove you from his/her friend list.') % @friend.name %>
+
+
+
+<% form_tag do %>
+ <%= hidden_field_tag(:confirmation, 1) %>
+
+ <%= submit_button(:ok, __("Yes") % @friend.name) %>
+ <%= button(:cancel, _("No"), :action => 'index') %>
+<% end %>
+
+
-
-
<%= __('Removing friend: %s') % @friend.name %>
-
-<%= profile_image @friend, :thumb, :class => 'friend_picture' %>
-
-
-<%= __('Are you sure you want to remove %s from your friends list?') % @friend.name %>
-
-
-
-
-<%= __('Note that %s will still have you as a friend, unless he/she also wants to remove you from his/her friend list.') % @friend.name %>
-
-
-
-<% form_tag do %>
- <%= hidden_field_tag(:confirmation, 1) %>
-
- <%= submit_button(:ok, __("Yes") % @friend.name) %>
- <%= button(:cancel, _("No"), :action => 'index') %>
-<% end %>
-
-
<%= _('News') %>
+ <% cache @news_cache_key do %>
+
+ <% @highlighted_news.each_with_index do |highlighted, index| %>
+
+
+
<%= link_to(h(highlighted.title), highlighted.url, :class => 'post-title') %>
+
<%= show_date(highlighted.published_at, true) %>
+
<%= highlighted.lead %>
+
+ <%= link_to(_('Read more'), highlighted.url) %>
+
+
+
+
+ <% end %>
+
+
+
+
+ <% @portal_news.each do |news| %>
+
+ <%= show_date(news.published_at, true) %>
+ <%= link_to(h(news.title), news.url, :class => 'post-title' ) %>
+
+ <% end %>
+
+
+
+ <% @area_news.each_with_index do |folder, i| %>
+ <% content_tag(:div, :class => ["news-area", ['even', 'odd'][i%2]].join(' ')) do %>
+ <% content_tag(:div, :class => 'news-area-inner-1') do %>
+ <% content_tag(:div, :class => 'news-area-inner-2') do %>
+ <%= link_to h(folder.title), folder.url %>
+
+ <% folder.news(environment.news_amount_by_folder).each do |news| %>
+ <%= link_to(h(news.title), news.url) %>
+ <% end%>
+
+ <%= link_to _('View more'), folder.url, :class => 'news-see-more' %>
+ <% end %>
+ <% end %>
+ <% end %>
+ <% end %>
+ <% end %>
+<% else %>
+ <%= environment.description %>
+<% end %>
+
+<% if environment.enabled?('search_in_home') %>
+
+ <% form_tag :controller => 'search', :action => 'index' do %>
+
+
+ <%= text_field_tag('query', '', :size => 50) %>
+ <%= submit_button(:search, _('Search')) %>
+
+
+
+ <%= lightbox_link_to _('More options'), :controller => 'search', :action => 'popup' %>
+
+ <% end %>
+
<%= _('News') %>
- <% cache @news_cache_key do %>
-
- <% @highlighted_news.each_with_index do |highlighted, index| %>
-
-
-
<%= link_to(h(highlighted.title), highlighted.url, :class => 'post-title') %>
-
<%= show_date(highlighted.published_at, true) %>
-
<%= highlighted.lead %>
-
- <%= link_to(_('Read more'), highlighted.url) %>
-
-
-
-
- <% end %>
-
-
-
-
- <% @portal_news.each do |news| %>
-
- <%= show_date(news.published_at, true) %>
- <%= link_to(h(news.title), news.url, :class => 'post-title' ) %>
-
- <% end %>
-
-
-
- <% @area_news.each_with_index do |folder, i| %>
- <% content_tag(:div, :class => ["news-area", ['even', 'odd'][i%2]].join(' ')) do %>
- <% content_tag(:div, :class => 'news-area-inner-1') do %>
- <% content_tag(:div, :class => 'news-area-inner-2') do %>
- <%= link_to h(folder.title), folder.url %>
-
- <% folder.news(environment.news_amount_by_folder).each do |news| %>
- <%= link_to(h(news.title), news.url) %>
- <% end%>
-
- <%= link_to _('View more'), folder.url, :class => 'news-see-more' %>
- <% end %>
- <% end %>
- <% end %>
- <% end %>
- <% end %>
-<% else %>
- <%= environment.description %>
-<% end %>
-
-<% if environment.enabled?('search_in_home') %>
-
- <% form_tag :controller => 'search', :action => 'index' do %>
-
-
- <%= text_field_tag('query', '', :size => 50) %>
- <%= submit_button(:search, _('Search')) %>
-
-
-
- <%= lightbox_link_to _('More options'), :controller => 'search', :action => 'popup' %>
-
- <% end %>
-
<%= _('Terms of use - %s') % environment.name %>
+<%= environment.terms_of_use %>
diff --git a/app/views/home/terms.rhtml b/app/views/home/terms.rhtml
deleted file mode 100644
index 830f50b..0000000
--- a/app/views/home/terms.rhtml
+++ /dev/null
@@ -1,2 +0,0 @@
-<%= _('Terms of use - %s') % environment.name %>
-<%= environment.terms_of_use %>
diff --git a/app/views/invite/_contact_list.html.erb b/app/views/invite/_contact_list.html.erb
new file mode 100644
index 0000000..2f3ab6c
--- /dev/null
+++ b/app/views/invite/_contact_list.html.erb
@@ -0,0 +1,12 @@
+<% friend_pos = 0 %>
+<% contacts.each do |contact| %>
+ <% friend_pos += 1 %>
+
+ <%= check_box_tag("webmail_import_addresses[]", contact[2],
+ (!@webmail_import_addresses || @webmail_import_addresses.include?(contact[2])),
+ :id => "contacts_to_invite_#{friend_pos}",
+ :class => "contact_to_invite" )
+ %>
+ "><%= "#{contact[0]} (#{contact[1]})" %>
+
+<% end %>
diff --git a/app/views/invite/_contact_list.rhtml b/app/views/invite/_contact_list.rhtml
deleted file mode 100644
index 2f3ab6c..0000000
--- a/app/views/invite/_contact_list.rhtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<% friend_pos = 0 %>
-<% contacts.each do |contact| %>
- <% friend_pos += 1 %>
-
- <%= check_box_tag("webmail_import_addresses[]", contact[2],
- (!@webmail_import_addresses || @webmail_import_addresses.include?(contact[2])),
- :id => "contacts_to_invite_#{friend_pos}",
- :class => "contact_to_invite" )
- %>
- "><%= "#{contact[0]} (#{contact[1]})" %>
-
-<% end %>
diff --git a/app/views/invite/_dialog_wait_loading.html.erb b/app/views/invite/_dialog_wait_loading.html.erb
new file mode 100644
index 0000000..360723c
--- /dev/null
+++ b/app/views/invite/_dialog_wait_loading.html.erb
@@ -0,0 +1,23 @@
+<% javascript_tag do %>
+ jQuery(function($) {
+ $("#loading-dialog").dialog({
+ height: 160,
+ width: 450,
+ modal: true,
+ resizable: false,
+ title: "<%= ui_icon('ui-icon-info') + _('Please, wait...') %>",
+ open: check_contact_list('<%= contact_list.to_s %>'),
+ });
+ });
+<% end %>
+
+
+
+
<%= _('Your e-mails contacts are being fetched') %>
+
<%= _('If it takes too long, you will be redirected to the previous page to try again. Be sure to fill in the fields with your correct login and password.') %>
+
-
<%= _('Your e-mails contacts are being fetched') %>
-
<%= _('If it takes too long, you will be redirected to the previous page to try again. Be sure to fill in the fields with your correct login and password.') %>
-
<%= _('Invite your friends') %>
+<% else %>
+ <%= _('Invite your friends to join %s') % profile.name %>
+<% end %>
+
+<%= _('Step 1 of 2: Select address book') %>
+
+<% form_tag do %>
+
+ <%= [
+ radio_button_tag(:import_from, "manual", @import_from == "manual", :onclick => 'hide_invite_friend_login_password()') + content_tag('label', _('Manually (empty field)'), :for => "import_from_manual"),
+ radio_button_tag(:import_from, "gmail", @import_from == "gmail", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Gmail', :for => 'import_from_gmail'),
+ radio_button_tag(:import_from, "yahoo", @import_from == "yahoo", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Yahoo', :for => "import_from_yahoo"),
+ radio_button_tag(:import_from, "hotmail", @import_from == "hotmail", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Hotmail', :for => "import_from_hotmail")
+ ].join("\n>
+
+ <%= ui_icon('ui-icon-alert') %>
+ <%= _('Please type your username in the format yourname@example.com') %>
+
+
+ <%= labelled_form_field(_("Username") + ":", text_field_tag(:login, @login)) %>
+ <%= labelled_form_field(_("Password") + ":", password_field_tag(:password)) %>
+
<%= _("We won't store your password or contact anyone without your permission.") %>
+<% end %>
+
+
+
+
+
diff --git a/app/views/invite/select_address_book.rhtml b/app/views/invite/select_address_book.rhtml
deleted file mode 100644
index 64b348c..0000000
--- a/app/views/invite/select_address_book.rhtml
+++ /dev/null
@@ -1,51 +0,0 @@
-<% if profile.person? %>
- <%= _('Invite your friends') %>
-<% else %>
- <%= _('Invite your friends to join %s') % profile.name %>
-<% end %>
-
-<%= _('Step 1 of 2: Select address book') %>
-
-<% form_tag do %>
-
- <%= [
- radio_button_tag(:import_from, "manual", @import_from == "manual", :onclick => 'hide_invite_friend_login_password()') + content_tag('label', _('Manually (empty field)'), :for => "import_from_manual"),
- radio_button_tag(:import_from, "gmail", @import_from == "gmail", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Gmail', :for => 'import_from_gmail'),
- radio_button_tag(:import_from, "yahoo", @import_from == "yahoo", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Yahoo', :for => "import_from_yahoo"),
- radio_button_tag(:import_from, "hotmail", @import_from == "hotmail", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Hotmail', :for => "import_from_hotmail")
- ].join("\n>
-
- <%= ui_icon('ui-icon-alert') %>
- <%= _('Please type your username in the format yourname@example.com') %>
-
-
- <%= labelled_form_field(_("Username") + ":", text_field_tag(:login, @login)) %>
- <%= labelled_form_field(_("Password") + ":", password_field_tag(:password)) %>
-
<%= _("We won't store your password or contact anyone without your permission.") %>
-<% end %>
-
-
-
-
-
diff --git a/app/views/invite/select_friends.html.erb b/app/views/invite/select_friends.html.erb
new file mode 100644
index 0000000..721a377
--- /dev/null
+++ b/app/views/invite/select_friends.html.erb
@@ -0,0 +1,47 @@
+<%= render :partial => 'invite/dialog_wait_loading', :locals => {:contact_list => @contact_list.id } if @import_from != 'manual' %>
+
+<% if profile.person? %>
+ <%= _('Invite your friends') %>
+<% else %>
+ <%= _('Invite your friends to join %s') % profile.name %>
+<% end %>
+
+
+<%= _('Step 2 of 2: Selecting Friends') %>
+
+<%= button(:back, _('Back'), { :action => 'select_address_book' }, :id => 'invitation_back_button') %>
+
+
+<%= _('Indicate which friends you want to invite.') %>
+
+
+<% form_tag do %>
+ <%= hidden_field_tag(:import_from, @import_from) %>
+ <%= hidden_field_tag(:contact_list, @contact_list.id) %>
+
+
+ <%= labelled_form_field(_('Enter one e-mail address per line:'), text_area_tag(:manual_import_addresses, (@manual_import_addresses || ''), :rows => 5, :style => 'width: 98%;')) %>
+
+ <% if @import_from != 'manual' %>
+
+ <%= link_to_function _('Check all'), "$$('input.contact_to_invite').each(function(checkbox) { checkbox.checked = true; });" %>
+ <%= link_to_function _('Uncheck all'), "$$('input.contact_to_invite').each(function(checkbox) { checkbox.checked = false; });" %>
+
+
+ <%= h _("Now enter an invitation message. You must keep the code in your invitation text. When your friends receive the invitation e-mail, will be replaced by a link that they need to click to activate their account. and codes will be replaced by your name and friend name, but they are optional.") %>
+ <%= labelled_form_field(_('Invitation text:'), text_area_tag(:mail_template, @mail_template, :cols => 72, :rows => 8)) %>
+
+
+ <% button_bar do %>
+ <%= submit_button(:ok, _("Invite my friends!")) %>
+ <% end %>
+<% end %>
diff --git a/app/views/invite/select_friends.rhtml b/app/views/invite/select_friends.rhtml
deleted file mode 100644
index 721a377..0000000
--- a/app/views/invite/select_friends.rhtml
+++ /dev/null
@@ -1,47 +0,0 @@
-<%= render :partial => 'invite/dialog_wait_loading', :locals => {:contact_list => @contact_list.id } if @import_from != 'manual' %>
-
-<% if profile.person? %>
- <%= _('Invite your friends') %>
-<% else %>
- <%= _('Invite your friends to join %s') % profile.name %>
-<% end %>
-
-
-<%= _('Step 2 of 2: Selecting Friends') %>
-
-<%= button(:back, _('Back'), { :action => 'select_address_book' }, :id => 'invitation_back_button') %>
-
-
-<%= _('Indicate which friends you want to invite.') %>
-
-
-<% form_tag do %>
- <%= hidden_field_tag(:import_from, @import_from) %>
- <%= hidden_field_tag(:contact_list, @contact_list.id) %>
-
-
- <%= labelled_form_field(_('Enter one e-mail address per line:'), text_area_tag(:manual_import_addresses, (@manual_import_addresses || ''), :rows => 5, :style => 'width: 98%;')) %>
-
- <% if @import_from != 'manual' %>
-
- <%= link_to_function _('Check all'), "$$('input.contact_to_invite').each(function(checkbox) { checkbox.checked = true; });" %>
- <%= link_to_function _('Uncheck all'), "$$('input.contact_to_invite').each(function(checkbox) { checkbox.checked = false; });" %>
-
-
- <%= h _("Now enter an invitation message. You must keep the code in your invitation text. When your friends receive the invitation e-mail, will be replaced by a link that they need to click to activate their account. and codes will be replaced by your name and friend name, but they are optional.") %>
- <%= labelled_form_field(_('Invitation text:'), text_area_tag(:mail_template, @mail_template, :cols => 72, :rows => 8)) %>
-
-
- <% button_bar do %>
- <%= submit_button(:ok, _("Invite my friends!")) %>
- <% end %>
-<% end %>
diff --git a/app/views/layouts/_javascript.html.erb b/app/views/layouts/_javascript.html.erb
new file mode 100644
index 0000000..1c9e5dd
--- /dev/null
+++ b/app/views/layouts/_javascript.html.erb
@@ -0,0 +1,13 @@
+<%= javascript_include_tag :defaults, 'jquery-latest.js',
+'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'colorbox',
+'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
+'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput',
+'add-and-join', 'report-abuse', 'catalog', 'manage-products',
+'jquery-ui-timepicker-addon', :cache => 'cache-general' %>
+
+<% language = FastGettext.locale %>
+<% %w{messages methods}.each do |type| %>
+ <% require_path = File.join('jquery-validation', 'localization', type+'_'+language) %>
+ <% full_path = File.join(Rails.root, 'public', 'javascripts', require_path+'.js')%>
+ <%= javascript_include_tag require_path if File.exists?(full_path) %>
+<% end %>
diff --git a/app/views/layouts/_javascript.rhtml b/app/views/layouts/_javascript.rhtml
deleted file mode 100644
index 1c9e5dd..0000000
--- a/app/views/layouts/_javascript.rhtml
+++ /dev/null
@@ -1,13 +0,0 @@
-<%= javascript_include_tag :defaults, 'jquery-latest.js',
-'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'colorbox',
-'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
-'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput',
-'add-and-join', 'report-abuse', 'catalog', 'manage-products',
-'jquery-ui-timepicker-addon', :cache => 'cache-general' %>
-
-<% language = FastGettext.locale %>
-<% %w{messages methods}.each do |type| %>
- <% require_path = File.join('jquery-validation', 'localization', type+'_'+language) %>
- <% full_path = File.join(Rails.root, 'public', 'javascripts', require_path+'.js')%>
- <%= javascript_include_tag require_path if File.exists?(full_path) %>
-<% end %>
diff --git a/app/views/layouts/application-ng.html.erb b/app/views/layouts/application-ng.html.erb
new file mode 100644
index 0000000..480e3f9
--- /dev/null
+++ b/app/views/layouts/application-ng.html.erb
@@ -0,0 +1,103 @@
+
+
+
+ <%= h page_title %>
+ <%= yield(:feeds) %>
+
+ <%= _("Go to the content") %>
+
+
+
+
+ <%= usermenu_logged_in %>
+
+
+
+ <%= _("%s ") % thickbox_inline_popup_link('' + _('Login') + ' ', login_url, 'inlineLoginBox', :id => 'link_login') %>
+ <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_eval(&content) }.join("") %>
+
+
+ <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
+
+
+ <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
+ <%= _("or %s ") % link_to('' + _('Sign up') + ' ', :controller => 'account', :action => 'signup')%>
+ <% end %>
+
+
+
+
+
+
+ <%= theme_site_title %>
+
+
+
+ <%= theme_extra_navigation %>
+
+
+
+
+
+ <%= insert_boxes(yield) %>
+
+
+
+
<%= h page_title %>
- <%= yield(:feeds) %>
-
- <%= _("Go to the content") %>
-
-
-
-
- <%= usermenu_logged_in %>
-
-
-
- <%= _("%s ") % thickbox_inline_popup_link('' + _('Login') + ' ', login_url, 'inlineLoginBox', :id => 'link_login') %>
- <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_eval(&content) }.join("") %>
-
-
- <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
-
-
- <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
- <%= _("or %s ") % link_to('' + _('Sign up') + ' ', :controller => 'account', :action => 'signup')%>
- <% end %>
-
-
-
-
-
-
- <%= theme_site_title %>
-
-
-
- <%= theme_extra_navigation %>
-
-
-
-
-
- <%= insert_boxes(yield) %>
-
-
-
-
<%= h page_title %>
+
+
+
+
+
+
BETA
+
+
+
+
+ <%= link_to ""+ @environment.name() +" ",
+ @environment.top_url,
+ :id=>"menu_link_to_envhome",
+ :title=>@environment.name %>
+ <% unless environment.enabled?(:disable_categories) %>
+ <% cache(environment.id.to_s + '_categories_menu') do %>
+ <%= render :file => 'shared/categories_menu' %>
+ <% end %>
+ <% end %>
+ <%= render :file => 'shared/assets_menu' %>
+
+
+
+ <%= language_chooser(environment, :element => 'dropdown') %>
+
+
+
+ <%= render :file => 'shared/user_menu' %>
+
+
+
<%= _('Manual') %>
+
+
+
+
+
+
+
+
+ <%= insert_boxes(yield) %>
+
+
+
+
+
+
+
+
<%= h page_title %>
-
-
-
-
-
-
BETA
-
-
-
-
- <%= link_to ""+ @environment.name() +" ",
- @environment.top_url,
- :id=>"menu_link_to_envhome",
- :title=>@environment.name %>
- <% unless environment.enabled?(:disable_categories) %>
- <% cache(environment.id.to_s + '_categories_menu') do %>
- <%= render :file => 'shared/categories_menu' %>
- <% end %>
- <% end %>
- <%= render :file => 'shared/assets_menu' %>
-
-
-
- <%= language_chooser(environment, :element => 'dropdown') %>
-
-
-
- <%= render :file => 'shared/user_menu' %>
-
-
-
<%= _('Manual') %>
-
-
-
-
-
-
-
-
- <%= insert_boxes(yield) %>
-
-
-
-
-
-
-
-
noosfero block
+
+ <%= stylesheet_link_tag 'common' %>
+ <%= stylesheet_link_tag 'button' %>
+ <%= stylesheet_link_tag 'search' %>
+ <%= stylesheet_link_tag 'block' %>
+
+
+ <%# FIXME %>
+ <%= stylesheet_link_tag '/designs/templates/default/stylesheets/style.css' %>
+
+ <%= icon_theme_stylesheet_tag %>
+
+ <%= javascript_include_tag(:defaults) %>
+
+ noosfero block
-
- <%= stylesheet_link_tag 'common' %>
- <%= stylesheet_link_tag 'button' %>
- <%= stylesheet_link_tag 'search' %>
- <%= stylesheet_link_tag 'block' %>
-
-
- <%# FIXME %>
- <%= stylesheet_link_tag '/designs/templates/default/stylesheets/style.css' %>
-
- <%= icon_theme_stylesheet_tag %>
-
- <%= javascript_include_tag(:defaults) %>
-
- <%= h page_title %>
+
+
<%= _("%s - Friends online (%d )") % [h(page_title), 0] %>
+
+
+
+ <%= image_tag "#{theme_path}/images/thin-logo.png", :title => environment.name, :alt => environment.name %>
+
+
+
+
<%= h page_title %>
-
-
<%= _("%s - Friends online (%d )") % [h(page_title), 0] %>
-
-
-
- <%= image_tag "#{theme_path}/images/thin-logo.png", :title => environment.name, :alt => environment.name %>
-
-
-
-
<%=
+ (@page ? @page.name + ' - ' : '') +
+ (@profile ? @profile.name + ' - ' : '') +
+ @environment.name +
+ (@category ? "→ #{@category.full_name}" : '')
+ %>
+
+ <%= stylesheet_import "slideshow" %>
+ <%= javascript_include_tag 'jquery-latest', 'sliderjs', 'pikachoose', :cache => 'cache-slideshow' %>
+
+
+
+ <%= yield %>
+
+
diff --git a/app/views/layouts/slideshow.rhtml b/app/views/layouts/slideshow.rhtml
deleted file mode 100644
index 05873ca..0000000
--- a/app/views/layouts/slideshow.rhtml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
- <%=
- (@page ? @page.name + ' - ' : '') +
- (@profile ? @profile.name + ' - ' : '') +
- @environment.name +
- (@category ? "→ #{@category.full_name}" : '')
- %>
-
- <%= stylesheet_import "slideshow" %>
- <%= javascript_include_tag 'jquery-latest', 'sliderjs', 'pikachoose', :cache => 'cache-slideshow' %>
-
-
-
- <%= yield %>
-
-
diff --git a/app/views/mailconf/index.html.erb b/app/views/mailconf/index.html.erb
new file mode 100644
index 0000000..96b1fd9
--- /dev/null
+++ b/app/views/mailconf/index.html.erb
@@ -0,0 +1,43 @@
+<%= _('e-Mail configuration') %>
+
+<%= error_messages_for :task %>
+
+<% if profile.user.email_activation_pending? %>
+
+ <%= _('You already request activation of your mailbox. Please wait until an administrator approves your request.') %>
+
+ <% button_bar do %>
+ <%= button :back, _('Back to control panel'), :controller => 'profile_editor' %>
+ <% end %>
+
+<% else %>
+
+
+ <% if profile.user.enable_email %>
+ <%= ('E-mail address') %>
+
+ <%= profile.email_addresses.map{|i| content_tag('li', i)}.join("\n") %>
+
+ <%= _('Configuration') %>
+
+
+ <%= link_to _('Mail configuration for POP and IMAP'), 'http://www.ynternet.org/move/infos-technique-pour-utiliser-multypass-pop3-smtp-imap-ftp-quotas...' %>
+
+
+ <% button_bar do %>
+ <%= button :back, _('Back to control panel'), :controller => 'profile_editor' %>
+ <% end %>
+
+ <% else %>
+
+ <%= _("Enable e-Mail account below:") %>
+ <%= profile.email_addresses.map{|i| content_tag('li', i)}.join("\n") %>
+ <%= _("You'll be able to access a webmail from your user menu.") %>
+ <% button_bar do %>
+ <%= button(:ok, _('Enable e-Mail'), { :action => 'enable' }, :method => 'post') %>
+ <%= button :back, _('Back to control panel'), :controller => 'profile_editor' %>
+ <% end %>
+
+ <% end %>
+
+<% end %>
diff --git a/app/views/mailconf/index.rhtml b/app/views/mailconf/index.rhtml
deleted file mode 100644
index 96b1fd9..0000000
--- a/app/views/mailconf/index.rhtml
+++ /dev/null
@@ -1,43 +0,0 @@
-<%= _('e-Mail configuration') %>
-
-<%= error_messages_for :task %>
-
-<% if profile.user.email_activation_pending? %>
-
- <%= _('You already request activation of your mailbox. Please wait until an administrator approves your request.') %>
-
- <% button_bar do %>
- <%= button :back, _('Back to control panel'), :controller => 'profile_editor' %>
- <% end %>
-
-<% else %>
-
-
- <% if profile.user.enable_email %>
- <%= ('E-mail address') %>
-
- <%= profile.email_addresses.map{|i| content_tag('li', i)}.join("\n") %>
-
- <%= _('Configuration') %>
-
-
- <%= link_to _('Mail configuration for POP and IMAP'), 'http://www.ynternet.org/move/infos-technique-pour-utiliser-multypass-pop3-smtp-imap-ftp-quotas...' %>
-
-
- <% button_bar do %>
- <%= button :back, _('Back to control panel'), :controller => 'profile_editor' %>
- <% end %>
-
- <% else %>
-
- <%= _("Enable e-Mail account below:") %>
- <%= profile.email_addresses.map{|i| content_tag('li', i)}.join("\n") %>
- <%= _("You'll be able to access a webmail from your user menu.") %>
- <% button_bar do %>
- <%= button(:ok, _('Enable e-Mail'), { :action => 'enable' }, :method => 'post') %>
- <%= button :back, _('Back to control panel'), :controller => 'profile_editor' %>
- <% end %>
-
- <% end %>
-
-<% end %>
diff --git a/app/views/mailing/sender/mail.html.erb b/app/views/mailing/sender/mail.html.erb
new file mode 100644
index 0000000..dc92944
--- /dev/null
+++ b/app/views/mailing/sender/mail.html.erb
@@ -0,0 +1,17 @@
+
+
+
+
+ --
+
+
+
+
+
diff --git a/app/views/mailing/sender/mail.rhtml b/app/views/mailing/sender/mail.rhtml
deleted file mode 100644
index dc92944..0000000
--- a/app/views/mailing/sender/mail.rhtml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
- --
-
-
-
-
-
diff --git a/app/views/manage_products/_add_input.html.erb b/app/views/manage_products/_add_input.html.erb
new file mode 100644
index 0000000..cce9cfd
--- /dev/null
+++ b/app/views/manage_products/_add_input.html.erb
@@ -0,0 +1,25 @@
+
+
+<% form_for(@input,
+ :url => {:action => 'add_input', :id => @product},
+ :html => {:method => 'post', :id => 'input-category-form'}
+ ) do |f| %>
+
+ <%= _('Choose an input or raw material to this product:') %>
+
+ <%= categories_container(select_for_new_category(@categories, @level)) %>
+
+
+
+ <%= submit_button(:save, _('Save and continue'), :id => 'save_and_continue') %>
+
+ <%= ui_icon('ui-icon-alert') %>
+ <%= _('This category does not allow registration of products, select a more specific category') %>
+
+
+ <%= button :cancel, _('Cancel'), '#', :class => 'cancel-add-input' %>
+
+
+<% end %>
+
+<%= javascript_tag "add_input_stuff()" %>
diff --git a/app/views/manage_products/_add_input.rhtml b/app/views/manage_products/_add_input.rhtml
deleted file mode 100644
index cce9cfd..0000000
--- a/app/views/manage_products/_add_input.rhtml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-<% form_for(@input,
- :url => {:action => 'add_input', :id => @product},
- :html => {:method => 'post', :id => 'input-category-form'}
- ) do |f| %>
-
- <%= _('Choose an input or raw material to this product:') %>
-
- <%= categories_container(select_for_new_category(@categories, @level)) %>
-
-
-
- <%= submit_button(:save, _('Save and continue'), :id => 'save_and_continue') %>
-
- <%= ui_icon('ui-icon-alert') %>
- <%= _('This category does not allow registration of products, select a more specific category') %>
-
-
- <%= button :cancel, _('Cancel'), '#', :class => 'cancel-add-input' %>
-
-
-<% end %>
-
-<%= javascript_tag "add_input_stuff()" %>
diff --git a/app/views/manage_products/_categories_for_selection.html.erb b/app/views/manage_products/_categories_for_selection.html.erb
new file mode 100644
index 0000000..cb62882
--- /dev/null
+++ b/app/views/manage_products/_categories_for_selection.html.erb
@@ -0,0 +1,8 @@
+<%= select_for_categories(categories, level) %>
+
+<% javascript_tag do %>
+ jQuery('#categories_container_wrapper').scrollTo('100%', 1000)
+ $('selected_category_id').value = <%= @category && @category.id %>
+ $('hierarchy_navigation').update('<%= escape_javascript(hierarchy_category_navigation(@category, :make_links => true)) %>')
+ toggleDisabled(<%= @category && @category.accept_products? ? 'true' : 'false' %>, $('save_and_continue'))
+<% end %>
diff --git a/app/views/manage_products/_categories_for_selection.rhtml b/app/views/manage_products/_categories_for_selection.rhtml
deleted file mode 100644
index cb62882..0000000
--- a/app/views/manage_products/_categories_for_selection.rhtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<%= select_for_categories(categories, level) %>
-
-<% javascript_tag do %>
- jQuery('#categories_container_wrapper').scrollTo('100%', 1000)
- $('selected_category_id').value = <%= @category && @category.id %>
- $('hierarchy_navigation').update('<%= escape_javascript(hierarchy_category_navigation(@category, :make_links => true)) %>')
- toggleDisabled(<%= @category && @category.accept_products? ? 'true' : 'false' %>, $('save_and_continue'))
-<% end %>
diff --git a/app/views/manage_products/_certifiers_for_selection.html.erb b/app/views/manage_products/_certifiers_for_selection.html.erb
new file mode 100644
index 0000000..07ae53a
--- /dev/null
+++ b/app/views/manage_products/_certifiers_for_selection.html.erb
@@ -0,0 +1,4 @@
+<%= select_certifiers(@qualifier) + remove_qualifier_button %>
+<% javascript_tag do %>
+ jQuery('#product-qualifiers-list *').removeClass('small-loading')
+<% end %>
diff --git a/app/views/manage_products/_certifiers_for_selection.rhtml b/app/views/manage_products/_certifiers_for_selection.rhtml
deleted file mode 100644
index 07ae53a..0000000
--- a/app/views/manage_products/_certifiers_for_selection.rhtml
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= select_certifiers(@qualifier) + remove_qualifier_button %>
-<% javascript_tag do %>
- jQuery('#product-qualifiers-list *').removeClass('small-loading')
-<% end %>
diff --git a/app/views/manage_products/_display_category.html.erb b/app/views/manage_products/_display_category.html.erb
new file mode 100644
index 0000000..3662191
--- /dev/null
+++ b/app/views/manage_products/_display_category.html.erb
@@ -0,0 +1,4 @@
+
+
+ <%= edit_link( _('Change category'), { :action => 'edit_category', :id => @product.id}, :id => 'link-edit-product-category') %>
+
-
- <%= edit_link( _('Change category'), { :action => 'edit_category', :id => @product.id}, :id => 'link-edit-product-category') %>
-
+ <%= image_tag (@product.reload.default_image('big')), :class => 'product-pic' %>
+
+
+<% if @product.image %>
+ <%= link_to content_tag(:span, _('Zoom in')), @product.image.public_filename,
+ :class => 'zoomify-image' %>
+<% end %>
+<%= add_zoom_to_images %>
+
+<%= edit_product_link_to_remote(@product, 'image', _('Change image')) %>
diff --git a/app/views/manage_products/_display_image.rhtml b/app/views/manage_products/_display_image.rhtml
deleted file mode 100644
index e8e44fb..0000000
--- a/app/views/manage_products/_display_image.rhtml
+++ /dev/null
@@ -1,11 +0,0 @@
-
- <%= image_tag (@product.reload.default_image('big')), :class => 'product-pic' %>
-
-
-<% if @product.image %>
- <%= link_to content_tag(:span, _('Zoom in')), @product.image.public_filename,
- :class => 'zoomify-image' %>
-<% end %>
-<%= add_zoom_to_images %>
-
-<%= edit_product_link_to_remote(@product, 'image', _('Change image')) %>
diff --git a/app/views/manage_products/_display_info.html.erb b/app/views/manage_products/_display_info.html.erb
new file mode 100644
index 0000000..d7adc96
--- /dev/null
+++ b/app/views/manage_products/_display_info.html.erb
@@ -0,0 +1,17 @@
+
+ <%= display_value(@product) %>
+ <%= display_availability(@product) %>
+ <%= display_qualifiers(@product) %>
+
+ <% if @product.has_basic_info? %>
+ <%= edit_product_button_to_remote(@product, 'info', _('Edit basic information'), :title => _('Click here to edit price, discount and qualifiers/certifiers to make your product more attractive and detailed for the consumers')) %>
+ <% else %>
+ <%= edit_product_ui_button_to_remote(@product, 'info', _('Add price and other basic information'),
+ :title => _('Click here to add price, discount and qualifiers/certifiers to make your product more attractive and detailed for the consumers'),
+ 'data-primary-icon' => 'ui-icon-pencil',
+ 'data-secondary-icon' => 'ui-icon-triangle-1-s')
+ %>
+ <%= javascript_tag("render_jquery_ui_buttons('edit-product-remote-button-ui-info')") %>
+ <% end%>
+
+
diff --git a/app/views/manage_products/_display_info.rhtml b/app/views/manage_products/_display_info.rhtml
deleted file mode 100644
index d7adc96..0000000
--- a/app/views/manage_products/_display_info.rhtml
+++ /dev/null
@@ -1,17 +0,0 @@
-
- <%= display_value(@product) %>
- <%= display_availability(@product) %>
- <%= display_qualifiers(@product) %>
-
- <% if @product.has_basic_info? %>
- <%= edit_product_button_to_remote(@product, 'info', _('Edit basic information'), :title => _('Click here to edit price, discount and qualifiers/certifiers to make your product more attractive and detailed for the consumers')) %>
- <% else %>
- <%= edit_product_ui_button_to_remote(@product, 'info', _('Add price and other basic information'),
- :title => _('Click here to add price, discount and qualifiers/certifiers to make your product more attractive and detailed for the consumers'),
- 'data-primary-icon' => 'ui-icon-pencil',
- 'data-secondary-icon' => 'ui-icon-triangle-1-s')
- %>
- <%= javascript_tag("render_jquery_ui_buttons('edit-product-remote-button-ui-info')") %>
- <% end%>
-
-
diff --git a/app/views/manage_products/_display_input.html.erb b/app/views/manage_products/_display_input.html.erb
new file mode 100644
index 0000000..45f4fb1
--- /dev/null
+++ b/app/views/manage_products/_display_input.html.erb
@@ -0,0 +1,21 @@
+
+
+ <% if user && user.has_permission?('manage_products', profile) %>
+ <%= javascript_tag "input_javascript_stuff(#{input.id})" %>
+ <% end %>
diff --git a/app/views/manage_products/_display_input.rhtml b/app/views/manage_products/_display_input.rhtml
deleted file mode 100644
index 45f4fb1..0000000
--- a/app/views/manage_products/_display_input.rhtml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
- <% if user && user.has_permission?('manage_products', profile) %>
- <%= javascript_tag "input_javascript_stuff(#{input.id})" %>
- <% end %>
diff --git a/app/views/manage_products/_display_inputs.html.erb b/app/views/manage_products/_display_inputs.html.erb
new file mode 100644
index 0000000..1c77287
--- /dev/null
+++ b/app/views/manage_products/_display_inputs.html.erb
@@ -0,0 +1,33 @@
+
+
+
+ <% if @product.inputs.empty? %>
+ <%= edit_ui_button(
+ _('Add the inputs or raw material used by this product'),
+ {:action => 'add_input', :id => @product.id},
+ :id => 'add-input-button',
+ 'data-primary-icon' => 'ui-icon-pencil',
+ 'data-secondary-icon' => 'ui-icon-triangle-1-s',
+ :title => _('Add inputs or raw materials used by this product and give more transparency to consumers about your enterprise')
+ ) %>
+ <%= javascript_tag("render_jquery_ui_buttons('add-input-button')") %>
+ <% else %>
+ <%= edit_button(:add, _('Add new input or raw material'), {:action => 'add_input', :id => @product.id}, :id => 'add-input-button', :title => _('Add new input or raw material used by this product and give more transparency to consumers about your enterprise')) %>
+ <%= content_tag('span', _('Drag the input with the mouse to change the order'), :class => 'hint', :style => 'display: none') %>
+ <% end %>
+
+
+
+
+<% if user && user.has_permission?('manage_products', profile) %>
+ <% if @product.inputs.size > 1 %>
+ <%= javascript_tag "input_javascript_ordering_stuff()" %>
+ <% end %>
+ <%= javascript_tag "display_input_stuff()" %>
+<% end %>
diff --git a/app/views/manage_products/_display_inputs.rhtml b/app/views/manage_products/_display_inputs.rhtml
deleted file mode 100644
index 1c77287..0000000
--- a/app/views/manage_products/_display_inputs.rhtml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
- <% if @product.inputs.empty? %>
- <%= edit_ui_button(
- _('Add the inputs or raw material used by this product'),
- {:action => 'add_input', :id => @product.id},
- :id => 'add-input-button',
- 'data-primary-icon' => 'ui-icon-pencil',
- 'data-secondary-icon' => 'ui-icon-triangle-1-s',
- :title => _('Add inputs or raw materials used by this product and give more transparency to consumers about your enterprise')
- ) %>
- <%= javascript_tag("render_jquery_ui_buttons('add-input-button')") %>
- <% else %>
- <%= edit_button(:add, _('Add new input or raw material'), {:action => 'add_input', :id => @product.id}, :id => 'add-input-button', :title => _('Add new input or raw material used by this product and give more transparency to consumers about your enterprise')) %>
- <%= content_tag('span', _('Drag the input with the mouse to change the order'), :class => 'hint', :style => 'display: none') %>
- <% end %>
-
-
-
-
-<% if user && user.has_permission?('manage_products', profile) %>
- <% if @product.inputs.size > 1 %>
- <%= javascript_tag "input_javascript_ordering_stuff()" %>
- <% end %>
- <%= javascript_tag "display_input_stuff()" %>
-<% end %>
diff --git a/app/views/manage_products/_display_name.html.erb b/app/views/manage_products/_display_name.html.erb
new file mode 100644
index 0000000..ec64e4e
--- /dev/null
+++ b/app/views/manage_products/_display_name.html.erb
@@ -0,0 +1,13 @@
+
+
<%= @product.name_with_unit %>
+ <%= edit_product_link_to_remote(@product, 'name', _('Edit name and unit'), :title => _('Click here to edit the name of your product and the unit')) %>
+
+<% javascript_tag do %>
+ $$('#display-product-category .hierarchy-category')[0].update('<%=
+ escape_javascript(hierarchy_category_navigation(
+ @product.product_category,
+ :make_links => false,
+ :hide_current_category => @product.name_is_blank?)
+ )
+ %>')
+<% end %>
diff --git a/app/views/manage_products/_display_name.rhtml b/app/views/manage_products/_display_name.rhtml
deleted file mode 100644
index ec64e4e..0000000
--- a/app/views/manage_products/_display_name.rhtml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
<%= @product.name_with_unit %>
- <%= edit_product_link_to_remote(@product, 'name', _('Edit name and unit'), :title => _('Click here to edit the name of your product and the unit')) %>
-
-<% javascript_tag do %>
- $$('#display-product-category .hierarchy-category')[0].update('<%=
- escape_javascript(hierarchy_category_navigation(
- @product.product_category,
- :make_links => false,
- :hide_current_category => @product.name_is_blank?)
- )
- %>')
-<% end %>
diff --git a/app/views/manage_products/_display_price_details.html.erb b/app/views/manage_products/_display_price_details.html.erb
new file mode 100644
index 0000000..a65b18b
--- /dev/null
+++ b/app/views/manage_products/_display_price_details.html.erb
@@ -0,0 +1,18 @@
+
+
+
+
+
+ <%= _('Inputs:') %>
+
+ <%= float_to_currency(@product.inputs_cost) %>
+
+
+ <% @product.price_details.each do |price_detail| %>
+
+ <%= "%s:" % price_detail.production_cost.name %>
+ <%= float_to_currency(price_detail.price) %>
+
+ <% end %>
+
+
-
-
-
-
- <%= _('Inputs:') %>
-
- <%= float_to_currency(@product.inputs_cost) %>
-
-
- <% @product.price_details.each do |price_detail| %>
-
- <%= "%s:" % price_detail.production_cost.name %>
- <%= float_to_currency(price_detail.price) %>
-
- <% end %>
-
-
+ <%= image_tag (@product.reload.default_image('thumb')), :class => 'product-pic' %>
+
+
+<% form_for(:product, :url => { :controller => 'manage_products', :action => 'edit', :id => @product, :field => 'image' }, :html => { :method => 'post', :id => 'uploadForm', :multipart => true}) do |f| %>
+ <% f.fields_for :image_builder, @product.image do |i| %>
+ <%= i.file_field( :uploaded_data, { :size => 10 } ) %>
+ <%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %>
+ <% end %>
+
+ <%= submit_button 'save', _('Save') %>
+ <%= cancel_edit_product_link(@product, 'image') %>
+<% end %>
+
+
+
+<% if errors %>
+ <%= render_dialog_error_messages 'product' %>
+<% end %>
diff --git a/app/views/manage_products/_edit_image.rhtml b/app/views/manage_products/_edit_image.rhtml
deleted file mode 100644
index d8c3338..0000000
--- a/app/views/manage_products/_edit_image.rhtml
+++ /dev/null
@@ -1,26 +0,0 @@
-
- <%= image_tag (@product.reload.default_image('thumb')), :class => 'product-pic' %>
-
-
-<% form_for(:product, :url => { :controller => 'manage_products', :action => 'edit', :id => @product, :field => 'image' }, :html => { :method => 'post', :id => 'uploadForm', :multipart => true}) do |f| %>
- <% f.fields_for :image_builder, @product.image do |i| %>
- <%= i.file_field( :uploaded_data, { :size => 10 } ) %>
- <%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %>
- <% end %>
-
- <%= submit_button 'save', _('Save') %>
- <%= cancel_edit_product_link(@product, 'image') %>
-<% end %>
-
-
-
-<% if errors %>
- <%= render_dialog_error_messages 'product' %>
-<% end %>
diff --git a/app/views/manage_products/_edit_info.html.erb b/app/views/manage_products/_edit_info.html.erb
new file mode 100644
index 0000000..66caa94
--- /dev/null
+++ b/app/views/manage_products/_edit_info.html.erb
@@ -0,0 +1,63 @@
+<% if errors %>
+ <%= render_dialog_error_messages 'product' %>
+<% end %>
+
+<% remote_form_for(@product,
+ :loading => "small_loading('product-info-form')",
+ :update => 'product-info',
+ :url => {:controller => 'manage_products', :action => 'edit', :id => @product, :field => 'info'},
+ :html => {:id => 'product-info-form', :method => 'post'}) do |f| %>
+
+
+
+ <%= f.label :price, _('Price (%s)') % environment.currency_unit, :class => 'formlabel' %>
+ <%= f.text_field(:price, :value => @product.formatted_value(:price), :class => 'numbers-only') %>
+
+
+ <%= f.label :discount, _('Discount (%s)') % environment.currency_unit, :class => 'formlabel' %>
+ <%= f.text_field(:discount, :value => @product.formatted_value(:discount), :class => 'numbers-only', :title => _('If your product is on sale, fill this field with the discount value')) %>
+
+
+ <%= _('Available') %>
+ <%= labelled_radio_button( _('Yes'), 'product[available]', true, @product.available, :id => 'product_available') + labelled_radio_button( _('No'), 'product[available]', false, !@product.available) %>
+
+
+ <%= f.label :highlighted, _('Highlight this product?'), :class => 'formlabel' %>
+ <%= f.check_box(:highlighted) %>
+
+
+
+ <% if !environment.qualifiers.empty? %>
+
+
+ <%= _('Qualifier') %>
+ <%= _('Certifier') %>
+
+ <% @product.qualifiers.each_with_index do |qualifier, index| %>
+
+
+ <%= select_qualifiers(@product, qualifier.id) %>
+
+
+ <%= select_certifiers(qualifier, @product) + remove_qualifier_button %>
+
+
+ <% end %>
+
+ <%= button_to_function(
+ :add,
+ _('Add new qualifier'),
+ "new_qualifier_row('#product-qualifiers-list', '#{escape_javascript(select_qualifiers(@product))}', '#{escape_javascript(remove_qualifier_button)}')"
+ ) %>
+ <%= hidden_field_tag "product[qualifiers_list][nil]" %>
+ <% end %>
+
+ <%= hidden_field_tag 'info-bar-update-url', @product.price_composition_bar_display_url, :class => 'bar-update-url' %>
+
+ <% button_bar do %>
+ <%= submit_button :save, _('Save') %>
+ <%= cancel_edit_product_link(@product, 'info') %>
+ <% end %>
+<% end %>
+
+<%= render :partial => 'shared/numbers_only_javascript' %>
diff --git a/app/views/manage_products/_edit_info.rhtml b/app/views/manage_products/_edit_info.rhtml
deleted file mode 100644
index 66caa94..0000000
--- a/app/views/manage_products/_edit_info.rhtml
+++ /dev/null
@@ -1,63 +0,0 @@
-<% if errors %>
- <%= render_dialog_error_messages 'product' %>
-<% end %>
-
-<% remote_form_for(@product,
- :loading => "small_loading('product-info-form')",
- :update => 'product-info',
- :url => {:controller => 'manage_products', :action => 'edit', :id => @product, :field => 'info'},
- :html => {:id => 'product-info-form', :method => 'post'}) do |f| %>
-
-
-
- <%= f.label :price, _('Price (%s)') % environment.currency_unit, :class => 'formlabel' %>
- <%= f.text_field(:price, :value => @product.formatted_value(:price), :class => 'numbers-only') %>
-
-
- <%= f.label :discount, _('Discount (%s)') % environment.currency_unit, :class => 'formlabel' %>
- <%= f.text_field(:discount, :value => @product.formatted_value(:discount), :class => 'numbers-only', :title => _('If your product is on sale, fill this field with the discount value')) %>
-
-
- <%= _('Available') %>
- <%= labelled_radio_button( _('Yes'), 'product[available]', true, @product.available, :id => 'product_available') + labelled_radio_button( _('No'), 'product[available]', false, !@product.available) %>
-
-
- <%= f.label :highlighted, _('Highlight this product?'), :class => 'formlabel' %>
- <%= f.check_box(:highlighted) %>
-
-
-
- <% if !environment.qualifiers.empty? %>
-
-
- <%= _('Qualifier') %>
- <%= _('Certifier') %>
-
- <% @product.qualifiers.each_with_index do |qualifier, index| %>
-
-
- <%= select_qualifiers(@product, qualifier.id) %>
-
-
- <%= select_certifiers(qualifier, @product) + remove_qualifier_button %>
-
-
- <% end %>
-
- <%= button_to_function(
- :add,
- _('Add new qualifier'),
- "new_qualifier_row('#product-qualifiers-list', '#{escape_javascript(select_qualifiers(@product))}', '#{escape_javascript(remove_qualifier_button)}')"
- ) %>
- <%= hidden_field_tag "product[qualifiers_list][nil]" %>
- <% end %>
-
- <%= hidden_field_tag 'info-bar-update-url', @product.price_composition_bar_display_url, :class => 'bar-update-url' %>
-
- <% button_bar do %>
- <%= submit_button :save, _('Save') %>
- <%= cancel_edit_product_link(@product, 'info') %>
- <% end %>
-<% end %>
-
-<%= render :partial => 'shared/numbers_only_javascript' %>
diff --git a/app/views/manage_products/_edit_input.html.erb b/app/views/manage_products/_edit_input.html.erb
new file mode 100644
index 0000000..a349d43
--- /dev/null
+++ b/app/views/manage_products/_edit_input.html.erb
@@ -0,0 +1,43 @@
+<% form_for(@input, :url => {:controller => 'manage_products', :action => 'edit_input', :id => @input},
+ :html => {:method => 'post', :id => "edit-input-#{ @input.id }-form"}) do |f| %>
+
+ <%= hidden_field_tag 'input-bar-update-url', @input.product.price_composition_bar_display_url, :class => 'bar-update-url' %>
+ <%= hidden_field_tag 'inputs-cost-update-url', @input.product.inputs_cost_update_url %>
+
+
+
+ <%= f.label :amount_used, label_amount_used(@input), :class => 'formlabel' %>
+ <%= f.text_field(:amount_used, :value => @input.formatted_amount, :class => 'numbers-only amount-used') + select_unit(@input) %>
+
+
+ <%= f.label :price_per_unit, _('Price %s (%s)') % [display_price_by(@input.unit), environment.currency_unit], :class => 'formlabel' %>
+ <%= f.text_field(:price_per_unit, :value => @input.formatted_value(:price_per_unit), :class => 'numbers-only price-per-unit') %>
+
+
+ <%= _("This input or raw material inpact on the final price of the product?") %>
+
+ <%= radio_button :input, 'relevant_to_price', true %>
+ <%= _('Yes') %>
+ <%= radio_button :input, 'relevant_to_price', false %>
+ <%= _('No') %>
+
+
+
+ <%= _('Is it from solidarity economy?') %>
+
+ <%= radio_button :input, 'is_from_solidarity_economy', true %>
+ <%= _('Yes') %>
+ <%= radio_button :input, 'is_from_solidarity_economy', false %>
+ <%= _('No') %>
+
+
+
+
+ <%= submit_button :save, _('Save'), :title => _('Save changes of this input or raw material') %>
+ <%= button :cancel, _('Cancel'), '#', :class => 'cancel-edit-input', :id => "cancel-edit-input-#{@input.id}", :title => _('Cancel changes of this input or raw material') %>
+
+
+
+<% end %>
+
+<%= javascript_tag "edit_input_stuff(#{@input.id}, '#{environment.currency_separator}')" %>
diff --git a/app/views/manage_products/_edit_input.rhtml b/app/views/manage_products/_edit_input.rhtml
deleted file mode 100644
index a349d43..0000000
--- a/app/views/manage_products/_edit_input.rhtml
+++ /dev/null
@@ -1,43 +0,0 @@
-<% form_for(@input, :url => {:controller => 'manage_products', :action => 'edit_input', :id => @input},
- :html => {:method => 'post', :id => "edit-input-#{ @input.id }-form"}) do |f| %>
-
- <%= hidden_field_tag 'input-bar-update-url', @input.product.price_composition_bar_display_url, :class => 'bar-update-url' %>
- <%= hidden_field_tag 'inputs-cost-update-url', @input.product.inputs_cost_update_url %>
-
-
-
- <%= f.label :amount_used, label_amount_used(@input), :class => 'formlabel' %>
- <%= f.text_field(:amount_used, :value => @input.formatted_amount, :class => 'numbers-only amount-used') + select_unit(@input) %>
-
-
- <%= f.label :price_per_unit, _('Price %s (%s)') % [display_price_by(@input.unit), environment.currency_unit], :class => 'formlabel' %>
- <%= f.text_field(:price_per_unit, :value => @input.formatted_value(:price_per_unit), :class => 'numbers-only price-per-unit') %>
-
-
- <%= _("This input or raw material inpact on the final price of the product?") %>
-
- <%= radio_button :input, 'relevant_to_price', true %>
- <%= _('Yes') %>
- <%= radio_button :input, 'relevant_to_price', false %>
- <%= _('No') %>
-
-
-
- <%= _('Is it from solidarity economy?') %>
-
- <%= radio_button :input, 'is_from_solidarity_economy', true %>
- <%= _('Yes') %>
- <%= radio_button :input, 'is_from_solidarity_economy', false %>
- <%= _('No') %>
-
-
-
-
- <%= submit_button :save, _('Save'), :title => _('Save changes of this input or raw material') %>
- <%= button :cancel, _('Cancel'), '#', :class => 'cancel-edit-input', :id => "cancel-edit-input-#{@input.id}", :title => _('Cancel changes of this input or raw material') %>
-
-
-
-<% end %>
-
-<%= javascript_tag "edit_input_stuff(#{@input.id}, '#{environment.currency_separator}')" %>
diff --git a/app/views/manage_products/_edit_name.html.erb b/app/views/manage_products/_edit_name.html.erb
new file mode 100644
index 0000000..f73170f
--- /dev/null
+++ b/app/views/manage_products/_edit_name.html.erb
@@ -0,0 +1,21 @@
+<% remote_form_for(@product,
+ :loading => "small_loading('product-name-form')",
+ :update => 'product-name',
+ :url => {:controller => 'manage_products', :action => 'edit', :id => @product, :field => 'name'},
+ :html => {:method => 'post', :id => 'product-name-form'}) do |f| %>
+ <%= f.text_field(:name, :value => @product.name, :class => 'name_edition') %>
+ <%= select_unit(@product) %>
+
+ <% button_bar do %>
+ <%= submit_button :save, _('Save') %>
+ <%= cancel_edit_product_link(@product, 'name') %>
+ <% end %>
+<% end %>
+
+
+
+<% if errors %>
+ <%= render_dialog_error_messages 'product' %>
+<% end %>
diff --git a/app/views/manage_products/_edit_name.rhtml b/app/views/manage_products/_edit_name.rhtml
deleted file mode 100644
index f73170f..0000000
--- a/app/views/manage_products/_edit_name.rhtml
+++ /dev/null
@@ -1,21 +0,0 @@
-<% remote_form_for(@product,
- :loading => "small_loading('product-name-form')",
- :update => 'product-name',
- :url => {:controller => 'manage_products', :action => 'edit', :id => @product, :field => 'name'},
- :html => {:method => 'post', :id => 'product-name-form'}) do |f| %>
- <%= f.text_field(:name, :value => @product.name, :class => 'name_edition') %>
- <%= select_unit(@product) %>
-
- <% button_bar do %>
- <%= submit_button :save, _('Save') %>
- <%= cancel_edit_product_link(@product, 'name') %>
- <% end %>
-<% end %>
-
-
-
-<% if errors %>
- <%= render_dialog_error_messages 'product' %>
-<% end %>
diff --git a/app/views/manage_products/_edit_price_details.html.erb b/app/views/manage_products/_edit_price_details.html.erb
new file mode 100644
index 0000000..1b9141b
--- /dev/null
+++ b/app/views/manage_products/_edit_price_details.html.erb
@@ -0,0 +1,14 @@
+<% price_details.each do |price_detail| %>
+
+ <%= select_production_cost(@product, price_detail.production_cost_id) %>
+ <%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', price_detail.formatted_value(:price), :class => 'numbers-only price-details-price')) %>
+
+ <%= link_to_remote(_('Remove'),
+ :update => "price-detail-#{price_detail.id}",
+ :complete => "calculateValuesForBar();",
+ :confirm => _('Are you sure that you want to remove this cost?'),
+ :url => { :action => 'remove_price_detail', :id => price_detail, :product => @product }) %>
+
+<% end %>
+
+<%= render :partial => 'shared/numbers_only_javascript' %>
diff --git a/app/views/manage_products/_edit_price_details.rhtml b/app/views/manage_products/_edit_price_details.rhtml
deleted file mode 100644
index 1b9141b..0000000
--- a/app/views/manage_products/_edit_price_details.rhtml
+++ /dev/null
@@ -1,14 +0,0 @@
-<% price_details.each do |price_detail| %>
-
- <%= select_production_cost(@product, price_detail.production_cost_id) %>
- <%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', price_detail.formatted_value(:price), :class => 'numbers-only price-details-price')) %>
-
- <%= link_to_remote(_('Remove'),
- :update => "price-detail-#{price_detail.id}",
- :complete => "calculateValuesForBar();",
- :confirm => _('Are you sure that you want to remove this cost?'),
- :url => { :action => 'remove_price_detail', :id => price_detail, :product => @product }) %>
-
-<% end %>
-
-<%= render :partial => 'shared/numbers_only_javascript' %>
diff --git a/app/views/manage_products/_form.html.erb b/app/views/manage_products/_form.html.erb
new file mode 100644
index 0000000..211aec4
--- /dev/null
+++ b/app/views/manage_products/_form.html.erb
@@ -0,0 +1,17 @@
+<%= error_messages_for :product %>
+<%= render :partial => 'display_input', :locals =>{:input => input} %>
+
diff --git a/app/views/manage_products/_input.rhtml b/app/views/manage_products/_input.rhtml
deleted file mode 100644
index 1c0da71..0000000
--- a/app/views/manage_products/_input.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-<%= render :partial => 'display_input', :locals =>{:input => input} %>
-
diff --git a/app/views/manage_products/_manage_product_details.html.erb b/app/views/manage_products/_manage_product_details.html.erb
new file mode 100644
index 0000000..a588e9d
--- /dev/null
+++ b/app/views/manage_products/_manage_product_details.html.erb
@@ -0,0 +1,43 @@
+
+ <%= render :partial => 'price_composition_bar' %>
+
+
+<% form_tag({:action => 'manage_product_details'}, :method => 'post', :id => 'manage-product-details-form') do %>
+
+
+
+ <%= _('Inputs') %>
+
+ <%= float_to_currency(@product.inputs_cost) %>
+
+
+ <%= _('This value is composed by the total value of registered inputs') %>
+
+
+ <%= render :partial => 'edit_price_details', :locals => {:price_details => @product.price_details} %>
+
+
+
+
+ <%= select_production_cost(@product) %>
+ <%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', nil, :class => 'numbers-only price-details-price')) %>
+ <%= link_to(_('Cancel'), '#', {:class => 'cancel-new-cost'}) %>
+
+
+
- <%= render :partial => 'price_composition_bar' %>
-
-
-<% form_tag({:action => 'manage_product_details'}, :method => 'post', :id => 'manage-product-details-form') do %>
-
-
-
- <%= _('Inputs') %>
-
- <%= float_to_currency(@product.inputs_cost) %>
-
-
- <%= _('This value is composed by the total value of registered inputs') %>
-
-
- <%= render :partial => 'edit_price_details', :locals => {:price_details => @product.price_details} %>
-
-
-
-
- <%= select_production_cost(@product) %>
- <%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', nil, :class => 'numbers-only price-details-price')) %>
- <%= link_to(_('Cancel'), '#', {:class => 'cancel-new-cost'}) %>
-
-
-
+
+
+
+ <%= price_composition_progressbar_text(@product) %>
+
+
+
' data-price-described-notice='<%= _("Congratulations! Now the price is open to the public") %>'>
+
+
-
-
-
- <%= price_composition_progressbar_text(@product) %>
-
-
-
' data-price-described-notice='<%= _("Congratulations! Now the price is open to the public") %>'>
-
-
<%= _('Editing') %> <%= @product.name %>
+
+<%= render :partial => 'form', :locals => {:mode => 'edit'} %>
diff --git a/app/views/manage_products/edit.rhtml b/app/views/manage_products/edit.rhtml
deleted file mode 100644
index 723e6d9..0000000
--- a/app/views/manage_products/edit.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
- <%= _('Editing') %> <%= @product.name %>
-
-<%= render :partial => 'form', :locals => {:mode => 'edit'} %>
diff --git a/app/views/manage_products/edit_category.html.erb b/app/views/manage_products/edit_category.html.erb
new file mode 100644
index 0000000..1b12874
--- /dev/null
+++ b/app/views/manage_products/edit_category.html.erb
@@ -0,0 +1,33 @@
+
+ <%= hierarchy_category_navigation(@category, :make_links => false)%>
+
+
+
+
+
<%= @product.name %>
+
+
+
+ <% remote_form_for(@product,
+ :loading => "open_loading('#{ _('loading...') }')",
+ :update => "request_result_message",
+ :url => {:action => 'edit_category', :id => @product},
+ :html => {:method => 'post', :id => 'category_form'}) do |f| %>
+
+
<%= _('Edit category of this product:') %>
+
+ <%= categories_container(selects_for_all_ancestors(@category), hierarchy_category_navigation(@category, :make_links => true)) %>
+
+
+ <%= button(:back, _('Back to product'), :action => 'show', :id => @product) %>
+
+ <%= submit_button(:save, _('Save and continue'), :id => 'save_and_continue') %>
+
+ <%= ui_icon('ui-icon-alert') %>
+ <%= _('This category does not allow registration of products, select a more specific category') %>
+
+
+
+
+ <% end %>
+
- <%= hierarchy_category_navigation(@category, :make_links => false)%>
-
-
-
-
-
<%= @product.name %>
-
-
-
- <% remote_form_for(@product,
- :loading => "open_loading('#{ _('loading...') }')",
- :update => "request_result_message",
- :url => {:action => 'edit_category', :id => @product},
- :html => {:method => 'post', :id => 'category_form'}) do |f| %>
-
-
<%= _('Edit category of this product:') %>
-
- <%= categories_container(selects_for_all_ancestors(@category), hierarchy_category_navigation(@category, :make_links => true)) %>
-
-
- <%= button(:back, _('Back to product'), :action => 'show', :id => @product) %>
-
- <%= submit_button(:save, _('Save and continue'), :id => 'save_and_continue') %>
-
- <%= ui_icon('ui-icon-alert') %>
- <%= _('This category does not allow registration of products, select a more specific category') %>
-
-
-
-
- <% end %>
-
<%=_('Listing products and services') %>
+
+
+
+ <%= _('Product') %>
+ <%= _('Price') %>
+ <%= _('Actions') %>
+
+ <% if @products.empty? %>
+
+ <%= _('(no product registered yet)') %>
+ <% end %>
+ <% @products.each do |product| %>
+
+ <%= link_to product.name, :action => 'show', :id => product %> <%= product.price %>
+
+ <%= button :delete, _('Remove'), {:action => 'destroy', :id => product}, :confirm => _('Are you sure you want to remove this product?') %>
+
+
+ <% end %>
+
+
+<%= pagination_links @products %>
+
+<% button_bar do %>
+ <%= button :add, _('New product or service'), :action => 'new' if @profile.create_product? %>
+ <%= button :back, _('Back'), { :controller => 'profile_editor', :profile => @profile.identifier, :action => 'index' } %>
+<% end %>
diff --git a/app/views/manage_products/index.rhtml b/app/views/manage_products/index.rhtml
deleted file mode 100644
index df5bec0..0000000
--- a/app/views/manage_products/index.rhtml
+++ /dev/null
@@ -1,30 +0,0 @@
- <%=_('Listing products and services') %>
-
-
-
- <%= _('Product') %>
- <%= _('Price') %>
- <%= _('Actions') %>
-
- <% if @products.empty? %>
-
- <%= _('(no product registered yet)') %>
- <% end %>
- <% @products.each do |product| %>
-
- <%= link_to product.name, :action => 'show', :id => product %> <%= product.price %>
-
- <%= button :delete, _('Remove'), {:action => 'destroy', :id => product}, :confirm => _('Are you sure you want to remove this product?') %>
-
-
- <% end %>
-
-
-<%= pagination_links @products %>
-
-<% button_bar do %>
- <%= button :add, _('New product or service'), :action => 'new' if @profile.create_product? %>
- <%= button :back, _('Back'), { :controller => 'profile_editor', :profile => @profile.identifier, :action => 'index' } %>
-<% end %>
diff --git a/app/views/manage_products/new.html.erb b/app/views/manage_products/new.html.erb
new file mode 100644
index 0000000..301ba33
--- /dev/null
+++ b/app/views/manage_products/new.html.erb
@@ -0,0 +1,30 @@
+<%= _('New product or service') %>
+
+
+
+<% remote_form_for :product, @product,
+ :loading => "open_loading('#{ _('loading...') }')",
+ :update => "request_result_message",
+ :url => {:action => 'new'},
+ :html => {:method => 'post', :id => 'category_form'} do |f| %>
+
+ <%= _('Select the category of the new product or service') %>
+
+ <%= categories_container(select_for_new_category(@categories, @level)) %>
+
+
+ <%= button :back, _('Back to the product listing'), :action => 'index' %>
+
+ <%= submit_button(:save, _('Save and continue'), :id => 'save_and_continue') %>
+
+ <%= ui_icon('ui-icon-alert') %>
+ <%= _('This category does not allow registration of products, select a more specific category') %>
+
+
+
+
+<% end %>
+
+<% javascript_tag do %>
+ toggleDisabled(<%= @category && @category.accept_products? ? 'true' : 'false' %>, $('save_and_continue'))
+<% end %>
diff --git a/app/views/manage_products/new.rhtml b/app/views/manage_products/new.rhtml
deleted file mode 100644
index 301ba33..0000000
--- a/app/views/manage_products/new.rhtml
+++ /dev/null
@@ -1,30 +0,0 @@
-<%= _('New product or service') %>
-
-
-
-<% remote_form_for :product, @product,
- :loading => "open_loading('#{ _('loading...') }')",
- :update => "request_result_message",
- :url => {:action => 'new'},
- :html => {:method => 'post', :id => 'category_form'} do |f| %>
-
- <%= _('Select the category of the new product or service') %>
-
- <%= categories_container(select_for_new_category(@categories, @level)) %>
-
-
- <%= button :back, _('Back to the product listing'), :action => 'index' %>
-
- <%= submit_button(:save, _('Save and continue'), :id => 'save_and_continue') %>
-
- <%= ui_icon('ui-icon-alert') %>
- <%= _('This category does not allow registration of products, select a more specific category') %>
-
-
-
-
-<% end %>
-
-<% javascript_tag do %>
- toggleDisabled(<%= @category && @category.accept_products? ? 'true' : 'false' %>, $('save_and_continue'))
-<% end %>
diff --git a/app/views/manage_products/show.html.erb b/app/views/manage_products/show.html.erb
new file mode 100644
index 0000000..f960ca3
--- /dev/null
+++ b/app/views/manage_products/show.html.erb
@@ -0,0 +1,59 @@
+
+ <%= render :partial => 'manage_products/display_category' %>
+
+
+
+
+
+ <%= render :partial => 'manage_products/display_name' %>
+
+
+
+
+ <%= render :partial => 'manage_products/display_image' %>
+
+
+
+ <%= render :partial => 'manage_products/display_info' %>
+
+
+
+
+
+ <% unless !@allowed_user && (@product.description.blank? && @product.inputs.empty? && !@product.price_described? ) %>
+
+
+
+ <%= render :partial => 'manage_products/display_description' %>
+
+
+ <%= render :partial => 'manage_products/display_inputs' %>
+
+ <% if @product.price_described? || @allowed_user %>
+
+ <%= render :partial => 'manage_products/display_price_details' %>
+ <%= render :partial => 'manage_products/price_details_button' %>
+
+ <% end %>
+
+ <% end %>
+
+
- <%= render :partial => 'manage_products/display_category' %>
-
-
-
-
-
- <%= render :partial => 'manage_products/display_name' %>
-
-
-
-
- <%= render :partial => 'manage_products/display_image' %>
-
-
-
- <%= render :partial => 'manage_products/display_info' %>
-
-
-
-
-
- <% unless !@allowed_user && (@product.description.blank? && @product.inputs.empty? && !@product.price_described? ) %>
-
-
-
- <%= render :partial => 'manage_products/display_description' %>
-
-
- <%= render :partial => 'manage_products/display_inputs' %>
-
- <% if @product.price_described? || @allowed_user %>
-
- <%= render :partial => 'manage_products/display_price_details' %>
- <%= render :partial => 'manage_products/price_details_button' %>
-
- <% end %>
-
- <% end %>
-
-
+ <%= render :partial => 'search/product', :locals => {:product => @product} %>
+
diff --git a/app/views/map_balloon/product.rhtml b/app/views/map_balloon/product.rhtml
deleted file mode 100644
index c3a2f1e..0000000
--- a/app/views/map_balloon/product.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-
- <%= render :partial => 'search/product', :locals => {:product => @product} %>
-
diff --git a/app/views/map_balloon/profile.html.erb b/app/views/map_balloon/profile.html.erb
new file mode 100644
index 0000000..0dff4d4
--- /dev/null
+++ b/app/views/map_balloon/profile.html.erb
@@ -0,0 +1,28 @@
+
+
+
+ <%= profile_image(@profile, :thumb) %>
+ <%= link_to(@profile.name, url_for(@profile.url)) %> <%= _('E-Mail: ') + @profile.contact_email %> <%= _('Phone(s): ') + @profile.contact_phone %> <%= _('Location: ') + @profile.region.name %> <%= _('Address: ') + @profile.address %> <%= _('Products/Services: ') + @profile.products.map{|i| link_to(i.name, :controller => 'manage_products', :profile => @profile.identifier, :action => 'show', :id => i.id)}.join(', ') %> <%= _('Distance: ') + "%.2f%" % @profile.distance %>
+
+
+
-
-
- <%= profile_image(@profile, :thumb) %>
- <%= link_to(@profile.name, url_for(@profile.url)) %> <%= _('E-Mail: ') + @profile.contact_email %> <%= _('Phone(s): ') + @profile.contact_phone %> <%= _('Location: ') + @profile.region.name %> <%= _('Address: ') + @profile.address %> <%= _('Products/Services: ') + @profile.products.map{|i| link_to(i.name, :controller => 'manage_products', :profile => @profile.identifier, :action => 'show', :id => i.id)}.join(', ') %> <%= _('Distance: ') + "%.2f%" % @profile.distance %>
-
-
-
<%= _('Location') %>
+
+ <%= flash[:error] %>
+
+
+<% form_for :profile_data, :url => {:action => 'edit_location'}, :html => {:id => 'location-form'} do |f| %>
+
+
+ <%= select_country _('Country'), 'profile_data', 'country', {:class => 'type-select'} %>
+ <%= labelled_form_field _('State'), f.text_field(:state) %>
+ <%= labelled_form_field _('City'), f.text_field(:city) %>
+ <%= labelled_form_field _('ZIP code'), text_field(:profile_data, :zip_code) %>
+ <%= labelled_form_field _('Address (street and number)'), text_field(:profile_data, :address) %>
+ <% button_bar do %>
+ <%= button_to_function :search, _('Locate in the map'), "addressToPoint()", :title => _("Locate the address informed above in the map below (note that you'll probably need to adjust the marker to get a precise position)") %>
+ <%= submit_button 'save', _('Save') %>
+ <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
+ <% end %>
+
+
+ <%= _('Drag the balloon to find the exact location.') %>
+
+
+
+ <%= f.hidden_field :lat %>
+ <%= f.hidden_field :lng %>
+
+<% end %>
+
+<%= content_tag('script', '', :src => "http://maps.googleapis.com/maps/api/js?sensor=false", :type => 'text/javascript') %>
+<%= content_tag('script', '', :src => url_for(:controller => :maps, :action => :google_map), :type => 'text/javascript') %>
diff --git a/app/views/maps/edit_location.rhtml b/app/views/maps/edit_location.rhtml
deleted file mode 100644
index 6f2f4dc..0000000
--- a/app/views/maps/edit_location.rhtml
+++ /dev/null
@@ -1,33 +0,0 @@
-<%= _('Location') %>
-
- <%= flash[:error] %>
-
-
-<% form_for :profile_data, :url => {:action => 'edit_location'}, :html => {:id => 'location-form'} do |f| %>
-
-
- <%= select_country _('Country'), 'profile_data', 'country', {:class => 'type-select'} %>
- <%= labelled_form_field _('State'), f.text_field(:state) %>
- <%= labelled_form_field _('City'), f.text_field(:city) %>
- <%= labelled_form_field _('ZIP code'), text_field(:profile_data, :zip_code) %>
- <%= labelled_form_field _('Address (street and number)'), text_field(:profile_data, :address) %>
- <% button_bar do %>
- <%= button_to_function :search, _('Locate in the map'), "addressToPoint()", :title => _("Locate the address informed above in the map below (note that you'll probably need to adjust the marker to get a precise position)") %>
- <%= submit_button 'save', _('Save') %>
- <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
- <% end %>
-
-
- <%= _('Drag the balloon to find the exact location.') %>
-
-
-
- <%= f.hidden_field :lat %>
- <%= f.hidden_field :lng %>
-
-<% end %>
-
-<%= content_tag('script', '', :src => "http://maps.googleapis.com/maps/api/js?sensor=false", :type => 'text/javascript') %>
-<%= content_tag('script', '', :src => url_for(:controller => :maps, :action => :google_map), :type => 'text/javascript') %>
diff --git a/app/views/memberships/index.html.erb b/app/views/memberships/index.html.erb
new file mode 100644
index 0000000..66aeeb6
--- /dev/null
+++ b/app/views/memberships/index.html.erb
@@ -0,0 +1,13 @@
+
+
+
<%= _('Manage my groups') %>
+
+<% button_bar do %>
+ <%= button(:add, __('Create a new community'), :controller => 'memberships', :action => 'new_community') %>
+ <%= button :add, __('Register a new enterprise'), :controller => 'enterprise_registration' if environment.enabled?('enterprise_registration') %>
+ <%= button :back, _('Go back'), :controller => 'profile_editor' %>
+<% end %>
+
+<%= render :partial => 'shared/list_groups', :locals => {:groups => @memberships} %>
+
+
diff --git a/app/views/memberships/index.rhtml b/app/views/memberships/index.rhtml
deleted file mode 100644
index 66aeeb6..0000000
--- a/app/views/memberships/index.rhtml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
<%= _('Manage my groups') %>
-
-<% button_bar do %>
- <%= button(:add, __('Create a new community'), :controller => 'memberships', :action => 'new_community') %>
- <%= button :add, __('Register a new enterprise'), :controller => 'enterprise_registration' if environment.enabled?('enterprise_registration') %>
- <%= button :back, _('Go back'), :controller => 'profile_editor' %>
-<% end %>
-
-<%= render :partial => 'shared/list_groups', :locals => {:groups => @memberships} %>
-
-
diff --git a/app/views/memberships/new_community.html.erb b/app/views/memberships/new_community.html.erb
new file mode 100644
index 0000000..d21aa42
--- /dev/null
+++ b/app/views/memberships/new_community.html.erb
@@ -0,0 +1,60 @@
+<%= __('Creating new community') %>
+
+<% if environment.enabled?('admin_must_approve_new_communities') %>
+
+ <%= _("Note that the creation of communities in this environment is restricted. Your request to create this new community will be sent to %{environment} administrators and will be approved or rejected according to their methods and criteria.") % { :environment => environment.name }%>
+
+<%end %>
+
+<%= error_messages_for :community %>
+
+
+
+<% labelled_form_for :community, @community, :html => { :multipart => true } do |f| %>
+
+ <%= required_fields_message %>
+
+ <%= required f.text_field(:name) %>
+
+ <% @plugins.dispatch(:new_community_hidden_fields).each do |field| %>
+ <% field.each do |key, value| %>
+ <%= f.hidden_field(key, :value => value) %>
+ <% end %>
+ <% end %>
+
+ <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => 'community', :profile => @community } %>
+
+ <% f.fields_for :image_builder, @community.image do |i| %>
+ <%= file_field_or_thumbnail(_('Image:'), @community.image, i) %>
+ <% end %>
+
+
+ <%= _('New members must be approved:')%>
+
+
+
+
+ <%= template_options(Community, 'community')%>
+
+ <% button_bar do %>
+ <%= submit_button(:save, _('Create')) %>
+ <%= button(:cancel, _('Cancel'), :action => 'index') %>
+ <% end %>
+
+<% end %>
+
+
<%= __('Creating new community') %>
-
-<% if environment.enabled?('admin_must_approve_new_communities') %>
-
- <%= _("Note that the creation of communities in this environment is restricted. Your request to create this new community will be sent to %{environment} administrators and will be approved or rejected according to their methods and criteria.") % { :environment => environment.name }%>
-
-<%end %>
-
-<%= error_messages_for :community %>
-
-
-
-<% labelled_form_for :community, @community, :html => { :multipart => true } do |f| %>
-
- <%= required_fields_message %>
-
- <%= required f.text_field(:name) %>
-
- <% @plugins.dispatch(:new_community_hidden_fields).each do |field| %>
- <% field.each do |key, value| %>
- <%= f.hidden_field(key, :value => value) %>
- <% end %>
- <% end %>
-
- <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => 'community', :profile => @community } %>
-
- <% f.fields_for :image_builder, @community.image do |i| %>
- <%= file_field_or_thumbnail(_('Image:'), @community.image, i) %>
- <% end %>
-
-
- <%= _('New members must be approved:')%>
-
-
-
-
- <%= template_options(Community, 'community')%>
-
- <% button_bar do %>
- <%= submit_button(:save, _('Create')) %>
- <%= button(:cancel, _('Cancel'), :action => 'index') %>
- <% end %>
-
-<% end %>
-
-
<%= _('Manage plugins') %>
+
+
+<%= _('Select which plugins you want to enable in your environment') %>
+
+
+<% labelled_form_for(:environment, @environment, :url => {:action => 'update'}) do |f| %>
+
+
+ <% @active_plugins.sort_by(&:plugin_name).each do |plugin| %>
+
+ <%= check_box_tag "environment[enabled_plugins][]", plugin, @environment.enabled_plugins.include?(plugin.to_s), :id => plugin.plugin_name %>
+
+ <%= hidden_field_tag('environment[enabled_plugins][]', '') %>
+ <%= plugin.plugin_name %>
+
+
+ <% end %>
+
+
+
+ <% button_bar do %>
+ <%= submit_button('save', _('Save changes')) %>
+ <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
+ <% end %>
+
+
+<% end %>
diff --git a/app/views/plugins/index.rhtml b/app/views/plugins/index.rhtml
deleted file mode 100644
index 8c4bc7d..0000000
--- a/app/views/plugins/index.rhtml
+++ /dev/null
@@ -1,35 +0,0 @@
-<%= _('Manage plugins') %>
-
-
-<%= _('Select which plugins you want to enable in your environment') %>
-
-
-<% labelled_form_for(:environment, @environment, :url => {:action => 'update'}) do |f| %>
-
-
- <% @active_plugins.sort_by(&:plugin_name).each do |plugin| %>
-
- <%= check_box_tag "environment[enabled_plugins][]", plugin, @environment.enabled_plugins.include?(plugin.to_s), :id => plugin.plugin_name %>
-
- <%= hidden_field_tag('environment[enabled_plugins][]', '') %>
- <%= plugin.plugin_name %>
-
-
- <% end %>
-
-
-
- <% button_bar do %>
- <%= submit_button('save', _('Save changes')) %>
- <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
- <% end %>
-
-
-<% end %>
diff --git a/app/views/profile/_add_member_in_community.html.erb b/app/views/profile/_add_member_in_community.html.erb
new file mode 100644
index 0000000..3cc3227
--- /dev/null
+++ b/app/views/profile/_add_member_in_community.html.erb
@@ -0,0 +1 @@
+<%= render :partial => 'default_activity', :locals => { :activity => activity, :tab_action => tab_action } %>
diff --git a/app/views/profile/_add_member_in_community.rhtml b/app/views/profile/_add_member_in_community.rhtml
deleted file mode 100644
index 3cc3227..0000000
--- a/app/views/profile/_add_member_in_community.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-<%= render :partial => 'default_activity', :locals => { :activity => activity, :tab_action => tab_action } %>
diff --git a/app/views/profile/_comment.html.erb b/app/views/profile/_comment.html.erb
new file mode 100644
index 0000000..50a9b36
--- /dev/null
+++ b/app/views/profile/_comment.html.erb
@@ -0,0 +1,87 @@
+<% Comment %>
+<% Profile %>
+<% Person %>
+
+
+
+
+
+
+ <% unless comment.replies.blank? %>
+
+ <% end %>
+
+
+
diff --git a/app/views/profile/_comment.rhtml b/app/views/profile/_comment.rhtml
deleted file mode 100644
index 50a9b36..0000000
--- a/app/views/profile/_comment.rhtml
+++ /dev/null
@@ -1,87 +0,0 @@
-<% Comment %>
-<% Profile %>
-<% Person %>
-
-
-
-
-
-
- <% unless comment.replies.blank? %>
-
- <% end %>
-
-
-
diff --git a/app/views/profile/_common.html.erb b/app/views/profile/_common.html.erb
new file mode 100644
index 0000000..54efeca
--- /dev/null
+++ b/app/views/profile/_common.html.erb
@@ -0,0 +1,53 @@
+<% unless @action %>
+ <% cache_timeout(profile.cache_key + '-profile-general-info', 4.hours) do %>
+
+
+ <%= _('Content') %>
+
+
+
+ <% profile.blogs.each do |blog| %>
+
+ <%= blog.name + ':' %>
+
+ <%= link_to(n_('One post', '%{num} posts', blog.posts.published.count) % { :num => blog.posts.published.count }, blog.url) %>
+
+
+ <% end %>
+ <% profile.image_galleries.each do |gallery| %>
+
+ <%= gallery.name + ':' %>
+
+ <%= link_to(n_('One picture', '%{num} pictures', gallery.images.published.count) % { :num => gallery.images.published.count }, gallery.url) %>
+
+
+ <% end %>
+
+
+ <%= _('Events:') %>
+
+ <%= link_to profile.events.published.count, :controller => 'events', :action => 'events' %>
+
+
+
+
+ <%= _('Tags:') %>
+
+
+ <%= tag_cloud @tags, :id, { :action => 'tags' }, :max_size => 18, :min_size => 10%>
+
+
+
+ <% if !environment.enabled?('disable_categories') && !profile.interests.empty? %>
+
+ <%= _('Interests') %>
+
+ <% profile.interests.each do |item| %>
+
+ <%= link_to item.name, :controller => 'search', :action => 'category_index', :category_path => item.explode_path %>
+
+ <% end %>
+ <% end %>
+ <% end %>
+<% end %>
diff --git a/app/views/profile/_common.rhtml b/app/views/profile/_common.rhtml
deleted file mode 100644
index 54efeca..0000000
--- a/app/views/profile/_common.rhtml
+++ /dev/null
@@ -1,53 +0,0 @@
-<% unless @action %>
- <% cache_timeout(profile.cache_key + '-profile-general-info', 4.hours) do %>
-
-
- <%= _('Content') %>
-
-
-
- <% profile.blogs.each do |blog| %>
-
- <%= blog.name + ':' %>
-
- <%= link_to(n_('One post', '%{num} posts', blog.posts.published.count) % { :num => blog.posts.published.count }, blog.url) %>
-
-
- <% end %>
- <% profile.image_galleries.each do |gallery| %>
-
- <%= gallery.name + ':' %>
-
- <%= link_to(n_('One picture', '%{num} pictures', gallery.images.published.count) % { :num => gallery.images.published.count }, gallery.url) %>
-
-
- <% end %>
-
-
- <%= _('Events:') %>
-
- <%= link_to profile.events.published.count, :controller => 'events', :action => 'events' %>
-
-
-
-
- <%= _('Tags:') %>
-
-
- <%= tag_cloud @tags, :id, { :action => 'tags' }, :max_size => 18, :min_size => 10%>
-
-
-
- <% if !environment.enabled?('disable_categories') && !profile.interests.empty? %>
-
- <%= _('Interests') %>
-
- <% profile.interests.each do |item| %>
-
- <%= link_to item.name, :controller => 'search', :action => 'category_index', :category_path => item.explode_path %>
-
- <% end %>
- <% end %>
- <% end %>
-<% end %>
diff --git a/app/views/profile/_create_article.html.erb b/app/views/profile/_create_article.html.erb
new file mode 100644
index 0000000..c955ac7
--- /dev/null
+++ b/app/views/profile/_create_article.html.erb
@@ -0,0 +1,22 @@
+
+ <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+
+
+
+ <%= link_to activity.user.short_name(20), activity.user.url %>
+ <%= _("on community %s") % link_to(activity.target.profile.short_name(20), activity.target.profile.url) if activity.target.profile.is_a?(Community) %>
+
+
+
<%= link_to(activity.params['name'], activity.params['url']) %>
+
+ <%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(truncate(activity.params['lead'], :length => 1000, :ommision => '...')).gsub(/(\xA0|\xC2|\s)+/, ' ').gsub(/^\s+/, '') %>
<%= link_to(_('See more'), activity.params['url']) unless activity.get_lead.blank? %>
+
+ <%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %>
+
<%= time_ago_as_sentence(activity.created_at) %>
+
+ <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
+ <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :only_hide => true, :view => params[:view]).to_json, _('Are you sure you want to remove this activity and all its replies?').to_json]) if logged_in? && current_person == @profile %>
+
+
- <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
-
-
-
- <%= link_to activity.user.short_name(20), activity.user.url %>
- <%= _("on community %s") % link_to(activity.target.profile.short_name(20), activity.target.profile.url) if activity.target.profile.is_a?(Community) %>
-
-
-
<%= link_to(activity.params['name'], activity.params['url']) %>
-
- <%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(truncate(activity.params['lead'], :length => 1000, :ommision => '...')).gsub(/(\xA0|\xC2|\s)+/, ' ').gsub(/^\s+/, '') %>
<%= link_to(_('See more'), activity.params['url']) unless activity.get_lead.blank? %>
-
- <%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %>
-
<%= time_ago_as_sentence(activity.created_at) %>
-
- <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
- <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :only_hide => true, :view => params[:view]).to_json, _('Are you sure you want to remove this activity and all its replies?').to_json]) if logged_in? && current_person == @profile %>
-
-
+ <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+
+
+
<%= link_to activity.user.name, activity.user.url %> <%= describe activity %>
+
<%= time_ago_as_sentence(activity.created_at) %>
+
+ <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
+ <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]).to_json, _('Are you sure you want to remove this activity and all its replies?').to_json]) if logged_in? && current_person == @profile %>
+
+
- <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
-
-
-
<%= link_to activity.user.name, activity.user.url %> <%= describe activity %>
-
<%= time_ago_as_sentence(activity.created_at) %>
-
- <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
- <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]).to_json, _('Are you sure you want to remove this activity and all its replies?').to_json]) if logged_in? && current_person == @profile %>
-
-
+ <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+
+
+
<%= link_to activity.user.name, activity.user.url %> <%= describe activity %>
+
<%= time_ago_as_sentence(activity.created_at) %>
+
+ <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]).to_json, _('Are you sure you want to remove this activity and all its replies?').to_json]) if logged_in? && current_person == @profile %>
+
+
- <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
-
-
-
<%= link_to activity.user.name, activity.user.url %> <%= describe activity %>
-
<%= time_ago_as_sentence(activity.created_at) %>
-
- <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]).to_json, _('Are you sure you want to remove this activity and all its replies?').to_json]) if logged_in? && current_person == @profile %>
-
-
+
+ <%= _('Basic information')%>
+
+
+
+ <%= _('Members') %>
+
+ <%= link_to profile.members_count, :controller => 'profile', :action => 'members' %>
+
+
+
+ <%= display_field(_('Type:'), profile, :privacy_setting, true) %>
+
+ <%= display_field(_('Location:'), profile, :location, true) %>
+
+
+ <%= _('Profile created at:') %>
+ <%= show_date(profile.created_at) %>
+
+
+ <% if profile.kind_of?(Enterprise) && !profile.environment.enabled?('disable_products_for_enterprises') %>
+
+
+ <%= link_to _('Products/Services'), :controller => 'catalog', :action => 'index' %>
+
+
+ <% end %>
+
+
+ <%= _('Administrators:') %>
+
+ <%= profile.admins.map { |admin| link_to(admin.short_name, admin.url)}.join(', ') %>
+
+
+
+ <%= render :partial => 'common' %>
+
diff --git a/app/views/profile/_organization_profile.rhtml b/app/views/profile/_organization_profile.rhtml
deleted file mode 100644
index 1a9315b..0000000
--- a/app/views/profile/_organization_profile.rhtml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
- <%= _('Basic information')%>
-
-
-
- <%= _('Members') %>
-
- <%= link_to profile.members_count, :controller => 'profile', :action => 'members' %>
-
-
-
- <%= display_field(_('Type:'), profile, :privacy_setting, true) %>
-
- <%= display_field(_('Location:'), profile, :location, true) %>
-
-
- <%= _('Profile created at:') %>
- <%= show_date(profile.created_at) %>
-
-
- <% if profile.kind_of?(Enterprise) && !profile.environment.enabled?('disable_products_for_enterprises') %>
-
-
- <%= link_to _('Products/Services'), :controller => 'catalog', :action => 'index' %>
-
-
- <% end %>
-
-
- <%= _('Administrators:') %>
-
- <%= profile.admins.map { |admin| link_to(admin.short_name, admin.url)}.join(', ') %>
-
-
-
- <%= render :partial => 'common' %>
-
diff --git a/app/views/profile/_person_profile.html.erb b/app/views/profile/_person_profile.html.erb
new file mode 100644
index 0000000..9fac130
--- /dev/null
+++ b/app/views/profile/_person_profile.html.erb
@@ -0,0 +1,49 @@
+
+
+ <%= _('Basic information')%>
+
+ <%= display_field(_('Sex:'), profile, :sex) { |gender| { 'male' => _('Male'), 'female' => _('Female') }[gender] } %>
+ <%= display_field(_('Date of birth:'), profile, :birth_date) { |date| show_date(date) }%>
+ <%= display_field(_('Location:'), profile, :location, true) %>
+
+ <%= display_field(_('Type:'), profile, :privacy_setting, true) %>
+
+
+ <%= _('Profile created at:') %>
+ <%= show_date(profile.created_at) %>
+
+
+ <%= display_contact profile %>
+
+ <% cache_timeout(profile.relationships_cache_key, 4.hours) do %>
+ <%= display_work_info profile %>
+
+ <% if !environment.enabled?('disable_asset_enterprises') && !profile.enterprises.empty? %>
+
+ <%= __('Enterprises') %>
+
+ <% profile.enterprises.includes(:environment,:domains, :preferred_domain).each do |item| %>
+
+ <%= button 'menu-enterprise', item.name, item.url %>
+
+ <% end %>
+ <% end %>
+
+
+ <%= _('Network')%>
+
+
+ <%= __('Friends') + ':' %>
+ <%= link_to profile.friends.count, { :controller => 'profile', :action => 'friends' } %>
+
+
+ <%= __('Communities') + ':' %>
+ <%= link_to profile.communities.count, :controller => "profile", :action => 'communities' %>
+
+
+ <%= render :partial => 'common' %>
+
+ <% end %>
+
+
diff --git a/app/views/profile/_person_profile.rhtml b/app/views/profile/_person_profile.rhtml
deleted file mode 100644
index 9fac130..0000000
--- a/app/views/profile/_person_profile.rhtml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
- <%= _('Basic information')%>
-
- <%= display_field(_('Sex:'), profile, :sex) { |gender| { 'male' => _('Male'), 'female' => _('Female') }[gender] } %>
- <%= display_field(_('Date of birth:'), profile, :birth_date) { |date| show_date(date) }%>
- <%= display_field(_('Location:'), profile, :location, true) %>
-
- <%= display_field(_('Type:'), profile, :privacy_setting, true) %>
-
-
- <%= _('Profile created at:') %>
- <%= show_date(profile.created_at) %>
-
-
- <%= display_contact profile %>
-
- <% cache_timeout(profile.relationships_cache_key, 4.hours) do %>
- <%= display_work_info profile %>
-
- <% if !environment.enabled?('disable_asset_enterprises') && !profile.enterprises.empty? %>
-
- <%= __('Enterprises') %>
-
- <% profile.enterprises.includes(:environment,:domains, :preferred_domain).each do |item| %>
-
- <%= button 'menu-enterprise', item.name, item.url %>
-
- <% end %>
- <% end %>
-
-
- <%= _('Network')%>
-
-
- <%= __('Friends') + ':' %>
- <%= link_to profile.friends.count, { :controller => 'profile', :action => 'friends' } %>
-
-
- <%= __('Communities') + ':' %>
- <%= link_to profile.communities.count, :controller => "profile", :action => 'communities' %>
-
-
- <%= render :partial => 'common' %>
-
- <% end %>
-
-
diff --git a/app/views/profile/_private_profile.html.erb b/app/views/profile/_private_profile.html.erb
new file mode 100644
index 0000000..1d5cae3
--- /dev/null
+++ b/app/views/profile/_private_profile.html.erb
@@ -0,0 +1,17 @@
+
+ <%= profile_image(profile, :big) %>
+
+
+<%= @message %>
+<%= profile.description %>
+
+<% button_bar do %>
+ <% if @action == :join && logged_in? %>
+ <%= button(:add, content_tag('span', __('Join')), profile.join_url, :class => 'join-community', :title => _("Join community"), :style => 'position: relative;') %>
+ <% end %>
+ <% if @action == :add_friend && logged_in? && !user.already_request_friendship?(profile) %>
+ <%= button(:add, content_tag('span', __('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
+ <% end %>
+ <%= button :back, _('Go back'), :back %>
+ <%= button :home, _("Go to %s home page") % environment.name, :controller => 'home' %>
+<% end %>
diff --git a/app/views/profile/_private_profile.rhtml b/app/views/profile/_private_profile.rhtml
deleted file mode 100644
index 1d5cae3..0000000
--- a/app/views/profile/_private_profile.rhtml
+++ /dev/null
@@ -1,17 +0,0 @@
-
- <%= profile_image(profile, :big) %>
-
-
-<%= @message %>
-<%= profile.description %>
-
-<% button_bar do %>
- <% if @action == :join && logged_in? %>
- <%= button(:add, content_tag('span', __('Join')), profile.join_url, :class => 'join-community', :title => _("Join community"), :style => 'position: relative;') %>
- <% end %>
- <% if @action == :add_friend && logged_in? && !user.already_request_friendship?(profile) %>
- <%= button(:add, content_tag('span', __('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
- <% end %>
- <%= button :back, _('Go back'), :back %>
- <%= button :home, _("Go to %s home page") % environment.name, :controller => 'home' %>
-<% end %>
diff --git a/app/views/profile/_profile.html.erb b/app/views/profile/_profile.html.erb
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/app/views/profile/_profile.html.erb
@@ -0,0 +1 @@
+
diff --git a/app/views/profile/_profile.rhtml b/app/views/profile/_profile.rhtml
deleted file mode 100644
index 8b13789..0000000
--- a/app/views/profile/_profile.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app/views/profile/_profile_activities_list.html.erb b/app/views/profile/_profile_activities_list.html.erb
new file mode 100644
index 0000000..462cc1d
--- /dev/null
+++ b/app/views/profile/_profile_activities_list.html.erb
@@ -0,0 +1,16 @@
+<% unless activities.nil? %>
+ <% activities.each do |a| %>
+ <% activity = a.klass.constantize.find(a.id) %>
+ <% if activity.kind_of?(ActionTracker::Record) %>
+ <%= render :partial => 'profile_activity', :locals => { :activity => activity, :tab_action => 'wall' } if activity.visible? %>
+ <% else %>
+ <%= render :partial => 'profile_scrap', :locals => {:scrap => activity } %>
+ <% end %>
+ <% end %>
+<% end %>
+
+<% if activities.current_page < activities.total_pages %>
+
+ <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_activities', :page => (activities.current_page + 1)}, :update => "profile_activities_page_#{activities.current_page}" %>
+
+<% end %>
diff --git a/app/views/profile/_profile_activities_list.rhtml b/app/views/profile/_profile_activities_list.rhtml
deleted file mode 100644
index 462cc1d..0000000
--- a/app/views/profile/_profile_activities_list.rhtml
+++ /dev/null
@@ -1,16 +0,0 @@
-<% unless activities.nil? %>
- <% activities.each do |a| %>
- <% activity = a.klass.constantize.find(a.id) %>
- <% if activity.kind_of?(ActionTracker::Record) %>
- <%= render :partial => 'profile_activity', :locals => { :activity => activity, :tab_action => 'wall' } if activity.visible? %>
- <% else %>
- <%= render :partial => 'profile_scrap', :locals => {:scrap => activity } %>
- <% end %>
- <% end %>
-<% end %>
-
-<% if activities.current_page < activities.total_pages %>
-
- <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_activities', :page => (activities.current_page + 1)}, :update => "profile_activities_page_#{activities.current_page}" %>
-
-<% end %>
diff --git a/app/views/profile/_profile_activities_scraps.html.erb b/app/views/profile/_profile_activities_scraps.html.erb
new file mode 100644
index 0000000..538839a
--- /dev/null
+++ b/app/views/profile/_profile_activities_scraps.html.erb
@@ -0,0 +1,2 @@
+NÂO DEVE APARECER!!
+
diff --git a/app/views/profile/_profile_activities_scraps.rhtml b/app/views/profile/_profile_activities_scraps.rhtml
deleted file mode 100644
index 538839a..0000000
--- a/app/views/profile/_profile_activities_scraps.rhtml
+++ /dev/null
@@ -1,2 +0,0 @@
-NÂO DEVE APARECER!!
-
diff --git a/app/views/profile/_profile_activity.html.erb b/app/views/profile/_profile_activity.html.erb
new file mode 100644
index 0000000..c0042d8
--- /dev/null
+++ b/app/views/profile/_profile_activity.html.erb
@@ -0,0 +1,4 @@
+
+ <%= render :partial => activity.verb, :locals => { :activity => activity, :tab_action => tab_action }%>
+
diff --git a/app/views/profile/_profile_activity.rhtml b/app/views/profile/_profile_activity.rhtml
deleted file mode 100644
index c0042d8..0000000
--- a/app/views/profile/_profile_activity.rhtml
+++ /dev/null
@@ -1,4 +0,0 @@
-
- <%= render :partial => activity.verb, :locals => { :activity => activity, :tab_action => tab_action }%>
-
diff --git a/app/views/profile/_profile_comment_form.html.erb b/app/views/profile/_profile_comment_form.html.erb
new file mode 100644
index 0000000..b158ff2
--- /dev/null
+++ b/app/views/profile/_profile_comment_form.html.erb
@@ -0,0 +1,22 @@
+
diff --git a/app/views/profile/_profile_comment_form.rhtml b/app/views/profile/_profile_comment_form.rhtml
deleted file mode 100644
index b158ff2..0000000
--- a/app/views/profile/_profile_comment_form.rhtml
+++ /dev/null
@@ -1,22 +0,0 @@
-
diff --git a/app/views/profile/_profile_comments.html.erb b/app/views/profile/_profile_comments.html.erb
new file mode 100644
index 0000000..40496c7
--- /dev/null
+++ b/app/views/profile/_profile_comments.html.erb
@@ -0,0 +1,13 @@
+<%= _("%s's network activity") % @profile.name %>
+
+ <%= render :partial => 'profile_network_activities', :locals => {:network_activities => @network_activities} %>
+
diff --git a/app/views/profile/_profile_network.rhtml b/app/views/profile/_profile_network.rhtml
deleted file mode 100644
index 99de5dd..0000000
--- a/app/views/profile/_profile_network.rhtml
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= _("%s's network activity") % @profile.name %>
-
- <%= render :partial => 'profile_network_activities', :locals => {:network_activities => @network_activities} %>
-
diff --git a/app/views/profile/_profile_network_activities.html.erb b/app/views/profile/_profile_network_activities.html.erb
new file mode 100644
index 0000000..8399fb2
--- /dev/null
+++ b/app/views/profile/_profile_network_activities.html.erb
@@ -0,0 +1,8 @@
+<% network_activities.each do |activity| %>
+ <%= render :partial => 'profile_activity', :locals => { :activity => activity, :tab_action => 'network' } if activity.visible? %>
+<% end %>
+<% if network_activities.current_page < network_activities.total_pages %>
+
+ <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_network_activities', :page => (network_activities.current_page + 1)}, :update => "profile_network_activities_page_#{network_activities.current_page}" %>
+
+<% end %>
diff --git a/app/views/profile/_profile_network_activities.rhtml b/app/views/profile/_profile_network_activities.rhtml
deleted file mode 100644
index 8399fb2..0000000
--- a/app/views/profile/_profile_network_activities.rhtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<% network_activities.each do |activity| %>
- <%= render :partial => 'profile_activity', :locals => { :activity => activity, :tab_action => 'network' } if activity.visible? %>
-<% end %>
-<% if network_activities.current_page < network_activities.total_pages %>
-
- <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_network_activities', :page => (network_activities.current_page + 1)}, :update => "profile_network_activities_page_#{network_activities.current_page}" %>
-
-<% end %>
diff --git a/app/views/profile/_profile_scrap.html.erb b/app/views/profile/_profile_scrap.html.erb
new file mode 100644
index 0000000..670e33a
--- /dev/null
+++ b/app/views/profile/_profile_scrap.html.erb
@@ -0,0 +1,32 @@
+
+
+ <%= link_to(profile_image(scrap.sender, :minor), scrap.sender.url) %>
+
+
+
<%= link_to scrap.sender.name, scrap.sender.url %>
+
<%= txt2html scrap.content %>
+
<%= time_ago_as_sentence(scrap.created_at) %>
+
+ <% if logged_in? && current_person.follows?(scrap.sender) %>
+
+ <%= link_to_function s_('profile|Comment'), "hide_and_show(['#profile-wall-message-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('reply_content_#{scrap.id}').focus();return false", :class => "profile-send-reply" %>
+
+ <% end %>
+ <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_scrap, :scrap_id => scrap.id, :view => params[:view]).to_json, _('Are you sure you want to remove this scrap and all its replies?').to_json]) if logged_in? && user.can_control_scrap?(scrap) %>
+
+
diff --git a/app/views/profile/_profile_scrap.rhtml b/app/views/profile/_profile_scrap.rhtml
deleted file mode 100644
index 670e33a..0000000
--- a/app/views/profile/_profile_scrap.rhtml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
- <%= link_to(profile_image(scrap.sender, :minor), scrap.sender.url) %>
-
-
-
<%= link_to scrap.sender.name, scrap.sender.url %>
-
<%= txt2html scrap.content %>
-
<%= time_ago_as_sentence(scrap.created_at) %>
-
- <% if logged_in? && current_person.follows?(scrap.sender) %>
-
- <%= link_to_function s_('profile|Comment'), "hide_and_show(['#profile-wall-message-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('reply_content_#{scrap.id}').focus();return false", :class => "profile-send-reply" %>
-
- <% end %>
- <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_scrap, :scrap_id => scrap.id, :view => params[:view]).to_json, _('Are you sure you want to remove this scrap and all its replies?').to_json]) if logged_in? && user.can_control_scrap?(scrap) %>
-
-
diff --git a/app/views/profile/_profile_scrap_reply_form.html.erb b/app/views/profile/_profile_scrap_reply_form.html.erb
new file mode 100644
index 0000000..dcd13a6
--- /dev/null
+++ b/app/views/profile/_profile_scrap_reply_form.html.erb
@@ -0,0 +1,21 @@
+
diff --git a/app/views/profile/_profile_scrap_reply_form.rhtml b/app/views/profile/_profile_scrap_reply_form.rhtml
deleted file mode 100644
index dcd13a6..0000000
--- a/app/views/profile/_profile_scrap_reply_form.rhtml
+++ /dev/null
@@ -1,21 +0,0 @@
-
diff --git a/app/views/profile/_profile_scraps.html.erb b/app/views/profile/_profile_scraps.html.erb
new file mode 100644
index 0000000..e4630da
--- /dev/null
+++ b/app/views/profile/_profile_scraps.html.erb
@@ -0,0 +1 @@
+NÃO DEVE APARECER
diff --git a/app/views/profile/_profile_scraps.rhtml b/app/views/profile/_profile_scraps.rhtml
deleted file mode 100644
index e4630da..0000000
--- a/app/views/profile/_profile_scraps.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-NÃO DEVE APARECER
diff --git a/app/views/profile/_profile_wall.html.erb b/app/views/profile/_profile_wall.html.erb
new file mode 100644
index 0000000..f0601f9
--- /dev/null
+++ b/app/views/profile/_profile_wall.html.erb
@@ -0,0 +1,12 @@
+<%= _("%s's wall") % @profile.name %>
+
+ <%= flash[:error] %>
+ <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "$('leave_scrap_content').value=''" do %>
+ <%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :cols => 50, :rows => 2 %>
+ <%= submit_button :new, _('Share') %>
+ <% end %>
+
+
+
+ <%= render :partial => 'profile_activities_list', :locals => {:activities => @activities} %>
+
diff --git a/app/views/profile/_profile_wall.rhtml b/app/views/profile/_profile_wall.rhtml
deleted file mode 100644
index f0601f9..0000000
--- a/app/views/profile/_profile_wall.rhtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<%= _("%s's wall") % @profile.name %>
-
- <%= flash[:error] %>
- <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "$('leave_scrap_content').value=''" do %>
- <%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :cols => 50, :rows => 2 %>
- <%= submit_button :new, _('Share') %>
- <% end %>
-
-
-
- <%= render :partial => 'profile_activities_list', :locals => {:activities => @activities} %>
-
diff --git a/app/views/profile/_update_article.html.erb b/app/views/profile/_update_article.html.erb
new file mode 100644
index 0000000..aec088a
--- /dev/null
+++ b/app/views/profile/_update_article.html.erb
@@ -0,0 +1 @@
+NAO É PRA APARECER
diff --git a/app/views/profile/_update_article.rhtml b/app/views/profile/_update_article.rhtml
deleted file mode 100644
index aec088a..0000000
--- a/app/views/profile/_update_article.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-NAO É PRA APARECER
diff --git a/app/views/profile/_upload_image.html.erb b/app/views/profile/_upload_image.html.erb
new file mode 100644
index 0000000..ab2e901
--- /dev/null
+++ b/app/views/profile/_upload_image.html.erb
@@ -0,0 +1,14 @@
+
+
+ <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+
+
+
<%= link_to activity.user.name, activity.user.url %> <%= describe activity %>
+
<%= time_ago_as_sentence(activity.created_at) %>
+
+ <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]).to_json, _('Are you sure you want to remove this activity and all its replies?').to_json]) if logged_in? && current_person == @profile %>
+
+
+
+
-
- <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
-
-
-
<%= link_to activity.user.name, activity.user.url %> <%= describe activity %>
-
<%= time_ago_as_sentence(activity.created_at) %>
-
- <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]).to_json, _('Are you sure you want to remove this activity and all its replies?').to_json]) if logged_in? && current_person == @profile %>
-
-
-
-
+
+
<%= _("%s's communities") % profile.name %>
+
+<% cache_timeout(profile.communities_cache_key(params), 4.hour) do %>
+
+ <% @communities.each do |community| %>
+ <%= profile_image_link(community)%>
+ <% end %>
+
+
+
+<% end %>
+
+<% button_bar do %>
+ <%= button :back, _('Go back'), { :controller => 'profile' } %>
+ <%= button :add, _('Create a new community'),
+ :controller => 'memberships', :action => 'new_community' if logged_in? && user == profile %>
+<% end %>
+
+
-
-
<%= _("%s's communities") % profile.name %>
-
-<% cache_timeout(profile.communities_cache_key(params), 4.hour) do %>
-
- <% @communities.each do |community| %>
- <%= profile_image_link(community)%>
- <% end %>
-
-
-
-<% end %>
-
-<% button_bar do %>
- <%= button :back, _('Go back'), { :controller => 'profile' } %>
- <%= button :add, _('Create a new community'),
- :controller => 'memberships', :action => 'new_community' if logged_in? && user == profile %>
-<% end %>
-
-
<%= _('Content tagged with "%s"') % CGI.escapeHTML(@tag) %>
+
+
+<%= link_to image_tag('icons-mime/rss-feed.png', :alt => _('Feed for this tag'), :title => _('Feed for this tag')), tag_feed_path, :class => 'blog-feed-link'%>
+
+
+<% cache_timeout(@tag_cache_key, 4.hour) do %>
+
+
+ <% for doc in @tagged %>
+ <%= link_to doc.title, doc.url %>
+ <% end %>
+
+
+ <%= link_to _('See content tagged with "%s" in the entire site') % CGI.escapeHTML(@tag), :controller => 'search', :action => 'tag', :tag => @tag %>
+
+<% end %>
diff --git a/app/views/profile/content_tagged.rhtml b/app/views/profile/content_tagged.rhtml
deleted file mode 100644
index bde9e04..0000000
--- a/app/views/profile/content_tagged.rhtml
+++ /dev/null
@@ -1,23 +0,0 @@
-<% add_rss_feed_to_head(_("%s's contents tagged with \"%s\"") % [profile.name, @tag], tag_feed_path) %>
-
-<%= _('Content tagged with "%s"') % CGI.escapeHTML(@tag) %>
-
-
-<%= link_to image_tag('icons-mime/rss-feed.png', :alt => _('Feed for this tag'), :title => _('Feed for this tag')), tag_feed_path, :class => 'blog-feed-link'%>
-
-
-<% cache_timeout(@tag_cache_key, 4.hour) do %>
-
-
- <% for doc in @tagged %>
- <%= link_to doc.title, doc.url %>
- <% end %>
-
-
- <%= link_to _('See content tagged with "%s" in the entire site') % CGI.escapeHTML(@tag), :controller => 'search', :action => 'tag', :tag => @tag %>
-
-<% end %>
diff --git a/app/views/profile/enterprises.html.erb b/app/views/profile/enterprises.html.erb
new file mode 100644
index 0000000..d292177
--- /dev/null
+++ b/app/views/profile/enterprises.html.erb
@@ -0,0 +1,17 @@
+
+
+
<%= __("%s's enterprises") % profile.name %>
+
+
+<% @enterprises.each do |enterprise| %>
+ <%= profile_image_link(enterprise)%>
+<% end %>
+
+
+<% button_bar do %>
+ <%= button :back, _('Go back'), { :controller => 'profile' } %>
+ <%= button :add, __('Register a new enterprise'), :controller => 'enterprise_registration' if logged_in? && environment.enabled?('enterprise_registration') %>
+<% end %>
+
+
-
-
<%= __("%s's enterprises") % profile.name %>
-
-
-<% @enterprises.each do |enterprise| %>
- <%= profile_image_link(enterprise)%>
-<% end %>
-
-
-<% button_bar do %>
- <%= button :back, _('Go back'), { :controller => 'profile' } %>
- <%= button :add, __('Register a new enterprise'), :controller => 'enterprise_registration' if logged_in? && environment.enabled?('enterprise_registration') %>
-<% end %>
-
-
+
+
<%= __("%s's fans") % profile.name %>
+
+
+<% @fans.each do |person| %>
+ <%= profile_image_link(person)%>
+<% end %>
+
+
+<% button_bar do %>
+ <%= button :back, _('Go back'), { :controller => 'profile' }%>
+<% end %>
+
+
-
-
<%= __("%s's fans") % profile.name %>
-
-
-<% @fans.each do |person| %>
- <%= profile_image_link(person)%>
-<% end %>
-
-
-<% button_bar do %>
- <%= button :back, _('Go back'), { :controller => 'profile' }%>
-<% end %>
-
-
+
+
<%= __("%s's favorite enterprises") % profile.name %>
+
+
+<% @favorite_enterprises.each do |enterprise| %>
+ <%= profile_image_link(enterprise)%>
+<% end %>
+
+
+<% button_bar do %>
+ <%= button :back, _('Go back'), { :controller => 'profile' }%>
+<% end %>
+
+
-
-
<%= __("%s's favorite enterprises") % profile.name %>
-
-
-<% @favorite_enterprises.each do |enterprise| %>
- <%= profile_image_link(enterprise)%>
-<% end %>
-
-
-<% button_bar do %>
- <%= button :back, _('Go back'), { :controller => 'profile' }%>
-<% end %>
-
-
+
+
<%= __("%s's friends") % profile.name %>
+
+<% cache_timeout(profile.friends_cache_key(params), 4.hours) do %>
+
+ <% @friends.each do |friend| %>
+ <%= profile_image_link(friend) %>
+ <% end%>
+
+
+
+<% end %>
+
+<% button_bar do %>
+ <%= button :back, _('Go back'), { :controller => 'profile' } %>
+ <% if user == profile %>
+ <%= button :edit, _('Manage my friends'), :controller => 'friends', :action => 'index', :profile => profile.identifier %>
+ <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
+ <% end %>
+<% end %>
+
+
-
-
<%= __("%s's friends") % profile.name %>
-
-<% cache_timeout(profile.friends_cache_key(params), 4.hours) do %>
-
- <% @friends.each do |friend| %>
- <%= profile_image_link(friend) %>
- <% end%>
-
-
-
-<% end %>
-
-<% button_bar do %>
- <%= button :back, _('Go back'), { :controller => 'profile' } %>
- <% if user == profile %>
- <%= button :edit, _('Manage my friends'), :controller => 'friends', :action => 'index', :profile => profile.identifier %>
- <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
- <% end %>
-<% end %>
-
-
<%= h profile.name %>
+
+<% if @action %>
+ <%= render :partial => 'private_profile' %>
+<% else %>
+ <% unless profile.description.blank? %>
+
+ <%= profile.description %>
+
+ <% end %>
+
+ <%= render :partial => 'shared/profile_search_form' %>
+
+<% end %>
+
+<% if @profile.public? || (logged_in? && current_person.follows?(@profile)) %>
+
+
+
+ <% plugins_tabs = @plugins.dispatch(:profile_tabs).
+ map { |tab| {:title => tab[:title], :id => tab[:id], :content => instance_eval(&tab[:content]), :start => tab[:title]} }%>
+
+ <% tabs = plugins_tabs.select { |tab| tab[:start] } %>
+
+ <% if @profile.organization? %>
+ <% tabs << {:title => _('Profile'), :id => 'organization-profile', :content => (render :partial => 'organization_profile')} %>
+ <% if logged_in? && current_person.follows?(@profile) %>
+ <% tabs << {:title => _('Wall'), :id => 'profile-wall', :content => (render :partial => 'profile_wall')} %>
+ <% end %>
+ <% elsif @profile.person? %>
+ <% tabs << {:title => _('Profile'), :id => 'person-profile', :content => (render :partial => 'person_profile')} %>
+ <% if logged_in? && current_person.follows?(@profile) %>
+ <% tabs << {:title => _('Wall'), :id => 'profile-wall', :content => (render :partial => 'profile_wall')} %>
+ <% tabs << {:title => _('Network'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>
+ <% end %>
+ <% end %>
+
+ <% tabs += plugins_tabs.select { |tab| !tab[:start] } %>
+
+ <%= render_tabs(tabs) %>
+
+
+
+<% end %>
diff --git a/app/views/profile/index.rhtml b/app/views/profile/index.rhtml
deleted file mode 100644
index 2f70250..0000000
--- a/app/views/profile/index.rhtml
+++ /dev/null
@@ -1,46 +0,0 @@
-<%= render :partial => 'shared/disabled_enterprise' %>
-
-<%= h profile.name %>
-
-<% if @action %>
- <%= render :partial => 'private_profile' %>
-<% else %>
- <% unless profile.description.blank? %>
-
- <%= profile.description %>
-
- <% end %>
-
- <%= render :partial => 'shared/profile_search_form' %>
-
-<% end %>
-
-<% if @profile.public? || (logged_in? && current_person.follows?(@profile)) %>
-
-
-
- <% plugins_tabs = @plugins.dispatch(:profile_tabs).
- map { |tab| {:title => tab[:title], :id => tab[:id], :content => instance_eval(&tab[:content]), :start => tab[:title]} }%>
-
- <% tabs = plugins_tabs.select { |tab| tab[:start] } %>
-
- <% if @profile.organization? %>
- <% tabs << {:title => _('Profile'), :id => 'organization-profile', :content => (render :partial => 'organization_profile')} %>
- <% if logged_in? && current_person.follows?(@profile) %>
- <% tabs << {:title => _('Wall'), :id => 'profile-wall', :content => (render :partial => 'profile_wall')} %>
- <% end %>
- <% elsif @profile.person? %>
- <% tabs << {:title => _('Profile'), :id => 'person-profile', :content => (render :partial => 'person_profile')} %>
- <% if logged_in? && current_person.follows?(@profile) %>
- <% tabs << {:title => _('Wall'), :id => 'profile-wall', :content => (render :partial => 'profile_wall')} %>
- <% tabs << {:title => _('Network'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>
- <% end %>
- <% end %>
-
- <% tabs += plugins_tabs.select { |tab| !tab[:start] } %>
-
- <%= render_tabs(tabs) %>
-
-
-
-<% end %>
diff --git a/app/views/profile/join.html.erb b/app/views/profile/join.html.erb
new file mode 100644
index 0000000..1ad934d
--- /dev/null
+++ b/app/views/profile/join.html.erb
@@ -0,0 +1,16 @@
+<%= _('Joining %s') % profile.name %>
+
+
+<%= _('Are you sure you want to join %s?') % profile.name %>
+
+
+<% form_tag do %>
+ <%= hidden_field_tag('back_to', @back_to) %>
+ <%= hidden_field_tag(:confirmation, 1) %>
+ <%= submit_button(:ok, _("Yes, I want to join.") % profile.name) %>
+ <% if logged_in? && request.xhr? %>
+ <%= lightbox_close_button(_("No, I don't want")) %>
+ <% else %>
+ <%= button(:cancel, _("No, I don't want."), profile.url) %>
+ <% end %>
+<% end %>
diff --git a/app/views/profile/join.rhtml b/app/views/profile/join.rhtml
deleted file mode 100644
index 1ad934d..0000000
--- a/app/views/profile/join.rhtml
+++ /dev/null
@@ -1,16 +0,0 @@
-<%= _('Joining %s') % profile.name %>
-
-
-<%= _('Are you sure you want to join %s?') % profile.name %>
-
-
-<% form_tag do %>
- <%= hidden_field_tag('back_to', @back_to) %>
- <%= hidden_field_tag(:confirmation, 1) %>
- <%= submit_button(:ok, _("Yes, I want to join.") % profile.name) %>
- <% if logged_in? && request.xhr? %>
- <%= lightbox_close_button(_("No, I don't want")) %>
- <% else %>
- <%= button(:cancel, _("No, I don't want."), profile.url) %>
- <% end %>
-<% end %>
diff --git a/app/views/profile/leave.html.erb b/app/views/profile/leave.html.erb
new file mode 100644
index 0000000..45ffc59
--- /dev/null
+++ b/app/views/profile/leave.html.erb
@@ -0,0 +1,16 @@
+<%= _('Leaving %s') % profile.name %>
+
+
+<%= _('Are you sure you want to leave %s?') % profile.name %>
+
+
+<% form_tag do %>
+ <%= hidden_field_tag(:confirmation, 1) %>
+ <%= hidden_field_tag(:back_to, @back_to) %>
+ <%= submit_button(:ok, _("Yes, I want to leave.") % profile.name) %>
+ <% if logged_in? && request.xhr? %>
+ <%= lightbox_close_button(_("No, I don't want")) %>
+ <% else %>
+ <%= button(:cancel, _("No, I don't want."), profile.url) %>
+ <% end %>
+<% end %>
diff --git a/app/views/profile/leave.rhtml b/app/views/profile/leave.rhtml
deleted file mode 100644
index 45ffc59..0000000
--- a/app/views/profile/leave.rhtml
+++ /dev/null
@@ -1,16 +0,0 @@
-<%= _('Leaving %s') % profile.name %>
-
-
-<%= _('Are you sure you want to leave %s?') % profile.name %>
-
-
-<% form_tag do %>
- <%= hidden_field_tag(:confirmation, 1) %>
- <%= hidden_field_tag(:back_to, @back_to) %>
- <%= submit_button(:ok, _("Yes, I want to leave.") % profile.name) %>
- <% if logged_in? && request.xhr? %>
- <%= lightbox_close_button(_("No, I don't want")) %>
- <% else %>
- <%= button(:cancel, _("No, I don't want."), profile.url) %>
- <% end %>
-<% end %>
diff --git a/app/views/profile/members.html.erb b/app/views/profile/members.html.erb
new file mode 100644
index 0000000..3639c52
--- /dev/null
+++ b/app/views/profile/members.html.erb
@@ -0,0 +1,29 @@
+
+
+
<%= _("%s's members") % profile.name %>
+
+<% cache_timeout(profile.members_cache_key(params), 4.hours) do %>
+
+ <% @members.each do |member| %>
+ <%= profile_image_link(member) %>
+ <% end %>
+
+
+
+<% end %>
+
+<% button_bar do %>
+ <%= button :back, _('Go back'), { :controller => 'profile' } %>
+ <% if profile.community? and user %>
+ <% if user.has_permission?(:invite_members, profile) %>
+ <%= button :search, _('Invite your friends to join %s') % profile.name, :controller => 'invite', :action => 'select_address_book' %>
+ <% end %>
+ <% if user.has_permission?(:send_mail_to_members, profile) %>
+ <%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>
+ <% end %>
+ <% end %>
+<% end %>
+
+
-
-
<%= _("%s's members") % profile.name %>
-
-<% cache_timeout(profile.members_cache_key(params), 4.hours) do %>
-
- <% @members.each do |member| %>
- <%= profile_image_link(member) %>
- <% end %>
-
-
-
-<% end %>
-
-<% button_bar do %>
- <%= button :back, _('Go back'), { :controller => 'profile' } %>
- <% if profile.community? and user %>
- <% if user.has_permission?(:invite_members, profile) %>
- <%= button :search, _('Invite your friends to join %s') % profile.name, :controller => 'invite', :action => 'select_address_book' %>
- <% end %>
- <% if user.has_permission?(:send_mail_to_members, profile) %>
- <%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>
- <% end %>
- <% end %>
-<% end %>
-
-
<%= h profile.short_name(50) %>
+
+<%= _('Send e-mail to members') %>
+
+<%= error_messages_for :mailing %>
+
+<%= render :file => 'shared/tiny_mce' %>
+
+<% form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %>
+ <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
+ <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
+ <%= submit_button(:send, _('Send')) %>
+ <%= button :cancel, _('Cancel e-mail'), :back %>
+<% end %>
diff --git a/app/views/profile/send_mail.rhtml b/app/views/profile/send_mail.rhtml
deleted file mode 100644
index 185f7cd..0000000
--- a/app/views/profile/send_mail.rhtml
+++ /dev/null
@@ -1,14 +0,0 @@
-<%= h profile.short_name(50) %>
-
-<%= _('Send e-mail to members') %>
-
-<%= error_messages_for :mailing %>
-
-<%= render :file => 'shared/tiny_mce' %>
-
-<% form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %>
- <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
- <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
- <%= submit_button(:send, _('Send')) %>
- <%= button :cancel, _('Cancel e-mail'), :back %>
-<% end %>
diff --git a/app/views/profile/sitemap.html.erb b/app/views/profile/sitemap.html.erb
new file mode 100644
index 0000000..0fcf974
--- /dev/null
+++ b/app/views/profile/sitemap.html.erb
@@ -0,0 +1,3 @@
+<%= _("%s: site map") % profile.name %>
+
+<%= list_articles(available_articles(@articles, user), false) %>
diff --git a/app/views/profile/sitemap.rhtml b/app/views/profile/sitemap.rhtml
deleted file mode 100644
index 0fcf974..0000000
--- a/app/views/profile/sitemap.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= _("%s: site map") % profile.name %>
-
-<%= list_articles(available_articles(@articles, user), false) %>
diff --git a/app/views/profile/tags.html.erb b/app/views/profile/tags.html.erb
new file mode 100644
index 0000000..cff2f92
--- /dev/null
+++ b/app/views/profile/tags.html.erb
@@ -0,0 +1,7 @@
+<%= _("%s's tags") % @profile.name %>
+
+
+<% cache_timeout(@tags_cache_key, 4.hour) do %>
+ <%= tag_cloud @tags, :id, { :action => :tags }, {:show_count => true} %>
+<% end %>
+
diff --git a/app/views/profile/tags.rhtml b/app/views/profile/tags.rhtml
deleted file mode 100644
index cff2f92..0000000
--- a/app/views/profile/tags.rhtml
+++ /dev/null
@@ -1,7 +0,0 @@
-<%= _("%s's tags") % @profile.name %>
-
-
-<% cache_timeout(@tags_cache_key, 4.hour) do %>
- <%= tag_cloud @tags, :id, { :action => :tags }, {:show_count => true} %>
-<% end %>
-
diff --git a/app/views/profile_editor/_organization.html.erb b/app/views/profile_editor/_organization.html.erb
new file mode 100644
index 0000000..9fedbd1
--- /dev/null
+++ b/app/views/profile_editor/_organization.html.erb
@@ -0,0 +1,67 @@
+<%= _('General information') %>
+
+ <%= required_fields_message %>
+
+ <%= required f.text_field(:name) %>
+
+ <%= @plugins.dispatch(:profile_info_extra_contents).collect { |content| instance_eval(&content) }.join("") %>
+
+<% if @environment.enabled?('enable_organization_url_change') %>
+
+<% end %>
+
+<% if @environment.enabled?('enable_organization_url_change') %>
+
+
+ <%= hidden_field_tag 'old_profile_identifier', @profile.identifier %>
+
+ <%= required labelled_form_field( _('Address'),
+ content_tag('code',
+ url_for(profile.url).gsub(/#{profile.identifier}$/, '') +
+ text_field(:profile_data, :identifier, :onchange => "warn_value_change()", :size => 25)
+ ) +
+ content_tag('div',
+ content_tag('strong', _('WARNING!')) + ' ' +
+ _("You are about to change the address, and this will break external links to the homepage or to content inside it. Do you really want to change?") +
+ content_tag('div',
+ button_to_function(:ok, _("Yes"), "confirm_change()") + ' ' +
+ button_to_function(:cancel, _('No'), 'no_change()')
+ ),
+ :id => 'identifier-change-confirmation',
+ :class => 'change-confirmation',
+ :style => 'display: none;'
+ )
+ )
+ %>
+
+<% end %>
+
+<%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => 'profile_data', :profile => @profile } %>
+
+<%= labelled_check_box(_('Enable "contact us"'), 'profile_data[enable_contact_us]', "1", @profile.enable_contact_us) if @profile.enterprise? %>
+
+<%= render :partial => 'moderation', :locals => { :profile => @profile } %>
diff --git a/app/views/profile_editor/_organization.rhtml b/app/views/profile_editor/_organization.rhtml
deleted file mode 100644
index 9fedbd1..0000000
--- a/app/views/profile_editor/_organization.rhtml
+++ /dev/null
@@ -1,67 +0,0 @@
-<%= _('General information') %>
-
- <%= required_fields_message %>
-
- <%= required f.text_field(:name) %>
-
- <%= @plugins.dispatch(:profile_info_extra_contents).collect { |content| instance_eval(&content) }.join("") %>
-
-<% if @environment.enabled?('enable_organization_url_change') %>
-
-<% end %>
-
-<% if @environment.enabled?('enable_organization_url_change') %>
-
-
- <%= hidden_field_tag 'old_profile_identifier', @profile.identifier %>
-
- <%= required labelled_form_field( _('Address'),
- content_tag('code',
- url_for(profile.url).gsub(/#{profile.identifier}$/, '') +
- text_field(:profile_data, :identifier, :onchange => "warn_value_change()", :size => 25)
- ) +
- content_tag('div',
- content_tag('strong', _('WARNING!')) + ' ' +
- _("You are about to change the address, and this will break external links to the homepage or to content inside it. Do you really want to change?") +
- content_tag('div',
- button_to_function(:ok, _("Yes"), "confirm_change()") + ' ' +
- button_to_function(:cancel, _('No'), 'no_change()')
- ),
- :id => 'identifier-change-confirmation',
- :class => 'change-confirmation',
- :style => 'display: none;'
- )
- )
- %>
-
-<% end %>
-
-<%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => 'profile_data', :profile => @profile } %>
-
-<%= labelled_check_box(_('Enable "contact us"'), 'profile_data[enable_contact_us]', "1", @profile.enable_contact_us) if @profile.enterprise? %>
-
-<%= render :partial => 'moderation', :locals => { :profile => @profile } %>
diff --git a/app/views/profile_editor/_pending_tasks.html.erb b/app/views/profile_editor/_pending_tasks.html.erb
new file mode 100644
index 0000000..9a13ee0
--- /dev/null
+++ b/app/views/profile_editor/_pending_tasks.html.erb
@@ -0,0 +1,11 @@
+<%= stylesheet_link_tag 'tasks' %>
+
+<% unless @pending_tasks.empty? %>
+
+
<%= _('You have pending requests') %>
+
+ <%= @pending_tasks.map {|task| content_tag('li', task_information(task))} %>
+
+ <%= button(:todo, _('Process requests'), :controller => 'tasks', :action => 'index') %>
+
-
<%= _('You have pending requests') %>
-
- <%= @pending_tasks.map {|task| content_tag('li', task_information(task))} %>
-
- <%= button(:todo, _('Process requests'), :controller => 'tasks', :action => 'index') %>
-
<%= _('Personal information') %>
+
+ <%= required_fields_message %>
+
+
+ <%= required f.text_field(:name) %>
+
+ <%= unchangeable_privacy_field @profile %>
+
+
+ <%= required f.text_field(:email) %>
+
+ <%= profile_field_privacy_selector @profile, 'email' %>
+
+
<%= _('Personal information') %>
-
- <%= required_fields_message %>
-
-
- <%= required f.text_field(:name) %>
-
- <%= unchangeable_privacy_field @profile %>
-
-
- <%= required f.text_field(:email) %>
-
- <%= profile_field_privacy_selector @profile, 'email' %>
-
-
+ <%= _('A short name by which you like to be known. Will be used in friends listings, community member listings etc.') %>
+
+<% end %>
+
+<%= optional_field(@person, 'description', f.text_area(:description, :rows => 5, :rel => _('Description'))) %>
+<%= optional_field(@person, 'preferred_domain', select_preferred_domain(:profile_data)) %>
+<%= optional_field(@person, 'contact_information', f.text_field(:contact_information, :rel => _('Contact information'))) %>
+<%= optional_field(@person, 'contact_phone', labelled_form_field(_('Home phone'), text_field(:profile_data, :contact_phone, :rel => _('Contact phone')))) %>
+<%= optional_field(@person, 'cell_phone', f.text_field(:cell_phone, :rel => _('Cell phone'))) %>
+<%= optional_field(@person, 'comercial_phone', f.text_field(:comercial_phone, :rel => _('Comercial phone'))) %>
+<%= optional_field(@person, 'sex', f.radio_group(:profile_data, :sex, [ ['male',_('Male')], ['female',_('Female')] ])) %>
+<%= optional_field(@person, 'birth_date', labelled_form_field(_('Birth date'), '' + pick_date(:profile_data, :birth_date, {:start_year => (Date.today.year - 100), :end_year => (Date.today.year - 5)}) + '
')) %>
+<%= optional_field(@person, 'nationality', f.text_field(:nationality, :rel => _('Nationality'))) %>
+<%= optional_field(@person, 'country', select_country(_('Country'), 'profile_data', 'country', {:class => 'type-select'})) %>
+<%= optional_field(@person, 'state', f.text_field(:state, :rel => _('State'))) %>
+<%= optional_field(@person, 'city', f.text_field(:city, :rel => _('City'))) %>
+<%= optional_field(@person, 'zip_code', labelled_form_field(_('ZIP code'), text_field(:profile_data, :zip_code, :rel => _('ZIP code')))) %>
+<%= optional_field(@person, 'address', labelled_form_field(_('Address (street and number)'), text_field(:profile_data, :address, :rel => _('Address')))) %>
+
+<% optional_field(@person, 'schooling') do %>
+
+<% end %>
+
+
+
+<%= optional_field(@person, 'formation', select_area(_('Education'), 'profile_data', 'formation', {:class => 'type-select-full-line'})) %>
+
+ >
+ <%= optional_field(@person, 'custom_formation', f.text_field(:custom_formation, :rel => _('Custom formation'))) %>
+
+<%= observe_field 'profile_data_formation', :function =>'toggle_text_field("profile_data_formation", "profile_data_custom_formation_span")' %>
+
+<%= optional_field(@person, 'area_of_study', select_area(_('Area of study'), 'profile_data', 'area_of_study', {:class => 'type-select-full-line'})) %>
+
+ >
+ <%= optional_field(@person, 'custom_area_of_study', f.text_field(:custom_area_of_study, :rel => _('Custom area of study'))) %>
+
+<%= observe_field 'profile_data_area_of_study', :function =>'toggle_text_field("profile_data_area_of_study", "profile_data_custom_area_of_study_span")' %>
+
+<%= optional_field(@person, 'professional_activity', f.text_field(:professional_activity, :rel => _('Professional activity'))) %>
+<%= optional_field(@person, 'organization', f.text_field(:organization, :rel => _('Organization'))) %>
+<%= optional_field(@person, 'organization_website', f.text_field(:organization_website, :rel => _('Organization website'))) %>
diff --git a/app/views/profile_editor/_person_form.rhtml b/app/views/profile_editor/_person_form.rhtml
deleted file mode 100644
index d4844d1..0000000
--- a/app/views/profile_editor/_person_form.rhtml
+++ /dev/null
@@ -1,61 +0,0 @@
-<% @person ||= @profile %>
-
-<% optional_field(@person, 'nickname') do %>
- <%= f.text_field(:nickname, :maxlength => 16, :size => 30, :rel => _('Nickname')) %>
-
- <%= _('A short name by which you like to be known. Will be used in friends listings, community member listings etc.') %>
-
-<% end %>
-
-<%= optional_field(@person, 'description', f.text_area(:description, :rows => 5, :rel => _('Description'))) %>
-<%= optional_field(@person, 'preferred_domain', select_preferred_domain(:profile_data)) %>
-<%= optional_field(@person, 'contact_information', f.text_field(:contact_information, :rel => _('Contact information'))) %>
-<%= optional_field(@person, 'contact_phone', labelled_form_field(_('Home phone'), text_field(:profile_data, :contact_phone, :rel => _('Contact phone')))) %>
-<%= optional_field(@person, 'cell_phone', f.text_field(:cell_phone, :rel => _('Cell phone'))) %>
-<%= optional_field(@person, 'comercial_phone', f.text_field(:comercial_phone, :rel => _('Comercial phone'))) %>
-<%= optional_field(@person, 'sex', f.radio_group(:profile_data, :sex, [ ['male',_('Male')], ['female',_('Female')] ])) %>
-<%= optional_field(@person, 'birth_date', labelled_form_field(_('Birth date'), '' + pick_date(:profile_data, :birth_date, {:start_year => (Date.today.year - 100), :end_year => (Date.today.year - 5)}) + '
')) %>
-<%= optional_field(@person, 'nationality', f.text_field(:nationality, :rel => _('Nationality'))) %>
-<%= optional_field(@person, 'country', select_country(_('Country'), 'profile_data', 'country', {:class => 'type-select'})) %>
-<%= optional_field(@person, 'state', f.text_field(:state, :rel => _('State'))) %>
-<%= optional_field(@person, 'city', f.text_field(:city, :rel => _('City'))) %>
-<%= optional_field(@person, 'zip_code', labelled_form_field(_('ZIP code'), text_field(:profile_data, :zip_code, :rel => _('ZIP code')))) %>
-<%= optional_field(@person, 'address', labelled_form_field(_('Address (street and number)'), text_field(:profile_data, :address, :rel => _('Address')))) %>
-
-<% optional_field(@person, 'schooling') do %>
-
-<% end %>
-
-
-
-<%= optional_field(@person, 'formation', select_area(_('Education'), 'profile_data', 'formation', {:class => 'type-select-full-line'})) %>
-
- >
- <%= optional_field(@person, 'custom_formation', f.text_field(:custom_formation, :rel => _('Custom formation'))) %>
-
-<%= observe_field 'profile_data_formation', :function =>'toggle_text_field("profile_data_formation", "profile_data_custom_formation_span")' %>
-
-<%= optional_field(@person, 'area_of_study', select_area(_('Area of study'), 'profile_data', 'area_of_study', {:class => 'type-select-full-line'})) %>
-
- >
- <%= optional_field(@person, 'custom_area_of_study', f.text_field(:custom_area_of_study, :rel => _('Custom area of study'))) %>
-
-<%= observe_field 'profile_data_area_of_study', :function =>'toggle_text_field("profile_data_area_of_study", "profile_data_custom_area_of_study_span")' %>
-
-<%= optional_field(@person, 'professional_activity', f.text_field(:professional_activity, :rel => _('Professional activity'))) %>
-<%= optional_field(@person, 'organization', f.text_field(:organization, :rel => _('Organization'))) %>
-<%= optional_field(@person, 'organization_website', f.text_field(:organization_website, :rel => _('Organization website'))) %>
diff --git a/app/views/profile_editor/destroy_profile.html.erb b/app/views/profile_editor/destroy_profile.html.erb
new file mode 100644
index 0000000..a79dee2
--- /dev/null
+++ b/app/views/profile_editor/destroy_profile.html.erb
@@ -0,0 +1,10 @@
+<%= _('Deleting profile %s') % profile.short_name(30) %>
+
+<%= _('Are you sure you want to delete this profile?') %>
+<%= _('You must be aware that all content of this profile (articles, events, files and pictures) will also be deleted.') %>
+
+<% button_bar do %>
+ <%= button(:remove, _('Yes, I am sure'), {:action => 'destroy_profile'}, :method => :post) %>
+ <%= button(:cancel, _('No, I gave up'), profile.url) %>
+<% end %>
+
diff --git a/app/views/profile_editor/destroy_profile.rhtml b/app/views/profile_editor/destroy_profile.rhtml
deleted file mode 100644
index a79dee2..0000000
--- a/app/views/profile_editor/destroy_profile.rhtml
+++ /dev/null
@@ -1,10 +0,0 @@
-<%= _('Deleting profile %s') % profile.short_name(30) %>
-
-<%= _('Are you sure you want to delete this profile?') %>
-<%= _('You must be aware that all content of this profile (articles, events, files and pictures) will also be deleted.') %>
-
-<% button_bar do %>
- <%= button(:remove, _('Yes, I am sure'), {:action => 'destroy_profile'}, :method => :post) %>
- <%= button(:cancel, _('No, I gave up'), profile.url) %>
-<% end %>
-
diff --git a/app/views/profile_editor/disable.html.erb b/app/views/profile_editor/disable.html.erb
new file mode 100644
index 0000000..effea8c
--- /dev/null
+++ b/app/views/profile_editor/disable.html.erb
@@ -0,0 +1,11 @@
+<%= __("Disabling '%s' enterprise") % @to_disable.name %>
+
+
+<%= _('Are you sure you want to disable %s?') % @to_disable.name %>
+
+
+<% form_tag do %>
+ <%= hidden_field_tag(:confirmation, 1) %>
+ <%= submit_button(:ok, _("Yes, I want to disable.")) %>
+ <%= button(:cancel, _("No, I don't want."), :action => 'index') %>
+<% end %>
diff --git a/app/views/profile_editor/disable.rhtml b/app/views/profile_editor/disable.rhtml
deleted file mode 100644
index effea8c..0000000
--- a/app/views/profile_editor/disable.rhtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<%= __("Disabling '%s' enterprise") % @to_disable.name %>
-
-
-<%= _('Are you sure you want to disable %s?') % @to_disable.name %>
-
-
-<% form_tag do %>
- <%= hidden_field_tag(:confirmation, 1) %>
- <%= submit_button(:ok, _("Yes, I want to disable.")) %>
- <%= button(:cancel, _("No, I don't want."), :action => 'index') %>
-<% end %>
diff --git a/app/views/profile_editor/edit.html.erb b/app/views/profile_editor/edit.html.erb
new file mode 100644
index 0000000..5a074bd
--- /dev/null
+++ b/app/views/profile_editor/edit.html.erb
@@ -0,0 +1,76 @@
+<%= _('Profile settings for %s') % profile.name %>
+
+<%= error_messages_for :profile %>
+
+<% labelled_form_for :profile_data, @profile, :html => { :id => 'profile-data', :multipart => true } do |f| %>
+
+ <% if user.has_permission?('manage_environment_templates', profile.environment) %>
+
+ <%= labelled_check_box(_('This profile is a template'), 'profile_data[is_template]', true, @profile.is_template) %>
+
+ <% end %>
+
+ <%= render :partial => partial_for_class(@profile.class), :locals => { :f => f } %>
+
+
+
<%= _('Change picture') %>
+ <%= unchangeable_privacy_field @profile %>
+
+
+ <% f.fields_for :image_builder, @profile.image do |i| %>
+ <%= file_field_or_thumbnail(_('Image:'), @profile.image, i) %><%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %>
+ <% end %>
+
+
+ <%= _('Privacy options') %>
+
+ <% if profile.person? %>
+
+ <%= labelled_radio_button _('Public — show my contents to all internet users'), 'profile_data[public_profile]', true, @profile.public_profile? %>
+
+
+ <%= labelled_radio_button _('Private — show my contents only to friends'), 'profile_data[public_profile]', false, !@profile.public_profile? %>
+
+ <% else %>
+
+ <%= labelled_radio_button _('Public — show content of this group to all internet users'), 'profile_data[public_profile]', true, @profile.public_profile? %>
+
+
+ <%= labelled_radio_button _('Private — show content of this group only to members'), 'profile_data[public_profile]', false, !@profile.public_profile? %>
+
+ <% end %>
+
+ <% if environment.enabled?('allow_change_of_redirection_after_login') %>
+ <%= _('Page to redirect after login') %>
+ <%= select 'profile_data', 'redirection_after_login', Environment.login_redirection_options.map{|key,value|[value,key]}, { :selected => @profile.preferred_login_redirection} %>
+ <% end %>
+
+ <%= _('Translations') %>
+ <%= labelled_check_box(
+ _('Automaticaly redirect the visitor to the article translated to his/her language'),
+ 'profile_data[redirect_l10n]', true, @profile.redirect_l10n
+ )%>
+
+ <%=
+ @plugins.dispatch(:profile_editor_extras).each do |content|
+ content.respond_to?(:call) ? content.call : content
+ end.join("\n")
+ %>
+
+ <%= select_categories(:profile_data, _('Select the categories of your interest'), 2) %>
+
+ <% button_bar do %>
+ <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}) %>
+ <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
+ <% end %>
+
+ <% if user && user.has_permission?('destroy_profile', profile) %>
+ <% button_bar(:id => 'delete-profile') do %>
+ <%= button(:remove, _('Delete profile'), {:action => :destroy_profile}) %>
+ <% end %>
+ <% end %>
+
+
+<% end %>
+
+<%# = generate_form :info, @info, {...} %>
diff --git a/app/views/profile_editor/edit.rhtml b/app/views/profile_editor/edit.rhtml
deleted file mode 100644
index 5a074bd..0000000
--- a/app/views/profile_editor/edit.rhtml
+++ /dev/null
@@ -1,76 +0,0 @@
-<%= _('Profile settings for %s') % profile.name %>
-
-<%= error_messages_for :profile %>
-
-<% labelled_form_for :profile_data, @profile, :html => { :id => 'profile-data', :multipart => true } do |f| %>
-
- <% if user.has_permission?('manage_environment_templates', profile.environment) %>
-
- <%= labelled_check_box(_('This profile is a template'), 'profile_data[is_template]', true, @profile.is_template) %>
-
- <% end %>
-
- <%= render :partial => partial_for_class(@profile.class), :locals => { :f => f } %>
-
-
-
<%= _('Change picture') %>
- <%= unchangeable_privacy_field @profile %>
-
-
- <% f.fields_for :image_builder, @profile.image do |i| %>
- <%= file_field_or_thumbnail(_('Image:'), @profile.image, i) %><%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %>
- <% end %>
-
-
- <%= _('Privacy options') %>
-
- <% if profile.person? %>
-
- <%= labelled_radio_button _('Public — show my contents to all internet users'), 'profile_data[public_profile]', true, @profile.public_profile? %>
-
-
- <%= labelled_radio_button _('Private — show my contents only to friends'), 'profile_data[public_profile]', false, !@profile.public_profile? %>
-
- <% else %>
-
- <%= labelled_radio_button _('Public — show content of this group to all internet users'), 'profile_data[public_profile]', true, @profile.public_profile? %>
-
-
- <%= labelled_radio_button _('Private — show content of this group only to members'), 'profile_data[public_profile]', false, !@profile.public_profile? %>
-
- <% end %>
-
- <% if environment.enabled?('allow_change_of_redirection_after_login') %>
- <%= _('Page to redirect after login') %>
- <%= select 'profile_data', 'redirection_after_login', Environment.login_redirection_options.map{|key,value|[value,key]}, { :selected => @profile.preferred_login_redirection} %>
- <% end %>
-
- <%= _('Translations') %>
- <%= labelled_check_box(
- _('Automaticaly redirect the visitor to the article translated to his/her language'),
- 'profile_data[redirect_l10n]', true, @profile.redirect_l10n
- )%>
-
- <%=
- @plugins.dispatch(:profile_editor_extras).each do |content|
- content.respond_to?(:call) ? content.call : content
- end.join("\n")
- %>
-
- <%= select_categories(:profile_data, _('Select the categories of your interest'), 2) %>
-
- <% button_bar do %>
- <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}) %>
- <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
- <% end %>
-
- <% if user && user.has_permission?('destroy_profile', profile) %>
- <% button_bar(:id => 'delete-profile') do %>
- <%= button(:remove, _('Delete profile'), {:action => :destroy_profile}) %>
- <% end %>
- <% end %>
-
-
-<% end %>
-
-<%# = generate_form :info, @info, {...} %>
diff --git a/app/views/profile_editor/enable.html.erb b/app/views/profile_editor/enable.html.erb
new file mode 100644
index 0000000..497cb2f
--- /dev/null
+++ b/app/views/profile_editor/enable.html.erb
@@ -0,0 +1,11 @@
+<%= __("Enabling '%s' enterprise") % @to_enable.name %>
+
+
+<%= _('Are you sure you want to enable %s?') % @to_enable.name %>
+
+
+<% form_tag do %>
+ <%= hidden_field_tag(:confirmation, 1) %>
+ <%= submit_button(:ok, _("Yes, I want to enable.")) %>
+ <%= button(:cancel, _("No, I don't want."), :action => 'index') %>
+<% end %>
diff --git a/app/views/profile_editor/enable.rhtml b/app/views/profile_editor/enable.rhtml
deleted file mode 100644
index 497cb2f..0000000
--- a/app/views/profile_editor/enable.rhtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<%= __("Enabling '%s' enterprise") % @to_enable.name %>
-
-
-<%= _('Are you sure you want to enable %s?') % @to_enable.name %>
-
-
-<% form_tag do %>
- <%= hidden_field_tag(:confirmation, 1) %>
- <%= submit_button(:ok, _("Yes, I want to enable.")) %>
- <%= button(:cancel, _("No, I don't want."), :action => 'index') %>
-<% end %>
diff --git a/app/views/profile_editor/header_footer.html.erb b/app/views/profile_editor/header_footer.html.erb
new file mode 100644
index 0000000..6ee70c7
--- /dev/null
+++ b/app/views/profile_editor/header_footer.html.erb
@@ -0,0 +1,32 @@
+<%= render :file => 'shared/tiny_mce' %>
+
+<%= _('Editing header and footer') %>
+
+<% form_tag do %>
+
+ <% if environment.enabled?('display_header_footer_explanation') %>
+
+ <%= _('Using the fields below you can customize the header and footer for your website:') %>
+
+ <%= _('On header, you can include a personalized banner by first adding in "Manage content", and then referencing it here. A good format is 468 X 60 pixels, PNG format.') %>
+ <%= _('On footer, you can include a slogan and your contact information etc.') %>
+
+
+ <%= _('See existing examples:') %>
+
+
+
+ <% end %>
+
<%= _('Content for header ') %>
+ <%= text_area_tag(:custom_header, @header, :style => 'width: 100%; height: 150px;', :class => 'mceEditor') %>
+
<%= _('Content for footer') %>
+ <%= text_area_tag(:custom_footer, @footer, :style => 'width: 100%; height: 150px;', :class => 'mceEditor') %>
+ <% button_bar do %>
+ <%= submit_button(:save, _('Save')) %>
+ <%= button(:cancel, _('Cancel'), :action => 'index') %>
+ <% end %>
+
<%= _('Editing header and footer') %>
-
-<% form_tag do %>
-
- <% if environment.enabled?('display_header_footer_explanation') %>
-
- <%= _('Using the fields below you can customize the header and footer for your website:') %>
-
- <%= _('On header, you can include a personalized banner by first adding in "Manage content", and then referencing it here. A good format is 468 X 60 pixels, PNG format.') %>
- <%= _('On footer, you can include a slogan and your contact information etc.') %>
-
-
- <%= _('See existing examples:') %>
-
-
-
- <% end %>
-
<%= _('Content for header ') %>
- <%= text_area_tag(:custom_header, @header, :style => 'width: 100%; height: 150px;', :class => 'mceEditor') %>
-
<%= _('Content for footer') %>
- <%= text_area_tag(:custom_footer, @footer, :style => 'width: 100%; height: 150px;', :class => 'mceEditor') %>
- <% button_bar do %>
- <%= submit_button(:save, _('Save')) %>
- <%= button(:cancel, _('Cancel'), :action => 'index') %>
- <% end %>
-
+
+
+ <%= h profile.short_name %>
+ –
+ <%= _('Control Panel') %>
+
+
+<%= render :partial => 'pending_tasks' %>
+
+<% control_panel do %>
+
+ <%= control_panel_button(profile.control_panel_settings_button[:title],
+ profile.control_panel_settings_button[:icon],
+ :controller => 'profile_editor', :action => 'edit') %>
+
+ <%= control_panel_button(_('Location'), 'edit-location', :controller => 'maps', :action => 'edit_location') %>
+
+ <%= control_panel_button(_('Mail settings'), 'mail', :controller => 'mailconf') if profile.person? && MailConf.enabled? %>
+
+ <%= control_panel_button(_('Tasks'), 'todo', :controller => 'tasks', :action => 'index') %>
+
+ <%= control_panel_button(_('Edit sideboxes'), 'blocks', :controller => 'profile_design', :action => 'index') %>
+
+ <%= control_panel_button(_('Edit Appearance'), 'design-editor', :controller => 'themes', :action => 'index') %>
+
+ <%= control_panel_button(_('Edit Header and Footer'), 'header-and-footer', :controller => 'profile_editor', :action => 'header_footer') unless profile.enterprise? && environment.enabled?('disable_header_and_footer') && !user.is_admin?(environment) %>
+
+ <%= control_panel_button(_('Manage Content'), 'cms', :controller => 'cms') %>
+
+ <% unless profile.enterprise? %>
+ <%= case profile.blogs.count
+ when 0
+ control_panel_button(_('Create blog'), 'blog-disabled', :controller => 'cms', :action => 'new', :type => 'Blog')
+ when 1
+ control_panel_button(_('Configure blog'), 'blog', :controller => 'cms', :action => 'edit', :id => profile.blog)
+ else
+ control_panel_button(_('Configure blog'), 'blog', :controller => 'cms')
+ end %>
+ <% end %>
+
+ <%= control_panel_button(_('Change Password'), 'change-password', :controller => 'account', :action => 'change_password') if profile.person? %>
+
+ <%= control_panel_button(__('Manage friends'), 'friends', :controller => 'friends', :action => 'index') if profile.person? %>
+
+ <%= control_panel_button(_('Manage Members'), 'members', :controller => 'profile_members') if profile.organization? && user.has_permission?(:manage_memberships, profile) %>
+
+ <%= control_panel_button(_('Manage Products and Services'), 'products', :controller => 'manage_products') if profile.enterprise? && !environment.enabled?('disable_products_for_enterprises') %>
+
+ <% if !environment.enabled?('disable_asset_enterprises') %>
+ <% if profile.is_validation_entity? %>
+ <%= control_panel_button(__('Enterprise Validation'), 'validation', :controller => 'enterprise_validation') %>
+ <% end %>
+ <% if profile.person? %>
+ <%= control_panel_button(__('Favorite Enterprises'), 'favorites', :controller => 'favorite_enterprises') %>
+ <% end %>
+ <% end %>
+
+ <% if profile.enterprise? %>
+ <% if profile.enabled? %>
+ <%= control_panel_button(__('Disable'), 'disable', :action => 'disable') %>
+ <% else %>
+ <%= control_panel_button(__('Enable'), 'enable', :action => 'enable') %>
+ <% end %>
+ <% end %>
+
+ <%= control_panel_button(_('Manage my groups'), 'groups', :controller => 'memberships') if profile.person? %>
+
+ <%= control_panel_button(_('Manage SPAM'), 'manage-spam', :controller => 'spam', :action => 'index') %>
+
+ <% @plugins.dispatch(:control_panel_buttons).each do |button| %>
+ <%= control_panel_button(button[:title], button[:icon], button[:url]) %>
+ <% end %>
+
+<% end %>
+
+ <% if profile.person? && environment.enabled?('enterprise_activation') %>
+
+
+ <% form_tag({:controller => 'account', :action => 'activation_question'}, {:method => 'get'}) do %>
+
<%= __('Activate your enterprise') %>
+
<%= __("If you received a letter with information about your enterprise activation, add here the activation code that was sent.") %>
+
<%= environment.help_message_to_add_enterprise %>
+ <%= labelled_form_field(__('Enterprise activation code') + ': ', text_field_tag('enterprise_code')) %>
+ <%= submit_button(:ok, _('Activate')) %>
+ <% end %>
+
+
+ <% end %>
+
+
-
-
- <%= h profile.short_name %>
- –
- <%= _('Control Panel') %>
-
-
-<%= render :partial => 'pending_tasks' %>
-
-<% control_panel do %>
-
- <%= control_panel_button(profile.control_panel_settings_button[:title],
- profile.control_panel_settings_button[:icon],
- :controller => 'profile_editor', :action => 'edit') %>
-
- <%= control_panel_button(_('Location'), 'edit-location', :controller => 'maps', :action => 'edit_location') %>
-
- <%= control_panel_button(_('Mail settings'), 'mail', :controller => 'mailconf') if profile.person? && MailConf.enabled? %>
-
- <%= control_panel_button(_('Tasks'), 'todo', :controller => 'tasks', :action => 'index') %>
-
- <%= control_panel_button(_('Edit sideboxes'), 'blocks', :controller => 'profile_design', :action => 'index') %>
-
- <%= control_panel_button(_('Edit Appearance'), 'design-editor', :controller => 'themes', :action => 'index') %>
-
- <%= control_panel_button(_('Edit Header and Footer'), 'header-and-footer', :controller => 'profile_editor', :action => 'header_footer') unless profile.enterprise? && environment.enabled?('disable_header_and_footer') && !user.is_admin?(environment) %>
-
- <%= control_panel_button(_('Manage Content'), 'cms', :controller => 'cms') %>
-
- <% unless profile.enterprise? %>
- <%= case profile.blogs.count
- when 0
- control_panel_button(_('Create blog'), 'blog-disabled', :controller => 'cms', :action => 'new', :type => 'Blog')
- when 1
- control_panel_button(_('Configure blog'), 'blog', :controller => 'cms', :action => 'edit', :id => profile.blog)
- else
- control_panel_button(_('Configure blog'), 'blog', :controller => 'cms')
- end %>
- <% end %>
-
- <%= control_panel_button(_('Change Password'), 'change-password', :controller => 'account', :action => 'change_password') if profile.person? %>
-
- <%= control_panel_button(__('Manage friends'), 'friends', :controller => 'friends', :action => 'index') if profile.person? %>
-
- <%= control_panel_button(_('Manage Members'), 'members', :controller => 'profile_members') if profile.organization? && user.has_permission?(:manage_memberships, profile) %>
-
- <%= control_panel_button(_('Manage Products and Services'), 'products', :controller => 'manage_products') if profile.enterprise? && !environment.enabled?('disable_products_for_enterprises') %>
-
- <% if !environment.enabled?('disable_asset_enterprises') %>
- <% if profile.is_validation_entity? %>
- <%= control_panel_button(__('Enterprise Validation'), 'validation', :controller => 'enterprise_validation') %>
- <% end %>
- <% if profile.person? %>
- <%= control_panel_button(__('Favorite Enterprises'), 'favorites', :controller => 'favorite_enterprises') %>
- <% end %>
- <% end %>
-
- <% if profile.enterprise? %>
- <% if profile.enabled? %>
- <%= control_panel_button(__('Disable'), 'disable', :action => 'disable') %>
- <% else %>
- <%= control_panel_button(__('Enable'), 'enable', :action => 'enable') %>
- <% end %>
- <% end %>
-
- <%= control_panel_button(_('Manage my groups'), 'groups', :controller => 'memberships') if profile.person? %>
-
- <%= control_panel_button(_('Manage SPAM'), 'manage-spam', :controller => 'spam', :action => 'index') %>
-
- <% @plugins.dispatch(:control_panel_buttons).each do |button| %>
- <%= control_panel_button(button[:title], button[:icon], button[:url]) %>
- <% end %>
-
-<% end %>
-
- <% if profile.person? && environment.enabled?('enterprise_activation') %>
-
-
- <% form_tag({:controller => 'account', :action => 'activation_question'}, {:method => 'get'}) do %>
-
<%= __('Activate your enterprise') %>
-
<%= __("If you received a letter with information about your enterprise activation, add here the activation code that was sent.") %>
-
<%= environment.help_message_to_add_enterprise %>
- <%= labelled_form_field(__('Enterprise activation code') + ': ', text_field_tag('enterprise_code')) %>
- <%= submit_button(:ok, _('Activate')) %>
- <% end %>
-
-
- <% end %>
-
-
<%= _('Add admins to %s') % profile.name %>
+
+<% form_remote_tag :url => {:action => 'find_users', :profile => profile.identifier, :scope => 'new_admins'}, :update => 'users-list', :loading => '$("users-list").addClassName("loading")', :complete => '$("users-list").removeClassName("loading")' do %>
+ <%= text_field_tag('query', '', :autocomplete => 'off') %>
+ <%= submit_tag(_('Search')) %>
+<% end %>
+
+<%= observe_field('query', :url => {:action => 'find_users', :profile => profile.identifier, :scope => 'new_admins'}, :update => 'users-list', :frequency => 1, :with => 'query', :condition => '$("query").value.length > 2', :loading => '$("users-list").addClassName("loading")', :complete => '$("users-list").removeClassName("loading")') %>
+<%= observe_field('query', :frequency => 1, :condition => '$("query").value.length <= 2', :function => '$("users-list").update($("empty-query").innerHTML)') %>
+
+
+ <%= render :partial => 'find_users' %>
+
+
+
+ <%= render :partial => 'find_users' %>
+
+
+
+ <%= render :partial => 'members_list' %>
+
+<%= drop_receiving_element('members-list',
+ :url => {:action => 'add_admin', :profile => profile.identifier, :leaving_admin => @person},
+ :before => '$("tr-" + element.id).hide()',
+ :loading => '$("members-list").addClassName("loading")',
+ :update => 'members-list',
+ :success => '$("tr-" + element.id).hide(); $(element.id).show();',
+ :complete => '$("members-list").removeClassName("loading")') %>
+
+<%= _('Add admins to %s') % profile.name %>
-
-<% form_remote_tag :url => {:action => 'find_users', :profile => profile.identifier, :scope => 'new_admins'}, :update => 'users-list', :loading => '$("users-list").addClassName("loading")', :complete => '$("users-list").removeClassName("loading")' do %>
- <%= text_field_tag('query', '', :autocomplete => 'off') %>
- <%= submit_tag(_('Search')) %>
-<% end %>
-
-<%= observe_field('query', :url => {:action => 'find_users', :profile => profile.identifier, :scope => 'new_admins'}, :update => 'users-list', :frequency => 1, :with => 'query', :condition => '$("query").value.length > 2', :loading => '$("users-list").addClassName("loading")', :complete => '$("users-list").removeClassName("loading")') %>
-<%= observe_field('query', :frequency => 1, :condition => '$("query").value.length <= 2', :function => '$("users-list").update($("empty-query").innerHTML)') %>
-
-
- <%= render :partial => 'find_users' %>
-
-
-
- <%= render :partial => 'find_users' %>
-
-
-
- <%= render :partial => 'members_list' %>
-
-<%= drop_receiving_element('members-list',
- :url => {:action => 'add_admin', :profile => profile.identifier, :leaving_admin => @person},
- :before => '$("tr-" + element.id).hide()',
- :loading => '$("members-list").addClassName("loading")',
- :update => 'members-list',
- :success => '$("tr-" + element.id).hide(); $(element.id).show();',
- :complete => '$("members-list").removeClassName("loading")') %>
-
-<%= title %>
+
+
+
+ <%= _('Member') %>
+ <%= _('Actions') %>
+
+ <% collection.each do |m| %>
+
+ <%= link_to_profile m.short_name, m.identifier, :title => m.name %>
+
+
+ <%= button_without_text :edit, _('Edit'), :action => 'change_role', :id => m %>
+ <%= button_to_remote_without_text(:remove, _('Remove'),
+ :update => 'members-list',
+ :loading => '$("members-list").addClassName("loading")',
+ :success => "$('tr-#{m.identifier}').show()",
+ :complete => '$("members-list").removeClassName("loading")',
+ :url => { :id => m }.merge(remove_action)) if m != user %>
+
+
+
+ <% end %>
+
diff --git a/app/views/profile_members/_members_list.rhtml b/app/views/profile_members/_members_list.rhtml
deleted file mode 100644
index b63b25c..0000000
--- a/app/views/profile_members/_members_list.rhtml
+++ /dev/null
@@ -1,28 +0,0 @@
-<% collection = @collection == :profile_admins ? profile.admins : profile.members %>
-<% title = @title ? @title : _('Current members') %>
-<% remove_action = @remove_action ? @remove_action : {:action => 'unassociate'} %>
-
-<%= title %>
-
-
-
- <%= _('Member') %>
- <%= _('Actions') %>
-
- <% collection.each do |m| %>
-
- <%= link_to_profile m.short_name, m.identifier, :title => m.name %>
-
-
- <%= button_without_text :edit, _('Edit'), :action => 'change_role', :id => m %>
- <%= button_to_remote_without_text(:remove, _('Remove'),
- :update => 'members-list',
- :loading => '$("members-list").addClassName("loading")',
- :success => "$('tr-#{m.identifier}').show()",
- :complete => '$("members-list").removeClassName("loading")',
- :url => { :id => m }.merge(remove_action)) if m != user %>
-
-
-
- <% end %>
-
diff --git a/app/views/profile_members/add_admin.html.erb b/app/views/profile_members/add_admin.html.erb
new file mode 120000
index 0000000..12e1b0b
--- /dev/null
+++ b/app/views/profile_members/add_admin.html.erb
@@ -0,0 +1 @@
+_members_list.rhtml
\ No newline at end of file
diff --git a/app/views/profile_members/add_admin.rhtml b/app/views/profile_members/add_admin.rhtml
deleted file mode 120000
index 12e1b0b..0000000
--- a/app/views/profile_members/add_admin.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-_members_list.rhtml
\ No newline at end of file
diff --git a/app/views/profile_members/add_member.html.erb b/app/views/profile_members/add_member.html.erb
new file mode 120000
index 0000000..12e1b0b
--- /dev/null
+++ b/app/views/profile_members/add_member.html.erb
@@ -0,0 +1 @@
+_members_list.rhtml
\ No newline at end of file
diff --git a/app/views/profile_members/add_member.rhtml b/app/views/profile_members/add_member.rhtml
deleted file mode 120000
index 12e1b0b..0000000
--- a/app/views/profile_members/add_member.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-_members_list.rhtml
\ No newline at end of file
diff --git a/app/views/profile_members/add_members.html.erb b/app/views/profile_members/add_members.html.erb
new file mode 100644
index 0000000..6c33eaf
--- /dev/null
+++ b/app/views/profile_members/add_members.html.erb
@@ -0,0 +1,3 @@
+<%= _('Add members to %s') % profile.name %>
+
+<%= render :partial => 'manage_roles', :locals => {:from => 'add_members'} %>
diff --git a/app/views/profile_members/add_members.rhtml b/app/views/profile_members/add_members.rhtml
deleted file mode 100644
index 6c33eaf..0000000
--- a/app/views/profile_members/add_members.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= _('Add members to %s') % profile.name %>
-
-<%= render :partial => 'manage_roles', :locals => {:from => 'add_members'} %>
diff --git a/app/views/profile_members/affiliate.html.erb b/app/views/profile_members/affiliate.html.erb
new file mode 100644
index 0000000..d6aa01a
--- /dev/null
+++ b/app/views/profile_members/affiliate.html.erb
@@ -0,0 +1,9 @@
+ <%= @member.name %>
+
+<% form_tag( {:action => 'give_role'}, {:method => :post}) do %>
+ <%= select_tag 'role', options_for_select(@roles.map{|r|[r.name,r.id]}) %>
+ <%= hidden_field_tag 'person', current_user.person.id %>
+ <% button_bar do %>
+ <%= submit_button('affiliate', _('Affiliate'), :cancel => {:action => 'index'}) %>
+ <% end %>
+<% end %>
diff --git a/app/views/profile_members/affiliate.rhtml b/app/views/profile_members/affiliate.rhtml
deleted file mode 100644
index d6aa01a..0000000
--- a/app/views/profile_members/affiliate.rhtml
+++ /dev/null
@@ -1,9 +0,0 @@
- <%= @member.name %>
-
-<% form_tag( {:action => 'give_role'}, {:method => :post}) do %>
- <%= select_tag 'role', options_for_select(@roles.map{|r|[r.name,r.id]}) %>
- <%= hidden_field_tag 'person', current_user.person.id %>
- <% button_bar do %>
- <%= submit_button('affiliate', _('Affiliate'), :cancel => {:action => 'index'}) %>
- <% end %>
-<% end %>
diff --git a/app/views/profile_members/change_role.html.erb b/app/views/profile_members/change_role.html.erb
new file mode 100644
index 0000000..8efe363
--- /dev/null
+++ b/app/views/profile_members/change_role.html.erb
@@ -0,0 +1,19 @@
+ <%= _('Changing role of %s') % @member.name %>
+
+<% labelled_form_for :member, @member, :url => {:action => 'update_roles'} do |f| %>
+
+ <%= _('Roles:') %>
+ <% r.permissions.each do |p| %>
+ <%= permission_name(p) %>
+ <% end %>
+
+ <% end %>
+ <%= hidden_field_tag 'person', @member.id %>
+
+ <% button_bar do %>
+ <%= submit_button('save', _('Save changes'), :cancel => {:action => 'index'}) %>
+ <% end %>
+<% end %>
diff --git a/app/views/profile_members/change_role.rhtml b/app/views/profile_members/change_role.rhtml
deleted file mode 100644
index 8efe363..0000000
--- a/app/views/profile_members/change_role.rhtml
+++ /dev/null
@@ -1,19 +0,0 @@
- <%= _('Changing role of %s') % @member.name %>
-
-<% labelled_form_for :member, @member, :url => {:action => 'update_roles'} do |f| %>
-
- <%= _('Roles:') %>
- <% r.permissions.each do |p| %>
- <%= permission_name(p) %>
- <% end %>
-
- <% end %>
- <%= hidden_field_tag 'person', @member.id %>
-
- <% button_bar do %>
- <%= submit_button('save', _('Save changes'), :cancel => {:action => 'index'}) %>
- <% end %>
-<% end %>
diff --git a/app/views/profile_members/index.html.erb b/app/views/profile_members/index.html.erb
new file mode 100644
index 0000000..62b7b77
--- /dev/null
+++ b/app/views/profile_members/index.html.erb
@@ -0,0 +1,9 @@
+<%= h profile.short_name(50) %>
+
+<%= render :partial => 'index_buttons' %>
+
+
+ <%= render :partial => 'members_list' %>
+
+
+<%= render :partial => 'index_buttons' %>
diff --git a/app/views/profile_members/index.rhtml b/app/views/profile_members/index.rhtml
deleted file mode 100644
index 62b7b77..0000000
--- a/app/views/profile_members/index.rhtml
+++ /dev/null
@@ -1,9 +0,0 @@
-<%= h profile.short_name(50) %>
-
-<%= render :partial => 'index_buttons' %>
-
-
- <%= render :partial => 'members_list' %>
-
-
-<%= render :partial => 'index_buttons' %>
diff --git a/app/views/profile_members/last_admin.html.erb b/app/views/profile_members/last_admin.html.erb
new file mode 100644
index 0000000..680ed60
--- /dev/null
+++ b/app/views/profile_members/last_admin.html.erb
@@ -0,0 +1,8 @@
+<%= _('Last administrator leaving %s') % profile.name %>
+
+
+ <%= _('Since you are the last administrator, you must choose at least one member to administer this community.') % profile.name %>
+
+
+<%= render :partial => 'manage_roles', :locals => {:from => 'last_admin'} %>
+
diff --git a/app/views/profile_members/last_admin.rhtml b/app/views/profile_members/last_admin.rhtml
deleted file mode 100644
index 680ed60..0000000
--- a/app/views/profile_members/last_admin.rhtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<%= _('Last administrator leaving %s') % profile.name %>
-
-
- <%= _('Since you are the last administrator, you must choose at least one member to administer this community.') % profile.name %>
-
-
-<%= render :partial => 'manage_roles', :locals => {:from => 'last_admin'} %>
-
diff --git a/app/views/profile_members/remove_admin.html.erb b/app/views/profile_members/remove_admin.html.erb
new file mode 120000
index 0000000..12e1b0b
--- /dev/null
+++ b/app/views/profile_members/remove_admin.html.erb
@@ -0,0 +1 @@
+_members_list.rhtml
\ No newline at end of file
diff --git a/app/views/profile_members/remove_admin.rhtml b/app/views/profile_members/remove_admin.rhtml
deleted file mode 120000
index 12e1b0b..0000000
--- a/app/views/profile_members/remove_admin.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-_members_list.rhtml
\ No newline at end of file
diff --git a/app/views/profile_members/unassociate.html.erb b/app/views/profile_members/unassociate.html.erb
new file mode 120000
index 0000000..12e1b0b
--- /dev/null
+++ b/app/views/profile_members/unassociate.html.erb
@@ -0,0 +1 @@
+_members_list.rhtml
\ No newline at end of file
diff --git a/app/views/profile_members/unassociate.rhtml b/app/views/profile_members/unassociate.rhtml
deleted file mode 120000
index 12e1b0b..0000000
--- a/app/views/profile_members/unassociate.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-_members_list.rhtml
\ No newline at end of file
diff --git a/app/views/profile_search/_article.html.erb b/app/views/profile_search/_article.html.erb
new file mode 100644
index 0000000..8f46328
--- /dev/null
+++ b/app/views/profile_search/_article.html.erb
@@ -0,0 +1,5 @@
+
+ <%= link_to article.title, article.view_url, :class => 'result-title' %>
+ <%= link_to article.short_lead, article.url, {:class => 'article-details'} %>
+ <%= link_to url_for(article.url), article.url, :class => 'article-url' %>
+
diff --git a/app/views/profile_search/_article.rhtml b/app/views/profile_search/_article.rhtml
deleted file mode 100644
index 8f46328..0000000
--- a/app/views/profile_search/_article.rhtml
+++ /dev/null
@@ -1,5 +0,0 @@
-
- <%= link_to article.title, article.view_url, :class => 'result-title' %>
- <%= link_to article.short_lead, article.url, {:class => 'article-details'} %>
- <%= link_to url_for(article.url), article.url, :class => 'article-url' %>
-
diff --git a/app/views/profile_search/_folder.html.erb b/app/views/profile_search/_folder.html.erb
new file mode 100644
index 0000000..03f1395
--- /dev/null
+++ b/app/views/profile_search/_folder.html.erb
@@ -0,0 +1,5 @@
+
+ <%= link_to article.title, article.view_url, :class => 'result-title' %>
+ <%= link_to article.body.to_s, article.url, {:class => 'article-details'} %>
+ <%= link_to url_for(article.url), article.url, :class => 'article-url' %>
+
diff --git a/app/views/profile_search/_folder.rhtml b/app/views/profile_search/_folder.rhtml
deleted file mode 100644
index 03f1395..0000000
--- a/app/views/profile_search/_folder.rhtml
+++ /dev/null
@@ -1,5 +0,0 @@
-
- <%= link_to article.title, article.view_url, :class => 'result-title' %>
- <%= link_to article.body.to_s, article.url, {:class => 'article-details'} %>
- <%= link_to url_for(article.url), article.url, :class => 'article-url' %>
-
diff --git a/app/views/profile_search/_uploaded_file.html.erb b/app/views/profile_search/_uploaded_file.html.erb
new file mode 100644
index 0000000..b0cb1d6
--- /dev/null
+++ b/app/views/profile_search/_uploaded_file.html.erb
@@ -0,0 +1,11 @@
+<% if article.image? %>
+
+ <%= link_to image_tag(article.public_filename(:thumb), :alt => article.abstract, :title => article.abstract), article.view_url, :class => 'article-details' %>
+
+<% else %>
+
+ <%= link_to article.title, article.view_url, :class => 'result-title' %>
+ <%= link_to article.title, article.short_lead, :class => 'article-details' %>
+ <%= link_to url_for(article.url), article.url, :class => 'article-url' %>
+
+<% end %>
diff --git a/app/views/profile_search/_uploaded_file.rhtml b/app/views/profile_search/_uploaded_file.rhtml
deleted file mode 100644
index b0cb1d6..0000000
--- a/app/views/profile_search/_uploaded_file.rhtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<% if article.image? %>
-
- <%= link_to image_tag(article.public_filename(:thumb), :alt => article.abstract, :title => article.abstract), article.view_url, :class => 'article-details' %>
-
-<% else %>
-
- <%= link_to article.title, article.view_url, :class => 'result-title' %>
- <%= link_to article.title, article.short_lead, :class => 'article-details' %>
- <%= link_to url_for(article.url), article.url, :class => 'article-url' %>
-
-<% end %>
diff --git a/app/views/profile_search/index.html.erb b/app/views/profile_search/index.html.erb
new file mode 100644
index 0000000..4d50023
--- /dev/null
+++ b/app/views/profile_search/index.html.erb
@@ -0,0 +1,19 @@
+
+
<%= _("Search on %s's profile") % profile.short_name %>
+
+ <%= render :partial => 'shared/profile_search_form' %>
+
+ <% if @results %>
+
+ <%= _("%s results found") % @results.total_entries %>
+
+
+
+ <% @results.sort_by { |r| r.is_image? ? 0 : 1}.each do |result| %>
+ <%= render :partial => partial_for_class(result.class), :locals => { :article => result } %>
+ <% end %>
+
+
+ <%= pagination_links @results %>
+ <% end %>
+
-
<%= _("Search on %s's profile") % profile.short_name %>
-
- <%= render :partial => 'shared/profile_search_form' %>
-
- <% if @results %>
-
- <%= _("%s results found") % @results.total_entries %>
-
-
-
- <% @results.sort_by { |r| r.is_image? ? 0 : 1}.each do |result| %>
- <%= render :partial => partial_for_class(result.class), :locals => { :article => result } %>
- <% end %>
-
-
- <%= pagination_links @results %>
- <% end %>
-
+
+
+ <%= link_to region.name, :action => 'region', :id => region %>
+
<%= n_('1 validator', '%{num} validators.', region.validators.size) % { :num => region.validators.size } %>
+ <% unless region.children.empty? %>
+
+ <%= render :partial => 'region', :collection => region.children %>
+
+ <% end %>
+
+
diff --git a/app/views/region_validators/_region.rhtml b/app/views/region_validators/_region.rhtml
deleted file mode 100644
index 16ee9b7..0000000
--- a/app/views/region_validators/_region.rhtml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- <%= link_to region.name, :action => 'region', :id => region %>
-
<%= n_('1 validator', '%{num} validators.', region.validators.size) % { :num => region.validators.size } %>
- <% unless region.children.empty? %>
-
- <%= render :partial => 'region', :collection => region.children %>
-
- <% end %>
-
-
diff --git a/app/views/region_validators/_search.html.erb b/app/views/region_validators/_search.html.erb
new file mode 100644
index 0000000..649df23
--- /dev/null
+++ b/app/views/region_validators/_search.html.erb
@@ -0,0 +1,15 @@
+<% if @search %>
+
+ <% for item in @search %>
+
+ <%= item.name %>
+ <% form_tag :action => 'add', :id => @region do %>
+ <%= hidden_field_tag :validator_id, item.id %>
+ <% button_bar do %>
+ <%= submit_button('add', _('Add')) %>
+ <% end %>
+ <% end %>
+
+ <% end %>
+
+<% end %>
diff --git a/app/views/region_validators/_search.rhtml b/app/views/region_validators/_search.rhtml
deleted file mode 100644
index 649df23..0000000
--- a/app/views/region_validators/_search.rhtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<% if @search %>
-
- <% for item in @search %>
-
- <%= item.name %>
- <% form_tag :action => 'add', :id => @region do %>
- <%= hidden_field_tag :validator_id, item.id %>
- <% button_bar do %>
- <%= submit_button('add', _('Add')) %>
- <% end %>
- <% end %>
-
- <% end %>
-
-<% end %>
diff --git a/app/views/region_validators/index.html.erb b/app/views/region_validators/index.html.erb
new file mode 100644
index 0000000..06a055a
--- /dev/null
+++ b/app/views/region_validators/index.html.erb
@@ -0,0 +1,5 @@
+<%= _('Validators by Region') %>
+
+
+ <%= render :partial => 'region', :collection => @regions %>
+
diff --git a/app/views/region_validators/index.rhtml b/app/views/region_validators/index.rhtml
deleted file mode 100644
index 06a055a..0000000
--- a/app/views/region_validators/index.rhtml
+++ /dev/null
@@ -1,5 +0,0 @@
-<%= _('Validators by Region') %>
-
-
- <%= render :partial => 'region', :collection => @regions %>
-
diff --git a/app/views/region_validators/region.html.erb b/app/views/region_validators/region.html.erb
new file mode 100644
index 0000000..464dcea
--- /dev/null
+++ b/app/views/region_validators/region.html.erb
@@ -0,0 +1,31 @@
+<%= _('Validators for region %s') % @region.name %>
+
+<%= _('Current validators') %>
+
+
+ <% for validator in @region.validators %>
+
+ <%= link_to_homepage validator.name, validator.identifier %>
+ <%= link_to _('Remove validation rights'), { :action => 'remove', :id => @region.id, :validator_id => validator }, :method => 'post' %>
+
+ <% end %>
+
+
+<%= _('Add new validators') %>
+
+
+<%= help _('First search organizations by their name, then use the buttons in the search result to add them as validators for this region. ') %>
+
+
+<% form_tag({}, { :method => 'get' }) do %>
+ <%= text_field_tag :search, nil, :id => 'search_validator' %>
+ <% button_bar do %>
+ <%= submit_button('search', _('Search')) %>
+ <% end %>
+<% end %>
+
+<%= observe_field 'search_validator', :url => { :action => 'search', :id => @region.id }, :with => 'search', :frequency => 1, :update => 'search_results' %>
+
+
+ <%= render :partial => 'search' %>
+
diff --git a/app/views/region_validators/region.rhtml b/app/views/region_validators/region.rhtml
deleted file mode 100644
index 464dcea..0000000
--- a/app/views/region_validators/region.rhtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<%= _('Validators for region %s') % @region.name %>
-
-<%= _('Current validators') %>
-
-
- <% for validator in @region.validators %>
-
- <%= link_to_homepage validator.name, validator.identifier %>
- <%= link_to _('Remove validation rights'), { :action => 'remove', :id => @region.id, :validator_id => validator }, :method => 'post' %>
-
- <% end %>
-
-
-<%= _('Add new validators') %>
-
-
-<%= help _('First search organizations by their name, then use the buttons in the search result to add them as validators for this region. ') %>
-
-
-<% form_tag({}, { :method => 'get' }) do %>
- <%= text_field_tag :search, nil, :id => 'search_validator' %>
- <% button_bar do %>
- <%= submit_button('search', _('Search')) %>
- <% end %>
-<% end %>
-
-<%= observe_field 'search_validator', :url => { :action => 'search', :id => @region.id }, :with => 'search', :frequency => 1, :update => 'search_results' %>
-
-
- <%= render :partial => 'search' %>
-
diff --git a/app/views/role/_form.html.erb b/app/views/role/_form.html.erb
new file mode 100644
index 0000000..0570578
--- /dev/null
+++ b/app/views/role/_form.html.erb
@@ -0,0 +1,18 @@
+<%= error_messages_for :role %>
+
+<% labelled_form_for :role, role, :url => (mode == :edit) ? {:action => 'update', :id => role} : {:action => 'create'} do |f| %>
+
+ <%= required_fields_message %>
+
+ <%= required f.text_field(:name) %>
+
+ <%= _('Permissions:') %>
+ <% permissions.keys.each do |p| %>
+ <%= check_box_tag("role[permissions][]", p, role.has_permission?(p), { :id => p }) %>
+ <%= content_tag(:label, permission_name(p), { :for => p }) %>
<%= _('Permissions:') %>
- <% permissions.keys.each do |p| %>
- <%= check_box_tag("role[permissions][]", p, role.has_permission?(p), { :id => p }) %>
- <%= content_tag(:label, permission_name(p), { :for => p }) %>
<%= _("Editing #{@role.name}") %>
+
+<%= render :partial => 'form', :locals => { :mode => :edit, :role => @role, :permissions => ActiveRecord::Base::PERMISSIONS[@role.kind] } %>
diff --git a/app/views/role/edit.rhtml b/app/views/role/edit.rhtml
deleted file mode 100644
index a8ff970..0000000
--- a/app/views/role/edit.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
- <%= _("Editing #{@role.name}") %>
-
-<%= render :partial => 'form', :locals => { :mode => :edit, :role => @role, :permissions => ActiveRecord::Base::PERMISSIONS[@role.kind] } %>
diff --git a/app/views/role/index.html.erb b/app/views/role/index.html.erb
new file mode 100644
index 0000000..ee77070
--- /dev/null
+++ b/app/views/role/index.html.erb
@@ -0,0 +1,23 @@
+<%= _('Manage user roles') %>
+
+
+
+ <%= _('Role') %>
+ <%= _('Actions') %>
+
+ <% @roles.each do |role| %>
+
+
+ <%= link_to role.name, :action => 'show', :id => role %>
+
+
+ <%= button_without_text :edit, _('Edit'), :action => 'edit', :id => role %>
+
+
+ <% end %>
+
+
+<% button_bar do %>
+ <%= button :add, _('Create a new role'), :action => 'new' %>
+ <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
+<% end %>
diff --git a/app/views/role/index.rhtml b/app/views/role/index.rhtml
deleted file mode 100644
index ee77070..0000000
--- a/app/views/role/index.rhtml
+++ /dev/null
@@ -1,23 +0,0 @@
-<%= _('Manage user roles') %>
-
-
-
- <%= _('Role') %>
- <%= _('Actions') %>
-
- <% @roles.each do |role| %>
-
-
- <%= link_to role.name, :action => 'show', :id => role %>
-
-
- <%= button_without_text :edit, _('Edit'), :action => 'edit', :id => role %>
-
-
- <% end %>
-
-
-<% button_bar do %>
- <%= button :add, _('Create a new role'), :action => 'new' %>
- <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
-<% end %>
diff --git a/app/views/role/new.html.erb b/app/views/role/new.html.erb
new file mode 100644
index 0000000..38c32d7
--- /dev/null
+++ b/app/views/role/new.html.erb
@@ -0,0 +1,3 @@
+ <%= _("Create a new role") %>
+
+<%= render :partial => 'form', :locals => { :mode => :create, :role => @role, :permissions => ActiveRecord::Base::PERMISSIONS[@role.kind] } %>
diff --git a/app/views/role/new.rhtml b/app/views/role/new.rhtml
deleted file mode 100644
index 38c32d7..0000000
--- a/app/views/role/new.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
- <%= _("Create a new role") %>
-
-<%= render :partial => 'form', :locals => { :mode => :create, :role => @role, :permissions => ActiveRecord::Base::PERMISSIONS[@role.kind] } %>
diff --git a/app/views/role/show.html.erb b/app/views/role/show.html.erb
new file mode 100644
index 0000000..97da59e
--- /dev/null
+++ b/app/views/role/show.html.erb
@@ -0,0 +1,13 @@
+ <%= _(@role.name) %>
+
+ <%= _('Permissions') %>
+
+ <% @role.permissions.each do |p| %>
+ <%= permission_name(p) %>
+ <% end %>
+
+
+<% button_bar do %>
+ <%= button :edit, _('Edit'), :action => 'edit', :id => @role %>
+ <%= button :back, _('Back to roles management'), :action => 'index' %>
+<% end %>
diff --git a/app/views/role/show.rhtml b/app/views/role/show.rhtml
deleted file mode 100644
index 97da59e..0000000
--- a/app/views/role/show.rhtml
+++ /dev/null
@@ -1,13 +0,0 @@
- <%= _(@role.name) %>
-
- <%= _('Permissions') %>
-
- <% @role.permissions.each do |p| %>
- <%= permission_name(p) %>
- <% end %>
-
-
-<% button_bar do %>
- <%= button :edit, _('Edit'), :action => 'edit', :id => @role %>
- <%= button :back, _('Back to roles management'), :action => 'index' %>
-<% end %>
diff --git a/app/views/scrap/notifier/mail.html.erb b/app/views/scrap/notifier/mail.html.erb
new file mode 100644
index 0000000..ec88a61
--- /dev/null
+++ b/app/views/scrap/notifier/mail.html.erb
@@ -0,0 +1,16 @@
+<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
+
+<%= word_wrap(_('%{sender} (%{sender_link}) has left the following scrap for you:') % { :sender => @sender, :sender_link => url_for(@sender_link) }) %>
+
+-------------------------------------------------------------------------------
+<%= word_wrap(@scrap_content) %>
+-------------------------------------------------------------------------------
+
+<%= _('View this scrap on the wall') %>:
+<%= url_for @wall_url %>
+
+<%= _("Greetings,") %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= url_for @url %>
diff --git a/app/views/scrap/notifier/mail.rhtml b/app/views/scrap/notifier/mail.rhtml
deleted file mode 100644
index ec88a61..0000000
--- a/app/views/scrap/notifier/mail.rhtml
+++ /dev/null
@@ -1,16 +0,0 @@
-<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
-
-<%= word_wrap(_('%{sender} (%{sender_link}) has left the following scrap for you:') % { :sender => @sender, :sender_link => url_for(@sender_link) }) %>
-
--------------------------------------------------------------------------------
-<%= word_wrap(@scrap_content) %>
--------------------------------------------------------------------------------
-
-<%= _('View this scrap on the wall') %>:
-<%= url_for @wall_url %>
-
-<%= _("Greetings,") %>
-
---
-<%= _('%s team.') % @environment %>
-<%= url_for @url %>
diff --git a/app/views/search/_article.html.erb b/app/views/search/_article.html.erb
new file mode 100644
index 0000000..25c2a41
--- /dev/null
+++ b/app/views/search/_article.html.erb
@@ -0,0 +1,12 @@
+
+ <%= link_to(article.title, article.url, :class => "search-result-title") %>
+
+ <%= render :partial => 'image', :object => article %>
+
+
+ <%= render :partial => 'article_common', :object => article %>
+
+ <%= render :partial => 'article_last_change', :object => article %>
+
+
+
diff --git a/app/views/search/_article.rhtml b/app/views/search/_article.rhtml
deleted file mode 100644
index 25c2a41..0000000
--- a/app/views/search/_article.rhtml
+++ /dev/null
@@ -1,12 +0,0 @@
-
- <%= link_to(article.title, article.url, :class => "search-result-title") %>
-
- <%= render :partial => 'image', :object => article %>
-
-
- <%= render :partial => 'article_common', :object => article %>
-
- <%= render :partial => 'article_last_change', :object => article %>
-
-
-
diff --git a/app/views/search/_article_author.html.erb b/app/views/search/_article_author.html.erb
new file mode 100644
index 0000000..9e9b1f6
--- /dev/null
+++ b/app/views/search/_article_author.html.erb
@@ -0,0 +1,8 @@
+<% article = article_author %>
+
+
+ <%= _("Author") %>
+
+ <%= link_to_profile article.profile.name, article.profile.identifier %>
+
+
diff --git a/app/views/search/_article_author.rhtml b/app/views/search/_article_author.rhtml
deleted file mode 100644
index 9e9b1f6..0000000
--- a/app/views/search/_article_author.rhtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<% article = article_author %>
-
-
- <%= _("Author") %>
-
- <%= link_to_profile article.profile.name, article.profile.identifier %>
-
-
diff --git a/app/views/search/_article_categories.html.erb b/app/views/search/_article_categories.html.erb
new file mode 100644
index 0000000..325f971
--- /dev/null
+++ b/app/views/search/_article_categories.html.erb
@@ -0,0 +1,9 @@
+
+ <%= _('Categories') %>
+ ">
+ <% article_categories.each do |category| %>
+ <%= link_to_category category, false, :class => "search-article-category" %>
+ <% end %>
+ <%= _('None') if article_categories.empty? %>
+
+
diff --git a/app/views/search/_article_categories.rhtml b/app/views/search/_article_categories.rhtml
deleted file mode 100644
index 325f971..0000000
--- a/app/views/search/_article_categories.rhtml
+++ /dev/null
@@ -1,9 +0,0 @@
-
- <%= _('Categories') %>
- ">
- <% article_categories.each do |category| %>
- <%= link_to_category category, false, :class => "search-article-category" %>
- <% end %>
- <%= _('None') if article_categories.empty? %>
-
-
diff --git a/app/views/search/_article_common.html.erb b/app/views/search/_article_common.html.erb
new file mode 100644
index 0000000..43e2a5f
--- /dev/null
+++ b/app/views/search/_article_common.html.erb
@@ -0,0 +1,7 @@
+<% article = article_common %>
+<% show_description = true if show_description.nil? %>
+
+<%= render :partial => 'article_author', :object => article %>
+<%= render :partial => 'article_description', :object => article if show_description %>
+<%= render :partial => 'article_tags', :object => article.tags %>
+<%= render :partial => 'article_categories', :object => article.categories %>
diff --git a/app/views/search/_article_common.rhtml b/app/views/search/_article_common.rhtml
deleted file mode 100644
index 43e2a5f..0000000
--- a/app/views/search/_article_common.rhtml
+++ /dev/null
@@ -1,7 +0,0 @@
-<% article = article_common %>
-<% show_description = true if show_description.nil? %>
-
-<%= render :partial => 'article_author', :object => article %>
-<%= render :partial => 'article_description', :object => article if show_description %>
-<%= render :partial => 'article_tags', :object => article.tags %>
-<%= render :partial => 'article_categories', :object => article.categories %>
diff --git a/app/views/search/_article_description.html.erb b/app/views/search/_article_description.html.erb
new file mode 100644
index 0000000..cec29d1
--- /dev/null
+++ b/app/views/search/_article_description.html.erb
@@ -0,0 +1,15 @@
+<% article = article_description %>
+
+
+ <%= _("Description") %>
+
+ <% if !article.body.blank? %>
+ <% description = strip_tags(article.body.to_s) %>
+ <% description.gsub!(/\s{2,}/, ' ') %>
+ <% description = excerpt(description, description.first(3), 200) %>
+
+ <%= description %>
+ <% else %>
+ <%= _('None') %>
+ <% end %>
+
diff --git a/app/views/search/_article_description.rhtml b/app/views/search/_article_description.rhtml
deleted file mode 100644
index cec29d1..0000000
--- a/app/views/search/_article_description.rhtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<% article = article_description %>
-
-
- <%= _("Description") %>
-
- <% if !article.body.blank? %>
- <% description = strip_tags(article.body.to_s) %>
- <% description.gsub!(/\s{2,}/, ' ') %>
- <% description = excerpt(description, description.first(3), 200) %>
-
- <%= description %>
- <% else %>
- <%= _('None') %>
- <% end %>
-
diff --git a/app/views/search/_article_last_change.html.erb b/app/views/search/_article_last_change.html.erb
new file mode 100644
index 0000000..d0203a3
--- /dev/null
+++ b/app/views/search/_article_last_change.html.erb
@@ -0,0 +1,10 @@
+<% article = article_last_change %>
+
+
+ <% if article.last_changed_by and article.last_changed_by != article.profile %>
+ <%= _('by %{name} at %{date}') % {:name => link_to(article.last_changed_by.name, article.last_changed_by.url),
+ :date => show_date(article.updated_at) } %>
+ <% else %>
+ <%= _('Last update: %s.') % show_date(article.updated_at) %>
+ <% end %>
+
diff --git a/app/views/search/_article_last_change.rhtml b/app/views/search/_article_last_change.rhtml
deleted file mode 100644
index d0203a3..0000000
--- a/app/views/search/_article_last_change.rhtml
+++ /dev/null
@@ -1,10 +0,0 @@
-<% article = article_last_change %>
-
-
- <% if article.last_changed_by and article.last_changed_by != article.profile %>
- <%= _('by %{name} at %{date}') % {:name => link_to(article.last_changed_by.name, article.last_changed_by.url),
- :date => show_date(article.updated_at) } %>
- <% else %>
- <%= _('Last update: %s.') % show_date(article.updated_at) %>
- <% end %>
-
diff --git a/app/views/search/_article_tags.html.erb b/app/views/search/_article_tags.html.erb
new file mode 100644
index 0000000..25f5c5e
--- /dev/null
+++ b/app/views/search/_article_tags.html.erb
@@ -0,0 +1,9 @@
+
+ <%= _('Tags') %>
+ ">
+ <% article_tags.each do |tag| %>
+ <%= link_to_tag tag, :class => "search-article-tag" %>
+ <% end %>
+ <%= _('None') if article_tags.empty? %>
+
+
diff --git a/app/views/search/_article_tags.rhtml b/app/views/search/_article_tags.rhtml
deleted file mode 100644
index 25f5c5e..0000000
--- a/app/views/search/_article_tags.rhtml
+++ /dev/null
@@ -1,9 +0,0 @@
-
- <%= _('Tags') %>
- ">
- <% article_tags.each do |tag| %>
- <%= link_to_tag tag, :class => "search-article-tag" %>
- <% end %>
- <%= _('None') if article_tags.empty? %>
-
-
diff --git a/app/views/search/_blog.html.erb b/app/views/search/_blog.html.erb
new file mode 100644
index 0000000..e96a519
--- /dev/null
+++ b/app/views/search/_blog.html.erb
@@ -0,0 +1,24 @@
+
+ <%= link_to blog.title, blog.view_url, :class => 'search-result-title' %>
+
+ <%= render :partial => 'image', :object => blog %>
+
+
+
+ <%= _("Last posts") %>
+
+ <% r = blog.children.find(:all, :order => :updated_at, :conditions => ['type != ?', 'RssFeed']).last(3) %>
+ ">
+ <% r.each do |a| %>
+ <%= link_to a.title, a.view_url, :class => 'search-blog-sample-item '+icon_for_article(a) %>
+ <% end %>
+ <%= _('None') if r.empty? %>
+
+
+
+ <%= render :partial => 'article_common', :object => blog %>
+
+ <%= render :partial => 'article_last_change', :object => blog %>
+
+
+
diff --git a/app/views/search/_blog.rhtml b/app/views/search/_blog.rhtml
deleted file mode 100644
index e96a519..0000000
--- a/app/views/search/_blog.rhtml
+++ /dev/null
@@ -1,24 +0,0 @@
-
- <%= link_to blog.title, blog.view_url, :class => 'search-result-title' %>
-
- <%= render :partial => 'image', :object => blog %>
-
-
-
- <%= _("Last posts") %>
-
- <% r = blog.children.find(:all, :order => :updated_at, :conditions => ['type != ?', 'RssFeed']).last(3) %>
- ">
- <% r.each do |a| %>
- <%= link_to a.title, a.view_url, :class => 'search-blog-sample-item '+icon_for_article(a) %>
- <% end %>
- <%= _('None') if r.empty? %>
-
-
-
- <%= render :partial => 'article_common', :object => blog %>
-
- <%= render :partial => 'article_last_change', :object => blog %>
-
-
-
diff --git a/app/views/search/_comment.html.erb b/app/views/search/_comment.html.erb
new file mode 100644
index 0000000..1cacab1
--- /dev/null
+++ b/app/views/search/_comment.html.erb
@@ -0,0 +1,23 @@
+
+ <%- if comment.author -%>
+ <%= link_to content_tag( 'span', comment.author.name() ), comment.author.url,
+ :class => 'comment-picture',
+ :style => 'background-image:url(%s)' % profile_icon(comment.author, :icon)
+ %>
+ <%- else -%>
+ <%# unauthenticated user: display gravatar icon %>
+ <%= content_tag 'span', ' ',
+ :class => 'comment-picture',
+ :style => 'background-image:url(%s)' % str_gravatar_url_for( comment.email, :size => 20 )
+ %>
+ <%- end %>
+ <%= link_to(comment.title, comment.url) %>
+
+ <%= _('by %{author} on "%{article}"') % {
+ :comment => link_to(comment.title, comment.url),
+ :article => link_to(comment.article.title, comment.article.url),
+ :author => comment.author_name } %>
+
+
+
+
diff --git a/app/views/search/_comment.rhtml b/app/views/search/_comment.rhtml
deleted file mode 100644
index 1cacab1..0000000
--- a/app/views/search/_comment.rhtml
+++ /dev/null
@@ -1,23 +0,0 @@
-
- <%- if comment.author -%>
- <%= link_to content_tag( 'span', comment.author.name() ), comment.author.url,
- :class => 'comment-picture',
- :style => 'background-image:url(%s)' % profile_icon(comment.author, :icon)
- %>
- <%- else -%>
- <%# unauthenticated user: display gravatar icon %>
- <%= content_tag 'span', ' ',
- :class => 'comment-picture',
- :style => 'background-image:url(%s)' % str_gravatar_url_for( comment.email, :size => 20 )
- %>
- <%- end %>
- <%= link_to(comment.title, comment.url) %>
-
- <%= _('by %{author} on "%{article}"') % {
- :comment => link_to(comment.title, comment.url),
- :article => link_to(comment.article.title, comment.article.url),
- :author => comment.author_name } %>
-
-
-
-
diff --git a/app/views/search/_content.html.erb b/app/views/search/_content.html.erb
new file mode 120000
index 0000000..54e6981
--- /dev/null
+++ b/app/views/search/_content.html.erb
@@ -0,0 +1 @@
+_article.rhtml
\ No newline at end of file
diff --git a/app/views/search/_content.rhtml b/app/views/search/_content.rhtml
deleted file mode 120000
index 54e6981..0000000
--- a/app/views/search/_content.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-_article.rhtml
\ No newline at end of file
diff --git a/app/views/search/_display_results.html.erb b/app/views/search/_display_results.html.erb
new file mode 100644
index 0000000..47c930d
--- /dev/null
+++ b/app/views/search/_display_results.html.erb
@@ -0,0 +1,40 @@
+
+ <% @order.each do |name| %>
+ <% results = @results[name] %>
+ <% empty = results.nil? || results.empty? %>
+
+
">
+ <% if not empty %>
+ <% partial = partial_for_class(results.first.class.class_name.constantize) %>
+
+ <% if multiple_search? %>
+
<%= @names[name] %>
+ <% if results.total_entries > SearchController::MULTIPLE_SEARCH_LIMIT %>
+ <%= link_to(_('see all (%d)') % results.total_entries, params.merge(:action => name), :class => 'see-more' ) %>
+ <% end %>
+ <% end %>
+
+
+
+ <% results.each do |hit| %>
+ <%= render :partial => partial_for_class(hit.class), :object => hit %>
+ <% end %>
+
+
+ <% else %>
+ <% if multiple_search? %>
+
<%= @names[name] %>
+ <% end %>
+
+
+ <% end %>
+
+ <% end %>
+
+
+
+ <%= add_zoom_to_images %>
+
- <% @order.each do |name| %>
- <% results = @results[name] %>
- <% empty = results.nil? || results.empty? %>
-
-
">
- <% if not empty %>
- <% partial = partial_for_class(results.first.class.class_name.constantize) %>
-
- <% if multiple_search? %>
-
<%= @names[name] %>
- <% if results.total_entries > SearchController::MULTIPLE_SEARCH_LIMIT %>
- <%= link_to(_('see all (%d)') % results.total_entries, params.merge(:action => name), :class => 'see-more' ) %>
- <% end %>
- <% end %>
-
-
-
- <% results.each do |hit| %>
- <%= render :partial => partial_for_class(hit.class), :object => hit %>
- <% end %>
-
-
- <% else %>
- <% if multiple_search? %>
-
<%= @names[name] %>
- <% end %>
-
-
- <% end %>
-
- <% end %>
-
-
-
- <%= add_zoom_to_images %>
-
+<%= link_to(event.title, event.url, :class => "search-result-title") %>
+
+ <%= render :partial => 'image', :object => event %>
+
+
+ <% if event.start_date %>
+
+ <%= _('Start date') %>
+ <%= event.start_date %>
+
+ <% end %>
+ <% if event.end_date %>
+
+ <%= _('End date') %>
+ <%= event.end_date %>
+
+ <% end %>
+
+ <%= render :partial => 'article_common', :object => event %>
+
+<%= render :partial => 'article_last_change', :object => event %>
+
+
+
diff --git a/app/views/search/_event.rhtml b/app/views/search/_event.rhtml
deleted file mode 100644
index eacbf2e..0000000
--- a/app/views/search/_event.rhtml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<%= link_to(event.title, event.url, :class => "search-result-title") %>
-
- <%= render :partial => 'image', :object => event %>
-
-
- <% if event.start_date %>
-
- <%= _('Start date') %>
- <%= event.start_date %>
-
- <% end %>
- <% if event.end_date %>
-
- <%= _('End date') %>
- <%= event.end_date %>
-
- <% end %>
-
- <%= render :partial => 'article_common', :object => event %>
-
-<%= render :partial => 'article_last_change', :object => event %>
-
-
-
diff --git a/app/views/search/_facets_menu.html.erb b/app/views/search/_facets_menu.html.erb
new file mode 100644
index 0000000..1893876
--- /dev/null
+++ b/app/views/search/_facets_menu.html.erb
@@ -0,0 +1,36 @@
+<% less_options_limit = 8 %>
+
+
diff --git a/app/views/search/_facets_menu.rhtml b/app/views/search/_facets_menu.rhtml
deleted file mode 100644
index 1893876..0000000
--- a/app/views/search/_facets_menu.rhtml
+++ /dev/null
@@ -1,36 +0,0 @@
-<% less_options_limit = 8 %>
-
-
diff --git a/app/views/search/_facets_unselect_menu.html.erb b/app/views/search/_facets_unselect_menu.html.erb
new file mode 100644
index 0000000..db1393b
--- /dev/null
+++ b/app/views/search/_facets_unselect_menu.html.erb
@@ -0,0 +1,6 @@
+
+ <% if params[:facet] and params[:facet].count > 0 %>
+ <%= _("Applied filters") %>
+ <%= facet_selecteds_html_for(environment, asset_class(@asset), params) %>
+ <% end %>
+
diff --git a/app/views/search/_facets_unselect_menu.rhtml b/app/views/search/_facets_unselect_menu.rhtml
deleted file mode 100644
index db1393b..0000000
--- a/app/views/search/_facets_unselect_menu.rhtml
+++ /dev/null
@@ -1,6 +0,0 @@
-
- <% if params[:facet] and params[:facet].count > 0 %>
- <%= _("Applied filters") %>
- <%= facet_selecteds_html_for(environment, asset_class(@asset), params) %>
- <% end %>
-
diff --git a/app/views/search/_folder.html.erb b/app/views/search/_folder.html.erb
new file mode 100644
index 0000000..a322481
--- /dev/null
+++ b/app/views/search/_folder.html.erb
@@ -0,0 +1,24 @@
+
+ <%= link_to folder.title, folder.view_url, :class => 'search-result-title' %>
+
+ <%= render :partial => 'image', :object => folder %>
+
+
+
+ <%= _("Last items") %>
+
+ <% r = folder.children.last(3) %>
+ ">
+ <% r.each do |a| %>
+ <%= link_to a.title, a.view_url, :class => 'search-folder-sample-item '+icon_for_article(a) %>
+ <% end %>
+ <%= _('None') if r.empty? %>
+
+
+
+ <%= render :partial => 'article_common', :object => folder %>
+
+ <%= render :partial => 'article_last_change', :object => folder %>
+
+
+
diff --git a/app/views/search/_folder.rhtml b/app/views/search/_folder.rhtml
deleted file mode 100644
index a322481..0000000
--- a/app/views/search/_folder.rhtml
+++ /dev/null
@@ -1,24 +0,0 @@
-
- <%= link_to folder.title, folder.view_url, :class => 'search-result-title' %>
-
- <%= render :partial => 'image', :object => folder %>
-
-
-
- <%= _("Last items") %>
-
- <% r = folder.children.last(3) %>
- ">
- <% r.each do |a| %>
- <%= link_to a.title, a.view_url, :class => 'search-folder-sample-item '+icon_for_article(a) %>
- <% end %>
- <%= _('None') if r.empty? %>
-
-
-
- <%= render :partial => 'article_common', :object => folder %>
-
- <%= render :partial => 'article_last_change', :object => folder %>
-
-
-
diff --git a/app/views/search/_forum.html.erb b/app/views/search/_forum.html.erb
new file mode 100644
index 0000000..54df4a2
--- /dev/null
+++ b/app/views/search/_forum.html.erb
@@ -0,0 +1,24 @@
+
+ <%= link_to forum.title, forum.view_url, :class => 'search-result-title' %>
+
+ <%= render :partial => 'image', :object => forum %>
+
+
+
+ <%= _("Last topics") %>
+
+ <% r = forum.children.find(:all, :order => :updated_at, :conditions => ['type != ?', 'RssFeed']).last(3) %>
+ ">
+ <% r.each do |a| %>
+ <%= link_to a.title, a.view_url, :class => 'search-forum-sample-item '+icon_for_article(a) %>
+ <% end %>
+ <%= _('None') if r.empty? %>
+
+
+
+ <%= render :partial => 'article_common', :object => forum %>
+
+ <%= render :partial => 'article_last_change', :object => forum %>
+
+
+
diff --git a/app/views/search/_forum.rhtml b/app/views/search/_forum.rhtml
deleted file mode 100644
index 54df4a2..0000000
--- a/app/views/search/_forum.rhtml
+++ /dev/null
@@ -1,24 +0,0 @@
-
- <%= link_to forum.title, forum.view_url, :class => 'search-result-title' %>
-
- <%= render :partial => 'image', :object => forum %>
-
-
-
- <%= _("Last topics") %>
-
- <% r = forum.children.find(:all, :order => :updated_at, :conditions => ['type != ?', 'RssFeed']).last(3) %>
- ">
- <% r.each do |a| %>
- <%= link_to a.title, a.view_url, :class => 'search-forum-sample-item '+icon_for_article(a) %>
- <% end %>
- <%= _('None') if r.empty? %>
-
-
-
- <%= render :partial => 'article_common', :object => forum %>
-
- <%= render :partial => 'article_last_change', :object => forum %>
-
-
-
diff --git a/app/views/search/_gallery.html.erb b/app/views/search/_gallery.html.erb
new file mode 100644
index 0000000..28e2e66
--- /dev/null
+++ b/app/views/search/_gallery.html.erb
@@ -0,0 +1,13 @@
+
+ <%= link_to gallery.title, gallery.view_url, :class => 'search-result-title' %>
+
+ <%= render :partial => 'image', :object => gallery %>
+
+
+ <%= render :partial => 'article_common', :object => gallery %>
+
+ <%= render :partial => 'article_last_change', :object => gallery %>
+
+
+
+
diff --git a/app/views/search/_gallery.rhtml b/app/views/search/_gallery.rhtml
deleted file mode 100644
index 28e2e66..0000000
--- a/app/views/search/_gallery.rhtml
+++ /dev/null
@@ -1,13 +0,0 @@
-
- <%= link_to gallery.title, gallery.view_url, :class => 'search-result-title' %>
-
- <%= render :partial => 'image', :object => gallery %>
-
-
- <%= render :partial => 'article_common', :object => gallery %>
-
- <%= render :partial => 'article_last_change', :object => gallery %>
-
-
-
-
diff --git a/app/views/search/_google_maps.html.erb b/app/views/search/_google_maps.html.erb
new file mode 100644
index 0000000..a105be5
--- /dev/null
+++ b/app/views/search/_google_maps.html.erb
@@ -0,0 +1,26 @@
+
+
+
+<%= content_tag('script', '', :src => "http://maps.google.com/maps/api/js?sensor=true", :type => 'text/javascript') %>
+<%= javascript_include_tag('google_maps') %>
+
+<%
+ icon = default_or_themed_icon("/images/icons-map/enterprise.png")
+%>
+
+
diff --git a/app/views/search/_google_maps.rhtml b/app/views/search/_google_maps.rhtml
deleted file mode 100644
index a105be5..0000000
--- a/app/views/search/_google_maps.rhtml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-<%= content_tag('script', '', :src => "http://maps.google.com/maps/api/js?sensor=true", :type => 'text/javascript') %>
-<%= javascript_include_tag('google_maps') %>
-
-<%
- icon = default_or_themed_icon("/images/icons-map/enterprise.png")
-%>
-
-
diff --git a/app/views/search/_image.html.erb b/app/views/search/_image.html.erb
new file mode 100644
index 0000000..be85c67
--- /dev/null
+++ b/app/views/search/_image.html.erb
@@ -0,0 +1,52 @@
+
+
+ <% if image.is_a? UploadedFile and image.filename %>
+ <% extension = image.extension %>
+ <% if ['jpg', 'jpeg', 'gif', 'png', 'tiff', 'svg'].include? extension %>
+ <%= link_to '', image.view_url, :class => "search-image-pic", :style => 'background-image: url(%s)'% image.public_filename(:thumb) %>
+ <% if image.width && image.height %>
+ <% javascript_tag do %>
+ image = jQuery('script').last().parent().find('.search-image-pic');
+ des_width = parseInt(image.css('width'));
+ des_height = parseInt(image.css('height'));
+
+ width = <%= image.width %>;
+ height = <%= image.height %>;
+ scale_factor = width > height ? des_width/width : des_height/height;
+
+ image.css({'width' : scale_factor*width +'px', 'height' : scale_factor*height+'px'});
+ <% end %>
+ <% end %>
+ <% elsif ['pdf'].include? extension %>
+ <%= link_to '', image.view_url, :class => 'search-image-pic icon-application-pdf' %>
+ <% elsif ['doc', 'docx', 'odt', 'rtf', 'txt', 'html', 'htm'].include? extension %>
+ <%= link_to '', image.view_url, :class => 'search-image-pic icon-application-vnd-oasis-opendocument-text' %>
+ <% elsif ['xls', 'xlsx', 'ods', 'csv', 'tsv', 'tab'].include? extension %>
+ <%= link_to '', image.view_url, :class => 'search-image-pic icon-application-vnd-oasis-opendocument-spreadsheet' %>
+ <% end %>
+ <% elsif image.is_a? Gallery %>
+
+ <% r = image.children.find(:all, :order => :updated_at, :conditions => ['type = ?', 'UploadedFile']).last(3) %>
+ <% if r.length > 0 %>
+ <% r.each do |i| %>
+ <%= link_to '', i.view_url, :class => "search-image-pic", :style => 'background-image: url(%s)'% i.public_filename(:thumb) %>
+ <% end %>
+ <% else %>
+
<%= _('No image') %>
+ <% end %>
+
+ <% elsif image.is_a? Product %>
+ <% if image.image %>
+
+ <%= link_to '', product_path(image), :class => "search-image-pic",
+ :style => 'background-image: url(%s)'% image.default_image(:thumb) %>
+ <%= link_to content_tag(:span, _('Zoom in')), image.image.public_filename,
+ :class => 'zoomify-image' %>
+
+ <% else %>
+
<%= _('No image') %>
+ <% end %>
+ <% else %>
+
+ <% end %>
+
-
- <% if image.is_a? UploadedFile and image.filename %>
- <% extension = image.extension %>
- <% if ['jpg', 'jpeg', 'gif', 'png', 'tiff', 'svg'].include? extension %>
- <%= link_to '', image.view_url, :class => "search-image-pic", :style => 'background-image: url(%s)'% image.public_filename(:thumb) %>
- <% if image.width && image.height %>
- <% javascript_tag do %>
- image = jQuery('script').last().parent().find('.search-image-pic');
- des_width = parseInt(image.css('width'));
- des_height = parseInt(image.css('height'));
-
- width = <%= image.width %>;
- height = <%= image.height %>;
- scale_factor = width > height ? des_width/width : des_height/height;
-
- image.css({'width' : scale_factor*width +'px', 'height' : scale_factor*height+'px'});
- <% end %>
- <% end %>
- <% elsif ['pdf'].include? extension %>
- <%= link_to '', image.view_url, :class => 'search-image-pic icon-application-pdf' %>
- <% elsif ['doc', 'docx', 'odt', 'rtf', 'txt', 'html', 'htm'].include? extension %>
- <%= link_to '', image.view_url, :class => 'search-image-pic icon-application-vnd-oasis-opendocument-text' %>
- <% elsif ['xls', 'xlsx', 'ods', 'csv', 'tsv', 'tab'].include? extension %>
- <%= link_to '', image.view_url, :class => 'search-image-pic icon-application-vnd-oasis-opendocument-spreadsheet' %>
- <% end %>
- <% elsif image.is_a? Gallery %>
-
- <% r = image.children.find(:all, :order => :updated_at, :conditions => ['type = ?', 'UploadedFile']).last(3) %>
- <% if r.length > 0 %>
- <% r.each do |i| %>
- <%= link_to '', i.view_url, :class => "search-image-pic", :style => 'background-image: url(%s)'% i.public_filename(:thumb) %>
- <% end %>
- <% else %>
-
<%= _('No image') %>
- <% end %>
-
- <% elsif image.is_a? Product %>
- <% if image.image %>
-
- <%= link_to '', product_path(image), :class => "search-image-pic",
- :style => 'background-image: url(%s)'% image.default_image(:thumb) %>
- <%= link_to content_tag(:span, _('Zoom in')), image.image.public_filename,
- :class => 'zoomify-image' %>
-
- <% else %>
-
<%= _('No image') %>
- <% end %>
- <% else %>
-
- <% end %>
-
+
+
+ <%= render :partial => 'search/image', :object => product %>
+
+ <% if product.available %>
+ <% if product.price && product.price > 0 %>
+ <% has_discount = product.discount && product.discount > 0 %>
+ <% if product.price %>
+
<%=_("from") if has_discount %> <%= price_span(product.price, :class => "search-product-price " + (has_discount ? 'with-discount' : '')) %>
+ <% if has_discount %>
+
<%=_("by")%> <%= price_span(product.price_with_discount, :class => "search-product-price") %>
+ <% end %>
+ <% if product.unit %>
+
<%= _('/') %> <%= product.unit.name %>
+ <% end %>
+ <% end %>
+
+ <% end %>
+ <% else %>
+
<%= _('Not available') %>
+ <%= link_to_product product, :class => 'search-result-title' %>
+
+ <%= _('Supplier') %> <%= link_to_homepage(product.enterprise.name, product.enterprise.identifier) %>
+
+
+ <% if product.description %>
+ <% desc_stripped = strip_tags(product.description) %>
+ <%= _('Description') %> <%= excerpt(desc_stripped, desc_stripped.first(3), 300) %>
+ <% end %>
+
+
+
+ <% if product.enterprise.region %>
+ <%= _('City') %>
+
+
+ <% if product.product_qualifiers.count > 0 %>
+ <%= _('Qualifiers') %>
+ <% product.product_qualifiers.each do |pq| %>
+ <% if pq.qualifier %>
+ <%= pq.qualifier.name + (pq.certifier.nil? ? _(";") : '') %>
+ <% end %>
+ <% if pq.certifier %>
+ <%= _('cert. ') + pq.certifier.name + _(";") %>
+ <% end %>
+ <% end %>
+ <% end %>
+
+
+
+ <%= extra_content.join('\n') %>
+ <% extra_properties.each do |property| %>
+ <%= property[:name] + ': ' + instance_eval(&property[:content]) %>
+ <% end %>
+
+
diff --git a/app/views/search/_product.rhtml b/app/views/search/_product.rhtml
deleted file mode 100644
index 0a73f7b..0000000
--- a/app/views/search/_product.rhtml
+++ /dev/null
@@ -1,85 +0,0 @@
-<% extra_content = @plugins.dispatch(:asset_product_extras, product, product.enterprise).collect { |content| instance_eval(&content) } %>
-<% extra_properties = @plugins.dispatch(:asset_product_properties, product)%>
-
-
-
-
- <%= render :partial => 'search/image', :object => product %>
-
- <% if product.available %>
- <% if product.price && product.price > 0 %>
- <% has_discount = product.discount && product.discount > 0 %>
- <% if product.price %>
-
<%=_("from") if has_discount %> <%= price_span(product.price, :class => "search-product-price " + (has_discount ? 'with-discount' : '')) %>
- <% if has_discount %>
-
<%=_("by")%> <%= price_span(product.price_with_discount, :class => "search-product-price") %>
- <% end %>
- <% if product.unit %>
-
<%= _('/') %> <%= product.unit.name %>
- <% end %>
- <% end %>
-
- <% end %>
- <% else %>
-
<%= _('Not available') %>
- <%= link_to_product product, :class => 'search-result-title' %>
-
- <%= _('Supplier') %> <%= link_to_homepage(product.enterprise.name, product.enterprise.identifier) %>
-
-
- <% if product.description %>
- <% desc_stripped = strip_tags(product.description) %>
- <%= _('Description') %> <%= excerpt(desc_stripped, desc_stripped.first(3), 300) %>
- <% end %>
-
-
-
- <% if product.enterprise.region %>
- <%= _('City') %>
-
-
- <% if product.product_qualifiers.count > 0 %>
- <%= _('Qualifiers') %>
- <% product.product_qualifiers.each do |pq| %>
- <% if pq.qualifier %>
- <%= pq.qualifier.name + (pq.certifier.nil? ? _(";") : '') %>
- <% end %>
- <% if pq.certifier %>
- <%= _('cert. ') + pq.certifier.name + _(";") %>
- <% end %>
- <% end %>
- <% end %>
-
-
-
- <%= extra_content.join('\n') %>
- <% extra_properties.each do |property| %>
- <%= property[:name] + ': ' + instance_eval(&property[:content]) %>
- <% end %>
-
-
diff --git a/app/views/search/_profile.html.erb b/app/views/search/_profile.html.erb
new file mode 100644
index 0000000..c0daf94
--- /dev/null
+++ b/app/views/search/_profile.html.erb
@@ -0,0 +1,42 @@
+
+<% if @empty_query or multiple_search? or !profile.enterprise? %>
+ <%= profile_image_link profile, :portrait, 'div',
+ @filter == 'more_recent' ? profile.send(@filter + '_label') + show_date(profile.created_at) : profile.send(@filter + '_label') %>
+<% else %>
+
+
+ <%= profile_image_link profile, :portrait, 'div' %>
+
+
+ <%= link_to_homepage(profile.name, profile.identifier, :class => "search-result-title") %>
+
+ <% if profile.description %>
+ <% body_stripped = strip_tags(profile.description) %>
+ <% elsif profile.home_page and profile.home_page.body %>
+ <% body_stripped = strip_tags(profile.home_page.body) %>
+ <% end %>
+ <%= excerpt(body_stripped, body_stripped.first(3), 200) if body_stripped %>
+
+
+ <%= _("City") %>
+ <% if profile.region %>
+ <%= city_with_state(profile.region) %>
+ <% end %>
+
+
+
+ <% profile.top_level_categorization.each do |parent, children| %>
+
+ <%= parent.name %>
+
+ <%= children.collect(&:name).join(', ') %>
+
+
+ <% end %>
+
+
+
+
+
diff --git a/app/views/search/_profile.rhtml b/app/views/search/_profile.rhtml
deleted file mode 100644
index c0daf94..0000000
--- a/app/views/search/_profile.rhtml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-<% if @empty_query or multiple_search? or !profile.enterprise? %>
- <%= profile_image_link profile, :portrait, 'div',
- @filter == 'more_recent' ? profile.send(@filter + '_label') + show_date(profile.created_at) : profile.send(@filter + '_label') %>
-<% else %>
-
-
- <%= profile_image_link profile, :portrait, 'div' %>
-
-
- <%= link_to_homepage(profile.name, profile.identifier, :class => "search-result-title") %>
-
- <% if profile.description %>
- <% body_stripped = strip_tags(profile.description) %>
- <% elsif profile.home_page and profile.home_page.body %>
- <% body_stripped = strip_tags(profile.home_page.body) %>
- <% end %>
- <%= excerpt(body_stripped, body_stripped.first(3), 200) if body_stripped %>
-
-
- <%= _("City") %>
- <% if profile.region %>
- <%= city_with_state(profile.region) %>
- <% end %>
-
-
-
- <% profile.top_level_categorization.each do |parent, children| %>
-
- <%= parent.name %>
-
- <%= children.collect(&:name).join(', ') %>
-
-
- <% end %>
-
-
-
-
-
diff --git a/app/views/search/_results_header.html.erb b/app/views/search/_results_header.html.erb
new file mode 100644
index 0000000..3449eba
--- /dev/null
+++ b/app/views/search/_results_header.html.erb
@@ -0,0 +1,21 @@
+
diff --git a/app/views/search/_results_header.rhtml b/app/views/search/_results_header.rhtml
deleted file mode 100644
index 3449eba..0000000
--- a/app/views/search/_results_header.rhtml
+++ /dev/null
@@ -1,21 +0,0 @@
-
diff --git a/app/views/search/_search_form.html.erb b/app/views/search/_search_form.html.erb
new file mode 100644
index 0000000..e298996
--- /dev/null
+++ b/app/views/search/_search_form.html.erb
@@ -0,0 +1,37 @@
+
diff --git a/app/views/search/_search_form.rhtml b/app/views/search/_search_form.rhtml
deleted file mode 100644
index e298996..0000000
--- a/app/views/search/_search_form.rhtml
+++ /dev/null
@@ -1,37 +0,0 @@
-
diff --git a/app/views/search/_sellers_form.html.erb b/app/views/search/_sellers_form.html.erb
new file mode 100644
index 0000000..c21b293
--- /dev/null
+++ b/app/views/search/_sellers_form.html.erb
@@ -0,0 +1,24 @@
+<%= title %>
+
+<% form_tag({:controller => 'search', :action => 'assets'}, {:method => 'get'}) do %>
+
+ <%= _('Search in:') %>
+
+ <%= labelled_radio_button __('Enterprises'), 'asset', 'enterprises', true %>
+
+
+
+ <%= select_city(true) %>
+
+
+
+ <%= labelled_select(_('Distance:'), 'radius', :first, :last, nil, [15, 30, 50, 100, 150, 200, 300, 400, 500, 1000].map{|n|[n, n.to_s + 'km']}) %>
+
+
+
+ <%= submit_tag _('Search'), :class => 'button with-text icon-search' %>
+
+
+<% end %>
diff --git a/app/views/search/_sellers_form.rhtml b/app/views/search/_sellers_form.rhtml
deleted file mode 100644
index c21b293..0000000
--- a/app/views/search/_sellers_form.rhtml
+++ /dev/null
@@ -1,24 +0,0 @@
-<%= title %>
-
-<% form_tag({:controller => 'search', :action => 'assets'}, {:method => 'get'}) do %>
-
- <%= _('Search in:') %>
-
- <%= labelled_radio_button __('Enterprises'), 'asset', 'enterprises', true %>
-
-
-
- <%= select_city(true) %>
-
-
-
- <%= labelled_select(_('Distance:'), 'radius', :first, :last, nil, [15, 30, 50, 100, 150, 200, 300, 400, 500, 1000].map{|n|[n, n.to_s + 'km']}) %>
-
-
-
- <%= submit_tag _('Search'), :class => 'button with-text icon-search' %>
-
-
-<% end %>
diff --git a/app/views/search/_text_article.html.erb b/app/views/search/_text_article.html.erb
new file mode 100644
index 0000000..0f1b746
--- /dev/null
+++ b/app/views/search/_text_article.html.erb
@@ -0,0 +1,13 @@
+
+ <%= link_to(text_article.title, text_article.url, :class => "search-result-title") %>
+
+
+ <%= render :partial => 'image', :object => text_article %>
+
+
+ <%= render :partial => 'article_common', :object => text_article %>
+
+ <%= render :partial => 'article_last_change', :object => text_article %>
+
+
+
diff --git a/app/views/search/_text_article.rhtml b/app/views/search/_text_article.rhtml
deleted file mode 100644
index 0f1b746..0000000
--- a/app/views/search/_text_article.rhtml
+++ /dev/null
@@ -1,13 +0,0 @@
-
- <%= link_to(text_article.title, text_article.url, :class => "search-result-title") %>
-
-
- <%= render :partial => 'image', :object => text_article %>
-
-
- <%= render :partial => 'article_common', :object => text_article %>
-
- <%= render :partial => 'article_last_change', :object => text_article %>
-
-
-
diff --git a/app/views/search/_uploaded_file.html.erb b/app/views/search/_uploaded_file.html.erb
new file mode 100644
index 0000000..b8aa1d4
--- /dev/null
+++ b/app/views/search/_uploaded_file.html.erb
@@ -0,0 +1,25 @@
+
+ <%= link_to uploaded_file.filename, uploaded_file.view_url, :class => 'search-result-title' %>
+
+
+ <%= render :partial => 'image', :object => uploaded_file %>
+
+
+
+ <%= render :partial => 'article_author', :object => uploaded_file %>
+ <%= render :partial => 'article_description', :object => uploaded_file %>
+
+ <% if uploaded_file.parent and uploaded_file.parent.published? %>
+
+ <%= uploaded_file.parent.gallery? ? _("Gallery") : _("Folder") %>
+ <%= link_to uploaded_file.parent.name, uploaded_file.parent.url %>
+
+ <% end %>
+
+ <%= render :partial => 'article_tags', :object => uploaded_file.tags %>
+ <%= render :partial => 'article_categories', :object => uploaded_file.categories %>
+
+ <%= render :partial => 'article_last_change', :object => uploaded_file %>
+
+
+
diff --git a/app/views/search/_uploaded_file.rhtml b/app/views/search/_uploaded_file.rhtml
deleted file mode 100644
index b8aa1d4..0000000
--- a/app/views/search/_uploaded_file.rhtml
+++ /dev/null
@@ -1,25 +0,0 @@
-
- <%= link_to uploaded_file.filename, uploaded_file.view_url, :class => 'search-result-title' %>
-
-
- <%= render :partial => 'image', :object => uploaded_file %>
-
-
-
- <%= render :partial => 'article_author', :object => uploaded_file %>
- <%= render :partial => 'article_description', :object => uploaded_file %>
-
- <% if uploaded_file.parent and uploaded_file.parent.published? %>
-
- <%= uploaded_file.parent.gallery? ? _("Gallery") : _("Folder") %>
- <%= link_to uploaded_file.parent.name, uploaded_file.parent.url %>
-
- <% end %>
-
- <%= render :partial => 'article_tags', :object => uploaded_file.tags %>
- <%= render :partial => 'article_categories', :object => uploaded_file.categories %>
-
- <%= render :partial => 'article_last_change', :object => uploaded_file %>
-
-
-
diff --git a/app/views/search/articles.html.erb b/app/views/search/articles.html.erb
new file mode 100644
index 0000000..ee20056
--- /dev/null
+++ b/app/views/search/articles.html.erb
@@ -0,0 +1,17 @@
+<%= search_page_title( @titles[:articles], @category ) %>
+
+
+ <% if !@empty_query %>
+ <%= facets_menu(:articles, @facets) %>
+ <% end %>
+
+
+
+ <%= render :partial => 'search_form', :locals => { :hint => _('Type the title, author or content desired') } %>
+ <%= render :partial => 'results_header' %>
+
+ <%= display_results %>
+ <%= pagination_links @results[:articles] %>
+
+
+
diff --git a/app/views/search/articles.rhtml b/app/views/search/articles.rhtml
deleted file mode 100644
index ee20056..0000000
--- a/app/views/search/articles.rhtml
+++ /dev/null
@@ -1,17 +0,0 @@
-<%= search_page_title( @titles[:articles], @category ) %>
-
-
- <% if !@empty_query %>
- <%= facets_menu(:articles, @facets) %>
- <% end %>
-
-
-
- <%= render :partial => 'search_form', :locals => { :hint => _('Type the title, author or content desired') } %>
- <%= render :partial => 'results_header' %>
-
- <%= display_results %>
- <%= pagination_links @results[:articles] %>
-
-
-
diff --git a/app/views/search/category_index.html.erb b/app/views/search/category_index.html.erb
new file mode 120000
index 0000000..3dd5e55
--- /dev/null
+++ b/app/views/search/category_index.html.erb
@@ -0,0 +1 @@
+index.rhtml
\ No newline at end of file
diff --git a/app/views/search/category_index.rhtml b/app/views/search/category_index.rhtml
deleted file mode 120000
index 3dd5e55..0000000
--- a/app/views/search/category_index.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-index.rhtml
\ No newline at end of file
diff --git a/app/views/search/communities.html.erb b/app/views/search/communities.html.erb
new file mode 100644
index 0000000..4566cf5
--- /dev/null
+++ b/app/views/search/communities.html.erb
@@ -0,0 +1,25 @@
+<%= search_page_title( @titles[:communities], @category ) %>
+
+
+ <% if logged_in? %>
+ <% button_bar do %>
+ <%# FIXME shouldn't the user create the community in the current environment instead of going to its home environment? %>
+ <%= button(:add, __('New community'), user.url.merge(:controller => 'memberships', :action => 'new_community', :profile => user.identifier)) %>
+ <% end %>
+ <% end %>
+
+ <% if !@empty_query %>
+ <%= facets_menu(:communities, @facets) %>
+ <% end %>
+
+
+
+ <%= render :partial => 'search_form', :locals => { :hint => _("Type words about the community you're looking for") } %>
+ <%= render :partial => 'results_header' %>
+
+ <%= display_results %>
+ <%= pagination_links @results.values.first %>
+
+
+
+
diff --git a/app/views/search/communities.rhtml b/app/views/search/communities.rhtml
deleted file mode 100644
index 4566cf5..0000000
--- a/app/views/search/communities.rhtml
+++ /dev/null
@@ -1,25 +0,0 @@
-<%= search_page_title( @titles[:communities], @category ) %>
-
-
- <% if logged_in? %>
- <% button_bar do %>
- <%# FIXME shouldn't the user create the community in the current environment instead of going to its home environment? %>
- <%= button(:add, __('New community'), user.url.merge(:controller => 'memberships', :action => 'new_community', :profile => user.identifier)) %>
- <% end %>
- <% end %>
-
- <% if !@empty_query %>
- <%= facets_menu(:communities, @facets) %>
- <% end %>
-
-
-
- <%= render :partial => 'search_form', :locals => { :hint => _("Type words about the community you're looking for") } %>
- <%= render :partial => 'results_header' %>
-
- <%= display_results %>
- <%= pagination_links @results.values.first %>
-
-
-
-
diff --git a/app/views/search/contents.html.erb b/app/views/search/contents.html.erb
new file mode 120000
index 0000000..3015e62
--- /dev/null
+++ b/app/views/search/contents.html.erb
@@ -0,0 +1 @@
+articles.rhtml
\ No newline at end of file
diff --git a/app/views/search/contents.rhtml b/app/views/search/contents.rhtml
deleted file mode 120000
index 3015e62..0000000
--- a/app/views/search/contents.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-articles.rhtml
\ No newline at end of file
diff --git a/app/views/search/enterprises.html.erb b/app/views/search/enterprises.html.erb
new file mode 100644
index 0000000..e8bfedf
--- /dev/null
+++ b/app/views/search/enterprises.html.erb
@@ -0,0 +1,28 @@
+<%= search_page_title( @titles[:enterprises], @category ) %>
+
+
+ <% if logged_in? && environment.enabled?('enterprise_registration') %>
+ <% button_bar do %>
+ <%= button(:add, __('New enterprise'), {:controller => 'enterprise_registration'}) %>
+ <% end %>
+ <% end %>
+
+ <% if !@empty_query %>
+ <% button_bar do %>
+ <%= display_map_list_button %>
+ <% end %>
+ <%= facets_menu(:enterprises, @facets) %>
+ <% end %>
+
+
+
+ <%= render :partial => 'search_form', :locals => { :hint => _("Type words about the enterprise you're looking for") } %>
+ <%= render :partial => 'results_header' %>
+
+ <%= display_results(true) %>
+ <% if params[:display] != 'map' %>
+ <%= pagination_links @results[:enterprises] %>
+ <% end %>
+
+
+
diff --git a/app/views/search/enterprises.rhtml b/app/views/search/enterprises.rhtml
deleted file mode 100644
index e8bfedf..0000000
--- a/app/views/search/enterprises.rhtml
+++ /dev/null
@@ -1,28 +0,0 @@
-<%= search_page_title( @titles[:enterprises], @category ) %>
-
-
- <% if logged_in? && environment.enabled?('enterprise_registration') %>
- <% button_bar do %>
- <%= button(:add, __('New enterprise'), {:controller => 'enterprise_registration'}) %>
- <% end %>
- <% end %>
-
- <% if !@empty_query %>
- <% button_bar do %>
- <%= display_map_list_button %>
- <% end %>
- <%= facets_menu(:enterprises, @facets) %>
- <% end %>
-
-
-
- <%= render :partial => 'search_form', :locals => { :hint => _("Type words about the enterprise you're looking for") } %>
- <%= render :partial => 'results_header' %>
-
- <%= display_results(true) %>
- <% if params[:display] != 'map' %>
- <%= pagination_links @results[:enterprises] %>
- <% end %>
-
-
-
diff --git a/app/views/search/events.html.erb b/app/views/search/events.html.erb
new file mode 100644
index 0000000..133ae77
--- /dev/null
+++ b/app/views/search/events.html.erb
@@ -0,0 +1,3 @@
+<%= search_page_title( Environment.default.name + "'s " + @titles[:events], @category ) %>
+
+<%= render :partial => 'events/agenda' %>
diff --git a/app/views/search/events.rhtml b/app/views/search/events.rhtml
deleted file mode 100644
index 133ae77..0000000
--- a/app/views/search/events.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= search_page_title( Environment.default.name + "'s " + @titles[:events], @category ) %>
-
-<%= render :partial => 'events/agenda' %>
diff --git a/app/views/search/facets_browse.html.erb b/app/views/search/facets_browse.html.erb
new file mode 100644
index 0000000..7178788
--- /dev/null
+++ b/app/views/search/facets_browse.html.erb
@@ -0,0 +1,8 @@
+<% results = @asset_class.map_facet_results(@facet, params[:facet], @facets, @all_facets) %>
+
+<% array = [] %>
+<% @asset_class.facet_result_sort(@facet, results, :alphabetically).each do |id, label, count| %>
+ <% array << {:id => id, :name => facet_link_html(@facet, params.merge(:controller => 'search', :action => @asset), id, label, count)} %>
+<% end %>
+
+<%= facet_javascript('facet-input-'+@facet[:id].to_s, @facet, array) %>
diff --git a/app/views/search/facets_browse.rhtml b/app/views/search/facets_browse.rhtml
deleted file mode 100644
index 7178788..0000000
--- a/app/views/search/facets_browse.rhtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<% results = @asset_class.map_facet_results(@facet, params[:facet], @facets, @all_facets) %>
-
-<% array = [] %>
-<% @asset_class.facet_result_sort(@facet, results, :alphabetically).each do |id, label, count| %>
- <% array << {:id => id, :name => facet_link_html(@facet, params.merge(:controller => 'search', :action => @asset), id, label, count)} %>
-<% end %>
-
-<%= facet_javascript('facet-input-'+@facet[:id].to_s, @facet, array) %>
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
new file mode 100644
index 0000000..7b2ee19
--- /dev/null
+++ b/app/views/search/index.html.erb
@@ -0,0 +1,29 @@
+">
+
+ <% if @category %>
+
<%= image_tag(@category.image.public_filename(:thumb), :id => 'category-image') if @category.image %>
+ <% end %>
+
+ <%= search_page_title(_('Search Results'), @category) %>
+ <%= render :partial => 'search_form', :locals => { :hint => '' } %>
+ <%= category_context(@category, params) %>
+ <%= display_results %>
+
+
+ <% if @category %>
+
<%= _('Sub-categories') %>
+ <% if @category.children.empty? %>
+
<%= _('No sub-categories') %>
+ <% else %>
+
+ <% @category.children.each do |c| %>
+ <%= link_to_category c, false %>
+ <% end %>
+
+ <% end %>
+ <% end %>
+
+
+
diff --git a/app/views/search/index.rhtml b/app/views/search/index.rhtml
deleted file mode 100644
index 7b2ee19..0000000
--- a/app/views/search/index.rhtml
+++ /dev/null
@@ -1,29 +0,0 @@
-">
-
- <% if @category %>
-
<%= image_tag(@category.image.public_filename(:thumb), :id => 'category-image') if @category.image %>
- <% end %>
-
- <%= search_page_title(_('Search Results'), @category) %>
- <%= render :partial => 'search_form', :locals => { :hint => '' } %>
- <%= category_context(@category, params) %>
- <%= display_results %>
-
-
- <% if @category %>
-
<%= _('Sub-categories') %>
- <% if @category.children.empty? %>
-
<%= _('No sub-categories') %>
- <% else %>
-
- <% @category.children.each do |c| %>
- <%= link_to_category c, false %>
- <% end %>
-
- <% end %>
- <% end %>
-
-
-
diff --git a/app/views/search/people.html.erb b/app/views/search/people.html.erb
new file mode 100644
index 0000000..adb29fd
--- /dev/null
+++ b/app/views/search/people.html.erb
@@ -0,0 +1,19 @@
+<%= search_page_title( @titles[:people], @category ) %>
+
+
+ <% if !@empty_query %>
+ <%= facets_menu(:people, @facets) %>
+ <% end %>
+
+
+
+ <%= render :partial => 'search_form', :locals => { :hint => _("Type words about the person you're looking for") } %>
+ <%= render :partial => 'results_header' %>
+
+ <%= display_results %>
+ <% if params[:display] != 'map' %>
+ <%= pagination_links @results.values.first %>
+ <% end %>
+
+
+
diff --git a/app/views/search/people.rhtml b/app/views/search/people.rhtml
deleted file mode 100644
index adb29fd..0000000
--- a/app/views/search/people.rhtml
+++ /dev/null
@@ -1,19 +0,0 @@
-<%= search_page_title( @titles[:people], @category ) %>
-
-
- <% if !@empty_query %>
- <%= facets_menu(:people, @facets) %>
- <% end %>
-
-
-
- <%= render :partial => 'search_form', :locals => { :hint => _("Type words about the person you're looking for") } %>
- <%= render :partial => 'results_header' %>
-
- <%= display_results %>
- <% if params[:display] != 'map' %>
- <%= pagination_links @results.values.first %>
- <% end %>
-
-
-
diff --git a/app/views/search/products.html.erb b/app/views/search/products.html.erb
new file mode 100644
index 0000000..74e8f02
--- /dev/null
+++ b/app/views/search/products.html.erb
@@ -0,0 +1,26 @@
+<%= search_page_title( @titles[:products], @category ) %>
+
+
+ <% if !@empty_query %>
+ <% button_bar do %>
+ <%= display_map_list_button %>
+<% end %>
+ <%= facets_menu(:products, @facets) %>
+<% end %>
+
+
+
+ <%= render :partial => 'search_form', :locals => { :hint => _('Type the product, service, city or qualifier desired') } %>
+ <%= render :partial => 'results_header' %>
+
+ <%= display_results(true) %>
+ <% if !@one_page and params[:display] != 'map' %>
+ <%= pagination_links @results[:products] %>
+<% end %>
+
+
+<% javascript_tag do %>
+ jQuery('.search-product-price-details').altBeautify();
+<% end %>
+
+
diff --git a/app/views/search/products.rhtml b/app/views/search/products.rhtml
deleted file mode 100644
index 74e8f02..0000000
--- a/app/views/search/products.rhtml
+++ /dev/null
@@ -1,26 +0,0 @@
-<%= search_page_title( @titles[:products], @category ) %>
-
-
- <% if !@empty_query %>
- <% button_bar do %>
- <%= display_map_list_button %>
-<% end %>
- <%= facets_menu(:products, @facets) %>
-<% end %>
-
-
-
- <%= render :partial => 'search_form', :locals => { :hint => _('Type the product, service, city or qualifier desired') } %>
- <%= render :partial => 'results_header' %>
-
- <%= display_results(true) %>
- <% if !@one_page and params[:display] != 'map' %>
- <%= pagination_links @results[:products] %>
-<% end %>
-
-
-<% javascript_tag do %>
- jQuery('.search-product-price-details').altBeautify();
-<% end %>
-
-
diff --git a/app/views/search/tag.html.erb b/app/views/search/tag.html.erb
new file mode 100644
index 0000000..2540146
--- /dev/null
+++ b/app/views/search/tag.html.erb
@@ -0,0 +1,13 @@
+
+ <%= _('Tagged with "%s"') % content_tag('code', @tag) %>
+
+
+<% button_bar do %>
+ <%= button('back', _('Back to tag cloud'), :action => 'tags') %>
+<% end %>
+
+<% cache_timeout(@tag_cache_key, 4.hour) do %>
+ <%= display_results %>
+
+
+<% end %>
diff --git a/app/views/search/tag.rhtml b/app/views/search/tag.rhtml
deleted file mode 100644
index 2540146..0000000
--- a/app/views/search/tag.rhtml
+++ /dev/null
@@ -1,13 +0,0 @@
-
- <%= _('Tagged with "%s"') % content_tag('code', @tag) %>
-
-
-<% button_bar do %>
- <%= button('back', _('Back to tag cloud'), :action => 'tags') %>
-<% end %>
-
-<% cache_timeout(@tag_cache_key, 4.hour) do %>
- <%= display_results %>
-
-
-<% end %>
diff --git a/app/views/search/tags.html.erb b/app/views/search/tags.html.erb
new file mode 100644
index 0000000..03b2995
--- /dev/null
+++ b/app/views/search/tags.html.erb
@@ -0,0 +1,7 @@
+<%= _('Tag cloud') %>
+
+
+<% cache_timeout(@tags_cache_key, 4.hour) do %>
+ <%= tag_cloud @tags, :tag, {:action => 'tag'}, {:show_count => true} %>
+<% end %>
+
diff --git a/app/views/search/tags.rhtml b/app/views/search/tags.rhtml
deleted file mode 100644
index 03b2995..0000000
--- a/app/views/search/tags.rhtml
+++ /dev/null
@@ -1,7 +0,0 @@
-<%= _('Tag cloud') %>
-
-
-<% cache_timeout(@tags_cache_key, 4.hour) do %>
- <%= tag_cloud @tags, :tag, {:action => 'tag'}, {:show_count => true} %>
-<% end %>
-
diff --git a/app/views/shared/_change_image.html.erb b/app/views/shared/_change_image.html.erb
new file mode 100644
index 0000000..3298b12
--- /dev/null
+++ b/app/views/shared/_change_image.html.erb
@@ -0,0 +1,5 @@
+ <%= i.file_field( :uploaded_data, { :onchange => 'updateImg(this.value)' } ) %>
+ <%= link_to_function(_('Cancel'), nil, :id => 'cancel-change-image-link', :class => 'button icon-cancel with-text', :style => 'display: none') do |page|
+ page['change-image-link'].show
+ page['change-image'].replace_html ''
+ end %>
diff --git a/app/views/shared/_change_image.rhtml b/app/views/shared/_change_image.rhtml
deleted file mode 100644
index 3298b12..0000000
--- a/app/views/shared/_change_image.rhtml
+++ /dev/null
@@ -1,5 +0,0 @@
- <%= i.file_field( :uploaded_data, { :onchange => 'updateImg(this.value)' } ) %>
- <%= link_to_function(_('Cancel'), nil, :id => 'cancel-change-image-link', :class => 'button icon-cancel with-text', :style => 'display: none') do |page|
- page['change-image-link'].show
- page['change-image'].replace_html ''
- end %>
diff --git a/app/views/shared/_dialog_error_messages.html.erb b/app/views/shared/_dialog_error_messages.html.erb
new file mode 100644
index 0000000..8774086
--- /dev/null
+++ b/app/views/shared/_dialog_error_messages.html.erb
@@ -0,0 +1,12 @@
+<% javascript_tag do %>
+ close_loading()
+ jQuery('#errorExplanation h2').hide()
+ jQuery('#errorExplanation p').hide()
+ jQuery('#errorExplanation').dialog({
+ modal: true,
+ width: 600,
+ resizable: false,
+ title: "<%= ui_icon('ui-icon-alert') %>Ops…",
+ });
+<% end %>
+<%= error_messages_for object_name %>
diff --git a/app/views/shared/_dialog_error_messages.rhtml b/app/views/shared/_dialog_error_messages.rhtml
deleted file mode 100644
index 8774086..0000000
--- a/app/views/shared/_dialog_error_messages.rhtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<% javascript_tag do %>
- close_loading()
- jQuery('#errorExplanation h2').hide()
- jQuery('#errorExplanation p').hide()
- jQuery('#errorExplanation').dialog({
- modal: true,
- width: 600,
- resizable: false,
- title: "<%= ui_icon('ui-icon-alert') %>Ops…",
- });
-<% end %>
-<%= error_messages_for object_name %>
diff --git a/app/views/shared/_disabled_enterprise.html.erb b/app/views/shared/_disabled_enterprise.html.erb
new file mode 100644
index 0000000..aa6f177
--- /dev/null
+++ b/app/views/shared/_disabled_enterprise.html.erb
@@ -0,0 +1,10 @@
+<% if profile.enterprise? && !profile.enabled? && !profile.blocks.select {|b| b.class == DisabledEnterpriseMessageBlock}.any? %>
+
+ <%= environment.message_for_disabled_enterprise %>
+ <% if profile.blocked? && user && user.is_admin?(profile.environment) %>
+
+ <%= button :lock, _('Unblock'), {:controller => 'profile', :action => 'unblock'} %>
+
+ <% end %>
+
- <%= environment.message_for_disabled_enterprise %>
- <% if profile.blocked? && user && user.is_admin?(profile.environment) %>
-
- <%= button :lock, _('Unblock'), {:controller => 'profile', :action => 'unblock'} %>
-
- <% end %>
-
<%= _('Used when a short version of your text is needed.') %>
+
+
+ <% if f %>
+ <%= labelled_form_field(_(abstract_label), f.text_area(abstract_method, :style => 'width: 98%; height: 200px;', :class => editor_type)) %>
+ <% else %>
+ <%= labelled_form_field(_(abstract_label), text_area(object, abstract_method, :style => 'width: 98%; height: 200px;', :class => editor_type)) %>
+ <% end %>
+
+
+ <% if f %>
+ <%= labelled_form_field(_(body_label), f.text_area(body_method, :style => 'width: 98%; height: 400px;', :class => editor_type)) %>
+ <% else %>
+ <%= labelled_form_field(_(body_label), text_area(object, body_method, :style => 'width: 98%; height: 400px;', :class => editor_type)) %>
+ <% end %>
+
+
+<%= javascript_include_tag 'article'%>
diff --git a/app/views/shared/_lead_and_body.rhtml b/app/views/shared/_lead_and_body.rhtml
deleted file mode 100644
index ad5ed41..0000000
--- a/app/views/shared/_lead_and_body.rhtml
+++ /dev/null
@@ -1,29 +0,0 @@
-<% object ||= :article %>
-<% abstract_label ||= 'Lead' %>
-<% abstract_method ||= :abstract %>
-<% body_label ||= 'Text' %>
-<% body_method ||= :body %>
-<% editor_type = defined?(tiny_mce) && tiny_mce ? 'mceEditor' : '' %>
-<% lead_id ||= 0%>
-<% f ||= false%>
-
-<%= _('Used when a short version of your text is needed.') %>
-
-
- <% if f %>
- <%= labelled_form_field(_(abstract_label), f.text_area(abstract_method, :style => 'width: 98%; height: 200px;', :class => editor_type)) %>
- <% else %>
- <%= labelled_form_field(_(abstract_label), text_area(object, abstract_method, :style => 'width: 98%; height: 200px;', :class => editor_type)) %>
- <% end %>
-
-
- <% if f %>
- <%= labelled_form_field(_(body_label), f.text_area(body_method, :style => 'width: 98%; height: 400px;', :class => editor_type)) %>
- <% else %>
- <%= labelled_form_field(_(body_label), text_area(object, body_method, :style => 'width: 98%; height: 400px;', :class => editor_type)) %>
- <% end %>
-
-
-<%= javascript_include_tag 'article'%>
diff --git a/app/views/shared/_manage_enterprises.html.erb b/app/views/shared/_manage_enterprises.html.erb
new file mode 100644
index 0000000..5e4a895
--- /dev/null
+++ b/app/views/shared/_manage_enterprises.html.erb
@@ -0,0 +1,8 @@
+
+
+
+
diff --git a/app/views/shared/_manage_enterprises.rhtml b/app/views/shared/_manage_enterprises.rhtml
deleted file mode 100644
index 5e4a895..0000000
--- a/app/views/shared/_manage_enterprises.rhtml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/app/views/shared/_numbers_only_javascript.html.erb b/app/views/shared/_numbers_only_javascript.html.erb
new file mode 100644
index 0000000..6d77641
--- /dev/null
+++ b/app/views/shared/_numbers_only_javascript.html.erb
@@ -0,0 +1,6 @@
+<% javascript_tag do %>
+ jQuery(".numbers-only").keypress(function(event) {
+ var separator = "<%= environment.currency_separator %>"
+ return numbersonly(event, separator)
+ });
+<% end %>
diff --git a/app/views/shared/_numbers_only_javascript.rhtml b/app/views/shared/_numbers_only_javascript.rhtml
deleted file mode 100644
index 6d77641..0000000
--- a/app/views/shared/_numbers_only_javascript.rhtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<% javascript_tag do %>
- jQuery(".numbers-only").keypress(function(event) {
- var separator = "<%= environment.currency_separator %>"
- return numbersonly(event, separator)
- });
-<% end %>
diff --git a/app/views/shared/_organization_custom_fields.html.erb b/app/views/shared/_organization_custom_fields.html.erb
new file mode 100644
index 0000000..893a666
--- /dev/null
+++ b/app/views/shared/_organization_custom_fields.html.erb
@@ -0,0 +1,29 @@
+<%= optional_field(profile, 'display_name', f.text_field(:display_name)) %>
+<% if profile.enterprise? %>
+ <%= optional_field(profile, 'business_name', f.text_field(:business_name)) %>
+<% end %>
+<%= optional_field(profile, 'description', f.text_area(:description, :rows => 5)) %>
+<%= optional_field(profile, 'contact_person', f.text_field(:contact_person)) %>
+<%= optional_field(profile, 'contact_email', f.text_field(:contact_email)) %>
+<%= optional_field(profile, 'contact_phone', f.text_field(:contact_phone)) %>
+<%= optional_field(profile, 'legal_form', f.text_field(:legal_form)) %>
+<%= optional_field(profile, 'economic_activity', f.text_field(:economic_activity)) %>
+<%= optional_field(profile, 'management_information', f.text_area(:management_information, :rows => 5)) %>
+<%= optional_field(profile, 'address', labelled_form_field(_('Address (street and number)'), text_field(object_name, :address))) %>
+<%= optional_field(profile, 'zip_code', labelled_form_field(_('ZIP code'), text_field(object_name, :zip_code))) %>
+<%= optional_field(profile, 'city', f.text_field(:city)) %>
+<%= optional_field(profile, 'state', f.text_field(:state)) %>
+<%= optional_field(profile, 'country', select_country(_('Country'), object_name, 'country', {:class => 'type-select'})) %>
+<%= optional_field(profile, 'tag_list', f.text_field(:tag_list)) %>
+
+<% if profile.community? %>
+ <%= optional_field(profile, 'language', f.text_field(:language)) %>
+<% end %>
+
+<% if profile.enterprise? %>
+ <%= optional_field(profile, 'organization_website', f.text_field(:organization_website)) %>
+ <%= optional_field(profile, 'historic_and_current_context', f.text_area(:historic_and_current_context, :rows => 5)) %>
+ <%= optional_field(profile, 'activities_short_description', f.text_area(:activities_short_description, :rows => 5)) %>
+ <%= optional_field(profile, 'acronym', f.text_field(:acronym)) %>
+ <%= optional_field(profile, 'foundation_year', f.text_field(:foundation_year)) %>
+<% end %>
diff --git a/app/views/shared/_organization_custom_fields.rhtml b/app/views/shared/_organization_custom_fields.rhtml
deleted file mode 100644
index 893a666..0000000
--- a/app/views/shared/_organization_custom_fields.rhtml
+++ /dev/null
@@ -1,29 +0,0 @@
-<%= optional_field(profile, 'display_name', f.text_field(:display_name)) %>
-<% if profile.enterprise? %>
- <%= optional_field(profile, 'business_name', f.text_field(:business_name)) %>
-<% end %>
-<%= optional_field(profile, 'description', f.text_area(:description, :rows => 5)) %>
-<%= optional_field(profile, 'contact_person', f.text_field(:contact_person)) %>
-<%= optional_field(profile, 'contact_email', f.text_field(:contact_email)) %>
-<%= optional_field(profile, 'contact_phone', f.text_field(:contact_phone)) %>
-<%= optional_field(profile, 'legal_form', f.text_field(:legal_form)) %>
-<%= optional_field(profile, 'economic_activity', f.text_field(:economic_activity)) %>
-<%= optional_field(profile, 'management_information', f.text_area(:management_information, :rows => 5)) %>
-<%= optional_field(profile, 'address', labelled_form_field(_('Address (street and number)'), text_field(object_name, :address))) %>
-<%= optional_field(profile, 'zip_code', labelled_form_field(_('ZIP code'), text_field(object_name, :zip_code))) %>
-<%= optional_field(profile, 'city', f.text_field(:city)) %>
-<%= optional_field(profile, 'state', f.text_field(:state)) %>
-<%= optional_field(profile, 'country', select_country(_('Country'), object_name, 'country', {:class => 'type-select'})) %>
-<%= optional_field(profile, 'tag_list', f.text_field(:tag_list)) %>
-
-<% if profile.community? %>
- <%= optional_field(profile, 'language', f.text_field(:language)) %>
-<% end %>
-
-<% if profile.enterprise? %>
- <%= optional_field(profile, 'organization_website', f.text_field(:organization_website)) %>
- <%= optional_field(profile, 'historic_and_current_context', f.text_area(:historic_and_current_context, :rows => 5)) %>
- <%= optional_field(profile, 'activities_short_description', f.text_area(:activities_short_description, :rows => 5)) %>
- <%= optional_field(profile, 'acronym', f.text_field(:acronym)) %>
- <%= optional_field(profile, 'foundation_year', f.text_field(:foundation_year)) %>
-<% end %>
diff --git a/app/views/shared/_profile_search_form.html.erb b/app/views/shared/_profile_search_form.html.erb
new file mode 100644
index 0000000..9823e4e
--- /dev/null
+++ b/app/views/shared/_profile_search_form.html.erb
@@ -0,0 +1,12 @@
+<% form_tag( { :controller => 'profile_search', :profile => profile.identifier}, :method => 'get', :class => 'search_form' ) do %>
+
+
+ <%= text_field_tag 'q', @q, :title => _("Find in %s's content") % profile.short_name %>
+
+ <%= submit_button(:search, _('Search')) %>
+
+ <%= labelled_radio_button profile.short_name, 'where', 'profile', true, :title => _("Find in %s's content") % profile.short_name %>
+ <%= labelled_radio_button _('General'), 'where', 'environment', false, :title => _("Search all content") %>
+
+
-
- <%= text_field_tag 'q', @q, :title => _("Find in %s's content") % profile.short_name %>
-
- <%= submit_button(:search, _('Search')) %>
-
- <%= labelled_radio_button profile.short_name, 'where', 'profile', true, :title => _("Find in %s's content") % profile.short_name %>
- <%= labelled_radio_button _('General'), 'where', 'environment', false, :title => _("Search all content") %>
-
-
+<% if !@current_category.nil? %>
+
<%= _('Current category:') %>
+ <%= hidden_field_tag "#{object_name}[#{object_name}_category_id]", @current_category.id unless multiple %>
+ <%
+ categories = [@current_category]
+ categories.push(@current_category) while @current_category = @current_category.parent
+ %>
+ <%= categories.compact.reverse.map{|i|
+ link_to_remote(i.name,
+ :update => "select-categories",
+ :url => { :action => 'update_categories', :category_id => i.id, :id => @object },
+ :loaded => visual_effect(:highlight, "select-categories"),
+ :class => 'select-current-category-link')}.join(' → ')
+ %>
+
+ <%= button_to_function_without_text(:save, _('Save'), nil, :id => 'save-category-button') do |page|
+ page.insert_html :bottom, 'selected-categories', content_tag('li', categories.first.full_name +
+ hidden_field_tag("#{object_name}[category_ids][]", categories.first.id) +
+ button_to_function_without_text(:cancel, _('Remove'), nil, :id => "remove-selected-category-#{categories.first.id}-button") {|page| page["selected-category-#{categories.first.id}"].remove}, :id => "selected-category-#{categories.first.id}")
+ end if multiple %>
+ <%= button_to_remote_without_text(:cancel, _('Cancel'),
+ { :update => "select-categories",
+ :url => { :action => 'update_categories', :id => @object },
+ :loaded => visual_effect(:highlight, "select-categories")
+ },
+ :id => 'cancel-category-button') %>
+
+<% else %>
+ <%= _('Select a category:') %>
+<% end %>
+
+<% if !@categories.empty? %>
+ <%= _('Categories:') %>
+ <% @categories.select{|i| !@object.respond_to?(:accept_category?) || @object.accept_category?(i)}.each do |category| %>
+ <%= link_to_remote category.name,
+ { :update => "select-categories",
+ :url => { :action => "update_categories", :category_id => category.id, :id => @object},
+ :loaded => visual_effect(:highlight, "select-categories")
+ },
+ :class => 'select-subcategory-link',
+ :id => "select-category-#{category.id}-link"
+ %>
+ <% end %>
+<% end %>
+
diff --git a/app/views/shared/_select_categories.rhtml b/app/views/shared/_select_categories.rhtml
deleted file mode 100644
index 6da992e..0000000
--- a/app/views/shared/_select_categories.rhtml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-<% if !@current_category.nil? %>
-
<%= _('Current category:') %>
- <%= hidden_field_tag "#{object_name}[#{object_name}_category_id]", @current_category.id unless multiple %>
- <%
- categories = [@current_category]
- categories.push(@current_category) while @current_category = @current_category.parent
- %>
- <%= categories.compact.reverse.map{|i|
- link_to_remote(i.name,
- :update => "select-categories",
- :url => { :action => 'update_categories', :category_id => i.id, :id => @object },
- :loaded => visual_effect(:highlight, "select-categories"),
- :class => 'select-current-category-link')}.join(' → ')
- %>
-
- <%= button_to_function_without_text(:save, _('Save'), nil, :id => 'save-category-button') do |page|
- page.insert_html :bottom, 'selected-categories', content_tag('li', categories.first.full_name +
- hidden_field_tag("#{object_name}[category_ids][]", categories.first.id) +
- button_to_function_without_text(:cancel, _('Remove'), nil, :id => "remove-selected-category-#{categories.first.id}-button") {|page| page["selected-category-#{categories.first.id}"].remove}, :id => "selected-category-#{categories.first.id}")
- end if multiple %>
- <%= button_to_remote_without_text(:cancel, _('Cancel'),
- { :update => "select-categories",
- :url => { :action => 'update_categories', :id => @object },
- :loaded => visual_effect(:highlight, "select-categories")
- },
- :id => 'cancel-category-button') %>
-
-<% else %>
- <%= _('Select a category:') %>
-<% end %>
-
-<% if !@categories.empty? %>
- <%= _('Categories:') %>
- <% @categories.select{|i| !@object.respond_to?(:accept_category?) || @object.accept_category?(i)}.each do |category| %>
- <%= link_to_remote category.name,
- { :update => "select-categories",
- :url => { :action => "update_categories", :category_id => category.id, :id => @object},
- :loaded => visual_effect(:highlight, "select-categories")
- },
- :class => 'select-subcategory-link',
- :id => "select-category-#{category.id}-link"
- %>
- <% end %>
-<% end %>
-
diff --git a/app/views/shared/_show_thumbnail.html.erb b/app/views/shared/_show_thumbnail.html.erb
new file mode 100644
index 0000000..a4f05e6
--- /dev/null
+++ b/app/views/shared/_show_thumbnail.html.erb
@@ -0,0 +1,11 @@
+ <%= image_tag(image.public_filename(:thumb)) %>
+
+
+
+
<%= @title || _('Access denied') %>
+
+ <% unless @message.nil? %>
+
<%= @message %>
+ <% else %>
+
<%= _('You are not allowed to view this page.') %>
+
<%= _("If you are supposed to have access to this area, you'll probably want to talk to the people responsible and ask them to give you access.") %>
+ <% end %>
+
+ <% button_bar do %>
+ <%= button :back, _('Go back'), :back %>
+ <%= button :home, _('Go to the site home page'), :controller => 'home' %>
+ <% end %>
+
+
+
-
-
<%= @title || _('Access denied') %>
-
- <% unless @message.nil? %>
-
<%= @message %>
- <% else %>
-
<%= _('You are not allowed to view this page.') %>
-
<%= _("If you are supposed to have access to this area, you'll probably want to talk to the people responsible and ask them to give you access.") %>
- <% end %>
-
- <% button_bar do %>
- <%= button :back, _('Go back'), :back %>
- <%= button :home, _('Go to the site home page'), :controller => 'home' %>
- <% end %>
-
-
-
+
+
+ <%= _('Title') %>
+ <%= _('Last update') %>
+
+ <% articles.each do |article| %>
+ <% if article.display_to?(user) %>
+ <%= display_article_in_listing(article, recursive, 0) %>
+ <% end %>
+ <% end %>
+
+
+<%= pagination_links(articles, {:param_name => 'npage', :page_links => true}) %>
diff --git a/app/views/shared/articles_list.rhtml b/app/views/shared/articles_list.rhtml
deleted file mode 100644
index 089a36d..0000000
--- a/app/views/shared/articles_list.rhtml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- <%= _('Title') %>
- <%= _('Last update') %>
-
- <% articles.each do |article| %>
- <% if article.display_to?(user) %>
- <%= display_article_in_listing(article, recursive, 0) %>
- <% end %>
- <% end %>
-
-
-<%= pagination_links(articles, {:param_name => 'npage', :page_links => true}) %>
diff --git a/app/views/shared/assets_menu.html.erb b/app/views/shared/assets_menu.html.erb
new file mode 100644
index 0000000..52c45ee
--- /dev/null
+++ b/app/views/shared/assets_menu.html.erb
@@ -0,0 +1,9 @@
+
diff --git a/app/views/shared/assets_menu.rhtml b/app/views/shared/assets_menu.rhtml
deleted file mode 100644
index 52c45ee..0000000
--- a/app/views/shared/assets_menu.rhtml
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/app/views/shared/block.html.erb b/app/views/shared/block.html.erb
new file mode 100644
index 0000000..1964b48
--- /dev/null
+++ b/app/views/shared/block.html.erb
@@ -0,0 +1,7 @@
+<% if block.cacheable? && use_cache %>
+ <% cache_timeout(block.cache_key(language), block.timeout) do %>
+ <%= display_block_content(block, user, main_content) %>
+ <% end %>
+<% else %>
+ <%= display_block_content(block, user, main_content) %>
+<% end %>
diff --git a/app/views/shared/block.rhtml b/app/views/shared/block.rhtml
deleted file mode 100644
index 1964b48..0000000
--- a/app/views/shared/block.rhtml
+++ /dev/null
@@ -1,7 +0,0 @@
-<% if block.cacheable? && use_cache %>
- <% cache_timeout(block.cache_key(language), block.timeout) do %>
- <%= display_block_content(block, user, main_content) %>
- <% end %>
-<% else %>
- <%= display_block_content(block, user, main_content) %>
-<% end %>
diff --git a/app/views/shared/categories_menu.html.erb b/app/views/shared/categories_menu.html.erb
new file mode 100644
index 0000000..763190f
--- /dev/null
+++ b/app/views/shared/categories_menu.html.erb
@@ -0,0 +1,12 @@
+
diff --git a/app/views/shared/categories_menu.rhtml b/app/views/shared/categories_menu.rhtml
deleted file mode 100644
index 763190f..0000000
--- a/app/views/shared/categories_menu.rhtml
+++ /dev/null
@@ -1,12 +0,0 @@
-
diff --git a/app/views/shared/codepress.html.erb b/app/views/shared/codepress.html.erb
new file mode 100644
index 0000000..ac6ee22
--- /dev/null
+++ b/app/views/shared/codepress.html.erb
@@ -0,0 +1 @@
+<%= javascript_include_tag 'codepress/codepress' %>
diff --git a/app/views/shared/codepress.rhtml b/app/views/shared/codepress.rhtml
deleted file mode 100644
index ac6ee22..0000000
--- a/app/views/shared/codepress.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-<%= javascript_include_tag 'codepress/codepress' %>
diff --git a/app/views/shared/logged_in/xmpp_chat.html.erb b/app/views/shared/logged_in/xmpp_chat.html.erb
new file mode 100644
index 0000000..7463bd3
--- /dev/null
+++ b/app/views/shared/logged_in/xmpp_chat.html.erb
@@ -0,0 +1,11 @@
+
+
+
+
+
<%= _('None of your friends is online at the moment') %>
+
+
+
+
+
+
-
-
-
-
<%= _('None of your friends is online at the moment') %>
-
-
-
-
-
-
+
<%= _('There is no such page: %s') % (content_tag('tt', @path)) %>
+
+ <%= _('You may have clicked an expired link or mistyped the address.') %>
+ <%= _('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.') %>
+
+ <% button_bar do %>
+ <%= button :back, _('Go back'), :back %>
+ <%= button :home, _('Go to the home page'), '/' %>
+ <% end %>
+
-
<%= _('There is no such page: %s') % (content_tag('tt', @path)) %>
-
- <%= _('You may have clicked an expired link or mistyped the address.') %>
- <%= _('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.') %>
-
- <% button_bar do %>
- <%= button :back, _('Go back'), :back %>
- <%= button :home, _('Go to the home page'), '/' %>
- <% end %>
-
<%= pq.qualifier.name + (pq.certifier.nil? ? _(";") : '') %>
+ <% end %>
+ <% if pq.certifier %>
+ <%= _('cert. ') + pq.certifier.name + _(";") %>
+ <% end %>
+
+
+<% end %>
diff --git a/app/views/shared/product/_qualifiers.rhtml b/app/views/shared/product/_qualifiers.rhtml
deleted file mode 100644
index 8ed9885..0000000
--- a/app/views/shared/product/_qualifiers.rhtml
+++ /dev/null
@@ -1,10 +0,0 @@
-<% product.product_qualifiers.each do |pq| %>
- <% if pq.qualifier %>
- <%= pq.qualifier.name + (pq.certifier.nil? ? _(";") : '') %>
- <% end %>
- <% if pq.certifier %>
- <%= _('cert. ') + pq.certifier.name + _(";") %>
- <% end %>
-
-
-<% end %>
diff --git a/app/views/shared/profile_actions/xmpp_chat.html.erb b/app/views/shared/profile_actions/xmpp_chat.html.erb
new file mode 100644
index 0000000..88a659b
--- /dev/null
+++ b/app/views/shared/profile_actions/xmpp_chat.html.erb
@@ -0,0 +1,5 @@
+<% if profile.members.include?(user) %>
+
+ <%= button_to_function(:chat, _('Enter chat room'), "open_chat_window(this, '##{profile.full_jid}')") %>
+
+<% end %>
diff --git a/app/views/shared/profile_actions/xmpp_chat.rhtml b/app/views/shared/profile_actions/xmpp_chat.rhtml
deleted file mode 100644
index 88a659b..0000000
--- a/app/views/shared/profile_actions/xmpp_chat.rhtml
+++ /dev/null
@@ -1,5 +0,0 @@
-<% if profile.members.include?(user) %>
-
- <%= button_to_function(:chat, _('Enter chat room'), "open_chat_window(this, '##{profile.full_jid}')") %>
-
-<% end %>
diff --git a/app/views/shared/theme_test_panel.html.erb b/app/views/shared/theme_test_panel.html.erb
new file mode 100644
index 0000000..d198822
--- /dev/null
+++ b/app/views/shared/theme_test_panel.html.erb
@@ -0,0 +1,13 @@
+
+
+ <%= _('Testing theme "%s"') % current_theme %>
+
+
+
<%= _('You can move this window away to have a better visualization of specific parts of screen.') %>
+
+ <% button_bar do %>
+ <%= button(:ok, _('Finished testing'), :controller => 'themes', :profile => theme_owner, :action => 'stop_test', :id => current_theme) %>
+ <%= button(:edit, _('Edit theme'), :controller => 'themes', :profile => theme_owner, :action => 'edit', :id => current_theme) %>
+ <% end %>
+
-
- <%= _('Testing theme "%s"') % current_theme %>
-
-
-
<%= _('You can move this window away to have a better visualization of specific parts of screen.') %>
-
- <% button_bar do %>
- <%= button(:ok, _('Finished testing'), :controller => 'themes', :profile => theme_owner, :action => 'stop_test', :id => current_theme) %>
- <%= button(:edit, _('Edit theme'), :controller => 'themes', :profile => theme_owner, :action => 'edit', :id => current_theme) %>
- <% end %>
-
' + _('Open chat') +' ', '#', :id => 'openchat', :onclick => 'open_chat_window(this)') %>
diff --git a/app/views/shared/usermenu/xmpp_chat.rhtml b/app/views/shared/usermenu/xmpp_chat.rhtml
deleted file mode 100644
index 05f7776..0000000
--- a/app/views/shared/usermenu/xmpp_chat.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-<%= link_to('' + _('Open chat') +' ', '#', :id => 'openchat', :onclick => 'open_chat_window(this)') %>
diff --git a/app/views/spam/index.html.erb b/app/views/spam/index.html.erb
new file mode 100644
index 0000000..eae44dc
--- /dev/null
+++ b/app/views/spam/index.html.erb
@@ -0,0 +1,20 @@
+<%= _('Manage SPAM') %>
+
+<% button_bar do %>
+ <%= button :back, _('Back to control panel'), :controller => :profile_editor %>
+<% end %>
+
+<%# FIXME should not need to replicate the article structure like this to be able to use the same formatting as the comments listing %>
+
+
+
+
+<%= pagination_links @spam %>
+
+<% button_bar do %>
+ <%= button :back, _('Back to control panel'), :controller => :profile_editor %>
+<% end %>
diff --git a/app/views/spam/index.rhtml b/app/views/spam/index.rhtml
deleted file mode 100644
index eae44dc..0000000
--- a/app/views/spam/index.rhtml
+++ /dev/null
@@ -1,20 +0,0 @@
-<%= _('Manage SPAM') %>
-
-<% button_bar do %>
- <%= button :back, _('Back to control panel'), :controller => :profile_editor %>
-<% end %>
-
-<%# FIXME should not need to replicate the article structure like this to be able to use the same formatting as the comments listing %>
-
-
-
-
-<%= pagination_links @spam %>
-
-<% button_bar do %>
- <%= button :back, _('Back to control panel'), :controller => :profile_editor %>
-<% end %>
diff --git a/app/views/task_mailer/invitation_notification.html.erb b/app/views/task_mailer/invitation_notification.html.erb
new file mode 100644
index 0000000..17a3d7c
--- /dev/null
+++ b/app/views/task_mailer/invitation_notification.html.erb
@@ -0,0 +1 @@
+<%= @message %>
\ No newline at end of file
diff --git a/app/views/task_mailer/invitation_notification.rhtml b/app/views/task_mailer/invitation_notification.rhtml
deleted file mode 100644
index 17a3d7c..0000000
--- a/app/views/task_mailer/invitation_notification.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-<%= @message %>
\ No newline at end of file
diff --git a/app/views/task_mailer/target_notification.html.erb b/app/views/task_mailer/target_notification.html.erb
new file mode 100644
index 0000000..b85dcd8
--- /dev/null
+++ b/app/views/task_mailer/target_notification.html.erb
@@ -0,0 +1,10 @@
+<%= _('Hello %s,') % @target %>
+
+<%= word_wrap(@message) %>
+
+<%= word_wrap(_('Access your list of tasks or your control panel to see this and other pending actions that need your attention.')) %>
+<%= @tasks_url %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= @url %>
diff --git a/app/views/task_mailer/target_notification.rhtml b/app/views/task_mailer/target_notification.rhtml
deleted file mode 100644
index b85dcd8..0000000
--- a/app/views/task_mailer/target_notification.rhtml
+++ /dev/null
@@ -1,10 +0,0 @@
-<%= _('Hello %s,') % @target %>
-
-<%= word_wrap(@message) %>
-
-<%= word_wrap(_('Access your list of tasks or your control panel to see this and other pending actions that need your attention.')) %>
-<%= @tasks_url %>
-
---
-<%= _('%s team.') % @environment %>
-<%= @url %>
diff --git a/app/views/task_mailer/task_activated.text.plain.html.erb b/app/views/task_mailer/task_activated.text.plain.html.erb
new file mode 120000
index 0000000..44721c9
--- /dev/null
+++ b/app/views/task_mailer/task_activated.text.plain.html.erb
@@ -0,0 +1 @@
+task_cancelled.text.plain.rhtml
\ No newline at end of file
diff --git a/app/views/task_mailer/task_activated.text.plain.rhtml b/app/views/task_mailer/task_activated.text.plain.rhtml
deleted file mode 120000
index 44721c9..0000000
--- a/app/views/task_mailer/task_activated.text.plain.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-task_cancelled.text.plain.rhtml
\ No newline at end of file
diff --git a/app/views/task_mailer/task_cancelled.text.plain.html.erb b/app/views/task_mailer/task_cancelled.text.plain.html.erb
new file mode 100644
index 0000000..9f74c43
--- /dev/null
+++ b/app/views/task_mailer/task_cancelled.text.plain.html.erb
@@ -0,0 +1,9 @@
+<%= _('Dear %s,') % @requestor %>
+
+<%= word_wrap(@message) %>
+
+<%= _('Greetings,') %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= @url %>
diff --git a/app/views/task_mailer/task_cancelled.text.plain.rhtml b/app/views/task_mailer/task_cancelled.text.plain.rhtml
deleted file mode 100644
index 9f74c43..0000000
--- a/app/views/task_mailer/task_cancelled.text.plain.rhtml
+++ /dev/null
@@ -1,9 +0,0 @@
-<%= _('Dear %s,') % @requestor %>
-
-<%= word_wrap(@message) %>
-
-<%= _('Greetings,') %>
-
---
-<%= _('%s team.') % @environment %>
-<%= @url %>
diff --git a/app/views/task_mailer/task_created.text.plain.html.erb b/app/views/task_mailer/task_created.text.plain.html.erb
new file mode 120000
index 0000000..44721c9
--- /dev/null
+++ b/app/views/task_mailer/task_created.text.plain.html.erb
@@ -0,0 +1 @@
+task_cancelled.text.plain.rhtml
\ No newline at end of file
diff --git a/app/views/task_mailer/task_created.text.plain.rhtml b/app/views/task_mailer/task_created.text.plain.rhtml
deleted file mode 120000
index 44721c9..0000000
--- a/app/views/task_mailer/task_created.text.plain.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-task_cancelled.text.plain.rhtml
\ No newline at end of file
diff --git a/app/views/task_mailer/task_finished.text.plain.html.erb b/app/views/task_mailer/task_finished.text.plain.html.erb
new file mode 120000
index 0000000..44721c9
--- /dev/null
+++ b/app/views/task_mailer/task_finished.text.plain.html.erb
@@ -0,0 +1 @@
+task_cancelled.text.plain.rhtml
\ No newline at end of file
diff --git a/app/views/task_mailer/task_finished.text.plain.rhtml b/app/views/task_mailer/task_finished.text.plain.rhtml
deleted file mode 120000
index 44721c9..0000000
--- a/app/views/task_mailer/task_finished.text.plain.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-task_cancelled.text.plain.rhtml
\ No newline at end of file
diff --git a/app/views/tasks/_abuse_complaint_accept_details.html.erb b/app/views/tasks/_abuse_complaint_accept_details.html.erb
new file mode 100644
index 0000000..0f678fa
--- /dev/null
+++ b/app/views/tasks/_abuse_complaint_accept_details.html.erb
@@ -0,0 +1,28 @@
+
+
"<%= abuse_report.reason %>"
+
<%= _('Reported by %{reporter} %{time}.') % {:reporter => abuse_report.reporter.name, :time => time_ago_as_sentence(abuse_report.created_at) }%>
+ <% if !abuse_report.content.blank? %>
+
<%=_('View details')%>
+
class="abuse-report-details">
+ <%= abuse_report.content %>
+
+ <% end %>
+
+ --
+
+
-
"<%= abuse_report.reason %>"
-
<%= _('Reported by %{reporter} %{time}.') % {:reporter => abuse_report.reporter.name, :time => time_ago_as_sentence(abuse_report.created_at) }%>
- <% if !abuse_report.content.blank? %>
-
<%=_('View details')%>
-
class="abuse-report-details">
- <%= abuse_report.content %>
-
- <% end %>
-
- --
-
-
+ <%=_('Suggestions: %s') % task.target.suggested_friend_groups.join(', ') %>
+
diff --git a/app/views/tasks/_add_friend_accept_details.rhtml b/app/views/tasks/_add_friend_accept_details.rhtml
deleted file mode 100644
index 68745c7..0000000
--- a/app/views/tasks/_add_friend_accept_details.rhtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<%=_('Classify your new friend:') +
-text_field_with_local_autocomplete("tasks[#{task.id}][task][group_for_friend]",
- task.target.suggested_friend_groups,
- {:id => "field-group-for-friend-#{task.id}", :maxlength => 150})
-%>
-
- <%=_('Suggestions: %s') % task.target.suggested_friend_groups.join(', ') %>
-
diff --git a/app/views/tasks/_add_member_accept_details.html.erb b/app/views/tasks/_add_member_accept_details.html.erb
new file mode 100644
index 0000000..71e5cee
--- /dev/null
+++ b/app/views/tasks/_add_member_accept_details.html.erb
@@ -0,0 +1,8 @@
+<%= content = _("Roles:")+"<%= label_tag(_("Email: %s") % task.email) %>
+<%= required labelled_form_field(_('Title'), f.text_field(:article_name, :size => 50)) %>
+<%= labelled_form_field(_('Source'), f.text_field(:source_name)) %>
+<%= labelled_form_field(_("Source URL"), f.text_field(:source)) %>
+
+<%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task][article_parent_id]", task.target) %>
+<%= labelled_form_field(_('Highlight this article'), f.check_box(:highlighted)) %>
+
+<%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :f => f, :abstract_method => 'article_abstract', :body_method => 'article_body', :lead_id => task.id} %>
diff --git a/app/views/tasks/_suggest_article_accept_details.rhtml b/app/views/tasks/_suggest_article_accept_details.rhtml
deleted file mode 100644
index 759e165..0000000
--- a/app/views/tasks/_suggest_article_accept_details.rhtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<%= render :file => 'shared/tiny_mce' %>
-
-<%= labelled_form_field(_("Sent by: "), f.text_field(:name)) %>
-<%= label_tag(_("Email: %s") % task.email) %>
-<%= required labelled_form_field(_('Title'), f.text_field(:article_name, :size => 50)) %>
-<%= labelled_form_field(_('Source'), f.text_field(:source_name)) %>
-<%= labelled_form_field(_("Source URL"), f.text_field(:source)) %>
-
-<%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task][article_parent_id]", task.target) %>
-<%= labelled_form_field(_('Highlight this article'), f.check_box(:highlighted)) %>
-
-<%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :f => f, :abstract_method => 'article_abstract', :body_method => 'article_body', :lead_id => task.id} %>
diff --git a/app/views/tasks/_task.html.erb b/app/views/tasks/_task.html.erb
new file mode 100644
index 0000000..1ee6fac
--- /dev/null
+++ b/app/views/tasks/_task.html.erb
@@ -0,0 +1,64 @@
+
+
+
+ <%
+ icon_info = task.icon
+ if icon_info[:type] == :profile_image
+ icon = profile_image(icon_info[:profile], :minor)
+ elsif icon_info[:type] == :defined_image
+ icon = "
"
+ end
+ %>
+ <%=
+ if icon_info[:url]
+ link_to(icon, icon_info[:url])
+ else
+ icon
+ end
+ %>
+
+
+
+
+ <%=
+ labelled_radio_button(_("Accept"), "tasks[#{task.id}][decision]", 'finish', task.default_decision == 'accept',
+ :id => "decision-finish-#{task.id}",
+ :class => 'task_accept_radio',
+ :disabled => task.accept_disabled?,
+ :task_id => "#{task.id}") +
+ labelled_radio_button(_("Reject"), "tasks[#{task.id}][decision]", 'cancel', task.default_decision == 'reject',
+ :id => "decision-cancel-#{task.id}",
+ :class => 'task_reject_radio',
+ :disabled => task.reject_disabled?,
+ :task_id => "#{task.id}") +
+ labelled_radio_button(_("Skip"), "tasks[#{task.id}][decision]", 'skip', task.default_decision == 'skip',
+ :id => "decision-skip-#{task.id}",
+ :class => 'task_skip_radio',
+ :disabled => task.skip_disabled?,
+ :task_id => "#{task.id}")
+ %>
+
+
+
+ <%= task.title %>
+
+
+
+ <%= task_information(task) %>
+
+
+ <% fields_for "tasks[#{task.id}][task]", task do |f| %>
+ <% if task.accept_details %>
+
+ <%= render :partial => partial_for_class(task.class, :accept_details), :locals => {:task => task, :f => f} %>
+
+ <% end %>
+
+ <% if task.reject_details %>
+
+ <%= render :partial => partial_for_class(task.class, :reject_details), :locals => {:task => task, :f => f} %>
+
+ <% end %>
+ <% end %>
+
+
-
-
- <%
- icon_info = task.icon
- if icon_info[:type] == :profile_image
- icon = profile_image(icon_info[:profile], :minor)
- elsif icon_info[:type] == :defined_image
- icon = "
"
- end
- %>
- <%=
- if icon_info[:url]
- link_to(icon, icon_info[:url])
- else
- icon
- end
- %>
-
-
-
-
- <%=
- labelled_radio_button(_("Accept"), "tasks[#{task.id}][decision]", 'finish', task.default_decision == 'accept',
- :id => "decision-finish-#{task.id}",
- :class => 'task_accept_radio',
- :disabled => task.accept_disabled?,
- :task_id => "#{task.id}") +
- labelled_radio_button(_("Reject"), "tasks[#{task.id}][decision]", 'cancel', task.default_decision == 'reject',
- :id => "decision-cancel-#{task.id}",
- :class => 'task_reject_radio',
- :disabled => task.reject_disabled?,
- :task_id => "#{task.id}") +
- labelled_radio_button(_("Skip"), "tasks[#{task.id}][decision]", 'skip', task.default_decision == 'skip',
- :id => "decision-skip-#{task.id}",
- :class => 'task_skip_radio',
- :disabled => task.skip_disabled?,
- :task_id => "#{task.id}")
- %>
-
-
-
- <%= task.title %>
-
-
-
- <%= task_information(task) %>
-
-
- <% fields_for "tasks[#{task.id}][task]", task do |f| %>
- <% if task.accept_details %>
-
- <%= render :partial => partial_for_class(task.class, :accept_details), :locals => {:task => task, :f => f} %>
-
- <% end %>
-
- <% if task.reject_details %>
-
- <%= render :partial => partial_for_class(task.class, :reject_details), :locals => {:task => task, :f => f} %>
-
- <% end %>
- <% end %>
-
-
<%= _("%s's pending tasks") % profile.name %>
+
+
+<% type_collection = [[nil, _('All')]] %>
+<% type_collection += Task.all_types.sort_by {|klass| klass.constantize.new.title}.map{|s| [s, s.constantize.new.title] } %>
+
+
+
+<% if !@failed.blank? %>
+
+ <% @failed.each do |error, tasks_descriptions|%>
+
<%= error %>
+
<%=_("This error happened with the following tasks: ")%>
+
+ <% tasks_descriptions.each do |description| %>
+ <%= description %>
+ <% end %>
+
+ <% end %>
+
+ <%= labelled_select(_('Filter')+': ', :filter_type, :first, :last, @filter, type_collection, :onchange => 'document.location.href = "?filter_type="+this.value')%>
+
+ <%= _('No pending tasks for %s') % profile.name %>
+<% else %>
+ <% form_tag :action => 'close' do%>
+ <% button_bar do %>
+ <%# FiXME button(:edit, _('View my requests'), :action => 'list_requested') %>
+ <%# FIXME button('menu-mail', _('Send request'), :action => 'new') %>
+ <%= submit_button :save, _("Apply!") %>
+ <%= button(:edit, _('View processed tasks'), :action => 'processed') %>
+ <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
+ <% end %>
+
+
+
+ <%= labelled_select(_('Filter')+': ', :filter_type, :first, :last, @filter, type_collection, :onchange => 'document.location.href = "?filter_type="+this.value')%>
+
+
+ <%= labelled_select(_("Set all to: "), 'set-decisions', 'first', 'last', nil, [['',""],['accept',_("Accept")],['reject',_("Reject")],['skip',_("Skip")]], :id => "up-set-all-tasks-to") %>
+
+ <% @tasks.each do |task| %>
+ <%= render :partial => 'task', :locals => { :task => task } %>
+ <% end %>
+
+ <%= labelled_select(_("Set all to: "), 'set-decisions', 'first', 'last', nil, [['',""],['accept',_("Accept")],['reject',_("Reject")],['skip',_("Skip")]], :id => "down-set-all-tasks-to") %>
+
+
+
+ <%= pagination_links(@tasks)%>
+
+ <% button_bar do %>
+ <%# FiXME button(:edit, _('View my requests'), :action => 'list_requested') %>
+ <%# FIXME button('menu-mail', _('Send request'), :action => 'new') %>
+ <%= submit_button :save, _("Apply!") %>
+ <%= button(:edit, _('View processed tasks'), :action => 'processed') %>
+ <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
+ <% end %>
+ <% end %>
+<% end %>
+
+
+
+<%= javascript_include_tag 'tasks' %>
diff --git a/app/views/tasks/index.rhtml b/app/views/tasks/index.rhtml
deleted file mode 100644
index 7572a0e..0000000
--- a/app/views/tasks/index.rhtml
+++ /dev/null
@@ -1,69 +0,0 @@
-<%= stylesheet_link_tag 'tasks' %>
-
-<%= _("%s's pending tasks") % profile.name %>
-
-
-<% type_collection = [[nil, _('All')]] %>
-<% type_collection += Task.all_types.sort_by {|klass| klass.constantize.new.title}.map{|s| [s, s.constantize.new.title] } %>
-
-
-
-<% if !@failed.blank? %>
-
- <% @failed.each do |error, tasks_descriptions|%>
-
<%= error %>
-
<%=_("This error happened with the following tasks: ")%>
-
- <% tasks_descriptions.each do |description| %>
- <%= description %>
- <% end %>
-
- <% end %>
-
- <%= labelled_select(_('Filter')+': ', :filter_type, :first, :last, @filter, type_collection, :onchange => 'document.location.href = "?filter_type="+this.value')%>
-
- <%= _('No pending tasks for %s') % profile.name %>
-<% else %>
- <% form_tag :action => 'close' do%>
- <% button_bar do %>
- <%# FiXME button(:edit, _('View my requests'), :action => 'list_requested') %>
- <%# FIXME button('menu-mail', _('Send request'), :action => 'new') %>
- <%= submit_button :save, _("Apply!") %>
- <%= button(:edit, _('View processed tasks'), :action => 'processed') %>
- <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
- <% end %>
-
-
-
- <%= labelled_select(_('Filter')+': ', :filter_type, :first, :last, @filter, type_collection, :onchange => 'document.location.href = "?filter_type="+this.value')%>
-
-
- <%= labelled_select(_("Set all to: "), 'set-decisions', 'first', 'last', nil, [['',""],['accept',_("Accept")],['reject',_("Reject")],['skip',_("Skip")]], :id => "up-set-all-tasks-to") %>
-
- <% @tasks.each do |task| %>
- <%= render :partial => 'task', :locals => { :task => task } %>
- <% end %>
-
- <%= labelled_select(_("Set all to: "), 'set-decisions', 'first', 'last', nil, [['',""],['accept',_("Accept")],['reject',_("Reject")],['skip',_("Skip")]], :id => "down-set-all-tasks-to") %>
-
-
-
- <%= pagination_links(@tasks)%>
-
- <% button_bar do %>
- <%# FiXME button(:edit, _('View my requests'), :action => 'list_requested') %>
- <%# FIXME button('menu-mail', _('Send request'), :action => 'new') %>
- <%= submit_button :save, _("Apply!") %>
- <%= button(:edit, _('View processed tasks'), :action => 'processed') %>
- <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
- <% end %>
- <% end %>
-<% end %>
-
-
-
-<%= javascript_include_tag 'tasks' %>
diff --git a/app/views/tasks/list_requested.html.erb b/app/views/tasks/list_requested.html.erb
new file mode 100644
index 0000000..8b4070f
--- /dev/null
+++ b/app/views/tasks/list_requested.html.erb
@@ -0,0 +1,18 @@
+<%= _('Tasks that I requested') %>
+
+
+ <% @tasks.each do |task| %>
+
+ <%= task.respond_to?(:title) ? link_to( task.title, :action => 'ticket_details', :id => task.id) : task.information %>
+ <%= _('Created:') + ' ' + show_date(task.created_at) %>
+ —
+ <%= _('Status:') + ' ' + task.status.to_s %>
+
+
+ <% end %>
+
+
+<% button_bar do %>
+ <%= button :back, _('Back'), :action => 'index' %>
+<% end %>
diff --git a/app/views/tasks/list_requested.rhtml b/app/views/tasks/list_requested.rhtml
deleted file mode 100644
index 8b4070f..0000000
--- a/app/views/tasks/list_requested.rhtml
+++ /dev/null
@@ -1,18 +0,0 @@
-<%= _('Tasks that I requested') %>
-
-
- <% @tasks.each do |task| %>
-
- <%= task.respond_to?(:title) ? link_to( task.title, :action => 'ticket_details', :id => task.id) : task.information %>
- <%= _('Created:') + ' ' + show_date(task.created_at) %>
- —
- <%= _('Status:') + ' ' + task.status.to_s %>
-
-
- <% end %>
-
-
-<% button_bar do %>
- <%= button :back, _('Back'), :action => 'index' %>
-<% end %>
diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb
new file mode 100644
index 0000000..ac2a634
--- /dev/null
+++ b/app/views/tasks/new.html.erb
@@ -0,0 +1,17 @@
+<%= @ticket.target ? _('New request for %s') % @ticket.target.name : _('New request') %>
+
+<%# FIXME: put style in css %>
+<% labelled_form_for :ticket, @ticket do |f| %>
+ <% if @ticket.target %>
+ <%= f.hidden_field :target_id %>
+ <% else %>
+ <%= display_form_field( _('To: '), f.select(:target_id, profile.friends.map{|p|[p.name, p.id]})) %>
+ <% end %>
+ <%= hidden_field_tag 'ticket[target_type]', 'Profile' %>
+ <%= f.text_field :title, :style => 'width:80%;' %>
+ <%= f.text_area :message, :style => 'height:200px; width:80%;' %>
+
+ <% button_bar do %>
+ <%= submit_button(:ok, _('Send'), :cancel => {:action => 'index'}) %>
+ <% end %>
+<% end %>
diff --git a/app/views/tasks/new.rhtml b/app/views/tasks/new.rhtml
deleted file mode 100644
index ac2a634..0000000
--- a/app/views/tasks/new.rhtml
+++ /dev/null
@@ -1,17 +0,0 @@
-<%= @ticket.target ? _('New request for %s') % @ticket.target.name : _('New request') %>
-
-<%# FIXME: put style in css %>
-<% labelled_form_for :ticket, @ticket do |f| %>
- <% if @ticket.target %>
- <%= f.hidden_field :target_id %>
- <% else %>
- <%= display_form_field( _('To: '), f.select(:target_id, profile.friends.map{|p|[p.name, p.id]})) %>
- <% end %>
- <%= hidden_field_tag 'ticket[target_type]', 'Profile' %>
- <%= f.text_field :title, :style => 'width:80%;' %>
- <%= f.text_area :message, :style => 'height:200px; width:80%;' %>
-
- <% button_bar do %>
- <%= submit_button(:ok, _('Send'), :cancel => {:action => 'index'}) %>
- <% end %>
-<% end %>
diff --git a/app/views/tasks/processed.html.erb b/app/views/tasks/processed.html.erb
new file mode 100644
index 0000000..b76fac6
--- /dev/null
+++ b/app/views/tasks/processed.html.erb
@@ -0,0 +1,24 @@
+<%= _("%s's processed tasks") % profile.name %>
+
+
+<% if @tasks.empty? %>
+ <%= _('No processed tasks.') %>
+<% else %>
+
+ <% @tasks.each do |item| %>
+
+ <%= task_information(item) %>
+ <%= _('Created:') +' '+ show_date(item.created_at) %>
+ —
+ <%= _('Processed:') +' '+ show_date(item.end_date) %>
+
+
+ <% end %>
+
+<% end %>
+
+
+<% button_bar do %>
+ <%= button(:back, _('Back'), :action => 'index') %>
+<% end %>
diff --git a/app/views/tasks/processed.rhtml b/app/views/tasks/processed.rhtml
deleted file mode 100644
index b76fac6..0000000
--- a/app/views/tasks/processed.rhtml
+++ /dev/null
@@ -1,24 +0,0 @@
-<%= _("%s's processed tasks") % profile.name %>
-
-
-<% if @tasks.empty? %>
- <%= _('No processed tasks.') %>
-<% else %>
-
- <% @tasks.each do |item| %>
-
- <%= task_information(item) %>
- <%= _('Created:') +' '+ show_date(item.created_at) %>
- —
- <%= _('Processed:') +' '+ show_date(item.end_date) %>
-
-
- <% end %>
-
-<% end %>
-
-
-<% button_bar do %>
- <%= button(:back, _('Back'), :action => 'index') %>
-<% end %>
diff --git a/app/views/tasks/ticket_details.html.erb b/app/views/tasks/ticket_details.html.erb
new file mode 100644
index 0000000..9376731
--- /dev/null
+++ b/app/views/tasks/ticket_details.html.erb
@@ -0,0 +1,19 @@
+<%= _('Ticket: %s') % @ticket.name %>
+
+ <%= _('Created at %s by %s') % [@ticket.created_at.to_date, link_to(@ticket.requestor.name, @ticket.requestor.url)] %>
+
+<%= _('Status: %s') % gettext(Task::Status.names[@ticket.status]) %>
+
+
+
<%= _('Description: %s') % @ticket.description %>
+
<%= _('Closing statement: %s') % @ticket.closing_statment %>
+<% end %>
+
+<% button_bar do %>
+ <%= button :back, _('Back'), :action => 'index' %>
+<% end %>
diff --git a/app/views/tasks/ticket_details.rhtml b/app/views/tasks/ticket_details.rhtml
deleted file mode 100644
index 9376731..0000000
--- a/app/views/tasks/ticket_details.rhtml
+++ /dev/null
@@ -1,19 +0,0 @@
-<%= _('Ticket: %s') % @ticket.name %>
-
- <%= _('Created at %s by %s') % [@ticket.created_at.to_date, link_to(@ticket.requestor.name, @ticket.requestor.url)] %>
-
-<%= _('Status: %s') % gettext(Task::Status.names[@ticket.status]) %>
-
-
-
<%= _('Description: %s') % @ticket.description %>
-
<%= _('Closing statement: %s') % @ticket.closing_statment %>
-<% end %>
-
-<% button_bar do %>
- <%= button :back, _('Back'), :action => 'index' %>
-<% end %>
diff --git a/app/views/themes/add_css.html.erb b/app/views/themes/add_css.html.erb
new file mode 100644
index 0000000..0517856
--- /dev/null
+++ b/app/views/themes/add_css.html.erb
@@ -0,0 +1,11 @@
+<%= _('Add a CSS file') %>
+
+<% form_tag do %>
+ <%= labelled_form_field(_('File name'), text_field_tag('css')) %>
+
+ <% button_bar do %>
+ <%= submit_button(:add, _('Add')) %>
+ <%= lightbox_close_button(_('Cancel')) %>
+ <% end %>
+
+<% end %>
diff --git a/app/views/themes/add_css.rhtml b/app/views/themes/add_css.rhtml
deleted file mode 100644
index 0517856..0000000
--- a/app/views/themes/add_css.rhtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<%= _('Add a CSS file') %>
-
-<% form_tag do %>
- <%= labelled_form_field(_('File name'), text_field_tag('css')) %>
-
- <% button_bar do %>
- <%= submit_button(:add, _('Add')) %>
- <%= lightbox_close_button(_('Cancel')) %>
- <% end %>
-
-<% end %>
diff --git a/app/views/themes/add_image.html.erb b/app/views/themes/add_image.html.erb
new file mode 100644
index 0000000..0a31980
--- /dev/null
+++ b/app/views/themes/add_image.html.erb
@@ -0,0 +1,6 @@
+<% form_tag({:action => 'add_image', :id => @theme.id}, :multipart => true) do %>
+ <%= labelled_form_field(_('Choose the image file'), file_field_tag(:image)) %>
+ <% button_bar do %>
+ <%= submit_button(:add, _('Add image')) %>
+ <% end %>
+<% end %>
diff --git a/app/views/themes/add_image.rhtml b/app/views/themes/add_image.rhtml
deleted file mode 100644
index 0a31980..0000000
--- a/app/views/themes/add_image.rhtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<% form_tag({:action => 'add_image', :id => @theme.id}, :multipart => true) do %>
- <%= labelled_form_field(_('Choose the image file'), file_field_tag(:image)) %>
- <% button_bar do %>
- <%= submit_button(:add, _('Add image')) %>
- <% end %>
-<% end %>
diff --git a/app/views/themes/css_editor.html.erb b/app/views/themes/css_editor.html.erb
new file mode 100644
index 0000000..0f84624
--- /dev/null
+++ b/app/views/themes/css_editor.html.erb
@@ -0,0 +1,13 @@
+<%= _('CSS code: "%s"') % @css %>
+
+<% form_tag({:action => 'update_css', :id => @theme.id }, :name => 'csscode_form') do %>
+ <%= hidden_field_tag('css', @css) %>
+ <%= text_area_tag('csscode', @code, :id => "codepressWindow", :class => 'codepress css') %>
+ <% button_bar do %>
+ <%= submit_button(:save, _('Save')) %>
+ <% end %>
+<% end %>
+
+
+
+
diff --git a/app/views/themes/css_editor.rhtml b/app/views/themes/css_editor.rhtml
deleted file mode 100644
index 0f84624..0000000
--- a/app/views/themes/css_editor.rhtml
+++ /dev/null
@@ -1,13 +0,0 @@
-<%= _('CSS code: "%s"') % @css %>
-
-<% form_tag({:action => 'update_css', :id => @theme.id }, :name => 'csscode_form') do %>
- <%= hidden_field_tag('css', @css) %>
- <%= text_area_tag('csscode', @code, :id => "codepressWindow", :class => 'codepress css') %>
- <% button_bar do %>
- <%= submit_button(:save, _('Save')) %>
- <% end %>
-<% end %>
-
-
-
-
diff --git a/app/views/themes/edit.html.erb b/app/views/themes/edit.html.erb
new file mode 100644
index 0000000..b282c99
--- /dev/null
+++ b/app/views/themes/edit.html.erb
@@ -0,0 +1,41 @@
+
+
+
+
+
<%= _('CSS files') %>
+
+ <% for css in @css_files %>
+ <%= link_to_remote(css, :url => { :action => 'css_editor', :id => @theme.id, :css => css }, :update => { :success => 'css-code' }) %>
+ <% end %>
+
+ <% button_bar do %>
+ <%= lightbox_button(:add, _('New CSS'), :action => 'add_css', :id => @theme.id) %>
+ <% end %>
+
+
<%= _('Images') %>
+
+ <% for image in @image_files %>
+ <%= image_tag("/user_themes/#{@theme.id}/images/#{image}") %>
+ <% end %>
+
+ <% button_bar do %>
+ <%= lightbox_button(:add, _('Add image'), :action => 'add_image', :id => @theme.id) %>
+ <% end %>
+
+
+ <%= _('Select a CSS file to edit') %>
+
+
+
+<%# javascript_include_tag 'codepress/codepress' %>
diff --git a/app/views/themes/edit.rhtml b/app/views/themes/edit.rhtml
deleted file mode 100644
index b282c99..0000000
--- a/app/views/themes/edit.rhtml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
<%= _('CSS files') %>
-
- <% for css in @css_files %>
- <%= link_to_remote(css, :url => { :action => 'css_editor', :id => @theme.id, :css => css }, :update => { :success => 'css-code' }) %>
- <% end %>
-
- <% button_bar do %>
- <%= lightbox_button(:add, _('New CSS'), :action => 'add_css', :id => @theme.id) %>
- <% end %>
-
-
<%= _('Images') %>
-
- <% for image in @image_files %>
- <%= image_tag("/user_themes/#{@theme.id}/images/#{image}") %>
- <% end %>
-
- <% button_bar do %>
- <%= lightbox_button(:add, _('Add image'), :action => 'add_image', :id => @theme.id) %>
- <% end %>
-
-
- <%= _('Select a CSS file to edit') %>
-
-
-
-<%# javascript_include_tag 'codepress/codepress' %>
diff --git a/app/views/themes/index.html.erb b/app/views/themes/index.html.erb
new file mode 100644
index 0000000..38c1327
--- /dev/null
+++ b/app/views/themes/index.html.erb
@@ -0,0 +1,120 @@
+<%= _('Editing Appearance') %>
+
+
+
+
<%= _('Select template') %>
+
+<% for templates in @layout_templates.in_groups_of(3) %>
+
+ <% for template in templates %><%=
+ if template
+ base_content = image_tag(
+ "/designs/templates/#{template.id}/thumbnail.png",
+ :alt => _('The "%s" template')) +
+ '
' +
+ content_tag('strong', template.id, :class => 'name') +
+ '
',
+ :class => 'template-opt list-opt selected')
+ else # Not selected
+ link_to(
+ base_content +'
',
+ { :action => 'set_layout_template', :id => template.id },
+ :class => 'template-opt list-opt')
+ end
+
+ end
+ %><% end %>
+
+
+
<%= _('Select theme') %>
+<%= button :home, _('Use the default theme'), { :action => 'unset'}, :method => 'post', :confirm => _('Are you sure you want to use the environment default theme?') %>
+
+<% for themes in @themes.in_groups_of(3) %>
+
+ <% for theme in themes %><%=
+ if theme
+
+ base_content = image_tag(
+ "/designs/themes/#{theme.id}/preview.png",
+ :alt => (_('The "%s" theme.') % theme.name)) +
+ '
' +
+ content_tag('strong', theme.name, :class => 'name') +
+ '
',
+ :class => 'theme-opt list-opt selected')
+ else # Not selected
+ link_to(
+ base_content + '
',
+ { :action => 'set', :id => theme.id },
+ :class => 'theme-opt list-opt')
+ end
+
+ end
+ %><% end %>
+
+
+
<%= _('My themes') %>
+
+ <% for themes in profile.themes.in_groups_of(3) %>
+
+ <% for theme in themes %><%=
+ if theme
+
+ selected = theme.id == @current_theme
+ sel_html = selected ?
+ content_tag('big', _('(current)') ) :
+ link_to(_('Use this theme'), :action => 'set', :id => theme.id)
+
+ content_tag( 'div',
+ image_tag(
+ '/images/icons-app/design-editor.png',
+ :alt => (_('The "%s" theme.') % theme.name)) +
+ '
' +
+ content_tag('strong', theme.name, :class => 'name') +
+ '
',
+ :class => 'theme-opt list-opt' + (selected ? ' selected' : '')
+ )
+
+ end
+ %><% end %>
+
+ <% end %>
+
+
<%= _('Editing Appearance') %>
-
-
-
-
<%= _('Select template') %>
-
-<% for templates in @layout_templates.in_groups_of(3) %>
-
- <% for template in templates %><%=
- if template
- base_content = image_tag(
- "/designs/templates/#{template.id}/thumbnail.png",
- :alt => _('The "%s" template')) +
- '
' +
- content_tag('strong', template.id, :class => 'name') +
- '
',
- :class => 'template-opt list-opt selected')
- else # Not selected
- link_to(
- base_content +'
',
- { :action => 'set_layout_template', :id => template.id },
- :class => 'template-opt list-opt')
- end
-
- end
- %><% end %>
-
-
-
<%= _('Select theme') %>
-<%= button :home, _('Use the default theme'), { :action => 'unset'}, :method => 'post', :confirm => _('Are you sure you want to use the environment default theme?') %>
-
-<% for themes in @themes.in_groups_of(3) %>
-
- <% for theme in themes %><%=
- if theme
-
- base_content = image_tag(
- "/designs/themes/#{theme.id}/preview.png",
- :alt => (_('The "%s" theme.') % theme.name)) +
- '
' +
- content_tag('strong', theme.name, :class => 'name') +
- '
',
- :class => 'theme-opt list-opt selected')
- else # Not selected
- link_to(
- base_content + '
',
- { :action => 'set', :id => theme.id },
- :class => 'theme-opt list-opt')
- end
-
- end
- %><% end %>
-
-
-
<%= _('My themes') %>
-
- <% for themes in profile.themes.in_groups_of(3) %>
-
- <% for theme in themes %><%=
- if theme
-
- selected = theme.id == @current_theme
- sel_html = selected ?
- content_tag('big', _('(current)') ) :
- link_to(_('Use this theme'), :action => 'set', :id => theme.id)
-
- content_tag( 'div',
- image_tag(
- '/images/icons-app/design-editor.png',
- :alt => (_('The "%s" theme.') % theme.name)) +
- '
' +
- content_tag('strong', theme.name, :class => 'name') +
- '
',
- :class => 'theme-opt list-opt' + (selected ? ' selected' : '')
- )
-
- end
- %><% end %>
-
- <% end %>
-
-
<%= _('Create new theme') %>
+
+<% form_tag(:action => 'new') do %>
+
+ <%= labelled_form_field(_('Name of the new theme:'), text_field_tag(:name)) %>
+
+ <% button_bar do %>
+ <%= submit_button(:save, _('Create')) %>
+ <% end %>
+<% end %>
diff --git a/app/views/themes/new.rhtml b/app/views/themes/new.rhtml
deleted file mode 100644
index fb77600..0000000
--- a/app/views/themes/new.rhtml
+++ /dev/null
@@ -1,10 +0,0 @@
-<%= _('Create new theme') %>
-
-<% form_tag(:action => 'new') do %>
-
- <%= labelled_form_field(_('Name of the new theme:'), text_field_tag(:name)) %>
-
- <% button_bar do %>
- <%= submit_button(:save, _('Create')) %>
- <% end %>
-<% end %>
diff --git a/app/views/user/mailer/activation_code.html.erb b/app/views/user/mailer/activation_code.html.erb
new file mode 100644
index 0000000..3f35a3c
--- /dev/null
+++ b/app/views/user/mailer/activation_code.html.erb
@@ -0,0 +1,9 @@
+<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
+
+<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code) }) %>
+
+<%= _("Greetings,") %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= url_for @url %>
diff --git a/app/views/user/mailer/activation_code.rhtml b/app/views/user/mailer/activation_code.rhtml
deleted file mode 100644
index 3f35a3c..0000000
--- a/app/views/user/mailer/activation_code.rhtml
+++ /dev/null
@@ -1,9 +0,0 @@
-<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
-
-<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code) }) %>
-
-<%= _("Greetings,") %>
-
---
-<%= _('%s team.') % @environment %>
-<%= url_for @url %>
diff --git a/app/views/user/mailer/activation_email_notify.html.erb b/app/views/user/mailer/activation_email_notify.html.erb
new file mode 100644
index 0000000..07a60aa
--- /dev/null
+++ b/app/views/user/mailer/activation_email_notify.html.erb
@@ -0,0 +1,12 @@
+<%= _('Hello %s,') % @name %>
+
+<%= _('Your email %s was just activated.') % [@email] %>
+
+<%= _('You can access your e-mail from anywhere, using the following address:') %>
+<%= @webmail %>
+
+<%= _('Greetings,') %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= @url %>
diff --git a/app/views/user/mailer/activation_email_notify.rhtml b/app/views/user/mailer/activation_email_notify.rhtml
deleted file mode 100644
index 07a60aa..0000000
--- a/app/views/user/mailer/activation_email_notify.rhtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<%= _('Hello %s,') % @name %>
-
-<%= _('Your email %s was just activated.') % [@email] %>
-
-<%= _('You can access your e-mail from anywhere, using the following address:') %>
-<%= @webmail %>
-
-<%= _('Greetings,') %>
-
---
-<%= _('%s team.') % @environment %>
-<%= @url %>
diff --git a/app/views/user/mailer/signup_welcome_email.html.erb b/app/views/user/mailer/signup_welcome_email.html.erb
new file mode 100644
index 0000000..6982a56
--- /dev/null
+++ b/app/views/user/mailer/signup_welcome_email.html.erb
@@ -0,0 +1,9 @@
+
+
+
+ <%= word_wrap @body %>
+
+
diff --git a/app/views/user/mailer/signup_welcome_email.rhtml b/app/views/user/mailer/signup_welcome_email.rhtml
deleted file mode 100644
index 6982a56..0000000
--- a/app/views/user/mailer/signup_welcome_email.rhtml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- <%= word_wrap @body %>
-
-
diff --git a/app/views/users/_user_csv.html.erb b/app/views/users/_user_csv.html.erb
new file mode 100644
index 0000000..4c52a09
--- /dev/null
+++ b/app/views/users/_user_csv.html.erb
@@ -0,0 +1 @@
+<%= user_csv.name %>;<%= user_csv.email %>
diff --git a/app/views/users/_user_csv.rhtml b/app/views/users/_user_csv.rhtml
deleted file mode 100644
index 4c52a09..0000000
--- a/app/views/users/_user_csv.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-<%= user_csv.name %>;<%= user_csv.email %>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
new file mode 100644
index 0000000..f40f241
--- /dev/null
+++ b/app/views/users/index.html.erb
@@ -0,0 +1,16 @@
+<%= _('Manage users') %>
+
+
+
+ <%= _('Download users list') %>:
+ <%= link_to '[CSV]', :format => 'csv' %>
+ <%= link_to '[XML]', :format => 'xml' %>
+
+
+ <%= link_to _('Send e-mail to users'), :action => 'send_mail' %>
+
+
+
+<% button_bar do %>
+ <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
+<% end %>
diff --git a/app/views/users/index.rhtml b/app/views/users/index.rhtml
deleted file mode 100644
index f40f241..0000000
--- a/app/views/users/index.rhtml
+++ /dev/null
@@ -1,16 +0,0 @@
-<%= _('Manage users') %>
-
-
-
- <%= _('Download users list') %>:
- <%= link_to '[CSV]', :format => 'csv' %>
- <%= link_to '[XML]', :format => 'xml' %>
-
-
- <%= link_to _('Send e-mail to users'), :action => 'send_mail' %>
-
-
-
-<% button_bar do %>
- <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
-<% end %>
diff --git a/app/views/users/index_csv.html.erb b/app/views/users/index_csv.html.erb
new file mode 100644
index 0000000..b956088
--- /dev/null
+++ b/app/views/users/index_csv.html.erb
@@ -0,0 +1,2 @@
+<%= _('name') %>;<%= _('email') %>
+<%= render :partial => 'user_csv', :collection => @users %>
diff --git a/app/views/users/index_csv.rhtml b/app/views/users/index_csv.rhtml
deleted file mode 100644
index b956088..0000000
--- a/app/views/users/index_csv.rhtml
+++ /dev/null
@@ -1,2 +0,0 @@
-<%= _('name') %>;<%= _('email') %>
-<%= render :partial => 'user_csv', :collection => @users %>
diff --git a/app/views/users/send_mail.html.erb b/app/views/users/send_mail.html.erb
new file mode 100644
index 0000000..1879b79
--- /dev/null
+++ b/app/views/users/send_mail.html.erb
@@ -0,0 +1,12 @@
+<%= _('Send e-mail to users') %>
+
+<%= error_messages_for :mailing %>
+
+<%= render :file => 'shared/tiny_mce' %>
+
+<% form_for :mailing, :url => {:action => 'send_mail', :host => @environment.default_hostname} do |f| %>
+ <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
+ <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
+ <%= submit_button(:send, _('Send')) %>
+ <%= button :cancel, _('Cancel e-mail'), :controller => 'users' %>
+<% end %>
diff --git a/app/views/users/send_mail.rhtml b/app/views/users/send_mail.rhtml
deleted file mode 100644
index 1879b79..0000000
--- a/app/views/users/send_mail.rhtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<%= _('Send e-mail to users') %>
-
-<%= error_messages_for :mailing %>
-
-<%= render :file => 'shared/tiny_mce' %>
-
-<% form_for :mailing, :url => {:action => 'send_mail', :host => @environment.default_hostname} do |f| %>
- <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
- <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
- <%= submit_button(:send, _('Send')) %>
- <%= button :cancel, _('Cancel e-mail'), :controller => 'users' %>
-<% end %>
--
libgit2 0.21.2
<%= comment.title.blank? && ' ' || comment.title %>
+