Skip to content

Commit 3c81394

Browse files
naumov-socolovnaumov-socolov
committed
Pre release
1 parent 230c93f commit 3c81394

25 files changed

+2483
-121
lines changed

‎test/test_actions.sh‎

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ V_BIN="$VESTA/bin"
66
V_TEST="$VESTA/test"
77

88
# Define functions
9-
tmp_user() {
9+
random() {
1010
MATRIX='0123456789'
11-
LENGTH=4
11+
LENGTH=$1
1212
while [ ${n:=1} -le $LENGTH ]; do
1313
rand="$rand${MATRIX:$(($RANDOM%${#MATRIX})):1}"
1414
let n+=1
1515
done
16-
echo "tmp_$rand"
16+
echo "$rand"
1717
}
1818

1919
echo_result() {
@@ -25,8 +25,8 @@ echo_result() {
2525
echo -n 'FAILED'
2626
echo -n ']'
2727
echo -ne '\r\n'
28-
echo "$4"
29-
echo "RETURN VALUE $2"
28+
echo ">>> $4"
29+
echo ">>> RETURN VALUE $2"
3030
cat $3
3131
else
3232
echo -n ' OK '
@@ -36,54 +36,63 @@ echo_result() {
3636
}
3737

3838
# Create random username
39-
user=$(tmp_user)
39+
user="tmp_$(random 4)"
4040
while [ ! -z "$(grep "^$user:" /etc/passwd)" ]; do
41-
user=$(tmp_user)
41+
user="tmp_$(random 4)"
4242
done
4343

4444
# Create random tmpfile
4545
tmpfile=$(mktemp -p /tmp )
4646

47+
4748
# Add new user
4849
cmd="v_add_user $user $user $user@vestacp.com default Super Test"
4950
$cmd > $tmpfile 2>> $tmpfile
5051
echo_result "Adding new user $user" "$?" "$tmpfile" "$cmd"
5152

53+
5254
# Change system shell
5355
cmd="v_change_user_shell $user bash"
5456
$cmd > $tmpfile 2>> $tmpfile
5557
echo_result "Changing system shell to /bin/bash" "$?" "$tmpfile" "$cmd"
5658

59+
5760
# Change name servers
5861
cmd="v_change_user_ns $user ns0.com ns1.com ns2.com ns3.com"
5962
$cmd > $tmpfile 2>> $tmpfile
6063
echo_result "Changing nameservers" "$?" "$tmpfile" "$cmd"
6164

65+
6266
# Add cron job
6367
cmd="v_add_cron_job $user 1 1 1 1 1 echo"
6468
$cmd > $tmpfile 2>> $tmpfile
6569
echo_result "Adding cron job" "$?" "$tmpfile" "$cmd"
6670

71+
6772
# Suspend cron job
6873
cmd="v_suspend_cron_job $user 1"
6974
$cmd > $tmpfile 2>> $tmpfile
7075
echo_result "Suspending cron job" "$?" "$tmpfile" "$cmd"
7176

77+
7278
# Unsuspend cron job
7379
cmd="v_unsuspend_cron_job $user 1"
7480
$cmd > $tmpfile 2>> $tmpfile
7581
echo_result "Unsuspending cron job" "$?" "$tmpfile" "$cmd"
7682

83+
7784
# Delete cron job
7885
cmd="v_delete_cron_job $user 1"
7986
$cmd > $tmpfile 2>> $tmpfile
8087
echo_result "Deleting cron job" "$?" "$tmpfile" "$cmd"
8188

89+
8290
# Add cron job
8391
cmd="v_add_cron_job $user 1 1 1 1 1 echo 1"
8492
$cmd > $tmpfile 2>> $tmpfile
8593
echo_result "Adding cron job" "$?" "$tmpfile" "$cmd"
8694

95+
8796
# Add cron job
8897
cmd="v_add_cron_job $user 1 1 1 1 1 echo 1"
8998
$cmd > $tmpfile 2>> $tmpfile
@@ -94,9 +103,28 @@ else
94103
fi
95104
echo_result "Dublicate cron job check" "$retval" "$tmpfile" "$cmd"
96105

97-
# Check ip
98-
#cat /proc/net/dev|cut -f 1 -d :|tail -n1
99-
#v_add_sys_ip 192.168.11.11 255.255.255.255 venet0 ekho
106+
107+
# List network interfaces
108+
cmd="v_list_sys_interfaces plain"
109+
interface=$($cmd 2> $tmpfile | head -n 1)
110+
if [ -z "$interface" ]; then
111+
echo_result "Listing network interfaces" "1" "$tmpfile" "$cmd"
112+
else
113+
echo_result "Listing network interfaces" "0" "$tmpfile" "$cmd"
114+
fi
115+
116+
117+
# Add new ip address
118+
cmd="v_add_sys_ip 198.18.0.123 255.255.255.255 $interface $user"
119+
$cmd > $tmpfile 2>> $tmpfile
120+
echo_result "Adding ip 198.18.0.123" "$?" "$tmpfile" "$cmd"
121+
122+
123+
# Delete ip address
124+
cmd="v_delete_sys_ip 198.18.0.123"
125+
$cmd > $tmpfile 2>> $tmpfile
126+
echo_result "Deleting ip 198.18.0.123" "$?" "$tmpfile" "$cmd"
127+
100128

101129
# Delete new user
102130
cmd="v_delete_user $user"

‎web/css/main.css‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,10 +1584,14 @@ input::-moz-focus-inner{
15841584
background-color:#FFFFCB;
15851585
}
15861586
.b-new-entry select.styled{
1587-
top:10px;
1587+
top:0;
15881588
}
15891589
.b-new-entry option{
1590-
font:14px arial,sans-serif;
1590+
padding:5px 5px 5px 8px;
1591+
font-family:Arial, Helvetica, sans-serif;
1592+
font-size:14px;
1593+
font-weight:bold;
1594+
color:#555;
15911595
}
15921596
.b-new-entry .form-options-group{}
15931597

‎web/images/checkbox-selector.png‎

-1.8 KB
Loading

‎web/images/checkboxes.png‎

5.79 KB
Loading

‎web/images/chekbox-selector.png‎

1.54 KB
Loading

‎web/images/fav.ico‎

2.36 KB
Binary file not shown.

‎web/images/form-checkboxes.png‎

1.16 KB
Loading

‎web/images/section-status-sprite-7.png‎

993 Bytes
Loading

‎web/index.html‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ <h1 class="logo"><a href="/">Vesta panel <span>&nbsp;</span></a></h1>
8282
<dl class="users-nav-item">
8383
<dt class="section-title cc">
8484
<span class="to-section">User</span>
85-
<i class="add-entry do_action_new_entry">&nbsp;</i>
8685
</dt>
8786
<dd class="section-contains">
8887
<span class="def"><span class="num-total">0</span> users</span>
@@ -98,7 +97,6 @@ <h1 class="logo"><a href="/">Vesta panel <span>&nbsp;</span></a></h1>
9897
<dl class="users-nav-item">
9998
<dt class="section-title cc">
10099
<span class="to-section">Web</span>
101-
<i class="add-entry do_action_new_entry">&nbsp;</i>
102100
</dt>
103101
<dd class="section-contains">
104102
<span class="def"><span class="num-total">0</span> web domains</span>
@@ -108,73 +106,68 @@ <h1 class="logo"><a href="/">Vesta panel <span>&nbsp;</span></a></h1>
108106
</div>
109107
<i class="section-devider"></i>
110108
</li>
111-
<li class="section" id="MAIL">
109+
<li class="section active" id="DNS">
112110
<div class="section-inner">
113111
<dl class="users-nav-item">
114112
<dt class="section-title cc">
115-
<span class="to-section">Mail</span>
116-
<i class="add-entry do_action_new_entry">&nbsp;</i>
113+
<span class="to-section">DNS</span>
117114
</dt>
118115
<dd class="section-contains">
119-
<span class="def"><span class="num-total">0</span> mail domain(s)</span>
116+
<span class="def"><span class="num-total">0</span> dns domain(s)</span>
120117
</dd>
121118
</dl>
122119
</div>
123120
<i class="section-devider"></i>
124121
</li>
125-
<li class="section" id="DB">
122+
<li class="section" id="MAIL">
126123
<div class="section-inner">
127124
<dl class="users-nav-item">
128125
<dt class="section-title cc">
129-
<span class="to-section">DB</span>
130-
<i class="add-entry do_action_new_entry">&nbsp;</i>
126+
<span class="to-section">Mail</span>
131127
</dt>
132128
<dd class="section-contains">
133-
<span class="def"><span class="num-total">0</span> databases</span>
134-
<span class="def"><span class="num-blocked">0</span> suspended</span>
129+
<span class="def"><span class="num-total">0</span> mail domain(s)</span>
135130
</dd>
136131
</dl>
137132
</div>
138133
<i class="section-devider"></i>
139134
</li>
140-
<li class="section active" id="DNS">
135+
<li class="section" id="DB">
141136
<div class="section-inner">
142137
<dl class="users-nav-item">
143138
<dt class="section-title cc">
144-
<span class="to-section">DNS</span>
145-
<i class="add-entry do_action_new_entry">&nbsp;</i>
139+
<span class="to-section">DB</span>
146140
</dt>
147141
<dd class="section-contains">
148-
<span class="def"><span class="num-total">0</span> dns domain(s)</span>
142+
<span class="def"><span class="num-total">0</span> databases</span>
143+
<span class="def"><span class="num-blocked">0</span> suspended</span>
149144
</dd>
150145
</dl>
151146
</div>
152147
<i class="section-devider"></i>
153148
</li>
154-
<li class="section" id="IP">
149+
<li class="section" id="CRON">
155150
<div class="section-inner">
156151
<dl class="users-nav-item">
157152
<dt class="section-title cc">
158-
<span class="to-section">IP</span>
159-
<i class="add-entry do_action_new_entry">&nbsp;</i>
153+
<span class="to-section">Cron</span>
160154
</dt>
161155
<dd class="section-contains">
162-
<span class="def"><span class="num-total">0</span> ip address(es)</span>
156+
<span class="def"><span class="num-total">0</span> cron job(s)</span>
163157
<span class="def"><span class="num-blocked">0</span> suspended</span>
164158
</dd>
165159
</dl>
166160
</div>
167161
<i class="section-devider"></i>
168162
</li>
169-
<li class="section last-section" id="CRON">
163+
<li class="section last-section" id="IP">
170164
<div class="section-inner">
171165
<dl class="users-nav-item">
172166
<dt class="section-title cc">
173-
<span class="to-section">Cron</span>
174-
<i class="add-entry do_action_new_entry">&nbsp;</i>
167+
<span class="to-section">IP</span>
175168
</dt>
176169
<dd class="section-contains">
177-
<span class="def"><span class="num-total">0</span> cron job(s)</span>
170+
<span class="def"><span class="num-total">0</span> ip address(es)</span>
178171
<span class="def"><span class="num-blocked">0</span> suspended</span>
179172
</dd>
180173
</dl>

‎web/js/__init__.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ $('document').ready(function() {
1111
App.Utils.detectBrowser();
1212
App.Ref.init();
1313

14-
App.Env.world = 'USER';
14+
//App.Env.world = 'USER';
1515
// Disabled cookie tab restoring. Enable if needed
16-
/*if ('undefined' != typeof App.Tmp.loadTAB) {
16+
if ('undefined' != typeof App.Tmp.loadTAB) {
1717
App.Env.world = App.Tmp.loadTAB;
1818
}
1919

@@ -25,7 +25,7 @@ $('document').ready(function() {
2525
else {
2626
App.Env.world = App.Constants.TABS[0];
2727
}
28-
}*/
28+
}
2929

3030
App.Pages.init();
3131
App.Core.listen();

0 commit comments

Comments
 (0)