refinerycms-core 0.9.9.13 → 0.9.9.14

data/app/views/admin/_javascripts.html.erb

@@ -1,6 +1,6 @@
 <%
   js_caching = Rails.root.writable? and RefinerySetting.find_or_set(:use_resource_caching, true)
-  login = defined?(login) ? login : login?
+  login = login? unless defined?(login)
 -%>
 <%= yield :before_javascript_libraries -%>
 <%= javascript_include_tag 'refinery/i18n' -%>

data/app/views/welcome.html.erb

@@ -3,7 +3,7 @@
   <%=t('.remember_admin_location')%>
 </p>
 <p>
-  <strong>http://<%= request.host %>/refinery</strong>
+  <strong><%= [request.protocol, request.host_with_port, '/refinery'].join %></strong>
 </p>
 <p>
   <%= t('.lets_start') %>

data/lib/generators/templates/config/database.yml.mysql

@@ -1,5 +1,5 @@
 login: &login
-  adapter: mysql
+  adapter: mysql2
   host: localhost
   username: root
   password:
@@ -13,7 +13,7 @@ test: &test
   <<: *login
 
 production: &production
-  adapter: mysql
+  adapter: mysql2
   host: localhost
   database: your_production_database
   username: your_production_database_login

data/lib/refinery/application.rb

@@ -6,6 +6,10 @@ module Refinery
     class << self
 
       def refinery!
+        ::Refinery.config.before_inclusion_procs.each do |proc|
+          proc.call if proc.respond_to?(:call)
+        end
+
         ::ApplicationHelper.send :include, ::Refinery::ApplicationHelper
 
         [::ApplicationController, ::Admin::BaseController].each do |c|
@@ -15,7 +19,7 @@ module Refinery
 
         ::Admin::BaseController.send :include, ::Refinery::Admin::BaseController
 
-        ::Refinery.config.on_attach_procs.each do |proc|
+        ::Refinery.config.after_inclusion_procs.each do |proc|
           proc.call if proc.respond_to?(:call)
         end
       end

data/lib/refinery/configuration.rb

@@ -1,12 +1,20 @@
 module Refinery
   class Configuration
 
-    def on_attach_procs
-      @@on_attach_procs ||= []
+    def after_inclusion_procs
+      @@after_inclusion_procs ||= []
     end
 
-    def on_attach(&blk)
-      on_attach_procs << blk if blk
+    def after_inclusion(&blk)
+      after_inclusion_procs << blk if blk
+    end
+
+    def before_inclusion_procs
+      @@before_inclusion_procs ||= []
+    end
+
+    def before_inclusion(&blk)
+      before_inclusion_procs << blk if blk
     end
 
   end

data/public/images/wymeditor/skins/refinery/html5/readme.md

@@ -0,0 +1 @@
+Labels are made using the [Visitor font](http://www.dafont.com/visitor.font), 9.5px, no anti-aliasing.

data/public/javascripts/refinery/admin.js

@@ -1132,5 +1132,5 @@ parseURL = function(url)
 };
 
 iframed = function() {
-  return (parent && parent.document.location.href != document.location.href && $.isFunction(parent.$));
+  return (parent && parent.document && parent.document.location.href != document.location.href && $.isFunction(parent.$));
 };

data/public/javascripts/wymeditor/jquery.refinery.wymeditor.js

@@ -211,7 +211,11 @@ $.extend(WYMeditor, {
     BLOCKS : new Array("address", "blockquote", "div", "dl",
      "fieldset", "form", "h1", "h2", "h3", "h4", "h5", "h6", "hr",
      "noscript", "ol", "p", "pre", "table", "ul", "dd", "dt",
-     "li", "tbody", "td", "tfoot", "th", "thead", "tr"),
+     "li", "tbody", "td", "tfoot", "th", "thead", "tr", "meter",
+     "section", "article", "aside", "details", "header", "footer",
+     "nav", "dialog", "figure", "figcaption", "address", "hgroup",
+     "mark", "time", "canvas", "audio", "video", "source", "output",
+     "progress", "ruby", "rt", "rp", "summary", "command"),
 
     KEY : {
       BACKSPACE: 8,
@@ -2449,7 +2453,7 @@ WYMeditor.XhtmlValidator = {
         "readonly":/^(readonly)$/,
         "size":/^(\d)+$/,
         "3":"src",
-        "type":/^(button|checkbox|file|hidden|image|password|radio|reset|submit|text)$/,
+        "type":/^(button|checkbox|file|hidden|image|password|radio|reset|submit|text|tel|search|url|email|datetime|date|month|week|time|datetime-local|number|range|color)$/,
         "4":"value"
       },
       "inside":"form"
@@ -3786,10 +3790,15 @@ WYMeditor.XhtmlSaxListener = function()
     "object", "ol", "optgroup", "option", "p", "pre", "q",
     "samp", "script", "select", "small", "span", "strong", "style",
     "sub", "sup", "table", "tbody", "td", "textarea", "tfoot", "th",
-    "thead", "title", "tr", "tt", "ul", "var", "extends"];
+    "thead", "title", "tr", "tt", "ul", "var", "extends", "meter",
+    "section", "article", "aside", "details", "header", "footer",
+    "nav", "dialog", "figure", "figcaption", "address", "hgroup",
+    "mark", "time", "canvas", "audio", "video", "source", "output",
+    "progress", "ruby", "rt", "rp", "summary", "command"];
 
 
-    this.inline_tags = ["br", "embed", "hr", "img", "input", "param"];
+    // Defines self-closing tags.
+    this.inline_tags = ["br", "embed", "hr", "img", "input", "param", "source", "wbr"];
 
     return this;
 };

data/public/stylesheets/wymeditor/skins/refinery/wymiframe.css

@@ -22,7 +22,7 @@
 /* basic */
   body  { background: #fff;}
 
-/* make HTML blocs visible */
+/* make HTML blocks visible */
   p,
   h1,
   h2,
@@ -34,7 +34,26 @@
   ol,
   table,
   blockquote,
-  pre       { background: transparent no-repeat 2px 2px;
+  pre,
+  article,
+  aside,
+  command,
+  details,
+  summary,
+  figure,
+  figcaption,
+  footer,
+  header,
+  hgroup,
+  mark,
+  meter,
+  nav,
+  progress,
+  ruby,
+  rt,
+  rp,
+  section,
+  time { background: transparent no-repeat 2px 2px;
           padding:8px 5px 5px;
           margin:6px 0px;
           border: 1px dotted #cccccc;
@@ -55,15 +74,34 @@
   td      { height: 1.6em; }
 
 /* labels */
-  p     { background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-p.png'); }
-  h1    { background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-h1.png'); }
-  h2    { background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-h2.png'); }
-  h3    { background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-h3.png'); }
-  h4    { background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-h4.png'); }
-  h5    { background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-h5.png'); }
-  h6    { background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-h6.png'); }
-  blockquote{ background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-blockquote.png'); }
-  pre     { background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-pre.png'); }
+  p           { background-image: url('/images/wymeditor/skins/refinery/html5/p.png'); }
+  h1          { background-image: url('/images/wymeditor/skins/refinery/html5/h1.png'); }
+  h2          { background-image: url('/images/wymeditor/skins/refinery/html5/h2.png'); }
+  h3          { background-image: url('/images/wymeditor/skins/refinery/html5/h3.png'); }
+  h4          { background-image: url('/images/wymeditor/skins/refinery/html5/h4.png'); }
+  h5          { background-image: url('/images/wymeditor/skins/refinery/html5/h5.png'); }
+  h6          { background-image: url('/images/wymeditor/skins/refinery/html5/h6.png'); }
+  blockquote  { background-image: url('/images/wymeditor/skins/refinery/html5/blockquote.png'); }
+  pre         { background-image: url('/images/wymeditor/skins/refinery/html5/pre.png'); }
+  meter       { background-image: url('/images/wymeditor/skins/refinery/html5/meter.png'); }
+  nav         { background-image: url('/images/wymeditor/skins/refinery/html5/nav.png'); }
+  ruby        { background-image: url('/images/wymeditor/skins/refinery/html5/ruby.png'); }
+  rt          { background-image: url('/images/wymeditor/skins/refinery/html5/rt.png'); }
+  rp          { background-image: url('/images/wymeditor/skins/refinery/html5/rp.png'); }
+  article     { background-image: url('/images/wymeditor/skins/refinery/html5/article.png'); }
+  aside       { background-image: url('/images/wymeditor/skins/refinery/html5/aside.png'); }
+  command     { background-image: url('/images/wymeditor/skins/refinery/html5/command.png'); }
+  details     { background-image: url('/images/wymeditor/skins/refinery/html5/details.png'); }  
+  summary     { background-image: url('/images/wymeditor/skins/refinery/html5/summary.png'); }
+  figure      { background-image: url('/images/wymeditor/skins/refinery/html5/figure.png'); }
+  figcaption  { background-image: url('/images/wymeditor/skins/refinery/html5/figcaption.png'); }
+  footer      { background-image: url('/images/wymeditor/skins/refinery/html5/footer.png'); }
+  header      { background-image: url('/images/wymeditor/skins/refinery/html5/header.png'); }
+  hgroup      { background-image: url('/images/wymeditor/skins/refinery/html5/hgroup.png'); }
+  mark        { background-image: url('/images/wymeditor/skins/refinery/html5/mark.png'); }
+  progress    { background-image: url('/images/wymeditor/skins/refinery/html5/progress.png'); }
+  section     { background-image: url('/images/wymeditor/skins/refinery/html5/section.png'); }
+  time        { background-image: url('/images/wymeditor/skins/refinery/html5/time.png'); }
 
 /* specific HTML elements */
 	caption	 { text-align: left; }
@@ -93,4 +131,26 @@
 
   img.selected_by_wym {
     border: 1px dashed #22a7f2;
+  }
+  
+  article,
+  aside,
+  command,
+  details,
+  summary,
+  figure,
+  figcaption,
+  footer,
+  header,
+  hgroup,
+  mark,
+  meter,
+  nav,
+  progress,
+  ruby,
+  rt,
+  rp,
+  section,
+  time {
+    display: block;
   }

data/refinerycms-core.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-core}
-  s.version           = %q{0.9.9.13}
+  s.version           = %q{0.9.9.14}
   s.summary           = %q{Core engine for Refinery CMS}
   s.description       = %q{The core of Refinery CMS. This handles the common functionality and is required by most engines}
-  s.date              = %q{2011-03-28}
+  s.date              = %q{2011-03-31}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
   s.require_paths     = %w(lib)
   s.executables       = %w()
 
-  s.add_dependency 'refinerycms-base',            '~> 0.9.9.13'
-  s.add_dependency 'refinerycms-settings',        '~> 0.9.9.13'
+  s.add_dependency 'refinerycms-base',            '~> 0.9.9.14'
+  s.add_dependency 'refinerycms-settings',        '~> 0.9.9.14'
   s.add_dependency 'refinerycms-generators',      '~> 1.0'
   s.add_dependency 'acts_as_indexed',             '~> 0.7'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
@@ -259,6 +259,36 @@ Gem::Specification.new do |s|
     'public/images/wymeditor/skins/refinery/arrow_redo.png',
     'public/images/wymeditor/skins/refinery/arrow_undo.png',
     'public/images/wymeditor/skins/refinery/eye.png',
+    'public/images/wymeditor/skins/refinery/html5',
+    'public/images/wymeditor/skins/refinery/html5/article.png',
+    'public/images/wymeditor/skins/refinery/html5/aside.png',
+    'public/images/wymeditor/skins/refinery/html5/blockquote.png',
+    'public/images/wymeditor/skins/refinery/html5/command.png',
+    'public/images/wymeditor/skins/refinery/html5/details.png',
+    'public/images/wymeditor/skins/refinery/html5/figcaption.png',
+    'public/images/wymeditor/skins/refinery/html5/figure.png',
+    'public/images/wymeditor/skins/refinery/html5/footer.png',
+    'public/images/wymeditor/skins/refinery/html5/h1.png',
+    'public/images/wymeditor/skins/refinery/html5/h2.png',
+    'public/images/wymeditor/skins/refinery/html5/h3.png',
+    'public/images/wymeditor/skins/refinery/html5/h4.png',
+    'public/images/wymeditor/skins/refinery/html5/h5.png',
+    'public/images/wymeditor/skins/refinery/html5/h6.png',
+    'public/images/wymeditor/skins/refinery/html5/header.png',
+    'public/images/wymeditor/skins/refinery/html5/hgroup.png',
+    'public/images/wymeditor/skins/refinery/html5/mark.png',
+    'public/images/wymeditor/skins/refinery/html5/meter.png',
+    'public/images/wymeditor/skins/refinery/html5/nav.png',
+    'public/images/wymeditor/skins/refinery/html5/p.png',
+    'public/images/wymeditor/skins/refinery/html5/pre.png',
+    'public/images/wymeditor/skins/refinery/html5/progress.png',
+    'public/images/wymeditor/skins/refinery/html5/readme.md',
+    'public/images/wymeditor/skins/refinery/html5/rp.png',
+    'public/images/wymeditor/skins/refinery/html5/rt.png',
+    'public/images/wymeditor/skins/refinery/html5/ruby.png',
+    'public/images/wymeditor/skins/refinery/html5/section.png',
+    'public/images/wymeditor/skins/refinery/html5/summary.png',
+    'public/images/wymeditor/skins/refinery/html5/time.png',
     'public/images/wymeditor/skins/refinery/iframe',
     'public/images/wymeditor/skins/refinery/iframe/lbl-blockquote.png',
     'public/images/wymeditor/skins/refinery/iframe/lbl-h1.png',

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.13
+  version: 0.9.9.14
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 +13:00
+date: 2011-03-31 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.13
+        version: 0.9.9.14
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -35,7 +35,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.13
+        version: 0.9.9.14
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -339,6 +339,35 @@ files:
 - public/images/wymeditor/skins/refinery/arrow_redo.png
 - public/images/wymeditor/skins/refinery/arrow_undo.png
 - public/images/wymeditor/skins/refinery/eye.png
+- public/images/wymeditor/skins/refinery/html5/article.png
+- public/images/wymeditor/skins/refinery/html5/aside.png
+- public/images/wymeditor/skins/refinery/html5/blockquote.png
+- public/images/wymeditor/skins/refinery/html5/command.png
+- public/images/wymeditor/skins/refinery/html5/details.png
+- public/images/wymeditor/skins/refinery/html5/figcaption.png
+- public/images/wymeditor/skins/refinery/html5/figure.png
+- public/images/wymeditor/skins/refinery/html5/footer.png
+- public/images/wymeditor/skins/refinery/html5/h1.png
+- public/images/wymeditor/skins/refinery/html5/h2.png
+- public/images/wymeditor/skins/refinery/html5/h3.png
+- public/images/wymeditor/skins/refinery/html5/h4.png
+- public/images/wymeditor/skins/refinery/html5/h5.png
+- public/images/wymeditor/skins/refinery/html5/h6.png
+- public/images/wymeditor/skins/refinery/html5/header.png
+- public/images/wymeditor/skins/refinery/html5/hgroup.png
+- public/images/wymeditor/skins/refinery/html5/mark.png
+- public/images/wymeditor/skins/refinery/html5/meter.png
+- public/images/wymeditor/skins/refinery/html5/nav.png
+- public/images/wymeditor/skins/refinery/html5/p.png
+- public/images/wymeditor/skins/refinery/html5/pre.png
+- public/images/wymeditor/skins/refinery/html5/progress.png
+- public/images/wymeditor/skins/refinery/html5/readme.md
+- public/images/wymeditor/skins/refinery/html5/rp.png
+- public/images/wymeditor/skins/refinery/html5/rt.png
+- public/images/wymeditor/skins/refinery/html5/ruby.png
+- public/images/wymeditor/skins/refinery/html5/section.png
+- public/images/wymeditor/skins/refinery/html5/summary.png
+- public/images/wymeditor/skins/refinery/html5/time.png
 - public/images/wymeditor/skins/refinery/iframe/lbl-blockquote.png
 - public/images/wymeditor/skins/refinery/iframe/lbl-h1.png
 - public/images/wymeditor/skins/refinery/iframe/lbl-h2.png