# SVN changeset patch
# User jsalyrosas
# Date 2013-06-03 15:52:07.277484
# Revision 196

- Revision de los estilos para el formulario de Nuevo perfil bajo los navegadores Firefox y Chromium.

Index: trunk/webapp/abscontrol/views.py
===================================================================
diff --git a/trunk/webapp/abscontrol/views.py b/trunk/webapp/abscontrol/views.py
--- a/trunk/webapp/abscontrol/views.py	(revision 195)
+++ b/trunk/webapp/abscontrol/views.py	(revision 196)
@@ -78,9 +78,6 @@
                                                       'profile_name' : newprofile.name,
                                                       'profile_id' : newprofile.id,
                                                       'lsPatterns' : lsPatterns,
-                                                      'txtUes' : txtUes, 'txtTxUp' : txtTxUp,
-                                                      'txtTxDown' : txtTxDown, 'txtRxUp' : txtRxUp,
-                                                      'txtRxDown' : txtRxDown,
                                                       'range' : range(8),
                                                       })
 
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 195)
+++ b/trunk/webapp/static/css/style.css	(revision 196)
@@ -194,7 +194,7 @@
 .legendAntenna {
 	font-family: 'Roboto Condensed', sans-serif;
 	font-size: inherit;
-	text-align: center;
+	text-align: left;
 	margin-left: 10px; }
 
 .infoAntenna {
@@ -276,11 +276,11 @@
 	border: 0px solid #1cc !important; }
 
 .lineInputs {
-	width: 240px;
+	/*width: 240px;*/
 	border: 0px solid #1cc !important; }
 
 .lineInputsTx {
-	width: 185px;
+	/*width: 185px;*/
 	border: 0px solid #1cc !important; }
 
 .divValuesAntenna, .divValuesTx {
@@ -290,11 +290,11 @@
 	border: 0px solid #bbb !important; }
 
 .divValuesAntenna {
-	width: 230px;
+	/*width: 230px;*/
 	border: 0px solid #2eb !important; }
 	
 .divValuesTx {
-	width: 175px;
+	/*width: 175px;*/
 	border: 0px solid #bbb !important; }
 
 .divValuesAntenna input[type=text], .divValuesTx input[type=text] {
@@ -396,8 +396,8 @@
 	margin: 0px 10px;
 	padding: 0;
 	font-family: 'Roboto Condensed', sans-serif;
-	overflow: hidden;
-	border: 1px solid #f00 !important; }
+	/*overflow: hidden;*/
+	border: 0px solid #f00 !important; }
 
 .titleUes {
 	width: 35px;
@@ -412,14 +412,13 @@
 .valueUes {
 	width: 300px;
 	float: left;
-	border: 1px solid #2f4 !important;
+	border: 0px solid #2f4 !important;
 	line-height: 22px; }
 
 .lblUes {
 	font-family: 'Roboto Condensed', sans-serif;
 	color: #666;
 	font-size: 1.1em; }
-
 
 .txtUnitUes {
 	width: 60px;
@@ -439,7 +438,8 @@
 	width: 120px;
 	float: left;
 	display: block;
-	border: 1px solid #1cc !important; }
+	line-height: 25px;
+	border: 0px solid #1cc !important; }
 
 .overJRO img {
 	width: 400px;
Index: trunk/webapp/static/js/patterns.js
===================================================================
diff --git a/trunk/webapp/static/js/patterns.js b/trunk/webapp/static/js/patterns.js
--- a/trunk/webapp/static/js/patterns.js	(revision 195)
+++ b/trunk/webapp/static/js/patterns.js	(revision 196)
@@ -23,6 +23,8 @@
     	txtRxUp = "";
     	txtTxDown = "";
     	txtRxDown = "";
+    	txtUesUp = "";
+    	txtUesDown = "";
     	for(i=0; i<=7; i++){
     		if(i == 0){
     			valueAntennaUp += "[";
@@ -79,20 +81,37 @@
     			txtRxDown += "]";
 			}
     	}
+    	
+    	txtUesUp += "["
+    	txtUesDown += "["
+    	
+    	for(i=1;i<=4;i++){
+    		txtUesUp += $("input[name=unitUesUp_"+i+"]").val();
+    		txtUesDown += $("input[name=unitUesDown_"+i+"]").val();
+    		if(i != 4){
+    			txtUesUp += ","
+    			txtUesDown += ","
+    		}
+    	}
+    	
+    	txtUesUp += "]"
+    	txtUesDown += "]"
+    	
     	$('input[name=txtAntennaUp]').attr("value",valueAntennaUp);
     	$('input[name=txtAntennaDown]').attr("value",valueAntennaDown);
     	$('input[name=txtTxUp]').attr("value",txtTxUp);
     	$('input[name=txtTxDown]').attr("value",txtTxDown);
     	$('input[name=txtRxUp]').attr("value",txtRxUp);
     	$('input[name=txtRxDown]').attr("value",txtRxDown);
+    	$('input[name=txtUesUp]').attr("value",txtUesUp);
+    	$('input[name=txtUesDown]').attr("value",txtUesDown);
     	$('#frmPattern').submit();
     });
     $('#lnkCancel').click(function() {
         if ($("#pattern_id").val() == 0){
             location.href = "/abscontrol/edit/" + $("#profile_id").val();    
         }else{
-            //location.href="/abscontrol/" + $("#profile_id").val() + "/view/" + $("#pattern_id").val();
-        	location.href = "/abscontrol/edit/" + $("#profile_id").val();
+            location.href = "/abscontrol/edit/" + $("#profile_id").val();
         }
     });
     $('#lnkExport').click(function(){
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 195)
+++ b/trunk/webapp/templates/abscontrol/new.html	(revision 196)
@@ -38,7 +38,7 @@
 	                    		<label for="lblSign" class="lblSign">[</label>
 	                    		<div class="divValuesAntenna">
 	                    		{% for j in range %}
-	                    			<input type="text" name="txtUnitAntennaUp" class="txtUnitAntenna" id="txtUnitAntennaUp_{{ i }}_{{ j }}" value="0.5" />
+	                    			<input type="text" name="txtUnitAntennaUp" class="txtUnitAntenna" id="txtUnitAntennaUp_{{ i }}_{{ j }}" value="0.5" maxlength="3" />
 	                    			{% if j != 7 %},{% endif %}
 	                    		{% endfor %}
 	                    		</div>
@@ -68,7 +68,7 @@
 	                    		<label for="lblSign" class="lblSignTx">[</label>
 	                    		<div class="divValuesTx">
 	                    		{% for j in range %}
-	                    			<input type="text" name="txtUnitTxUp" class="txtUnitTx" id="txtUnitTxUp_{{ i }}_{{ j }}" value="1" />
+	                    			<input type="text" name="txtUnitTxUp" class="txtUnitTx" id="txtUnitTxUp_{{ i }}_{{ j }}" value="1" maxlength="1" />
 	                    			{% if j != 7 %},{% endif %}
 	                    		{% endfor %}
 	                    		</div>
@@ -99,7 +99,7 @@
 	                    		<label for="lblSign" class="lblSignTx">[</label>
 	                    		<div class="divValuesTx">
 	                    		{% for j in range %}
-	                    			<input type="text" name="txtUnitRxUp" class="txtUnitRx" id="txtUnitRxUp_{{ i }}_{{ j }}" value="0" />
+	                    			<input type="text" name="txtUnitRxUp" class="txtUnitRx" id="txtUnitRxUp_{{ i }}_{{ j }}" value="0" maxlength="1" />
 	                    			{% if j != 7 %},{% endif %}
 	                    		{% endfor %}
 	                    		</div>
@@ -118,17 +118,25 @@
                 </div>
                 <div class="cleardivs"></div>
                 <div class="divNewUes">
-                    <label for="lblUes">Ues:</label>
-                    <input type="text" name="txtUesUp" value="{{ txtUes }}" />
+                    <label for="lblUes" class="titleUes">Ues:</label>
+                    <div class="valueUes">
+                    	<label for="lblUes">[</label>
+                    	<input type="text" name="unitUesUp_1" value="0.533333" maxlength="8" class="txtUnitUes" />,
+	                    <input type="text" name="unitUesUp_2" value="0.00000" maxlength="7" class="txtUnitUes" />,
+	                    <input type="text" name="unitUesUp_3" value="1.06667" maxlength="7" class="txtUnitUes" />,
+	                    <input type="text" name="unitUesUp_4" value="0.00000" maxlength="7" class="txtUnitUes" />
+	                    <label for="lblUes">]</label>
+                    </div>
                 </div>
                 <div class="checkOnly">
                 	<input type="checkbox" name="chkOnlyRxUp" value="" />
-                    <label for="lblOnlyRx">Only RX</label>
+                    <label for="lblOnlyRx">Only Rx</label>
                 </div>
             </fieldset>
             <input type="hidden" name="txtAntennaUp" value="" />
             <input type="hidden" name="txtTxUp" value="" />
             <input type="hidden" name="txtRxUp" value="" />
+            <input type="hidden" name="txtUesUp" value="" />
         </div>
         
         <div id="antennaDown" class="NewAntenna">
@@ -148,7 +156,7 @@
 	                    		<label for="lblSign" class="lblSign">[</label>
 	                    		<div class="divValuesAntenna">
 	                    		{% for j in range %}
-	                    			<input type="text" name="txtUnitAntennaDown" class="txtUnitAntenna" id="txtUnitAntennaDown_{{ i }}_{{ j }}" value="0.5" />
+	                    			<input type="text" name="txtUnitAntennaDown" class="txtUnitAntenna" id="txtUnitAntennaDown_{{ i }}_{{ j }}" value="0.5" maxlength="3" />
 	                    			{% if j != 7 %},{% endif %}
 	                    		{% endfor %}
 	                    		</div>
@@ -178,7 +186,7 @@
 	                    		<label for="lblSign" class="lblSignTx">[</label>
 	                    		<div class="divValuesTx">
 	                    		{% for j in range %}
-	                    			<input type="text" name="txtUnitTxDown" class="txtUnitTx" id="txtUnitTxDown_{{ i }}_{{ j }}" value="1" />
+	                    			<input type="text" name="txtUnitTxDown" class="txtUnitTx" id="txtUnitTxDown_{{ i }}_{{ j }}" value="1" maxlength="1" />
 	                    			{% if j != 7 %},{% endif %}
 	                    		{% endfor %}
 	                    		</div>
@@ -240,12 +248,13 @@
                 </div>
                 <div class="checkOnly">
                 	<input type="checkbox" name="chkOnlyRxDown" value="" />
-                    <label for="lblOnlyRx">Only RX</label>
+                    <label for="lblOnlyRx">Only Rx</label>
                 </div>
             </fieldset>
             <input type="hidden" name="txtAntennaDown" value="" />
             <input type="hidden" name="txtTxDown" value="" />
             <input type="hidden" name="txtRxDown" value="" />
+            <input type="hidden" name="txtUesDown" value="" />
         </div>
     </div>
     	<input type="hidden" name="mode" value="e">