ABS/abscontrol Commit - r182:183 · Jicamarca Repository

- Habilitando la edicion del perfil y estandarizando el menu de perfiles.

jsalyrosas -

r182:183

parent child

Context file:

r182:183

Collapse all files

trunk/webapp/templates/abscontrol/changeName.html created 10644 +38 0

@@ -0,0 +1,38
	1	{% extends "abscontrol/index.html" %}
	2	{% block title %}ABS CONTROL:::::NEW PROFILE{% endblock %}
	3	{% block scripting %}
	4	<script src="/static/static/js/profiles.js"></script>
	5	{% endblock %}
	6	{% block mnu_profile %}
	7	<nav class="MnuHorizontal" id="mnuProfiles">
	8	<ul>
	9	<li><a href="#" id="lnkChangeProfile">Save</a></li>
	10	<li><a href="/abscontrol/edit/{{ objProfile.id }}/">Cancel</a></li>
	11	</ul>
	12	</nav>
	13	{% endblock %}
	14	{% block maincolumn%}
	15	<div id="maincolumn">
	16	<form action="/abscontrol/update/{{ objProfile.id }}/" method="post" id="frmProfile">
	17	<div id="divProfile">
	18	<label for="lblName">Profile: {{ profile_name }}</label>
	19	<input type="text" name="txtProfile" value="{{ objProfile.name }}"/>
	20	</div>
	21	<div class="cleardivs"></div>
	22	<input type="hidden" name="mode" value="e">
	23	</form>
	24	<div id="navPatterns">
	25	<nav class="" id="navPatternList">
	26	<ul>
	27	{% for element in lsPatterns %}
	28	{% if patternChoosen.id == element.id %}
	29	<li><a href="/abscontrol/{{ objProfile.id }}/edit/{{ element.id }}" class="lnkPatternSelected">{{ element.value }}</a></li>
	30	{% else %}
	31	<li><a href="/abscontrol/{{ objProfile.id }}/edit/{{ element.id }}" class="lnkPattern">{{ element.value }}</a></li>
	32	{% endif %}
	33	{% endfor %}
	34	</ul>
	35	</nav>
	36	</div>
	37	</div>
	38	{% endblock %}

trunk/webapp/abscontrol/urls.py +1 0

                 url(r'^view/(?P<profile_id>\d+)/$', 'view'),
                 url(r'^edit/(?P<profile_id>\d+)/$', 'edit'),
                 url(r'^update/(?P<profile_id>\d+)/$', 'update'),
+                url(r'^changeName/(?P<profile_id>\d+)/$', 'changeName'),
                 #url(r'^(?P<profile_id>\d+)/$', 'detail'),
                 url(r'^(?P<profile_id>\d+)/add/$', 'addPattern'),
                 url(r'^(?P<profile_id>\d+)/save/$', 'savePattern'),

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

                 return redirect(newurl)
             def update(request, profile_id):
-                pass
+                txtProfile = request.POST["txtProfile"]
+                objProfile = Profile.objects.get(pk=profile_id)
+                objProfile.name = txtProfile
+                objProfile.state = 1
+                objProfile.save()
+                newurl = '/abscontrol/view/%d' % objProfile.id
+                return redirect(newurl)
+            def changeName(request, profile_id):
+                profile_list = Profile.objects.filter(state=1)
+                objProfile = Profile.objects.get(pk=profile_id)
+                lsPatterns = objProfile.pattern_set.all()
+                return render_to_response('abscontrol/changeName.html', {'profile_list': profile_list,
+                                                                         'objProfile': objProfile,
+                                                                         'lsPatterns' : lsPatterns,
+                                                                         })
             def view(request, profile_id):
                 nextPattern = 0
                 return render_to_response('abscontrol/import.html', {'profile_list': profile_list,})
             def showImport(request):
+                profile_list = Profile.objects.filter(state=1)
                 if request.method == 'POST':
                     txtFilename = request.FILES['txtFile']
                     if txtFilename:
                 return render_to_response('abscontrol/upload-edit.html', {'txtFilename': txtFilename, 'patterns' : patterns,
                                                                           'expName' : expName, 'num_patterns' : num_patterns,
+                                                                          'profile_list': profile_list,
                                                                           })
             def saveImport(request):

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

             /****************************************************************************************/
             .mnu{ height: 22px; border: 0px solid #c55 !important;}
             .mnu li{ display:inline;}
-            .MnuVertical, .MnuHorizontal { font-family: 'Droid Sans', sans-serif; font-size: 1.2em; font-style: italic; text-shadow: 2px 2px #eee}
+            .MnuVertical, .MnuHorizontal { font-family: 'Droid Sans', sans-serif; font-size: inherit;
+            							   font-style: normal; text-shadow: 2px 2px #eee;}
             .MnuHorizontal ul{ list-style: none; list-style-type: none; margin: 0;}
             /*.MnuHorizontal{ display: -webkit-box; -webkit-box-orient:horizontal;}*/
             #infoProfiles label {padding: 10px 10px 10px 12px; margin: 10px 0}
             #infoProfiles select {padding: 4px 0px; margin: 0; font-family: 'Droid Sans', sans-serif;
             					   font-size: 12px; letter-spacing: 0.029em; width: 200px;}
-            #mnuProfiles{margin: 0px; border: 0px solid #1494F6 !important; float: left; padding: 2px 10px}
+            #mnuProfiles{margin: 0px 0px 0px 0px; border: 0px solid #1494F6 !important; float: right; padding: 2px 10px}
             #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; float: left; }
-            #mnuProfiles a{ font-weight: normal; color: #1494F6; display: block; border: 0px solid #1cc !important; text-align: center}
+            #mnuProfiles a{ font-weight: normal; color: #1494F6; display: block; border: 0px solid #1cc !important; text-align: center;
+            				border-bottom: 1px solid #1494F6 !important; text-decoration: none; padding: 0px 4px;
+            				line-height: 18px; margin: 6px 6px;}
             /****************************************************************************************/
             /********               FORMULARIO DE PERFILES      *************************************/

trunk/webapp/static/js/patterns.js +3 0

                     profile_id = $(this).attr("alt");
                     location.href = "/abscontrol/send/" + profile_id + "/";
                 });
+                $('#lnkUpdateProfile').click(function(){
+                	$('#frmProfile').submit();
+                });
             });

trunk/webapp/static/js/profiles.js +6 0

                 $('#lnkSaveImport').click(function(){
                 	$('#frmImportProfile').submit();
                 });
+                $('#lnkUpload').click(function(){
+                	$('#frmImport').submit();
+                });
                 $('#lnkExport').click(function(){
                     profile_id = $(this).attr("alt");
                     location.href="/abscontrol/export/" + profile_id + "/";
                     profile_id = $(this).attr("alt");
                     location.href="/abscontrol/send/" + profile_id + "/";
                 });
+                $('#lnkChangeProfile').click(function(){
+                	$('#frmProfile').submit();
+                });
             });

trunk/webapp/templates/abscontrol/edit.html +13 -4

                 <script src="/static/static/js/patterns.js"></script>
             {% endblock %}
             {% block mnu_profile %}
-            <nav class="MnuVertical" id="mnuProfiles">
+            <nav class="MnuHorizontal" id="mnuProfiles">
                 <ul>
                     <li><a href="/abscontrol/new/">New</a></li>
                     {% if objProfile.state == 0 %}
-                    <li><a href="/abscontrol/update/{{ objProfile.id }}/?opt=changeName">Save</a></li>
+                    <li><a href="/abscontrol/changeName/{{ objProfile.id }}/">Save</a></li>
                     {% else %}
-                    <li><a href="/abscontrol/update/{{ objProfile.id }}/?opt=update">Save</a></li>
+                    <li><a href="#" id="lnkUpdateProfile">Save</a></li>
                     {% endif %}
                     <li><a href="#">Save as</a></li>
                     <li><a href="/abscontrol/import/">Import</a></li>
             {% endblock %}
             {% block maincolumn%}
             <div id="maincolumn">
+            	{% if objProfile.state == 1 %}
+            	<form action="/abscontrol/update/{{ objProfile.id }}/" method="post" id="frmProfile">
                 <div id="divProfile">
                     <label for="lblName">Profile:</label>
-                    <label for="lblProfile">{{ objProfile.name }}</label>
+                    <input type="text" name="txtProfile" value="{{ objProfile.name }}"/>
                 </div>
+                	<input type="hidden" name="mode" value="e">
+                </form>
+                {% else %}
+                <div id="divProfile">
+                    <label for="lblName">Profile: {{ objProfile.name }}</label>
+                </div>
+                {% endif %}
                 {% if patternChoosen %}
                 <div id="navPatterns">
                     <nav class="" id="navPatternList">

trunk/webapp/templates/abscontrol/import.html +9 -2

             {% extends "abscontrol/index.html" %}
             {% block title %}ABS CONTROL:::::IMPORT PROFILE{% endblock %}
+            {% block mnu_profile %}
+            <nav class="MnuHorizontal" id="mnuProfiles">
+                <ul>
+                    <li><a href="#" id="lnkUpload">Upload</a></li>
+                    <li><a href="#" id="lnkCancel">Cancel</a></li>
+                </ul>
+            </nav>
+            {% endblock %}
             {% block maincolumn %}
             <div id="maincolumn">
-                <form action="/abscontrol/showImport/" method="post" enctype="multipart/form-data">
+                <form name="frmImport" id="frmImport" action="/abscontrol/showImport/" method="post" enctype="multipart/form-data">
                 <div id="divPattern">
                     <div class="divUes">
                         <label for="lblFile">Choose File:</label>
                         <input type="file" name="txtFile" />
-                        <input type="submit" name="btnSend" value="Upload" />
                     </div>
                 </div>
                 </form>

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

                     </div>
                     {% block mnu_profile %}
                     <div id="mnuProfiles">
-                    <nav class="MnuVertical" id="navProfiles">
+                    <nav class="MnuHorizontal" id="navProfiles">
                         <ul>
                             <li><a href="/abscontrol/new">New</a></li>
                             {% if objProfile %}

trunk/webapp/templates/abscontrol/upload-edit.html +1 -1

             	<script src="/static/static/js/profiles.js"></script>
             {% endblock %}
             {% block mnu_profile %}
-            <nav class="MnuVertical" id="mnuProfiles">
+            <nav class="MnuHorizontal" id="mnuProfiles">
                 <ul>
                     <li><a href="/abscontrol/new">New</a></li>
                     <li><a href="#" id="lnkSaveImport">Save</a></li>

trunk/webapp/templates/abscontrol/upload-view.html +1 -1

             {% block title %}ABS CONTROL:::::IMPORT PROFILE{% endblock %}
             {% block mnu_profile %}
-            <nav class="MnuVertical" id="mnuProfiles">
+            <nav class="MnuHorizontal" id="mnuProfiles">
                 <ul>
                     <li><a href="/abscontrol/new">New</a></li>
                     <li><a href="#">Save</a></li>

trunk/webapp/templates/abscontrol/view.html +3 -1

             {% block title %}ABS CONTROL:::PROFILE:::{{ objProfile.name }}{% endblock %}
             {% block mnu_profile %}
-            <nav class="MnuVertical" id="mnuProfiles">
+            <nav class="MnuHorizontal" id="mnuProfiles">
                 <ul>
                     <li><a href="/abscontrol/new">New</a></li>
                     {% if patternChoosen %}
             {% endblock %}
             {% block maincolumn%}
             <div id="maincolumn">
+            	{% if objProfile.state == 0 %}
                 <div id="divProfile">
                     <label for="lblName">Profile:</label>
                     <label for="lblProfile">{{ objProfile.name }}</label>
                 </div>
+                {% endif %}
                 {% if patternChoosen %}
                 <div id="navPatterns">
                     <nav class="" id="navPatternList">

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