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

             /********               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 }
             .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;}
             #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}
             		  	  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 									*************/
             /****************************************************************************************/

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

             <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">
                         </div>
                     </fieldset>
                 </div>
-                <div id="antennaDown">
+                <div id="antennaDown" class="antenna">
                     <fieldset class="flsAntenna">
                         <legend>DOWN</legend>
                         <div class="divAntenna">

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

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

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

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

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

                 <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">
                             </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">
                             </div>
                         </fieldset>
                     </div>
-                    <div id="antennaDown">
+                    <div id="antennaDown" class="antenna">
                         <fieldset class="flsAntenna">
                             <legend>DOWN</legend>
                             <div class="divAntenna">
                             </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">

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

                 {% 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>
                         <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">

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

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

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