DATABASES/madrigal Commit - r7:4e0b343b0c61

Fixing plots

jespinoza -

r7:4e0b343b0c61

parent child

Context file:

r7:4e0b343b0c61

Collapse all files

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

source/madpy/djangoMad/madweb/templates/madweb/show_experiment.html +2 -2

             {% 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 src="https://cdn.plot.ly/plotly-latest.min.js"></script>
                 <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 -->
             	<!-- file select div -->
-            	<div class="col-md-12 single_form" id="file_plot">
+            	<div class="col-md-9 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
+            	{% endblock %}

source/madpy/djangoMad/madweb/templates/madweb/single.html +1 -1

             {% 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">
+            				<div class="col-md-9 single_form" id="file_plot">
             		{% if form.show_plots %}
             			{% include "madweb/parameter_selection.html" %}
             		{% endif %}
             				</div> <!-- end subdivide -->
             {% endblock %}

source/madpy/djangoMad/madweb/templates/madweb/wt_usersGuide.html +6 -6

             {% load static %}
             <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
             <html xmlns="http://www.w3.org/1999/xhtml"><!-- InstanceBegin template="/Templates/doc_template.dwt" codeOutsideHTMLIsLocked="false" -->
             <head>
             <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
             <!-- InstanceBeginEditable name="doctitle" -->
             <title>Madrigal users guide</title>
             <!-- InstanceEndEditable --><!-- InstanceBeginEditable name="head" --><!-- InstanceEndEditable -->
             <link href="/static/madrigal.css" rel="stylesheet" type="text/css" />
             <style type="text/css">
             	html body {
             		background-color: {{bg_color}};
             	}
             </style>
             <!-- InstanceParam name="href_up_top" type="text" value="madContents.html" --><!-- InstanceParam name="href_next_top" type="text" value="wt_contents.html" --><!-- InstanceParam name="href_back_top" type="text" value="whatsNew.html" --><!-- InstanceParam name="href_back_bottom" type="text" value="whatsNew.html" --><!-- InstanceParam name="href_up_bottom" type="text" value="madContents.html" --><!-- InstanceParam name="href_next_bottom" type="text" value="wt_contents.html" --><!-- InstanceParam name="href_prev_top" type="text" value="whatsNew.html" --><!-- InstanceParam name="href_uptitle_top" type="text" value="madContents.html" --><!-- InstanceParam name="href_nexttitle_top" type="text" value="wt_contents.html" --><!-- InstanceParam name="href_prevtitle_bottom" type="text" value="whatsNew.html" --><!-- InstanceParam name="href_uptitle_bottom" type="text" value="madContents.html" --><!-- InstanceParam name="href_nexttitle_bottom" type="text" value="wt_contents.html" -->
             </head>
             <body>
             <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
               <tr>
-                <td width="5%"><a href="{% url 'docs' 'whatsNew.html' %}"><img src="/static/previous.png" alt="previous" width="32" height="32" /></a></td>
+            	  <td width="5%"><a href="{% url 'docs' 'whatsNew.html' %}"><img src="{% static 'previous.png' %}" alt="previous" width="32" height="32" /></a></td>
-                <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/static/up.png" alt="up" width="32" height="32" /></a></td>
+            	  <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="{% static 'up.png' %}" alt="up" width="32" height="32" /></a></td>
-                <td width="5%"><a href="{% url 'docs' 'wt_contents.html' %}"><img src="/static/next.png" alt="next" width="32" height="32" /></a></td>
+            	  <td width="5%"><a href="{% url 'docs' 'wt_contents.html' %}"><img src="{% static 'next.png' %}" alt="next" width="32" height="32" /></a></td>
                 <td width="54%"><!-- InstanceBeginEditable name="EditTitleTop" -->Madrigal user's guide (How do I access Madrigal data?)<!-- InstanceEndEditable --></td>
                 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
                 <td width="18%"><a href="/">Madrigal home</a></td>
               </tr>
             </table>
             <div class='online-navigation'>
             <b class="navlabel">Previous:</b>
             <a class="sectref" href="{% url 'docs' 'whatsNew.html' %}"><!-- InstanceBeginEditable name="PreviousTitle" -->What's new  <!-- InstanceEndEditable --></A>
             <b class="navlabel">&nbsp;&nbsp;Up:</b>
             <a class="sectref" href="{% url 'docs' 'madContents.html' %}"><!-- InstanceBeginEditable name="UpTitle" -->Doc home <!-- InstanceEndEditable --></A>
             <b class="navlabel">&nbsp;&nbsp;Next:</b>
             <a class="sectref" href="{% url 'docs' 'wt_contents.html' %}"><!-- InstanceBeginEditable name="NextTitle" -->Web interface tutorial TOC <!-- InstanceEndEditable --></A></div>
             <hr/>
             <!-- InstanceBeginEditable name="EditDoc" -->
             <h1 align="center">Madrigal user's guide (How do I access Madrigal data?)</h1>
             <p>There are two basic ways to access Madrigal data - through a web browser, or through the API using the programming languages  Matlab, IDL, Python, or Fortran95. The Madrigal web interface will also allow you to create the most common commands you would need to run these API's. That is, with just a few click you can create a command to download whatever files you want from any number of experiments in any format. You can also create a command to download just the parameters you want with any filter you might want.</p>
             <p>This user's guide consists of a brief tutorial on using the web interface, and a tutorial and a reference manual for remote data access. The last section also documents some command line interfaces into Madrigal.</p>
             <ul>
               <li><a href="{% url 'docs' 'wt_contents.html' %}">Web interface tutorial</a></li>
               <li><a href="{% url 'docs' 'rt_contents.html' %}">Remote API tutorial</a></li>
               <li><a href="{% url 'docs' 'rr_contents.html' %}">Remote API reference guide</a></li>
             </ul>
             <!-- InstanceEndEditable -->
             <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
               <tr>
-                <td width="5%"><a href="{% url 'docs' 'whatsNew.html' %}"><img src="/static/previous.png" alt="previous" width="32" height="32" /></a></td>
+            	  <td width="5%"><a href="{% url 'docs' 'whatsNew.html' %}"><img src="{% static 'previous.png' %}" alt="previous" width="32" height="32" /></a></td>
-                <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/static/up.png" alt="up" width="32" height="32" /></a></td>
+            	  <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="{% static 'up.png' %}" alt="up" width="32" height="32" /></a></td>
-                <td width="5%"><a href="{% url 'docs' 'wt_contents.html' %}"><img src="/static/next.png" alt="next" width="32" height="32" /></a></td>
+            	  <td width="5%"><a href="{% url 'docs' 'wt_contents.html' %}"><img src="{% static 'next.png' %}" alt="next" width="32" height="32" /></a></td>
                 <td width="54%"><!-- InstanceBeginEditable name="EditTitleBottom" -->Madrigal user's guide (How do I access Madrigal data?)<!-- InstanceEndEditable --></td>
                 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
                 <td width="18%"><a href="/">Madrigal home</a></td>
               </tr>
             </table>
             <div class='online-navigation'>
             <b class="navlabel">Previous:</b>
             <a class="sectref" href="{% url 'docs' 'whatsNew.html' %}"><!-- InstanceBeginEditable name="PreviousTitle2" -->What's new <!-- InstanceEndEditable --></A>
             <b class="navlabel">&nbsp;&nbsp;Up:</b>
             <a class="sectref" href="{% url 'docs' 'madContents.html' %}"><!-- InstanceBeginEditable name="UpTitle2" -->Doc home <!-- InstanceEndEditable --></A>
             <b class="navlabel">&nbsp;&nbsp;Next:</b>
             <a class="sectref" href="{% url 'docs' 'wt_contents.html' %}"><!-- InstanceBeginEditable name="NextTitle2" -->Web interface tutorial TOC<!-- InstanceEndEditable --></A></div>
             <hr/>
             <p>&nbsp;</p>
             </body>
             <!-- InstanceEnd --></html>

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

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