ABS/abscontrol Commit - r190:191 · Jicamarca Repository

- Agregado el archivo requirements.txt para las librerias pre-requisitos....

jsalyrosas -

r190:191

parent child

Context file:

r190:191

Collapse all files

trunk/webapp/requirements.txt created 10644 +6 0

@@ -0,0 +1,6
	1	Django==1.4.3
	2	MySQL-python==1.2.3
	3	argparse==1.2.1
	4	numpy==1.7.1
	5	wsgiref==0.1.2
	6	yolk==0.4.3

trunk/webapp/static/css/style.css +23 -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 {
             	padding: 0;
             	margin: 0;
             	font-size: 12px; }
             header {
             	width: 980px;
             	height: 50px;
             	text-align: center;
             	line-height: 50px;
             	border: 0px solid #fcc !important; }
             #schema {
             	margin: 0 auto;
             	width: 980px;
             	padding: 10px 10px;
             	border: 0px solid #f00 !important; }
             #content {
             	margin: 5px 0px;
             	border: 0px solid #1cc; }
             #topcolumn {
             	float: left;
             	width: 980px;
             	height: 40px;
             	line-height: 35px;
             	margin: 2px 0px;
             	border: 1px solid #ddd !important;
             	box-shadow: 2px 2px 5px #888; }
             #maincolumn {
             	float: left;
             	width: 980px;
             	margin: 2px 0px;
             	padding: 0px 0px;
             	border: 1px solid #ddd !important;
             	box-shadow: 2px 2px 5px #666; }
             footer {
             	height: 30px;
             	line-height: 30px;
             	text-align: center;
             	margin: 0px 0px;
             	border: 0px solid #200 !important;
             	box-shadow: 2px 2px 5px #888; }
             .cleardivs {
             	clear: both;
             	border: 0px solid #400;
             	height: 0px; }
             textarea {
             	resize: none;
             	overflow: hidden; }
             /****************************************************************************************/
             /******                     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 {
             	float: left;
             	width: 300px;
             	margin: 0px;
             	padding: 2px 0px;
             	border: 0px solid #1cc !important; }
             #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: 0;
             	float: right;
             	padding: 2px 10px;
             	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;
             	float: left;
             	padding: 2px;
             	border: 0px solid #c55 !important; }
             #mnuProfiles a {
             	font-weight: normal;
             	color: #1494F6;
             	display: block;
             	text-align: center;
             	border-bottom: 1px solid #1494F6 !important;
             	text-decoration: none;
             	padding: 0px 4px;
             	line-height: 18px;
             	margin: 6px; }
             /****************************************************************************************/
             /********               FORMULARIO DE PERFILES      *************************************/
             /****************************************************************************************/
             #divProfile {
             	margin: 10px 0px;
             	padding: 10px 10px;
             	width: 500px;
             	border: 0px solid #dff !important; }
             #divPattern textarea,input[type=text],label,input[type=file],input[type=button],input[type=submit] {
             	font-family: 'Open Sans', sans-serif;
             	font-size: inherit; }
             .antenna, .NewAntenna {
             	box-shadow: 1px 1px 2px #666;
             	padding: 5px;
             	margin: 10px auto;
             	width: 520px;
             	display: block;
             	border: 0px solid #fee !important; }
             .antenna {
             	width: 520px; }
             .NewAntenna {
             	width: 620px; }
             .flsAntenna, .NewFlsAntenna {
             	margin: 0;
             	padding: 0px;
             	border: 1px solid #fee !important;
             	width: 510px; }
             .flsAntenna {
             	width: 510px; }
             .NewFlsAntenna {
             	width: 610px; }
             .legendAntenna {
             	font-family: 'Roboto Condensed', sans-serif;
             	font-size: inherit;
             	text-align: center;
             	margin-left: 10px; }
             .infoAntenna {
             	width: 500px;
             	float: left;
             	border: 0px solid #f00 !important; }
             .overJRO {
             	width: 250px;
             	float: left;
             	margin: 0px 5px;
             	border: 0px solid #1cc !important; }
             .divAntenna {
             	width: 220px;
             	float: left;
             	margin: 10px;
             	border: 0px solid #fcc !important; }
             .NewDivAntenna {
             	width: 290px;
             	float: left;
             	margin: 10px;
             	border: 0px solid #fcc !important; }
             .titleField {
             	display: block;
             	text-align: center; }
             .txtAntenna, .view-textAntenna {
             	width: 175px;
             	max-width: 180px;
             	height: 160px;
             	max-height: 165px;
             	background: #fdfdfb;
             	border: 2px solid #eee !important;
                 text-align: justify;
                 margin: 0 auto;
                 line-height: 20px; }
             .txtAntenna {
             	padding: 4px;
             }
             .view-textAntenna {
             	padding: 2px;
             	font-family: "Ubuntu";
             	font-size: inherit; }
             .boxAntenna {
             	width: 280px;
             	border: 2px solid #eee !important;
             	text-align: center;
             	display: block;
             	float: left;
             	margin: 0;
             	padding: 0; }
             .lineInputs {
             	width: 262px;
             	text-align: center;
             	line-height: 18px;
             	padding: 0;
             	height: 20px;
             	margin: 0 auto;
             	display: block;
             	border: 0px solid #1cc !important; }
             .lineInputs label {
             	float: left;
             	margin: 0px 2px;
             	border: 0px solid #bbb !important; }
+            .divValuesAntenna, .divValuesTR {
+            	float: left;
+            	display: block;
+            	margin: 0 auto;
+            	border: 0px solid #bbb !important; }
             .divValuesAntenna {
             	width: 230px;
-            	border: 0px solid #bbb !important;
+            	border: 0px solid #bbb !important; }
-            	float: left;
-            	display: block;
+            .divValuesTR {
-            	margin: 0 auto; }
+            	width: 180px;
+            	border: 0px solid #bbb !important; }
-            .divValuesAntenna input[type=text] {
-            	width: 18px;
+            .divValuesAntenna input[type=text], .divValuesTR input[type=text] {
             	border: 0px;
             	border-bottom: 1px solid #666 !important;
-            	line-height: 20px; }
+            	line-height: 20px;
+            }
+            .divValuesAntenna input[type=text] {
+            	width: 18px; }
+            .divValuesTR input[type=text]{
+            	width: 11px;
+            }
             .lblSign {
             	width: 8px;
             	font-family: 'Roboto Condensed', sans-serif;
             	font-size: 1.1em;
             	color: #666; }
             #lblSignLeft, #lblSignRight {
             	margin: 0;
             	line-height: 18px;
             	height: 20px;
             	float: left;
             	padding: 0; }
             .divTx {
             	display: block;
             	float: left;
             	margin: 10px;
             	border: 0px solid #f00 !important; }
             .divTx label {
             	display: block; }
             .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', 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', 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;
             	float: right;
             	margin: 5px 40px 5px 0px;
             	border: 0px solid #1cc !important; }
             #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;
             	margin: 0px 2px;
             	text-align: center;
             	color: #1494F6;
             	border-bottom: 1px solid #1494F6 !important; }
             #infoPattern {
             	display: block;
             	margin: 0px 25px;
             	border: 0px solid #1494f6 !important; }
             #navPatterns {
             	margin: 0 auto;
             	width: 700px;
             	height: 30px;
             	border: 0px solid #d00 !important;
             	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;
             	display: block;
             	text-align: center;
             	line-height: 30px;
             	padding: 1px 0px;
             	border: 0px solid #1cc !important; }
             .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;
             	margin: 0 auto;
             	height: 100%;
             	border: 0px solid #1cc !important; }
             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/new.html +20 -1

             {% 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"> -->
                 <form action="/abscontrol/upgrade/{{ profile_id }}/" 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="lnkSavePattern">Save</a></li>
                         </ul>
                     </nav>
                 </div>
                 <div class="cleardivs"></div>
                 {% endblock %}
                 <div id="divPattern">
                     <div id="antennaUp" class="NewAntenna">
                         <fieldset class="NewFlsAntenna">
                             <legend class="legendAntenna">UP</legend>
                             <div class="NewDivAntenna">
                                 <label for="lblAntenna" class="titleField">Antenna</label>
                                 <div class="boxAntenna" id="divtxtAntenna">
                                 {% for i in range %}
                                 	<div class="lineInputs">
                                 	{% if i == 0 %}<label for="lblSignLeft" class="lblSign" id="lblSignLeft">[</label>{% endif %}
                                 		<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" />
                                 			{% if j != 7 %},{% endif %}
                                 		{% endfor %}
                                 		</div>
                                 		<label for="lblSign" class="lblSign">]</label>
                                 		{% if i == 7 %}<label for="lblSignRight" class="lblSign" id="lblSignRight">]</label>{% endif %}
                                 	</div>
                                 {% endfor %}
                                 </div>
                             </div>
+                            <div class="NewDivTR">
+                            	<label for="lblTx" class="titleField">Tx</label>
+                            	<div class="boxTR" id="divtxtTR">
+                            	{% for i in range %}
+                                	<div class="lineInputsTR">
+                                	{% if i == 0 %}<label for="lblSignLeft" class="lblSign" id="lblSignLeft">[</label>{% endif %}
+                                		<label for="lblSign" class="lblSign">[</label>
+                                		<div class="divValuesTR">
+                                		{% for j in range %}
+                                			<input type="text" name="txtUnitTR" class="txtUnitTR" id="txtUnitTR_{{ i }}_{{ j }}" value="1" />
+                                			{% if j != 7 %},{% endif %}
+                                		{% endfor %}
+                                		</div>
+                                		<label for="lblSign" class="lblSign">]</label>
+                                		{% if i == 7 %}<label for="lblSignRight" class="lblSign" id="lblSignRight">]</label>{% endif %}
+                                	</div>
+                                {% endfor %}
+                            	</div>
+                            </div>
                             <div class="divTx">
-                                <label for="lblTx" class="titleField">Tx</label>
                                 <textarea name="txtTxUp" class="txtTR" cols="18" rows="8">{{ txtTxUp }}</textarea>
                             </div>
                             <div class="divTx">
                                 <label for="lblRx" class="titleField"	>Rx</label>
                                 <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>
                         <input type="hidden" name="txtAntennaUp" value="" />
+                        <input type="hidden" name="txtTxUp" value="" />
                     </div>
                     <div id="antennaDown" class="NewAntenna">
                         <fieldset class="NewFlsAntenna">
                             <legend class="legendAntenna">DOWN</legend>
                             <div class="NewDivAntenna">
                                 <label for="lblAntenna" class="titleField">Antenna</label>
                                 <div class="boxAntenna" id="divtxtAntenna">
                                 {% for i in range %}
                                 	<div class="lineInputs">
                                 	{% if i == 0 %}<label for="lblSignLeft" class="lblSign" id="lblSignLeft">[</label>{% endif %}
                                 		<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" />
                                 			{% if j != 7 %},{% endif %}
                                 		{% endfor %}
                                 		</div>
                                 		<label for="lblSign" class="lblSign">]</label>
                                 		{% if i == 7 %}<label for="lblSignRight" class="lblSign" id="lblSignRight">]</label>{% endif %}
                                 	</div>
                                 {% endfor %}
                                 </div>
                             </div>
                             <div class="divTx">
                                 <label for="lblTx">Tx</label>
                                 <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="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>
                         <input type="hidden" name="txtAntennaDown" value="" />
                     </div>
                 </div>
                 	<input type="hidden" name="mode" value="e">
                 </form>
             </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