Skip to content

Commit c8a3fb7

Browse files
committed
Add color picker in case someone needs that
1 parent 6b4071a commit c8a3fb7

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"dependencies": {
44
"jquery": ">=1.0",
55
"ng-admin": ">=1.0.6",
6+
"angular-bootstrap-colorpicker": "v3.0.31",
67
"angular-simple-logger": ">=0.0.1",
78
"angular-google-maps": "2.4.1",
89
"angular-google-chart": "0.1.0"

priv/admin/admin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* All rights reserved.
44
* Distributed under the terms of the MIT License. See the LICENSE file.
55
*/
6-
var myApp = angular.module('myApp', ['ng-admin', 'uiGmapgoogle-maps', 'googlechart']);
6+
var myApp = angular.module('myApp', ['ng-admin', 'colorpicker.module', 'uiGmapgoogle-maps', 'googlechart']);
77
myApp.config(['NgAdminConfigurationProvider', function (nga) {
88
var admin = nga.application('Server Admin').baseApiUrl('/');
99

priv/admin/index.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<meta charset="utf-8">
55
<title>Server Admin</title>
66
<link rel="stylesheet" href="/admin/ng-admin.min.css">
7+
<link rel="stylesheet" href="/admin/colorpicker.min.css">
78
<style>
89
.angular-google-map-container { height: 400px; }
910
p.channel_check { width: 30px; text-align:center; float: left; }
@@ -19,6 +20,7 @@
1920
<script src="/admin/angular-simple-logger.min.js"></script>
2021
<script src="/admin/angular-google-maps.min.js" type="text/javascript"></script>
2122
<script src="/admin/ng-google-chart.min.js" type="text/javascript"></script>
23+
<script src="/admin/bootstrap-colorpicker-module.min.js" type="text/javascript"></script>
2224
<script src="/admin/admin-config.js" type="text/javascript"></script>
2325
<script src="/admin/admin.js" type="text/javascript"></script>
2426
</body>

rebar.config

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,23 @@
2828
{compile, "npm install --save"},
2929
{compile, "cp node_modules/jquery/dist/jquery.min.js priv/admin"},
3030
{compile, "cp node_modules/ng-admin/build/ng-admin.min.js priv/admin"},
31+
{compile, "cp node_modules/angular-bootstrap-colorpicker/js/bootstrap-colorpicker-module.min.js priv/admin"},
3132
{compile, "cp node_modules/angular-simple-logger/dist/angular-simple-logger.min.js priv/admin"},
3233
{compile, "cp node_modules/angular-google-maps/dist/angular-google-maps.min.js priv/admin"},
3334
{compile, "cp node_modules/angular-google-chart/ng-google-chart.min.js priv/admin"},
34-
{compile, "cp node_modules/ng-admin/build/ng-admin.min.css priv/admin"}
35+
{compile, "cp node_modules/ng-admin/build/ng-admin.min.css priv/admin"},
36+
{compile, "cp node_modules/angular-bootstrap-colorpicker/css/colorpicker.min.css priv/admin"}
3537
]}.
3638

3739
{artifacts, [
3840
"priv/admin/jquery.min.js",
3941
"priv/admin/ng-admin.min.js",
42+
"priv/admin/bootstrap-colorpicker-module.min.js",
4043
"priv/admin/angular-simple-logger.min.js",
4144
"priv/admin/angular-google-maps.min.js",
4245
"priv/admin/ng-google-chart.min.js",
43-
"priv/admin/ng-admin.min.css"
46+
"priv/admin/ng-admin.min.css",
47+
"priv/admin/colorpicker.min.css"
4448
]}.
4549

4650
{relx, [

0 commit comments

Comments
 (0)