Various updates to the web display

docs/sphinx/installation.rst

@@ -33,7 +33,7 @@ To install Marvin, use::
 If you are using an Anaconda distribution of Python, you may use the following available ``conda`` environment,
 `here <https://anaconda.org/SDSS/marvin/files>`_. Once downloaded, set up the virtual environment with::
 
-  conda env create -f marvin_2.6.0.yml
+  conda env create -f marvin_2.7.1.yml
 
 To create a clean, isolated, conda virtual environment from scratch, and install marvin into it, do the following::
 

python/marvin/web/controllers/explore.py

@@ -84,6 +84,9 @@ def index(self):
         self.explore['dapbintemps'] = dm.get_bintemps(db_only=True)
         self.explore['dapmaps'] = daplist
 
+        if 'bintemp' not in current_session:
+            current_session['bintemp'] = '{0}-{1}'.format(dm.get_bintype(), dm.get_template())
+
         self.explore['targetlist'] = current_session.get('targetlist', '')
         self.explore['n_targs'] = current_session.get('n_targs', 0)
 
@@ -189,12 +192,16 @@ def get_maps(self):
         if not mapchoice or not btchoice:
             flash('Must select a map and bintype', 'error')
             return redirect(url_for(home))
+
+        # update the DAPTYPE session selection
+        current_session['bintemp'] = btchoice
 
         targets = targetlist.split('\r\n')
         self.explore['targetlist'] = targetlist
         self.explore['targets'] = targets
         self.explore['n_targs'] = len(targets)
         self.explore['mapchoice'] = mapchoice
+        self.explore['btchoice'] = btchoice
 
         self.explore['maps'] = True
         self.explore['mapmsgs'] = 'go'
@@ -223,6 +230,8 @@ def updateMaps(self):
             return jsonify(result=output)
 
         hasbin = btchoice.split('-')[0] in cube.get_available_bintypes() if btchoice else None
+        # in principle update the DAPTYPE session selection, but doesn't quite work
+        current_session['bintemp'] = btchoice
 
         try:
             mapdict = buildMapDict(cube, [mapchoice], self._dapver, bintemp=btchoice)

python/marvin/web/lib/scss/marvin/_galaxy.scss

@@ -90,4 +90,8 @@
 
 #vacmodalbody {
   padding: 0px;
+}
+
+.infopop {
+  z-index: 20;
 }

python/marvin/web/lib/scss/marvin/_search.scss

@@ -2,4 +2,8 @@
 #guideqb div.modal-dialog {
     position: initial;
     top: 150px;
+}
+
+#guideqb {
+    z-index: 1000;
 }

python/marvin/web/templates/galaxy.html

@@ -67,7 +67,8 @@ <h3 class="panel-title" data-toggle="tooltip" data-placement="top" title="The ov
                           </div>
                           <div class='btn-group-vertical'>
                           {{download('#galaxydownload', links)}}
-                          <a href='http://skyserver.sdss.org/public/en/tools/chart/navi.aspx?ra={{cubehdr.objra}}&dec={{cubehdr.objdec}}&opt=GS&scale=0.2' class='btn btn-warning' id='gotocas' target='_blank'><i class="fa fa-external-link fa-fw" aria-hidden="true"></i> Go to SkyServer</a>
+                          <a href='https://skyserver.sdss.org/dr17/VisualTools/navi?ra={{cubehdr.objra}}&dec={{cubehdr.objdec}}&opt=GS&scale=0.2' class='btn btn-warning' id='gotocas' target='_blank' data-toggle="tooltip" data-container="body" data-placement="right" title="Search for this target in SDSS SkyServer"><i class="fa fa-external-link fa-fw" aria-hidden="true"></i> Go to SkyServer</a>
+                          <a href='http://simbad.u-strasbg.fr/simbad/sim-coo?Coord={{cubehdr.objra}} {{cubehdr.objdec}}&CooFrame=FK5&CooEpoch=2000&CooEqui=2000&CooDefinedFrames=none&Radius=1&Radius.unit=arcmin&submit=submit+query&CoordList=' class='btn btn-default' id='gotosim' target='_blank' data-toggle="tooltip" data-container="body" data-placement="right" title="Search for this target in Simbad"><i class="fa fa-external-link fa-fw" aria-hidden="true"></i> Go to Simbad</a>
                           </div>
                     </div>
                     <!-- MaNGA Target Flags -->

python/marvin/web/templates/header.html

@@ -46,10 +46,10 @@
             <!-- Links to some Docs -->
             {# Links to Whats New and Known Issues #}
             <div class='nav navbar-nav btn-group' id='links' role='group'>
-                <a class='navbar-btn btn btn-info' target='_blank' href='http://sdss-marvin.readthedocs.io/en/stable/whats-new.html'>What's New</a>
-                <a class='navbar-btn btn btn-danger' target='_blank' href='http://sdss-marvin.readthedocs.io/en/stable/known-issues.html'>Known Issues</a>
-                {#<a class='navbar-btn btn btn-warning' target='_blank' href='http://sdss-marvin.readthedocs.io/en/stable/getinvolved.html'>Get Involved</a>#}
-                <a class='navbar-btn btn btn-success' target='_blank' href='https://github.com/sdss/marvin/issues/new'>Provide Feedback</a>
+                <a class='navbar-btn btn btn-success' target='_blank' href='https://www.sdss.org/dr17/manga/' data-toggle="tooltip" data-container="body" data-placement="bottom" title="Learn more about the MaNGA survey">New to SDSS MaNGA?</a>
+                <a class='navbar-btn btn btn-info' target='_blank' href='http://sdss-marvin.readthedocs.io/en/stable/whats-new.html' data-toggle="tooltip" data-container="body" data-placement="bottom" title="See what's new in Marvin">What's New</a>
+                <a class='navbar-btn btn btn-danger' target='_blank' href='http://sdss-marvin.readthedocs.io/en/stable/known-issues.html' data-toggle="tooltip" data-container="body" data-placement="bottom" title="Check out known issues in Marvin">Known Issues</a>
+                <a class='navbar-btn btn btn-warning' target='_blank' href='https://github.com/sdss/marvin/issues/new' data-toggle="tooltip" data-container="body" data-placement="bottom" title="Submit a new Github Issue">Provide Feedback</a>
             </div>
 
             <!-- Login / User Prefs -->

python/marvin/web/templates/macros.html

@@ -94,7 +94,7 @@ <h4 class="modal-title">Your Rsync Link</h4>
 
 {# Download Button for Single Galaxy #}
 {% macro download(id, links) %}
-  <div class="btn-group marvin-download-singles" id='{{id}}'>
+  <div class="btn-group marvin-download-singles" id='{{id}}' data-toggle="tooltip" data-container="body" data-placement="right" title="Download the MaNGA products for this target">
     <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
       <i class="fa fa-download fa-fw" aria-hidden="true"></i>Download <span class="caret"></span>
     </button>
@@ -131,7 +131,7 @@ <h3 class="panel-title">{{title|default('Panel Title')}}</h3>
 {# Info PopUp #}
 {% macro infopopup(text, title, inner, id, alert='warning', place='right') %}
 {#<div class='col-md-{{col}} infopop' id='{{id}}'>#}
-    <button type="button" class="btn btn-{{alert}}" data-html='true' data-toggle="popover"
+    <button type="button" class="btn btn-{{alert}} infopop" data-html='true' data-toggle="popover"
     data-placement="{{place}}" data-container='#{{id}}' title="{{title}}" data-content="{{inner}}">{{text}}</button>
 {#</div>#}
 {% endmacro %}