No OneTemporary
Actions

Size

32 KB

Subscribers

None

View Options

	diff --git a/content/scenes/B00001001.tpl b/content/scenes/B00001001.tpl
	index b4d5a12..2a64460 100644
	--- a/content/scenes/B00001001.tpl
	+++ b/content/scenes/B00001001.tpl
	@@ -1,156 +1,156 @@
	<!-- Tower navigation and passage CSS -->
	<style>
	body {
	overflow: hidden;
	}

	/* Tower map */

	#tower {
	background-image: url({$SCENE_URL}/{$CurrentPerso->location_global}/all.png);
	background-position: left;
	background-repeat: no-repeat;
	height: 442px;
	}

	#tower_hl {
	position: relative;
	}

	/* Passage */

	#passage {
	width: 960px;
	height: 401px;

	background-image: url({$SCENE_URL}/{$CurrentPerso->location_global}/couloir/bay/void.png);
	background-position: top left;
	background-repeat: no-repeat;
	}

	#passage_left {
	position: relative;
	background-image: url({$SCENE_URL}/{$CurrentPerso->location_global}/couloir/GoLeft.png);
	width: 38px;
	height: 38px;
	}

	#passage_right {
	position: relative;
	background-image: url({$SCENE_URL}/{$CurrentPerso->location_global}/couloir/GoRight.png);
	width: 38px;
	height: 38px;
	}

	#passage_gallery ul {
	position: relative;
	top: 145px;
	left: 120px;

	margin-top: inherit;
	margin-bottom: inherit;
	}

	#passage_gallery li {
	display: block;
	float: left;
	margin-right: 60px;

	width: 170px;
	height: 170px;

	padding: 4px 4px;

	background-image: url({$SCENE_URL}/{$CurrentPerso->location_global}/couloir/frame.png);
	background-repeat: no-repeat;
	background-position: top left;
	}

	#screen {
	position: absolute;
	left: 10%;
	top: 10%;
	width: 80%;
	height: 80%;
	}

	#screen img {
	position: absolute;
	cursor: pointer;
	visibility: hidden;
	width: 0px;
	height: 0px;
	}

	#screen .tvover {
	border: solid #343434;
	opacity: 1;
	filter: alpha(opacity=100);
	}

	#screen .tvout {
	border: solid #fff;
	opacity: 0.7;
	}

	#bankImages {
	display: none;
	}
	</style>

	<!-- Tower -->
	<!--
	<div id="tower"></div>
	-->

	<!-- Passage -->
	<div class="grid_16 alpha omega">
	<div id="passage">
	<div id="passage_gallery"></div>
	</div>
	</div>

	<!-- Upload dialog -->
	<div dojoType="dijit.Dialog" id="uploadDialog" style="display: none;" title="{#UploadNewArtwork#}">
	<p>{#UploadNewArtworkDescription#}</p>
	<form method="post" id="test" action="{get_xhr_hashed_url('upload_content', {$CurrentPerso->location_global})}" enctype="multipart/form-data">
	<input type="hidden" id="location_local" name="location_local" value='{$CurrentPerso->location_local}' />
	<input type="hidden" id="i" name="location_k" value="-1">
	<div class="row">
	- <label for="artwork" class="firstLabel">Picture (max. {ini_get('upload_max_filesize')})</label>
	+ <label for="artwork" class="firstLabel">{#UploadNewArtworkPicture#} (max. {ini_get('upload_max_filesize')})</label>
	<input type="file" name="artwork" id="artwork" class="long" />
	</div>
	<div class="row">
	- <label for="title" class="firstLabel">Title</label>
	+ <label for="title" class="firstLabel">{#UploadNewArtworkTitle#}</label>
	<input dojoType="dijit.form.TextBox" name="title" id="title" type="text" class="long" />
	</div>
	<div class="row center">
	<button dojoType="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconSave" type="submit" value="Save" />OK</button>
	</div>
	</form>
	</div>

	<!-- Javascript bits: script.aculo.us -->
	<script src="{#StaticContentURL#}/js/prototype.js"></script>
	<script src="{#StaticContentURL#}/js/effects.js"></script>
	<!-- Javascript bits: dojo -->
	<script>
	dojo.require("dojo.parser");
	dojo.require("dijit.Dialog");
	dojo.require("dijit.form.Button");
	dojo.require("dijit.form.TextBox");
	</script>
	<!-- Javascript bits: tower and couloir/passage/corridor/gallery/whatNameYouGiveToIt -->
	<script src="{$SCENE_URL}/{$CurrentPerso->location_global}/tower.js"></script>
	<script>
	//Initializes tower map
	//tower.hl = '{$SCENE_URL}/{$CurrentPerso->location_global}/hl.png';
	//tower.highlight(3);

	//Initializes passage view
	passage.bayPath = '{$SCENE_URL}/{$CurrentPerso->location_global}/couloir/bay/';
	passage.initialize('{$location->global}', '{$CurrentPerso->location_local}');

	//Initializes gallery
	gallery.initialize('{#StaticContentURL#}', '{get_xhr_hashed_url('get_content', {$CurrentPerso->location_global})}');
	</script>
	\ No newline at end of file
	diff --git a/content/users/1148/30052009(078)Square.jpg b/content/users/1148/30052009(078)Square.jpg
	index 37dd67a..a9cbfa3 100644
	Binary files a/content/users/1148/30052009(078)Square.jpg and b/content/users/1148/30052009(078)Square.jpg differ
	diff --git a/dev/quux.php b/dev/quux.php
	index 78acb9f..556ccd8 100644
	--- a/dev/quux.php
	+++ b/dev/quux.php
	@@ -1,48 +1,56 @@
	<?php

	require_once('includes/objects/ship.php');
	require_once('includes/objects/port.php');
	require_once('includes/objects/application.php');
	+ require_once('includes/objects/content.php');

	include('controllers/header.php');

	- $case = 'pushdata';
	+ $case = 'thumbnail';
	switch ($case) {
	case 'pushdata';
	echo '
	<h2>/api.php/app/pushdata</h2>
	<form method="post" action="/api.php/app/pushdata?mode=file&key=37d839ba-f9fc-42ca-a3e8-28053e979b90" enctype="multipart/form-data">
	<input type="file" name="datafile" /><br />
	<input type="submit" value="Send file" />
	</form>
	';
	+ break;
	+
	+ case 'thumbnail':
	+ $content = new Content(1);
	+ dprint_r($content);
	+ $content->generate_thumbnail();
	+ break;

	case 'port':
	echo '<h2>Port::from_location test</h2>';
	$locations = array("B00002", "B00002123", "B00001001", "xyz: [800, 42, 220]");
	foreach ($locations as $location) {
	dprint_r(Port::from_location($location));
	}
	break;

	case 'ext':
	$file = 'dev/foo.tar';
	echo "<h2>$file</h2>";
	echo "<h3>.tar.bz2</h3>";
	echo ereg('\.tar\.bz2$', $file);
	echo "<h3>.tar</h3>";
	echo ereg('\.tar$', $file);
	break;

	case 'app':
	echo Application::from_api_key("37d839ba-f9fc-42ca-a3e8-28053e979b90")->generate_userkey();
	break;

	case '':
	dieprint_r("No case currently selected.");
	break;
	}

	include('controllers/footer.php');

	?>
	\ No newline at end of file
	diff --git a/do.php b/do.php
	index 1191d08..cbb49ea 100644
	--- a/do.php
	+++ b/do.php
	@@ -1,256 +1,255 @@
	<?php

	/*
	* Zed
	* (c) 2010, Dereckson, some rights reserved
	* Released under BSD license
	*
	* AJAX callbacks
	*
	* As main controller could potentially be interrupted (e.g. if site.requests
	* flag is at 1, user is redirected to controllers/userrequest.php), all AJAX
	* queries should be handled by this script and not directly by the controllers.
	*
	* Standard return values:
	* -7 user is logged but perso isn't selected
	* -9 user is not logged
	*
	*/

	////////////////////////////////////////////////////////////////////////////////
	///
	/// Initialization
	///

	//Standard return values
	define('USER_NOT_LOGGED', -9);
	define('PERSO_NOT_SELECTED', -7);

	//Pluton library
	include('includes/core.php');

	//Session
	$IP = encode_ip($_SERVER["REMOTE_ADDR"]);
	require_once('includes/story/story.php'); //this class can be stored in session
	session_start();
	$_SESSION[ID] = session_id();
	session_update(); //updates or creates the session

	include("includes/login.php"); //login/logout
	$CurrentUser = get_logged_user(); //Gets current user infos

	//Gets current perso
	require_once('includes/objects/perso.php');
	if ($perso_id = $CurrentUser->session['perso_id']) {
	$CurrentPerso = new Perso($perso_id);
	}

	//Requires user and perso
	if ($CurrentUser->id < 1000) {
	echo USER_NOT_LOGGED;
	exit;
	}
	if (!$CurrentPerso) {
	echo PERSO_NOT_SELECTED;
	exit;
	}

	//Loads Smarty (as it handles l10n, it will be used by lang_get)
	require('includes/Smarty/Smarty.class.php');
	$smarty = new Smarty();
	$current_dir = dirname(__FILE__);
	$smarty->template_dir = $current_dir . '/skins/zed';
	$smarty->compile_dir = $current_dir . '/cache/compiled';
	$smarty->cache_dir = $current_dir . '/cache';
	$smarty->config_dir = $current_dir;

	//Loads language files
	initialize_lang();
	lang_load('core.conf');

	////////////////////////////////////////////////////////////////////////////////
	///
	/// Actions definitions
	///

	/*
	* Actions class
	* Each method is called by first part of your URL, other parts are arguments
	* e.g. /do.php/validate_quux_request/52 = Actions::validate_quux_request(52);
	*
	* You can also use $_GET, $_POST or better $_REQUEST.
	*
	* Don't echo the value but return it, so we can in the future implement custom
	* formats like api_output();
	*/

	class Actions {
	/*
	* Checks the arguments hash
	* @param Array $args the arguments, the last being the hash
	*/
	static private function is_hash_valid ($args) {
	global $Config;
	return array_pop($args) == md5($_SESSION['ID'] . $Config['SecretKey'] . implode('', $args));
	}

	/*
	* Handles a allow/deny perso request
	* @param string $request_flag the request flag to clear
	* @param string $store 'perso' or 'registry'
	* @param string $key the perso flag or registry key
	* @param string $value the value to store
	* @param string $hash the security hash
	* @return boolean true if the request is valid and have been processed ; otherwise, false.
	*/
	static function perso_request ($request_flag, $store, $key, $value, $hash) {
	global $CurrentPerso;

	//Ensures we've the correct amount of arguments
	if (func_num_args() < 4) return false;

	//Checks hash
	$args = func_get_args();
	if (!self::is_hash_valid($args)) {
	return false;
	}

	//Sets flag
	switch ($store) {
	case 'perso':
	$CurrentPerso->set_flag($key, $value);
	break;

	case 'registry':
	registry_set($key, $value);
	break;

	default:
	//Unknown storage location
	return false;
	}

	//Clears request flag
	if ((string)$request_flag !== "0") {
	$CurrentPerso->delete_flag($request_flag);
	}

	return true;
	}

	/*
	* Sets current perso's local location
	* @param string $location_local the local location
	* @return GeoLocation the current perso's GeoLocation object
	*
	* We don't require a security hash. If the users want to play with it, no problem.
	* You generally moves inside a global location as you wish.
	* So, if you write a story capturing a perso, use flags to handle this escape!
	*/
	static function set_local_location ($location_local) {
	global $CurrentPerso;

	//Ensures we've the correct amount of arguments
	if (func_num_args() < 1) return null;

	//Moves current perso to specified location
	$CurrentPerso->move_to(null, $location_local);

	//Returns GeoLocation relevant instance
	return $CurrentPerso->location;
	}

	/*
	* Handles upload content form
	* @return string new content path
	*/
	static function upload_content () {
	global $CurrentPerso, $CurrentUser;
	require_once('includes/objects/content.php');
	-
	//Initializes a new content instance
	$content = new Content();

	//Reads form
	$content->load_from_form();

	//Sets current user/perso parameters
	$content->user_id = $CurrentUser->id;
	$content->perso_id = $CurrentPerso->id;
	$content->location_global = $CurrentPerso->location_global;

	//Saves file
	if ($content->handle_uploaded_file($_FILES['artwork'])) {
	$content->save_to_database();
	$content->generate_thumbnail();
	return true;
	}

	return false;
	}
	/*
	*
	* @return Array content files
	*/
	static function get_content ($location_global) {
	//Ensures we've the correct amount of arguments
	if (func_num_args() < 1) return null;

	//Checks hash
	$args = func_get_args();
	if (!self::is_hash_valid($args)) {
	return false;
	}

	require_once('includes/objects/content.php');
	return Content::get_local_content($location_global, $_GET['location_local']);
	}
	}

	////////////////////////////////////////////////////////////////////////////////
	///
	/// Handles request
	///

	//You really should use $_SERVER['PATH_INFO']
	//i.e. calling /do.php/your request without any mod rewrite intervention
	//
	//If you choose otherwise, uncomment and tweak one of the following lines:
	//$Config['SiteURL'] = 'http://yourserver/zed/do.php';
	//$Config['SiteURL'] = get_server_url() . '/do.php';
	$args = get_current_url_fragments();

	$method = array_shift($args);

	if ($_REQUEST['debug']) {
	//Debug version
	//Most of E_STRICT errors are evaluated at the compile time thus such errors
	//are not reported
	ini_set('display_errors', 'stderr');
	error_reporting(-1);
	if (method_exists('Actions', $method)) {
	$result = call_user_func_array(array('Actions', $method), $args);
	echo json_encode($result);
	} else {
	echo "<p>Method doesn't exist: $method</p>";
	}

	if (array_key_exists('redirectTo', $_REQUEST)) {
	//If user JS disabled, you can add ?redirectTo= followed by an URL
	echo "<p>Instead to print a callback value, redirects to <a href=\"$_REQUEST[redirectTo]\">$_REQUEST[redirectTo]</a></p>";
	}
	} else {
	//Prod version doesn't prints warning <== silence operator
	if (method_exists('Actions', $method)) {
	$result = @call_user_func_array(array('Actions', $method), $args);

	if (array_key_exists('redirectTo', $_REQUEST)) {
	//If user JS disabled, you can add ?redirectTo= followed by an URL
	header("location: " . $_REQUEST['redirectTo']);
	} else {
	echo json_encode($result);
	}
	}
	}

	?>
	\ No newline at end of file
	diff --git a/includes/objects/content.php b/includes/objects/content.php
	index ff4f37c..911250b 100644
	--- a/includes/objects/content.php
	+++ b/includes/objects/content.php
	@@ -1,259 +1,270 @@
	<?php

	/*
	* Content class
	*
	* 0.1 2010-02-24 15:57 Autogenerated by Pluton Scaffolding
	*
	* @package Zed
	* @copyright Copyright (c) 2010, Dereckson
	* @license Released under BSD license
	* @version 0.1
	* @todo remove dbc temporary limitations (cf. /do.php upload_content and infra)
	* @todo create a class ContentLocation and move location fields there
	* @todo validate SQL schema and add in config.php TABLE_CONTENT tables
	*
	* [DESIGN BY CONTRACT] This class works only with the following assertions:
	* i. Each content have EXACTLY ONE location
	* ii. Location fields will not be modified
	*
	* If a content have more than one location, only the first occurence in
	* content_locations table will be considered.
	*
	* If a content have no location, it will be ignored.
	*
	* If you edit content location, then call saveToDatabase, you will create
	* a new location but future instances will contain first not deleted location.
	*
	*/
	class Content {

	/* -------------------------------------------------------------
	Properties
	- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */

	public $id;
	public $path;
	public $user_id;
	public $perso_id;
	public $title;

	public $location_global = null;
	public $location_local = null;
	public $location_k = null;

	public $perso_name;
	public $perso_nickname;

	/* -------------------------------------------------------------
	Constructor, __toString
	- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */

	/*
	* Initializes a new Content instance
	* @param int $id the primary key
	*/
	function __construct ($id = null) {
	if ($id) {
	$this->id = $id;
	$this->load_from_database();
	}
	}

	/*
	* Returns a string representation of current Content instance
	* @return string the content title or path if title is blank.
	*/
	function __toString () {
	return $this->title ? $this->title : $this->path;
	}

	/* -------------------------------------------------------------
	Load/save class
	- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */

	/*
	* Loads the object Content (ie fill the properties) from the $_POST array
	* @param boolean $allowSensibleFields if false, allow only location_local, location_k and title to be defined ; otherwise, allow all fields.
	*/
	function load_from_form ($allowSensibleFields = false) {
	if (array_key_exists('title', $_POST)) $this->title = $_POST['title'];
	if (array_key_exists('location_local', $_POST)) $this->location_local = $_POST['location_local'];
	if (array_key_exists('location_k', $_POST)) $this->location_k = $_POST['location_k'];

	if ($allowSensibleFields) {
	if (array_key_exists('path', $_POST)) $this->path = $_POST['path'];
	if (array_key_exists('user_id', $_POST)) $this->user_id = $_POST['user_id'];
	if (array_key_exists('perso_id', $_POST)) $this->perso_id = $_POST['perso_id'];
	if (array_key_exists('location_global', $_POST)) $this->location_global = $_POST['location_global'];
	}
	}

	/*
	* Loads the object Content (ie fill the properties) from the database
	*/
	function load_from_database () {
	global $db;
	$id = $db->sql_escape($this->id);
	$sql = "SELECT * FROM content WHERE content_id = '" . $id . "'";
	if ( !($result = $db->sql_query($sql)) ) message_die(SQL_ERROR, "Unable to query content", '', __LINE__, __FILE__, $sql);
	if (!$row = $db->sql_fetchrow($result)) {
	$this->lastError = "Content unkwown: " . $this->id;
	return false;
	}
	$this->load_from_row($row);
	return true;
	}

	/*
	* Loads the object from row
	*/
	function load_from_row ($row) {
	$this->id = $row['content_id'];
	$this->path = $row['content_path'];
	$this->user_id = $row['user_id'];
	$this->perso_id = $row['perso_id'];
	$this->title = $row['content_title'];
	$this->location_global = $row['location_global'];
	$this->location_local = $row['location_local'];
	$this->location_k = $row['location_k'];

	if (array_key_exists('perso_name', $row)) $this->perso_name = $row['perso_name'];
	if (array_key_exists('perso_nickname', $row)) $this->perso_nickname = $row['perso_nickname'];
	}

	/*
	* Saves to database
	*/
	function save_to_database () {
	global $db;

	$id = $this->id ? "'" . $db->sql_escape($this->id) . "'" : 'NULL';
	$path = $db->sql_escape($this->path);
	$user_id = $db->sql_escape($this->user_id);
	$perso_id = $db->sql_escape($this->perso_id);
	$title = $db->sql_escape($this->title);

	$location_global = ($this->location_global !== null) ? "'" . $db->sql_escape($this->location_global) . "'" : 'NULL';
	$location_local = ($this->location_local !== null) ? "'" . $db->sql_escape($this->location_local) . "'" : 'NULL';
	$location_k = ($this->location_k !== null) ? "'" . $db->sql_escape($this->location_k) . "'" : 'NULL';

	//Updates or inserts
	$sql = "REPLACE INTO content_files (`content_id`, `content_path`, `user_id`, `perso_id`, `content_title`) VALUES ($id, '$path', '$user_id', '$perso_id', '$title')";
	if (!$db->sql_query($sql)) {
	message_die(SQL_ERROR, "Can't save content", '', __LINE__, __FILE__, $sql);
	}

	if (!$this->id) {
	//Gets new record id value
	$this->id = $db->sql_nextid();
	}

	//Saves location
	$id = $this->id ? "'" . $db->sql_escape($this->id) . "'" : 'NULL';
	$sql = "REPLACE INTO content_locations (location_global, location_local, location_k, content_id) VALUES ($location_global, $location_local, $location_k, $id)";
	if (!$db->sql_query($sql))
	message_die(SQL_ERROR, "Can't save content location", '', __LINE__, __FILE__, $sql);
	}

	/* -------------------------------------------------------------
	File handling helper methods
	- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */

	/*
	* Determines if the extension is valid
	* @param string $ext The extension (without dot)
	* @return boolean true if this extension is valid ; otherwise, false.
	*/
	function is_valid_extension ($ext) {
	switch ($ext = strtolower($ext)) {
	//Pictures
	case 'jpg':
	case 'gif':
	case 'png':
	case 'bmp':
	case 'xbm':
	return true;

	//Denied extension
	default:
	return false;
	}
	}

	+ /*
	+ * Creates a directory
	+ */
	+ function create_directory ($dir) {
	+ if (!file_exists($dir)) {
	+ @mkdir($dir); //Creates new directory, chmod 777
	+ }
	+ }
	+
	/*
	* @return boolean true if the file have been handled
	*/
	function handle_uploaded_file ($fileArray) {
	if (count($fileArray) && $fileArray['error'] == 0) {
	+ $this->create_directory("content/users/$this->user_id");
	$this->path = "content/users/$this->user_id/$fileArray[name]";
	- if (!self::is_valid_extension(get_extension($file))) {
	+ if (!self::is_valid_extension(get_extension($fileArray[name]))) {
	return false;
	}
	if (move_uploaded_file($fileArray['tmp_name'], $this->path)) {
	return true;
	} else {
	$this->path = null;
	return false;
	}
	} else {
	return false;
	}
	}

	/*
	* Generates a thumbnail using ImageMagick binary
	* @return boolean true if the thumbnail command returns 0 as program exit code ; otherwise, false
	*/
	function generate_thumbnail () {
	global $Config;

	//Builds thumbnail filename
	$sourceFile = $this->path;
	$pos = strrpos($this->path, '.');
	$thumbnailFile = substr($sourceFile, 0, $pos) . 'Square' . substr($sourceFile, $pos);

	//Executes imagemagick command
	- $command = $Config['ImageMagick']['convert'] . " $sourceFile -resize 162x162 $thumbnailFile";
	- @system($command, $code);
	+ $command = $Config['ImageMagick']['convert'] . " \"$sourceFile\" -resize 162x162 \"$thumbnailFile\"";
	+ echo "$command";
	+ system($command, $code);

	//Returns true if the command have exited with errorcode 0 (= ok)
	return ($code == 0);
	}

	/* -------------------------------------------------------------
	Gets content
	- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */

	/*
	* Gets content at specified location
	* @param string $location_global global content location
	* @param string $location_local local content location
	* @return Array array of Content instances
	*/
	static function get_local_content ($location_global, $location_local) {
	global $db;

	//Get contents at this location
	$location_global = $db->sql_escape($location_global);
	$location_local = $db->sql_escape($location_local);

	$sql = "SELECT c.*, p.perso_nickname, p.perso_name FROM content c, persos p WHERE c.location_global = '$location_global' AND c.location_local = '$location_local' AND p.perso_id = c.perso_id ORDER BY location_k ASC";
	if (!$result = $db->sql_query($sql)) {
	message_die(SQL_ERROR, "Can't get content", '', __LINE__, __FILE__, $sql);
	}

	//Fills content array
	$contents = array();
	while ($row = $db->sql_fetchrow($result)) {
	$content = new Content();
	$content->load_from_row($row);
	$contents[] = $content;
	}

	return $contents;
	}

	}

	?>
	\ No newline at end of file
	diff --git a/js/tour.js b/js/tour.js
	index f19ec91..49754ad 100644
	--- a/js/tour.js
	+++ b/js/tour.js
	@@ -1,148 +1,154 @@
	/* -------------------------------------------------------------
	Zed
	- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	Author: Dereckson
	Tags: animation jquery l10n
	Filename: tour.js
	Version: 1.0
	Created: 2010-01-25
	Updated: 2010-02-03
	Licence: Dual licensed: BSD and Creative Commons BY 3.0.
	Dependencies: jQuery (for dom elements selection and dimensions.js)
	dimensions.js
	------------------------------------------------------------- */

	var tour = {
	//Default language
	lang: "en",

	//Translated in
	langs: "en,fr",

	//Current highlight showed
	current: -1,

	//File extension
	extension: "png",

	//Highlights files and position
	//File: /img/tour/{filename}.{extension}
	highlights: [
	["create", 13, 18],
	["lounge", 339, 107],
	["play", 22, 345],
	["explore", 325, 373]
	],

	//The center x, y coordinate
	//It's used to determinate what highlight to print
	center: [368, 390],

	//Gets the highlight index, from position
	where: function(x, y) {
	if (x < this.center[0]) {
	//We're at left from center point
	return (y < this.center[1]) ? 0 : 2;
	} else {
	//We're at right from center point
	return (y < this.center[1]) ? 1 : 3;
	}
	},

	//Determines if we're inside the #Tour id
	isInside: function (pageX, pageY) {
	var tourOffset = $("#Tour").offset();
	return pageX >= tourOffset.left && pageY >= tourOffset.top
	&& pageX <= tourOffset.left + $("#Tour").width()
	&& pageY <= tourOffset.top + $("#Tour").height();
	},

	//Shows the highlight at specified the page position
	showAt: function (pageX, pageY) {
	var tourOffset = $("#Tour").offset();
	this.show(
	this.where(pageX - tourOffset.left , pageY - tourOffset.top)
	);
	},

	//Shows the specified highlight
	show: function (i) {
	if (this.current != i) {
	var filename = this.highlights[i][0] + "_" + this.lang + "." + this.extension;
	var code = '<img src="img/tour/' + filename + '" alt="' + this.highlights[i][0] + '" />';
	$('#TourHighlight').empty().html(code);
	var o = document.getElementById("TourHighlight");
	o.style.left = this.highlights[i][1] + "px";
	o.style.top = this.highlights[i][2] + "px";
	this.current = i;
	}
	},

	//Hides highlight
	hideall: function () {
	if (this.current > -1) {
	this.current = -1;
	$('#TourHighlight').empty();
	}
	},

	//Runs the animation
	run: function (delay) {
	//Highlight order
	//[0, 1, 3, 2] is a counterwise move
	var order = [0, 1, 3, 2];

	//Prints first hightlight
	this.show(order[0]);

	//Prints next highlights
	n = this.highlights.length;
	for (i = 1 ; i < n ; i++) {
	setTimeout('tour.show(' + order[i] + ')', delay * i);
	}

	//Prints back the first, and enables rollover
	setTimeout('tour.show(' + order[0] + ')', delay * n);
	setTimeout('tour.enableRollover()', delay * n);
	},

	//Enables rollovers
	enableRollover: function () {
	//Enables panel on click
	$('#Tour').bind("mousemove mouseout", function(e) {
	if (tour.isInside(e.pageX, e.pageY)) {
	tour.showAt(e.pageX, e.pageY);
	} else {
	tour.hideall();
	}
	});
	},

	//Gets client language (Firefox) or preferences content language (IE)
	getLanguage: function () {
	var lang = navigator.language;
	if (lang == undefined) lang = navigator.userLanguage;
	if (lang == undefined) return "";

	//fr-be -> fr
	var pos = lang.indexOf('-');
	if (pos > -1) lang = lang.substring(0, pos);

	return lang.toLowerCase();
	},

	//Initializes tour
	init: function () {
	//Tries to localize
	var lang = this.getLanguage();
	if (this.langs.indexOf(lang) > -1) this.lang = lang;

	//Runs tour animation
	//The rollover will be enabled at anim end
	this.run(900);
	+
	+ //Makes the tour clickable
	+ $('#Tour').bind("click", function(e) {
	+ document.location.href = "/";
	+ });
	}
	}

	$(document).ready(function() {
	- tour.init();
	-});
	\ No newline at end of file
	+ tour.init();
	+});
	+
	diff --git a/lang/en/scenes.conf b/lang/en/scenes.conf
	index cf8649e..86b53f5 100644
	--- a/lang/en/scenes.conf
	+++ b/lang/en/scenes.conf
	@@ -1,12 +1,14 @@
	#Zed language config file - scenes
	#Language: English
	-#Code: fr
	+#Code: en
	#Author: Dereckson

	###
	### Hypership tower
	###

	[B00001001]
	-UploadNewArtwork = "Téléverser une œuvre"
	-UploadNewArtworkDescription = "Ce cadre est libre. Vous pouvez exposer ici l'un de vos travaux ou tout autre que vous appréciez."
	+UploadNewArtwork = "Upload new artwork"
	+UploadNewArtworkDescription = "This frame is free. You can display here your artwork or any other artwork you like."
	+UploadNewArtworkPicture = "Picture"
	+UploadNewArtworkTitle = "Title"
	\ No newline at end of file

File Metadata

Mime Type: text/x-diff
Expires: Mon, Nov 4, 00:28 (3 w, 5 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 20987
Default Alt Text: (32 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions