projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c784ee4 e24bcab)
Merge branch 'bug_9052' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 30 Dec 2012 23:36:34 +0000 (18:36 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 30 Dec 2012 23:36:34 +0000 (18:36 -0500)
Conflicts:
koha-tmpl/opac-tmpl/prog/en/css/sco.css

1  2 
koha-tmpl/opac-tmpl/prog/en/css/sco.css patch | diff1 | diff2 | blob | history
koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt patch | diff1 | diff2 | blob | history
koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt patch | diff1 | diff2 | blob | history

diff --cc koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt
index f2fa3a9,df4f0d3..b0d2445
--- 1/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt
--- 2/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt
@@@ -3,12 -3,7 +3,10 @@@
  <meta name="generator" content="Koha [% Version %]" /> <!-- leave this for stats -->
  <link rel="shortcut icon" href="[% themelang %]/includes/favicon.ico" type="image/x-icon" />
  
- <link rel="stylesheet" type="text/css" href="[% yuipath %]/reset-fonts-grids.css" />
- <link rel="stylesheet" type="text/css" href="[% yuipath %]/skin.css" />
  <link rel="stylesheet" type="text/css" href="[% themelang %]/css/sco.css" />
 +[% IF ( SCOUserCSS ) %]<style type="text/css">[% SCOUserCSS %]</style>[% END %]
 +
 +[% IF ( SCOUserJS ) %]<script type="text/javascript">[% SCOUserJS %]</script>[% END %]
  </head>
  <body>
  <div id="doc" class="yui-t7">
diff --cc koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
index 5441ccf,3fdf2f4..3f6438f
--- 1/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
--- 2/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
@@@ -98,13 -108,10 +98,11 @@@ $(document).ready(function()
  });
  </script>
  [% IF ( opacuserjs ) %]<script type="text/javascript">[% opacuserjs %]</script>[% END %]
 -
 +[% IF ( SCOUserJS ) %]<script type="text/javascript">[% SCOUserJS %]</script>[% END %]
  
- <link rel="stylesheet" type="text/css" href="[% yuipath %]/reset-fonts-grids.css" />
- <link rel="stylesheet" type="text/css" href="[% yuipath %]/skin.css" />
  <link rel="stylesheet" type="text/css" href="[% themelang %]/css/sco.css" />
  [% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %]
 +[% IF ( SCOUserCSS ) %]<style type="text/css">[% SCOUserCSS %]</style>[% END %]
  
  </head>
  <body onload="dofocus();">
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git