diff options
| author | David Drury <david@drury.me.uk> | 2016-02-24 20:35:37 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2016-02-28 17:25:55 +0000 |
| commit | dc46b57449e335587417319b1bb980729dfe17aa (patch) | |
| tree | 5c4fca6ee64be3c1244ac1276a022b7d258b7acc /app/Module/NotesTabModule.php | |
| parent | 4b207177137d933a7ecf26b2ec91aaebe8e8cd7a (diff) | |
| download | webtrees-dc46b57449e335587417319b1bb980729dfe17aa.tar.gz webtrees-dc46b57449e335587417319b1bb980729dfe17aa.tar.bz2 webtrees-dc46b57449e335587417319b1bb980729dfe17aa.zip | |
Added styling for Census Assistant notes (same as markdown).
census-edit.php fixed bug in function updateCensusText whereby hidden <th> elements were included in the column count when generating the note text.
fixed bug in CensusAssistantModule.php function formatCensusNote to remove leading \n char from $data (real solution would be to change regex on line 294 but I go cross eyed looking at that).
Accomodate censuses with many columns (eg US 1930). To do this it was necessary to move the "Events of close relatives etc." line outside the facts table as colspan and table-layout: fixed don't play well together
NotesTabModule.php also need some work to properly show censuses with many columns
Select the correct census from which to derive the column headers
Use Soundex to perform place matching
Safety first programming
Diffstat (limited to 'app/Module/NotesTabModule.php')
| -rw-r--r-- | app/Module/NotesTabModule.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/app/Module/NotesTabModule.php b/app/Module/NotesTabModule.php index 1bab581a22..5b4e31037f 100644 --- a/app/Module/NotesTabModule.php +++ b/app/Module/NotesTabModule.php @@ -61,14 +61,13 @@ class NotesTabModule extends AbstractModule implements ModuleTabInterface { global $WT_TREE, $controller; ob_start(); - echo '<table class="facts_table">'; ?> - <tr> - <td colspan="2" class="descriptionbox rela"> + <div class="descriptionbox rela"> <input id="checkbox_note2" type="checkbox" <?php echo $WT_TREE->getPreference('SHOW_LEVEL2_NOTES') ? 'checked' : ''; ?> onclick="jQuery('tr.row_note2').toggle();"> - <label for="checkbox_note2"><?php echo I18N::translate('Show all notes'); ?></label> - </td> - </tr> + <label for="checkbox_note2"><?php echo I18N::translate('Show all notes'); ?></label> + </div> + <table class="facts_table"> + <?php foreach ($this->getFactsWithNotes() as $fact) { if ($fact->getTag() == 'NOTE') { |