refinerycms 0.9.6.33 → 0.9.6.34

data/VERSION

@@ -1 +1 @@
-0.9.6.33
+0.9.6.34

data/config/application.rb

@@ -2,7 +2,7 @@
 RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 
 # Specified gem version of Refinery to use when vendor/plugins/refinery/lib/refinery.rb is not present.
-REFINERY_GEM_VERSION = '0.9.6.33' unless defined? REFINERY_GEM_VERSION
+REFINERY_GEM_VERSION = '0.9.6.34' unless defined? REFINERY_GEM_VERSION
 
 # Boot Rails
 require File.join(File.dirname(__FILE__), 'boot')

data/public/javascripts/refinery/admin.js

@@ -9,6 +9,7 @@ $(document).ready(function(){
 
   // focus first field in an admin form.
   $('form input[type=text]:first').focus();
+  $('#content').corner('2px');
 });
 
 init_delete_confirmations = function() {

data/public/stylesheets/refinery/application.css

@@ -1,3 +1,6 @@
+body {
+  margin: 0px;
+}
 #page {
   padding: 20px;
   width: 1000px;

data/public/stylesheets/refinery/refinery.css

@@ -132,7 +132,8 @@ a {
 }
 
 .splash #content {
-  background: url('/images/refinery/admin_bg.png') repeat-y;
+  background-image: url('/images/refinery/admin_bg.png');
+  background-repeat: repeat-y;
 }
 #content h1 {
   font-size: 18px;
@@ -160,49 +161,63 @@ a:hover {
   text-align: left;
   width: 990px;
 }
-#page_container #page {
-  background: #f6f5f4;
+
+body.login #page_container #page, #page_container.splash #page, #content {
+  background-color: #f6f5f4;
 }
 
-#page_container.login {
+body.login #page_container, body.login #site_bar_content, body.login #site_bar_branding  {
   width: 590px;
 }
 
-#page_container.login #page h1 {
+body.login #header {
+  display: none;
+}
+
+body.login #editor_switch {
+  display: none;
+}
+
+body.login #site_bar_branding img {
+  float: right;
+  margin-top: 10px;
+}
+
+#page_container .login #page h1 {
   margin: 0;
   padding: 5px;
   font-size: 20px;
   line-height:22px
 }
 
-#page_container.login div.session_username, #page_container.login div.session_password {
+body.login #page_container div.session_username, body.login #page_container div.session_password {
   float: left;
 }
 
-#page_container.login div.session_password {
+body.login #page_container div.session_password {
   margin-left: 25px;
 }
 
-#page_container.login div.remember_me {
+body.login #page_container div.remember_me {
   margin-top: 12px;
 }
 
-#page_container.login div.forgot_password {
+body.login #page_container div.forgot_password {
   float: right;
 
   margin-top: 11px;
   margin-right: 3px;
 }
 
-#page_container.login div.remember_me label {
+body.login #page_container div.remember_me label {
   display: inline;
 }
 
-#page_container.login div.session_username input, #page_container.login div.session_password input {
+body.login #page_container div.session_username input, body.login #page_container div.session_password input {
   width: 260px;
 }
 
-#page_container.login div.actions {
+body.login #page_container div.actions {
   margin-top: 12px;
 }
 
@@ -293,13 +308,12 @@ pre {
 }
 
 #header {
-  background: url('/images/refinery/header_background.png') #50504B repeat-x bottom;
   padding: 26px 15px 0 15px;
   position: relative;
-  height: 93px;
+  height: 18px;
 }
 
-#page_container.login #header {
+body.login #page_container #header {
   padding: 42px 15px 42px 15px;
   height: 35px;
 }
@@ -397,7 +411,7 @@ pre {
 }
 
 #records li {
-  padding: 5px;
+  padding: 2px 5px;
   vertical-align: top;
   margin-bottom: 2px;
 }
@@ -644,7 +658,7 @@ label.stripped {
   line-height: 16px;
 }
 .actions a * {
-  padding: 4px;
+  padding: 4px 4px 1px 4px;
 }
 
 .actions a:hover {
@@ -922,6 +936,16 @@ ul#menu.reordering_menu li a {
   cursor: move;
 }
 
+#site_bar {
+  background: none;
+}
+
+
+#site_bar_content {
+  width: 958px;
+  margin: 0px auto;
+}
+
 .clearfix:after {
   content:".";
   display:block;

data/public/stylesheets/refinery/site_bar.css

@@ -0,0 +1,38 @@
+#editor_switch {
+  float: left;
+}
+
+#site_bar_branding {
+  float: right;
+}
+
+#site_bar, #site_bar * {
+  color: #a7a79d;
+  font-family: Arial;
+  font-size: 13px;
+}
+
+#site_bar a:hover {
+  color: white;
+}
+
+#site_bar * {
+  line-height: 40px;
+}
+
+#site_bar {
+  height: 40px;
+  background: url('/images/refinery/page_bg.png') repeat;
+  padding: 0px 15px;
+}
+
+#site_bar img {
+  vertical-align: middle;
+  margin-top: -5px;
+  padding-left: 10px;
+}
+
+#site_bar_branding a {
+  border-bottom: none;
+  
+}

data/themes/demolicious/stylesheets/formatting.css

@@ -18,7 +18,7 @@ h1, #body_content h1, h1#body_content_page_title {
     font-family: "Trebuchet MS", Trebuchet;
 }
 #body_content_left p, #body_content_right p {
-    margin-bottom: 23px;
+    margin-bottom: 12px;
 }
 h2, h3 {
     color: #8f8f8f;

data/themes/demolicious/views/layouts/application.html.erb

@@ -1,7 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
   <%= render :partial => "/shared/head", :locals => {:theme => true} %>
   <body>
+    <%= render :partial => "/shared/site_bar" if logged_in? %>
     <%= render :partial => "/shared/ie6check" if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%>
     <div id='page_container'>
       <div id='page' class='clearfix'>

data/themes/hemingway/views/layouts/application.html.erb

@@ -1,5 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
   <%= render :partial => "/shared/head", :locals => {:theme => true} %>
   <body>
     <div id="header">

data/todo.md

@@ -2,6 +2,10 @@
 
 What are some of the known things that need to be done?
 
+## Internationalization
+
+We've got a branch for it and we need to merge that into the master.
+
 ## Tests
 
 * Add unit test coverage for user, user plugin and user mailer
@@ -10,14 +14,4 @@ What are some of the known things that need to be done?
 
 # Rails 3.0 Support
 
-We've started an effort to move to Rails 3.0 - that just needs to be completed.
-
-# Improve the Generator
-
-We need to have support for build in Refinery field types like "image". So I could run
-
-  ./script/generate refinery staff name:string bio:text mugshot:image
-  
-And it will automatically create a form field that pops open the image picker on the staff form.
-
-There is now a partial to easily call an image picker.
+We've started an effort to move to Rails 3.0 - that just needs to be completed.

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

@@ -3,7 +3,7 @@ ActionController::Routing::Routes.draw do |map|
   map.resources :inquiries, :collection => {:thank_you => :get}
 
   map.namespace(:admin) do |admin|
-    admin.resources :inquiries, :member => {:toggle_status => :get}
+    admin.resources :inquiries
     admin.resources :inquiry_settings
   end
 end

data/vendor/plugins/inquiries/inquiries.md

@@ -22,7 +22,7 @@ Go into your 'Inquiries' tab in the Refinery admin area and click on "Update who
 
 Go into your 'Inquiries' tab in the Refinery admin area and click on "Edit confirmation email"
 
-## But I don't ant a Contact Form how do I kill it?
+## But I don't want a Contact Form how do I kill it?
 
 Your contact form loads because you have a page in your site that is told to not just render a normal page, but load the contact form instead.
 

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

@@ -0,0 +1,7 @@
+<div id="footer">
+  <%= link_to image_tag("#{"http://www.resolvedigital.com/images/" unless local_request?}refinery/resolve_digital_footer_logo.png", :alt => "Resolve Digital"), "http://www.resolvedigital.com", :target => "_blank", :id => "footer_logo" %>
+  <p>
+    Refinery built by <%= link_to "Resolve Digital", "http://www.resolvedigital.com", :target => "_blank" %>.
+    Copyright &copy; 2005-<%= Time.now.year %> Resolve Digital
+  </p>
+</div>

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

@@ -10,4 +10,4 @@
   <%= 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) -%>
   <%= yield :head %>
-</head>
+</head>

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

@@ -1,16 +1,12 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
   <%= render :partial => "/admin/head" %>
-  <body>
+  <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="page_container"<%= " class='login'" unless logged_in? %><%= " class='splash'" if logged_in? and action_name == "index" %>>
+    <div id="page_container">
       <div id="page">
         <div class="clearfix" id="header">
-          <h1>
-            <%= just_installed? ? "Welcome to Refinery" : link_to(RefinerySetting[:site_name], admin_root_url) %>
-          </h1>
-          <%= link_to "View public site", "/", :target => "_blank", :id => "site_link" if logged_in? %>
-          <%= link_to image_tag("#{"http://www.refinerycms.com/images/" unless local_request?}refinery/logo.png", :alt => "Refinery (tm) Content Manager"), "http://www.refinerycms.com", :target => "_blank", :id => "logo" -%>
           <%= render :partial => "/admin/menu" if logged_in? %>
         </div>
         <div id="content" class="clearfix">
@@ -20,15 +16,7 @@
           <%= yield %>
         </div>
       </div>
-      <% if RefinerySetting.find_or_set(:show_backend_branding, false) %>
-        <div id="footer">
-          <%= link_to image_tag("#{"http://www.resolvedigital.com/images/" unless local_request?}refinery/resolve_digital_footer_logo.png", :alt => "Resolve Digital"), "http://www.resolvedigital.com", :target => "_blank", :id => "footer_logo" %>
-          <p>
-            Refinery built by <%= link_to "Resolve Digital", "http://www.resolvedigital.com", :target => "_blank" %>.
-            Copyright &copy; 2005-<%= Time.now.year %> Resolve Digital
-          </p>
-        </div>
-      <% end %>
+      <%= 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

@@ -1,7 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
   <%= render :partial => "/shared/head" %>
   <body>
+    <%= render :partial => "/shared/site_bar" if logged_in? %>
     <%= render :partial => "/shared/ie6check" if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%>
     <div id='page_container'>
       <div id='page' class='clearfix'>

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

@@ -0,0 +1,18 @@
+<div id='site_bar'>
+  <div id='site_bar_content' class='clearfix'>
+    <div id='editor_switch'>
+      <% if admin? %>
+        <%= link_to "Switch to live view", "/" %>
+      <% else %>
+        <%= link_to "Switch to editor view", admin_root_url %>
+      <% end %>
+    </div>
+    <div id='site_bar_branding'>
+      <%= RefinerySetting[:site_name] %>
+      <%= link_to image_tag("#{"http://refinerycms.com/images/" unless local_request?}refinery/logo-tiny.png",
+                    :alt => "Refinery (tm) Content Manager"), "http://refinerycms.com",
+                    :target => "_blank" %>
+    </div>
+  </div>
+</div>
+<%= stylesheet_link_tag('refinery/site_bar') %>

data/vendor/plugins/refinery_dialogs/app/views/layouts/admin_dialog.html.erb

@@ -1,6 +1,5 @@
-<% use_caching = RefinerySetting.find_or_set(:use_resource_caching, false) -%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
   <%= render :partial => "/admin/head" %>
   <body id='dialog_container' class='dialog'>
     <div id="flash_container">
@@ -8,4 +7,4 @@
     </div>
     <%= yield %>
   </body>
-</html>
+</html>

data/vendor/plugins/refinery_settings/app/models/refinery_setting.rb

@@ -6,7 +6,7 @@ class RefinerySetting < ActiveRecord::Base
 
   # Number of settings to show per page when using will_paginate
   def self.per_page
-    10
+    12
   end
 
   # prettier version of the name.

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 6
-  - 33
-  version: 0.9.6.33
+  - 34
+  version: 0.9.6.34
 platform: ruby
 authors: 
 - Resolve Digital
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-07 00:00:00 +12:00
+date: 2010-05-10 00:00:00 +12:00
 default_executable: 
 dependencies: []
 
@@ -131,6 +131,7 @@ files:
 - public/images/refinery/logo-medium.png
 - public/images/refinery/logo-small-medium.png
 - public/images/refinery/logo-small.png
+- public/images/refinery/logo-tiny.png
 - public/images/refinery/logo.png
 - public/images/refinery/nav-3-background.gif
 - public/images/refinery/page_bg.png
@@ -219,6 +220,7 @@ files:
 - public/stylesheets/refinery/formatting.css
 - public/stylesheets/refinery/home.css
 - public/stylesheets/refinery/refinery.css
+- public/stylesheets/refinery/site_bar.css
 - public/stylesheets/refinery/theme.css
 - public/stylesheets/refinery/tooltips.css
 - public/stylesheets/refinery/ui.css
@@ -709,6 +711,7 @@ files:
 - vendor/plugins/rails_indexes/test/rails_indexes_test.rb
 - vendor/plugins/rails_indexes/test/test_helper.rb
 - vendor/plugins/refinery/app/controllers/admin/refinery_core_controller.rb
+- vendor/plugins/refinery/app/views/admin/_footer.html.erb
 - vendor/plugins/refinery/app/views/admin/_head.html.erb
 - vendor/plugins/refinery/app/views/admin/_menu.html.erb
 - vendor/plugins/refinery/app/views/layouts/admin.html.erb
@@ -722,6 +725,7 @@ files:
 - vendor/plugins/refinery/app/views/shared/_menu.html.erb
 - vendor/plugins/refinery/app/views/shared/_menu_branch.html.erb
 - vendor/plugins/refinery/app/views/shared/_message.html.erb
+- vendor/plugins/refinery/app/views/shared/_site_bar.html.erb
 - vendor/plugins/refinery/app/views/shared/_submenu.html.erb
 - vendor/plugins/refinery/app/views/shared/_submenu_branch.html.erb
 - vendor/plugins/refinery/app/views/shared/admin/_continue_editing.html.erb