Permalink
Browse files

added WebLoader dependency

  • Loading branch information...
1 parent f99c343 commit ca16fdf9f0f70415e29c160fa45c27b389fd1ad4 @juzna committed Aug 1, 2012
Showing with 19 additions and 5 deletions.
  1. +10 −0 app/presenters/BasePresenter.php
  2. +3 −4 app/templates/@layout.latte
  3. +6 −1 composer.json
@@ -6,4 +6,14 @@
abstract class BasePresenter extends Nette\Application\UI\Presenter
{
+ protected function createComponentCss()
+ {
+ return $this->context->webLoader->css;
+ }
+
+ protected function createComponentJavascript()
+ {
+ return $this->context->webLoader->javascript;
+ }
+
}
@@ -16,12 +16,11 @@
<title>{block title|striptags|upper}Nette Application Skeleton{/block}</title>
- <link rel="stylesheet" media="screen,projection,tv" href="{$basePath}/css/screen.css" type="text/css">
- <link rel="stylesheet" media="print" href="{$basePath}/css/print.css" type="text/css">
+ {control css}
+ {control javascript}
+
<link rel="shortcut icon" href="{$basePath}/favicon.ico" type="image/x-icon">
- <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>
- <script type="text/javascript" src="{$basePath}/js/netteForms.js"></script>
{block head}{/block}
</head>
View
@@ -10,6 +10,10 @@
"homepage": "http://davidgrudl.com"
},
{
+ "name": "Jan Dolecek",
+ "email": "juzna.cz@gmail.com"
+ },
+ {
"name": "Nette Community",
"homepage": "https://github.com/nette/nette/contributors"
}
@@ -20,7 +24,8 @@
"require": {
"php": ">= 5.3.0",
"nette/nette": ">= 2.0.4",
- "nette/addon-installer": "@dev"
+ "nette/addon-installer": "@dev",
+ "JanMarek/WebLoader": "dev-juznovo"
},
"minimum-stability": "dev",
"repositories": [

0 comments on commit ca16fdf

Please sign in to comment.