Merge 207bc25 into 516ba12

Gemfile

@@ -5,7 +5,10 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 ruby '2.5.0'
 
-# Gems to install: faker, shoulda matchers
+# 
+# Rails essentials
+# 
+
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.2.1'
 # Use sqlite3 and postgres as the database for Active Record
@@ -20,56 +23,47 @@ gem 'sassc-rails'
 gem 'uglifier', '>= 1.3.0'
 # See https://github.com/rails/execjs#readme for more supported runtimes
 gem 'mini_racer', platforms: :ruby
-# See https://github.com/bokmann/font-awesome-rails for details
-gem 'font-awesome-rails'
-
-# Use CoffeeScript for .coffee assets and views
-gem 'coffee-rails', '~> 4.2'
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
 gem 'turbolinks', '~> 5'
+# Flexible authentication solution for Rails with Warden
+# https://github.com/plataformatec/devise
+gem 'devise'
+gem 'devise-bootstrap-views', '~> 1.0'
+gem 'devise-i18n'
+# Provides different authentication strategies
+gem 'omniauth'
+gem 'omniauth_openid_connect'
+# Role management, minimal authorization through OO design and pure Ruby classes
+# https://github.com/varvet/pundit
+gem 'pundit'
+# Reduces boot times through caching; required in config/boot.rb
+gem 'bootsnap', '>= 1.1.0', require: false
+# Use CoffeeScript for .coffee assets and views
+gem 'coffee-rails', '~> 4.2'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.5'
 # Use Redis adapter to run Action Cable in production
 # gem 'redis', '~> 4.0'
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
-
 # Use ActiveStorage variant
 # gem 'mini_magick', '~> 4.8'
 
-# Flexible authentication solution for Rails with Warden
-# https://github.com/plataformatec/devise
-gem 'devise'
-# Role management, minimal authorization through OO design and pure Ruby classes
-# https://github.com/varvet/pundit
-gem 'pundit'
-
-# Fancy default views and javascript helpers https://github.com/twbs/bootstrap-rubygem
-gem 'bootstrap', '~> 4.3.1'
-gem 'devise-bootstrap-views', '~> 1.0'
-gem 'devise-i18n'
-gem 'jquery-rails'
-# Jquery datatables ruby gems for assets pipeline, https://datatables.net/
-# https://github.com/mkhairi/jquery-datatables
-gem 'jquery-datatables'
+#
+# Application
+#
 
 # Ruby interface to the VMware vSphere API
 # https://github.com/vmware/rbvmomi
 gem 'rbvmomi'
-
-# Provides form.select extensions
-gem 'select2-rails'
-
-# Provides different authentication strategies
-gem 'omniauth'
-gem 'omniauth_openid_connect'
-
-# Allow locks on database
-gem 'with_advisory_lock'
-
 # Ruby Git
 gem 'git'
-
+# Allow locks on database
+# https://github.com/ClosureTree/with_advisory_lock
+gem 'with_advisory_lock'
+# SSH private and public key generator in pure Ruby (RSA & DSA)
+# https://github.com/bensie/sshkey
+gem 'sshkey', '~> 1.9'
 # Mina for deployment
 # Have a look in the tutorial:
 # https://github.com/lnikell/wiki/wiki/Deploy-rails-application-with-Mina,-Nginx-and-Puma
@@ -83,20 +77,32 @@ gem 'mina-logs', require: false
 # Announce Mina deploys to Slack channels, https://github.com/krichly/mina-slack
 gem 'execjs', require: false
 gem 'mina-slack', require: false, github: 'krichly/mina-slack'
-
-# Reduces boot times through caching; required in config/boot.rb
-gem 'bootsnap', '>= 1.1.0', require: false
-
 # Coveralls is a web service to help you track your code coverage
 # over time, and ensure that all your new code is fully covered
 # https://coveralls.io/github/hpi-swt2/vm-portal
 gem 'coveralls', require: false
-
 # Report errors in production to central Errbit system
 # https://github.com/errbit/errbit
 # https://github.com/airbrake/airbrake
 gem 'airbrake', '~> 5.0'
 
+#
+# Packaged JS & CSS libraries
+#
+
+# Fancy default views and javascript helpers https://github.com/twbs/bootstrap-rubygem
+gem 'bootstrap', '~> 4.3.1'
+# jQuery for Rails https://github.com/rails/jquery-rails
+gem 'jquery-rails'
+# Jquery datatables ruby gems for assets pipeline, https://datatables.net/
+# https://github.com/mkhairi/jquery-datatables
+gem 'jquery-datatables'
+# The font-awesome font bundled as an asset for the rails asset pipeline
+# See https://github.com/bokmann/font-awesome-rails
+gem 'font-awesome-rails'
+# Integrate Select2 javascript library with Rails asset pipeline
+# https://github.com/argerim/select2-rails
+gem 'select2-rails'
 # Packaged clipboard.js JS library for copying text to clipboard
 # https://github.com/sadiqmmm/clipboard-rails
 gem 'clipboard-rails'
@@ -149,4 +155,3 @@ end
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
 
-gem 'sshkey', '~> 1.9'

app/assets/javascripts/application.js

@@ -30,9 +30,8 @@
 // https://github.com/turbolinks/turbolinks#observing-navigation-events
 document.addEventListener("turbolinks:load", function() {
   // Initialize 'Select2', jQuery based replacement for select boxes
-  // https://github.com/argerim/select2-rails#usage
-  $('.selecttwo').select2();
-
+  // https://github.com/argerim/select2-rails#include-select2-rails-stylesheet-assets
+  $('.selecttwo').select2({ theme: "bootstrap" });
   // Initialize Boostrap tooltips for all elements having data-toggle
   // attribute set to 'tooltip'. Uses the title attr as tooltip.
   // https://getbootstrap.com/docs/4.0/components/tooltips

app/assets/stylesheets/application.scss

@@ -9,23 +9,36 @@
  * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
  * files in this directory. Styles in this file should be added after the last require_* statement.
  * It is generally better to create a new file per style scope.
-
- *= require font-awesome
- *= require_self
- *= require_tree .
  */
-
+
+ /*
+ * Remove all the *= require and *= require_tree statements from the Sass file.
+ * Instead, use @import to import Sass files.
+ * Do not use *= require in Sass or your other stylesheets will not be 
+ * able to access the Bootstrap mixins and variables.
+ * See: https://github.com/twbs/bootstrap-rubygem#a-ruby-on-rails
+ */
+
+// Custom bootstrap variables must be set or *before* bootstrap is imported
 $primary: #0C415F;
 $danger: #a80833;
 $primary-active: #1f6993;
 $primary-hover: #1a5b82;
 
+// https://github.com/bokmann/font-awesome-rails#sass-support
+@import "font-awesome";
 // https://github.com/twbs/bootstrap-rubygem#a-ruby-on-rails
-// Custom bootstrap variables must be set or imported *before* bootstrap.
 @import "bootstrap";
+// https://github.com/argerim/select2-rails/issues/135
+@import "select2.css";
+@import "select2-bootstrap";
+// Custom styles for select2: app/assets/stylesheets/custom.scss
+@import "select2-custom";
 // Bootstrap styling for datatables
 // https://github.com/mkhairi/jquery-datatables#stylesheets
 @import 'datatables/dataTables.bootstrap4';
+// Custom styles for datatables: app/assets/stylesheets/datatables-custom.scss
+@import 'datatables-custom';
 // optional datatables styles for extensions, include when used
 //@import 'datatables/extensions/AutoFill/autoFill.bootstrap4';
 //@import 'datatables/extensions/Buttons/buttons.bootstrap4';
@@ -39,71 +52,6 @@ $primary-hover: #1a5b82;
 //@import 'datatables/extensions/Scroller/scroller.bootstrap4';
 //@import 'datatables/extensions/Select/select.bootstrap4';
 
-th {
-  @extend .text-white;
-  @extend .bg-primary;
-}
-
-html, body {
-  height: 100%;
-  min-width: 1000px;
-  width: 100%;
-}
-
-.page-container {
-  margin: 25px 0 0 50px;
-  width: calc(100% - 100px);
-}
-
-h1 {
-  color: $primary;
-}
-
-.dashboard-header-link {
-  text-decoration: none !important;
-}
-
-h3:hover {
-  text-decoration: none;
-  color: $primary-hover;
-}
-
-body {
-  display: flex;
-  flex-direction: column;
-}
-
-#content {
-  flex: 1 0 auto;
-}
-
-#footer {
-  flex-shrink: 0;
-
-  a {
-    color: white;
-  }
-
-  .footer-element {
-    padding-top: 20px;
-
-    &__left {
-      @extend .footer-element;
-      padding-left: 50px;
-    }
-  }
-}
-
-.dropdown-menu {
-  padding: 10px;
-  width: auto;
-}
-
-.bg-primary-light {
-  background-color: #e6f3ff;
-}
-
-#menu-profile-dropdown {
-  padding-top: 3px;
-}
+// All custom CSS: app/assets/stylesheets/custom.scss
+@import 'custom';
 

app/assets/stylesheets/resource_allocation.scss → app/assets/stylesheets/charts.scss

@@ -1,5 +1,4 @@
 // Place all the styles related to the Requests controller here.
-// They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
 
 .graphLabel {
@@ -33,4 +32,5 @@
     position: relative;
     text-align: center;
     display: inline-block;
-}
+}
+