webficient-browsercms 3.0.2 → 3.0.3

data/app/views/cms/content/show.html.erb

@@ -1,4 +1,5 @@
 <% page_title @page.page_title -%>
+<% content_for :html_head, stylesheet_link_tag('cms/content_editor') -%>
 <% if @show_toolbar -%>  
   <% flash.keep -%>
   <iframe src="<%=h cms_toolbar_path(:page_id => @page.id, :page_version => @page.version, :mode => @mode, :page_toolbar => @show_page_toolbar ? 1 : 0) %>" width="100%" height="<%= @show_page_toolbar ? 159 : 100 %>px" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" name="cms_toolbar"></iframe>

data/app/views/cms/pages/_edit_connector.html.erb

@@ -1,19 +1,31 @@
-<div class="cms_edit_connectable" style="display: block; height: auto; width: inherit; position: relative; border: 1px solid #999; margin: 1px -6px 0 -6px; padding: 25px 5px 0 5px;  background: url(/images/cms/containers/beta.png) repeat-x 0 0;">
-  <div style="display: block; width: 100%; position: absolute; top: 5px; left: 5px; height: 30px;">
-    <%= link_to image_tag("cms/pages/show_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), cms_connectable_path(connectable), :title => "View this content (#{connectable.name})" , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;"%>
-    <%= link_to image_tag("cms/pages/edit_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), edit_cms_connectable_path(connectable, :_redirect_to => @page.path), :title => "Edit this content (#{connectable.name})" , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;"%>
-    <% if @page.connectors.for_page_version(@page.version).in_container(connector.container).count > 1 %>
-      <%= link_to image_tag("cms/pages/up_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), move_up_cms_connector_path(connector), :class => "http_put", :title => "Move this content up (#{connectable.name})" , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;"%>
-      <%= link_to image_tag("cms/pages/down_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), move_down_cms_connector_path(connector), :class => "http_put", :title => "Move this content down (#{connectable.name})" , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;"%>
-    <% else %>
-      <%= image_tag("cms/pages/up_connectable_disabled.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;") %>
-      <%= image_tag("cms/pages/down_connectable_disabled.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;") %>
-    <% end %>
-    <%= link_to image_tag("cms/pages/delete_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), cms_connector_path(connector, :_redirect_to => @page.path), :class => "confirm_with_title http_delete", :title => "Remove this content from page (#{connectable.name}).  It will remain available in the Content Library." , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;"%>
+<% content_tag :div, :class => 'cms_edit_connectable' do -%>
+  <% content_tag :div, :class => 'toolbar' do -%>
+    <%= link_to image_tag("cms/pages/show_connectable.gif"), 
+          cms_connectable_path(connectable), 
+          :title => "View this content (#{connectable.name})" %>
+    <%= link_to image_tag("cms/pages/edit_connectable.gif"), 
+          edit_cms_connectable_path(connectable, :_redirect_to => @page.path), 
+          :title => "Edit this content (#{connectable.name})" %>
+    <% if @page.connectors.for_page_version(@page.version).in_container(connector.container).count > 1 -%>
+      <%= link_to image_tag("cms/pages/up_connectable.gif"), 
+            move_up_cms_connector_path(connector), 
+            :class => "http_put", 
+            :title => "Move this content up (#{connectable.name})" %>
+      <%= link_to image_tag("cms/pages/down_connectable.gif"), 
+            move_down_cms_connector_path(connector), 
+            :class => "http_put", 
+            :title => "Move this content down (#{connectable.name})" %>
+    <% else -%>
+      <%= image_tag("cms/pages/up_connectable_disabled.gif") %>
+      <%= image_tag("cms/pages/down_connectable_disabled.gif") %>
+    <% end -%>
+    <%= link_to image_tag("cms/pages/delete_connectable.gif"), 
+          cms_connector_path(connector, :_redirect_to => @page.path), 
+          :class => "confirm_with_title http_delete", 
+          :title => "Remove this content from page (#{connectable.name}).  It will remain available in the Content Library." %>
     <%= status_icon connector.status,
           :class => "published_status", 
-          :title => connector.live? ? "This content is published and can be seen by site visitors." : "This content is a draft and won't be seen by site visitors until this page is published." , 
-          :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: 0; position: absolute; top: -1px; right: 10px;" %>
-  </div>
-    <%= render_connectable connectable %>
-</div>
+          :title => connector.live? ? "This content is published and can be seen by site visitors." : "This content is a draft and won't be seen by site visitors until this page is published." %>
+  <% end -%>
+  <%= render_connectable connectable %>
+<% end %>

data/app/views/cms/pages/_edit_container.html.erb

@@ -1,11 +1,14 @@
-<div class="cms_edit_container" style="height: auto; width: inherit; background: url(/images/cms/containers/alpha.png) repeat-x 0 0; border: 1px solid #999; margin: -8px 0 0 -8px; padding: 24px 7px 1px 7px; position: relative;">
-    <div style="display: block; width: 100%; position: absolute; top: 5px; left: 5px; height: 30px;">
-      <%= link_to image_tag("cms/pages/add_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), cms_content_types_path(:connect_to_page_id => @page, :connect_to_container => name), :title => "Add new content to this container (#{name})" , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;"%>
-      <%= link_to image_tag("cms/pages/connect_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), new_cms_connector_path(:page_id => @page, :container => name), :title => "Insert existing content into this container (#{name})" , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;"%>
-      <%= image_tag "cms/#{@page.container_published?(name) ? 'published' : 'draft'}_status.gif", 
-            :class => "published_status",
-            :title => @page.container_published?(name) ? "This content is published and can be seen by site visitors." : "This content is a draft and won't be seen by site visitors until this page is published.", 
-            :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none; position: absolute; top: -1px; right: 12px;" %>
-  </div>
+<% content_tag :div, :class => 'cms_edit_container' do -%>
+  <% content_tag :div, :class =>'toolbar' do -%>
+    <%= link_to image_tag("cms/pages/add_connectable.gif"), 
+          cms_content_types_path(:connect_to_page_id => @page, :connect_to_container => name), 
+          :title => "Add new content to this container (#{name})" %>
+    <%= link_to image_tag("cms/pages/connect_connectable.gif"), 
+          new_cms_connector_path(:page_id => @page, :container => name), 
+          :title => "Insert existing content into this container (#{name})" %>
+    <%= image_tag "cms/#{@page.container_published?(name) ? 'published' : 'draft'}_status.gif", 
+          :class => "published_status",
+          :title => @page.container_published?(name) ? "This content is published and can be seen by site visitors." : "This content is a draft and won't be seen by site visitors until this page is published." %>
+  <% end -%>
   <%= content %>
-</div>
+<% end -%>

data/browsercms.gemspec

@@ -5,12 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{browsercms}
-  s.version = "3.0.2"
+  s.version = "3.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["BrowserMedia", "Webficient"]
-  s.date = %q{2009-08-24}
-  s.description = %q{browsercms}
+  s.date = %q{2009-09-04}
   s.email = %q{github@browsermedia.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -1190,6 +1189,7 @@ Gem::Specification.new do |s|
      "public/stylesheets/cms/application.css",
      "public/stylesheets/cms/block.css",
      "public/stylesheets/cms/buttons.css",
+     "public/stylesheets/cms/content_editor.css",
      "public/stylesheets/cms/content_library.css",
      "public/stylesheets/cms/content_types.css",
      "public/stylesheets/cms/dashboard.css",

data/public/stylesheets/cms/content_editor.css

@@ -0,0 +1,98 @@
+div.cms_edit_container {
+  height: auto;
+  width: inherit;
+  background: url(/images/cms/containers/alpha.png) repeat-x 0 0;
+  border: 1px solid #999;
+  margin: -8px 0 0 -8px;
+  padding: 24px 7px 1px 7px;
+  position: relative;
+}
+
+div.cms_edit_container div.toolbar {
+  display: block;
+  width: 100%;
+  position: absolute;
+  top: 5px;
+  left: 5px;
+  height: 30px;
+}
+
+div.cms_edit_container div.toolbar img {
+  text-decoration: none;
+  padding: 0;
+  background: none;
+  margin: 0;
+  float: none;
+  border: none;
+}
+
+div.cms_edit_container div.toolbar img.published_status {
+  text-decoration: none;
+  padding: 0 2px 0 0;
+  background: none;
+  margin: 0;
+  float: none;
+  border: none;
+  position: absolute;
+  top: -1px;
+  right: 12px;
+}
+
+div.cms_edit_container div.toolbar a {
+  text-decoration: none;
+  padding: 0 2px 0 0;
+  background: none;
+  margin: 0;
+  float: none;
+  border: none;
+}
+
+div.cms_edit_connectable {
+  display: block;
+  height: auto;
+  width: inherit;
+  position: relative;
+  border: 1px solid #999;
+  margin: 1px -6px 0 -6px;
+  padding: 25px 5px 0 5px;
+  background: url(/images/cms/containers/beta.png) repeat-x 0 0;
+}
+
+div.cms_edit_connectable div.toolbar {
+  display: block;
+  width: 100%;
+  position: absolute;
+  top: 5px;
+  left: 5px;
+  height: 30px;
+}
+
+div.cms_edit_connectable div.toolbar img {
+  text-decoration: none;
+  padding: 0;
+  background: none;
+  margin: 0;
+  float: none;
+  border: none;
+}
+
+div.cms_edit_connectable div.toolbar img.published_status {
+  text-decoration: none;
+  padding: 0 2px 0 0;
+  background: none;
+  margin: 0;
+  float: none;
+  border: 0;
+  position: absolute;
+  top: -1px;
+  right: 10px;
+}
+
+div.cms_edit_connectable div.toolbar a {
+  text-decoration: none;
+  padding: 0 2px 0 0;
+  background: none;
+  margin: 0;
+  float: none;
+  border: none;
+}

data/public/stylesheets/cms/page_toolbar.css

@@ -1,135 +1,148 @@
 body {
-background: #FFF url(/images/cms/toolbar_bg.png) repeat-x 0 0;
+  background: #FFF url(/images/cms/toolbar_bg.png) repeat-x 0 0;
 }
+
 #page_toolbar {
-background: #FFF url(/images/cms/page_toolbar/page_toolbar_bg.gif) repeat-x 0 0;
-height: 24px;
-text-transform: uppercase;
+  background: #FFF url(/images/cms/page_toolbar/page_toolbar_bg.gif) repeat-x 0 0;
+  height: 24px;
+  text-transform: uppercase;
 }
-.page_attribute_div {
-float: left;
-color: #EEE;
-* font-size: 8pt;
 
-height: 24px;
-padding-right: 8px;
+.page_attribute_div {
+  float: left;
+  color: #EEE;
+  * font-size: 8pt;
+  height: 24px;
+  padding-right: 8px;
 }
 
 #status_div.draft {
-background: #F00 url(/images/cms/page_toolbar/status_draft_bg.gif) repeat-x 0 0;
+  background: #F00 url(/images/cms/page_toolbar/status_draft_bg.gif) repeat-x 0 0;
 }
+
 #status_div.published {
-background: #888 url(/images/cms/page_toolbar/status_published_bg.gif) repeat-x 0 0;
+  background: #888 url(/images/cms/page_toolbar/status_published_bg.gif) repeat-x 0 0;
 }
+
 .page_attribute_div div {
-padding: 0;
+  padding: 0;
 }
 
 .page_attribute_label {
-float: left;
-margin-top: 5px;
-margin-left: 7px;
+  float: left;
+  margin-top: 5px;
+  margin-left: 7px;
 }
 
 .page_attribute_value {
-float: left;
-margin-top: 2px;
-margin-right: 5px;
-margin-left: 4px;
+  float: left;
+  margin-top: 2px;
+  margin-right: 5px;
+  margin-left: 4px;
 }
 
 .page_attribute_value_container {
-margin-top: 4px;
-margin-left: 4px;
-float: left;
-background: #FFF url(/images/cms/page_toolbar/page_toolbar_inset_bg.gif) repeat-x 0 0;
+  margin-top: 4px;
+  margin-left: 4px;
+  float: left;
+  background: #FFF url(/images/cms/page_toolbar/page_toolbar_inset_bg.gif) repeat-x 0 0;
 }
+
 .page_attribute_value_container a {
-color: #EEE;
-text-decoration: none;
+  color: #EEE;
+  text-decoration: none;
 }
+
 .page_attribute_value_container a:hover {
-color: blue;
-text-decoration: underline;
+  color: blue;
+  text-decoration: underline;
 }
 
-
 #draft_page_status_container {
-background: #FFF url(/images/cms/page_toolbar/page_toolbar_inset_draft_bg.gif) repeat-x 0 0;
+  background: #FFF url(/images/cms/page_toolbar/page_toolbar_inset_draft_bg.gif) repeat-x 0 0;
 }
+
 #published_page_status_container {
-margin-top: 4px;
-float: left;
-background: #FFF url(/images/cms/page_toolbar/page_toolbar_inset_published_bg.gif) repeat-x 0 0;
+  margin-top: 4px;
+  float: left;
+  background: #FFF url(/images/cms/page_toolbar/page_toolbar_inset_published_bg.gif) repeat-x 0 0;
 }
+
 .buttons a {
-* font-size: 8pt;
-color: #EEE;
-margin-top: 7px;
-text-transform: uppercase;
+  * font-size: 8pt;
+  color: #EEE;
+  margin-top: 7px;
+  text-transform: uppercase;
 }
-#visual_editor_toggle {
-float: right;
-text-transform: uppercase;
-margin-top: 12px;
-margin-right: 0px;
-color: #000;
-font-weight: bold;
 
+#visual_editor_toggle {
+  float: right;
+  text-transform: uppercase;
+  margin-top: 12px;
+  margin-right: 0px;
+  color: #000;
+  font-weight: bold;
 }
+
 #visual_editor_toggle div {
-float: left;
+  float: left;
 }
+
 .visual_editor_label {
-margin-right: 5px;
-margin-top: 6px;
+  margin-right: 5px;
+  margin-top: 6px;
 }
+
 .visual_editor_value_container {
-background: url(/images/cms/page_toolbar/visual_editor_state_bg.gif) no-repeat 0 0;
-width: 35px;
-height: 23px;
-padding: 0;
-color: #EEE;
+  background: url(/images/cms/page_toolbar/visual_editor_state_bg.gif) no-repeat 0 0;
+  width: 35px;
+  height: 23px;
+  padding: 0;
+  color: #EEE;
 }
+
 .visual_editor_toggle_container {
-height: 20px;
-padding: 0;
-margin-left: 4px;
-margin-top: 1px;
+  height: 20px;
+  padding: 0;
+  margin-left: 4px;
+  margin-top: 1px;
 }
-.visual_editor_value_container span, .visual_editor_toggle_container a{
-display: block;
-text-align: center;
-float: left;
-height: 15px;
-text-decoration: none;
-}
-.visual_editor_value_container span{
-padding-top: 5px;
-width: 34px;
-margin: 1px 0 0 0;
+
+.visual_editor_value_container span, .visual_editor_toggle_container a {
+  display: block;
+  text-align: center;
+  float: left;
+  height: 15px;
+  text-decoration: none;
 }
-.visual_editor_toggle_container a.sm_button{
-margin: 0;
-width: 62px;
-	padding: 5px 0 0 0;
-	background: url(/images/cms/buttons/sm_button.gif) no-repeat top right;
-	color: #FFF;
-	text-decoration: none;
-	margin-right: 0px;
+
+.visual_editor_value_container span {
+  padding-top: 5px;
+  width: 34px;
+  margin: 1px 0 0 0;
 }
-.visual_editor_toggle_container a.sm_button span{
-padding-left: 2px;
+
+.visual_editor_toggle_container a.sm_button {
+  margin: 0;
+  width: 62px;
+  padding: 5px 0 0 0;
+  background: url(/images/cms/buttons/sm_button.gif) no-repeat top right;
+  color: #FFF;
+  text-decoration: none;
+  margin-right: 0px;
 }
 
+.visual_editor_toggle_container a.sm_button span {
+  padding-left: 2px;
+}
 
 .visual_editor_toggle_container a.sm_button:hover {
-	background: url(/images/cms/buttons/sm_button_h.gif) no-repeat top right;
+  background: url(/images/cms/buttons/sm_button_h.gif) no-repeat top right;
 }
 
 .buttons .publish_button {
 }
 
 .spacer {
-margin-left: 3px;
+  margin-left: 3px;
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webficient-browsercms
 version: !ruby/object:Gem::Version 
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors: 
 - BrowserMedia
@@ -10,11 +10,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-24 00:00:00 -07:00
+date: 2009-09-04 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: browsercms
+description: 
 email: github@browsermedia.com
 executables: []
 
@@ -1197,6 +1197,7 @@ files:
 - public/stylesheets/cms/application.css
 - public/stylesheets/cms/block.css
 - public/stylesheets/cms/buttons.css
+- public/stylesheets/cms/content_editor.css
 - public/stylesheets/cms/content_library.css
 - public/stylesheets/cms/content_types.css
 - public/stylesheets/cms/dashboard.css