ABS/abscontrol Commit - r199:200 · Jicamarca Repository

- Finalizado el formulario del Login al proyecto.

jsalyrosas -

r199:200

parent child

Context file:

r199:200

Collapse all files

trunk/webapp/abs_webapp_dev/settings.py +1 -1

             # Django settings for abs_webapp_dev project.
             import os, sys
             PROJECT_DIR = os.path.split(os.path.dirname(__file__))[0]
             API_DIR = "/home/dev/workspace/absclient"
             sys.path.append(API_DIR)
             DEBUG = True
             TEMPLATE_DEBUG = DEBUG
             ADMINS = (
                 # ('Your Name', 'your_email@example.com'),
             )
             MANAGERS = ADMINS
             DATABASES = {
                 'default': {
                     'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
                     'NAME': 'db_jrowebapp_dev',                      # Or path to database file if using sqlite3.
                     'USER': 'abscontrol',                      # Not used with sqlite3.
                     'PASSWORD': 'abscontrol',                  # Not used with sqlite3.
                     'HOST': 'localhost',                      # Set to empty string for localhost. Not used with sqlite3.
                     'PORT': '3306',                      # Set to empty string for default. Not used with sqlite3.
                 }
             }
             # Local time zone for this installation. Choices can be found here:
             # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
             # although not all choices may be available on all operating systems.
             # In a Windows environment this must be set to your system time zone.
             TIME_ZONE = 'America/Lima'
             # Language code for this installation. All choices can be found here:
             # http://www.i18nguy.com/unicode/language-identifiers.html
             LANGUAGE_CODE = 'en-us'
             SITE_ID = 1
             # If you set this to False, Django will make some optimizations so as not
             # to load the internationalization machinery.
             USE_I18N = True
             # If you set this to False, Django will not format dates, numbers and
             # calendars according to the current locale.
             USE_L10N = True
             # If you set this to False, Django will not use timezone-aware datetimes.
             USE_TZ = True
             # Absolute filesystem path to the directory that will hold user-uploaded files.
             # Example: "/home/media/media.lawrence.com/media/"
             MEDIA_ROOT = os.path.join(PROJECT_DIR, 'media').replace('\\', '/')
             # URL that handles the media served from MEDIA_ROOT. Make sure to use a
             # trailing slash.
             # Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
             MEDIA_URL = '/media/'
             # Absolute path to the directory static files should be collected to.
             # Don't put anything in this directory yourself; store your static files
             # in apps' "static/" subdirectories and in STATICFILES_DIRS.
             # Example: "/home/media/media.lawrence.com/static/"
             #STATIC_ROOT = os.path.join(PROJECT_DIR, 'static-serve').replace('\\', '/'),
             STATIC_ROOT = ''
             # URL prefix for static files.
             # Example: "http://media.lawrence.com/static/"
             STATIC_URL = '/static/'
             # Additional locations of static files
             STATICFILES_DIRS = (
                 # Put strings here, like "/home/html/static" or "C:/www/django/static".
                 # Always use forward slashes, even on Windows.
                 # Don't forget to use absolute paths, not relative paths.
                 #os.path.join(PROJECT_DIR, "static").replace('\\', '/'),
                 ("static", os.path.join(PROJECT_DIR, "static").replace('\\', '/')),
             )
             # List of finder classes that know how to find static files in
             # various locations.
             STATICFILES_FINDERS = (
                 'django.contrib.staticfiles.finders.FileSystemFinder',
                 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
             #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
             )
             # Make this unique, and don't share it with anybody.
             SECRET_KEY = '=^abu)gd=)7hf#rme_vw=tv!bdh7+tts*^&amp;)h(n=7@7(9#__@e'
             # List of callables that know how to import templates from various sources.
             TEMPLATE_LOADERS = (
                 'django.template.loaders.filesystem.Loader',
                 'django.template.loaders.app_directories.Loader',
             #     'django.template.loaders.eggs.Loader',
             )
             MIDDLEWARE_CLASSES = (
                 'django.middleware.common.CommonMiddleware',
                 'django.contrib.sessions.middleware.SessionMiddleware',
-                #'django.middleware.csrf.CsrfViewMiddleware',
+                'django.middleware.csrf.CsrfViewMiddleware',
                 'django.contrib.auth.middleware.AuthenticationMiddleware',
                 'django.contrib.messages.middleware.MessageMiddleware',
                 # Uncomment the next line for simple clickjacking protection:
                 # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
             )
             ROOT_URLCONF = 'abs_webapp_dev.urls'
             # Python dotted path to the WSGI application used by Django's runserver.
             WSGI_APPLICATION = 'abs_webapp_dev.wsgi.application'
             TEMPLATE_DIRS = (
                 # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
                 # Always use forward slashes, even on Windows.
                 # Don't forget to use absolute paths, not relative paths.
                 os.path.join(PROJECT_DIR, "templates").replace('\\', '/'),
             )
             INSTALLED_APPS = (
                 'django.contrib.auth',
                 'django.contrib.contenttypes',
                 'django.contrib.sessions',
                 'django.contrib.sites',
                 'django.contrib.messages',
                 'django.contrib.staticfiles',
                 # Uncomment the next line to enable the admin:
                 'django.contrib.admin',
                 # Uncomment the next line to enable admin documentation:
                 # 'django.contrib.admindocs',
                 'abscontrol',
             )
             # A sample logging configuration. The only tangible logging
             # performed by this configuration is to send an email to
             # the site admins on every HTTP 500 error when DEBUG=False.
             # See http://docs.djangoproject.com/en/dev/topics/logging for
             # more details on how to customize your logging configuration.
             LOGGING = {
                 'version': 1,
                 'disable_existing_loggers': False,
                 'filters': {
                     'require_debug_false': {
                         '()': 'django.utils.log.RequireDebugFalse'
                     }
                 },
                 'handlers': {
                     'mail_admins': {
                         'level': 'ERROR',
                         'filters': ['require_debug_false'],
                         'class': 'django.utils.log.AdminEmailHandler'
                     }
                 },
                 'loggers': {
                     'django.request': {
                         'handlers': ['mail_admins'],
                         'level': 'ERROR',
                         'propagate': True,
                     },
                 }
             }

trunk/webapp/abs_webapp_dev/urls.py +1 0

             from django.conf.urls import patterns, include, url
             from django.conf import settings
             # Uncomment the next two lines to enable the admin:
             from django.contrib import admin
             admin.autodiscover()
             urlpatterns = patterns('',
                 # Examples:
                 # url(r'^$', 'abs_webapp_dev.views.home', name='home'),
                 # url(r'^abs_webapp_dev/', include('abs_webapp_dev.foo.urls')),
                 # Uncomment the admin/doc line below to enable admin documentation:
                 # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
                 # Uncomment the next line to enable the admin:
                 url(r'^admin/', include(admin.site.urls)),
                 url(r'^abscontrol/', include('abscontrol.urls')),
                 url(r'^accounts/login/$', 'django.contrib.auth.views.login'),
+                url(r'^$', 'abscontrol.views.index'),
             )
             if settings.DEBUG:
                 urlpatterns = patterns('',
                 url(r'^media/(?P<path>.*)$', 'django.views.static.serve',{'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
             ) + urlpatterns

trunk/webapp/abscontrol/views.py +2 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 django.contrib.auth.decorators import login_required
             from datetime import datetime
             from abscontrol.models import Profile, Pattern, AntennaDown, AntennaUp
             from util.readABSFile import readABSFile
             from util.saveABSFile import saveABSFile
             from util.ABSData import ABSData
             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]]"
             arrayTx = [["0","0","0","0","0","0","0","0"],\
                        ["0","0","0","0","0","0","0","0"],\
                        ["0","0","0","0","0","0","0","0"],\
                        ["0","0","0","0","0","0","0","0"],\
                        ["0","0","0","0","0","0","0","0"],\
                        ["0","0","0","0","0","0","0","0"],\
                        ["0","0","0","0","0","0","0","0"],\
                        ["0","0","0","0","0","0","0","0"]]
             arrayUes = ["0.533333","0.00000","1.06667","0.00000"]
+            @login_required(login_url='/accounts/login/')
             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,
                                                                   'profile_name' : newprofile.name,
                                                                   'profile_id' : newprofile.id,
                                                                   'lsPatterns' : lsPatterns,
                                                                   'range' : range(8), 'arrayUes' : arrayUes,
                                                                   })
             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)
             # Update temporal experiment
             def upgrade(request, profile_id):
                 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"]
                 objProfile = Profile.objects.get(pk=profile_id)
                 newpattern = objProfile.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/%d/edit/%d' % (int(profile_id), newpattern.id)
                 return redirect(newurl)
             def update(request, profile_id):
                 txtProfile = request.POST["txtProfile"]
                 objProfile = Profile.objects.get(pk=profile_id)
                 objProfile.name = txtProfile
                 objProfile.state = 1
                 objProfile.save()
                 newurl = '/abscontrol/view/%d' % objProfile.id
                 return redirect(newurl)
             def changeName(request, profile_id):
                 profile_list = Profile.objects.filter(state=1)
                 objProfile = Profile.objects.get(pk=profile_id)
                 lsPatterns = objProfile.pattern_set.all()
                 return render_to_response('abscontrol/changeName.html', {'profile_list': profile_list,
                                                                          'objProfile': objProfile,
                                                                          'lsPatterns' : lsPatterns,
                                                                          })
             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
                 absData = ABSData()
                 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()
                 arrayAntennaUp = absData.convertStringtoList2(objAntennaUp.value)
                 if objAntennaUp.tx != None:
                     arrayTxUp = absData.convertStringtoList2(objAntennaUp.tx)
                 else:
                     arrayTxUp = arrayTx
                 if objAntennaUp.rx != None:
                     arrayRxUp = absData.convertStringtoList2(objAntennaUp.rx)
                 else:
                     arrayRxUp = arrayTx
                 if objAntennaUp.ues != None:
                     arrayUesUp = absData.convertStringtoList1(objAntennaUp.ues)
                 else:
                     arrayUesUp = arrayUes
                 arrayAntennaDown = absData.convertStringtoList2(objAntennaDown.value)
                 if objAntennaDown.tx != None:
                     arrayTxDown = absData.convertStringtoList2(objAntennaDown.tx)
                 else:
                     arrayTxDown = arrayTx
                 if objAntennaDown.rx != None:
                     arrayRxDown = absData.convertStringtoList2(objAntennaDown.rx)
                 else:
                     arrayRxDown = arrayTx
                 if objAntennaDown.ues != None:
                     arrayUesDown = absData.convertStringtoList1(objAntennaDown.ues)
                 else:
                     arrayUesDown = arrayUes
                 return render_to_response('abscontrol/edit.html', {'objProfile': objProfile, 'profile_list': profile_list,
                                                                    'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,
                                                                    'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,
                                                                    'arrayAntennaUp' : arrayAntennaUp, 'arrayTxUp' : arrayTxUp,
                                                                    'arrayRxUp' : arrayRxUp, 'arrayRxDown' : arrayRxDown,
                                                                    'arrayAntennaDown' : arrayAntennaDown, 'arrayTxDown' : arrayTxDown,
                                                                    'arrayUesUp' : arrayUesUp, 'arrayUesDown' : arrayUesDown,
                                                                    })
             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,
                                                                          'range' : range(8), 'arrayUes' : arrayUes,
                                                                          })
             def editPattern(request, profile_id, pattern_id):
                 absData = ABSData()
                 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()
                 arrayAntennaUp = absData.convertStringtoList2(objAntennaUp.value)
                 if objAntennaUp.tx != None:
                     arrayTxUp = absData.convertStringtoList2(objAntennaUp.tx)
                 else:
                     arrayTxUp = arrayTx
                 if objAntennaUp.rx != None:
                     arrayRxUp = absData.convertStringtoList2(objAntennaUp.rx)
                 else:
                     arrayRxUp = arrayTx
                 if objAntennaUp.ues != None:
                     arrayUesUp = absData.convertStringtoList1(objAntennaUp.ues)
                 else:
                     arrayUesUp = arrayUes
                 arrayAntennaDown = absData.convertStringtoList2(objAntennaDown.value)
                 if objAntennaDown.tx != None:
                     arrayTxDown = absData.convertStringtoList2(objAntennaDown.tx)
                 else:
                     arrayTxDown = arrayTx
                 if objAntennaDown.rx != None:
                     arrayRxDown = absData.convertStringtoList2(objAntennaDown.rx)
                 else:
                     arrayRxDown = arrayTx
                 if objAntennaDown.ues != None:
                     arrayUesDown = absData.convertStringtoList1(objAntennaDown.ues)
                 else:
                     arrayUesDown = arrayUes
                 return render_to_response('abscontrol/editPattern.html', {'objProfile': objProfile, 'profile_list': profile_list,
                                                                           'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,
                                                                           'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,
                                                                           'arrayAntennaUp' : arrayAntennaUp, 'arrayTxUp' : arrayTxUp,
                                                                           'arrayRxUp' : arrayRxUp, 'arrayRxDown' : arrayRxDown,
                                                                           'arrayAntennaDown' : arrayAntennaDown, 'arrayTxDown' : arrayTxDown,
                                                                           'arrayUesUp' : arrayUesUp, 'arrayUesDown' : arrayUesDown,
                                                                           })
             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 upload(request):
                 profile_list = Profile.objects.filter(state=1)
                 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()
                         if expName != "" and num_patterns > 0:
                             newprofile = Profile(name=expName)
                             newprofile.save()
                             newprofile.state = 1
                             for element in patterns:
                                 newpattern = newprofile.pattern_set.create(value=element["number"])
                                 newpattern.antennaup_set.create(value=element["up"])
                                 newpattern.antennadown_set.create(value=element["down"])
                             newprofile.save()
                             newurl = '/abscontrol/edit/%d' % int(newprofile.id)
                             return redirect(newurl)
                         else:
                             txtError = "Experiment's name not found or the number of patterns is 0."
                             return render_to_response('abscontrol/error.html', {'profile_list': profile_list,
                                                                                 'txtError' : txtError, })
                 else:
                     txtError = "No file."
                     return render_to_response('abscontrol/error.html', {'profile_list': profile_list, 'txtError' : txtError, })
             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 +73 -1

             /*
              * 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 {
             	padding: 0;
             	margin: 0;
             	font-size: 12px; }
             header {
             	width: 980px;
             	height: 50px;
             	text-align: center;
             	line-height: 50px;
             	border: 0px solid #fcc !important; }
             #schema {
             	margin: 0 auto;
             	width: 980px;
             	padding: 10px 10px;
             	border: 0px solid #f00 !important; }
             #content {
             	margin: 5px 0px;
             	border: 0px solid #1cc; }
             #topcolumn {
             	float: left;
             	width: 980px;
             	height: 40px;
             	line-height: 35px;
             	margin: 2px 0px;
             	border: 1px solid #ddd !important;
             	box-shadow: 2px 2px 5px #888; }
             #maincolumn {
             	float: left;
             	width: 980px;
             	margin: 2px 0px;
             	padding: 0px 0px;
             	border: 1px solid #ddd !important;
             	box-shadow: 2px 2px 5px #666; }
             footer {
             	height: 30px;
             	line-height: 30px;
             	text-align: center;
             	margin: 0px 0px;
             	border: 0px solid #200 !important;
             	box-shadow: 2px 2px 5px #888; }
             .cleardivs {
             	clear: both;
             	border: 0px solid #400;
             	height: 0px; }
             textarea {
             	resize: none;
             	overflow: hidden; }
             /****************************************************************************************/
             /******                     ESTILOS GENERALES                           *****************/
             /****************************************************************************************/
             .mnu {
             	height: 22px;
             	border: 0px solid #c55 !important; }
             .mnu li {
             	display:inline; }
             .MnuVertical, .MnuHorizontal {
             	font-family: 'Droid Sans', sans-serif;
             	font-size: inherit;
             	font-style: normal;
             	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 {
             	float: left;
             	width: 300px;
             	margin: 0px;
             	padding: 2px 0px;
             	border: 0px solid #1cc !important; }
             #infoProfiles label {
             	padding: 10px 10px 10px 12px;
             	margin: 10px 0;
             	font-family: 'Droid Sans', sans-serif;
             	/*font-family: 'Roboto Condensed', sans-serif;*/
             	/*letter-spacing: 0.046em;*/ }
             #infoProfiles select {
             	padding: 4px 0px; margin: 0;
             	font-family: 'Droid Sans', sans-serif;
             	font-size: 12px;
             	letter-spacing: 0.006;
             	width: 200px; }
             #mnuProfiles {
             	margin: 0;
             	float: right;
             	padding: 2px 10px;
             	border: 0px solid #1494F6 !important; }
             #mnuProfiles ul {
             	list-style: none;
             	list-style-type: none;
             	margin: 0;
             	padding-left: 20px;
             	border: 0px solid #f00 !important; }
             #mnuProfiles li {
             	width: 80px;
             	float: left;
             	padding: 2px;
             	border: 0px solid #c55 !important; }
             #mnuProfiles a {
             	font-weight: normal;
             	color: #1494F6;
             	display: block;
             	text-align: center;
             	border-bottom: 1px solid #1494F6 !important;
             	text-decoration: none;
             	padding: 0px 4px;
             	line-height: 18px;
             	margin: 6px; }
             /****************************************************************************************/
             /********               FORMULARIO DE PERFILES      *************************************/
             /****************************************************************************************/
             #divProfile {
             	margin: 10px 0px;
             	padding: 10px 10px;
             	width: 500px;
             	border: 0px solid #dff !important; }
             #divProfile label,input[type=text],input[type=file] {
             	font-family: 'Open Sans', sans-serif;
             	/*font-family: 'Roboto Condensed', sans-serif;*/
             	font-size: inherit; }
             #divPattern textarea,input[type=text],label,input[type=file],input[type=button],input[type=submit] {
             	font-family: 'Roboto Condensed', sans-serif;
             	font-size: inherit; }
             .antenna, .NewAntenna {
             	box-shadow: 1px 1px 2px #666;
             	padding: 5px;
             	margin: 10px auto;
             	display: block;
             	border: 0px solid #fee !important; }
             .antenna {
             	width: 520px; }
             .NewAntenna {
             	width: 750px;
             	border: 0px solid #f00 !important; }
             .flsAntenna, .NewFlsAntenna {
             	margin: 0;
             	padding: 0px;
             	border: 1px solid #fee !important; }
             .flsAntenna {
             	width: 510px; }
             .NewFlsAntenna {
             	width: 100%; }
             .legendAntenna {
             	font-family: 'Roboto Condensed', sans-serif;
             	font-size: inherit;
             	text-align: left;
             	margin-left: 10px; }
             .infoAntenna {
             	width: 500px;
             	float: left;
             	border: 0px solid #f00 !important; }
             .overJRO {
             	width: 250px;
             	float: left;
             	margin: 0px 5px;
             	border: 0px solid #1cc !important; }
             .divAntenna, .NewDivAntenna, .NewDivTx {
             	float: left;
             	margin: 10px;
             	border: 0px solid #fcc !important; }
             .divAntenna {
             	width: 220px;
             	border: 0px solid #fcc !important; }
             .NewDivAntenna {
             	border: 0px solid #fcc !important; }
             .NewDivTx {
             	border: 0px solid #fcc !important; }
             .titleField {
             	display: block;
             	text-align: center;
             	font-family: 'Roboto Condensed', sans-serif;
             	letter-spacing: 0.086em; }
             .txtAntenna, .view-textAntenna {
             	width: 175px;
             	max-width: 180px;
             	height: 160px;
             	max-height: 165px;
             	background: #fdfdfb;
             	border: 2px solid #eee !important;
                 text-align: justify;
                 margin: 0 auto;
                 line-height: 20px; }
             .txtAntenna {
             	padding: 4px;
             }
             .view-textAntenna {
             	padding: 2px;
             	font-family: "Ubuntu";
             	font-size: inherit; }
             .boxAntenna, .boxTR {
             	border: 2px solid #eee !important;
             	text-align: center;
             	display: block;
             	float: left;
             	margin: 0;
             	padding: 0; }
             .boxAntenna {
             	padding: 3px; }
             .boxTR {
             	padding: 3px; }
             .fullLine{
             	font-size: 0.95em; }
             .lineInputs, .lineInputsTx {
             	text-align: left;
             	line-height: 1.4em;
             	padding: 0;
             	margin: 0px;
             	display: block;
             	float: left;
             	border: 0px solid #1cc !important; }
             .lineInputs {
             	/*width: 240px;*/
             	border: 0px solid #1cc !important; }
             .lineInputsTx {
             	/*width: 185px;*/
             	border: 0px solid #1cc !important; }
             .divValuesAntenna, .divValuesTx {
             	float: left;
             	display: block;
             	margin: 0 auto;
             	border: 0px solid #bbb !important; }
             .divValuesAntenna {
             	/*width: 230px;*/
             	border: 0px solid #2eb !important; }
             .divValuesTx {
             	/*width: 175px;*/
             	border: 0px solid #bbb !important; }
             .divValuesAntenna input[type=text], .divValuesTx input[type=text] {
             	border: 0px;
             	border-bottom: 1px solid #666 !important;
             	line-height: 1.1em;
             	font-family: 'Roboto Condensed', sans-serif; }
             .divValuesAntenna input[type=text] {
             	width: 18px; }
             .divValuesTx input[type=text]{
             	width: 11px; }
             .lblSign, .lblSignTx {
             	font-family: 'Roboto Condensed', sans-serif;
             	color: #666;
             	float: left;
             	margin: 0px;
             	border: 0px solid #bbb !important; }
             .lblSignLeft {
             	font-family: 'Roboto Condensed', sans-serif;
             	color: #666;
             	float: left;
             	margin: 0px 2px 0px 0px;
             	padding: 0;
             	border: 0px solid #f00 !important; }
             .lblSignRight {
             	font-family: 'Roboto Condensed', sans-serif;
             	color: #666;
             	float: left;
             	margin: 0;
             	padding: 0;
             	border: 0px solid #f00 !important; }
             .lblNewSignLeft, .lblNewSignRight {
             	font-family: 'Roboto Condensed', sans-serif;
             	color: #666;
             	float: left;
             	padding: 0; }
             .lblNewSignLeft {
             	margin: 0px 2px 0px 0px;
             	border: 0px solid #f00 !important; }
             .lblNewSignRight {
             	margin: 0;
             	border: 0px solid #f00 !important; }
             .divTx {
             	display: block;
             	float: left;
             	margin: 10px;
             	border: 0px solid #f00 !important; }
             .divTx label {
             	display: block; }
             .divTx textarea {
             	width: 100px;
             	max-width: 100px;
             	height: 160px;
             	max-height: 165px;
             	text-align: justify;
             	border: 2px solid #eee !important;
             	font-family: "Ubuntu";
             	font-size: inherit;
             	line-height: 20px; }
             .divTx p {
             	width: 100px;
             	max-width: 105px;
             	height: 160px;
             	max-height: 165px;
             	background: #fdfdfb;
             	padding: 2px;
             	border: 1px solid #eee !important;
             	font-family: 'Ubuntu', sans-serif;
             	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', sans-serif;
             	font-size: inherit; }
             .divNewUes {
             	width: 350px;
             	display: block;
             	margin: 0px 10px;
             	padding: 0;
             	font-family: 'Roboto Condensed', sans-serif;
             	/*overflow: hidden;*/
             	border: 0px solid #f00 !important; }
             .titleUes {
             	width: 35px;
             	text-align: right;
             	padding-right: 5px;
             	float: left;
             	line-height: 22px;
             	font-family: 'Roboto Condensed', sans-serif;
             	letter-spacing: 0.086em;
             	border: 0px solid #266 !important; }
             .valueUes {
             	width: 300px;
             	float: left;
             	border: 0px solid #2f4 !important;
             	line-height: 22px; }
             .lblUes {
             	font-family: 'Roboto Condensed', sans-serif;
             	color: #666;
             	font-size: 1.1em; }
             .txtUnitUes {
             	width: 60px;
             	border: 0;
             	padding: 0px 2px;
             	text-align: center;
             	font-family: 'Roboto Condensed', sans-serif;
             	font-size: 0.95em;
             	border-bottom: 1px solid #666 !important; }
             /*
             .divNewUes input[type=text] {
             	width: 240px;
             	max-width: 240px;
             	line-height: 22px; }
             */
             .checkOnly {
             	width: 120px;
             	float: left;
             	display: block;
             	line-height: 25px;
             	border: 0px solid #1cc !important; }
             .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;
             	float: right;
             	margin: 5px 40px 5px 0px;
             	border: 0px solid #1cc !important; }
             #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;
             	margin: 0px 2px;
             	text-align: center;
             	color: #1494F6;
             	border-bottom: 1px solid #1494F6 !important; }
             #infoPattern {
             	display: block;
             	margin: 0px 25px;
             	border: 0px solid #1494f6 !important; }
             #navPatterns {
             	margin: 0 auto;
             	width: 700px;
             	height: 30px;
             	border: 0px solid #d00 !important;
             	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;
             	display: block;
             	text-align: center;
             	line-height: 30px;
             	padding: 1px 0px;
             	border: 0px solid #1cc !important; }
             .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;
             	margin: 0 auto;
             	height: 100%;
             	border: 0px solid #1cc !important; }
             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; }
             header nav a.selected {
             	background: #666;
             	color: #fff; }
+            #Main_Head {
+            	margin: 0 auto;
+            	height: 100%;
+            	border: 1px solid #ddd !important;
+            	box-shadow: 1px 1px 2px #ddd;
+            	border-radius: 5px;
+            	display: block; }
+            .Main_Title {
+            	font-size: 2em;
+            	letter-spacing: 0.06em;
+            	color: #444;
+            	text-shadow: 2px 2px #ccc; }
             /****************************************************************************************/
             /******                 			FOOTER 									*************/
             /****************************************************************************************/
             footer p {
             	font-family: 'Roboto Condensed', sans-serif;
-            	font-size: 0.98em; }
  No newline at end of file
+            	font-size: 0.98em; }
+            /****************************************************************************************/
+            /******                 			LOGIN 									*************/
+            /****************************************************************************************/
+            #contentLogin {
+            	margin: 0;
+            	padding: 0;
+            	border: 0px solid #1cc; }
+            #MainColumnLogin {
+            	margin: 2px auto;
+            	border: 0px solid #f00 !important;
+            	box-shadow: 1px 1px 2px #ddd;
+            	border-radius: 2px;
+            	background-color: #eee;
+            	width: 100%;
+            	padding: 5px 0px;
+            }
+            .row_reg {
+            	margin: 5px auto;
+            	display: block;
+            	width: 90%;
+            	border: 0px solid #1cc !important;
+            	line-height: 22px;
+            }
+            .row_reg label, .row_reg input[type=text] {
+            	float: left;
+            	line-height: 22px;
+            }
+            #id_username, #id_password {
+            	width: 160px;
+            	line-height: 22px;
+            }
+            .row_reg label {
+            	width: 400px;
+            	text-align: right;
+            	padding-right: 10px;
+            	border: 0px solid #d22 !important;
+            }
+            .row_reg input[type=submit], .row_reg input[type=button] {
+            	margin-left: 410px;
+            	width: 80px;
+            }
+            #lblTitleLogin {
+            	width: 100%;
+            	text-align: center;
+            	font-size: 1.2em;
+            	font-weight: normal;
+            	color: #222;
+            	border: 0px solid #f00 !important;
+            	background-color: #ccc;
+            }
  No newline at end of file

trunk/webapp/templates/abscontrol/index.html +8 0

             {% extends "base.html" %}
             {% block title %}ABS CONTROL:::::{% endblock %}
             {% block scripting %}
             	{% if profile_list %}
             	<script src="/static/static/js/profiles.js"></script>
             	{% endif %}
+            {% endblock %}
+            {% block header %}
+            <nav id="header">
+              <a href="{% url abscontrol.views.index %}" class="selected">ABS</a>
+              <a href="#">CR</a>
+              <a href="#">DDS</a>
+              <a href="#">JARS</a>
+            </nav>
             {% 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="MnuHorizontal" id="navProfiles">
                         <ul>
                             <li><a href="{% url abscontrol.views.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="{% url abscontrol.views.importProfile %}">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" style="height: 50px"></div>
                 {% endblock %}
                 <div class="cleardivs"></div>
             </div>
             {% endblock %}

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

             {% 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 %}
+                        {% block header %}
-                            <nav id="header">
+                        	<div id="Main_Head">
-                              <a href="/abscontrol/" class="selected">ABS</a>
+                        		<label class="Main_Title">Jicamarca Radio Observatory</label>
-                              <a href="#">CR</a>
+                        	</div>
-                              <a href="#">DDS</a>
+                        {% endblock %}
-                              <a href="#">JARS</a>
-                            </nav>
-                            {% endblock %}
                         </header>
                         {% block content %}
                         <div id="content"></div>
                         {% endblock %}
                         <footer>
                             {% block footer %}
                             <p>&copy; Copyright 2013 by Jicamarca Radio Observatory</p>
                             {% endblock %}
                         </footer>
                     </div>
                 </body>
             </html>

trunk/webapp/templates/registration/login.html +35 -24

@@ -1,28 +1,39
1	{% extends "base.html" %}	1	{% extends "base.html" %}
2	{% load url from future %}	2	{% load url from future %}
3		3
4	{% block content %}	4	{% block content %}
5		5	<div id="contentLogin">
6	{% if form.errors %}	6	<div class="content_message">
7	<p>Your username and password didn't match. Please try again.</p>	7	{% if form.errors %}
8	{% endif %}	8	<p>Your username and password didn't match. Please try again.</p>
9		9	{% endif %}
10	<form method="post" action="{% url 'django.contrib.auth.views.login' %}">	10	</div>
11	{% csrf_token %}	11	<div id="MainColumnLogin">
12	<table>	12	<form method="post" action="{% url 'django.contrib.auth.views.login' %}">
13	<tr>	13	{% csrf_token %}
14	<td>{{ form.username.label_tag }}</td>	14	<div class="row_reg">
15	<td>{{ form.username }}</td>	15	<label id="lblTitleLogin">Access</label>
16	</tr>	16	<div class="cleardivs"></div>
17	<tr>	17	</div>
18	<td>{{ form.password.label_tag }}</td>	18	<div class="cleardivs"></div>
19	<td>{{ form.password }}</td>	19	<div class="row_reg">
20	</tr>	20	<label>{{ form.username.label_tag }}</label>
21	</table>	21	{{ form.username }}
22		22	<div class="cleardivs"></div>
23	<input type="submit" value="login" />	23	</div>
24	<input type="hidden" name="next" value="{{ next }}" />	24	<div class="cleardivs"></div>
25	</form>	25	<div class="row_reg">
26		26	<label>{{ form.password.label_tag }}</label>
27	{% endblock %}	27	{{ form.password }}
28		28	<div class="cleardivs"></div>
		29	</div>
		30	<div class="cleardivs"></div>
		31	<div class="row_reg">
		32	<input type="submit" value="Ok" />
		33	</div>
		34	<div class="cleardivs"></div>
		35	<input type="hidden" name="next" value="{% url 'abscontrol.views.index' %}" />
		36	</form>
		37	</div>
		38	</div>
		39	{% endblock %} No newline at end of file

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