[geeklog-cvs] geeklog: In the topic editor, display the max. size of the topic...

[geeklog-cvs at lists.geeklog.net]

changeset 7600:566c5d651197
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/566c5d651197
user: Dirk Haun <dirk at haun-online.de>
date: Sat Jan 16 20:31:34 2010 +0100
description:
In the topic editor, display the max. size of the topic icon and whether it will be scaled down (borrowed from usersettings)

diffstat:

 public_html/admin/topic.php                                   |  17 ++++++++++++++---
 public_html/docs/english/theme.html                           |   3 +++
 public_html/layout/professional/admin/topic/topiceditor.thtml |   2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diffs (70 lines):

diff -r a14252ca181c -r 566c5d651197 public_html/admin/topic.php
--- a/public_html/admin/topic.php	Sat Jan 16 19:51:24 2010 +0100
+++ b/public_html/admin/topic.php	Sat Jan 16 20:31:34 2010 +0100
@@ -8,7 +8,7 @@
 // |                                                                           |
 // | Geeklog topic administration page.                                        |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2009 by the following authors:                         |
+// | Copyright (C) 2000-2010 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
 // |          Mark Limburg      - mlimburg AT users DOT sourceforge DOT net    |
@@ -77,7 +77,7 @@
 */
 function edittopic ($tid = '')
 {
-    global $_CONF, $_GROUPS, $_TABLES, $_USER, $LANG27, $LANG_ACCESS,
+    global $_CONF, $_GROUPS, $_TABLES, $_USER, $LANG04, $LANG27, $LANG_ACCESS,
            $LANG_ADMIN, $MESSAGE;
 
     $retval = '';
@@ -188,11 +188,22 @@
     }
     $topic_templates->set_var('lang_topicimage', $LANG27[4]);
     $topic_templates->set_var('lang_uploadimage', $LANG27[27]);
-    $topic_templates->set_var('icon_dimensions', $_CONF['max_topicicon_width'].' x '.$_CONF['max_topicicon_height']);
     $topic_templates->set_var('lang_maxsize', $LANG27[28]);
+    $topic_templates->set_var('icon_dimensions',
+        $_CONF['max_topicicon_width'] . ' x ' . $_CONF['max_topicicon_height']);
     $topic_templates->set_var('max_url_length', 255);
     $topic_templates->set_var('image_url', $A['imageurl']);
 
+    if (empty($_CONF['image_lib'])) {
+        $scaling = $LANG04[162];
+    } else {
+        $scaling = $LANG04[161];
+    }
+    $topic_templates->set_var('icon_max_dimensions',
+        sprintf($LANG04[160], $_CONF['max_topicicon_width'],
+                              $_CONF['max_topicicon_height'],
+                              $_CONF['max_topicicon_size'], $scaling));
+
     $topic_templates->set_var('lang_metadescription',
                               $LANG_ADMIN['meta_description']);
     $topic_templates->set_var('lang_metakeywords',
diff -r a14252ca181c -r 566c5d651197 public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Sat Jan 16 19:51:24 2010 +0100
+++ b/public_html/docs/english/theme.html	Sat Jan 16 20:31:34 2010 +0100
@@ -198,6 +198,9 @@
 <h2><a name="changes">Theme changes in Geeklog 1.6.2</a></h2>
 
 <ul>
+<li>In the topic editor template, <tt>admin/topic/topiceditor.thtml</tt>,
+    display the max. size of the topic icon and whether it will be scaled down
+    (new variable <code>{icon_max_dimensions}</code>).</li>
 <li>A new option in My Account allows users to enable/disable the Advanced
     Editor. Requires a new template variable <tt>{advanced_editor_option}</tt>
     in <tt>preferences/displayblock.thtml</tt> and a new template file
diff -r a14252ca181c -r 566c5d651197 public_html/layout/professional/admin/topic/topiceditor.thtml
--- a/public_html/layout/professional/admin/topic/topiceditor.thtml	Sat Jan 16 19:51:24 2010 +0100
+++ b/public_html/layout/professional/admin/topic/topiceditor.thtml	Sat Jan 16 20:31:34 2010 +0100
@@ -22,7 +22,7 @@
                                     </tr>
                                     <tr>
                                         <td class="alignright">{lang_uploadimage}:</td>
-                                        <td><input type="file" name="newicon"{xhtml}> ({lang_maxsize} {icon_dimensions})</td>
+                                        <td><input type="file" name="newicon"{xhtml}> {icon_max_dimensions}</td>
                                     </tr>
                                     <tr{hide_meta}>
                                         <td valign="top" align="right">{lang_metadescription}:</td>