MDL-12215 made the advanced search tab more consistent with the interface

diff --git a/lang/en_utf8/data.php b/lang/en_utf8/data.php
index 4696f6ad2a4f38ea7d4893c1cc9dd709c9b91a6a..2a6764133321ac5d50df6f7ef9b27925716ef001 100644 (file)
--- a/lang/en_utf8/data.php
+++ b/lang/en_utf8/data.php
@@ -7,14 +7,14 @@ $string['add'] = 'Add entry';
 $string['addafield'] = 'Add a field';
 $string['addcomment'] = 'Add comment';
 $string['addentries'] = 'Add entries';
-$string['advancedsearch'] = 'Advanced Search';
 $string['addtemplate'] = 'Add template';
+$string['advancedsearch'] = 'Advanced search';
 $string['allowcomments'] = 'Allow comments?';
 $string['allowratings'] = 'Allow posts to be rated?';
 $string['alttext'] = 'Alternative text';
 $string['approve'] = 'Approve';
 $string['ascending'] = 'Ascending';
-$string['asearchtemplate'] = 'Advanced Search Template';
+$string['asearchtemplate'] = 'Advanced search template';
 $string['atmaxentry'] = 'You have entered the maximum number of entries allowed!';
 $string['autogenallforms'] = 'Generate all default templates';
 $string['autolinkurl'] = 'Autolink the URL';
@@ -210,6 +210,7 @@ $string['saveaspreset'] = 'Save as preset';
 $string['savesettings'] = 'Save settings';
 $string['savesuccess'] = 'Saved successfully. Your preset will now be available across the site.';
 $string['savetemplate'] = 'Save template';
+$string['search'] = 'Search';
 $string['sendinratings'] = 'Send in my latest ratings';
 $string['single'] = 'View single';
 $string['singletemplate'] = 'Single template';

diff --git a/mod/data/tabs.php b/mod/data/tabs.php
index 860bb807cf7ac02f94d9ce41b31a871692ebc7e2..75c59b4f290fc943e04bd596cc46bc488014afb5 100755 (executable)
--- a/mod/data/tabs.php
+++ b/mod/data/tabs.php
@@ -38,15 +38,15 @@
 
     $row[] = new tabobject('list', $CFG->wwwroot.'/mod/data/view.php?d='.$data->id, get_string('list','data'));
     
-    //Add an advanced search tab.
-    $row[] = new tabobject('asearch', $CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&mode=asearch', get_string('advancedsearch', 'data'));
-    
     if (isset($record)) {
         $row[] = new tabobject('single', $CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&rid='.$record->id, get_string('single','data'));
     } else {
         $row[] = new tabobject('single', $CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&mode=single', get_string('single','data'));
     }
 
+    // Add an advanced search tab.
+    $row[] = new tabobject('asearch', $CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&mode=asearch', get_string('search', 'data'));
+
     if (isloggedin()) {
         if (data_user_can_add_entry($data, $currentgroup, $groupmode)) { // took out participation list here!
             $addstring = empty($editentry) ? get_string('add', 'data') : get_string('editentry', 'data');
@@ -57,8 +57,8 @@
                 $defaultemplate = 'listtemplate';
             } else if ($currenttab == 'add') {
                 $defaultemplate = 'addtemplate';
-                       } else if ($currenttab == 'asearch') {
-                               $defaultemplate = 'asearchtemplate';
+            } else if ($currenttab == 'asearch') {
+                $defaultemplate = 'asearchtemplate';
             } else {
                 $defaultemplate = 'singletemplate';
             }
@@ -78,7 +78,7 @@
 
         $inactive = array();
         $inactive[] = 'templates';
-        $templatelist = array ('listtemplate', 'asearchtemplate' , 'singletemplate', 'addtemplate', 'rsstemplate', 'csstemplate', 'jstemplate');
+        $templatelist = array ('listtemplate', 'singletemplate', 'asearchtemplate', 'addtemplate', 'rsstemplate', 'csstemplate', 'jstemplate');
 
         $row  = array();
         $currenttab ='';