25 files changed, 14 insertions, 15 deletions
diff --git a/share/frontend/imgrid/img/athenafinal.gif b/share/frontend/imgrid/athenafinal.gif
index 19e0d58..19e0d58 100755
--- a/share/frontend/imgrid/img/athenafinal.gif
+++ b/share/frontend/imgrid/athenafinal.gif
diff --git a/share/frontend/imgrid/img/background.gif b/share/frontend/imgrid/background.gif
index ac28d8d..ac28d8d 100755
--- a/share/frontend/imgrid/img/background.gif
+++ b/share/frontend/imgrid/background.gif
diff --git a/share/frontend/imgrid/img/blackplant.png b/share/frontend/imgrid/blackplant.png
index e78b547..e78b547 100755
--- a/share/frontend/imgrid/img/blackplant.png
+++ b/share/frontend/imgrid/blackplant.png
diff --git a/share/frontend/imgrid/img/blackplant2.png b/share/frontend/imgrid/blackplant2.png
index e4f8096..e4f8096 100755
--- a/share/frontend/imgrid/img/blackplant2.png
+++ b/share/frontend/imgrid/blackplant2.png
diff --git a/share/frontend/imgrid/img/blackplant3.png b/share/frontend/imgrid/blackplant3.png
index 4052e9d..4052e9d 100755
--- a/share/frontend/imgrid/img/blackplant3.png
+++ b/share/frontend/imgrid/blackplant3.png
diff --git a/share/frontend/imgrid/img/bros.png b/share/frontend/imgrid/bros.png
index 30f48fb..30f48fb 100755
--- a/share/frontend/imgrid/img/bros.png
+++ b/share/frontend/imgrid/bros.png
diff --git a/share/frontend/imgrid/js/colordictbackup.js b/share/frontend/imgrid/colordictbackup.js
index 62f914a..62f914a 100755
--- a/share/frontend/imgrid/js/colordictbackup.js
+++ b/share/frontend/imgrid/colordictbackup.js
diff --git a/share/frontend/imgrid/js/colors_iframe.js b/share/frontend/imgrid/colors_iframe.js
index 5e6d5b2..5e6d5b2 100644
--- a/share/frontend/imgrid/js/colors_iframe.js
+++ b/share/frontend/imgrid/colors_iframe.js
diff --git a/share/frontend/imgrid/css/cssreset.css b/share/frontend/imgrid/cssreset.css
index 9329580..9329580 100755
--- a/share/frontend/imgrid/css/cssreset.css
+++ b/share/frontend/imgrid/cssreset.css
diff --git a/share/frontend/imgrid/img/facebookimage.png b/share/frontend/imgrid/facebookimage.png
index 9ba4068..9ba4068 100755
--- a/share/frontend/imgrid/img/facebookimage.png
+++ b/share/frontend/imgrid/facebookimage.png
diff --git a/share/frontend/imgrid/css/general.css b/share/frontend/imgrid/general.css
index dc1296a..dc1296a 100755
--- a/share/frontend/imgrid/css/general.css
+++ b/share/frontend/imgrid/general.css
diff --git a/share/frontend/imgrid/img/generating.gif b/share/frontend/imgrid/generating.gif
index 441abe7..441abe7 100755
--- a/share/frontend/imgrid/img/generating.gif
+++ b/share/frontend/imgrid/generating.gif
diff --git a/share/frontend/imgrid/img/harrisbros.png b/share/frontend/imgrid/harrisbros.png
index 47366e1..47366e1 100755
--- a/share/frontend/imgrid/img/harrisbros.png
+++ b/share/frontend/imgrid/harrisbros.png
diff --git a/share/frontend/imgrid/img/imgrid.png b/share/frontend/imgrid/imgrid.png
index cfdae05..cfdae05 100755
--- a/share/frontend/imgrid/img/imgrid.png
+++ b/share/frontend/imgrid/imgrid.png
diff --git a/share/frontend/imgrid/index.html b/share/frontend/imgrid/index.html
index 0507e4f..3076df7 100755
--- a/share/frontend/imgrid/index.html
+++ b/share/frontend/imgrid/index.html
@@ -37,13 +37,13 @@
     <meta property="og:title" content="imgrid" />
     <meta property="og:type" content="website" />
     <meta property="og:site_name" content="IMGRID - stretch images from the web in 3 dimensions, draw lines and make drop shadows" />
-		<meta property="og:image" content="http://asdf.us/imgrid/img/facebookimage.png"/>
+		<meta property="og:image" content="http://asdf.us/imgrid/facebookimage.png"/>
     <meta property="fb:admins" content="100001923956223,1709246"/>
 		<title>IMGRID - stretch images from the web in 3 dimensions, draw lines and make drop shadows</title>
 		
-		<link rel="stylesheet" href="css/general.css" type="text/css" media="screen" />  
-		<link href='css/jquery-ui-1.8.16.custom.css' rel='stylesheet' type='text/css' />
-		<link href='css/cssreset.css' rel='stylesheet' type='text/css'/>
+		<link rel="stylesheet" href="general.css" type="text/css" media="screen" />  
+		<link href='jquery-ui-1.8.16.custom.css' rel='stylesheet' type='text/css' />
+		<link href='cssreset.css' rel='stylesheet' type='text/css'/>
 	<link href='http://fonts.googleapis.com/css?family=Varela+Round' rel='stylesheet' type='text/css'>
 		<style type='text/css'>
 			body
@@ -197,11 +197,11 @@ table
 </head>
 <body>
 			<div id='intro' style='position:absolute;top:0px;left:0px;width:100%;height:100%;background-image:url(background.gif);'><div style="background-image:url(background.gif); z-index:1000; height:inherit; width:inherit; position:fixed; left:50%; top:20px">
-					<img src="img/athenafinal.gif"></img>
+					<img src="athenafinal.gif"></img>
 			</div></div>
 
-<a href="http://asdf.us/imgrid/index.html" style:'cursor:pointer'><img src='img/bros.png' style='position:fixed; top:-200px; z-index:-100;'></img>
-<div style='font-size:30px;'><img style="width:500px" src="img/imgrid.png"></img></div></a>
+<a href="http://asdf.us/imgrid/index.html" style:'cursor:pointer'><img src='bros.png' style='position:fixed; top:-200px; z-index:-100;'></img>
+<div style='font-size:30px;'><img style="width:500px" src="imgrid.png"></img></div></a>
 <div style="font-size:12px;margin-left:20px;margin-bottom:20px;">IMGRID - stretch images from the web in 3 dimensions, draw lines and make drop shadows
 <br>
 hit enter or click GENERATE to get your perspective-plane
@@ -367,13 +367,13 @@ hit enter or click GENERATE to get your perspective-plane
 
 
 
-<span class='copyright' style="position:fixed; bottom:10px; left:10px;">COPYRIGHT 2011 PEPPER</span><a href='http://asdf.us/imgrid/greatgrids/index.html'><img class='copyright' style='display:inline; position:fixed; bottom:10px; left:290px; width:100px' src="img/blackplant.png"></img></a>
-<script type="text/javascript" src="js/jquery-1.6.4.min.js"></script>
-<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
+<span class='copyright' style="position:fixed; bottom:10px; left:10px;">COPYRIGHT 2011 PEPPER</span><a href='http://asdf.us/imgrid/greatgrids/index.html'><img class='copyright' style='display:inline; position:fixed; bottom:10px; left:290px; width:100px' src="blackplant.png"></img></a>
+<script type="text/javascript" src="jquery-1.6.4.min.js"></script>
+<script type="text/javascript" src="jquery-ui-1.8.16.custom.min.js"></script>
 <script type="text/javascript" src="/im/colors/js/jquery.remember-state.js"></script>
 <script type="text/javascript" src="/im/colors/js/jquery.fancybox.js?v=2.1.5"></script>
 <link rel="stylesheet" type="text/css" href="/im/colors/css/jquery.fancybox.css?v=2.1.5" media="screen" />
-<script type="text/javascript" src="js/colors_iframe.js"></script>
+<script type="text/javascript" src="colors_iframe.js"></script>
 <script type='text/javascript'> 
 $(document).ready(function()
 	{
@@ -383,8 +383,8 @@ $(document).ready(function()
 		})
 	});
 </script>
-<script type="text/javascript" src="js/sliders.js"></script>
-<script type="text/javascript" src="js/imgrid-main.js"></script>
+<script type="text/javascript" src="sliders.js"></script>
+<script type="text/javascript" src="main.js"></script>
 <script type='text/javascript'>
 		linksclicked = 'false';
 		$('#linksplug').click(function(){
diff --git a/share/frontend/imgrid/js/jquery-1.6.4.min.js b/share/frontend/imgrid/jquery-1.6.4.min.js
index 628ed9b..628ed9b 100755
--- a/share/frontend/imgrid/js/jquery-1.6.4.min.js
+++ b/share/frontend/imgrid/jquery-1.6.4.min.js
diff --git a/share/frontend/imgrid/css/jquery-ui-1.8.16.custom.css b/share/frontend/imgrid/jquery-ui-1.8.16.custom.css
index 9e3cc66..9e3cc66 100755
--- a/share/frontend/imgrid/css/jquery-ui-1.8.16.custom.css
+++ b/share/frontend/imgrid/jquery-ui-1.8.16.custom.css
diff --git a/share/frontend/imgrid/js/jquery-ui-1.8.16.custom.min.js b/share/frontend/imgrid/jquery-ui-1.8.16.custom.min.js
index 3042d0b..3042d0b 100755
--- a/share/frontend/imgrid/js/jquery-ui-1.8.16.custom.min.js
+++ b/share/frontend/imgrid/jquery-ui-1.8.16.custom.min.js
diff --git a/share/frontend/imgrid/js/imgrid-main.js b/share/frontend/imgrid/main.js
index f88e235..9693c86 100755
--- a/share/frontend/imgrid/js/imgrid-main.js
+++ b/share/frontend/imgrid/main.js
@@ -47,7 +47,7 @@ var Main =
 			roll: $("#roll").val(),
 			zoom: $("#zoom").val(),
 			trim: $("#trim:checked").val() !== undefined ? "true" : "false",
-			format: $('#format :selected').val(),
+			finalformat: $('#format :selected').val(),
 			username: $('#username').val()
 			}
 		if (data.transition == 'infinite'){
@@ -73,7 +73,6 @@ var Main =
 		},
 	callback: function (data)
 		{
-    data = JSON.parse(data)
 		$("#output-cmd").html('')
 		$("#output-img").html("<a target=_blank href='"+data.url+"'>"+"<img src='"+data.url+"'></img><br>"+"</a>");
 		$("#output-url").val(data.url)
diff --git a/share/frontend/imgrid/js/maincopy.js b/share/frontend/imgrid/maincopy.js
index b7f474b..b7f474b 100755
--- a/share/frontend/imgrid/js/maincopy.js
+++ b/share/frontend/imgrid/maincopy.js
diff --git a/share/frontend/imgrid/img/oldathena.gif b/share/frontend/imgrid/oldathena.gif
index b05605c..b05605c 100755
--- a/share/frontend/imgrid/img/oldathena.gif
+++ b/share/frontend/imgrid/oldathena.gif
diff --git a/share/frontend/imgrid/js/popup.js b/share/frontend/imgrid/popup.js
index bf138d0..bf138d0 100755
--- a/share/frontend/imgrid/js/popup.js
+++ b/share/frontend/imgrid/popup.js
diff --git a/share/frontend/imgrid/js/sliders.js b/share/frontend/imgrid/sliders.js
index ef76b03..ef76b03 100755
--- a/share/frontend/imgrid/js/sliders.js
+++ b/share/frontend/imgrid/sliders.js
diff --git a/share/frontend/imgrid/img/test.gif b/share/frontend/imgrid/test.gif
index ebfbdeb..ebfbdeb 100755
--- a/share/frontend/imgrid/img/test.gif
+++ b/share/frontend/imgrid/test.gif
diff --git a/share/frontend/imgrid/img/thatbackground.gif b/share/frontend/imgrid/thatbackground.gif
index e52cfdc..e52cfdc 100755
--- a/share/frontend/imgrid/img/thatbackground.gif
+++ b/share/frontend/imgrid/thatbackground.gif