diff options
| -rw-r--r-- | admin.php | 6 | ||||
| -rw-r--r-- | individual.php | 1 | ||||
| -rw-r--r-- | js/webtrees-1.5.2.js | 8 | ||||
| -rw-r--r-- | library/WT/Controller/Individual.php | 1 | ||||
| -rw-r--r-- | library/WT/Controller/Search.php | 2 |
5 files changed, 12 insertions, 6 deletions
@@ -26,9 +26,9 @@ require WT_ROOT.'includes/functions/functions_edit.php'; $controller=new WT_Controller_Page(); $controller ->requireManagerLogin() - ->addInlineJavascript('jQuery("#x").accordion({active:0, icons:{ "header": "ui-icon-triangle-1-s", "headerSelected": "ui-icon-triangle-1-n" }, heightStyle: "content"});') - ->addInlineJavascript('jQuery("#tree_stats").accordion({icons:{ "header": "ui-icon-triangle-1-s", "headerSelected": "ui-icon-triangle-1-n" }});') - ->addInlineJavascript('jQuery("#changes").accordion({icons:{ "header": "ui-icon-triangle-1-s", "headerSelected": "ui-icon-triangle-1-n" }});') + ->addInlineJavascript('jQuery("#x").accordion({heightStyle: "content"});') + ->addInlineJavascript('jQuery("#tree_stats").accordion();') + ->addInlineJavascript('jQuery("#changes").accordion();') ->addInlineJavascript('jQuery("#content_container").css("visibility", "visible");') ->setPageTitle(WT_I18N::translate('Administration')) ->pageHeader(); diff --git a/individual.php b/individual.php index 79a368c620..39473773a9 100644 --- a/individual.php +++ b/individual.php @@ -171,7 +171,6 @@ $controller->addInlineJavascript(' jQuery("#header_accordion1").accordion({ active: 0, - icons: {"header": "ui-icon-triangle-1-s", "headerSelected": "ui-icon-triangle-1-n" }, heightStyle: "content", collapsible: true }); diff --git a/js/webtrees-1.5.2.js b/js/webtrees-1.5.2.js index 842a063620..3df82eae46 100644 --- a/js/webtrees-1.5.2.js +++ b/js/webtrees-1.5.2.js @@ -1492,3 +1492,11 @@ function activate_colorbox(config) { // Allow all other media types remain as download links }); } + +// Add LTR/RTL support for jQueryUI Accordions +jQuery.extend($.ui.accordion.prototype.options, { + icons: { + header: textDirection === "rtl" ? "ui-icon-triangle-1-w" : "ui-icon-triangle-1-e", + activeHeader: "ui-icon-triangle-1-s" + } +}); diff --git a/library/WT/Controller/Individual.php b/library/WT/Controller/Individual.php index f47f332733..dbd1d7c9fd 100644 --- a/library/WT/Controller/Individual.php +++ b/library/WT/Controller/Individual.php @@ -393,7 +393,6 @@ class WT_Controller_Individual extends WT_Controller_GedcomRecord { active:' . $active . ', heightStyle: "content", collapsible: true, - icons:{ "header": "ui-icon-triangle-1-s", "headerSelected": "ui-icon-triangle-1-n" } }); '); diff --git a/library/WT/Controller/Search.php b/library/WT/Controller/Search.php index ebab5ffa55..b99543711c 100644 --- a/library/WT/Controller/Search.php +++ b/library/WT/Controller/Search.php @@ -597,7 +597,7 @@ class WT_Controller_Search extends WT_Controller_Page { } } echo '</div>';//#searchAccordion-indi - $this->addInlineJavascript('jQuery("#searchAccordion-indi").accordion({active:0, heightStyle: "content", collapsible: true, icons:{ "header": "ui-icon-triangle-1-s", "headerSelected": "ui-icon-triangle-1-n" }});'); + $this->addInlineJavascript('jQuery("#searchAccordion-indi").accordion({heightStyle: "content", collapsible: true});'); // family results echo '<div id="searchAccordion-fam">'; |