Skip to content

Commit 4af1e4b

Browse files
committed
centered confirmation dialog
1 parent 9c8e062 commit 4af1e4b

26 files changed

+60
-88
lines changed

web/css/main.css

Lines changed: 13 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ label:active {
136136
font-weight: bold;
137137
text-decoration: none;
138138
line-height: 22px;
139-
padding: 0px 19px 4px 17px;
140-
margin: 0px 0px 2px 0px;
139+
padding: 0 4px 2px 4px;
140+
margin: 0 14px 2px 0;
141141
}
142142

143143
.top-logout:hover {
@@ -272,11 +272,7 @@ label:active {
272272
font-size: 9pt;
273273
font-family: Arial, Helvetica, sans-serif;
274274
// color: #333;
275-
<<<<<<< HEAD
276275
color: #666;
277-
=======
278-
color: #7E7D7F;
279-
>>>>>>> 29caf7e3b5ca98e665b4b3c7c6be94ade368c484
280276
decoration: none;
281277
overflow: hidden;
282278
}
@@ -601,9 +597,6 @@ label:active {
601597
background-color: #eceff1;
602598
border-bottom: 1px solid #e9e9e9;
603599
}
604-
.data.mode-add {
605-
border-top: 5px solid #F79B44;
606-
}
607600

608601
.mode-add .data-add {
609602
background-color: #f7f6ed;
@@ -800,11 +793,7 @@ label:active {
800793
vertical-align: top;
801794
line-height: 1.2em;
802795
font-size: 10pt;
803-
<<<<<<< HEAD
804796
color: #666;
805-
=======
806-
color: #626163; /* #7E7D7F;*/
807-
>>>>>>> 29caf7e3b5ca98e665b4b3c7c6be94ade368c484
808797
padding: 2px 4px 1px 0;
809798
white-space: nowrap;
810799
}
@@ -814,22 +803,14 @@ label:active {
814803
line-height: 0.8em;
815804
font-size: 8pt;
816805
padding: 4px 0 0 0;
817-
<<<<<<< HEAD
818806
color: #666;
819-
=======
820-
color: #7E7D7F;
821-
>>>>>>> 29caf7e3b5ca98e665b4b3c7c6be94ade368c484
822807
}
823808

824809
.counter-value {
825810
vertical-align: top;
826811
line-height: 1.2em;
827812
font-size: 10pt;
828-
<<<<<<< HEAD
829813
color: #555;
830-
=======
831-
color: #545355; /*#626163;*/
832-
>>>>>>> 29caf7e3b5ca98e665b4b3c7c6be94ade368c484
833814
padding: 2px 0 1px 2px;
834815
}
835816

@@ -924,11 +905,6 @@ label:active {
924905
border: 1px solid #909090;
925906
}
926907

927-
.vst-input:disabled:hover {
928-
border: 1px solid #C0C0C0;
929-
}
930-
931-
932908
.vst-input:focus {
933909
border: 1px solid #f79b44;
934910
background-color: #fffcd2;
@@ -951,21 +927,12 @@ label:active {
951927
min-width: 138px;
952928
margin: 2px 6px 0 0;
953929
padding: 8px 1px 6px 10px;
954-
<<<<<<< HEAD
955-
}
956-
957-
.vst-list option {
958-
padding: 6px 1px 6px 15px;
959-
}
960-
961-
=======
962930
}
963931

964932
.vst-list option {
965933
padding: 6px 1px 6px 15px;
966934
}
967935

968-
>>>>>>> 29caf7e3b5ca98e665b4b3c7c6be94ade368c484
969936
/*
970937
@-moz-document url-prefix() {
971938
.vst-list {
@@ -1028,8 +995,8 @@ label:active {
1028995
}
1029996

1030997
.login-button:hover {
1031-
border: 1px solid #6DB8D3;
1032-
background-color: #6DB8D3;
998+
border: 1px solid #adaeae;
999+
background-color: #adaeae;
10331000
}
10341001

10351002
.login-button:active {
@@ -1273,3 +1240,12 @@ label:active {
12731240
.timer-container .timer-button.play{
12741241
background: url(/images/start.png) no-repeat;
12751242
}
1243+
1244+
.confirmation {
1245+
vertical-align: top;
1246+
text-align: center;
1247+
line-height: 1.2em;
1248+
font-size: 10pt;
1249+
color: #555;
1250+
padding: 2px 0 1px 2px;
1251+
}

web/templates/admin/add_firewall_banlist.html

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,11 @@
5353
<td>
5454
<select class="vst-list" name="v_chain">
5555
<option value="SSH" <?php if ((!empty($v_chain)) && ( $v_chain == "'SSH'" )) echo 'selected'?>><?php print __('SSH') ?></option>
56+
<option value="WEB" <?php if ((!empty($v_chain)) && ( $v_chain == "'WEB'" )) echo 'selected'?>><?php print __('WEB') ?></option>
5657
<option value="FTP" <?php if ((!empty($v_chain)) && ( $v_chain == "'FTP'" )) echo 'selected'?>><?php print __('FTP') ?></option>
57-
<option value="MAIL" <?php if ((!empty($v_chain)) && ( $v_chain == "'MAIL'" )) echo 'selected'?>><?php print __('MAIL') ?></option>
5858
<option value="DNS" <?php if ((!empty($v_chain)) && ( $v_chain == "'DNS'" )) echo 'selected'?>><?php print __('DNS') ?></option>
59-
<option value="HTTP" <?php if ((!empty($v_chain)) && ( $v_chain == "'HTTP'" )) echo 'selected'?>><?php print __('HTTP') ?></option>
60-
<option value="HTTPS" <?php if ((!empty($v_chain)) && ( $v_chain == "'HTTPS'" )) echo 'selected'?>><?php print __('HTPS') ?></option>
61-
<option value="POP3" <?php if ((!empty($v_chain)) && ( $v_chain == "'POP3'" )) echo 'selected'?>><?php print __('POP3') ?></option>
62-
<option value="IMAP" <?php if ((!empty($v_chain)) && ( $v_chain == "'IMAP'" )) echo 'selected'?>><?php print __('IMAP') ?></option>
63-
<option value="MYSQL" <?php if ((!empty($v_chain)) && ( $v_chain == "'MYSQL'" )) echo 'selected'?>><?php print __('MYSQL') ?></option>
64-
<option value="POSTGRES" <?php if ((!empty($v_chain)) && ( $v_chain == "'POSTGRES'" )) echo 'selected'?>><?php print __('POSTGRES') ?></option>
59+
<option value="MAIL" <?php if ((!empty($v_chain)) && ( $v_chain == "'MAIL'" )) echo 'selected'?>><?php print __('MAIL') ?></option>
60+
<option value="DB" <?php if ((!empty($v_chain)) && ( $v_chain == "'DB'" )) echo 'selected'?>><?php print __('DB') ?></option>
6561
<option value="VESTA" <?php if ((!empty($v_chain)) && ( $v_chain == "'VESTA'" )) echo 'selected'?>><?php print __('VESTA') ?></option>
6662
</select>
6763
</td>

web/templates/admin/list_backup.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<?php print __('delete');?>
6666
<input type="hidden" name="delete_url" value="/delete/backup/?backup=<?php echo "$key" ?>" />
6767
<div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
68-
<p class="counter-value"><?php print __('DELETE_BACKUP_CONFIRMATION',$key);?></p>
68+
<p class="confirmation"><?php print __('DELETE_BACKUP_CONFIRMATION',$key);?></p>
6969
</div>
7070
</span>
7171
</a>

web/templates/admin/list_backup_exclusions.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<?php print __('delete');?>
4646
<input type="hidden" name="delete_url" value="/delete/backup/exclusion/?system=<?php echo "$key" ?>" />
4747
<div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
48-
<p class="counter-value"><?php print __('DELETE_EXCLUSION_CONFIRMATION',$key);?></p>
48+
<p class="confirmation"><?php print __('DELETE_EXCLUSION_CONFIRMATION',$key);?></p>
4949
</div>
5050
</span>
5151
</a>

web/templates/admin/list_cron.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<?php print __('delete');?>
7373
<input type="hidden" name="delete_url" value="/delete/cron/?job=<?php echo $data[$key]['JOB']; ?>" />
7474
<div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
75-
<p class="counter-value"><?php print __('DELETE_CRON_CONFIRMATION');?></p>
75+
<p class="confirmation"><?php print __('DELETE_CRON_CONFIRMATION');?></p>
7676
</div>
7777
</span>
7878
</a>
@@ -82,7 +82,7 @@
8282
<?php echo __($spnd_action); ?>
8383
<input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/cron/?job=<?php echo $data[$key]['JOB']; ?>" />
8484
<div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
85-
<p class="counter-value"><?php print __($spnd_confirmation);?></p>
85+
<p class="confirmation"><?php print __($spnd_confirmation);?></p>
8686
</div>
8787
</span>
8888
</a>

web/templates/admin/list_db.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<?php echo __('delete') ?>
6666
<input type="hidden" name="delete_url" value="/delete/db/?database=<?php echo "$key" ?>" />
6767
<div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
68-
<p class="counter-value"><?php print __('DELETE_DATABASE_CONFIRMATION',$key);?></p>
68+
<p class="confirmation"><?php print __('DELETE_DATABASE_CONFIRMATION',$key);?></p>
6969
</div>
7070
</span>
7171
</a>
@@ -75,7 +75,7 @@
7575
<?php echo __($spnd_action) ?>
7676
<input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/db/?database=<?php echo "$key" ?>" />
7777
<div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
78-
<p class="counter-value"><?php print __($spnd_confirmation,$key);?></p>
78+
<p class="confirmation"><?php print __($spnd_confirmation,$key);?></p>
7979
</div>
8080
</span>
8181
</a>

web/templates/admin/list_dns.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<?php print __('delete');?>
5858
<input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $key ?>" />
5959
<div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
60-
<p class="counter-value"><?php print __('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
60+
<p class="confirmation"><?php print __('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
6161
</div>
6262
</span>
6363
</a>
@@ -67,7 +67,7 @@
6767
<?php echo __($spnd_action); ?>
6868
<input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/dns/?domain=<?php echo $key ?>" />
6969
<div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
70-
<p class="counter-value"><?php print __($spnd_confirmation,$key);?></p>
70+
<p class="confirmation"><?php print __($spnd_confirmation,$key);?></p>
7171
</div>
7272
</span>
7373
</a>

web/templates/admin/list_dns_rec.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<?php print __('delete');?>
6464
<input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>" />
6565
<div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
66-
<p class="counter-value"><?php print __('DELETE_RECORD_CONFIRMATION',$data[$key]['RECORD']);?></p>
66+
<p class="confirmation"><?php print __('DELETE_RECORD_CONFIRMATION',$data[$key]['RECORD']);?></p>
6767
</div>
6868
</span>
6969
</a>

web/templates/admin/list_firewall.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<?php print __('delete');?>
6060
<input type="hidden" name="delete_url" value="/delete/firewall/?rule=<?php echo $data[$key]['RULE'] ?>"/>
6161
<div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
62-
<p class="counter-value"><?php print __('DELETE_RULE_CONFIRMATION',$data[$key]['RULE']);?></p>
62+
<p class="confirmation"><?php print __('DELETE_RULE_CONFIRMATION',$data[$key]['RULE']);?></p>
6363
</div>
6464
</span>
6565
</a>
@@ -69,7 +69,7 @@
6969
<?php echo __($spnd_action); ?>
7070
<input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/firewall/?rule=<?php echo $data[$key]['RULE'] ?>" />
7171
<div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
72-
<p class="counter-value"><?php print __($spnd_confirmation,$key);?></p>
72+
<p class="confirmation"><?php print __($spnd_confirmation,$key);?></p>
7373
</div>
7474
</span>
7575
</a>

web/templates/admin/list_firewall_banlist.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<?php print __('delete');?>
5454
<input type="hidden" name="delete_url" value="/delete/firewall/banlist/?ip=<?php echo $ip ?>&chain=<?php echo $chain ?>"/>
5555
<div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
56-
<p class="counter-value"><?php print __('DELETE_IP_CONFIRMATION',$ip);?></p>
56+
<p class="confirmation"><?php print __('DELETE_IP_CONFIRMATION',$ip);?></p>
5757
</div>
5858
</span>
5959
</a>

0 commit comments

Comments
 (0)