@@ -146,7 +146,9 @@ class RowsController < ApplicationController
format.html { redirect_to(rows_url) }
format.xml { head :ok }
format.js {
- page.call "Row.fix_first", row.section
+ render :update do |page|
+ page.call "Row.fix_first", row.section
+ end
}
end
rescue
app/controllers/rows_controller.rb
@@ -112,7 +112,7 @@ class Row < ActiveRecord::Base
add_count.times do
new_column = self.columns.create(:jivepage => jivepage)
new_column.create_box!("textblock", 1,
- :content => "Click here to change text.")
+ :content => "Click here to change text.") if new_column.first?
end
end
app/models/row.rb
@@ -1,6 +1,7 @@
<% column ||= @column %>
<div id="<%= dom_id(column, "content") %>" class="column">
<%= tool_shed(column) %>
+ <% if column.boxes.blank? %> <% end %>
<%= render :partial => "boxes/box", :collection => column.boxes %>
</div>
app/views/columns/_content.html.erb
@@ -1,5 +1,5 @@
<!-- This gets moved to a row on demand -->
-<div id="home_column_tool_shed" style="display:none">
+<div id="home-column_tool_shed" style="display:none">
<div id="all_column_tools">
<div id="insert_tool">
<table id="insert_menu" cellspacing="0" cellpadding="0">
@@ -22,23 +22,19 @@
</div>
</div>
-<div id="home_row_tool_shed" style="display:none">
- <div id="all_row_tools">
- <div id="top_tool" class="tool">
- <ul id="top_menu" cellspacing="0" cellpadding="0">
- <li class="<%= Row::FULL %>"><%= link_to_function "full", "Row.format(this)" %></li>
- <li class="<%= Row::HALVES %>"><%= link_to_function "halves", "Row.format(this)" %></li>
- <li class="<%= Row::THIRDS %>"><%= link_to_function "thirds", "Row.format(this)" %></li>
- <li class="<%= Row::LEFT %>"><%= link_to_function "left", "Row.format(this)" %></li>
- <li class="<%= Row::RIGHT %>"><%= link_to_function "right", "Row.format(this)" %></li>
- </ul>
- </div>
- <div id="left_tool" class="tool">
- <ul id="left_menu" cellspacing="0" cellpadding="0">
- <li class="up"><%= link_to_function "^^", "Row.up()" %></li>
- <li class="drop"><%= link_to_function "x", "Row.drop()" %></li>
+<div id="home-row_tool_shed" style="display:none;">
+ <div id="all_row_tools">
+ <div id="row_tool" class="tool">
+ <ul id="row_menu">
+ <li class="up"><%= link_to_function "↑", "Row.up()" %></li>
+ <li class="down"><%= link_to_function "↓", "Row.down()" %></li>
<li class="insert"><%= link_to_function "+", "Row.insert()" %></li>
- <li class="down"><%= link_to_function "vv", "Row.down()" %></li>
+ <li class="drop"><%= link_to_function "X", "Row.drop()" %></li>
+ <li class="<%= Row::FULL %>"><%= link_to_function "full", "Row.format(this)" %></li>
+ <li class="<%= Row::HALVES %>"><%= link_to_function "halves", "Row.format(this)" %></li>
+ <li class="<%= Row::THIRDS %>"><%= link_to_function "thirds", "Row.format(this)" %></li>
+ <li class="<%= Row::LEFT %>"><%= link_to_function "left", "Row.format(this)" %></li>
+ <li class="<%= Row::RIGHT %>"><%= link_to_function "right", "Row.format(this)" %></li>
</ul>
</div>
</div>
app/views/jivepages/_tool_shed.html.erb
@@ -5,7 +5,7 @@
<%= rows_for(:body, @jivepage) %>
<% content_for(:footer) do %>
-<blockquote>
+<!-- <blockquote> -->
<%= rows_for(:footer, @jivepage) %>
<%= link_to('View this page', jivepage_path(@jivepage)) %>
<br/>
@@ -20,7 +20,7 @@
<% form_for Jivepage.new, :jivepage do %>
<%= submit_tag "New page" %>
<% end %>
-</blockquote>
+<!-- </blockquote> -->
<%= render :partial => "jivepages/tool_shed" %>
<% end %>
app/views/jivepages/edit.html.erb
@@ -4,16 +4,23 @@
<head>
<% @jivepage ||= Jivepage.new({:sidebar => "none"}) %>
<title><%= h(@jivepage && @jivepage.title ? @jivepage.title : controller.action_name) %> : jivepages</title>
+
<% asset_path = "/plugin_assets/jivepages" %>
- <link rel="stylesheet" href="<%= asset_path %>/stylesheets/reset-fonts-grids.yui251.css" type="text/css">
- <link rel="stylesheet" href="<%= asset_path %>/stylesheets/jivepages.css" type="text/css">
+ <% %w{reset-fonts-grids.yui251 tabs jivepages}.each do |lib| %>
+ <link rel="stylesheet" href="<%= asset_path %>/stylesheets/<%= lib %>.css" type="text/css">
+ <% end %>
<%= javascript_include_tag :defaults %>
- <%= javascript_include_tag "#{asset_path}/javascripts/util", "#{asset_path}/javascripts/jivepages" %>
+ <% %w{util jivepages jquery jquery/ui.core.js jquery/ui.tabs.js}.each do |lib| %>
+ <%= javascript_include_tag "#{asset_path}/javascripts/#{lib}" %>
+ <% end %>
+ <%= javascript_tag %{
+ var $j = jQuery.noConflict();
+ } %>
</head>
<body>
<div id="<%= @jivepage.layout || "doc" %>" class="jivepage <%= @jivepage.skin %> <%= controller.action_name %>">
- <%= render :partial => "jivepages/structure_controls" if controller.action_name == "edit" %>
+ <%= render :partial => "jivepages/menu" if controller.action_name == "edit" %>
<div id="hd">
<div id="header_section" class="yui-b">
<%= yield :header %>
app/views/layouts/jivepages.html.erb
@@ -5,7 +5,7 @@
first %>">
<% unless (no_tool ||= false) %>
- <%= tool_shed(row) %>
+ <%= tool_shed(row) %>
<% end %>
<div id="<%= dom_id(row, 'container') %>">
app/views/rows/_row.html.erb
@@ -1,2 +1,2 @@
-<span id="<%= dom_id(row, "row_tool_shed") %>" class="row_tool_shed">
-</span>
+<div class="row_menu_stub"><a class="row_menu_stub_a">*</a><span id="<%= dom_id(row, "row_tool_shed") %>" class="row_tool_shed">
+</span></div>
app/views/rows/_tool_shed.html.erb
e085dea7d57746c1e47ae3db648921ab2f4db10f
Mark Anderson
wayoutwest@gmail.com
http://github.com/pmark/jivepages/commit/a3b7ac7423e102fa9cc1086ec11f3f72b7261508
a3b7ac7423e102fa9cc1086ec11f3f72b7261508
2008-06-07T00:58:03-07:00
2008-06-07T00:58:03-07:00
Much better row menu; Main menu with tabs for Page, Site, Permissions, Collaborators, Visitors.
dc93b27779d1adb64df064b69b4055c9729bf1c7
Mark Anderson
wayoutwest@gmail.com