Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #170 from rledisez/master

my
  • Loading branch information...
commit 0353f3f22c76648782b8efe8132847eb7a9e9ccc 2 parents 7d56d47 + 73440ae
@bharat bharat authored
View
16 3.0/modules/downloadalbum/controllers/downloadalbum.php
@@ -35,7 +35,7 @@ public function zip($container_type, $id) {
: $container->name.'.zip';
break;
- case "tag":
+ case "tag":
// @todo: if the module is not installed, it crash
$container = ORM::factory("tag", $id);
if (is_null($container->name)) {
@@ -45,11 +45,11 @@ public function zip($container_type, $id) {
$zipname = $container->name.'.zip';
break;
- default:
- throw new Kohana_Exception('unhandled container type: '.$container_type);
- }
+ default:
+ throw new Kohana_Exception('unhandled container type: '.$container_type);
+ }
- $files = $this->getFilesList($container);
+ $files = $this->getFilesList($container);
// Calculate ZIP size (look behind for details)
$zipsize = 22;
@@ -165,7 +165,7 @@ private function getFilesList($container) {
$items = $container->viewable()
->descendants(null, null, array(array("type", "<>", "album")));
foreach($items as $i) {
- if (!access::can('view_full', $i)) {
+ if (!access::can('downloadalbum', $i)) {
continue;
}
@@ -216,7 +216,9 @@ private function getFilesList($container) {
*/
private function prepareOutput() {
// Close output buffers
- Kohana::close_buffers(FALSE);
+ while (ob_get_level() > 0) {
+ ob_end_clean();
+ }
// Clear any output
Event::add('system.display', create_function('', 'Kohana::$output = "";'));
}
View
34 3.0/modules/downloadalbum/helpers/downloadalbum_event.php
@@ -19,22 +19,26 @@
*/
class downloadalbum_event_Core {
static function album_menu($menu, $theme) {
- $downloadLink = url::site("downloadalbum/zip/album/{$theme->item->id}");
- $menu
- ->append(Menu::factory("link")
- ->id("downloadalbum")
- ->label(t("Download Album"))
- ->url($downloadLink)
- ->css_id("g-download-album-link"));
+ if( access::can("downloadalbum", $theme->item) && $theme->children_count > 0 ) {
+ $downloadLink = url::site("downloadalbum/zip/album/{$theme->item->id}");
+ $menu
+ ->append(Menu::factory("link")
+ ->id("downloadalbum")
+ ->label(t("Download Album"))
+ ->url($downloadLink)
+ ->css_id("g-download-album-link"));
+ }
}
static function tag_menu($menu, $theme) {
- $downloadLink = url::site("downloadalbum/zip/tag/{$theme->tag()->id}");
- $menu
- ->append(Menu::factory("link")
- ->id("downloadalbum")
- ->label(t("Download Album"))
- ->url($downloadLink)
- ->css_id("g-download-album-link"));
- }
+ if( $theme->children_count > 0 ) {
+ $downloadLink = url::site("downloadalbum/zip/tag/{$theme->tag()->id}");
+ $menu
+ ->append(Menu::factory("link")
+ ->id("downloadalbum")
+ ->label(t("Download Album"))
+ ->url($downloadLink)
+ ->css_id("g-download-album-link"));
+ }
+ }
}
View
37 3.0/modules/downloadalbum/helpers/downloadalbum_installer.php
@@ -0,0 +1,37 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+class downloadalbum_installer {
+ static function install() {
+ access::register_permission("downloadalbum", "Download album");
+ module::set_version("downloadalbum", 3);
+ }
+
+ static function upgrade($version) {
+ if( $version == 2 ) {
+ access::register_permission("downloadalbum", "Download album");
+ module::set_version("downloadalbum", 3);
+ }
+ }
+
+ static function uninstall() {
+ access::delete_permission("downloadalbum");
+ module::delete("downloadalbum");
+ }
+}
View
4 3.0/modules/downloadalbum/module.info
@@ -1,7 +1,7 @@
name = "DownloadAlbum"
description = "Displays a link to download a ZIP archive of the current album."
-version = 2
-author_name = ""
+version = 3
+author_name = "Romain LE DISEZ"
author_url = ""
info_url = "http://codex.gallery2.org/Gallery3:Modules:downloadalbum"
discuss_url = "http://gallery.menalto.com/forum_module_downloadalbum"
View
57 3.0/themes/sobriety/css/screen.css
@@ -540,11 +540,10 @@ span.ui-icon-key { background-position: -112px -128px; }
display: block;
position: absolute;
right: 340px; /* 640/2 + 10 + 10 */
- top: 230px;
+ top: 260px;
width: 230px;
height: 30px;
padding-top: 10px;
- margin-top: 30px;
text-align: right;
font-style: italic;
background-image: url("../images/divider_l.png");
@@ -580,16 +579,16 @@ span.ui-icon-key { background-position: -112px -128px; }
top: 260px; /* (230 + 30) */
left: 50%;
margin-left: 340px; /* (640/2 + 10 + 10) */
+ padding-top: 10px;
+ background-image: url("../images/divider_r.png");
+ background-position: left top;
+ background-repeat: no-repeat;
}
#g-item #g-info h1 {
text-align: left;
font-size: 1em;
border: none;
- padding-top: 10px;
- background-image: url("../images/divider_r.png");
- background-position: left top;
- background-repeat: no-repeat;
}
#g-item .g-block {
@@ -597,7 +596,7 @@ span.ui-icon-key { background-position: -112px -128px; }
margin: auto;
}
-#g-item .g-block#g-metadata {
+#g-item .g-block#sobriety-actions-menu {
text-align: right;
display: block;
width: 300px; /* 230px is not enought: french is verbose */
@@ -607,7 +606,7 @@ span.ui-icon-key { background-position: -112px -128px; }
top: 300px; /* (230 + 30 + 10 + 30) */
}
-#g-item .g-block#g-metadata h2 {
+#g-item .g-block#sobriety-actions-menu h2 {
font-size: 1em;
padding-top: 10px;
text-align: right;
@@ -617,7 +616,7 @@ span.ui-icon-key { background-position: -112px -128px; }
background-repeat: no-repeat;
}
-#g-item .g-block#g-metadata ul {
+#g-item .g-block#sobriety-actions-menu ul {
list-style: none;
padding: 0;
}
@@ -726,13 +725,16 @@ div#g-action-status {
#g-dialog {
padding: 0 2em 0 15px;
margin: 0;
+ min-height: 64px !important;
}
-#g-dialog form, #g-dialog div#g-edit-permissions-form {
+#g-dialog form,
+#g-dialog div#g-edit-permissions-form {
padding: 0 0 0 63px; /* 48 + 15 */
margin: 0;
background-repeat: no-repeat;
- background-position: 0px 3em;
+ background-position: 0px 1em;
+ min-height: 64px; /* ~1em + 48px */
}
#g-dialog form#g-add-album-form {
background-image: url("../images/icons/g-add-album-form.png");
@@ -762,10 +764,8 @@ div#g-action-status {
#g-dialog div#g-edit-permissions-form fieldset legend {
font-size: 1em;
font-weight: bold;
- /*text-align: center;*/
display: block;
padding: 1em 0 1em 0;
- /*margin: auto;*/
}
@@ -806,10 +806,41 @@ div#g-action-status {
#g-dialog a.g-cancel {
float: right;
-moz-appearance: button;
+
-webkit-appearance: push-button;
+ color: black;
+ cursor: default;
+ margin-bottom: 2px;
+ margin-left: 2px;
+ margin-right: 2px;
+ margin-top: 2px;
/*clear: left;*/
}
+/* SUPPRESSION */
+#g-dialog > div > p {
+ padding-left: 63px;
+}
+
+#g-dialog form#g-confirm-delete {
+ left: 15px;
+ min-height: 64px;
+ position: absolute;
+ right: 2em;
+ top: 0px;
+}
+
+#g-dialog form#g-confirm-delete fieldset {
+ bottom: 0px;
+ left: 0px;
+ position: absolute;
+ right: 0px;
+}
+
+#g-dialog form#g-confirm-delete fieldset legend {
+ display: none;
+}
+
#g-add-photos-canvas-sd {
height: 33px;
View
2  3.0/themes/sobriety/js/ui.init.js
@@ -82,7 +82,7 @@ $(document).ready(function() {
} else {
var sib_height = $(this).prev().height();
}
- if ($.browser.msie && $.browser.version >= 8) {
+ if ($.browser.msie && $.browser.version <= 8) {
sib_height = sib_height + 1;
}
$(this).css("height", sib_height);
View
6 3.0/themes/sobriety/theme.info
@@ -4,9 +4,9 @@ version = 1
author = "Romain LE DISEZ"
site = 1
admin = 0
-;wind commit = 3a9bdebafda1807bb2294c041e655f6464841bf0
-;wind date = Tue Sep 21 21:38:32 2010 -0700
-author_name = ""
+;wind commit = 68437993b90bb9cc02ca1134e73c754e1f0d8273
+;wind date = Sat May 19 10:54:02 2012 -0700
+author_name = "Romain LE DISEZ"
author_url = ""
info_url = "http://codex.gallery2.org/Gallery3:Themes:sobriety"
discuss_url = "http://gallery.menalto.com/forum_theme_sobriety"
View
5 3.0/themes/sobriety/views/album.html.php
@@ -9,9 +9,12 @@
<ul id="g-album-grid" class="ui-helper-clearfix">
<? if (count($children)): ?>
<? foreach ($children as $i => $child): ?>
- <? $item_class = "g-photo"; ?>
<? if ($child->is_album()): ?>
<? $item_class = "g-album"; ?>
+ <? elseif ($child->is_movie()): ?>
+ <? $item_class = "g-movie"; ?>
+ <? else: ?>
+ <? $item_class = "g-photo"; ?>
<? endif ?>
<li id="g-item-id-<?= $child->id ?>" class="g-item <?= $item_class ?>">
<?= $theme->thumb_top($child) ?>
View
2  3.0/themes/sobriety/views/dynamic.html.php
@@ -3,7 +3,7 @@
<div id="g-album-header-buttons">
<?= $theme->dynamic_top() ?>
</div>
- <h1><?= html::clean($title) ?></h1>
+ <h1><?= html::purify($title) ?></h1>
</div>
<ul id="g-album-grid" class="ui-helper-clearfix">
View
9 3.0/themes/sobriety/views/no_sidebar.html.php
@@ -1,6 +1,11 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<ul class="g-message-block">
- <li class="g-warning"><?= t("No active sidebar blocks.") ?>
- <br/><a href="<?= url::site("admin/sidebar") ?>"><?= t("Add blocks") ?></a>
+ <li class="g-warning">
+ <? if (block_manager::get_active("site_sidebar")): ?>
+ <?= t("Active sidebar blocks have no content.") ?>
+ <? else: ?>
+ <?= t("No active sidebar blocks.") ?>
+ <? endif ?>
+ <a href="<?= url::site("admin/sidebar") ?>"><?= t("configure blocks") ?></a>
</li>
</ul>
View
82 3.0/themes/sobriety/views/page.html.php
@@ -1,37 +1,30 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
+<?php header("X-Frame-Options: SAMEORIGIN"); ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" <?= $theme->html_attributes() ?> xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+ <? $theme->start_combining("script,css") ?>
<title>
<? if ($page_title): ?>
<?= $page_title ?>
<? else: ?>
<? if ($theme->item()): ?>
- <? if ($theme->item()->is_album()): ?>
- <?= t("Browse Album :: %album_title", array("album_title" => $theme->item()->title)) ?>
- <? elseif ($theme->item()->is_photo()): ?>
- <?= t("Photo :: %photo_title", array("photo_title" => $theme->item()->title)) ?>
- <? else: ?>
- <?= t("Movie :: %movie_title", array("movie_title" => $theme->item()->title)) ?>
- <? endif ?>
+ <?= html::purify($theme->item()->title) ?>
<? elseif ($theme->tag()): ?>
- <?= t("Browse Tag :: %tag_title", array("tag_title" => $theme->tag()->name)) ?>
+ <?= t("Photos tagged with %tag_title", array("tag_title" => $theme->tag()->name)) ?>
<? else: /* Not an item, not a tag, no page_title specified. Help! */ ?>
- <?= t("Gallery") ?>
+ <?= html::purify(item::root()->title) ?>
<? endif ?>
<? endif ?>
</title>
- <link rel="shortcut icon" href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>" type="image/x-icon" />
- <?= $theme->css("_DISABLED_yui/reset-fonts-grids.css") ?>
- <?= $theme->css("_DISABLED_superfish/css/superfish.css") ?>
- <?= $theme->css("_DISABLED_themeroller/ui.base.css") ?>
- <?= $theme->css("screen.css") ?>
- <!--[if lte IE 8]>
- <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
- media="screen,print,projection" />
- <![endif]-->
+ <link rel="shortcut icon"
+ href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>"
+ type="image/x-icon" />
+ <link rel="apple-touch-icon-precomposed"
+ href="<?= url::file(module::get_var("gallery", "apple_touch_icon_url")) ?>" />
+ <?= $theme->script("json2-min.js") ?>
<?= $theme->script("jquery.js") ?>
<?= $theme->script("jquery.form.js") ?>
<?= $theme->script("jquery-ui.js") ?>
@@ -45,9 +38,8 @@
<?= $theme->script("_DISABLED_superfish/js/superfish.js") ?>
<?= $theme->script("_DISABLED_jquery.localscroll.js") ?>
<?= $theme->script("sobriety.ui.init.js") ?>
- <?= $theme->script("ui.init.js") ?>
- <? /* These are page specific, but if we put them before $theme->head() they get combined */ ?>
+ <? /* These are page specific but they get combined */ ?>
<? if ($theme->page_subtype == "photo"): ?>
<?= $theme->script("_DISABLED_jquery.scrollTo.js") ?>
<?= $theme->script("gallery.show_full_size.js") ?>
@@ -56,7 +48,27 @@
<? endif ?>
<?= $theme->head() ?>
+
+ <? /* Theme specific CSS/JS goes last so that it can override module CSS/JS */ ?>
+ <?= $theme->script("ui.init.js") ?>
+ <?= $theme->css("DISABLED_yui/reset-fonts-grids.css") ?>
+ <?= $theme->css("DISABLED_superfish/css/superfish.css") ?>
+ <?= $theme->css("DISABLED_themeroller/ui.base.css") ?>
+ <?= $theme->css("screen.css") ?>
+ <? if (locales::is_rtl()): ?>
+ <?= $theme->css("screen-rtl.css") ?>
+ <? endif; ?>
+ <!--[if lte IE 8]>
+ <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
+ media="screen,print,projection" />
+ <![endif]-->
+
+ <!-- LOOKING FOR YOUR CSS? It's all been combined into the link below -->
+ <?= $theme->get_combined("css") ?>
<?= new View("sobriety_styles.html") ?>
+
+ <!-- LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link below -->
+ <?= $theme->get_combined("script") ?>
</head>
<body <?= $theme->body_attributes() ?>>
@@ -84,28 +96,16 @@
<?= $theme->header_bottom() ?>
</div>
- <? if ($theme->item() && !empty($parents)): ?>
+ <? if (!empty($breadcrumbs)): ?>
<ul class="g-breadcrumbs">
- <? $i = 0 ?>
- <? foreach ($parents as $parent): ?>
- <li<? if ($i == 0) print " class=\"g-first\"" ?>>
- <? // Adding ?show=<id> causes Gallery3 to display the page
- // containing that photo. For now, we just do it for
- // the immediate parent so that when you go back up a
- // level you're on the right page. ?>
- <a href="<?= $parent->url($parent->id == $theme->item()->parent_id ?
- "show={$theme->item()->id}" : null) ?>">
- <? // limit the title length to something reasonable (defaults to 15) ?>
- <?= html::purify(text::limit_chars($parent->title,
- module::get_var("gallery", "visible_title_length"))) ?>
- </a>
- </li>
- <? $i++ ?>
+ <? foreach ($breadcrumbs as $breadcrumb): ?>
+ <li class="<?= $breadcrumb->last ? "g-active" : "" ?>
+ <?= $breadcrumb->first ? "g-first" : "" ?>">
+ <? if (!$breadcrumb->last): ?> <a href="<?= $breadcrumb->url ?>"><? endif ?>
+ <?= html::purify(text::limit_chars($breadcrumb->title, module::get_var("gallery", "visible_title_length"))) ?>
+ <? if (!$breadcrumb->last): ?></a><? endif ?>
+ </li>
<? endforeach ?>
- <li class="g-active<? if ($i == 0) print " g-first" ?>">
- <?= html::purify(text::limit_chars($theme->item()->title,
- module::get_var("gallery", "visible_title_length"))) ?>
- </li>
</ul>
<? endif ?>
</div>
View
97 3.0/themes/sobriety/views/permissions_form.html.php
@@ -1,97 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<fieldset>
- <legend> <?= t('Edit Permissions') ?> </legend>
- <table>
- <thead>
- <tr>
- <th><!-- group name --></th>
- <? foreach ($permissions as $permission): ?>
- <th><?= t($permission->display_name) ?></th>
- <? endforeach ?>
- </tr>
- </thead>
- <tbody>
- <? foreach ($groups as $group): ?>
- <tr>
- <th><?= html::clean($group->name) ?></th>
-
- <? foreach ($permissions as $permission): ?>
- <? $intent = access::group_intent($group, $permission->name, $item) ?>
- <? $allowed = access::group_can($group, $permission->name, $item) ?>
- <? $lock = access::locked_by($group, $permission->name, $item) ?>
-
- <? if ($lock): ?>
- <td class="g-denied">
- <img src="<?= url::file(gallery::find_file("images", "ico-denied.png")) ?>"
- title="<?= t('denied and locked through parent album')->for_html_attr() ?>"
- alt="<?= t('denied icon')->for_html_attr() ?>" />
- <a href="javascript:show(<?= $lock->id ?>)" title="<?= t('click to go to parent album')->for_html_attr() ?>">
- <img src="<?= url::file(gallery::find_file("images", "ico-lock.png")) ?>" alt="<?= t('locked icon')->for_html_attr() ?>" />
- </a>
- </td>
- <? else: ?>
- <? if ($intent === access::INHERIT): ?>
- <? if ($allowed): ?>
- <td class="g-allowed">
- <a href="javascript:set('allow',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)" title="<?= t('allowed through parent album, click to allow explicitly')->for_html_attr() ?>">
- <img src="<?= url::file(gallery::find_file("images", "ico-success-passive.png")) ?>" alt="<?= t('passive allowed icon')->for_html_attr() ?>" />
- </a>
- <a href="javascript:set('deny',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
- title="<?= t('click to deny')->for_html_attr() ?>">
- <img src="<?= url::file(gallery::find_file("images", "ico-denied-inactive.png")) ?>" alt="<?= t('inactive denied icon')->for_html_attr() ?>" />
- </a>
- </td>
- <? else: ?>
- <td class="g-denied">
- <a href="javascript:set('allow',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
- title="<?= t('click to allow')->for_html_attr() ?>">
- <img src="<?= url::file(gallery::find_file("images", "ico-success-inactive.png")) ?>" alt="<?= t('inactive allowed icon')->for_html_attr() ?>" />
- </a>
- <a href="javascript:set('deny',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
- title="<?= t('denied through parent album, click to deny explicitly')->for_html_attr() ?>">
- <img src="<?= url::file(gallery::find_file("images", "ico-denied-passive.png")) ?>" alt="<?= t('passive denied icon')->for_html_attr() ?>" />
- </a>
- </td>
- <? endif ?>
-
- <? elseif ($intent === access::DENY): ?>
- <td class="g-denied">
- <a href="javascript:set('allow',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
- title="<?= t('click to allow')->for_html_attr() ?>">
- <img src="<?= url::file(gallery::find_file("images", "ico-success-inactive.png")) ?>" alt="<?= t('inactive allowed icon')->for_html_attr() ?>" />
- </a>
- <? if ($item->id == 1): ?>
- <img src="<?= url::file(gallery::find_file("images", "ico-denied.png")) ?>" alt="<?= t('denied icon')->for_html_attr() ?>" title="<?= t('denied')->for_html_attr() ?>"/>
- <? else: ?>
- <a href="javascript:set('reset',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
- title="<?= t('denied, click to reset')->for_html_attr() ?>">
- <img src="<?= url::file(gallery::find_file("images", "ico-denied.png")) ?>" alt="<?= t('denied icon')->for_html_attr() ?>" />
- </a>
- <? endif ?>
- </td>
- <? elseif ($intent === access::ALLOW): ?>
- <td class="g-allowed">
- <? if ($item->id == 1): ?>
- <img src="<?= url::file(gallery::find_file("images", "ico-success.png")) ?>" title="<?= t("allowed")->for_html_attr() ?>" alt="<?= t('allowed icon')->for_html_attr() ?>" />
- <? else: ?>
- <a href="javascript:set('reset',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
- title="<?= t('allowed, click to reset')->for_html_attr() ?>">
- <img src="<?= url::file(gallery::find_file("images", "ico-success.png")) ?>" alt="<?= t('allowed icon')->for_html_attr() ?>" />
- </a>
- <? endif ?>
- <a href="javascript:set('deny',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
- title="<?= t('click to deny')->for_html_attr() ?>">
- <img src="<?= url::file(gallery::find_file("images", "ico-denied-inactive.png")) ?>" alt="<?= t('inactive denied icon')->for_html_attr() ?>" />
- </a>
- </td>
- <? endif ?>
- <? endif ?>
- <? endforeach ?>
- </tr>
- <? endforeach ?>
- </tbody>
- </table>
-</fieldset>
-<fieldset>
-<button>Done</button>
-</fieldset>
View
1  3.0/themes/sobriety/views/photo.html.php
@@ -46,7 +46,6 @@
<h1><?= html::purify($item->title) ?></h1>
<div><?= nl2br(html::purify($item->description)) ?></div>
</div>
- <?= new View("sobriety_actions.html") ?>
<?= $theme->photo_bottom() ?>
</div>
View
2  3.0/themes/sobriety/views/sidebar.html.php
@@ -1,4 +1,5 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
+<?= new View("sobriety_actions.html") ?>
<?= $theme->sidebar_top() ?>
<div id="g-view-menu" class="g-buttonset ui-helper-clearfix">
<? if ($page_subtype == "album"):?>
@@ -11,7 +12,6 @@
<?= $theme->tag_menu() ?>
<? endif ?>
</div>
-<?= new View("sobriety_actions.html") ?>
<?= $theme->sidebar_blocks() ?>
<?= $theme->sidebar_bottom() ?>
View
2  3.0/themes/sobriety/views/sobriety_actions.html.php
@@ -6,7 +6,7 @@
?>
<? if( !empty($menu->elements['add_menu']->elements) || !empty($menu->elements['options_menu']->elements) ): ?>
- <div id="g-metadata" class="g-block">
+ <div id="sobriety-actions-menu" class="g-block">
<h2><?= t("Actions") ?></h2>
<div class="g-block-content">
<ul class="g-metadata">
Please sign in to comment.
Something went wrong with that request. Please try again.