diff options
| -rw-r--r-- | core/helpers/core_menu.php | 2 | ||||
| -rw-r--r-- | core/js/fullsize.js | 2 | ||||
| -rw-r--r-- | core/libraries/Menu.php | 24 | ||||
| -rw-r--r-- | themes/default/css/screen.css | 4 | ||||
| -rw-r--r-- | themes/default/views/photo.html.php | 2 |
5 files changed, 27 insertions, 7 deletions
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 "<li><a$css_id class=\"gMenuElement\" href=\"$this->url\">$this->label</a></li>"; + if (isset($this->css_class) && !empty($this->css_class)) { + $css_class = " $this->css_class"; + } else { + $css_class = ""; + } + return "<li><a$css_id class=\"gMenuElement$css_class\" href=\"$this->url\">$this->label</a></li>"; } } @@ -85,7 +100,12 @@ class Menu_Element_Dialog extends Menu_Element { } else { $css_id = ""; } - return "<li><a$css_id class=\"gMenuLink\" href=\"$this->url\" " . + if (isset($this->css_class) && !empty($this->css_class)) { + $css_class = " $this->css_class"; + } else { + $css_class = ""; + } + return "<li><a$css_id class=\"gMenuLink$css_class\" href=\"$this->url\" " . "title=\"$this->label\">$this->label</a></li>"; } } diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index 28806e10..f191358f 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -568,7 +568,7 @@ form p.gError { #gViewMenu #gAddWatchLink, #gViewMenu #gHybridLink, #gViewMenu #gSlideshowLink, -#gViewMenu #gFullsizeLink, +#gViewMenu .gFullSizeLink, #gViewMenu #gCommentsLink { background-repeat: no-repeat; background-position: 10px 50%; @@ -601,7 +601,7 @@ form p.gError { background-image: url('../images/ico-view-slideshow.png'); } -#gViewMenu #gFullsizeLink { +#gViewMenu .gFullSizeLink { background-image: url('../images/ico-view-fullsize.png'); } diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php index 8c0f7f5e..666fa9ee 100644 --- a/themes/default/views/photo.html.php +++ b/themes/default/views/photo.html.php @@ -12,7 +12,7 @@ <? endif ?> </ul> - <?= $item->resize_tag(array("id" => "gPhotoId-{$item->id}")) ?> + <a href="#" class="gFullSizeLink" title="<?= t("View full size") ?>"><?= $item->resize_tag(array("id" => "gPhotoId-{$item->id}")) ?></a> <div id="gInfo"> <h1><?= $item->title ?></h1> |