Revert "Rename "theme_3nids" to just "3nids" since we no longer have a theme_3nids module."
This reverts commit e8302ffcc8
.
Conflicts:
themes/3nids/views/album.html.php
This commit is contained in:
parent
fe468a6014
commit
1447920592
@ -18,11 +18,11 @@
|
||||
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
class Admin_3nids_Controller extends Admin_Controller {
|
||||
class Admin_theme_3nids_Controller extends Admin_Controller {
|
||||
public function index() {
|
||||
// Generate a new admin page.
|
||||
$view = new Admin_View("admin.html");
|
||||
$view->content = new View("admin_3nids.html");
|
||||
$view->content = new View("admin_theme_3nids.html");
|
||||
|
||||
// Generate a form for Google Maps Settings.
|
||||
$view->content->theme_form = $this->_get_3nids_form();
|
||||
@ -35,19 +35,19 @@ class Admin_3nids_Controller extends Admin_Controller {
|
||||
|
||||
private function _get_3nids_form() {
|
||||
// Make a new form for inputing information associated with google maps.
|
||||
$form = new Forge("admin/3nids/save3nidsprefs", "", "post",
|
||||
$form = new Forge("admin/theme_3nids/save3nidsprefs", "", "post",
|
||||
array("id" => "gTagsMapAdminForm"));
|
||||
|
||||
// Input box for the Maps API Key
|
||||
$form->input("title")
|
||||
->label(t("item title : parent or item."))
|
||||
->value(module::get_var("3nids", "title"));
|
||||
->value(module::get_var("theme_3nids", "title"));
|
||||
$form->input("description")
|
||||
->label(t("item description : tags or item or parent or nothing. If item description chosen and not available, then parent description is used."))
|
||||
->value(module::get_var("3nids", "description"));
|
||||
->value(module::get_var("theme_3nids", "description"));
|
||||
$form->input("photo_size")
|
||||
->label(t("Photo size: resize or full."))
|
||||
->value(module::get_var("3nids", "photo_size"));
|
||||
->value(module::get_var("theme_3nids", "photo_size"));
|
||||
|
||||
// Add a save button to the form.
|
||||
$form->submit("SaveSettings")->value(t("Save"));
|
||||
@ -68,12 +68,12 @@ class Admin_3nids_Controller extends Admin_Controller {
|
||||
$photo_size = Input::instance()->post("photo_size");
|
||||
|
||||
// Save Settings.
|
||||
module::set_var("3nids", "description", $description);
|
||||
module::set_var("3nids", "title", $title);
|
||||
module::set_var("3nids", "photo_size", $photo_size);
|
||||
module::set_var("theme_3nids", "description", $description);
|
||||
module::set_var("theme_3nids", "title", $title);
|
||||
module::set_var("theme_3nids", "photo_size", $photo_size);
|
||||
|
||||
// Display a success message and redirect back to the TagsMap admin page.
|
||||
message::success(t("Your Settings Have Been Saved."));
|
||||
url::redirect("admin/3nids");
|
||||
url::redirect("admin/theme_3nids");
|
||||
}
|
||||
}
|
@ -25,7 +25,7 @@ class Photo_3nids_Controller extends Items_Controller {
|
||||
|
||||
$view = new Theme_View("photo_3nids.html", "other", "page");
|
||||
$view->item = $item;
|
||||
$photo_size = module::get_var("3nids","photo_size");
|
||||
$photo_size = module::get_var("theme_3nids","photo_size");
|
||||
if ($photo_size == "full"){
|
||||
$view->item_url = $item->file_url();
|
||||
} else {
|
||||
|
@ -58,12 +58,12 @@ class 3nids_Core {
|
||||
$rel = " rel=\"fancygroup\" ";
|
||||
}
|
||||
|
||||
if ($item->is_photo() || ($item->is_movie()) && module::is_active("3nids")){
|
||||
if ($item->is_photo() || ($item->is_movie()) && module::is_active("theme_3nids")){
|
||||
$fancymodule = "";
|
||||
if (module::is_active("exif")) {
|
||||
$fancymodule .= "exif::" . url::site("exif/show/{$item->id}") . ";;";
|
||||
}
|
||||
if (module::is_active("comment") && module::is_active("3nids")) {
|
||||
if (module::is_active("comment") && module::is_active("theme_3nids")) {
|
||||
$fancymodule .= "comment::" . url::site("comments_3nids?item_id={$item->id}") .
|
||||
";;comment_count::" . comment_3nids::count($item) . ";;";
|
||||
}
|
||||
|
@ -17,13 +17,13 @@
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
class 3nids_event_Core {
|
||||
class theme_3nids_event_Core {
|
||||
static function admin_menu($menu, $theme) {
|
||||
// Add a link to the TagsMap admin page to the Content menu.
|
||||
$menu->get("content_menu")
|
||||
->append(Menu::factory("link")
|
||||
->id("3nids")
|
||||
->id("theme_3nids")
|
||||
->label(t("Theme 3nids Settings"))
|
||||
->url(url::site("admin/3nids")));
|
||||
->url(url::site("admin/theme_3nids")));
|
||||
}
|
||||
}
|
@ -16,7 +16,7 @@
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
class 3nids_theme {
|
||||
class theme_3nids_theme {
|
||||
|
||||
static function credits($theme) {
|
||||
return "<a href=\"http://codex.gallery2.org/Gallery3:Themes:3nids\">3nids theme</a>";
|
||||
|
@ -16,7 +16,7 @@ $children_offset = ($theme->pagination->current_page -1) * $page_size ;
|
||||
<? if (count($children)): ?>
|
||||
<? for ($i = 0; $i < $children_offset; $i++): ?>
|
||||
<? $child = $children_all[$i] ?>
|
||||
<?= 3nids::fancylink($child, "header") ?>
|
||||
<?= theme_3nids::fancylink($child, "header") ?>
|
||||
<? endfor ?>
|
||||
|
||||
<? foreach ($children as $i => $child): ?>
|
||||
@ -26,7 +26,7 @@ $children_offset = ($theme->pagination->current_page -1) * $page_size ;
|
||||
<? endif ?>
|
||||
<li id="g-item-id-<?= $child->id ?>" class="g-item <?= $item_class ?>">
|
||||
<?= $theme->thumb_top($child) ?>
|
||||
<?= 3nids::fancylink($child, "album") ?>
|
||||
<?= theme_3nids::fancylink($child, "album") ?>
|
||||
<?= $theme->thumb_bottom($child) ?>
|
||||
<?= $theme->context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>
|
||||
</li>
|
||||
@ -34,7 +34,7 @@ $children_offset = ($theme->pagination->current_page -1) * $page_size ;
|
||||
|
||||
<? for($i=$children_offset+$page_size;$i<$children_count;$i++): ?>
|
||||
<? $child = $children_all[$i] ?>
|
||||
<?= 3nids::fancylink($child, "header") ?>
|
||||
<?= theme_3nids::fancylink($child, "header") ?>
|
||||
<? endfor ?>
|
||||
<? else: ?>
|
||||
<? if ($user->admin || access::can("add", $item)): ?>
|
||||
|
@ -14,7 +14,7 @@
|
||||
<ul id="g-album-grid" class="ui-helper-clearfix">
|
||||
<? for($i=0;$i<$children_offset;$i++): ?>
|
||||
<? $child = $children_all[$i] ?>
|
||||
<?= 3nids::fancylink($child,"header") ?>
|
||||
<?= theme_3nids::fancylink($child,"header") ?>
|
||||
<? endfor ?>
|
||||
|
||||
<? foreach ($children as $i => $child): ?>
|
||||
@ -22,7 +22,7 @@
|
||||
<!--<li class="g-Item <?= $child->is_album() ? "g-album" : "" ?>">!-->
|
||||
<li id="g-item-id-<?= $child->id ?>" class="g-item g-album">
|
||||
<?= $theme->thumb_top($child) ?>
|
||||
<?= 3nids::fancylink($child,"dynamic") ?>
|
||||
<?= theme_3nids::fancylink($child,"dynamic") ?>
|
||||
<?= $theme->thumb_bottom($child) ?>
|
||||
<?= $theme->context_menu($child, "#g-ItemId-{$child->id} .g-Thumbnail") ?>
|
||||
</li>
|
||||
@ -30,7 +30,7 @@
|
||||
</ul>
|
||||
<? for($i=$children_offset+$page_size;$i<$children_count;$i++): ?>
|
||||
<? $child = $children_all[$i] ?>
|
||||
<?= 3nids::fancylink($child,"header") ?>
|
||||
<?= theme_3nids::fancylink($child,"header") ?>
|
||||
<? endfor ?>
|
||||
<?= $theme->dynamic_bottom() ?>
|
||||
|
||||
|
@ -1,3 +1,3 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.") ?>
|
||||
|
||||
<?= 3nids::fancylink($item, "dynamic", false, false, "h4") ?>
|
||||
<?= theme_3nids::fancylink($item, "dynamic", false, false, "h4") ?>
|
||||
|
@ -13,19 +13,19 @@
|
||||
<ul id="g-album-grid" class="ui-helper-clearfix">
|
||||
<? for($i=0;$i<$children_offset;$i++): ?>
|
||||
<? $child = $children_all[$i] ?>
|
||||
<?= 3nids::fancylink($child,"header") ?>
|
||||
<?= theme_3nids::fancylink($child,"header") ?>
|
||||
<? endfor ?>
|
||||
<? foreach ($items as $child): ?>
|
||||
<li id="g-item-id-<?= $child->id ?>" class="g-item g-album">
|
||||
<?= $theme->thumb_top($child) ?>
|
||||
<?= 3nids::fancylink($child,"dynamic") ?>
|
||||
<?= theme_3nids::fancylink($child,"dynamic") ?>
|
||||
<?= $theme->thumb_bottom($child) ?>
|
||||
<?= $theme->context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>
|
||||
</li>
|
||||
<? endforeach ?>
|
||||
<? for($i=$children_offset+$page_size;$i<$children_count;$i++): ?>
|
||||
<? $child = $children_all[$i] ?>
|
||||
<?= 3nids::fancylink($child,"header") ?>
|
||||
<?= theme_3nids::fancylink($child,"header") ?>
|
||||
<? endfor ?>
|
||||
</ul>
|
||||
<?= $theme->paginator() ?>
|
||||
|
Reference in New Issue
Block a user