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

Change code for new page slide.js

Browse Source 
Conflicts:
	app/views/admin/pages/_form.html.erb
This commit is contained in:
chris committed 2013-10-19 19:14:14 +08:00
1 parent f694134150
commit d2602a3a84
35 files changed
+625 -98
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/views/admin/ad_banners/edit.js.erb
+1 -1
View File
@@ -1 +1 @@
$('#view-page .content').html("<%= j render 'edit' %>");
$('.view-page .content').html("<%= j render 'edit' %>");
app/views/admin/ad_banners/new.js.erb
+1 -1
View File
@@ -1 +1 @@
$('#view-page .content').html("<%= j render 'new' %>");
$('.view-page .content').html("<%= j render 'new' %>");
app/views/admin/categories/_category.html.erb
+1 -1
View File
@@ -6,7 +6,7 @@
<div class="quick-edit">
<ul class="nav nav-pills">
<% if is_admin?%>
<li><%= link_to t(:edit), edit_admin_module_app_category_path(@module_app_id, category), class: "open-slide" %></li>
<li><%= link_to t(:edit), edit_admin_module_app_category_path(@module_app_id, category), class: "open-slide", data: {title: t(:edit_category)} %></li>
<li><%= link_to show_toggle_archive_btn(category) , toggle_admin_module_app_category_path(@module_app_id, category), method: :post, remote: true, class: "archive_toggle" %></li>
<% end %>
<% if is_manager? || is_admin? %>
app/views/admin/categories/_edit.html.erb
-1
View File
@@ -1,6 +1,5 @@
<%= form_for @category, :url => admin_module_app_category_path(@module_app_id, @category), remote: true do |f| %>
<fieldset>
<legend><%= t(:edit_category) %></legend>
<%= render :partial => 'form', :locals => {:f => f} %>
</fieldset>
<div class="form-actions">
app/views/admin/categories/_index.html.erb
+1 -1
View File
@@ -13,7 +13,7 @@
<div class="bottomnav clearfix">
<div class="action pull-right">
<%= link_to content_tag(:i, nil, class: "icons-plus") + " " + t(:add), new_admin_module_app_category_path(@module_app_id), class: "btn btn-primary open-slide" %>
<%= link_to content_tag(:i, nil, class: "icons-plus") + " " + t(:add), new_admin_module_app_category_path(@module_app_id), class: "btn btn-primary open-slide", data: {title: t(:add_category)} %>
</div>
<div class="pagination pagination-centered">
<%= paginate @categories unless @categories.blank? %>
app/views/admin/categories/_new.html.erb
-1
View File
@@ -1,6 +1,5 @@
<%= form_for @category, :url => admin_module_app_categories_path(@module_app_id), remote: true do |f| %>
<fieldset>
<legend><%= t(:add_category) %></legend>
<%= render :partial => 'form', :locals => {:f => f} %>
</fieldset>
<div class="form-actions">
app/views/admin/categories/edit.js.erb
+1 -1
View File
@@ -1 +1 @@
$('#view-page .content').html("<%= j render 'edit' %>");
$('.view-page .content').html("<%= j render 'edit' %>");
app/views/admin/categories/new.js.erb
+1 -1
View File
@@ -1 +1 @@
$('#view-page .content').html("<%= j render 'new' %>");
$('.view-page .content').html("<%= j render 'new' %>");
app/views/admin/items/_node.html.erb
+4 -4
View File
@@ -17,10 +17,10 @@
<%= link_to node.title, node.url %>
<% end %>
<div class="item-menu">
<%= link_to content_tag(:i, nil, class: "icon-eye-open"), eval("admin_#{node.class.to_s.downcase}_path(node)"), class: "view-page open-slide tip", title: t(:view), data: {title: t(:view)} if node.class.to_s.eql?('Page') %>
<%= link_to content_tag(:i, nil, class: "icon-edit"), eval("edit_admin_#{node.class.to_s.downcase}_path(node)"), class: "open-slide tip", title: t(:edit), data: {title: t(:edit)} %>
<%= link_to content_tag(:i, nil, class: "icons-newspaper"), new_admin_page_path(:parent_id => node.id), class: "open-slide tip", title: t(:add_page), data: {title: t(:add_page)} if node.class.to_s.eql?('Page') %>
<%= link_to content_tag(:i, nil, class: "icon-link"), new_admin_link_path(:parent_id => node.id), class: "open-slide tip", title: t(:add_link), data: {title: t(:add_link)} if node.class.to_s.eql?('Page') %>
<%= link_to content_tag(:i, nil, class: "icon-eye-open"), eval("admin_#{node.class.to_s.downcase}_path(node)"), class: "view-page open-slide tip", title: t(:view), data: {title: node.title} if node.class.to_s.eql?('Page') %>
<%= link_to content_tag(:i, nil, class: "icon-edit"), eval("edit_admin_#{node.class.to_s.downcase}_path(node)"), class: "open-slide tip #{node.class.to_s.downcase} edit", title: t(:edit), data: {title: t(:edit)} %>
<%= link_to content_tag(:i, nil, class: "icons-newspaper"), new_admin_page_path(:parent_id => node.id), class: "open-slide tip page", title: t(:add_page), data: {title: t(:add_page)} if node.class.to_s.eql?('Page') %>
<%= link_to content_tag(:i, nil, class: "icon-link"), new_admin_link_path(:parent_id => node.id), class: "open-slide tip link", title: t(:add_link), data: {title: t(:add_link)} if node.class.to_s.eql?('Page') %>
<%= link_to content_tag(:i, nil, class: "icon-trash"), nil, rel: eval("admin_#{node.class.to_s.downcase}_path(node)"), class: "delete tip", title: t(:delete_), data: {title: t(:delete_)} unless node.root? %>
</div>
</div>
app/views/admin/items/index.html.erb
+2
View File
@@ -5,3 +5,5 @@
</ol>
<% end %>
<%= render 'layouts/delete_modal', delete_options: {remote: true} %>
<%= javascript_include_tag "lib/pageslide.js" %>
app/views/admin/links/edit.js.erb
+1 -1
View File
@@ -1 +1 @@
$('#view-page .content').html("<%= j render 'edit' %>");
$('.view-page .content').html("<%= j render 'edit' %>");
app/views/admin/links/new.js.erb
+1 -1
View File
@@ -1 +1 @@
$('#view-page .content').html("<%= j render 'new' %>");
$('.view-page .content').html("<%= j render 'new' %>");
app/views/admin/module_tags/_edit.html.erb
-1
View File
@@ -1,6 +1,5 @@
<%= form_for @tag, url: admin_module_tag_path(@tag, module_app_id: @module_app_id), remote: true do |f| %>
<fieldset>
<legend><%= t('editing.tag') %></legend>
<%= render partial: "admin/tags/form", :locals => { :f => f } %>
<div class="form-actions">
<a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a>
app/views/admin/module_tags/_index.html.erb
+1 -1
View File
@@ -8,7 +8,7 @@
<%= link_to t(:delete), '#', id: "deleteTags", class: "btn btn-danger toggable hide", rel: '' %>
<%= link_to t(:merge), '#', id: "mergerTags", class: "btn btn-success toggable hide", rel: merge_admin_module_tags_path(module_app_id: @module_app_id) %>
<%= link_to t(:remove_default), '#', id: "removeDefaults", class: "btn btn-info toggable hide", rel: '' %>
<%= link_to content_tag(:i, nil, class: "icons-plus") + " " + t(:add), new_admin_module_tag_path(module_app_id: @module_app_id), class: "btn btn-primary open-slide" %>
<%= link_to content_tag(:i, nil, class: "icons-plus") + " " + t(:add), new_admin_module_tag_path(module_app_id: @module_app_id), class: "btn btn-primary open-slide", data: {title: t(:add_tags)} %>
</div>
</div>
<!-- footer:end -->
app/views/admin/module_tags/_module_tag.html.erb
+1 -1
View File
@@ -9,7 +9,7 @@
<%= show_names_slash(module_tag) %>
</a>
<% else %>
<%= link_to edit_admin_module_tag_path(module_tag, module_app_id: @module_app_id), class: "open-slide" do %>
<%= link_to edit_admin_module_tag_path(module_tag, module_app_id: @module_app_id), class: "open-slide", data: {title: t('editing.tag')} do %>
<span class="amount"><%= get_tagging_count(module_tag) %></span>
<%= show_names_slash(module_tag) %>
<% end %>
app/views/admin/module_tags/_new.html.erb
+2 -3
View File
@@ -1,9 +1,8 @@
<div id="add-tags">
<legend>Add Tags</legend>
<ul class="nav nav-pills">
<li class="active"><a href=".set_new" data-toggle="tab">Create new</a></li>
<li><a href=".select_default" data-toggle="tab">Use Default</a></li>
<li class="active"><a href=".set_new" data-toggle="tab"><%= t(:create_) %></a></li>
<li><a href=".select_default" data-toggle="tab"><%= t(:use_default) %></a></li>
</ul>
<div class="tab-content">
app/views/admin/module_tags/edit.js.erb
+1 -1
View File
@@ -1 +1 @@
$('#view-page .content').html("<%= j render 'edit' %>");
$('.view-page .content').html("<%= j render 'edit' %>");
app/views/admin/module_tags/new.js.erb
+1 -1
View File
@@ -1 +1 @@
$('#view-page .content').html("<%= j render 'new' %>");
$('.view-page .content').html("<%= j render 'new' %>");
app/views/admin/pages/edit.js.erb
+1 -1
View File
@@ -1 +1 @@
$('#view-page .content').html("<%= j render 'edit' %>");
$('.view-page .content').html("<%= j render 'edit' %>");
app/views/admin/pages/new.js.erb
+1 -1
View File
@@ -1 +1 @@
$('#view-page .content').html("<%= j render 'new' %>");
$('.view-page .content').html("<%= j render 'new' %>");
app/views/admin/tags/_edit.html.erb
-1
View File
@@ -1,6 +1,5 @@
<%= form_for @tag, url: admin_tag_path(@tag), remote: true do |f| %>
<fieldset>
<legend><%= t('editing.tag') %></legend>
<%= render partial: "form", :locals => { :f => f } %>
<div class="form-actions">
<a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a>
app/views/admin/tags/_index.html.erb
+1 -1
View File
@@ -6,7 +6,7 @@
<%= link_to t(:delete), '#', id: "deleteTags", class: "btn btn-danger toggable hide", rel: '' %>
<%= link_to t(:merge), '#', id: "mergerTags", class: "btn btn-success toggable hide", rel: merge_admin_tags_path %>
<%= link_to t(:add_to_default), add_to_default_admin_tags_path, id: "addDefault", class: "btn btn-info toggable hide", method: :post, remote: true %>
<%= link_to content_tag(:i, nil, class: "icons-plus") + " " + t(:add), new_admin_tag_path, class: "btn btn-primary open-slide" %>
<%= link_to content_tag(:i, nil, class: "icons-plus") + " " + t(:add), new_admin_tag_path, class: "btn btn-primary open-slide", data: {title: t('new.tag')} %>
</div>
</div>
<!-- footer:end -->
app/views/admin/tags/_new.html.erb
-1
View File
@@ -1,6 +1,5 @@
<%= form_for @tag, url: admin_tags_path, remote: true do |f| %>
<fieldset>
<legend><%= t('new.tag') %></legend>
<%= render partial: "form", :locals => { :f => f } %>
<div class="form-actions">
<a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a>
app/views/admin/tags/edit.js.erb
+1 -1
View File
@@ -1 +1 @@
$('#view-page .content').html("<%= j render 'edit' %>");
$('.view-page .content').html("<%= j render 'edit' %>");
app/views/admin/tags/new.js.erb
+1 -1
View File
@@ -1 +1 @@
$('#view-page .content').html("<%= j render 'new' %>");
$('.view-page .content').html("<%= j render 'new' %>");
app/views/layouts/back_end.html.erb
+1 -7
View File
@@ -32,13 +32,7 @@
<%= yield :right_nav %>
</div>
<%= yield %>
<div id="pageslide">
<div id="view-page" class="nano" style="display:none">
<div class="content">
</div>
</div>
</div>
<%= javascript_include_tag "lib/jquery.pageslide.js" %>
<%= javascript_include_tag "lib/pageslide.js" %>
</div>
</section>
</body>
app/views/layouts/member.html.erb
+1 -7
View File
@@ -30,13 +30,7 @@
<%= yield :right_nav %>
</div>
<%= yield %>
<div id="pageslide">
<div id="view-page" class="nano" style="display:none">
<div class="content">
</div>
</div>
</div>
<%= javascript_include_tag "lib/jquery.pageslide.js" %>
<%= javascript_include_tag "lib/pageslide.js" %>
</div>
</section>
</body>
app/views/layouts/structure.html.erb
-7
View File
@@ -24,13 +24,6 @@
</div>
<% end %>
<%= yield %>
<div id="pageslide">
<div id="view-page" class="nano" style="display:none">
<div class="content">
</div>
</div>
</div>
<%= javascript_include_tag "lib/jquery.pageslide.js" %>
</div>
</section>
</body>