From 1ffa0ef4e78ec725c7c579e56fb610535f915792 Mon Sep 17 00:00:00 2001
From: Nicolas Roman <nroman@evolix.fr>
Date: Thu, 16 May 2019 10:57:05 +0200
Subject: [PATCH] normalize title names

---
 inc/webadmin-edit.php           |  8 ++++----
 inc/webadmin-servername.php     |  4 ++--
 tpl/webadmin-edit.tpl.php       |  4 ++--
 tpl/webadmin-itk.tpl.php        |  2 +-
 tpl/webadmin-servername.tpl.php |  6 +++---
 tpl/webadmin.tpl.php            | 10 +++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/inc/webadmin-edit.php b/inc/webadmin-edit.php
index b52a528..7e63681 100644
--- a/inc/webadmin-edit.php
+++ b/inc/webadmin-edit.php
@@ -222,10 +222,10 @@ elseif (isset($params[2]) && $params[2] == "add") {
                 }
             }
             else {
-              print "<h2>Ajout d'un serveralias</h2><hr>";
+              print "<h2>Ajout d'un alias</h2><hr>";
                     print "<form name=\"form-add\" id=\"form-add\" action=\"\" method=\"POST\">";
                     print "   <fieldset>";
-                    print "        <legend>Ajout d'un serveralias</legend>";
+                    print "        <legend>Ajout d'un alias</legend>";
                     print $form;
                     print "        <p><input type=\"submit\" value=\"Créer\"/></p>";
                     print "     </fieldset>";
@@ -233,10 +233,10 @@ elseif (isset($params[2]) && $params[2] == "add") {
 
             }
         } else {
-			print "<h2>Ajout d'un serveralias</h2><hr>";
+			print "<h2>Ajout d'un alias</h2><hr>";
             print "<form name=\"form-add\" id=\"form-add\" action=\"\" method=\"POST\">";
             print "   <fieldset>";
-            print "        <legend>Ajout d'un serveralias</legend>";
+            print "        <legend>Ajout d'un alias</legend>";
             print $form;
             print "        <p><input type=\"submit\" value=\"Créer\"/></p>";
             print "     </fieldset>";
diff --git a/inc/webadmin-servername.php b/inc/webadmin-servername.php
index 7779c43..db5b862 100644
--- a/inc/webadmin-servername.php
+++ b/inc/webadmin-servername.php
@@ -146,10 +146,10 @@ if (isset($params[2]) && $params[2] == "edit") {
                 }
             }
         } else {
-          print "<h2>Modification du ServerName</h2><hr>";
+          print "<h2>Modification du Servername</h2><hr>";
           print "<form name=\"form-add\" id=\"form-add\" action=\"\" method=\"POST\">";
           print "   <fieldset>";
-          print "        <legend>Modification du ServerName</legend>";
+          print "        <legend>Modification du Servername</legend>";
           print $form;
           print "        <p><input type=\"submit\" value=\"Modifier\"/></p>";
           print "     </fieldset>";
diff --git a/tpl/webadmin-edit.tpl.php b/tpl/webadmin-edit.tpl.php
index 09826c2..4c57bd3 100644
--- a/tpl/webadmin-edit.tpl.php
+++ b/tpl/webadmin-edit.tpl.php
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2009 Evolix - Tous droits reserves
  *
- * vim: expandtab softtabstop=4 tabstop=4 shiftwidth=4 showtabline=2 
+ * vim: expandtab softtabstop=4 tabstop=4 shiftwidth=4 showtabline=2
  *
  * @author Thomas Martin <tmartin@evolix.fr>
  * @version 1.0
@@ -38,7 +38,7 @@
         <?php
             for ( $i=0; $i < count($alias_list); ++$i ) {
                 print '<tr>';
-                printf('<td><a href="http://%s">http://%s</a></td>',
+                printf('<td>%s</td>',
                     $alias_list[$i]['alias'], $alias_list[$i]['alias']);
                 if (is_superadmin())
                     printf('<td><a href="/webadmin/%s/alias/delete/%s/">Supprimer</a></td>',
diff --git a/tpl/webadmin-itk.tpl.php b/tpl/webadmin-itk.tpl.php
index 313f947..c856703 100644
--- a/tpl/webadmin-itk.tpl.php
+++ b/tpl/webadmin-itk.tpl.php
@@ -22,7 +22,7 @@
     <table id="tab-list">
         <thead>
         <tr>
-           <th>ServerName</th>
+           <th>Servername</th>
            <th>Utilisateur</th>
            <?php if (is_superadmin()) {
                print '<th>Action</th>';
diff --git a/tpl/webadmin-servername.tpl.php b/tpl/webadmin-servername.tpl.php
index 9766b99..ac53cdd 100644
--- a/tpl/webadmin-servername.tpl.php
+++ b/tpl/webadmin-servername.tpl.php
@@ -13,7 +13,7 @@
 
 ?>
 
-<h2>ServerNames</h2>
+<h2>Servernames</h2>
 
 <?php
 
@@ -22,7 +22,7 @@
     <table id="tab-list">
         <thead>
         <tr>
-           <th>ServerName</th>
+           <th>Servername</th>
            <?php if (is_superadmin()) {
                print '<th>Action</th>';
            } ?>
@@ -43,7 +43,7 @@
     </table>
 <?php
    } else {
-       print "<p>Aucun ServerName existant pour le domaine $domain !</p>";
+       print "<p>Aucun Servername existant pour le domaine $domain !</p>";
    }
 
 
diff --git a/tpl/webadmin.tpl.php b/tpl/webadmin.tpl.php
index 0fd15c6..5ccba08 100755
--- a/tpl/webadmin.tpl.php
+++ b/tpl/webadmin.tpl.php
@@ -22,9 +22,9 @@
       <thead>
       <tr>
         <?php if(is_superadmin()) {
-            print '<th>Propriétaire</th>';
+            print '<th>Virtual Host</th>';
         } ?>
-        <th>Domaine</th>
+        <th>Servername</th>
         <?php if(is_superadmin()) {
             print '<th>Alias</th>';
         }
@@ -61,7 +61,7 @@
           if(is_superadmin()) {
             printf('<td>%s</td>', $vhost_info['owner']);
           }
-          printf('<td><a href="http://%s">http://%s</a></td>',
+          printf('<td>%s</td>',
                   $vhost_info['server_name'], $vhost_info['server_name']);
 
           if ($conf['cluster']) {
@@ -87,7 +87,7 @@
                   printf('<td>%s</td>', $vhost_info['slave']);
 	  }
 
-          printf('<td align="left">%s</td>', preg_replace('/,/','<br />',$vhost_info['server_alias']));
+          printf('<td>%s</td>', preg_replace('/,/','<br />',$vhost_info['server_alias']));
 
           if ($conf['quota']) {
             printf('<td>%s</td>', $vhost_info['size']);
@@ -110,7 +110,7 @@
               } else {
                   printf('<a href="/webadmin/%s/itk/">ITK</a>', $vhost_info['owner']);
               }
-              printf('<a href="/webadmin/%s/delete/"> - Supprimer</a>', $vhost_info['owner']);
+              printf('<a href="/webadmin/%s/delete/">Supprimer</a>', $vhost_info['owner']);
               printf('</td>');
 
           }