haystack · awaln · Jan 23, 2015 · Jan 23, 2015 · Jan 23, 2015 · Jan 24, 2015
diff --git a/TODO.txt b/TODO.txt
@@ -0,0 +1,12 @@
+Upload CSV (or other things that Exhibit can use)
+
+Use pre-uploaded files (and store them)
+
+URL of data somewhere else on the web (cross-site scripting via datapress)
+
+*************************************************
+
+- How does Wordpress upload/store files?
+- What does Exhibit need for CSV files?
+- Build GUI for uploading files
+- Build GUI for using uploaded files
diff --git a/admin_javascript.js.php b/admin_javascript.js.php
@@ -13,10 +13,8 @@
 
 if (!$guessurl = site_url())
 	$guessurl = wp_guess_url();
-	$baseuri = $guessurl;
-	$exhibituri = $baseuri . '/wp-content/plugins/datapress';
-	$imageurl = $exhibituri . '/exhibit.png';
-	$footnotesurl = $exhibituri . '/footnotes.png';	
+$baseuri = $guessurl;
+$exhibituri = $baseuri . '/wp-content/plugins/datapress';
 
 print <<<EOF
 
@@ -41,10 +39,8 @@ function set_post_exhibit(exhibit_id) {
 
 // send html to the post editor
 function add_exhibit_token_and_exit() {
-	var imagestring = "<img src='$imageurl' alt='Your Exhibit' height='70' width='70'/>";	
-	var footstring = "<img src='$footnotesurl' alt='Your Footnotes' height='70' width = '70'/>";
-	var h = imagestring + " " + footstring;
-	var searchfor = '$imageurl';
+	var h = "{{Exhibit}}  {{Footnotes}}";
+	var searchfor = "{{Exhibit}}";
 
 	if ( typeof tinyMCE != 'undefined' && ( ed = tinyMCE.activeEditor ) && !ed.isHidden() ) {
 		ed.focus();

diff --git a/configurator/exhibit-inputbox-data-link.php b/configurator/exhibit-inputbox-data-link.php
@@ -1,16 +1,19 @@
 <?php
 if (!$guessurl = site_url())
-	$guessurl = wp_guess_url();
+    $guessurl = wp_guess_url();
 $baseuri = $guessurl;
 $exhibituri = $baseuri . '/wp-content/plugins/datapress';
 ?>
 
 <table>
-	<tr>
-		<td>URL</td>
-		<td><input id="exhibit-datasource-link-uri" type="text" size="30" />&nbsp; &nbsp; [ <a href="http://projects.csail.mit.edu/datapress/help/importing-data/" target="_blank">help with data importing</a> ]</td>
-	</tr>
-	<!--<tr>
+    <tr>
+        <td>URL</td>
+        <td><input id="exhibit-datasource-link-uri" type="text" size="30"/>&nbsp; &nbsp; [ <a
+                href="http://projects.csail.mit.edu/datapress/help/importing-data/" target="_blank">help with data
+                importing</a> ]
+        </td>
+    </tr>
+    <!--<tr>
 		<td>Type</td>
 		<td><p>
 		    <select id="exhibit-datasource-link-kind">
@@ -21,101 +24,162 @@
 		    <a href="#" onclick="popup('http://projects.csail.mit.edu/datapress/contacthelp/importing-data/importing-data/'); return false;"><img align="middle" src="<?php echo $exhibituri ?>/images/help.png" width="20" height="20" /></a>
 		</p></td>
 	</tr>-->
-	<tr>
-    	<td>Name</td>
-		<td><input id="exhibit-datasource-link-sourcename" type="text" size="30" /></td>
-	</tr>
+    <tr>
+        <td>Name</td>
+        <td><input id="exhibit-datasource-link-sourcename" type="text" size="30"/></td>
+    </tr>
 </table>
 <p align="right">
-<!-- <a id="#upload_button" href="#" class="addlink">Upload File</a> -->
-<a href="#" class="addlink" onclick="submit_data_link(); return false">Add Data Link</a></p>
+    <!-- <a id="#upload_button" href="#" class="addlink">Upload File</a> -->
+    <a href="#" class="addlink" onclick="submit_data_link(); return false">Add Data Link</a>
+</p>
+<div id="exhibit-worksheet-selection" style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; display: inline; background-color: rgba(0, 0, 0, 0.6); display:none;">
+    <div style="border:2px solid #99CC66; border-radius:4px; position:absolute; top:0; left:0; right:0; bottom:0; margin:auto; width: 50%; height:5em; padding:10px; background-color:#FFFFFF;">
+        Your Spreadsheet contained multiple sheets. Please select which sheet you would like to use:
+        <br>
+        <select id="exhibit-worksheet-selection-dropdown" data-kind="google-spreadsheet" data-sourcename="test" data-key="1mbYtgzvP0Zv7Glc7pBjV3FBj2EIflPY37URRsfSikVQ" style="display:inline-block">
+        </select>
+        <div style="display:inline-block; position:absolute; padding:4px; border:1px solid black; background-color:#f5f5f5; font-weight:bold; margin:.1em 0 0 1em" onclick="select_sheet()">
+            Select this sheet
+        </div>
+    </div>
+</div>
+
 
 <script type="text/JavaScript">
 
-    jQuery(document).ready(function() {
-        jQuery('#upload_button').click(function() {
-         formfield = jQuery('#exhibit-datasource-link-uri').attr('name');
-         tb_show('', 'media-upload.php?type=image&amp;TB_iframe=true');
-         return false;
+    jQuery(document).ready(function () {
+        jQuery('#upload_button').click(function () {
+            formfield = jQuery('#exhibit-datasource-link-uri').attr('name');
+            tb_show('', 'media-upload.php?type=image&amp;TB_iframe=true');
+            return false;
         });
 
-        window.send_to_editor = function(html) {
-         imgurl = jQuery('img',html).attr('src');
-         jQuery('#exhibit-datasource-link-uri').val(imgurl);
-         tb_remove();
+        window.send_to_editor = function (html) {
+            imgurl = jQuery('img', html).attr('src');
+            jQuery('#exhibit-datasource-link-uri').val(imgurl);
+            tb_remove();
+        }
+    });
+
+    function kind_for(kind) {
+        if (kind == "google-spreadsheet") {
+            return "Google Spreadsheet";
         }
-   });
-
-  function kind_for(kind) {
-  	if (kind == "google-spreadsheet") {
-		return "Google Spreadsheet";
-	}
-	if (kind == "application/json") {
-		return "JSON File";
-	}
-	return "Unknown Type";
-  }
-
-  function add_datasource_link(kind, uri, sourcename, where) {
-		var remove_id = addExhibitElementLink(
-			"data-source-list",
-			kind_for(kind) + ": " + sourcename + " (<a href='" + uri + "'>view data</a>)",
-			'data', 
-			{
-				kind: kind, 
-				uri: uri,
-				sourcename: sourcename,
-				data_location: where
-		    },
+        if (kind == "application/json") {
+            return "JSON File";
+        }
+        return "Unknown Type";
+    }
+
+    function add_datasource_link(kind, uri, sourcename, where) {
+        var remove_id = addExhibitElementLink(
+            "data-source-list",
+            kind_for(kind) + ": " + sourcename + " (<a target='_blank' href='" + uri + "'>view data</a>)",
+            'data',
+            {
+                kind: kind,
+                uri: uri,
+                sourcename: sourcename,
+                data_location: where
+            },
             {
                 editable: true,
                 tabid: "exhibit-datasource-link"
             });
-		ex_add_head_link(uri, kind, remove_id);
-		$.post("<?php bloginfo('wpurl'); ?>/wp-admin/admin-ajax.php",
-		       { action: "insert_parrotable_url",
-		         url: encodeURIComponent(uri) },
-               function(data){
-                 setTimeout("ex_load_links()", 1000);
-               });
-  }
-
-  function submit_data_link() {
-
-	var uri = jQuery('#exhibit-datasource-link-uri').val();
-
-	var kind = guess_type(uri);
-	//var kind = jQuery('#exhibit-datasource-link-kind').val();
-    var sourcename = jQuery('#exhibit-datasource-link-sourcename').val();
-
-	jQuery(function() {
-		jQuery.getJSON("<?php bloginfo('wpurl'); ?>/wp-admin/admin-ajax.php?action=import_datafiles&url=" + encodeURIComponent(uri) + "&name=" + encodeURIComponent(sourcename) + "&type=" + encodeURIComponent(kind), function(json) {
-            // Process Errors
-            if (json.errors) {
-                for (var i=0; i<json.errors.length; i++) {
-                    alert("Error: " + json.errors[i]);
-                }                
-            }
-
-            // Process Warnings
-            if (json.warnings) {
-                for (var i=0; i<json.warnings.length; i++) {
-                    alert("Warning: " + json.warnings[i]);
-                }                
-            }
-
-            // Process Links
-			if (json.links) {
-    			for(var i=0; i<json.links.length; i++) {
-    				var link_kind = json.links[i].kind;
-    				var link_uri = json.links[i].href;
-    				var link_sourcename = json.links[i].alt;
-    				add_datasource_link(link_kind, link_uri, link_sourcename, 'remote');					
-    			}
-			}
-		});	
-	});
-
-  }
+        ex_add_head_link(uri, kind, remove_id);
+        $.post("<?php bloginfo('wpurl'); ?>/wp-admin/admin-ajax.php",
+            {
+                action: "insert_parrotable_url",
+                url: encodeURIComponent(uri)
+            },
+            function (data) {
+                setTimeout("ex_load_links()", 1000);
+            });
+    }
+
+    function submit_data_link() {
+
+        var uri = jQuery('#exhibit-datasource-link-uri').val();
+
+        var kind = guess_type(uri);
+        //var kind = jQuery('#exhibit-datasource-link-kind').val();
+        var sourcename = jQuery('#exhibit-datasource-link-sourcename').val();
+
+        jQuery(function () {
+            jQuery.getJSON("<?php bloginfo('wpurl'); ?>/wp-admin/admin-ajax.php?action=import_datafiles&url=" + encodeURIComponent(uri) + "&name=" + encodeURIComponent(sourcename) + "&type=" + encodeURIComponent(kind), function (json) {
+                // Process Errors
+                if (json.errors) {
+                    for (var i = 0; i < json.errors.length; i++) {
+                        alert("Error: " + json.errors[i]);
+                    }
+                }
+
+                // Process Warnings
+                if (json.warnings) {
+                    for (var i = 0; i < json.warnings.length; i++) {
+                        alert("Warning: " + json.warnings[i]);
+                    }
+                }
+
+                // Process Links
+                if (json.links) {
+                    for (var i = 0; i < json.links.length; i++) {
+                        var link_kind = json.links[i].kind;
+                        var link_sourcename = json.links[i].alt;
+                        if (typeof json.links[i].multisheet != "undefined") {
+                            var link_uri = sheet_dropdown(json.links[i].sheets_xml, json.links[i].key, link_kind, link_sourcename);
+                        } else {
+                            var link_uri = json.links[i].href;
+                            add_datasource_link(link_kind, link_uri, link_sourcename, 'remote');
+                        }
+
+                    }
+                }
+            });
+        });
+
+    }
+
+    function sheet_dropdown(xml, key, link_kind, link_sourcename) {
+        // scrape page for sheet ids and sheet titles.
+        var sheet_match = new RegExp(/([^<>\/]+)<\/id>/g);
+        var title_match = new RegExp(/<title[^>]+>([^<]+)<\/title>/g);
+        var sheets = [];
+        var titles = [];
+        var match_s;
+        var match_t;
+        while((match_s = sheet_match.exec(xml)) && (match_t = title_match.exec(xml))){
+            sheets.push(match_s[1]);
+            titles.push(match_t[1]);
+        }
+        // first entry in both lists is the full worksheet, don't care about that.
+        sheets.shift();
+        titles.shift();
+        // set options on drop down.
+        var select = document.getElementById('exhibit-worksheet-selection-dropdown');
+        select.setAttribute('data-kind', link_kind);
+        select.setAttribute('data-sourcename', link_sourcename);
+        select.setAttribute('data-key', key);
+        var option;
+        for(var i=0; i<sheets.length; i++){
+            option = document.createElement('OPTION');
+            option.text = titles[i];
+            option.value = sheets[i];
+            select.add(option);
+        }
+        document.getElementById('exhibit-worksheet-selection').style.display = 'inline';
+    }
+
+    function select_sheet(){
+        // user chose a sheet, add it
+        var select = document.getElementById('exhibit-worksheet-selection-dropdown');
+        var link_kind = select.getAttribute('data-kind');
+        var link_uri = 'https://spreadsheets.google.com/feeds/list/' + select.getAttribute('data-key') + '/' + select.options[select.selectedIndex].value + '/public/basic?hl=en_US&alt=json-in-script';
+        var link_sourcename = select.getAttribute('data-sourcename');
+        select.innerHTML="";
+        document.getElementById('exhibit-worksheet-selection').style.display = 'none';
+        add_datasource_link(link_kind, link_uri, link_sourcename, 'remote');
+    }
 
 </script>
diff --git a/facet_widget.php b/facet_widget.php
@@ -30,4 +30,4 @@ function datapressFacet_init()
   register_sidebar_widget(__('DataPress Facets'), 'widget_datapressFacet');
 }
 add_action("plugins_loaded", "datapressFacet_init");
-?>
+?>
diff --git a/head-datasources.php b/head-datasources.php
@@ -0,0 +1,20 @@
+<?php
+	if (!$guessurl = site_url())
+    	$guessurl = wp_guess_url();
+    $baseuri = $guessurl;
+    $exhibituri = $baseuri . '/wp-content/plugins/datapress';
+require_once('wp-exhibit-geocoder.php');
+global $exhibits_to_show;
+
+if (isset($exhibits_to_show) && (count($exhibits_to_show) > 0)) {
+    foreach ($exhibits_to_show as $exhibit_to_show) {
+        foreach($exhibit_to_show->get('datasources') as $datasource) {
+            echo($datasource->htmlContent() . "\n");
+        }
+    // This isn't necessary becasue we're dynamically adding it now
+    // if(WpExhibitGeocoder::doesExhibitContainGeocodedData($exhibit_to_show->get('id'))) {
+    //         echo("<link href='$exhibituri/wp-exhibit-geocode.php?exhibit-id=" . $exhibit_to_show->get('id') . "' type='application/json' rel='exhibit/data' alt='geocoded_data' />\n");
+    // }
+}
+}
+?>
diff --git a/head-exhibit.php b/head-exhibit.php
@@ -0,0 +1,42 @@
+<?php
+global $exhibits_to_show;
+
+if (count($exhibits_to_show) == 1) {
+    if ((! $exhibits_to_show[0]->get('lightbox')) || (isset($lightboxed_exhibit))) {
+        $google_map_api_key = get_option( 'google_map_api_key' );
+        $plugin_dir = trailingslashit( get_bloginfo('wpurl') ).PLUGINDIR.'/datapress';    
+
+        ?>
+        <script src="http://projects.csail.mit.edu/datapress/exhibit-files/exhibit-api/exhibit-api.js?autoCreate=false" type="text/javascript"></script> 
+        <script src="http://projects.csail.mit.edu/datapress/exhibit-files/exhibit-api/extensions/time/time-extension.js" type="text/javascript"></script>
+        <script src="http://projects.csail.mit.edu/datapress/exhibit-files/exhibit-api/extensions/chart/chart-extension.js" type="text/javascript"></script>
+        <link rel="stylesheet" type="text/css" href="<?php echo $plugin_dir ?>/exhibit.css" />
+
+        <?php
+        // Insert lense decoration css files for each lens decoration
+        foreach ($exhibits_to_show[0]->get('lenses') as $lens) {
+            if ($lens->get('decoration') != 'none') {
+                ?>
+                <link rel="stylesheet" type="text/css" href="<?php echo $plugin_dir ?>/css/<?php echo $lens->get('decoration') ?>.css" />
+                <?php
+            }
+        }
+        ?>
+
+        <?php 
+        if ($google_map_api_key != null) { 
+            ?><script src="http://projects.csail.mit.edu/datapress/exhibit-files/exhibit-api/extensions/map/map-extension.js?gmapkey=<?php echo $google_map_api_key ?>"></script><?php
+        }
+
+        $css = $exhibits_to_show[0]->get('css');
+        if ($css != NULL) {
+    		?><link rel="stylesheet" href="<?php echo $css ?>" type="text/css" /><?php
+    	}
+
+    	echo('<script type="text/javascript">');
+    	include('head-start-exhibit.js.php');    
+    	echo('</script>');
+    }
+}
+
+?>
diff --git a/head-lightbox-library.php b/head-lightbox-library.php
@@ -1,6 +1,4 @@
 <?php
-global $exhibits_to_show;
-
 	if (!$guessurl = site_url())
     	$guessurl = wp_guess_url();
         $baseuri = $guessurl;
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,4 +30,4 @@ function datapressFacet_init() @@
       register_sidebar_widget(__('DataPress Facets'), 'widget_datapressFacet');
     }
     add_action("plugins_loaded", "datapressFacet_init");
-    ?>
+    ?>