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

Author: serghey-rodin

web/css/main.css

@@ -3,7 +3,7 @@ Title  : Vesta
 Author : Eugen Lobicov, eugen.lobicov@gmail.com 
 
 created : November 27, 2009
-last updated : February 8, 2012
+last updated : February 13, 2012
 - - - - - - - - - - - - - - - - - - */
 
 html{
@@ -1891,15 +1891,9 @@ input::-moz-focus-inner{
 				width:221px;
 				margin:0;
 				border-right:0;
-				cursor:pointer;
 				padding-top:6px;
 				padding-bottom:6px;
-				}
-				.b-new-entry .autocomplete-box .text-field{
-					-moz-box-shadow:none;
-					-webkit-box-shadow:none;
-					border-color:#B8C2C3;
-				}
+			}
 
 			.b-new-entry .autocomplete-box .arrow{
 				position:absolute;
@@ -1913,7 +1907,6 @@ input::-moz-focus-inner{
 				background:#fff url(../images/autocomplete-field-arrows-sprite-2012-02-11.png) no-repeat;
 				cursor:pointer;
 			}
-			.b-new-entry .autocomplete-box:hover .arrow,
 			.b-new-entry .autocomplete-box .arrow:hover,
 			.b-new-entry .autocomplete-box .arrow:active,
 			.b-new-entry .autocomplete-box .arrow:focus{

web/js/pages.js

@@ -43,9 +43,7 @@ App.Pages.prepareHTML = function()
     $('#actions-toolbar .stats-subbar').remove();
 	$('#actions-toolbar .stats-components').remove();
     $('#actions-toolbar .do_action_new_entry').removeClass('hidden');
-
 	$('.active').removeClass('active');
-
     $('.row-filters').removeClass('hidden');
     if ('undefined' != typeof App.Pages[App.Env.world].prepareHTML) {
         App.Pages[App.Env.world].prepareHTML();
@@ -55,8 +53,7 @@ App.Pages.prepareHTML = function()
     }
     $('#new-entry-keyword').text(App.Helpers.getHumanTabName());
     document.title = 'Vesta | ' + App.Helpers.getHumanTabName();
-
-    $('#'+App.Env.world).addClass('active');
+    
     App.Tmp[App.Env.world + '_selected_records'] = 0;
 }
 

web/js/templates.js

@@ -485,7 +485,7 @@ App.Templates.html = {
                                             <span class="prop-title">email:</span>\
                                             <span class="group-values">\
                                                 <span class="prop-value user-email">~!:CONTACT~!</span>\
-                                                <span class="prop-value user-reports">(reporting ~!:REPORTS_ENABLED~!)</span>\
+                                                <span class="prop-value user-reports">(reports ~!:REPORTS_ENABLED~!)</span>\
                                                 </span>\
                                         </span>\
 										<span class="prop-box template-box">\
@@ -1113,7 +1113,7 @@ App.Templates.html = {
                     <img class="stats-graph" src="~!:IMG_SRC~!" alt="" />\
                 </div>\
             </div>'],
-        SUBMENU: ['<div class="date-range-controls stats-subbar"><span class="motive">Generate:</span><span class="date-range-control today active" onClick="App.Actions.loadStats(\'today\')">daily</span>\
+        SUBMENU: ['<div class="date-range-controls stats-subbar"><span class="motive">Genarate:</span><span class="date-range-control today active" onClick="App.Actions.loadStats(\'today\')">daily</span>\
                 <span class="date-range-control week" onClick="App.Actions.loadStats(\'week\')">weekly</span>\
                 <span class="date-range-control month" onClick="App.Actions.loadStats(\'month\')">monthly</span>\
                 <span class="date-range-control year" onClick="App.Actions.loadStats(\'year\')">yearly</span></div>'],

web/vesta/api/WEB_DOMAIN.class.php

@@ -78,8 +78,7 @@ public function addExecute(Request $request)
         $params = array(
                       'USER'   => $user['uid'],
                       'DOMAIN' => $_s['DOMAIN'],
-                      'IP'     => $_s['IP'],
-                      'TPL'    => $_s['TPL']
+                      'IP'     => $_s['IP']
                   );
 
         $result = Vesta::execute(Vesta::V_ADD_WEB_DOMAIN, $params);
@@ -89,7 +88,6 @@ public function addExecute(Request $request)
             return $this->reply($result['status'], $result['data']);
         }
 
-        /*
         if (!empty($_s['TPL'])) {
             $params = array(
                         'USER'   => $user['uid'],
@@ -103,7 +101,7 @@ public function addExecute(Request $request)
                 $this->errors['CHANGE_TPL'] = array($result['error_code'] => $result['error_message']);
             }
         }
-        */
+      
 
         if (!empty($_s['ALIAS'])) {
             $alias_arr = explode(',', str_replace("\n", "", $_s['ALIAS']));