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

Jump to bottom

SAW - Bootstrap Catalog Base Code #314

Merged
merged 9 commits into from
Jun 9, 2017
Merged

SAW - Bootstrap Catalog Base Code #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
de0b756
basic bootstrap accordion in catalog - lots of missing stuff still
SamWord May 9, 2017
bc2b32d
search bar-no functionality, show all button-with functionality
SamWord May 10, 2017
6fc9dc6
removed text
SamWord May 10, 2017
e5645d2
accordion styling, only glyphicons open accordion
SamWord May 11, 2017
4b06592
show available/show all button works with org colors
SamWord Jun 1, 2017
e2ebd9d
Catalog header, changed application.yml
SamWord Jun 2, 2017
cadf63e
availability button, search bar styling
SamWord Jun 5, 2017
99cfa69
removed unused (at the moment) buttons
SamWord Jun 5, 2017
f26c057
resolved merge conflicts
SamWord Jun 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file added app/assets/images/catalog_manager/logos/catalog_manager_logo.jpg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 26 additions & 16 deletions app/assets/javascripts/catalog_manager/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,36 @@
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
// TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

// This is a manifest file that'll be compiled into including all the files listed below.
// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
// be included in the compiled file accessible from http://example.com/assets/application.js
// This is a manifest file that'll be compiled into application.js, which will include all the files
// listed below.
//
// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
//
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// the compiled file.
//
//= require catalog_manager/sparc
//= require jquery
//= require bootstrap-sprockets
//= require bootstrap-select
//= require bootstrap-table
//= require bootstrap-table-export
//= require bootstrap-table-custom
//= require moment
//= require bootstrap-datetimepicker
//= require catalog_manager/catalog
//= require jquery_ujs
//= require json2
//= require jquery.remotipart
//= require jquery_nested_form
//= require jquery.cookie
//= require jquery.form
//= require jquery.toastmessage
//= require catalog_manager/jquery.jstree
//= require jquery-ui
//= require jquery_nested_form
//= require catalog_manager/jquery.formatCurrency-1.4.0.min
//= require catalog_manager/catalog
//= require catalog_manager/services
//= require catalog_manager/institutions
//= require catalog_manager/providers
//= require catalog_manager/update
//= require catalog_manager/config
//= require nprogress
//= require nprogress-ajax
//= require json2
//= require underscore-min
//= require form_manager
//= require form_fx_manager
//= require twitter/typeahead.min
//= require assert
//= require ajax_handler
//= require sweetalert.min