Deplace new menu item in main page

Trop de modal tu les modal

app/templates/admin/_menu-admin.html

@@ -32,9 +32,12 @@
     </button>
     
 
-    <a class="btn btn-warning nav-brand js-scroll-trigger" href="/edit/save">
+    <button class="btn btn-warning nav-brand js-scroll-trigger" href="/edit/save"
+	    type="button"
+	    data-toggle="modal"
+	    data-target="#publish">
       Publier mes modifications
-    </a>
+    </button>
 
 
   </div>
@@ -140,3 +143,22 @@
   </div>
 </div>
 </div>
+
+<div class="modal" id="publish">
+  <div class="modal-dialog modal-lg">
+    <div class="modal-content">
+      <!-- Modal Header -->
+      <div class="modal-header">
+        <h4 class="modal-title"> Publier mon site </h4>
+        <button type="button" class="close" data-dismiss="modal">&times;</button>
+      </div>
+      <div class="modal-body text-center">
+	{% include 'admin/_publish.html' %}
+      </div>
+      <div class="modal-footer mx-auto">
+	<a class="btn btn-danger" href="/" > Annuler </a>
+      </div>
+    </div>
+  </div>
+</div>
+

app/templates/admin/_menu-edit.html

@@ -29,8 +29,26 @@
       {% endif %}
       {% endfor %}
 
-  </div>  
-    <button class="btn btn-outline-success" onclick="openForm()">+</button>
+  </div> 
+  <hr />
+    
+<div class="newItemMenu" id="newItem">
+  <form  class="form-container">
+    <h3>Nouvelle entrée</h3><br>
+    
+    <label for="nom"><b>Nom</b></label>
+    <input type="text" placeholder="Nom" id="newEntry_name" required="">
+    <br/>
+    <label> Cette entré est un sous menu </label>
+    <input type="checkbox" id="submenu" onclick="disableLink()" value="Cette entré est un sous-menu"><br>
+    <label for="link"><b>Lien</b></label>
+    <input type="text" placeholder="un lien ou nom d'un bloc" id="newEntry_link">
+    <br>
+    <button type="button" onclick="addEntry()" class="btn btn-outline-success">+</button>
+</div>
+  </form>
+
+
     <hr>
     <button class="btn btn-success" type="submit" form="menuEdit"> Enregistrer </button>
  
@@ -38,19 +56,6 @@
 
 
 
-<div class="form-popup" id="myForm" style="display: none;">
-  <form  class="form-container">
-    <h3>Nouvelle entrée</h3><br>
-    
-    <label for="nom"><b>Nom</b></label>
-    <input type="text" placeholder="Nom" id="newEntry_name" required="">
-    <input type="checkbox" id="submenu" onclick="disableLink()" value="Cette entré est un sous-menu"><br>
-    <label for="link"><b>Lien</b></label>
-    <input type="text" placeholder="un lien ou nom d'un bloc" id="newEntry_link">
-    <button type="button" onclick="addEntry()" class="btn">Ajouter</button>
-    <button type="button" class="btn cancel" onclick="closeForm()">Close</button>
-  </form>
-</div>
 
 <script src="/static/vendors/Sortable/Sortable.min.js"></script>
 <script type="text/javascript">