Merge branch 'master' of github.com:serghey-rodin/vesta

Author: very-twi

web/index.html

@@ -81,7 +81,7 @@ <h1 class="logo"><a href="/">Vesta panel <span>&nbsp;</span></a></h1>
                             <div class="section-inner">
                                     <dl class="users-nav-item">
                                         <dt class="section-title cc">
-                                                <span class="to-section">Users</span> 
+                                                <span class="to-section">User</span> 
                                                 <i class="add-entry do_action_new_entry">&nbsp;</i>
                                         </dt>
                                         <dd class="section-contains">

web/js/actions.js

@@ -533,7 +533,7 @@ App.Actions.add_form_ns = function(evt)
 
     $(form).find('.ns-entry').each(function(i, o)
     {
-        $(o).find('label').text('NS #' + (i + 1));
+        $(o).find('label').text('NameServer #' + (i + 1));
         $(o).find('input').attr('name', 'NS' + (i + 1));
     });
 }
@@ -581,7 +581,7 @@ App.Actions.view_template_info = function(evt)
             $.each(reply.data, function(key) {
                 html += '<li><strong>'+key+':</strong> '+reply.data[key]+'</li>';
             });
-            App.Helpers.openInnerPopup(elm, '<ul>'+html+'</ul>', 'Template Info');
+            App.Helpers.openInnerPopup(elm, '<ul>'+html+'</ul>', 'Template Settings');
         }        
     });
 }

web/js/html.js

@@ -27,10 +27,10 @@ App.HTML.Build.dns_form = function (options, id) {
     tpl.set(':source', options);
     options = App.Helpers.evalJSON(options) || {};
     if (App.Helpers.isEmpty(options)) {
-        tpl.set(':title', 'New dns record');
+        tpl.set(':title', 'New dns domain');
         tpl.set(':save_button', 'ADD');
     } else {
-        tpl.set(':title', 'Edit dns record');
+        tpl.set(':title', 'Edit dns domain');
         tpl.set(':save_button', 'SAVE');
     }
     tpl.set(':id', id || '');