From b9ffc51a110107be82cb1151acd9c7cd07f55ab1 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 15 Dec 2010 02:40:42 +0000
Subject: last step in conversion to elgg.js

git-svn-id: http://code.elgg.org/elgg/trunk@7628 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/js/initialise_elgg.php       |  4 +++
 views/default/js/initialize_elgg.php       | 45 ++++++++++++++++++++++++++++++
 views/default/page/elements/html_begin.php |  2 +-
 views/default/scripts/initialize_elgg.php  | 45 ------------------------------
 4 files changed, 50 insertions(+), 46 deletions(-)
 create mode 100644 views/default/js/initialise_elgg.php
 create mode 100644 views/default/js/initialize_elgg.php
 delete mode 100644 views/default/scripts/initialize_elgg.php

(limited to 'views/default')

diff --git a/views/default/js/initialise_elgg.php b/views/default/js/initialise_elgg.php
new file mode 100644
index 000000000..3d617953a
--- /dev/null
+++ b/views/default/js/initialise_elgg.php
@@ -0,0 +1,4 @@
+<?php
+/**
+ * This has been deprecated in 1.8 - see elgg.php in this directory.
+ */
\ No newline at end of file
diff --git a/views/default/js/initialize_elgg.php b/views/default/js/initialize_elgg.php
new file mode 100644
index 000000000..03d5adc5a
--- /dev/null
+++ b/views/default/js/initialize_elgg.php
@@ -0,0 +1,45 @@
+<?php 
+/**
+ * 
+ */
+
+?>
+<script type="text/javascript">
+/**
+ * Don't want to cache these -- they could change for every request
+ */
+elgg.config.lastcache = <?php echo (int)($vars['config']->lastcache); ?>;
+
+elgg.security.token.__elgg_ts = <?php echo $ts = time(); ?>;
+elgg.security.token.__elgg_token = '<?php echo generate_action_token($ts); ?>';
+
+<?php
+$page_owner = elgg_get_page_owner();
+
+if ($page_owner instanceof ElggEntity) {
+	$page_owner_json = array();
+	foreach ($page_owner->getExportableValues() as $v) {
+		$page_owner_json[$v] = $page_owner->$v;
+	}
+	
+	$page_owner_json['subtype'] = $page_owner->getSubtype();
+	$page_owner_json['url'] = $page_owner->getURL();
+	
+	echo 'elgg.page_owner =  '.json_encode($page_owner_json).';'; 
+}
+
+$user = get_loggedin_user();
+
+if ($user instanceof ElggUser) {
+	$user_json = array();
+	foreach ($user->getExportableValues() as $v) {
+		$user_json[$v] = $user->$v;
+	}
+	
+	$user_json['subtype'] = $user->getSubtype();
+	$user_json['url'] = $user->getURL();
+	
+	echo 'elgg.session.user = new elgg.ElggUser('.json_encode($user_json).');'; 
+}
+?>;
+</script>
\ No newline at end of file
diff --git a/views/default/page/elements/html_begin.php b/views/default/page/elements/html_begin.php
index 23879dde8..29f7d893f 100644
--- a/views/default/page/elements/html_begin.php
+++ b/views/default/page/elements/html_begin.php
@@ -78,7 +78,7 @@ $ie6_url = elgg_view_get_simplecache_url('css', 'ie6');
 	<![endif]-->
 <?php
 
-echo elgg_view('scripts/initialize_elgg');
+echo elgg_view('js/initialize_elgg');
 echo $feedref;
 
 $metatags = elgg_view('metatags', $vars);
diff --git a/views/default/scripts/initialize_elgg.php b/views/default/scripts/initialize_elgg.php
deleted file mode 100644
index 03d5adc5a..000000000
--- a/views/default/scripts/initialize_elgg.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php 
-/**
- * 
- */
-
-?>
-<script type="text/javascript">
-/**
- * Don't want to cache these -- they could change for every request
- */
-elgg.config.lastcache = <?php echo (int)($vars['config']->lastcache); ?>;
-
-elgg.security.token.__elgg_ts = <?php echo $ts = time(); ?>;
-elgg.security.token.__elgg_token = '<?php echo generate_action_token($ts); ?>';
-
-<?php
-$page_owner = elgg_get_page_owner();
-
-if ($page_owner instanceof ElggEntity) {
-	$page_owner_json = array();
-	foreach ($page_owner->getExportableValues() as $v) {
-		$page_owner_json[$v] = $page_owner->$v;
-	}
-	
-	$page_owner_json['subtype'] = $page_owner->getSubtype();
-	$page_owner_json['url'] = $page_owner->getURL();
-	
-	echo 'elgg.page_owner =  '.json_encode($page_owner_json).';'; 
-}
-
-$user = get_loggedin_user();
-
-if ($user instanceof ElggUser) {
-	$user_json = array();
-	foreach ($user->getExportableValues() as $v) {
-		$user_json[$v] = $user->$v;
-	}
-	
-	$user_json['subtype'] = $user->getSubtype();
-	$user_json['url'] = $user->getURL();
-	
-	echo 'elgg.session.user = new elgg.ElggUser('.json_encode($user_json).');'; 
-}
-?>;
-</script>
\ No newline at end of file
-- 
cgit v1.2.3