Skip to content

Commit

Permalink
Merge pull request pkp#1515 from NateWr/i2085_ios_frontend_dropdowns
Browse files Browse the repository at this point in the history
pkp/pkp-lib#2085 Use Bootstrap dropdowns for default theme dropdowns
  • Loading branch information
bozana authored Sep 1, 2017
2 parents 210bde7 + 06651fb commit d1d5cb6
Show file tree
Hide file tree
Showing 10 changed files with 3,128 additions and 103 deletions.
5 changes: 5 additions & 0 deletions plugins/themes/default/DefaultThemePlugin.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,11 @@ public function init() {
$this->addScript('jQueryUI', $jqueryUI, array('baseUrl' => ''));
$this->addScript('jQueryTagIt', $request->getBaseUrl() . '/lib/pkp/js/lib/jquery/plugins/jquery.tag-it.js', array('baseUrl' => ''));

// Load Bootsrap's dropdown
$this->addScript('popper', 'js/lib/popper/popper.js');
$this->addScript('bsUtil', 'js/lib/bootstrap/util.js');
$this->addScript('bsDropdown', 'js/lib/bootstrap/dropdown.js');

// Load custom JavaScript for this theme
$this->addScript('default', 'js/main.js');
}
Expand Down
22 changes: 22 additions & 0 deletions plugins/themes/default/js/lib/bootstrap/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
The MIT License (MIT)

Copyright (c) 2011-2017 Twitter, Inc.
Copyright (c) 2011-2017 The Bootstrap Authors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
Loading

0 comments on commit d1d5cb6

Please sign in to comment.