hyde_admin 0.0.3 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a05ad4bb0704e1175cd5ed0393ae09181a0241dd423add001cd7ef4cc365ed2
-  data.tar.gz: 1db71be2ffc12226a0c10fb66751311e4bd6b8d795aa3bccf4dcc9da5993e557
+  metadata.gz: efb3733133bc8adfcf1bfa8a365ef7a5e7d98b87f03f615b538ccc874ec76fa1
+  data.tar.gz: 38a47d3d53dd35bae51f7673c21bcb25b85bf1f18992f9305cad83486ed46205
 SHA512:
-  metadata.gz: '0902597c60ffe712e999a065655ad6034f3d9e2b62f129b815e2139ef684d0f565f08d0fda4ad2f59b85a182da93f0d730dcfbad99128521befe593d266cd21e'
-  data.tar.gz: 8926be4affe34325d115ccf1788609fc46a7770a770233944a425a2a054870b501861601eaf232ab73f2ac48741068b611ec59e3535035010513917b3c9d857d
+  metadata.gz: 32f1fa3002f7b43460f94ca833c56c4c0ea820f4db3c03552f28c042c89286a553a9b74baddb9f8ac4b38b03f0b0bcfc1aea1ec5221b9f114f88498efd87ea71
+  data.tar.gz: 83b5a59c1a4ca153b58cff1ae58459831e6d951d954a5382b0880c3773abce88c159eb9bfecea914120add871ce34828ff211b0ef5287e1b8bae53f9688a1749

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/.idea/hyde_admin.iml

@@ -12,7 +12,11 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.1.9, RVM: ruby-2.7.0) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ffi (v1.15.4, RVM: ruby-2.7.0) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="i18n (v1.8.10, RVM: ruby-2.7.0) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="image_processing (v1.12.1, RVM: ruby-2.7.0) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mini_magick (v4.11.0, RVM: ruby-2.7.0) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ruby-vips (v2.0.17, RVM: ruby-2.7.0) [gem]" level="application" />
   </component>
   <component name="RModuleSettingsStorage">
     <LOAD_PATH number="0" />

data/CHANGELOG.md

@@ -1,3 +1,31 @@
+# 0.0.8
+
+Resize image at upload with ImageProcessing (MiniMagick)
+
+# 0.0.7
+
+Post edit : bugfix, keep layout & format when we don't show input.
+CodeMirror editor : form-control style
+Locales shows possible value for config.
+
+# 0.0.6
+
+Form upload image + style images selector
+Menu follows workflow
+Configuration remove beforeSend
+Rsync params
+Publish only for drafts
+
+# 0.0.5
+
+Sometimes no tags
+
+# 0.0.4
+
+Correct images selector
+Some refactoring
+Escape translations
+
 # 0.0.3
 
 Bugfix (see commits)

data/README.md

@@ -1,3 +1,7 @@
+## Hyde admin
+
+Hyde_admin is a administration frontend for Jekyll (static site generator in Ruby).
+
 ## Getting Started with Hyde Admin
 
 Add

data/TODO.md

@@ -1 +1,3 @@
-Overview btn for posts/drafts/pages (save && rebuild && open in new tab)
+Overview btn for posts/drafts/pages (save && rebuild && open in new tab)
+See TINYmce for wysiwyg editor
+Add defaults class for images injected by editor

data/bin/admin_views/admin_layout.html.erb

@@ -32,63 +32,62 @@
         <nav id="sidebarMenu" class="col-md-3 col-lg-2 d-md-block bg-light sidebar collapse">
           <div class="position-sticky pt-3">
             <ul class="nav flex-column">
-              <li class="nav-item">
-                <a class="nav-link active" aria-current="page" href="/<%= @hyde_parameters['site_index'] %>">
-                  <span data-feather="home" class="fas fa-eye"></span>
-                  <%= t.overview.capitalize %>
-                </a>
-              </li>
               <li class="nav-item">
               </li>
               <li class="nav-item">
                 <a class="nav-link active" aria-current="page" href="/dashboard">
                   <span data-feather="home" class="fas fa-tachometer-alt"></span>
-                  <%= t.dashboard.capitalize %>
+                  <%= EscapeUtils.escape_html t.dashboard.capitalize %>
                 </a>
               </li>
               <li class="nav-item">
                 <a class="nav-link" href="/pages/index">
                   <span data-feather="file" class="fas fa-file"></span>
-                  <%= t.pages.capitalize %>
+                  <%= EscapeUtils.escape_html t.pages.capitalize %>
                 </a>
               </li>
               <li class="nav-item">
                 <a class="nav-link" href="/drafts/index">
                   <span data-feather="shopping-cart" class="fas fa-file"></span>
-                  <%= t.drafts.capitalize %>
+                  <%= EscapeUtils.escape_html t.drafts.capitalize %>
                 </a>
               </li>
               <li class="nav-item">
                 <a class="nav-link" href="/posts/index">
                   <span data-feather="users" class="fas fa-file"></span>
-                  <%= t.posts.capitalize %>
+                  <%= EscapeUtils.escape_html t.posts.capitalize %>
                 </a>
               </li>
-              <li class="nav-item"></li>
               <li class="nav-item">
                 <a class="nav-link" href="/files/index">
                   <span data-feather="users" class="fas fa-copy"></span>
-                  <%= t.files.capitalize %>
+                  <%= EscapeUtils.escape_html t.files.capitalize %>
+                </a>
+              </li>
+              <li></li>
+              <li class="nav-item mb-4 mt-4">
+                <a class="nav-link" href="/configuration">
+                  <span data-feather="layers" class="fas fa-tools"></span>
+                  <%= EscapeUtils.escape_html t.configuration.capitalize %>
                 </a>
               </li>
-              <li class="nav-item"></li>
+              <li></li>
               <li class="nav-item">
                 <a class="nav-link active" aria-current="page" href="/rebuild" id="btn-rebuild">
                   <span data-feather="home" class="fas fa-hammer"></span>
-                  <%= t.rebuild.capitalize %>
+                  <%= EscapeUtils.escape_html t.rebuild.capitalize %>
                 </a>
               </li>
               <li class="nav-item">
-                <a class="nav-link active" aria-current="page" href="/deploy" id="btn-deploy">
-                  <span data-feather="home" class="fas fa-cloud-upload-alt"></span>
-                  <%= t.deploy.capitalize %>
+                <a class="nav-link active" aria-current="page" target="_blank" href="/<%= @hyde_parameters['site_index'] %>">
+                  <span data-feather="home" class="fas fa-eye"></span>
+                  <%= EscapeUtils.escape_html t.overview.capitalize %>
                 </a>
               </li>
-              <li class="nav-item"></li>
               <li class="nav-item">
-                <a class="nav-link" href="/configuration">
-                  <span data-feather="layers" class="fas fa-tools"></span>
-                  <%= t.configuration.capitalize %>
+                <a class="nav-link active" aria-current="page" href="/deploy" id="btn-deploy">
+                  <span data-feather="home" class="fas fa-cloud-upload-alt"></span>
+                  <%= EscapeUtils.escape_html t.deploy.capitalize %>
                 </a>
               </li>
             </ul>
@@ -124,20 +123,49 @@
       <div class="modal-dialog" role="document">
         <div class="modal-content">
           <div class="modal-header">
-            <h5 class="modal-title">Images</h5>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <h5 class="modal-title"><%= t.images.capitalize %></h5>
+            <!--
+            <button type="button" class="btn btn-default close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
             </button>
+            -->
+            <button type="button" class="btn btn-outline-secondary btn-sm load-image">
+              <%= t.load_images.capitalize %>
+            </button>
           </div>
-          <div class="modal-body modal-body-image">
-            <% path_of_images = File.join(Dir.pwd, @hyde_parameters['images_path'], "**") %>
-            <% $stderr.puts(path_of_images) %>
-            <% Dir.glob(path_of_images)[(@page || 0) * 9, ((@page || 0) + 1) * 9 ].each do |img| %>
-              <% img = img.gsub(Dir.pwd, "") %>
-              <div class="image-element">
-                <img src="<%= img %>" alt="<%= img %>">
+          <div class="modal-body">
+            <div>
+              <div class="image-selector-search d-block" data-page="0">
+                <form action="" class="form-inline">
+                  <div class="form-group mb-2">
+                    <label>
+                      <input class="form-check-input" type="radio" name="sort_date" value="asc"> <%= EscapeUtils.escape_html t.newer.capitalize %>
+                    </label>
+                    &nbsp;&nbsp;&nbsp;
+                    <label>
+                      <input class="form-check-input" type="radio" name="sort_date" value="desc" checked> <%= EscapeUtils.escape_html t.older.capitalize %>
+                    </label>
+                  </div>
+                  <div class="form-group mb-2">
+                    <label for="inputFilename" class="sr-only"><%= EscapeUtils.escape_html t.filename.capitalize %></label>
+                    <input type="text" class="form-control" name="filename" id="inputFilename" placeholder="<%= EscapeUtils.escape_html t.filename_placeholder.capitalize %>">
+                  </div>
+                  <button type="submit" class="btn btn-primary image-selector-search-submit d-block mb-2"><%= EscapeUtils.escape_html t.search.capitalize %></button>
+                </form>
+              </div>
+              <div class="image-selector-content">
+                <% path = File.join(Pathname.new(Mid.gem_source_path), 'admin_views', 'partials', 'images_page.html.erb') %>
+                <%= ERB.new(File.read(path)).result(binding) %>
               </div>
-            <% end %>
+              <div class="image-selector-page text-center">
+                <a href="#" title="<%= EscapeUtils.escape_html t.previous_images %>" class="btn btn-secondary image-selector-page-prev px-4">
+                  <i class="fas fa-chevron-left"></i>
+                </a>
+                <a href="#" title="<%= EscapeUtils.escape_html t.next_images %>" class="btn btn-secondary image-selector-page-next px-4">
+                  <i class="fas fa-chevron-right"></i>
+                </a>
+              </div>
+            </div>
           </div>
         </div>
       </div>
@@ -154,6 +182,45 @@
         });
       }
       <% end %>
+
+      function search(offset_page){
+          let sort_date = $('.image-selector-search input[name=sort_date]:checked').val();
+          let filename = $('.image-selector-search input[name=filename]').val();
+          let page = $('.image-selector-search').attr('data-page');
+          let new_page = parseInt(page) + offset_page;
+
+          if(new_page < 0){
+              new_page = 0;
+          }
+
+          $.post( "/ajax/images", { sort_date: sort_date, filename: filename, page: new_page })
+              .done(function( data ) {
+                  $('.image-selector-content').html(data);
+              });
+
+          $('.image-selector-search').attr('data-page', new_page);
+          return false;
+      }
+
+      $(document).on('click', '.image-selector-search-submit', function(){
+          search(0);
+          return false;
+      });
+      $(document).on('click', '.image-selector-page-prev', function(){
+          search(-1);
+          return false;
+      });
+      $(document).on('click', '.image-selector-page-next', function(){
+          search(1);
+          return false;
+      });
+      $(document).on('click', '.load-image', function(){
+          var windowObjectReference = window.open("/upload_image_form", "update_image", "dialog=yes,menubar=no,location=no,resizable=no,scrollbars=yes,status=yes,outerWidth=800,innerHeight=300,width=800,height=300");
+          return false;
+      });
+      function reload_image(){
+          $('.load-image').click();
+      }
     </script>
     <script src="/fslightbox/fslightbox.js"></script>
   </body>

data/bin/admin_views/configuration.erb

@@ -1,13 +1,13 @@
-<h2><%= t.configuration.capitalize %></h2>
+<h2><%= EscapeUtils.escape_html t.configuration.capitalize %></h2>
 
 <form action="/configuration" method="post">
   <% @hyde_parameters.each_pair do |setting, value| %>
     <div class="mb-3">
-      <label for="i-<%= setting %>" class="form-label"><%= t.send(setting).capitalize %></label>
+      <label for="i-<%= setting %>" class="form-label"><%= (EscapeUtils.escape_html t.send(setting).capitalize rescue setting) %></label>
       <input type="text" class="form-control" value="<%= value %>" name="<%= setting %>" id="i-<%= setting %>">
-      <div id="i-<%= setting %>-help" class="form-text"><%= t.send("help_#{setting}").capitalize %></div>
+      <div id="i-<%= setting %>-help" class="form-text"><%= (EscapeUtils.escape_html t.send("help_#{setting}").capitalize rescue '') %></div>
     </div>
   <% end %>
-  <button type="submit" class="btn btn-primary"><%= t.submit.capitalize %></button>
+  <button type="submit" class="btn btn-primary"><%= EscapeUtils.escape_html t.submit.capitalize %></button>
 </form>
 

data/bin/admin_views/dashboard.erb

@@ -1 +1 @@
-<h2><%= t.dashboard.capitalize %></h2>
+<h2><%= EscapeUtils.escape_html t.dashboard.capitalize %></h2>

data/bin/admin_views/editor_html.erb

@@ -1,24 +1,24 @@
 <div class="codemirror-toolbar btn-toolbar" role="toolbar">
   <div class="btn-group mr-2" role="group" aria-label="Undo/redo">
-    <button type="button" class="btn btn-light"><i class="fas fa-undo-alt" title="<%= t.editor_undo %>"></i></button>
-    <button type="button" class="btn btn-light"><i class="fas fa-redo-alt" title="<%= t.editor_redo %>"></i></button>
+    <button type="button" class="btn btn-light"><i class="fas fa-undo-alt" title="<%= EscapeUtils.escape_html t.editor_undo %>"></i></button>
+    <button type="button" class="btn btn-light"><i class="fas fa-redo-alt" title="<%= EscapeUtils.escape_html t.editor_redo %>"></i></button>
   </div>
   <div class="btn-group mr-2" role="group" aria-label="Structural tags">
-    <button type="button" class="btn btn-light"><i class="fas fa-file-image" title="<%= t.editor_file %>"></i></button>
-    <button type="button" class="btn btn-light"><i class="fas fa-list cmt-replace" title="<%= t.editor_list %>"></i></button>
-    <button type="button" class="btn btn-light"><i class="fas fa-list-ol cmt-replace" title="<%= t.editor_list_ol %>"></i></button>
-    <button type="button" class="btn btn-light"><i class="fas fa-link cmt-replace" title="<%= t.editor_link %>"></i></button>
-    <button type="button" class="btn btn-light"><i class="fas fa-quote-left cmt-replace" title="<%= t.editor_quote %>"></i></button>
+    <button type="button" class="btn btn-light"><i class="fas fa-file-image" title="<%= EscapeUtils.escape_html t.editor_file %>"></i></button>
+    <button type="button" class="btn btn-light"><i class="fas fa-list cmt-replace" title="<%= EscapeUtils.escape_html t.editor_list %>"></i></button>
+    <button type="button" class="btn btn-light"><i class="fas fa-list-ol cmt-replace" title="<%= EscapeUtils.escape_html t.editor_list_ol %>"></i></button>
+    <button type="button" class="btn btn-light"><i class="fas fa-link cmt-replace" title="<%= EscapeUtils.escape_html t.editor_link %>"></i></button>
+    <button type="button" class="btn btn-light"><i class="fas fa-quote-left cmt-replace" title="<%= EscapeUtils.escape_html t.editor_quote %>"></i></button>
   </div>
   <div class="btn-group mr-2" role="group" aria-label="Style tags">
-    <button type="button" class="btn btn-light"><i class="fas fa-heading cmt-heading-1" title="<%= t.editor_title_h1 %>">1</i></button>
-    <button type="button" class="btn btn-light"><i class="fas fa-heading cmt-heading-2" title="<%= t.editor_title_h2 %>">2</i></button>
-    <button type="button" class="btn btn-light"><i class="fas fa-heading cmt-heading-3" title="<%= t.editor_title_h3 %>">3</i></button>
-    <button type="button" class="btn btn-light"><i class="fas fa-heading cmt-heading-4" title="<%= t.editor_title_h4 %>">4</i></button>
-    <button type="button" class="btn btn-light"><i class="fas fa-heading cmt-heading-5" title="<%= t.editor_title_h5 %>">5</i></button>
-    <button type="button" class="btn btn-light"><i class="fas fa-underline cmt-replace" title="<%= t.editor_underline %>"></i></button>
-    <button type="button" class="btn btn-light"><i class="fas fa-bold cmt-replace" title="<%= t.editor_bold %>"></i></button>
-    <button type="button" class="btn btn-light"><i class="fas fa-italic cmt-replace" title="<%= t.editor_italic %>"></i></button>
-    <button type="button" class="btn btn-light"><i class="fas fa-strikethrough cmt-replace" title="<%= t.editor_strikethrough %>"></i></button>
+    <button type="button" class="btn btn-light"><i class="fas fa-heading cmt-heading-1" title="<%= EscapeUtils.escape_html t.editor_title_h1 %>">1</i></button>
+    <button type="button" class="btn btn-light"><i class="fas fa-heading cmt-heading-2" title="<%= EscapeUtils.escape_html t.editor_title_h2 %>">2</i></button>
+    <button type="button" class="btn btn-light"><i class="fas fa-heading cmt-heading-3" title="<%= EscapeUtils.escape_html t.editor_title_h3 %>">3</i></button>
+    <button type="button" class="btn btn-light"><i class="fas fa-heading cmt-heading-4" title="<%= EscapeUtils.escape_html t.editor_title_h4 %>">4</i></button>
+    <button type="button" class="btn btn-light"><i class="fas fa-heading cmt-heading-5" title="<%= EscapeUtils.escape_html t.editor_title_h5 %>">5</i></button>
+    <button type="button" class="btn btn-light"><i class="fas fa-underline cmt-replace" title="<%= EscapeUtils.escape_html t.editor_underline %>"></i></button>
+    <button type="button" class="btn btn-light"><i class="fas fa-bold cmt-replace" title="<%= EscapeUtils.escape_html t.editor_bold %>"></i></button>
+    <button type="button" class="btn btn-light"><i class="fas fa-italic cmt-replace" title="<%= EscapeUtils.escape_html t.editor_italic %>"></i></button>
+    <button type="button" class="btn btn-light"><i class="fas fa-strikethrough cmt-replace" title="<%= EscapeUtils.escape_html t.editor_strikethrough %>"></i></button>
   </div>
 </div>

data/bin/admin_views/editor_js.erb

@@ -8,9 +8,9 @@ $(document).on('click', '.codemirror-toolbar .fa-file-image', function(){
   $('.modal-image').modal('show');
 });
 $(document).on('click', '.modal-image img', function(){
-  let img_src = '<img src="' + $(this).attr('src') + '" alt="<%= t.default_alt_img %>" title="<%= t.default_title_img %>" />';
+  let img_src = '<img src="' + $(this).attr('src') + '" alt="<%= EscapeUtils.escape_html t.default_alt_img %>" title="<%= EscapeUtils.escape_html t.default_title_img %>" />';
   if(window.mode_markdown){
-    img_src = '![<%= t.default_alt_img %>](' + $(this).attr('src') + ')';
+    img_src = '![<%= EscapeUtils.escape_html t.default_alt_img %>](' + $(this).attr('src') + ')';
   }
   window.myCodeMirror.replaceSelection(img_src);
   $('.modal-image').modal('hide');

data/bin/admin_views/files/edit.erb

@@ -1,30 +1,30 @@
-<h2><%= t.edit.capitalize %></h2>
+<h2><%= EscapeUtils.escape_html t.edit.capitalize %></h2>
 
 <form action="/files/update?file=<%= @file %>" method="post">
   <% if @has_header %>
     <div class="mb-3">
-      <label for="i-header" class="form-label"><%= t.header.capitalize %></label>
+      <label for="i-header" class="form-label"><%= EscapeUtils.escape_html t.header.capitalize %></label>
       <textarea class="form-control text-editor" id="i-header" rows="3" name="header" style="font-family: <%= (['.html', '.xml', '.yml', '.js', '.md'].include?(File.extname(@file)) ? 'monospace' : 'inherit') %>"><%= @header %></textarea>
     </div>
   <% end %>
   <div class="mb-3">
-    <label for="i-content" class="form-label"><%= t.content.capitalize %>
+    <label for="i-content" class="form-label"><%= EscapeUtils.escape_html t.content.capitalize %>
       <% if ['.html','.md'].include?(File.extname(@file)) %>
         <a href="https://jekyllrb.com/docs/liquid/" class="text-secondary" target="_blank"><i class="fas fa-question-circle"></i></a>
       <% end %>
     </label>
 
     <% if @has_editor %>
-      <% path = File.join(Pathname.new(File.dirname(__FILE__)).parent, 'editor_html.erb') %>
+      <% path = File.join(Pathname.new(Mid.gem_source_path), 'admin_views', 'editor_html.erb') %>
       <%= ERB.new(File.read(path)).result(binding) %>
     <% end %>
 
   <textarea class="form-control text-editor" id="i-content" rows="3" name="content" style="font-family: <%= (['.html', '.xml', '.yml', '.js', '.md'].include?(File.extname(@file)) ? 'monospace' : 'inherit') %>"><%= @content %></textarea>
 
     <script type="text/javascript" charset="utf-8">
-        <% path = File.join(Pathname.new(File.dirname(__FILE__)).parent, 'editor_js.erb') %>
+        <% path = File.join(Pathname.new(Mid.gem_source_path), 'admin_views', 'editor_js.erb') %>
         <%= ERB.new(File.read(path)).result(binding) %>
     </script>
   </div>
-  <button type="submit" class="btn btn-primary"><%= t.submit.capitalize %></button>
+  <button type="submit" class="btn btn-primary"><%= EscapeUtils.escape_html t.submit.capitalize %></button>
 </form>

data/bin/admin_views/files/listing.erb

@@ -1,4 +1,4 @@
-<h2><%= t.files.capitalize %></h2>
+<h2><%= EscapeUtils.escape_html t.files.capitalize %></h2>
 
 <div class="row g-3">
   <div class="col-auto">
@@ -8,7 +8,7 @@
           <input type="file" multiple name="files[]" class="form-control">
         </div>
         <div class="col-auto">
-          <button type="submit" class="btn btn-outline-secondary"><i class="fa fa-plus" title="<%= t.create.capitalize %>"></i> <%= t.upload %></button>
+          <button type="submit" class="btn btn-outline-secondary"><i class="fa fa-plus" title="<%= EscapeUtils.escape_html t.create.capitalize %>"></i> <%= EscapeUtils.escape_html t.upload %></button>
         </div>
       </div>
     </form>
@@ -19,10 +19,10 @@
     <form method="post" action="/files/create_dir?dir_path=<%= @dir_path %>">
       <div class="row g-2 align-items-center">
         <div class="col-auto">
-          <input type="text" name="directory_name" class="form-control" placeholder="<%= t.directory_input_placeholder %>">
+          <input type="text" name="directory_name" class="form-control" placeholder="<%= EscapeUtils.escape_html t.directory_input_placeholder %>">
         </div>
         <div class="col-auto">
-          <button type="submit" class="btn btn-outline-secondary"><i class="fa fa-plus" title="<%= t.create.capitalize %>"></i> <%= t.create %></button>
+          <button type="submit" class="btn btn-outline-secondary"><i class="fa fa-plus" title="<%= EscapeUtils.escape_html t.create.capitalize %>"></i> <%= EscapeUtils.escape_html t.create %></button>
         </div>
       </div>
     </form>
@@ -33,10 +33,10 @@
     <form method="post" action="/files/create_file?dir_path=<%= @dir_path %>">
       <div class="row g-2 align-items-center">
         <div class="col-auto">
-          <input type="text" name="file_name" class="form-control" placeholder="<%= t.file_input_placeholder %>">
+          <input type="text" name="file_name" class="form-control" placeholder="<%= EscapeUtils.escape_html t.file_input_placeholder %>">
         </div>
         <div class="col-auto">
-          <button type="submit" class="btn btn-outline-secondary"><i class="fa fa-plus" title="<%= t.create.capitalize %>"></i> <%= t.create %></button>
+          <button type="submit" class="btn btn-outline-secondary"><i class="fa fa-plus" title="<%= EscapeUtils.escape_html t.create.capitalize %>"></i> <%= EscapeUtils.escape_html t.create %></button>
         </div>
       </div>
     </form>
@@ -49,20 +49,20 @@
   <table class="table table-striped table-sm">
     <tr>
       <th>
-        <%= t.file.capitalize %>
+        <%= EscapeUtils.escape_html t.file.capitalize %>
       </th>
       <th class="text-center">
-        <%= t.edit.capitalize %>
+        <%= EscapeUtils.escape_html t.edit.capitalize %>
       </th>
       <th class="text-center">
-        <%= t.delete.capitalize %>
+        <%= EscapeUtils.escape_html t.delete.capitalize %>
       </th>
     </tr>
     <% if @parent_dir %>
       <tr>
         <td colspan="3">
           <i class="fas fa-folder"></i>
-          <a href="/files/index?dir_path=<%= File.dirname(@dir_path) %>">[<%= t.parent_dir.capitalize %>]</a>
+          <a href="/files/index?dir_path=<%= File.dirname(@dir_path) %>">[<%= EscapeUtils.escape_html t.parent_dir.capitalize %>]</a>
         </td>
       </tr>
     <% end %>
@@ -95,13 +95,13 @@
         </td>
         <td class="text-center">
           <% if !File.directory?(f) %>
-            <a href="/files/edit?file=<%= f %>&dir_path=<%= @dir_path %>" class="btn btn-default"><i class="fa fa-edit" title="<%= t.edit %>"></i></a>
+            <a href="/files/edit?file=<%= f %>&dir_path=<%= @dir_path %>" class="btn btn-default"><i class="fa fa-edit" title="<%= EscapeUtils.escape_html t.edit %>"></i></a>
           <% end %>
         </td>
         <td class="text-center">
-          <form method="post" action="/files/delete?file=<%= f %>" class="inline form-confirm" data-confirm="<%= t.are_you_sure %>">
+          <form method="post" action="/files/delete?file=<%= f %>" class="inline form-confirm" data-confirm="<%= EscapeUtils.escape_html t.are_you_sure %>">
             <input name="path" type="hidden" value="<%= @dir_path %>">
-            <button type="submit" class="btn btn-default"><i class="fa fa-trash" title="<%= t.delete %>"></i></button>
+            <button type="submit" class="btn btn-default"><i class="fa fa-trash" title="<%= EscapeUtils.escape_html t.delete %>"></i></button>
           </form>
         </td>
       </tr>

data/bin/admin_views/partials/image_element.html.erb

@@ -0,0 +1,4 @@
+<div class="image-element mb-4">
+  <img src="<%= @img %>" alt="<%= @img %>">
+  <span class="font-size:8px;"><%= @img.split('/').last %></span>
+</div>

data/bin/admin_views/partials/images_page.html.erb

@@ -0,0 +1,8 @@
+<% path = File.join(Pathname.new(Mid.gem_source_path), 'admin_views', 'partials', 'image_element.html.erb') %>
+<% myerb = ERB.new(File.read(path), eoutvar: "@bidule") %>
+<% # Why %= don't work !? Need to do a loop concat... %>
+<% $stderr.puts @images %>
+<% (@images || []).each do |img| %>
+  <% @img = img.gsub(Dir.pwd, "") %>
+  <%= myerb.result(binding)  %>
+<% end %>

data/bin/admin_views/posts/edit.erb

@@ -1,81 +1,83 @@
-<h2><%= t.send(@type_file).capitalize %></h2>
+<h2><%= EscapeUtils.escape_html t.send(@type_file).capitalize %></h2>
 
 <% file_params = (!@new_record ? "?file=#{@file}" : "") %>
 
 <form action="/<%= @type_file %><%= file_params %>" method="post">
   <% if !@new_record %>
     <div class="mb-3">
-      <label for="i-path" class="form-label"><%= t.path.capitalize %></label>
+      <label for="i-path" class="form-label"><%= EscapeUtils.escape_html t.path.capitalize %></label>
       <div class="input-group">
-        <input type="text" class="form-control" value="<%= @file %>" name="new_file" id="i-path">
         <span class="input-group-text">
-          <i class="fas fa-calendar-alt" id="btn-date-path" title="<%= t.change_date_path %>"></i>
+          <i class="fas fa-calendar-alt" id="btn-date-path" title="<%= EscapeUtils.escape_html t.change_date_path %>"></i>
         </span>
         <span class="input-group-text">
-          <i class="fas fa-sync-alt" id="btn-title-path" title="<%= t.change_title_path %>"></i>
+          <i class="fas fa-sync-alt" id="btn-title-path" title="<%= EscapeUtils.escape_html t.change_title_path %>"></i>
         </span>
+        <input type="text" class="form-control" value="<%= @file %>" name="new_file" id="i-path">
       </div>
-      <div id="i-path-help" class="form-text"><%= t.help_path %></div>
+      <div id="i-path-help" class="form-text"><%= EscapeUtils.escape_html t.help_path %></div>
     </div>
   <% end %>
+
   <div class="mb-3">
-    <label for="i-title" class="form-label"><%= t.title.capitalize %></label>
+    <label for="i-title" class="form-label"><%= EscapeUtils.escape_html t.title.capitalize %></label>
     <input type="text" value="<%= @headers.delete('title') %>" class="form-control" name="title" id="i-title">
   </div>
   <div class="mb-3">
-    <label for="i-date" class="form-label"><%= t.date.capitalize %></label>
+    <label for="i-date" class="form-label"><%= EscapeUtils.escape_html t.date.capitalize %></label>
     <div class="input-group">
-      <input type="text" value="<%= @headers.delete('date') || Time.now.strftime('%Y-%m-%d %H:%M:%S %z') %>" class="form-control" name="date" id="i-date">
       <span class="input-group-text">
-        <i class="fas fa-calendar-day" id="btn-date-today" title="<%= t.set_date_today %>"></i>
+        <i class="fas fa-calendar-day" id="btn-date-today" title="<%= EscapeUtils.escape_html t.set_date_today %>"></i>
       </span>
+      <input type="text" value="<%= @headers.delete('date') || Time.now.strftime('%Y-%m-%d %H:%M:%S %z') %>" class="form-control" name="date" id="i-date">
     </div>
   </div>
   <div class="mb-3">
-    <label for="i-tags" class="form-label"><%= t.tags.capitalize %></label>
-    <input type="text" value="<%= @headers.delete('tags') %>" class="form-control" name="tags" id="i-tags">
-    <div id="i-tags-help" class="form-text"><%= t.help_tags %></div>
-  </div>
-  <div class="mb-3 form-check">
-    <input type="checkbox" class="form-check-input" name="publish" value="publish" id="i-publish">
-    <label class="form-check-label" for="i-publish"><%= t.publish.capitalize %></label>
+    <label for="i-tags" class="form-label"><%= EscapeUtils.escape_html t.tags.capitalize %></label>
+    <input type="text" value="<%= Mid.extract_tags(@headers.delete('tags')).join(',') %>" class="form-control" name="tags" id="i-tags">
+    <div id="i-tags-help" class="form-text"><%= EscapeUtils.escape_html t.help_tags.capitalize %></div>
   </div>
 
+  <% if @type_file == 'drafts' %>
+    <div class="mb-3 form-check">
+      <input type="checkbox" class="form-check-input" name="publish" value="publish" id="i-publish">
+      <label class="form-check-label" for="i-publish"><%= EscapeUtils.escape_html t.publish.capitalize %></label>
+    </div>
+  <% end %>
+
+  <% selected_layout = @headers.delete('layout') %>
+  <% selected_layout = @hyde_parameters['default_layout'] if selected_layout.nil? || selected_layout.empty? %>
   <% if @hyde_parameters['display_layout'].to_s == 'true' %>
     <div class="mb-3">
-      <label for="i-layout" class="form-label"><%= t.layout.capitalize %></label>
+      <label for="i-layout" class="form-label"><%= EscapeUtils.escape_html t.layout.capitalize %></label>
       <select class="form-select" aria-label="Choice layout" name="layout">
         <% Dir.glob(File.join(Dir.pwd, '_layouts', '*')).each do |f| %>
-          <% layout = File.basename(f, File.extname(f)) %>
-          <option <%= ((@headers['layout'] == f || (@headers['layout'].to_s.empty? && layout == @hyde_parameters['default_layout'])) ? 'selected' : '') %> value="<%= layout %>"><%= layout %></option>
+          <% layout_loop = File.basename(f, File.extname(f)) %>
+          <option <%= (layout_loop == selected_layout ? 'selected' : '') %> value="<%= layout_loop %>"><%= layout_loop %></option>
         <% end %>
       </select>
     </div>
-    <% @headers.delete('layout') %>
   <% else %>
-    <input type="hidden" name="layout" value="<%= @hyde_parameters['default_layout'] %>">
+    <input type="hidden" name="layout" value="<%= selected_layout %>">
   <% end %>
 
+  <% selected_format = File.extname(@file) %>
+  <% selected_format = ".#{@hyde_parameters['default_format']}" if selected_format.empty? %>
   <% if @hyde_parameters['display_format'].to_s == 'true' %>
     <div class="mb-3">
-      <label for="i-format" class="form-label"><%= t.format.capitalize %></label>
+      <label for="i-format" class="form-label"><%= EscapeUtils.escape_html t.format.capitalize %></label>
       <select class="form-select" id="select-format" aria-label="Choice format" name="format">
-        <% format = File.extname(@file) %>
-        <% format = ".#{@hyde_parameters['default_format']}" if format.empty? %>
         <% { 'html' => 'html', 'markdown' => 'md' }.each do |k, v| %>
-          <option <%= (format == ".#{v}" ? 'selected' : '') %> value="<%= v %>"><%= k %></option>
+          <option <%= (selected_format == ".#{v}" ? 'selected' : '') %> value="<%= v %>"><%= k %></option>
         <% end %>
       </select>
     </div>
-    <script type="text/javascript" charset="utf-8">
-        window.mode_markdown = '<%= format %>' === '.md';
-    </script>
   <% else %>
-    <input type="hidden" name="format" value="<%= @hyde_parameters['default_format'] %>">
-    <script type="text/javascript" charset="utf-8">
-      window.mode_markdown = '<%= @hyde_parameters['default_format'] %>' === 'md';
-    </script>
+    <input type="hidden" name="format" value="<%= selected_format.gsub('.','') %>">
   <% end %>
+  <script type="text/javascript" charset="utf-8">
+      window.mode_markdown = '<%= selected_format %>' === '.md';
+  </script>
 
   <% @headers.each do |k,v| %>
     <div class="mb-3">
@@ -84,13 +86,13 @@
     </div>
   <% end %>
 
-  <a href="#" class="btn btn-secondary mb-2" id="add-header"><i class="fas fa-plus"></i> <%= t.add_header.capitalize %></a>
+  <a href="#" class="btn btn-secondary mb-2" id="add-header"><i class="fas fa-plus"></i> <%= EscapeUtils.escape_html t.add_header.capitalize %></a>
   <div class="mb-3 custom-headers"></div>
 
   <div class="mb-3 template-header" style="display: none">
     <div class="row">
-      <div class="col-sm-4"><input type="text" class="col-sm-6 form-control header-name" name="" placeholder="header name"></div>
-      <div class="col-sm-8"><input type="text" class="col-sm-6 form-control header-value" name="" placeholder="header value"></div>
+      <div class="col-sm-4"><input type="text" class="col-sm-6 form-control header-name" name="" placeholder="<%= EscapeUtils.escape_html t.header_name.capitalize %>"></div>
+      <div class="col-sm-8"><input type="text" class="col-sm-6 form-control header-value" name="" placeholder="<%= EscapeUtils.escape_html t.header_value.capitalize %>"></div>
     </div>
   </div>
 
@@ -109,14 +111,14 @@
   </script>
 
   <div class="mb-3">
-    <label for="i-content" class="form-label"><%= t.content.capitalize %> <a href="https://jekyllrb.com/docs/liquid/" class="text-secondary" target="_blank"><i class="fas fa-question-circle"></i></a></label>
+    <label for="i-content" class="form-label"><%= EscapeUtils.escape_html t.content.capitalize %> <a href="https://jekyllrb.com/docs/liquid/" class="text-secondary" target="_blank"><i class="fas fa-question-circle"></i></a></label>
 
-    <% path = File.join(Pathname.new(File.dirname(__FILE__)).parent, 'editor_html.erb') %>
+    <% path = File.join(Pathname.new(Mid.gem_source_path), 'admin_views', 'editor_html.erb') %>
     <%= ERB.new(File.read(path)).result(binding) %>
 
     <textarea class="form-control text-editor" id="i-content" rows="3" name="content"><%= @content %></textarea>
   </div>
-  <button type="submit" class="btn btn-primary"><%= t.submit.capitalize %></button>
+  <button type="submit" class="btn btn-primary"><%= EscapeUtils.escape_html t.submit.capitalize %></button>
 </form>
 
 <script type="text/javascript" charset="utf-8">
@@ -150,7 +152,7 @@
         return false;
     });
 
-    <% path = File.join(Pathname.new(File.dirname(__FILE__)).parent, 'editor_js.erb') %>
+    <% path = File.join(Pathname.new(Mid.gem_source_path), 'admin_views', 'editor_js.erb') %>
     <%= ERB.new(File.read(path)).result(binding) %>
 
 </script>

data/bin/admin_views/posts/listing.erb

@@ -1,30 +1,33 @@
-<h2><%= t.send(@type_file).capitalize %> &nbsp; <a href="/<%= @type_file %>/new" class="btn btn-secondary btn-sm"><i class="fas fa-plus"></i> <%= t.new.capitalize %></a></h2>
+<h2><%= EscapeUtils.escape_html t.send(@type_file).capitalize %> &nbsp; <a href="/<%= @type_file %>/new" class="btn btn-secondary btn-sm"><i class="fas fa-plus"></i> <%= EscapeUtils.escape_html t.new.capitalize %></a></h2>
 
 <div class="table-responsive">
   <table class="table table-striped table-sm">
     <tr>
       <th>
-        <%= t.file.capitalize %>
+        <%= EscapeUtils.escape_html t.file.capitalize %>
       </th>
       <th>
-        <%= t.edit.capitalize %>
+        <%= EscapeUtils.escape_html t.edit.capitalize %>
       </th>
       <th>
-        <%= t.delete.capitalize %>
+        <%= EscapeUtils.escape_html t.delete.capitalize %>
       </th>
     </tr>
     <% @files.each do |f| %>
+      <% edit_path = "/#{@type_file}?file=#{f}" %>
     <tr>
       <td>
-        <%= f.gsub(File.join(Dir.pwd, ''),'') %>
+        <a href="<%= edit_path %>" class="link-dark">
+          <%= f.gsub(File.join(Dir.pwd, ''),'') %>
+        </a>
       </td>
       <td>
-        <a href="/<%= @type_file %>?file=<%= f %>" class="btn btn-default"><i class="fa fa-edit" title="<%= t.edit.capitalize %>"></i></a>
+        <a href="<%= edit_path %>" class="btn btn-default"><i class="fa fa-edit" title="<%= EscapeUtils.escape_html t.edit.capitalize %>"></i></a>
       </td>
       <td>
-        <form method="post" action="/<%= @type_file %>/delete" class="inline form-confirm" data-confirm="<%= t.are_you_sure %>">
+        <form method="post" action="/<%= @type_file %>/delete" class="inline form-confirm" data-confirm="<%= EscapeUtils.escape_html t.are_you_sure %>">
           <input type="hidden" name="file" value="<%= f %>">
-	        <button type="submit" class="btn btn-default"><i class="fa fa-trash" title="<%= t.delete.capitalize %>"></i></button>
+	        <button type="submit" class="btn btn-default"><i class="fa fa-trash" title="<%= EscapeUtils.escape_html t.delete.capitalize %>"></i></button>
         </form>
       </td>
     </tr>

data/bin/admin_views/upload_image_form.erb

@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html lang="fr">
+  <head>
+    <meta charset="utf-8">
+    <title>Hyde for Jekyll</title>
+
+    <meta name="description" content="Hyde for Jekyll">
+    <meta name="author" content="Sylvain Claudel (https://blog.rivsc.ovh)">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-F3w7mX95PdgyTmZZMECAngseQB83DfGTowi0iMjiWaeVhAn4FJkqJByhZMI3AhiU" crossorigin="anonymous">
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-/bQdsTh/da6pkI1MST/rWKFNjaCP5gBSY4sEBT38Q/9RBh9AH40zEOg7Hlq2THRZ" crossorigin="anonymous"></script>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" integrity="sha512-1ycn6IcaQQ40/MKBW2W4Rhis/DbILU74C1vSrLJxCq57o941Ym01SwNsOMqvEBFlcgUa6xLiPY/NS5R+E6ztJQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+
+    <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
+
+    <script type="text/javascript" charset="utf-8">
+      $(function(){
+          $(document).on('click', '.btn-return-to-editor', function(){
+              //don't work
+              //window.opener.reload_image();
+              window.close();
+          });
+      });
+    </script>
+  </head>
+  <body style="width:800px;" class="p-4">
+    <div class="container-fluid">
+      <div class="row">
+        <h1><%= t.upload_image_form.capitalize %></h1>
+
+        <% if @filenames %>
+          <%= t.pictures_has_been_uploaded.capitalize %> : <%= @filenames.join(', ') %>
+        <% end %>
+
+        <form enctype="multipart/form-data" method="post" action="/upload_image" class="row g-3">
+          <div class="col-10">
+            <input type="file" name="files[]" multiple class="form-control">
+          </div>
+          <div class="col-2">
+            <button class="btn btn-primary"><%= t.upload.capitalize %></button>
+          </div>
+        </form>
+
+        <button class="btn btn-secondary btn-return-to-editor fixed-bottom mb-4 ms-4"><%= t.quit.capitalize %></button>
+      </div>
+    </div>
+  </body>
+</html>

data/bin/hyde_admin.ru

@@ -5,11 +5,16 @@ require 'yaml'
 require 'fileutils'
 require 'i18n'
 require 'date'
+require 'escape_utils'
+require 'image_processing/mini_magick'
 require_relative '../lib/hyde_admin/version'
 
 # TODO détecter format nouveau post (pour codemirror)
+# Serve
+
+class Mid < Roda
+  plugin :middleware
 
-class App < Roda
   YML_FILE_NAME = "hyde_admin.yml"
 
   plugin :render,
@@ -55,7 +60,7 @@ class App < Roda
   end
 
   def self.extract_header(str)
-    headers = App.extract_header_str(str).to_s.split("\n")
+    headers = Mid.extract_header_str(str).to_s.split("\n")
     headers = headers.select{ |header| !header.empty? }.map{ |header| header.scan(/([a-zA-Z0-9]*): (.*)/).flatten }.select{ |header| !header.empty? }
     hsh_headers = {}
     if !headers.flatten.empty?
@@ -70,6 +75,34 @@ class App < Roda
     str.gsub(/---(.*?)---/m, "")
   end
 
+  def self.gem_source_path
+    File.expand_path(File.dirname(__FILE__))
+  end
+
+  def self.extract_tags(str)
+    str.to_s.scan(/^\[?(.*?)\]?$/).flatten.first.split(',')
+  end
+
+  def self.resize_image(image_path,params)
+    dir = File.dirname(image_path)
+    basename = File.basename(image_path, File.extname(image_path))
+    while File.exist?("#{File.join(dir, "#{basename}_#{params['resize_size']}")}.#{params['resize_format']}")
+      basename += '_'
+    end
+    output_path = "#{File.join(dir, "#{basename}_#{params['resize_size']}")}.#{params['resize_format']}"
+
+    width,height = params['resize_size'].split("x")
+    ip = ImageProcessing::MiniMagick
+      .source(image_path)
+      .convert(params['resize_format'])
+      .resize_to_limit(width.to_i, height.to_i)
+    if params['resize_format'] == 'jpg'
+      ip = ip.saver(quality: 80, interlace: "Line")
+    end
+
+    ip.call(destination: output_path)
+  end
+
   FORMAT_DATE_FILENAME = '%Y-%m-%d'
   FORMAT_DATE_INPUT_FILENAME = '%Y-%m-%d %H:%M:%S %z'
 
@@ -105,12 +138,13 @@ class App < Roda
     end
 
     r.on "deploy" do
-      `#{@hyde_parameters['rsync_fullpath']} #{Dir.pwd}/_site/ #{@hyde_parameters['deploy_dest_user']}@#{@hyde_parameters['deploy_dest_address']}:#{@hyde_parameters['deploy_dest_path']}`
+      `#{@hyde_parameters['rsync_fullpath']} -avzr #{Dir.pwd}/_site/ #{@hyde_parameters['deploy_dest_user']}@#{@hyde_parameters['deploy_dest_address']}:#{@hyde_parameters['deploy_dest_path']}`
       r.redirect "/dashboard"
     end
 
     r.post "configuration" do
       r.params.each_pair do |k,v|
+        next if k.to_s == "beforeSend"
         @hyde_parameters[k] = v
       end
       File.open(File.join(Dir.pwd, YML_FILE_NAME),"w+") do |f|
@@ -127,6 +161,29 @@ class App < Roda
       view("dashboard")
     end
 
+    r.on "upload_image_form" do
+      render("upload_image_form")
+    end
+
+    r.post "upload_image" do
+      files = [r.params['files']].flatten # 1 or more files
+      @filenames = []
+      files.each do |file|
+        filename = file[:filename]
+        while File.exist?(File.join(@hyde_parameters['images_path'], filename))
+          filename = "#{File.basename(filename, File.extname(filename))}_#{File.extname(filename)}"
+        end
+        @filenames << filename
+        File.open(File.join(@hyde_parameters['images_path'], filename), 'wb') do |f|
+          f.write(file[:tempfile].read)
+        end
+        if @hyde_parameters['resize_enable'] == 'true'
+          Mid.resize_image(File.join(@hyde_parameters['images_path'], filename), @hyde_parameters)
+        end
+      end
+      render("upload_image_form")
+    end
+
     r.on "files" do
       @dir_path = r.params['dir_path'] || Dir.pwd
 
@@ -141,6 +198,7 @@ class App < Roda
       r.post "create" do
         files = [r.params['files']].flatten # 1 or more files
         files.each do |file|
+          # TODO rename file if exist
           File.open(File.join(@dir_path, file[:filename]), 'wb') do |f|
             f.write(file[:tempfile].read)
           end
@@ -167,8 +225,8 @@ class App < Roda
       r.get "edit" do
         @file = r.params['file']
         @content = File.read(@file)
-        @header = App.extract_header_str(@content)
-        @content = App.remove_header(@content)
+        @header = Mid.extract_header_str(@content)
+        @content = Mid.remove_header(@content)
         @has_header = (!@header.nil? && !@header.empty?)
         @has_editor = ['.html','.md'].include?(File.extname(@file))
         view("files/edit")
@@ -210,13 +268,34 @@ class App < Roda
         path = r.params['path']
         title = r.params['title']
         I18n.config.available_locales = :en
-        new_path = path.gsub(REGEXP_EXTRACT_DATE_TITLE_FROM_FILENAME, "\\1#{App.transliterate_title_for_url(title)}\\3")
+        new_path = path.gsub(REGEXP_EXTRACT_DATE_TITLE_FROM_FILENAME, "\\1#{Mid.transliterate_title_for_url(title)}\\3")
         response.write(new_path)
       end
       r.post "update_date_today" do
         date = Time.now.strftime(FORMAT_DATE_INPUT_FILENAME)
         response.write(date)
       end
+      r.post "images" do
+        nb_elements_per_page = 9
+
+        sort_date = r.params['sort_date']
+        filename = r.params['filename']
+        page = r.params['page'].to_i
+        start_elts = (page || 0) * nb_elements_per_page
+
+        search_filename = "*#{filename.strip}*"
+
+        path_of_images = File.join(Dir.pwd, @hyde_parameters['images_path'], search_filename)
+
+        all_images = Dir.glob(path_of_images).sort_by {|filename| File.mtime(filename) }
+        all_images = all_images.reverse if sort_date == 'asc'
+        @images = all_images[start_elts, nb_elements_per_page]
+
+        path = File.join(Pathname.new(Mid.gem_source_path), 'admin_views', 'partials', 'images_page.html.erb')
+        data = ERB.new(File.read(path)).result(binding)
+
+        response.write(data)
+      end
     end
 
     # Posts/pages/drafts
@@ -256,7 +335,7 @@ class App < Roda
           @file = r.params['file']
 
           content_file = File.read(@file)
-          @headers = App.extract_header(content_file)
+          @headers = Mid.extract_header(content_file)
           @content = File.read(@file).gsub(/---(.*?)---/m, "")
 
           # for page
@@ -286,7 +365,7 @@ class App < Roda
           #$stderr.puts "---->"
 
           if @new_file.nil? || @new_file.empty?
-            filename = App.urlize(@date, @title, (@type_file != 'pages'))
+            filename = Mid.urlize(@date, @title, (@type_file != 'pages'))
             @new_file = File.join(Dir.pwd,"_#{@type_file}", "#{filename}.#{@format}")
           end
 
@@ -328,4 +407,11 @@ class App < Roda
   end
 end
 
+# https://roda.jeremyevans.net/rdoc/classes/Roda/RodaPlugins/Middleware.html
+class App < Roda
+  use Mid
+  use Rack::Static, :urls => [''], root: Dir.pwd # allow to match all files in Dir.pwd
+end
+
 run App.freeze.app
+

data/bin/hyde_admin.yml

@@ -6,10 +6,13 @@ deploy_dest_path: "/absolute/remote/path/mysite"
 rsync_fullpath: rsync
 site_index: index.html
 hyde_admin_language: en
-hyde_admin_auth: false
+hyde_admin_auth: 'false'
 hyde_admin_user: admin
 hyde_admin_password: admin
 default_format: html
-display_layout: true
-display_format: true
-images_path: assets/images/
+display_layout: 'true'
+display_format: 'true'
+images_path: assets/images/
+resize_format: jpg
+resize_size: 1500x1000
+resize_enable: 'true'

data/bin/hyde_assets/hyde_admin.css

@@ -1,18 +1,37 @@
 /* modal pictures */
-.modal-body-image{
+.image-selector-content{
     display: grid;
     grid-template-columns: 1fr 1fr 1fr;
 }
-.modal-body-image .image-element{
+.image-selector-content .image-element{
     width: 150px;
     height: 150px;
 }
-.modal-body-image .image-element img{
+.image-selector-content .image-element img{
     width: 100%;
     height: 100%;
     object-fit: contain;
     overflow: hidden;
+    border:2px solid white;
 }
-.modal-body-image .image-element img:hover{
+.image-selector-content .image-element img:hover{
     border:2px solid gray;
+}
+
+.image-element{
+    position: relative;
+}
+
+.image-element span{
+    position: absolute;
+    bottom:0px;
+    left:5px;
+    z-index: 10;
+    font-weight: bold;
+    margin-bottom: -20px;
+}
+
+.CodeMirror{
+    border: 1px solid #ced4da;
+    border-radius: 4px;
 }

data/bin/i18n/en.yml

@@ -39,7 +39,7 @@ help_default_layout: default layout for jekyll posts/pages
 deploy_dest_user: deploy remote user
 help_deploy_dest_user: Ssh user for rsync
 deploy_dest_address: deploy remote domain
-help_deploy_dest_address: remote domain for ssh deployment
+help_deploy_dest_address: remote domain for ssh deployment (example.com)
 deploy_dest_path: deploy remote path
 help_deploy_dest_path: remote path on disk for ssh deployment
 rsync_fullpath: rsync path
@@ -47,24 +47,24 @@ help_rsync_fullpath: if rsync is not in PATH, othervise just let 'rsync'
 site_index: index file name of site
 help_site_index: link to open when we click on overview
 hyde_admin_language: hyde admin language
-help_hyde_admin_language: To change hyde admin language interface
+help_hyde_admin_language: To change hyde admin language interface (fr = french, en = english)
 set_date_today: set date at today
 change_date_path: update date in path
 change_title_path: update title in path
 directory_input_placeholder: directory name to create
 file_input_placeholder: file name to create
 hyde_admin_auth: enable BasicAuth
-help_hyde_admin_auth: enable BasicAuth
+help_hyde_admin_auth: enable BasicAuth (true/false)
 hyde_admin_user: BasicAuth user
 help_hyde_admin_user: BasicAuth user
 hyde_admin_password: BasicAuth password
 help_hyde_admin_password: BasicAuth password
 default_format: default format
-help_default_format: default format
+help_default_format: default format (html = html, md = markdown)
 display_layout: display the layout input on edit form
-help_display_layout: display the layout input on edit form
+help_display_layout: display the layout input on edit form (true/false)
 display_format: display the format input on edit form
-help_display_format: display the format input on edit form
+help_display_format: display the format input on edit form (true/false)
 images_path: pictures path
 help_images_path: relative local picture path
 editor_undo: Undo
@@ -85,4 +85,25 @@ editor_italic: Italic
 editor_strikethrough: Strikethrough
 default_alt_img: Alt text
 default_title_img: Title text
-parent_dir: dossier parent
+parent_dir: parent directory
+sort_by_date: sort_by_date
+older: older first
+newer: newer first
+previous_images: previous images
+next_images: next images
+search: search
+filename: filename
+filename_placeholder: filename...
+upload_image_form: upload image form
+pictures_has_been_uploaded: pictures has been uploaded
+quit: quit
+header_name: header name
+header_value: header value
+images: images
+load_images: load images
+resize_format: jpg
+help_resize_format: jpg or png
+resize_size: 1500x1000
+help_resize_size: Downsize to fit to the specified size (resize preserve ratio), example 1500x1000
+resize_enable: true
+help_resize_enable: enable feature resize image at upload

data/bin/i18n/fr.yml

@@ -39,7 +39,7 @@ help_default_layout: présentation par défaut pour les posts et pages
 deploy_dest_user: Utilisateur pour déploiement
 help_deploy_dest_user: Utilisateur pour déploiement par ssh
 deploy_dest_address: Adresse pour déploiement
-help_deploy_dest_address: Domaine ou adresse IP pour déploiement à travers ssh
+help_deploy_dest_address: Domaine ou adresse IP pour déploiement à travers ssh (example.com)
 deploy_dest_path: chemin distant pour déploiement
 help_deploy_dest_path: chemin distant pour déploiement du site
 rsync_fullpath: chemin rsync
@@ -47,24 +47,24 @@ help_rsync_fullpath: si rsync n'est pas dans le PATH, sinon laissez 'rsync'
 site_index: nom du fichier index pour le site
 help_site_index: Lien pour le lien aperçu, pensez à l'extention si nécessaire
 hyde_admin_language: hyde admin langue
-help_hyde_admin_language: Pour changer la langue d'interface de hyde admin
+help_hyde_admin_language: Pour changer la langue d'interface de hyde admin (fr = français, en = anglais)
 set_date_today: mets la date du jour
 change_date_path: mets à jour la date dans le chemin de fichier
 change_title_path: mets à jour le titre dans le chemin de fichier
 directory_input_placeholder: nom du dossier à créer
 file_input_placeholder: nom du fichier à créer
 hyde_admin_auth: enable BasicAuth
-help_hyde_admin_auth: enable BasicAuth
+help_hyde_admin_auth: enable BasicAuth (true/false)
 hyde_admin_user: BasicAuth user
 help_hyde_admin_user: BasicAuth user
 hyde_admin_password: BasicAuth password
 help_hyde_admin_password: BasicAuth password
 default_format: format par défaut
-help_default_format: format par défaut pour les posts
+help_default_format: format par défaut pour les posts (html = html, md = markdown)
 display_layout: affiche le choix du layout sur le formulaire d'édition
-help_display_layout: affiche le choix du layout sur le formulaire d'édition
+help_display_layout: affiche le choix du layout sur le formulaire d'édition (true/false)
 display_format: affiche le choix du format sur le formulaire d'édition
-help_display_format: affiche le choix du format sur le formulaire d'édition
+help_display_format: affiche le choix du format sur le formulaire d'édition (true/false)
 images_path: chemin des images
 help_images_path: chemin local relatif des images
 editor_undo: Annuler
@@ -85,4 +85,25 @@ editor_italic: Italique
 editor_strikethrough: Barré
 default_alt_img: Texte alternatif
 default_title_img: Titre image
-parent_dir: dossier parent
+parent_dir: dossier parent
+sort_by_date: tri par date
+older: vieille d'abord
+newer: récente d'abord
+previous_images: images précédentes " lol
+next_images: images suivantes
+search: recherche
+filename: nom de fichier
+filename_placeholder: nom de fichier...
+upload_image_form: formulaire d'upload d'image
+pictures_has_been_uploaded: les images ont été uploadées
+quit: quitter
+header_name: nom d'entête
+header_value: valeur d'entête
+images: images
+load_images: charger images
+resize_format: jpg
+help_resize_format: jpg ou png
+resize_size: 1500x1000
+help_resize_size: Réduit les image pour coller à la taille spécifiée (le redimensionnement préserve le ratio), exemple 1500x1000
+resize_enable: true
+help_resize_enable: active la fonctionnalité de redimensionnement d'image à l'upload

data/hyde_admin.gemspec

@@ -28,6 +28,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("roda", "~> 3.48.0")
   s.add_runtime_dependency("roda-i18n", "~> 0.4.0")
   s.add_runtime_dependency("roda-http-auth", "0.2.0")
+  s.add_runtime_dependency("escape_utils") # escape_javascript / escape_html
   #s.add_runtime_dependency("i18n", "~> 0.4.0") # I18n.transliterate (already required by jekyll)
   s.add_runtime_dependency('jekyll') # Because we call jekyll binary
+  s.add_runtime_dependency('image_processing') # JPEG quality
 end

data/lib/hyde_admin/version.rb

@@ -1,3 +1,3 @@
 module HydeAdmin
-  VERSION = "0.0.3"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyde_admin
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.8
 platform: ruby
 authors:
 - Sylvain Claudel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-13 00:00:00.000000000 Z
+date: 2021-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roda
@@ -52,6 +52,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: escape_utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: image_processing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Jekyll admin interface
 email: claudel.sylvain@gmail.com
 executables:
@@ -74,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitattributes"
+- ".gitignore"
 - ".idea/.gitignore"
 - ".idea/hyde_admin.iml"
 - ".idea/misc.xml"
@@ -89,8 +118,11 @@ files:
 - bin/admin_views/editor_js.erb
 - bin/admin_views/files/edit.erb
 - bin/admin_views/files/listing.erb
+- bin/admin_views/partials/image_element.html.erb
+- bin/admin_views/partials/images_page.html.erb
 - bin/admin_views/posts/edit.erb
 - bin/admin_views/posts/listing.erb
+- bin/admin_views/upload_image_form.erb
 - bin/fslightbox/fslightbox.js
 - bin/hyde_admin
 - bin/hyde_admin.ru