ABS/abscontrol Commit - r184:185 · Jicamarca Repository

- Estandarizando todas las ventanas de la aplicacion. Afinando los estilos.

jsalyrosas -

r184:185

parent child

Context file:

r184:185

Collapse all files

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

             /*
              * 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 {width: 980px; border: 0px solid #fcc !important; height: 50px; text-align: center; line-height: 50px}
             #schema {margin: 0 auto; width: 980px; border: 0px solid #f00 !important; padding: 10px 10px 10px 10px}
             #content {border: 0px solid #1cc; margin-top: 5px; margin-bottom: 5px}
             #content #topcolumn {float: left; border: 1px solid #ddd !important; width: 980px; height: 40px; line-height: 35px;
             					 margin: 2px 0px; box-shadow: 2px 2px 5px #888;}
             #content #maincolumn {float: left; border: 1px solid #ddd !important; width: 980px; margin: 2px 0px; padding: 0px 0px;
             					  box-shadow: 2px 2px 5px #666;}
             footer {border: 0px solid #200 !important; height: 30px; text-align: center; line-height: 30px;
             		margin: 2px 0px; box-shadow: 2px 2px 5px #888;}
             .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: inherit;
             							   font-style: normal; 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 **********************************/
             /****************************************************************************************/
             #infoProfiles {border: 0px solid #1cc !important; width: 300px; margin: 0px; padding-top: 2px; padding-bottom: 2px;
             			   float: left;}
             #infoProfiles label {padding: 10px 10px 10px 12px; margin: 10px 0}
             #infoProfiles select {padding: 4px 0px; margin: 0; font-family: 'Droid Sans', sans-serif;
             					   font-size: 12px; letter-spacing: 0.029em; width: 200px;}
             #mnuProfiles{margin: 0px 0px 0px 0px; border: 0px solid #1494F6 !important; float: right; padding: 2px 10px}
             #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; float: left; }
             #mnuProfiles a{ font-weight: normal; color: #1494F6; display: block; border: 0px solid #1cc !important; text-align: center;
             				border-bottom: 1px solid #1494F6 !important; text-decoration: none; padding: 0px 4px;
             				line-height: 18px; margin: 6px 6px;}
             /****************************************************************************************/
             /********               FORMULARIO DE PERFILES      *************************************/
             /****************************************************************************************/
             #divProfile { border: 0px solid #dff !important; margin: 10px 0px; padding: 10px 10px; width: 500px }
-            .flsAntenna { margin: 0; width: 100%; padding: 0px; border: 0px solid #f00 !important }
-            #divPattern textarea,input[type=text],label{ font-family: "Open Sans"; font-size: inherit; }
+            #divPattern textarea,input[type=text],label,input[type=file],input[type=button],input[type=submit]{
+            	font-family: 'Open Sans', sans-serif; font-size: inherit; }
             #divPattern textarea {resize: none; overflow: hidden}
-            .antenna{ border: 0px solid #1494F6 !important; padding: 2px; margin: 5px 10px; float: left; width: 480px}
+            .antenna{ border: 0px solid #fee !important; box-shadow: 1px 1px 2px #666; padding: 5px; margin: 10px auto;
+            		  width: 480px; display: block}
+            .flsAntenna { margin: 0; padding: 0px; border: 1px solid #fee !important; width: 470px}
+            .flsAntenna legend{ font-family: 'Roboto Condensed', sans-serif; font-size: inherit; text-align: center;
+            					margin-left: 10px}
             .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: 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 { display: block; float: left; margin: 10px; border: 0px solid #f00 !important}
             .divTx label{ display: block }
-            .divTx textarea{ width: 135px; max-width: 135px; height: 135px; max-height: 140px; text-align: justify }
+            .divTx textarea{ width: 100px; max-width: 100px; height: 160px; max-height: 165px; text-align: justify;
+            				  border: 2px solid #eee !important; font-family: "Ubuntu"; font-size: inherit;
+            				  line-height: 20px}
             .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;
+                      border: 1px solid #eee !important; font-family: 'Ubuntu', sans-serif; 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; font-family: "Ubuntu"; font-size: inherit;}
+            .divUes input[type=text] { width: 240px; max-width: 240px; font-family: 'Ubuntu', sans-serif; font-size: inherit;}
             .overJRO img{width: 400px; height: 200px; text-align: center; vertical-align: middle; margin: 40px 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: right;
             				margin: 5px 40px 5px 0px;}
             #divMnuPattern li{ float: right; 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: 0px solid #1494f6 !important; margin: 0px 25px; }
             #navPatterns{ margin: 0 auto; border: 0px solid #d00 !important; width: 700px; height: 30px;
                           font-family: 'Ubuntu', sans-serif; font-size: 14px; padding: 5px 0px}
             #navPatternList{ margin: 0 auto; border: 0px 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: 30px; padding: 1px 0px}
             .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; }
             /****************************************************************************************/
             /******                 			HEADER 									*************/
             /****************************************************************************************/
             header nav{width: 960px; border: 0px solid #1cc !important; margin: 0 auto; height: 100%}
             header nav a{font-family: 'Roboto Condensed', sans-serif; font-size: 1.98em; text-transform: uppercase; width: 232px;
             		  	  padding: 2px; text-align: center; border: 1px solid #ddd !important; box-shadow: 1px 1px 2px #ddd; display: block;
             		  	  float: left; height: 45px; text-decoration: none; background: #eee; line-height: 45px;
             		  	  color: #15425d; margin: 0px 1px}
+            header nav a.selected{ background: #666; color: #fff }
             /****************************************************************************************/
             /******                 			FOOTER 									*************/
             /****************************************************************************************/
             footer p{font-family: 'Roboto Condensed', sans-serif; font-size: 0.98em}

trunk/webapp/templates/abscontrol/addPattern.html +4 -4

             {% extends "abscontrol/edit.html" %}
             {% block mnuPattern %}
             <div class="divMenu" id="divMnuPattern">
                 <nav class="MnuHorizontal">
                     <ul class="mnu" id="mnuPattern">
+                        <li><a href="#" id="lnkCancel">Cancel</a></li>
                         <li><a href="#" id="lnkSave">Save</a></li>
-                        <li><a href="#" id="lnkCancel">Cancel</a></li>
                     </ul>
                 </nav>
             </div>
             <div class="cleardivs"></div>
             {% endblock %}
             {% block pattern %}
-            <div id="infoPattern">
+            <div id="divPattern">
                 <form action="/abscontrol/{{ objProfile.id }}/save/" id="frmPattern" method="post">
-                <div id="antennaUp">
+                <div id="antennaUp" class="antenna">
                     <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 }}" />
                         </div>
                     </fieldset>
                 </div>
-                <div id="antennaDown">
+                <div id="antennaDown" class="antenna">
                     <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 }}" />
                         </div>
                     </fieldset>
                 </div>
                     <input type="hidden" name="profile_id" id="profile_id" value="{{ objProfile.id }}" />
                     <input type="hidden" name="mode" value="e">
                 </form>
             </div>
             {% endblock %}

trunk/webapp/templates/abscontrol/edit.html +3 -4

             {% extends "abscontrol/index.html" %}
             {% block title %}ABS CONTROL:::PROFILE:::{{ objProfile.name }}{% endblock %}
             {% block scripting %}
                 <script src="/static/static/js/patterns.js"></script>
             {% endblock %}
             {% block mnu_profile %}
             <nav class="MnuHorizontal" id="mnuProfiles">
                 <ul>
                     <li><a href="/abscontrol/new/">New</a></li>
                     {% if objProfile.state == 0 %}
                     <li><a href="/abscontrol/changeName/{{ objProfile.id }}/">Save</a></li>
                     {% else %}
                     <li><a href="#" id="lnkUpdateProfile">Save</a></li>
                     {% endif %}
                     <li><a href="#">Save as</a></li>
                     <li><a href="/abscontrol/import/">Import</a></li>
                     {% if objProfile %}
                     <li><a href="#" id="lnkExport" alt="{{ objProfile.id }}">Export</a></li>
                     {% endif %}
                 </ul>
             </nav>
             {% endblock %}
             {% block maincolumn%}
             <div id="maincolumn">
             	{% if objProfile.state == 1 %}
             	<form action="/abscontrol/update/{{ objProfile.id }}/" method="post" id="frmProfile">
                 <div id="divProfile">
                     <label for="lblName">Profile:</label>
                     <input type="text" name="txtProfile" value="{{ objProfile.name }}"/>
                 </div>
                 	<input type="hidden" name="mode" value="e">
                 </form>
                 {% else %}
                 <div id="divProfile">
                     <label for="lblName">Profile: {{ objProfile.name }}</label>
                 </div>
                 {% endif %}
                 {% 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 }}/edit/{{ element.id }}" class="lnkPatternSelected">{{ element.value }}</a></li>
                         {% else %}
                         <li><a href="/abscontrol/{{ objProfile.id }}/edit/{{ element.id }}" class="lnkPattern">{{ element.value }}</a></li>
                         {% endif %}
                     {% endfor %}
                         </ul>
                     </nav>
                 </div>
                 {% endif %}
                 <div id="divPattern">
                     {% block mnuPattern %}
                     <div class="divMenu" id="divMnuPattern">
                         <nav class="MnuHorizontal">
                             <ul class="mnu" id="mnuPattern">
                             	{% if lsPatterns|length > 1 %}
                                 <li><a href="/abscontrol/{{ objProfile.id }}/delete/{{ patternChoosen.id }}">Delete</a></li>
                                 {% endif %}
                                 <li><a href="#" class="" id="lnkSave">Save</a></li>
                             	{% if lsPatterns|length < 10 %}
                                 <li><a href="/abscontrol/{{ objProfile.id }}/add">Add</a></li>
                                 {% endif %}
                             </ul>
                         </nav>
                     </div>
                     <div class="cleardivs"></div>
                     {% endblock %}
                     {% block pattern %}
-                    <div id="infoPattern">
+                    <div id="divPattern">
+                        <div id="antennaUp"  class="antenna">
-                        <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">{{ antennaUp.value }}</textarea>
                                 </div>
                                 <div class="divTx">
                                     <label for="lblTx">Tx</label>
                                     <textarea name="txtTxUp" class="txtTR" cols="20" rows="8">{{ antennaUp.tx }}</textarea>
                                 </div>
                                 <div class="divTx">
                                     <label for="lblRx">Rx</label>
                                     <textarea name="txtRxUp" class="txtTR" cols="20" rows="8">{{ antennaUp.rx }}</textarea>
                                 </div>
                                 <div class="cleardivs"></div>
                                 <div class="divUes">
                                     <label for="lblUes">Ues:</label>
                                     <input type="text" name="txtUesUp" value="{{ antennaUp.ues }}" />
                                 </div>
                                 <input type="hidden" name="txtAntennaUpId" value="{{ antennaUp.id }}" />
                             </fieldset>
                         </div>
-                        <div id="antennaDown">
+                        <div id="antennaDown" class="antenna">
                             <fieldset class="flsAntenna">
                                 <legend>DOWN</legend>
                                 <div class="divAntenna">
                                     <label for="lblAntenna">Antenna</label>
                                     <textarea name="txtAntennaDown" class="txtAntenna" cols="38" rows="8">{{ antennaDown.value }}</textarea>
                                 </div>
                                 <div class="divTx">
                                     <label for="lblTx">Tx</label>
                                     <textarea name="txtTxDown" class="txtTR" cols="20" rows="8">{{ antennaDown.tx }}</textarea>
                                 </div>
                                 <div class="divTx">
                                     <label for="lblRx">Rx</label>
                                     <textarea name="txtRxDown" class="txtTR" cols="20" rows="8">{{ antennaDown.rx }}</textarea>
                                 </div>
                                 <div class="cleardivs"></div>
                                 <div class="divUes">
                                     <label for="lblUes">Ues:</label>
                                     <input type="text" name="txtUesDown" value="{{ antennaDown.ues }}" />
                                 </div>
                                 <input type="hidden" name="txtAntennaDownId" value="{{ antennaDown.id }}" />
                             </fieldset>
                         </div>
                     </div>
                     {% endblock %}
                 </div>
             </div>
             {% endblock %}

trunk/webapp/templates/abscontrol/editPattern.html +3 -3

             {% extends "abscontrol/edit.html" %}
             {% block mnuPattern %}
             <div class="divMenu" id="divMnuPattern">
                 <nav class="MnuHorizontal">
                     <ul class="mnu" id="mnuPattern">
                     	<li><a href="#" id="lnkCancel">Delete</a></li>
                     	<li><a href="#" id="lnkSave">Save</a></li>
                     	{% if lsPatterns|length < 10 %}
                     	<li><a href="#" id="lnkAdd">Add</a></li>
                     	{% endif %}
                     </ul>
                 </nav>
             </div>
             <div class="cleardivs"></div>
             {% endblock %}
             {% block pattern %}
-            <div id="infoPattern">
+            <div id="divPattern">
                 <form action="/abscontrol/{{ objProfile.id }}/save/" id="frmPattern" method="post">
-                <div id="antennaUp">
+                <div id="antennaUp" class="antenna">
                     <fieldset class="flsAntenna">
                         <legend>UP</legend>
                         <div class="divAntenna">
                             <label for="lblAntenna">Antenna</label>
                             <textarea name="txtAntennaUp" class="txtAntenna" cols="38" rows="8">{{ antennaUp.value }}</textarea>
                         </div>
                         <div class="divTx">
                             <label for="lblTx">Tx</label>
                             <textarea name="txtTxUp" class="txtTR" cols="20" rows="8">{{ antennaUp.tx }}</textarea>
                         </div>
                         <div class="divTx">
                             <label for="lblRx">Rx</label>
                             <textarea name="txtRxUp" class="txtTR" cols="20" rows="8">{{ antennaUp.rx }}</textarea>
                         </div>
                         <div class="cleardivs"></div>
                         <div class="divUes">
                             <label for="lblUes">Ues:</label>
                             <input type="text" name="txtUesUp" value="{{ antennaUp.ues }}" />
                         </div>
                         <input type="hidden" name="txtAntennaUpId" value="{{ antennaUp.id }}" />
                     </fieldset>
                 </div>
-                <div id="antennaDown">
+                <div id="antennaDown" class="antenna">
                     <fieldset class="flsAntenna">
                         <legend>DOWN</legend>
                         <div class="divAntenna">
                             <label for="lblAntenna">Antenna</label>
                             <textarea name="txtAntennaDown" class="txtAntenna" cols="38" rows="8">{{ antennaDown.value }}</textarea>
                         </div>
                         <div class="divTx">
                             <label for="lblTx">Tx</label>
                             <textarea name="txtTxDown" class="txtTR" cols="20" rows="8">{{ antennaDown.tx }}</textarea>
                         </div>
                         <div class="divTx">
                             <label for="lblRx">Rx</label>
                             <textarea name="txtRxDown" class="txtTR" cols="20" rows="8">{{ antennaDown.rx }}</textarea>
                         </div>
                         <div class="cleardivs"></div>
                         <div class="divUes">
                             <label for="lblUes">Ues:</label>
                             <input type="text" name="txtUesDown" value="{{ antennaDown.ues }}" />
                         </div>
                         <input type="hidden" name="txtAntennaDownId" value="{{ antennaDown.id }}" />
                     </fieldset>
                 </div>
                 <input type="hidden" name="pattern_id" id="pattern_id" value="{{ patternChoosen.id }}" />
                 <input type="hidden" name="profile_id" id="profile_id" value="{{ objProfile.id }}" />
                 <input type="hidden" name="mode" value="e">
                 </form>
             </div>
             {% endblock %}

trunk/webapp/templates/abscontrol/new.html +7 -6

             {% extends "abscontrol/index.html" %}
             {% block title %}ABS CONTROL:::::NEW PROFILE{% endblock %}
             {% block scripting %}
                 <script src="/static/static/js/patterns.js"></script>
             {% endblock %}
             {% block maincolumn%}
             <div id="maincolumn">
                 <form action="/abscontrol/{{ profile_id }}/save/" method="post" id="frmPattern">
                 <div id="divProfile">
                     <label for="lblName">Profile: {{ profile_name }}</label>
                 </div>
                 {% block mnuPattern %}
                 <div class="divMenu" id="divMnuPattern">
                     <nav class="MnuHorizontal">
                         <ul class="mnu" id="mnuPattern">
                         	<li><a href="#" id="lnkSave">Save</a></li>
                         </ul>
                     </nav>
                 </div>
                 <div class="cleardivs"></div>
                 {% endblock %}
                 <div id="divPattern">
-                    <div id="antennaUp">
+                    <div id="antennaUp" class="antenna">
                         <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>
+                                <textarea name="txtTxUp" class="txtTR" cols="18" rows="8">{{ txtTxUp }}</textarea>
                             </div>
                             <div class="divTx">
                                 <label for="lblRx">Rx</label>
-                                <textarea name="txtRxUp" class="txtTR" cols="20" rows="8">{{ txtRxUp }}</textarea>
+                                <textarea name="txtRxUp" class="txtTR" cols="18" 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">
+                    <div id="antennaDown" class="antenna">
                         <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>
+                                <textarea name="txtTxDown" class="txtTR" cols="15" rows="8">{{ txtTxDown }}</textarea>
                             </div>
                             <div class="divTx">
                                 <label for="lblRx">Rx</label>
-                                <textarea name="txtRxDown" class="txtTR" cols="20" rows="8">{{ txtRxDown }}</textarea>
+                                <textarea name="txtRxDown" class="txtTR" cols="15" 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>
                 	<input type="hidden" name="mode" value="e">
                 </form>
             </div>
             {% endblock %}

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

             {% extends "abscontrol/index.html" %}
             {% block title %}ABS CONTROL:::PROFILE:::{{ objProfile.name }}{% endblock %}
             {% block mnu_profile %}
             <nav class="MnuHorizontal" id="mnuProfiles">
                 <ul>
                     <li><a href="/abscontrol/new">New</a></li>
                     {% if patternChoosen %}
                     <li><a href="/abscontrol/{{ objProfile.id }}/edit/{{ patternChoosen.id }}">Edit</a></li>
                     {% else %}
                     <li><a href="/abscontrol/edit/{{ objProfile.id }}">Edit</a></li>
                     {% endif %}
                     <li><a href="#">Save as</a></li>
                     <li><a href="/abscontrol/import">Import</a></li>
                     <li><a href="#" id="lnkExport" alt="{{ objProfile.id }}">Export</a></li>
                     <li><a href="#" id="lnkSendFile" alt="{{ objProfile.id }}">Send</a></li>
                 </ul>
             </nav>
             {% endblock %}
             {% block maincolumn%}
             <div id="maincolumn">
             	{% if objProfile.state == 0 %}
                 <div id="divProfile">
                     <label for="lblName">Profile:</label>
                     <label for="lblProfile">{{ objProfile.name }}</label>
                 </div>
                 {% endif %}
                 {% 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>
                         <div class="cleardivs"></div>
                     </nav>
                 </div>
                 {% endif %}
                 {% block mnuPattern %}
                 <div class="divMenu" id="divMnuPattern">
                     <nav class="MnuHorizontal">
                         <ul class="mnu" id="mnuPattern">
                         	<li><a href="#">Apply</a></li>
                         </ul>
                     </nav>
                 </div>
                 <div class="cleardivs"></div>
                 {% endblock %}
                 <div id="divPattern">
                     <div id="infoPattern">
-                        <div id="antennaUp" class="antenna">
+                        <div id="antennaUp" class="antenna" style="float: left">
                             <fieldset class="flsAntenna">
                                 <legend>UP</legend>
                                 <div class="infoAntenna">
                                     <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 %}
                                         <input type="checkbox" name="chkOnlyRxUp" value="" />
                                         {% else %}
                                         <input type="checkbox" name="chkOnlyRxUp" value="" checked="checked"/>
                                         {% endif %}
                                         <label for="lblOnlyRx">Only RX</label>
                                     </div>
                                 </div>
                            	</fieldset>
                         </div>
                         <div class="overJRO">
                             <img />
                             <a href="#" class="activeOverJRO" id="Up">Preview</a>
                         </div>
                         <div class="cleardivs"></div>
-                        <div id="antennaDown" class="antenna">
+                        <div id="antennaDown" class="antenna" style="float: left">
                             <fieldset class="flsAntenna">
                                 <legend>DOWN</legend>
                                 <div class="infoAntenna">
                                     <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 %}
                                         <input type="checkbox" name="chkOnlyRxDown" value="" />
                                         {% else %}
                                         <input type="checkbox" name="chkOnlyRxDown" value="" checked="checked"/>
                                         {% endif %}
                                         <label for="lblOnlyRx">Only RX</label>
                                     </div>
                                 </div>
                             </fieldset>
                         </div>
                         <div class="overJRO">
                             <img />
                             <a href="#" class="activeOverJRO" id="Down">Preview</a>
                         </div>
                         <div class="cleardivs"></div>
                     </div>
                     <input type="hidden" name="txtAntennaUpId" value="{{ antennaUp.id }}"/>
                     <input type="hidden" name="txtAntennaDownId" value="{{ antennaDown.id }}"/>
                     <input type="hidden" name="txtPatternId" value="{{ patternChoosen.id }}"/>
                     <input type="hidden" name="txtProfileId" value="{{ objProfile.id }}"/>
                 </div>
             </div>
             {% endblock %}

trunk/webapp/templates/base.html +1 -1

             {% load static %}
             <!DOCTYPE html>
             <html lang="en">
                 <head>
                     <meta charset="utf-8" />
                     {% comment %}
                     <!-- Always force latest IE rendering engine (even in intranet) & Chrome Frame
                     Remove this if you use the .htaccess -->
                     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
                     {% endcomment %}
                     <link href='http://fonts.googleapis.com/css?family=Droid+Sans|Ubuntu:400,500,300italic|Open+Sans:400,300,600|Open+Sans+Condensed:300,700|Roboto+Condensed:400,300' rel='stylesheet' type='text/css'>
                     <link rel="stylesheet" href="{% static 'static/css/style.css' %}" type="text/css" />
                     <script src="{% static 'static/js/jquery-1.9.1.min.js' %}"></script>
                     {% block scripting %}{% endblock %}
                     <title>{% block title %}JRO WEB APPS::::{% endblock %}</title>
                     <meta name="description" content="JRO WEB APPLICATIONS" />
                     <meta name="author" content="Jose Antonio Sal y Rosas Celi" />
                     {# <meta name="viewport" content="width=device-width; initial-scale=1.0" /> #}
                     {% comment %}
                     <!-- Replace favicon.ico & apple-touch-icon.png in the root of your domain and delete these references -->
                     <link rel="shortcut icon" href="/favicon.ico" />
                     <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
                     {% endcomment %}
                 </head>
                 <body>
                     <div id="schema">
                         <header>
                             {% block header %}
                             <nav id="header">
-                              <a href="/abscontrol/">ABS</a>
+                              <a href="/abscontrol/" class="selected">ABS</a>
                               <a href="#">CR</a>
                               <a href="#">DDS</a>
                               <a href="#">JARS</a>
                             </nav>
                             {% endblock %}
                         </header>
                         {% block content %}
                         <div id="content"></div>
                         {% endblock %}
                         <footer>
                             {% block footer %}
                             <p>&copy; Copyright 2013 by Jicamarca Radio Observatory</p>
                             {% endblock %}
                         </footer>
                     </div>
                 </body>
             </html>

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