Items UI changes
This commit is contained in:
chris2tof committed
1 parent
247b8ec4dc
commit
a695b9ad29
31 files changed
+141
-41
No files matched your search
@@ -9,14 +9,16 @@ module Admin::ItemHelper
|
||||
when 'Link'
|
||||
dest = admin_link_path(node)
|
||||
end
|
||||
ret << "<ul>"
|
||||
ret << "<li>"
|
||||
ret << (link_to node.name, dest)
|
||||
ret << ' | ' << (link_to t('admin.code'), eval("edit_admin_#{node._type.downcase}_path(node, :code => true)")) if node._type.eql?('Page')
|
||||
ret << ' | ' << (link_to t('admin.new_page'), new_admin_page_path(:parent_id => node.id)) if node._type.eql?('Page')
|
||||
ret << ' | ' << (link_to t('admin.new_link'), new_admin_link_path(:parent_id => node.id)) if node._type.eql?('Page')
|
||||
ret << ' | ' << (link_to t('admin.new_page'), new_admin_page_path(:parent_id => node.id), :class => 'new_page') if node._type.eql?('Page')
|
||||
ret << ' | ' << (link_to t('admin.new_link'), new_admin_link_path(:parent_id => node.id), :class => 'new_link') if node._type.eql?('Page')
|
||||
ret << ' | ' << (link_to t(:delete), eval("delete_admin_#{node._type.downcase}_path(node, :authenticity_token => form_authenticity_token)"), :confirm => t('sure?'), :class => 'delete')
|
||||
ret << render_children(node)
|
||||
ret << "</li>"
|
||||
ret << "</ul>"
|
||||
end
|
||||
ret.html_safe
|
||||
end
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<% content_for :sidebar do %>
|
||||
<div id='sidebar'><%= render 'admin/items/site_map_left_bar' %></div>
|
||||
<%= render 'admin/items/site_map_left_bar' %>
|
||||
<% end -%>
|
||||
|
||||
<% content_for :page_specific_javascript do %>
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
$('#main').empty();
|
||||
$('#panel_main').empty();
|
||||
switch ("<%= escape_javascript(@item._type)%>") {
|
||||
case 'Link':
|
||||
$('#main').append("<%= escape_javascript(render(:partial => 'admin/links/show')) %>");
|
||||
$('#panel_main').append("<%= escape_javascript(render(:partial => 'admin/links/show')) %>");
|
||||
break;
|
||||
case 'Page':
|
||||
$('#main').append("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>");
|
||||
$('#panel_main').append("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>");
|
||||
break;
|
||||
};
|
||||
@@ -1,3 +1,3 @@
|
||||
$('#sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>");
|
||||
$('#main').html("<%= escape_javascript(render(:partial => 'admin/links/show')) %>");
|
||||
$('#panel_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>");
|
||||
$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/links/show')) %>");
|
||||
history.pushState(null, document.title, "<%= escape_javascript(admin_link_url(@item)) %>");
|
||||
@@ -1 +1 @@
|
||||
$('#sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>");
|
||||
$('#panel_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>");
|
||||
@@ -1,5 +1,5 @@
|
||||
<% content_for :sidebar do %>
|
||||
<div id='sidebar'><%= render 'admin/items/site_map_left_bar' %></div>
|
||||
<%= render 'admin/items/site_map_left_bar' %>
|
||||
<% end -%>
|
||||
|
||||
<%= render 'edit' %>
|
||||
@@ -1 +1 @@
|
||||
$('#main').html("<%= escape_javascript(render(:partial => 'admin/links/edit')) %>");
|
||||
$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/links/edit')) %>");
|
||||
@@ -1,5 +1,5 @@
|
||||
<% content_for :sidebar do %>
|
||||
<div id='sidebar'><%= render 'admin/items/site_map_left_bar' %></div>
|
||||
<%= render 'admin/items/site_map_left_bar' %>
|
||||
<% end -%>
|
||||
|
||||
<%= render 'new' %>
|
||||
@@ -1 +1 @@
|
||||
$('#main').html("<%= escape_javascript(render(:partial => 'admin/links/new')) %>");
|
||||
$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/links/new')) %>");
|
||||
@@ -1,5 +1,5 @@
|
||||
<% content_for :sidebar do %>
|
||||
<div id='sidebar'><%= render 'admin/items/site_map_left_bar' %></div>
|
||||
<%= render 'admin/items/site_map_left_bar' %>
|
||||
<% end -%>
|
||||
|
||||
<%= render 'show' %>
|
||||
@@ -1 +1 @@
|
||||
$('#main').html("<%= escape_javascript(render(:partial => 'show')) %>");
|
||||
$('#panel_main').html("<%= escape_javascript(render(:partial => 'show')) %>");
|
||||
@@ -1,2 +1,2 @@
|
||||
$('#main').html("<%= escape_javascript(render(:partial => 'admin/links/show')) %>");
|
||||
$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/links/show')) %>");
|
||||
history.pushState(null, document.title, "<%= escape_javascript(admin_link_url(@item)) %>");
|
||||
@@ -1,5 +1,5 @@
|
||||
<% content_for :sidebar do %>
|
||||
<div id='sidebar'><%= render 'admin/items/site_map_left_bar' %></div>
|
||||
<%= render 'admin/items/site_map_left_bar' %>
|
||||
<% end -%>
|
||||
|
||||
<%= render @partial %>
|
||||
@@ -1 +1 @@
|
||||
$('#main').html("<%= escape_javascript(render(:partial => @partial)) %>");
|
||||
$('#panel_main').html("<%= escape_javascript(render(:partial => @partial)) %>");
|
||||
@@ -1,2 +1,2 @@
|
||||
$('#main').html("<%= escape_javascript(render(:partial => 'admin/pages/show' )) %>");
|
||||
$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/pages/show' )) %>");
|
||||
history.pushState(null, document.title, "<%= escape_javascript(admin_page_url(@item)) %>");
|
||||
@@ -1,3 +1,3 @@
|
||||
$('#sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>");
|
||||
$('#main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>");
|
||||
$('#panel_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>");
|
||||
$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>");
|
||||
history.pushState(null, document.title, "<%= escape_javascript(admin_page_url(@item)) %>");
|
||||
@@ -1 +1 @@
|
||||
$('#sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>");
|
||||
$('#panel_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>");
|
||||
@@ -1,3 +1,7 @@
|
||||
<% content_for :sidebar do %>
|
||||
<%= render 'admin/items/site_map_left_bar' %>
|
||||
<% end -%>
|
||||
|
||||
<h1><%= t('admin.editing_page') %></h1>
|
||||
|
||||
<%= form_for @item, :url => admin_page_path(@item) do |f| %>
|
||||
|
||||
@@ -1 +1 @@
|
||||
$('#main').html("<%= escape_javascript(render(:partial => @code ? 'edit_code' : 'edit')) %>");
|
||||
$('#panel_main').html("<%= escape_javascript(render(:partial => @code ? 'edit_code' : 'edit')) %>");
|
||||
@@ -1,5 +1,5 @@
|
||||
<% content_for :sidebar do %>
|
||||
<div id='sidebar'><%= render 'admin/items/site_map_left_bar' %></div>
|
||||
<%= render 'admin/items/site_map_left_bar' %>
|
||||
<% end -%>
|
||||
|
||||
<%= render 'new' %>
|
||||
@@ -1 +1 @@
|
||||
$('#main').html("<%= escape_javascript(render(:partial => 'admin/pages/new')) %>");
|
||||
$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/pages/new')) %>");
|
||||
@@ -1 +1,5 @@
|
||||
<% content_for :sidebar do %>
|
||||
<%= render 'admin/items/site_map_left_bar' %>
|
||||
<% end -%>
|
||||
|
||||
<%= render @code ? 'show_code' : 'show' %>
|
||||
@@ -1 +1 @@
|
||||
$('#main').html("<%= escape_javascript(render(:partial => 'show')) %>");
|
||||
$('#panel_main').html("<%= escape_javascript(render(:partial => 'show')) %>");
|
||||
@@ -1,2 +1,2 @@
|
||||
$('#main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>");
|
||||
$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>");
|
||||
history.pushState(null, document.title, "<%= escape_javascript(admin_page_url(@item)) %>");
|
||||
@@ -5,8 +5,7 @@
|
||||
<title><%= @title || 'R4 rescue title' %></title>
|
||||
<link rel="shortcut icon" href="/favicon.ico">
|
||||
<%= yield :page_specific_link %>
|
||||
<%= stylesheet_link_tag "easy", "main", "devise", "content", :media => "screen, projection" %>
|
||||
<%= stylesheet_link_tag "easyprint", :media => "print" %>
|
||||
<%= stylesheet_link_tag "content", :media => "screen, projection" %>
|
||||
<%= javascript_include_tag :ckeditor %>
|
||||
|
||||
<%= javascript_include_tag "jquery", "jquery-ui", "rails", "easy", "application", :cache => 'all' %>
|
||||
@@ -18,8 +17,8 @@
|
||||
<%= csrf_meta_tag %>
|
||||
</head>
|
||||
<body>
|
||||
<div id="header">
|
||||
<ul id="nav">
|
||||
<div id="panel_header">
|
||||
<ul id="panel_nav">
|
||||
<li><%= link_to t('homepage'), root_path %></li>
|
||||
<li><%= link_to t('admin.item'), admin_items_path %></li>
|
||||
<li><%= link_to t('admin.layout'), admin_layouts_path %></li>
|
||||
@@ -28,7 +27,7 @@
|
||||
<li><%= link_to t('admin.user_role'), admin_user_role_models_path %></li>
|
||||
<li><%= link_to t('admin.translation'), admin_translations_path %></li>
|
||||
</ul>
|
||||
<ul class="hmenu">
|
||||
<ul class="panel_hmenu">
|
||||
<li>
|
||||
<%= render 'layouts/lang_menu' %>
|
||||
</li>
|
||||
@@ -36,12 +35,11 @@
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div id="content" class="content">
|
||||
<div id="sidebar" style='float: left;'><%= yield :sidebar %></div>
|
||||
<div id="main" style='float: left;'><%= yield %></div>
|
||||
<div id="panel_content" class="content">
|
||||
<div id="panel_sidebar" style='float: left;'><%= yield :sidebar %></div>
|
||||
<div id="panel_main" style='float: left;'><%= yield %></div>
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
</div>
|
||||
<div id="panel_footer"><%= yield :footer %></div>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
Reference in new issue
Block a user