[geeklog-cvs] geeklog: Hide meta tag entry fields from the Story editors when ...

[geeklog-cvs at lists.geeklog.net]

changeset 7510:fd75c85d005a
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/fd75c85d005a
user: Dirk Haun <dirk at haun-online.de>
date: Mon Nov 30 12:15:48 2009 +0100
description:
Hide meta tag entry fields from the Story editors when meta tag support is disabled

diffstat:

 public_html/admin/story.php                                            |  5 +++++
 public_html/docs/english/theme.html                                    |  5 +++++
 public_html/docs/history                                               |  4 ++--
 public_html/layout/professional/admin/story/storyeditor.thtml          |  4 ++--
 public_html/layout/professional/admin/story/storyeditor_advanced.thtml |  4 ++--
 5 files changed, 16 insertions(+), 6 deletions(-)

diffs (78 lines):

diff -r 1d014c213404 -r fd75c85d005a public_html/admin/story.php
--- a/public_html/admin/story.php	Mon Nov 30 11:56:03 2009 +0100
+++ b/public_html/admin/story.php	Mon Nov 30 12:15:48 2009 +0100
@@ -551,6 +551,11 @@
     $story_templates->set_var('meta_description', $story->EditElements('meta_description'));
     $story_templates->set_var('lang_metakeywords', $LANG_ADMIN['meta_keywords']);
     $story_templates->set_var('meta_keywords', $story->EditElements('meta_keywords'));    
+    if ($_CONF['meta_tags'] > 0) {
+        $story_templates->set_var('hide_meta', '');
+    } else {
+        $story_templates->set_var('hide_meta', ' style="display:none;"');
+    }
     $story_templates->set_var('lang_topic', $LANG_ADMIN['topic']);
     if(empty($currenttopic) && ($story->EditElements('tid') == '')) {
         $story->setTid(DB_getItem($_TABLES['topics'], 'tid',
diff -r 1d014c213404 -r fd75c85d005a public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Mon Nov 30 11:56:03 2009 +0100
+++ b/public_html/docs/english/theme.html	Mon Nov 30 12:15:48 2009 +0100
@@ -198,6 +198,11 @@
 <h2><a name="changes">Theme changes in Geeklog 1.6.2</a></h2>
 
 <ul>
+<li>New variable <code>{hide_meta}</code> in the Story editor templates,
+    <tt>admin/topic/storyeditor.thtml</tt> and
+    <tt>admin/topic/storyeditor_advanced.thtml</tt>, to hide the text entry
+    fields for the meta description and meta keywords when meta tag support is
+    disabled.</li>
 <li>New variable <code>{hide_meta}</code> in the Topic editor template,
     <tt>admin/topic/topiceditor.thtml</tt>, to hide the text entry fields for
     the meta description and meta keywords when meta tag support is
diff -r 1d014c213404 -r fd75c85d005a public_html/docs/history
--- a/public_html/docs/history	Mon Nov 30 11:56:03 2009 +0100
+++ b/public_html/docs/history	Mon Nov 30 12:15:48 2009 +0100
@@ -3,8 +3,8 @@
 ??? ??, 20?? (1.6.2)
 ------------
 
-- Hide meta tag entry fields from Topic editor when meta tag support is
-  disabled [Dirk]
+- Hide meta tag entry fields from the Story and Topic editors when meta tag
+  support is disabled [Dirk]
 - Fixed topic selection for the Daily Digest (bug #0001041, patch provided by
   Ben)
 - Changed the 'menu_elements' and 'notification' config options to dropdowns
diff -r 1d014c213404 -r fd75c85d005a public_html/layout/professional/admin/story/storyeditor.thtml
--- a/public_html/layout/professional/admin/story/storyeditor.thtml	Mon Nov 30 11:56:03 2009 +0100
+++ b/public_html/layout/professional/admin/story/storyeditor.thtml	Mon Nov 30 12:15:48 2009 +0100
@@ -181,11 +181,11 @@
                                         <td class="alignright" style="vertical-align:top;">{lang_sid}:</td>
                                         <td><input type="text" dir="ltr" size="40" maxlength="40" name="sid" value="{story_id}"{xhtml}></td>
                                     </tr>
-                                    <tr>
+                                    <tr{hide_meta}>
                                         <td valign="top" align="right">{lang_metadescription}:</td>
                                         <td><textarea name="meta_description" style="width:100%" rows="2">{meta_description}</textarea></td>
                                     </tr>
-                                    <tr>
+                                    <tr{hide_meta}>
                                         <td valign="top" align="right">{lang_metakeywords}:</td>
                                         <td><textarea name="meta_keywords" style="width:100%" rows="2">{meta_keywords}</textarea></td>
                                     </tr>                                        
diff -r 1d014c213404 -r fd75c85d005a public_html/layout/professional/admin/story/storyeditor_advanced.thtml
--- a/public_html/layout/professional/admin/story/storyeditor_advanced.thtml	Mon Nov 30 11:56:03 2009 +0100
+++ b/public_html/layout/professional/admin/story/storyeditor_advanced.thtml	Mon Nov 30 12:15:48 2009 +0100
@@ -31,11 +31,11 @@
                 <td class="alignright" style="vertical-align:top;">{lang_sid}:</td>
                 <td><input type="text" dir="ltr" size="48" maxlength="40" name="sid" value="{story_id}"{xhtml}></td>
             </tr>
-            <tr>
+            <tr{hide_meta}>
                 <td valign="top" align="right">{lang_metadescription}:</td>
                 <td><textarea name="meta_description" style="width:100%" rows="2">{meta_description}</textarea></td>
             </tr>
-            <tr>
+            <tr{hide_meta}>
                 <td valign="top" align="right">{lang_metakeywords}:</td>
                 <td><textarea name="meta_keywords" style="width:100%" rows="2">{meta_keywords}</textarea></td>
             </tr>