Merge pull request #755 from Flatta/use-css

Use CSS rather than tricky string manipulation

web/css/styles.min.css

@@ -2946,6 +2946,7 @@ form#vstobjects.suspended {
   padding: 3px 14px 3px 27px;
   position: absolute;
   text-transform: uppercase;
+  white-space: nowrap;
   word-break: keep-all;
   z-index: -1;
 }

web/templates/admin/list_backup.html

@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/schedule/backup/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Create Backup'))?>"></a>
+        <a href="/schedule/backup/" class="l-sort__create-btn" title="<?=__('Create Backup')?>"></a>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>

web/templates/admin/list_backup_detail.html

@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/schedule/restore/?backup=<?=htmlentities($_GET['backup'])?>" class="l-sort__create-btn restore" title="<?=str_replace(' ', '&nbsp;', __('Restore All'))?>"></a>
+        <a href="/schedule/restore/?backup=<?=htmlentities($_GET['backup'])?>" class="l-sort__create-btn restore" title="<?=__('Restore All')?>"></a>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>

web/templates/admin/list_backup_exclusions.html

@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/edit/backup/exclusions/" class="l-sort__create-btn edit" title="<?=str_replace(' ', '&nbsp;', __('Configure'))?>"></a>
+        <a href="/edit/backup/exclusions/" class="l-sort__create-btn edit" title="<?=__('Configure')?>"></a>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>

web/templates/admin/list_cron.html

@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/cron/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Cron Job'))?>"></a>
+        <a href="/add/cron/" class="l-sort__create-btn" title="<?=__('Add Cron Job')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Command')?></span><span class="up">&nbsp;</span></li>

web/templates/admin/list_db.html

@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/db/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Database'))?>"></a>
+        <a href="/add/db/" class="l-sort__create-btn" title="<?=__('Add Database')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Database')?></span><span class="up">&nbsp;</span></li>

web/templates/admin/list_dns.html

@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/dns/" title="<?=str_replace(' ', '&nbsp;', __('Add DNS Domain'))?>" class="l-sort__create-btn"></a>
+        <a href="/add/dns/" title="<?=__('Add DNS Domain')?>" class="l-sort__create-btn"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-expire" sort_as_int="1"><span class="name"><?=__('Expire')?></span><span class="up">&nbsp;</span></li>

web/templates/admin/list_dns_rec.html

@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/dns/?domain=<?=htmlentities($_GET['domain'])?>" title="<?=str_replace(' ', '&nbsp;', __('Add DNS Record'))?>" class="l-sort__create-btn"></a>
+        <a href="/add/dns/?domain=<?=htmlentities($_GET['domain'])?>" title="<?=__('Add DNS Record')?>" class="l-sort__create-btn"></a>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>

web/templates/admin/list_firewall.html

@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/firewall/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Rule'))?>"></a>
+        <a href="/add/firewall/" class="l-sort__create-btn" title="<?=__('Add Rule')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-action"><span class="name active"><?=__('Action')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-protocol"><span class="name"><?=__('Protocol')?></span><span class="up">&nbsp;</span></li>

web/templates/admin/list_firewall_banlist.html

@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/firewall/banlist/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Ban IP Address'))?>"></a>
+        <a href="/add/firewall/banlist/" class="l-sort__create-btn" title="<?=__('Ban IP Address')?>"></a>
 
         <div class="l-sort-toolbar clearfix">
           <table>

web/templates/admin/list_ip.html

@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/ip/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add IP'))?>"></a>
+        <a href="/add/ip/" class="l-sort__create-btn" title="<?=__('Add IP')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-ip"><span class="name"><?=__('ip')?></span><span class="up">&nbsp;</span></li>

web/templates/admin/list_mail.html

@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/mail/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Mail Domain'))?>"></a>
+        <a href="/add/mail/" class="l-sort__create-btn" title="<?=__('Add Mail Domain')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Domain')?></span><span class="up">&nbsp;</span></li>

web/templates/admin/list_mail_acc.html

@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/mail/?domain=<?=htmlentities($_GET['domain'])?>" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Mail Account'))?>"></a>
+        <a href="/add/mail/?domain=<?=htmlentities($_GET['domain'])?>" class="l-sort__create-btn" title="<?=__('Add Mail Account')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Account')?></span><span class="up">&nbsp;</span></li>

web/templates/admin/list_packages.html

@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/package/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Package'))?>"></a>
+        <a href="/add/package/" class="l-sort__create-btn" title="<?=__('Add Package')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Package Name')?></span><span class="up">&nbsp;</span></li>

web/templates/admin/list_services.html

@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/edit/server/" class="l-sort__create-btn edit" title="<?=str_replace(' ', '&nbsp;', __('Configure'))?>"></a>
+        <a href="/edit/server/" class="l-sort__create-btn edit" title="<?=__('Configure')?>"></a>
 
         <div class="l-sort-toolbar clearfix">
           <table>

web/templates/admin/list_user.html

@@ -2,9 +2,9 @@
       <div class="l-sort clearfix noselect">
         <?php
           if ($user == 'admin') {
-            echo '<a class="l-sort__create-btn" href="/add/user/" title="'.str_replace(' ', '&nbsp;', __('Add User')).'"></a>';
+            echo '<a class="l-sort__create-btn" href="/add/user/" title="'.__('Add User').'"></a>';
           } else {
-            echo '<a class="l-sort__create-btn" href="/add/web/" title="'.str_replace(' ', '&nbsp;', __('Add Web Domain')).'"></a>';
+            echo '<a class="l-sort__create-btn" href="/add/web/" title="'.__('Add Web Domain').'"></a>';
           }
         ?>
         <ul class="context-menu sort-order" style="display:none;">

web/templates/admin/list_web.html

@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/web/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Web Domain'))?>"></a>
+        <a href="/add/web/" class="l-sort__create-btn" title="<?=__('Add Web Domain')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Domain')?></span><span class="up">&nbsp;</span></li>

web/templates/user/list_cron.html

@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/cron/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Cron Job'))?>"></a>
+        <a href="/add/cron/" class="l-sort__create-btn" title="<?=__('Add Cron Job')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Command')?></span><span class="up">&nbsp;</span></li>

web/templates/user/list_db.html

@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/db/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Database'))?>"></a>
+        <a href="/add/db/" class="l-sort__create-btn" title="<?=__('Add Database')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Database')?></span><span class="up">&nbsp;</span></li>

web/templates/user/list_dns.html

@@ -1,7 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/dns/" title="<?=str_replace(' ', '&nbsp;', __('Add DNS Domain'))?>" class="l-sort__create-btn"></a>
-        <a href="/add/dns/" title="<?=str_replace(' ', '&nbsp;', __('Add DNS Domain'))?>" class="l-sort__create-btn"></a>
+        <a href="/add/dns/" title="<?=__('Add DNS Domain')?>" class="l-sort__create-btn"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-expire" sort_as_int="1"><span class="name"><?=__('Expire')?></span><span class="up">&nbsp;</span></li>

web/templates/user/list_dns_rec.html

@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/dns/?domain=<?=htmlentities($_GET['domain'])?>" title="<?=str_replace(' ', '&nbsp;', __('Add DNS Record'))?>" class="l-sort__create-btn"></a>
+        <a href="/add/dns/?domain=<?=htmlentities($_GET['domain'])?>" title="<?=__('Add DNS Record')?>" class="l-sort__create-btn"></a>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>

web/templates/user/list_mail.html

@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/mail/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Mail Domain'))?>"></a>
+        <a href="/add/mail/" class="l-sort__create-btn" title="<?=__('Add Mail Domain')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Domain')?></span><span class="up">&nbsp;</span></li>

web/templates/user/list_mail_acc.html

@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/mail/?domain=<?=htmlentities($_GET['domain'])?>" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Mail Account'))?>"></a>
+        <a href="/add/mail/?domain=<?=htmlentities($_GET['domain'])?>" class="l-sort__create-btn" title="<?=__('Add Mail Account')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Account')?></span><span class="up">&nbsp;</span></li>

web/templates/user/list_user.html

@@ -2,9 +2,9 @@
       <div class="l-sort clearfix noselect">
         <?php
           if ($user == 'admin') {
-            echo '<a class="l-sort__create-btn" href="/add/user/" title="'.str_replace(' ', '&nbsp;', __('Add User')).'"></a>';
+            echo '<a class="l-sort__create-btn" href="/add/user/" title="'.__('Add User').'"></a>';
           } else {
-            echo '<a class="l-sort__create-btn" href="/add/web/" title="'.str_replace(' ', '&nbsp;', __('Add Web Domain')).'"></a>';
+            echo '<a class="l-sort__create-btn" href="/add/web/" title="'.__('Add Web Domain').'"></a>';
           }
         ?>
         <ul class="context-menu sort-order" style="display:none;">

web/templates/user/list_web.html

@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/web/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Web Domain'))?>"></a>
+        <a href="/add/web/" class="l-sort__create-btn" title="<?=__('Add Web Domain')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Domain')?></span><span class="up">&nbsp;</span></li>