Permalink
Browse files

Moved /shared/* and /shared/admin/* to /refinery/* and /refinery/admi…

…n/* as it makes more sense.
  • Loading branch information...
1 parent 378fa91 commit 0c001c18b5e3f2e72fc7a678402c609b8d9c6d16 @parndt parndt committed May 30, 2011
Showing with 86 additions and 85 deletions.
  1. +2 −2 authentication/app/views/layouts/login.html.erb
  2. +2 −2 authentication/app/views/refinery/admin/users/_form.html.erb
  3. +2 −2 authentication/app/views/refinery/passwords/edit.html.erb
  4. +1 −1 authentication/app/views/refinery/passwords/new.html.erb
  5. +1 −1 authentication/app/views/refinery/sessions/new.html.erb
  6. +2 −2 authentication/app/views/refinery/users/new.html.erb
  7. +1 −0 changelog.md
  8. +7 −7 core/app/views/layouts/application.html.erb
  9. +4 −4 core/app/views/layouts/refinery/admin.html.erb
  10. +2 −2 core/app/views/layouts/refinery/admin_dialog.html.erb
  11. +1 −1 core/app/views/{shared → refinery}/_content_page.html.erb
  12. 0 core/app/views/{shared → refinery}/_draft_page_message.html.erb
  13. 0 core/app/views/{shared → refinery}/_footer.html.erb
  14. 0 core/app/views/{shared → refinery}/_google_analytics.html.erb
  15. +1 −1 core/app/views/{shared → refinery}/_head.html.erb
  16. +1 −1 core/app/views/{shared → refinery}/_header.html.erb
  17. 0 core/app/views/{shared → refinery}/_html_tag.html.erb
  18. 0 core/app/views/{shared → refinery}/_ie6check.html.erb
  19. 0 core/app/views/{shared → refinery}/_javascripts.html.erb
  20. +1 −1 core/app/views/{shared → refinery}/_menu.html.erb
  21. +1 −1 core/app/views/{shared → refinery}/_menu_branch.html.erb
  22. 0 core/app/views/{shared → refinery}/_message.html.erb
  23. 0 core/app/views/{shared → refinery}/_no_script.html.erb
  24. 0 core/app/views/{shared → refinery}/_site_bar.html.erb
  25. 0 core/app/views/{shared → refinery}/admin/_continue_editing.html.erb
  26. 0 core/app/views/{shared → refinery}/admin/_error_messages.html.erb
  27. +1 −1 core/app/views/{shared → refinery}/admin/_form_actions.html.erb
  28. 0 core/app/views/{shared → refinery}/admin/_image_picker.html.erb
  29. 0 core/app/views/{shared → refinery}/admin/_make_sortable.html.erb
  30. 0 core/app/views/{shared → refinery}/admin/_resource_picker.html.erb
  31. 0 core/app/views/{shared → refinery}/admin/_search.html.erb
  32. 0 core/app/views/{shared → refinery}/admin/_sortable_list.html.erb
  33. 0 core/app/views/{shared → refinery}/admin/_tabbed_fields.html.erb
  34. +4 −4 core/lib/refinery/crud.rb
  35. +1 −1 core/lib/refinery/helpers/menu_helper.rb
  36. +24 −24 core/refinerycms-core.gemspec
  37. +1 −1 dashboard/app/views/refinery/admin/dashboard/index.html.erb
  38. +1 −1 doc/guides/1 - Getting Started/2 - Getting Started with Refinery.textile
  39. +1 −1 doc/guides/5 - Extending with Engines/1 - Tabbed fields in your engine's admin area.textile
  40. +1 −1 images/app/views/refinery/admin/images/_actions.html.erb
  41. +2 −2 images/app/views/refinery/admin/images/_existing_image.html.erb
  42. +2 −2 images/app/views/refinery/admin/images/_form.html.erb
  43. +1 −1 images/app/views/refinery/admin/images/insert.html.erb
  44. +1 −1 pages/app/views/admin/pages/_sortable_list.html.erb
  45. +1 −1 pages/app/views/refinery/admin/pages/_actions.html.erb
  46. +2 −2 pages/app/views/refinery/admin/pages/_form.html.erb
  47. +1 −1 pages/app/views/refinery/admin/pages/_form_new_page_parts.html.erb
  48. +1 −1 pages/app/views/refinery/admin/pages/_sortable_list.html.erb
  49. +1 −1 pages/app/views/refinery/admin/pages/index.html.erb
  50. +1 −1 pages/app/views/refinery/admin/pages_dialogs/link_to.html.erb
  51. +1 −1 pages/app/views/refinery/pages/home.html.erb
  52. +1 −1 pages/app/views/refinery/pages/show.html.erb
  53. +1 −1 resources/app/views/refinery/admin/resources/_actions.html.erb
  54. +1 −1 resources/app/views/refinery/admin/resources/_existing_resource.html.erb
  55. +2 −2 resources/app/views/refinery/admin/resources/_form.html.erb
  56. +1 −1 resources/app/views/refinery/admin/resources/insert.html.erb
  57. +1 −1 settings/app/views/refinery/admin/settings/_actions.html.erb
  58. +2 −2 settings/app/views/refinery/admin/settings/_form.html.erb
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<%= render :partial => "/shared/html_tag" %>
+<%= render :partial => "/refinery/html_tag" %>
<%= render :partial => "refinery/admin/head", :locals => {:login => true} %>
<body class='login <%= I18n.locale %>'>
<div id='tooltip_container'></div>
@@ -10,7 +10,7 @@
<div id="page">
<div id="content" class="clearfix">
<div id="flash_container">
- <%= render :partial => "/shared/message" %>
+ <%= render :partial => "/refinery/message" %>
</div>
<%= yield %>
</div>
@@ -1,6 +1,6 @@
<%= form_for [:admin, @user], {:url => @user.new_record? ? main_app.refinery_admin_users_path : main_app.refinery_admin_user_path(@user), :as => :user} do |f| %>
- <%= render :partial => "/shared/admin/error_messages",
+ <%= render :partial => "/refinery/admin/error_messages",
:locals => {
:object => @user,
:include_object_name => true
@@ -70,7 +70,7 @@
</div>
<% end %>
- <%= render :partial => "/shared/admin/form_actions",
+ <%= render :partial => "/refinery/admin/form_actions",
:locals => {
:f => f,
:continue_editing => false,
@@ -3,7 +3,7 @@
<%= form_for(resource, :as => resource_name, :url => main_app.password_path(resource_name), :html => { :method => :put }) do |f| %>
<%= f.hidden_field :reset_password_token %>
- <%= render :partial => "/shared/admin/error_messages",
+ <%= render :partial => "/refinery/admin/error_messages",
:locals => {
:object => @user,
:include_object_name => true
@@ -19,7 +19,7 @@
<%= f.password_field :password_confirmation, :class => 'larger widest' %>
</div>
- <%= render :partial => "/shared/admin/form_actions",
+ <%= render :partial => "/refinery/admin/form_actions",
:locals => {
:f => f,
:continue_editing => false,
@@ -7,7 +7,7 @@
:placeholder => t('email_address', :scope => 'refinery.users.forgot') %>
</div>
- <%= render :partial => "/shared/admin/form_actions",
+ <%= render :partial => "/refinery/admin/form_actions",
:locals => {
:f => f,
:continue_editing => false,
@@ -20,7 +20,7 @@
<%= link_to t('.forgot_password'), main_app.new_refinery_user_password_path %>
</div>
</div>
- <%= render :partial => "/shared/admin/form_actions",
+ <%= render :partial => "/refinery/admin/form_actions",
:locals => {
:f => f,
:submit_button_text => t('.sign_in'),
@@ -1,7 +1,7 @@
<% content_for :header, t('fill_form', :scope => 'refinery.users.new') %>
<%= form_for :user, :url => main_app.refinery_user_registration_path do |f| -%>
- <%= render :partial => "/shared/admin/error_messages",
+ <%= render :partial => "/refinery/admin/error_messages",
:locals => {
:object => @user,
:include_object_name => true
@@ -30,7 +30,7 @@
<% end -%>
<% end -%>
- <%= render :partial => "/shared/admin/form_actions",
+ <%= render :partial => "/refinery/admin/form_actions",
:locals => {
:f => f,
:submit_continue => false,
View
@@ -5,6 +5,7 @@
* Moved everything under Refinery namespace. [wakeless](https://github.com/wakeless)
* Renamed `RefinerySetting` to `Refinery::Setting`. [Philip Arndt](https://github.com/parndt)
* Added `--trace` option to bin/refinerycms. [Steven Heidel](http://github.com/stevenheidel)
+* Moved `/shared/*` to `/refinery/*` instead, including `/shared/admin/*` to `/refinery/admin/*` as it makes more sense. [Philip Arndt](https://github.com/parndt)
* [See full list](https://github.com/resolve/refinerycms/compare/1.0.0...1.1.0)
## 1.0.0 [28 May 2011]
@@ -1,21 +1,21 @@
<!DOCTYPE html>
-<%= render :partial => "/shared/html_tag" %>
- <% site_bar = render(:partial => "/shared/site_bar", :locals => {:head => true}) -%>
- <%= render :partial => "/shared/head" %>
+<%= render :partial => "/refinery/html_tag" %>
+ <% site_bar = render(:partial => "/refinery/site_bar", :locals => {:head => true}) -%>
+ <%= render :partial => "/refinery/head" %>
<body>
<%= site_bar -%>
- <%= render :partial => "/shared/ie6check" if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%>
+ <%= render :partial => "/refinery/ie6check" if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%>
<div id="page_container">
<header>
- <%= render :partial => "/shared/header" -%>
+ <%= render :partial => "/refinery/header" -%>
</header>
<section id='page'>
<%= yield %>
</section>
<footer>
- <%= render :partial => "/shared/footer" -%>
+ <%= render :partial => "/refinery/footer" -%>
</footer>
</div>
- <%= render :partial => "/shared/javascripts" %>
+ <%= render :partial => "/refinery/javascripts" %>
</body>
</html>
@@ -1,9 +1,9 @@
<!DOCTYPE html>
-<%= render :partial => "/shared/html_tag" %>
+<%= render :partial => "/refinery/html_tag" %>
<% content_for :meta, "<meta refinerycms='#{Refinery.version}' />".html_safe %>
<%= render :partial => "refinery/admin/head" %>
<body class='<%= action_name %> <%= I18n.locale %>'>
- <%= render :partial => '/shared/site_bar' %>
+ <%= render :partial => '/refinery/site_bar' %>
<div id='tooltip_container'></div>
<header>
<%= render :partial => "refinery/admin/menu" %>
@@ -12,8 +12,8 @@
<div id="page">
<div id="content" class="clearfix">
<div id="flash_container">
- <%= render :partial => '/shared/no_script' %>
- <%= render :partial => "/shared/message" %>
+ <%= render :partial => '/refinery/no_script' %>
+ <%= render :partial => "/refinery/message" %>
</div>
<%= yield %>
</div>
@@ -1,10 +1,10 @@
<!DOCTYPE html>
-<%= render :partial => "/shared/html_tag" %>
+<%= render :partial => "/refinery/html_tag" %>
<%= render :partial => "/refinery/admin/head" %>
<body id='dialog_container' class='dialog <%= I18n.locale %><%= ' wym_iframe_body' if params[:wymeditor].presence %>'>
<div id='tooltip_container'></div>
<div id="flash_container">
- <%= render :partial => '/shared/message' %>
+ <%= render :partial => '/refinery/message' %>
</div>
<div id='content' class='clearfix'>
<%= yield %>
@@ -60,4 +60,4 @@
<section id='body_content'<%= " class='#{css.join(' ')}'" if css.present? %>>
<%= raw sections.map{|section| section[:html]}.join("\n") -%>
</section>
-<%= render :partial => '/shared/draft_page_message' unless @page.nil? or @page.live? -%>
+<%= render :partial => '/refinery/draft_page_message' unless @page.nil? or @page.live? -%>
@@ -17,7 +17,7 @@
<%= stylesheet_link_tag "home", :theme => theme if home_page? %>
<%= yield :stylesheets %>
- <%= render :partial => '/shared/google_analytics' unless local_request? %>
+ <%= render :partial => '/refinery/google_analytics' unless local_request? %>
<%= javascript_include_tag 'modernizr-min' %>
</head>
@@ -1,7 +1,7 @@
<h1 id='logo'>
<%= link_to ::Refinery::Setting.find_or_set(:site_name, "Company Name"), main_app.root_path %>
</h1>
-<%= render(:partial => "/shared/menu", :locals => {
+<%= render(:partial => "/refinery/menu", :locals => {
:dom_id => 'menu',
:css => 'menu'
}) %>
@@ -8,7 +8,7 @@
-%>
<nav id='<%= dom_id %>' class='<%= css %>'>
<ul>
- <%= render :partial => '/shared/menu_branch', :collection => roots,
+ <%= render :partial => '/refinery/menu_branch', :collection => roots,
:locals => {
:hide_children => hide_children,
:sibling_count => (roots.length - 1),
@@ -10,7 +10,7 @@
<%= link_to(menu_branch.title, main_app.url_for(menu_branch.url)) -%>
<% if (children = menu_branch.children unless hide_children).present? -%>
<ul class='clearfix'>
- <%= render :partial => '/shared/menu_branch', :collection => children,
+ <%= render :partial => '/refinery/menu_branch', :collection => children,
:locals => {
:apply_css => local_assigns[:apply_css],
:hide_children => !!hide_children
@@ -47,7 +47,7 @@
:class => "wymupdate button",
:tooltip => submit_button_title unless hide_submit %>
- <%= render :partial => "/shared/admin/continue_editing", :locals => {:f => f} if continue_editing -%>
+ <%= render :partial => "/refinery/admin/continue_editing", :locals => {:f => f} if continue_editing -%>
<%= hidden_field_tag :continue_editing, false if continue_editing %>
<%= link_to(cancel_button_text, cancel_url,
@@ -83,7 +83,7 @@ def create
unless request.xhr?
redirect_to :back
else
- render :partial => "/shared/message"
+ render :partial => "/refinery/message"
end
end
else
@@ -93,7 +93,7 @@ def create
unless request.xhr?
render :action => 'new'
else
- render :partial => "/shared/admin/error_messages",
+ render :partial => "/refinery/admin/error_messages",
:locals => {
:object => @#{singular_name},
:include_object_name => true
@@ -120,7 +120,7 @@ def update
unless request.xhr?
redirect_to :back
else
- render :partial => "/shared/message"
+ render :partial => "/refinery/message"
end
end
else
@@ -130,7 +130,7 @@ def update
unless request.xhr?
render :action => 'edit'
else
- render :partial => "/shared/admin/error_messages",
+ render :partial => "/refinery/admin/error_messages",
:locals => {
:object => @#{singular_name},
:include_object_name => true
@@ -14,7 +14,7 @@ def cache_if(condition, name = {}, &block)
nil
end
- # This was extracted from app/views/shared/_menu_branch.html.erb
+ # This was extracted from app/views/refinery/_menu_branch.html.erb
# to remove the complexity of that template by reducing logic in the view.
def css_for_menu_branch(item, counter, sibling_count = nil, collection = nil, selected_item = nil, warning = true)
@@ -295,30 +295,30 @@ Gem::Specification.new do |s|
'app/views/refinery/welcome.html.erb',
'app/views/refinery/wymiframe.html.erb',
'app/views/shared',
- 'app/views/shared/_content_page.html.erb',
- 'app/views/shared/_draft_page_message.html.erb',
- 'app/views/shared/_footer.html.erb',
- 'app/views/shared/_google_analytics.html.erb',
- 'app/views/shared/_head.html.erb',
- 'app/views/shared/_header.html.erb',
- 'app/views/shared/_html_tag.html.erb',
- 'app/views/shared/_ie6check.html.erb',
- 'app/views/shared/_javascripts.html.erb',
- 'app/views/shared/_menu.html.erb',
- 'app/views/shared/_menu_branch.html.erb',
- 'app/views/shared/_message.html.erb',
- 'app/views/shared/_no_script.html.erb',
- 'app/views/shared/_site_bar.html.erb',
- 'app/views/shared/admin',
- 'app/views/shared/admin/_continue_editing.html.erb',
- 'app/views/shared/admin/_error_messages.html.erb',
- 'app/views/shared/admin/_form_actions.html.erb',
- 'app/views/shared/admin/_image_picker.html.erb',
- 'app/views/shared/admin/_make_sortable.html.erb',
- 'app/views/shared/admin/_resource_picker.html.erb',
- 'app/views/shared/admin/_search.html.erb',
- 'app/views/shared/admin/_sortable_list.html.erb',
- 'app/views/shared/admin/_tabbed_fields.html.erb',
+ 'app/views/refinery/_content_page.html.erb',
+ 'app/views/refinery/_draft_page_message.html.erb',
+ 'app/views/refinery/_footer.html.erb',
+ 'app/views/refinery/_google_analytics.html.erb',
+ 'app/views/refinery/_head.html.erb',
+ 'app/views/refinery/_header.html.erb',
+ 'app/views/refinery/_html_tag.html.erb',
+ 'app/views/refinery/_ie6check.html.erb',
+ 'app/views/refinery/_javascripts.html.erb',
+ 'app/views/refinery/_menu.html.erb',
+ 'app/views/refinery/_menu_branch.html.erb',
+ 'app/views/refinery/_message.html.erb',
+ 'app/views/refinery/_no_script.html.erb',
+ 'app/views/refinery/_site_bar.html.erb',
+ 'app/views/refinery/admin',
+ 'app/views/refinery/admin/_continue_editing.html.erb',
+ 'app/views/refinery/admin/_error_messages.html.erb',
+ 'app/views/refinery/admin/_form_actions.html.erb',
+ 'app/views/refinery/admin/_image_picker.html.erb',
+ 'app/views/refinery/admin/_make_sortable.html.erb',
+ 'app/views/refinery/admin/_resource_picker.html.erb',
+ 'app/views/refinery/admin/_search.html.erb',
+ 'app/views/refinery/admin/_sortable_list.html.erb',
+ 'app/views/refinery/admin/_tabbed_fields.html.erb',
'config',
'config/initializers',
'config/initializers/kaminari_monkeypatches.rb',
@@ -9,5 +9,5 @@
</div>
<% if request.env["HTTP_USER_AGENT"] =~ /MSIE/ and
::Refinery::Setting.find_or_set(:show_internet_explorer_upgrade_message, true, :scoping => 'refinery') %>
- <% flash.now[:message] = render(:partial => "/shared/ie6check") %>
+ <% flash.now[:message] = render(:partial => "/refinery/ie6check") %>
<% end %>
@@ -192,7 +192,7 @@ $ Copied view template file to app/views/pages/show.html.erb
Now edit +app/views/pages/show.html.erb+ and it will look like this:
<erb>
-<%= render :partial => "/shared/content_page" %>
+<%= render :partial => "/refinery/content_page" %>
</erb>
Refinery has a +content_page+ partial it uses just to get you started. But we'll soon remove this and use our own ERB view instead.
@@ -14,7 +14,7 @@ h3. Changing your admin view to support multiple tabs
If your engine has a number of text areas that you'd like to display as a series of tabs instead, simply edit the admin view (under +app/views/admin/engine_name/_form.html.erb+), and add:
<erb>
-<%= render :partial => "/shared/admin/tabbed_fields",
+<%= render :partial => "/refinery/admin/tabbed_fields",
:locals => { :f => f,
:tabbed_fields => [:field, :list] } %>
</erb>
@@ -1,6 +1,6 @@
<ul>
<li>
- <%= render :partial => "/shared/admin/search", :locals => {:url => main_app.refinery_admin_images_path} %>
+ <%= render :partial => "/refinery/admin/search", :locals => {:url => main_app.refinery_admin_images_path} %>
</li>
<li>
<%= link_to t('.create_new_image'), main_app.new_refinery_admin_image_path(:dialog => true, :width => 600, :height => 300),
@@ -1,5 +1,5 @@
<div id='existing_image_area' class='dialog_area' <%= "style='display:none;'" if @image.errors.any? %>>
- <%= render :partial => '/shared/admin/search',
+ <%= render :partial => '/refinery/admin/search',
:locals => {:url => main_app.insert_refinery_admin_images_path(params.dup.delete(:image))} %>
<input type='hidden' name='selected_image' id='selected_image' />
<div id='existing_image_area_content' class='clearfix'>
@@ -60,7 +60,7 @@
</div>
<% end %>
- <%= render :partial => "/shared/admin/form_actions",
+ <%= render :partial => "/refinery/admin/form_actions",
:locals => {
:f => nil,
:cancel_url => '',
@@ -1,6 +1,6 @@
<%= form_for [:admin, @image], :url => @url_override || @image.new_record? ? main_app.refinery_admin_images_path : main_app.refinery_admin_image_path(@image), :html => {:multipart => true}, :as => :image do |f| %>
- <%= render :partial => "/shared/admin/error_messages",
+ <%= render :partial => "/refinery/admin/error_messages",
:locals => {
:object => @image,
:include_object_name => false
@@ -27,7 +27,7 @@
<input type='hidden' name='wymeditor' value='<%= params[:wymeditor] %>'>
- <%= render :partial => "/shared/admin/form_actions",
+ <%= render :partial => "/refinery/admin/form_actions",
:locals => {
:f => f,
:continue_editing => false,
@@ -25,7 +25,7 @@
<% end %>
<% else %>
<% flash.now[:error] = t('no_images_yet', :scope => 'refinery.admin.images.records').split('.').first.html_safe + "." %>
- <%= render :partial => "/shared/admin/form_actions",
+ <%= render :partial => "/refinery/admin/form_actions",
:locals => {
:f => nil,
:cancel_url => '',
@@ -5,5 +5,5 @@
:collection => @pages
} %>
</ul>
-<%= render :partial => "/shared/admin/sortable_list",
+<%= render :partial => "/refinery/admin/sortable_list",
:locals => {:continue_reordering => !!local_assigns[:continue_reordering]} %>
Oops, something went wrong.

1 comment on commit 0c001c1

Very good work.

Please sign in to comment.