Merge commit 'pianohacker-koha/prefs-submit' into master

Merge in Jesse Weaver's system preference editor changes.

Conflicts:
	C4/Bookfund.pm
	koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
	koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
	koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl

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

diff --cc C4/Context.pm
Simple merge

diff --cc C4/Output.pm
index fde73f1,344a45f..6baf5eb
--- 1/C4/Output.pm
--- 2/C4/Output.pm
+++ b/C4/Output.pm
@@@ -70,19 -69,11 +70,12 @@@ my $path = C4::Context->config('intraht
  
  #---------------------------------------------------------------------------------------------------------
  # FIXME - POD
- sub gettemplate {
+ 
+ sub _get_template_file {
      my ( $tmplbase, $interface, $query ) = @_;
-     ($query) or warn "no query in gettemplate";
-     my $htdocs;
-     if ( $interface ne "intranet" ) {
-         $htdocs = C4::Context->config('opachtdocs');
-     }
-     else {
-         $htdocs = C4::Context->config('intrahtdocs');
-     }
-     my $path = C4::Context->preference('intranet_includes') || 'includes';
+     my $htdocs = C4::Context->config( $interface ne 'intranet' ? 'opachtdocs' : 'intrahtdocs' );
      my ( $theme, $lang ) = themelanguage( $htdocs, $tmplbase, $interface, $query );
 +    my $opacstylesheet = C4::Context->preference('opacstylesheet');
  
      # if the template doesn't exist, load the English one as a last resort
      my $filename = "$htdocs/$theme/$lang/modules/$tmplbase";

diff --cc koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 16f999b,61e6331..0be3df7
--- 1/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
--- 2/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@@ -1833,42 -1773,7 +1815,46 @@@ h1#xml a 
        width:35px;
  }
  
 +#cartDetails {
 +      background-color : #FFF;
 +      border: 1px solid #739acf;
 +      border-right-width : 2px;
 +      border-bottom-width : 2px;
 +      color : black;
 +      display : none;
 +      margin : 0;
 +      padding : 10px;
 +      text-align : center;
 +      width : 180px;
 +}
 +#cartmenulink {
 +        background: transparent url("../../img/cart-small.gif") 0 3px no-repeat;
 +        padding-left : 15px;
 +}
 +#cartmenulink span#basketcount span {
 +      display : inline;
 +      font-size : 90%;
 +      font-weight : normal;
 +      padding : 0;
 +}
 +#moremenu {
 +        display : none;
 +}
 +
 +.results_summary {
 +  display: block;
 +  font-size : 85%; 
 +  color: #707070;
 +  padding : 0 0 .5em 0;
 +}
 +.results_summary .label {
 +  color: #202020;
 +}
 +.results_summary a {
 +  font-weight: normal;
 +}
 +
+ img.spinner {
+     vertical-align: middle;
+     padding-right: 0.3em;
+ }

diff --cc koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
Simple merge

diff --cc koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
index e6da426,92a94f4..d4c7846
--- 1/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
--- 2/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@@@ -71,32 -50,10 +71,31 @@@
  <script type="text/javascript" src="<!-- TMPL_VAR NAME="yuipath" -->/button/button-min.js"></script> 
  <script type="text/javascript" src="<!-- TMPL_VAR NAME="yuipath" -->/container/container_core-min.js"></script> 
  <script type="text/javascript" src="<!-- TMPL_VAR NAME="yuipath" -->/menu/menu-min.js"></script> 
 +
  <!-- koha core js -->
  <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/js/staff-global.js"></script>
 -<!-- TMPL_IF NAME="intranetuserjs" --><script type="text/javascript">
 -//<![CDATA[
 -<!-- TMPL_VAR NAME="intranetuserjs" -->
 -//]]>
 -</script><!-- /TMPL_IF -->
 +<!-- TMPL_IF NAME="intranetuserjs" -->
 +    <script type="text/javascript">
 +    //<![CDATA[
 +    <!-- TMPL_VAR NAME="intranetuserjs" -->
 +    //]]>
 +    </script>
 +<!-- /TMPL_IF -->
 +<script type="text/javascript" language="javascript">
 +    //<![CDATA[
 +    <!-- TMPL_IF NAME="intranetbookbag" -->var MSG_BASKET_EMPTY = _("Your cart is currently empty");
 +        var MSG_RECORD_IN_BASKET = _("This item is already in your cart");
 +        var MSG_RECORD_ADDED = _("This item has been added to your cart");
 +        var MSG_NRECORDS_ADDED = _(" item(s) added to your cart");
 +        var MSG_NRECORDS_IN_BASKET = _("already in your cart");
 +        var MSG_NO_RECORD_SELECTED = _("No item was selected");
 +        var MSG_NO_RECORD_ADDED = _("No item was added to your cart");
 +        var MSG_CONFIRM_DEL_BASKET = _("Are you sure you want to empty your cart?");
 +        var MSG_CONFIRM_DEL_RECORDS = _("Are you sure you want to remove the selected items?");
 +        var MSG_NON_RESERVES_SELECTED = _("One or more selected items cannot be reserved.");
 +    <!-- /TMPL_IF -->
 +    //]]>
 +    </script>
 +    <!-- TMPL_IF EXPR="virtualshelves || intranetbookbag" -->
 +        <script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/basket.js"></script>
 +    <!-- /TMPL_IF -->
- 

diff --cc koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
Simple merge

diff --cc koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
Simple merge

diff --cc koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
index 1751075,8dea0ba..420d7e1
--- 1/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
--- 2/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
@@@ -59,19 -59,25 +59,20 @@@
        <ul>
          <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC Record</a></li>
          <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
 -              <!-- TMPL_IF NAME="CAN_user_serials" -->
 -        <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
 -              <!-- /TMPL_IF -->
      </ul>
 -      <!-- TMPL_IF NAME="CAN_user_acquisition" -->
 -    <h3><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></h3>
 -      <!-- /TMPL_IF -->
 -    <!-- /TMPL_IF --><!-- TMPL_IF NAME="CAN_user_reports" -->
 -          <h3><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></h3>
      <!-- /TMPL_IF -->
-     <!-- TMPL_IF NAME="CAN_user_parameters" --> <h3> <a href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a></h3>
-               <ul>
-             <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a></li>
 +    <!-- TMPL_IF NAME="CAN_user_serials" -->
 +    <h3><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></h3>
 +    <!-- /TMPL_IF -->
 +      <!-- TMPL_IF NAME="CAN_user_acquisition" --> <h3><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></h3> <!-- /TMPL_IF -->
 +    <!-- TMPL_IF NAME="CAN_user_reports"     --> <h3><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> </h3> <!-- /TMPL_IF -->
+     <!-- TMPL_IF NAME="CAN_user_parameters" -->
+    <h3> <a href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a></h3>
+                       <ul>
+             <li><a href="/cgi-bin/koha/admin/preferences.pl">System preferences</a></li>
          </ul>
      <!-- /TMPL_IF -->
 -    <!-- TMPL_IF NAME="CAN_user_tools" -->
 -    <h3><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></h3>
 -    <!-- /TMPL_IF -->
 +    <!-- TMPL_IF NAME="CAN_user_tools" --> <h3><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></h3> <!-- /TMPL_IF -->
      <h3><a href="/cgi-bin/koha/about.pl">About Koha</a></h3>
        </div>
        </div>