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 176)
+++ b/trunk/webapp/abscontrol/views.py (revision 177)
@@ -116,7 +116,7 @@
else:
pattern_value = 1
- profile_list = Profile.objects.all()
+ profile_list = Profile.objects.filter(state=1)
objProfile = Profile.objects.get(pk=profile_id)
lsPatterns = objProfile.pattern_set.all()
@@ -142,7 +142,7 @@
else:
pattern_value = 1
- profile_list = Profile.objects.all()
+ profile_list = Profile.objects.filter(state=1)
objProfile = Profile.objects.get(pk=profile_id)
lsPatterns = objProfile.pattern_set.all()
@@ -239,13 +239,16 @@
objAntennaDown.ues = txtUesDown
objAntennaDown.save()
- newurl = '/abscontrol/%d/view/%d' % (int(profile_id), int(pattern_id))
+ if mode == "e":
+ newurl = '/abscontrol/%d/edit/%d' % (int(profile_id), int(pattern_id))
+ else:
+ newurl = '/abscontrol/%d/view/%d' % (int(profile_id), int(pattern_id))
return redirect(newurl)
def viewPattern(request, profile_id, pattern_id):
- profile_list = Profile.objects.all()
+ profile_list = Profile.objects.filter(state=1)
objProfile = Profile.objects.get(pk=profile_id)
patternChoosen = Pattern.objects.get(pk=pattern_id)
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 176)
+++ b/trunk/webapp/static/css/style.css (revision 177)
@@ -8,10 +8,10 @@
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; padding: 10px 10px 10px 10px}
+#schema {margin: 0 auto; width: 980px; border: 1px solid #f00 !important; padding: 10px 10px 10px 10px}
#content {border: 1px solid #1cc; margin-top: 5px; margin-bottom: 5px}
-#content #leftcolumn {float: left;border: 1px solid #c55; width: 150px; }
-#content #maincolumn {float: left; border: 1px solid #000; width: 800px; padding-left: 20px;}
+#content #leftcolumn {float: left;border: 2px solid #f00 !important; width: 160px; }
+#content #maincolumn {float: left; border: 1px solid #000 !important; width: 780px; margin: 0; padding: 0px 10px }
footer {border: 1px solid #200; font-size: 0.9em; height: 30px; text-align: center; line-height: 20px}
.cleardivs {clear: both; border: 0px solid #400; height: 0px}
@@ -29,9 +29,10 @@
/****************************************************************************************/
/****** MENU DE NAVEGACION DE PERFILES **********************************/
/****************************************************************************************/
-#content #infoProfiles {border: 1px solid #d00 !important; width: 140px; margin: 0px; padding-top: 2px; padding-bottom: 2px}
-.lblInfo {padding-left: 12px; line-height: 20px;}
-#infoProfiles select {padding-left: 12px; line-height: 20px;margin-left: 12px}
+#content #infoProfiles {border: 1px solid #1cc !important; width: 100%; margin: 0px; padding-top: 2px; padding-bottom: 2px}
+.lblInfo {line-height: 20px; padding: 10px 10px 10px 12px; margin: 10px 0}
+#infoProfiles select {padding-left: 0px; line-height: 25px;margin-left: 12px; font-family: 'Droid Sans', sans-serif;
+ font-size: 11px; letter-spacing: 0.029em;}
#content nav {border: 0px solid #c55 !important; margin: 0px;}
#leftcolumn #mnuProfiles{ margin: 5px 0px; border: 0px solid #1494F6 !important; }
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 176)
+++ b/trunk/webapp/templates/abscontrol/edit.html (revision 177)
@@ -2,6 +2,19 @@
{% block title %}ABS CONTROL:::PROFILE:::{{ objProfile.name }}{% endblock %}
{% block scripting %}
+{% endblock %}
+{% block mnu_profile %}
+
{% endblock %}
{% block maincolumn%}
@@ -14,12 +27,13 @@
@@ -33,9 +47,9 @@
@@ -47,21 +61,22 @@
-
{{ antennaUp.value }}
+
-
{{ antennaUp.tx }}
+
-
{{ antennaUp.rx }}
+
-
+
+
@@ -69,21 +84,22 @@
-
{{ antennaDown.value }}
+
-
{{ antennaDown.tx }}
+
-
{{ antennaDown.rx }}
+
-
+
+
Index: trunk/webapp/templates/abscontrol/editPattern.html
===================================================================
diff --git a/trunk/webapp/templates/abscontrol/editPattern.html b/trunk/webapp/templates/abscontrol/editPattern.html
--- a/trunk/webapp/templates/abscontrol/editPattern.html (revision 176)
+++ b/trunk/webapp/templates/abscontrol/editPattern.html (revision 177)
@@ -4,7 +4,9 @@
+
{% endblock %}
\ No newline at end of file
Index: trunk/webapp/templates/abscontrol/view.html
===================================================================
diff --git a/trunk/webapp/templates/abscontrol/view.html b/trunk/webapp/templates/abscontrol/view.html
--- a/trunk/webapp/templates/abscontrol/view.html (revision 176)
+++ b/trunk/webapp/templates/abscontrol/view.html (revision 177)
@@ -8,6 +8,16 @@
+ {% block mnuPattern %}
+
+
+ {% endblock %}
{% if patternChoosen %}
@@ -15,9 +25,9 @@
Index: trunk/webapp/templates/abscontrol/viewPattern.html
===================================================================
diff --git a/trunk/webapp/templates/abscontrol/viewPattern.html b/trunk/webapp/templates/abscontrol/viewPattern.html
--- a/trunk/webapp/templates/abscontrol/viewPattern.html (revision 176)
+++ b/trunk/webapp/templates/abscontrol/viewPattern.html (revision 177)
@@ -1,19 +1,5 @@
-{% extends "abscontrol/edit.html" %}
+{% extends "abscontrol/view.html" %}
-{% block mnuPattern %}
-
-
-{% endblock %}
{% block pattern %}
{% if patternChoosen %}