diff --git a/portalcautivo/login.html b/portalcautivo/login.html index 5077e29..e3fd3ac 100644 --- a/portalcautivo/login.html +++ b/portalcautivo/login.html @@ -21,40 +21,45 @@ @@ -278,67 +286,70 @@ input[type="submit"] {

Entrar con Internet

-

Si tienes un código de acceso, ingrésalo aquí:

- $(if chap-id) -
- - - - -
+

Si tienes un código de acceso, ingrésalo aquí:

+ $(if chap-id) +
+ + + + +
- - - $(endif) - - - - - -
- - - - - -
-
- - - - - - - - - - - - - -
Usuario:
Contraseña:
 
-
-
- - - $(if error)
$(error)
$(endif) -
- - + + + $(endif) + + + + + +
+ + + + + +
+
+ + + + + + + + + + + + + + + + +
Identificador:
Clave:
 
+
+
+ + + $(if error)
+
$(error)
$(endif) +
+ +
@@ -346,7 +357,7 @@ input[type="submit"] {
-

Ver contenidos Locales sin Internet

+

Ver contenidos locales sin Internet

diff --git a/portalcautivo/status.html b/portalcautivo/status.html index 2287327..912a74b 100644 --- a/portalcautivo/status.html +++ b/portalcautivo/status.html @@ -1,144 +1,185 @@ + -RedINC> estado -$(if refresh-timeout) - -$(endif) - - - - - + --> + + - + + - +
- - - - - +
- -
-
- -$(if login-by == 'trial') -
BienvenidX!

-$(elif login-by != 'mac') -
BienvenidX! $(username)!

-$(endif) - - -$(if session-time-left) - -$(else) - -$(endif) -$(if blocked == 'yes') - -$(elif refresh-timeout) - -$(endif) + + + + + -
IP address:$(ip)
bytes subida/descarga:$(bytes-in-nice) / $(bytes-out-nice)
conectado / left:$(uptime) / $(session-time-left)
conectado:$(uptime)
status:
-advertisement required
status refresh:$(refresh-timeout)
+ +
+ + + $(if login-by == 'trial') +
+
BienvenidX!

$(elif login-by != 'mac') +
+
BienvenidX! $(username)!

$(endif) + + + + + + + + + $(if session-time-left) + + + + + $(else) + + + + + $(endif) $(if blocked == 'yes') + + + + $(elif refresh-timeout) + + + + $(endif) -
IP address:$(ip)
bytes subida/descarga:$(bytes-in-nice) / $(bytes-out-nice)
conectado / left:$(uptime) / $(session-time-left)
conectado:$(uptime)
status: +
+ advertisement required
+
status refresh:$(refresh-timeout)
-$(if login-by-mac != 'yes') -
- - -$(endif) - + $(endif) + -
+
+ diff --git a/weblocal/libs/css/master.css b/weblocal/libs/css/master.css index 3c51c7a..e3a638d 100644 --- a/weblocal/libs/css/master.css +++ b/weblocal/libs/css/master.css @@ -23,8 +23,9 @@ h3 { } .btn-default { - border-color: #cccccc2b; + border-color: #cccccc2b; } + .boton_chat>.btn-lg { padding: 15px 30px; font-size: 20px; diff --git a/weblocal/libs/css/style.css b/weblocal/libs/css/style.css index 69d8f38..56637d0 100644 --- a/weblocal/libs/css/style.css +++ b/weblocal/libs/css/style.css @@ -3,47 +3,48 @@ padding: 0; } */ - fieldset.fieldset-borde { - border: 2px solid #EDEDED !important; - border-radius:3px; - padding: 0 1.4em 1.4em 1.4em !important; - margin: 0 0 1.5em 0 !important; - -webkit-box-shadow: 0px 0px 0px 0px #000; - box-shadow: 0px 0px 0px 0px #000; +fieldset.fieldset-borde { + border: 2px solid #EDEDED !important; + border-radius: 3px; + padding: 0 1.4em 1.4em 1.4em !important; + margin: 0 0 1.5em 0 !important; + -webkit-box-shadow: 0px 0px 0px 0px #000; + box-shadow: 0px 0px 0px 0px #000; +} + +legend.legend-area { + font-size: 1.2em !important; + font-weight: bold !important; + text-align: left !important; + width: auto; + padding: 0 10px; + border-bottom: none; } - legend.legend-area { - font-size: 1.2em !important; - font-weight: bold !important; - text-align: left !important; - width:auto; - padding:0 10px; - border-bottom:none; - } - body { - background: #222; - font-family: Georgia, serif; - color: #fff; - font-size: 14px; + background: #222; + font-family: Georgia, serif; + color: #fff; + font-size: 14px; } #dates a { - color: gray; - text-decoration: none; - -webkit-transition: 0.5s; - -moz-transition: 0.5s; - -o-transition: 0.5s; - -ms-transition: 0.5s; - transition: 0.5s; - font-size: 12px; + color: gray; + text-decoration: none; + -webkit-transition: 0.5s; + -moz-transition: 0.5s; + -o-transition: 0.5s; + -ms-transition: 0.5s; + transition: 0.5s; + font-size: 12px; } -#dates a:hover, -#dates a.selected { - color: red; - font-size: 18px; - } + +#dates a:hover, #dates a.selected { + color: red; + font-size: 18px; +} + /* h1,h2,h4,h5,h6 { text-align: center; @@ -62,130 +63,142 @@ h1,h2,h4,h5,h6 { margin-bottom: 20px; } */ - #timeline { - width: 95%; - height: 500px; - overflow: hidden; - margin: 100px auto; - position: relative; - } - #dates { - width: 800px; - height: 60px; - overflow: hidden; - background: url('timeline/dot.gif') left 45px repeat-x; - } - #dates li { - list-style: none; - float: left; - width: 100px; - height: 50px; - font-size: 24px; - text-align: center; - background: url('timeline/biggerdot.png') center bottom no-repeat; - } - #dates a { - line-height: 18px; - padding-bottom: 10px; - } - #dates .selected { - font-size: 18px; - } - - #issues { - width: 800px; - height: 500px; - overflow: hidden; - } - #issues li { - width: 900px; - height: 500px; - list-style: none; - float: left; - } - #issues li.selected img { - -webkit-transform: scale(1.1,1.1); - -moz-transform: scale(1.1,1.1); - -o-transform: scale(1.1,1.1); - -ms-transform: scale(1.1,1.1); - transform: scale(1.1,1.1); - } - #issues li img { - float: left; - margin: 10px 30px 10px 50px; - background: transparent; - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF)"; /* IE 8 */ - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF);/* IE 6 & 7 */ - zoom: 1; - -webkit-transition: all 2s ease-in-out; - -moz-transition: all 2s ease-in-out; - -o-transition: all 2s ease-in-out; - -ms-transition: all 2s ease-in-out; - transition: all 2s ease-in-out; - -webkit-transform: scale(0.7,0.7); - -moz-transform: scale(0.7,0.7); - -o-transform: scale(0.7,0.7); - -ms-transform: scale(0.7,0.7); - transform: scale(0.7,0.7); - } - #issues li h1 { - - font-size: 48px; - margin: 20px 0; - color: red; - /*text-shadow: #000 1px 1px 2px;*/ - } - #issues li p { - font-size: 14px; - margin-right: 70px; - font-weight: normal; - line-height: 22px; - /* text-shadow: #000 1px 1px 2px;*/ - } - - #grad_left, - #grad_right { - width: 100px; - height: 500px; - position: absolute; - top: 0; - } - #grad_left { - left: 0; - /* background: url('timeline/grad_left.png') repeat-y;*/ - } - #grad_right { - right: 0; - /* background: url('timeline/grad_right.png') repeat-y;*/ - } - - #next, - #prev { - position: absolute; - top: 0; - font-size: 70px; - top: 170px; - width: 22px; - height: 38px; - background-position: 0 0; - background-repeat: no-repeat; - text-indent: -9999px; - overflow: hidden; - } - #next:hover, - #prev:hover { - background-position: 0 -76px; - } - #next { - right: 0; - background-image: url('timeline/next.png'); - } - #prev { - left: 0; - background-image: url('timeline/prev.png'); - } - #next.disabled, - #prev.disabled { - opacity: 0.2; - } \ No newline at end of file +#timeline { + width: 95%; + height: 500px; + overflow: hidden; + margin: 100px auto; + position: relative; +} + +#dates { + width: 800px; + height: 60px; + overflow: hidden; + background: url('timeline/dot.gif') left 45px repeat-x; +} + +#dates li { + list-style: none; + float: left; + width: 100px; + height: 50px; + font-size: 24px; + text-align: center; + background: url('timeline/biggerdot.png') center bottom no-repeat; +} + +#dates a { + line-height: 18px; + padding-bottom: 10px; +} + +#dates .selected { + font-size: 18px; +} + +#issues { + width: 800px; + height: 500px; + overflow: hidden; +} + +#issues li { + width: 900px; + height: 500px; + list-style: none; + float: left; +} + +#issues li.selected img { + -webkit-transform: scale(1.1, 1.1); + -moz-transform: scale(1.1, 1.1); + -o-transform: scale(1.1, 1.1); + -ms-transform: scale(1.1, 1.1); + transform: scale(1.1, 1.1); +} + +#issues li img { + float: left; + margin: 10px 30px 10px 50px; + background: transparent; + -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF)"; + /* IE 8 */ + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF, endColorstr=#00FFFFFF); + /* IE 6 & 7 */ + zoom: 1; + -webkit-transition: all 2s ease-in-out; + -moz-transition: all 2s ease-in-out; + -o-transition: all 2s ease-in-out; + -ms-transition: all 2s ease-in-out; + transition: all 2s ease-in-out; + -webkit-transform: scale(0.7, 0.7); + -moz-transform: scale(0.7, 0.7); + -o-transform: scale(0.7, 0.7); + -ms-transform: scale(0.7, 0.7); + transform: scale(0.7, 0.7); +} + +#issues li h1 { + font-size: 48px; + margin: 20px 0; + color: red; + /*text-shadow: #000 1px 1px 2px;*/ +} + +#issues li p { + font-size: 14px; + margin-right: 70px; + font-weight: normal; + line-height: 22px; + /* text-shadow: #000 1px 1px 2px;*/ +} + +#grad_left, #grad_right { + width: 100px; + height: 500px; + position: absolute; + top: 0; +} + +#grad_left { + left: 0; + /* background: url('timeline/grad_left.png') repeat-y;*/ +} + +#grad_right { + right: 0; + /* background: url('timeline/grad_right.png') repeat-y;*/ +} + +#next, #prev { + position: absolute; + top: 0; + font-size: 70px; + top: 170px; + width: 22px; + height: 38px; + background-position: 0 0; + background-repeat: no-repeat; + text-indent: -9999px; + overflow: hidden; +} + +#next:hover, #prev:hover { + background-position: 0 -76px; +} + +#next { + right: 0; + background-image: url('timeline/next.png'); +} + +#prev { + left: 0; + background-image: url('timeline/prev.png'); +} + +#next.disabled, #prev.disabled { + opacity: 0.2; +}