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

             from django.conf.urls import patterns, url
             urlpatterns = patterns('abscontrol.views',
                 url(r'^$', 'index'),
                 url(r'^new/$', 'new'),
                 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'),
                 url(r'^(?P<profile_id>\d+)/edit/(?P<pattern_id>\d+)/$', 'editPattern'),
                 url(r'^(?P<profile_id>\d+)/view/(?P<pattern_id>\d+)/$', 'viewPattern'),
                 url(r'^(?P<profile_id>\d+)/delete/(?P<pattern_id>\d+)/$', 'deletePattern'),
                 #url(r'^(?P<poll_id>\d+)/results/$', 'results'),
                 #url(r'^(?P<poll_id>\d+)/vote/$', 'vote'),
                 url(r'^import/$', 'importProfile'),
                 url(r'^showImport/$', 'showImport'),
                 url(r'^saveImport/$', 'saveImport'),
                 url(r'^(?P<profile_id>\d+)/(?P<pattern_id>\d+)/overjro/(?P<antenna_id>\d+)/$', 'overJRO'),
                 url(r'^export/(?P<profile_id>\d+)/$', 'export'),
                 url(r'^send/(?P<profile_id>\d+)/$', 'send'),
             )

trunk/webapp/abscontrol/views.py +3 0

             from django.shortcuts import render_to_response, redirect
             from django.http import HttpResponse
             from django.conf import settings
             from django.utils.encoding import smart_str
             from django.core.servers.basehttp import FileWrapper
             import mimetypes
             from datetime import datetime
             from abscontrol.models import Profile, Pattern, AntennaDown, AntennaUp
             from util.readABSFile import readABSFile
             from util.saveABSFile import saveABSFile
             from scripts.sendFile import sendFile
             txtAntenna = "[[0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5]," \
                          "[1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0]," \
                          "[0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5]," \
                          "[0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5]," \
                          "[1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0]," \
                          "[0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5]," \
                          "[1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0]," \
                          "[0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5]]"
             txtTxUp = "[[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]]"
             txtTxDown = "[[1,1,1,1,0,0,0,0]," \
                         "[1,1,1,1,0,0,0,0]," \
                         "[1,1,1,1,0,0,0,0]," \
                         "[1,1,1,1,0,0,0,0]," \
                         "[0,0,0,0,1,1,1,1]," \
                         "[0,0,0,0,1,1,1,1]," \
                         "[0,0,0,0,1,1,1,1]," \
                         "[0,0,0,0,1,1,1,1]]"
             txtRxUp = "[[0,0,0,0,1,1,1,1]," \
                       "[0,0,0,0,1,1,1,1]," \
                       "[0,0,0,0,1,1,1,1]," \
                       "[0,0,0,0,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]]"
             txtRxDown = "[[1,1,1,1,1,1,1,1]," \
                         "[1,1,1,1,1,1,1,1]," \
                         "[1,1,1,1,1,1,1,1]," \
                         "[1,1,1,1,1,1,1,1]," \
                         "[1,1,1,1,1,1,1,1]," \
                         "[1,1,1,1,1,1,1,1]," \
                         "[1,1,1,1,1,1,1,1]," \
                         "[1,1,1,1,1,1,1,1]]"
             txtUes = "[0.533333,0.00000,1.06667,0.00000]"
             def index(request):
                 #latest_poll_list = profileAntenna.objects.all().order_by('-pub_date')[:5]
                 profile_list = Profile.objects.filter(state=1)
                 return render_to_response('abscontrol/index.html', {'profile_list': profile_list})
             def new(request):
                 profile_list = Profile.objects.filter(state=1)
                 txtProfile = datetime.now().strftime("%Y%m%d%H%M%S%f")
                 newprofile = Profile(name=txtProfile)
                 newprofile.save()
                 lsPatterns = None
                 return render_to_response('abscontrol/new.html', {'profile_list': profile_list,
                                                                   'txtAntenna' : txtAntenna,
                                                                   'profile_name' : newprofile.name,
                                                                   'profile_id' : newprofile.id,
                                                                   'lsPatterns' : lsPatterns,
                                                                   'txtUes' : txtUes, 'txtTxUp' : txtTxUp,
                                                                   'txtTxDown' : txtTxDown, 'txtRxUp' : txtRxUp,
                                                                   'txtRxDown' : txtRxDown,
                                                                   })
             def save(request):
                 txtProfile = request.POST["txtProfile"]
                 txtAntennaUp = request.POST["txtAntennaUp"]
                 txtTxUp = request.POST["txtTxUp"]
                 txtRxUp = request.POST["txtRxUp"]
                 txtUesUp = request.POST["txtUesUp"]
                 txtAntennaDown = request.POST["txtAntennaDown"]
                 txtTxDown = request.POST["txtTxDown"]
                 txtRxDown = request.POST["txtRxDown"]
                 txtUesDown = request.POST["txtUesDown"]
                 newprofile = Profile(name=txtProfile)
                 newprofile.save()
                 newpattern = newprofile.pattern_set.create(value=1)
                 newpattern.antennaup_set.create(value=txtAntennaUp,tx=txtTxUp,rx=txtRxUp,ues=txtUesUp)
                 newpattern.antennadown_set.create(value=txtAntennaDown,tx=txtTxDown,rx=txtRxDown,ues=txtUesDown)
                 newurl = '/abscontrol/view/%d' % newprofile.id
                 return redirect(newurl)
+            def update(request, profile_id):
+                pass
             def view(request, profile_id):
                 nextPattern = 0
                 if request.method == 'GET' and 'pattern' in request.GET:
                     pattern_value = request.GET["pattern"]
                 else:
                     pattern_value = 1
                 profile_list = Profile.objects.filter(state=1)
                 objProfile = Profile.objects.get(pk=profile_id)
                 lsPatterns = objProfile.pattern_set.all()
                 patternChoosen = objProfile.pattern_set.get(value=pattern_value)
                 objAntennaUp = patternChoosen.antennaup_set.get()
                 objAntennaDown = patternChoosen.antennadown_set.get()
                 if len(lsPatterns) > 1:
                     if pattern_value == 1:
                         nextValuePattern = pattern_value + 1
                         nextPattern = objProfile.pattern_set.get(value=nextValuePattern)
                 return render_to_response('abscontrol/view.html', {'objProfile': objProfile, 'profile_list': profile_list,
                                                                    'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,
                                                                    'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,
                                                                    'nextPattern' : nextPattern,
                                                                    })
             def edit(request, profile_id):
                 if request.method == 'GET' and 'pattern' in request.GET:
                     pattern_value = request.GET["pattern"]
                 else:
                     pattern_value = 1
                 profile_list = Profile.objects.filter(state=1)
                 objProfile = Profile.objects.get(pk=profile_id)
                 lsPatterns = objProfile.pattern_set.all()
                 patternChoosen = objProfile.pattern_set.get(value=pattern_value)
                 objAntennaUp = patternChoosen.antennaup_set.get()
                 objAntennaDown = patternChoosen.antennadown_set.get()
                 return render_to_response('abscontrol/edit.html', {'objProfile': objProfile, 'profile_list': profile_list,
                                                                    'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,
                                                                    'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,
                                                                    })
             def addPattern(request, profile_id):
                 profile_list = Profile.objects.filter(state=1)
                 objProfile = Profile.objects.get(pk=profile_id)
                 return render_to_response('abscontrol/addPattern.html', {'objProfile': objProfile, 'profile_list': profile_list,
                                                                          'txtAntenna' : txtAntenna, 'txtUes' : txtUes,
                                                                          'txtTxUp' : txtTxUp, 'txtTxDown' : txtTxDown,
                                                                          'txtRxUp' : txtRxUp, 'txtRxDown' : txtRxDown,
                                                                          })
             def editPattern(request, profile_id, pattern_id):
                 profile_list = Profile.objects.filter(state=1)
                 objProfile = Profile.objects.get(pk=profile_id)
                 lsPatterns = objProfile.pattern_set.all()
                 patternChoosen = Pattern.objects.get(pk=pattern_id)
                 objAntennaUp = patternChoosen.antennaup_set.get()
                 objAntennaDown = patternChoosen.antennadown_set.get()
                 return render_to_response('abscontrol/editPattern.html', {'objProfile': objProfile, 'profile_list': profile_list,
                                                                           'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,
                                                                           'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,
                                                                           })
             def savePattern(request, profile_id):
                 pattern_id = 0
                 method = "save"
                 if 'pattern_id' in request.POST:
                     pattern_id = request.POST["pattern_id"]
                     method = "update"
                 maxValuePattern = 0
                 txtAntennaUp = request.POST["txtAntennaUp"]
                 txtTxUp = request.POST["txtTxUp"]
                 txtRxUp = request.POST["txtRxUp"]
                 txtUesUp = request.POST["txtUesUp"]
                 txtAntennaDown = request.POST["txtAntennaDown"]
                 txtTxDown = request.POST["txtTxDown"]
                 txtRxDown = request.POST["txtRxDown"]
                 txtUesDown = request.POST["txtUesDown"]
                 mode = request.POST["mode"]
                 if method == "save":
                     objProfile = Profile.objects.get(pk=profile_id)
                     lsPatterns = objProfile.pattern_set.all()
                     if len(lsPatterns) > 0:
                         for element in lsPatterns:
                             if element.value > maxValuePattern:
                                 maxPattern = element.value
                     else:
                         maxPattern = 0
                     if maxPattern < 10 :
                         newValuePattern = maxPattern + 1
                         newpattern = objProfile.pattern_set.create(value=newValuePattern)
                         newpattern.antennaup_set.create(value=txtAntennaUp,tx=txtTxUp,rx=txtRxUp,ues=txtUesUp)
                         newpattern.antennadown_set.create(value=txtAntennaDown,tx=txtTxDown,rx=txtRxDown,ues=txtUesDown)
                         error = 0
                     else:
                         error = 1 # Can not add more patterns
                     if mode == "e":
                         newurl = '/abscontrol/%d/edit/%d' % (int(profile_id), newpattern.id)
                     else:
                         newurl = '/abscontrol/%d/view/%d' % (int(profile_id), newpattern.id)
                 else:
                     txtAntennaUpId = request.POST["txtAntennaUpId"]
                     objAntennaUp = AntennaUp.objects.get(pk=txtAntennaUpId)
                     objAntennaUp.value = txtAntennaUp
                     objAntennaUp.tx = txtTxUp
                     objAntennaUp.rx = txtRxUp
                     objAntennaUp.ues = txtUesUp
                     objAntennaUp.save()
                     txtAntennaDownId = request.POST["txtAntennaDownId"]
                     objAntennaDown = AntennaDown.objects.get(pk=txtAntennaDownId)
                     objAntennaDown.value = txtAntennaDown
                     objAntennaDown.tx = txtTxDown
                     objAntennaDown.rx = txtRxDown
                     objAntennaDown.ues = txtUesDown
                     objAntennaDown.save()
                     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.filter(state=1)
                 objProfile = Profile.objects.get(pk=profile_id)
                 patternChoosen = Pattern.objects.get(pk=pattern_id)
                 objAntennaUp = patternChoosen.antennaup_set.get()
                 objAntennaDown = patternChoosen.antennadown_set.get()
                 lsPatterns = objProfile.pattern_set.all()
                 return render_to_response('abscontrol/viewPattern.html', {'objProfile': objProfile, 'profile_list': profile_list,
                                                                           'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,
                                                                           'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,
                                                                           })
             def deletePattern(request, profile_id, pattern_id):
                 newurl = '/abscontrol/edit/%d' % int(profile_id)
                 return redirect(newurl)
             def importProfile(request):
                 profile_list = Profile.objects.filter(state=1)
                 return render_to_response('abscontrol/import.html', {'profile_list': profile_list,})
             def showImport(request):
                 if request.method == 'POST':
                     txtFilename = request.FILES['txtFile']
                     if txtFilename:
                         destination = open('/tmp/'+txtFilename.name, 'wb+')
                         for chunk in txtFilename.chunks():
                             destination.write(chunk)
                         destination.close()
                         filename = '/tmp/'+txtFilename.name
                         readFile = readABSFile(filename)
                         expName, num_patterns, patterns = readFile.getMetadata()
                 else:
                     txtFilename = "Error"
                     #content = "Error"
                     expName = ""
                     num_patterns = 0
                 return render_to_response('abscontrol/upload-edit.html', {'txtFilename': txtFilename, 'patterns' : patterns,
                                                                           'expName' : expName, 'num_patterns' : num_patterns,
                                                                           })
             def saveImport(request):
                 patterns = []
                 expName = request.POST["txtProfile"]
                 num_patterns = int(request.POST["txtNumPatterns"])
                 newprofile = Profile(name=expName)
                 newprofile.save()
                 for i in range(0,num_patterns):
                     number = request.POST["txtNumberPattern"+str(i+1)]
                     txtAntennaUp = request.POST["txtAntennaUp"+str(i+1)]
                     txtAntennaDown = request.POST["txtAntennaDown"+str(i+1)]
                     dicPattern = {"number" : number, "up" : txtAntennaUp, "down" : txtAntennaDown}
                     patterns.append(dicPattern)
                     newpattern = newprofile.pattern_set.create(value=number)
                     newpattern.antennaup_set.create(value=txtAntennaUp)
                     newpattern.antennadown_set.create(value=txtAntennaDown)
                 newurl = '/abscontrol/view/%d' % newprofile.id
                 return redirect(newurl)
                 '''
                 return render_to_response('abscontrol/upload-view.html', {'expName' : expName, 'patterns' : patterns,
                                                                           'num_patterns' : num_patterns,
                                                                           })
                 '''
             def overJRO(request, profile_id, pattern_id, antenna_id):
                 if request.GET["beam"] == "Up":
                     objAntenna = AntennaUp.objects.get(pk=antenna_id)
                 else:
                     objAntenna = AntennaDown.objects.get(pk=antenna_id)
                 objProfile = Profile.objects.get(pk=profile_id)
                 exp_name = objProfile.name
                 phase_tx = objAntenna.value
                 gain_tx = objAntenna.tx
                 gain_rx = objAntenna.rx
                 ues_tx = objAntenna.ues
                 only_rx = objAntenna.only_rx
                 return exp_name, phase_tx, gain_tx, gain_rx, ues_tx, only_rx
             def export(request, profile_id):
                 listPatterns = []
                 objProfile = Profile.objects.get(pk=profile_id)
                 exp_name = objProfile.name
                 lsPatterns = objProfile.pattern_set.all()
                 for element in lsPatterns:
                     objAntennaUp = element.antennaup_set.get()
                     objAntennaDown = element.antennadown_set.get()
                     dicPatterns = {"number" : element.value, "up" : objAntennaUp.value, "down" : objAntennaDown.value}
                     listPatterns.append(dicPatterns)
                 absFile = saveABSFile()
                 absFile.setParameters(settings.MEDIA_ROOT, exp_name, listPatterns)
                 filename, filesize = absFile.save()
                 wrapper = FileWrapper( open( filename, "r" ) )
                 content_type = mimetypes.guess_type( filename )[0]
                 response = HttpResponse(wrapper, content_type = content_type)
                 response['Content-Description'] = 'File Transfer'
                 response['Content-Disposition'] = 'attachment; filename=%s' % smart_str(filename)
                 response['Content-Transfer-Encoding'] = 'binary'
                 response['Expires'] = '0'
                 response['Cache-Control'] = 'must-revalidate'
                 response['Pragma'] = 'public'
                 response['Content-Length'] = '%s' % str(filesize)
                 response['X-Sendfile'] = '%s' % smart_str(filename)
                 return response
             def send(request, profile_id):
                 listPatterns = []
                 objProfile = Profile.objects.get(pk=profile_id)
                 exp_name = objProfile.name
                 lsPatterns = objProfile.pattern_set.all()
                 for element in lsPatterns:
                     objAntennaUp = element.antennaup_set.get()
                     objAntennaDown = element.antennadown_set.get()
                     dicPatterns = {"number" : element.value, "up" : objAntennaUp.value, "down" : objAntennaDown.value}
                     listPatterns.append(dicPatterns)
                 absFile = saveABSFile()
                 absFile.setParameters(settings.MEDIA_ROOT, exp_name, listPatterns)
                 filename, filesize = absFile.save()
                 apiclient = sendFile()
                 apiclient.execute(filename)
                 output = apiclient.getOutput()
                 if output == "OK":
                     message = "File sent successfully."
                     objProfile.hits += 1
                     objProfile.save()
                 else:
                     message = "Error sending file."
                 profile_list = Profile.objects.all()
                 return render_to_response('abscontrol/sendFile.html', {'message': message, "profile_list" : profile_list,
                                                                        'objProfile': objProfile,
                                                                        })

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

             /*
              * font-family: 'Droid Sans', sans-serif;
              * font-family: 'Ubuntu', sans-serif;
              * font-family: 'Open Sans', sans-serif;
              * font-family: 'Open Sans Condensed', sans-serif;
              * font-family: 'Roboto Condensed', sans-serif;
              */
             body { font-size: 12px; }
-            header {border: 1px solid #fcc; font-size: 2em; height: 50px; text-align: center; line-height: 50px}
+            header {width: 980px; border: 0px solid #fcc !important; height: 50px; text-align: center; line-height: 50px}
-            #schema {margin: 0 auto; width: 980px; border: 1px solid #f00 !important; padding: 10px 10px 10px 10px}
+            #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}
             /****************************************************************************************/
             /******                     ESTILOS GENERALES                           *****************/
             /****************************************************************************************/
             .mnu{ height: 22px; border: 0px solid #c55 !important;}
             .mnu li{ display:inline;}
             .MnuVertical, .MnuHorizontal { font-family: 'Droid Sans', sans-serif; font-size: 1.2em; font-style: italic; text-shadow: 2px 2px #eee}
             .MnuHorizontal ul{ list-style: none; list-style-type: none; margin: 0;}
             /*.MnuHorizontal{ display: -webkit-box; -webkit-box-orient:horizontal;}*/
             /*.MnuHorizontal a{ display:block; padding:10px; -webkit-box-flex:1; text-align:center; }*/
             /****************************************************************************************/
             /******                 MENU DE NAVEGACION DE PERFILES **********************************/
             /****************************************************************************************/
             #infoProfiles {border: 0px solid #1cc !important; width: 300px; margin: 0px; padding-top: 2px; padding-bottom: 2px;
             			   float: left;}
             #infoProfiles label {padding: 10px 10px 10px 12px; margin: 10px 0}
             #infoProfiles select {padding: 4px 0px; margin: 0; font-family: 'Droid Sans', sans-serif;
             					   font-size: 12px; letter-spacing: 0.029em; width: 200px;}
             #mnuProfiles{margin: 0px; border: 0px solid #1494F6 !important; float: left; padding: 2px 10px}
             #mnuProfiles ul{list-style: none; list-style-type: none; margin: 0; padding-left: 20px; border: 0px solid #f00 !important}
             #mnuProfiles li{ width: 80px; padding: 2px; border: 0px solid #c55 !important; float: left; }
             #mnuProfiles a{ font-weight: normal; color: #1494F6; display: block; border: 0px solid #1cc !important; text-align: center}
             /****************************************************************************************/
             /********               FORMULARIO DE PERFILES      *************************************/
             /****************************************************************************************/
             #divProfile { border: 0px solid #dff !important; margin: 10px 0px; padding: 10px 10px; width: 500px }
             .flsAntenna { margin: 0; width: 100%; padding: 0px; border: 0px solid #f00 !important }
             #divPattern textarea,input[type=text],label{ font-family: "Open Sans"; font-size: inherit; }
             #divPattern textarea {resize: none; overflow: hidden}
             .antenna{ border: 0px solid #1494F6 !important; padding: 2px; margin: 5px 10px; float: left; width: 480px}
             .infoAntenna{ border: 0px solid #f00 !important; width: 480px; float: left}
             .overJRO{ border: 0px solid #1cc !important; width: 250px; float: left; margin: 0px 5px}
             .divAntenna { float: left; margin: 10px; border: 0px solid #fcc !important; width: 190px }
             .divAntenna label{ display: block }
             .txtAntenna { width: 175px; max-width: 180px; height: 160px; max-height: 165px; background: #fdfdfb; padding: 4px;
                           border: 2px solid #eee !important; /*font-family: "Ubuntu"; font-size: inherit;*/
                           text-align: justify; margin: 0 auto; line-height: 20px}
             .divAntenna p{ width: 175px; max-width: 180px; height: 160px; max-height: 165px; background: #fdfdfb; padding: 2px;
                            border: 1px solid #eee !important; font-family: "Ubuntu"; font-size: inherit;
                            text-align: justify; margin: 0 auto; line-height: 20px}
             .divTx { display: block; float: left; margin: 10px; height: 150px }
             .divTx label{ display: block }
             .divTx textarea{ width: 135px; max-width: 135px; height: 135px; max-height: 140px; text-align: justify }
             .divTx p{ width: 100px; max-width: 105px; height: 160px; max-height: 165px; background: #fdfdfb; padding: 2px;
                       border: 1px solid #eee !important; font-family: "Ubuntu"; font-size: inherit;
                       text-align: justify; margin: 0 auto; line-height: 20px;}
             .divUes { display: block; margin: 10px}
             .divUes input[type=text] { width: 240px; max-width: 240px; font-family: "Ubuntu"; font-size: inherit;}
             .overJRO img{width: 400px; height: 200px; text-align: center; vertical-align: middle; margin: 40px 5px 5px 5px;
                          display: block; background: #fdfdfb; border: 1px solid #eee !important;}
             .overJRO a{ text-align: center; margin: 0 auto; display: block}
             /****************************************************************************************/
             /******                 MENU DE NAVEGACION DE PATRONES **********************************/
             /****************************************************************************************/
             #divMnuPattern{ width: 280px; height: 25px; display: block; border: 0px solid #1cc !important; float: right;
             				margin: 5px 40px 5px 0px;}
             #divMnuPattern li{ float: right; display: block; width: 60px; border: 0px solid #2cc !important}
             #divMnuPattern a{ display: block; line-height: 22px; text-decoration: none; padding: 0px 5px;
                               border-bottom: 1px solid #1494F6 !important; margin: 0px 2px; text-align: center; color: #1494F6
                             }
             #infoPattern{ display: block; border: 1px solid #1494f6 !important; margin: 5px 2px; }
             #navPatterns{ margin: 0 auto; border: 0px solid #d00 !important; width: 700px; height: 30px;
                           font-family: 'Ubuntu', sans-serif; font-size: 14px; padding: 5px 0px}
             #navPatternList{ margin: 0 auto; border: 0px solid #ecc !important}
             #navPatternList ul{ list-style: none; list-style-type: none; margin: 0;}
             #navPatternList ul li{ float: left; width: 50px; border: 1px solid #eee !important; }
             #navPatternList a{ width: 50px; border: 0px solid #1cc !important; display: block; text-align: center; line-height: 30px; padding: 1px 0px}
             .lnkPattern{ background-color: #ccc !important; color: #eee;}
             .lnkPatternSelected{ background-color: #2cc !important; color: #fff;}
             .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}

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

             {% extends "abscontrol/index.html" %}
             {% block title %}ABS CONTROL:::PROFILE:::{{ objProfile.name }}{% endblock %}
             {% block scripting %}
                 <script src="/static/static/js/patterns.js"></script>
             {% endblock %}
             {% 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>
-                    <li><a href="#">Save</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 %}
                 </ul>
             </nav>
             {% endblock %}
             {% block maincolumn%}
             <div id="maincolumn">
                 <div id="divProfile">
                     <label for="lblName">Profile:</label>
                     <label for="lblProfile">{{ objProfile.name }}</label>
                 </div>
                 {% if patternChoosen %}
                 <div id="navPatterns">
                     <nav class="" id="navPatternList">
                         <ul>
                     {% for element in lsPatterns %}
                         {% if patternChoosen.id == element.id %}
                         <li><a href="/abscontrol/{{ objProfile.id }}/edit/{{ element.id }}" class="lnkPatternSelected">{{ element.value }}</a></li>
                         {% else %}
                         <li><a href="/abscontrol/{{ objProfile.id }}/edit/{{ element.id }}" class="lnkPattern">{{ element.value }}</a></li>
                         {% endif %}
                     {% endfor %}
                         </ul>
                     </nav>
                 </div>
                 {% endif %}
                 <div id="divPattern">
                     {% block mnuPattern %}
                     <div class="divMenu" id="divMnuPattern">
                         <nav class="MnuHorizontal">
                             <ul class="mnu" id="mnuPattern">
                             	{% if lsPatterns|length > 1 %}
                                 <li><a href="/abscontrol/{{ objProfile.id }}/delete/{{ patternChoosen.id }}">Delete</a></li>
                                 {% endif %}
                                 <li><a href="#" class="" id="lnkSave">Save</a></li>
                             	{% if lsPatterns|length < 10 %}
                                 <li><a href="/abscontrol/{{ objProfile.id }}/add">Add</a></li>
                                 {% endif %}
                             </ul>
                         </nav>
                     </div>
                     <div class="cleardivs"></div>
                     {% endblock %}
                     {% block pattern %}
                     <div id="infoPattern">
                         <div id="antennaUp">
                             <fieldset class="flsAntenna">
                                 <legend>UP</legend>
                                 <div class="divAntenna">
                                     <label for="lblAntenna">Antenna</label>
                                     <textarea name="txtAntennaUp" class="txtAntenna" cols="38" rows="8">{{ antennaUp.value }}</textarea>
                                 </div>
                                 <div class="divTx">
                                     <label for="lblTx">Tx</label>
                                     <textarea name="txtTxUp" class="txtTR" cols="20" rows="8">{{ antennaUp.tx }}</textarea>
                                 </div>
                                 <div class="divTx">
                                     <label for="lblRx">Rx</label>
                                     <textarea name="txtRxUp" class="txtTR" cols="20" rows="8">{{ antennaUp.rx }}</textarea>
                                 </div>
                                 <div class="cleardivs"></div>
                                 <div class="divUes">
                                     <label for="lblUes">Ues:</label>
                                     <input type="text" name="txtUesUp" value="{{ antennaUp.ues }}" />
                                 </div>
                                 <input type="hidden" name="txtAntennaUpId" value="{{ antennaUp.id }}" />
                             </fieldset>
                         </div>
                         <div id="antennaDown">
                             <fieldset class="flsAntenna">
                                 <legend>DOWN</legend>
                                 <div class="divAntenna">
                                     <label for="lblAntenna">Antenna</label>
                                     <textarea name="txtAntennaDown" class="txtAntenna" cols="38" rows="8">{{ antennaDown.value }}</textarea>
                                 </div>
                                 <div class="divTx">
                                     <label for="lblTx">Tx</label>
                                     <textarea name="txtTxDown" class="txtTR" cols="20" rows="8">{{ antennaDown.tx }}</textarea>
                                 </div>
                                 <div class="divTx">
                                     <label for="lblRx">Rx</label>
                                     <textarea name="txtRxDown" class="txtTR" cols="20" rows="8">{{ antennaDown.rx }}</textarea>
                                 </div>
                                 <div class="cleardivs"></div>
                                 <div class="divUes">
                                     <label for="lblUes">Ues:</label>
                                     <input type="text" name="txtUesDown" value="{{ antennaDown.ues }}" />
                                 </div>
                                 <input type="hidden" name="txtAntennaDownId" value="{{ antennaDown.id }}" />
                             </fieldset>
                         </div>
                     </div>
                     {% endblock %}
                 </div>
             </div>
             {% endblock %}

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

             {% extends "base.html" %}
             {% block title %}ABS CONTROL:::::{% endblock %}
             {% block scripting %}
             	{% if profile_list %}
             	<script src="/static/static/js/profiles.js"></script>
             	{% endif %}
             {% endblock %}
             {% block content %}
             <div id="content">
                 {% block topcolumn %}
                 <div id="topcolumn">
                     <div id="lsProfiles">
                         <div id="infoProfiles">
                             <label for="lblProfile" class="lblInfo">Profiles: </label>
                             {% if profile_list %}
                             <select name="lsProfiles" id="listProfiles">
                                 <option value="-1">Choose ...</option>
                             {% for entry in profile_list %}
                             	{% if objProfile %}
                             		{% if objProfile.id == entry.id %}
                                 <option value="{{ entry.id }}" selected>{{ entry.name }}</option>
                                 	{% else %}
                                 <option value="{{ entry.id }}">{{ entry.name }}</option>
                                 	{% endif %}
                                 {% else %}
                                 <option value="{{ entry.id }}">{{ entry.name }}</option>
                                 {% endif %}
                             {% endfor %}
                             </select>
                             {% else %}
                             <label for="lblMessage" class="lblInfo">No profiles.</label>
                             {% endif %}
                         </div>
                     </div>
                     {% block mnu_profile %}
                     <div id="mnuProfiles">
                     <nav class="MnuVertical" id="navProfiles">
                         <ul>
                             <li><a href="/abscontrol/new">New</a></li>
                             {% if objProfile %}
                             <li><a href="/abscontrol/edit/{{ objProfile.id }}">Edit</a></li>
                             <li><a href="#">Save</a></li>
                             {% endif %}
                             <li><a href="#">Save as</a></li>
                             <li><a href="/abscontrol/import">Import</a></li>
                             {% if objProfile %}
                             <li><a href="#" id="lnkExport" alt="{{ objProfile.id }}">Export</a></li>
                             <li><a href="#" id="lnkSendFile" alt="{{ objProfile.id }}">Send</a></li>
                             {% endif %}
                         </ul>
                         <div class="cleardivs"></div>
                     </nav>
                     </div>
                     {% endblock %}
                     <div class="cleardivs"></div>
                 </div>
                 {% endblock %}
                 {% block maincolumn %}
-                <div id="maincolumn">
+                <div id="maincolumn" style="height: 50px"></div>
-                </div>
                 {% endblock %}
                 <div class="cleardivs"></div>
             </div>
             {% endblock %}

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

             {% load static %}
             <!DOCTYPE html>
             <html lang="en">
                 <head>
                     <meta charset="utf-8" />
                     {% comment %}
                     <!-- Always force latest IE rendering engine (even in intranet) & Chrome Frame
                     Remove this if you use the .htaccess -->
                     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
                     {% endcomment %}
                     <link href='http://fonts.googleapis.com/css?family=Droid+Sans|Ubuntu:400,500,300italic|Open+Sans:400,300,600|Open+Sans+Condensed:300,700|Roboto+Condensed:400,300' rel='stylesheet' type='text/css'>
                     <link rel="stylesheet" href="{% static 'static/css/style.css' %}" type="text/css" />
                     <script src="{% static 'static/js/jquery-1.9.1.min.js' %}"></script>
                     {% block scripting %}{% endblock %}
                     <title>{% block title %}JRO WEB APPS::::{% endblock %}</title>
                     <meta name="description" content="JRO WEB APPLICATIONS" />
                     <meta name="author" content="Jose Antonio Sal y Rosas Celi" />
                     {# <meta name="viewport" content="width=device-width; initial-scale=1.0" /> #}
                     {% comment %}
                     <!-- Replace favicon.ico & apple-touch-icon.png in the root of your domain and delete these references -->
                     <link rel="shortcut icon" href="/favicon.ico" />
                     <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
                     {% endcomment %}
                 </head>
                 <body>
                     <div id="schema">
                         <header>
                             {% block header %}
-                            <nav>
+                            <nav id="header">
-                              <a href="/abscontrol/">ABS</a> |
+                              <a href="/abscontrol/">ABS</a>
-                              <a href="#">CR</a> |
+                              <a href="#">CR</a>
-                              <a href="#">DDS</a> |
+                              <a href="#">DDS</a>
                               <a href="#">JARS</a>
                             </nav>
                             {% endblock %}
                         </header>
                         {% block content %}
                         <div id="content"></div>
                         {% endblock %}
                         <footer>
                             {% block footer %}
-                            <p>&copy; Copyright by Jicamarca Radio Observatory</p>
+                            <p>&copy; Copyright 2013 by Jicamarca Radio Observatory</p>
                             {% endblock %}
                         </footer>
                     </div>
                 </body>
             </html>

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