Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix layouts to use relative paths in helpers for static assets
  • Loading branch information
mde committed Jan 31, 2014
1 parent de3fd66 commit 0c0a094
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 52 deletions.
18 changes: 6 additions & 12 deletions gen/base/views/ejs/layouts/layout_header.html.ejs
Expand Up @@ -12,18 +12,12 @@
<%- scriptLink('http://html5shim.googlecode.com/svn/trunk/html5.js', {type:'text/javascript'}) %> <%- scriptLink('http://html5shim.googlecode.com/svn/trunk/html5.js', {type:'text/javascript'}) %>
<![endif]--> <![endif]-->


<%- scriptLink('/js/jquery.min.js', {type:'text/javascript'}) %> <%- scriptLink('jquery.min.js', {type:'text/javascript'}) %>
<%- scriptLink('/js/bootstrap.min.js', {type:'text/javascript'}) %> <%- scriptLink('bootstrap.min.js', {type:'text/javascript'}) %>
<%- scriptLink('/js/config/init.js', {type: 'text/javascript'}) %> <%- scriptLink('config/init.js', {type: 'text/javascript'}) %>


<%- styleLink('/css/bootstrap.min.css', {rel:'stylesheet'}) %> <%- styleLink('bootstrap.min.css', {rel:'stylesheet'}) %>
<%- styleLink('/css/style.css', {rel:'stylesheet'}) %> <%- styleLink('bootstrap.responsive.min.css', {rel:'stylesheet'}) %>
<%- styleLink('/css/bootstrap.responsive.min.css', {rel:'stylesheet'}) %> <%- styleLink('style.css', {rel:'stylesheet'}) %>

<!-- The fav and touch icons -->
<link rel="shortcut icon" href="/images/favicon.ico">
<link rel="apple-touch-icon" href="images/apple-touch-icon.png">
<link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head> </head>


8 changes: 1 addition & 7 deletions gen/base/views/handlebars/layouts/layout_header.html.hbs
Expand Up @@ -17,13 +17,7 @@
<script type="text/javascript" src="/js/config/init.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/bootstrap.min.css">
<link rel="stylesheet" href="/css/style.css">
<link rel="stylesheet" href="/css/bootstrap.responsive.min.css"> <link rel="stylesheet" href="/css/bootstrap.responsive.min.css">

<link rel="stylesheet" href="/css/style.css">
<!-- The fav and touch icons -->
<link rel="shortcut icon" href="/images/favicon.ico">
<link rel="apple-touch-icon" href="images/apple-touch-icon.png">
<link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head> </head>


17 changes: 6 additions & 11 deletions gen/base/views/jade/layouts/layout_header.html.jade
Expand Up @@ -11,18 +11,13 @@ html(lang="en")
//if lt IE 9 //if lt IE 9
script(src="http://html5shim.googlecode.com/svn/trunk/html5.js") script(src="http://html5shim.googlecode.com/svn/trunk/html5.js")
!= scriptLink('/js/jquery.min.js', {type:'text/javascript'}) != scriptLink('jquery.min.js', {type:'text/javascript'})
!= scriptLink('/js/bootstrap.min.js', {type:'text/javascript'}) != scriptLink('bootstrap.min.js', {type:'text/javascript'})
!= scriptLink('/js/config/init.js', {type: 'text/javascript'}) != scriptLink('config/init.js', {type: 'text/javascript'})


!= styleLink('/css/bootstrap.min.css', {rel:'stylesheet'}) != styleLink('bootstrap.min.css', {rel:'stylesheet'})
!= styleLink('/css/style.css', {rel:'stylesheet'}) != styleLink('bootstrap.responsive.min.css', {rel:'stylesheet'})
!= styleLink('/css/bootstrap.responsive.min.css', {rel:'stylesheet'}) != styleLink('style.css', {rel:'stylesheet'})


// The fav and touch icons
link(rel="shortcut icon", href="/images/favicon.ico")
link(rel="apple-touch-icon", href="images/apple-touch-icon.png")
link(rel="apple-touch-icon", sizes="72x72", href="images/apple-touch-icon-72x72.png")
link(rel="apple-touch-icon", sizes="114x114", href="images/apple-touch-icon-114x114.png")




8 changes: 1 addition & 7 deletions gen/base/views/mustache/layouts/layout_header.html.hbs
Expand Up @@ -17,13 +17,7 @@
<script type="text/javascript" src="/js/config/init.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/bootstrap.min.css">
<link rel="stylesheet" href="/css/style.css">
<link rel="stylesheet" href="/css/bootstrap.responsive.min.css"> <link rel="stylesheet" href="/css/bootstrap.responsive.min.css">

<link rel="stylesheet" href="/css/style.css">
<!-- The fav and touch icons -->
<link rel="shortcut icon" href="/images/favicon.ico">
<link rel="apple-touch-icon" href="images/apple-touch-icon.png">
<link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head> </head>


22 changes: 7 additions & 15 deletions gen/base/views/swig/layouts/application.html.swig
Expand Up @@ -11,21 +11,13 @@
<!--[if lt IE 9]> <!--[if lt IE 9]>
{{ scriptLink('http://html5shim.googlecode.com/svn/trunk/html5.js', {type: 'text/javascript'}) }} {{ scriptLink('http://html5shim.googlecode.com/svn/trunk/html5.js', {type: 'text/javascript'}) }}
<![endif]--> <![endif]-->
{{ scriptLink('/js/jquery.min.js', {type: 'text/javascript'}) }} {{ scriptLink('jquery.min.js', {type: 'text/javascript'}) }}
{{ scriptLink('/js/bootstrap.min.js', {type: 'text/javascript'}) }} {{ scriptLink('bootstrap.min.js', {type: 'text/javascript'}) }}
{{ scriptLink('/js/core/core.js', {type: 'text/javascript'}) }} {{ scriptLink('config/init.js', {type: 'text/javascript'}) }}
<!-- {{ scriptLink('/js/models/your_model.js', {type: 'text/javascript'}) }} -->
{{ scriptLink('/js/config/init.js', {type: 'text/javascript'}) }}


{{ styleLink('/css/bootstrap.min.css', {rel:'stylesheet'}) }} {{ styleLink('bootstrap.min.css', {rel:'stylesheet'}) }}
{{ styleLink('/css/style.css', {rel:'stylesheet'}) }} {{ styleLink('bootstrap.responsive.min.css', {rel:'stylesheet'}) }}
{{ styleLink('/css/bootstrap.responsive.min.css', {rel:'stylesheet'}) }} {{ styleLink('style.css', {rel:'stylesheet'}) }}

<!-- The fav and touch icons -->
<link rel="shortcut icon" href="/images/favicon.ico">
<link rel="apple-touch-icon" href="images/apple-touch-icon.png">
<link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head> </head>
<body> <body>
<div class="navbar navbar-fixed-top"> <div class="navbar navbar-fixed-top">
Expand All @@ -47,7 +39,7 @@
</div> </div>
<div class="container"> <div class="container">
{{ displayFlash(flash) }} {{ displayFlash(flash) }}
{{ yield() }} {{ render() }}
</div> </div>
</body> </body>
</html> </html>

0 comments on commit 0c0a094

Please sign in to comment.