remove last vestiges of NOTMARC mode

MARC, the metadata exchange format for the 20th century!

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc
index d834de9..1b0158b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc
@@ -16,10 +16,6 @@
 
        function yuiToolbar() {
        
-    <!-- TMPL_IF NAME="NOTMARC" -->
-           new YAHOO.widget.Button("newrecord");
-       <!-- TMPL_ELSE -->
-       
                var newmenu = [
                        { text: _("Default Framework"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=" },
                        <!-- TMPL_LOOP NAME="frameworkcodeloop" -->{ text: "<!-- TMPL_VAR name="frameworktext" -->", url: "/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=<!-- TMPL_VAR name="value" -->"},
@@ -64,9 +60,6 @@
        </script>
        
   <div id="newmenuc">
-    <!-- TMPL_IF NAME="NOTMARC" -->
-               <a id="newrecord" href="/cgi-bin/koha/cataloging/addbiblio.pl">New Record</a>
-       <!-- TMPL_ELSE -->
                <form name="f" action="addbiblio.pl" method="post">
                <label for="frameworkcode">New Record with framework:</label>
                        <select name="frameworkcode" id="frameworkcode">
@@ -80,7 +73,6 @@
                        <input type="submit" value="Add Record Without Search" />
                </form>
         <a id="z3950search" onclick="PopupZ3950(); return false;">Z39.50 Search</a>
-    <!-- /TMPL_IF -->  
 
   </div>
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
index 2c217b3..778e90f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
@@ -147,10 +147,9 @@
                 <td><!-- TMPL_VAR NAME="file" --></td>
                 <td> <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=<!-- TMPL_VAR NAME="id" -->" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=<!-- TMPL_VAR NAME="id" -->" title="MARC" rel="gb_page_center[600,500]">Card</a>
                                </td>
-                <td><!-- TMPL_IF NAME="NOTMARC" -->
-                <!-- TMPL_ELSE -->
+                <td>
                        <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?breedingid=<!-- TMPL_VAR NAME="id" -->" <!-- TMPL_UNLESS NAME="CAN_user_editcatalogue_edit_catalogue" --> class="disabled" onclick="return false;"<!-- /TMPL_UNLESS -->>Add biblio</a>
-                <!-- /TMPL_IF --></td>
+                </td>
             </tr>
             <!-- /TMPL_LOOP -->
         </table>

diff --git a/mainpage.pl b/mainpage.pl
index b5c0b1e..6a0c1af 100755 (executable)
--- a/mainpage.pl
+++ b/mainpage.pl
@@ -52,10 +52,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $marc_p = C4::Context->boolean_preference("marc");
-
 $template->param(
-    NOTMARC       => !$marc_p,
     authtypesloop => \@authtypesloop
 );