diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2019-01-22 15:22:45 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2019-01-22 15:22:45 +0000 |
| commit | 54452b04856df5056fa76d9764beb95110c35d02 (patch) | |
| tree | 4a7f9a4c01e5af39fed5354451ca5e42453bd116 /resources | |
| parent | d84d39881110b925b29db08735fe45f4c397aab8 (diff) | |
| download | webtrees-54452b04856df5056fa76d9764beb95110c35d02.tar.gz webtrees-54452b04856df5056fa76d9764beb95110c35d02.tar.bz2 webtrees-54452b04856df5056fa76d9764beb95110c35d02.zip | |
Merge DescentsChartController into DescendancyChartModule
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/views/modules/ancestors-chart/chart-page.phtml | 2 | ||||
| -rw-r--r-- | resources/views/modules/descendancy_chart/chart-page.phtml (renamed from resources/views/descendants-page.phtml) | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/resources/views/modules/ancestors-chart/chart-page.phtml b/resources/views/modules/ancestors-chart/chart-page.phtml index 36c1070ba6..359b71b172 100644 --- a/resources/views/modules/ancestors-chart/chart-page.phtml +++ b/resources/views/modules/ancestors-chart/chart-page.phtml @@ -51,7 +51,7 @@ </div> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-ancestors-chart" data-ajax-url="<?= e($module->chartUrl($individual, ['generations' => $generations, 'chart_style' => $chart_style, 'show_cousins' => $show_cousins, 'ajax' => '1'])) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-ancestors-chart" data-ajax-url="<?= e($ajax_url) ?>"></div> <?php View::push('javascript') ?> <script> diff --git a/resources/views/descendants-page.phtml b/resources/views/modules/descendancy_chart/chart-page.phtml index f7cb8f3f9d..d016b55e79 100644 --- a/resources/views/descendants-page.phtml +++ b/resources/views/modules/descendancy_chart/chart-page.phtml @@ -7,7 +7,9 @@ </h2> <form class="wt-page-options wt-page-options-descendants-chart d-print-none"> - <input type="hidden" name="route" value="descendants"> + <input type="hidden" name="route" value="module"> + <input type="hidden" name="module" value="<?= $module->getName() ?>"> + <input type="hidden" name="action" value="Chart"> <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="row form-group"> @@ -34,7 +36,7 @@ <?= I18N::translate('Layout') ?> </legend> <div class="col-sm-9 wt-page-options-value"> - <?= Bootstrap4::radioButtons('chart_style', $chart_styles, $chart_style, true, []) ?> + <?= Bootstrap4::radioButtons('chart_style', $chart_styles, $chart_style, true) ?> </div> </div> </fieldset> @@ -42,10 +44,9 @@ <div class="row form-group"> <div class="col-form-label col-sm-3 wt-page-options-label"></div> <div class="col-sm-9 wt-page-options-value"> - <input class="btn btn-primary" type="submit" value="<?= /* I18N: A button label. */ - I18N::translate('view') ?>"> + <input class="btn btn-primary" type="submit" value="<?= /* I18N: A button label. */ I18N::translate('view') ?>"> </div> </div> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-descendants-chart" data-ajax-url="<?= e(route('descendants-chart', ['xref' => $individual->xref(), 'ged' => $individual->tree()->name(), 'generations' => $generations, 'chart_style' => $chart_style])) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-descendants-chart" data-ajax-url="<?= e($ajax_url) ?>"></div> |