# SVN changeset patch
# User jsalyrosas
# Date 2013-05-20 22:46:52.620557
# Revision 181

- Mejorando el diseño de la aplicacion.

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 180)
+++ b/trunk/webapp/abscontrol/views.py	(revision 181)
@@ -269,7 +269,7 @@
     return redirect(newurl)
 
 def importProfile(request):
-    profile_list = Profile.objects.all()
+    profile_list = Profile.objects.filter(state=1)
     return render_to_response('abscontrol/import.html', {'profile_list': profile_list,})
 
 def showImport(request):
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 180)
+++ b/trunk/webapp/static/css/style.css	(revision 181)
@@ -9,9 +9,11 @@
 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 !important; padding: 10px 10px 10px 10px}
-#content {border: 1px solid #1cc; margin-top: 5px; margin-bottom: 5px}
-#content #leftcolumn {float: left;border: 2px solid #f00 !important; width: 160px; }
-#content #maincolumn {float: left; border: 1px solid #000 !important; width: 780px; margin: 0; padding: 0px 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: 0px solid #000 !important; width: 980px; margin: 2px 0px; padding: 0px 0px;
+					  box-shadow: 2px 2px 5px #666;}
 footer {border: 1px solid #200; font-size: 0.9em; height: 30px; text-align: center; line-height: 20px}
 
 .cleardivs {clear: both; border: 0px solid #400; height: 0px}
@@ -29,25 +31,24 @@
 /****************************************************************************************/
 /******                 MENU DE NAVEGACION DE PERFILES **********************************/
 /****************************************************************************************/
-#content #infoProfiles {border: 1px solid #1cc !important; width: 100%; margin: 0px; padding-top: 2px; padding-bottom: 2px}
-.lblInfo {line-height: 20px; padding: 10px 10px 10px 12px; margin: 10px 0}
-#infoProfiles select {padding-left: 0px; line-height: 25px;margin-left: 12px; font-family: 'Droid Sans', sans-serif;
-					   font-size: 11px; letter-spacing: 0.029em;}
-#content nav {border: 0px solid #c55 !important; margin: 0px;}
-
-#leftcolumn #mnuProfiles{ margin: 5px 0px; border: 0px solid #1494F6 !important; }
+#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; border: 0px solid #1494F6 !important; float: left; 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; line-height: 22px}
-#mnuProfiles a{ font-weight: normal; color: #1494F6; display: block; border: 0px solid #1cc !important; text-align: left}
+#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}
 
 /****************************************************************************************/
 /********               FORMULARIO DE PERFILES      *************************************/
 /****************************************************************************************/
-#divProfile { border: 0px solid #dff; margin: 10px 0px; padding: 10px 10px; width: 500px }
-.flsAntenna { margin: 0; width: 750px; padding: 5px }
+#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 {resize: none; overflow: hidden}
-.antenna{ border: 1px solid #1494F6 !important; padding: 5px}
+.antenna{ border: 0px solid #1494F6 !important; padding: 2px; margin: 5px 10px; float: left; width: 480px}
 .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 }
@@ -69,23 +70,24 @@
 .divUes { display: block; margin: 10px}
 .divUes input[type=text] { width: 240px; max-width: 240px; font-family: "Ubuntu"; font-size: inherit;}
 
-.overJRO img{width: 200; height: 145px; text-align: center; vertical-align: middle; margin: 25px 5px 5px 5px;
+.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: left; margin-left: 500px}
-#divMnuPattern li{ float: left; display: block; width: 60px; border: 0px solid #2cc !important}
+#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: 1px solid #1494f6 !important; margin: 5px 2px; }
 
-#navPatterns{ margin: 5px auto; border: 0px solid #d00 !important; width: 700px; height: 30px; 
-              font-family: 'Ubuntu', sans-serif; font-size: 14px; padding: 10px 0px}
-#navPatternList{ margin: 0px auto; border: 1px solid #ecc !important}
+#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}
Index: trunk/webapp/templates/abscontrol/edit.html
===================================================================
diff --git a/trunk/webapp/templates/abscontrol/edit.html b/trunk/webapp/templates/abscontrol/edit.html
--- a/trunk/webapp/templates/abscontrol/edit.html	(revision 180)
+++ b/trunk/webapp/templates/abscontrol/edit.html	(revision 181)
@@ -22,17 +22,32 @@
         <label for="lblName">Profile:</label>
         <label for="lblProfile">{{ objProfile.name }}</label>
     </div>
+    {% 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 %}
-                    <li><a href="#" class="" id="lnkSave">Save</a></li>
-                    {% if lsPatterns|length > 1 %}
-                    <li><a href="/abscontrol/{{ objProfile.id }}/delete/{{ patternChoosen.id }}">Delete</a></li>
                     {% endif %}
                 </ul>
             </nav>
@@ -41,21 +56,7 @@
         {% endblock %}
         {% block pattern %}
         <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 }}/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="antennaUp">
                 <fieldset class="flsAntenna">
                     <legend>UP</legend>
Index: trunk/webapp/templates/abscontrol/editPattern.html
===================================================================
diff --git a/trunk/webapp/templates/abscontrol/editPattern.html b/trunk/webapp/templates/abscontrol/editPattern.html
--- a/trunk/webapp/templates/abscontrol/editPattern.html	(revision 180)
+++ b/trunk/webapp/templates/abscontrol/editPattern.html	(revision 181)
@@ -4,11 +4,11 @@
 <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 %}
-            <li><a href="#" id="lnkSave">Save</a></li>
-            <li><a href="#" id="lnkCancel">Delete</a></li>
         </ul>
     </nav>
 </div>
@@ -16,20 +16,6 @@
 {% endblock %}
 {% block pattern %}
 <div id="infoPattern">
-	<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>
-    <div class="cleardivs"></div>
     <form action="/abscontrol/{{ objProfile.id }}/save/" id="frmPattern" method="post">
     <div id="antennaUp">
         <fieldset class="flsAntenna">
Index: trunk/webapp/templates/abscontrol/index.html
===================================================================
diff --git a/trunk/webapp/templates/abscontrol/index.html b/trunk/webapp/templates/abscontrol/index.html
--- a/trunk/webapp/templates/abscontrol/index.html	(revision 180)
+++ b/trunk/webapp/templates/abscontrol/index.html	(revision 181)
@@ -8,11 +8,11 @@
 {% endblock %}
 {% block content %}
 <div id="content">
-    {% block leftcolumn %}
-    <div id="leftcolumn">
+    {% block topcolumn %}
+    <div id="topcolumn">
         <div id="lsProfiles">
             <div id="infoProfiles">
-                <label for="lblProfile" class="lblInfo">Profiles:</label><br />
+                <label for="lblProfile" class="lblInfo">Profiles: </label>
                 {% if profile_list %}
                 <select name="lsProfiles" id="listProfiles">
                     <option value="-1">Choose ...</option>
@@ -34,7 +34,8 @@
             </div>
         </div>
         {% block mnu_profile %}
-        <nav class="MnuVertical" id="mnuProfiles">
+        <div id="mnuProfiles">
+        <nav class="MnuVertical" id="navProfiles">
             <ul>
                 <li><a href="/abscontrol/new">New</a></li>
                 {% if objProfile %}
@@ -48,8 +49,11 @@
                 <li><a href="#" id="lnkSendFile" alt="{{ objProfile.id }}">Send</a></li>
                 {% endif %}
             </ul>
+            <div class="cleardivs"></div>
         </nav>
+        </div>
         {% endblock %}
+        <div class="cleardivs"></div>
     </div>
     {% endblock %}
     {% block maincolumn %}
Index: trunk/webapp/templates/abscontrol/view.html
===================================================================
diff --git a/trunk/webapp/templates/abscontrol/view.html b/trunk/webapp/templates/abscontrol/view.html
--- a/trunk/webapp/templates/abscontrol/view.html	(revision 180)
+++ b/trunk/webapp/templates/abscontrol/view.html	(revision 181)
@@ -23,33 +23,34 @@
         <label for="lblName">Profile:</label>
         <label for="lblProfile">{{ objProfile.name }}</label>
     </div>
+    {% 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">
-    	{% 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="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">
                 <fieldset class="flsAntenna">
                     <legend>UP</legend>
@@ -78,13 +79,14 @@
                             <label for="lblOnlyRx">Only RX</label>
                         </div>
                     </div>
-                    <div class="overJRO">
-                        <img />
-                        <a href="#" class="activeOverJRO" id="Up">Preview</a>
-                    </div>
-                    <div class="cleardivs"></div>
-                </fieldset>
+               	</fieldset>
+            </div>   	
+            <div class="overJRO">
+                <img />
+                <a href="#" class="activeOverJRO" id="Up">Preview</a>
             </div>
+            <div class="cleardivs"></div>
+            
             <div id="antennaDown" class="antenna">
                 <fieldset class="flsAntenna">
                     <legend>DOWN</legend>
@@ -113,13 +115,14 @@
                             <label for="lblOnlyRx">Only RX</label>
                         </div>
                     </div>
-                    <div class="overJRO">
-                        <img />
-                        <a href="#" class="activeOverJRO" id="Down">Preview</a>
-                    </div>
-                    <div class="cleardivs"></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 }}"/>
Index: trunk/webapp/templates/base.html
===================================================================
diff --git a/trunk/webapp/templates/base.html b/trunk/webapp/templates/base.html
--- a/trunk/webapp/templates/base.html	(revision 180)
+++ b/trunk/webapp/templates/base.html	(revision 181)
@@ -28,7 +28,7 @@
             <header>
                 {% block header %}
                 <nav>
-                  <a href="/abscontrol">ABS</a> |
+                  <a href="/abscontrol/">ABS</a> |
                   <a href="#">CR</a> |
                   <a href="#">DDS</a> |
                   <a href="#">JARS</a>
@@ -36,12 +36,7 @@
                 {% endblock %}
             </header>
             {% block content %}
-            <div id="content">
-                <nav>
-                    <p><a href="/">Home</a></p>
-                    <p><a href="/contact">Contact</a></p>
-                </nav>
-            </div>
+            <div id="content"></div>
             {% endblock %}
             <footer>
                 {% block footer %}