# SVN changeset patch
# User jsalyrosas
# Date 2013-05-21 10:55:59.912460
# Revision 182

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

Index: trunk/webapp/abscontrol/urls.py
===================================================================
diff --git a/trunk/webapp/abscontrol/urls.py b/trunk/webapp/abscontrol/urls.py
--- a/trunk/webapp/abscontrol/urls.py	(revision 181)
+++ b/trunk/webapp/abscontrol/urls.py	(revision 182)
@@ -6,7 +6,7 @@
     url(r'^save/$', 'save'),
     url(r'^view/(?P<profile_id>\d+)/$', 'view'),
     url(r'^edit/(?P<profile_id>\d+)/$', 'edit'),
-    #url(r'^(?P<profile_id>\d+)/edit/$', 'edit'),
+    url(r'^update/(?P<profile_id>\d+)/$', 'update'),
     #url(r'^(?P<profile_id>\d+)/$', 'detail'),
     url(r'^(?P<profile_id>\d+)/add/$', 'addPattern'),
     url(r'^(?P<profile_id>\d+)/save/$', 'savePattern'),
Index: trunk/webapp/abscontrol/views.py
===================================================================
diff --git a/trunk/webapp/abscontrol/views.py b/trunk/webapp/abscontrol/views.py
--- a/trunk/webapp/abscontrol/views.py	(revision 181)
+++ b/trunk/webapp/abscontrol/views.py	(revision 182)
@@ -107,6 +107,9 @@
     newurl = '/abscontrol/view/%d' % newprofile.id
     
     return redirect(newurl)
+
+def update(request, profile_id):
+    pass
 
 def view(request, profile_id):
     nextPattern = 0
Index: trunk/webapp/static/css/style.css
===================================================================
diff --git a/trunk/webapp/static/css/style.css b/trunk/webapp/static/css/style.css
--- a/trunk/webapp/static/css/style.css	(revision 181)
+++ b/trunk/webapp/static/css/style.css	(revision 182)
@@ -7,14 +7,15 @@
  */
 
 body { font-size: 12px; }
-header {border: 1px solid #fcc; font-size: 2em; height: 50px; text-align: center; line-height: 50px}
-#schema {margin: 0 auto; width: 980px; border: 1px solid #f00 !important; padding: 10px 10px 10px 10px}
+header {width: 980px; border: 0px solid #fcc !important; height: 50px; text-align: center; line-height: 50px}
+#schema {margin: 0 auto; width: 980px; border: 0px solid #f00 !important; padding: 10px 10px 10px 10px}
 #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;
+#content #topcolumn {float: left; border: 1px solid #ddd !important; width: 980px; height: 40px; line-height: 35px;
 					 margin: 2px 0px; box-shadow: 2px 2px 5px #888;}
-#content #maincolumn {float: left; border: 0px solid #000 !important; width: 980px; margin: 2px 0px; padding: 0px 0px;
+#content #maincolumn {float: left; border: 1px solid #ddd !important; width: 980px; margin: 2px 0px; padding: 0px 0px;
 					  box-shadow: 2px 2px 5px #666;}
-footer {border: 1px solid #200; font-size: 0.9em; height: 30px; text-align: center; line-height: 20px}
+footer {border: 0px solid #200 !important; height: 30px; text-align: center; line-height: 30px;
+		margin: 2px 0px; box-shadow: 2px 2px 5px #888;}
 
 .cleardivs {clear: both; border: 0px solid #400; height: 0px}
 /****************************************************************************************/
@@ -97,3 +98,17 @@
 .divListofPatterns{ width: 650px; display: block; border: 1px solid #1cc !important; margin: 0 auto}
 .divPattern{ width: 600px; display: block; border: 1px solid #f00 !important; margin: 2px auto; }
 
+/****************************************************************************************/
+/******                 			HEADER 									*************/
+/****************************************************************************************/
+header nav{width: 960px; border: 0px solid #1cc !important; margin: 0 auto; height: 100%}
+header nav a{font-family: 'Roboto Condensed', sans-serif; font-size: 1.98em; text-transform: uppercase; width: 232px;
+		  	  padding: 2px; text-align: center; border: 1px solid #ddd !important; box-shadow: 1px 1px 2px #ddd; display: block;
+		  	  float: left; height: 45px; text-decoration: none; background: #eee; line-height: 45px;
+		  	  color: #15425d; margin: 0px 1px}
+
+/****************************************************************************************/
+/******                 			FOOTER 									*************/
+/****************************************************************************************/
+footer p{font-family: 'Roboto Condensed', sans-serif; font-size: 0.98em}
+
Index: trunk/webapp/templates/abscontrol/edit.html
===================================================================
diff --git a/trunk/webapp/templates/abscontrol/edit.html b/trunk/webapp/templates/abscontrol/edit.html
--- a/trunk/webapp/templates/abscontrol/edit.html	(revision 181)
+++ b/trunk/webapp/templates/abscontrol/edit.html	(revision 182)
@@ -6,10 +6,14 @@
 {% block mnu_profile %}
 <nav class="MnuVertical" id="mnuProfiles">
     <ul>
-        <li><a href="/abscontrol/new">New</a></li>
-        <li><a href="#">Save</a></li>
+        <li><a href="/abscontrol/new/">New</a></li>
+        {% if objProfile.state == 0 %}
+        <li><a href="/abscontrol/update/{{ objProfile.id }}/?opt=changeName">Save</a></li>
+        {% else %}
+        <li><a href="/abscontrol/update/{{ objProfile.id }}/?opt=update">Save</a></li>
+        {% endif %}
         <li><a href="#">Save as</a></li>
-        <li><a href="/abscontrol/import">Import</a></li>
+        <li><a href="/abscontrol/import/">Import</a></li>
         {% if objProfile %}
         <li><a href="#" id="lnkExport" alt="{{ objProfile.id }}">Export</a></li>
         {% endif %}
Index: trunk/webapp/templates/abscontrol/index.html
===================================================================
diff --git a/trunk/webapp/templates/abscontrol/index.html b/trunk/webapp/templates/abscontrol/index.html
--- a/trunk/webapp/templates/abscontrol/index.html	(revision 181)
+++ b/trunk/webapp/templates/abscontrol/index.html	(revision 182)
@@ -57,9 +57,7 @@
     </div>
     {% endblock %}
     {% block maincolumn %}
-    <div id="maincolumn">
-        
-    </div>
+    <div id="maincolumn" style="height: 50px"></div>
     {% endblock %}
     <div class="cleardivs"></div>
 </div>
Index: trunk/webapp/templates/base.html
===================================================================
diff --git a/trunk/webapp/templates/base.html b/trunk/webapp/templates/base.html
--- a/trunk/webapp/templates/base.html	(revision 181)
+++ b/trunk/webapp/templates/base.html	(revision 182)
@@ -27,10 +27,10 @@
         <div id="schema">
             <header>
                 {% block header %}
-                <nav>
-                  <a href="/abscontrol/">ABS</a> |
-                  <a href="#">CR</a> |
-                  <a href="#">DDS</a> |
+                <nav id="header">
+                  <a href="/abscontrol/">ABS</a>
+                  <a href="#">CR</a>
+                  <a href="#">DDS</a>
                   <a href="#">JARS</a>
                 </nav> 
                 {% endblock %}
@@ -40,7 +40,7 @@
             {% endblock %}
             <footer>
                 {% block footer %}
-                <p>&copy; Copyright by Jicamarca Radio Observatory</p>
+                <p>&copy; Copyright 2013 by Jicamarca Radio Observatory</p>
                 {% endblock %}
             </footer>
         </div>