Merge pull request #1760 from sparc-request/kg-catalog_accordion_carets

KG - Service Catalog Carets / Other Panel Issues
sparc-request · Mar 27, 2019 · b197402 · b197402
2 parents 22ebbbb + 042905a
commit b197402
Show file tree

Hide file tree

Showing 17 changed files with 43 additions and 54 deletions.
diff --git a/app/assets/stylesheets/bootstrap-custom.sass b/app/assets/stylesheets/bootstrap-custom.sass
@@ -36,8 +36,13 @@
 
   .panel-heading, .panel-footer
     @extend .d-flex
+
+  .panel-heading:not(.flex-column), .panel-footer:not(.flex-column)
     @extend .align-items-center
 
+  .panel-heading.flex-column, .panel-footer.flex-column
+    @extend .justify-content-center
+
 
 
 // Buttons

diff --git a/app/assets/stylesheets/flex-utils.sass b/app/assets/stylesheets/flex-utils.sass
@@ -49,8 +49,8 @@
   flex-direction: row !important
 
 .flex-column
-  -ms-flex-direction: row !important
-  flex-direction: row !important
+  -ms-flex-direction: column !important
+  flex-direction: column !important
 
 .flex-wrap
   -ms-flex-wrap: wrap !important

diff --git a/app/views/catalogs/accordion/_institutions.html.haml b/app/views/catalogs/accordion/_institutions.html.haml
@@ -24,13 +24,12 @@
 
     .panel.panel-default
       .panel-heading.institution-header.clicked{ class: [i.css_class, locked ? 'bg-danger text-danger' : ''], data: { id: i.id, toggle: 'collapse', target: ".institution-#{i.id}", parent: '#institution-accordion' } }
-        .row
-          .col-lg-10
-            %h4.panel-title.text-left
-              = organization_name_display(i, locked)
-          .col-lg-2
-            - if i.providers.any?
-              %span.caret
+        .col-lg-11.no-padding
+          %h4.panel-title.text-left
+            = organization_name_display(i, locked)
+        .col-lg-1.no-padding.text-right
+          - if i.providers.any?
+            %span.caret
       .panel-collapse.collapse.in{ class: "institution-#{i.id}" }
         .panel-body
           = render 'catalogs/accordion/providers', providers: i.providers, locked_ids: locked_ids, i: i
diff --git a/app/views/catalogs/accordion/_providers.html.haml b/app/views/catalogs/accordion/_providers.html.haml
@@ -24,13 +24,12 @@
 
     .panel.panel-default
       .panel-heading.provider-header{ class: [css_class(p), locked ? 'bg-danger text-danger' : ''], data: { id: p.id, toggle: 'collapse', target: ".provider-#{p.id}", parent: "#institution-#{i.id}" } }
-        .row
-          .col-lg-10
-            %h4.panel-title.text-left
-              = organization_name_display(p, locked)
-          .col-lg-2
-            - if p.programs.any?
-              %span.caret
+        .col-lg-11.no-padding
+          %h4.panel-title.text-left
+            = organization_name_display(p, locked)
+        .col-lg-1.no-padding.text-right
+          - if p.programs.any?
+            %span.caret
       .panel-collapse.collapse{ class: ["provider-#{p.id}", @provider == p ? 'in' : ''] }
         .panel-body
           = render 'catalogs/accordion/programs', programs: p.programs, locked_ids: locked_ids
diff --git a/app/views/dashboard/protocols/form/study_form_sections/_affiliations.html.haml b/app/views/dashboard/protocols/form/study_form_sections/_affiliations.html.haml
@@ -19,11 +19,10 @@
 -# 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.
 
 .panel.panel-default
-  .panel-heading
+  .panel-heading.flex-column
     %h4.panel-title
       = t(:protocols)[:studies][:affiliations][:header]
-    .sub_text
-      = t(:protocols)[:studies][:affiliations][:subtext]
+    = t(:protocols)[:studies][:affiliations][:subtext]
   .panel-body
     = form.fields_for :affiliations, protocol.affiliations.sort_by(&:position) do |affiliations_form|
       - checked = !affiliations_form.object.new && !affiliations_form.object.marked_for_destruction?

diff --git a/app/views/dashboard/protocols/form/study_form_sections/_financial_information.html.haml b/app/views/dashboard/protocols/form/study_form_sections/_financial_information.html.haml
@@ -19,11 +19,10 @@
 -# 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.
 
 .panel.panel-default
-  .panel-heading
+  .panel-heading.flex-column
     %h4.panel-title
       = t(:protocols)[:studies][:financial_information][:header]
-    .sub_text
-      = t(:protocols)[:studies][:financial_information][:subtext]
+    = t(:protocols)[:studies][:financial_information][:subtext]
   .panel-body
     .form-group.row#udak-number
       = form.label :udak_project_number, t(:protocols)[:studies][:financial_information][:udak_project_number], class: 'col-lg-2 control-label'

diff --git a/app/views/dashboard/protocols/form/study_form_sections/_impact_areas.html.haml b/app/views/dashboard/protocols/form/study_form_sections/_impact_areas.html.haml
@@ -19,11 +19,10 @@
 -# 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.
 
 .panel.panel-default
-  .panel-heading
+  .panel-heading.flex-column
     %h4.panel-title
       = t(:protocols)[:studies][:impact_areas][:header]
-    .sub_text
-      = t(:protocols)[:studies][:impact_areas][:subtext]
+    = t(:protocols)[:studies][:impact_areas][:subtext]
   .panel-body
     = form.fields_for :impact_areas, protocol.impact_areas.sort_by(&:position) do |ia_form|
       - checked = !ia_form.object.new && !ia_form.object.marked_for_destruction?

diff --git a/app/views/dashboard/protocols/form/study_form_sections/_research_involving.html.haml b/app/views/dashboard/protocols/form/study_form_sections/_research_involving.html.haml
@@ -19,11 +19,10 @@
 -# 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.
 
 .panel.panel-default
-  .panel-heading
+  .panel-heading.flex-column
     %h4.panel-title
       = t(:protocols)[:studies][:research_involving][:header]
-    .sub_text
-      = t(:protocols)[:studies][:research_involving][:subtext]
+    = t(:protocols)[:studies][:research_involving][:subtext]
   .panel-body
     = form.fields_for :research_types_info do |rt_form|
       .form-group.row.human_subjects

diff --git a/app/views/dashboard/protocols/form/study_form_sections/_study_information.html.haml b/app/views/dashboard/protocols/form/study_form_sections/_study_information.html.haml
@@ -19,11 +19,10 @@
 -# 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.
 
 .panel.panel-default
-  .panel-heading
+  .panel-heading.flex-column
     %h4.panel-title
       = t(:protocols)[:studies][:information][:header]
-    .sub_text
-      = t(:protocols)[:studies][:information][:subtext]
+    = t(:protocols)[:studies][:information][:subtext]
   .panel-body.container-fluid
     - if Setting.get_value("research_master_enabled")
       .form-group.row

diff --git a/app/views/dashboard/protocols/form/study_form_sections/_study_type.html.haml b/app/views/dashboard/protocols/form/study_form_sections/_study_type.html.haml
@@ -19,11 +19,10 @@
 -# 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.
 
 .panel.panel-default
-  .panel-heading
+  .panel-heading.flex-column
     %h4.panel-title
       = t(:protocols)[:studies][:study_type][:header]
-    .sub_text
-      = t(:protocols)[:studies][:study_type][:subtext]
+    = t(:protocols)[:studies][:study_type][:subtext]
   .panel-body
     = form.fields_for :study_types, protocol.study_types.sort_by(&:position) do |st_form|
       - checked = !st_form.object.new && !st_form.object.marked_for_destruction?

diff --git a/app/views/protocols/form/_project_roles_fields.html.haml b/app/views/protocols/form/_project_roles_fields.html.haml
@@ -22,8 +22,6 @@
   .panel-heading
     %h4.panel-title
       = t(:protocols)[:authorized_users][:header]
-    .sub_text
-      = t(:protocols)[:authorized_users][:subtext]
   .panel-body
     = form.fields_for :project_roles do |pr_form|
       .form-group.row

diff --git a/app/views/protocols/form/study_form_sections/_affiliations.html.haml b/app/views/protocols/form/study_form_sections/_affiliations.html.haml
@@ -19,11 +19,10 @@
 -# 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.
 
 .panel.panel-default
-  .panel-heading
+  .panel-heading.flex-column
     %h4.panel-title
       = t(:protocols)[:studies][:affiliations][:header]
-    .sub_text
-      = t(:protocols)[:studies][:affiliations][:subtext]
+    = t(:protocols)[:studies][:affiliations][:subtext]
   .panel-body
     = form.fields_for :affiliations, protocol.affiliations.sort_by(&:position) do |affiliations_form|
       - checked = !affiliations_form.object.new && !affiliations_form.object.marked_for_destruction?

diff --git a/app/views/protocols/form/study_form_sections/_financial_information.html.haml b/app/views/protocols/form/study_form_sections/_financial_information.html.haml
@@ -19,11 +19,10 @@
 -# 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.
 
 .panel.panel-default
-  .panel-heading
+  .panel-heading.flex-column
     %h4.panel-title
       = t(:protocols)[:studies][:financial_information][:header]
-    .sub_text
-      = t(:protocols)[:studies][:financial_information][:subtext]
+    = t(:protocols)[:studies][:financial_information][:subtext]
   .panel-body
     .form-group.row#udak-number
       = form.label :udak_project_number, t(:protocols)[:studies][:financial_information][:udak_project_number], class: 'col-lg-2 control-label'

diff --git a/app/views/protocols/form/study_form_sections/_impact_areas.html.haml b/app/views/protocols/form/study_form_sections/_impact_areas.html.haml
@@ -19,11 +19,10 @@
 -# 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.
 
 .panel.panel-default
-  .panel-heading
+  .panel-heading.flex-column
     %h4.panel-title
       = t(:protocols)[:studies][:impact_areas][:header]
-    .sub_text
-      = t(:protocols)[:studies][:impact_areas][:subtext]
+    = t(:protocols)[:studies][:impact_areas][:subtext]
   .panel-body
     = form.fields_for :impact_areas, protocol.impact_areas.sort_by(&:position) do |ia_form|
       - checked = !ia_form.object.new && !ia_form.object.marked_for_destruction?

diff --git a/app/views/protocols/form/study_form_sections/_research_involving.html.haml b/app/views/protocols/form/study_form_sections/_research_involving.html.haml
@@ -19,11 +19,10 @@
 -# 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.
 
 .panel.panel-default
-  .panel-heading
+  .panel-heading.flex-column
     %h4.panel-title
       = t(:protocols)[:studies][:research_involving][:header]
-    .sub_text
-      = t(:protocols)[:studies][:research_involving][:subtext]
+    = t(:protocols)[:studies][:research_involving][:subtext]
   .panel-body
     = form.fields_for :research_types_info do |rt_form|
       .form-group.row.human_subjects

diff --git a/app/views/protocols/form/study_form_sections/_study_information.html.haml b/app/views/protocols/form/study_form_sections/_study_information.html.haml
@@ -19,11 +19,10 @@
 -# 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.
 
 .panel.panel-default
-  .panel-heading
+  .panel-heading.flex-column
     %h4.panel-title
       = t(:protocols)[:studies][:information][:header]
-    .sub_text
-      = t(:protocols)[:studies][:information][:subtext]
+    = t(:protocols)[:studies][:information][:subtext]
   .panel-body.container-fluid
     - if Setting.get_value("research_master_enabled")
       .form-group.row

diff --git a/app/views/protocols/form/study_form_sections/_study_type.html.haml b/app/views/protocols/form/study_form_sections/_study_type.html.haml
@@ -19,11 +19,10 @@
 -# 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.
 
 .panel.panel-default
-  .panel-heading
+  .panel-heading.flex-column
     %h4.panel-title
       = t(:protocols)[:studies][:study_type][:header]
-    .sub_text
-      = t(:protocols)[:studies][:study_type][:subtext]
+    = t(:protocols)[:studies][:study_type][:subtext]
   .panel-body
     = form.fields_for :study_types, protocol.study_types.sort_by(&:position) do |st_form|
       - checked = !st_form.object.new && !st_form.object.marked_for_destruction?