improved resizing, moved download link to a button in top of frame

bfaure · Aug 26, 2018 · 2b193c8 · 2b193c8
1 parent 405542c
commit 2b193c8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/icons/imdb_logo.png b/icons/imdb_logo.png
diff --git a/manifest.json b/manifest.json
@@ -7,7 +7,7 @@
                                 "popup/popular_articles.html",
                                 "popup/popular_articles_generator.js",
                                 "options.html",
-                                "icons/imdb_logo.png"
+                                "icons/download.png"
                 ],
 
   "description": "Display view data on all Wikipedia articles",

diff --git a/popup/popup.js b/popup/popup.js
@@ -123,7 +123,7 @@ function process_url(url)
 			iframe_container.appendChild(iFrame);
 
 			iFrame.src = chrome.extension.getURL("popup/popup_box.htm");
-			iFrame.style = "border:1px solid #a6a6a6;";
+			iFrame.style = "border:1px solid #a6a6a6;margin-left:0.5em";
 
 			// if this is the main page, skip
 			if (url=="https://en.wikipedia.org/wiki/Main_Page")
@@ -139,7 +139,7 @@ function process_url(url)
 
 			// width is set to match the width of the existing box on the article page
 			iFrame.width = "280";
-			iFrame.height = "240";
+			iFrame.height = "244";
 
 			iFrame.align = "right";
 
@@ -156,7 +156,7 @@ function process_url(url)
 
 window.addEventListener("message",handleMessage,false);
 function handleMessage(event){
-	document.getElementById("wiki_frame").style.height="445px";
+	document.getElementById("wiki_frame").style.height="417px";
 }
 
 

diff --git a/popup/popup_generator.js b/popup/popup_generator.js
@@ -440,12 +440,21 @@ function process_url(tablink)
 	article_pretty = article_pretty.split("%C3%A9").join("é");
 	article_pretty = article_pretty.split("%C3%97").join("x").split("%26").join("&");
 
-	$("body").append("<div class=\"bg-text\">Popularity</div>");
+	let csvContent="data:text/csv;charset=utf-8,Date,Views\r\n";
+	for(let q=0; q<export_data.views.length; q+=1){
+		csvContent+=String(export_data.date[q])+","+String(export_data.views[q])+"\r\n";
+	}
+	var data_url=encodeURI(csvContent);
+	let download_name=article+"-view_data.csv";
+	let img_src=chrome.extension.getURL("/icons/download.png");
+	var link="<a title=\"Download Plot Data as CSV\" download=\""+download_name+"\" href=\""+data_url+"\"><img style=\"height:10px;width:10px;float:left;margin-top:3px;margin-left:10px;margin-right:-48px\" src=\""+img_src+"\"/></a>";
+
+	$("body").append("<div class=\"bg-text\">"+link+"Popularity</div>");
 
 	var views_arr = make_view_plot(article); // returns array with [avg_daily_views,views_last_week]
 	var avg_daily_views = views_arr[0];
 	var views_last_week = views_arr[1];
-
+	
 	var avg_daily_views_pretty = String(avg_daily_views.toLocaleString('en-US',{minimumFractionDigits: 2})).split(".")[0];
 	var avg_daily_views_line = "<b>Average Views</b>&nbsp;&nbsp;"+avg_daily_views_pretty+" / day";
 	$("body").append("<p>"+avg_daily_views_line+"</p>");
@@ -486,15 +495,6 @@ function process_url(tablink)
 
 		parent.postMessage("message","*"); // resize the iframe to fit imdb stuff
 	}
-
-	let csvContent="data:text/csv;charset=utf-8,Date,Views\r\n";
-	for(let q=0; q<export_data.views.length; q+=1){
-		csvContent+=String(export_data.date[q])+","+String(export_data.views[q])+"\r\n";
-	}
-	var data_url=encodeURI(csvContent);
-	let download_name=article+"-view_data.csv";
-	var link="<p><a download=\""+download_name+"\" href=\""+data_url+"\">Export plot data as CSV</a></p>";
-	$("body").append(link);
 }
 
 function jQueryMain () {