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

in bootstrap 4+ panel is now card. support both for the moment #997

Merged
merged 6 commits into from
Dec 20, 2024
Merged

in bootstrap 4+ panel is now card. support both for the moment #997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f408ab5
in bootstrap 4+ panel is now card. support both for the moment
orangewolf Dec 12, 2024
3603820
additional style fixes
orangewolf Dec 18, 2024
e122df7
Merge branch 'main' into bootstrap_card_fixes
orangewolf Dec 18, 2024
b3d26e2
Merge branch 'main' into bootstrap_card_fixes
orangewolf Dec 20, 2024
45193c0
workign on card footer for buttons
orangewolf Dec 20, 2024
316fc07
Merge branch 'main' into bootstrap_card_fixes
orangewolf Dec 20, 2024
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
5 changes: 5 additions & 0 deletions app/assets/stylesheets/bulkrax/import_export.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
.bulkrax-card-footer {
min-height: 60px;

}

div.importer_parser_fields_file_style span.radio {
display: inline;
margin-right: 20px;
Expand Down
4 changes: 2 additions & 2 deletions app/views/bulkrax/entries/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p id="notice"><%= notice %></p>
<div class="panel panel-default">
<div class="panel-body">
<div class="panel card panel-default">
<div class="panel-body card-body">
<p class='bulkrax-p-align'>
<strong><%= t('bulkrax.importer.labels.identifier') %>:</strong>
<%= @entry.identifier %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/bulkrax/exporters/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="panel-body">
<div class="panel-body card-body">
<% if exporter.errors.any? %>
<div id="error_explanation">
<h2><%= pluralize(exporter.errors.count, "error") %> prohibited this exporter from being saved:</h2>
Expand Down
4 changes: 2 additions & 2 deletions app/views/bulkrax/exporters/edit.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

<div class="row">
<div class="col-md-12">
<div class="panel panel-default tabs exporter-form">
<div class="panel card panel-default exporter-form">
<%= simple_form_for @exporter do |form| %>
<%= render 'form', exporter: @exporter, form: form %>
<div class="panel-footer">
<div class="panel-footer card-footer bulkrax-card-footer">
<div class='pull-right'>
<%= form.button :submit, value: 'Update Exporter', class: 'btn btn-primary' %>
|
Expand Down
4 changes: 2 additions & 2 deletions app/views/bulkrax/exporters/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<meta name="turbolinks-cache-control" content="no-cache">
<% end %>

<div class="panel panel-default">
<div class="panel-body">
<div class="panel card panel-default">
<div class="panel-body card-body">
<div class="table-responsive">
<table id='exporters-table' class="table table-striped">
<thead>
Expand Down
4 changes: 2 additions & 2 deletions app/views/bulkrax/exporters/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

<div class="row">
<div class="col-md-12">
<div class="panel panel-default tabs exporter-form">
<div class="panel card panel-default exporter-form">
<%= simple_form_for @exporter do |form| %>
<%= render 'form', exporter: @exporter, form: form %>
<div class="panel-footer">
<div class="panel-footer card-footer bulkrax-card-footer">
<div class='pull-right'>
<%= form.button :submit, value: 'Create and Export', class: 'btn btn-primary' %>
|
Expand Down
4 changes: 2 additions & 2 deletions app/views/bulkrax/exporters/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<h1><span class='fa fa-cloud-download' aria-hidden='true'></span> Exporter: <%= @exporter.name %></h1>
</div>

<div class='panel panel-default'>
<div class='panel-body'>
<div class='panel card panel-default'>
<div class='panel-body card-body'>

<% if File.exist?(@exporter.exporter_export_zip_path) %>
<%= simple_form_for @exporter, method: :get, url: exporter_download_path(@exporter), html: { class: 'form-inline bulkrax-p-align' } do |form| %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/bulkrax/importers/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="panel-body">
<div class="panel-body card-body">
<% if importer.errors.any? %>
<div id="error_explanation">
<h2><%= pluralize(importer.errors.count, "error") %> prohibited this importer from being saved:</h2>
Expand Down
6 changes: 3 additions & 3 deletions app/views/bulkrax/importers/edit.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

<div class="row">
<div class="col-md-12">
<div class="panel panel-default tabs importer-form">
<div class="panel card panel-default importer-form">

<%= simple_form_for @importer, html: { multipart: true } do |form| %>
<%= render 'form', importer: @importer, form: form %>
<div class="panel-footer">
<div class="panel-footer card-footer bulkrax-card-footer">
<div class='pull-right'>
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#bulkraxModal">
Update Importer
Expand All @@ -21,4 +21,4 @@
<% end %>
</div>
</div>
</div>
</div>
4 changes: 2 additions & 2 deletions app/views/bulkrax/importers/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<meta name="turbolinks-cache-control" content="no-cache">
<% end %>

<div class="panel panel-default">
<div class="panel-body">
<div class="panel card panel-default">
<div class="panel-body card-body">
<div class="table-responsive">
<table id='importers-table' class="table table-striped">
<thead>
Expand Down
4 changes: 2 additions & 2 deletions app/views/bulkrax/importers/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

<div class="row">
<div class="col-md-12">
<div class="panel panel-default tabs importer-form">
<div class="panel card panel-default importer-form">
<%= simple_form_for @importer, html: { multipart: true } do |form| %>
<%= render 'form', importer: @importer, form: form %>
<div class="panel-footer">
<div class="panel-footer card-footer bulkrax-card-footer">
<div class='pull-right'>
<% if ENV['SHOW_CREATE_AND_VALIDATE'] == 'true' %>
<%= form.button :submit, value: 'Create and Validate', class: 'btn btn-primary' %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/bulkrax/importers/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<% end %>
</div>
</div>
<div class="panel panel-default bulkrax-align-text">
<div class="panel-body">
<div class="panel card panel-default bulkrax-align-text">
<div class="panel-body card-body">
<p class="bulkrax-p-align">
<strong><%= t('bulkrax.importer.labels.name') %>:</strong>
<%= @importer.name %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/bulkrax/importers/upload_corrected_entries.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<h1><span class='fa fa-cloud-upload' aria-hidden='true'></span> Upload Corrected Entries: <%= @importer.name %></h1>
</div>

<div class='panel panel-default'>
<div class='panel-body'>
<div class='panel card panel-default'>
<div class='panel-body card-body'>
<p>
Upload <b>only</b> the corrected entries for the <b><%= @importer.name %></b> importer. To export failed entries for correction,
<%= link_to importer_export_errors_path(@importer.id) do %>
Expand Down
Loading