Index: trunk/webapp/static/css/style.css =================================================================== diff --git a/trunk/webapp/static/css/style.css b/trunk/webapp/static/css/style.css --- a/trunk/webapp/static/css/style.css (revision 153) +++ b/trunk/webapp/static/css/style.css (revision 154) @@ -43,23 +43,34 @@ /******** FORMULARIO DE PERFILES *************************************/ /****************************************************************************************/ #divProfile { border: 0px solid #dff; margin: 10px 0px; padding: 10px 10px; width: 500px } -.flsAntenna { margin: 10px 0px; width: 750px; padding: 10px 10px } +.flsAntenna { margin: 0; width: 750px; padding: 5px } #divPattern textarea,input[type=text],label{ font-family: "Open Sans"; font-size: inherit; } - #divPattern textarea {resize: none; overflow: hidden} - -.divAntenna { float: left; margin: 10px; height: 160px; border: 0px solid #fcc !important; width: 260px } +.antenna{ border: 1px solid #1494F6 !important; padding: 5px} +.infoAntenna{ border: 0px solid #f00 !important; width: 480px; float: left} +.overJRO{ border: 0px solid #1cc !important; width: 250px; float: left; margin: 0px 5px} +.divAntenna { float: left; margin: 10px; border: 0px solid #fcc !important; width: 190px } .divAntenna label{ display: block } -.txtAntenna { width: 250px; max-width: 250px; height: 135px; max-height: 140px; } -.divAntenna p{ width: 250px; max-width: 250px; height: 130px; max-height: 130px; border: 1px solid #eee !important} +.txtAntenna { width: 175px; max-width: 180px; height: 160px; max-height: 165px; background: #fdfdfb; padding: 4px; + border: 2px solid #eee !important; /*font-family: "Ubuntu"; font-size: inherit;*/ + text-align: justify; margin: 0 auto; line-height: 20px} +.divAntenna p{ width: 175px; max-width: 180px; height: 160px; max-height: 165px; background: #fdfdfb; padding: 2px; + border: 1px solid #eee !important; font-family: "Ubuntu"; font-size: inherit; + text-align: justify; margin: 0 auto; line-height: 20px} .divTx { display: block; float: left; margin: 10px; height: 150px } .divTx label{ display: block } .divTx textarea{ width: 135px; max-width: 135px; height: 135px; max-height: 140px; text-align: justify } -.divTx p{ width: 135px; max-width: 135px; height: 130px; max-height: 130px; text-align: justify } +.divTx p{ width: 100px; max-width: 105px; height: 160px; max-height: 165px; background: #fdfdfb; padding: 2px; + border: 1px solid #eee !important; font-family: "Ubuntu"; font-size: inherit; + text-align: justify; margin: 0 auto; line-height: 20px;} .divUes { display: block; margin: 10px} -.divUes input[type=text] { width: 240px; max-width: 240px;} +.divUes input[type=text] { width: 240px; max-width: 240px; font-family: "Ubuntu"; font-size: inherit;} + +.overJRO img{width: 200; height: 145px; text-align: center; vertical-align: middle; margin: 25px 5px 5px 5px; + display: block; background: #fdfdfb; border: 1px solid #eee !important;} +.overJRO a{ text-align: center; margin: 0 auto; display: block} /****************************************************************************************/ /****** MENU DE NAVEGACION DE PATRONES **********************************/ Index: trunk/webapp/static/js/profiles.js =================================================================== diff --git a/trunk/webapp/static/js/profiles.js b/trunk/webapp/static/js/profiles.js --- a/trunk/webapp/static/js/profiles.js (revision 153) +++ b/trunk/webapp/static/js/profiles.js (revision 154) @@ -9,4 +9,7 @@ location.href="/abscontrol/view/" + $(this).val(); } }); + $('.activeOverJRO').click(function() { + alert("OverJRO"); + }); }); \ No newline at end of file Index: trunk/webapp/templates/abscontrol/new.html =================================================================== diff --git a/trunk/webapp/templates/abscontrol/new.html b/trunk/webapp/templates/abscontrol/new.html --- a/trunk/webapp/templates/abscontrol/new.html (revision 153) +++ b/trunk/webapp/templates/abscontrol/new.html (revision 154) @@ -29,6 +29,8 @@
+ +
@@ -51,6 +53,8 @@
+ +
Index: trunk/webapp/templates/abscontrol/view.html =================================================================== diff --git a/trunk/webapp/templates/abscontrol/view.html b/trunk/webapp/templates/abscontrol/view.html --- a/trunk/webapp/templates/abscontrol/view.html (revision 153) +++ b/trunk/webapp/templates/abscontrol/view.html (revision 154) @@ -24,48 +24,74 @@ {% endif %} -
+
UP -
- -

{{ antennaUp.value }}

+
+
+ +

{{ antennaUp.value }}

+
+
+ +

{{ antennaUp.tx }}

+
+
+ +

{{ antennaUp.rx }}

+
+
+
+ + + {% if antennaUp.only_rx == 0 %} + + {% else %} + + {% endif %} + +
-
- -

{{ antennaUp.tx }}

-
-
- -

{{ antennaUp.rx }}

+
+ + Preview
-
- - -
-
+
DOWN -
- -

{{ antennaDown.value }}

+
+
+ +

{{ antennaDown.value }}

+
+
+ +

{{ antennaDown.tx }}

+
+
+ +

{{ antennaDown.rx }}

+
+
+
+ + + {% if antennaDown.only_rx == 0 %} + + {% else %} + + {% endif %} + +
-
- -

{{ antennaDown.tx }}

-
-
- -

{{ antennaDown.rx }}

+
+ + Preview
-
- - -