Skip to content

Commit 924e277

Browse files
serghey-rodinserghey-rodin
committed
Merge branch 'master' of github.com:serghey-rodin/vesta
2 parents 2ffc02e + 183a90d commit 924e277

24 files changed

+2221
-2148
lines changed

‎web/css/main.css‎

Lines changed: 183 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Title : Vesta
33
Author : Eugen Lobicov, eugen.lobicov@gmail.com
44
55
created : November 27, 2009
6-
last updated : March 14, 2011
6+
last updated : July 10, 2011
77
- - - - - - - - - - - - - - - - - - */
88

99
html{
@@ -23,12 +23,8 @@ body{
2323
border:1px solid red;
2424
border:solid #a9aa98;
2525
border-width:0 2px;
26-
/* padding:0 0 0 10px;
27-
background:url(../images/bg-left.gif) repeat-y;*/
2826
}
2927
.outer{
30-
/* padding:0 10px 0 0;
31-
background:url(../images/bg-right.gif) repeat-y 100% 0;*/
3228
padding-bottom:58px;
3329
background:#fff url(../images/footer-bg.gif) repeat-x 0 100%;
3430
}
@@ -1076,6 +1072,11 @@ input::-moz-focus-inner{
10761072
font-size:12px;
10771073
color:#777;
10781074
}
1075+
.prop-value-collapsed-childs{
1076+
padding-right:15px;
1077+
background:url(../images/group-values-collapsed.png) no-repeat 100% 5px;
1078+
cursor:pointer;
1079+
}
10791080
.show-records{
10801081
display:inline-block;
10811082
padding-right:15px;
@@ -1094,6 +1095,36 @@ input::-moz-focus-inner{
10941095
line-height:13px;
10951096
cursor:pointer;
10961097
}
1098+
1099+
.prop-box_group-values{
1100+
display:block;
1101+
}
1102+
.prop-box_group-values .prop-title{
1103+
float: left;
1104+
margin:2px 0 0;
1105+
}
1106+
.prop-box_group-values .group-values{
1107+
float:left;
1108+
margin-left:3px;
1109+
}
1110+
.group-values .prop-value{
1111+
display:block;
1112+
}
1113+
.group-values__bullet .prop-value{
1114+
padding-left:15px;
1115+
background:url(../images/group-value-bullet.png) no-repeat 5px 8px;
1116+
}
1117+
.group-values .group-switcher{
1118+
padding-right:15px;
1119+
background:url(../images/group-values-collapsed.png) no-repeat 100% 4px;
1120+
}
1121+
.group-values .group-values-count{
1122+
font-size:12px;
1123+
font-style:italic;
1124+
color:#cdcdcd;
1125+
border-bottom:1px solid #c9cac4;
1126+
cursor:pointer;
1127+
}
10971128

10981129
.props-additional .owner-box{
10991130
padding-left:45px;
@@ -1257,7 +1288,10 @@ input::-moz-focus-inner{
12571288
margin:0 20px 0 0;
12581289
width:230px;
12591290
cursor:pointer;
1260-
}
1291+
}
1292+
.b-new-entry_dns .ttl-field{
1293+
width:75px;
1294+
}
12611295
.generate-pwd,
12621296
.context-settings{
12631297
position:relative;
@@ -1600,11 +1634,7 @@ input::-moz-focus-inner{
16001634
.domains-list .ip-adr-box .prop-box{
16011635
margin-left:20px;
16021636
}
1603-
/* .domains-list .ip-adr-box .prop-value{
1604-
padding:0;
1605-
cursor:pointer;
1606-
border-bottom:1px solid #cbcbbf;
1607-
} */
1637+
16081638
.domains-list .props-additional{
16091639
width:230px;
16101640
padding-top:0;
@@ -1676,6 +1706,107 @@ input::-moz-focus-inner{
16761706
background-color:#9fec00;
16771707
}
16781708

1709+
/* New graphs */
1710+
.stats-box{
1711+
position:relative;
1712+
margin-left:-25px;
1713+
padding-left:25px;
1714+
background:url(../images/stats-brace.png) no-repeat 0 50%;
1715+
}
1716+
.stats-box-title{
1717+
position:absolute;
1718+
top:50%;
1719+
left:-65px;
1720+
margin-top:-10px;
1721+
padding-right:25px;
1722+
text-transform:uppercase;
1723+
font-size:9px;
1724+
line-height:12px;
1725+
background:url(../images/stats-curve.png) no-repeat 100% 50%;
1726+
color:#acacac;
1727+
border-bottom:1px solid #acacac;
1728+
}
1729+
.b-usage-box2{
1730+
display:block;
1731+
margin:0 0 22px;
1732+
position:relative;
1733+
}
1734+
.b-usage-box2 .prop-title{
1735+
float:left;
1736+
margin:2px 15px 0 0;
1737+
}
1738+
.b-usage-box2 .usage-box{
1739+
float:left;
1740+
}
1741+
.b-usage-box2 .value-box{
1742+
padding-top:11px;
1743+
float:left;
1744+
width:85px;
1745+
}
1746+
.b-usage-box2 .max-size{
1747+
position:relative;
1748+
top:11px;
1749+
float:right;
1750+
padding:7px 0 0 3px;
1751+
border-left:1px solid #B7B7B9;
1752+
font-size:10px;
1753+
line-height:1;
1754+
color:#acacac;
1755+
}
1756+
.b-usage-box2 .max-size .units{
1757+
font-size:10px;
1758+
color:#acacac;
1759+
}
1760+
.b-usage-box2 .graph{
1761+
position:relative;
1762+
border:solid #b7b7b9;
1763+
border-width:1px 0 1px 1px;
1764+
font-size:0;
1765+
line-height:0;
1766+
}
1767+
.b-usage-box2 .value{
1768+
position:absolute;
1769+
top:-15px;
1770+
left:0;
1771+
z-index:10;
1772+
display:block;
1773+
white-space:nowrap;
1774+
padding:0 0 7px 3px;
1775+
font-size:11px;
1776+
line-height:1;
1777+
background:url(../images/bar-value-mark.png) no-repeat 0 100%;
1778+
color:#797979;
1779+
}
1780+
.b-usage-box2 .value-size{
1781+
padding-left:3px;
1782+
}
1783+
.b-usage-box2 .graph .bar{
1784+
position:relative;
1785+
display:block;
1786+
height:2px;
1787+
background-color:#9fec00;
1788+
}
1789+
1790+
/* Overdraft */
1791+
.b-usage-box2 .overdraft{}
1792+
1793+
.b-usage-box2 .overdraft .value{
1794+
margin-left:-1px;
1795+
color:#F00;
1796+
}
1797+
1798+
.b-usage-box2 .bar_overdraft{
1799+
position:absolute;
1800+
top:-1px;
1801+
z-index:5;
1802+
display:block;
1803+
height:2px;
1804+
border:solid #b7b7b9;
1805+
border-width:1px 0;
1806+
background:#ff9934 url(../images/overrun-border.png) no-repeat 100% 0;
1807+
}
1808+
1809+
16791810
.domains-list .disk-usage{
16801811
margin:0 0 6px;
16811812
}
@@ -1829,7 +1960,7 @@ input::-moz-focus-inner{
18291960
padding:0 3px 0 0;
18301961
}
18311962

1832-
/* Cron list
1963+
/* Users list
18331964
- - - - - - - - - - - - - - - - - - - */
18341965
.users-list{}
18351966

@@ -1841,9 +1972,11 @@ input::-moz-focus-inner{
18411972
}
18421973
.users-list .props-main{
18431974
width:345px;
1975+
width:330px;
18441976
}
18451977
.users-list .username-box{
18461978
padding-top:6px;
1979+
margin:0 0 15px;
18471980
}
18481981
.users-list .username-box .user{
18491982
position:relative;
@@ -1866,6 +1999,7 @@ input::-moz-focus-inner{
18661999

18672000
.users-list .props-additional{
18682001
width:200px;
2002+
width:225px;
18692003
}
18702004
.users-list .props-additional .prop-box,
18712005
.users-list .props-ext .prop-box{
@@ -1875,23 +2009,34 @@ input::-moz-focus-inner{
18752009
.users-list .props-additional .ns2-box{
18762010
padding-left:27px;
18772011
}
2012+
/* .users-list .ns-list-box{
2013+
padding-left:40px;
2014+
}*/
2015+
.users-list .ns-list-box .group-switcher{
2016+
padding-left:15px;
2017+
}
18782018
.users-list .props-additional .ns1-box .prop-title,
18792019
.users-list .props-additional .ns2-box .prop-title{
18802020
display: inline;
18812021
float: left;
1882-
margin: 2px 0 0 -27px;
1883-
}
2022+
margin: 2px 0 0 -27px;
2023+
}
18842024
.users-list .props-additional .ns1-box .prop-value,
18852025
.users-list .props-additional .ns2-box .prop-value{
18862026
padding:0;
18872027
}
18882028

18892029
.users-list .props-ext{
1890-
width:200px;
2030+
width:190px;
18912031
}
2032+
2033+
.users-list .db-box,
2034+
.users-list .dnsdomains-box{
2035+
margin-top:35px;
2036+
}
2037+
18922038
.username-box .prop-box{
18932039
position:relative;
1894-
/* top:6px;*/
18952040
margin:0;
18962041
}
18972042
.user-details{
@@ -1904,6 +2049,14 @@ input::-moz-focus-inner{
19042049
.user-details .user-reports{
19052050
color:#9c9c9c;
19062051
}
2052+
.user-details-box .prop-box{
2053+
margin:0 0 5px;
2054+
}
2055+
.user-details-box .user-name .prop-value,
2056+
.user-details-box .user-email{
2057+
font-style:italic;
2058+
color:#706f6b;
2059+
}
19072060

19082061
/* DB list
19092062
- - - - - - - - - - - - - - - - - - - */
@@ -2261,4 +2414,17 @@ input::-moz-focus-inner{
22612414
.users-list .suspended-row .username-box .nickname:active,
22622415
.users-list .suspended-row .user-backups-box .prop-title:active{
22632416
color:#ccc;
2264-
}
2417+
}
2418+
2419+
2420+
select{
2421+
background-color: white;
2422+
width:265px;
2423+
margin:0;
2424+
padding:6px 7px;
2425+
border:2px solid #b8c2c3;
2426+
color:#555;
2427+
font-family:Arial, Helvetica, sans-serif;
2428+
font-size:14px;
2429+
font-weight:bold;
2430+
}

‎web/js/__init__.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
$(document).ready(function(){
22
try{
33
App.Utils.detectBrowser();
4-
5-
App.Env.world = 'USER';
4+
App.Env.world = 'CRON';
65
App.Pages.init();
7-
86
App.Ref.init();
9-
7+
108
//App.View.start();
119
App.Core.listen();
1210
App.Core.initMenu();
1311
App.Helpers.liveValidate();
14-
12+
1513
}catch(e){
1614
fb.error(e);
1715
}

‎web/js/_settings.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@ App.i18n.EN = {};
33
App.i18n.EN.incorrect_ip = 'Incorrect ip';
44
App.i18n.EN.confirm = 'Are you sure?';
55
App.i18n.getMessage = function(key)
6-
{
6+
{
77
return 'undefined' != typeof App.i18n[App.Env.lang][key] ? App.i18n[App.Env.lang][key] : '';
88
}
99

1010

1111

1212
// Constants
13-
App.Constants.IP_FORM_ID = 'ip-form';
14-
App.Constants.DNS_FORM_ID = 'dns-form';
15-
App.Constants.USER_FORM_ID = 'user-form';
13+
App.Constants.IP_FORM_ID = 'ip-form';
14+
App.Constants.DNS_FORM_ID = 'dns-form';
15+
App.Constants.USER_FORM_ID = 'user-form';
16+
App.Constants.WEB_DOMAIN_FORM_ID = 'web_domain-form';
17+
App.Constants.DB_FORM_ID = 'db-form';
1618

1719
App.Settings.ajax_url = 1;
1820
App.Settings.uri = location.href.replace('index.html', '');

0 commit comments

Comments
 (0)