Skip to content

Commit e85bd87

Browse files
modularcodermodularcoder
committed
Layout definition in _context.js
index page tag enclosing fix Comments removal
1 parent a4e2ea4 commit e85bd87

5 files changed

Lines changed: 118 additions & 172 deletions

File tree

‎build/tasks/app-pages.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ module.exports.task = function(gulp, plugins, paths) {
3838
var templateRes = template(context);
3939

4040
// Layout processing
41-
var layout = file.frontMatter.layout || null;
41+
var layout = context.layout || null;
4242

4343
// If the layout exists, render it with template inside
4444
if (layout && handlebars.partials[layout]) {

‎src/app/_common/header/nav/notifications/notifications.hbs‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
11
{{!-- Notifications --}}
22

33
<li class="notifications new">
4-
<a href="" data-toggle="dropdown">
5-
<i class="fa fa-bell-o"></i>
6-
<sup>
7-
<span class="counter">8</span>
8-
</sup>
9-
</a>
4+
<a href="" data-toggle="dropdown">
5+
<i class="fa fa-bell-o"></i>
6+
<sup>
7+
<span class="counter">8</span>
8+
</sup>
9+
</a>
1010

11-
<div class="dropdown-menu notifications-dropdown-menu">
11+
<div class="dropdown-menu notifications-dropdown-menu">
1212

13-
<ul class="notifications-container">
14-
<li>
15-
<a href="" class="notification-item">
16-
<div class="img-col">
17-
<div class="img" style="background-image: url('{{images.faces.[0]}}')"></div>
18-
</div>
19-
<div class="body-col">
20-
<p>
21-
<span class="accent">Zack Alien</span> pushed new commit:
22-
<span class="accent">Fix page load performance issue</span>.
23-
</p>
24-
</div>
25-
</a>
26-
</li>
27-
<li>
28-
<a href="" class="notification-item">
29-
<div class="img-col">
30-
<div class="img" style="background-image: url('{{images.faces.[1]}}')"></div>
31-
</div>
32-
<div class="body-col">
33-
<p>
34-
<span class="accent">Amaya Hatsumi</span> started new task:
35-
<span class="accent">Dashboard UI design.</span>.
36-
</p>
37-
</div>
38-
</a>
39-
</li>
40-
<li>
41-
<a href="" class="notification-item">
42-
<div class="img-col">
43-
<div class="img" style="background-image: url('{{images.faces.[2]}}')"></div>
44-
</div>
45-
<div class="body-col">
46-
<p>
47-
<span class="accent">Andy Nouman</span> deployed new version of
48-
<span class="accent">NodeJS REST Api V3</span>
49-
</p>
50-
</div>
51-
</a>
52-
</li>
53-
</ul>
13+
<ul class="notifications-container">
14+
<li>
15+
<a href="" class="notification-item">
16+
<div class="img-col">
17+
<div class="img" style="background-image: url('{{images.faces.[0]}}')"></div>
18+
</div>
19+
<div class="body-col">
20+
<p>
21+
<span class="accent">Zack Alien</span> pushed new commit:
22+
<span class="accent">Fix page load performance issue</span>.
23+
</p>
24+
</div>
25+
</a>
26+
</li>
27+
<li>
28+
<a href="" class="notification-item">
29+
<div class="img-col">
30+
<div class="img" style="background-image: url('{{images.faces.[1]}}')"></div>
31+
</div>
32+
<div class="body-col">
33+
<p>
34+
<span class="accent">Amaya Hatsumi</span> started new task:
35+
<span class="accent">Dashboard UI design.</span>.
36+
</p>
37+
</div>
38+
</a>
39+
</li>
40+
<li>
41+
<a href="" class="notification-item">
42+
<div class="img-col">
43+
<div class="img" style="background-image: url('{{images.faces.[2]}}')"></div>
44+
</div>
45+
<div class="body-col">
46+
<p>
47+
<span class="accent">Andy Nouman</span> deployed new version of
48+
<span class="accent">NodeJS REST Api V3</span>
49+
</p>
50+
</div>
51+
</a>
52+
</li>
53+
</ul>
5454

55-
<footer>
56-
<ul>
57-
<li>
58-
<a href="">
59-
View All
60-
</a>
61-
</li>
62-
</ul>
63-
</footer>
64-
</div>
55+
<footer>
56+
<ul>
57+
<li>
58+
<a href="">
59+
View All
60+
</a>
61+
</li>
62+
</ul>
63+
</footer>
64+
</div>
6565
</li>

‎src/app/_common/header/nav/profile/profile.hbs‎

Lines changed: 27 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,30 @@
11
{{!-- Profile --}}
2-
32
<li class="profile dropdown">
4-
<!--<a href="" data-toggle="dropdown">
5-
<div class="img" style="background-image: url('https://avatars3.githubusercontent.com/u/3959008?v=3&s=40')">
6-
7-
</div>
8-
9-
<span class="name">
10-
John Doe
11-
</span>
12-
13-
<span class="arrow">
14-
<i class="fa fa-angle-down"></i>
15-
</span>
16-
</a>-->
17-
18-
19-
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
20-
<div class="img" style="background-image: url('https://avatars3.githubusercontent.com/u/3959008?v=3&s=40')">
21-
22-
</div>
23-
<span class="name">
24-
John Doe
25-
</span>
26-
</a>
27-
<div class="dropdown-menu profile-dropdown-menu" aria-labelledby="dropdownMenu1">
28-
<a class="dropdown-item" href="#">
29-
<i class="fa fa-user icon"></i>
30-
Profile
31-
</a>
32-
<a class="dropdown-item" href="#">
33-
<i class="fa fa-bell icon"></i>
34-
Notifications
35-
</a>
36-
<a class="dropdown-item" href="#">
37-
<i class="fa fa-gear icon"></i>
38-
Settings
39-
</a>
40-
<div class="dropdown-divider" ></div>
41-
<a class="dropdown-item" href="forms.html">
42-
<i class="fa fa-power-off icon"></i>
43-
Logout
44-
</a>
45-
</div>
46-
47-
48-
<!--<ul class="dropdown-menu profile-dropdown-menu">
49-
<li>
50-
<a href="">
51-
<i class="fa fa-user icon"></i>
52-
<span>Profile</span>
53-
</a>
54-
</li>
55-
<li>
56-
<a href="">
57-
<i class="fa fa-bell icon"></i>
58-
<span>Notifications</span>
59-
</a>
60-
</li>
61-
<li>
62-
<a href="">
63-
<i class="fa fa-gear icon"></i>
64-
<span>Settings</span>
65-
</a>
66-
</li>
67-
<li class="divider"></li>
68-
<li class="logout">
69-
<a href="login.html">
70-
<i class="fa fa-power-off icon"></i>
71-
<span>Logout</span>
72-
</a>
73-
</li>
74-
</ul>-->
75-
3+
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
4+
<div class="img" style="background-image: url('https://avatars3.githubusercontent.com/u/3959008?v=3&s=40')">
5+
6+
</div>
7+
<span class="name">
8+
John Doe
9+
</span>
10+
</a>
11+
<div class="dropdown-menu profile-dropdown-menu" aria-labelledby="dropdownMenu1">
12+
<a class="dropdown-item" href="#">
13+
<i class="fa fa-user icon"></i>
14+
Profile
15+
</a>
16+
<a class="dropdown-item" href="#">
17+
<i class="fa fa-bell icon"></i>
18+
Notifications
19+
</a>
20+
<a class="dropdown-item" href="#">
21+
<i class="fa fa-gear icon"></i>
22+
Settings
23+
</a>
24+
<div class="dropdown-divider" ></div>
25+
<a class="dropdown-item" href="forms.html">
26+
<i class="fa fa-power-off icon"></i>
27+
Logout
28+
</a>
29+
</div>
7630
</li>

‎src/app/dashboard/index-page.hbs‎

Lines changed: 31 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -66,45 +66,37 @@ tasks:
6666
- title: Beer time with dudes
6767
done: false
6868
---
69-
{{!-- {{#extend "app/app-layout"}} --}}
70-
{{!-- {{#content "body"}} --}}
69+
<section class="section">
70+
<div class="row sameheight-container">
71+
<div class="col col-xs-12 col-sm-12 col-md-6 col-xl-5 stats-col">
72+
{{> app/dashboard/stats/stats}}
73+
</div>
74+
<div class="col col-xs-12 col-sm-12 col-md-6 col-xl-7 history-col">
75+
{{> app/dashboard/history/history}}
76+
</div>
77+
</div>
78+
</section>
7179

72-
{{!-- Analytics --}}
73-
<section class="section">
74-
<div class="row sameheight-container">
75-
<div class="col col-xs-12 col-sm-12 col-md-6 col-xl-5 stats-col">
76-
{{> app/dashboard/stats/stats}}
77-
</div>
78-
<div class="col col-xs-12 col-sm-12 col-md-6 col-xl-7 history-col">
79-
{{> app/dashboard/history/history}}
80-
</div>
81-
</div>
82-
</section>
80+
<section class="section">
81+
<div class="row sameheight-container">
8382

84-
<section class="section">
85-
<div class="row sameheight-container">
83+
<div class="col-xl-8">
84+
{{> app/dashboard/items/items}}
85+
</div>
8686

87-
<div class="col-xl-8">
88-
{{> app/dashboard/items/items}}
89-
</div>
90-
91-
<div class="col-xl-4">
92-
{{> app/dashboard/sales-breakdown/sales-breakdown}}
93-
</div>
94-
</div>
95-
</section>
96-
<section class="section map-tasks">
97-
<div class="row sameheight-container">
98-
<div class="col-md-8">
99-
{{> app/dashboard/sales-by-countries/sales-by-countries}}
100-
</div>
101-
102-
<div class="col-md-4">
103-
{{> app/dashboard/tasks/tasks}}
104-
</div>
105-
</div>
106-
</section>
107-
108-
109-
{{!-- {{/content}} --}}
110-
{{!-- {{/extend}} --}}
87+
<div class="col-xl-4">
88+
{{> app/dashboard/sales-breakdown/sales-breakdown}}
89+
</div>
90+
</div>
91+
</section>
92+
<section class="section map-tasks">
93+
<div class="row sameheight-container">
94+
<div class="col-md-8">
95+
{{> app/dashboard/sales-by-countries/sales-by-countries}}
96+
</div>
97+
98+
<div class="col-md-4">
99+
{{> app/dashboard/tasks/tasks}}
100+
</div>
101+
</div>
102+
</section>

‎src/app/dashboard/items/items.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<div class="item-heading">Published</div>
8383
<div>
8484
{{this.date}}
85-
<div>
85+
</div>
8686
</div>
8787
</div>
8888
</li>

0 commit comments

Comments
 (0)