Skip to content

Commit e56bfd4

Browse files
Hyperkid123Hyperkid123
authored
Merge branch 'master' into topology-map
2 parents 9e76e16 + 254e74a commit e56bfd4

File tree

76 files changed

+9747
-1435
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+9747
-1435
lines changed

‎.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dist/docs/font*
1919
dist/docs/grunt-styles
2020
dist/docs/img
2121
dist/docs/index.html
22-
22+
coverage/
2323

2424
/docs
2525
/dist
@@ -28,4 +28,4 @@ npm-debug.log
2828
lib
2929
.bower
3030

31-
.vscode
31+
.vscode

‎Gruntfile.js

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ module.exports = function (grunt) {
6767
},
6868
img: {
6969
cwd: 'misc/',
70-
src: ['patternfly-orb.svg', '*.png'],
70+
src: ['patternfly-orb.svg','patternfly-logo.svg', 'grid-sidebar.png', '*.png'],
7171
dest: 'docs/img',
7272
expand: true
7373
},
@@ -161,9 +161,17 @@ module.exports = function (grunt) {
161161
browsers: ['PhantomJS']
162162
}
163163
},
164+
coveralls: {
165+
options: {
166+
debug: true,
167+
coverageDir: 'coverage',
168+
dryRun: false,
169+
force: true
170+
}
171+
},
164172
ngdocs: {
165173
options: {
166-
title: 'Angular Patternfly Documentation',
174+
title: 'ANGULAR PATTERNFLY',
167175
dest: 'docs',
168176
image: 'misc/logo-alt.svg',
169177
scripts: [
@@ -197,6 +205,7 @@ module.exports = function (grunt) {
197205
'node_modules/patternfly/dist/css/patternfly.css',
198206
'node_modules/patternfly/dist/css/patternfly-additions.css',
199207
'dist/styles/angular-patternfly.css',
208+
'misc/patternfly-showcase.css',
200209
'misc/ng-docs.css',
201210
'misc/examples.css']
202211
},
@@ -368,7 +377,7 @@ module.exports = function (grunt) {
368377
grunt.registerTask('default', ['build']);
369378
grunt.registerTask('ngdocs:view', ['build', 'connect:docs', 'watch']);
370379
grunt.registerTask('lint', ['eslint', 'htmlhint']);
371-
grunt.registerTask('test', ['karma']);
380+
grunt.registerTask('test', ['karma', 'coveralls']);
372381
grunt.registerTask('check', ['lint', 'test']);
373382
grunt.registerTask('help', ['availabletasks']);
374383
grunt.registerTask('serve', ['ngdocs:view']);

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
[![Build Status](https://travis-ci.org/patternfly/angular-patternfly.svg?branch=master)](https://travis-ci.org/patternfly/angular-patternfly)
22
[![Dependency Status](https://gemnasium.com/badges/github.com/patternfly/angular-patternfly.svg)](https://gemnasium.com/github.com/patternfly/angular-patternfly)
33
[![Code Climate](https://codeclimate.com/github/patternfly/angular-patternfly/badges/gpa.svg)](https://codeclimate.com/github/patternfly/angular-patternfly)
4-
4+
[![NSP Status](https://nodesecurity.io/orgs/angular-patternfly/projects/690b94c3-4f36-4208-887d-fdb5f22f65fc/badge)](https://nodesecurity.io/orgs/angular-patternfly/projects/690b94c3-4f36-4208-887d-fdb5f22f65fc)
55
[![Join the chat at https://gitter.im/patternfly/angular-patternfly](https://badges.gitter.im/patternfly/angular-patternfly.svg)](https://gitter.im/patternfly/angular-patternfly?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
6+
[![Coverage Status](https://coveralls.io/repos/github/patternfly/angular-patternfly/badge.svg)](https://coveralls.io/github/patternfly/angular-patternfly)
67

78
# AngularJS components for [PatternFly](https://www.patternfly.org)
89

‎grunt-ngdocs-index.tmpl

Lines changed: 77 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -89,30 +89,86 @@
8989
</script>
9090
</head>
9191

92-
<body>
93-
<header class="header">
94-
<div class="navbar navbar-fixed-top">
95-
<div class="navbar-inner">
96-
<div class="container-fluid navbar-inverse">
97-
<% if (image) { %>
98-
<% if (imageLink) { %>
99-
<a href="<%= imageLink %>">
100-
<% } %>
101-
<img class="pull-left" src="<%= image %>">
102-
<% if (imageLink) { %>
92+
<body class="showcase">
93+
<header>
94+
<nav class="navbar navbar-default navbar-fixed-top">
95+
<div class="container-fluid">
96+
<div class="navbar-header">
97+
<button type="button" class="navbar-toggle" ng-click="isOpen = !isOpen">
98+
<span class="sr-only">Toggle navigation</span>
99+
<span class="icon-bar"></span>
100+
<span class="icon-bar"></span>
101+
<span class="icon-bar"></span>
102+
</button>
103+
<div class="navbar-brand">
104+
<a id="logo" ng-bind-template="<%= title %>" href="#"></a>
105+
</div>
106+
</div>
107+
<div class="navbar-collapse navbar-collapse-pf-site collapse">
108+
<ul id="menu-primary" class="nav navbar-nav navbar-right navbar-utility">
109+
<li class="active">
110+
<a href="#">Components</a>
111+
</li>
112+
<li>
113+
<a href="https://github.com/patternfly/angular-patternfly">Github</a>
114+
</li>
115+
<li class="applauncher-pf dropdown dropdown-kebab-pf">
116+
<a class="dropdown-toggle nav-item-iconic" data-toggle="dropdown" href="#" aria-expanded="true">
117+
<i class="fa fa-th applauncher-pf-icon" aria-hidden="true">
118+
<span class="sr-only">PatternFly Showcases</span>
119+
</i>
103120
</a>
104-
<% } %>
105-
<% } %>
106-
<% if (title) {%>
107-
<% if (imageLink) { %>
108-
<img class="pull-left" src="<%= imageLink %>">
109-
<% } %>
110-
<a <% if (titleLink) { %> href="<%= titleLink %>" <% } %> class="navbar-brand"><%= title %></a>
111-
<% } %>
112-
<%= navContent %>
121+
<ul class="dropdown-menu dropdown-menu-right" role="menu">
122+
<li class="applauncher-pf-item" role="menuitem">
123+
<a class="applauncher-pf-link" href="https://rawgit.com/patternfly/patternfly-ng/master-dist/dist-demo/#/">
124+
<span class="applauncher-pf-link-title">PatternFly NG</span>
125+
</a>
126+
</li>
127+
<li class="applauncher-pf-item" role="menuitem">
128+
<a class="applauncher-pf-link" href="https://patternfly-webcomponents.github.io/components.html">
129+
<span class="applauncher-pf-link-title">PatternFly Web Components</span>
130+
</a>
131+
</li>
132+
<li class="applauncher-pf-item" role="menuitem">
133+
<a class="applauncher-pf-link" href="https://rawgit.com/patternfly/patternfly-react/gh-pages/index.html">
134+
<span class="applauncher-pf-link-title">PatternFly React</span>
135+
</a>
136+
</li>
137+
</ul>
138+
</li>
139+
</ul>
113140
</div>
114141
</div>
115-
</div>
142+
</nav>
143+
<nav class="navbar navbar-sidebar navbar-primary" ng-class="{'open': isOpen}">
144+
<ul>
145+
<li class="primary-menu">
146+
<a href="">Menu</a>
147+
<ul>
148+
<li class="active">
149+
<a href="#">Components</a>
150+
</li>
151+
<li>
152+
<a href="https://github.com/patternfly/angular-patternfly">Github</a>
153+
</li>
154+
<li>
155+
<a class="showcase-collapsed" ng-class="{'collapsed': !isCollapsed}" ng-click="isCollapsed = !isCollapsed">PatternFly Showcases</a>
156+
<ul class="collapse" ng-class="{'in': isCollapsed}">
157+
<li>
158+
<a href="https://rawgit.com/patternfly/patternfly-ng/master-dist/dist-demo/#/">PatternFly NG</a>
159+
</li>
160+
<li>
161+
<a href="https://patternfly-webcomponents.github.io/components.html">PatternFly Web Components</a>
162+
</li>
163+
<li>
164+
<a href="https://rawgit.com/patternfly/patternfly-react/gh-pages/index.html">PatternFly React</a>
165+
</li>
166+
</ul>
167+
</li>
168+
</ul>
169+
</li>
170+
</ul>
171+
</nav>
116172
</header>
117173

118174
<div role="main" class="container-fluid">

‎misc/grid-sidebar.png

17 KB
Loading

‎misc/patternfly-logo.svg

Lines changed: 17 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)