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

Fix for structure: restore js and change manifests

This commit is contained in:
Christophe Vilayphiou 2012-04-25 18:17:58 +08:00
parent 876036dd20
commit 58d52c60d3
4 changed files with 42 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/assets/javascripts/side_bar_history.js
View File

@ -1,28 +1,28 @@
var history_edited = false;
// $('#back_sidebar a, #back_main a.nav').live('click',
// function () {
// $.getScript(this.href);
// history.pushState(null, document.title, this.href);
// history_edited = true;
// return false;
// }
// );
$('#back_sidebar a, #back_main a.nav').live('click',
function () {
$.getScript(this.href);
history.pushState(null, document.title, this.href);
history_edited = true;
return false;
}
);
// $('#back_main a.reload').live('click',
// function () {
// $.getScript(this.href);
// history.replaceState(null, document.title, this.href);
// history_edited = true;
// return false;
// }
// );
$('#back_main a.reload').live('click',
function () {
$.getScript(this.href);
history.replaceState(null, document.title, this.href);
history_edited = true;
return false;
}
);
// $('.form').live('submit', function () {
// $.post(this.action, $(this).serialize(), null, 'script');
// history_edited = true;
// return false;
// });
$('#back_main .form').live('submit', function () {
$.post(this.action, $(this).serialize(), null, 'script');
history_edited = true;
return false;
});
$(document).on('click', '.js_history',
function () {

5
app/assets/javascripts/site_editor.js
View File

@ -4,8 +4,5 @@
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// the compiled file.
//
//= require jquery
//= require jquery_ujs
//= require page_edit
//= require side_bar_history
//= require new_admin
//= require page_edit

4
app/assets/stylesheets/site_editor.css.erb
View File

@ -2,9 +2,7 @@
*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
*the top of the compiled file, but it's generally better to create a new file per style scope.
*= require reset
*= require_self
*= require message
*= require new_admin
*= require site_items
*= require sidebar
*/

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

@ -9,31 +9,30 @@
<![endif]-->
<%= stylesheet_link_tag "site_editor" %>
<%= javascript_include_tag "site_editor" %>
<%= yield :page_specific_css %>
<%= yield :page_specific_javascript %>
<%= csrf_meta_tag %>
</head>
<body>
<!--
<header id="back_banner_link" class="fixed clear" >
<nav id="back_orbit">
<span>Orbit Icon</span>
<%= render 'layouts/drop_down_menu' %>
</nav>
<div class="hmenu">
<%= render 'devise/menu/login_items' %>
<div class="lang"><%= render 'layouts/lang_menu' %></div>
<%= render 'layouts/orbit_bar' %>
<nav id="main-sidebar" class="my_scroll">
<div class="scrollbar">
<div class="track">
<div class="thumb">
<div class="end"></div>
</div>
</div>
</div>
</header>
-->
<div class="viewport">
<div id='back_sidebar' class="overview">
<ul class="nav nav-list">
<%= yield :sidebar %>
</ul>
</div>
</div>
</nav>
<div id="main-wrap">
<div id="main-sidebar"><%= yield :sidebar %></div>
<div class="main"><div id='back_main' class="main2">
<div id='back_main'>
<%= yield %>
</div></div>
<div class="tertiary"><%= yield :tertiary %></div>
<div id="back_footer"><p><%= APP_CONFIG['ruling_digital'] %></p></div>
</div>
</div>
</body>
</html>