github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 21:04:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Serghey Rodin 2012-02-14 18:41:29 +02:00
commit e0c4407148
4 changed files with 7 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
web/css/main.css
View file

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

5
web/js/pages.js
View file

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

4
web/js/templates.js
View file

@ -485,7 +485,7 @@ App.Templates.html = {
<span class="prop-title">email:</span>\ <span class="prop-title">email:</span>\
<span class="group-values">\ <span class="group-values">\
<span class="prop-value user-email">~!:CONTACT~!</span>\ <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>\ </span>\
<span class="prop-box template-box">\ <span class="prop-box template-box">\
@ -1113,7 +1113,7 @@ App.Templates.html = {
<img class="stats-graph" src="~!:IMG_SRC~!" alt="" />\ <img class="stats-graph" src="~!:IMG_SRC~!" alt="" />\
</div>\ </div>\
</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 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 month" onClick="App.Actions.loadStats(\'month\')">monthly</span>\
<span class="date-range-control year" onClick="App.Actions.loadStats(\'year\')">yearly</span></div>'], <span class="date-range-control year" onClick="App.Actions.loadStats(\'year\')">yearly</span></div>'],

6
web/vesta/api/WEB_DOMAIN.class.php
View file

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