Réduction des boutons

core/module/addon/view/index/index.php

@@ -1,22 +1,20 @@
 <div class="row">
-	<div class="col2">
+	<div class="col1">
 		<?php echo template::button('configModulesBack', [
 			'class' => 'buttonGrey',
 			'href' => helper::baseUrl(),
-			'ico' => 'left',
-			'value' => 'Retour'
+			'value' => template::ico('left')
 		]); ?>
 	</div>
-	<div class="col2">
+	<div class="col1">
 		<?php echo template::button('configModulesHelp', [
-			'href' => 'https://doc.zwiicms.fr/les-modules',
+			'href' => 'https://doc.zwiicms.fr/modules-utilisation-generique',
 			'target' => '_blank',
-			'ico' => 'help',
-			'value' => 'Aide',
+			'value' => template::ico('help'),
 			'class' => 'buttonHelp'
 		]); ?>
 	</div>
-	<div class="col2 offset4">
+	<div class="col2 offset6">
           <?php echo template::button('configModulesStore', [
               'href' => helper::baseUrl() . 'addon/store',
               'value' => 'Catalogue en ligne'

core/module/addon/view/store/store.php

@@ -1,10 +1,9 @@
 <div class="row">
-	<div class="col2">
+	<div class="col1">
 		<?php echo template::button('configStoreBack', [
 			'class' => 'buttonGrey',
-			'href' => helper::baseUrl() . 'addon/upload',
-			'ico' => 'left',
-			'value' => 'Retour'
+			'href' => helper::baseUrl()  . 'addon',
+			'value' => template::ico('left')
 		]); ?>
 	</div>
 </div>

core/module/addon/view/upload/upload.help.html

@@ -1,6 +0,0 @@
-<h3>INSTALLER OU METTRE A JOUR</h3>
-<p>Avant de choisir le fichier ZIP du module à installer vous devez le télécharger sur votre serveur en utilisant le 'Catalogue en ligne'.</p>
-<p>D'autres modules sont également disponibles sur le <a href="https://forum.zwiicms.fr/categories/t%C3%A9l%C3%A9chargements-de-modules" target="_blank" rel="noopener">forum de ZwiiCMS</a>,
-téléversez les sur votre serveur avec 'Gérer les fichiers'.</p>
-<p>Lors d'une mise à jour Zwii contrôle la version du module à installer, pour réinstaller un module de même numéro de version vous devez cocher 'Mise à jour forcée'.
-  Il est déconseillé d'installer un module plus ancien.</p>

core/module/addon/view/upload/upload.php

@@ -1,30 +1,26 @@
 <?php echo template::formOpen('configModulesUpload'); ?>
   <div class="row">
-      <div class="col2">
+      <div class="col1">
           <?php echo template::button('configModulesBack', [
               'class' => 'buttonGrey',
               'href' => helper::baseUrl()  . 'addon',
-              'ico' => 'left',
-              'value' => 'Retour'
+              'value' => template::ico('left')
           ]); ?>
       </div>
-      <div class="col2">
+      <div class="col1">
         <?php echo template::button('addonIndexHelp', [
+          'href' => 'https://doc.zwiicms.fr/installation-d-un-module',
+          'target' => '_blank',
           'class' => 'buttonHelp',
-          'ico' => 'help',
-          'value' => 'Aide'
+          'value' => template::ico('help')
         ]); ?>
       </div>
-      <div class="col2 offset6">
+      <div class="col2 offset8">
             <?php echo template::submit('configModulesSubmit',[
                 'value' => 'Valider',
                 'ico' => 'check'
             ]); ?>
       </div>
-  </div>
-  <!-- Aide à propos de la gestion des modules, view upload -->
-  <div class="helpDisplayContent">
-    <?php echo file_get_contents( 'core/module/addon/view/upload/upload.help.html') ;?>
   </div>
 	<div class="row">
 		<div class="col12">

core/module/config/view/backup/backup.php

@@ -1,14 +1,13 @@
 <?php echo template::formOpen('configBackupForm'); ?>
 <div class="row">
-	<div class="col2">
+	<div class="col1">
 		<?php echo template::button('configBackupBack', [
 				'class' => 'buttonGrey',
 				'href' => helper::baseUrl() . 'config',
-				'ico' => 'left',
-				'value' => 'Retour'
+				'value' => template::ico('left')
 		]); ?>
 	</div>
-	<div class="col2 offset8">
+	<div class="col2 offset9">
 		<?php echo template::submit('configBackupSubmit',[
 			'value' => 'Sauvegarder',
 			'uniqueSubmission' => true

core/module/config/view/index/index.php

@@ -1,23 +1,21 @@
 <?php echo template::formOpen('configForm');?>
 <div class="row">
-	<div class="col2">
+	<div class="col1">
 		<?php echo template::button('configBack', [
 			'class' => 'buttonGrey',
 			'href' => helper::baseUrl(false),
-			'ico' => 'home',
-			'value' => 'Accueil'
+            'value' => template::ico('home')
 		]); ?>
 	</div>
-    <div class="col2 ">
+    <div class="col1">
 			<?php echo template::button('configHelp', [
 				'class' => 'buttonHelp',
                 'href' => 'https://doc.zwiicms.fr/configuration-du-site',
                 'target' => '_blank',
-				'ico' => 'help',
-				'value' => 'Aide'
+				'value' => template::ico('help')
 			]); ?>
 		</div>
-	<div class="col2 offset6">
+	<div class="col2 offset8">
 		<?php echo template::submit('Submit'); ?>
 	</div>
 </div>

core/module/page/view/edit/edit.php

@@ -1,37 +1,33 @@
 <?php echo template::formOpen('pageEditForm'); ?>
 	<div class="row">
-		<div class="col2">
+		<div class="col1">
 			<?php $href = helper::baseUrl() . $this->getUrl(2); ?>
     		<?php if ($this->getData(['page', $this->getUrl(2), 'moduleId']) === 'redirection' || 'code')$href = helper::baseUrl(); ?>
 			<?php echo template::button('pageEditBack', [
 				'class' => 'buttonGrey',
 				'href' => $href,
-				'ico' => 'left',
-				'value' => 'Retour'
+				'value' => template::ico('home')
 			]); ?>
 		</div>
-		<div class="col2">
+		<div class="col1">
 			<?php echo template::button('pageEditHelp', [
 				'href' => 'https://doc.zwiicms.fr/edition-des-pages',
 				'target' => '_blank',
-				'ico' => 'help',
-				'value' => 'Aide',
+				'value' => template::ico('help'),
 				'class' => 'buttonHelp'
 			]); ?>
 		</div>
-		<div class="col2 offset2">
-			<?php echo template::button('pageEditDuplicate', [
-				'href' => helper::baseUrl() . 'page/duplicate/' . $this->getUrl(2) . '&csrf=' . $_SESSION['csrf'],
-				'value' => 'Dupliquer',
-				'ico' => 'clone'
-			]); ?>
-		</div>
-		<div class="col2">
+		<div class="col1 offset6">
 			<?php echo template::button('pageEditDelete', [
 				'class' => 'buttonRed',
 				'href' => helper::baseUrl() . 'page/delete/' . $this->getUrl(2) . '&csrf=' . $_SESSION['csrf'],
-				'value' => 'Supprimer',
-				'ico' => 'cancel'
+				'value' => template::ico('cancel')
+			]); ?>
+		</div>
+		<div class="col1">
+			<?php echo template::button('pageEditDuplicate', [
+				'href' => helper::baseUrl() . 'page/duplicate/' . $this->getUrl(2) . '&csrf=' . $_SESSION['csrf'],
+				'value' => template::ico('clone')
 			]); ?>
 		</div>
 		<div class="col2">

core/module/theme/view/admin/admin.php

@@ -1,24 +1,24 @@
 <?php echo template::formOpen('configAdminForm'); ?>
 	<div class="row">
-		<div class="col2">
+		<div class="col1">
 			<?php echo template::button('configAdminBack', [
 				'class' => 'buttonGrey',
 				'href' => helper::baseUrl() . 'theme',
-				'ico' => 'left',
-				'value' => 'Retour'
+				'value' => template::ico('left')
 			]); ?>
 		</div>
-		<div class="col2 offset4">
+		<!--
+		<div class="col2 offset5">
 			<?php echo template::button('configAdminTest', [
 				'value' => 'Bouton Standard'
 			]); ?>
 		</div>
-		<div class="col2 offset">
+		-->
+		<div class="col1 offset8">
 			<?php echo template::button('configAdminReset', [
 				'class' => 'buttonRed',
 				'href' => helper::baseUrl() . 'theme/reset/admin' . '&csrf=' . $_SESSION['csrf'],
-				'value' => 'Réinitialiser',
-				'ico' => 'cancel'
+				'value' => template::ico('cancel')
 			]); ?>
 		</div>
 		<div class="col2">

core/module/theme/view/advanced/advanced.php

@@ -1,19 +1,17 @@
 <?php echo template::formOpen('themeAdvancedForm'); ?>
 	<div class="row">
-		<div class="col2">
+		<div class="col1">
 			<?php echo template::button('themeAdvancedBack', [
 				'class' => 'buttonGrey',
 				'href' => helper::baseUrl() . 'theme',
-				'ico' => 'left',
-				'value' => 'Retour'
+				'value' => template::ico('left')
 			]); ?>
 		</div>
-		<div class="col2 offset6">
+		<div class="col1 offset8">
 			<?php echo template::button('themeAdvancedReset', [
 				'href' => helper::baseUrl() . 'theme/reset/custom' . '&csrf=' . $_SESSION['csrf'],
 				'class' => 'buttonRed',
-				'ico' => 'cancel',
-				'value' => 'Réinitialiser'
+				'value' => template::ico('cancel')
 			]); ?>
 		</div>
 		<div class="col2">

core/module/theme/view/body/body.php

@@ -1,23 +1,21 @@
 <?php echo template::formOpen('themeBodyForm'); ?>
 <div class="row">
-	<div class="col2">
+	<div class="col1">
 		<?php echo template::button('themeBodyBack', [
 			'class' => 'buttonGrey',
 			'href' => helper::baseUrl() . 'theme',
-			'ico' => 'left',
-			'value' => 'Retour'
+			'value' => template::ico('left')
 		]); ?>
 	</div>
-	<div class="col2">
+	<div class="col1">
 		<?php echo template::button('themeBodyHelp', [
 			'href' => 'https://doc.zwiicms.fr/arriere-plan',
 			'target' => '_blank',
-			'ico' => 'help',
-			'value' => 'Aide',
+			'value' => template::ico('help'),
 			'class' => 'buttonHelp'
 		]); ?>
 	</div>
-	<div class="col2 offset6">
+	<div class="col2 offset8">
 		<?php echo template::submit('themeBodySubmit'); ?>
 	</div>
 </div>

core/module/theme/view/footer/footer.php

@@ -1,23 +1,21 @@
 <?php echo template::formOpen('themeFooterForm'); ?>
 <div class="row">
-    <div class="col2">
+    <div class="col1">
         <?php echo template::button('themeFooterBack', [
 				'class' => 'buttonGrey',
 				'href' => helper::baseUrl() . 'theme',
-				'ico' => 'left',
-				'value' => 'Retour'
+				'value' => template::ico('left')
 			]); ?>
     </div>
-    <div class="col2">
+    <div class="col1">
       <?php echo template::button('themeFooterHelp', [
         'href' => 'https://doc.zwiicms.fr/pied-de-page',
         'target' => '_blank',
-        'ico' => 'help',
-        'value' => 'Aide',
+        'value' => template::ico('help'),
         'class' => 'buttonHelp'
       ]); ?>
     </div>
-    <div class="col2 offset6">
+    <div class="col2 offset8">
         <?php echo template::submit('themeFooterSubmit'); ?>
     </div>
 </div>

core/module/theme/view/header/header.php

@@ -1,23 +1,21 @@
 <?php echo template::formOpen('themeHeaderForm'); ?>
 <div class="row">
-    <div class="col2">
+    <div class="col1">
         <?php echo template::button('themeHeaderBack', [
 				'class' => 'buttonGrey',
 				'href' => helper::baseUrl() . 'theme',
-				'ico' => 'left',
-				'value' => 'Retour'
+				'value' => template::ico('left')
 			]); ?>
     </div>
-    <div class="col2">
+    <div class="col1">
       <?php echo template::button('themeHeaderHelp', [
         'href' => 'https://doc.zwiicms.fr/banniere',
         'target' => '_blank',
-        'ico' => 'help',
-        'value' => 'Aide',
+        'value' => template::ico('help'),
         'class' => 'buttonHelp'
       ]); ?>
     </div>
-    <div class="col2 offset6">
+    <div class="col2 offset8">
         <?php echo template::submit('themeHeaderSubmit'); ?>
     </div>
 </div>

core/module/theme/view/manage/manage.php

@@ -1,14 +1,13 @@
 <?php echo template::formOpen('themeManageForm'); ?>
 	<div class="row">
-		<div class="col2">
+		<div class="col1">
 			<?php echo template::button('themeManageBack', [
 				'class' => 'buttonGrey',
 				'href' => helper::baseUrl() . 'theme',
-				'ico' => 'left',
-				'value' => 'Retour'
+				'value' => template::ico('left')
 			]); ?>
 		</div>
-		<div class="col2 offset6">
+		<div class="col2 offset7">
 			<?php echo template::button('configManageReset', [
 				'class' => 'buttonRed',
 				'href' => helper::baseUrl() . 'theme/reset/manage'  . '&csrf=' . $_SESSION['csrf'],

core/module/theme/view/menu/menu.php

@@ -1,23 +1,21 @@
 <?php echo template::formOpen('themeMenuForm'); ?>
 <div class="row">
-    <div class="col2">
+    <div class="col1">
         <?php echo template::button('themeMenuBack', [
 				'class' => 'buttonGrey',
 				'href' => helper::baseUrl() . 'theme',
-				'ico' => 'left',
-				'value' => 'Retour'
+				'value' => template::ico('left')
 			]); ?>
     </div>
-    <div class="col2">
+    <div class="col1">
       <?php echo template::button('themeMenuHelp', [
         'href' => 'https://doc.zwiicms.fr/menu',
         'target' => '_blank',
-        'ico' => 'help',
-        'value' => 'Aide',
+        'value' => template::ico('help'),
         'class' => 'buttonHelp'
       ]); ?>
     </div>
-    <div class="col2 offset6">
+    <div class="col2 offset8">
         <?php echo template::submit('themeMenuSubmit'); ?>
     </div>
 </div>

core/module/theme/view/site/site.php

@@ -1,23 +1,21 @@
 <?php echo template::formOpen('themeSiteForm'); ?>
 	<div class="row">
-		<div class="col2">
+		<div class="col1">
 			<?php echo template::button('themeSiteBack', [
 				'class' => 'buttonGrey',
 				'href' => helper::baseUrl() . 'theme',
-				'ico' => 'left',
-				'value' => 'Retour'
+				'value' => template::ico('left')
 			]); ?>
 		</div>
-		<div class="col2">
+		<div class="col1">
 			<?php echo template::button('themeSiteHelp', [
 				'href' => 'https://doc.zwiicms.fr/site61863d315ffe0',
 				'target' => '_blank',
-				'ico' => 'help',
-				'value' => 'Aide',
+				'value' => template::ico('help'),
 				'class' => 'buttonHelp'
 			]); ?>
 		</div>
-		<div class="col2 offset6">
+		<div class="col2 offset8">
 			<?php echo template::submit('themeSiteSubmit'); ?>
 		</div>
 	</div>

core/module/translate/view/index/index.php

@@ -1,27 +1,25 @@
 <?php echo template::formOpen('translateForm'); ?>
 	<div class="row">
-		<div class="col2">
+		<div class="col1">
 			<?php echo template::button('translateFormBack', [
 				'class' => 'buttonGrey',
 				'href' => helper::baseUrl(),
-				'ico' => 'left',
-				'value' => 'Retour'
+				'value' => template::ico('left')
 			]); ?>
 		</div>
-		<div class="col2">
+		<div class="col1">
 			<?php echo template::button('translateHelp', [
 				'href' => 'https://doc.zwiicms.fr/prise-en-charge-des-langues-etrangeres',
 				'target' => '_blank',
-				'ico' => 'help',
-				'value' => 'Aide',
+				'value' => template::ico('cancel'),
 				'class' => 'buttonHelp'
 			]); ?>
 		</div>
-		<div class="col3 offset3">
+		<div class="col3 offset5">
 		<?php echo template::button('translateButton', [
 			'href' => helper::baseUrl() . 'translate/copy',
-			'value' => 'Utilitaire de copie',
-			'ico' => 'cog-alt',
+			'value' => 'Copie inter-langues',
+			'ico' => 'cogs',
 			'disabled' => $module::$siteTranslate
 		]); ?>
 		</div>

core/module/user/view/add/add.php

@@ -1,14 +1,13 @@
 <?php echo template::formOpen('userAddForm'); ?>
 	<div class="row">
-		<div class="col2">
+		<div class="col1">
 			<?php echo template::button('userAddBack', [
 				'class' => 'buttonGrey',
 				'href' => helper::baseUrl() . 'user',
-				'ico' => 'left',
-				'value' => 'Retour'
+				'value' => template::ico('left')
 			]); ?>
 		</div>
-		<div class="col2 offset8">
+		<div class="col2 offset9">
 			<?php echo template::submit('userAddSubmit'); ?>
 		</div>
 	</div>

core/module/user/view/edit/edit.php

@@ -1,23 +1,21 @@
 <?php echo template::formOpen('userEditForm'); ?>
 	<div class="row">
-		<div class="col2">
+		<div class="col1">
 			<?php if($this->getUser('group') === self::GROUP_ADMIN): ?>
 				<?php echo template::button('userEditBack', [
 					'class' => 'buttonGrey',
 					'href' => helper::baseUrl() . 'user',
-					'ico' => 'left',
-					'value' => 'Retour'
+					'value' => template::ico('left')
 				]); ?>
 			<?php else: ?>
 				<?php echo template::button('userEditBack', [
 					'class' => 'buttonGrey',
 					'href' => helper::baseUrl(false),
-					'ico' => 'home',
-					'value' => 'Accueil'
+					'value' => template::ico('home')
 				]); ?>
 			<?php endif; ?>
 		</div>
-		<div class="col2 offset8">
+		<div class="col2 offset9">
 			<?php echo template::submit('userEditSubmit'); ?>
 		</div>
 	</div>

core/module/user/view/forgot/forgot.php

@@ -3,11 +3,10 @@
 		'label' => 'Identifiant'
 	]); ?>
 	<div class="row">
-		<div class="col3 offset6">
+		<div class="col1 offset9">
 			<?php echo template::button('userForgotBack', [
 				'href' => helper::baseUrl() . 'user/login/' . $this->getUrl(2),
-				'ico' => 'left',
-				'value' => 'Retour'
+				'value' => template::ico('left')
 			]); ?>
 		</div>
 		<div class="col3">

core/module/user/view/import/import.php

@@ -1,23 +1,21 @@
 <?php echo template::formOpen('userImportForm'); ?>
 <div class="row">
-    <div class="col2">
+    <div class="col1">
         <?php echo template::button('userImportBack', [
             'class' => 'buttonGrey',
             'href' => helper::baseUrl() . 'user',
-            'ico' => 'left',
-            'value' => 'Retour'
+            'value' => template::ico('left')
         ]); ?>
     </div>
-	<div class="col2">
+	<div class="col1">
 		<?php echo template::button('userHelp', [
 			'href' => 'https://doc.zwiicms.fr/importation-d-une-liste-d-utilisateurs',
 			'target' => '_blank',
-			'ico' => 'help',
-			'value' => 'Aide',
+            'value' => template::ico('help'),
 			'class' => 'buttonHelp'
 		]); ?>
 	</div>
-    <div class="col2 offset6">
+    <div class="col2 offset8">
 		<?php echo template::submit('userImportSubmit', [
 				'value' => 'Importer'
 			]); ?>
@@ -28,7 +26,7 @@
         <div class="block">
         <h4>Importation de fichier plat CSV</h4>
             <div class="row">
-                <div class="col6">
+                <div class="col10">
                       <?php echo template::file('userImportCSVFile', [
                             'label' => 'Liste d\'utilisateurs :'
                       ]); ?>

core/module/user/view/index/index.php

@@ -1,33 +1,29 @@
 <div class="row">
-	<div class="col2">
+	<div class="col1">
 		<?php echo template::button('userAddBack', [
 			'class' => 'buttonGrey',
 			'href' => helper::baseUrl(false),
-			'ico' => 'home',
-			'value' => 'Accueil'
+			'value' => template::ico('home')
 		]); ?>
 	</div>
-	<div class="col2">
+	<div class="col1">
 		<?php echo template::button('userHelp', [
 			'href' => 'https://doc.zwiicms.fr/gestion-des-utilisateurs',
 			'target' => '_blank',
-			'ico' => 'help',
-			'value' => 'Aide',
+			'value' => template::ico('help'),
 			'class' => 'buttonHelp'
 		]); ?>
 	</div>
-	<div class="col2 offset4">
+	<div class="col1 offset8">
 		<?php echo template::button('userImport', [
 			'href' => helper::baseUrl() . 'user/import',
-			'ico' => 'plus',
-			'value' => 'Importation'
+			'value' => template::ico('download')
 		]); ?>
 	</div>
-	<div class="col2">
+	<div class="col1">
 		<?php echo template::button('userAdd', [
 			'href' => helper::baseUrl() . 'user/add',
-			'ico' => 'plus',
-			'value' => 'Utilisateur'
+			'value' => template::ico('plus')
 		]); ?>
 	</div>
 </div>

module/blog/view/edit/edit.php

@@ -1,17 +1,16 @@
 <?php echo template::formOpen('blogEditForm'); ?>
 	<div class="row">
-		<div class="col2">
+		<div class="col1">
 			<?php echo template::button('blogEditBack', [
 				'class' => 'buttonGrey',
 				'href' => helper::baseUrl() . $this->getUrl(0) . '/config',
-				'ico' => 'left',
-				'value' => 'Retour'
+				'value' => template::ico('left')
 			]); ?>
 		</div>
-		<div class="col3 offset5">
+		<div class="col3 offset6">
 			<?php echo template::button('blogEditDraft', [
 				'uniqueSubmission' => true,
-				'value' => 'Enregistrer en brouillon'
+				'value' => 'Brouillon'
 			]); ?>
 			<?php echo template::hidden('blogEditState', [
 				'value' => true

module/gallery/view/theme/theme.php

@@ -1,15 +1,14 @@
 <?php echo template::formOpen('galleryThemeForm'); ?>
 
 	<div class="row">
-		<div class="col2">
+		<div class="col1">
 			<?php echo template::button('galleryThemeBack', [
 				'class' => 'buttonGrey',
 				'href' => helper::baseUrl() . $this->getUrl(0) . '/config',
-				'ico' => 'left',
-				'value' => 'Retour'
+				'value' => template::ico('cancel')
 			]); ?>
 		</div>
-		<div class="col2 offset8">
+		<div class="col2 offset9">
 			<?php echo template::submit('galleryThemeBack'); ?>
 		</div>
 	</div>

module/news/view/edit/edit.php

@@ -4,14 +4,13 @@
 			<?php echo template::button('newsEditBack', [
 				'class' => 'buttonGrey',
 				'href' => helper::baseUrl() . $this->getUrl(0) . '/config',
-				'ico' => 'left',
-				'value' => 'Retour'
+				'value' => template::ico('left')
 			]); ?>
 		</div>
-		<div class="col3 offset5">
+		<div class="col2 offset6">
 			<?php echo template::button('newsEditDraft', [
 				'uniqueSubmission' => true,
-				'value' => 'Enregistrer en brouillon'
+				'value' => 'Brouillon'
 			]); ?>
 			<?php echo template::hidden('newsEditState', [
 				'value' => true