| @@ -269,7 +269,7 | |||
|
|
269 | 269 | return redirect(newurl) |
|
|
270 | 270 | |
|
|
271 | 271 | def importProfile(request): |
|
|
272 |
profile_list = Profile.objects. |
|
|
|
272 | profile_list = Profile.objects.filter(state=1) | |
|
|
273 | 273 | return render_to_response('abscontrol/import.html', {'profile_list': profile_list,}) |
|
|
274 | 274 | |
|
|
275 | 275 | def showImport(request): |
| @@ -9,9 +9,11 | |||
|
|
9 | 9 | body { font-size: 12px; } |
|
|
10 | 10 | header {border: 1px solid #fcc; font-size: 2em; height: 50px; text-align: center; line-height: 50px} |
|
|
11 | 11 | #schema {margin: 0 auto; width: 980px; border: 1px solid #f00 !important; padding: 10px 10px 10px 10px} |
|
|
12 |
#content {border: |
|
|
|
13 |
#content # |
|
|
|
14 | #content #maincolumn {float: left; border: 1px solid #000 !important; width: 780px; margin: 0; padding: 0px 10px } | |
|
|
12 | #content {border: 0px solid #1cc; margin-top: 5px; margin-bottom: 5px} | |
|
|
13 | #content #topcolumn {float: left;border: 1px solid #ddd !important; width: 980px; height: 40px; line-height: 35px; | |
|
|
14 | margin: 2px 0px; box-shadow: 2px 2px 5px #888;} | |
|
|
15 | #content #maincolumn {float: left; border: 0px solid #000 !important; width: 980px; margin: 2px 0px; padding: 0px 0px; | |
|
|
16 | box-shadow: 2px 2px 5px #666;} | |
|
|
15 | 17 | footer {border: 1px solid #200; font-size: 0.9em; height: 30px; text-align: center; line-height: 20px} |
|
|
16 | 18 | |
|
|
17 | 19 | .cleardivs {clear: both; border: 0px solid #400; height: 0px} |
| @@ -29,25 +31,24 | |||
|
|
29 | 31 | /****************************************************************************************/ |
|
|
30 | 32 | /****** MENU DE NAVEGACION DE PERFILES **********************************/ |
|
|
31 | 33 | /****************************************************************************************/ |
|
|
32 |
|
|
|
|
33 | .lblInfo {line-height: 20px; padding: 10px 10px 10px 12px; margin: 10px 0} | |
|
|
34 | #infoProfiles select {padding-left: 0px; line-height: 25px;margin-left: 12px; font-family: 'Droid Sans', sans-serif; | |
|
|
35 | font-size: 11px; letter-spacing: 0.029em;} | |
|
|
36 | #content nav {border: 0px solid #c55 !important; margin: 0px;} | |
|
|
37 | ||
|
|
38 | #leftcolumn #mnuProfiles{ margin: 5px 0px; border: 0px solid #1494F6 !important; } | |
|
|
34 | #infoProfiles {border: 0px solid #1cc !important; width: 300px; margin: 0px; padding-top: 2px; padding-bottom: 2px; | |
|
|
35 | float: left;} | |
|
|
36 | #infoProfiles label {padding: 10px 10px 10px 12px; margin: 10px 0} | |
|
|
37 | #infoProfiles select {padding: 4px 0px; margin: 0; font-family: 'Droid Sans', sans-serif; | |
|
|
38 | font-size: 12px; letter-spacing: 0.029em; width: 200px;} | |
|
|
39 | #mnuProfiles{margin: 0px; border: 0px solid #1494F6 !important; float: left; padding: 2px 10px} | |
|
|
39 | 40 | #mnuProfiles ul{list-style: none; list-style-type: none; margin: 0; padding-left: 20px; border: 0px solid #f00 !important} |
|
|
40 |
#mnuProfiles li{ width: 80px; padding: 2px; border: 0px solid #c55 !important; |
|
|
|
41 |
#mnuProfiles a{ font-weight: normal; color: #1494F6; display: block; border: 0px solid #1cc !important; text-align: |
|
|
|
41 | #mnuProfiles li{ width: 80px; padding: 2px; border: 0px solid #c55 !important; float: left; } | |
|
|
42 | #mnuProfiles a{ font-weight: normal; color: #1494F6; display: block; border: 0px solid #1cc !important; text-align: center} | |
|
|
42 | 43 | |
|
|
43 | 44 | /****************************************************************************************/ |
|
|
44 | 45 | /******** FORMULARIO DE PERFILES *************************************/ |
|
|
45 | 46 | /****************************************************************************************/ |
|
|
46 | #divProfile { border: 0px solid #dff; margin: 10px 0px; padding: 10px 10px; width: 500px } | |
|
|
47 |
.flsAntenna { margin: 0; width: |
|
|
|
47 | #divProfile { border: 0px solid #dff !important; margin: 10px 0px; padding: 10px 10px; width: 500px } | |
|
|
48 | .flsAntenna { margin: 0; width: 100%; padding: 0px; border: 0px solid #f00 !important } | |
|
|
48 | 49 | #divPattern textarea,input[type=text],label{ font-family: "Open Sans"; font-size: inherit; } |
|
|
49 | 50 | #divPattern textarea {resize: none; overflow: hidden} |
|
|
50 |
.antenna{ border: |
|
|
|
51 | .antenna{ border: 0px solid #1494F6 !important; padding: 2px; margin: 5px 10px; float: left; width: 480px} | |
|
|
51 | 52 | .infoAntenna{ border: 0px solid #f00 !important; width: 480px; float: left} |
|
|
52 | 53 | .overJRO{ border: 0px solid #1cc !important; width: 250px; float: left; margin: 0px 5px} |
|
|
53 | 54 | .divAntenna { float: left; margin: 10px; border: 0px solid #fcc !important; width: 190px } |
| @@ -69,23 +70,24 | |||
|
|
69 | 70 | .divUes { display: block; margin: 10px} |
|
|
70 | 71 | .divUes input[type=text] { width: 240px; max-width: 240px; font-family: "Ubuntu"; font-size: inherit;} |
|
|
71 | 72 | |
|
|
72 |
.overJRO img{width: |
|
|
|
73 | .overJRO img{width: 400px; height: 200px; text-align: center; vertical-align: middle; margin: 40px 5px 5px 5px; | |
|
|
73 | 74 | display: block; background: #fdfdfb; border: 1px solid #eee !important;} |
|
|
74 | 75 | .overJRO a{ text-align: center; margin: 0 auto; display: block} |
|
|
75 | 76 | |
|
|
76 | 77 | /****************************************************************************************/ |
|
|
77 | 78 | /****** MENU DE NAVEGACION DE PATRONES **********************************/ |
|
|
78 | 79 | /****************************************************************************************/ |
|
|
79 |
#divMnuPattern{ width: 280px; height: 25px; display: block; border: 0px solid #1cc !important; float: |
|
|
|
80 | #divMnuPattern li{ float: left; display: block; width: 60px; border: 0px solid #2cc !important} | |
|
|
80 | #divMnuPattern{ width: 280px; height: 25px; display: block; border: 0px solid #1cc !important; float: right; | |
|
|
81 | margin: 5px 40px 5px 0px;} | |
|
|
82 | #divMnuPattern li{ float: right; display: block; width: 60px; border: 0px solid #2cc !important} | |
|
|
81 | 83 | #divMnuPattern a{ display: block; line-height: 22px; text-decoration: none; padding: 0px 5px; |
|
|
82 | 84 | border-bottom: 1px solid #1494F6 !important; margin: 0px 2px; text-align: center; color: #1494F6 |
|
|
83 | 85 | } |
|
|
84 |
#infoPattern{ display: block; border: 1px solid #1494f6 !important |
|
|
|
86 | #infoPattern{ display: block; border: 1px solid #1494f6 !important; margin: 5px 2px; } | |
|
|
85 | 87 | |
|
|
86 |
#navPatterns{ margin: |
|
|
|
87 |
font-family: 'Ubuntu', sans-serif; font-size: 14px; padding: |
|
|
|
88 |
#navPatternList{ margin: 0 |
|
|
|
88 | #navPatterns{ margin: 0 auto; border: 0px solid #d00 !important; width: 700px; height: 30px; | |
|
|
89 | font-family: 'Ubuntu', sans-serif; font-size: 14px; padding: 5px 0px} | |
|
|
90 | #navPatternList{ margin: 0 auto; border: 0px solid #ecc !important} | |
|
|
89 | 91 | #navPatternList ul{ list-style: none; list-style-type: none; margin: 0;} |
|
|
90 | 92 | #navPatternList ul li{ float: left; width: 50px; border: 1px solid #eee !important; } |
|
|
91 | 93 | #navPatternList a{ width: 50px; border: 0px solid #1cc !important; display: block; text-align: center; line-height: 30px; padding: 1px 0px} |
| @@ -22,17 +22,32 | |||
|
|
22 | 22 | <label for="lblName">Profile:</label> |
|
|
23 | 23 | <label for="lblProfile">{{ objProfile.name }}</label> |
|
|
24 | 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 | 40 | <div id="divPattern"> |
|
|
26 | 41 | {% block mnuPattern %} |
|
|
27 | 42 | <div class="divMenu" id="divMnuPattern"> |
|
|
28 | 43 | <nav class="MnuHorizontal"> |
|
|
29 | 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 | 49 | {% if lsPatterns|length < 10 %} |
|
|
31 | 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 | 51 | {% endif %} |
|
|
37 | 52 | </ul> |
|
|
38 | 53 | </nav> |
| @@ -41,21 +56,7 | |||
|
|
41 | 56 | {% endblock %} |
|
|
42 | 57 | {% block pattern %} |
|
|
43 | 58 | <div id="infoPattern"> |
|
|
44 | {% if patternChoosen %} | |
|
|
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 | ||
|
|
59 | 60 | <div id="antennaUp"> |
|
|
60 | 61 | <fieldset class="flsAntenna"> |
|
|
61 | 62 | <legend>UP</legend> |
| @@ -4,11 +4,11 | |||
|
|
4 | 4 | <div class="divMenu" id="divMnuPattern"> |
|
|
5 | 5 | <nav class="MnuHorizontal"> |
|
|
6 | 6 | <ul class="mnu" id="mnuPattern"> |
|
|
7 | <li><a href="#" id="lnkCancel">Delete</a></li> | |
|
|
8 | <li><a href="#" id="lnkSave">Save</a></li> | |
|
|
7 | 9 | {% if lsPatterns|length < 10 %} |
|
|
8 | 10 | <li><a href="#" id="lnkAdd">Add</a></li> |
|
|
9 | 11 | {% endif %} |
|
|
10 | <li><a href="#" id="lnkSave">Save</a></li> | |
|
|
11 | <li><a href="#" id="lnkCancel">Delete</a></li> | |
|
|
12 | 12 | </ul> |
|
|
13 | 13 | </nav> |
|
|
14 | 14 | </div> |
| @@ -16,20 +16,6 | |||
|
|
16 | 16 | {% endblock %} |
|
|
17 | 17 | {% block pattern %} |
|
|
18 | 18 | <div id="infoPattern"> |
|
|
19 | <div id="navPatterns"> | |
|
|
20 | <nav class="" id="navPatternList"> | |
|
|
21 | <ul> | |
|
|
22 | {% for element in lsPatterns %} | |
|
|
23 | {% if patternChoosen.id == element.id %} | |
|
|
24 | <li><a href="/abscontrol/{{ objProfile.id }}/edit/{{ element.id }}" class="lnkPatternSelected">{{ element.value }}</a></li> | |
|
|
25 | {% else %} | |
|
|
26 | <li><a href="/abscontrol/{{ objProfile.id }}/edit/{{ element.id }}" class="lnkPattern">{{ element.value }}</a></li> | |
|
|
27 | {% endif %} | |
|
|
28 | {% endfor %} | |
|
|
29 | </ul> | |
|
|
30 | </nav> | |
|
|
31 | </div> | |
|
|
32 | <div class="cleardivs"></div> | |
|
|
33 | 19 | <form action="/abscontrol/{{ objProfile.id }}/save/" id="frmPattern" method="post"> |
|
|
34 | 20 | <div id="antennaUp"> |
|
|
35 | 21 | <fieldset class="flsAntenna"> |
| @@ -8,11 +8,11 | |||
|
|
8 | 8 | {% endblock %} |
|
|
9 | 9 | {% block content %} |
|
|
10 | 10 | <div id="content"> |
|
|
11 |
{% block |
|
|
|
12 |
<div id=" |
|
|
|
11 | {% block topcolumn %} | |
|
|
12 | <div id="topcolumn"> | |
|
|
13 | 13 | <div id="lsProfiles"> |
|
|
14 | 14 | <div id="infoProfiles"> |
|
|
15 |
<label for="lblProfile" class="lblInfo">Profiles:</label> |
|
|
|
15 | <label for="lblProfile" class="lblInfo">Profiles: </label> | |
|
|
16 | 16 | {% if profile_list %} |
|
|
17 | 17 | <select name="lsProfiles" id="listProfiles"> |
|
|
18 | 18 | <option value="-1">Choose ...</option> |
| @@ -34,7 +34,8 | |||
|
|
34 | 34 | </div> |
|
|
35 | 35 | </div> |
|
|
36 | 36 | {% block mnu_profile %} |
|
|
37 |
< |
|
|
|
37 | <div id="mnuProfiles"> | |
|
|
38 | <nav class="MnuVertical" id="navProfiles"> | |
|
|
38 | 39 | <ul> |
|
|
39 | 40 | <li><a href="/abscontrol/new">New</a></li> |
|
|
40 | 41 | {% if objProfile %} |
| @@ -48,8 +49,11 | |||
|
|
48 | 49 | <li><a href="#" id="lnkSendFile" alt="{{ objProfile.id }}">Send</a></li> |
|
|
49 | 50 | {% endif %} |
|
|
50 | 51 | </ul> |
|
|
52 | <div class="cleardivs"></div> | |
|
|
51 | 53 | </nav> |
|
|
54 | </div> | |
|
|
52 | 55 | {% endblock %} |
|
|
56 | <div class="cleardivs"></div> | |
|
|
53 | 57 | </div> |
|
|
54 | 58 | {% endblock %} |
|
|
55 | 59 | {% block maincolumn %} |
| @@ -23,33 +23,34 | |||
|
|
23 | 23 | <label for="lblName">Profile:</label> |
|
|
24 | 24 | <label for="lblProfile">{{ objProfile.name }}</label> |
|
|
25 | 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 | 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 | 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 | 54 | <div id="antennaUp" class="antenna"> |
|
|
54 | 55 | <fieldset class="flsAntenna"> |
|
|
55 | 56 | <legend>UP</legend> |
| @@ -78,13 +79,14 | |||
|
|
78 | 79 | <label for="lblOnlyRx">Only RX</label> |
|
|
79 | 80 | </div> |
|
|
80 | 81 | </div> |
|
|
81 | <div class="overJRO"> | |
|
|
82 | <img /> | |
|
|
83 | <a href="#" class="activeOverJRO" id="Up">Preview</a> | |
|
|
84 |
|
|
|
|
85 | <div class="cleardivs"></div> | |
|
|
86 | </fieldset> | |
|
|
82 | </fieldset> | |
|
|
83 | </div> | |
|
|
84 | <div class="overJRO"> | |
|
|
85 | <img /> | |
|
|
86 | <a href="#" class="activeOverJRO" id="Up">Preview</a> | |
|
|
87 | 87 | </div> |
|
|
88 | <div class="cleardivs"></div> | |
|
|
89 | ||
|
|
88 | 90 | <div id="antennaDown" class="antenna"> |
|
|
89 | 91 | <fieldset class="flsAntenna"> |
|
|
90 | 92 | <legend>DOWN</legend> |
| @@ -113,13 +115,14 | |||
|
|
113 | 115 | <label for="lblOnlyRx">Only RX</label> |
|
|
114 | 116 | </div> |
|
|
115 | 117 | </div> |
|
|
116 |
|
|
|
|
117 | <img /> | |
|
|
118 | <a href="#" class="activeOverJRO" id="Down">Preview</a> | |
|
|
119 | </div> | |
|
|
120 | <div class="cleardivs"></div> | |
|
|
118 | ||
|
|
121 | 119 | </fieldset> |
|
|
122 | 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 | 126 | </div> |
|
|
124 | 127 | <input type="hidden" name="txtAntennaUpId" value="{{ antennaUp.id }}"/> |
|
|
125 | 128 | <input type="hidden" name="txtAntennaDownId" value="{{ antennaDown.id }}"/> |
| @@ -28,7 +28,7 | |||
|
|
28 | 28 | <header> |
|
|
29 | 29 | {% block header %} |
|
|
30 | 30 | <nav> |
|
|
31 | <a href="/abscontrol">ABS</a> | | |
|
|
31 | <a href="/abscontrol/">ABS</a> | | |
|
|
32 | 32 | <a href="#">CR</a> | |
|
|
33 | 33 | <a href="#">DDS</a> | |
|
|
34 | 34 | <a href="#">JARS</a> |
| @@ -36,12 +36,7 | |||
|
|
36 | 36 | {% endblock %} |
|
|
37 | 37 | </header> |
|
|
38 | 38 | {% block content %} |
|
|
39 | <div id="content"> | |
|
|
40 | <nav> | |
|
|
41 | <p><a href="/">Home</a></p> | |
|
|
42 | <p><a href="/contact">Contact</a></p> | |
|
|
43 | </nav> | |
|
|
44 | </div> | |
|
|
39 | <div id="content"></div> | |
|
|
45 | 40 | {% endblock %} |
|
|
46 | 41 | <footer> |
|
|
47 | 42 | {% block footer %} |
General Comments 0
You need to be logged in to leave comments.
Login now