Skip to content

Commit a1c8045

Browse files
serghey-rodinserghey-rodin
committed
refactoring cron section: new html formating
1 parent c080bca commit a1c8045

File tree

10 files changed

+610
-467
lines changed

10 files changed

+610
-467
lines changed

‎web/add/cron/index.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
$db_types = json_decode(implode('', $output), true);
6969
unset($output);
7070

71-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_add_cron.html');
7271
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_cron.html');
7372
unset($_SESSION['error_msg']);
7473
unset($_SESSION['ok_msg']);

‎web/list/cron/index.php‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,18 @@
1313

1414
// Data
1515
if ($_SESSION['user'] == 'admin') {
16-
1716
exec (VESTA_CMD."v_list_cron_jobs $user json", $output, $return_var);
18-
check_error($return_var);
1917
$data = json_decode(implode('', $output), true);
2018
$data = array_reverse($data);
2119
unset($output);
22-
23-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_cron.html');
2420
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_cron.html');
2521
} else {
2622

2723
exec (VESTA_CMD."v_list_cron_jobs $user json", $output, $return_var);
28-
check_error($return_var);
2924
$data = json_decode(implode('', $output), true);
3025
$data = array_reverse($data);
3126
unset($output);
32-
33-
include($_SERVER['DOCUMENT_ROOT'].'/templates/user/menu_cron.html');
3427
include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_cron.html');
35-
3628
}
3729

3830
// Footer

‎web/templates/admin/add_cron.html‎

Lines changed: 104 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,106 @@
1-
<script type="text/javascript">
2-
function elementHideShow(elementToHideOrShow) {
3-
var el = document.getElementById(elementToHideOrShow);
4-
if (el.style.display == "block") {
5-
el.style.display = "none";
6-
} else {
7-
el.style.display = "block";
8-
}
9-
}
101

11-
function randomString() {
12-
var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
13-
var string_length = 10;
14-
var randomstring = '';
15-
for (var i=0; i<string_length; i++) {
16-
var rnum = Math.floor(Math.random() * chars.length);
17-
randomstring += chars.substring(rnum,rnum+1);
18-
}
19-
document.v_add_user.v_password.value = randomstring;
20-
}
21-
</script>
2+
<table class="sub-menu" style="background: white;">
3+
<tr>
4+
<td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding Cron Job</b></a>
5+
<?php
6+
if (!empty($_SESSION['error_msg'])) {
7+
echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
8+
} else {
9+
if (!empty($_SESSION['ok_msg'])) {
10+
echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
11+
}
12+
}
13+
?>
14+
</td>
15+
</tr>
16+
</table>
17+
</td>
18+
</tr>
19+
</table>
2220

23-
24-
<table class='data'>
25-
<tr class="data-add">
26-
<td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
27-
<table class="data-col1">
28-
<tr><td style="padding: 18 0 4 18;"></td></tr>
29-
</table>
30-
</td>
31-
<td class="data-dotted" width="830px" style="vertical-align:top;">
32-
<table width="830px"><tr>
33-
<td></td>
34-
</tr></table>
35-
<table class="data-col2" width="600px">
36-
<form method="post" name="v_add_user">
37-
<tr><td class="add-text" style="padding: 10 0 0 2px;">Minute</td></tr>
38-
<tr><td><input type="text" size="20" class="add-input" name="v_min" <?php if (!empty($v_min)) echo "value=".$v_min; ?>></td></tr>
39-
<tr><td class="add-text" style="padding: 10px 0 0 2px;">Hour</td></tr>
40-
<tr><td></span><input type="text" size="20" class="add-input" name="v_hour" <?php if (!empty($v_hour)) echo "value=".$v_hour; ?>></tr>
41-
<tr><td class="add-text" style="padding: 10px 0 0 2px;">Day</td></tr>
42-
<tr><td></span><input type="text" size="20" class="add-input" name="v_day" <?php if (!empty($v_day)) echo "value=".$v_day; ?>></tr>
43-
<tr><td class="add-text" style="padding: 10px 0 0 2px;">Month</td></tr>
44-
<tr><td></span><input type="text" size="20" class="add-input" name="v_month" <?php if (!empty($v_month)) echo "value=".$v_month; ?>></tr>
45-
<tr><td class="add-text" style="padding: 10px 0 0 2px;">Day of Week</td></tr>
46-
<tr><td></span><input type="text" size="20" class="add-input" name="v_wday" <?php if (!empty($v_wday)) echo "value=".$v_wday; ?>></tr>
47-
<tr><td class="add-text" style="padding: 10px 0 0 2px;">Command</td></tr>
48-
<tr><td></span><input type="text" size="20" class="add-input" name="v_cmd" <?php if (!empty($v_cmd)) echo "value='".$v_cmd."'"; ?>></tr>
49-
50-
<tr><td style="padding: 24px 0 0 0;">
51-
<input type="submit" name="ok" value="OK" class="add-button"></form>
52-
<input type="button" class="add-button" value="Cancel" onClick="location.href='/list/cron/'">
53-
</td></tr>
54-
</table>
55-
</td>
56-
</tr>
57-
</table>
21+
<form id="vstobjects" name="v_add_cron" method="post">
22+
<table class='data'>
23+
<tr class="data-add">
24+
<td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
25+
<table class="data-col1">
26+
<tr><td style="padding: 18 0 4 18;"></td></tr>
27+
</table>
28+
</td>
29+
<td class="data-dotted" width="830px" style="vertical-align:top;">
30+
<table width="830px">
31+
<tr>
32+
<td></td>
33+
</tr>
34+
</table>
35+
<table class="data-col2" width="600px">
36+
<tr>
37+
<td class="add-text" style="padding: 10 0 0 2px;">
38+
Minute
39+
</td>
40+
</tr>
41+
<tr>
42+
<td>
43+
<input type="text" size="20" class="add-input" name="v_min" <?php if (!empty($v_min)) echo "value=".$v_min; ?>>
44+
</td>
45+
</tr>
46+
<tr>
47+
<td class="add-text" style="padding: 10px 0 0 2px;">
48+
Hour
49+
</td>
50+
</tr>
51+
<tr>
52+
<td>
53+
<input type="text" size="20" class="add-input" name="v_hour" <?php if (!empty($v_hour)) echo "value=".$v_hour; ?>>
54+
</td>
55+
</tr>
56+
<tr>
57+
<td class="add-text" style="padding: 10px 0 0 2px;">
58+
Day
59+
</td>
60+
</tr>
61+
<tr>
62+
<td>
63+
<input type="text" size="20" class="add-input" name="v_day" <?php if (!empty($v_day)) echo "value=".$v_day; ?>>
64+
</td>
65+
</tr>
66+
<tr>
67+
<td class="add-text" style="padding: 10px 0 0 2px;">
68+
Month
69+
</td>
70+
</tr>
71+
<tr>
72+
<td>
73+
<input type="text" size="20" class="add-input" name="v_month" <?php if (!empty($v_month)) echo "value=".$v_month; ?>>
74+
</td>
75+
</tr>
76+
<tr>
77+
<td class="add-text" style="padding: 10px 0 0 2px;">
78+
Day of Week
79+
</td>
80+
</tr>
81+
<tr>
82+
<td>
83+
<input type="text" size="20" class="add-input" name="v_wday" <?php if (!empty($v_wday)) echo "value=".$v_wday; ?>>
84+
</td>
85+
</tr>
86+
<tr>
87+
<td class="add-text" style="padding: 10px 0 0 2px;">
88+
Command
89+
</td>
90+
</tr>
91+
<tr>
92+
<td>
93+
<input type="text" size="20" class="add-input" name="v_cmd" <?php if (!empty($v_cmd)) echo "value='".$v_cmd."'"; ?>>
94+
</td>
95+
</tr>
96+
<tr>
97+
<td style="padding: 24px 0 0 0;">
98+
<input type="submit" name="ok" value="OK" class="button">
99+
<input type="button" class="button" value="Cancel" onclick="location.href='/list/cron/'">
100+
</td>
101+
</tr>
102+
</table>
103+
</td>
104+
</tr>
105+
</table>
106+
</form>

0 commit comments

Comments
 (0)