From 0bcf819b071545d8e536bd2f224a13c9e58fb185 Mon Sep 17 00:00:00 2001
From: raylu <raylu@mixpanel.com>
Date: Mon, 4 Jul 2011 02:09:47 -0700
Subject: reorganize JS

---
 views/layouts/default.html.php | 21 +--------------------
 views/pages/home.html.php      |  8 ++++++++
 2 files changed, 9 insertions(+), 20 deletions(-)

(limited to 'views')

diff --git a/views/layouts/default.html.php b/views/layouts/default.html.php
index bc5ac36..1eac7f1 100644
--- a/views/layouts/default.html.php
+++ b/views/layouts/default.html.php
@@ -87,28 +87,9 @@ use \lithium\security\Auth;
 <?= $this->html->script("/js/jquery.tools.min.js"); ?>
 <?= $this->html->script("/js/jquery.form.js"); ?>
 <?= $this->html->script("/js/jquery.tipsy.js"); ?>
-<?= $this->html->script("/js/functions.js"); ?>
 <?= $this->html->script("/js/jquery.prettyPhoto.js"); ?>
-
-<script type="text/javascript">
-$(document).ready(function(){
-	var login = $("a[href='/login']");
-	login.attr('href', '#login');
-	login.attr('title', '');
-	login.prettyPhoto({deeplinking: false, social_tools: false});
-});
-</script>
-
+<?= $this->html->script("/js/functions.js"); ?>
 <?= $this->scripts(); ?>
-<script type="text/javascript">
-$(document).ready(function() {
-	setTimeout(function() {
-		$(".flash-message").fadeOut("slow", function () {
-			$(".flash-message").remove();
-		});
-	}, 2000);
-});
-</script>
 
 </body>
 </html>
diff --git a/views/pages/home.html.php b/views/pages/home.html.php
index 9d39b95..bdb46ca 100644
--- a/views/pages/home.html.php
+++ b/views/pages/home.html.php
@@ -81,3 +81,11 @@
 	Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
 </p>
 <br class="cl" />
+
+<?php ob_start(); ?>
+<script type="text/javascript">
+$(document).ready(function() {
+	$(".scrollable").scrollable();
+});
+</script>
+<?php $this->scripts(ob_get_clean()); ?>
-- 
cgit v1.2.3