Skip to content

Commit 9d76344

Browse files
serghey-rodinserghey-rodin
committed
New submenu
1 parent dbf793a commit 9d76344

File tree

11 files changed

+73
-35
lines changed

11 files changed

+73
-35
lines changed

‎web/css/main.css‎

Lines changed: 48 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -316,17 +316,17 @@ label:active {
316316
}
317317

318318
.submenu-button-select {
319-
width: 28px;
319+
width: 24px;
320320
height: 28px;
321321
cursor: pointer;
322322
color: #555;
323323
background-color: #fafafa;
324324
border: 1px solid #ccc;
325-
border-radius: 3px 3px 3px 3px;
326-
padding: 0;
325+
border-radius: 0px 3px 3px 0px;
327326
font-size: 9pt;
328327
font-weight: bold;
329328
font-family:Arial, Helvetica, sans-serif;
329+
position: absolute;
330330
}
331331

332332
.submenu-button-search {
@@ -426,35 +426,61 @@ label:active {
426426
background-color: #777;
427427
}
428428

429-
.submenu-select-dropdown {
430-
font-family:Arial, Helvetica, sans-serif;
431-
font-size: 9pt;
432-
color: #333;
433-
display: block;
429+
.submenu-select-wrapper {
434430
float: left;
435-
height: 28px;
436-
margin: 0 4px 0 0;
437-
min-width: 138px;
438-
background-color: #fff;
439-
border: 1px solid #ccc;
440-
border-radius: 3px 3px 3px 3px;
441-
padding: 0px 0px 2px 4px;
431+
border-top: 1px solid #ccc;
432+
border-bottom: 1px solid #ccc;
433+
border-left: 1px solid #ccc;
434+
background: #fafafa url("/images/arrow.png") no-repeat right 3px center;
435+
cursor: pointer;
436+
color: #777;
437+
font-size: 9pt;
438+
border-radius: 3px 0px 0px 3px;
439+
padding: 0 11px 0 0;
442440
}
443441

442+
.submenu-select-wrapper, .submenu-select-wrapper select{
443+
min-width: 107px;
444+
height: 26px;
445+
line-height: 26px;
446+
}
444447

445-
.submenu-select-dropdown:hover {
446-
border: 1px solid #909090;
448+
.submenu-select-wrapper:hover {
449+
background-color: #fff;
450+
border-color:#909090;
451+
color: #555;
447452
}
448453

449-
.submenu-select-dropdown:focus {
450-
border: 1px solid #f79b44;
454+
.submenu-select-wrapper select:focus {
455+
border-color:#f79b44;
451456
background-color: #fffcd2;
452457
color: #333;
453458
}
454459

460+
.submenu-select-wrapper option {
461+
padding: 5px;
462+
}
455463

456-
.submenu-select-dropdown option {
457-
padding: 5px 5px 5px 8px;
464+
.submenu-select-wrapper .holder{
465+
display: block;
466+
margin: 0 5px 0 5px;
467+
white-space: nowrap;
468+
overflow: hidden;
469+
cursor: pointer;
470+
}
471+
472+
.submenu-select-wrapper select{
473+
margin: 0;
474+
position: absolute;
475+
cursor: pointer;
476+
outline: none;
477+
opacity: 0;
478+
/* CSS hacks for older browsers */
479+
_noFocusLine: expression(this.hideFocus=true);
480+
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
481+
filter: alpha(opacity=0);
482+
-khtml-opacity: 0;
483+
-moz-opacity: 0;
458484
}
459485

460486
.submenu-search-block {
@@ -1249,3 +1275,4 @@ label:active {
12491275
color: #555;
12501276
padding: 2px 0 1px 2px;
12511277
}
1278+

‎web/images/arrow.png‎

243 Bytes
Loading

‎web/templates/admin/list_backup.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</select>
2020
<input type="submit" name="ok" value="›" class="submenu-button-select">
2121
</div>
22-
<div class="submenu-select-block">
22+
<div class="submenu-select-block" style="margin: 0 0 0 21px;">
2323
<a class="submenu-select-link" href="/list/backup/exclusions/">[ <?php print __('backup exclusions');?> ]</a>
2424
</div>
2525
<?php display_error_block(); ?>

‎web/templates/admin/list_cron.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<input type="submit" name="ok" value="›" class="submenu-button-select">
2525
</div>
2626
<?php if ($panel[$user]['LANGUAGE'] == 'en') { ?>
27-
<div class="submenu-select-block">
27+
<div class="submenu-select-block" style="margin: 0 0 0 21px;">
2828
<?php
2929
if($panel[$user]['CRON_REPORTS'] == 'yes') {
3030
?>

‎web/templates/admin/list_firewall.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<input type="submit" name="ok" value="›" class="submenu-button-select">
2121
</div>
2222
<?php if(!empty($_SESSION['FIREWALL_EXTENSION'])) { ?>
23-
<div class="submenu-select-block">
23+
<div class="submenu-select-block" style="margin: 0 0 0 21px;">
2424
<a class="submenu-select-link" href="/list/firewall/banlist/">[ <?php print __('list fail2ban');?> ]</a>
2525
</div>
2626
<?php } ?>

‎web/templates/admin/list_services.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<table class="submenu">
22
<tr>
33
<td class="wrapper">
4+
<div style="float:left; width: 160px;">&nbsp;</div>
45
<div class="submenu-search-block">
56
<form action="/search/" method="get">
67
<input type="text" name="q" class="submenu-search-field">

‎web/templates/admin/list_stats.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<table class="submenu">
22
<tr>
33
<td class="wrapper">
4+
<div style="float:left; width: 147px;">&nbsp;</div>
45
<div class="submenu-search-block">
56
<form action="/search/" method="get">
67
<input type="text" name="q" class="submenu-search-field">
@@ -9,7 +10,7 @@
910
</div>
1011
<div class="submenu-select-block" style="padding-left:8px;">
1112
<form action="/list/stats/" method="get" id="objects">
12-
<a class="vst<?php if (empty($_GET['user'])) echo "-selected"; ?>" style="padding: 4px 12px 0 0;" href='/list/stats/'><?php print __('Overall Statistics');?></a>
13+
<a class="vst-selected" style="margin: 0px 8px 0 0;" href='/list/stats/'><?php print __('Overall Statistics');?></a>
1314
<select class="submenu-select-dropdown" name="user">
1415
<option value=""><?php print __('show per user');?></option>
1516
<?php

‎web/templates/admin/list_updates.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<table class="submenu">
33
<tr>
44
<td class="wrapper">
5+
<div style="float:left; width: 160px;">&nbsp;</div>
56
<div class="submenu-search-block">
67
<form action="/search/" method="get">
78
<input type="text" name="q" class="submenu-search-field">
@@ -17,7 +18,7 @@
1718
</select>
1819
<input type="submit" name="ok" value="›" class="submenu-button-select">
1920
</div>
20-
<div class="submenu-select-block">
21+
<div class="submenu-select-block" style="margin: 0 0 0 21px;">
2122
<?php
2223
if($autoupdate == 'Enabled') {
2324
?>

‎web/templates/admin/list_user.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<div class="submenu-select-block">
2020
<form action="/bulk/user/" method="post" id="objects">
2121
<a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
22-
<select class="submenu-select-dropdown" name="action">
22+
<select name="action" class="submenu-select-dropdown">
2323
<option value=""><?php print __('apply to selected');?></option>
2424
<option value="rebuild"><?php print __('rebuild');?></option>
2525
<option value="rebuild web"><?php print __('rebuild web');?></option>

‎web/templates/header.html‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<link rel="icon" href="/images/favicon.ico" type="image/x-icon">
55
<title>Vesta - <?php echo "$TAB"; ?> </title>
66
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
7-
<link type="text/css" href="/css/main.css?ver=1413983264" rel="stylesheet" />
7+
<link type="text/css" href="/css/main.css?ver=1417643221" rel="stylesheet" />
88
<!--[if IE 7]>
99
<link rel="stylesheet" type="text/css" href="/css/ie.css" />
1010
<style type="text/css">
@@ -23,11 +23,6 @@
2323
.submenu-select-block {
2424
width:239px;
2525
}
26-
27-
.submenu-select-dropdown {
28-
position: relative;
29-
top: 2px;
30-
}
3126
</style>
3227
<![endif]-->
3328
<link type="text/css" href="/css/jquery-custom-dialogs.css" rel="stylesheet" />
@@ -177,9 +172,22 @@
177172
}
178173
}
179174
}
175+
</script>
180176

177+
<script language="JavaScript">
178+
$(document).ready(function(){
179+
$(".submenu-select-dropdown").each(function(){
180+
$(this).wrap( "<span class='submenu-select-wrapper'></span>" );
181+
$(this).after("<span class='holder'></span>");
182+
});
183+
$(".submenu-select-dropdown").change(function(){
184+
var selectedOption = $(this).find(":selected").text();
185+
$(this).next(".holder").text(selectedOption);
186+
}).trigger('change');
187+
})
181188
</script>
189+
182190
<script type="text/javascript" src="/js/app.js"></script>
183191
<script type="text/javascript" src="/js/templates.js"></script>
184192
</head>
185-
<body>
193+
<body>

0 commit comments

Comments
 (0)