From 4ecf078db60a38a20cae4b55de9064529a815166 Mon Sep 17 00:00:00 2001 From: James Mason Date: Fri, 15 Jun 2018 18:20:18 -0700 Subject: [PATCH] Consistent, concise styling of datables Add a semantic class to aggregate bootstrap classes and consistently applyt them to all datatables. --- app/assets/stylesheets/osem-datatables.scss | 21 +++++++++++++++++++ app/assets/stylesheets/strap-on.scss | 3 +++ app/views/admin/booths/index.html.haml | 2 +- app/views/admin/events/index.html.haml | 2 +- .../admin/events/registrations.html.haml | 2 +- app/views/admin/events/show.html.haml | 2 +- .../_users_with_org_admin_role.haml | 2 +- app/views/admin/organizations/index.html.haml | 2 +- .../admin/physical_tickets/index.html.haml | 2 +- app/views/admin/questions/show.html.haml | 2 +- app/views/admin/registrations/index.html.haml | 2 +- app/views/admin/reports/_all_events.html.haml | 2 +- .../_events_with_requirements.html.haml | 2 +- .../_events_without_commercials.html.haml | 2 +- .../admin/reports/_missing_speakers.html.haml | 2 +- app/views/admin/resources/index.html.haml | 3 +-- app/views/admin/roles/_users.html.haml | 2 +- app/views/admin/tickets/index.html.haml | 2 +- app/views/admin/tickets/show.html.haml | 3 +-- app/views/admin/tracks/index.html.haml | 2 +- app/views/admin/tracks/show.html.haml | 2 +- .../users/_event_registrations.html.haml | 2 +- app/views/admin/users/_submissions.html.haml | 2 +- app/views/admin/users/index.html.haml | 2 +- app/views/proposals/registrations.html.haml | 2 +- 25 files changed, 47 insertions(+), 25 deletions(-) create mode 100644 app/assets/stylesheets/osem-datatables.scss diff --git a/app/assets/stylesheets/osem-datatables.scss b/app/assets/stylesheets/osem-datatables.scss new file mode 100644 index 00000000..4f640f49 --- /dev/null +++ b/app/assets/stylesheets/osem-datatables.scss @@ -0,0 +1,21 @@ +table.datatable { + @extend .table, .table-striped, .table-bordered, .table-hover; + + td.actions { + vertical-align: middle; + align: center; + + div.btn-group { + display: flex; + } + + a { + @extend .btn; + } + } + + td.truncate { + max-width: 1px; + @include text-overflow(); + } +} diff --git a/app/assets/stylesheets/strap-on.scss b/app/assets/stylesheets/strap-on.scss index 83fd8e9a..571161e6 100644 --- a/app/assets/stylesheets/strap-on.scss +++ b/app/assets/stylesheets/strap-on.scss @@ -61,3 +61,6 @@ $navbar-default-link-hover-color: #000000; // Utility classes @import "bootstrap/utilities"; @import "bootstrap/responsive-utilities"; + +// semantic classes +@import "osem-datatables"; diff --git a/app/views/admin/booths/index.html.haml b/app/views/admin/booths/index.html.haml index 431b6dfc..e135be56 100644 --- a/app/views/admin/booths/index.html.haml +++ b/app/views/admin/booths/index.html.haml @@ -54,7 +54,7 @@ = link_to "#{@conference.booth_limit} booths", edit_admin_conference_path(@conference.short_title) ) - if @booths.any? - %table.table.table-striped.table-bordered.table-hover.datatable + %table.datatable %thead %th %b ID diff --git a/app/views/admin/events/index.html.haml b/app/views/admin/events/index.html.haml index 3088539c..3e3f2e7a 100644 --- a/app/views/admin/events/index.html.haml +++ b/app/views/admin/events/index.html.haml @@ -59,7 +59,7 @@ .row .col-md-12 .margin-event-table - %table.table.table-striped.table-bordered.table-hover.datatable + %table.datatable %thead %th %b ID diff --git a/app/views/admin/events/registrations.html.haml b/app/views/admin/events/registrations.html.haml index 00328c8a..227c0138 100644 --- a/app/views/admin/events/registrations.html.haml +++ b/app/views/admin/events/registrations.html.haml @@ -16,7 +16,7 @@ You have more registrations than the capacity of the room! .well - %table.table.table-hover.table-borderd.table-striped.datatable#registrations + %table.datatable#registrations %thead %th %th Name diff --git a/app/views/admin/events/show.html.haml b/app/views/admin/events/show.html.haml index 0fe17c78..ecf45c2a 100644 --- a/app/views/admin/events/show.html.haml +++ b/app/views/admin/events/show.html.haml @@ -18,7 +18,7 @@ = render 'proposal' #history-content.tab-pane .col-md-12 - %table.table.table-striped.table-bordered.table-hover.datatable + %table.datatable %thead %th ID %th Description diff --git a/app/views/admin/organizations/_users_with_org_admin_role.haml b/app/views/admin/organizations/_users_with_org_admin_role.haml index e107868c..d780babc 100644 --- a/app/views/admin/organizations/_users_with_org_admin_role.haml +++ b/app/views/admin/organizations/_users_with_org_admin_role.haml @@ -1,7 +1,7 @@ .page-header %h3 Users (#{users.length}) - if users.present? - %table.table.table-striped.table-bordered.table-hover.datatable#users + %table.datatable#users %thead %th Name %th Email diff --git a/app/views/admin/organizations/index.html.haml b/app/views/admin/organizations/index.html.haml index ed782677..7baa6849 100644 --- a/app/views/admin/organizations/index.html.haml +++ b/app/views/admin/organizations/index.html.haml @@ -9,7 +9,7 @@ Manage organizations in OSEM .row .col-md-12 - %table.table.table-hover.datatable + %table.datatable %thead %th Name %th Upcoming Conferences diff --git a/app/views/admin/physical_tickets/index.html.haml b/app/views/admin/physical_tickets/index.html.haml index 8b26a965..0d71efe2 100644 --- a/app/views/admin/physical_tickets/index.html.haml +++ b/app/views/admin/physical_tickets/index.html.haml @@ -16,7 +16,7 @@ - if @physical_tickets.any? .row .col-md-12 - %table.table.table-hover.datatable#tickets + %table.datatable#tickets %thead %th ID %th Type diff --git a/app/views/admin/questions/show.html.haml b/app/views/admin/questions/show.html.haml index 0f01d41d..2c397d10 100644 --- a/app/views/admin/questions/show.html.haml +++ b/app/views/admin/questions/show.html.haml @@ -11,7 +11,7 @@ .row .col-md-12 - %table.table.table-border.table-hover.datatable#question_users + %table.datatable#question_users %thead %th Name %th Username diff --git a/app/views/admin/registrations/index.html.haml b/app/views/admin/registrations/index.html.haml index 52a266f8..8e5528bf 100644 --- a/app/views/admin/registrations/index.html.haml +++ b/app/views/admin/registrations/index.html.haml @@ -19,7 +19,7 @@ .row .col-md-12 %div.margin-event-table - %table.table.table-hover.datatable#registrations + %table.datatable#registrations %thead %tr %th ID# diff --git a/app/views/admin/reports/_all_events.html.haml b/app/views/admin/reports/_all_events.html.haml index cca8968a..87ed9817 100644 --- a/app/views/admin/reports/_all_events.html.haml +++ b/app/views/admin/reports/_all_events.html.haml @@ -8,7 +8,7 @@ All submissions and the information that they are missing .col-md-12 - %table.table.table-striped.table-bordered.table-hover.datatable + %table.datatable %thead %th ID %th Title diff --git a/app/views/admin/reports/_events_with_requirements.html.haml b/app/views/admin/reports/_events_with_requirements.html.haml index 9e01a8ae..662142d7 100644 --- a/app/views/admin/reports/_events_with_requirements.html.haml +++ b/app/views/admin/reports/_events_with_requirements.html.haml @@ -7,7 +7,7 @@ %p.text-muted All submissions where the speakers have special requirements .col-md-12 - %table.table.table-striped.table-bordered.table-hover.datatable + %table.datatable %thead %th ID %th Title diff --git a/app/views/admin/reports/_events_without_commercials.html.haml b/app/views/admin/reports/_events_without_commercials.html.haml index 7156beb9..a9447f1d 100644 --- a/app/views/admin/reports/_events_without_commercials.html.haml +++ b/app/views/admin/reports/_events_without_commercials.html.haml @@ -7,7 +7,7 @@ %p.text-muted All submissions that have no commercial .col-md-12 - %table.table.table-striped.table-bordered.table-hover.datatable + %table.datatable %thead %th ID %th Title diff --git a/app/views/admin/reports/_missing_speakers.html.haml b/app/views/admin/reports/_missing_speakers.html.haml index bc1769ae..d439590a 100644 --- a/app/views/admin/reports/_missing_speakers.html.haml +++ b/app/views/admin/reports/_missing_speakers.html.haml @@ -7,7 +7,7 @@ %p.text-muted All event speakers who haven't checked in .col-md-12 - %table.table.table-striped.table-bordered.table-hover.datatable + %table.datatable %thead %th Speaker Name %th Registered? diff --git a/app/views/admin/resources/index.html.haml b/app/views/admin/resources/index.html.haml index 7f1b6137..4d97f1d6 100644 --- a/app/views/admin/resources/index.html.haml +++ b/app/views/admin/resources/index.html.haml @@ -7,7 +7,7 @@ - if @conference.resources.any? .row .col-md-12 - %table.table.table-hover.datatable + %table.datatable %thead %th Name %th Left( Left/Total ) @@ -33,4 +33,3 @@ .row .col-md-12 = link_to 'Add Resource', new_admin_conference_resource_path, class: 'btn btn-success pull-right', disabled: !(can? :create, Resource.new(conference_id: @conference_id)) - diff --git a/app/views/admin/roles/_users.html.haml b/app/views/admin/roles/_users.html.haml index 268f01f5..bde7856b 100644 --- a/app/views/admin/roles/_users.html.haml +++ b/app/views/admin/roles/_users.html.haml @@ -1,7 +1,7 @@ .page-header %h3 Users (#{users.length}) - if users.present? - %table.table.table-striped.table-bordered.table-hover.datatable#users + %table.datatable#users %thead - if ( can? :toggle_user, @role ) %th.col-md-1 diff --git a/app/views/admin/tickets/index.html.haml b/app/views/admin/tickets/index.html.haml index 71698bb2..020cc1c7 100644 --- a/app/views/admin/tickets/index.html.haml +++ b/app/views/admin/tickets/index.html.haml @@ -8,7 +8,7 @@ - if @conference.tickets.any? .row .col-md-12 - %table.table.table-hover.datatable#tickets + %table.datatable#tickets %thead %th Title %th Price diff --git a/app/views/admin/tickets/show.html.haml b/app/views/admin/tickets/show.html.haml index 5d816ad8..d80b040b 100644 --- a/app/views/admin/tickets/show.html.haml +++ b/app/views/admin/tickets/show.html.haml @@ -12,7 +12,7 @@ People who bought this ticket .row .col-md-12 - %table.table.table-hover.datatable + %table.datatable %thead %th # %th Name @@ -35,4 +35,3 @@ = buyer.affiliation %td = @ticket.tickets_paid(buyer) - diff --git a/app/views/admin/tracks/index.html.haml b/app/views/admin/tracks/index.html.haml index ac0cb606..acdbfe0d 100644 --- a/app/views/admin/tracks/index.html.haml +++ b/app/views/admin/tracks/index.html.haml @@ -33,7 +33,7 @@ .row .col-md-12 - if @tracks.any? - %table.table.table-hover.table-striped.table-bordered.datatable#tracks + %table.datatable#tracks %thead %th ID %th Name diff --git a/app/views/admin/tracks/show.html.haml b/app/views/admin/tracks/show.html.haml index 262fe6ed..a7bb61a4 100644 --- a/app/views/admin/tracks/show.html.haml +++ b/app/views/admin/tracks/show.html.haml @@ -107,7 +107,7 @@ .tab-pane#events .col-md-12 - %table.table.table-hover.datatable + %table.datatable %thead %th Title %th Type diff --git a/app/views/admin/users/_event_registrations.html.haml b/app/views/admin/users/_event_registrations.html.haml index e83a188f..d512bc12 100644 --- a/app/views/admin/users/_event_registrations.html.haml +++ b/app/views/admin/users/_event_registrations.html.haml @@ -5,7 +5,7 @@ .col-md-12 .well - %table.table.table-bordered.table-striped.table-hover.datatable#event_registrations + %table.datatable#event_registrations %thead %th ID %th Conference diff --git a/app/views/admin/users/_submissions.html.haml b/app/views/admin/users/_submissions.html.haml index c3b05119..81ee01c6 100644 --- a/app/views/admin/users/_submissions.html.haml +++ b/app/views/admin/users/_submissions.html.haml @@ -4,7 +4,7 @@ Submissions (#{@user.events.length}) for #{@user.name} .col-md-12 .well - %table.table.table-bordered.table-striped.table-hover.datatable#submissions + %table.datatable#submissions %thead %th ID %th Conference diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml index 204665a3..69bc6c31 100644 --- a/app/views/admin/users/index.html.haml +++ b/app/views/admin/users/index.html.haml @@ -10,7 +10,7 @@ = link_to 'Add User', new_admin_user_path, :class => 'button btn btn-default btn-info' .row .col-md-12.table-responsive - %table.table.table-striped.table-bordered.table-hover.datatable + %table.datatable %thead %th ID %th Confirmed? diff --git a/app/views/proposals/registrations.html.haml b/app/views/proposals/registrations.html.haml index e46798ec..fd8184e9 100644 --- a/app/views/proposals/registrations.html.haml +++ b/app/views/proposals/registrations.html.haml @@ -13,7 +13,7 @@ = @event.title .well - %table.table.table-hover.table-borderd.table-striped.datatable#registrations + %table.datatable#registrations %thead %th %th Name