From c1660423133e072ca123d62040bc1a09e642378d Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Fri, 6 Feb 2009 01:47:42 +0000 Subject: Apply default link styles to links in dialogs, including the Forgot Password link. --- core/helpers/core_menu.php | 2 +- core/js/fullsize.js | 2 +- core/libraries/Menu.php | 24 ++++++++++++++++++++++-- 3 files changed, 24 insertions(+), 4 deletions(-) (limited to 'core') diff --git a/core/helpers/core_menu.php b/core/helpers/core_menu.php index 247fd215..4720a00d 100644 --- a/core/helpers/core_menu.php +++ b/core/helpers/core_menu.php @@ -93,7 +93,7 @@ class core_menu_Core { ->id("fullsize") ->label(t("View full size")) ->url("#") - ->css_id("gFullsizeLink")); + ->css_class("gFullSizeLink")); } $menu ->append(Menu::factory("link") diff --git a/core/js/fullsize.js b/core/js/fullsize.js index f6b586ae..9092dc30 100644 --- a/core/js/fullsize.js +++ b/core/js/fullsize.js @@ -2,7 +2,7 @@ * @todo Move inline CSS out to external style sheet (theme style sheet) */ $(document).ready(function() { - $("#gFullsizeLink").click(function() { + $(".gFullSizeLink").click(function() { var width = $(document).width(); var height = $(document).height(); diff --git a/core/libraries/Menu.php b/core/libraries/Menu.php index 8c1a0a47..10065f8b 100644 --- a/core/libraries/Menu.php +++ b/core/libraries/Menu.php @@ -21,6 +21,7 @@ class Menu_Element { public $label; public $url; public $css_id; + public $css_class; public $id; /** @@ -59,6 +60,15 @@ class Menu_Element { return $this; } + /** + * Set the css class + * @chainable + */ + public function css_class($css_class) { + $this->css_class = $css_class; + return $this; + } + } /** @@ -71,7 +81,12 @@ class Menu_Element_Link extends Menu_Element { } else { $css_id = ""; } - return "
  • url\">$this->label
  • "; + if (isset($this->css_class) && !empty($this->css_class)) { + $css_class = " $this->css_class"; + } else { + $css_class = ""; + } + return "
  • url\">$this->label
  • "; } } @@ -85,7 +100,12 @@ class Menu_Element_Dialog extends Menu_Element { } else { $css_id = ""; } - return "
  • url\" " . + if (isset($this->css_class) && !empty($this->css_class)) { + $css_class = " $this->css_class"; + } else { + $css_class = ""; + } + return "
  • url\" " . "title=\"$this->label\">$this->label
  • "; } } -- cgit v1.2.3