Remove the options menus from the albums and photo pages and move to the site menu

This commit is contained in:
Tim Almdal
2008-12-11 21:27:16 +00:00
parent bf10544e27
commit bd992a97b2
4 changed files with 44 additions and 25 deletions

View File

@@ -37,13 +37,18 @@ class core_menu_Core {
// @todo need to do a permission check here
$menu->append(
Menu::factory("submenu")
->id("upload_menu")
->label(_("Upload"))
->id("options_menu")
->label(_("Options"))
->append(
Menu::factory("dialog")
->id("add_photos")
->label(_("Add Photos"))
->url(url::site("form/add/photos/$item->id"))));
->id("add_item")
->label(_("Add an item"))
->url(url::site("form/add/photos/$item->id")))
->append(
Menu::factory("dialog")
->id("add_album")
->label(_("Add album"))
->url(url::site("form/add/albums/$item->id"))));
$admin_menu = Menu::factory("submenu")
->id("admin_menu")

View File

@@ -0,0 +1,34 @@
<?php defined("SYSPATH") or die("No direct script access.");
/**
* Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2008 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 Local_Import_Controller extends Controller {
public function form_add() {
// $form = local_import::get_admin_form();
// $paths = unserialize(module::get_var("local_import", "authorized_paths"));
// if ($form->validate()) {
// $paths[$form->path->value] = 1;
// module::set_var("local_import", "authorized_paths", serialize($paths));
// }
// $view = new View("local_import_dir_list.html");
// $view->paths = array_keys($paths);
//
// print $view;
print "<p>Hi There</p";
}
}

View File

@@ -4,16 +4,6 @@
<li><a href="#" id="gAlbumLink" title="<?= _("View album") ?>"><?= _("Album view") ?></a></li>
<li><a href="#" id="gHybridLink" title="<?= _("View album in hybrid mode") ?>"><?= _("Hybrid view") ?></a></li>
<li><?= $theme->album_top() ?></li>
<li><a href="#">Options</a>
<ul>
<li><a href="<?= url::site("/form/add/photos/$item->id") ?>"
title="<?= _("Add an item") ?>"
class="gDialogLink"><?= _("Add an item") ?></a></li>
<li><a href="<?= url::site("/form/add/albums/$item->id") ?>"
title="<?= _("Add album") ?>"
class="gDialogLink"><?= _("Add album") ?></a></li>
</ul>
</li>
</ul>
<h1><?= $item->title_edit ?></h1>

View File

@@ -4,16 +4,6 @@
<li><a href="#" id="gFullsizeLink" title="<?= _("View full size image") ?>"><?= _("View full size image") ?></a></li>
<li><a href="#" id="gHybridLink" title="<?= _("View album in hybrid mode") ?>"><?= _("Hybrid view") ?></a></li>
<li><?= $theme->album_top() ?></li>
<li><a href="#">Options</a>
<ul>
<li><a href="<?= url::site("/form/add/photos/$item->id") ?>"
title="<?= _("Add an item") ?>"
class="gDialogLink"><?= _("Add an item") ?></a></li>
<li><a href="<?= url::site("/form/add/albums/$item->id") ?>"
title="<?= _("Add album") ?>"
class="gDialogLink"><?= _("Add album") ?></a></li>
</ul>
</li>
</ul>
<h1><?= $item->title_edit ?></h1>