diff --git a/themes/3nids_theme/3nids/css/3nids.css b/themes/3nids_theme/3nids/css/3nids.css index 68d8b627..80d02c25 100755 --- a/themes/3nids_theme/3nids/css/3nids.css +++ b/themes/3nids_theme/3nids/css/3nids.css @@ -43,3 +43,12 @@ text-align: left; margin-top: 30px; } + +.g-block-content .g-parent-album h4 span { + background: transparent url('../images/ico-album.png') no-repeat top left; + display: inline-block; + height: 16px; + margin-right: 5px; + width: 16px; +} + diff --git a/themes/3nids_theme/3nids/css/screen.css b/themes/3nids_theme/3nids/css/screen.css index 4e4b24e5..0400e898 100755 --- a/themes/3nids_theme/3nids/css/screen.css +++ b/themes/3nids_theme/3nids/css/screen.css @@ -370,14 +370,6 @@ li.g-error select { background-color: #484848; } -#g-image-block .g-parent-album h4 span { - background: transparent url('../images/ico-album.png') no-repeat top left; - display: inline-block; - height: 16px; - margin-right: 5px; - width: 16px; -} - #g-content #g-album-grid .g-album h2 span { background: transparent url('../images/ico-album.png') no-repeat top left; display: inline-block; diff --git a/themes/3nids_theme/3nids/views/image_block_block.html.php b/themes/3nids_theme/3nids/views/image_block_block.html.php index 1a8400d0..103be25d 100755 --- a/themes/3nids_theme/3nids/views/image_block_block.html.php +++ b/themes/3nids_theme/3nids/views/image_block_block.html.php @@ -1,17 +1,3 @@ - -id}") . ";;";} ?> -id}") . ";;comment_count::" . comment_3nids::count($item) . ";;" ;} ?> - -
- - thumb_img(array("class" => "g-thumbnail")) ?> - - - -
-

parent()->title ?>

 -
-
- + diff --git a/themes/3nids_theme/last_commit.txt b/themes/3nids_theme/last_commit.txt index 5ee23da2..eef64fe9 100755 --- a/themes/3nids_theme/last_commit.txt +++ b/themes/3nids_theme/last_commit.txt @@ -1 +1 @@ -Context menu of videos and photos inside the Lightbox theme! \ No newline at end of file +Update image block \ No newline at end of file diff --git a/themes/3nids_theme/modules/theme_3nids/helpers/theme_3nids.php b/themes/3nids_theme/modules/theme_3nids/helpers/theme_3nids.php index c8e921dd..5efd33f4 100755 --- a/themes/3nids_theme/modules/theme_3nids/helpers/theme_3nids.php +++ b/themes/3nids_theme/modules/theme_3nids/helpers/theme_3nids.php @@ -25,12 +25,13 @@ */ class theme_3nids_Core { - public function fancylink($item, $viewtype="album") { + public function fancylink($item, $viewtype="album", $groupImg = true, $displayComment = true, $parentTitleClass = "h2") { //viewtype = album || dynamic || header $link = ""; access::required("view", $item); - + $rel = ""; + if ($groupImg == true) {$rel = " rel=\"fancygroup\" ";} if ($item->is_photo() || ($item->is_movie()) && module::is_active("theme_3nids")){ $fancymodule = ""; @@ -39,9 +40,9 @@ class theme_3nids_Core { 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) . ";;" ;} if ($item->is_photo()){ - $link .= "id}") ."/?w=" . $item->width . "xewx&h=" . $item->height . "xehx\" rel=\"fancygroup\" class=\"fancyclass iframe\" title=\"" . $item->parent()->title .", " . $item->parent()->description ."\" name=\"" . $fancymodule . " \">"; + $link .= "id}") ."/?w=" . $item->width . "xewx&h=" . $item->height . "xehx\" " . $rel . " class=\"fancyclass iframe\" title=\"" . $item->parent()->title .", " . $item->parent()->description ."\" name=\"" . $fancymodule . " \">"; }else{ - $link .= "id}") . "/?w=" . strval(20+($item->width)) . "xewx&h=" . strval(50+($item->height)) . "xehx\" rel=\"fancygroup\" class=\"fancyclass iframe\" title=\"" . $item->parent()->title .", " . $item->parent()->description ."\" name=\"" . $fancymodule . " \">"; + $link .= "id}") . "/?w=" . strval(20+($item->width)) . "xewx&h=" . strval(50+($item->height)) . "xehx\" " . $rel . " class=\"fancyclass iframe\" title=\"" . $item->parent()->title .", " . $item->parent()->description ."\" name=\"" . $fancymodule . " \">"; } } elseif( $item->is_album() && $viewtype != "header"){ $link .= "url() . "\">"; @@ -50,13 +51,13 @@ class theme_3nids_Core { if($viewtype != "header"){ $link .= $item->thumb_img(array("class" => "g-thumbnail")) . ""; if( $item->is_album() && $viewtype == "album" ){ - $link .= "url() . "?show=" . $item->id . "\">

" . html::clean($item->title) . "

"; + $link .= "url() . "?show=" . $item->id . "\"><$parentTitleClass>" . html::clean($item->title) . ""; } elseif ( !($item->is_album()) && $viewtype == "dynamic") { - $link .= "parent()->url() . "?show=" . $item->id . "\">

" . html::clean($item->parent()->title) . "

"; + $link .= "parent()->url() . "?show=" . $item->id . "\" class=\"g-parent-album\"><$parentTitleClass>" . html::clean($item->parent()->title) . ""; } - if (($item->is_photo() || $item->is_movie()) && module::is_active("comment") && module::is_active("theme_3nids")) { - $link .= ""; + if (($item->is_photo() || $item->is_movie()) && $displayComment==true && module::is_active("comment") && module::is_active("theme_3nids")) { + $link .= ""; } }else{ $link .= "";