Skip to content

Commit ad6b4c1

Browse files
committed
Merge branch 'master' of github.com:serghey-rodin/vesta
2 parents 5e7233d + eef9cdd commit ad6b4c1

File tree

4 files changed

+29
-10
lines changed

4 files changed

+29
-10
lines changed

web/css/main.css

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1474,8 +1474,9 @@ input::-moz-focus-inner{
14741474
background:url(../images/group-value-bullet.png) no-repeat 5px 8px;
14751475
}
14761476
.group-values .group-switcher{
1477+
display:block;
14771478
padding-right:15px;
1478-
background:url(../images/group-values-collapsed.png) no-repeat 100% 4px;
1479+
background:url(../images/group-values-collapsed.png) no-repeat 100% 50%;
14791480
}
14801481
.group-values .group-values-count{
14811482
font-size:12px;
@@ -1574,7 +1575,7 @@ input::-moz-focus-inner{
15741575
.b-new-entry .textarea:focus{
15751576
-moz-box-shadow:0 0 8px rgba(82, 168, 236, 0.5);
15761577
-webkit-box-shadow:0 0 8px rgba(82, 168, 236, 0.5);
1577-
border-color:rgba(82, 168, 236, 0.75) !important;
1578+
border-color:rgba(82, 168, 236, 0.75);
15781579
color:#262523;
15791580
}
15801581

@@ -1611,6 +1612,8 @@ input::-moz-focus-inner{
16111612
}
16121613
.b-new-entry select.styled{
16131614
top:0;
1615+
width:231px;
1616+
height:35px;
16141617
}
16151618
.b-new-entry option{
16161619
padding:5px 5px 5px 8px;
@@ -1881,25 +1884,36 @@ input::-moz-focus-inner{
18811884
.b-new-entry .autocomplete-box{
18821885
position:relative;
18831886
float:left;
1884-
padding-right:35px;
1887+
padding-right:34px;
18851888
background:#fff;
18861889
}
18871890
.b-new-entry .autocomplete-box .text-field{
1888-
width:213px;
1891+
width:221px;
18891892
margin:0;
1890-
}
1893+
border-right:0;
1894+
cursor:pointer;
1895+
padding-top:6px;
1896+
padding-bottom:6px;
1897+
}
1898+
.b-new-entry .autocomplete-box .text-field{
1899+
-moz-box-shadow:none;
1900+
-webkit-box-shadow:none;
1901+
border-color:#B8C2C3;
1902+
}
1903+
18911904
.b-new-entry .autocomplete-box .arrow{
18921905
position:absolute;
18931906
top:0;
18941907
right:0;
18951908
display:block;
1896-
width:32px;
1909+
width:34px;
18971910
height:32px;
18981911
font-size:0;
18991912
line-height:0;
1900-
background:#fff url(../images/autocomplete-field-arrows-sprite.png) no-repeat;
1913+
background:#fff url(../images/autocomplete-field-arrows-sprite-2012-02-11.png) no-repeat;
19011914
cursor:pointer;
19021915
}
1916+
.b-new-entry .autocomplete-box:hover .arrow,
19031917
.b-new-entry .autocomplete-box .arrow:hover,
19041918
.b-new-entry .autocomplete-box .arrow:active,
19051919
.b-new-entry .autocomplete-box .arrow:focus{
1.8 KB
Loading

web/js/pages.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ App.Pages.prepareHTML = function()
4343
$('#actions-toolbar .stats-subbar').remove();
4444
$('#actions-toolbar .stats-components').remove();
4545
$('#actions-toolbar .do_action_new_entry').removeClass('hidden');
46+
4647
$('.active').removeClass('active');
48+
4749
$('.row-filters').removeClass('hidden');
4850
if ('undefined' != typeof App.Pages[App.Env.world].prepareHTML) {
4951
App.Pages[App.Env.world].prepareHTML();
@@ -53,7 +55,8 @@ App.Pages.prepareHTML = function()
5355
}
5456
$('#new-entry-keyword').text(App.Helpers.getHumanTabName());
5557
document.title = 'Vesta | ' + App.Helpers.getHumanTabName();
56-
58+
59+
$('#'+App.Env.world).addClass('active');
5760
App.Tmp[App.Env.world + '_selected_records'] = 0;
5861
}
5962

web/vesta/api/WEB_DOMAIN.class.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ public function addExecute(Request $request)
7878
$params = array(
7979
'USER' => $user['uid'],
8080
'DOMAIN' => $_s['DOMAIN'],
81-
'IP' => $_s['IP']
81+
'IP' => $_s['IP'],
82+
'TPL' => $_s['TPL']
8283
);
8384

8485
$result = Vesta::execute(Vesta::V_ADD_WEB_DOMAIN, $params);
@@ -88,6 +89,7 @@ public function addExecute(Request $request)
8889
return $this->reply($result['status'], $result['data']);
8990
}
9091

92+
/*
9193
if (!empty($_s['TPL'])) {
9294
$params = array(
9395
'USER' => $user['uid'],
@@ -101,7 +103,7 @@ public function addExecute(Request $request)
101103
$this->errors['CHANGE_TPL'] = array($result['error_code'] => $result['error_message']);
102104
}
103105
}
104-
106+
*/
105107

106108
if (!empty($_s['ALIAS'])) {
107109
$alias_arr = explode(',', str_replace("\n", "", $_s['ALIAS']));

0 commit comments

Comments
 (0)