work on RTE and choose image

@@ -1585,9 +1585,6 @@ jQuery(document).ready(function(){
 
             var galleryUrl = $this.$original_element.data('gallery-url');
 
-
-
-
             jQuery.ajax({
                 type: 'POST',
                 url: galleryUrl,
@@ -1606,6 +1603,12 @@ jQuery(document).ready(function(){
                         html: true,
                         trigger: 'manual',
                         placement: layer_position
+                    }).on('shown.bs.popover', function () {
+                      var $obj = $($(this).data("bs.popover").getTipElement());
+                      $obj.addClass('rte-popover');
+                      if(!$this.$original_element.froalaEditor('fullscreen.isActive')){
+                        $obj.css('left', '-490px');
+                      }
                     }).on('hidden.bs.popover', function () {
                         $popover.popover('dispose');
                     }).popover('show');
@@ -1622,7 +1625,7 @@ jQuery(document).ready(function(){
                         var img_link = $(this).attr('href');
 
                         $this.$original_element.froalaEditor('image.insert', img_link, true, {});
-
+                        $popover.popover('dispose');
 
                         return false;
                     });

@@ -5318,6 +5318,7 @@ body .jvectormap-zoomout {
   font-weight:bold;
 }
 
+.mt-5{margin-top:5px;}
 .mt-20{margin-top:20px;}
 
 .dropleft.without-icon .dropdown-toggle::before{
@@ -5375,4 +5376,19 @@ body .jvectormap-zoomout {
   text-decoration: none;
   outline: 0;
   background-color: #428bca;
+}
+
+.rte-popover{
+  max-width:600px;
+  width:600px;
+  z-index:9999;
+  .popover-body{
+    height:400px;
+    overflow-y: auto;
+    background-color:#f5f7fa;
+
+  }
+  .arrow:after{
+    border-left-color:#f5f7fa;    
+  }
 }
\ No newline at end of file

@@ -55,7 +55,7 @@ module Kanjai
     end
 
     def get_gallery
-      @collection = Image.all
+      @collection = Image.where(file_type: Kanjai::Image::IMAGE_MIME_TYPE)
 
       render :layout => false
     end

@@ -4,6 +4,8 @@ module Kanjai
     
     belongs_to :object, polymorphic: true, optional: true
 
+    IMAGE_MIME_TYPE = ['image/bmp', 'image/gif', 'image/jpeg', 'image/pipeg', 'image/svg+xml', 'image/png']
+
 #    has_attached_file :image,
 #                      :styles => {:mini => '200x200>'},
 #                      :path => ":object_type/:object_id/images/:id/:style/:basename.:extension",

@@ -4,7 +4,7 @@ module Kanjai
 
     has_many :page_contents
 
-    validates :title, :url, :page_id, :lang, presence: true
+    validates :title, :page_id, :lang, presence: true
 
     serialize :template_content, Array
 

@@ -22,6 +22,4 @@
       </div>
     </div>
   <% end %>
-
-
 </div>

-<div>
-    <% @collection.each do |item| %>
-            <a href="<%= item.image_link %>" class="gallery-item" style="display:inline-block;width:200px;height:200px;border:1px solid black;"><%= image_tag item.image_link, :style => 'display:inline-block;margin:0;padding:0;max-width:100px;' %></a>
-    <% end %>
-</div>
+<div class="card-columns">
+  <% @collection.each do |item| %>
+    <a href="<%= item.image_link %>" class="gallery-item">
+      <div class="card mb-4" >
+        <%= image_tag item.image_link, class: 'card-img-top img-fluid', alt: '' %>
+      </div>
+    </a>
+  <% end %>
+</div>
\ No newline at end of file

@@ -22,7 +22,7 @@
     </div>
 
     <div class="form-group row mt-2">
-      <%= form.label :page_template_id, Kanjai::Page.human_attribute_name(:page_template_id), :class => "col-sm-2 control-label" %>
+      <%= form.label :page_template_id, Kanjai::Page.human_attribute_name(:page_template_id) + '*', :class => "col-sm-2 control-label" %>
       <div class="col-sm-10">
         <%= form.select :page_template_id, Kanjai::PageTemplate.all.collect{|p|  [p[:title], p[:id]] }, {:include_blank => true}, :class => "form-control #{@page.errors.include?(:page_template) ? 'parsley-error' : ''}" %>
         <%= error_messages(@page, :page_template) %>
@@ -72,7 +72,7 @@
           </div>
 
           <div class="form-group row mt-2">
-            <%= form2.label :url, Kanjai::Page.human_attribute_name(:url) + '*', :class => "col-sm-2 col-form-label" %>
+            <%= form2.label :url, Kanjai::Page.human_attribute_name(:url), :class => "col-sm-2 col-form-label" %>
             <div class="col-sm-10">
               <%= form2.text_field :url, :class => "form-control" %>
             </div>
@@ -83,9 +83,16 @@
 
   <div class="card-footer mt-20">
     <div class="clearfix">
-      <div class="float-right">
-        <%= link_to t('actions.cancel'), admin_pages_url, class: 'btn btn-secondary' %>
-        <button class="btn btn-primary" type="submit"><%= t('actions.save') %></button>
+      <div class="row">
+        <div class="col-md-6">
+          <p class="mt-1">* Please at mandatory fields</p>
+        </div>
+        <div class="col-md-6">
+          <div class="float-right">
+            <%= link_to t('actions.cancel'), admin_pages_url, class: 'btn btn-secondary' %>
+            <button class="btn btn-primary" type="submit"><%= t('actions.save') %></button>
+          </div>
+        </div>
       </div>
     </div>
   </div>

@@ -12,7 +12,8 @@ Kanjai::Engine.routes.draw do
   end
 
   namespace :admin do
-    get '/' => 'dashboard#index', as: 'dashboard'
+    #get '/' => 'dashboard#index', as: 'dashboard'
+    get '/' => 'pages#index', as: 'dashboard'
 
 
     get 'configuration' => 'config#index', :as => :configuration

 module Kanjai
-  VERSION = "0.0.149"
+  VERSION = "0.0.150"
 end