refinerycms 0.9.6.34 → 0.9.7

data/vendor/plugins/pages/config/routes.rb

@@ -1,8 +1,8 @@
 ActionController::Routing::Routes.draw do |map|
   map.resources :pages
 
-  map.namespace(:admin) do |admin|
-    admin.resources :pages
+  map.namespace(:admin, :path_prefix => 'refinery') do |admin|
+    admin.resources :pages, :collection => {:update_positions => :post}
     admin.resources :page_parts
 
     admin.resources :pages_dialogs, :as => "pages/dialogs", :controller => :page_dialogs,

data/vendor/plugins/pages/rails/init.rb

@@ -1,8 +1,10 @@
 Refinery::Plugin.register do |plugin|
   plugin.title = "Pages"
+  plugin.name = "refinery_pages"
+  plugin.directory = "pages"
   plugin.description = "Manage content pages"
   plugin.version = 1.0
-  plugin.menu_match = /admin\/page(_dialog|_part)?s$/
+  plugin.menu_match = /(refinery|admin)\/page(_dialog|_part)?s$/
   plugin.activity = {
     :class => Page,
     :url_prefix => "edit",
@@ -10,4 +12,6 @@ Refinery::Plugin.register do |plugin|
     :created_image => "page_add.png",
     :updated_image => "page_edit.png"
   }
+  # this tells refinery where this plugin is located on the filesystem and helps with urls.
+  plugin.directory = directory
 end

data/vendor/plugins/pages/readme.md

@@ -0,0 +1,156 @@
+# Pages
+
+![Refinery Pages](http://refinerycms.com/system/images/0000/0656/pages.png)
+
+## About
+
+One core part of Refinery is Pages. Plugins such as News and Inquiries hook to pages. The menu is rendered based off the structure of your pages.
+
+Pages have one key thing about them that is unique - page parts.
+
+## Page Parts
+
+![Refinery Page Parts](http://refinerycms.com/system/images/0000/0586/editing-page.png)
+
+### What are they?
+
+Think of a page part is a single piece of content on your page. At [Resolve Digital](http://www.resolvedigital.co.nz) we often simply use ``body`` and ``side_body``. One is for the main content and one is for the content which goes on a side bit of the page to display other information.
+
+### Default Page Parts
+
+You can change what the default page parts are called or add more by editing the "Default Page Parts" setting. This is a serialized array of names. The default looks like this
+
+    ---
+    - Body
+    - Side Body
+
+Edit this setting to suit your taste.
+
+### Adding Page Parts for Specific Pages
+
+You can add extra page parts to your pages by setting the "New Page Parts" to ``true``.
+
+Now do this
+
+* Edit the page you want to add a part to
+* Click the little "+" icon up by the page part tabs
+* Type the name of your new part and hit add.
+
+_Note: in the user-facing front end we call them "content sections" not "page parts"._
+
+## Page Options
+
+### Draft/Published
+
+You can have draft and published pages. This is controlled by checking and unchecking the "Save as Draft" field on the page form, when editing the page.
+
+### Custom Title
+
+There are three options for how the page title will be rendered on the front end.
+
+* ``None``: will just default to the page title
+* ``Text``: allows you to have a different name for the page in the backend to the front end (sometimes good for SEO)
+* ``Image``: If your designer is using a custom non-standard web font, this is ideal. Bang the image of your title right in there (_we don't recommend this though! Standard web fonts are always a good idea_)
+
+### Show in Menu
+
+You can hide a page from the navigation if you like by unchecking "show in menu". This is good for extra reference pages or even pages you might want to link someone up to directly but not "advertise" the pages existence on the menu.
+
+### Custom URL
+
+This allows you to make your page not link to a normal page but make it show something else. This could be a donation link to a completely different site or as Refinery uses it, you might want to link to another plugin.
+
+The "contact us" page for example has a Custom URL of ``/contact``, this is because we want it to load the inquiries form from the inquiries plugin instead and we have this ``map.new_inquiry '/contact', :controller => "inquiries", :action => "new"`` in the routes.
+
+### WYMeditor (the visual editor)
+
+Refinery is backed by [WYMeditor](http://www.wymeditor.org/)
+
+It's a standards compliant editor that we've trimmed to only have what we feel is absolutely necessary. When you're editing the content in a page part you're using [WYMeditor](http://www.wymeditor.org/).
+
+We have since modified the source code of WYMeditor to allow for a lot of new features like our custom dialogues however it is all based on the release: WYMeditor 0.5 rc1.
+
+You can also switch to "source" view and edit XHTML manually if the visual editor is not playing nice.
+
+### Custom Selectable Styles in WYMeditor
+
+![Refinery Page Editor Styles](http://refinerycms.com/system/images/0000/0596/editing-page-style.png)
+
+Some sites require a little more than just your standard bold and heading controls. This is where the "css" style drop down comes in handy.
+
+It allows your users to select a style you define. You need to edit/create a CSS file called ``theme.css``.
+
+This file should be located in ``/public/stylesheets/themes.css``
+
+Inside that file you define your styles like this
+
+    .category-name-style-name {
+      // apply your CSS rules here
+    }
+
+For example, if I wanted to add a style that allowed my users to highlight their text a light yellow colour, I would put this
+
+    .text-highlight-yellow {
+      background: LightYellow;
+    }
+
+Now edit ``public/javascripts/admin.js``. We're going to need to tell WYMeditor that we have some new styles it should load when the editor is loaded.
+
+Currently your ``admin.js`` file will have something like this
+
+    var custom_wymeditor_boot_options = {
+
+    };
+
+If we open ``public/javascripts/boot_wym.js`` we can see this inside which is the default:
+
+    , classesItems: [
+      {name: 'text-align', rules:['left', 'center', 'right', 'justify'], join: '-'}
+      , {name: 'image-align', rules:['left', 'right'], join: '-'}
+      , {name: 'font-size', rules:['small', 'normal', 'large'], join: '-'}
+    ]
+
+Let's just breakdown a single WYMeditor line and understand it:
+
+    {name: 'font-size', rules:['small','normal','large'], join: '-'}
+
+``font-size`` is the name of the category and ``small``, ``normal``, ``large`` are the actual styles. So for this to match up with the styles in my theme.css file the class name has to be:
+
+    .font-size-small { // CSS rules here }
+    .font-size-normal { // CSS rules here }
+    .font-size-large { // CSS rules here }
+
+So going back to our text highlighting style above, we make the new style show up in the editor by changing our ``admin.js`` file to:
+
+    var custom_wymeditor_boot_options = {
+      classesItems: [
+        {name: 'text-align', rules:['left', 'center', 'right', 'justify'], join: '-'}
+        , {name: 'image-align', rules:['left', 'right'], join: '-'}
+        , {name: 'font-size', rules:['small','normal','large'], join: '-'}
+        , {name: 'text-highlight', rules:['yellow'], join: '-'}
+      ]
+    }
+
+### Dialogs that show from WYMeditor
+
+![Refinery Page Editor Link Dialog](http://refinerycms.com/system/images/0000/0636/link-dialog.png)
+
+## Page Link dialog
+
+The link dialog lets you link in several different ways:
+
+* To an internal page
+* To an external page
+* To an email address
+* To a resource you've uploaded in the Resources tab.
+
+## Insert Image dialog
+
+Simply lets you select from an existing image found in the Images tab or upload a new one right within the dialog.
+
+## Refinery Default Pages
+
+Some pages you have to keep in order for Refinery to stay fully functional:
+
+* Page not found - the default 404 page
+* Down for maintenance - renders when you're site is being updated.

data/vendor/plugins/refinery/app/controllers/admin/refinery_core_controller.rb

@@ -1,8 +1,10 @@
 class Admin::RefineryCoreController < Admin::BaseController
 
   def update_plugin_positions
-    params[:menu].each do |plugin_title|
-      current_user.plugins.find_by_title(plugin_title).update_attribute(:position, params[:menu].index(plugin_title))
+    params[:menu].each_with_index do |plugin_name, index|
+      if (plugin = current_user.plugins.find_by_name(plugin_name))
+        plugin.update_attribute(:position, index)
+      end
     end
     render :nothing => true
   end

data/vendor/plugins/refinery/app/controllers/refinery/fast_controller.rb

@@ -0,0 +1,7 @@
+class Refinery::FastController < ActionController::Base
+
+  def wymiframe
+    render :template => "/wymiframe", :layout => false
+  end
+
+end

data/vendor/plugins/refinery/app/views/admin/_head.html.erb

@@ -1,13 +1,46 @@
-<% use_caching = RefinerySetting.find_or_set(:use_resource_caching, false) -%>
+<%
+  # Internet Explorer is fine with JS caching, but cache CSS and kaboom.
+  # Would be great if someone could fix this?
+  js_caching = RefinerySetting.find_or_set(:use_resource_caching, Rails.root.join('public', 'javascripts', 'cache').writable?)
+  css_caching = js_caching && request.env['HTTP_USER_AGENT'] !~ /MSIE/
+-%>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<% if request.env['HTTP_USER_AGENT'] =~ /MSIE/%>
+  <!--[if lt IE 9]>
+    <%= javascript_include_tag('http://html5shiv.googlecode.com/svn/trunk/html5.js') %>
+  <![endif]-->
+<% end %>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title><%= RefinerySetting.find_or_set(:site_name, 'Company Name') %> - Refinery</title>
-  <%= stylesheet_link_tag 'refinery/refinery', 'refinery/ui', 'refinery/tooltips', "wymeditor/skins/refinery/skin", :cache => (use_caching ? "cache/refinery" : false) %>
-  <%= render :partial => "/shared/admin/head_before_javascript_libraries" -%>
-  <%= jquery_include_tags(use_caching) %>
-  <%= javascript_include_tag 'jquery/jquery.corner.js', :cache => (use_caching ? "cache/jquery-plugins" : false) %>
+
+  <%= stylesheet_link_tag 'refinery/site_bar',
+                          'refinery/refinery',
+                          'refinery/ui',
+                          'refinery/tooltips',
+                          'wymeditor/skins/refinery/skin',
+                          :cache => (css_caching ? "cache/refinery" : false) %>
+
+  <%= yield :head_before_javascript_libraries -%>
+
+  <%= jquery_include_tags(:caching => js_caching) %>
+
+  <%= javascript_include_tag 'jquery/jquery.corner.js',
+                             'jquery/jquery.textTruncate.js',
+                             'jquery/jquery.html5-placeholder-shim.js',
+                             'jquery/jquery.timers.js',
+                             :cache => (js_caching ? "cache/jquery-plugins" : false) %>
+
+  <%= javascript_include_tag 'refinery/i18n' %>
+  <script type='text/javascript'>I18n.locale = '<%= I18n.locale %>';</script>
+
   <%= yield :head_after_javascript_libraries %>
-  <%= javascript_include_tag 'admin', 'wymeditor/jquery.refinery.wymeditor.js', 'refinery/boot_wym', 'refinery/admin', :cache => (use_caching ? "cache/admin" : false) %>
-  <%= javascript_include_tag "http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js" if RefinerySetting.find_or_set(:show_firebug_lite, false) -%>
+
+  <%= javascript_include_tag 'wymeditor/jquery.refinery.wymeditor.js',
+                             'admin',
+                             'refinery/boot_wym',
+                             'refinery/admin',
+                             :cache => (js_caching ? "cache/admin" : false) %>
+
+  <%= "<!--[if lt IE 8]>#{stylesheet_link_tag 'refinery/ie'}<![endif]-->".html_safe if request.env['HTTP_USER_AGENT'] =~ /MSIE/ %>
   <%= yield :head %>
-</head>
+</head>

data/vendor/plugins/refinery/app/views/admin/_menu.html.erb

@@ -1,19 +1,18 @@
-<ul id="menu">
+<nav id="menu">
   <% Refinery::Plugins.active.in_menu.each do |plugin| -%>
-    <li class='tab' id='plugin_<%= plugin.title %>'>
-      <%= link_to plugin.title, plugin.url, :class => (plugin.highlighted?(params) ? "active" : "") %>
-    </li>
+    <%= link_to plugin.title, plugin.url,
+                :class => (plugin.highlighted?(params) ? "active" : ""),
+                :id => "plugin_#{plugin.name}" %>
   <% end -%>
-  <% if Refinery::Plugins.active.in_menu.many? -%>
-    <li>
-      <%= link_to "&nbsp;", "", :id => "menu_reorder", :title => "Reorder menu" %>
-      <%= link_to "&nbsp;", "", :id => "menu_reorder_done", :title => "I'm done reordering the menu", :style => "display: none;" %>
-    </li>
-  <% end %>
-  <li id='logout'>
-    <%= link_to "Log out", logout_url %>
-  </li>
-</ul>
+  <% if Refinery::Plugins.active.in_menu.many? and RefinerySetting.find_or_set(:refinery_enable_backend_reordering, true) -%>
+    <%= link_to refinery_icon_tag('arrow_switch.png'), "",
+                :id => "menu_reorder",
+                :title => t('.reorder_menu') %>
 
+    <%= link_to refinery_icon_tag('tick.png'), "",
+                :id => "menu_reorder_done",
+                :title => t('.reorder_menu_done'),
+                :style => "display: none;" %>
+  <% end %>
+</nav>
 <input type='hidden' id='admin_authenticity_token' value='<%= form_authenticity_token %>' />
-

data/vendor/plugins/refinery/app/views/admin/_menu_tab.html.erb

@@ -0,0 +1,4 @@
+<li class='tab' id='plugin_<%= menu_tab.name %>' name='plugin[<%= menu_tab.name %>]'>
+  <%= link_to t('plugins.' + menu_tab.name + '.title', :default => menu_tab.title), menu_tab.url,
+              :class => (menu_tab.highlighted?(params) ? "active" : nil) -%>
+</li>

data/vendor/plugins/refinery/app/views/layouts/admin.html.erb

@@ -4,11 +4,17 @@
   <body<%= " class='login'" unless logged_in? %><%= " class='splash'" if logged_in? and action_name == "index" %>>
     <%= render :partial => '/shared/site_bar'  %>
     <div id='tooltip_container'></div>
+    <div id='header'>
+      <div id='header_content'>
+        <% if logged_in? %>
+          <%= render :partial => "/admin/menu" %>
+        <% else %>
+          <h1><%= yield :header %></h1>
+        <% end %>
+      </div>
+    </div>
     <div id="page_container">
       <div id="page">
-        <div class="clearfix" id="header">
-          <%= render :partial => "/admin/menu" if logged_in? %>
-        </div>
         <div id="content" class="clearfix">
           <div id="flash_container">
             <%= render :partial => "/shared/message" %>
@@ -16,7 +22,6 @@
           <%= yield %>
         </div>
       </div>
-      <%= render :partial => "/admin/footer" if RefinerySetting.find_or_set(:show_backend_branding, false) %>
     </div>
   </body>
-</html>
+</html>

data/vendor/plugins/refinery/app/views/layouts/application.html.erb

@@ -2,17 +2,17 @@
 <html>
   <%= render :partial => "/shared/head" %>
   <body>
-    <%= render :partial => "/shared/site_bar" if logged_in? %>
+    <%= render :partial => "/shared/site_bar" %>
     <%= render :partial => "/shared/ie6check" if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%>
     <div id='page_container'>
-      <div id='page' class='clearfix'>
+      <div id='page'>
         <div id='header' class='clearfix'>
           <%= render :partial => "/shared/header" %>
         </div>
         <div id='body' class='clearfix'>
           <%= yield %>
         </div>
-        <div id='footer' class='clearfix'>
+        <div id='footer'>
           <%= render :partial => "/shared/footer" %>
         </div>
       </div>

data/vendor/plugins/refinery/app/views/shared/_content_page.html.erb

@@ -1,36 +1,35 @@
 <%
   show_empty_sections ||= false
   remove_automatic_sections ||= false
+  hide_sections ||= []
 
-  body_content_title = page_title if (body_content_title = yield :body_content_title).blank? and !show_empty_sections and !remove_automatic_sections
-  body_content_left = @page[:body] if (body_content_left = yield :body_content_left).blank? and !show_empty_sections and !remove_automatic_sections
-  body_content_right = @page[:side_body] if (body_content_right = yield :body_content_right).blank? and !show_empty_sections and !remove_automatic_sections
+  sections = [
+    {:yield => :body_content_title, :fallback => page_title, :id => 'body_content_page_title', :title => true},
+    {:yield => :body_content_left, :fallback => @page.present? ? @page[:body] : nil},
+    {:yield => :body_content_right, :fallback => @page.present? ? @page[:side_body] : nil}
+  ].reject {|section| hide_sections.include?(section[:yield]) }
 
-  extra_body_content_classes = []
-  extra_body_content_classes << "no_title" if body_content_title.blank?
-  extra_body_content_classes << "no_left" if body_content_left.blank?
-  extra_body_content_classes << "no_right" if body_content_right.blank?
+  css = []
+  sections.each do |section|
+    dom_id = (section[:id] ||= section[:yield].to_s)
+    section[:html] = (yield(section[:yield]))
+
+    if section[:html].blank? and !show_empty_sections and !remove_automatic_sections
+      section[:html] = section[:fallback]
+    end
+
+    unless section[:html].blank?
+      unless section[:title]
+        section[:html] = "<div class='clearfix' id='#{dom_id}'>#{section[:html]}</div>".html_safe
+      else
+        section[:html] = "<h1 id='#{dom_id}'>#{section[:html]}</h1>".html_safe
+      end
+    else
+      css << "no_#{dom_id}"
+    end
+  end
 -%>
-<%= render :partial => "/shared/submenu" if !admin? and (show_submenu ||= true) and RefinerySetting.find_or_set(:show_submenu_on_content_pages, true) %>
-<div id='body_content' class='clearfix<%= " #{extra_body_content_classes.join(" ")}" if extra_body_content_classes.any? %>'>
-<% if body_content_title.present? or (show_empty_sections and !remove_automatic_sections) -%>
-  <h1 id='body_content_page_title'>
-    <%= body_content_title %>
-  </h1>
-<% end -%>
-<% if body_content_left.present? or (show_empty_sections and !remove_automatic_sections) -%>
-  <div id='body_content_left' class='clearfix'>
-    <%= body_content_left %>
-  </div>
-<% end -%>
-<% if body_content_right.present? or (show_empty_sections and !remove_automatic_sections)  -%>
-  <div id='body_content_right' class='clearfix'>
-    <%= body_content_right %>
-  </div>
-<% end -%>
+<div id='body_content' class='clearfix<%= " #{css.join(' ')}" if css.any? %>'>
+  <%= sections.collect {|s| s[:html] }.join("\n") %>
 </div>
-<% unless @page.live? -%>
-  <div class='page_not_live'>
-    This page is NOT live for public viewing.
-  </div>
-<% end -%>
+<%= render :partial => '/shared/draft_page_message' unless @page.nil? or @page.live? -%>

data/vendor/plugins/refinery/app/views/shared/_draft_page_message.html.erb

@@ -0,0 +1,3 @@
+<div class='page_not_live'>
+  This page is NOT live for public viewing.
+</div>

data/vendor/plugins/refinery/app/views/shared/_google_analytics.html.erb

@@ -1,4 +1,5 @@
-<% unless (page_code = RefinerySetting[:analytics_page_code]) == 'UA-xxxxxx-x' -%>
+<% if ((page_code = RefinerySetting[:analytics_page_code].to_s.strip).present? &&
+        page_code != 'UA-xxxxxx-x') -%>
   <script type="text/javascript">
     var _gaq = _gaq || [];
     _gaq.push(['_setAccount', '<%= page_code %>']);

data/vendor/plugins/refinery/app/views/shared/_head.html.erb

@@ -2,6 +2,7 @@
 <head>
   <title><%= browser_title(yield(:title)) %></title>
   <%= render :partial => 'shared/google_analytics' unless local_request? %>
+  <%= "<!--[if lt IE 9]>#{javascript_include_tag('http://html5shiv.googlecode.com/svn/trunk/html5.js')}<![endif]-->".html_safe if request.env['HTTP_USER_AGENT'] =~ /MSIE/ %>
   <%= stylesheet_link_tag "application", "formatting", :theme => theme %>
   <%= stylesheet_link_tag "theme" %>
   <%= stylesheet_link_tag "home", :theme => theme if home_page? %>