typos

nette · Nov 7, 2012 · 960e7ae · 960e7ae
1 parent b76f28b
commit 960e7ae
Show file tree

Hide file tree

Showing 16 changed files with 141 additions and 263 deletions.
diff --git a/CD-collection/app/templates/@layout.latte b/CD-collection/app/templates/@layout.latte
@@ -12,15 +12,13 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta http-equiv="Content-Language" content="en" />
-
+	<meta charset="utf-8">
 	<meta name="description" content="Nette Framework example" />
 	<meta n:ifset="$robots" name="robots" content="{$robots}">
 
 	<title>{block #title|striptags|trim}{/block} | Nette example</title>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="{$basePath}/css/site.css" />
+	<link rel="stylesheet" media="screen" href="{$basePath}/css/site.css" />
 	<script src="http://nette.github.com/resources/js/netteForms.js"></script>
 </head>
 

diff --git a/Demo/Finder.filters.php b/Demo/Finder.filters.php
@@ -60,11 +60,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<meta http-equiv="content-type" content="text/html; charset=utf-8">
-
+	<meta charset="utf-8">
 	<title>Nette\Finder custom filters | Nette Framework</title>
-
-	<link rel="stylesheet" type="text/css" media="screen" href="files/style.css" />
+	<link rel="stylesheet" media="screen" href="files/style.css" />
 </head>
 
 <body>

diff --git a/Fifteen/app/templates/Default.default.latte b/Fifteen/app/templates/Default.default.latte
@@ -1,16 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<meta http-equiv="content-type" content="text/html; charset=utf-8">
-	<meta http-equiv="content-language" content="en">
-	<meta http-equiv="imagetoolbar" content="no">
-	<meta name="author" content="David Grudl">
-	<meta name="copyright" content="David Grudl">
-	<link rel="stylesheet" type="text/css" media="screen" href="{$basePath}/css/style.css">
-
+	<meta charset="utf-8">
 	<title>Fifteen - Nette Framework example</title>
-
-	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js" type="text/javascript"></script>
+	<link rel="stylesheet" media="screen" href="{$basePath}/css/style.css">
+	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8/jquery.min.js" type="text/javascript"></script>
 	<script src="{$basePath}/js/fifteen.js" type="text/javascript"></script>
 	<script src="{$basePath}/js/jquery.nette.js" type="text/javascript"></script>
 </head>

diff --git a/Fifteen/www/js/fifteen.js b/Fifteen/www/js/fifteen.js
@@ -6,28 +6,34 @@ jQuery(function($) {
 
 	var active = false;
 
-	$('.fifteen a.ajax').live('click', function(event) {
+	$('body').on('click', '.fifteen a.ajax', function(event) {
 		event.preventDefault();
 		event.stopImmediatePropagation();
-		if (active || $.active) return;
+		if (active || $.active) {
+			return;
+		}
 
 		active = true;
 		var payload;
 		var delta = $(this).attr('rel').split(',');
 		var img = $('img', this);
 		img.css('z-index', 1000);
 		img.animate({
-			'left': delta[0] * (img.attr('width') + 1) + 'px',
-			'top': delta[1] * (img.attr('height') + 1) + 'px'
+			left: delta[0] * img.attr('width'),
+			top: delta[1] * img.attr('height')
 		});
 		img.queue(function() {
 			active = false;
-			if (payload) $.nette.success(payload);
+			if (payload) {
+				$.nette.success(payload);
+			}
 		});
 
 		$.post($.nette.href = this.href, function(data) {
 			payload = data;
-			if (!active) $.nette.success(payload);
+			if (!active) {
+				$.nette.success(payload);
+			}
 		});
 
 		$.nette.spinner.css({

diff --git a/Fifteen/www/js/jquery.nette.js b/Fifteen/www/js/jquery.nette.js
@@ -16,20 +16,16 @@ if (typeof jQuery != 'function') {
 (function($) {
 
 	$.nette = {
-		success: function(payload)
-		{
-			// redirect
+		success: function(payload) {
 			if (payload.redirect) {
 				window.location.href = payload.redirect;
 				return;
 			}
 
-			// state
 			if (payload.state) {
 				$.nette.state = payload.state;
 			}
 
-			// snippets
 			if (payload.snippets) {
 				for (var i in payload.snippets) {
 					$.nette.updateSnippet(i, payload.snippets[i]);
@@ -42,14 +38,12 @@ if (typeof jQuery != 'function') {
 			}
 		},
 
-		updateSnippet: function(id, html)
-		{
+		updateSnippet: function(id, html) {
 			$('#' + id).html(html);
 		},
 
 		// create animated spinner
-		createSpinner: function(id)
-		{
+		createSpinner: function(id) {
 			return this.spinner = $('<div></div>').attr('id', id ? id : 'ajax-spinner').ajaxStart(function() {
 				$(this).show();
 

diff --git a/Forms/CSRF-protection.php b/Forms/CSRF-protection.php
@@ -15,35 +15,29 @@
 
 
 $form = new Form;
-
 $form->addProtection('Security token did not match. Possible CSRF attack.', 3);
-
 $form->addHidden('id')->setDefaultValue(123);
 $form->addSubmit('submit', 'Delete item');
 
 
 
-// Check if form was successfully submitted?
-if ($form->isSubmitted() && $form->isValid()) {
+if ($form->isSuccess()) {
 	echo '<h2>Form was submitted and successfully validated</h2>';
-
 	Debugger::dump($form->values);
 
 	exit; // here is usually redirect to another page
 }
 
 
 
-// Render form
 ?>
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<meta http-equiv="content-type" content="text/html; charset=utf-8">
-
+	<meta charset="utf-8">
 	<title>Nette\Forms CSRF protection example | Nette Framework</title>
 
-	<style type="text/css">
+	<style>
 	.required {
 		color: maroon
 	}
@@ -64,7 +58,7 @@
 		text-align: right;
 	}
 	</style>
-	<link rel="stylesheet" type="text/css" media="screen" href="files/style.css" />
+	<link rel="stylesheet" media="screen" href="files/style.css" />
 </head>
 
 <body>

diff --git a/Forms/basic-example.php b/Forms/basic-example.php
@@ -2,10 +2,6 @@
 
 /**
  * Nette\Forms basic example.
- *
- * - form definition using fluent interfaces
- * - form groups usage
- * - default rendering
  */
 
 
@@ -18,25 +14,6 @@
 Debugger::enable();
 
 
-$countries = array(
-	'Europe' => array(
-		'CZ' => 'Czech Republic',
-		'SK' => 'Slovakia',
-		'GB' => 'United Kingdom',
-	),
-	'CA' => 'Canada',
-	'US' => 'United States',
-	'?'  => 'other',
-);
-
-$sex = array(
-	'm' => 'male',
-	'f' => 'female',
-);
-
-
-
-// Define form with validation rules
 $form = new Form;
 
 // group Personal data
@@ -51,7 +28,10 @@
 	->addRule($form::INTEGER, 'Age must be numeric value')
 	->addRule($form::RANGE, 'Age must be in range from %d to %d', array(10, 100));
 
-$form->addRadioList('gender', 'Your gender:', $sex);
+$form->addRadioList('gender', 'Your gender:', array(
+	'm' => 'male',
+	'f' => 'female',
+));
 
 $form->addText('email', 'Email:')
 	->setEmptyValue('@')
@@ -78,6 +58,14 @@
 	->addConditionOn($form['send'], $form::EQUAL, TRUE)
 		->addRule($form::FILLED, 'Enter your shipping address');
 
+$countries = array(
+	'Europe' => array(
+		'CZ' => 'Czech Republic',
+		'SK' => 'Slovakia',
+	),
+	'US' => 'USA',
+	'?'  => 'other',
+);
 $form->addSelect('country', 'Country:', $countries)
 	->setPrompt('Select your country')
 	->addConditionOn($form['send'], $form::EQUAL, TRUE)
@@ -112,41 +100,32 @@
 
 
 
-// Check if form was submitted?
 if ($form->isSubmitted()) {
-
-	// Check if form is valid
 	if ($form->isValid()) {
 		echo '<h2>Form was submitted and successfully validated</h2>';
-
 		Debugger::dump($form->values);
 
 		exit; // here is usually redirect to another page
 	}
 
 } else {
-	// not submitted, define default values
-	$defaults = array(
+	$form->setDefaults(array( // not submitted, define default values
 		'name'    => 'John Doe',
 		'userid'  => 231,
-		'country' => 'CZ', // Czech Republic
-	);
-
-	$form->setDefaults($defaults);
+		'country' => 'CZ',
+	));
 }
 
 
 
-// Render form
 ?>
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<meta http-equiv="content-type" content="text/html; charset=utf-8">
-
+	<meta charset="utf-8">
 	<title>Nette\Forms basic example | Nette Framework</title>
 
-	<style type="text/css">
+	<style>
 	.required {
 		color: maroon
 	}
@@ -167,7 +146,7 @@
 		text-align: right;
 	}
 	</style>
-	<link rel="stylesheet" type="text/css" media="screen" href="files/style.css" />
+	<link rel="stylesheet" media="screen" href="files/style.css" />
 	<script src="http://nette.github.com/resources/js/netteForms.js"></script>
 </head>