Skip to content

Commit 4b24b4e

Browse files
serghey-rodinserghey-rodin
committed
new html layout using border-collapse
1 parent f8178b1 commit 4b24b4e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+831
-953
lines changed

‎web/css/main.css‎

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@ form {
1010
margin: 0;
1111
}
1212

13+
14+
table {
15+
border-collapse: collapse;
16+
}
17+
18+
td {
19+
padding: 0;
20+
}
21+
22+
1323
.hidden {
1424
display: none;
1525
}
@@ -263,7 +273,7 @@ form {
263273

264274
.submenu-select-block {
265275
float:left;
266-
padding-left: 31px;
276+
padding-left: 30px;
267277
}
268278

269279
.submenu-select-link {
@@ -441,10 +451,9 @@ form {
441451
.data-dotted {
442452
text-align: left;
443453
vertical-align:top;
444-
border-top:1px dotted #d3d3d3;
454+
border-top: 1px dotted #d3d3d3;
445455
padding: 0 0 26px 0;
446456
margin: 0;
447-
width: 166px;
448457
}
449458

450459
.data-dotted td {
@@ -453,33 +462,33 @@ form {
453462

454463
.data-col1 {
455464
text-align: left;
456-
padding:0;
465+
padding: 0;
466+
width: 173px;
457467
}
458468

459469
.data-col1 tr td {
460-
padding:0 0 6px 24px;
470+
padding:2px 0 6px 26px;
461471
}
462472

463473
.data-col1 tr:first-child td {
464-
padding:22px 0 0 24px;
474+
padding:24px 0 0 26px;
465475
}
466476

467477
.data-col2 {
468478
text-align: left;
469-
padding: 0;
470479
overflow: hidden;
480+
width: 827px;
471481
}
472482

473483
.data-col5 {
474-
table-layout: fixed;
475484
text-align: left;
476-
padding: 0;
477485
overflow: hidden;
486+
width: 817px;
487+
table-layout: fixed;
478488
white-space: nowrap;
479489
}
480490

481491
.data-date {
482-
padding: 0 0 0 18;
483492
letter-spacing: 0.3em;
484493
font-size: 8pt;
485494
color: #6A6A6A
@@ -489,22 +498,20 @@ form {
489498
font-size: 8pt;
490499
letter-spacing: 0.1em;
491500
color: #81a64f;
492-
padding: 0 0 13 18;
493501
}
494502

495503
.data-suspended {
496504
font-size: 8pt;
497505
letter-spacing: 0.1em;
498506
color: #de5543;
499-
padding: 0 0 13 18;
500507
}
501508

502509
.data-controls {
503510
float: right;
504511
height: 16px;
505512
border-left: 1px solid #d3d3d3;
506513
font-size: 8pt;
507-
padding: 2px 12px 0 6px;
514+
padding: 2px 12px 1px 6px;
508515
letter-spacing: 0.1em;
509516
color: #2361a1;
510517
text-decoration: none;
@@ -546,21 +553,25 @@ form {
546553
.username {
547554
color: #222;
548555
font-size: 14pt;
556+
padding: 1px 0 2px 0;
549557
}
550558

551559
.domain {
552560
color: #222;
553561
font-size: 14pt;
562+
padding: 1px 0 2px 0;
554563
}
555564

556565
.cron {
557566
color: #222;
558567
font-size: 18px;
568+
padding: 1px 0 2px 0;
559569
}
560570

561571
.log {
562572
color: #222;
563573
font-size: 12pt;
574+
padding: 1px 0 2px 0;
564575
}
565576

566577
.aliases {
@@ -587,14 +598,14 @@ form {
587598
line-height: 1.3em;
588599
font-size: 10pt;
589600
color: #222;
590-
padding: 0 4px 0 0;
601+
padding: 2px 4px 1px 0;
591602
}
592603

593604
.cron-counter-name {
594605
vertical-align:top;
595606
line-height: 0.8em;
596607
font-size: 8pt;
597-
padding: 4 0 0 0;
608+
padding: 4px 0 0 0;
598609
color: #222;
599610
}
600611

@@ -603,7 +614,7 @@ form {
603614
line-height: 1.3em;
604615
font-size: 10pt;
605616
color: #222;
606-
padding: 0 0 0 2px;
617+
padding: 2px 0 1px 2px;
607618
}
608619

609620
.log-counter-value {
@@ -685,7 +696,7 @@ form {
685696
padding: 5px;
686697
width: 360px;
687698
height: 28px;
688-
margin: 0 6px 0 0;
699+
margin: 2px 6px 0 0;
689700
}
690701

691702
.vst-input:hover {
@@ -706,6 +717,7 @@ form {
706717
color: #555;
707718
height: 30px;
708719
min-width: 138px;
720+
margin: 2px 6px 0 0;
709721
}
710722

711723
@-moz-document url-prefix() {
@@ -718,6 +730,7 @@ form {
718730
padding: 5px;
719731
font-size: 12pt;
720732
border: 1px solid #f7f6ed;
733+
margin: 2px 6px 0 0;
721734
}
722735

723736
.vst-checkbox:hover {
@@ -857,15 +870,14 @@ form {
857870
vertical-align:top;
858871
width: 500px;
859872
height: 50px;
860-
padding: 0 8px 0 0;
861873
margin: 0;
862874
}
863875

864876
.vestacp{
865877
font-size: 8pt;
866878
color: #222;
867879
text-align: right;
868-
padding: 20px 0 0 0;
880+
padding: 0 8px 0 0;
869881
}
870882

871883
.error {

‎web/templates/admin/add_cron.html‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
?>
99
<table class="submenu">
1010
<tr>
11-
<td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding Cron Job');?></b></a>
11+
<td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Adding Cron Job');?></b></a>
1212
<?php
1313
if (!empty($_SESSION['error_msg'])) {
1414
echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -26,20 +26,15 @@
2626
<form id="vstobjects" name="v_add_cron" method="post">
2727
<table class='data'>
2828
<tr class="data-add">
29-
<td class="data-dotted" width="150">
29+
<td class="data-dotted">
3030
<table class="data-col1">
3131
<tr><td></td></tr>
3232
</table>
3333
</td>
34-
<td class="data-dotted" width="830px">
35-
<table width="830px">
36-
<tr>
37-
<td></td>
38-
</tr>
39-
</table>
34+
<td class="data-dotted">
4035
<table class="data-col2" width="600px">
4136
<tr>
42-
<td class="vst-text" style="padding: 20px 0 0 2px;">
37+
<td class="vst-text" style="padding: 24px 0 0 0;">
4338
<?php print __('Minute');?>
4439
</td>
4540
</tr>
@@ -49,7 +44,7 @@
4944
</td>
5045
</tr>
5146
<tr>
52-
<td class="vst-text" style="padding: 10px 0 0 2px;">
47+
<td class="vst-text" style="padding: 12px 0 0 0;">
5348
<?php print __('Hour');?>
5449
</td>
5550
</tr>
@@ -59,7 +54,7 @@
5954
</td>
6055
</tr>
6156
<tr>
62-
<td class="vst-text" style="padding: 10px 0 0 2px;">
57+
<td class="vst-text" style="padding: 12px 0 0 0;">
6358
<?php print __('Day');?>
6459
</td>
6560
</tr>
@@ -69,7 +64,7 @@
6964
</td>
7065
</tr>
7166
<tr>
72-
<td class="vst-text" style="padding: 10px 0 0 2px;">
67+
<td class="vst-text" style="padding: 12px 0 0 0;">
7368
<?php print __('Month');?>
7469
</td>
7570
</tr>
@@ -79,7 +74,7 @@
7974
</td>
8075
</tr>
8176
<tr>
82-
<td class="vst-text" style="padding: 10px 0 0 2px;">
77+
<td class="vst-text" style="padding: 12px 0 0 0;">
8378
<?php print __('Day of week');?>
8479
</td>
8580
</tr>
@@ -89,7 +84,7 @@
8984
</td>
9085
</tr>
9186
<tr>
92-
<td class="vst-text" style="padding: 10px 0 0 2px;">
87+
<td class="vst-text" style="padding: 12px 0 0 0;">
9388
<?php print __('Command');?>
9489
</td>
9590
</tr>

‎web/templates/admin/add_db.html‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
?>
99
<table class="submenu">
1010
<tr>
11-
<td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding database');?></b></a>
11+
<td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Adding database');?></b></a>
1212
<?php
1313
if (!empty($_SESSION['error_msg'])) {
1414
echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -46,25 +46,20 @@
4646
</script>
4747
<table class='data'>
4848
<tr class="data-add">
49-
<td class="data-dotted" width="150">
49+
<td class="data-dotted">
5050
<table class="data-col1">
5151
<tr><td></td></tr>
5252
</table>
5353
</td>
54-
<td class="data-dotted" width="830px">
55-
<table width="830px">
56-
<tr>
57-
<td></td>
58-
</tr>
59-
</table>
54+
<td class="data-dotted">
6055
<table class="data-col2" width="600px">
6156
<tr>
62-
<td style="padding: 20px 0 0 2px; color:#777;" >
57+
<td style="padding:24px 0 0 0; color:#777;" >
6358
<?php print __('Prefix will be automaticaly added to database name and database user',$user."_");?>
6459
</td>
6560
</tr>
6661
<tr>
67-
<td class="vst-text" style="padding: 10px 0 0 2px;">
62+
<td class="vst-text" style="padding: 12px 0 0 0;">
6863
<?php print __('Database');?>
6964
</td>
7065
</tr>
@@ -75,7 +70,7 @@
7570
</td>
7671
</tr>
7772
<tr>
78-
<td class="vst-text" style="padding: 10px 0 0 2px;">
73+
<td class="vst-text" style="padding: 12px 0 0 0;">
7974
<?php print __('User');?>
8075
</td>
8176
</tr>
@@ -86,7 +81,7 @@
8681
</td>
8782
</tr>
8883
<tr>
89-
<td class="vst-text" style="padding: 10px 0 0 2px;">
84+
<td class="vst-text" style="padding: 12px 0 0 0;">
9085
<?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
9186
</td>
9287
</tr>
@@ -96,7 +91,7 @@
9691
</td>
9792
</tr>
9893
<tr>
99-
<td class="vst-text" style="padding: 10px 0 0 2px;">
94+
<td class="vst-text" style="padding: 12px 0 0 0;">
10095
<?php print __('Type');?>
10196
</td>
10297
</tr>
@@ -114,7 +109,7 @@
114109
</td>
115110
</tr>
116111
<tr>
117-
<td class="vst-text" style="padding: 10px 0 0 2px;">
112+
<td class="vst-text" style="padding: 12px 0 0 0;">
118113
<?php print __('Host');?>
119114
</td>
120115
</tr>
@@ -133,7 +128,7 @@
133128
</tr>
134129

135130
<tr>
136-
<td class="vst-text" style="padding: 10px 0 0 2px;">
131+
<td class="vst-text" style="padding: 12px 0 0 0;">
137132
<?php print __('Charset');?>
138133
</td>
139134
</tr>
@@ -179,7 +174,7 @@
179174
</select>
180175
</td>
181176
<tr>
182-
<td class="vst-text" style="padding: 10px 0 0 2px;">
177+
<td class="vst-text" style="padding: 12px 0 0 0;">
183178
<?php print __('Send login credentials to email address') ?>
184179
</td>
185180
</tr>

0 commit comments

Comments
 (0)