Skip to content

Commit bffe02a

Browse files
committed
fixed helpers
1 parent d3d29d1 commit bffe02a

4 files changed

Lines changed: 71 additions & 50 deletions

File tree

src/templates/layouts/countdown.hbs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727
<style>body{direction: rtl;}</style>
2828
{{/if}}
2929

30-
{{#if analytics}}
31-
{{analytics google.analytics 'head'}}
32-
{{/if}}
30+
3331
</head>
3432
<body class="bg-dark lter">
3533
{% body %}

src/templates/layouts/default.hbs

Lines changed: 68 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,66 @@
11
<!doctype html>
2-
<html class="no-js">
2+
<html>
3+
34
<head>
45
<meta charset="UTF-8">
5-
<title>{{title}}</title>
66
<!--IE Compatibility modes-->
77
<meta http-equiv="X-UA-Compatible" content="IE=edge">
88
<!--Mobile first-->
99
<meta name="viewport" content="width=device-width, initial-scale=1">
10+
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
11+
<title>{{title}}</title>
12+
13+
<meta name="description" content="{{pkg.description}}">
14+
1015
<!-- Bootstrap -->
11-
{{#if rtl}}
12-
<link rel="stylesheet" href="{{assets}}/lib/bootstrap/dist/css/bootstrap.rtl.css">
13-
{{else}}
14-
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.min.css">
15-
{{/if}}
16+
<link rel="stylesheet" href="{{assets}}/lib/bootstrap/css/bootstrap{{#if rtl}}.rtl{{/if}}{{#if production}}.min{{/if}}.css">
17+
1618
<!-- Font Awesome -->
17-
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
19+
<link rel="stylesheet" href="{{assets}}/lib/font-awesome/css/font-awesome{{#if production}}.min{{/if}}.css">
20+
1821
<!-- Metis core stylesheet -->
19-
{{#if rtl}}
20-
<link rel="stylesheet" href="{{assets}}/css/main.rtl.css">
21-
{{else}}
22-
<link rel="stylesheet" href="{{assets}}/css/main.min.css">
23-
{{/if}}
22+
<link rel="stylesheet" href="{{assets}}/css/main{{#if rtl}}.rtl{{/if}}{{#if production}}.min{{/if}}.css">
23+
2424
<!-- metisMenu stylesheet -->
25-
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/metisMenu/1.1.3/metisMenu.min.css">
25+
<link rel="stylesheet" href="{{assets}}/metismenu/metisMenu{{#if production}}.min{{/if}}.css">
26+
2627
{{#if rtl}}
2728
<style>body{direction: rtl;}</style>
2829
{{/if}}
2930
{{#if stylesheets}}
30-
{{css stylesheets}}
31+
{{#each stylesheets}}
32+
{{.}}
33+
{{/each}}
3134
{{/if}}
3235
{{#if cdncss}}
33-
{{cdn cdncss}}
36+
{{#each cdncss}}
37+
{{.}}
38+
{{/each}}
3439
{{/if}}
35-
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
40+
41+
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
3642
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
3743
<!--[if lt IE 9]>
38-
<script src="{{assets}}/lib/html5shiv/html5shiv.js"></script>
39-
<script src="{{assets}}/lib/respond/respond.min.js"></script>
44+
<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
45+
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
4046
<![endif]-->
47+
4148
<!--For Development Only. Not required -->
4249
<script>
4350
less = {
4451
env: "development",
4552
relativeUrls: false,
46-
rootpath: "../assets/"
53+
rootpath: "{{assets}}/"
4754
};
4855
</script>
49-
<link rel="stylesheet" href="{{assets}}/css/style-switcher.css">
56+
<link rel="stylesheet" href="{{assets}}/css/style-switcher{{#if production}}.min{{/if}}.css">
5057
<link rel="stylesheet/less" type="text/css" href="{{assets}}/less/theme.less">
51-
<script src="//cdnjs.cloudflare.com/ajax/libs/less.js/2.2.0/less.min.js"></script>
52-
<!--Modernizr-->
53-
<script src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
54-
{{#if analytics}}
55-
{{analytics google.analytics 'head'}}
56-
{{/if}}
58+
<script src="https://cdnjs.cloudflare.com/ajax/libs/less.js/2.7.1/less{{#if production}}.min{{/if}}.js"></script>
59+
60+
{{!-- {{> analytic}} --}}
61+
5762
</head>
63+
5864
<body class="{{#if boXed}}boxed{{/if}} {{#if sideMini}}sidebar-left-mini{{/if}} {{#if fixedMenu}}menu-affix{{/if}}">
5965
<div class="bg-dark dk" id="wrap">
6066
<div id="top">
@@ -70,7 +76,12 @@
7076
<!-- /.search-bar -->
7177
{{/if}}
7278
<div class="main-bar">
73-
<h3><i class="{{ icon }}"></i>&nbsp; {{ title }}</h3>
79+
<h3>
80+
{{#if icon}}
81+
<i class="{{ icon }}"></i>&nbsp;
82+
{{/if}}
83+
{{ title }}
84+
</h3>
7485
</div>
7586
<!-- /.main-bar -->
7687
</header>
@@ -105,33 +116,49 @@
105116
</div>
106117
<!-- /#wrap -->
107118
<footer class="Footer bg-dark dker">
108-
<p>2014 &copy; Metis Bootstrap Admin Template</p>
119+
<p>2016 &copy; Metis Bootstrap Admin Template</p>
109120
</footer>
110121
<!-- /#footer -->
111122
{{> helpModal }}
123+
112124
<!--jQuery -->
113-
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
125+
<script src="{{assets}}/lib/jquery/jquery{{#if production}}.min{{/if}}.js"></script>
126+
114127
{{#if cdnjs}}
115-
{{cdn cdnjs}}
128+
{{#each cdnjs}}
129+
<script src="{{.}}"></script>
130+
{{/each}}
116131
{{/if}}
132+
117133
<!--Bootstrap -->
118-
<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/js/bootstrap.min.js"></script>
134+
<script src="{{assets}}/lib/bootstrap/js/bootstrap{{#if production}}.min{{/if}}.js"></script>
119135
<!-- MetisMenu -->
120-
<script src="//cdnjs.cloudflare.com/ajax/libs/metisMenu/1.1.3/metisMenu.min.js"></script>
136+
<script src="{{assets}}/lib/metismenu/metisMenu{{#if production}}.min{{/if}}.js"></script>
121137
<!-- Screenfull -->
122-
<script src="//cdnjs.cloudflare.com/ajax/libs/screenfull.js/2.0.0/screenfull.min.js"></script>
138+
<script src="{{assets}}/lib/screenfull/screenfull{{#if production}}.min{{/if}}.js"></script>
123139

124140
{{#if javascripts}}
125-
{{js javascripts}}
141+
{{#each javascripts}}
142+
<script src="{{assets}}/{{.}}"></script>
143+
{{/each}}
126144
{{/if}}
145+
127146
<!-- Metis core scripts -->
128-
<script src="{{assets}}/js/core.min.js"></script>
147+
<script src="{{assets}}/js/core{{#if production}}.min{{/if}}.js"></script>
129148
<!-- Metis demo scripts -->
130-
<script src="{{assets}}/js/app.js"></script>
149+
<script src="{{assets}}/js/app{{#if production}}.min{{/if}}.js"></script>
150+
131151
{{#if scripts}}
132-
<script>
133-
{{scripts}}
134-
</script>
152+
<script>
153+
$(function(){
154+
{{#each scripts}}
155+
{{.}};
156+
{{/each}}
157+
});
158+
</script>
135159
{{/if}}
136-
<script src="{{assets}}/js/style-switcher.min.js"></script>
160+
161+
<script src="{{assets}}/js/style-switcher{{#if production}}.min{{/if}}.js"></script>
137162
</body>
163+
164+
</html>

src/templates/layouts/errors.hbs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
{{#if rtl}}
2323
<style>body{direction: rtl;}</style>
2424
{{/if}}
25-
{{#if analytics}}
26-
{{analytics google.analytics 'head'}}
27-
{{/if}}
25+
2826
</head>
2927
<body class="error">
3028
<div class="container">

src/templates/layouts/login.hbs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323
{{#if rtl}}
2424
<style>body{direction: rtl;}</style>
2525
{{/if}}
26-
{{#if analytics}}
27-
{{analytics google.analytics 'head'}}
28-
{{/if}}
26+
2927
</head>
3028
<body class="login">
3129

0 commit comments

Comments
 (0)