ABS/abscontrol Commit - r181:182 · Jicamarca Repository

- Modificada la presentacion de la aplicacion web, y agregando la funcionalidad para guardar los perfiles temporales.

jsalyrosas -

r181:182

parent child

Context file:

r181:182

Collapse all files

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

                 url(r'^save/$', 'save'),
                 url(r'^view/(?P<profile_id>\d+)/$', 'view'),
                 url(r'^edit/(?P<profile_id>\d+)/$', 'edit'),
                 url(r'^update/(?P<profile_id>\d+)/$', 'update'),
  No newline at end of file
-                #url(r'^(?P<profile_id>\d+)/edit/$', 'edit'),
  No newline at end of file
                 #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 +3 0

                 newurl = '/abscontrol/view/%d' % newprofile.id
   No newline at end of file
                 return redirect(newurl)
              No newline at end of file
+            def update(request, profile_id):
              No newline at end of file
+                pass
  No newline at end of file
   No newline at end of file
             def view(request, profile_id):
                 nextPattern = 0

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

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

trunk/webapp/templates/abscontrol/edit.html +7 -3

             {% block mnu_profile %}
             <nav class="MnuVertical" id="mnuProfiles">
                 <ul>
                     <li><a href="/abscontrol/new/">New</a></li>
-                    <li><a href="/abscontrol/new">New</a></li>
+             No newline at end of file
                     {% if objProfile.state == 0 %}
-                    <li><a href="#">Save</a></li>
  No newline at end of file
+             No newline at end of file
+                    <li><a href="/abscontrol/update/{{ objProfile.id }}/?opt=changeName">Save</a></li>
              No newline at end of file
+                    {% else %}
              No newline at end of file
+                    <li><a href="/abscontrol/update/{{ objProfile.id }}/?opt=update">Save</a></li>
              No newline at end of file
+                    {% endif %}
  No newline at end of file
                     <li><a href="#">Save as</a></li>
                     <li><a href="/abscontrol/import/">Import</a></li>
  No newline at end of file
-                    <li><a href="/abscontrol/import">Import</a></li>
  No newline at end of file
                     {% if objProfile %}
                     <li><a href="#" id="lnkExport" alt="{{ objProfile.id }}">Export</a></li>
                     {% endif %}

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

                 </div>
                 {% endblock %}
                 {% block maincolumn %}
                 <div id="maincolumn" style="height: 50px"></div>
  No newline at end of file
-                <div id="maincolumn">
              No newline at end of file
              No newline at end of file
-                </div>
  No newline at end of file
                 {% endblock %}
                 <div class="cleardivs"></div>
             </div>

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

                     <div id="schema">
                         <header>
                             {% block header %}
                             <nav id="header">
-                            <nav>
+             No newline at end of file
                               <a href="/abscontrol/">ABS</a>
-                              <a href="/abscontrol/">ABS</a> |
+             No newline at end of file
                               <a href="#">CR</a>
-                              <a href="#">CR</a> |
+             No newline at end of file
                               <a href="#">DDS</a>
  No newline at end of file
-                              <a href="#">DDS</a> |
  No newline at end of file
                               <a href="#">JARS</a>
                             </nav>
                             {% endblock %}

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