check errors, add reset password function

@@ -1944,6 +1944,7 @@ var flashHandler = function(e, params) {
   var type = params.type;
   if (type == 'alert') type = 'info';
   if (type == 'notice') type = 'info';
+  if (type == 'error') type = 'danger';
   
   $.notify(params.message, {
     status: type,

@@ -56,6 +56,8 @@ jQuery(document).ready(function(){
                 $cell.data('class', class_value);
             }
 
+            $this.popover('hide');
+
             return false;
         });
 
@@ -269,6 +271,8 @@ jQuery(document).ready(function(){
     $('.html-generator').on('click', '.col-operation .col-content, .row-operation .col-content', function(){
         var $this = $(this);
 
+        $('body').trigger('click');
+
         if($this.closest('.row-element-block').length > 0){
           var $cell = $this.closest('.row-element-block');
         }else{
@@ -291,6 +295,16 @@ jQuery(document).ready(function(){
                     $('#work_area').slideDown('slow', function(){
                       initializeFieldForm($('#page_content_form'));
                     });
+                    
+                    $('#work_area .editor-content').find('.cancel-content').click(function(){
+                        $('#work_area').slideUp('fast', function(){
+                            $('#work_area .editor-content').html('');
+                            $('#structure_area').slideDown('slow', function(){                            
+                            });                                
+                        });
+                        return false;
+                    });
+
                 });
             }
         });

@@ -26,6 +26,27 @@ module Kanjai
     def edit
       @page_template = PageTemplate.find(params[:id])
       @url = @page_template.file_expiring_url
+
+      lang = params[:lang]
+
+      if @page_template.unzip
+        exist_markers = @page_template.page_content_markers.where(lang: lang).collect(&:marker)
+
+        @page_template.template_statics.where.not(marker: exist_markers).each do |item|
+          @page_template.page_content_markers.create(
+                      marker: item.marker,
+                      marker_type: item.marker_type,
+                      marker_name: item.marker_name,
+                      lang: lang
+          )
+        end
+
+
+
+        @markers = @page_template.page_content_markers.where(lang: lang)
+      end
+
+
     end
 
     def update

+require 'unobtrusive_flash'
+
+module Kanjai
+  module Admin
+    class PasswordsController < Devise::PasswordsController
+      include UnobtrusiveFlash::ControllerMixin
+      layout 'kanjai/admin_login'
+
+      after_action :prepare_unobtrusive_flash
+
+      def create
+        self.resource = resource_class.send_reset_password_instructions(resource_params)
+        yield resource if block_given?
+
+        if successfully_sent?(resource)
+          respond_with({}, location: after_sending_reset_password_instructions_path_for(resource_name))
+        else
+          flash[:error] = t('password_reset_error')
+          respond_with(resource)
+        end
+      end
+
+      protected
+
+      def after_sign_in_path_for(resource)
+        admin_dashboard_path
+      end
+
+      def after_sign_out_path_for(resource)
+        new_admin_user_session_path
+      end
+
+    end
+  end
+end
\ No newline at end of file

@@ -2,7 +2,7 @@ module Kanjai
   class AdminUser < ActiveRecord::Base
     # Include default devise modules. Others available are:
     # :confirmable, :lockable, :timeoutable and :omniauthable
-    devise :database_authenticatable, :rememberable, :trackable, :validatable
+    devise :database_authenticatable, :rememberable, :trackable, :validatable, :recoverable
 
 
   end

@@ -18,7 +18,7 @@ module Kanjai
     has_many :page_data, dependent: :destroy
     accepts_nested_attributes_for :page_data
 
-    #validates :title, :url, presence: true
+    validates :title, presence: true
 
     #serialize :template_content, Array
 

@@ -189,6 +189,16 @@ module Kanjai
       url
     end
 
+    def human_title
+      if original_file_name.to_s.empty?
+        I18n.t('admin.template_status.not_file')
+      elsif unzip
+        I18n.t('admin.template_status.unzip')
+      else
+        I18n.t('admin.template_status.zip')
+      end
+    end
+
     private 
 
     def move_file

-<div class="container">
-  <div class="col-md-4" style="float:none;margin:0 auto;">
-    <h1>Forgot your password?</h1>
-
-    <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
-      <%= devise_error_messages! %>
-
-        <div class="form-group">
-            <%= f.label :email %><br />
-            <%= f.email_field :email, autofocus: true, :class => 'form-control' %>
-        </div>
-
-
-        <%= f.submit "Send me reset password instructions", :class => 'btn btn-default' %>
-
-    <% end %>
-
-    <%= render "devise/shared/links" %>
-  </div>
-</div>
\ No newline at end of file
+<div class="card-body">
+   <p class="text-center py-2"><%= t('password_reset_title') %></p>
+   <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
+      <p class="text-center"><%= t('password_reset_text') %></p>
+      <div class="form-group"><label class="text-muted" for="resetInputEmail1"><%= t('password_reset_email') %></label>
+         <div class="input-group with-focus">
+          <%= f.email_field :email, autofocus: true, :class => 'form-control border-right-0', autocomplete: 'off' %>
+            <div class="input-group-append"><span class="input-group-text text-muted bg-transparent border-left-0"><em class="fa fa-envelope"></em></span></div>
+         </div>
+      </div><button class="btn btn-danger btn-block" type="submit">Reset</button>
+   <% end %>
+</div>

@@ -22,6 +22,9 @@
                         <%= t('admin.login.remember_me') %>
                     </label>
                 </div>
+                <div class="float-right">
+                    <%= link_to t('forgot_password'), new_password_path(resource_name), class: 'text-muted' %>
+                </div>
             <% end -%>      
 
         </div>

@@ -21,9 +21,14 @@
 
   <div class="card-footer mt-20">
     <div class="clearfix">
-      <div class="float-right">
-        <%= link_to t('actions.cancel'), admin_admin_users_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"><%= t('mandatory_fields') %></p>
+        </div>
+        <div class="col-md-6 text-right">
+          <%= link_to t('actions.cancel'), admin_admin_users_url, class: 'btn btn-secondary' %>
+          <button class="btn btn-primary" type="submit"><%= t('actions.save') %></button>
+        </div>
       </div>
     </div>
   </div>

@@ -22,9 +22,14 @@
 
   <div class="card-footer mt-20">
     <div class="clearfix">
-      <div class="float-right">
-        <%= link_to t('actions.cancel'), admin_page_langs_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"><%= t('mandatory_fields') %></p>
+        </div>
+        <div class="col-md-6 text-right">
+          <%= link_to t('actions.cancel'), admin_page_langs_url, class: 'btn btn-secondary' %>
+          <button class="btn btn-primary" type="submit"><%= t('actions.save') %></button>
+        </div>
       </div>
     </div>
   </div>

@@ -29,9 +29,14 @@
 
   <div class="card-footer mt-20">
     <div class="clearfix">
-      <div class="float-right">
-        <%= link_to t('actions.cancel'), admin_page_templates_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"><%= t('mandatory_fields') %></p>
+        </div>
+        <div class="col-md-6 text-right">
+          <%= link_to t('actions.cancel'), admin_page_templates_url, class: 'btn btn-secondary' %>
+          <button class="btn btn-primary" type="submit"><%= t('actions.save') %></button>
+        </div>
       </div>
     </div>
   </div>

 <div class="content-wrapper">
   <div class="row">
-    <div class="col-xl-12">
-
-      <%= form_for @page_template, url: admin_page_template_url(@page_template), html: {class: 'form-horizontal ajax-file-upload-form simple_submit'} do |f| %>
-          <div class="card card-default">
-            <div class="card-header">
-              <div class="card-title"><%= t('admin.templates.edit') %></div>
-            </div>            
-            <%= render partial: 'form', locals: {f: f} %>
+    <div class="col-xl-12">    
+      <div class="card card-default">
+        <div class="card-header">
+          <div class="card-title"><%= t('admin.templates.edit') %></div>
+        </div>            
+
+        <ul class="nav nav-tabs" role="tablist">
+           <li class="nav-item" role="presentation"><a class="nav-link <%= controller_name == 'page_templates' ? 'active' : '' %>" href="#general" aria-controls="general" role="tab" data-toggle="tab">General</a></li>
+           <li class="nav-item" role="presentation"><a class="nav-link <%= controller_name == 'page_templates2' ? 'active' : '' %>" href="#static" aria-controls="meta" role="tab" data-toggle="tab">Static</a></li>
+           <% if Kanjai::PageLang.count > 0 %>
+              <li class="choose-lang">
+                 <div class="text-right">
+                    <%= select_tag :choose_lang, options_for_select(Kanjai::PageLang.all.collect{|lang| [lang.title, lang.code, data: {url: edit_admin_page_template_url(@page_template, lang: lang.code)}] }, params[:lang]), class: 'form-control' %>
+                 </div>
+              </li>
+           <% end %>   
+        </ul><!-- Tab panes-->
+        <div class="tab-content">
+          <div class="tab-pane <%= controller_name == 'page_templates' ? 'active' : '' %>" id="general" role="tabpanel">
+            <%= form_for @page_template, url: admin_page_template_url(@page_template), html: {class: 'form-horizontal ajax-file-upload-form simple_submit'} do |f| %>
+              <%= render partial: 'form', locals: {f: f} %>
+            <% end %>
+          </div>
+
+          <div class="tab-pane <%= controller_name == 'page_templates2' ? 'active' : '' %>" id="static" role="tabpanel">
+            <%= 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| %>
+
+                <%= form.fields_for :page_content_markers, @markers  do |form2| %>
+
+                    <div class="form-group">
+                      <%= form2.label :text_value, form2.object.marker, :class => "control-label" %>
+                      <% if form2.object.marker_type == 'string' %>
+                          <%= form2.text_field :text_value, :class => "form-control" %>
+                      <% end %>
+                      <% if form2.object.marker_type == 'text' %>
+                          <%= form2.text_area :text_value, :class => "form-control page_html_content" %>
+                      <% end %>
+                      <% if form2.object.marker_type == 'file' %>
+                          <% s3_direct_post = S3_BUCKET.presigned_post(key: "#{form2.object.get_file_path}${filename}", success_action_status: '201', acl: 'public-read') %>
+                          <%= form2.file_field :text_value, :class => "", 'data-url' => s3_direct_post.url, 'data-form-data' => s3_direct_post.fields.to_json, 'data-host' => URI.parse(s3_direct_post.url).host , 'data-type' => 'zip' %>
+                          <% if form2.object.text_value.present? %>
+                              <%= link_to 'file', form2.object.text_value %>
+                          <% end %>
+                      <% end %>
+
+                    </div>
+
+
+                <% end %>
+
+                <div class="card-footer mt-20">
+                  <div class="clearfix">
+                    <div class="float-right">
+                      <%= link_to t('actions.cancel'), admin_page_templates_url, class: 'btn btn-secondary' %>
+                      <button class="btn btn-primary save" type="submit"><%= t('actions.save') %></button>
+                    </div>
+                  </div>
+                </div>
+
+            <% end %>
           </div>
-      <% end %>
+        </div>
 
+      </div>
     </div>
   </div>
 </div>

@@ -30,7 +30,7 @@
                   <% @collection.each do |item| %>
                       <tr id='<%= dom_id(item) %>'>
                         <td><%= item.title %></td>
-                        <td><%= (item.unzip ? 'unzip' : 'zip') %></td>
+                        <td><%= item.human_title %></td>
                         <td><%= I18n.l(item.updated_at) %></td>
                         <td><%= item.notice %></td>
                         <td>
@@ -41,9 +41,6 @@
                             <ul class="dropdown-menu">
                               <li class="dropdown-item"><%= link_to t('actions.edit'), edit_admin_page_template_url(item), class: 'dropdown-item' %></li>
                               <li class="dropdown-item"><%= link_to t('actions.delete'), admin_page_template_url(item), :class => 'delete-row-item dropdown-item' %></li>
-                              <% Kanjai::PageLang.all.each do |lang| %>
-                                <li class="dropdown-item"><%= link_to t('actions.edit_static_element', lang: lang.code), marker_admin_page_template_url(item, :lang => lang.code), class: 'dropdown-item'  %></li>
-                              <% end %>
                             </ul>
                           </div>
                         </td>

@@ -28,6 +28,7 @@
 
       <%= render :partial => 'kanjai/shared/edit_resource_links', locals: {collection_url: admin_page_templates_url} %>
 
+
   <% end %>
 
 </div>
\ No newline at end of file

@@ -5,7 +5,7 @@
 
     <% if @page.new_record? %>
       <div class="form-group row">
-        <%= form.label :title,  Kanjai::Page.human_attribute_name(:title), :class => "col-md-2 col-form-label" %>
+        <%= form.label :title,  Kanjai::Page.human_attribute_name(:title) + '*', :class => "col-md-2 col-form-label" %>
         <div class="col-md-10">
           <%= form.text_field :title, :class => "form-control" %>
           <%= error_messages(@page, :title) %>
@@ -57,17 +57,16 @@
       </div>
     </div>                
   </fieldset>
-
   <% unless @page.new_record? %>
     <fieldset>
       <legend><%= t('admin.pages.edit_lang_content', :lang => params[:lang]) %></legend>
-      <%= form.fields_for :page_data, @page.page_data.where(lang: params[:lang]) do |form2| %>
-
+      <%= form.fields_for :page_data, @page.page_data.select{|item| item.lang == params[:lang] } do |form2| %>
 
           <div class="form-group row">
             <%= form2.label :title, Kanjai::Page.human_attribute_name(:title) + '*', :class => "col-sm-2 col-form-label" %>
             <div class="col-sm-10">
-              <%= form2.text_field :title, :class => "form-control" %>
+              <%= form2.text_field :title, :class => "form-control #{@page.errors.include?('page_data.title') ? 'parsley-error' : ''}" %>
+              <%= error_messages(form.object, 'page_data.title') %>
             </div>
           </div>
 
@@ -77,6 +76,7 @@
               <%= form2.text_field :url, :class => "form-control" %>
             </div>
           </div>
+
       <% end %>
     </fieldset>
   <% end %>
@@ -85,7 +85,7 @@
     <div class="clearfix">
       <div class="row">
         <div class="col-md-6">
-          <p class="mt-1">* Please at mandatory fields</p>
+          <p class="mt-1"><%= t('mandatory_fields') %></p>
         </div>
         <div class="col-md-6">
           <div class="float-right">

@@ -21,7 +21,7 @@
     <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' %>
+          <%= link_to t('actions.cancel'), '#', class: 'btn btn-secondary cancel-content' %>
           <button class="btn btn-primary" type="submit"><%= t('actions.save') %></button>
         </div>
       </div>

@@ -7,7 +7,7 @@
    
    <%= csrf_meta_tags %>
 
-   <title>Angle - Bootstrap Admin Template</title><!-- =============== VENDOR STYLES ===============-->
+   <title><%= t('meta_title') %></title><!-- =============== VENDOR STYLES ===============-->
    <!-- FONT AWESOME-->
    <%= stylesheet_link_tag    "kanjai/general" %>
 </head>

@@ -4,7 +4,7 @@
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-   <title>Angle - Bootstrap Admin Template</title>
+   <title><%= t('meta_title') %></title>
    <%= stylesheet_link_tag    "kanjai/general" %>
 </head>
 

 template = ERB.new File.new("#{Rails.root}/config/admin.yml").read
 processed = template.result(binding)
 
-ADMIN_CONFIG = YAML.load(processed)[Rails.env]
\ No newline at end of file
+ADMIN_CONFIG = YAML.load(processed)[Rails.env]
+
+ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
+  html_tag.html_safe
+end
\ No newline at end of file

@@ -35,6 +35,13 @@ en:
   copyright: "© 2020 - kanjai.org"
   logout: 'Logout'
   please_wait: "Please, wait ..."
+  mandatory_fields: "* Mandatory fields"
+  meta_title: "Kanjai - Bootstrap CMS"
+  forgot_password: "Forgot your password?"
+  password_reset_title: "PASSWORD RESET"
+  password_reset_text: "Fill with your mail to receive instructions on how to reset your password."
+  password_reset_email: "Email address"
+  password_reset_error: "Can not send instrution, please check email"
 
 
   date:
@@ -78,6 +85,7 @@ en:
         updated_at: "Updated at"
         unzip: "Status"
         notice: "Notice"
+        attachment: "Template"
       kanjai/image:
         name: "Name"
         tags: "Tags"
@@ -141,4 +149,8 @@ en:
       empty_text: "You don't have template"
       edit: "Edit template"
       create: "Add new template"
+    template_status:
+      not_file: ""
+      unzip: "In Progress"
+      zip: "Ready"
 

@@ -3,7 +3,7 @@ Kanjai::Engine.routes.draw do
 
   devise_for :admin_users, {
                            path_names: {sign_in: 'login', sign_out: 'logout'},
-                           controllers: {sessions: 'kanjai/admin/sessions'},
+                           controllers: {sessions: 'kanjai/admin/sessions', passwords: 'kanjai/admin/passwords'},
                            class_name: "Kanjai::AdminUser", module: :devise
   }
 

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