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 -7

             /*
              * 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;
              */
   No newline at end of file
             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}
   No newline at end of file
             .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;}
   No newline at end of file
             /*.MnuHorizontal{ display: -webkit-box; -webkit-box-orient:horizontal;}*/
             /*.MnuHorizontal a{ display:block; padding:10px; -webkit-box-flex:1; text-align:center; }*/
   No newline at end of file
             /****************************************************************************************/
             /******                 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;}
   No newline at end of file
             #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}
   No newline at end of file
             /****************************************************************************************/
             /********               FORMULARIO DE PERFILES      *************************************/
             /****************************************************************************************/
             #divProfile { border: 0px solid #dff; margin: 10px 0px; padding: 10px 10px; width: 500px }
             .flsAntenna { margin: 0; width: 750px; padding: 5px }
  No newline at end of file
-            .flsAntenna { margin: 10px 0px; width: 750px; padding: 10px 10px }
  No newline at end of file
             #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}
             .infoAntenna{ border: 0px solid #f00 !important; width: 480px; float: left}
              No newline at end of file
             .overJRO{ border: 0px solid #1cc !important; width: 250px; float: left; margin: 0px 5px}
-            .divAntenna { float: left; margin: 10px; height: 160px; border: 0px solid #fcc !important; width: 260px }
  No newline at end of file
+             No newline at end of file
+            .divAntenna { float: left; margin: 10px; border: 0px solid #fcc !important; width: 190px }
              No newline at end of file
+            .divAntenna label{ display: block }
  No newline at end of file
             .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;*/
-            .txtAntenna { width: 250px; max-width: 250px; height: 135px; max-height: 140px; }
+             No newline at end of file
                           text-align: justify; margin: 0 auto; line-height: 20px}
-            .divAntenna p{ width: 250px; max-width: 250px; height: 130px; max-height: 130px; border: 1px solid #eee !important}
  No newline at end of file
+             No newline at end of file
+            .divAntenna p{ width: 175px; max-width: 180px; height: 160px; max-height: 165px; background: #fdfdfb; padding: 2px;
              No newline at end of file
+                           border: 1px solid #eee !important; font-family: "Ubuntu"; font-size: inherit;
              No newline at end of file
+                           text-align: justify; margin: 0 auto; line-height: 20px}
              No newline at end of file
+  No newline at end of file
             .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: 100px; max-width: 105px; height: 160px; max-height: 165px; background: #fdfdfb; padding: 2px;
                       border: 1px solid #eee !important; font-family: "Ubuntu"; font-size: inherit;
-            .divTx p{ width: 135px; max-width: 135px; height: 130px; max-height: 130px; text-align: justify }
  No newline at end of file
+             No newline at end of file
+                      text-align: justify; margin: 0 auto; line-height: 20px;}
              No newline at end of file
+  No newline at end of file
             .divUes { display: block; margin: 10px}
             .divUes input[type=text] { width: 240px; max-width: 240px; font-family: "Ubuntu"; font-size: inherit;}
              No newline at end of file
-            .divUes input[type=text] { width: 240px; max-width: 240px;}
  No newline at end of file
+             No newline at end of file
+            .overJRO img{width: 200; height: 145px; text-align: center; vertical-align: middle; margin: 25px 5px 5px 5px;
              No newline at end of file
+                         display: block; background: #fdfdfb; border: 1px solid #eee !important;}
              No newline at end of file
+            .overJRO a{ text-align: center; margin: 0 auto; display: block}
              No newline at end of file
+  No newline at end of file
             /****************************************************************************************/
             /******                 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; }
             #infoPattern{ display: block; border: 1px solid #1494f6 !important, margin: 5px 2px; }
  No newline at end of file
             #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;}
             .lnkPatternSelected{ background-color: #2cc !important; color: #fff;}
  No newline at end of file
             .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; }
             .divPattern{ width: 600px; display: block; border: 1px solid #f00 !important; margin: 2px auto; }
  No newline at end of file
   No newline at end of file

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
              */
   No newline at end of file
             $(document).on('ready',function(){
                 $('#listProfiles').change(function() {
                     if($(this).val() != -1){
                         location.href="/abscontrol/view/" + $(this).val();
                     }
                 });
+                $('.activeOverJRO').click(function() {
              No newline at end of file
+                    alert("OverJRO");
  No newline at end of file
                 });
+            });
  No newline at end of file

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

             {% extends "abscontrol/index.html" %}
             {% block title %}ABS CONTROL:::::NEW PROFILE{% endblock %}
   No newline at end of file
             {% 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="" />
              No newline at end of file
+                                <label for="lblOnlyRx">Only RX</label>
  No newline at end of file
                             </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="" />
              No newline at end of file
+                                <label for="lblOnlyRx">Only RX</label>
  No newline at end of file
                             </div>
                         </fieldset>
                     </div>
                 </div>
                 </form>
             </div>
             {% endblock %}

trunk/webapp/templates/abscontrol/view.html +28 -2

             {% extends "abscontrol/index.html" %}
             {% block title %}ABS CONTROL:::PROFILE:::{{ objProfile.name }}{% endblock %}
   No newline at end of file
             {% block maincolumn%}
             <div id="maincolumn">
                 <div id="divProfile">
                     <label for="lblName">Profile:</label>
                     <label for="lblProfile">{{ objProfile.name }}</label>
                 </div>
                 <div id="divPattern">
                     <div id="infoPattern">
                         {% if patternChoosen %}
                         <div id="navPatterns">
                             <nav class="" id="navPatternList">
                                 <ul>
                             {% for element in lsPatterns %}
                                 {% if patternChoosen.id == element.id %}
                                 <li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}" class="lnkPatternSelected">{{ element.value }}</a></li>
                                 {% else %}
                                 <li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}" class="lnkPattern">{{ element.value }}</a></li>
                                 {% endif %}
                             {% endfor %}
                                 </ul>
                             </nav>
                         </div>
                         {% endif %}
                         <div id="antennaUp" class="antenna">
  No newline at end of file
-                        <div id="antennaUp">
  No newline at end of file
                             <fieldset class="flsAntenna">
                                 <legend>UP</legend>
+                                <div class="infoAntenna">
  No newline at end of file
                                     <div class="divAntenna">
                                         <label for="lblAntenna">Antenna</label>
                                         <p>{{ antennaUp.value }}</p>
                                     </div>
                                     <div class="divTx">
                                         <label for="lblTx">Tx</label>
                                         <p>{{ antennaUp.tx }}</p>
                                     </div>
                                     <div class="divTx">
                                         <label for="lblRx">Rx</label>
                                         <p>{{ antennaUp.rx }}</p>
                                     </div>
                                     <div class="cleardivs"></div>
                                     <div class="divUes">
                                         <label for="lblUes">Ues:</label>
                                         <label for="lblAntennaUpUes">{{ antennaUp.ues }}</label>
+                                        {% if antennaUp.only_rx == 0 %}
              No newline at end of file
+                                        <input type="checkbox" name="chkOnlyRxUp" value="" />
              No newline at end of file
+                                        {% else %}
              No newline at end of file
+                                        <input type="checkbox" name="chkOnlyRxUp" value="" checked="checked"/>
              No newline at end of file
+                                        {% endif %}
              No newline at end of file
+                                        <label for="lblOnlyRx">Only RX</label>
  No newline at end of file
                                     </div>
+                                </div>
              No newline at end of file
+                                <div class="overJRO">
              No newline at end of file
+                                    <img />
              No newline at end of file
+                                    <a href="#" class="activeOverJRO" id="patternChoosen.id">Preview</a>
              No newline at end of file
+                                </div>
              No newline at end of file
+                                <div class="cleardivs"></div>
  No newline at end of file
                             </fieldset>
                         </div>
                         <div id="antennaDown" class="antenna">
  No newline at end of file
-                        <div id="antennaDown">
  No newline at end of file
                             <fieldset class="flsAntenna">
                                 <legend>DOWN</legend>
+                                <div class="infoAntenna">
  No newline at end of file
                                     <div class="divAntenna">
                                         <label for="lblAntenna">Antenna</label>
                                         <p>{{ antennaDown.value }}</p>
                                     </div>
                                     <div class="divTx">
                                         <label for="lblTx">Tx</label>
                                         <p>{{ antennaDown.tx }}</p>
                                     </div>
                                     <div class="divTx">
                                         <label for="lblRx">Rx</label>
                                         <p>{{ antennaDown.rx }}</p>
                                     </div>
                                     <div class="cleardivs"></div>
                                     <div class="divUes">
                                         <label for="lblUes">Ues:</label>
                                         <label for="lblAntennaDownUes">{{ antennaDown.ues }}</label>
+                                        {% if antennaDown.only_rx == 0 %}
              No newline at end of file
+                                        <input type="checkbox" name="chkOnlyRxDown" value="" />
              No newline at end of file
+                                        {% else %}
              No newline at end of file
+                                        <input type="checkbox" name="chkOnlyRxDown" value="" checked="checked"/>
              No newline at end of file
+                                        {% endif %}
              No newline at end of file
+                                        <label for="lblOnlyRx">Only RX</label>
  No newline at end of file
                                     </div>
+                                </div>
              No newline at end of file
+                                <div class="overJRO">
              No newline at end of file
+                                    <img />
              No newline at end of file
+                                    <a href="#" class="activeOverJRO" id="{{ patternChoosen.id }}">Preview</a>
              No newline at end of file
+                                </div>
              No newline at end of file
+                                <div class="cleardivs"></div>
  No newline at end of file
                             </fieldset>
                         </div>
                     </div>
                 </div>
             </div>
             {% 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