Skip to content

Commit

Permalink
CRM-20756 - Add Angular ui.bootstrap library
Browse files Browse the repository at this point in the history
This adds the library
[ui.bootstrap](https://angular-ui.github.io/bootstrap/), which makes it
easier to include the functional elements of Bootstrap in AngularJS pages.

In the past, adding this was problematic, but now the situation has
improved:

1.  civicrm-core has upgraded to AngularJS 1.5.  (In the past, civicrm-core
used AngularJS 1.3, which was incompatible.)

2.  civicrm-core allows optional AngularJS modules.  (In the past, all
modules were loaded unconditionally, which could result in loading
new/unnecessary code for legacy users.  Now, you can opt-out of this
behavior with `basePages=>array()`.)
  • Loading branch information
totten committed Jun 22, 2017
1 parent f95dc11 commit e88c001
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 0 deletions.
1 change: 1 addition & 0 deletions Civi/Angular/Manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ public function getModules() {
$angularModules['ngRoute'] = include "$civicrm_root/ang/ngRoute.ang.php";
$angularModules['ngSanitize'] = include "$civicrm_root/ang/ngSanitize.ang.php";
$angularModules['ui.utils'] = include "$civicrm_root/ang/ui.utils.ang.php";
$angularModules['ui.bootstrap'] = include "$civicrm_root/ang/ui.bootstrap.ang.php";
$angularModules['ui.sortable'] = include "$civicrm_root/ang/ui.sortable.ang.php";
$angularModules['unsavedChanges'] = include "$civicrm_root/ang/unsavedChanges.ang.php";
$angularModules['statuspage'] = include "$civicrm_root/ang/crmStatusPage.ang.php";
Expand Down
11 changes: 11 additions & 0 deletions ang/ui.bootstrap.ang.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php
// This file declares an Angular module which can be autoloaded
// in CiviCRM. See also:
// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules

return array(
'ext' => 'civicrm',
'basePages' => array(),
'js' => array('bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js'),
'css' => array('bower_components/angular-bootstrap/ui-bootstrap-csp.css', 'ang/ui.bootstrap.css'),
);
1 change: 1 addition & 0 deletions ang/ui.bootstrap.css
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.nav, .pagination, .carousel, .panel-title a { cursor: pointer; }
1 change: 1 addition & 0 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"jstree": "~3",
"ckeditor": "~4.5",
"font-awesome": "~4",
"angular-bootstrap": "^2.5.0",
"angular-sanitize": "~1.5.0",
"phantomjs-polyfill": "^0.0.2"
},
Expand Down

0 comments on commit e88c001

Please sign in to comment.