Merge branch 'bugfix-ui' into develop

Author: Kristan Kenney

web/templates/admin/edit_server.html

@@ -644,6 +644,7 @@
                                         <tr>
                                             <td class="vst-text input-label">
                                                 <?php print __('SSL Certificate');?>
+                                                <span id="generate-csr"> / <a class="generate" target="_blank" href="/generate/ssl/?domain=<?=$v_hostname?>"><?=__('Generate CSR')?></a></span>
                                             </td>
                                         </tr>
                                         <tr>

web/templates/admin/list_packages.html

@@ -77,8 +77,10 @@
           <input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="user[]" value="<?=$key?>">
         </div>
             <div class="clearfix l-unit__stat-col--left wide-2"><b><a href="/edit/package/?package=<?=$key?>&token=<?=$_SESSION['token']?>"><?=$key?></b></a>
-              <br />
-              <span style="font-size: 0.8rem;"><?=str_replace(',', '<br>',$data[$key]['NS'])?></span>
+              <?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) {?>
+                <br />
+                <span style="font-size: 0.8rem;"><?=str_replace(',', '<br>',$data[$key]['NS'])?></span>
+              <?php }?>
             </div>
             <!-- START QUICK ACTION TOOLBAR AREA -->
             <div class="clearfix l-unit__stat-col--left text-right compact-3">