Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

use view helper functions for scripts/styles; address other feedback …

…from @larzconwell; revert accidental Makefile change
  • Loading branch information...
commit 243591c531cd8f516b3385cc8faa0e8c192db042 1 parent bebccdc
@kengoldfarb kengoldfarb authored
View
1  Makefile
@@ -29,6 +29,7 @@ install:
@mkdir -p $(DESTDIR)$(PREFIX)/bin && \
mkdir -p $(DESTDIR)$(PREFIX)/lib/node_modules/geddy && \
mkdir -p ./node_modules && \
+ npm install jake utilities model barista && \
cp -R ./* $(DESTDIR)$(PREFIX)/lib/node_modules/geddy/ && \
ln -snf ../lib/node_modules/geddy/bin/cli.js $(DESTDIR)$(PREFIX)/bin/geddy && \
chmod 755 $(DESTDIR)$(PREFIX)/lib/node_modules/geddy/bin/cli.js && \
View
19 gen/base/realtime/views/swig/layouts/application.html.swig
@@ -9,18 +9,17 @@
<!-- The HTML5 shim, for IE6-8 support of HTML elements -->
<!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+ {{ scriptLink('http://html5shim.googlecode.com/svn/trunk/html5.js', {type: 'test/javascript'}) }}
<![endif]-->
+ {{ scriptLink('/js/jquery.min.js', {type: 'test/javascript'}) }}
+ {{ scriptLink('/js/bootstrap.min.js', {type: 'test/javascript'}) }}
+ {{ scriptLink('/js/core/core.js', {type: 'test/javascript'}) }}
+ <!-- {{ scriptLink('/js/models/your_model.js', {type: 'test/javascript'}) }} -->
+ {{ scriptLink('/js/config/init.js', {type: 'test/javascript'}) }}
- <script type="text/javascript" src="/js/jquery.min.js"></script>
- <script type="text/javascript" src="/js/bootstrap.min.js"></script>
- <script type="text/javascript" src="/js/core/core.js"></script>
- <!-- <script type="text/javascript" src="/js/models/your_model.js"></script> -->
- <script type="text/javascript" src="/js/config/init.js"></script>
-
- <link rel="stylesheet" href="/css/bootstrap.min.css">
- <link rel="stylesheet" href="/css/style.css">
- <link rel="stylesheet" href="/css/bootstrap.responsive.min.css">
+ {{ styleLink('/css/bootstrap.min.css', {rel:'stylesheet'}) }}
+ {{ styleLink('/css/style.css', {rel:'stylesheet'}) }}
+ {{ styleLink('/css/bootstrap.responsive.min.css', {rel:'stylesheet'}) }}
<!-- The fav and touch icons -->
<link rel="shortcut icon" href="/images/favicon.ico">
View
19 gen/base/views/swig/layouts/application.html.swig
@@ -9,18 +9,17 @@
<!-- The HTML5 shim, for IE6-8 support of HTML elements -->
<!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+ {{ scriptLink('http://html5shim.googlecode.com/svn/trunk/html5.js', {type: 'test/javascript'}) }}
<![endif]-->
+ {{ scriptLink('/js/jquery.min.js', {type: 'test/javascript'}) }}
+ {{ scriptLink('/js/bootstrap.min.js', {type: 'test/javascript'}) }}
+ {{ scriptLink('/js/core/core.js', {type: 'test/javascript'}) }}
+ <!-- {{ scriptLink('/js/models/your_model.js', {type: 'test/javascript'}) }} -->
+ {{ scriptLink('/js/config/init.js', {type: 'test/javascript'}) }}
- <script type="text/javascript" src="/js/jquery.min.js"></script>
- <script type="text/javascript" src="/js/bootstrap.min.js"></script>
- <script type="text/javascript" src="/js/core/core.js"></script>
- <!-- <script type="text/javascript" src="/js/models/your_model.js"></script> -->
- <script type="text/javascript" src="/js/config/init.js"></script>
-
- <link rel="stylesheet" href="/css/bootstrap.min.css">
- <link rel="stylesheet" href="/css/style.css">
- <link rel="stylesheet" href="/css/bootstrap.responsive.min.css">
+ {{ styleLink('/css/bootstrap.min.css', {rel:'stylesheet'}) }}
+ {{ styleLink('/css/style.css', {rel:'stylesheet'}) }}
+ {{ styleLink('/css/bootstrap.responsive.min.css', {rel:'stylesheet'}) }}
<!-- The fav and touch icons -->
<link rel="shortcut icon" href="/images/favicon.ico">
View
2  gen/jakelib/gen.jake
@@ -254,7 +254,7 @@ namespace('gen', function () {
jake.Task['gen:test'].invoke(name,
{properties: modelProperties});
jake.Task['gen:controllerScaffold'].invoke(name,
- {properties: modelProperties, engine: engine});
+ {properties: modelProperties});
jake.Task['gen:route'].invoke(name);
jake.Task['gen:viewsScaffold'].invoke(name,
{engine: engine, properties: modelProperties, realtime: realtime});
View
9 gen/scaffold/realtime/views/swig/layout.html.swig.ejs
@@ -4,10 +4,11 @@
<meta charset="utf-8">
<title>Geddy App | This app uses Geddy.js</title>
- <script type="text/javascript" src="/js/jquery.min.js"></script>
- <script type="text/javascript" src="/js/core/core.js"></script>
- <!-- <script type="text/javascript" src="/js/models/your_model.js"></script> -->
- <script type="text/javascript" src="/js/config/init.js"></script>
+ {{ scriptLink('/js/jquery.min.js', {type: 'test/javascript'}) }}
+ {{ scriptLink('/js/core/core.js', {type: 'test/javascript'}) }}
+ <!-- {{ scriptLink('/js/models/your_model.js', {type: 'test/javascript'}) }} -->
+ {{ scriptLink('/js/config/init.js', {type: 'test/javascript'}) }}
+
</head>
<body>
<div class="container">
View
1  lib/template/adapters/index.js
@@ -39,7 +39,6 @@ var setOptions = function (options) {
self.engineName = 'handlebars';
return new (require('./handlebars'));
case 'swig':
- self.engineName = 'swig';
return new (require('./swig'));
}
})();
Please sign in to comment.
Something went wrong with that request. Please try again.