Skip to content

Commit 5cad328

Browse files
author
Mathew Goldsborough
committed
Merge branch 'develop' into optimize-gulp
Conflicts: package.json src/index.html
2 parents ded84e1 + 65c8de3 commit 5cad328

File tree

4 files changed

+235
-3
lines changed

4 files changed

+235
-3
lines changed

‎README.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,20 @@ If you want to change it, simply replace the template and CSS!
106106

107107
Instead of hardcoding the widget HTML directly, AngularJS widget component functionality is ready to use:
108108

109+
```HTML
110+
<rd-widget>
111+
<rd-widget-header icon="fa-tasks" title="Awesome Widget">
112+
<a href="#" class="pull-right">Widget Link</a>
113+
</rd-widget-header>
114+
<!-- Classes are optional but allow you to style the widget-body. -->
115+
<rd-widget-body classes="medium no-padding">
116+
<p>Hello world from a widget!</p>
117+
</rd-widget-body>
118+
</rd-widget>
119+
```
120+
121+
Loading widget
122+
109123
```HTML
110124
<rd-widget>
111125
<rd-widget-header title="Hello World"><rd-widget-header>
@@ -114,6 +128,7 @@ Instead of hardcoding the widget HTML directly, AngularJS widget component funct
114128
</rd-widget>
115129
```
116130

131+
117132
### FAQ
118133

119134
#### What is the dashboard compatible with?

‎package.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@
22
"name": "Responsive-Dashboard",
33
"version": "0.0.2",
44
"author": "Elliot Hesp",
5+
"repository": {
6+
"type": "git",
7+
"url": "git://github.com/Ehesp/Responsive-Dashboard"
8+
},
59
"contributors": [
610
"Leonel Samayoa <[email protected]> (http://gobliip.com)",
7-
"Ricardo Pascua <[email protected]>"
11+
"Ricardo Pascua <[email protected]>",
12+
"Mathew Goldsborough <[email protected]>"
813
],
914
"scripts": {
1015
"postinstall": "node node_modules/bower/bin/bower install"

‎src/index.html‎

Lines changed: 211 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<title>Dashboard</title>
88

99
<link rel="stylesheet" type="text/css" href="css/dashboard.min.css">
10+
1011
</head>
1112
<body ng-controller="MasterCtrl">
1213
<div id="page-wrapper" ng-class="{'active': toggle}" ng-cloak>
@@ -124,8 +125,218 @@
124125
</div><!-- End Content Wrapper -->
125126
</div><!-- End Page Wrapper -->
126127

128+
<<<<<<< HEAD
127129
<script type="text/javascript" src="js/vendors.min.js"></script>
128130
<script type="text/javascript" src="js/dashboard.min.js"></script>
129131
<script type="text/javascript" src="js/templates.min.js"></script>
132+
=======
133+
<script type="text/ng-template" id="dashboard.html">
134+
<div class="row alerts-container" data-ng-controller="AlertsCtrl" data-ng-show="alerts.length">
135+
<div class="col-xs-12">
136+
<alert data-ng-repeat="alert in alerts" type="{{alert.type}}" close="closeAlert($index)">{{alert.msg}}</alert>
137+
</div>
138+
</div>
139+
140+
<div class="row">
141+
<div class="col-lg-3 col-md-6 col-xs-12">
142+
<rd-widget>
143+
<rd-widget-body>
144+
<div class="widget-icon green pull-left">
145+
<i class="fa fa-users"></i>
146+
</div>
147+
<div class="title">80</div>
148+
<div class="comment">Users</div>
149+
</rd-widget-body>
150+
</rd-widget>
151+
</div>
152+
<div class="col-lg-3 col-md-6 col-xs-12">
153+
<rd-widget>
154+
<rd-widget-body>
155+
<div class="widget-icon red pull-left">
156+
<i class="fa fa-tasks"></i>
157+
</div>
158+
<div class="title">16</div>
159+
<div class="comment">Servers</div>
160+
</rd-widget-body>
161+
</rd-widget>
162+
</div>
163+
<div class="col-lg-3 col-md-6 col-xs-12">
164+
<rd-widget>
165+
<rd-widget-body>
166+
<div class="widget-icon orange pull-left">
167+
<i class="fa fa-sitemap"></i>
168+
</div>
169+
<div class="title">225</div>
170+
<div class="comment">Documents</div>
171+
</rd-widget-body>
172+
</rd-widget>
173+
</div>
174+
<div class="spacer visible-xs"></div>
175+
<div class="col-lg-3 col-md-6 col-xs-12">
176+
<rd-widget>
177+
<rd-widget-body>
178+
<div class="widget-icon blue pull-left">
179+
<i class="fa fa-support"></i>
180+
</div>
181+
<div class="title">62</div>
182+
<div class="comment">Tickets</div>
183+
</rd-widget-body>
184+
</rd-widget>
185+
</div>
186+
</div>
187+
<div class="row">
188+
<div class="col-lg-6">
189+
<rd-widget>
190+
<rd-widget-header icon="fa-tasks" title="Servers">
191+
<a href="#" class="pull-right">Manage</a>
192+
</rd-widget-header>
193+
<rd-widget-body classes="medium no-padding">
194+
<div class="table-responsive">
195+
<table class="table">
196+
<tbody>
197+
<tr><td>RDVMPC001</td><td>238.103.133.37</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
198+
<tr><td>RDVMPC002</td><td>68.66.63.170</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
199+
<tr><td>RDVMPC003</td><td>76.117.212.33</td><td><span tooltip="Server Down!" class="text-danger"><i class="fa fa-warning"></i></span></td></tr>
200+
<tr><td>RDPHPC001</td><td>91.88.224.5</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
201+
<tr><td>RDESX001</td><td>197.188.15.93</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
202+
<tr><td>RDESX002</td><td>168.85.154.251</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
203+
<tr><td>RDESX003</td><td>209.25.191.61</td><td><span tooltip="Server Down!" class="text-danger"><i class="fa fa-warning"></i></span></td></tr>
204+
<tr><td>RDESX004</td><td>252.37.192.235</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
205+
<tr><td>RDTerminal01</td><td>139.71.18.207</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
206+
<tr><td>RDTerminal02</td><td>136.80.122.212</td><td><span tooltip="Could not connect!" class="text-warning"><i class="fa fa-flash"></i></span></td></tr>
207+
<tr><td>RDDomainCont01</td><td>196.80.245.33</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
208+
</tbody>
209+
</table>
210+
</div>
211+
</rd-widget-body>
212+
</rd-widget>
213+
</div>
214+
<div class="col-lg-6">
215+
<rd-widget>
216+
<rd-widget-header icon="fa-users" title="Users">
217+
<input type="text" placeholder="Search" class="form-control input-sm pull-right" />
218+
</rd-widget-header>
219+
<rd-widget-body classes="medium no-padding">
220+
<div class="table-responsive">
221+
<table class="table">
222+
<thead>
223+
<tr><th class="text-center">ID</th><th>Username</th><th>Role</th><th>Account</th></tr>
224+
</thead>
225+
<tbody>
226+
<tr><td class="text-center">1</td><td>Joe Bloggs</td><td>Super Admin</td><td>AZ23045</td></tr>
227+
<tr><td class="text-center">2</td><td>Timothy Hernandez</td><td>Admin</td><td>AU24783</td></tr>
228+
<tr><td class="text-center">3</td><td>Joe Bickham</td><td>User</td><td>AM23781</td></tr>
229+
</tbody>
230+
</table>
231+
</div>
232+
</rd-widget-body>
233+
</rd-widget>
234+
</div>
235+
</div>
236+
<div class="row">
237+
<div class="col-lg-6">
238+
<rd-widget>
239+
<rd-widget-header icon="fa-plus" title="Extras">
240+
<button class="btn btn-sm btn-info pull-right">Button</button>
241+
</rd-widget-header>
242+
<rd-widget-body>
243+
244+
<div class="message">
245+
This is a standard message which will also work the ".no-padding" class, I can also <span class="error">be an error message!</span>
246+
</div>
247+
248+
<hr />
249+
250+
<div class="message">
251+
<a href="http://angular-ui.github.io/bootstrap/" target="_blank">UI Bootstrap</a> is included, so you can use <a href="#" tooltip="I'm a tooltip!">tooltips</a> and all of the other native Bootstrap JS components!
252+
</div>
253+
254+
<hr />
255+
256+
<form class="form-horizontal" role="form">
257+
<div class="form-group has-feedback has-success">
258+
<label for="label" class="col-sm-2 control-label">Inline Form</label>
259+
<div class="col-sm-5">
260+
<input type="text" class="form-control" />
261+
<span class="fa fa-key form-control-feedback"></span>
262+
</div>
263+
<div class="col-sm-5">
264+
<div class="input-mask">I'm an input mask!</div>
265+
</div>
266+
</div>
267+
</form>
268+
269+
</rd-widget-body>
270+
</rd-widget>
271+
</div>
272+
<div class="col-lg-6">
273+
<rd-widget>
274+
<rd-widget-header icon="fa-cog fa-spin" title="Loading Directive">
275+
<a href="http://tobiasahlin.com/spinkit/" target="_blank" class="pull-right">SpinKit</a>
276+
</rd-widget-header>
277+
<rd-widget-body loading="true"></rd-widget-body>
278+
</rd-widget>
279+
</div>
280+
</div>
281+
<!-- End Main Content -->
282+
</script>
283+
284+
<script type="text/ng-template" id="tables.html">
285+
<div class="row">
286+
<div class="col-lg-6">
287+
<rd-widget>
288+
<rd-widget-header icon="fa-tasks" title="Servers">
289+
<a href="#" class="pull-right">Manage</a>
290+
</rd-widget-header>
291+
<rd-widget-body classes="medium no-padding">
292+
<div class="table-responsive">
293+
<table class="table">
294+
<tbody>
295+
<tr><td>RDVMPC001</td><td>238.103.133.37</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
296+
<tr><td>RDVMPC002</td><td>68.66.63.170</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
297+
<tr><td>RDVMPC003</td><td>76.117.212.33</td><td><span tooltip="Server Down!" class="text-danger"><i class="fa fa-warning"></i></span></td></tr>
298+
<tr><td>RDPHPC001</td><td>91.88.224.5</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
299+
<tr><td>RDESX001</td><td>197.188.15.93</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
300+
<tr><td>RDESX002</td><td>168.85.154.251</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
301+
<tr><td>RDESX003</td><td>209.25.191.61</td><td><span tooltip="Server Down!" class="text-danger"><i class="fa fa-warning"></i></span></td></tr>
302+
<tr><td>RDESX004</td><td>252.37.192.235</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
303+
<tr><td>RDTerminal01</td><td>139.71.18.207</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
304+
<tr><td>RDTerminal02</td><td>136.80.122.212</td><td><span tooltip="Could not connect!" class="text-warning"><i class="fa fa-flash"></i></span></td></tr>
305+
<tr><td>RDDomainCont01</td><td>196.80.245.33</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
306+
</tbody>
307+
</table>
308+
</div>
309+
</rd-widget-body>
310+
</rd-widget>
311+
</div>
312+
<div class="col-lg-6">
313+
<rd-widget>
314+
<rd-widget-header icon="fa-tasks" title="Striped Servers">
315+
<a href="#" class="pull-right">Manage</a>
316+
</rd-widget-header>
317+
<rd-widget-body classes="medium no-padding">
318+
<div class="table-responsive table-striped">
319+
<table class="table">
320+
<tbody>
321+
<tr><td>RDVMPC001</td><td>238.103.133.37</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
322+
<tr><td>RDVMPC002</td><td>68.66.63.170</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
323+
<tr><td>RDVMPC003</td><td>76.117.212.33</td><td><span tooltip="Server Down!" class="text-danger"><i class="fa fa-warning"></i></span></td></tr>
324+
<tr><td>RDPHPC001</td><td>91.88.224.5</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
325+
<tr><td>RDESX001</td><td>197.188.15.93</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
326+
<tr><td>RDESX002</td><td>168.85.154.251</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
327+
<tr><td>RDESX003</td><td>209.25.191.61</td><td><span tooltip="Server Down!" class="text-danger"><i class="fa fa-warning"></i></span></td></tr>
328+
<tr><td>RDESX004</td><td>252.37.192.235</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
329+
<tr><td>RDTerminal01</td><td>139.71.18.207</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
330+
<tr><td>RDTerminal02</td><td>136.80.122.212</td><td><span tooltip="Could not connect!" class="text-warning"><i class="fa fa-flash"></i></span></td></tr>
331+
<tr><td>RDDomainCont01</td><td>196.80.245.33</td><td><span class="text-success"><i class="fa fa-check"></i></span></td></tr>
332+
</tbody>
333+
</table>
334+
</div>
335+
</rd-widget-body>
336+
</rd-widget>
337+
</div>
338+
</div>
339+
</script>
340+
>>>>>>> develop
130341
</body>
131342
</html>

‎src/js/dashboard/directives/widget-body.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ function rdWidgetBody () {
66
var directive = {
77
requires: '^rdWidget',
88
scope: {
9-
loading: '@?'
9+
loading: '@?',
10+
classes: '@?'
1011
},
1112
transclude: true,
12-
template: '<div class="widget-body"><rd-loading ng-show="loading"></rd-loading><div ng-hide="loading" class="widget-content" ng-transclude></div></div>',
13+
template: '<div class="widget-body" ng-class="classes"><rd-loading ng-show="loading"></rd-loading><div ng-hide="loading" class="widget-content" ng-transclude></div></div>',
1314
restrict: 'E'
1415
};
1516
return directive;

0 commit comments

Comments
 (0)