ready to merge to main branch

85 files changed, 1073 insertions, 508 deletions

diff --git a/photoblaster/db/imcmd.py b/photoblaster/db/imcmd.py
index 1cd9fb4..ba76bfe 100644
--- a/photoblaster/db/imcmd.py
+++ b/photoblaster/db/imcmd.py
@@ -1,10 +1,11 @@
 # coding: utf-8
 """imcmd sqlalchemy module"""
-from sqlalchemy import Column, Integer, LargeBinary, String, 
+from sqlalchemy import Column, Integer, LargeBinary, String
 from sqlalchemy.ext.declarative import declarative_base
 
 Base = declarative_base()
 
+
 class ImCmd(Base):
     """defines the table class"""
     __tablename__ = 'im_cmd'
diff --git a/photoblaster/modules/base.py b/photoblaster/modules/base.py
index 3f45058..70cc76c 100644
--- a/photoblaster/modules/base.py
+++ b/photoblaster/modules/base.py
@@ -13,7 +13,7 @@ from subprocess import Popen, PIPE, call
 from photoblaster.params import Params
 import sha
 import simplejson as json
-from photoblaster.s3cli import S3Cli
+from photoblaster.s3.cli import S3Cli
 from photoblaster.db.pb import Pb as DbPb
 BASE_URL = "http://i.asdf.us"
 
diff --git a/run_module_examples.py b/run_module_examples.py
index 909c207..a6af4b5 100644
--- a/run_module_examples.py
+++ b/run_module_examples.py
@@ -2,9 +2,8 @@
 """calls the example_run method on all modules"""
 from photoblaster.modules import Pb
 for cls in Pb.__subclasses__():
-    if cls.__name__ == "PbGradient":
-        print cls.__name__
-        instance = cls.example_run()
-        instance.file_s3move()
-        print instance.file_dict()
-        instance.db_send();
+    print cls.__name__
+    instance = cls.example_run()
+    instance.file_s3move()
+    print instance.file_dict()
+    instance.db_send();
diff --git a/share/frontend/im/OLD/01/_1424365694_frankhats.gif b/share/frontend/im/OLD/01/_1424365694_frankhats.gif
deleted file mode 100644
index 3c51d74..0000000
--- a/share/frontend/im/OLD/01/_1424365694_frankhats.gif
+++ /dev/null
diff --git a/share/frontend/im/OLD/13/imgrid_1424839118_imgrid_1424839001_ymba2ut_pepper_pepper.png b/share/frontend/im/OLD/13/imgrid_1424839118_imgrid_1424839001_ymba2ut_pepper_pepper.png
deleted file mode 100644
index 266d54f..0000000
--- a/share/frontend/im/OLD/13/imgrid_1424839118_imgrid_1424839001_ymba2ut_pepper_pepper.png
+++ /dev/null
diff --git a/share/frontend/im/OLD/26/imgrid_1424839138_imgrid_1424839001_ymba2ut_pepper_pepper.png b/share/frontend/im/OLD/26/imgrid_1424839138_imgrid_1424839001_ymba2ut_pepper_pepper.png
deleted file mode 100644
index 266d54f..0000000
--- a/share/frontend/im/OLD/26/imgrid_1424839138_imgrid_1424839001_ymba2ut_pepper_pepper.png
+++ /dev/null
diff --git a/share/frontend/im/OLD/2a/imgrid_1424839194_imgrid_1424839001_ymba2ut_pepper_pepper.png b/share/frontend/im/OLD/2a/imgrid_1424839194_imgrid_1424839001_ymba2ut_pepper_pepper.png
deleted file mode 100644
index 266d54f..0000000
--- a/share/frontend/im/OLD/2a/imgrid_1424839194_imgrid_1424839001_ymba2ut_pepper_pepper.png
+++ /dev/null
diff --git a/share/frontend/im/OLD/37/imBreak_1424908970_xx_abridged___.gif b/share/frontend/im/OLD/37/imBreak_1424908970_xx_abridged___.gif
deleted file mode 100644
index bcc8038..0000000
--- a/share/frontend/im/OLD/37/imBreak_1424908970_xx_abridged___.gif
+++ /dev/null
diff --git a/share/frontend/im/OLD/3a/imgrid_1424839041_imgrid_1424839001_ymba2ut_pepper_pepper.png b/share/frontend/im/OLD/3a/imgrid_1424839041_imgrid_1424839001_ymba2ut_pepper_pepper.png
deleted file mode 100644
index 266d54f..0000000
--- a/share/frontend/im/OLD/3a/imgrid_1424839041_imgrid_1424839001_ymba2ut_pepper_pepper.png
+++ /dev/null
diff --git a/share/frontend/im/OLD/61/imgrid_1424839095_imgrid_1424839001_ymba2ut_pepper_pepper.png b/share/frontend/im/OLD/61/imgrid_1424839095_imgrid_1424839001_ymba2ut_pepper_pepper.png
deleted file mode 100644
index 266d54f..0000000
--- a/share/frontend/im/OLD/61/imgrid_1424839095_imgrid_1424839001_ymba2ut_pepper_pepper.png
+++ /dev/null
diff --git a/share/frontend/im/OLD/61/imgrid_1424839214_imgrid_1424839001_ymba2ut_pepper_pepper.png b/share/frontend/im/OLD/61/imgrid_1424839214_imgrid_1424839001_ymba2ut_pepper_pepper.png
deleted file mode 100644
index 266d54f..0000000
--- a/share/frontend/im/OLD/61/imgrid_1424839214_imgrid_1424839001_ymba2ut_pepper_pepper.png
+++ /dev/null
diff --git a/share/frontend/im/OLD/71/imgrid_1424839153_imgrid_1424839001_ymba2ut_pepper_pepper.png b/share/frontend/im/OLD/71/imgrid_1424839153_imgrid_1424839001_ymba2ut_pepper_pepper.png
deleted file mode 100644
index 266d54f..0000000
--- a/share/frontend/im/OLD/71/imgrid_1424839153_imgrid_1424839001_ymba2ut_pepper_pepper.png
+++ /dev/null
diff --git a/share/frontend/im/OLD/8c/_1424361556_dvvidpw.gif b/share/frontend/im/OLD/8c/_1424361556_dvvidpw.gif
deleted file mode 100644
index 3c51d74..0000000
--- a/share/frontend/im/OLD/8c/_1424361556_dvvidpw.gif
+++ /dev/null
diff --git a/share/frontend/im/OLD/91/imgrid_1424839066_imgrid_1424839001_ymba2ut_pepper_pepper.png b/share/frontend/im/OLD/91/imgrid_1424839066_imgrid_1424839001_ymba2ut_pepper_pepper.png
deleted file mode 100644
index 266d54f..0000000
--- a/share/frontend/im/OLD/91/imgrid_1424839066_imgrid_1424839001_ymba2ut_pepper_pepper.png
+++ /dev/null
diff --git a/share/frontend/im/OLD/9f/imgrid_1424839118_pepper.png b/share/frontend/im/OLD/9f/imgrid_1424839118_pepper.png
deleted file mode 100644
index 0c8ee7d..0000000
--- a/share/frontend/im/OLD/9f/imgrid_1424839118_pepper.png
+++ /dev/null
diff --git a/share/frontend/im/OLD/ba/imBreak_1424908974_xx_abridged___.gif b/share/frontend/im/OLD/ba/imBreak_1424908974_xx_abridged___.gif
deleted file mode 100644
index f0b981d..0000000
--- a/share/frontend/im/OLD/ba/imBreak_1424908974_xx_abridged___.gif
+++ /dev/null
diff --git a/share/frontend/im/OLD/bb/1423883560371dumpfmdatesdooduok_1424365488_mmi.gif b/share/frontend/im/OLD/bb/1423883560371dumpfmdatesdooduok_1424365488_mmi.gif
deleted file mode 100644
index 3c51d74..0000000
--- a/share/frontend/im/OLD/bb/1423883560371dumpfmdatesdooduok_1424365488_mmi.gif
+++ /dev/null
diff --git a/share/frontend/im/OLD/bb/1423883560371dumpfmdatesdooduok_1424365545_mmi.gif b/share/frontend/im/OLD/bb/1423883560371dumpfmdatesdooduok_1424365545_mmi.gif
deleted file mode 100644
index 3c51d74..0000000
--- a/share/frontend/im/OLD/bb/1423883560371dumpfmdatesdooduok_1424365545_mmi.gif
+++ /dev/null
diff --git a/share/frontend/im/OLD/bc/new_1424372778.gif b/share/frontend/im/OLD/bc/new_1424372778.gif
deleted file mode 100644
index 3c51d74..0000000
--- a/share/frontend/im/OLD/bc/new_1424372778.gif
+++ /dev/null
diff --git a/share/frontend/im/OLD/bc/new_1424372876.gif b/share/frontend/im/OLD/bc/new_1424372876.gif
deleted file mode 100644
index 3c51d74..0000000
--- a/share/frontend/im/OLD/bc/new_1424372876.gif
+++ /dev/null
diff --git a/share/frontend/im/OLD/cf/imgrid_1424839174_imgrid_1424839001_ymba2ut_pepper_pepper.png b/share/frontend/im/OLD/cf/imgrid_1424839174_imgrid_1424839001_ymba2ut_pepper_pepper.png
deleted file mode 100644
index 266d54f..0000000
--- a/share/frontend/im/OLD/cf/imgrid_1424839174_imgrid_1424839001_ymba2ut_pepper_pepper.png
+++ /dev/null
diff --git a/share/frontend/im/OLD/clearthedirectories b/share/frontend/im/OLD/clearthedirectories
deleted file mode 100755
index 6d5b2a7..0000000
--- a/share/frontend/im/OLD/clearthedirectories
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/python2.7
-
-import sys
-import os
-import time
-
-f = open("directories",'r')
-lines = f.readlines()
-f.close()
-newlines = []
-for line in lines:
-	if "\n" in line:
-		jerry = line.replace("\n","")
-		if len(jerry) == 2:
-			newlines.append(jerry)
-dirs = newlines
-print dirs
-for dir in dirs:
-	print dir
-	if len(dir) == 2:
-		delete = False
-		os.system("ls "+dir+"/ >> contents")
-		f = open("contents","r")
-		thecontents = f.readlines()
-		f.close()
-		print thecontents
-		os.system("rm contents")
-		tempbool = False
- 		tempbool2 = False
-		if len(thecontents) != 0:
-			for x in thecontents:
-				if ".jpg" in x:
-					tempbool = True
-#			if len(thedirs)>40:
-#				tempbool2 = True
-			if tempbool == True:# and tempbool2 == True:
-				print "deleting contents.."
-		print "moving to directory '"+dir+"'"
-	if len(thecontents)>0:
-		x = input("bout to do some deleting 1=yes 0=no")
-		if x == 1:
-			print "ok deleting "+dir+"/*"
-			try:
-				os.system("rm "+dir+"/*")
-			except:
-				continue
-		else:
-			sys.exit()
-	else:
-		print "nothing there"
-		continue
diff --git a/share/frontend/im/OLD/d8/imgrid_1424839121_imgrid_1424839001_ymba2ut_pepper_pepper.png b/share/frontend/im/OLD/d8/imgrid_1424839121_imgrid_1424839001_ymba2ut_pepper_pepper.png
deleted file mode 100644
index 266d54f..0000000
--- a/share/frontend/im/OLD/d8/imgrid_1424839121_imgrid_1424839001_ymba2ut_pepper_pepper.png
+++ /dev/null
diff --git a/share/frontend/im/OLD/e6/imBreak_1424908981_xx_abridged___.gif b/share/frontend/im/OLD/e6/imBreak_1424908981_xx_abridged___.gif
deleted file mode 100644
index 04cc98f..0000000
--- a/share/frontend/im/OLD/e6/imBreak_1424908981_xx_abridged___.gif
+++ /dev/null
diff --git a/share/frontend/im/OLD/e9/_1424362273_dvvidpw.gif b/share/frontend/im/OLD/e9/_1424362273_dvvidpw.gif
deleted file mode 100644
index 3c51d74..0000000
--- a/share/frontend/im/OLD/e9/_1424362273_dvvidpw.gif
+++ /dev/null
diff --git a/share/frontend/im/OLD/ec/imgrid_1424839230_imgrid_1424839001_ymba2ut_pepper_pepper.png b/share/frontend/im/OLD/ec/imgrid_1424839230_imgrid_1424839001_ymba2ut_pepper_pepper.png
deleted file mode 100644
index 266d54f..0000000
--- a/share/frontend/im/OLD/ec/imgrid_1424839230_imgrid_1424839001_ymba2ut_pepper_pepper.png
+++ /dev/null
diff --git a/share/frontend/im/OLD/f8/_1424370030.gif b/share/frontend/im/OLD/f8/_1424370030.gif
deleted file mode 100644
index 3c51d74..0000000
--- a/share/frontend/im/OLD/f8/_1424370030.gif
+++ /dev/null
diff --git a/share/frontend/im/gallery/.htaccess b/share/frontend/im/gallery/.htaccess
index 2617f79..e48c0b8 100755
--- a/share/frontend/im/gallery/.htaccess
+++ b/share/frontend/im/gallery/.htaccess
@@ -1,2 +1 @@
 DirectoryIndex /cgi-bin/im/gallery
-
diff --git a/share/frontend/im/gradient.html b/share/frontend/im/gradient.html
deleted file mode 100755
index 6b451bb..0000000
--- a/share/frontend/im/gradient.html
+++ /dev/null
@@ -1,402 +0,0 @@
-<!doctype html>
-<html>
-<head>
-<title>PHOTOBLASTER</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
-<meta property="og:title" content="PHOTOBLASTER"/> 
-<meta property="og:type" content="website"/> 
-<meta property="og:url" content="http://asdf.us/im/"/> 
-<meta property="og:image" content="http://asdf.us/im/6e/sparklebling1_1310021111_1310071704.gif" />
-<meta property="og:site_name" content="asdf.us"/> 
-<meta property="og:description" content=""/> 
-<meta property="fb:admins" content="100001923956223,1709246"/>
-<style type="text/css">
-*
-	{
-	padding: 0;
-	margin: 0;
-	font-family: serif;
-	font-size: 16px;
-background-image: -webkit-gradient(
-    linear,
-    left bottom,
-    left top,
-    color-stop(0.01, #480925),
-    color-stop(0.51, #7E8585)
-);
-background-image: -moz-linear-gradient(
-    center bottom,
-    #480925 1%,
-    #7E8585 51%
-);
-
-
-	}
-body
-	{
-//	overflow: hidden;
-background-image: -webkit-gradient(
-    linear,
-    left bottom,
-    left top,
-    color-stop(0.01, #480925),
-    color-stop(0.51, #7E8585)
-);
-background-image: -moz-linear-gradient(
-    center bottom,
-    #480925 1%,
-    #7E8585 51%
-);
-
-
-//	background-color: red;
-	}
-#controls,#result
-	{
-	display: inline-block;
-	padding: 10px;
-	width: 430px;
-	position: absolute;
-	}
-#controls
-	{
-	font-size: 14px;
-	top: 0; left: 0;
-	max-height: 450px;
-	z-index: 5;
-	}
-#result
-	{
-	background-color: #d6d0d0;
-	top: 10px; left: 480px;
-	display: none;
-	z-index: 5;
-	}
-#instructions
-	{
-	position: absolute;
-	bottom: 10px;
-	left: 10px;
-	line-height: 18px;
-	z-index: 1;
-	}
-p
-	{
-//	background-color: #fff;
-	padding: 10px;
-	font-size: 14px;
-	width: 430px;
-	display: block;
-	}
-#gallery-link
-	{
-	background-color: #fff;
-	position: absolute;
-	top: 10px;
-	right: 10px;
-	padding: 10px;
-	z-index: 10;
-	}
-.error
-	{
-	color: red;
-	font-size: 20px;
-	}
-a
-	{
-	color: #b4d;
-	font-weight: bold;
-	}
-label
-	{
-	display: inline-block;
-	width: 190px;
-	padding-right: 10px;
-	text-align: right;
-	}
-input[type=text]
-	{
-	width: 100px;
-	}
-#img-url,#output-url,#img-background
-	{
-	width: 200px;
-	}
-#img-fuzz,#img-width,#img-height,#img-brightness,#img-saturation,#img-contrast,#img-hue,#img-rotate
-	{
-	width: 50px;
-	text-align: right;
-	}
-button
-	{
-	padding: 2px 5px;
-	font-size: 16px;
-	}
-#result img
-	{
-	max-width: 400px;
-	max-height: 400px;
-	}
-#output-cmd
-	{
-	font-size: 12px;
-	white-space: pre;
-	}
-.shim
-	{
-	height: 10px;
-	clear: both;
-	display: block;
-	}
-#output-url
-	{
-	width: 320px;
-	}
-#likebutton
-	{
-	position: absolute;
-	bottom: 10px;
-	right: 10px;
-	width: 350px;
-	background-color: #fff;
-	padding: 10px;
-	color: #ddd;
-	font-family: trebuchet ms, sans-serif;
-	}
-</style>
-<body>
-<div id="controls">
-<p>
-	<label>IMAGE URL</label>
-	<input type="text" id="img-url" />
-	<br/>
-
-
-	<label>define a width</label>
-	<input type="text" id="img-width" /><small>px</small>
-	<br/>
-
-	<label>define a height</label>
-	<input type="text" id="img-height" /><small>px</small>
-	<br/>
-
-	<span class="shim"></span>
-
-	<label>first color</label>
-	<input type="text" id="first-color" value="" />
-	<br/>
-
-	<label>second color</label>
-	<input type="text" id="second-color" value="" />
-	<br/>
-
-	<span class="shim"></span>
-
-
-	<label>brightness <small>(0-200)</small></label>
-	<input type="text" id="img-brightness" value="" />
-	<br/>
-
-<!--
-	<label>contrast <small>(0-200)</small></label>
-	<input type="text" id="img-contrast" value="" />
-	<br/>
--->
-
-	<span class="shim"></span>
-
-	<label>flip horizontally?</label>
-	<input type="checkbox" id="img-flop" value="1" />
-	<br/>
-
-	<label>flip vertically?</label>
-	<input type="checkbox" id="img-flip" value="1" />
-	<br/>
-
-	<label>rotate <small>(0-360)</small></label>
-	<input type="text" id="img-rotate" value="" />&deg;
-	<br/>
-
-	<label>gradient type</label>
-	<select id="gradient-type">
-		<option selected="selected">Over</option>
-		<option>ATop</option>
-		<option>Dst_Over</option>
-		<option>Dst_In</option>
-		<option>Dst_Out</option>
-		<option>Multiply</option>
-		<option>Screen</option>
-		<option>Divide</option>
-		<option>Plus</option>
-		<option>Difference</option>
-		<option>Exclusion</option>
-		<option>Lighten</option>
-		<option>Darken</option>
-		<option>Overlay</option>
-		<option>Hard_Light</option>
-		<option>Soft_Light</option>
-		<option>Pegtop_Light</option>
-		<option>Linear_Light</option>
-		<option>Vivid_Light</option>
-		<option>Pin_Light</option>
-		<option>Linear_Dodge</option>
-		<option>Linear_Burn</option>
-		<option>Color_Dodge</option>
-		<option>Color_Burn</option>
-	</select>
-
-	<label>output format</label>
-	<select id="img-format">
-		<option selected="selected">gif</option>
-		<option>jpg</option>
-		<option>png</option>
-	</select>
--->
-
-	<span class="shim"></span>
-
-	<label>your name</label>
-	<input type="text" id="img-name" />
-	<br/>
-
-	<span class="shim"></span>
-
-	<label>&nbsp;</label>
-	<button id="img-generate">GENERATE</button>
-</p>
-
-	<span class="shim"></span>
-	<p>
-	See what people are making &rarr; <a href="/im/gallery/">Image Gallery</a><br/>
-	<span class="shim"></span>
-	Some really cool photoblasts &rarr; <a href="http://photoblaster.tumblr.com/">Photoblaster Tumblr</a>
-	</p>
-<br>
-	<p>
-	<span class="shim"></span>
-	Go back to the editor &rarr; <a href"/im/">Photoblaster Editor</a></br>
-</div>
-
-
-<div id="result">
-	&rarr; <input type="text" id="output-url"/><br/>
-	<span id="output-cmd"></span><br/>
-
-	<img id="output-img" />
-</div>
-
-<div id="instructions">
-	<p>
-	Define a width and height, and choose colors for the gradient. You can also choose the gradient style.
-	<span class="shim"></span>
-	Specify colors using hex codes, or consult the list of <a href="colors.html" target="_blank">Color Names</a>.
-	</p>
-</div>
-
-<div id="likebutton"> 
-<div id="fb-root" style="background-color: transparent;"></div><script src="http://connect.facebook.net/en_US/all.js#appId=236917449658413&amp;xfbml=1"></script><fb:like href="http://asdf.us/im/" send="false" width="347" show_faces="true" colorscheme="light" font="" style="background-color: transparent;"></fb:like> 
-</div> 
-
-</body>
-<script type="text/javascript" src="/js/jquery.js"></script>
-<script type="text/javascript">
-var Main =
-	{
-	API_HEADER: "#@im",
-	enter: function (e)
-		{
-		if (e.keyCode === 13)
-			Main.go()
-		},
-	go: function ()
-		{
-		$("#output-cmd").html('generating...').show()
-		$("#result").show()
-		var data =
-			{
-			url: $("#img-url").val(),
-			transparent: $('#img-transparent:checked').val() !== undefined ? "true" : "false",
-			flip: $('#img-flip:checked').val() !== undefined ? "true" : "false",
-			flop: $('#img-flop:checked').val() !== undefined ? "true" : "false",
-			rotate: $("#img-rotate").val(),
-			subtract: $("#img-subtract").val(),
-			fuzz: $("#img-fuzz").val(),
-			width: $("#img-width").val(),
-			height: $("#img-height").val(),
-			black: $("#img-black").val(),
-			white: $("#img-white").val(),
-			brightness: $("#img-brightness").val(),
-			saturation: $("#img-saturation").val(),
-			hue: $("#img-hue").val(),
-			contrast: $("#img-contrast").val(),
-			background: $("#img-background").val(),
-			// merge_early: $('#img-merge_early:checked').val() !== undefined ? "true" : "false",
-			compose: $('#img-compose :selected').text(),
-			// tile: $('#img-tile:checked').val() !== undefined ? "true" : "false",
-			format: $('#img-format :selected').text(),
-			name: $("#img-name").val(),
-			}
-		if (data.name.length > 0)
-			document.cookie = "imname="+data.name+";path=/;domain=.asdf.us;max-age=1086400"
-		$.post("/cgi-bin/im/generate", data, Main.callback)
-		},
-	error: function (s)
-		{
-		$("#output-cmd").html("<span class='error'>ERROR: " + s + "</span>").show()
-		$("#output-url").hide()
-		$("#output-img").hide()
-		},
-	callback: function (raw)
-		{
-		lines = raw.split("\n")
-		if (lines[0] !== Main.API_HEADER)
-			return Main.error("problem loading API")
-		if (lines[1].indexOf("ERROR\t") === 0)
-			return Main.error(lines[1].split("\t")[1])
-
-		// $("#output-cmd").html(lines[1]+"<br/>"+lines[2])
-		// $("#output-cmd").hide()
-		$("#output-cmd").html("size: "+Main.filesize(lines[4])+"<br/>"+(lines[5].replace(" ", " x ").replace(/'/g,"").replace(',',"")))
-		$("#output-url").val(lines[3])
-		$("#output-img").hide().attr("src", lines[3]).fadeIn(700)
-		},
-	filesize: function (size)
-		{
-		if (size < 1024)
-			return size + " bytes"
-		if (size < 1024 * 1024)
-			return Math.floor (size/1024) + " KB"
-		else
-			return Math.floor (size/(1024*1024)) + " MB"
-		},
-	cookie: function ()
-		{
-		if (document.cookie)
-			{
-			var cookies = document.cookie.split(";")
-			for (i in cookies)
-				{
-				var cookie = cookies[i].split("=")
-				if (cookie[0].indexOf("imname") !== -1)
-					{
-					if (cookie[1] !== 'false' && cookie[1] !== 'undefined' && cookie[1].length)
-						{
-						return cookie[1]
-						}
-					}
-				}
-			}
-		return ""
-		},
-	init: function ()
-		{
-		var name = Main.cookie ()
-		$("#img-name").val(name)
-		$("#img-generate").bind("click", Main.go)
-		$("div input[type=text]").bind("keydown", Main.enter)
-		},
-	}
-Main.init ()
-</script>
-</html>
-
diff --git a/share/frontend/im/index.html b/share/frontend/im/index.html
index 9a14e27..c19770f 100755
--- a/share/frontend/im/index.html
+++ b/share/frontend/im/index.html
@@ -373,10 +373,11 @@ div#controls, span#userlink {
 	<span class="shim"></span>
 	<p>
   <img src="new.gif" width="32" height="16" />
-  Mess around with heightmaps and textures <a href="/imlandscape">Landscape</a> 
+  Draw color codes &rarr; <a href="/ascii/">Ascii</a> 
 	<span class="shim"></span>
-  <img src="new.gif" width="32" height="16" />
-  Overlay patterns onto your gifs <a href="/impattern">pattern</a> 
+  Mess around with heightmaps and textures &rarr; <a href="/imlandscape">ImLandscape</a> 
+	<span class="shim"></span>
+  Overlay patterns onto your gifs &rarr; <a href="/impattern">ImPattern</a> 
 	<span class="shim"></span>
   Write your own effects &rarr; <a href="/shader/">Shaderblaster</a> &amp; <a href="/dither/">Dither</a>
 	<span class="shim"></span>
@@ -474,10 +475,8 @@ var Main =
 		$("#output-url").hide()
 		$("#output-img").hide()
 		},
-	callback: function (raw)
+	callback: function (data)
 		{
-    data = JSON.parse(raw)
-    console.log(data)
 		Main.generating = false
 		$("#output-cmd").html("size: "+Main.filesize(data.size)+"<br/>"
       + data.width + " x " + data.height);
diff --git a/share/frontend/im/index_old.html b/share/frontend/im/index_old.html
new file mode 100755
index 0000000..bf88a3b
--- /dev/null
+++ b/share/frontend/im/index_old.html
@@ -0,0 +1,573 @@
+<!doctype html>
+<html>
+<head>
+<title>PHOTOBLASTER</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
+<meta property="og:title" content="PHOTOBLASTER"/> 
+<meta property="og:type" content="website"/> 
+<meta property="og:url" content="http://asdf.us/im/"/> 
+<meta property="og:image" content="http://asdf.us/im/6e/sparklebling1_1310021111_1310071704.gif" />
+<meta property="og:site_name" content="asdf.us"/> 
+<meta property="og:description" content="Paste a link into the first box, then use the other settings to colorize, distort, add transparency and a background."/> 
+<meta property="fb:admins" content="100001923956223,1709246"/>
+<!--FOR THE COLORS IFRAME-->
+<link rel="stylesheet" type="text/css" href="/im/colors/css/jquery.fancybox.css?v=2.1.5" media="screen" />
+
+<style type="text/css">
+*
+	{
+	padding: 0;
+	margin: 0;
+	font-family: sans-serif;
+	}
+body
+	{
+	background-color: #efedee;
+	// background-color: #838388;
+	color: #555;
+	}
+#down_for_maintenance{
+  position: absolute;
+  background: url("http://asdf.us/impattern/patterns/38.png");
+  z-index:2000;
+  height: 100%;
+  width: 100%;
+  top: 0;
+  left:0;
+  display: none;
+}
+#down_for_maintenance > span{
+  background: white;
+}
+#controls,#result
+	{
+	display: inline-block;
+	margin: 10px;
+	width: 430px;
+	float: left;
+	}
+#controls
+	{
+	font-size: 14px;
+	top: 0; left: 0;
+	z-index: 5;
+	}
+#result
+	{
+	background-color: #d6d0d0;
+//	background-color: #131412;
+	margin-left: 20px;
+	padding: 10px;
+	display: none;
+	z-index: 5;
+	}
+#sendtoinput
+	{
+	font-size: 10px; 
+	}
+#instructions
+	{
+	position: absolute;
+	bottom: 10px;
+	left: 10px;
+	line-height: 18px;
+	z-index: 1;
+	}
+p,form
+	{
+//	background-color: #010101;
+	background-color: #fff;
+	background-image: url(imcupbg.jpg);
+	background-position: center center;
+	padding: 10px;
+	font-size: 14px;
+	width: 430px;
+	display: block;
+	}
+#gallery-link
+	{
+	background-color: #fff;
+	background-image: url(imcupbg.jpg);
+	background-position: center center;
+	position: absolute;
+	top: 10px;
+	right: 10px;
+	padding: 10px;
+	z-index: 10;
+	}
+.error
+	{
+	color: red;
+	font-size: 20px;
+	}
+a
+	{
+//	color: #b4d;
+	color: #a39;
+	font-weight: bold;
+	}
+label
+	{
+	display: inline-block;
+	width: 190px;
+	padding-right: 10px;
+	text-align: right;
+	}
+small
+	{
+	color: #777;
+	}
+input[type=text]
+	{
+	width: 100px;
+	}
+#img-url,#output-url,#img-background
+	{
+	width: 200px;
+	}
+#bgswitcheroo, #colorswitcheroo
+  {
+  width: 19px;
+  height:38px;
+  display: inline-block;
+  position: absolute;
+  background-image: url(http://i.asdf.us/im/7e/user_convo_1353562627_1355449919.png);
+  //background-image: url( http://i.asdf.us/im/7b/user_convo_1353562627.png); 
+  background-repeat:no-repeat;
+  background-position: 3px 10px;
+  cursor: pointer;
+  }
+#img-fuzz,#img-width,#img-height,#img-brightness,#img-saturation,#img-contrast,#img-hue,#img-rotate
+	{
+	width: 50px;
+	text-align: right;
+	}
+button
+	{
+	padding: 2px 5px;
+	font-size: 16px;
+	}
+#result img
+	{
+	max-width: 400px;
+	max-height: 400px;
+	}
+#output-cmd
+	{
+	font-size: 12px;
+	white-space: pre;
+	}
+.shim
+	{
+	height: 10px;
+	clear: both;
+	display: block;
+	}
+#output-url
+	{
+	width: 320px;
+	}
+#likebutton
+	{
+  display: none;
+	position: absolute;
+	bottom: 10px;
+	right: 10px;
+	width: 350px;
+	background-color: #fff;
+	background-image: url(imcupbg.jpg);
+	padding: 10px;
+	color: #ddd;
+	font-family: trebuchet ms, sans-serif;
+	}
+div#controls, span#userlink {
+  display: none;
+} span#userlink a {
+  text-transform: capitalize;
+}
+</style>
+
+</head>
+<body>
+<div id="down_for_maintenance">
+  <span>SORRY, this photoblaster page is down for maintenance. Will be back in an hour or so...</span>
+</div>
+<div id="controls">
+<form id="imform" action="javascript:return false">
+	<label id="img-url-label">IMAGE URL</label>
+	<input type="text" id="img-url" /><div id="bgswitcheroo"></div>
+	<!--<br/>-->
+	<label id="background-url-label">background URL</label>
+	<input type="text" id="img-background" value="" />
+	<br/>
+
+	<label>compose operator</label>
+	<select id="img-compose">
+		<option selected="selected">Over</option>
+		<option>ATop</option>
+		<option>Dst_Over</option>
+		<option>Dst_In</option>
+		<option>Dst_Out</option>
+		<option>Multiply</option>
+		<option>Screen</option>
+		<option>Divide</option>
+		<option>Plus</option>
+		<option>Difference</option>
+		<option>Exclusion</option>
+		<option>Lighten</option>
+		<option>Darken</option>
+		<option>Overlay</option>
+		<option>Hard_Light</option>
+		<option>Soft_Light</option>
+		<option>Pegtop_Light</option>
+		<option>Linear_Light</option>
+		<option>Vivid_Light</option>
+		<option>Pin_Light</option>
+		<option>Linear_Dodge</option>
+		<option>Linear_Burn</option>
+		<option>Color_Dodge</option>
+		<option>Color_Burn</option>
+	</select>
+	<br/>
+
+	<label>gravity</label>
+	<select id="img-gravity">
+		<option selected="selected">Center</option>
+		<option>East</option>
+		<option>NorthEast</option>
+		<option>North</option>
+		<option>NorthWest</option>
+		<option>West</option>
+		<option>SouthWest</option>
+		<option>South</option>
+		<option>SouthEast</option>
+	</select>
+<!--  <br>
+	<label>tile foreground?</label>
+		
+	<input type="checkbox" id="img-tile" value="1" />
+	<br/> -->
+
+<!--
+	<label>merge before recolor?</label>
+	<input type="checkbox" id="img-merge_early" value="1" />
+	<br/>
+
+-->
+	<span class="shim"></span>
+
+
+	<span class="shim"></span>
+
+	<label>make semi-transparent?</label>
+	<input type="checkbox" id="img-transparent" value="1" checked="true" />
+	<br/>
+
+	<label>remove color</label>
+	<input type="text" id="img-subtract" value="white" class="img-subtract"/>&nbsp;
+<a href="colors/" class="img-subtract pick-color">pick color</a>
+	<br/>
+
+	<label>transparency fuzz</label>
+	<input type="text" id="img-fuzz" value="5" />%
+	<br/>
+
+	<span class="shim"></span>
+
+	<label>resize width</label>
+	<input type="text" id="img-width" /><small>px</small>
+	<br/>
+
+	<label>resize height</label>
+	<input type="text" id="img-height" /><small>px</small>
+	<br/>
+
+	<label>nearest neighbor?</label>
+	<input type="checkbox" id="img-nearest" value="1" />
+	<br/>
+
+	<span class="shim"></span>
+
+	<label>recolor white</label>
+	<input type="text" id="img-white" class="img-white" value="white" />&nbsp;
+<a href="colors/" class="img-white pick-color">pick color</a>
+	<div id="colorswitcheroo"></div>
+	<br/>
+
+	<label>recolor black</label>
+	<input type="text" id="img-black" class="img-black" value="black" />&nbsp;
+<a href="colors/" class="img-black pick-color">pick color</a>
+	<br />
+<!--	<label><a href="colors/index.html" target="_blank" style="font-size: 10px">-->
+<!--	List of Color Names</a></label>-->
+
+	<span class="shim"></span>
+
+	<label>hue <small>(0-200)</small></label>
+	<input type="text" id="img-hue" value="" />
+	<br/>
+<!--
+	<label>saturation <small>(0-200)</small></label>
+	<input type="text" id="img-saturation" value="" />
+	<br/>
+-->
+<!--
+	<label>brightness <small>(0-200)</small></label>
+	<input type="text" id="img-brightness" value="" />
+	<br/>
+-->
+<!--
+	<label>contrast <small>(0-200)</small></label>
+	<input type="text" id="img-contrast" value="" />
+	<br/>
+-->
+
+	<span class="shim"></span>
+
+	<label>flip horizontally?</label>
+	<input type="checkbox" id="img-flop" value="1" />
+	<br/>
+
+	<label>flip vertically?</label>
+	<input type="checkbox" id="img-flip" value="1" />
+	<br/>
+
+	<label>rotate <small>(0-360)</small></label>
+	<input type="text" id="img-rotate" value="" />&deg;
+	<br/>
+
+	<span class="shim"></span>
+
+	<label>output format</label>
+	<select id="img-format">
+		<option selected="selected">gif</option>
+		<option>jpg</option>
+		<option>png</option>
+	</select>
+<!--
+	<span id="gif-options">
+		<label>dispose</label>
+		<select id="dispose">
+			<option value="none" selected>None</option>
+			<option value="previous">Previous</option>
+			<option value="background">Background</option>
+		</select>
+	</span>
+-->
+
+ <!-- <input type="reset" id="reset-button" value="reset-button"></input>-->
+
+	<span class="shim"></span>
+
+	<label>put your name here &gt;&gt;&gt;</label>
+	<input type="text" id="img-name" value="" />
+	<br/>
+
+	<span class="shim"></span>
+
+	<label>&nbsp;</label>
+	<button id="img-generate">GENERATE</button>
+
+ </form>
+
+	<span class="shim"></span>
+	<p>
+  <img src="new.gif" width="32" height="16" />
+  Mess around with heightmaps and textures <a href="/imlandscape">Landscape</a> 
+	<span class="shim"></span>
+  <img src="new.gif" width="32" height="16" />
+  Overlay patterns onto your gifs <a href="/impattern">pattern</a> 
+	<span class="shim"></span>
+  Write your own effects &rarr; <a href="/shader/">Shaderblaster</a> &amp; <a href="/dither/">Dither</a>
+	<span class="shim"></span>
+  Oh now it's on....payback time &rarr; <a href="/imbreak/">FOTO FUCKER</a>
+	<span class="shim"></span>
+  <!--<img src="new.gif" width="32" height="16" />-->
+  Transform images in 3D &rarr; <a href="/imgrid/">Grid Generator</a>
+	<span class="shim"></span>
+  Gradients make everything better &rarr; <a href="/imgradient/">Gradient Generator</a>
+	</p>
+	<span class="shim"></span>
+	<p>
+	See what people are making &rarr; <a href="/im/gallery/">Image Gallery</a><br/>
+	<span class="shim"></span>
+	The best ones go here &rarr; <a href="http://photoblaster.tumblr.com/">Photoblaster Tumblr</a>
+	<span class="shim"></span>
+	View a random selection &rarr; <a href="/im/gallery/?random=1">Random Gallery</a><br/>
+  <span id="userlink">
+  	<span class="shim"></span>
+  	Things you've made &rarr; <a href="/im/gallery/?random=1">Your Gallery</a><br/>
+  </span>
+	</p>
+</div>
+
+<div id="result">
+	&rarr; <input type="text" id="output-url"/><br/>
+	<span id="output-cmd"></span><br/>
+
+	<img id="output-img" />
+	<br/><span id="sendtoinput"></span>
+</div>
+
+<!--
+<div id="likebutton"> 
+<div id="fb-root" style="background-color: transparent;"></div><script src="http://connect.facebook.net/en_US/all.js#appId=236917449658413&amp;xfbml=1"></script><fb:like href="http://asdf.us/im/" send="false" width="347" show_faces="true" colorscheme="light" font="" style="background-color: transparent;"></fb:like>
+</div> 
+-->
+
+<script type="text/javascript" src="/js/jquery.js"></script>
+<script type="text/javascript">
+var Main =
+	{
+	API_HEADER: "#@im",
+	generating: false,
+	enter: function (e)
+		{
+		if (Main.generating)
+			return
+		if (e.keyCode === 13)
+			Main.go()
+		},
+	go: function ()
+		{
+		if (Main.generating)
+			return
+		Main.generating = true
+		$("#output-cmd").html('generating...').show()
+		$("#result").show()
+		var data =
+			{
+			url: $("#img-url").val(),
+			transparent: $('#img-transparent:checked').val() !== undefined ? "true" : "false",
+			flip: $('#img-flip:checked').val() !== undefined ? "true" : "false",
+			flop: $('#img-flop:checked').val() !== undefined ? "true" : "false",
+			nearest: $('#img-nearest:checked').val() !== undefined ? "true" : "false",
+			rotate: $("#img-rotate").val(),
+			subtract: $("#img-subtract").val(),
+			fuzz: $("#img-fuzz").val(),
+			width: $("#img-width").val(),
+			height: $("#img-height").val(),
+			black: $("#img-black").val(),
+			white: $("#img-white").val(),
+			//brightness: $("#img-brightness").val(),
+			//saturation: $("#img-saturation").val(),
+			hue: $("#img-hue").val(),
+			contrast: $("#img-contrast").val(),
+			background: $("#img-background").val(),
+			// merge_early: $('#img-merge_early:checked').val() !== undefined ? "true" : "false",
+			compose: $('#img-compose :selected').text(),
+			gravity: $('#img-gravity :selected').text(),
+			// tile: $('#img-tile:checked').val() !== undefined ? "true" : "false",
+			format: $('#img-format :selected').text(),
+			dispose: $('#dispose').val(),
+			name: $("#img-name").val(),
+			}
+		if (data.rotate.match(/-/)){ data.rotate=360-parseInt(data.rotate.replace("-","")); };
+		$("#img-rotate").val("");
+		if (data.name.length > 0)
+			document.cookie = "imname="+data.name+";path=/;domain=.asdf.us;max-age=1086400"
+		$.post("/cgi-bin/im/generate", data, Main.callback)
+		},
+	error: function (s)
+		{
+		$("#output-cmd").html("<span class='error'>ERROR: " + s + "</span>").show()
+		$("#output-url").hide()
+		$("#output-img").hide()
+		},
+	callback: function (raw)
+		{
+		Main.generating = false
+		lines = raw.split("\n")
+		if (lines[0] !== Main.API_HEADER)
+			return Main.error("problem loading API")
+		if (lines[1].indexOf("ERROR\t") === 0)
+			return Main.error(lines[1].split("\t")[1])
+
+		// $("#output-cmd").html(lines[1]+"<br/>"+lines[2])
+		// $("#output-cmd").hide()
+		$("#output-cmd").html("size: "+Main.filesize(lines[4])+"<br/>"+(lines[5].replace(" ", " x ").replace(/'/g,"").replace(',',"")))
+		$("#output-url").val(lines[3]);
+		$("#output-img").hide().attr("src", lines[3]).fadeIn(700)
+		$("#sendtoinput").html("&nbsp;send to input <img src=\"arrow_pointing_left.png\"/>&nbsp;").css({"border": "1px solid gray", "cursor" : "pointer"}).click(function(){
+			$("#img-url").val(lines[3]);
+		});
+		
+		},
+	filesize: function (size)
+		{
+		if (size < 1024)
+			return size + " bytes"
+		if (size < 1024 * 1024)
+			return Math.floor (size/1024) + " KB"
+		else
+			return Math.floor (size/(1024*1024)) + " MB"
+		},
+	cookie: function ()
+		{
+		if (document.cookie)
+			{
+			var cookies = document.cookie.split(";")
+			for (i in cookies)
+				{
+				var cookie = cookies[i].split("=")
+				if (cookie[0].indexOf("imname") !== -1)
+					{
+					if (cookie[1] !== 'false' && cookie[1] !== 'undefined' && cookie[1].length)
+						{
+						return cookie[1]
+						}
+					}
+				}
+			}
+		return ""
+		},
+	preloadSize: function(url,label,tag){
+		console.log(url)
+		var img = new Image()
+		img.onload = function(){ $(label).html( tag + ": " + img.naturalWidth + " x " + img.naturalHeight ) }
+		img.src = url
+	},
+	init: function ()
+		{
+		var name = Main.cookie ()
+		$("#img-name").val(name)
+    if (name)
+      {
+      $("#userlink").show()
+      $("#userlink a").attr("href", "/im/gallery/?name="+name).html(name+"'s photoblasts")
+      }
+    $("#likebutton,#controls").fadeIn(0)
+		$("#img-generate").bind("click", Main.go)
+		$("div input[type=text]").bind("keydown", Main.enter)
+		$("#img-url").change(function(){Main.preloadSize(this.value,"#img-url-label","image")})
+		$("#img-background").change(function(){Main.preloadSize(this.value,"#background-url-label","bg")})
+		$("#bgswitcheroo").click(function() {
+		    a = $("#img-url").val();
+	    	    b = $("#img-background").val();
+		    $("#img-url").val(b);
+	    	    $("#img-background").val(a);
+		  });
+		$("#colorswitcheroo").click(function() {
+		    a = $("#img-white").val();
+	    	    b = $("#img-black").val();
+		    $("#img-white").val(b);
+	            $("#img-black").val(a);
+		  });
+		$("#img-format").change(function(){
+			$("#gif-options").css( "visibility",  $("#img-format").val() === "gif" ? "visible" : "hidden")
+		})
+
+		},
+	}
+document.getElementById('imform').reset();
+Main.init ()
+</script>
+<script type="text/javascript" src="http://asdf.us/js/pbembed.js"></script>
+<!--for the colors iframe-->
+<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>
+<script type="text/javascript" src="colors_iframe.js"></script>
+</body>
+</html>
+
diff --git a/share/frontend/imgrid/js/jquery-ui-1.8.16.custom.min.js b/share/frontend/im/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/im/jquery-ui-1.8.16.custom.min.js
diff --git a/share/frontend/imbreak/img/_broken_by_janie_147_greeks.gif b/share/frontend/imbreak/_broken_by_janie_147_greeks.gif
index e5c4ddb..e5c4ddb 100755
--- a/share/frontend/imbreak/img/_broken_by_janie_147_greeks.gif
+++ b/share/frontend/imbreak/_broken_by_janie_147_greeks.gif
diff --git a/share/frontend/imbreak/img/_broken_by_janie_16b_justhost_155x75.gif b/share/frontend/imbreak/_broken_by_janie_16b_justhost_155x75.gif
index 5b7144d..5b7144d 100755
--- a/share/frontend/imbreak/img/_broken_by_janie_16b_justhost_155x75.gif
+++ b/share/frontend/imbreak/_broken_by_janie_16b_justhost_155x75.gif
diff --git a/share/frontend/imbreak/img/_broken_by_janie_399_a_pair_of_siena_and_carved_white_marble_columns_20th_century_d5409361h.jpg b/share/frontend/imbreak/_broken_by_janie_399_a_pair_of_siena_and_carved_white_marble_columns_20th_century_d5409361h.jpg
index d6dd790..d6dd790 100755
--- a/share/frontend/imbreak/img/_broken_by_janie_399_a_pair_of_siena_and_carved_white_marble_columns_20th_century_d5409361h.jpg
+++ b/share/frontend/imbreak/_broken_by_janie_399_a_pair_of_siena_and_carved_white_marble_columns_20th_century_d5409361h.jpg
diff --git a/share/frontend/imbreak/img/columns.jpg b/share/frontend/imbreak/columns.jpg
index d6dd790..d6dd790 100755
--- a/share/frontend/imbreak/img/columns.jpg
+++ b/share/frontend/imbreak/columns.jpg
diff --git a/share/frontend/imbreak/img/firstlogo.gif b/share/frontend/imbreak/firstlogo.gif
index 5762688..5762688 100755
--- a/share/frontend/imbreak/img/firstlogo.gif
+++ b/share/frontend/imbreak/firstlogo.gif
diff --git a/share/frontend/imbreak/img/generating.gif b/share/frontend/imbreak/generating.gif
index 441abe7..441abe7 100755
--- a/share/frontend/imbreak/img/generating.gif
+++ b/share/frontend/imbreak/generating.gif
diff --git a/share/frontend/imbreak/img/greeks.gif b/share/frontend/imbreak/greeks.gif
index f676210..f676210 100755
--- a/share/frontend/imbreak/img/greeks.gif
+++ b/share/frontend/imbreak/greeks.gif
diff --git a/share/frontend/imbreak/img/ALPHA20IVY20201_1323328300.gif b/share/frontend/imbreak/img/ALPHA20IVY20201_1323328300.gif
deleted file mode 100644
index 710ef2e..0000000
--- a/share/frontend/imbreak/img/ALPHA20IVY20201_1323328300.gif
+++ /dev/null
diff --git a/share/frontend/imbreak/img/imgrid_1328137237_ivy_pepper.gif b/share/frontend/imbreak/img/imgrid_1328137237_ivy_pepper.gif
deleted file mode 100644
index 8cd7316..0000000
--- a/share/frontend/imbreak/img/imgrid_1328137237_ivy_pepper.gif
+++ /dev/null
diff --git a/share/frontend/imbreak/index.html b/share/frontend/imbreak/index.html
index b84a5f3..88d0c6b 100755
--- a/share/frontend/imbreak/index.html
+++ b/share/frontend/imbreak/index.html
@@ -42,7 +42,7 @@ by pepper
 body
 	{
 	font-size:11px;
-	background-image:url(img/_broken_by_janie_30e_semitrans1.png);
+	background-image:url(_broken_by_janie_30e_semitrans1.png);
 	overflow:hidden;
 	}
 #header
@@ -172,14 +172,14 @@ body
 	<span style="background-color:rgba(245,245,245,0.7)">An image breaking utility from PHOTOBLASTER, this program breaks images
 	<br>and then restores them to an unbroken state so that they can be used for further editing.<br></span>
 <p>
-	<li id="ivy" style="background-image:url(img/ivy.gif);">
-	<img id="firstlogo" src="img/firstlogo.gif"></img>
-	<img id="mainlogo" src="img/newmain.gif"></img>
-	<img id="secondlogo" src="img/on9TF_1322970909_1322970984_1323325278.gif"></img>
+	<li id="ivy" style="background-image:url(ivy.gif);">
+	<img id="firstlogo" src="firstlogo.gif"></img>
+	<img id="mainlogo" src="newmain.gif"></img>
+	<img id="secondlogo" src="on9TF_1322970909_1322970984_1323325278.gif"></img>
 </li>
-<li style="display:inline; background-image:url(img/imgrid_1328137237_ivy_pepper.gif)"></li>
+<li style="display:inline; background-image:url(http://i.asdf.us/im/63/imgrid_1328137237_ivy_pepper.gif)"></li>
 </p>
-<p style="background-image:url(img/ALPHA20IVY20201_1323328300.gif)">
+<p style="background-image:url(http://asdf.us/im/54/ALPHA20IVY20201_1323328300.gif)">
 	
 </p>
 </div>
@@ -243,7 +243,7 @@ BREAK ANGLE:&nbsp;<input id='breakangle' type='text' value='0'></input>
 	<div id="output-info" class='results'></div>
 </div>
 <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
-<script type="text/javascript" src="js/jquery-ui.min.js"></script>
+<script type="text/javascript" src="jquery-ui.min.js"></script>
 <script type="text/javascript">
 function clearcopyright(){
 $('#copyright').html("");
@@ -264,7 +264,7 @@ $( "#breakangleslider" ).slider({
     $( "#breakangle" ).val($( "#breakangleslider" ).slider( "value" ) );
 });
 </script>
-<script type="text/javascript" src="js/imbreak-main.js"></script>
+<script type="text/javascript" src="main.js"></script>
 
 <script type="text/javascript" src="http://asdf.us/js/pbembed.js"></script>
 </body>
diff --git a/share/frontend/imbreak/img/ivy.gif b/share/frontend/imbreak/ivy.gif
index b51faca..b51faca 100755
--- a/share/frontend/imbreak/img/ivy.gif
+++ b/share/frontend/imbreak/ivy.gif
diff --git a/share/frontend/imbreak/img/ivy2.gif b/share/frontend/imbreak/ivy2.gif
index 710ef2e..710ef2e 100755
--- a/share/frontend/imbreak/img/ivy2.gif
+++ b/share/frontend/imbreak/ivy2.gif
diff --git a/share/frontend/imbreak/js/jcookie.js b/share/frontend/imbreak/jcookie.js
index ee84737..ee84737 100755
--- a/share/frontend/imbreak/js/jcookie.js
+++ b/share/frontend/imbreak/jcookie.js
diff --git a/share/frontend/imbreak/js/jquery-ui.min.js b/share/frontend/imbreak/jquery-ui.min.js
index 0202506..0202506 100755
--- a/share/frontend/imbreak/js/jquery-ui.min.js
+++ b/share/frontend/imbreak/jquery-ui.min.js
diff --git a/share/frontend/imbreak/js/jquery.cookie.js b/share/frontend/imbreak/jquery.cookie.js
index 6036754..6036754 100755
--- a/share/frontend/imbreak/js/jquery.cookie.js
+++ b/share/frontend/imbreak/jquery.cookie.js
diff --git a/share/frontend/imbreak/js/jquery.min.js b/share/frontend/imbreak/jquery.min.js
index 198b3ff..198b3ff 100755
--- a/share/frontend/imbreak/js/jquery.min.js
+++ b/share/frontend/imbreak/jquery.min.js
diff --git a/share/frontend/imbreak/js/imbreak-main.js b/share/frontend/imbreak/main.js
index c56c9a2..75f82d0 100755
--- a/share/frontend/imbreak/js/imbreak-main.js
+++ b/share/frontend/imbreak/main.js
@@ -29,7 +29,7 @@ var Main =
 			breakangle: $("#breakangle").val(),
 			url: $('#url').val(),
 			username: $('#username').val(),
-			firsttime: Main.firsttime.toString()
+//			firsttime: Main.firsttime.toString()
 			}
 		if (data["breakmode"] == "gradual")
 				{
@@ -49,7 +49,20 @@ var Main =
 		$('#error').append(thestring);
 		if (data.username.length > 0)
 		document.cookie = "imname="+data.username+";path=/;domain=.asdf.us;max-age=1086400"
-		$.post("/im/api/imbreak", data, Main.callback)
+		var request = $.ajax({
+      type: "POST", 
+      url: "/im/api/imbreak",
+      data: data, 
+      dataType: "json"
+
+    })
+    request.done(function(data){
+      Main.callback(data)
+    })
+    request.fail(function(){
+      Main.error("The image became too broken!");
+      Main.generating = false
+    });
 		},
 	error: function (s)
 		{
@@ -68,7 +81,6 @@ var Main =
 		},
 	callback: function (data)
 		{
-    data = JSON.parse(data)
 		$('#error').append('called');
 		$("#output-cmd").html('')
 		$('#output-url').val(data.url)
diff --git a/share/frontend/imbreak/img/newmain.gif b/share/frontend/imbreak/newmain.gif
index 8eb7e73..8eb7e73 100755
--- a/share/frontend/imbreak/img/newmain.gif
+++ b/share/frontend/imbreak/newmain.gif
diff --git a/share/frontend/imbreak/img/og.jpg b/share/frontend/imbreak/og.jpg
index d6dd790..d6dd790 100755
--- a/share/frontend/imbreak/img/og.jpg
+++ b/share/frontend/imbreak/og.jpg
diff --git a/share/frontend/imbreak/img/on9TF_1322970909_1322970984_1323325278.gif b/share/frontend/imbreak/on9TF_1322970909_1322970984_1323325278.gif
index 8e19e59..8e19e59 100755
--- a/share/frontend/imbreak/img/on9TF_1322970909_1322970984_1323325278.gif
+++ b/share/frontend/imbreak/on9TF_1322970909_1322970984_1323325278.gif
diff --git a/share/frontend/imbreak/img/title1.gif b/share/frontend/imbreak/title1.gif
index 206723a..206723a 100755
--- a/share/frontend/imbreak/img/title1.gif
+++ b/share/frontend/imbreak/title1.gif
diff --git a/share/frontend/imbreak/ultimate.html b/share/frontend/imbreak/ultimate.html
new file mode 100755
index 0000000..2e51cdd
--- /dev/null
+++ b/share/frontend/imbreak/ultimate.html
@@ -0,0 +1,215 @@
+<html>
+<!--
+        *                                                       *
+       ***                                                     ***
+       ****                                                   ****
+       *   ******                                       ******   *
+       *         ***************************************         *
+        **            *       ______*______       *            **
+          *****      *        ______*______        *      *****
+               *******        ______*______        *******
+            ***       ****          *         ****        ***
+                ****** *oo*******  ***  *******oo* ******
+                     *   *o********* *********o*   *
+                      *   *                   *   *
+                       *   *   _         _   *   *
+                        *   *  -_       _-  *   *
+                         *  *   -_     _-   *  *
+                          * *     -___-     * *
+                           *                 *
+                          *********************
+                          *      **   **      *
+                            *    **   **    *
+                              *  _-----_  *
+                                *********
+by pepper
+-->  
+<head>
+		<link href='jquery-ui-1.8.16.custom.css' rel='stylesheet' type='text/css' />
+		<link href='cssreset.css' rel='stylesheet' type='text/css'/>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
+<meta property="og:title" content="FOTO FUCKER"/> 
+<meta property="og:type" content="website"/> 
+<meta name=Author content="Pepper Dreamteamer"/>
+<meta property="og:url" content="http://asdf.us/imbreak/"/> 
+<meta property="og:image" content="http://asdf.us/imbreak/og.jpg" />
+<meta property="og:site_name" content="asdf.us"/> 
+<meta property="og:description" content="now it's time to get back at those photos and fuck them up"/> 
+<meta property="fb:admins" content="100001923956223,1709246"/>
+<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
+<style type='text/css'>
+body
+	{
+	font-size:11px;
+	background-image:url(_broken_by_janie_30e_semitrans1.png);
+	}
+#header
+	{
+	-moz-border-radius:14px;
+	-webkit-border-radius:14px;
+	border-radius:14px 14px 14px 14px;
+	padding:10px;
+	width: 100%;
+	background-image:url(http://asdf.us/im/88/_broken_by_janie_399_a_pair_of_siena_and_carved_white_marble_columns_20th_century_d5409361h.jpg);
+	background-color:gray;
+	}
+#header img
+	{
+	display:inline;
+	text-align:right;
+	width:200px;
+	}
+#controls
+	{
+	width:50%;
+	padding:24px;
+	background-color:#F0F0F0;
+	}
+#breakmode
+	{
+	background-color:#FAFAFA;
+	}
+#likebutton
+	{
+	background-color:#F7f7f7;
+	right:20px;
+	position:absolute;
+	bottom:10px;
+	}
+#links
+	{
+	background-color:#FFFFFF;
+	}
+#urlinput
+	{
+	width:340px;
+	font-size:11;
+	}
+.results
+	{
+	background-color:#F0F0F0;
+	display:none;
+	position:fixed;
+	width:50%;
+	right:10px;
+	top:20px;
+	z-index:100;
+	}
+#output-image
+	{
+	display:none;
+	max-height:800px;
+	max-width:500px;
+	}
+#therest
+	{
+	padding:20px;
+	}
+#links
+	{
+	padding:5px;
+	}
+.ui-slider-horizontal
+	{
+	background-color:whitesmoke;
+	}
+</style>
+</head>
+<body>
+<!--<form id="theform">-->
+<div id="header">
+	<br>
+	<span style="background-color:rgb(245,245,245,0.5)">An image breaking utility from PHOTOBLASTER, this program breaks images
+	<br>and then restores them to an unbroken state so that they can be used for further editing.<br></span>
+	<p style="background-image:url(ALPHA20IVY20204_1323327862.gif);"><img src="http://asdf.us/im/11/_broken_by_janie_147_greeks.gif"></img></p><p style="background-image:url(http://asdf.us/im/54/ALPHA20IVY20201_1323328300.gif)">
+	<img src="_broken_by_janie_147_title1.gif"></img>
+	<img src="on9TF_1322970909_1322970984_1323325278.gif"></img></p>
+<!--	<img src=" http://asdf.us/im/2f/_broken_by_anon_13c__broken_by_anon_70_enuY5.png"></img>-->
+</div>
+<br>
+<div id="controls">
+		WHY NOT <span style="font-color:#FF6A6A">PASTE A URL HERE</span>? (an image or gif animation)!! <span style="font-color:#FF6A6A">&rarr;</span>
+		<input id='url'>
+		</input>
+		<br>
+		<span id='example'>e.g. http://imageman.com/coolguy.jpg... or hotimagedudes/cooltimes.gif</span>
+		<button id='breakbutton'>BREAK IT!</button>&larr;&larr;CLICK HERE!!  KEEP CLICKING TO KEEP FUCKING IT UP!!!
+		<br>
+<!--		<button id='refreshbutton'>START OVER</button>-->
+
+BREAK TYPE:&nbsp;<select id="breaktype">
+	<option selected="selected" value='CLASSIC'>CLASSIC</option>
+	<option value="REDUX">REDUX</option>
+	<option value="BLURRY_BREAK">BLURRY BREAK</option>
+	<option value="BLURRY_BREAK_2">BLURRY BREAK 2</option>
+	<option value="RGB_WASH">RGB WASH</option>
+	<option value="RGB_WASH_2">RGB WASH 2</option>
+	<option value="NOISY_BREAK">NOISY BREAK</option>
+	<option value="BROKEN_VIGNETTE">BROKEN VIGNETTE</option>
+	<option value="FAX_MACHINE">FAX MACHINE</option>
+	<option value="STRIPES">STRIPES</option>
+	
+	<option value="PHOTOCOPY">PHOTOCOPY</option>
+</select>
+
+
+<br>
+	<div id='breakmode'>BREAK MODES:
+		<input type='radio' name='modeswitch' id='gradual' value='gradual' checked='checked'></input>gradual
+		<input type='radio' name='modeswitch' id='subtle' value='subtle'></input>subtle
+		<input type='radio' name='modeswitch' id='extreme' value='extreme'></input>extreme
+	</div>
+		<br>
+BREAK ANGLE:&nbsp;<input id='breakangle' type='text' value='0'></input>
+<div id="breakangleslider" style="display:inline-block; width: 500px; height:10px;" class="slider"></div><br>
+<div id="expanded_check"></div><!--add click event in javascript-->
+</div>
+<br>
+<span style="padding-left:5px;">enter your username: <input type='text' id='username'></input></span>
+<div id='therest'>
+
+	<div id='links'>
+		<span id='imagegallery'><a href='http://asdf.us/im/gallery'>PHOTOBLASTER IMAGE GALLERY</a></span>
+		<br>
+		<span id='backtotheeditor'><a href="http://asdf.us/im">&larr;BACK TO THE EDITOR</a></span>
+	</div>
+
+	<div id="likebutton"> 
+	<div id="fb-root" style="background-color: transparent;"></div><script src="http://connect.facebook.net/en_US/all.js#appId=236917449658413&amp;xfbml=1"></script><fb:like href="http://asdf.us/im/" send="false" width="347" show_faces="true" colorscheme="light" font="" style="background-color: transparent;"></fb:like> 
+	</div> 
+</div>
+</div>
+<!--</form>-->
+<div id='result' class='results'>
+	<span id="output-cmd" class='results'>
+</span>
+	<span id="output-img" class='results'></span>
+	<input id="output-url" class='results'></input>
+	<div id="output-info" class='results'></div>
+</div>
+<!--<div id="error" style="background-color:red;height:40px;width:400px;"></div>-->
+<span class='copyright' style="position:fixed; bottom:10px; left:320px;">COPYRIGHT 2011 PEPPER DREAMTEAMER</span>
+<script type="text/javascript" src="jquery.min.js"></script>
+<script type="text/javascript" src="jquery-ui.min.js"></script>
+<script type="text/javascript" src="main.js"></script>
+<script type="text/javascript">
+$('body').click(function(){$('#copyright').html("")});
+$(function(){
+$( "#breakangleslider" ).slider({
+      value:0,
+      min: -180,
+      max: 180,
+      step: 1,
+      slide: function( event, ui ) {
+        $( "#breakangle" ).val(ui.value);
+          }
+        });
+    $( "#breakangle" ).val($( "#breakangleslider" ).slider( "value" ) );
+});
+</script>
+
+</body>
+
+
+
+</html>
diff --git a/share/frontend/imgradient/index.html b/share/frontend/imgradient/index.html
index dd4c8f4..d42b663 100755
--- a/share/frontend/imgradient/index.html
+++ b/share/frontend/imgradient/index.html
@@ -376,10 +376,10 @@ button
 </div> 
 
 <script type="text/javascript" src="/js/jquery.js"></script>
-<script type="text/javascript" src="/js/jquery-ui-1.8.16.custom.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>
-<script type="text/javascript" src="/js/colors_iframe.js"></script>
+<script type="text/javascript" src="colors_iframe.js"></script>
 <script type="text/javascript">
 
 	$(function() {
@@ -482,13 +482,12 @@ var Main =
 		},
 	callback: function (data)
     {
-    data = JSON.parse(data) 
-    if (data.error){
-      return Main.error(data.error)
-    }
-    $("#output-cmd").html("size: "+Main.filesize(data.size)+"<br/>"+data.height + "&nbsp;x&nbsp;" + data.width)
-    $("#output-url").val(data.url)
-    $("#output-img").hide().attr("src", data.url).fadeIn(700)
+      if (data.error){
+        return Main.error(data.error)
+      }
+      $("#output-cmd").html("size: "+Main.filesize(data.size)+"<br/>"+data.height + "&nbsp;x&nbsp;" + data.width)
+      $("#output-url").val(data.url)
+      $("#output-img").hide().attr("src", data.url).fadeIn(700)
     },
 	filesize: function (size)
 		{
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/jquery-ui-1.8.16.custom.min.js b/share/frontend/imgrid/jquery-ui-1.8.16.custom.min.js
new file mode 100755
index 0000000..3042d0b
--- /dev/null
+++ b/share/frontend/imgrid/jquery-ui-1.8.16.custom.min.js
@@ -0,0 +1,84 @@
+/*!
+ * jQuery UI 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI
+ */
+(function(c,j){function k(a,b){var d=a.nodeName.toLowerCase();if("area"===d){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&l(a)}return(/input|select|textarea|button|object/.test(d)?!a.disabled:"a"==d?a.href||b:b)&&l(a)}function l(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.16",
+keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({propAttr:c.fn.prop||c.fn.attr,_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=
+this;setTimeout(function(){c(d).focus();b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,
+"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart":
+"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,m,n){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(m)g-=parseFloat(c.curCSS(f,"border"+this+"Width",true))||0;if(n)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,
+outerWidth:c.fn.outerWidth,outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c(this).css(h,d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){return k(a,!isNaN(c.attr(a,"tabindex")))},tabbable:function(a){var b=c.attr(a,
+"tabindex"),d=isNaN(b);return(d||b>=0)&&k(a,!d)}});c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&
+a.element[0].parentNode)for(var e=0;e<b.length;e++)a.options[b[e][0]]&&b[e][1].apply(a.element,d)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&&
+c.ui.isOverAxis(b,e,i)}})}})(jQuery);
+;/*!
+ * jQuery UI Widget 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Widget
+ */
+(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)try{b(d).triggerHandler("remove")}catch(e){}k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){try{b(this).triggerHandler("remove")}catch(d){}});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]=
+function(h){return!!b.data(h,a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)):
+d;if(e&&d.charAt(0)==="_")return h;e?this.each(function(){var g=b.data(this,a),i=g&&b.isFunction(g[d])?g[d].apply(g,f):g;if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options=
+b.extend(true,{},this.options,this._getCreateOptions(),a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+
+"-disabled ui-state-disabled")},widget:function(){return this.element},option:function(a,c){var d=a;if(arguments.length===0)return b.extend({},this.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}this._setOptions(d);return this},_setOptions:function(a){var c=this;b.each(a,function(d,e){c._setOption(d,e)});return this},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",
+c);return this},enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery);
+;/*!
+ * jQuery UI Mouse 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Mouse
+ *
+ * Depends:
+ *	jquery.ui.widget.js
+ */
+(function(b){var d=false;b(document).mouseup(function(){d=false});b.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var a=this;this.element.bind("mousedown."+this.widgetName,function(c){return a._mouseDown(c)}).bind("click."+this.widgetName,function(c){if(true===b.data(c.target,a.widgetName+".preventClickEvent")){b.removeData(c.target,a.widgetName+".preventClickEvent");c.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+
+this.widgetName)},_mouseDown:function(a){if(!d){this._mouseStarted&&this._mouseUp(a);this._mouseDownEvent=a;var c=this,f=a.which==1,g=typeof this.options.cancel=="string"&&a.target.nodeName?b(a.target).closest(this.options.cancel).length:false;if(!f||g||!this._mouseCapture(a))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){c.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a)){this._mouseStarted=
+this._mouseStart(a)!==false;if(!this._mouseStarted){a.preventDefault();return true}}true===b.data(a.target,this.widgetName+".preventClickEvent")&&b.removeData(a.target,this.widgetName+".preventClickEvent");this._mouseMoveDelegate=function(e){return c._mouseMove(e)};this._mouseUpDelegate=function(e){return c._mouseUp(e)};b(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);a.preventDefault();return d=true}},_mouseMove:function(a){if(b.browser.msie&&
+!(document.documentMode>=9)&&!a.button)return this._mouseUp(a);if(this._mouseStarted){this._mouseDrag(a);return a.preventDefault()}if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,a)!==false)?this._mouseDrag(a):this._mouseUp(a);return!this._mouseStarted},_mouseUp:function(a){b(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=
+false;a.target==this._mouseDownEvent.target&&b.data(a.target,this.widgetName+".preventClickEvent",true);this._mouseStop(a)}return false},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery);
+;/*
+ * jQuery UI Slider 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(d){d.widget("ui.slider",d.ui.mouse,{widgetEventPrefix:"slide",options:{animate:false,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null},_create:function(){var a=this,b=this.options,c=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),f=b.values&&b.values.length||1,e=[];this._mouseSliding=this._keySliding=false;this._animateOff=true;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+
+this.orientation+" ui-widget ui-widget-content ui-corner-all"+(b.disabled?" ui-slider-disabled ui-disabled":""));this.range=d([]);if(b.range){if(b.range===true){if(!b.values)b.values=[this._valueMin(),this._valueMin()];if(b.values.length&&b.values.length!==2)b.values=[b.values[0],b.values[0]]}this.range=d("<div></div>").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(b.range==="min"||b.range==="max"?" ui-slider-range-"+b.range:""))}for(var j=c.length;j<f;j+=1)e.push("<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>");
+this.handles=c.add(d(e.join("")).appendTo(a.element));this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(g){g.preventDefault()}).hover(function(){b.disabled||d(this).addClass("ui-state-hover")},function(){d(this).removeClass("ui-state-hover")}).focus(function(){if(b.disabled)d(this).blur();else{d(".ui-slider .ui-state-focus").removeClass("ui-state-focus");d(this).addClass("ui-state-focus")}}).blur(function(){d(this).removeClass("ui-state-focus")});this.handles.each(function(g){d(this).data("index.ui-slider-handle",
+g)});this.handles.keydown(function(g){var k=true,l=d(this).data("index.ui-slider-handle"),i,h,m;if(!a.options.disabled){switch(g.keyCode){case d.ui.keyCode.HOME:case d.ui.keyCode.END:case d.ui.keyCode.PAGE_UP:case d.ui.keyCode.PAGE_DOWN:case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:k=false;if(!a._keySliding){a._keySliding=true;d(this).addClass("ui-state-active");i=a._start(g,l);if(i===false)return}break}m=a.options.step;i=a.options.values&&a.options.values.length?
+(h=a.values(l)):(h=a.value());switch(g.keyCode){case d.ui.keyCode.HOME:h=a._valueMin();break;case d.ui.keyCode.END:h=a._valueMax();break;case d.ui.keyCode.PAGE_UP:h=a._trimAlignValue(i+(a._valueMax()-a._valueMin())/5);break;case d.ui.keyCode.PAGE_DOWN:h=a._trimAlignValue(i-(a._valueMax()-a._valueMin())/5);break;case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:if(i===a._valueMax())return;h=a._trimAlignValue(i+m);break;case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:if(i===a._valueMin())return;h=a._trimAlignValue(i-
+m);break}a._slide(g,l,h);return k}}).keyup(function(g){var k=d(this).data("index.ui-slider-handle");if(a._keySliding){a._keySliding=false;a._stop(g,k);a._change(g,k);d(this).removeClass("ui-state-active")}});this._refreshValue();this._animateOff=false},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");this._mouseDestroy();
+return this},_mouseCapture:function(a){var b=this.options,c,f,e,j,g;if(b.disabled)return false;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();c=this._normValueFromMouse({x:a.pageX,y:a.pageY});f=this._valueMax()-this._valueMin()+1;j=this;this.handles.each(function(k){var l=Math.abs(c-j.values(k));if(f>l){f=l;e=d(this);g=k}});if(b.range===true&&this.values(1)===b.min){g+=1;e=d(this.handles[g])}if(this._start(a,g)===false)return false;
+this._mouseSliding=true;j._handleIndex=g;e.addClass("ui-state-active").focus();b=e.offset();this._clickOffset=!d(a.target).parents().andSelf().is(".ui-slider-handle")?{left:0,top:0}:{left:a.pageX-b.left-e.width()/2,top:a.pageY-b.top-e.height()/2-(parseInt(e.css("borderTopWidth"),10)||0)-(parseInt(e.css("borderBottomWidth"),10)||0)+(parseInt(e.css("marginTop"),10)||0)};this.handles.hasClass("ui-state-hover")||this._slide(a,g,c);return this._animateOff=true},_mouseStart:function(){return true},_mouseDrag:function(a){var b=
+this._normValueFromMouse({x:a.pageX,y:a.pageY});this._slide(a,this._handleIndex,b);return false},_mouseStop:function(a){this.handles.removeClass("ui-state-active");this._mouseSliding=false;this._stop(a,this._handleIndex);this._change(a,this._handleIndex);this._clickOffset=this._handleIndex=null;return this._animateOff=false},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(a){var b;if(this.orientation==="horizontal"){b=
+this.elementSize.width;a=a.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{b=this.elementSize.height;a=a.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}b=a/b;if(b>1)b=1;if(b<0)b=0;if(this.orientation==="vertical")b=1-b;a=this._valueMax()-this._valueMin();return this._trimAlignValue(this._valueMin()+b*a)},_start:function(a,b){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);
+c.values=this.values()}return this._trigger("start",a,c)},_slide:function(a,b,c){var f;if(this.options.values&&this.options.values.length){f=this.values(b?0:1);if(this.options.values.length===2&&this.options.range===true&&(b===0&&c>f||b===1&&c<f))c=f;if(c!==this.values(b)){f=this.values();f[b]=c;a=this._trigger("slide",a,{handle:this.handles[b],value:c,values:f});this.values(b?0:1);a!==false&&this.values(b,c,true)}}else if(c!==this.value()){a=this._trigger("slide",a,{handle:this.handles[b],value:c});
+a!==false&&this.value(c)}},_stop:function(a,b){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);c.values=this.values()}this._trigger("stop",a,c)},_change:function(a,b){if(!this._keySliding&&!this._mouseSliding){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);c.values=this.values()}this._trigger("change",a,c)}},value:function(a){if(arguments.length){this.options.value=
+this._trimAlignValue(a);this._refreshValue();this._change(null,0)}else return this._value()},values:function(a,b){var c,f,e;if(arguments.length>1){this.options.values[a]=this._trimAlignValue(b);this._refreshValue();this._change(null,a)}else if(arguments.length)if(d.isArray(arguments[0])){c=this.options.values;f=arguments[0];for(e=0;e<c.length;e+=1){c[e]=this._trimAlignValue(f[e]);this._change(null,e)}this._refreshValue()}else return this.options.values&&this.options.values.length?this._values(a):
+this.value();else return this._values()},_setOption:function(a,b){var c,f=0;if(d.isArray(this.options.values))f=this.options.values.length;d.Widget.prototype._setOption.apply(this,arguments);switch(a){case "disabled":if(b){this.handles.filter(".ui-state-focus").blur();this.handles.removeClass("ui-state-hover");this.handles.propAttr("disabled",true);this.element.addClass("ui-disabled")}else{this.handles.propAttr("disabled",false);this.element.removeClass("ui-disabled")}break;case "orientation":this._detectOrientation();
+this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation);this._refreshValue();break;case "value":this._animateOff=true;this._refreshValue();this._change(null,0);this._animateOff=false;break;case "values":this._animateOff=true;this._refreshValue();for(c=0;c<f;c+=1)this._change(null,c);this._animateOff=false;break}},_value:function(){var a=this.options.value;return a=this._trimAlignValue(a)},_values:function(a){var b,c;if(arguments.length){b=this.options.values[a];
+return b=this._trimAlignValue(b)}else{b=this.options.values.slice();for(c=0;c<b.length;c+=1)b[c]=this._trimAlignValue(b[c]);return b}},_trimAlignValue:function(a){if(a<=this._valueMin())return this._valueMin();if(a>=this._valueMax())return this._valueMax();var b=this.options.step>0?this.options.step:1,c=(a-this._valueMin())%b;a=a-c;if(Math.abs(c)*2>=b)a+=c>0?b:-b;return parseFloat(a.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var a=
+this.options.range,b=this.options,c=this,f=!this._animateOff?b.animate:false,e,j={},g,k,l,i;if(this.options.values&&this.options.values.length)this.handles.each(function(h){e=(c.values(h)-c._valueMin())/(c._valueMax()-c._valueMin())*100;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";d(this).stop(1,1)[f?"animate":"css"](j,b.animate);if(c.options.range===true)if(c.orientation==="horizontal"){if(h===0)c.range.stop(1,1)[f?"animate":"css"]({left:e+"%"},b.animate);if(h===1)c.range[f?"animate":"css"]({width:e-
+g+"%"},{queue:false,duration:b.animate})}else{if(h===0)c.range.stop(1,1)[f?"animate":"css"]({bottom:e+"%"},b.animate);if(h===1)c.range[f?"animate":"css"]({height:e-g+"%"},{queue:false,duration:b.animate})}g=e});else{k=this.value();l=this._valueMin();i=this._valueMax();e=i!==l?(k-l)/(i-l)*100:0;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";this.handle.stop(1,1)[f?"animate":"css"](j,b.animate);if(a==="min"&&this.orientation==="horizontal")this.range.stop(1,1)[f?"animate":"css"]({width:e+"%"},
+b.animate);if(a==="max"&&this.orientation==="horizontal")this.range[f?"animate":"css"]({width:100-e+"%"},{queue:false,duration:b.animate});if(a==="min"&&this.orientation==="vertical")this.range.stop(1,1)[f?"animate":"css"]({height:e+"%"},b.animate);if(a==="max"&&this.orientation==="vertical")this.range[f?"animate":"css"]({height:100-e+"%"},{queue:false,duration:b.animate})}}});d.extend(d.ui.slider,{version:"1.8.16"})})(jQuery);
+;
\ No newline at end of file
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
diff --git a/share/frontend/impattern/index.html b/share/frontend/impattern/index.html
index b26ded5..417ddd9 100755
--- a/share/frontend/impattern/index.html
+++ b/share/frontend/impattern/index.html
@@ -3,7 +3,7 @@
 <link href='http://fonts.googleapis.com/css?family=Orienta|Roboto' rel='stylesheet' type='text/css'>
 <link href='css/normalize.css' rel='stylesheet' type='text/css'>
 <link href='css/unsemantic-grid-responsive.css' rel='stylesheet' type='text/css'>
-<link href='css/impattern-main.css' rel='stylesheet' type='text/css'/>
+<link href='css/main.css' rel='stylesheet' type='text/css'/>
 <link href='css/overlay.css' rel='stylesheet' type='text/css'/>
 <link href='css/sketch.css' rel='stylesheet' type='text/css'/>
 <link href='css/result.css' rel='stylesheet' type='text/css'/>
@@ -296,7 +296,7 @@ $(document).ready(function(){
     }
   console.log(
     { 
-      'pattern_data' : JSON.stringify(window.custom_pattern),
+      'pattern_data' : window.custom_pattern,
       'pattern_url' : $('.patterns').attr("current_pattern"),
       'image_url' : $('input.image_input').val(), 
       'username' : $('#username').val(),
@@ -315,7 +315,6 @@ $(document).ready(function(){
       'username' : $('#username').val(),
     }
   }).done(function( msg ) {
-    msg = JSON.parse(msg)
     $('#submit').prop("disabled", false);
     $('#submit').html("ROCK");
     $('body').css("background", "url(img/loading.gif)");
@@ -324,7 +323,6 @@ $(document).ready(function(){
         alert( "There was an error processing your request ");
         console.log(msg);
       }
-      console.log(msg)
       console.log("new url: "+msg.url);
       update_username($("#username").val());
       show_finished_image(msg.url);
diff --git a/to_merge/TODO b/to_merge/TODO
new file mode 100644
index 0000000..04f0396
--- /dev/null
+++ b/to_merge/TODO
@@ -0,0 +1,7 @@
+GET RUNNING LOCALLY
+run_module_examples_test (doesn't use server)
+merge these files
+the gallery
+email cuthbert
+laundry
+
diff --git a/to_merge/__init__.py b/to_merge/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/to_merge/__init__.py
diff --git a/to_merge/db.py b/to_merge/db.py
new file mode 100644
index 0000000..d4dbec8
--- /dev/null
+++ b/to_merge/db.py
@@ -0,0 +1,90 @@
+"""Db bass class for updating the photoblaster database"""
+import time
+import sys
+from photoblaster.db.imcmd import ImCmd
+from photoblaster.config import DB_USER, DB_PASSWORD, DB_HOST,\
+    DB_NAME
+from sqlalchemy import Column, Integer, LargeBinary, String, \
+    create_engine, sql, func, desc
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import sessionmaker
+
+_NULL = sql.null()
+
+Base = declarative_base()
+metadata = Base.metadata
+
+
+class Db(object):
+    """wrapper for all db methods"""
+    def __init__(self):
+        engine = create_engine('mysql://{}:{}@{}/{}'.format(
+            DB_USER,
+            DB_PASSWORD,
+            DB_HOST,
+            DB_NAME
+        ))
+        self.Session = sessionmaker(bind=engine)
+
+    def _get(
+            self,
+            columns=None,
+            filter_by={},
+            order_by=None,
+            offset=0,
+            limit=20,
+            not_deleted=False
+            ):
+        session = self.Session()
+        results = session.query(ImCmd)
+        if not_deleted:
+            filter_by['deleted'] = 0
+        if filter_by:
+            results = results.filter_by(filter_by)
+        if order_by is not None:
+            results = results.order_by(order_by)
+        results = results.offset(offset).limit(limit)
+        session.close()
+        return [result.serialize(columns=columns) for result in results]
+
+    def get_random(
+            self, filter_by={},
+            offset=0, limit=20, columns=None
+            ):
+        return self._get(
+            columns=columns, order_by=func.random(),
+            offset=offset, limit=limit)
+
+    def get_by_date(
+            self,
+            filter_by={},
+            offset=0, limit=20, columns=None
+            ):
+        return self._get(
+            columns=columns, offset=offset, limit=limit,
+            order_by=desc(
+                ImCmd.date
+            )
+        )
+
+    def insert_cmd(self, **kwargs):
+        try:
+            session = self.Session()
+            _entry_data = {
+                'date': kwargs.get("date", int(time.time())),
+                'remote_addr': kwargs['remote_addr'] or _NULL,
+                'name': kwargs['username'] or _NULL,
+                'url': kwargs['username'] or _NULL,
+                'dir': kwargs['directory'] or _NULL,
+                'oldfile': kwargs['oldfile'] or _NULL,
+                'newfile': kwargs['newfile'] or _NULL,
+                'cmd': kwargs['cmd'] or _NULL,
+                'dataobj': kwargs['dataobj'] or _NULL,
+                'tag': kwargs['tag'] or _NULL
+            }
+            session.add(ImCmd(**_entry_data))
+            session.commit()
+            session.close()
+        except Exception as e:
+            sys.stderr.write("Unable to commit database entry\n")
+            sys.stderr.write(str(e))
diff --git a/to_merge/imcmd.py b/to_merge/imcmd.py
new file mode 100644
index 0000000..5206f99
--- /dev/null
+++ b/to_merge/imcmd.py
@@ -0,0 +1,43 @@
+"""describes the ImCmd class"""
+import sys
+from sqlalchemy import Column, Integer, LargeBinary, String
+from simplejson import json
+from sqlalchemy.orm import class_mapper
+
+
+class ImCmd(Base):
+    """defines the table class"""
+    __tablename__ = 'im_cmd'
+    id = Column(Integer, primary_key=True)
+    date = Column(Integer)
+    remote_addr = Column(String(16))
+    name = Column(String(16))
+    url = Column(String(256))
+    dir = Column(String(2))
+    oldfile = Column(String(256))
+    newfile = Column(String(256))
+    cmd = Column(LargeBinary)
+    dataobj = Column(LargeBinary)
+    tag = Column(String(50))
+
+    def serialize(self, columns=None):
+        """returns the class as a dictionary"""
+        if not columns:
+            columns = [c.key for c in class_mapper(self.__class__).columns]
+        col_val = []
+        for c in columns:
+            if c == "dataobj":
+                val = getattr(self, c)
+                if val is not None:
+                    try:
+                        val = json.loads(val)
+                    except json.JSONDecodeError:
+                        sys.stderr.write("Could not decode json: %s\n" % val)
+                        sys.stderr.write(
+                            "bad value in db, id = %s\n" % getattr(self, "id")
+                            )
+                        pass
+                col_val.append((c, val))
+            else:
+                col_val.append((c, getattr(self, c)))
+        return dict(col_val)