developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing id in site_editor.html.erb and comment out in parser_back_end.rb because of a loading bug

This commit is contained in:
chris2tof 2011-12-29 18:08:08 +08:00
parent d85f29e65c
commit 7ebfe3a7f9
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/views/layouts/site_editor.html.erb
View File

@ -1,14 +1,14 @@
<!DOCTYPE HTML> <!DOCTYPE HTML>
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title><%= @title || APP_CONFIG['orbit'] %></title> <title><%= @title || APP_CONFIG['orbit'] %></title>
<link rel="shortcut icon" href="/favicon.ico"> <link rel="shortcut icon" href="/favicon.ico">
<%= stylesheet_link_tag "site_editor" %> <%= stylesheet_link_tag "site_editor" %>
<%= javascript_include_tag "site_editor" %> <%= javascript_include_tag "site_editor" %>
<%= yield :page_specific_css %> <%= yield :page_specific_css %>
<%= yield :page_specific_javascript %> <%= yield :page_specific_javascript %>
<%= csrf_meta_tag %> <%= csrf_meta_tag %>
</head> </head>
<body> <body>
@ -19,9 +19,9 @@
<%= render 'devise/menu/login_items' %> <%= render 'devise/menu/login_items' %>
</div> </div>
</div> </div>
<div id="back_content"> <div id="back_content">
<div id="back_sidebar"><%= yield :sidebar %></div> <div id="back_sidebar"><%= yield :sidebar %></div>
<div class="main"><div class="main2"> <div class="main"><div id='back_main' class="main2">
<%= yield %> <%= yield %>
</div></div> </div></div>
<div class="tertiary"><%= yield :tertiary %></div> <div class="tertiary"><%= yield :tertiary %></div>

2
lib/parsers/parser_back_end.rb
View File

@ -84,7 +84,7 @@ module ParserBackEnd
c.define_tag 'content' do |tag| c.define_tag 'content' do |tag|
ret = '' ret = ''
if (tag.attributes["main"] == "true" && !page.module_app.nil?) if (tag.attributes["main"] == "true" && !page.module_app.nil?)
ret << "<div id='appfrontend' class='dymanic_load' path='#{page.app_frontend_url}'></div>" # ret << "<div id='appfrontend' class='dymanic_load' path='#{page.app_frontend_url}'></div>"
else else
part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s }
ret << "<div id='#{tag.attr['name']}' part_id='#{part.id}' class='editable' style='border:solid 1px; margin:5px; padding:5px;'>" ret << "<div id='#{tag.attr['name']}' part_id='#{part.id}' class='editable' style='border:solid 1px; margin:5px; padding:5px;'>"