From bb828644baa9909f9277295996a83d5f2739c921 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Wed, 13 Dec 2006 21:02:01 +0000
Subject: [PATCH]  xhtml and accessibility cleanup in data mod MDL-7813 *
 buttons reorganized - now displayed only with templates where usable

---
 mod/data/lib.php                                 | 4 +++-
 mod/data/preset/imagegallery/listtemplate.html   | 2 +-
 mod/data/preset/imagegallery/singletemplate.html | 2 +-
 mod/data/templates.php                           | 9 ++++++---
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/mod/data/lib.php b/mod/data/lib.php
index fa308e9606..105d601960 100755
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -358,8 +358,10 @@ function data_generate_default_template(&$data, $template, $recordid=0, $form=fa
             $str .= '</td></tr>';
 
         }
-        if ($template != 'addtemplate' and $template != 'rsstemplate') {    //if not adding, we put tags in there
+        if ($template == 'listtemplate') {
             $str .= '<tr><td align="center" colspan="2">##edit##  ##more##  ##delete##  ##approve##</td></tr>';
+        } else if ($template == 'singletemplate') {
+            $str .= '<tr><td align="center" colspan="2">##edit##  ##delete##  ##approve##</td></tr>';
         }
 
         $str .= '</table>';
diff --git a/mod/data/preset/imagegallery/listtemplate.html b/mod/data/preset/imagegallery/listtemplate.html
index 73737e1b1f..8684de7403 100644
--- a/mod/data/preset/imagegallery/listtemplate.html
+++ b/mod/data/preset/imagegallery/listtemplate.html
@@ -2,7 +2,7 @@
 <table class="pictureframe"><tr><td>
 <table class="picture">
 <tr><td><div class="listimage">[[image]]</div></td></tr>
-<tr><td align="right">##edit## ##delete## ##approve##</td></tr>
+<tr><td align="right">##more## ##edit## ##delete## ##approve##</td></tr>
 </table>
 </td></tr></table>
 </div>
diff --git a/mod/data/preset/imagegallery/singletemplate.html b/mod/data/preset/imagegallery/singletemplate.html
index 539ec5a01f..fd682c76d2 100644
--- a/mod/data/preset/imagegallery/singletemplate.html
+++ b/mod/data/preset/imagegallery/singletemplate.html
@@ -3,6 +3,6 @@
 <tr><td align="center"><h3>[[title]]</h3></td></tr>
 <tr><td align="center"><div id="singleimage">[[image]]</div></td></tr>
 <tr><td align="center"><span class="caption">[[caption]]</span></td></tr>
-<tr><td align="center">##edit##  ##more##  ##delete##  ##approve##</td></tr>
+<tr><td align="center">##edit##  ##delete##  ##approve##</td></tr>
 </table>
 </div>
\ No newline at end of file
diff --git a/mod/data/templates.php b/mod/data/templates.php
index d87be18732..37bccb3b6c 100755
--- a/mod/data/templates.php
+++ b/mod/data/templates.php
@@ -220,12 +220,15 @@
         if ($mode != 'addtemplate') {
             echo '<optgroup label="'.get_string('buttons', 'data').'">';
             echo '<option value="##edit##">' .get_string('edit', 'data'). ' - ##edit##</option>';
-            echo '<option value="##more##">' .get_string('more', 'data'). ' - ##more##</option>';
-            echo '<option value="##moreurl##">' .get_string('moreurl', 'data'). ' - ##moreurl##</option>';
             echo '<option value="##delete##">' .get_string('delete', 'data'). ' - ##delete##</option>';
             echo '<option value="##approve##">' .get_string('approve', 'data'). ' - ##approve##</option>';
-            echo '<option value="##comments##">' .get_string('comments', 'data'). ' - ##comments##</option>';
             echo '<option value="##user##">' .get_string('user'). ' - ##user##</option>';
+            if ($mode != 'singletemplate') {
+                // more points to single template - not useable there 
+                echo '<option value="##more##">' .get_string('more', 'data'). ' - ##more##</option>';
+                echo '<option value="##moreurl##">' .get_string('moreurl', 'data'). ' - ##moreurl##</option>';
+                echo '<option value="##comments##">' .get_string('comments', 'data'). ' - ##comments##</option>';
+            }
             echo '</optgroup>';
         }
         echo '</select>';
-- 
2.39.5