From 7ebfe3a7f9cff75e974413c75bba0736e5fdc9b3 Mon Sep 17 00:00:00 2001 From: chris2tof Date: Thu, 29 Dec 2011 18:08:08 +0800 Subject: [PATCH] Add missing id in site_editor.html.erb and comment out in parser_back_end.rb because of a loading bug --- app/views/layouts/site_editor.html.erb | 22 +++++++++++----------- lib/parsers/parser_back_end.rb | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/views/layouts/site_editor.html.erb b/app/views/layouts/site_editor.html.erb index b2cdf1334..f419fb028 100644 --- a/app/views/layouts/site_editor.html.erb +++ b/app/views/layouts/site_editor.html.erb @@ -1,14 +1,14 @@ - - <%= @title || APP_CONFIG['orbit'] %> - - <%= stylesheet_link_tag "site_editor" %> - <%= javascript_include_tag "site_editor" %> - <%= yield :page_specific_css %> - <%= yield :page_specific_javascript %> - <%= csrf_meta_tag %> + + <%= @title || APP_CONFIG['orbit'] %> + + <%= stylesheet_link_tag "site_editor" %> + <%= javascript_include_tag "site_editor" %> + <%= yield :page_specific_css %> + <%= yield :page_specific_javascript %> + <%= csrf_meta_tag %> @@ -19,14 +19,14 @@ <%= render 'devise/menu/login_items' %> -
+
<%= yield :sidebar %>
-
+
<%= yield %>
<%= yield :tertiary %>
- + diff --git a/lib/parsers/parser_back_end.rb b/lib/parsers/parser_back_end.rb index d11ce9b2f..ac94825fd 100644 --- a/lib/parsers/parser_back_end.rb +++ b/lib/parsers/parser_back_end.rb @@ -84,7 +84,7 @@ module ParserBackEnd c.define_tag 'content' do |tag| ret = '' if (tag.attributes["main"] == "true" && !page.module_app.nil?) - ret << "
" + # ret << "
" else part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } ret << "
"