##// END OF EJS Templates
ABS » abscontrol
RSS
- Mejorando la navegacion de la aplicacion web.
jsalyrosas -
r176:177
parent child
Show More
Show file before | Show file after | Hide comments
@@ -116,7 +116,7
116 else:
116 else:
117 pattern_value = 1
117 pattern_value = 1
118
118
119 profile_list = Profile.objects.all()
119 profile_list = Profile.objects.filter(state=1)
120 objProfile = Profile.objects.get(pk=profile_id)
120 objProfile = Profile.objects.get(pk=profile_id)
121
121
122 lsPatterns = objProfile.pattern_set.all()
122 lsPatterns = objProfile.pattern_set.all()
@@ -142,7 +142,7
142 else:
142 else:
143 pattern_value = 1
143 pattern_value = 1
144
144
145 profile_list = Profile.objects.all()
145 profile_list = Profile.objects.filter(state=1)
146 objProfile = Profile.objects.get(pk=profile_id)
146 objProfile = Profile.objects.get(pk=profile_id)
147
147
148 lsPatterns = objProfile.pattern_set.all()
148 lsPatterns = objProfile.pattern_set.all()
@@ -239,13 +239,16
239 objAntennaDown.ues = txtUesDown
239 objAntennaDown.ues = txtUesDown
240 objAntennaDown.save()
240 objAntennaDown.save()
241
241
242 newurl = '/abscontrol/%d/view/%d' % (int(profile_id), int(pattern_id))
242 if mode == "e":
243 newurl = '/abscontrol/%d/edit/%d' % (int(profile_id), int(pattern_id))
244 else:
245 newurl = '/abscontrol/%d/view/%d' % (int(profile_id), int(pattern_id))
243
246
244 return redirect(newurl)
247 return redirect(newurl)
245
248
246 def viewPattern(request, profile_id, pattern_id):
249 def viewPattern(request, profile_id, pattern_id):
247
250
248 profile_list = Profile.objects.all()
251 profile_list = Profile.objects.filter(state=1)
249 objProfile = Profile.objects.get(pk=profile_id)
252 objProfile = Profile.objects.get(pk=profile_id)
250
253
251 patternChoosen = Pattern.objects.get(pk=pattern_id)
254 patternChoosen = Pattern.objects.get(pk=pattern_id)
Show file before | Show file after | Hide comments
@@ -8,10 +8,10
8
8
9 body { font-size: 12px; }
9 body { font-size: 12px; }
10 header {border: 1px solid #fcc; font-size: 2em; height: 50px; text-align: center; line-height: 50px}
10 header {border: 1px solid #fcc; font-size: 2em; height: 50px; text-align: center; line-height: 50px}
11 #schema {margin: 0 auto; width: 980px; border: 1px solid #f00; padding: 10px 10px 10px 10px}
11 #schema {margin: 0 auto; width: 980px; border: 1px solid #f00 !important; padding: 10px 10px 10px 10px}
12 #content {border: 1px solid #1cc; margin-top: 5px; margin-bottom: 5px}
12 #content {border: 1px solid #1cc; margin-top: 5px; margin-bottom: 5px}
13 #content #leftcolumn {float: left;border: 1px solid #c55; width: 150px; }
13 #content #leftcolumn {float: left;border: 2px solid #f00 !important; width: 160px; }
14 #content #maincolumn {float: left; border: 1px solid #000; width: 800px; padding-left: 20px;}
14 #content #maincolumn {float: left; border: 1px solid #000 !important; width: 780px; margin: 0; padding: 0px 10px }
15 footer {border: 1px solid #200; font-size: 0.9em; height: 30px; text-align: center; line-height: 20px}
15 footer {border: 1px solid #200; font-size: 0.9em; height: 30px; text-align: center; line-height: 20px}
16
16
17 .cleardivs {clear: both; border: 0px solid #400; height: 0px}
17 .cleardivs {clear: both; border: 0px solid #400; height: 0px}
@@ -29,9 +29,10
29 /****************************************************************************************/
29 /****************************************************************************************/
30 /****** MENU DE NAVEGACION DE PERFILES **********************************/
30 /****** MENU DE NAVEGACION DE PERFILES **********************************/
31 /****************************************************************************************/
31 /****************************************************************************************/
32 #content #infoProfiles {border: 1px solid #d00 !important; width: 140px; margin: 0px; padding-top: 2px; padding-bottom: 2px}
32 #content #infoProfiles {border: 1px solid #1cc !important; width: 100%; margin: 0px; padding-top: 2px; padding-bottom: 2px}
33 .lblInfo {padding-left: 12px; line-height: 20px;}
33 .lblInfo {line-height: 20px; padding: 10px 10px 10px 12px; margin: 10px 0}
34 #infoProfiles select {padding-left: 12px; line-height: 20px;margin-left: 12px}
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;}
35 #content nav {border: 0px solid #c55 !important; margin: 0px;}
36 #content nav {border: 0px solid #c55 !important; margin: 0px;}
36
37
37 #leftcolumn #mnuProfiles{ margin: 5px 0px; border: 0px solid #1494F6 !important; }
38 #leftcolumn #mnuProfiles{ margin: 5px 0px; border: 0px solid #1494F6 !important; }
Show file before | Show file after | Hide comments
@@ -2,6 +2,19
2 {% block title %}ABS CONTROL:::PROFILE:::{{ objProfile.name }}{% endblock %}
2 {% block title %}ABS CONTROL:::PROFILE:::{{ objProfile.name }}{% endblock %}
3 {% block scripting %}
3 {% block scripting %}
4 <script src="/static/static/js/patterns.js"></script>
4 <script src="/static/static/js/patterns.js"></script>
5 {% endblock %}
6 {% block mnu_profile %}
7 <nav class="MnuVertical" id="mnuProfiles">
8 <ul>
9 <li><a href="/abscontrol/new">New</a></li>
10 <li><a href="#">Save</a></li>
11 <li><a href="#">Save as</a></li>
12 <li><a href="/abscontrol/import">Import</a></li>
13 {% if objProfile %}
14 <li><a href="#" id="lnkExport" alt="{{ objProfile.id }}">Export</a></li>
15 {% endif %}
16 </ul>
17 </nav>
5 {% endblock %}
18 {% endblock %}
6 {% block maincolumn%}
19 {% block maincolumn%}
7 <div id="maincolumn">
20 <div id="maincolumn">
@@ -14,12 +27,13
14 <div class="divMenu" id="divMnuPattern">
27 <div class="divMenu" id="divMnuPattern">
15 <nav class="MnuHorizontal">
28 <nav class="MnuHorizontal">
16 <ul class="mnu" id="mnuPattern">
29 <ul class="mnu" id="mnuPattern">
30 {% if lsPatterns|length < 10 %}
17 <li><a href="/abscontrol/{{ objProfile.id }}/add">Add</a></li>
31 <li><a href="/abscontrol/{{ objProfile.id }}/add">Add</a></li>
18 <li><a href="/abscontrol/{{ objProfile.id }}/edit/{{ patternChoosen.id }}">Edit</a></li>
32 {% endif %}
33 <li><a href="#" class="" id="lnkSave">Save</a></li>
19 {% if lsPatterns|length > 1 %}
34 {% if lsPatterns|length > 1 %}
20 <li><a href="/abscontrol/{{ objProfile.id }}/delete/{{ patternChoosen.id }}">Delete</a></li>
35 <li><a href="/abscontrol/{{ objProfile.id }}/delete/{{ patternChoosen.id }}">Delete</a></li>
21 {% endif %}
36 {% endif %}
22 <li><a href="#">Apply</a></li>
23 </ul>
37 </ul>
24 </nav>
38 </nav>
25 </div>
39 </div>
@@ -33,9 +47,9
33 <ul>
47 <ul>
34 {% for element in lsPatterns %}
48 {% for element in lsPatterns %}
35 {% if patternChoosen.id == element.id %}
49 {% if patternChoosen.id == element.id %}
36 <li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}" class="lnkPatternSelected">{{ element.value }}</a></li>
50 <li><a href="/abscontrol/{{ objProfile.id }}/edit/{{ element.id }}" class="lnkPatternSelected">{{ element.value }}</a></li>
37 {% else %}
51 {% else %}
38 <li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}" class="lnkPattern">{{ element.value }}</a></li>
52 <li><a href="/abscontrol/{{ objProfile.id }}/edit/{{ element.id }}" class="lnkPattern">{{ element.value }}</a></li>
39 {% endif %}
53 {% endif %}
40 {% endfor %}
54 {% endfor %}
41 </ul>
55 </ul>
@@ -47,21 +61,22
47 <legend>UP</legend>
61 <legend>UP</legend>
48 <div class="divAntenna">
62 <div class="divAntenna">
49 <label for="lblAntenna">Antenna</label>
63 <label for="lblAntenna">Antenna</label>
50 <p>{{ antennaUp.value }}</p>
64 <textarea name="txtAntennaUp" class="txtAntenna" cols="38" rows="8">{{ antennaUp.value }}</textarea>
51 </div>
65 </div>
52 <div class="divTx">
66 <div class="divTx">
53 <label for="lblTx">Tx</label>
67 <label for="lblTx">Tx</label>
54 <p>{{ antennaUp.tx }}</p>
68 <textarea name="txtTxUp" class="txtTR" cols="20" rows="8">{{ antennaUp.tx }}</textarea>
55 </div>
69 </div>
56 <div class="divTx">
70 <div class="divTx">
57 <label for="lblRx">Rx</label>
71 <label for="lblRx">Rx</label>
58 <p>{{ antennaUp.rx }}</p>
72 <textarea name="txtRxUp" class="txtTR" cols="20" rows="8">{{ antennaUp.rx }}</textarea>
59 </div>
73 </div>
60 <div class="cleardivs"></div>
74 <div class="cleardivs"></div>
61 <div class="divUes">
75 <div class="divUes">
62 <label for="lblUes">Ues:</label>
76 <label for="lblUes">Ues:</label>
63 <label for="lblAntennaUpUes">{{ antennaUp.ues }}</label>
77 <input type="text" name="txtUesUp" value="{{ antennaUp.ues }}" />
64 </div>
78 </div>
79 <input type="hidden" name="txtAntennaUpId" value="{{ antennaUp.id }}" />
65 </fieldset>
80 </fieldset>
66 </div>
81 </div>
67 <div id="antennaDown">
82 <div id="antennaDown">
@@ -69,21 +84,22
69 <legend>DOWN</legend>
84 <legend>DOWN</legend>
70 <div class="divAntenna">
85 <div class="divAntenna">
71 <label for="lblAntenna">Antenna</label>
86 <label for="lblAntenna">Antenna</label>
72 <p>{{ antennaDown.value }}</textarea>
87 <textarea name="txtAntennaDown" class="txtAntenna" cols="38" rows="8">{{ antennaDown.value }}</textarea>
73 </div>
88 </div>
74 <div class="divTx">
89 <div class="divTx">
75 <label for="lblTx">Tx</label>
90 <label for="lblTx">Tx</label>
76 <p>{{ antennaDown.tx }}</p>
91 <textarea name="txtTxDown" class="txtTR" cols="20" rows="8">{{ antennaDown.tx }}</textarea>
77 </div>
92 </div>
78 <div class="divTx">
93 <div class="divTx">
79 <label for="lblRx">Rx</label>
94 <label for="lblRx">Rx</label>
80 <p>{{ antennaDown.rx }}</p>
95 <textarea name="txtRxDown" class="txtTR" cols="20" rows="8">{{ antennaDown.rx }}</textarea>
81 </div>
96 </div>
82 <div class="cleardivs"></div>
97 <div class="cleardivs"></div>
83 <div class="divUes">
98 <div class="divUes">
84 <label for="lblUes">Ues:</label>
99 <label for="lblUes">Ues:</label>
85 <label for="lblAntennaDownUes">{{ antennaDown.ues }}</label>
100 <input type="text" name="txtUesDown" value="{{ antennaDown.ues }}" />
86 </div>
101 </div>
102 <input type="hidden" name="txtAntennaDownId" value="{{ antennaDown.id }}" />
87 </fieldset>
103 </fieldset>
88 </div>
104 </div>
89 </div>
105 </div>
Show file before | Show file after | Hide comments
@@ -4,7 +4,9
4 <div class="divMenu" id="divMnuPattern">
4 <div class="divMenu" id="divMnuPattern">
5 <nav class="MnuHorizontal">
5 <nav class="MnuHorizontal">
6 <ul class="mnu" id="mnuPattern">
6 <ul class="mnu" id="mnuPattern">
7 {% if lsPatterns|length < 10 %}
7 <li><a href="#" id="lnkAdd">Add</a></li>
8 <li><a href="#" id="lnkAdd">Add</a></li>
9 {% endif %}
8 <li><a href="#" id="lnkSave">Save</a></li>
10 <li><a href="#" id="lnkSave">Save</a></li>
9 <li><a href="#" id="lnkCancel">Delete</a></li>
11 <li><a href="#" id="lnkCancel">Delete</a></li>
10 </ul>
12 </ul>
@@ -19,9 +21,9
19 <ul>
21 <ul>
20 {% for element in lsPatterns %}
22 {% for element in lsPatterns %}
21 {% if patternChoosen.id == element.id %}
23 {% if patternChoosen.id == element.id %}
22 <li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}" class="lnkPatternSelected">{{ element.value }}</a></li>
24 <li><a href="/abscontrol/{{ objProfile.id }}/edit/{{ element.id }}" class="lnkPatternSelected">{{ element.value }}</a></li>
23 {% else %}
25 {% else %}
24 <li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}" class="lnkPattern">{{ element.value }}</a></li>
26 <li><a href="/abscontrol/{{ objProfile.id }}/edit/{{ element.id }}" class="lnkPattern">{{ element.value }}</a></li>
25 {% endif %}
27 {% endif %}
26 {% endfor %}
28 {% endfor %}
27 </ul>
29 </ul>
@@ -77,6 +79,7
77 </div>
79 </div>
78 <input type="hidden" name="pattern_id" id="pattern_id" value="{{ patternChoosen.id }}" />
80 <input type="hidden" name="pattern_id" id="pattern_id" value="{{ patternChoosen.id }}" />
79 <input type="hidden" name="profile_id" id="profile_id" value="{{ objProfile.id }}" />
81 <input type="hidden" name="profile_id" id="profile_id" value="{{ objProfile.id }}" />
82 <input type="hidden" name="mode" value="e">
80 </form>
83 </form>
81 </div>
84 </div>
82 {% endblock %} No newline at end of file
85 {% endblock %}
Show file before | Show file after | Hide comments
@@ -8,6 +8,16
8 <label for="lblProfile">{{ objProfile.name }}</label>
8 <label for="lblProfile">{{ objProfile.name }}</label>
9 </div>
9 </div>
10 <div id="divPattern">
10 <div id="divPattern">
11 {% block mnuPattern %}
12 <div class="divMenu" id="divMnuPattern">
13 <nav class="MnuHorizontal">
14 <ul class="mnu" id="mnuPattern">
15 <li><a href="#">Apply</a></li>
16 </ul>
17 </nav>
18 </div>
19 <div class="cleardivs"></div>
20 {% endblock %}
11 <div id="infoPattern">
21 <div id="infoPattern">
12 {% if patternChoosen %}
22 {% if patternChoosen %}
13 <div id="navPatterns">
23 <div id="navPatterns">
@@ -15,9 +25,9
15 <ul>
25 <ul>
16 {% for element in lsPatterns %}
26 {% for element in lsPatterns %}
17 {% if patternChoosen.id == element.id %}
27 {% if patternChoosen.id == element.id %}
18 <li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}" class="lnkPatternSelected">{{ element.value }}</a></li>
28 <li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}/" class="lnkPatternSelected">{{ element.value }}</a></li>
19 {% else %}
29 {% else %}
20 <li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}" class="lnkPattern">{{ element.value }}</a></li>
30 <li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}/" class="lnkPattern">{{ element.value }}</a></li>
21 {% endif %}
31 {% endif %}
22 {% endfor %}
32 {% endfor %}
23 </ul>
33 </ul>
Show file before | Show file after | Hide comments
@@ -1,19 +1,5
1 {% extends "abscontrol/edit.html" %}
1 {% extends "abscontrol/view.html" %}
2
2
3 {% block mnuPattern %}
4 <div class="divMenu" id="divMnuPattern">
5 <nav class="MnuHorizontal">
6 <ul class="mnu" id="mnuPattern">
7 <li><a href="/abscontrol/{{ objProfile.id }}/edit/{{ patternChoosen.id }}">Edit</a></li>
8 {% if lsPatterns|length > 1 %}
9 <li><a href="/abscontrol/{{ objProfile.id }}/delete/{{ patternChoosen.id }}">Delete</a></li>
10 {% endif %}
11 <li><a href="#">Apply</a></li>
12 </ul>
13 </nav>
14 </div>
15 <div class="cleardivs"></div>
16 {% endblock %}
17 {% block pattern %}
3 {% block pattern %}
18 <div id="infoPattern">
4 <div id="infoPattern">
19 {% if patternChoosen %}
5 {% if patternChoosen %}
General Comments 0
You need to be logged in to leave comments. Login now