ABS/abscontrol Commit - r180:181 · Jicamarca Repository

- Mejorando el diseño de la aplicacion.

jsalyrosas -

r180:181

parent child

Context file:

r180:181

Collapse all files

trunk/webapp/abscontrol/views.py +1 -1

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

trunk/webapp/static/css/style.css +24 -22

             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 {border: 0px solid #1cc; margin-top: 5px; margin-bottom: 5px}
-            #content #leftcolumn {float: left;border: 2px solid #f00 !important; width: 160px; }
+            #content #topcolumn {float: left;border: 1px solid #ddd !important; width: 980px; height: 40px; line-height: 35px;
-            #content #maincolumn {float: left; border: 1px solid #000 !important; width: 780px; margin: 0; padding: 0px 10px }
+            					 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}
             /****************************************************************************************/
             /******                 MENU DE NAVEGACION DE PERFILES **********************************/
             /****************************************************************************************/
-            #content #infoProfiles {border: 1px solid #1cc !important; width: 100%; margin: 0px; padding-top: 2px; padding-bottom: 2px}
+            #infoProfiles {border: 0px solid #1cc !important; width: 300px; margin: 0px; padding-top: 2px; padding-bottom: 2px;
-            .lblInfo {line-height: 20px; padding: 10px 10px 10px 12px; margin: 10px 0}
+            			   float: left;}
-            #infoProfiles select {padding-left: 0px; line-height: 25px;margin-left: 12px; font-family: 'Droid Sans', sans-serif;
+            #infoProfiles label {padding: 10px 10px 10px 12px; margin: 10px 0}
-            					   font-size: 11px; letter-spacing: 0.029em;}
+            #infoProfiles select {padding: 4px 0px; margin: 0; font-family: 'Droid Sans', sans-serif;
-            #content nav {border: 0px solid #c55 !important; margin: 0px;}
+            					   font-size: 12px; letter-spacing: 0.029em; width: 200px;}
+            #mnuProfiles{margin: 0px; border: 0px solid #1494F6 !important; float: left; padding: 2px 10px}
-            #leftcolumn #mnuProfiles{ margin: 5px 0px; 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; padding: 2px; border: 0px solid #c55 !important; line-height: 22px}
+            #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: 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 }
+            #divProfile { border: 0px solid #dff !important; margin: 10px 0px; padding: 10px 10px; width: 500px }
-            .flsAntenna { margin: 0; width: 750px; padding: 5px }
+            .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 }
             .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{ width: 280px; height: 25px; display: block; border: 0px solid #1cc !important; float: right;
-            #divMnuPattern li{ float: left; display: block; width: 60px; border: 0px solid #2cc !important}
+            				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;
+            #navPatterns{ margin: 0 auto; border: 0px solid #d00 !important; width: 700px; height: 30px;
-                          font-family: 'Ubuntu', sans-serif; font-size: 14px; padding: 10px 0px}
+                          font-family: 'Ubuntu', sans-serif; font-size: 14px; padding: 5px 0px}
-            #navPatternList{ margin: 0px auto; border: 1px solid #ecc !important}
+            #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}

trunk/webapp/templates/abscontrol/edit.html +20 -19

@@ -22,17 +22,32
22	<label for="lblName">Profile:</label>	22	<label for="lblName">Profile:</label>
23	<label for="lblProfile">{{ objProfile.name }}</label>	23	<label for="lblProfile">{{ objProfile.name }}</label>
24	</div>	24	</div>
		25	{% if patternChoosen %}
		26	<div id="navPatterns">
		27	<nav class="" id="navPatternList">
		28	<ul>
		29	{% for element in lsPatterns %}
		30	{% if patternChoosen.id == element.id %}
		31	<li><a href="/abscontrol/{{ objProfile.id }}/edit/{{ element.id }}" class="lnkPatternSelected">{{ element.value }}</a></li>
		32	{% else %}
		33	<li><a href="/abscontrol/{{ objProfile.id }}/edit/{{ element.id }}" class="lnkPattern">{{ element.value }}</a></li>
		34	{% endif %}
		35	{% endfor %}
		36	</ul>
		37	</nav>
		38	</div>
		39	{% endif %}
25	<div id="divPattern">	40	<div id="divPattern">
26	{% block mnuPattern %}	41	{% block mnuPattern %}
27	<div class="divMenu" id="divMnuPattern">	42	<div class="divMenu" id="divMnuPattern">
28	<nav class="MnuHorizontal">	43	<nav class="MnuHorizontal">
29	<ul class="mnu" id="mnuPattern">	44	<ul class="mnu" id="mnuPattern">
		45	{% if lsPatterns\|length > 1 %}
		46	<li><a href="/abscontrol/{{ objProfile.id }}/delete/{{ patternChoosen.id }}">Delete</a></li>
		47	{% endif %}
		48	<li><a href="#" class="" id="lnkSave">Save</a></li>
30	{% if lsPatterns\|length < 10 %}	49	{% if lsPatterns\|length < 10 %}
31	<li><a href="/abscontrol/{{ objProfile.id }}/add">Add</a></li>	50	<li><a href="/abscontrol/{{ objProfile.id }}/add">Add</a></li>
32	{% endif %}
33	<li><a href="#" class="" id="lnkSave">Save</a></li>
34	{% if lsPatterns\|length > 1 %}
35	<li><a href="/abscontrol/{{ objProfile.id }}/delete/{{ patternChoosen.id }}">Delete</a></li>
36	{% endif %}	51	{% endif %}
37	</ul>	52	</ul>
38	</nav>	53	</nav>
@@ -41,21 +56,7
41	{% endblock %}	56	{% endblock %}
42	{% block pattern %}	57	{% block pattern %}
43	<div id="infoPattern">	58	<div id="infoPattern">
44	{% if patternChoosen %}	59
45	<div id="navPatterns">
46	<nav class="" id="navPatternList">
47	<ul>
48	{% for element in lsPatterns %}
49	{% if patternChoosen.id == element.id %}
50	<li><a href="/abscontrol/{{ objProfile.id }}/edit/{{ element.id }}" class="lnkPatternSelected">{{ element.value }}</a></li>
51	{% else %}
52	<li><a href="/abscontrol/{{ objProfile.id }}/edit/{{ element.id }}" class="lnkPattern">{{ element.value }}</a></li>
53	{% endif %}
54	{% endfor %}
55	</ul>
56	</nav>
57	</div>
58	{% endif %}
59	<div id="antennaUp">	60	<div id="antennaUp">
60	<fieldset class="flsAntenna">	61	<fieldset class="flsAntenna">
61	<legend>UP</legend>	62	<legend>UP</legend>

trunk/webapp/templates/abscontrol/editPattern.html +2 -16

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

trunk/webapp/templates/abscontrol/index.html +8 -4

             {% endblock %}
             {% block content %}
             <div id="content">
-                {% block leftcolumn %}
+                {% block topcolumn %}
-                <div id="leftcolumn">
+                <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>
                         </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 %}
                             <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 %}

trunk/webapp/templates/abscontrol/view.html +39 -36

@@ -23,33 +23,34
23	<label for="lblName">Profile:</label>	23	<label for="lblName">Profile:</label>
24	<label for="lblProfile">{{ objProfile.name }}</label>	24	<label for="lblProfile">{{ objProfile.name }}</label>
25	</div>	25	</div>
		26	{% if patternChoosen %}
		27	<div id="navPatterns">
		28	<nav class="" id="navPatternList">
		29	<ul>
		30	{% for element in lsPatterns %}
		31	{% if patternChoosen.id == element.id %}
		32	<li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}/" class="lnkPatternSelected">{{ element.value }}</a></li>
		33	{% else %}
		34	<li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}/" class="lnkPattern">{{ element.value }}</a></li>
		35	{% endif %}
		36	{% endfor %}
		37	</ul>
		38	<div class="cleardivs"></div>
		39	</nav>
		40	</div>
		41	{% endif %}
		42	{% block mnuPattern %}
		43	<div class="divMenu" id="divMnuPattern">
		44	<nav class="MnuHorizontal">
		45	<ul class="mnu" id="mnuPattern">
		46	<li><a href="#">Apply</a></li>
		47	</ul>
		48	</nav>
		49	</div>
		50	<div class="cleardivs"></div>
		51	{% endblock %}
26	<div id="divPattern">	52	<div id="divPattern">
27	{% block mnuPattern %}
28	<div class="divMenu" id="divMnuPattern">
29	<nav class="MnuHorizontal">
30	<ul class="mnu" id="mnuPattern">
31	<li><a href="#">Apply</a></li>
32	</ul>
33	</nav>
34	</div>
35	<div class="cleardivs"></div>
36	{% endblock %}
37	<div id="infoPattern">	53	<div id="infoPattern">
38	{% if patternChoosen %}
39	<div id="navPatterns">
40	<nav class="" id="navPatternList">
41	<ul>
42	{% for element in lsPatterns %}
43	{% if patternChoosen.id == element.id %}
44	<li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}/" class="lnkPatternSelected">{{ element.value }}</a></li>
45	{% else %}
46	<li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}/" class="lnkPattern">{{ element.value }}</a></li>
47	{% endif %}
48	{% endfor %}
49	</ul>
50	</nav>
51	</div>
52	{% endif %}
53	<div id="antennaUp" class="antenna">	54	<div id="antennaUp" class="antenna">
54	<fieldset class="flsAntenna">	55	<fieldset class="flsAntenna">
55	<legend>UP</legend>	56	<legend>UP</legend>
@@ -78,13 +79,14
78	<label for="lblOnlyRx">Only RX</label>	79	<label for="lblOnlyRx">Only RX</label>
79	</div>	80	</div>
80	</div>	81	</div>
81	<div class="overJRO">	82	</fieldset>
82	<img />	83	</div>
83	<a href="#" class="activeOverJRO" id="Up">Preview</a>	84	<div class="overJRO">
84	</~~div~~>	85	<img />
85	<div class="cleardivs"></div>	86	<a href="#" class="activeOverJRO" id="Up">Preview</a>
86	</fieldset>
87	</div>	87	</div>
		88	<div class="cleardivs"></div>
		89
88	<div id="antennaDown" class="antenna">	90	<div id="antennaDown" class="antenna">
89	<fieldset class="flsAntenna">	91	<fieldset class="flsAntenna">
90	<legend>DOWN</legend>	92	<legend>DOWN</legend>
@@ -113,13 +115,14
113	<label for="lblOnlyRx">Only RX</label>	115	<label for="lblOnlyRx">Only RX</label>
114	</div>	116	</div>
115	</div>	117	</div>
116	<~~div~~ ~~class~~=~~"overJRO"~~>	118
117	<img />
118	<a href="#" class="activeOverJRO" id="Down">Preview</a>
119	</div>
120	<div class="cleardivs"></div>
121	</fieldset>	119	</fieldset>
122	</div>	120	</div>
		121	<div class="overJRO">
		122	<img />
		123	<a href="#" class="activeOverJRO" id="Down">Preview</a>
		124	</div>
		125	<div class="cleardivs"></div>
123	</div>	126	</div>
124	<input type="hidden" name="txtAntennaUpId" value="{{ antennaUp.id }}"/>	127	<input type="hidden" name="txtAntennaUpId" value="{{ antennaUp.id }}"/>
125	<input type="hidden" name="txtAntennaDownId" value="{{ antennaDown.id }}"/>	128	<input type="hidden" name="txtAntennaDownId" value="{{ antennaDown.id }}"/>

trunk/webapp/templates/base.html +2 -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>
                             {% endblock %}
                         </header>
                         {% block content %}
-                        <div id="content">
+                        <div id="content"></div>
-                            <nav>
-                                <p><a href="/">Home</a></p>
-                                <p><a href="/contact">Contact</a></p>
-                            </nav>
-                        </div>
                         {% endblock %}
                         <footer>
                             {% block footer %}

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