summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormakitso <makitso@gmail.com>2017-10-01 07:34:47 -0700
committermakitso <makitso@gmail.com>2017-10-01 07:34:47 -0700
commit44d05b50b37837a977c66c3b1750262bf1421171 (patch)
treeb6281ffa46488014300f681925eac78987bb73e1
parent3fd1694bdeb091bfdb5172bfb764bd9bc17a2ad7 (diff)
downloadwebtrees-44d05b50b37837a977c66c3b1750262bf1421171.tar.gz
webtrees-44d05b50b37837a977c66c3b1750262bf1421171.tar.bz2
webtrees-44d05b50b37837a977c66c3b1750262bf1421171.zip
Fix: #1379 - Replace card-block with card-body
-rwxr-xr-x[-rw-r--r--]admin.php10
-rwxr-xr-x[-rw-r--r--]admin_trees_manage.php6
-rwxr-xr-x[-rw-r--r--]app/Controller/IndividualController.php4
-rwxr-xr-xapp/Theme/AbstractTheme.php2
-rwxr-xr-x[-rw-r--r--]edit_interface.php8
-rwxr-xr-x[-rw-r--r--]resources/views/modals/on-screen-keyboard.php2
6 files changed, 16 insertions, 16 deletions
diff --git a/admin.php b/admin.php
index d0ce34cf5c..cee6f74326 100644..100755
--- a/admin.php
+++ b/admin.php
@@ -592,7 +592,7 @@ if (
</div>
<div id="card-server-content" class="collapse show" role="tabpanel" aria-labelledby="card-server-header">
- <div class="card-block">
+ <div class="card-body">
<?php foreach ($server_warnings as $server_warning): ?>
<p><?= $server_warning ?></p>
<?php endforeach ?>
@@ -611,7 +611,7 @@ if (
</h2>
</div>
<div id="card-version-content" class="collapse show" role="tabpanel" aria-labelledby="card-version-header">
- <div class="card-block">
+ <div class="card-body">
<p>
<?= /* I18N: %s is a URL/link to the project website */ I18N::translate('Support and documentation can be found at %s.', '<a href="https://webtrees.net/">webtrees.net</a>') ?>
</p>
@@ -644,7 +644,7 @@ if (
</h2>
</div>
<div id="card-users-content" class="collapse" role="tabpanel" aria-labelledby="card-users-header">
- <div class="card-block">
+ <div class="card-body">
<table class="table table-condensed">
<caption class="sr-only">
<?= I18N::translate('Users') ?>
@@ -755,7 +755,7 @@ if (
</h2>
</div>
<div id="card-trees-content" class="collapse" role="tabpanel" aria-labelledby="card-trees-header">
- <div class="card-block">
+ <div class="card-body">
<table class="table table-condensed">
<caption class="sr-only">
<?= I18N::translate('Family trees') ?>
@@ -887,7 +887,7 @@ if (
</h2>
</div>
<div id="card-old-files-content" class="collapse" role="tabpanel" aria-labelledby="card-old-files-header">
- <div class="card-block">
+ <div class="card-body">
<p>
<?= I18N::translate('Files have been found from a previous version of webtrees. Old files can sometimes be a security risk. You should delete them.') ?>
</p>
diff --git a/admin_trees_manage.php b/admin_trees_manage.php
index 92693b4959..5f75d37c96 100644..100755
--- a/admin_trees_manage.php
+++ b/admin_trees_manage.php
@@ -350,7 +350,7 @@ echo Bootstrap4::breadcrumbs([
</h2>
</div>
<div id="card-tree-content-<?= $tree->getTreeId() ?>" class="collapse<?= $tree == $WT_TREE || $tree->getPreference('imported') === '0' ? ' show' : '' ?>" role="tabpanel" aria-labelledby="panel-tree-header-<?= $tree->getTreeId() ?>">
- <div class="card-block">
+ <div class="card-body">
<?php
$importing = Database::prepare(
"SELECT 1 FROM `##gedcom_chunk` WHERE gedcom_id = ? AND imported = '0' LIMIT 1"
@@ -627,7 +627,7 @@ echo Bootstrap4::breadcrumbs([
</h2>
</div>
<div id="card-tree-create-content" class="collapse<?= empty(Tree::getAll()) ? ' show' : '' ?>" role="tabpanel" aria-labelledby="card-tree-create-header">
- <div class="card-block">
+ <div class="card-body">
<form class="form-horizontal" method="post">
<?= Filter::getCsrf() ?>
<input type="hidden" name="action" value="new_tree">
@@ -702,7 +702,7 @@ echo Bootstrap4::breadcrumbs([
</h2>
</div>
<div id="card-pgv-wizard-content" class="collapse show" role="tabpanel" aria-labelledby="card-pgv-wizard-header">
- <div class="card-block">
+ <div class="card-body">
<p>
<?= I18N::translate('The PhpGedView to webtrees wizard is an automated process to assist administrators make the move from a PhpGedView installation to a new webtrees one. It will transfer all PhpGedView GEDCOM and other database information directly to your new webtrees database. The following requirements are necessary:') ?>
</p>
diff --git a/app/Controller/IndividualController.php b/app/Controller/IndividualController.php
index 52879f1d47..fbe28e2c6e 100644..100755
--- a/app/Controller/IndividualController.php
+++ b/app/Controller/IndividualController.php
@@ -209,7 +209,7 @@ class IndividualController extends GedcomRecordController {
' . $edit_links . '
</div>
<div id="name-content-' . $n . '" class="' . $content_class . '" role="tabpanel" aria-labelledby="name-header-' . $n . '">
- <div class="card-block">' . $content . '</div>
+ <div class="card-body">' . $content . '</div>
</div>
</div>';
}
@@ -348,7 +348,7 @@ class IndividualController extends GedcomRecordController {
</div>
</div>
<div id="sidebar-content-' . $module->getName() . '" class="' . $class . '" role="tabpanel" aria-labelledby="sidebar-header-' . $module->getName() . '">
- <div class="card-block">' . $module->getSidebarContent() . '</div>
+ <div class="card-body">' . $module->getSidebarContent() . '</div>
</div>
</div>';
}
diff --git a/app/Theme/AbstractTheme.php b/app/Theme/AbstractTheme.php
index 4a9b5ed464..4fc1cba9fa 100755
--- a/app/Theme/AbstractTheme.php
+++ b/app/Theme/AbstractTheme.php
@@ -513,7 +513,7 @@ abstract class AbstractTheme {
return
'<div class="card mb-4 wt-block wt-block-' . $class . '" id="' . $id . '">' .
'<div class="card-header wt-block-header wt-block-header-' . $class . '">' . $title . '</div>' .
- '<div class="card-block wt-block-content wt-block-content-' . $class . '">' . $content . '</div>' .
+ '<div class="card-body wt-block-content wt-block-content-' . $class . '">' . $content . '</div>' .
'</div>';
}
diff --git a/edit_interface.php b/edit_interface.php
index db099c2e30..6e82b15f4e 100644..100755
--- a/edit_interface.php
+++ b/edit_interface.php
@@ -2425,7 +2425,7 @@ case 'reorder-media':
<?= FontAwesome::semanticIcon('drag-handle', '') ?>
<?= $fact->getTarget()->getFullName() ?>
</h3>
- <div class="card-block">
+ <div class="card-body">
<?= $fact->getTarget()->displayImage(100, 100, "contain") ?>
</div>
</div>
@@ -2520,7 +2520,7 @@ case 'reorder-names':
<?= FontAwesome::semanticIcon('drag-handle', '') ?>
<?= $fact->getValue() ?>
</h3>
- <div class="card-block">
+ <div class="card-body">
<?= GedcomTag::getLabelValue('TYPE', GedcomCodeName::getValue($fact->getAttribute('TYPE'), $fact->getParent())) ?>
</div>
</div>
@@ -2616,7 +2616,7 @@ case 'reorder-children':
<?= FontAwesome::semanticIcon('drag-handle', '') ?>
<?= $fact->getTarget()->getFullName() ?>
</h3>
- <div class="card-block">
+ <div class="card-body">
<?= $fact->getTarget()->formatFirstMajorFact(WT_EVENTS_BIRT, 2) ?>
<?= $fact->getTarget()->formatFirstMajorFact(WT_EVENTS_DEAT, 2) ?>
</div>
@@ -2717,7 +2717,7 @@ case 'reorder-spouses':
<?= FontAwesome::semanticIcon('drag-handle', '') ?>
<?= $fact->getTarget()->getFullName() ?>
</h3>
- <div class="card-block">
+ <div class="card-body">
<?= $fact->getTarget()->formatFirstMajorFact(WT_EVENTS_MARR, 2) ?>
<?= $fact->getTarget()->formatFirstMajorFact(WT_EVENTS_DIV, 2) ?>
</div>
diff --git a/resources/views/modals/on-screen-keyboard.php b/resources/views/modals/on-screen-keyboard.php
index fa7bb2e969..22e67cbbeb 100644..100755
--- a/resources/views/modals/on-screen-keyboard.php
+++ b/resources/views/modals/on-screen-keyboard.php
@@ -28,7 +28,7 @@
</div>
</div>
</div>
- <div class="card-block wt-osk-keys">
+ <div class="card-body wt-osk-keys">
<!-- Quotation marks -->
<div class="wt-osk-group">
<span class="wt-osk-key">&lsquo;<sup class="wt-osk-key-shift">&ldquo;</sup></span>