Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pkp/pkp-lib#2085 Implement bootstrap dropdown for default theme #436

Merged
merged 2 commits into from
Sep 1, 2017
Merged

pkp/pkp-lib#2085 Implement bootstrap dropdown for default theme #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b05a3f8
pkp/pkp-lib#2085 Implement bootstrap dropdown for default theme
NateWr Aug 31, 2017
f8d7d06
Submodule update ##NateWr/i2085_ios_frontend_dropdowns##
NateWr Aug 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/pkp
Open in desktop
Submodule pkp updated 8 files
+1 −1 js/controllers/list/ListPanel.vue
+1 −1 js/controllers/list/ListPanelFilter.vue
+1 −1 js/controllers/list/ListPanelLoadMore.vue
+2 −2 js/controllers/list/submissions/SubmissionsListFilter.vue
+1 −1 js/controllers/list/submissions/SubmissionsListPanel.vue
+7 −8 styles/controllers/listPanel.less
+0 −5 styles/helpers.less
+3 −3 templates/frontend/components/header.tpl
5 changes: 5 additions & 0 deletions plugins/themes/default/DefaultThemePlugin.inc.php
View file
Open in desktop
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
View file
Open in desktop
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