From 7ee91198efe9d4e40519b15078fa79842d027535 Mon Sep 17 00:00:00 2001
From: kitoy <kitoy@kitoy.me>
Date: Fri, 22 May 2026 01:21:39 +0200
Subject: [PATCH] Clean HTML for admin site

---
 app/models/sites.py                  | 11 ++--
 app/templates/admin/_blocs-list.html |  4 +-
 app/templates/admin/_pages-edit.html | 78 ++++++++++++++--------------
 app/templates/admin/_publish.html    | 10 ++--
 app/templates/admin/login.html       |  4 +-
 5 files changed, 52 insertions(+), 55 deletions(-)

diff --git a/app/models/sites.py b/app/models/sites.py
index a676e40..24f0444 100644
--- a/app/models/sites.py
+++ b/app/models/sites.py
@@ -189,24 +189,23 @@ class DataSite:
             pageIndex.write_text(htmlExport)
         
     def copy_static_files(self):
-        themesStaticFolder = Path(PurePosixPath('app').joinpath('static','themes', self.datas['config']['theme'],'static'))
-        publicStaticFolder = Path(PurePosixPath(self.user_folder).joinpath('public', 'static'))
+        themesStaticFolder = Path(PurePosixPath('app').joinpath('static','themes', self.datas['config']['theme']))
+        publicStaticFolder = Path(PurePosixPath(self.user_folder).joinpath('public', 'static', 'themes', self.datas['config']['theme']))
+
         rmtree (publicStaticFolder, ignore_errors=True)
+
         copytree(themesStaticFolder, publicStaticFolder)
 
 
     def publish(self, user:str, password:str, serverAddress:str, serverPort:int, folder:str):
         remote_directory = "/remote/dir"
         userDir = Path(PurePosixPath(self.user_folder))
-        
 
         command = "lftp -u \"{}\",\"{}\" -p {} {} -e ' mirror -R public {}; chmod -R o+rx ./; bye;'".format(user,
-
                                                                                     password,
                                                                                     serverPort,
                                                                                     serverAddress,
-                                                                                     folder)
-        print(command)
+                                                                                    folder)
         try:
             subprocess.call(command, shell=True, cwd=str(userDir))
         except ChildProcessError:
diff --git a/app/templates/admin/_blocs-list.html b/app/templates/admin/_blocs-list.html
index 6ddc6b0..06a00f0 100644
--- a/app/templates/admin/_blocs-list.html
+++ b/app/templates/admin/_blocs-list.html
@@ -1,8 +1,6 @@
 
 
-<form class="sortblocs" action="/sortblocs" method="POST" id="myblocs">
 <div id="myblocs" class="myblocs">    
-  <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>  
   {% for item in myblocs.keys() %}
 
   <div class="bloc" id="bloc-{{ item }}" style="margin-top: 10px;">
@@ -15,6 +13,8 @@
 
 </div>
 </form>
+
+
 <script src="/static/vendors/Sortable/Sortable.min.js"></script>
 <script type="text/javascript">
  
diff --git a/app/templates/admin/_pages-edit.html b/app/templates/admin/_pages-edit.html
index cb56c04..a803560 100644
--- a/app/templates/admin/_pages-edit.html
+++ b/app/templates/admin/_pages-edit.html
@@ -1,47 +1,45 @@
 <div id="mypages"> 
-	<ul style="list-style:none;" id="mypages" class="mypages">    
-		<li><a href="/"> <button class="btn"> Page d'accueil </button> </a> </li>
+  <ul style="list-style:none;" id="mypages" class="mypages">    
+    <li><a href="/"> <button class="btn"> Page d'accueil </button> </a> </li>
+    {% for item in pagesList %}
+    <li style="padding-top: 10px;"> 
+      <a href="/{{ item }}/">
+	<button class="btn"> {{ item }} </button>
+      </a> 
+      <a href="/rmPage/{{ item }}"><button class="btn btn-danger"> X </button></a>
+    </li>
+    {% endfor %}     
 
-  		{% for item in pagesList %}
-
-  		<li style="padding-top: 10px;"> 
-			<a href="/{{ item }}/"> 
-				<button class="btn"> {{ item }} </button>
-			</a> 
-			<a href="/rmPage/{{ item }}"><button class="btn btn-danger"> X </button></a>
-
-		</li>
-  		{% endfor %}     
-
-	</ul>
+  </ul>
  
-	<div class="formAddPage" id="addPage">
-	<form action="/addPage" id="addPage" method="POST" class="" >
-    	<input id="csrf_token" name="csrf_token" type="hidden" value="{{ csrf_token() }}">  
-    	<h3>Créé un nouveau bloc</H3>
-    	<br>
-   	<label for="blocName">Nom du bloc (caractères sans accents uniquement) </label>
-      	<div class="input-group">
-	      <input type="text"
-	      name="pageName" 
-	      class="form-control" 
-	      id="pageName" 
-	      placeholder="Ma_Page" 
-	      required>
-       	<div class="invalid-feedback">
-        	 Entrez le nom de la page sans espaces ni caractères spéciaux  
-         </div>
-       </div> 
-       <br>
-           <label for="link"><b>Type de bloc</b></label>
-       <br/>
-       <select id="pageType" name="pageType" size="8" required>
+  <div class="formAddPage" id="addPage">
+    <form action="/addPage" id="addPage" method="POST" class="" >
+      <input id="csrf_token" name="csrf_token" type="hidden" value="{{ csrf_token() }}">  
+        <h3>Créé un nouveau bloc</H3>
+	<br />
+	<label for="blocName">Nom du bloc (caractères sans accents uniquement) </label>	
+	<div class="input-group">
+	  <input type="text"
+		name="pageName" 
+		class="form-control" 
+		id="pageName" 
+		placeholder="Ma_Page" 
+		required >
+	  <div class="invalid-feedback">
+	    Entrez le nom de la page sans espaces ni caractères spéciaux  
+	  </div>
+	</div>
+
+        <br />
+        <label for="link"><b>Type de bloc</b></label>
+        <br/>
+        <select id="pageType" name="pageType" size="8" required>
 	   <option value="article_image"> Article avec une image d'en tête </option> 
 	   <option value="simple_article"> Page blanche Texte libre </option>
-       </select>
-       <br/>
-       <button type="submit" class="btn btn-success"
+        </select>
+        <br/>
+        <button type="submit" class="btn btn-success"
 			  onclick="valid_nameBloc()"> Créer la page </button>
-  	</form>
-</div>
+    </form>
+  </div>
 </div>
diff --git a/app/templates/admin/_publish.html b/app/templates/admin/_publish.html
index 851da92..b95646c 100644
--- a/app/templates/admin/_publish.html
+++ b/app/templates/admin/_publish.html
@@ -4,15 +4,15 @@
     	<h3>Publier mon site </h3>
 	<p> Rentrez ici les identifiants de connexions fourni par votre hébergeur. </p>
     	<br/>
-   	<label for="ServerAddress"> Adresse du serveur : </label>
-      	<div class="input-group">
-	      <input type="text"
-	      name="serverAddress" 
+   		<label for="ServerAddress"> Adresse du serveur : </label>
+      		<div class="input-group">
+		      <input type="text"
+		name="serverAddress" 
 	      class="form-control" 
 	      id="serverAddress" 
 	      placeholder="sftp://mon_serveur.com, ou ftp://mon_serveur.com" 
 	      required>
-       	<dd<div class="invalid-feedback">
+       		<div class="invalid-feedback">
         	 L'upload a rencontrer n'a pas pu se faire.  
          </div>
        </div> 
diff --git a/app/templates/admin/login.html b/app/templates/admin/login.html
index 61a6078..a2e5ee6 100644
--- a/app/templates/admin/login.html
+++ b/app/templates/admin/login.html
@@ -13,7 +13,7 @@
          {{ form.csrf_token }}
 	  <h3 class="heading"> Connexion Mon site perso  </h3>
     	   <div class="inputContainer">
-        <svg class="inputIcon" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#2e2e2e" viewBox="0 0 16 16">
+        <svg class="inputIcon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="#2e2e2e" viewBox="0 0 16 16">
             <path d="M13.106 7.222c0-2.967-2.249-5.032-5.482-5.032-3.35 0-5.646 2.318-5.646 5.702 0 3.493 2.235 5.708 5.762 5.708.862 0 1.689-.123 2.304-.335v-.862c-.43.199-1.354.328-2.29.328-2.926 0-4.813-1.88-4.813-4.798 0-2.844 1.921-4.881 4.594-4.881 2.735 0 4.608 1.688 4.608 4.156 0 1.682-.554 2.769-1.416 2.769-.492 0-.772-.28-.772-.76V5.206H8.923v.834h-.11c-.266-.595-.881-.964-1.6-.964-1.4 0-2.378 1.162-2.378 2.823 0 1.737.957 2.906 2.379 2.906.8 0 1.415-.39 1.709-1.087h.11c.081.67.703 1.148 1.503 1.148 1.572 0 2.57-1.415 2.57-3.643zm-7.177.704c0-1.197.54-1.907 1.456-1.907.93 0 1.524.738 1.524 1.907S8.308 9.84 7.371 9.84c-.895 0-1.442-.725-1.442-1.914z"></path>
         </svg>
 
@@ -21,7 +21,7 @@
         </div>
     
         <div class="inputContainer">
-        <svg class="inputIcon" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#2e2e2e" viewBox="0 0 16 16">
+        <svg class="inputIcon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="#2e2e2e" viewBox="0 0 16 16">
             <path d="M8 1a2 2 0 0 1 2 2v4H6V3a2 2 0 0 1 2-2zm3 6V3a3 3 0 0 0-6 0v4a2 2 0 0 0-2 2v5a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V9a2 2 0 0 0-2-2z"></path>
         </svg>