Commit e014aac281db4b3dee31b6ce65acdf95b809b0a2
1 parent
0c2e420a
show svg preview in admin part, sorting static elements
Showing
4 changed files
with
7 additions
and
3 deletions
| @@ -24,7 +24,7 @@ module Kanjai | @@ -24,7 +24,7 @@ module Kanjai | ||
| 24 | 24 | ||
| 25 | def self.image?(url) | 25 | def self.image?(url) |
| 26 | ext = File.extname(url) | 26 | ext = File.extname(url) |
| 27 | - ['.jpg', '.gif', '.jpeg', '.png'].include?(ext) | 27 | + ['.jpg', '.gif', '.jpeg', '.png', '.svg'].include?(ext) |
| 28 | end | 28 | end |
| 29 | 29 | ||
| 30 | end | 30 | end |
| @@ -30,7 +30,7 @@ | @@ -30,7 +30,7 @@ | ||
| 30 | <div class="tab-pane <%= controller_name == 'page_templates2' ? 'active' : '' %>" id="static" role="tabpanel"> | 30 | <div class="tab-pane <%= controller_name == 'page_templates2' ? 'active' : '' %>" id="static" role="tabpanel"> |
| 31 | <%= form_for(@page_template, :url => update_marker_admin_page_template_url, :html => {:method => 'POST', :class => "form-horizontal ajax-file-upload-form simple_submit"}) do |form| %> | 31 | <%= form_for(@page_template, :url => update_marker_admin_page_template_url, :html => {:method => 'POST', :class => "form-horizontal ajax-file-upload-form simple_submit"}) do |form| %> |
| 32 | 32 | ||
| 33 | - <%= form.fields_for :page_content_markers, @markers do |form2| %> | 33 | + <%= form.fields_for :page_content_markers, sort_static_markers(@markers) do |form2| %> |
| 34 | 34 | ||
| 35 | <div class="form-group"> | 35 | <div class="form-group"> |
| 36 | <%= form2.label :text_value, form2.object.marker_name, :class => "control-label" %> | 36 | <%= form2.label :text_value, form2.object.marker_name, :class => "control-label" %> |