fixed: code

felix-lambert · Jun 2, 2014 · f7f28ee · f7f28ee
1 parent a855343
commit f7f28ee
Show file tree

Hide file tree

Showing 56 changed files with 38 additions and 300 deletions.
diff --git a/angularjs-bootstrap/tmp/app.js b/angularjs-bootstrap/tmp/app.js
diff --git a/angularjs-bootstrap/tmp/controllers-home.js b/angularjs-bootstrap/tmp/controllers-home.js
diff --git a/angularjs-bootstrap/tmp/controllers-user.js b/angularjs-bootstrap/tmp/controllers-user.js
diff --git a/angularjs-bootstrap/tmp/css-app.css b/angularjs-bootstrap/tmp/css-app.css
diff --git a/angularjs-bootstrap/views/_layout.html b/angularjs-bootstrap/views/_layout.html
@@ -13,6 +13,7 @@
     <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" />
     <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css" />
     @{head}
+    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
     <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
     @{favicon('favicon.ico')}
 

diff --git a/angularjs-common/views/app.html b/angularjs-common/views/app.html
@@ -4,7 +4,7 @@
 @{ngStyle('app')}
 
 <!-- cdnjs -->
-@{ngLocale('~en-us')}
+@{ngLocale('en-us')}
 
 <!-- /app/controllers/ -->
 @{ngController('home', 'user')}

diff --git a/assertion-testing/tests/default.js b/assertion-testing/tests/default.js
@@ -12,20 +12,16 @@ exports.run = function(framework, name) {
 	});
 
 	framework.assert('Test URL 1', '/1/', ['GET'], function(error, data, code, headers, cookies, name) {
-		console.log(data, code)
 		assert.ok(code === 200 && data === '1', name);
-		console.log('1');
 	});
 
 	framework.assert('Test URL 2', '/2/', ['GET'], function(error, data, code, headers, cookies, name) {
 		assert.ok(code === 200 && data === '2', name);
-		console.log('2');
 	});
 
 	framework.assert('Test URL 3', '/3/', ['GET'], function(error, data, code, headers, cookies, name) {
 		// throws error, data === 4
 		assert.ok(code === 200 && data === '3', name);
-		console.log('3');
 	});
 
 };
diff --git a/async/views/homepage.html b/async/views/homepage.html
@@ -18,7 +18,9 @@
 </head>
 <body>
 
-	@{!model.join('<br />')}
+	@{foreach m in model}
+		<div>@{m}</div>
+	@{end}
 
 </body>
 </html>
diff --git a/authorization-www-basic/controllers/default.js b/authorization-www-basic/controllers/default.js
@@ -5,7 +5,7 @@ exports.install = function(framework) {
 function authorization() {
 
 	var self = this;
-	var user = self.baa('This is secure area');
+	var user = self.baa('This is secured area');
 
 	if (user === null) {
 		// self.baa() automatically will send a response to an authentication.

diff --git a/authorization/databases/users-logs.nosql b/authorization/databases/users-logs.nosql
@@ -8,3 +8,4 @@
 {"id":1,"email":"[email protected]","ip":"127.0.0.1","date":"2013-12-27T22:33:40.839Z"}
 {"id":1,"email":"[email protected]","ip":"127.0.0.1","date":"2013-12-27T22:34:38.823Z"}
 {"id":1,"email":"[email protected]","ip":"127.0.0.1","date":"2014-03-02T08:10:29.987Z"}
+{"id":1,"email":"[email protected]","ip":"127.0.0.1","date":"2014-05-29T06:01:40.119Z"}
diff --git a/components/components/grid.js b/components/components/grid.js
@@ -1,8 +1,8 @@
 var configuration = { class: 'grid' };
 
 exports.install = function(framework) {
-	// @#auto-vendor-prefix#@ = framework automatically adds prefixes
-	framework.fs.create.css('grid', '@#auto-vendor-prefix#@\n.grid{width:100%;border:1px solid #E0E0E0;border-right:0;border-bottom:0;font:normal 11px Arial;color:gray}.grid td{border:1px solid #E0E0E0;border-left:0;border-top:0;padding:5px 8px}', true);
+	// /*auto*/ = framework automatically adds vendor prefixes
+	framework.fs.create.css('grid', '/*auto*/\n.grid{width:100%;border:1px solid #E0E0E0;border-right:0;border-bottom:0;font:normal 11px Arial;color:gray}.grid td{border:1px solid #E0E0E0;border-left:0;border-top:0;padding:5px 8px}', true);
 };
 
 exports.configure = function(obj) {

diff --git a/components/public/css/grid.css b/components/public/css/grid.css
@@ -1,3 +1,2 @@
 @#auto-vendor-prefix#@
-
 .grid{width:100%;border:1px solid #E0E0E0;border-right:0;border-bottom:0;font:normal 11px Arial;color:gray}.grid td{border:1px solid #E0E0E0;border-left:0;border-top:0;padding:5px 8px}
diff --git a/css-auto-vendor-prefixes/public/css/default.css b/css-auto-vendor-prefixes/public/css/default.css
@@ -1,4 +1,5 @@
-@#auto-vendor-prefix#@
+/*auto*/
+
 body { margin:50px; background-color: #E0E0E0; }
 
 div { color: red; box-shadow: 10px 10px 5px silver; border-radius: 10px 10px 10px 10px; background-color: white; padding:10px; }

diff --git a/email-send/readme.md b/email-send/readme.md
@@ -0,0 +1,3 @@
+# E-mail templating
+
+Example: <https://github.com/totaljs/examples/tree/master/controller-mail>
diff --git a/email-templating-view/config-debug b/email-templating-view/config-debug
diff --git a/email-templating-view/controllers/default.js b/email-templating-view/controllers/default.js
diff --git a/email-templating-view/definitions/mail.js b/email-templating-view/definitions/mail.js
diff --git a/email-templating-view/views/mail.html b/email-templating-view/views/mail.html
diff --git a/email-templating/config-debug b/email-templating/config-debug
diff --git a/email-templating/controllers/default.js b/email-templating/controllers/default.js
diff --git a/email-templating/definitions/mail.js b/email-templating/definitions/mail.js
diff --git a/email-templating/index.js b/email-templating/index.js
diff --git a/email-templating/resources/en.resource b/email-templating/resources/en.resource
diff --git a/forms/controllers/default.js b/forms/controllers/default.js
@@ -6,8 +6,6 @@ exports.install = function(framework) {
 function view_registration() {
 	var self = this;
 
-	self.repository.title = 'Registration';	
-
 	var model = {
 		type: 0,
 		name: '',
@@ -36,7 +34,7 @@ function json_registration() {
 	var self = this;
 
 	self.repository.country = ['', 'SK', 'CZ', 'EN', 'DE', 'AU', 'HU', 'PL', 'FR'];
-	
+
 	self.repository.type = [
 		{ id: 0, name: '' },
 		{ id: 1, name: 'Developer' },

diff --git a/forms/views/_layout.html b/forms/views/_layout.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>@{repository.title}</title>
+    <title>Registration</title>
     <meta charset="utf-8" />
 	<meta http-equiv="content-language" content="sk" />
 	<meta http-equiv="X-UA-Compatible" content="IE=10" />

diff --git a/framework-schema-validation/controllers/default.js b/framework-schema-validation/controllers/default.js
@@ -9,7 +9,7 @@ function plain_homepage() {
 	var self = this;
 
 	// send test request to /order/
-	utils.request(self.host('/order/'), 'POST', 'firstname=Peter&lastname=Sirka&email=[email protected]&telephone=0903163302&address=&inject=1&inject=2&param=custom');
+	utils.request(self.host('/order/'), ['post'], { firstname: 'Peter', lastname: 'Sirka', email: '[email protected]', telephone: '0903163302', address: '', inject1: '', inject2: '', param: 'custom' });
 
 	self.plain('Show node.js console');
 }

diff --git a/framework-schema/controllers/default.js b/framework-schema/controllers/default.js
@@ -9,7 +9,7 @@ function plain_homepage() {
 	var self = this;
 
 	// send test request to /order/
-	utils.request(self.host('/order/'), 'POST', 'firstname=Peter&lastname=Sirka&email=[email protected]&telephone=0903163302&address=&inject=1&inject=2&param=custom');
+	utils.request(self.host('/order/'), ['post'], { firstname: 'Peter', lastname: 'Sirka', email: '[email protected]', telephone: '0903163302', address: '', inject1: '', inject2: '', param: 'custom' });
 
 	self.plain('Show node.js console');
 }

diff --git a/minimal/index.js → minimal-configuration/index.js b/minimal/index.js → minimal-configuration/index.js
diff --git a/models/controllers/default.js b/models/controllers/default.js
@@ -4,6 +4,6 @@ exports.install = function(framework) {
 
 function json_homepage() {
 	var self = this;
-	var user = self.model('user');
+	var user = MODEL('user');
 	self.json(user, true);
 }
diff --git a/navigation-sitemap/templates/sitemap.html b/navigation-sitemap/templates/sitemap.html
@@ -1,5 +1,5 @@
 <ul>
-	<!--
-	<li><a href="{url}">{name}</a></li>
-	-->
+	@{foreach}
+	<li><a href="@{model.url}">@{model.name}</a></li>
+	@{end}
 </ul>
diff --git a/navigation-sitemap/views/homepage.html b/navigation-sitemap/views/homepage.html
@@ -16,5 +16,14 @@
 
 	@{template('sitemap', sitemap())}
 
+	<br />
+	<!-- OR -->
+	<br />
+
+	@{foreach m in sitemap()}
+		<div>@{m.name}, relative url: @{m.url}</div>
+	@{end}
+
+
 </body>
 </html>
diff --git a/pagination/templates/paging1.html b/pagination/templates/paging1.html
@@ -1,6 +1,6 @@
 <div class="mb5">Paging:</div>
 <div class="paging">
-	<!--
-	<a href="@{model.url}">@{model.page}</a>
-	-->
+	@{foreach}
+    	<a href="@{model.url}">@{model.page}</a>
+	@{end}
 </div>
diff --git a/pagination/templates/paging2.html b/pagination/templates/paging2.html
@@ -1,7 +1,7 @@
 <div class="mb5">Paging @{repository.page}/@{repository.count}:</div>
 <div class="paging">
-	<!--
-	<a href="@{model.url}"@{if model.selected} class="selected"@{endif}>@{model.page}</a>
-	-->
+    @{foreach m in model}
+	   <a href="@{m.url}"@{if m.selected} class="selected"@{endif}>@{m.page}</a>
+	@{end}
 	<div>@{repository.items.format('### ###')} items</div>
 </div>
diff --git a/pagination/views/homepage.html b/pagination/views/homepage.html
@@ -1,4 +1,4 @@
-@{template('paging1', model.render(), model)}
+@{template('paging1', model.render())}
 
 <hr />
 

diff --git a/routing-advanced/controllers/admin/articles.js b/routing-advanced/controllers/admin/articles.js
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,2 @@
		@#auto-vendor-prefix#@

		.grid{width:100%;border:1px solid #E0E0E0;border-right:0;border-bottom:0;font:normal 11px Arial;color:gray}.grid td{border:1px solid #E0E0E0;border-left:0;border-top:0;padding:5px 8px}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# E-mail templating

		Example: <https://github.com/totaljs/examples/tree/master/controller-mail>