diff options
| -rw-r--r-- | includes/functions/functions_print_lists.php | 4 | ||||
| -rw-r--r-- | js/kryogenix/sorttable_filter.js | 66 | ||||
| -rw-r--r-- | themes/clouds/style.css | 7 | ||||
| -rw-r--r-- | themes/colors/css/colors.css | 7 | ||||
| -rw-r--r-- | themes/fab/style.css | 7 | ||||
| -rw-r--r-- | themes/minimal/style.css | 5 | ||||
| -rw-r--r-- | themes/webtrees/style.css | 5 | ||||
| -rw-r--r-- | themes/xenea/style.css | 5 |
8 files changed, 17 insertions, 89 deletions
diff --git a/includes/functions/functions_print_lists.php b/includes/functions/functions_print_lists.php index 3a92419042..e713e6a481 100644 --- a/includes/functions/functions_print_lists.php +++ b/includes/functions/functions_print_lists.php @@ -135,9 +135,6 @@ function print_indi_table($datalist, $legend='', $option='') { echo WT_Person::sexImage('F', 'large'), ' </button> '; echo '<button type="button" id="SEX_U_'.$table_id.'" class="SEX_U" title="', WT_I18N::translate('Show only persons of whom the gender is not known.'), '" >'; echo WT_Person::sexImage('U', 'large'), ' </button></fieldset>'; - echo '<fieldset class="aliveinyear"><button type="button" id="alive_in_year_'.$table_id.'" class="alive_in_year" title="', WT_I18N::translate('Show persons alive in the indicated year.'), '" >'; - echo WT_I18N::translate('Alive in Year'), '</button>'; - echo '<input type="text" size="4" id="aliveyear_'.$table_id.'"" class="aliveyear" value="', date('Y'), '" /></fieldset>'; echo '<fieldset class="years"><button type="button" id="DEAT_N_'.$table_id.'" class="DEAT_N" title="', WT_I18N::translate('Show people who are alive or couples where both partners are alive.'), '" >'; echo WT_I18N::translate('Alive '), '</button> '; echo '<button type="button" id="DEAT_Y_'.$table_id.'" class="DEAT_Y" title="', WT_I18N::translate('Show people who are dead or couples where both partners are deceased.'), '" >'; @@ -2193,7 +2190,6 @@ function load_behaviour() { if (!temp) return true; var table = temp.id; var args = this.className.split('_'); // eg: BIRT_YES - if (args[0]=="alive") return table_filter_alive(table); if (args[0]=="reset") return table_filter(table, "", ""); if (args[1].length) return table_filter(table, args[0], args[1]); return false; diff --git a/js/kryogenix/sorttable_filter.js b/js/kryogenix/sorttable_filter.js index 6c257caf6d..0a474a5d39 100644 --- a/js/kryogenix/sorttable_filter.js +++ b/js/kryogenix/sorttable_filter.js @@ -3,7 +3,7 @@ * Additional filtering functions for sorttable.js * * webtrees: Web based Family History software - * Copyright (C) 2010 webtrees development team. + * Copyright (C) 2011 webtrees development team. * * Derived from PhpGedView * Copyright (C) 2002 to 2007 John Finlay and Others @@ -22,10 +22,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @see sorttable.js - * @package webtrees - * @subpackage Display - * @version $Id$ + * $Id$ */ function table_filter(id, keyword, filter) { @@ -71,65 +68,6 @@ function table_renum(id) { } } -function table_filter_alive(id) { - var table = document.getElementById(id); - var year = document.getElementById("aliveyear").value; - if (year>2500) // Approximate conversion of hebrew to gregorian year - year-=3761; - - // Calculate Julian Day numbers for 1st Jan and 31st Dec - var jd_1jan=1721061+365*year+Math.floor((year-1)/4)-Math.floor((year-1)/100)+Math.floor((year-1)/400); - var jd_31dec=1721425+365*year+Math.floor(year/4)-Math.floor(year/100)+Math.floor(year/400); - - // get birth and death column number => search for <span class="date" - var BCOL = -1; - var DCOL = -1; - var firstRow = table.rows[1]; - var key; - for (var c=0;c<firstRow.cells.length;c++) { - key = firstRow.cells[c].getElementsByTagName("SPAN"); - if (key.length && key[0].className && key[0].className.indexOf('date') != -1) { - if (BCOL<0) - BCOL=c; - else { - DCOL=c; - break; - } - } - } - if (BCOL<0 || DCOL<0) return; - - // apply filter - for (var r=1;r<table.rows.length;r++) { - var row = table.rows[r]; - // don't do sortbottom last rows - if (row.className && (row.className.indexOf('sortbottom') != -1)) break; - // get jd of birth/death - b_jd=0; - key=row.cells[BCOL].getElementsByTagName("a"); - if (key.length) b_jd=parseInt(key[0].name,10); - d_jd=0; - key=row.cells[DCOL].getElementsByTagName("a"); - if (key.length) d_jd=parseInt(key[0].name,10); - // assume birth/death based on max age of 100 years - if (b_jd==0 && d_jd>0) - b_jd=d_jd-36525; - if (d_jd==0 && b_jd>0) - d_jd=b_jd+36525; - // hide/show - if (b_jd<=jd_31dec && d_jd>=jd_1jan) { - if (document.all && !window.opera) - row.style.display="inline"; // IE - else - row.style.display="table-row"; - } else - row.style.display="none"; - } - // Resequence row numbers - table_renum(id); - return false; -} - function sortByOtherCol(node, offset) { var td = node.parentNode; var tr = td.parentNode; diff --git a/themes/clouds/style.css b/themes/clouds/style.css index af9619e6de..f278597ec9 100644 --- a/themes/clouds/style.css +++ b/themes/clouds/style.css @@ -1852,13 +1852,12 @@ html[dir='rtl'] .dataTables_length {float:left;} .media-list img {display:block; height:40px; margin:3px auto;} .SEX_M, .SEX_F, .SEX_U {height:20px;} .SEX_M img, .SEX_F img, .SEX_U img {vertical-align:top;} -.gender, .aliveinyear, .years, .given, .parents, .charts, .reset {background-color:lightgrey; display:inline; margin:0 6px 0 0; padding:0 0 1px 0;} +.gender, .years, .given, .parents, .charts, .reset {background-color:lightgrey; display:inline; margin:0 6px 0 0; padding:0 0 1px 0;} .gender {padding:2px 0;} -.aliveyear {background-color:#EEE8AA;} -.aliveinyear button, .years button, .given button, .parents input, .charts input, .reset button {margin: 1px; padding:1px 6px;} +.years button, .given button, .parents input, .charts input, .reset button {margin: 1px; padding:1px 6px;} html[dir='rtl'] .source-list th:last-child, html[dir='rtl'] .note-list th:last-child, html[dir='rtl'] .repo-list th:last-child {margin:0 1px 1px -2px;} -html[dir='rtl'] .gender, html[dir='rtl'] .aliveinyear, html[dir='rtl'] .years, html[dir='rtl'] .given, html[dir='rtl'] .parents, html[dir='rtl'] .charts, html[dir='rtl'] .reset {margin:0 0 0 6px;} +html[dir='rtl'] .gender, html[dir='rtl'] .years, html[dir='rtl'] .given, html[dir='rtl'] .parents, html[dir='rtl'] .charts, html[dir='rtl'] .reset {margin:0 0 0 6px;} /* ========= Sidebar ============== */ #indi_left {float:left; width:98%;} diff --git a/themes/colors/css/colors.css b/themes/colors/css/colors.css index 6a17456aa7..014cbe801b 100644 --- a/themes/colors/css/colors.css +++ b/themes/colors/css/colors.css @@ -1806,13 +1806,12 @@ html[dir='rtl'] .dataTables_length {float:left;} .media-list img {display:block; height:40px; margin:3px auto;} .SEX_M, .SEX_F, .SEX_U {height:20px;} .SEX_M img, .SEX_F img, .SEX_U img {vertical-align:top;} -.gender, .aliveinyear, .years, .given, .parents, .charts, .reset {background-color:lightgrey; display:inline; margin:0 6px 0 0; padding:0 0 1px 0;} +.gender, .years, .given, .parents, .charts, .reset {background-color:lightgrey; display:inline; margin:0 6px 0 0; padding:0 0 1px 0;} .gender {padding:2px 0;} -.aliveyear {background-color:#EEE8AA;} -.aliveinyear button, .years button, .given button, .parents input, .charts input, .reset button {margin: 1px; padding:1px 6px;} +.years button, .given button, .parents input, .charts input, .reset button {margin: 1px; padding:1px 6px;} html[dir='rtl'] .source-list th:last-child, html[dir='rtl'] .note-list th:last-child, html[dir='rtl'] .repo-list th:last-child {margin:0 1px 1px -2px;} -html[dir='rtl'] .gender, html[dir='rtl'] .aliveinyear, html[dir='rtl'] .years, html[dir='rtl'] .given, html[dir='rtl'] .parents, html[dir='rtl'] .charts, html[dir='rtl'] .reset {margin:0 0 0 6px;} +html[dir='rtl'] .gender, html[dir='rtl'] .years, html[dir='rtl'] .given, html[dir='rtl'] .parents, html[dir='rtl'] .charts, html[dir='rtl'] .reset {margin:0 0 0 6px;} /* ========= Sidebar ============== */ diff --git a/themes/fab/style.css b/themes/fab/style.css index e07a64019e..6947de9fd0 100644 --- a/themes/fab/style.css +++ b/themes/fab/style.css @@ -1221,13 +1221,12 @@ html[dir='rtl'] .dataTables_length {float:left;} .media-list img {display:block; height:40px; margin:3px auto;} .SEX_M, .SEX_F, .SEX_U {height:20px;} .SEX_M img, .SEX_F img, .SEX_U img {vertical-align:top;} -.gender, .aliveinyear, .years, .given, .parents, .charts, .reset {background-color:lightgrey; display:inline; margin:0 6px 0 0; padding:0 0 1px 0;} +.gender, .years, .given, .parents, .charts, .reset {background-color:lightgrey; display:inline; margin:0 6px 0 0; padding:0 0 1px 0;} .gender {padding:2px 0;} -.aliveyear {background-color:#EEE8AA; margin:0; padding:0;} -.aliveinyear button, .years button, .given button, .parents input, .charts input, .reset button {margin:1px;} +.years button, .given button, .parents input, .charts input, .reset button {margin:1px;} html[dir='rtl'] .source-list th:last-child, html[dir='rtl'] .note-list th:last-child, html[dir='rtl'] .repo-list th:last-child {margin:0 1px 1px -2px;} -html[dir='rtl'] .gender, html[dir='rtl'] .aliveinyear, html[dir='rtl'] .years, html[dir='rtl'] .given, html[dir='rtl'] .parents, html[dir='rtl'] .charts, html[dir='rtl'] .reset {margin:0 0 0 6px;} +html[dir='rtl'] .gender, html[dir='rtl'] .years, html[dir='rtl'] .given, html[dir='rtl'] .parents, html[dir='rtl'] .charts, html[dir='rtl'] .reset {margin:0 0 0 6px;} /* ========= Sidebar ============== */ #main {min-width:600px; width:100%} diff --git a/themes/minimal/style.css b/themes/minimal/style.css index e932a1a3c1..c0d4dfa4ce 100644 --- a/themes/minimal/style.css +++ b/themes/minimal/style.css @@ -1622,12 +1622,11 @@ html[dir='rtl'] .dataTables_length {float:left;} .media-list img {display:block; height:40px; margin:3px auto;} .SEX_M, .SEX_F, .SEX_U {height:20px;} .SEX_M img, .SEX_F img, .SEX_U img {vertical-align:top;} -.gender, .aliveinyear, .years, .given, .parents, .charts, .reset {background-color:lightgrey; display:inline; margin:0 6px 0 0; padding:0 0 1px 0;} +.gender, .years, .given, .parents, .charts, .reset {background-color:lightgrey; display:inline; margin:0 6px 0 0; padding:0 0 1px 0;} .gender {padding:2px 0;} -.aliveyear {background-color:#EEE8AA;} html[dir='rtl'] .source-list th:last-child, html[dir='rtl'] .note-list th:last-child, html[dir='rtl'] .repo-list th:last-child {margin:0 1px 1px -2px;} -html[dir='rtl'] .gender, html[dir='rtl'] .aliveinyear, html[dir='rtl'] .years, html[dir='rtl'] .given, html[dir='rtl'] .parents, html[dir='rtl'] .charts, html[dir='rtl'] .reset {margin:0 0 0 6px;} +html[dir='rtl'] .gender, html[dir='rtl'] .years, html[dir='rtl'] .given, html[dir='rtl'] .parents, html[dir='rtl'] .charts, html[dir='rtl'] .reset {margin:0 0 0 6px;} /* ========= Sidebar ============== */ #main {min-width:600px; width:100%} diff --git a/themes/webtrees/style.css b/themes/webtrees/style.css index 2e6b318bc3..33d7ab93de 100644 --- a/themes/webtrees/style.css +++ b/themes/webtrees/style.css @@ -1367,12 +1367,11 @@ td.descriptionbox a {color:#fff;}/* this keeps the tag color the same when it i .media-list img {display:block; height:40px; margin:3px auto;} .SEX_M, .SEX_F, .SEX_U {height:20px;} .SEX_M img, .SEX_F img, .SEX_U img {vertical-align:top;} -.gender, .aliveinyear, .years, .given, .parents, .charts, .reset {background-color:#d3d3d3; display:inline; margin:0 6px 0 0; padding:0 0 1px 0;} +.gender, .years, .given, .parents, .charts, .reset {background-color:#d3d3d3; display:inline; margin:0 6px 0 0; padding:0 0 1px 0;} .gender {padding:2px 0;} -.aliveyear {background-color:#eee8aa;} html[dir='rtl'] .source-list th:last-child, html[dir='rtl'] .note-list th:last-child, html[dir='rtl'] .repo-list th:last-child {margin:0 1px 1px -2px;} -html[dir='rtl'] .gender, html[dir='rtl'] .aliveinyear, html[dir='rtl'] .years, html[dir='rtl'] .given, html[dir='rtl'] .parents, html[dir='rtl'] .charts, html[dir='rtl'] .reset {margin:0 0 0 6px;} +html[dir='rtl'] .gender, html[dir='rtl'] .years, html[dir='rtl'] .given, html[dir='rtl'] .parents, html[dir='rtl'] .charts, html[dir='rtl'] .reset {margin:0 0 0 6px;} /* ======= Block styles ========== */ #index_main_blocks {clear:none; width:66%; float:left; padding:3px;} diff --git a/themes/xenea/style.css b/themes/xenea/style.css index 5c9f387134..799419514a 100644 --- a/themes/xenea/style.css +++ b/themes/xenea/style.css @@ -1890,12 +1890,11 @@ html[dir='rtl'] .dataTables_length {float:left;} .media-list img {display:block; height:40px; margin:3px auto;} .SEX_M, .SEX_F, .SEX_U {height:20px;} .SEX_M img, .SEX_F img, .SEX_U img {vertical-align:top;} -.gender, .aliveinyear, .years, .given, .parents, .charts, .reset {background-color:lightgrey; display:inline; margin:0 6px 0 0; padding:0 0 1px 0;} +.gender, .years, .given, .parents, .charts, .reset {background-color:lightgrey; display:inline; margin:0 6px 0 0; padding:0 0 1px 0;} .gender {padding:2px 0;} -.aliveyear {background-color:#EEE8AA;} html[dir='rtl'] .source-list th:last-child, html[dir='rtl'] .note-list th:last-child, html[dir='rtl'] .repo-list th:last-child {margin:0 1px 1px -2px;} -html[dir='rtl'] .gender, html[dir='rtl'] .aliveinyear, html[dir='rtl'] .years, html[dir='rtl'] .given, html[dir='rtl'] .parents, html[dir='rtl'] .charts, html[dir='rtl'] .reset {margin:0 0 0 6px;} +html[dir='rtl'] .gender, html[dir='rtl'] .years, html[dir='rtl'] .given, html[dir='rtl'] .parents, html[dir='rtl'] .charts, html[dir='rtl'] .reset {margin:0 0 0 6px;} /* ========= Sidebar ============== */ #main {min-width:600px; width:100%} |