Deleting some inline styles and unused code. MDL-8746

Merged from MOODLE_18_STABLE

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 1f3bb88093186eca6982709d79b10221305b8d0a..394deeed32e0a9215f6c86801d8aa0d2da54e29f 100644 (file)
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -1211,7 +1211,7 @@ function glossary_print_tabbed_table_end() {
 
 function glossary_print_approval_menu($cm, $glossary,$mode, $hook, $sortkey = '', $sortorder = '') {
     if ($glossary->showalphabet) {
-        echo '<div style="text-align:center">' . get_string("explainalphabet","glossary") . '</div><br />';
+        echo '<div class="glossaryexplain">' . get_string("explainalphabet","glossary") . '</div><br />';
     }
     glossary_print_special_links($cm, $glossary, $mode, $hook);
 
@@ -1222,22 +1222,18 @@ function glossary_print_approval_menu($cm, $glossary,$mode, $hook, $sortkey = ''
     glossary_print_sorting_links($cm, $mode, 'CREATION', 'asc');
 }
 
-function glossary_print_addentry_menu($cm, $glossary, $mode, $hook, $sortkey='', $sortorder = '') {
-    echo '<div style="text-align:center">' . get_string("explainaddentry","glossary") . '</div><br />';
-}
-
 function glossary_print_import_menu($cm, $glossary, $mode, $hook, $sortkey='', $sortorder = '') {
-    echo '<div style="text-align:center">' . get_string("explainimport","glossary") . '</div><br />';
+    echo '<div class="glossaryexplain">' . get_string("explainimport","glossary") . '</div>';
 }
 
 function glossary_print_export_menu($cm, $glossary, $mode, $hook, $sortkey='', $sortorder = '') {
-    echo '<div style="text-align:center">' . get_string("explainexport","glossary") . '</div><br />';
+    echo '<div class="glossaryexplain">' . get_string("explainexport","glossary") . '</div>';
 }
 
 function glossary_print_alphabet_menu($cm, $glossary, $mode, $hook, $sortkey='', $sortorder = '') {
     if ( $mode != 'date' ) {
         if ($glossary->showalphabet) {
-            echo '<div style="text-align:center">' . get_string("explainalphabet","glossary") . '</div><br />';
+            echo '<div class="glossaryexplain">' . get_string("explainalphabet","glossary") . '</div><br />';
         }
 
         glossary_print_special_links($cm, $glossary, $mode, $hook);
@@ -1252,12 +1248,12 @@ function glossary_print_alphabet_menu($cm, $glossary, $mode, $hook, $sortkey='',
 
 function glossary_print_author_menu($cm, $glossary,$mode, $hook, $sortkey = '', $sortorder = '') {
     if ($glossary->showalphabet) {
-        echo '<div style="text-align:center">' . get_string("explainalphabet","glossary") . '</div><br />';
+        echo '<div class="glossaryexplain">' . get_string("explainalphabet","glossary") . '</div><br />';
     }
 
-    glossary_print_sorting_links($cm, $mode, $sortkey,$sortorder);
     glossary_print_alphabet_links($cm, $glossary, $mode, $hook, $sortkey, $sortorder);
     glossary_print_all_links($cm, $glossary, $mode, $hook);
+    glossary_print_sorting_links($cm, $mode, $sortkey,$sortorder);
 }
 
 function glossary_print_categories_menu($cm, $glossary, $hook, $category) {

diff --git a/mod/glossary/tabs.php b/mod/glossary/tabs.php
index de601d6d4f562d1c4de2b187e895dcd5c7b716a0..8bc62c794f91426cd9e21919d1c6c8e3fc5ca527 100644 (file)
--- a/mod/glossary/tabs.php
+++ b/mod/glossary/tabs.php
@@ -97,11 +97,6 @@
         case GLOSSARY_APPROVAL_VIEW:
             glossary_print_approval_menu($cm, $glossary, $mode, $hook, $sortkey, $sortorder);
         break;
-        case GLOSSARY_ADDENTRY_VIEW:
-            $search = "";
-            $l = "";
-            glossary_print_addentry_menu($cm, $glossary, $mode, $hook, $sortkey, $sortorder);
-        break;
         case GLOSSARY_AUTHOR_VIEW:
             $search = "";
             glossary_print_author_menu($cm, $glossary, "author", $hook, $sortkey, $sortorder, 'print');