LIl things.

This commit is contained in:
Jason A. Donenfeld
2011-05-06 22:48:09 -04:00
parent 2e017d0df3
commit 8bd9d1519e
7 changed files with 109 additions and 28 deletions

View File

@ -17,7 +17,7 @@ a:hover {
top: 0;
padding: 0.4em;
font-weight: bold;
font-size: 1.2em;
font-size: 1.15em;
}
#loading {
display: none;
@ -82,6 +82,33 @@ a:hover {
right: 0;
text-align: center;
}
#photo-box {
display: inline;
}
#photo-links {
background-color: #000000;
font-weight: bold;
height: 10px;
font-size: 10px;
line-height: 7px;
padding-top: 3px;
padding-bottom: 3px;
padding-right: 10px;
padding-left: 10px;
display: none;
border-top-right-radius: 5px;
border-top-left-radius: 5px;
-moz-border-top-right-radius: 5px;
-moz-border-top-left-radius: 5px;
-webkit-border-top-right-radius: 5px;
-webkit-border-top-left-radius: 5px;
}
#photo-bar {
position: absolute;
bottom: 0;
width: 100%;
text-align: center;
}
.photo-view-container {
position: absolute;
height: 150px;
@ -94,3 +121,12 @@ a:hover {
padding: 0 !important;
text-align: center;
}
#error {
display: none;
text-align: center;
padding-top: 20%;
font-size: 4em;
font-weight: bold;
font-style: italic;
}

View File

@ -3,12 +3,12 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<title>JasonDonenfeld.com &#8211; Colors</title>
<title>JasonDonenfeld.com &#8211; Photos</title>
<link href="css/styles.min.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="js/scripts.min.js"></script>
</head>
<body>
<div id="title">Colors</div>
<div id="title">Photos</div>
<div id="album-view">
<div id="thumbs">
<div id="loading">Loading...</div>
@ -16,10 +16,20 @@
<div id="subalbums"></div>
</div>
<div id="photo-view">
<a id="next-photo"><img id="photo" /></a>
<div id="photo-box">
<a id="next-photo"><img id="photo" /></a>
<div id="photo-bar">
<div id="photo-links">
<a id="metadata-link">metadata</a> | <a id="original-link" target="_blank">download original</a>
</div>
</div>
</div>
<a id="back">&larr;</a>
<a id="next">&rarr;</a>
</div>
<div id="error">Forgot my camera...</div>
</body>
</html>

View File

@ -10,6 +10,8 @@ $(document).ready(function() {
.replace(/\(/g, "")
.replace(/\)/g, "")
.replace(/#/g, "")
.replace(/&/g, "")
.replace(/,/g, "")
.replace(/\[/g, "")
.replace(/\]/g, "")
.replace(/"/g, "")
@ -42,7 +44,7 @@ $(document).ready(function() {
$.ajax({
type: "GET",
url: "cache/" + current_album_cache + ".json",
error: function() { $(document.body).html("Couldn't fetch it."); },
error: die,
success: albumLoaded
});
}
@ -147,6 +149,8 @@ $(document).ready(function() {
$("#back").attr("href", "#" + current_album_cache + "/" + cachePath(current_album.photos[
(current_photo_index - 1 < 0) ? (current_album.photos.length - 1) : (current_photo_index - 1)
].name));
$("#original-link").attr("target", "_blank").attr("href", "albums/" + current_album.path + "/" + current_photo.name);
$("#metadata-link").attr("href", "javascript:alert('Coming soon...')");
$("#album-view").addClass("photo-view-container");
$("#subalbums").hide();
@ -188,13 +192,19 @@ $(document).ready(function() {
$.ajax({
type: "GET",
url: "cache/" + album + ".json",
error: function() { $(document.body).html("Couldn't fetch it."); },
error: die,
success: callback
});
}
function albumThumbFinder(album, callback) {
fetchAlbumForThumb(album, function(fetchedAlbum) { albumForThumbIteration(fetchedAlbum, callback); });
}
function die() {
$("#album-view").hide();
$("#photo-view").hide();
$("#title").hide();
$("#error").fadeIn(5000);
}
var current_album_cache = null;
var current_photo_cache = null;
@ -237,4 +247,10 @@ $(document).ready(function() {
}
return true;
});
$("#photo-box").mouseenter(function() {
$("#photo-links").stop().fadeTo("slow", 0.50).css("display", "inline");
});
$("#photo-box").mouseleave(function() {
$("#photo-links").stop().fadeOut("slow");
});
});

View File

@ -4,7 +4,7 @@ function cachePath($path) {
$path = substr($path, 1);
if ($path[strlen($path) - 1] == '/')
$path = substr($path, 0, strlen($path) - 1);
$path = str_replace('_-_', '-', str_replace('/', '-', str_replace(' ', '_', str_replace('(', '', str_replace(')', '', str_replace('#', '', str_replace('[', '', str_replace(']', '', str_replace('"', '', str_replace("'", '', strtolower($path)))))))))));
$path = str_replace('_-_', '-', str_replace('/', '-', str_replace(' ', '_', str_replace('(', '', str_replace(')', '', str_replace('#', '', str_replace('[', '', str_replace(']', '', str_replace('&', '', str_replace(',', '', str_replace('"', '', str_replace("'", '', strtolower($path)))))))))))));
while (strpos($path, "--") !== false)
$path = str_replace("--", "-", $path);
while (strpos($path, "__") !== false)
@ -23,9 +23,13 @@ if (strpos(strtolower($url), ".php") == strlen($url) - 4) {
$url = substr($url, 0, strlen($url) - 4);
$index = strrpos($url, "/");
$redirect = "/#".cachePath(substr($url, 0, $index))."/".cachePath(substr($url, $index));
} else if (strpos($url, "/cache/") === 0 || strpos($url, "/albums/") === 0 || strpos($url, "/img/") === 0 || strpos($url, "/img/") === 0 || strpos($url, "/js/") === 0 || strpos($url, "/css/") === 0) {
header("HTTP/1.1 404 Not Found");
exit();
} else
$redirect = "/#".cachePath($url);
header("HTTP/1.1 301 Moved Permanently");
header("Location: $redirect");
?>