DATABASES/madrigal Commit - r2:98d277d09dd7

Add modules for interactive plots and upload data

jespinoza -

r2:98d277d09dd7

parent child

Context file:

r2:98d277d09dd7

Expand all files

The requested changes are too big and content was truncated. Show full diff

source/madpy/djangoMad/apps/login/__init__.py created 755 0 0

NO CONTENT: new file 100755

source/madpy/djangoMad/apps/login/migrations/__init__.py created 755 0 0

NO CONTENT: new file 100755

source/madpy/djangoMad/apps/login/templates/login/login.html created 755 +17 0

@@ -0,0 +1,17
	1	{% extends "base.html" %}
	2
	3	{% block title %}Login{% endblock %}
	4
	5	{% block content %}
	6	<center>
	7	<h4>Please login</h4>
	8
	9	<div style="margin-top: 30px;">
	10	<form method="POST">
	11	{{ form.as_p }}
	12	{% csrf_token %}
	13	<button type="submit">Login</button>
	14	</form>
	15	</div>
	16	</center>
	17	{% endblock %}

source/madpy/djangoMad/apps/login/urls.py created 755 +9 0

@@ -0,0 +1,9
	1	from django.conf.urls import url
	2	from . import views
	3
	4	urlpatterns = [
	5	url(r'^login/$', views.login_view, name='login'),
	6	url(r'^logout/$', views.logout_view, name='logout'),
	7	]
	8
	9	app_name = 'login' No newline at end of file

source/madpy/djangoMad/apps/login/views.py created 755 +38 0

@@ -0,0 +1,38
	1	from django.contrib.auth import authenticate
	2	from django.contrib.auth import login, logout
	3	from django.contrib.auth.forms import AuthenticationForm
	4	from django.shortcuts import render, redirect
	5
	6	''' Login to updata app for ROJ staff'''
	7
	8	def login_view(request):
	9
	10	form = AuthenticationForm()
	11	if request.method == "POST":
	12	form = AuthenticationForm(data=request.POST)
	13
	14	if form.is_valid():
	15
	16	username = form.cleaned_data['username']
	17	password = form.cleaned_data['password']
	18
	19	user = authenticate(username=username, password=password)
	20
	21	if user is not None:
	22
	23	if user.is_active:
	24	login(request, user)
	25
	26	return redirect('/updata')
	27	else:
	28	return render(request, "login/login.html" )
	29	else:
	30	context = {'error_login': "error"}
	31	return render(request, "login/login.html", context )
	32
	33	return render(request, "login/login.html", {'form': form})
	34
	35	def logout_view(request):
	36
	37	logout(request)
	38	return redirect('/') No newline at end of file

source/madpy/djangoMad/apps/updata/__init__.py created 755 0 0

	1	NO CONTENT: new file 100755			NO CONTENT: new file 100755

NO CONTENT: new file 100755

source/madpy/djangoMad/apps/updata/forms.py created 755 +108 0

@@ -0,0 +1,108
	1	from django import forms
	2	import django.utils.html
	3	import django.utils.safestring
	4	import django.template.defaulttags
	5
	6	# third party imports
	7	import numpy
	8
	9	# Madrigal imports
	10	import madrigal.metadata
	11	import madrigal.ui.web
	12
	13	# madrigal imports
	14	import madrigal._derive
	15	import madrigal.metadata
	16	import madrigal.ui.web
	17	import madrigal.cedar
	18	import madrigal.isprint
	19	import madweb.forms
	20
	21	import datetime, time
	22
	23	def getSelection(keyword, args, kwargs):
	24	"""getSelection returns '0' if keyword not a key in either args[0] or kwargs,
	25	otherwise the value
	26
	27	args, kwargs - arguments as passed into SingleExpDefaultForm __init__
	28	"""
	29	if len(args) == 0 and len(list(kwargs.keys())) == 0:
	30	return('0') # default case when no data passed in
	31	elif len(args) > 0:
	32	# args[0] is data dict argument to bind data
	33	if keyword in args[0]:
	34	return(args[0][keyword])
	35	else:
	36	return('0')
	37	elif keyword in kwargs:
	38	return(kwargs[keyword])
	39	elif 'data' in kwargs:
	40	if keyword in kwargs['data']:
	41	return(kwargs['data'][keyword])
	42	else:
	43	return('0')
	44	else:
	45	return('0')
	46
	47	def getExperimentList(args, kwargs, madWeb, header='Select experiment: '):
	48
	49	instrumentsId= int(getSelection('instruments', args, kwargs))
	50
	51	kinstList = [int(instrumentsId)]
	52	startDate = datetime.datetime(1950,1,1)
	53	startDT = datetime.datetime(startDate.year, startDate.month, startDate.day, 0, 0, 0)
	54	now = datetime.datetime.now()
	55	endDate = datetime.datetime(now.year, 12, 31, 23, 59, 59)
	56	endDT = datetime.datetime(endDate.year, endDate.month, endDate.day, 23, 59, 59)
	57	experiments = madWeb.getExperimentList(kinstList,startDT, endDT, True)
	58	expListin = [('0', header),]
	59	for exp in experiments:
	60	expListin.append((exp[0], exp[2]))
	61
	62	# Using set
	63	seen = set()
	64
	65	# using list comprehension
	66	expList = [(a, b) for a, b in expListin
	67	if not (b in seen or seen.add(b))]
	68
	69	return(expList)
	70
	71	class UpdataForm(forms.Form):
	72	def __init__(self, args, *kwargs):
	73	super(UpdataForm, self).__init__(args, *kwargs)
	74	madDB = madrigal.metadata.MadrigalDB()
	75	madInstData = madrigal.metadata.MadrigalInstrumentData(madDB)
	76	instruments = madInstData.getInstruments(0, True)
	77	instList = [('0', "Select Instrument"), ]
	78	for kinst, instDesc, siteID in instruments:
	79	instList.append((str(kinst), instDesc))
	80
	81	instrumentSelection = getSelection('instruments', args, kwargs)
	82	self.fields['instruments'] = django.forms.ChoiceField(widget = django.forms.Select(attrs={"onChange":'populateExp(this)'}),
	83	choices=instList,
	84	initial=instrumentSelection,
	85	label='Instrument:')
	86
	87	madWebObj = madrigal.ui.web.MadrigalWeb(madDB)
	88	experimentSelection = getSelection('experiments', args, kwargs)
	89	self.fields['experiments'] = django.forms.ChoiceField(choices=getExperimentList(args, kwargs, madWebObj),
	90	initial=experimentSelection,
	91	required=False, label='Experiment:')
	92
	93	description = forms.CharField(widget=forms.Textarea(attrs={'cols': 40,'rows': 3, 'style': 'resize:none'}), label='Description')
	94	type = forms.ChoiceField(choices=[('0', 'Public'),('1', 'Private')], initial=0,widget=forms.RadioSelect(attrs={'class': 'custom-radio'}))
	95	file = forms.FileField(label='Select Files', widget=forms.ClearableFileInput(attrs={'multiple': True}))
	96
	97	class ExpForm(forms.Form):
	98	"""SingleExpInstForm is a Form class for the instrument select field in the Single Experiment interface.
	99	Use this because its faster to create than the full SingleExpDefaultForm
	100	"""
	101	def __init__(self, args, *kwargs):
	102	super(ExpForm, self).__init__(args, *kwargs)
	103	madDB = madrigal.metadata.MadrigalDB()
	104	madWebObj = madrigal.ui.web.MadrigalWeb(madDB)
	105	experimentSelection = getSelection('experiments', args, kwargs)
	106	self.fields['experiments'] = django.forms.ChoiceField(choices=getExperimentList(args, kwargs, madWebObj),
	107	initial=experimentSelection,
	108	required=False, label='Experiment')

source/madpy/djangoMad/apps/updata/migrations/__init__.py created 755 0 0

	1	NO CONTENT: new file 100755			NO CONTENT: new file 100755

NO CONTENT: new file 100755

source/madpy/djangoMad/apps/updata/templates/updata/experiments.html created 755 +9 0

@@ -0,0 +1,9
	1	<div class="row">
	2	{{ form.experiments.label }}
	3	</div>
	4	<!-- Instrument select is its own row in selections column -->
	5	<div class="row">
	6	<div class="col-md-12">
	7	{{ form.experiments }}
	8	</div> <!-- end span -->
	9	</div> <!-- end row --> No newline at end of file

source/madpy/djangoMad/apps/updata/templates/updata/index.html created 755 +102 0

@@ -0,0 +1,102
	1	{% extends "base.html" %}
	2	{% block title %}Upload Data{% endblock %}
	3
	4	{% block extra_head %}
	5	<script type="text/javascript">
	6	function populateExp(select) {
	7
	8	var kinst = select.options[select.selectedIndex].value;
	9	var url = "{% url 'updata:get_experiments' %}" + '?instruments=' + kinst;
	10	// first delete all forms that are now out of date
	11	divIndex = $(".single_form").index($("#experiments"))
	12	$(".single_form").slice(divIndex).empty()
	13	// second populate the categories html
	14	$(".single_form").slice(divIndex, divIndex + 1).load(url);
	15	}
	16
	17	</script>
	18
	19	<style>
	20	.custom-radio {
	21	list-style: none;
	22	margin: 0;
	23	padding: 0;
	24	}
	25	</style>
	26	{% endblock %}
	27
	28	{% block content %}
	29
	30	<center><h4>Upload Data</h4></center>
	31	<form method="post" enctype="multipart/form-data">
	32
	33	{% csrf_token %}
	34
	35	{% block description %}
	36	<!-- subdivide selection column for instruments to be possibly filled in by ajax - single_form 0 -->
	37	<div class="col-md-12 single_form" id="description">
	38	<div class="row">
	39	{{ form.description.label }}
	40	</div>
	41	<!-- Instrument select is its own row in selections column -->
	42	<div class="row">
	43	<div class="col-md-12">
	44	{{ form.description }}
	45	</div> <!-- end span -->
	46	</div> <!-- end row -->
	47	</div> <!-- end subdivide -->
	48
	49	{% endblock %}
	50
	51	{% block file %}
	52	<div class="col-md-12 single_form" style="margin-top: 15px;" id="description">
	53	<div class="row">
	54	{{ form.file.label }}
	55	</div>
	56	<!-- Instrument select is its own row in selections column -->
	57	<div class="row">
	58	<div class="col-md-12">
	59	{{ form.file }}
	60	</div> <!-- end span -->
	61	</div> <!-- end row -->
	62	</div> <!-- end subdivide -->
	63
	64	{% endblock %}
	65
	66	{% block type %}
	67	<div class="col-md-12 single_form" style="margin-top: 15px;" id="description">
	68	<!-- Instrument select is its own row in selections column -->
	69	<div class="row">
	70	<div class="col-md-12">
	71	{{ form.type }}
	72	</div> <!-- end span -->
	73	</div> <!-- end row -->
	74	</div> <!-- end subdivide -->
	75
	76	{% endblock %}
	77
	78	{% block instruments %}
	79	<!-- subdivide selection column for instruments to be possibly filled in by ajax - single_form 0 -->
	80	<div class="col-md-12 single_form" style="margin-top: 15px;" id="instruments">
	81
	82	{% if form.instruments %}
	83	{% include "madweb/instruments.html" %}
	84	{% endif %}
	85
	86	</div> <!-- end subdivide -->
	87	{% endblock %}
	88
	89	{% block experiments %}
	90	<!-- subdivide selection column for experiments to be possibly filled in by ajax - single_form 0 -->
	91	<div class="col-md-12 single_form" style="margin-top: 15px;" id="experiments">
	92
	93	{% if form.experiments %}
	94	{% include "updata/experiments.html" %}
	95	{% endif %}
	96
	97	</div> <!-- end subdivide -->
	98	{% endblock %}
	99	<button style="margin-top: 15px;" type="submit">Load</button>
	100
	101	</form>
	102	{% endblock %} No newline at end of file

source/madpy/djangoMad/apps/updata/urls.py created 755 +9 0

@@ -0,0 +1,9
	1	from django.conf.urls import url
	2	from . import views
	3
	4	urlpatterns = [
	5	url(r'^$',views.index, name='updata_index'),
	6	url(r'^getExperiments/?$', views.get_experiments, name='get_experiments'),
	7	]
	8
	9	app_name = 'updata' No newline at end of file

source/madpy/djangoMad/apps/updata/views.py created 755 +83 0

@@ -0,0 +1,83
	1
	2	from django.contrib.auth.decorators import login_required
	3	from django.shortcuts import render
	4	from .forms import UpdataForm, ExpForm
	5	from django.core.files.storage import FileSystemStorage
	6	from django.contrib import messages
	7
	8	import os
	9
	10	# madrigal imports
	11	import madrigal.metadata
	12	import madrigal.ui.web
	13	import madrigal.admin
	14
	15	@login_required
	16	def index(request):
	17	'''
	18	Uploading experiments data view. Allows user to upload experiment files
	19
	20	'''
	21	dbAdminObj = madrigal.admin.MadrigalDBAdmin()
	22	madDB = madrigal.metadata.MadrigalDB()
	23	madWebObj = madrigal.ui.web.MadrigalWeb(madDB)
	24	siteName, siteList = madWebObj.getSiteInfo()
	25
	26	if request.method == 'POST':
	27	form = UpdataForm(request.POST, request.FILES)
	28	files = request.FILES.getlist('file')
	29
	30	if form.is_valid():
	31	try:
	32	description = form.cleaned_data['description']
	33	instCode = int(form.cleaned_data['instruments'])
	34	expId = form.cleaned_data['experiments']
	35	perm = int(form.cleaned_data['type'])
	36
	37	#saving file
	38	for f in files:
	39	fs = FileSystemStorage(location='/tmp')
	40	fs.save(f.name, f)
	41	madExp = madrigal.metadata.MadrigalExperiment()
	42	filepath = os.path.join('/tmp', f.name)
	43	expTitle = madExp.getExpNameByExpId(expId)
	44
	45	dbAdminObj.createMadrigalExperiment(filepath,expTitle, perm, description, instCode)
	46
	47
	48	madInstParams = madrigal.metadata.MadrigalInstrumentParameters()
	49	madInstKindats = madrigal.metadata.MadrigalInstrumentKindats()
	50
	51	print('* Updating local metadata *')
	52	dbAdminObj.__updateLocalMetadata__()
	53	print('* Rebuilding instParmTab.txt *')
	54	madInstParams.rebuildInstParmTable()
	55	print('* Rebuilding instKindatTab.txt *')
	56	madInstKindats.rebuildInstKindatTable()
	57	messages.success(
	58	request, 'Experimento(s) creado(s) exitosamente')
	59	form = UpdataForm()
	60
	61	except Exception as e:
	62	messages.error(
	63	request, str(e))
	64	else:
	65	form = UpdataForm()
	66
	67	return render(request, 'updata/index.html', {
	68	'form': form,
	69	'site_name': siteName,
	70	'site_list': siteList,
	71	})
	72
	73
	74	def get_experiments(request):
	75	"""get_experiments is a Ajax call that returns the experiments select html to support the
	76	updata UI. Called when a user modifies the intruments select field.
	77
	78	Inputs:
	79	request
	80	"""
	81	form = ExpForm(request.GET)
	82
	83	return render(request, 'updata/experiments.html', {'form': form})

source/madpy/djangoMad/madweb/static/loader.gif created 755 binary 0 0

NO CONTENT: new file 100755, binary diff hidden

source/madpy/djangoMad/madweb/templates/madweb/parameter_selection.html created 755 +50 0

@@ -0,0 +1,50
	1	<div class="row" style="margin-bottom: 20px">
	2	Select parameter: <br>
	3	{{ form.param_list1d.label }}
	4	{{ form.param_list1d }}
	5	{% if form.param_list2d %}
	6	{{ form.param_list2d.label }}
	7	{{ form.param_list2d }}
	8	{% endif %}
	9
	10	</div>
	11
	12	<script>
	13	$('#id_param_list2d').bind('change', function (e) {
	14	var expID = '{{ expID }}';
	15	var param = $(this).val();
	16	var url = '{% url 'plot' %}' + '?expID=' + expID + '&param2d=' + param;
	17	console.log(url)
	18	// first delete all forms that are now out of date
	19	divIndex = $(".single_form").index($( "#file_plot" ))
	20	$(".single_form").slice(divIndex).empty()
	21	// second populate the file_plot html if '0' not selected
	22	if (param != '0') {
	23	$(".single_form").slice(divIndex,divIndex+1).html("<img src=\"static/loader.gif\" class=\"load_center\"/>").load(url);
	24	}
	25	})
	26	$('#id_param_list1d').bind('change', function (e) {
	27	var expID = '{{ expID }}';
	28	var param = $(this).val();
	29	var url = '{% url 'plot' %}' + '?expID=' + expID + '&param1d=' + param;
	30	console.log(url)
	31	// first delete all forms that are now out of date
	32	divIndex = $(".single_form").index($( "#file_plot" ))
	33	$(".single_form").slice(divIndex).empty()
	34	// second populate the file_plot html if '0' not selected
	35	if (param != '0') {
	36	$(".single_form").slice(divIndex,divIndex+1).html("<img src=\"static/loader.gif\" class =\"load_center\"/>").load(url);
	37	}
	38	})
	39	</script>
	40	<style>
	41	.load_center {
	42	display: block;
	43	margin-left: auto;
	44	margin-right: auto;
	45	margin-top: 100px;
	46	margin-bottom: 100px;
	47	width: 4%;
	48	align-items: center;
	49	}
	50	</style> No newline at end of file

source/madpy/djangoMad/djangoMad/settings.py +16 -10

             """
             Django settings for djangoMad project.
             For more information on this file, see
             https://docs.djangoproject.com/en/1.7/topics/settings/
             For the full list of settings and their values, see
             https://docs.djangoproject.com/en/1.7/ref/settings/
             """
             # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
             import os
             BASE_DIR = os.path.dirname(os.path.dirname(__file__))
             # Quick-start development settings - unsuitable for production
             # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
             # SECURITY WARNING: keep the secret key used in production secret!
-            SECRET_KEY = '!wa!749ow0!%7t7tr6fr^fvkqyd7yc#mmvpfedr+f2pb!4r)wd'
+            SECRET_KEY = '^c1l3d35+q28^66d2pc1qlu(k$wmw^*gg3rfitz^s)t=9eu1ui'
             # SECURITY WARNING: don't run with debug turned on in production!
             DEBUG = True
             ALLOWED_HOSTS = ['localhost:8000', '127.0.0.1', 'localhost']
             ADMINS = (('Bill Rideout', 'brideout@haystack.mit.edu'),)
             EMAIL_HOST = 'hyperion.haystack.mit.edu'
             SEND_BROKEN_LINK_EMAILS = True
             MANAGERS = (('Bill Rideout', 'brideout@haystack.mit.edu'),)
             # Application definition
             INSTALLED_APPS = (
-                #'django.contrib.admin',
+                'django.contrib.admin',
                 'django.contrib.auth',
                 'django.contrib.contenttypes',
                 'django.contrib.sessions',
                 'django.contrib.messages',
                 'django.contrib.staticfiles',
                 'madweb',
                 'django_bootstrap_calendar',
-                'bootstrap3'
+                'bootstrap3',
+                'apps.login',
+                'apps.updata',
             )
-            MIDDLEWARE_CLASSES = (
+            MIDDLEWARE = [
-                'django.contrib.auth.middleware.AuthenticationMiddleware',
+                'django.middleware.security.SecurityMiddleware',
-                'django.contrib.messages.middleware.MessageMiddleware',
                 'django.contrib.sessions.middleware.SessionMiddleware',
                 'django.middleware.common.CommonMiddleware',
                 'django.middleware.csrf.CsrfViewMiddleware',
-                'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
+                'django.contrib.auth.middleware.AuthenticationMiddleware',
+                'django.contrib.messages.middleware.MessageMiddleware',
                 'django.middleware.clickjacking.XFrameOptionsMiddleware',
+            ]
             ROOT_URLCONF = 'djangoMad.urls'
             WSGI_APPLICATION = 'djangoMad.wsgi.application'
             TEMPLATES = [
                 {
                     'BACKEND': 'django.template.backends.django.DjangoTemplates',
                     'DIRS': [
                         os.path.join(BASE_DIR, "templates"),
                     ],
                     'APP_DIRS': True,
                     'OPTIONS': {
                         'context_processors': [
                             'django.contrib.auth.context_processors.auth',
                             'django.template.context_processors.debug',
                             'django.template.context_processors.i18n',
                             'django.template.context_processors.media',
                             'django.template.context_processors.static',
                             'django.template.context_processors.tz',
                             'django.contrib.messages.context_processors.messages',
+                            'django.template.context_processors.request',
                         ],
                     },
                 },
             ]
             # Database
             # https://docs.djangoproject.com/en/1.7/ref/settings/#databases
             DATABASES = {
+                'default': {
+                    'ENGINE': 'django.db.backends.sqlite3',
+                    'NAME': 'madrigal.sqlite',
+                }
             }
             # Internationalization
             # https://docs.djangoproject.com/en/1.7/topics/i18n/
             LANGUAGE_CODE = 'en-us'
             TIME_ZONE = 'UTC'
             USE_I18N = True
             USE_L10N = True
             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(BASE_DIR, 'media')
             # 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(BASE_DIR, 'static')
             # URL prefix for static files.
             # Example: "http://media.lawrence.com/static/"
             STATIC_URL = '/static/'
             BOOTSTRAP3 = {
                 # Include jQuery with Bootstrap JavaScript (affects django-bootstrap3 template tags)
                 'jquery_url': '/static/jquery.min.js',
                 'include_jquery': True,
             }

source/madpy/djangoMad/djangoMad/urls.py +3 0

             from django.conf.urls import include, url
             from django.contrib import admin
             import madweb.views
             urlpatterns = [
                 url(r'^', include('madweb.urls')),
                 url(r'^$', madweb.views.index),
+                url(r'^updata/', include('apps.updata.urls', namespace="updata")),
+                url(r'^accounts/', include('apps.login.urls', namespace="login")),
+                url(r'^admin/', admin.site.urls),
             ]

source/madpy/djangoMad/djangoMad/wsgi.py +1 -1

             """
             WSGI config for djangoMad project.
             It exposes the WSGI callable as a module-level variable named ``application``.
             For more information on this file, see
             https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/
             """
             import os, os.path
             import madrigal.metadata
             madDB = madrigal.metadata.MadrigalDB()
             os.environ['PYTHON_EGG_CACHE'] = os.path.join(madDB.getMadroot(), 'eggs')
-            os.environ.setdefault("DJANGO_SETTINGS_MODULE", "djangoMad.settings_production")
+            os.environ.setdefault("DJANGO_SETTINGS_MODULE", "djangoMad.settings")
             from django.core.wsgi import get_wsgi_application
             application = get_wsgi_application()

source/madpy/djangoMad/madweb/forms.py 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

source/madpy/djangoMad/madweb/templates/madweb/show_experiment.html +9 -1

             {% extends "base.html" %}
             {% comment %}
             	Written by Bill Rideout brideout@haystack.mit.edu
             	Base template for Madrigal show experiment web interface
             	$Id: show_experiment.html 7310 2021-03-02 14:31:06Z brideout $
             {% endcomment %}
             {% block title %}Show Madrigal experiment{% endblock %}
             {% block extra_head %}
                 <script>
                     function changeFile (select) {
                     	var basename = select.options[select.selectedIndex].value;
                     {% if form.exp_id %}
             			var url = '{% url 'change_files' %}' + '?experiment_list={{ form.exp_id.label }}&file_list=' + basename;
             		{% else %}
             			var exp_id = $("#id_experiment_list")[0].options[$("#id_experiment_list")[0].selectedIndex].value;
             			var url = '{% url 'change_files' %}' + '?experiment_list=' + exp_id + '&file_list=' + basename;
             		{% endif %}
                         // first delete all forms that are now out of date
                         divIndex = $(".single_form").index($( "#file_buttons" ))
                         $(".single_form").slice(divIndex).empty()
                         // second populate the file_list html if '0' not selected
                         if (basename != '0') {
                         	    $(".single_form").slice(divIndex,divIndex+1).load(url);
                         }
                     }
                     {% include "madweb/fileDownload.js" %}
                 </script>
             {% endblock %}
             {% block content %}
             	<center><h4> {{ form.exp_desc.label }} </h4></center>
             	{% include "madweb/file_list.html" %}
             	<!-- file select div -->
             	<div class="col-md-12 single_form" id="file_buttons">
             		{% if form.file_buttons %}
             			{% include "madweb/file_buttons.html" %}
             		{% endif %}
             	</div> <!-- end subdivide -->
             	<div>&nbsp;</div>
             	<!-- file select div -->
             	<div class="col-md-12 single_form" id="file_data">
             		{% if form.show_plots %}
             			{% include "madweb/show_plots.html" %}
             		{% elif form.plot_list %}
             			{% include "madweb/show_plots.html" %}
             		{% endif %}
             	</div> <!-- end subdivide -->
-            {% endblock %}
  No newline at end of file
+            	<!-- file select div -->
+            	<div class="col-md-12 single_form" id="file_plot">
+            		{% if form.show_plots %}
+            			{% include "madweb/parameter_selection.html" %}
+            		{% endif %}
+            	</div> <!-- end subdivide -->
+            	{% endblock %}
  No newline at end of file

source/madpy/djangoMad/madweb/templates/madweb/single.html +9 0

             {% extends "base_single.html" %}
             {% comment %}
             	Written by Bill Rideout brideout@haystack.mit.edu
             	Final template for Madrigal single experiment web interface
             	$Id: single.html 7290 2021-01-13 21:07:21Z brideout $
             {% endcomment %}
             {% block ajax_js %}
                 <script type="text/javascript">
                     {% if years %}
                     $( document ).ready(function() {
             		    createCalendar();
             		});
                     {% endif %}
                 	var redirectLookup = {
                 	  "0": function() { return ""; },
                 	  {% for redirect in redirect_list %}
             		  "{{ redirect.0 }}": function() { return "{{ redirect.1|safe }}"; },
             		  {% endfor %}
             		};
                     function populateCat (checkbox) {
                         var is_global = 0;
                         if (checkbox.checked) {
                         	is_global = 1;
                         }
                         var url = '{% url 'get_categories' %}' + '?isGlobal=' + is_global;
                         // first delete all forms that are now out of date
                         divIndex = $(".single_form").index($( "#categories" ))
                         $(".single_form").slice(divIndex).empty()
                         // second populate the categories html
                         $(".single_form").slice(divIndex,divIndex+1).load(url);
                     }
                     function populateInst (select) {
                         var is_global = 0;
                         if ($("#id_isGlobal")[0].checked) {
                         	is_global = 1;
                         }
                         var category = select.options[select.selectedIndex].value;
                         var url = '{% url 'get_instruments' %}' + '?isGlobal=' + is_global + '&categories=' + category;
                         // first delete all forms that are now out of date
                         divIndex = $(".single_form").index($( "#instruments" ))
                         $(".single_form").slice(divIndex).empty()
                         // second populate the instruments html if '0' not selected
                         if (category != '0') {
                         	$(".single_form").slice(divIndex,divIndex+1).load(url);
                         }
                     }
                     function populateYear (select) {
                         var is_global = 0;
                         if ($("#id_isGlobal")[0].checked) {
                         	is_global = 1;
                         }
                         // this method may redirect if instrument is not local
                         var kinst = select.options[select.selectedIndex].value;
                         var redirectUrl = redirectLookup[kinst]();
                         if (redirectUrl.length > 0) {
                            // redirect
                            alert('Because this data is not local, you will be redirected to ' + redirectUrl);
                            window.location.href = redirectUrl;
                         } else {
                         	var url = '{% url 'get_years' %}' + '?isGlobal=' + is_global + '&instruments=' + kinst;
             	            // first delete all forms that are now out of date
             	            divIndex = $(".single_form").index($( "#years" ))
                         	$(".single_form").slice(divIndex).empty()
             	            // second populate the years html if '0' not selected
             	            if (kinst != '0') {
             	            	$(".single_form").slice(divIndex,divIndex+1).load(url);
             	            }
                         }
                     }
                     function populateMonth (select) {
                         var year = select.options[select.selectedIndex].value;
             			var kinst = $("#id_instruments")[0].options[$("#id_instruments")[0].selectedIndex].value;
             			var is_global = 0;
                         if ($("#id_isGlobal")[0].checked) {
                         	is_global = 1;
                         }
                     	var url = '{% url 'get_months' %}' + '?isGlobal=' + is_global + '&instruments=' + kinst + '&years=' + year;
                         // first delete all forms that are now out of date
                         divIndex = $(".single_form").index($( "#months" ))
                     	$(".single_form").slice(divIndex).empty()
                         // second populate the years html if '0' not selected
                         if (kinst != '0') {
                         	$(".single_form").slice(divIndex,divIndex+1).load(url);
                         }
                     }
                     function populateCalendar (select) {
                     	var year = $("#id_years")[0].options[$("#id_years")[0].selectedIndex].value;
                     	var month = select.options[select.selectedIndex].value;
             			var kinst = $("#id_instruments")[0].options[$("#id_instruments")[0].selectedIndex].value;
             			var is_global = 0;
                         if ($("#id_isGlobal")[0].checked) {
                         	is_global = 1;
                         }
             			var url = '{% url 'get_calendar' %}' + '?isGlobal=' + is_global + '&instruments=' + kinst + '&years=' + year + '&months=' + month;
                         // first delete all forms that are now out of date
                         divIndex = $(".single_form").index($( "#calendar" ))
                         $(".single_form").slice(divIndex).empty()
                         // second populate the calendar html if '0' not selected
                         if (year != '0') {
                         	$(".single_form").slice(divIndex,divIndex+1).load(url, function() {
               					createCalendar();
             				});
                         }
                     }
                     function populateFile (select) {
                     	var expId = select.options[select.selectedIndex].value;
             			var url = '{% url 'get_files' %}' + '?experiment_list=' + expId;
                         // first delete all forms that are now out of date
             	        divIndex = $(".single_form").index($( "#file_select" ))
                         $(".single_form").slice(divIndex).empty()
                         // second populate the file_list html if '0' not selected
                         if (expId != '0') {
                         	$(".single_form").slice(divIndex,divIndex+1).load(url);
                         }
                     }
                     function changeFile (select) {
                     	var basename = select.options[select.selectedIndex].value;
                     {% if form.exp_id %}
             			var url = '{% url 'change_files' %}' + '?experiment_list={{ form.exp_id.label }}&file_list=' + basename;
             		{% else %}
             			var exp_id = $("#id_experiment_list")[0].options[$("#id_experiment_list")[0].selectedIndex].value;
             			var url = '{% url 'change_files' %}' + '?experiment_list=' + exp_id + '&file_list=' + basename;
             		{% endif %}
                         // first delete all forms that are now out of date
                         divIndex = $(".single_form").index($( "#file_buttons" ))
                         $(".single_form").slice(divIndex).empty()
                         // second populate the file_list html if '0' not selected
                         if (basename != '0') {
                         	$(".single_form").slice(divIndex,divIndex+1).load(url);
                         }
                     }
                     {% include "madweb/fileDownload.js" %}
                 </script>
             {% endblock %}
             {% block isGlobal %}
             				<div class="col-md-12 single_form" id="isGlobal">
             				{{ form.isGlobal.label }} {{ form.isGlobal }}
             				</div> <!-- end subdivide -->
             {% endblock %}
             {% block categories %}
                             <!-- subdivide selection column for categories to be possibly filled in by ajax - single_form 0 -->
             				<div class="col-md-12  single_form" id="categories">
             		{% if form.categories %}
             			{% include "madweb/categories.html" %}
             		{% endif %}
             				</div> <!-- end subdivide -->
             {% endblock %}
             {% block instruments %}
             				<!-- subdivide selection column for instruments to be possibly filled in by ajax - single_form 0 -->
             				<div class="col-md-12 single_form" id="instruments">
             		{% if form.instruments %}
             			{% include "madweb/instruments.html" %}
             		{% endif %}
             				</div> <!-- end subdivide -->
             {% endblock %}
             {% block years %}
             				<!-- subdivide selection column for year to be possibly filled in by ajax - single_form 1 -->
             				<div class="col-md-12 single_form" id="years">
             		{% if form.years %}
             			{% include "madweb/years.html" %}
             		{% endif %}
             				</div> <!-- end subdivide -->
             {% endblock %}
             {% block months %}
             				<!-- subdivide selection column for month  to be possibly filled in by ajax - single_form 1 -->
             				<div class="col-md-12 single_form" id="months">
             		{% if form.months %}
             			{% include "madweb/months.html" %}
             		{% endif %}
             				</div> <!-- end subdivide -->
             {% endblock %}
             {% block calendar %}
             				<!-- subdivide selection column for calendar to be possibly filled in by ajax - single_form 2 -->
             				<div class="col-md-12 single_form" id="calendar">
             		{% if form.days %}
             			{% include "madweb/calendar.html" %}
             		{% endif %}
             				</div> <!-- end subdivide -->
             {% endblock %}
             {% block experiment_select %}
             				<!-- this select only appears if there are multiple experiments in the day -->
             				<div class="col-md-12 single_form" id="experiment_select">
             		{% if form.experiment_list %}
             			{% include "madweb/exp_list.html" %}
             		{% endif %}
             				</div> <!-- end subdivide -->
             {% endblock %}
             {% block file_select %}
             				<!-- file select div -->
             				<div class="col-md-12 single_form" id="file_select">
             		{% if form.file_list|length > 1 %}
             			{% include "madweb/file_list.html" %}
             		{% elif form.days and not form.experiment_list %}
             		    <center><p> This experiment has no Madrigal CEDAR format Hdf5 files. Showing only plots and auxillary files instead.</p></center>
             			{% include "madweb/show_plots.html" %}
             		{% endif %}
             				</div> <!-- end subdivide -->
             {% endblock %}
             {% block file_buttons %}
             				<!-- file select div -->
             				<div class="col-md-12 single_form" id="file_buttons">
             		{% if form.file_buttons %}
             			{% include "madweb/file_buttons.html" %}
             		{% endif %}
             				</div> <!-- end subdivide -->
             				<div>&nbsp;</div>
             {% endblock %}
             {% block file_data %}
             				<!-- file select div -->
             				<div class="col-md-12 single_form" id="file_data">
             		{% if form.show_plots %}
             			{% include "madweb/show_plots.html" %}
             		{% endif %}
             				</div> <!-- end subdivide -->
             {% endblock %}
+            {% block file_plot %}
+            				<!-- file select div -->
+            				<div class="col-md-12 single_form" id="file_plot">
+            		{% if form.show_plots %}
+            			{% include "madweb/parameter_selection.html" %}
+            		{% endif %}
+            				</div> <!-- end subdivide -->
+            {% endblock %}

source/madpy/djangoMad/madweb/urls.py +3 0

             '''
             Created on Jul 16, 2013
             @author: Jose Antonio Sal y Rosas Celi
             @contact: arturo.jasyrc@gmail.com
             As imported and slightly modified by Bill Rideout Jan 20, 2015
             $Id: urls.py 7246 2020-10-12 14:54:26Z brideout $
             '''
             from django.conf.urls import url
             from . import views
             urlpatterns = [        url(r'^$',
                                        views.index,
                                        name='index'),
                                    url(r'^index.html/?$',
                                        views.index,
                                        name='index'),
                                    url(r'^single/?$',
                                        views.check_registration(views.view_single),
                                        name='view_single'),
                                    url(r'^register/?$',
                                        views.view_registration,
                                        name='view_registration'),
                                    url(r'^getCategories/?$',
                                        views.get_categories,
                                        name='get_categories'),
                                    url(r'^getInstruments/?$',
                                        views.get_instruments,
                                        name='get_instruments'),
                                    url(r'^getYears/?$',
                                        views.get_years,
                                        name='get_years'),
                                    url(r'^getMonths/?$',
                                        views.get_months,
                                        name='get_months'),
                                    url(r'^getCalendar/?$',
                                        views.get_calendar,
                                        name='get_calendar'),
                                    url(r'^populateCalendarExperiment/?$',
                                        views.populate_calendar_experiment,
                                        name='populate_calendar_experiment'),
                                    url(r'^getFiles/?$',
                                        views.get_files,
                                        name='get_files'),
                                    url(r'^changeFiles/?$',
                                        views.change_files,
                                        name='change_files'),
                                    url(r'^showPlots/?$',
                                        views.show_plots,
                                        name='show_plots'),
+                                   url(r'^view_plot/?$',
+                                       views.view_plot,
+                                       name='plot'),
                                    url(r'^downloadAsIs/?$',
                                        views.download_as_is,
                                        name='download_as_is'),
                                    url(r'^downloadFileAsIs/?$',
                                        views.download_file_as_is,
                                        name='download_file_as_is'),
                                    url(r'^printAsIs/?$',
                                        views.print_as_is,
                                        name='print_as_is'),
                                    url(r'^listRecords/?$',
                                        views.list_records,
                                        name='list_records'),
                                    url(r'^showInfo/?$',
                                        views.show_info,
                                        name='show_info'),
                                    url(r'^showDoi/?$',
                                        views.show_doi,
                                        name='show_doi'),
                                    url(r'^getAdvanced/?$',
                                        views.get_advanced,
                                        name='get_advanced'),
                                    url(r'^advancedDownload/?$',
                                        views.advanced_download,
                                        name='advanced_download'),
                                    url(r'^advancedPrint/?$',
                                        views.advanced_print,
                                        name='advanced_print'),
                                    url(r'^list/?$',
                                        views.check_registration(views.view_list),
                                        name='view_list'),
                                    url(r'^downloadAsIsScript/?$',
                                        views.download_as_is_script,
                                        name='download_as_is_script'),
                                    url(r'^generateDownloadFilesScript/?$',
                                        views.generate_download_files_script,
                                        name='generate_download_files_script'),
                                    url(r'^downloadAdvancedScript/?$',
                                        views.download_advanced_script,
                                        name='download_advanced_script'),
                                    url(r'^generateDownloadAdvancedScript/?$',
                                        views.generate_download_advanced_script,
                                        name='generate_download_advanced_script'),
                                    url(r'^generateParmsScript/?$',
                                        views.generate_parms_script,
                                        name='generate_parms_script'),
                                    url(r'^generateParmsFiltersScript/?$',
                                        views.generate_parms_filters_script,
                                        name='generate_parms_filters_script'),
                                    url(r'^listExperiments/?$',
                                        views.list_experiments,
                                        name='list_experiments'),
                                    url(r'^viewRecordPlot/?$',
                                        views.view_record_plot,
                                        name='view_record_plot'),
                                    url(r'^viewRecordImage/?$',
                                        views.view_record_image,
                                        name='view_record_image'),
                                    url(r'^showExperiment/?$',
                                        views.check_registration(views.show_experiment),
                                        name='show_experiment'),
                                    url(r'^madExperiment.cgi/*$',
                                        views.check_registration(views.show_experiment_v2),
                                        name='show_experiment_v2'),
                                    url(r'^chooseScript/?$',
                                        views.check_registration(views.choose_script),
                                        name='choose_script'),
                                    url(r'^ftp/$',
                                        views.check_registration(views.ftp),
                                        name='ftp'),
                                    url(r'^ftp/fullname/([^/]+)/email/([^/]+)/affiliation/([^/]+)/kinst/(\d+)/$',
                                        views.ftp_instrument,
                                        name='ftp_instrument'),
                                    url(r'^ftp/fullname/([^/]+)/email/([^/]+)/affiliation/([^/]+)/kinst/(\d+)/year/(\d+)/$',
                                        views.ftp_year,
                                        name='ftp_year'),
                                    url(r'^ftp/fullname/([^/]+)/email/([^/]+)/affiliation/([^/]+)/kinst/(\d+)/year/(\d+)/kindat/(\d+)/$',
                                        views.ftp_kindat,
                                        name='ftp_kindat'),
                                    url(r'^ftp/fullname/([^/]+)/email/([^/]+)/affiliation/([^/]+)/kinst/(\d+)/year/(\d+)/kindat/(\d+)/format/([^/]+)/$',
                                        views.ftp_files,
                                        name='ftp_files'),
                                    url(r'^ftp/fullname/([^/]+)/email/([^/]+)/affiliation/([^/]+)/kinst/(\d+)/year/(\d+)/kindat/(\d+)/format/([^/]+)/fullFilename/([^/]+)/$',
                                        views.ftp_download,
                                        name='ftp_download'),
                                    url(r'ftpMultipleDownload/$',
                                        views.ftp_multiple_download,
                                        name='ftp_multiple_download'),
                                    url(r'^instMetadata/?$',
                                        views.instrument_metadata,
                                        name='instrument_metadata'),
                                    url(r'^siteMetadata/?$',
                                        views.site_metadata,
                                        name='site_metadata'),
                                    url(r'^parameterMetadata/?$',
                                        views.parameter_metadata,
                                        name='parameter_metadata'),
                                    url(r'^kindatMetadata/?$',
                                        views.kindat_metadata,
                                        name='kindat_metadata'),
                                    url(r'^madCalculator/?$',
                                        views.madrigal_calculator,
                                        name='madrigal_calculator'),
                                    url(r'^madCalculatorOutput/?$',
                                        views.madrigal_calculator_output,
                                        name='madrigal_calculator_output'),
                                    url(r'^getMetadata/*$',
                                        views.get_metadata,
                                        name='get_metadata'),
                                    url(r'^looker/?$',
                                        views.looker_main,
                                        name='looker_main'),
                                    url(r'^lookerForm/?$',
                                        views.looker_form,
                                        name='looker_form'),
                                    url(r'^lookerOutput/?$',
                                        views.looker_output,
                                        name='looker_output'),
                                    url(r'^getVersionService.py/*$',
                                        views.get_version_service,
                                        name='get_version_service'),
                                    url(r'^getInstrumentsService.py/*$',
                                        views.get_instruments_service,
                                        name='get_instruments_service'),
                                    url(r'^getExperimentsService.py/*$',
                                        views.get_experiments_service,
                                        name='get_experiments_service'),
                                    url(r'^getExperimentFilesService.py/*$',
                                        views.get_experiment_files_service,
                                        name='get_experiment_files_service'),
                                    url(r'^getParametersService.py/*$',
                                        views.get_parameters_service,
                                        name='get_parameters_service'),
                                    url(r'^isprintService.py/*$',
                                        views.isprint_service,
                                        name='isprint_service'),
                                    url(r'^getMadfile.cgi/*$',
                                        views.get_madfile_service,
                                        name='get_madfile_service'),
                                    url(r'^madCalculatorService.py/*$',
                                        views.mad_calculator_service,
                                        name='mad_calculator_service'),
                                    url(r'^madTimeCalculatorService.py/*$',
                                        views.mad_time_calculator_service,
                                        name='mad_time_calculator_service'),
                                    url(r'^madCalculator2Service.py/*$',
                                        views.mad_calculator2_service,
                                        name='mad_calculator2_service'),
                                    url(r'^madCalculator2Service.py',
                                        views.mad_calculator2_service,
                                        name='mad_calculator2_service'),
                                    url(r'^madCalculator3Service.py/*$',
                                        views.mad_calculator3_service,
                                        name='mad_calculator3_service'),
                                    url(r'^madCalculator3Service.py',
                                        views.mad_calculator3_service,
                                        name='mad_calculator3_service'),
                                    url(r'^geodeticToRadarService.py',
                                        views.geodetic_to_radar_service,
                                        name='geodetic_to_radar_service'),
                                    url(r'^radarToGeodeticService.py',
                                        views.radar_to_geodetic_service,
                                        name='radar_to_geodetic_service'),
                                    url(r'^listFileTimesService.py',
                                        views.list_file_times_service,
                                        name='list_file_times_service'),
                                    url(r'^downloadWebFileService.py',
                                        views.download_web_file_service,
                                        name='download_web_file_service'),
                                    url(r'^traceMagneticFieldService.py',
                                        views.trace_magnetic_field_service,
                                        name='trace_magnetic_field_service'),
                                    url(r'^globalFileSearchService.py',
                                        views.global_file_search_service,
                                        name='global_file_search_service'),
                                    url(r'^getUrlListFromGroupIdService.py',
                                        views.get_url_list_from_group_id_service,
                                        name='get_url_list_from_group_id_service'),
                                    url(r'^setGroupIdFromUrlListService.py',
                                        views.set_group_id_from_url_list_service,
                                        name='set_group_id_from_url_list_service'),
                                    url(r'docs/name/(.+)$',
                                        views.docs,
                                        name='docs'),
                                 ]

source/madpy/djangoMad/madweb/views.py 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

source/madpy/djangoMad/templates/base_single.html +2 0

             {% load bootstrap3 %}
             {% comment %}
             	Written by Bill Rideout brideout@haystack.mit.edu
             	Base template for Madrigal single experiment web interface
             	$Id: base_single.html 7320 2021-03-04 21:23:07Z brideout $
             {% endcomment %}
             {# Load CSS and JavaScript #}
             {% bootstrap_css %}
             {% bootstrap_javascript %}
             {% load static %}
             <link rel="stylesheet" href="{% static "bootstrap_calendar/css/bootstrap_calendar.css" %}" type="text/css" />
             <script type="text/javascript" src="{% static "bootstrap_calendar/js/bootstrap_calendar.js" %}"></script>
             <!DOCTYPE html>
             <html>
             <head>
             	<meta charset="UTF-8">
             	<meta name="viewport" content="width=device-width, initial-scale=1.0">
             	<link rel="shortcut icon" type="image/png" href="/static/favicon.ico"/>
+            	<script src="https://cdn.plot.ly/plotly-latest.min.js"></script>
             	<title>{% block title %}Madrigal Database{% endblock %}</title>
                 <style type="text/css">
             		html body {
             	    	background-color: {{bg_color}};
             		}
             		.breadcrumb > li + li:before {
             		    content: none;
             		}
             	</style>
                 {% block extra_head %}{% endblock %}
                 {% block ajax_js %}{% endblock %}
             </head>
             <body>
             	<div class="loader" style="display:none"></div>
             	<div class="container-fluid">
             	{% include "navbar.html" %}
             	   <center><h4>Select single Madrigal experiment</h4></center>
             		<div class="row">
             			<div class="col-sm-12">
             		    {% bootstrap_messages %}
             		    </div>
             	    </div>
             	    {% if form.errors %}
             	    <div class="row">
             			<div class="col-sm-12">
             		    <p style="color: red;">
             		        Please correct the error{{ form.errors|pluralize }} below.
             		        {{ form.errors }}
             		    </p>
             		    </div>
             	    </div>
             	    {% endif %}
             	    <div class="row">
             			<div class="col-sm-3">
             			{% block isGlobal %}{% endblock %}
             			{% block categories %}{% endblock %}
             			{% block instruments %}{% endblock %}
             	    	{% block years %}{% endblock %}
             	    	{% block months %}{% endblock %}
             	    	{% block calendar %}{% endblock %}
             			</div>
             			<div class="col-sm-9">
             			{% block experiment_select %}{% endblock %}
             			{% block file_select %}{% endblock %}
             			{% block file_buttons %}{% endblock %}
             			{% block file_data %}{% endblock %}
+            			{% block file_plot %}{% endblock %}
             			</div>
             		</div>
             	    <p></p>
             	    {% comment %}
             	    <div class="row">
             	    	<div class="col-sm-12">{% block download %}{% endblock %}</div>
             	    </div>
             	    <p></p>
             	    <div class="row">
             		    <div class="col-sm-12">{% block information %}{% endblock %}</div>
             	    </div>{% endcomment %}
             	    <p><hr></p>
             	    <footer class="row">
             	        <div class="col-sm-6">
             	            <p>Madrigal database</p>
             	        </div>
             	        <div class="col-sm-6" style="text-align:right">
             	            <p>
             	            </p>
             	        </div>
             	    </footer>
             	</div> <!-- container-fluid -->
             	<script>
             	    $('[data-toggle="tooltip"]').tooltip();
             	    $('[data-toggle="tooltip"]').on('show.bs.tooltip', function() {
             		    // Only one tooltip should ever be open at a time
             		    $('.tooltip').not(this).hide();
             		});
             	    $('.my-dropdown').dropdown();
             		$('.my-dropdown').tooltip();
             	</script>
             </body>
             </html>

source/madpy/djangoMad/templates/navbar.html +2 -1

             {% comment %}
             	Written by Bill Rideout brideout@haystack.mit.edu
             	Generic navbar code shared by all Madrigal pages
             	$Id: navbar.html 6641 2018-11-06 18:02:21Z brideout $
             {% endcomment %}
             		<style>
             		/* --- Style --- This CSS for a custom color navbar for Madrigal was generated using url http://work.smarchal.com/twbscolor/css/e74c3cc0392becf0f1ffbbbc0 */
             		.navbar-default {
             		  background-color: #21A7EB;
             		  border-color: #2182EB;
             		}
             		.navbar-default .navbar-brand {
             		  color: #ecf0f1;
             		}
             		.navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus {
             		  color: #ffbbbc;
             		}
             		.navbar-default .navbar-text {
             		  color: #ecf0f1;
             		}
             		.navbar-default .navbar-nav > li > a {
             		  color: #ecf0f1;
             		}
             		.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
             		  color: #ffbbbc;
             		}
             		.navbar-default .navbar-nav > li > .dropdown-menu {
             		  background-color: #21A7EB;
             		}
             		.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
             		  color: #ecf0f1;
             		}
             		.navbar-default .navbar-nav > li > .dropdown-menu > li > a:hover,
             		.navbar-default .navbar-nav > li > .dropdown-menu > li > a:focus {
             		  color: #ffbbbc;
             		  background-color: #2182EB;
             		}
             		.navbar-default .navbar-nav > li > .dropdown-menu > li > .divider {
             		  background-color: #21A7EB;
             		}
             		.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus {
             		  color: #ffbbbc;
             		  background-color: #2182EB;
             		}
             		.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus {
             		  color: #ffbbbc;
             		  background-color: #2182EB;
             		}
             		.navbar-default .navbar-toggle {
             		  border-color: #2182EB;
             		}
             		.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
             		  background-color: #2182EB;
             		}
             		.navbar-default .navbar-toggle .icon-bar {
             		  background-color: #ecf0f1;
             		}
             		.navbar-default .navbar-collapse,
             		.navbar-default .navbar-form {
             		  border-color: #ecf0f1;
             		}
             		.navbar-default .navbar-link {
             		  color: #ecf0f1;
             		}
             		.navbar-default .navbar-link:hover {
             		  color: #ffbbbc;
             		}
             		@media (max-width: 767px) {
             		  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
             		    color: #ecf0f1;
             		  }
             		  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
             		    color: #ffbbbc;
             		  }
             		  .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
             		    color: #ffbbbc;
             		    background-color: #2182EB;
             		  }
             		}
             		</style>
                 	<nav class="navbar navbar-default" role="navigation">
                         <div class="navbar-header">
                             <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#collapse">
                               <span class="sr-only">Toggle navigation</span>
                               <span class="glyphicon glyphicon-arrow-down"></span>
                               MENU
                             </button>
                         </div>
                         <div class="collapse navbar-collapse" id="collapse">
                             <ul class="nav navbar-nav">
                                 <li {{ home_active|safe }}><a href="{% url 'index' %}" data-toggle="tooltip" data-original-title="Click here to return to the home page of the {{ site_name }} Madrigal site." data-placement="bottom">{{ site_name }} Home</a></li>
                                 <li class="dropdown"><a href="#" data-toggle="dropdown" class="my-dropdown" title="Use this dropdown menu to access all data anywhere on any Madrigal site.  See the tooltips for each choice for more information." data-placement="right">Access data<span class="caret"></span></a>
                                 	<ul class="dropdown-menu">
                                     	<li {{ list_active|safe }}><a href="{% url 'view_list' %}" data-toggle="tooltip" data-original-title="List a range of experiments on any Madrigal site that you can then choose from, and then access its data" data-placement="right">List experiments</a></li>
                                     	<li {{ single_active|safe }}><a href="{% url 'view_single' %}" data-toggle="tooltip" data-original-title="Navigate to a single experiment on any Madrigal site, and access that experiment&#39;s data" data-placement="right">Select single experiment</a></li>
                                         <li {{ script_active|safe }}><a href="{% url 'choose_script' %}" data-toggle="tooltip" data-original-title="Use this link to create a command that will download data from a range of experiments at once" data-placement="right">Create a command to download multiple exps</a></li>
                                         <li {{ ftp_active|safe }}><a href="{% url 'ftp' %}" data-toggle="tooltip" data-original-title="Simple ftp-like UI" data-placement="right">FTP-like access</a></li>
                                     </ul>
                                 </li>
                                 <li class="dropdown"><a href="#" data-toggle="dropdown" class="my-dropdown" title="Use this dropdown menu to access all Madrigal metadata. See the tooltips for each choice for more information." data-placement="right">Access metadata<span class="caret"></span></a>
                                 	<ul class="dropdown-menu">
                                 	    <li {{ site_active|safe }}><a href="{% url 'site_metadata' %}" data-toggle="tooltip" data-original-title="List all metadata related to individual Madrigal sites." data-placement="right">Madrigal site metadata</a></li>
                                     	<li {{ inst_active|safe }}><a href="{% url 'instrument_metadata' %}" data-toggle="tooltip" data-original-title="List all metadata related to individual Madrigal instruments." data-placement="right">Instrument metadata</a></li>
                                         <li {{ parm_active|safe }}><a href="{% url 'parameter_metadata' %}" data-toggle="tooltip" data-original-title="List all metadata related to individual CEDAR parameters." data-placement="right">CEDAR Parameters</a></li>
                                         <li {{ kindat_active|safe }}><a href="{% url 'kindat_metadata' %}" data-toggle="tooltip" data-original-title="List all metadata related to individual Madrigal kind of data file codes (also called kindats). Each Madrigal file has a single kind of data code." data-placement="right">Kind of data metadata</a></li>
                                         <li {{ filter_active|safe }}><a href="{% url 'docs' 'filter_desc.html' %}" data-toggle="tooltip" data-original-title="Describe use of filters in Madrigal." data-placement="right">Filter string metadata</a></li>
                                     </ul>
                                 </li>
                                 <li class="dropdown"><a href="#" data-toggle="dropdown" class="my-dropdown" title="Click here to access modeling tools associated with Madrigal." data-placement="right">Run models<span class="caret"></span></a>
                                 	<ul class="dropdown-menu">
                                 	    <li {{ madCalculator_active|safe }}><a href="{% url 'madrigal_calculator' %}" data-toggle="tooltip" data-original-title="Calculate any Madrigal parameter for a given time and range of lat, lon, and alt." data-placement="right">Run Madrigal derivation engine</a></li>
                                     	<li {{ looker_active|safe }}><a href="{% url 'looker_main' %}" data-toggle="tooltip" data-original-title="Simple Geodetic and Geomagnetic (IGRF) coordinate transformations (aka looker)." data-placement="right">Looker</a></li>
                                         <li><a href="http://models.haystack.mit.edu/models/" data-toggle="tooltip" data-original-title="Run ISR empirical models developed from historical ISR data by Shunrong Zhang." data-placement="right">ISR empirical models</a></li>
                                     </ul>
                                 </li>
                                 <li {{ doc_active|safe }}><a href="docs/name/madContents.html" data-toggle="tooltip" data-original-title="Click here to see Madrigal documentation on the web interface, using scripts to automate data access, Madrigal administration, and information for Madrigal developers." data-placement="bottom">Documentation</a></li>
                                 <li class="dropdown"><a href="#" data-toggle="dropdown" class="my-dropdown" title="Use this dropdown menu to navigate to another Madrigal site."  data-placement="left">Other Madrigal sites<span class="caret"></span></a>
                                 	<ul class="dropdown-menu">
                                 	{% for siteName, siteUrl in site_list %}
                                     	<li><a href="{{ siteUrl }}" data-toggle="tooltip" data-original-title="Navigate to Madrigal site at {{ siteName }}" data-placement="left">{{ siteName }}</a></li>
                                     {% endfor %}
                                     </ul>
                                 </li>
                                 <li><a href="http://cedar.openmadrigal.org/openmadrigal" data-toggle="tooltip" data-original-title="Click here to go to OpenMadrigal, where you can download API&#39;s in python, Matlab, and IDL to run Madrigal scripts, and access Madrigal&#39;s source code." data-placement="bottom">OpenMadrigal</a></li>
+            					<li><a href="{% url 'updata:updata_index' %}" data-toggle="tooltip" data-original-title="Click here to upload data to Madrigal database." data-placement="bottom">Upload Madrigal Data</a></li>
                             </ul>
                         </div>
                      </nav>

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