Skip to content

Commit 339a821

Browse files
andresgalanteandresgalante
authored
Merge pull request patternfly#417 from cardosogabriel/PTNFLY-1423
PTNFLY-1423 Creating Toolbar widget to be consumed by patternfly-org.
2 parents 3a16dba + 2826150 commit 339a821

5 files changed

Lines changed: 10 additions & 92 deletions

File tree

‎tests/pages/_includes/widgets/layouts/card-view-multi-select.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
{% include widgets/layouts/navbar-toolbar.html %}
1+
{% include widgets/layouts/navbar-primary.html %}
2+
{% include widgets/layouts/toolbar.html %}
23
<div class="container-fluid container-cards-pf">
34
<div class="row row-cards-pf">
45
<div class="col-xs-12 col-sm-4 col-md-3 col-lg-2">

‎tests/pages/_includes/widgets/layouts/card-view-single-select.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
{% include widgets/layouts/navbar-toolbar.html %}
1+
{% include widgets/layouts/navbar-primary.html %}
2+
{% include widgets/layouts/toolbar.html %}
23
<div class="container-fluid container-cards-pf">
34
<div class="row row-cards-pf">
45
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-3">

tests/pages/_includes/widgets/layouts/navbar-toolbar.html renamed to tests/pages/_includes/widgets/layouts/toolbar.html

Lines changed: 1 addition & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,3 @@
1-
<nav class="navbar navbar-default navbar-pf" role="navigation">
2-
<div class="navbar-header">
3-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse-1">
4-
<span class="sr-only">Toggle navigation</span>
5-
<span class="icon-bar"></span>
6-
<span class="icon-bar"></span>
7-
<span class="icon-bar"></span>
8-
</button>
9-
<a class="navbar-brand" href="/">
10-
<img src="{{site.navbar-brand-icon}}" alt="{{ site.title-product }}" />
11-
</a>
12-
</div>
13-
<div class="collapse navbar-collapse navbar-collapse-1">
14-
<ul class="nav navbar-nav navbar-utility">
15-
<li>
16-
<a href="#">Status</a>
17-
</li>
18-
<li class="dropdown">
19-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
20-
<span class="pficon pficon-user"></span>
21-
Brian Johnson <b class="caret"></b>
22-
</a>
23-
<ul class="dropdown-menu">
24-
<li>
25-
<a href="#">Link</a>
26-
</li>
27-
<li>
28-
<a href="#">Another link</a>
29-
</li>
30-
<li>
31-
<a href="#">Something else here</a>
32-
</li>
33-
<li class="divider"></li>
34-
<li class="dropdown-submenu">
35-
<a tabindex="-1" href="#">More options</a>
36-
<ul class="dropdown-menu">
37-
<li>
38-
<a href="#">Link</a>
39-
</li>
40-
<li>
41-
<a href="#">Another link</a>
42-
</li>
43-
<li>
44-
<a href="#">Something else here</a>
45-
</li>
46-
<li class="divider"></li>
47-
<li class="dropdown-header">Nav header</li>
48-
<li>
49-
<a href="#">Separated link</a>
50-
</li>
51-
<li class="divider"></li>
52-
<li>
53-
<a href="#">One more separated link</a>
54-
</li>
55-
</ul>
56-
</li>
57-
<li class="divider"></li>
58-
<li>
59-
<a href="#">One more separated link</a>
60-
</li>
61-
</ul>
62-
</li>
63-
</ul>
64-
<ul class="nav navbar-nav navbar-primary">
65-
<li>
66-
<a href="#">First Link</a>
67-
</li>
68-
<li>
69-
<a href="#">Another Link</a>
70-
</li>
71-
<li>
72-
<a href="#">And Another</a>
73-
</li>
74-
<li>
75-
<a href="#">As a General Rule</a>
76-
</li>
77-
<li>
78-
<a href="#">Five to Seven Links</a>
79-
</li>
80-
<li>
81-
<a href="#">Is Good</a>
82-
</li>
83-
</ul>
84-
</div>
85-
</nav>
86-
871
<div class="container-fluid">
882
<div class="row toolbar-pf">
893
<div class="col-sm-12">
@@ -198,4 +112,4 @@ <h5>40 Results</h5>
198112

199113
});
200114
})(jQuery);
201-
</script>
115+
</script>

‎tests/pages/_includes/widgets/list-view/list-view-page.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
{% include widgets/layouts/navbar-toolbar.html %}
1+
{% include widgets/layouts/navbar-primary.html %}
2+
{% include widgets/layouts/toolbar.html %}
23
<div class="container-fluid">
34
{% include widgets/list-view/list-view-standard-rows.html %}
45
</div>

‎tests/pages/toolbar.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
title: Toolbar
55
resource: true
66
---
7-
<h2>Toolbar</h2>
8-
{% include widgets/layouts/navbar-toolbar.html %}
7+
<h2>Toolbar with Horizontal Navigation</h2>
8+
{% include widgets/layouts/navbar-primary.html %}
9+
{% include widgets/layouts/toolbar.html %}

0 commit comments

Comments
 (0)