github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 04:50:47 -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-12 23:28:28 +02:00
commit ad6b4c1aee
4 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
web/css/main.css
View file

@ -1474,8 +1474,9 @@ input::-moz-focus-inner{
background:url(../images/group-value-bullet.png) no-repeat 5px 8px; background:url(../images/group-value-bullet.png) no-repeat 5px 8px;
} }
.group-values .group-switcher{ .group-values .group-switcher{
display:block;
padding-right:15px; padding-right:15px;
background:url(../images/group-values-collapsed.png) no-repeat 100% 4px; background:url(../images/group-values-collapsed.png) no-repeat 100% 50%;
} }
.group-values .group-values-count{ .group-values .group-values-count{
font-size:12px; font-size:12px;
@ -1574,7 +1575,7 @@ input::-moz-focus-inner{
.b-new-entry .textarea:focus{ .b-new-entry .textarea:focus{
-moz-box-shadow:0 0 8px rgba(82, 168, 236, 0.5); -moz-box-shadow:0 0 8px rgba(82, 168, 236, 0.5);
-webkit-box-shadow:0 0 8px rgba(82, 168, 236, 0.5); -webkit-box-shadow:0 0 8px rgba(82, 168, 236, 0.5);
border-color:rgba(82, 168, 236, 0.75) !important; border-color:rgba(82, 168, 236, 0.75);
color:#262523; color:#262523;
} }
@ -1611,6 +1612,8 @@ input::-moz-focus-inner{
} }
.b-new-entry select.styled{ .b-new-entry select.styled{
top:0; top:0;
width:231px;
height:35px;
} }
.b-new-entry option{ .b-new-entry option{
padding:5px 5px 5px 8px; padding:5px 5px 5px 8px;
@ -1881,25 +1884,36 @@ input::-moz-focus-inner{
.b-new-entry .autocomplete-box{ .b-new-entry .autocomplete-box{
position:relative; position:relative;
float:left; float:left;
padding-right:35px; padding-right:34px;
background:#fff; background:#fff;
} }
.b-new-entry .autocomplete-box .text-field{ .b-new-entry .autocomplete-box .text-field{
width:213px; width:221px;
margin:0; 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{ .b-new-entry .autocomplete-box .arrow{
position:absolute; position:absolute;
top:0; top:0;
right:0; right:0;
display:block; display:block;
width:32px; width:34px;
height:32px; height:32px;
font-size:0; font-size:0;
line-height:0; line-height:0;
background:#fff url(../images/autocomplete-field-arrows-sprite.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{

BIN
web/images/autocomplete-field-arrows-sprite-2012-02-11.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

5
web/js/pages.js
View file

@ -43,7 +43,9 @@ 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();
@ -53,7 +55,8 @@ 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;
} }

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

@ -78,7 +78,8 @@ 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);
@ -88,6 +89,7 @@ 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'],
@ -101,7 +103,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']));