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 208) +++ b/trunk/webapp/abscontrol/views.py (revision 209) @@ -118,6 +118,9 @@ }, context_instance=RequestContext(request)) def view(request, profile_id): + objProfileActive = None + objPatternActive = None + if request.method == 'GET' and 'pattern' in request.GET: pattern_value = request.GET["pattern"] else: @@ -131,9 +134,18 @@ objAntennaUp = patternChoosen.antennaup_set.get() objAntennaDown = patternChoosen.antennadown_set.get() + lsProfilesActive = Profile.objects.filter(is_active=1) + if len(lsProfilesActive) > 0: + objProfileActive = Profile.objects.get(is_active=1) + + lsPatternsActive = Pattern.objects.filter(is_active=1) + if len(lsPatternsActive) > 0: + objPatternActive = Pattern.objects.get(is_active=1) + return render_to_response('abscontrol/view.html', {'objProfile': objProfile, 'profile_list': profile_list, 'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns, 'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown, + 'profileActive' : objProfileActive, 'patternActive' : objPatternActive, }, context_instance=RequestContext(request)) def edit(request, profile_id): @@ -322,9 +334,18 @@ lsPatterns = objProfile.pattern_set.all() + lsProfilesActive = Profile.objects.filter(is_active=1) + if len(lsProfilesActive) > 0: + objProfileActive = Profile.objects.get(is_active=1) + + lsPatternsActive = Pattern.objects.filter(is_active=1) + if len(lsPatternsActive) > 0: + objPatternActive = Pattern.objects.get(is_active=1) + return render_to_response('abscontrol/viewPattern.html', {'objProfile': objProfile, 'profile_list': profile_list, 'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns, 'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown, + 'profileActive' : objProfileActive, 'patternActive' : objPatternActive, }, context_instance=RequestContext(request)) def deletePattern(request, profile_id, pattern_id): =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/webapp/media/navbarsep.png =================================================================== diff --git a/trunk/webapp/media/navbarsep.png b/trunk/webapp/media/navbarsep.png new file mode 10644 --- /dev/null (revision 0) +++ b/trunk/webapp/media/navbarsep.png (revision 209) 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 208) +++ b/trunk/webapp/static/css/style.css (revision 209) @@ -25,8 +25,8 @@ border: 0px solid #f00 !important; } #content { - margin: 5px 0px; - border: 0px solid #1cc; } + margin: 2px 0px 0px 0px; + border: 0px solid #1cc !important; } #topcolumn { float: left; @@ -37,11 +37,19 @@ border: 1px solid #ddd !important; box-shadow: 2px 2px 5px #888; } +#activeProfileBar { + float: left; + width: 980px; + margin: 0px 0px; + height: 25px; + border: 1px solid #ddd !important; + box-shadow: 1px 1px 5px #ccc; } + #maincolumn { float: left; width: 980px; - margin: 2px 0px; - padding: 0px 0px; + margin: 2px 0px 0px 0px; + padding: 2px 0px 6px 0px; border: 1px solid #ddd !important; box-shadow: 2px 2px 5px #666; } @@ -124,7 +132,7 @@ padding: 4px 0px; margin: 0; font-family: 'Droid Sans', sans-serif; font-size: 12px; - letter-spacing: 0.006; + letter-spacing: 0.006em; width: 200px; } #mnuProfiles { @@ -158,6 +166,31 @@ margin: 6px; } /****************************************************************************************/ +/****** BARRA DE PERFILES ACTIVOS *************/ +/****************************************************************************************/ + +#activeProfileBar label, a{ + line-height: 20px; + float: left; + letter-spacing: 0.01em; + padding: 3px 12px; + border: 0px solid #f00 !important; } + +.titleBar { + color: #333; + margin-left: 2px; + text-align: right; } + +.ActiveProfile, .ActivePattern, .lnkActiveProfile { + color: #001bf4; + margin: 0px 2px; + text-align: left; + text-decoration: None; } + +.navbarsep{ + float: left; } + +/****************************************************************************************/ /******** FORMULARIO DE PERFILES *************************************/ /****************************************************************************************/ #divProfile { @@ -168,8 +201,31 @@ #divProfile label,input[type=text],input[type=file] { font-family: 'Open Sans', sans-serif; - /*font-family: 'Roboto Condensed', sans-serif;*/ font-size: inherit; } + +#divProfile label { + float: left; + text-align: right; + width: 120px; + padding: 3px 10px 3px 10px; + line-height: 20px; + border: 0px solid #d85 !important; +} + +#divProfile input[type=text] { + letter-spacing: 0.08em; + padding: 2px 10px 2px 10px; + width: 200px; +} + +#divProfile input[type=text]:FOCUS { + border: 1px solid #faa !important; + border-radius: 0.26em; + box-shadow: 2px 2px 5px #fbb; +} + +.lblProfile { + width: 200px; } #divPattern textarea,input[type=text],label,input[type=file],input[type=button],input[type=submit] { font-family: 'Roboto Condensed', sans-serif; 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 208) +++ b/trunk/webapp/templates/abscontrol/edit.html (revision 209) @@ -7,7 +7,9 @@ {% endblock %} {% block maincolumn%} +{% block activeProfileBar %} +
+
+ + + {% if profileActive != None %} + {{ profileActive.name }} + {% endif %} + {% if patternActive != None %} + + {{ patternActive.value }} + {% endif %} +
+
+{% endblock %}
{% if objProfile.state == 0 %}