ABS/abscontrol Commit - r153:154 · Jicamarca Repository

- Iniciando el desarrollo de la comunicacion con OverJRO.

jsalyrosas -

r153:154

parent child

Context file:

r153:154

Collapse all files

trunk/webapp/static/css/style.css +19 -8

             /*
              * font-family: 'Droid Sans', sans-serif;
              * font-family: 'Ubuntu', sans-serif;
              * font-family: 'Open Sans', sans-serif;
              * font-family: 'Open Sans Condensed', sans-serif;
              * font-family: 'Roboto Condensed', sans-serif;
              */
             body { font-size: 12px; }
             header {border: 1px solid #fcc; font-size: 2em; height: 50px; text-align: center; line-height: 50px}
             #schema {margin: 0 auto; width: 980px; border: 1px solid #f00; padding: 10px 10px 10px 10px}
             #content {border: 1px solid #1cc; margin-top: 5px; margin-bottom: 5px}
             #content #leftcolumn {float: left;border: 1px solid #c55; width: 150px; }
             #content #maincolumn {float: left; border: 1px solid #000; width: 800px; padding-left: 20px;}
             footer {border: 1px solid #200; font-size: 0.9em; height: 30px; text-align: center; line-height: 20px}
             .cleardivs {clear: both; border: 0px solid #400; height: 0px}
             /****************************************************************************************/
             /******                     ESTILOS GENERALES                           *****************/
             /****************************************************************************************/
             .mnu{ height: 22px; border: 0px solid #c55 !important;}
             .mnu li{ display:inline;}
             .MnuVertical, .MnuHorizontal { font-family: 'Droid Sans', sans-serif; font-size: 1.2em; font-style: italic; text-shadow: 2px 2px #eee}
             .MnuHorizontal ul{ list-style: none; list-style-type: none; margin: 0;}
             /*.MnuHorizontal{ display: -webkit-box; -webkit-box-orient:horizontal;}*/
             /*.MnuHorizontal a{ display:block; padding:10px; -webkit-box-flex:1; text-align:center; }*/
             /****************************************************************************************/
             /******                 MENU DE NAVEGACION DE PERFILES **********************************/
             /****************************************************************************************/
             #content #infoProfiles {border: 1px solid #d00 !important; width: 140px; margin: 0px; padding-top: 2px; padding-bottom: 2px}
             .lblInfo {padding-left: 12px; line-height: 20px;}
             #infoProfiles select {padding-left: 12px; line-height: 20px;margin-left: 12px}
             #content nav {border: 0px solid #c55 !important; margin: 0px;}
             #leftcolumn #mnuProfiles{ margin: 5px 0px; border: 0px solid #1494F6 !important; }
             #mnuProfiles ul{list-style: none; list-style-type: none; margin: 0; padding-left: 20px; border: 0px solid #f00 !important}
             #mnuProfiles li{ width: 80px; padding: 2px; border: 0px solid #c55 !important; line-height: 22px}
             #mnuProfiles a{ font-weight: normal; color: #1494F6; display: block; border: 0px solid #1cc !important; text-align: left}
             /****************************************************************************************/
             /********               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}
+            .antenna{ border: 1px solid #1494F6 !important; padding: 5px}
-            .divAntenna { float: left; margin: 10px; height: 160px; border: 0px solid #fcc !important; width: 260px }
+            .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; }
+            .txtAntenna { width: 175px; max-width: 180px; height: 160px; max-height: 165px; background: #fdfdfb; padding: 4px;
-            .divAntenna p{ width: 250px; max-width: 250px; height: 130px; max-height: 130px; border: 1px solid #eee !important}
+                          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 **********************************/
             /****************************************************************************************/
             #divMnuPattern{ width: 280px; height: 25px; display: block; border: 0px solid #1cc !important; float: left; margin-left: 500px}
             #divMnuPattern li{ float: left; display: block; width: 60px; border: 0px solid #2cc !important}
             #divMnuPattern a{ display: block; line-height: 22px; text-decoration: none; padding: 0px 5px;
                               border-bottom: 1px solid #1494F6 !important; margin: 0px 2px; text-align: center; color: #1494F6
                             }
             #infoPattern{ display: block; border: 1px solid #1494f6 !important, margin: 5px 2px; }
             #navPatterns{ margin: 10px auto; border: 0px solid #d00 !important; width: 500px; height: 30px; font-family: 'Ubuntu', sans-serif; font-size: 14px;
                           padding: 10px 0px}
             #navPatternList{ margin: 0px auto; border: 1px solid #ecc !important}
             #navPatternList ul{ list-style: none; list-style-type: none; margin: 0;}
             #navPatternList ul li{ float: left; width: 50px; border: 1px solid #eee !important; }
             #navPatternList a{ width: 50px; border: 0px solid #1cc !important; display: block; text-align: center; line-height: 25px}
             .lnkPattern{ background-color: #ccc !important; color: #eee;}
             .lnkPatternSelected{ background-color: #2cc !important; color: #fff;}
             .divListofPatterns{ width: 650px; display: block; border: 1px solid #1cc !important; margin: 0 auto}
             .divPattern{ width: 600px; display: block; border: 1px solid #f00 !important; margin: 2px auto; }

trunk/webapp/static/js/profiles.js +3 0

             /**
              * @author Jose Antonio Sal y Rosas Celi
              * @contact: jose.salyrosas@jro.igp.gob.pe, arturo.jasyrc@gmail.com
              */
             $(document).on('ready',function(){
                 $('#listProfiles').change(function() {
                     if($(this).val() != -1){
                         location.href="/abscontrol/view/" + $(this).val();
                     }
                 });
+                $('.activeOverJRO').click(function() {
+                    alert("OverJRO");
+                });
             });

trunk/webapp/templates/abscontrol/new.html +4 0

             {% extends "abscontrol/index.html" %}
             {% block title %}ABS CONTROL:::::NEW PROFILE{% endblock %}
             {% block maincolumn%}
             <div id="maincolumn">
                 <form action="/abscontrol/save/" method="post">
                 <div id="divProfile">
                     <label for="lblName">Profile:</label>
                     <input type="text" name="txtProfile" id="" value="" />
                     <input type="submit" value="Save" />
                 </div>
                 <div id="divPattern">
                     <div id="antennaUp">
                         <fieldset class="flsAntenna">
                             <legend>UP</legend>
                             <div class="divAntenna">
                                 <label for="lblAntenna">Antenna</label>
                                 <textarea name="txtAntennaUp" class="txtAntenna" cols="38" rows="8">{{ txtAntenna }}</textarea>
                             </div>
                             <div class="divTx">
                                 <label for="lblTx">Tx</label>
                                 <textarea name="txtTxUp" class="txtTR" cols="20" rows="8">{{ txtTxUp }}</textarea>
                             </div>
                             <div class="divTx">
                                 <label for="lblRx">Rx</label>
                                 <textarea name="txtRxUp" class="txtTR" cols="20" rows="8">{{ txtRxUp }}</textarea>
                             </div>
                             <div class="cleardivs"></div>
                             <div class="divUes">
                                 <label for="lblUes">Ues:</label>
                                 <input type="text" name="txtUesUp" value="{{ txtUes }}" />
+                                <input type="checkbox" name="chkOnlyRxUp" value="" />
+                                <label for="lblOnlyRx">Only RX</label>
                             </div>
                         </fieldset>
                     </div>
                     <div id="antennaDown">
                         <fieldset class="flsAntenna">
                             <legend>DOWN</legend>
                             <div class="divAntenna">
                                 <label for="lblAntenna">Antenna</label>
                                 <textarea name="txtAntennaDown" class="txtAntenna" cols="38" rows="8">{{ txtAntenna }}</textarea>
                             </div>
                             <div class="divTx">
                                 <label for="lblTx">Tx</label>
                                 <textarea name="txtTxDown" class="txtTR" cols="20" rows="8">{{ txtTxDown }}</textarea>
                             </div>
                             <div class="divTx">
                                 <label for="lblRx">Rx</label>
                                 <textarea name="txtRxDown" class="txtTR" cols="20" rows="8">{{ txtRxDown }}</textarea>
                             </div>
                             <div class="cleardivs"></div>
                             <div class="divUes">
                                 <label for="lblUes">Ues:</label>
                                 <input type="text" name="txtUesDown" value="{{ txtUes }}" />
+                                <input type="checkbox" name="chkOnlyRxDown" value="" />
+                                <label for="lblOnlyRx">Only RX</label>
                             </div>
                         </fieldset>
                     </div>
                 </div>
                 </form>
             </div>
             {% endblock %}

trunk/webapp/templates/abscontrol/view.html +56 -30

@@ -1,74 +1,100
1	{% extends "abscontrol/index.html" %}	1	{% extends "abscontrol/index.html" %}
2	{% block title %}ABS CONTROL:::PROFILE:::{{ objProfile.name }}{% endblock %}	2	{% block title %}ABS CONTROL:::PROFILE:::{{ objProfile.name }}{% endblock %}
3		3
4	{% block maincolumn%}	4	{% block maincolumn%}
5	<div id="maincolumn">	5	<div id="maincolumn">
6	<div id="divProfile">	6	<div id="divProfile">
7	<label for="lblName">Profile:</label>	7	<label for="lblName">Profile:</label>
8	<label for="lblProfile">{{ objProfile.name }}</label>	8	<label for="lblProfile">{{ objProfile.name }}</label>
9	</div>	9	</div>
10	<div id="divPattern">	10	<div id="divPattern">
11	<div id="infoPattern">	11	<div id="infoPattern">
12	{% if patternChoosen %}	12	{% if patternChoosen %}
13	<div id="navPatterns">	13	<div id="navPatterns">
14	<nav class="" id="navPatternList">	14	<nav class="" id="navPatternList">
15	<ul>	15	<ul>
16	{% for element in lsPatterns %}	16	{% for element in lsPatterns %}
17	{% if patternChoosen.id == element.id %}	17	{% if patternChoosen.id == element.id %}
18	<li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}" class="lnkPatternSelected">{{ element.value }}</a></li>	18	<li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}" class="lnkPatternSelected">{{ element.value }}</a></li>
19	{% else %}	19	{% else %}
20	<li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}" class="lnkPattern">{{ element.value }}</a></li>	20	<li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}" class="lnkPattern">{{ element.value }}</a></li>
21	{% endif %}	21	{% endif %}
22	{% endfor %}	22	{% endfor %}
23	</ul>	23	</ul>
24	</nav>	24	</nav>
25	</div>	25	</div>
26	{% endif %}	26	{% endif %}
27	<div id="antennaUp">	27	<div id="antennaUp" class="antenna">
28	<fieldset class="flsAntenna">	28	<fieldset class="flsAntenna">
29	<legend>UP</legend>	29	<legend>UP</legend>
30	<div class="~~div~~Antenna">	30	<div class="infoAntenna">
31	<~~label~~ ~~for~~="~~lbl~~Antenna">~~Antenna~~</~~label~~>	31	<div class="divAntenna">
32	<p>{{ antennaUp.value }}</p>	32	<label for="lblAntenna">Antenna</label>
		33	<p>{{ antennaUp.value }}</p>
		34	</div>
		35	<div class="divTx">
		36	<label for="lblTx">Tx</label>
		37	<p>{{ antennaUp.tx }}</p>
		38	</div>
		39	<div class="divTx">
		40	<label for="lblRx">Rx</label>
		41	<p>{{ antennaUp.rx }}</p>
		42	</div>
		43	<div class="cleardivs"></div>
		44	<div class="divUes">
		45	<label for="lblUes">Ues:</label>
		46	<label for="lblAntennaUpUes">{{ antennaUp.ues }}</label>
		47	{% if antennaUp.only_rx == 0 %}
		48	<input type="checkbox" name="chkOnlyRxUp" value="" />
		49	{% else %}
		50	<input type="checkbox" name="chkOnlyRxUp" value="" checked="checked"/>
		51	{% endif %}
		52	<label for="lblOnlyRx">Only RX</label>
		53	</div>
33	</div>	54	</div>
34	<div class="~~divTx~~">	55	<div class="overJRO">
35	<~~label~~ ~~for~~=~~"lblTx"~~>Tx</~~label~~>	56	<img />
36	<p>{{ antennaUp.tx }}</p>	57	<a href="#" class="activeOverJRO" id="patternChoosen.id">Preview</a>
37	</div>
38	<div class="divTx">
39	<label for="lblRx">Rx</label>
40	<p>{{ antennaUp.rx }}</p>
41	</div>	58	</div>
42	<div class="cleardivs"></div>	59	<div class="cleardivs"></div>
43	<div class="divUes">
44	<label for="lblUes">Ues:</label>
45	<label for="lblAntennaUpUes">{{ antennaUp.ues }}</label>
46	</div>
47	</fieldset>	60	</fieldset>
48	</div>	61	</div>
49	<div id="antennaDown">	62	<div id="antennaDown" class="antenna">
50	<fieldset class="flsAntenna">	63	<fieldset class="flsAntenna">
51	<legend>DOWN</legend>	64	<legend>DOWN</legend>
52	<div class="~~div~~Antenna">	65	<div class="infoAntenna">
53	<~~label~~ ~~for~~="~~lbl~~Antenna">~~Antenna~~</~~label~~>	66	<div class="divAntenna">
54	<p>{{ antennaDown.value }}</p>	67	<label for="lblAntenna">Antenna</label>
		68	<p>{{ antennaDown.value }}</p>
		69	</div>
		70	<div class="divTx">
		71	<label for="lblTx">Tx</label>
		72	<p>{{ antennaDown.tx }}</p>
		73	</div>
		74	<div class="divTx">
		75	<label for="lblRx">Rx</label>
		76	<p>{{ antennaDown.rx }}</p>
		77	</div>
		78	<div class="cleardivs"></div>
		79	<div class="divUes">
		80	<label for="lblUes">Ues:</label>
		81	<label for="lblAntennaDownUes">{{ antennaDown.ues }}</label>
		82	{% if antennaDown.only_rx == 0 %}
		83	<input type="checkbox" name="chkOnlyRxDown" value="" />
		84	{% else %}
		85	<input type="checkbox" name="chkOnlyRxDown" value="" checked="checked"/>
		86	{% endif %}
		87	<label for="lblOnlyRx">Only RX</label>
		88	</div>
55	</div>	89	</div>
56	<div class="~~divTx~~">	90	<div class="overJRO">
57	<~~label~~ ~~for~~=~~"lblTx"~~>Tx</~~label~~>	91	<img />
58	<p>{{ antennaDown.tx }}</p>	92	<a href="#" class="activeOverJRO" id="{{ patternChoosen.id }}">Preview</a>
59	</div>
60	<div class="divTx">
61	<label for="lblRx">Rx</label>
62	<p>{{ antennaDown.rx }}</p>
63	</div>	93	</div>
64	<div class="cleardivs"></div>	94	<div class="cleardivs"></div>
65	<div class="divUes">
66	<label for="lblUes">Ues:</label>
67	<label for="lblAntennaDownUes">{{ antennaDown.ues }}</label>
68	</div>
69	</fieldset>	95	</fieldset>
70	</div>	96	</div>
71	</div>	97	</div>
72	</div>	98	</div>
73	</div>	99	</div>
74	{% endblock %}	100	{% endblock %}

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages