[themes] more consistent naming

core/themelet.php

@@ -28,11 +28,11 @@ private function get_common(): Themelet
         return self::$common;
     }
 
-    public function build_thumb_html(Image $image): HTMLElement
+    public function build_thumb(Image $image): HTMLElement
     {
         $c = self::get_common();
         assert(is_a($c, CommonElementsTheme::class));
-        return $c->build_thumb_html($image);
+        return $c->build_thumb($image);
     }
 
     public function display_paginator(Page $page, string $base, ?string $query, int $page_number, int $total_pages, bool $show_random = false): void

ext/artists/theme.php

@@ -411,7 +411,7 @@ public function show_artist(array $artist, array $aliases, array $members, array
         //we show the images for the artist
         $artist_images = "";
         foreach ($images as $image) {
-            $thumb_html = $this->build_thumb_html($image);
+            $thumb_html = $this->build_thumb($image);
 
             $artist_images .= '<span class="thumb">'.
                 '<a href="$image_link">'.$thumb_html.'</a>'.

ext/comment/theme.php

@@ -48,7 +48,7 @@ public function display_comment_list(array $images, int $page_number, int $total
             $image = $pair[0];
             $comments = $pair[1];
 
-            $thumb_html = $this->build_thumb_html($image);
+            $thumb_html = $this->build_thumb($image);
             $comment_html = "";
 
             $comment_count = count($comments);

ext/common_elements/theme.php

@@ -14,7 +14,7 @@ class CommonElementsTheme extends Themelet
      * Generic thumbnail code; returns HTML rather than adding
      * a block since thumbs tend to go inside blocks...
      */
-    public function build_thumb_html(Image $image): HTMLElement
+    public function build_thumb(Image $image): HTMLElement
     {
         global $config;
 

ext/image_view_counter/theme.php

@@ -16,7 +16,7 @@ public function view_popular(array $images): void
         global $page, $config;
         $pop_images = "";
         foreach ($images as $image) {
-            $pop_images .= $this->build_thumb_html($image) . "\n";
+            $pop_images .= $this->build_thumb($image) . "\n";
         }
 
         $page->set_title($config->get_string(SetupConfig::TITLE));

ext/index/theme.php

@@ -106,7 +106,7 @@ protected function build_table(array $images, ?string $query): HTMLElement
         $h_query = html_escape($query);
         $table = "<div class='shm-image-list' data-query='$h_query'>";
         foreach ($images as $image) {
-            $table .= $this->build_thumb_html($image);
+            $table .= $this->build_thumb($image);
         }
         $table .= "</div>";
         return rawHTML($table);

ext/notes/theme.php

@@ -80,7 +80,7 @@ public function display_note_list(array $images, int $pageNumber, int $totalPage
         global $page;
         $pool_images = '';
         foreach ($images as $image) {
-            $thumb_html = $this->build_thumb_html($image);
+            $thumb_html = $this->build_thumb($image);
 
             $pool_images .= '<span class="thumb">'.
                             '    <a href="$image_link">'.$thumb_html.'</a>'.
@@ -101,7 +101,7 @@ public function display_note_requests(array $images, int $pageNumber, int $total
 
         $pool_images = '';
         foreach ($images as $image) {
-            $thumb_html = $this->build_thumb_html($image);
+            $thumb_html = $this->build_thumb($image);
             $pool_images .= '<span class="thumb">'.
                             '    <a href="$image_link">'.$thumb_html.'</a>'.
                             '</span>';

ext/numeric_score/theme.php

@@ -72,7 +72,7 @@ public function view_popular(array $images, string $totaldate, string $current,
 
         $pop_images = "";
         foreach ($images as $image) {
-            $pop_images .= $this->build_thumb_html($image)."\n";
+            $pop_images .= $this->build_thumb($image)."\n";
         }
 
         $b_dte = make_link("popular_by_$name", date($fmt, \Safe\strtotime("-1 $name", \Safe\strtotime($totaldate))));

ext/pools/theme.php

@@ -152,7 +152,7 @@ public function view_pool(Pool $pool, array $images, int $pageNumber, int $total
 
         $image_list = DIV(["class" => "shm-image-list"]);
         foreach ($images as $image) {
-            $image_list->appendChild($this->build_thumb_html($image));
+            $image_list->appendChild($this->build_thumb($image));
         }
 
         $page->add_block(new Block("Viewing Posts", $image_list, "main", 30));
@@ -249,7 +249,7 @@ function confirm_action() {
         $image_list = DIV(["class" => "shm-image-list"]);
         foreach ($images as $image) {
             $image_list->appendChild(
-                SPAN(["class" => "thumb"], $this->build_thumb_html($image), BR(), INPUT(["type" => "checkbox", "name" => "check[]", "value" => $image->id])),
+                SPAN(["class" => "thumb"], $this->build_thumb($image), BR(), INPUT(["type" => "checkbox", "name" => "check[]", "value" => $image->id])),
             );
         }
         $form->appendChild($image_list);
@@ -280,7 +280,7 @@ public function edit_order(Page $page, Pool $pool, array $images): void
         foreach ($images as $i => $image) {
             $image_list->appendChild(SPAN(
                 ["class" => "thumb"],
-                $this->build_thumb_html($image),
+                $this->build_thumb($image),
                 INPUT(["type" => "number", "name" => "order_{$image->id}", "value" => $image['image_order'], "style" => "max-width: 50px;"]),
             ));
         }
@@ -315,7 +315,7 @@ public function edit_pool(Page $page, Pool $pool, array $images): void
         foreach ($images as $image) {
             $image_list->appendChild(SPAN(
                 ["class" => "thumb"],
-                $this->build_thumb_html($image),
+                $this->build_thumb($image),
                 INPUT(["type" => "checkbox", "name" => "check[]", "value" => $image->id])
             ));
         }

ext/random_image/main.php

@@ -31,7 +31,7 @@ public function onPageRequest(PageRequestEvent $event): void
             } elseif ($action === "widget") {
                 $page->set_mode(PageMode::DATA);
                 $page->set_mime(MimeType::HTML);
-                $page->set_data($this->theme->build_thumb_html($image));
+                $page->set_data($this->theme->build_thumb($image));
             }
         }
     }

ext/random_list/theme.php

@@ -33,7 +33,7 @@ public function display_page(Page $page, array $images): void
             $html .= "<div class='shm-image-list'>";
 
             foreach ($images as $image) {
-                $html .= $this->build_thumb_html($image);
+                $html .= $this->build_thumb($image);
             }
 
             $html .= "</div>";

ext/regen_thumb/theme.php

@@ -16,7 +16,7 @@ public function display_results(Page $page, Image $image): void
         $page->set_title("Thumbnail Regenerated");
         $page->add_html_header(META(['http-equiv' => 'cache-control', 'content' => 'no-cache']));
         $page->add_block(new NavBlock());
-        $page->add_block(new Block("Thumbnail", $this->build_thumb_html($image)));
+        $page->add_block(new Block("Thumbnail", $this->build_thumb($image)));
     }
 
     public function bulk_html(): string

ext/relationships/theme.php

@@ -102,12 +102,12 @@ private function get_parent_thumbnail_html(Image $image): HTMLElement
         $parent_id = $image['parent_id'];
         $parent_image = Image::by_id_ex($parent_id);
 
-        return $this->build_thumb_html($parent_image);
+        return $this->build_thumb($parent_image);
     }
 
     private function get_child_thumbnail_html(Image $image): HTMLElement
     {
-        return $this->build_thumb_html($image);
+        return $this->build_thumb($image);
     }
 
     private function get_sibling_thumbnail_html(Image $image): string
@@ -116,7 +116,7 @@ private function get_sibling_thumbnail_html(Image $image): string
         $html = "";
 
         foreach ($siblings as $sibling) {
-            $html .= $this->build_thumb_html($sibling);
+            $html .= $this->build_thumb($sibling);
         }
 
         return $html;

ext/replace_file/theme.php

@@ -26,7 +26,7 @@ public function display_replace_page(Page $page, int $image_id): void
         $max_kb = to_shorthand_int($max_size);
 
         $image = Image::by_id_ex($image_id);
-        $thumbnail = $this->build_thumb_html($image);
+        $thumbnail = $this->build_thumb($image);
 
         $form = SHM_FORM("replace/".$image_id, multipart: true);
         $form->appendChild(emptyHTML(

ext/report_image/theme.php

@@ -22,7 +22,7 @@ public function display_reported_images(Page $page, array $reports): void
         foreach ($reports as $report) {
             $image = $report['image'];
             $h_reason = format_text($report['reason']);
-            $image_link = $this->build_thumb_html($image);
+            $image_link = $this->build_thumb($image);
 
             $reporter_name = html_escape($report['reporter_name']);
             $userlink = "<a href='".make_link("user/$reporter_name")."'>$reporter_name</a>";

ext/rss_images/main.php

@@ -120,7 +120,7 @@ private function thumb(Image $image): string
         $posted = date(DATE_RSS, \Safe\strtotime($image->posted));
         $content = html_escape(
             "<div>" .
-            "<p>" . $this->theme->build_thumb_html($image) . "</p>" .
+            "<p>" . $this->theme->build_thumb($image) . "</p>" .
             "</div>"
         );
 

themes/danbooru/comment.theme.php

@@ -43,7 +43,7 @@ public function display_comment_list(array $images, int $page_number, int $total
             $image = $pair[0];
             $comments = $pair[1];
 
-            $thumb_html = $this->build_thumb_html($image);
+            $thumb_html = $this->build_thumb($image);
 
             $s = "   ";
             $un = $image->get_owner()->name;

themes/danbooru/index.theme.php

@@ -65,7 +65,7 @@ protected function build_table(array $images, ?string $query): HTMLElement
         $h_query = html_escape($query);
         $table = "<div class='shm-image-list' data-query='$h_query'>";
         foreach ($images as $image) {
-            $table .= $this->build_thumb_html($image) . "\n";
+            $table .= $this->build_thumb($image) . "\n";
         }
         $table .= "</div>";
         return rawHTML($table);

themes/danbooru2/comment.theme.php

@@ -43,7 +43,7 @@ public function display_comment_list(array $images, int $page_number, int $total
             $image = $pair[0];
             $comments = $pair[1];
 
-            $thumb_html = $this->build_thumb_html($image);
+            $thumb_html = $this->build_thumb($image);
 
             $s = "   ";
             $un = $image->get_owner()->name;

themes/danbooru2/index.theme.php

@@ -53,7 +53,7 @@ protected function build_table(array $images, ?string $query): HTMLElement
         $h_query = html_escape($query);
         $table = "<div class='shm-image-list' data-query='$h_query'>";
         foreach ($images as $image) {
-            $table .= $this->build_thumb_html($image) . "\n";
+            $table .= $this->build_thumb($image) . "\n";
         }
         $table .= "</div>";
         return rawHTML($table);

themes/futaba/comment.theme.php

@@ -53,7 +53,7 @@ public function display_comment_list(array $images, int $page_number, int $total
             $html .= "File: <a href=\"".make_link("post/view/{$image->id}")."\">$h_filename</a> - ($h_filesize, {$w}x{$h}) - ";
             $html .= html_escape($image->get_tag_list());
             $html .= "<div style='text-align: left'>";
-            $html .=   "<div style='float: left;'>" . $this->build_thumb_html($image) . "</div>";
+            $html .=   "<div style='float: left;'>" . $this->build_thumb($image) . "</div>";
             $html .=   "<div class='commentset'>$comment_html</div>";
             $html .= "</div>";