1
0

Not sure why, but merging the remote repository and my local required a add and commit of the 3nids theme

This commit is contained in:
Tim Almdal 2009-11-15 06:50:21 -08:00
parent 139437eb73
commit 344702fda3
10 changed files with 1111 additions and 1111 deletions

View File

@ -1,54 +1,54 @@
/* 3nids specific */ /* 3nids specific */
.g-movie { .g-movie {
padding-top: 10px; padding-top: 10px;
} }
.g-map-head img { .g-map-head img {
display: block; display: block;
margin: 3px; margin: 3px;
} }
.g-map-head a { .g-map-head a {
float: right; float: right;
} }
.g-comment-thumb{ .g-comment-thumb{
padding: 5px; padding: 5px;
text-align: left; text-align: left;
} }
.g-fancy-iframe-body{ .g-fancy-iframe-body{
background-color: #333333; background-color: #333333;
height: auto; height: auto;
} }
#mod_frame{ #mod_frame{
background-color: #333333; background-color: #333333;
} }
.g-comment-box { .g-comment-box {
border-bottom: 1px solid #555; border-bottom: 1px solid #555;
} }
.g-comment-box:hover{ .g-comment-box:hover{
background-color: black; background-color: black;
color: #ffffcc; color: #ffffcc;
} }
#g-comment-detail { #g-comment-detail {
width: 360px; width: 360px;
height: 100%; height: 100%;
background-color: #333333; background-color: #333333;
padding: 10px; padding: 10px;
text-align: left; text-align: left;
margin-top: 30px; margin-top: 30px;
} }
.g-block-content .g-parent-album h4 span { .g-block-content .g-parent-album h4 span {
background: transparent url('../images/ico-album.png') no-repeat top left; background: transparent url('../images/ico-album.png') no-repeat top left;
display: inline-block; display: inline-block;
height: 16px; height: 16px;
margin-right: 5px; margin-right: 5px;
width: 16px; width: 16px;
} }

File diff suppressed because it is too large Load Diff

View File

@ -1,38 +1,38 @@
This is a theme for gallery3. This is a theme for gallery3.
It uses jquery lightbox slideshow (fancybox) to display images, and includes a tagsmap module (originally from rWatcher). It uses jquery lightbox slideshow (fancybox) to display images, and includes a tagsmap module (originally from rWatcher).
********* *********
Demo @ http://gallery.3nids.ch Demo @ http://gallery.3nids.ch
********* *********
Requirements: Requirements:
- Gallery 3 last experimental version @ http://github.com/gallery/gallery3 - Gallery 3 last experimental version @ http://github.com/gallery/gallery3
- Tag module activated (if want to use tagsmap) - Tag module activated (if want to use tagsmap)
- theme_3nids module must be activated to display properly the theme. - theme_3nids module must be activated to display properly the theme.
********* *********
Installation: Installation:
1. Copy the theme folder (3nids) into gallery3/themes directory. 1. Copy the theme folder (3nids) into gallery3/themes directory.
2. Copy modules folder into gallery3 directory. It includes tagsmap and theme_3nids modules. 2. Copy modules folder into gallery3 directory. It includes tagsmap and theme_3nids modules.
3. Activate tagsmap and theme_3nids module. 3. Activate tagsmap and theme_3nids module.
********* *********
Configuration: Configuration:
Go to admin -> content -> Theme 3nids settings to configure the theme properly. Go to admin -> content -> Theme 3nids settings to configure the theme properly.
********* *********
Use: Use:
This theme displays full size images. So be carefull to upload not too large images! This theme displays full size images. So be carefull to upload not too large images!
The theme uses the tagsmap module which has been enhanced. The theme uses the tagsmap module which has been enhanced.
For advanced users: For advanced users:
If you want to separate geotag from others, name those with the "map." prefix., the "map." prefix will not be displayed on the map. If you want to separate geotag from others, name those with the "map." prefix., the "map." prefix will not be displayed on the map.
If you want to remove the prefix in the tag cloud sidebar, wou will have to update in gallery3/modules/tag/helpers/tag.php the popular_tags function: If you want to remove the prefix in the tag cloud sidebar, wou will have to update in gallery3/modules/tag/helpers/tag.php the popular_tags function:
static function popular_tags($count) { static function popular_tags($count) {
return ORM::factory("tag") return ORM::factory("tag")
->orderby("count", "DESC") ->orderby("count", "DESC")
->notregex("name","map\.") ->notregex("name","map\.")
->limit($count) ->limit($count)
->find_all(); ->find_all();
} }

View File

@ -1,97 +1,97 @@
.tooltip{ .tooltip{
position: absolute; position: absolute;
left: 10px; left: 10px;
top: 10px; top: 10px;
width: 150px; width: 150px;
background-color: #777; background-color: #777;
color: #ffffcc; color: #ffffcc;
border: 1px solid #f9db01; border: 1px solid #f9db01;
font: bold 13px "Trebuchet MS", Verdana, Arial, sans-serif; font: bold 13px "Trebuchet MS", Verdana, Arial, sans-serif;
padding: 4px; padding: 4px;
z-index: 20; z-index: 20;
-moz-border-radius: 10px; -moz-border-radius: 10px;
-moz-opacity: .87; -moz-opacity: .87;
filter:alpha(opacity=87); filter:alpha(opacity=87);
opacity:.87; opacity:.87;
} }
.g-map-thumb-table{ .g-map-thumb-table{
width:200px; width:200px;
height: 80px; height: 80px;
font-size: 0.9em; font-size: 0.9em;
font-style: normal; font-style: normal;
color: #FFFFCC; color: #FFFFCC;
} }
.g-map-thumb-img{ .g-map-thumb-img{
overflow:auto; overflow:auto;
position: relative; position: relative;
height:125px; height:125px;
} }
.g-map-thumb-link{ .g-map-thumb-link{
height: 15px; height: 15px;
} }
.g-map-thumb-td{ .g-map-thumb-td{
padding: 0; padding: 0;
text-align: center; text-align: center;
} }
.gMapThumbnail{ .gMapThumbnail{
height: 80px; height: 80px;
} }
#gmInfo{ #gmInfo{
width: 230px; width: 230px;
} }
#gmInfo_contents{ #gmInfo_contents{
background: #3d3d3d; background: #3d3d3d;
} }
#gmInfo_contents div{ #gmInfo_contents div{
font-style: italic; font-style: italic;
vertical-align: middle; vertical-align: middle;
margin: 0 10px; margin: 0 10px;
} }
#gmInfo_tl{ #gmInfo_tl{
width: 14px; width: 14px;
height: 14px; height: 14px;
background: url('../images/gmInfo_tl.png') top left no-repeat transparent; background: url('../images/gmInfo_tl.png') top left no-repeat transparent;
} }
#gmInfo_t{ #gmInfo_t{
background: url('../images/gmInfo_t.png') top left repeat-x transparent; background: url('../images/gmInfo_t.png') top left repeat-x transparent;
} }
#gmInfo_tr{ #gmInfo_tr{
width: 14px; width: 14px;
height: 14px; height: 14px;
background: url('../images/gmInfo_tr.png') top left no-repeat transparent; background: url('../images/gmInfo_tr.png') top left no-repeat transparent;
} }
#gmInfo_l{ #gmInfo_l{
width: 14px; width: 14px;
background: url('../images/gmInfo_l.png') top left repeat-y transparent; background: url('../images/gmInfo_l.png') top left repeat-y transparent;
} }
#gmInfo_r{ #gmInfo_r{
width: 14px; width: 14px;
background: url('../images/gmInfo_r.png') top right repeat-y transparent; background: url('../images/gmInfo_r.png') top right repeat-y transparent;
} }
#gmInfo_bl{ #gmInfo_bl{
width: 14px; width: 14px;
height: 14px; height: 14px;
background: url('../images/gmInfo_bl.png') top left no-repeat transparent; background: url('../images/gmInfo_bl.png') top left no-repeat transparent;
} }
#gmInfo_b{ #gmInfo_b{
background: url('../images/gmInfo_b.png') top left repeat-x transparent; background: url('../images/gmInfo_b.png') top left repeat-x transparent;
} }
#gmInfo_br{ #gmInfo_br{
width: 14px; width: 14px;
height: 14px; height: 14px;
background: url('../images/gmInfo_br.png') top left no-repeat transparent; background: url('../images/gmInfo_br.png') top left no-repeat transparent;
} }
#gmInfo_close{ #gmInfo_close{
width: 30px; width: 30px;
height: 30px; height: 30px;
background: url('../images/gmInfo_close.png') top left no-repeat transparent; background: url('../images/gmInfo_close.png') top left no-repeat transparent;
margin: -10px 0 0 10px; margin: -10px 0 0 10px;
cursor: pointer; cursor: pointer;
} }
#gmInfo_beak{ #gmInfo_beak{
width: 27px; width: 27px;
height: 33px; height: 33px;
background: url('../images/gmInfo_beak.png') top left no-repeat transparent; background: url('../images/gmInfo_beak.png') top left no-repeat transparent;
} }

View File

@ -1,39 +1,39 @@
<?php defined("SYSPATH") or die("No direct script access."); <?php defined("SYSPATH") or die("No direct script access.");
/** /**
* Gallery - a web based photo album viewer and editor * Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2009 Bharat Mediratta * Copyright (C) 2000-2009 Bharat Mediratta
* *
* This program is free software; you can redistribute it and/or modify * 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 * 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 * the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version. * your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details. * General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/** /**
* This is the API for handling comments. * This is the API for handling comments.
* *
* Note: by design, this class does not do any permission checking. * Note: by design, this class does not do any permission checking.
*/ */
class tagsmap_Core { class tagsmap_Core {
public function tagitems($tag) { public function tagitems($tag) {
$tagitems = ORM::factory("item") $tagitems = ORM::factory("item")
->viewable() ->viewable()
->join("items_tags", "items.id", "items_tags.item_id") ->join("items_tags", "items.id", "items_tags.item_id")
->where("items_tags.tag_id", $tag->tag_id) ->where("items_tags.tag_id", $tag->tag_id)
->orderby("items.name", "DESC") ->orderby("items.name", "DESC")
->find_all(); ->find_all();
return $tagitems; return $tagitems;
} }
} }
?> ?>

View File

@ -1,24 +1,24 @@
<?php defined("SYSPATH") or die("No direct script access."); <?php defined("SYSPATH") or die("No direct script access.");
/** /**
* Gallery - a web based photo album viewer and editor * Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2009 Bharat Mediratta * Copyright (C) 2000-2009 Bharat Mediratta
* *
* This program is free software; you can redistribute it and/or modify * 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 * 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 * the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version. * your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details. * General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
class tagsmap_theme { class tagsmap_theme {
static function head($theme) { static function head($theme) {
$theme->css("tagsmap.css"); $theme->css("tagsmap.css");
} }
} }

View File

@ -1,38 +1,38 @@
<?php defined("SYSPATH") or die("No direct script access."); <?php defined("SYSPATH") or die("No direct script access.");
/** /**
* Gallery - a web based photo album viewer and editor * Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2009 Bharat Mediratta * Copyright (C) 2000-2009 Bharat Mediratta
* *
* This program is free software; you can redistribute it and/or modify * 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 * 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 * the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version. * your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details. * General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
class Movie_3nids_Controller extends REST_Controller { class Movie_3nids_Controller extends REST_Controller {
protected $resource_type = "movie_3nids"; protected $resource_type = "movie_3nids";
/** /**
* Display comments based on criteria. * Display comments based on criteria.
* @see REST_Controller::_index() * @see REST_Controller::_index()
*/ */
public function show($item_id) { public function show($item_id) {
$item = ORM::factory("item", $item_id); $item = ORM::factory("item", $item_id);
access::required("view", $item); access::required("view", $item);
$view = new Theme_View("movie_3nids.html", "page"); $view = new Theme_View("movie_3nids.html", "page");
$view->item = $item; $view->item = $item;
$view->attrs = array("class" => "g-movie", "id" => "g-movie-id-{$item->id}", "style" => "display:block;width:{$item->width}px;height:{$item->height}px"); $view->attrs = array("class" => "g-movie", "id" => "g-movie-id-{$item->id}", "style" => "display:block;width:{$item->width}px;height:{$item->height}px");
print $view; print $view;
break; break;
} }
} }

View File

@ -1,43 +1,43 @@
<?php defined("SYSPATH") or die("No direct script access."); <?php defined("SYSPATH") or die("No direct script access.");
/** /**
* Gallery - a web based photo album viewer and editor * Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2009 Bharat Mediratta * Copyright (C) 2000-2009 Bharat Mediratta
* *
* This program is free software; you can redistribute it and/or modify * 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 * 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 * the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version. * your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details. * General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
class Photo_3nids_Controller extends REST_Controller { class Photo_3nids_Controller extends REST_Controller {
protected $resource_type = "photo_3nids"; protected $resource_type = "photo_3nids";
/** /**
* Display comments based on criteria. * Display comments based on criteria.
* @see REST_Controller::_index() * @see REST_Controller::_index()
*/ */
public function show($item_id) { public function show($item_id) {
$item = ORM::factory("item", $item_id); $item = ORM::factory("item", $item_id);
access::required("view", $item); access::required("view", $item);
$view = new Theme_View("photo_3nids.html", "page"); $view = new Theme_View("photo_3nids.html", "page");
$view->item = $item; $view->item = $item;
$photo_size = module::get_var("theme_3nids","photo_size"); $photo_size = module::get_var("theme_3nids","photo_size");
if ($photo_size == "full"){ if ($photo_size == "full"){
$view->item_url = $item->file_url(); $view->item_url = $item->file_url();
}else{ }else{
$view->item_url = $item->resize_url(); $view->item_url = $item->resize_url();
} }
print $view; print $view;
break; break;
} }
} }

View File

@ -1,101 +1,101 @@
<?php defined("SYSPATH") or die("No direct script access."); <?php defined("SYSPATH") or die("No direct script access.");
/** /**
* Gallery - a web based photo album viewer and editor * Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2009 Bharat Mediratta * Copyright (C) 2000-2009 Bharat Mediratta
* *
* This program is free software; you can redistribute it and/or modify * 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 * 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 * the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version. * your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details. * General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/** /**
* This is the API for handling comments. * This is the API for handling comments.
* *
* Note: by design, this class does not do any permission checking. * Note: by design, this class does not do any permission checking.
*/ */
class theme_3nids_Core { class theme_3nids_Core {
public function fancylink($item, $viewtype="album", $groupImg = true, $displayComment = true, $parentTitleClass = "h2") { public function fancylink($item, $viewtype="album", $groupImg = true, $displayComment = true, $parentTitleClass = "h2") {
//viewtype = album || dynamic || header //viewtype = album || dynamic || header
$link = ""; $link = "";
access::required("view", $item); access::required("view", $item);
$photo_size = module::get_var("theme_3nids","photo_size"); $photo_size = module::get_var("theme_3nids","photo_size");
if ($photo_size == "full"){ if ($photo_size == "full"){
$width = $item->width; $width = $item->width;
$height = $item->height; $height = $item->height;
}else{ }else{
$width = $item->resize_width; $width = $item->resize_width;
$height = $item->resize_height; $height = $item->resize_height;
} }
$desriptionMode = module::get_var("theme_3nids", "description"); $desriptionMode = module::get_var("theme_3nids", "description");
$description = ""; $description = "";
$tags = tag::item_tags($item); $tags = tag::item_tags($item);
if(count($tags) && $desriptionMode == "tags"){ if(count($tags) && $desriptionMode == "tags"){
$description = " || " . implode(", ", $tags); $description = " || " . implode(", ", $tags);
}elseif($desriptionMode == "item" && $item->description != ""){ }elseif($desriptionMode == "item" && $item->description != ""){
$description = " || " . str_replace("\"","&quot;",$item->description); $description = " || " . str_replace("\"","&quot;",$item->description);
}elseif (($desriptionMode == "parent" || $desriptionMode == "item") && $item->parent()->description != ""){ }elseif (($desriptionMode == "parent" || $desriptionMode == "item") && $item->parent()->description != ""){
$description = " || " . str_replace("\"","&quot;",$item->parent()->description); $description = " || " . str_replace("\"","&quot;",$item->parent()->description);
} }
$titleMode = module::get_var("theme_3nids", "title"); $titleMode = module::get_var("theme_3nids", "title");
if ($titleMode == "parent"){ if ($titleMode == "parent"){
$title = html::clean($item->parent()->title); $title = html::clean($item->parent()->title);
}else{ }else{
$title = html::clean($item->title); $title = html::clean($item->title);
} }
$rel = ""; $rel = "";
if ($groupImg == true) {$rel = " rel=\"fancygroup\" ";} if ($groupImg == true) {$rel = " rel=\"fancygroup\" ";}
if ($item->is_photo() || ($item->is_movie()) && module::is_active("theme_3nids")){ if ($item->is_photo() || ($item->is_movie()) && module::is_active("theme_3nids")){
$fancymodule = ""; $fancymodule = "";
if (module::is_active("exif")){ if (module::is_active("exif")){
$fancymodule .= "exif::" . url::site("exif/show/{$item->id}") . ";;";} $fancymodule .= "exif::" . url::site("exif/show/{$item->id}") . ";;";}
if (module::is_active("comment") && module::is_active("theme_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) . ";;" ;} $fancymodule .= "comment::" . url::site("comments_3nids?item_id={$item->id}") . ";;comment_count::" . comment_3nids::count($item) . ";;" ;}
if ($item->is_photo()){ if ($item->is_photo()){
$link .= "<a href=\"" . url::site("photo_3nids/show/{$item->id}") ."/?w=" . $width . "xewx&h=" . $height . "xehx\" " . $rel . " class=\"fancyclass iframe\" title=\"" . $title . $description ."\" name=\"" . $fancymodule . " \">"; $link .= "<a href=\"" . url::site("photo_3nids/show/{$item->id}") ."/?w=" . $width . "xewx&h=" . $height . "xehx\" " . $rel . " class=\"fancyclass iframe\" title=\"" . $title . $description ."\" name=\"" . $fancymodule . " \">";
}else{ }else{
$link .= "<a href=\"" . url::site("movie_3nids/show/{$item->id}") . "/?w=" . strval(20+($width)) . "xewx&h=" . strval(50+($height)) . "xehx\" " . $rel . " class=\"fancyclass iframe\" title=\"" . $item->parent()->title . $description ."\" name=\"" . $fancymodule . " \">"; $link .= "<a href=\"" . url::site("movie_3nids/show/{$item->id}") . "/?w=" . strval(20+($width)) . "xewx&h=" . strval(50+($height)) . "xehx\" " . $rel . " class=\"fancyclass iframe\" title=\"" . $item->parent()->title . $description ."\" name=\"" . $fancymodule . " \">";
} }
} elseif( $item->is_album() && $viewtype != "header"){ } elseif( $item->is_album() && $viewtype != "header"){
$link .= "<a href=\"" . $item->url() . "\">"; $link .= "<a href=\"" . $item->url() . "\">";
} }
if($viewtype != "header"){ if($viewtype != "header"){
$link .= $item->thumb_img(array("class" => "g-thumbnail")) . "</a>"; $link .= $item->thumb_img(array("class" => "g-thumbnail")) . "</a>";
if( $item->is_album() && $viewtype == "album" ){ if( $item->is_album() && $viewtype == "album" ){
$link .= "<a href=\"" . $item->url() . "?show=" . $item->id . "\"><$parentTitleClass><span></span>" . html::clean($item->title) . "</$parentTitleClass></a>"; $link .= "<a href=\"" . $item->url() . "?show=" . $item->id . "\"><$parentTitleClass><span></span>" . html::clean($item->title) . "</$parentTitleClass></a>";
} elseif ( !($item->is_album()) && $viewtype == "dynamic") { } elseif ( !($item->is_album()) && $viewtype == "dynamic") {
$link .= "<a href=\"" . $item->parent()->url() . "?show=" . $item->id . "\" class=\"g-parent-album\"><$parentTitleClass><span></span>" . html::clean($item->parent()->title) . "</$parentTitleClass></a>"; $link .= "<a href=\"" . $item->parent()->url() . "?show=" . $item->id . "\" class=\"g-parent-album\"><$parentTitleClass><span></span>" . html::clean($item->parent()->title) . "</$parentTitleClass></a>";
} }
if (($item->is_photo() || $item->is_movie()) && $displayComment==true && module::is_active("comment") && module::is_active("theme_3nids")) { if (($item->is_photo() || $item->is_movie()) && $displayComment==true && module::is_active("comment") && module::is_active("theme_3nids")) {
$link .= "<ul class=\"g-metadata\"><li><a href=\"" . url::site("comments_3nids?item_id={$item->id}") ."\" class=\"iframe fancyclass g-hidden\">" . comment_3nids::count($item) . " " . t("comments") . "</a></li></ul>"; $link .= "<ul class=\"g-metadata\"><li><a href=\"" . url::site("comments_3nids?item_id={$item->id}") ."\" class=\"iframe fancyclass g-hidden\">" . comment_3nids::count($item) . " " . t("comments") . "</a></li></ul>";
} }
}else{ }else{
$link .= "</a>"; $link .= "</a>";
} }
return $link; return $link;
} }
} }
?> ?>

View File

@ -1,26 +1,26 @@
<?php defined("SYSPATH") or die("No direct script access.");/** <?php defined("SYSPATH") or die("No direct script access.");/**
* Gallery - a web based photo album viewer and editor * Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2009 Bharat Mediratta * Copyright (C) 2000-2009 Bharat Mediratta
* *
* This program is free software; you can redistribute it and/or modify * 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 * 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 * the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version. * your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details. * General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
class theme_3nids_theme { class theme_3nids_theme {
static function credits($theme) { static function credits($theme) {
return "<a href=\"http://codex.gallery2.org/Gallery3:Themes:3nids\">3nids theme</a>"; return "<a href=\"http://codex.gallery2.org/Gallery3:Themes:3nids\">3nids theme</a>";
} }
} }