##// END OF EJS Templates
- Agregada la barra de perfil y patron activo.
jsalyrosas -
r208:209
parent child
Show More
1 NO CONTENT: new file 10644
NO CONTENT: new file 10644
@@ -118,6 +118,9
118 }, context_instance=RequestContext(request)) No newline at end of file
118 }, context_instance=RequestContext(request))
119 No newline at end of file
119
120 def view(request, profile_id): No newline at end of file
120 def view(request, profile_id):
121 objProfileActive = None
No newline at end of file
122 objPatternActive = None
No newline at end of file
123 No newline at end of file
121 if request.method == 'GET' and 'pattern' in request.GET: No newline at end of file
124 if request.method == 'GET' and 'pattern' in request.GET:
122 pattern_value = request.GET["pattern"] No newline at end of file
125 pattern_value = request.GET["pattern"]
123 else: No newline at end of file
126 else:
@@ -25,8 +25,8
25 border: 0px solid #f00 !important; } No newline at end of file
25 border: 0px solid #f00 !important; }
26 No newline at end of file
26
27 #content {
27 #content {
No newline at end of file
28 margin: 2px 0px 0px 0px;
28 margin: 5px 0px;
No newline at end of file
No newline at end of file
29 border: 0px solid #1cc !important; } No newline at end of file
29 border: 0px solid #1cc; } No newline at end of file
30 No newline at end of file
30
31 #topcolumn { No newline at end of file
31 #topcolumn {
32 float: left; No newline at end of file
32 float: left;
@@ -7,7 +7,9
7 <nav class="MnuHorizontal" id="mnuProfiles"> No newline at end of file
7 <nav class="MnuHorizontal" id="mnuProfiles">
8 <ul> No newline at end of file
8 <ul>
9 <li><a href="{% url abscontrol.views.new %}">New</a></li> No newline at end of file
9 <li><a href="{% url abscontrol.views.new %}">New</a></li>
10 {% if objProfile and patternChoosen %} No newline at end of file
10 <li><a href="{% url abscontrol.views.viewPattern objProfile.id patternChoosen.id %}">View</a></li> No newline at end of file
11 <li><a href="{% url abscontrol.views.viewPattern objProfile.id patternChoosen.id %}">View</a></li>
12 {% endif %} No newline at end of file
11 {% if objProfile.state == 0 %} No newline at end of file
13 {% if objProfile.state == 0 %}
12 <li><a href="/abscontrol/changeName/{{ objProfile.id }}/">Save</a></li> No newline at end of file
14 <li><a href="/abscontrol/changeName/{{ objProfile.id }}/">Save</a></li>
13 {% else %} No newline at end of file
15 {% else %}
@@ -6,11 +6,11
6 {% endblock %} No newline at end of file
6 {% endblock %}
7 {% block maincolumn%} No newline at end of file
7 {% block maincolumn%}
8 <div id="maincolumn">
8 <div id="maincolumn">
No newline at end of file
9 <!-- <form action="/abscontrol/{{ profile_id }}/save/" method="post" id="frmPattern"> --> No newline at end of file
10 <form action="/abscontrol/upgrade/{{ profile_id }}/" method="post" id="frmPattern"> No newline at end of file
9 <form action="/abscontrol/upgrade/{{ profile_id }}/" method="post" id="frmPattern">
11 {% csrf_token %} No newline at end of file
10 {% csrf_token %}
12 <div id="divProfile">
11 <div id="divProfile">
No newline at end of file
12 <label for="lblName">Profile:</label>
13 <label for="lblName">Profile: {{ profile_name }}</label> No newline at end of file
No newline at end of file
13 <label for="lblName" class="lblProfile">{{ profile_name }}</label> No newline at end of file
14 </div> No newline at end of file
14 </div>
15 {% block mnuPattern %} No newline at end of file
15 {% block mnuPattern %}
16 <div class="divMenu" id="divMnuPattern"> No newline at end of file
16 <div class="divMenu" id="divMnuPattern">
@@ -18,6 +18,21
18 </nav> No newline at end of file
18 </nav>
19 {% endblock %} No newline at end of file
19 {% endblock %}
20 {% block maincolumn%} No newline at end of file
20 {% block maincolumn%}
21 {% block activeProfileBar %}
No newline at end of file
22 <div class="cleardivs"></div>
No newline at end of file
23 <div id="activeProfileBar">
No newline at end of file
24 <label for="lblProfileTitle" class="titleBar">Active Profile</label>
No newline at end of file
25 <img src="/media/navbarsep.png" class="navbarsep">
No newline at end of file
26 {% if profileActive != None %}
No newline at end of file
27 <a href="{% url abscontrol.views.view profileActive.id %}" class="lnkActiveProfile">{{ profileActive.name }}</a>
No newline at end of file
28 {% endif %}
No newline at end of file
29 {% if patternActive != None %}
No newline at end of file
30 <img src="/media/navbarsep.png" class="navbarsep">
No newline at end of file
31 <a href="{% url abscontrol.views.viewPattern profileActive.id patternActive.id %}" class="lnkActiveProfile">{{ patternActive.value }}</a>
No newline at end of file
32 {% endif %}
No newline at end of file
33 </div>
No newline at end of file
34 <div class="cleardivs"></div>
No newline at end of file
35 {% endblock %} No newline at end of file
21 <div id="maincolumn"> No newline at end of file
36 <div id="maincolumn">
22 {% if objProfile.state == 0 %} No newline at end of file
37 {% if objProfile.state == 0 %}
23 <div id="divProfile"> No newline at end of file
38 <div id="divProfile">
General Comments 0
You need to be logged in to leave comments. Login now