Commit 262ebb6c10db76663ccc45969dee77743c824311
1 parent
d76a2e72
check filter file, page content part, css
Showing
8 changed files
with
32 additions
and
10 deletions
| @@ -542,7 +542,7 @@ jQuery(document).ready(function(){ | @@ -542,7 +542,7 @@ jQuery(document).ready(function(){ | ||
| 542 | '<li class="dropdown-item"><a class="col-content" href="javascript;void(0);">Edit</a></li>' + | 542 | '<li class="dropdown-item"><a class="col-content" href="javascript;void(0);">Edit</a></li>' + |
| 543 | '<li class="dropdown-item"><a class="col-duplicate" href="javascript;void(0);">Duplicate</a></li>' + | 543 | '<li class="dropdown-item"><a class="col-duplicate" href="javascript;void(0);">Duplicate</a></li>' + |
| 544 | '<li class="dropdown-item"><a class="col-edit popover-link" href="javascript;void(0);">Settings</a></li>' + | 544 | '<li class="dropdown-item"><a class="col-edit popover-link" href="javascript;void(0);">Settings</a></li>' + |
| 545 | - '<li class="dropdown-item"><a class="col-remove" href="javascript;void(0);">Remove</a></li>' + | 545 | + '<li class="dropdown-item"><a class="col-remove" href="javascript;void(0);">Delete</a></li>' + |
| 546 | '</ul>'+ | 546 | '</ul>'+ |
| 547 | '</div>' + | 547 | '</div>' + |
| 548 | '</div>'; | 548 | '</div>'; |
| @@ -565,7 +565,7 @@ jQuery(document).ready(function(){ | @@ -565,7 +565,7 @@ jQuery(document).ready(function(){ | ||
| 565 | 565 | ||
| 566 | content += '<li class="dropdown-item"><a class="col-duplicate" href="javascript;void(0);">Duplicate</a></li>'; | 566 | content += '<li class="dropdown-item"><a class="col-duplicate" href="javascript;void(0);">Duplicate</a></li>'; |
| 567 | 567 | ||
| 568 | - content += '<li class="dropdown-item"><a class="row-remove" href="javascript;void(0);">Remove</a></li>'; | 568 | + content += '<li class="dropdown-item"><a class="row-remove" href="javascript;void(0);">Delete</a></li>'; |
| 569 | 569 | ||
| 570 | content += '</ul>'+ | 570 | content += '</ul>'+ |
| 571 | '</div>' + | 571 | '</div>' + |
| @@ -56,11 +56,12 @@ jQuery(document).ready(function(){ | @@ -56,11 +56,12 @@ jQuery(document).ready(function(){ | ||
| 56 | if($this.hasClass('active')){ | 56 | if($this.hasClass('active')){ |
| 57 | $this.removeClass('active'); | 57 | $this.removeClass('active'); |
| 58 | }else{ | 58 | }else{ |
| 59 | + $('.filter label').removeClass('active'); | ||
| 59 | $this.addClass('active'); | 60 | $this.addClass('active'); |
| 60 | } | 61 | } |
| 61 | - if($this.data('value') == 'all' && $this.hasClass('active')){ | ||
| 62 | - $wrapper.find(".filter label.active").not($this).removeClass('active'); | ||
| 63 | - }; | 62 | + //if($this.data('value') == 'all' && $this.hasClass('active')){ |
| 63 | + // $wrapper.find(".filter label.active").not($this).removeClass('active'); | ||
| 64 | + //}; | ||
| 64 | if($this.data('value') != 'all' && $this.hasClass('active')){ | 65 | if($this.data('value') != 'all' && $this.hasClass('active')){ |
| 65 | $wrapper.find(".filter label.active[data-value=all]").removeClass('active'); | 66 | $wrapper.find(".filter label.active[data-value=all]").removeClass('active'); |
| 66 | }; | 67 | }; |
| @@ -58,4 +58,23 @@ | @@ -58,4 +58,23 @@ | ||
| 58 | label{margin-right:10px;} | 58 | label{margin-right:10px;} |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | -.block{display:block !important;} | ||
| 61 | +.block{display:block !important;} | ||
| 62 | + | ||
| 63 | +.card-header-back{ | ||
| 64 | + margin-bottom: 10px; | ||
| 65 | + display: inline-block; | ||
| 66 | +} | ||
| 67 | + | ||
| 68 | +.dropdown-item, | ||
| 69 | +.html-generator .html-content .col-inner .col-operation .dropdown-item a, .html-generator .html-content .row-inner .row-operation .dropdown-item a { | ||
| 70 | + display: block; | ||
| 71 | + width: 100%; | ||
| 72 | + padding: 0.25rem 1.5rem; | ||
| 73 | + clear: both; | ||
| 74 | + font-weight: 400; | ||
| 75 | + color: #212529 !important; | ||
| 76 | + text-align: inherit; | ||
| 77 | + white-space: nowrap; | ||
| 78 | + background-color: transparent; | ||
| 79 | + font-size: 14px !important; | ||
| 80 | + border: 0; } |
| 1 | module Kanjai | 1 | module Kanjai |
| 2 | class Admin::TagsController < AdminController | 2 | class Admin::TagsController < AdminController |
| 3 | def index | 3 | def index |
| 4 | - render json: ActsAsTaggableOn::Tag.order(:name).collect{|item| {title: item.name}} | 4 | + render json: ActsAsTaggableOn::Tag.order(:id).collect{|item| {title: item.name}} |
| 5 | end | 5 | end |
| 6 | 6 | ||
| 7 | def delete | 7 | def delete |
| 1 | <label data-value='all' class="btn btn-primary active">All</label> | 1 | <label data-value='all' class="btn btn-primary active">All</label> |
| 2 | -<% ActsAsTaggableOn::Tag.most_used.each do |tag| %> | 2 | +<% ActsAsTaggableOn::Tag.order(:id).each do |tag| %> |
| 3 | <label data-value='<%= tag.name %>' class="btn btn-primary tag-item-<%= tag.id %>"> | 3 | <label data-value='<%= tag.name %>' class="btn btn-primary tag-item-<%= tag.id %>"> |
| 4 | <%= tag.name %> | 4 | <%= tag.name %> |
| 5 | <div class="delete-tag-wrapper text-right"> | 5 | <div class="delete-tag-wrapper text-right"> |
| @@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
| 5 | 5 | ||
| 6 | <div class="card card-default"> | 6 | <div class="card card-default"> |
| 7 | <div class="card-header"> | 7 | <div class="card-header"> |
| 8 | - <%= link_to t('back_to_page_list'), admin_pages_path(domain_id: @page.domain.id) %> | 8 | + <%= link_to t('back_to_page_list'), admin_pages_path(domain_id: @page.domain.id), class: 'card-header-back' %> |
| 9 | <div class="card-title"><%= t('admin.pages.edit', title: @page.lang_attributes(Kanjai::PageLang.default(@page.domain), :title)) %></div> | 9 | <div class="card-title"><%= t('admin.pages.edit', title: @page.lang_attributes(Kanjai::PageLang.default(@page.domain), :title)) %></div> |
| 10 | </div> | 10 | </div> |
| 11 | <%= render partial: 'form' %> | 11 | <%= render partial: 'form' %> |
| @@ -11,9 +11,11 @@ | @@ -11,9 +11,11 @@ | ||
| 11 | </div> | 11 | </div> |
| 12 | <div class="html-content container-fluid clearfix"><%= get_html_by_json(@page_data).html_safe %></div> | 12 | <div class="html-content container-fluid clearfix"><%= get_html_by_json(@page_data).html_safe %></div> |
| 13 | <div class="html-elements"> | 13 | <div class="html-elements"> |
| 14 | + | ||
| 14 | <div class="item label label-default element-row btn btn-primary"><%= t('admin.page_structure.row') %></div> | 15 | <div class="item label label-default element-row btn btn-primary"><%= t('admin.page_structure.row') %></div> |
| 15 | <div class="item label label-default element-col btn btn-primary"><%= t('admin.page_structure.col') %></div> | 16 | <div class="item label label-default element-col btn btn-primary"><%= t('admin.page_structure.col') %></div> |
| 16 | <div class="item label label-default element-block btn btn-primary"><%= t('admin.page_structure.block') %></div> | 17 | <div class="item label label-default element-block btn btn-primary"><%= t('admin.page_structure.block') %></div> |
| 18 | + <%= link_to t('back_to_page_list'), admin_pages_path(domain_id: @page.domain.id), class: 'btn btn-secondary float-right' %> | ||
| 17 | </div> | 19 | </div> |
| 18 | 20 | ||
| 19 | <div class="card-footer not-visible"> | 21 | <div class="card-footer not-visible"> |