##// END OF EJS Templates
ABS » abscontrol
RSS
- Modificada la presentacion de la aplicacion web, y agregando la funcionalidad para guardar los perfiles temporales.
jsalyrosas -
r181:182
parent child
Show More
Show file before | Show file after | Hide comments
@@ -6,7 +6,7
6 url(r'^save/$', 'save'),
6 url(r'^save/$', 'save'),
7 url(r'^view/(?P<profile_id>\d+)/$', 'view'),
7 url(r'^view/(?P<profile_id>\d+)/$', 'view'),
8 url(r'^edit/(?P<profile_id>\d+)/$', 'edit'),
8 url(r'^edit/(?P<profile_id>\d+)/$', 'edit'),
9 #url(r'^(?P<profile_id>\d+)/edit/$', 'edit'),
9 url(r'^update/(?P<profile_id>\d+)/$', 'update'),
10 #url(r'^(?P<profile_id>\d+)/$', 'detail'),
10 #url(r'^(?P<profile_id>\d+)/$', 'detail'),
11 url(r'^(?P<profile_id>\d+)/add/$', 'addPattern'),
11 url(r'^(?P<profile_id>\d+)/add/$', 'addPattern'),
12 url(r'^(?P<profile_id>\d+)/save/$', 'savePattern'),
12 url(r'^(?P<profile_id>\d+)/save/$', 'savePattern'),
Show file before | Show file after | Hide comments
@@ -107,6 +107,9
107 newurl = '/abscontrol/view/%d' % newprofile.id
107 newurl = '/abscontrol/view/%d' % newprofile.id
108
108
109 return redirect(newurl)
109 return redirect(newurl)
110
111 def update(request, profile_id):
112 pass
110
113
111 def view(request, profile_id):
114 def view(request, profile_id):
112 nextPattern = 0
115 nextPattern = 0
Show file before | Show file after | Hide comments
@@ -7,14 +7,15
7 */
7 */
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 {width: 980px; border: 0px solid #fcc !important; height: 50px; text-align: center; line-height: 50px}
11 #schema {margin: 0 auto; width: 980px; border: 1px solid #f00 !important; padding: 10px 10px 10px 10px}
11 #schema {margin: 0 auto; width: 980px; border: 0px solid #f00 !important; padding: 10px 10px 10px 10px}
12 #content {border: 0px solid #1cc; margin-top: 5px; margin-bottom: 5px}
12 #content {border: 0px solid #1cc; margin-top: 5px; margin-bottom: 5px}
13 #content #topcolumn {float: left;border: 1px solid #ddd !important; width: 980px; height: 40px; line-height: 35px;
13 #content #topcolumn {float: left; border: 1px solid #ddd !important; width: 980px; height: 40px; line-height: 35px;
14 margin: 2px 0px; box-shadow: 2px 2px 5px #888;}
14 margin: 2px 0px; box-shadow: 2px 2px 5px #888;}
15 #content #maincolumn {float: left; border: 0px solid #000 !important; width: 980px; margin: 2px 0px; padding: 0px 0px;
15 #content #maincolumn {float: left; border: 1px solid #ddd !important; width: 980px; margin: 2px 0px; padding: 0px 0px;
16 box-shadow: 2px 2px 5px #666;}
16 box-shadow: 2px 2px 5px #666;}
17 footer {border: 1px solid #200; font-size: 0.9em; height: 30px; text-align: center; line-height: 20px}
17 footer {border: 0px solid #200 !important; height: 30px; text-align: center; line-height: 30px;
18 margin: 2px 0px; box-shadow: 2px 2px 5px #888;}
18
19
19 .cleardivs {clear: both; border: 0px solid #400; height: 0px}
20 .cleardivs {clear: both; border: 0px solid #400; height: 0px}
20 /****************************************************************************************/
21 /****************************************************************************************/
@@ -97,3 +98,17
97 .divListofPatterns{ width: 650px; display: block; border: 1px solid #1cc !important; margin: 0 auto}
98 .divListofPatterns{ width: 650px; display: block; border: 1px solid #1cc !important; margin: 0 auto}
98 .divPattern{ width: 600px; display: block; border: 1px solid #f00 !important; margin: 2px auto; }
99 .divPattern{ width: 600px; display: block; border: 1px solid #f00 !important; margin: 2px auto; }
99
100
101 /****************************************************************************************/
102 /****** HEADER *************/
103 /****************************************************************************************/
104 header nav{width: 960px; border: 0px solid #1cc !important; margin: 0 auto; height: 100%}
105 header nav a{font-family: 'Roboto Condensed', sans-serif; font-size: 1.98em; text-transform: uppercase; width: 232px;
106 padding: 2px; text-align: center; border: 1px solid #ddd !important; box-shadow: 1px 1px 2px #ddd; display: block;
107 float: left; height: 45px; text-decoration: none; background: #eee; line-height: 45px;
108 color: #15425d; margin: 0px 1px}
109
110 /****************************************************************************************/
111 /****** FOOTER *************/
112 /****************************************************************************************/
113 footer p{font-family: 'Roboto Condensed', sans-serif; font-size: 0.98em}
114
Show file before | Show file after | Hide comments
@@ -6,10 +6,14
6 {% block mnu_profile %}
6 {% block mnu_profile %}
7 <nav class="MnuVertical" id="mnuProfiles">
7 <nav class="MnuVertical" id="mnuProfiles">
8 <ul>
8 <ul>
9 <li><a href="/abscontrol/new">New</a></li>
9 <li><a href="/abscontrol/new/">New</a></li>
10 <li><a href="#">Save</a></li>
10 {% if objProfile.state == 0 %}
11 <li><a href="/abscontrol/update/{{ objProfile.id }}/?opt=changeName">Save</a></li>
12 {% else %}
13 <li><a href="/abscontrol/update/{{ objProfile.id }}/?opt=update">Save</a></li>
14 {% endif %}
11 <li><a href="#">Save as</a></li>
15 <li><a href="#">Save as</a></li>
12 <li><a href="/abscontrol/import">Import</a></li>
16 <li><a href="/abscontrol/import/">Import</a></li>
13 {% if objProfile %}
17 {% if objProfile %}
14 <li><a href="#" id="lnkExport" alt="{{ objProfile.id }}">Export</a></li>
18 <li><a href="#" id="lnkExport" alt="{{ objProfile.id }}">Export</a></li>
15 {% endif %}
19 {% endif %}
Show file before | Show file after | Hide comments
@@ -57,9 +57,7
57 </div>
57 </div>
58 {% endblock %}
58 {% endblock %}
59 {% block maincolumn %}
59 {% block maincolumn %}
60 <div id="maincolumn">
60 <div id="maincolumn" style="height: 50px"></div>
61
62 </div>
63 {% endblock %}
61 {% endblock %}
64 <div class="cleardivs"></div>
62 <div class="cleardivs"></div>
65 </div>
63 </div>
Show file before | Show file after | Hide comments
@@ -27,10 +27,10
27 <div id="schema">
27 <div id="schema">
28 <header>
28 <header>
29 {% block header %}
29 {% block header %}
30 <nav>
30 <nav id="header">
31 <a href="/abscontrol/">ABS</a> |
31 <a href="/abscontrol/">ABS</a>
32 <a href="#">CR</a> |
32 <a href="#">CR</a>
33 <a href="#">DDS</a> |
33 <a href="#">DDS</a>
34 <a href="#">JARS</a>
34 <a href="#">JARS</a>
35 </nav>
35 </nav>
36 {% endblock %}
36 {% endblock %}
@@ -40,7 +40,7
40 {% endblock %}
40 {% endblock %}
41 <footer>
41 <footer>
42 {% block footer %}
42 {% block footer %}
43 <p>&copy; Copyright by Jicamarca Radio Observatory</p>
43 <p>&copy; Copyright 2013 by Jicamarca Radio Observatory</p>
44 {% endblock %}
44 {% endblock %}
45 </footer>
45 </footer>
46 </div>
46 </div>
General Comments 0
You need to be logged in to leave comments. Login now