Fix for structure js and css
This commit is contained in:
parent
58d52c60d3
commit
6f1eb97ace
|
@ -4,5 +4,12 @@
|
||||||
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
|
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
|
||||||
// the compiled file.
|
// the compiled file.
|
||||||
//
|
//
|
||||||
//= require new_admin
|
//= require jquery
|
||||||
|
//= require jquery_ujs
|
||||||
|
//= require bootstrap
|
||||||
|
//= require jquery.isotope.min
|
||||||
|
//= require jquery.tinyscrollbar.min
|
||||||
|
//= require orbit-1.0
|
||||||
|
//= require orbit-bar-search
|
||||||
|
//= require side_bar_history
|
||||||
//= require page_edit
|
//= require page_edit
|
|
@ -2,7 +2,13 @@
|
||||||
*This is a manifest file that'll automatically include all the stylesheets available in this directory
|
*This is a manifest file that'll automatically include all the stylesheets available in this directory
|
||||||
*and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
|
*and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
|
||||||
*the top of the compiled file, but it's generally better to create a new file per style scope.
|
*the top of the compiled file, but it's generally better to create a new file per style scope.
|
||||||
*= require new_admin
|
*= require reset
|
||||||
|
*= require_self
|
||||||
|
*= require message
|
||||||
|
*= require bootstrap
|
||||||
|
*= require style
|
||||||
|
*= require bootstrap-orbit
|
||||||
|
*= require scroll_style
|
||||||
*= require site_items
|
*= require site_items
|
||||||
*= require sidebar
|
*= require sidebar
|
||||||
*/
|
*/
|
|
@ -138,15 +138,8 @@ module ApplicationHelper
|
||||||
|
|
||||||
def page_javascripts(page)
|
def page_javascripts(page)
|
||||||
javascripts = ''
|
javascripts = ''
|
||||||
javascripts << "<script type='text/javascript' src='/static/jquery.js'></script>\n"
|
|
||||||
javascripts << "<script type='text/javascript' src='/static/jquery.cycle.all.latest.js'></script>\n"
|
javascripts << "<script type='text/javascript' src='/static/jquery.cycle.all.latest.js'></script>\n"
|
||||||
javascripts << "<script type='text/javascript' src='/static/kernel.js'></script>\n"
|
javascripts << "<script type='text/javascript' src='/static/kernel.js'></script>\n"
|
||||||
javascripts << "<script type='text/javascript' src='/assets/bootstrap.js'></script>\n"
|
|
||||||
javascripts << "<script type='text/javascript' src='/assets/jquery.tinyscrollbar.min.js'></script>\n"
|
|
||||||
javascripts << "<script type='text/javascript' src='/assets/jquery.isotope.min.js'></script>\n"
|
|
||||||
javascripts << "<script type='text/javascript' src='/assets/orbit-bar-member.js'></script>\n"
|
|
||||||
javascripts << "<script type='text/javascript' src='/assets/orbit-bar-search.js'></script>\n"
|
|
||||||
javascripts << "<script type='text/javascript' src='/assets/orbit_bar.js'></script>\n"
|
|
||||||
javascripts << "<script type='text/javascript' src='/assets/event.js'></script>\n"
|
javascripts << "<script type='text/javascript' src='/assets/event.js'></script>\n"
|
||||||
page.design.javascripts.each do |js|
|
page.design.javascripts.each do |js|
|
||||||
# javascripts << "<script type='text/javascript' src='#{js.file.url}'></script>"
|
# javascripts << "<script type='text/javascript' src='#{js.file.url}'></script>"
|
||||||
|
|
|
@ -1,5 +1 @@
|
||||||
<% content_for :sidebar do %>
|
|
||||||
<%= render 'admin/items/site_map_left_bar' %>
|
|
||||||
<% end -%>
|
|
||||||
|
|
||||||
<%= render 'show' %>
|
<%= render 'show' %>
|
Reference in New Issue