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)
   No newline at end of file
             def importProfile(request):
                 profile_list = Profile.objects.filter(state=1)
  No newline at end of file
-                profile_list = Profile.objects.all()
  No newline at end of file
                 return render_to_response('abscontrol/import.html', {'profile_list': profile_list,})
   No newline at end of file
             def showImport(request):

trunk/webapp/static/css/style.css +5 -3

             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: 0px solid #1cc; margin-top: 5px; margin-bottom: 5px}
-            #content {border: 1px solid #1cc; margin-top: 5px; margin-bottom: 5px}
+             No newline at end of file
             #content #topcolumn {float: left;border: 1px solid #ddd !important; width: 980px; height: 40px; line-height: 35px;
-            #content #leftcolumn {float: left;border: 2px solid #f00 !important; width: 160px; }
+             No newline at end of file
             					 margin: 2px 0px; box-shadow: 2px 2px 5px #888;}
-            #content #maincolumn {float: left; border: 1px solid #000 !important; width: 780px; margin: 0; padding: 0px 10px }
  No newline at end of file
+             No newline at end of file
+            #content #maincolumn {float: left; border: 0px solid #000 !important; width: 980px; margin: 2px 0px; padding: 0px 0px;
              No newline at end of file
+            					  box-shadow: 2px 2px 5px #666;}
  No newline at end of file
             footer {border: 1px solid #200; font-size: 0.9em; height: 30px; text-align: center; line-height: 20px}
   No newline at end of file
             .cleardivs {clear: both; border: 0px solid #400; height: 0px}

trunk/webapp/templates/abscontrol/edit.html 0 -19

@@ -22,25 +22,6
22	<label for="lblName">Profile:</label> No newline at end of file	22	<label for="lblName">Profile:</label>
23	<label for="lblProfile">{{ objProfile.name }}</label> No newline at end of file	23	<label for="lblProfile">{{ objProfile.name }}</label>
24	</div>	24	</div>
	No newline at end of file
25	<div id="divPattern">
	No newline at end of file
26	{% block mnuPattern %}
	No newline at end of file
27	<div class="divMenu" id="divMnuPattern">
	No newline at end of file
28	<nav class="MnuHorizontal">
	No newline at end of file
29	<ul class="mnu" id="mnuPattern">
	No newline at end of file
30	{% if lsPatterns\|length < 10 %}
	No newline at end of file
31	<li><a href="/abscontrol/{{ objProfile.id }}/add">Add</a></li>
	No newline at end of file
32	{% endif %}
	No newline at end of file
33	<li><a href="#" class="" id="lnkSave">Save</a></li>
	No newline at end of file
34	{% if lsPatterns\|length > 1 %}
	No newline at end of file
35	<li><a href="/abscontrol/{{ objProfile.id }}/delete/{{ patternChoosen.id }}">Delete</a></li>
	No newline at end of file
36	{% endif %}
	No newline at end of file
37	</ul>
	No newline at end of file
38	</nav>
	No newline at end of file
39	</div>
	No newline at end of file
40	<div class="cleardivs"></div>
	No newline at end of file
41	{% endblock %}
	No newline at end of file
42	{% block pattern %}
	No newline at end of file
43	<div id="infoPattern"> No newline at end of file
44	{% if patternChoosen %} No newline at end of file	25	{% if patternChoosen %}
45	<div id="navPatterns"> No newline at end of file	26	<div id="navPatterns">
46	<nav class="" id="navPatternList"> No newline at end of file	27	<nav class="" id="navPatternList">

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

             <div class="divMenu" id="divMnuPattern">
                 <nav class="MnuHorizontal">
                     <ul class="mnu" id="mnuPattern">
+                    	<li><a href="#" id="lnkCancel">Delete</a></li>
              No newline at end of file
+                    	<li><a href="#" id="lnkSave">Save</a></li>
  No newline at end of file
                     	{% if lsPatterns|length < 10 %}
                     	<li><a href="#" id="lnkAdd">Add</a></li>
                     	{% endif %}
              No newline at end of file
-                        <li><a href="#" id="lnkSave">Save</a></li>
              No newline at end of file
-                        <li><a href="#" id="lnkCancel">Delete</a></li>
  No newline at end of file
                     </ul>
                 </nav>
             </div>

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

             {% endblock %}
             {% block content %}
             <div id="content">
                 {% block topcolumn %}
-                {% block leftcolumn %}
+             No newline at end of file
                 <div id="topcolumn">
  No newline at end of file
-                <div id="leftcolumn">
  No newline at end of file
                     <div id="lsProfiles">
                         <div id="infoProfiles">
                             <label for="lblProfile" class="lblInfo">Profiles: </label>
  No newline at end of file
-                            <label for="lblProfile" class="lblInfo">Profiles:</label><br />
  No newline at end of file
                             {% if profile_list %}
                             <select name="lsProfiles" id="listProfiles">
                                 <option value="-1">Choose ...</option>

trunk/webapp/templates/abscontrol/view.html 0 -12

@@ -23,18 +23,6
23	<label for="lblName">Profile:</label> No newline at end of file	23	<label for="lblName">Profile:</label>
24	<label for="lblProfile">{{ objProfile.name }}</label> No newline at end of file	24	<label for="lblProfile">{{ objProfile.name }}</label>
25	</div>	25	</div>
	No newline at end of file
26	<div id="divPattern">
	No newline at end of file
27	{% block mnuPattern %}
	No newline at end of file
28	<div class="divMenu" id="divMnuPattern">
	No newline at end of file
29	<nav class="MnuHorizontal">
	No newline at end of file
30	<ul class="mnu" id="mnuPattern">
	No newline at end of file
31	<li><a href="#">Apply</a></li>
	No newline at end of file
32	</ul>
	No newline at end of file
33	</nav>
	No newline at end of file
34	</div>
	No newline at end of file
35	<div class="cleardivs"></div>
	No newline at end of file
36	{% endblock %}
	No newline at end of file
37	<div id="infoPattern"> No newline at end of file
38	{% if patternChoosen %} No newline at end of file	26	{% if patternChoosen %}
39	<div id="navPatterns"> No newline at end of file	27	<div id="navPatterns">
40	<nav class="" id="navPatternList"> No newline at end of file	28	<nav class="" id="navPatternList">

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

                         <header>
                             {% block header %}
                             <nav>
                               <a href="/abscontrol/">ABS</a> |
  No newline at end of file
-                              <a href="/abscontrol">ABS</a> |
  No newline at end of file
                               <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