X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl-cms.git;a=blobdiff_plain;f=admin_pages.php;h=584aaa0798059210e6dd55c9a2ae9bba4c606b0b;hp=9c7f56aa224e9b3d22ed410ff71e7a6f2405a122;hb=3ed0f0b53ff1b3ea3e30292bf39eb6e30935e9eb;hpb=40e5acacf037bc97c69e25aeae2bfbf14f77c7ec diff --git a/admin_pages.php b/admin_pages.php index 9c7f56a..584aaa0 100644 --- a/admin_pages.php +++ b/admin_pages.php @@ -75,22 +75,18 @@ function admin_pages_main_delete($id) { # get all images from admin_images (for cms) function admin_pages_get_images() { $out = []; - $rows = db_get_assocs('cms_images', 'image,name,caption,sizes', 'order by name, caption, image'); + $rows = db_get_assocs('cms_images', 'image,name,caption', "order by coalesce(nullif(name, ''), caption), created_at"); if ($rows) { - $id = 0; - foreach($rows as &$row) { + $id = -1; + foreach($rows as &$row) { $id += 1; $parts = explode(' ', $row['image'] . ' ', 7); $out[] = [ 'id' => '' . $id, - 'thumb' => $parts[3], - 'image' => $parts[0], - 'image_width' => (int)$parts[1], - 'image_height' => (int)$parts[2], - 'sizes' => $row['sizes'], + 'src' => $parts[0], + 'aspect' => ''.(round(100000 * ((int)$parts[2]) / ((int)$parts[1]) / 1000)).'%', 'name' => $row['name'], 'caption' => $row['caption'] ]; - $id += 1; } unset($row); } return $out; @@ -172,6 +168,9 @@ function admin_pages_main_form($id = false) { } tem_set('wfpl_images_json', json_encode(admin_pages_get_images())); + tem_set('wfpl_image_width_full', WFPL_IMAGE_WIDTH_FULL); + tem_set('wfpl_image_width_small', WFPL_IMAGE_WIDTH_SMALL); + tem_set('wfpl_image_width_thumb', WFPL_IMAGE_WIDTH_THUMB); tem_set('form', $data); tem_set('$head'); # wysiwyg init goes in }