diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index 76e48daf68..d77a1eebf7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -524,9 +524,9 @@ fieldset.brief ol, fieldset.brief li { list-style-type : none; } -fieldset.brief div.hint { +fieldset.brief div.hint, fieldset.rows div.hint { color : #999999; - font-size : 90%; + font-size : 95%; margin-bottom : .4em; } @@ -555,14 +555,23 @@ fieldset.rows label, fieldset.rows span.label { text-align: right; } + .yui-b fieldset.rows label, .yui-b fieldset.rows span.label { width: 9em; } +.yui-b fieldset.rows div.hint { + margin-left : 10.5em; +} + .yui-u fieldset.rows label, .yui-u fieldset.rows span.label { width: 6em; } +.yui-u fieldset.rows div.hint { + margin-left : 7.5em; +} + fieldset.rows.left label, fieldset.rows.left span.label { width : 8em; text-align : left; @@ -951,4 +960,28 @@ div.first fieldset { .accesskey { text-decoration : underline; + } + + #changelanguage { + background-color : #F3F3F3; + border-top : 1px solid #E8E8E8; + font-size : 93%; + margin-top : 2em; + padding : .3em .5em .5em .5em; + } + + #changelanguage ul { + margin : 0; + padding : 0; + } + + #changelanguage li { + border-left : 1px solid #CCC; + display : inline; + list-style : none; + padding : 0 .5em; + } + + #changelanguage li:first-child { + border-left : 0; } \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc new file mode 100644 index 0000000000..c6ea1c6092 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc @@ -0,0 +1,110 @@ + + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-toolbar.inc new file mode 100644 index 0000000000..f075bbf8b8 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-toolbar.inc @@ -0,0 +1,21 @@ +
+ +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc index eb45f8aaa8..2ca4fe03ff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc @@ -1,7 +1,7 @@ -
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl index f148f86646..4ee7757654 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl @@ -44,23 +44,23 @@
  • "> -  
  • + -
  • Illustrator:  
  • +
  • Illustrator:
  • Publisher: "> -   +
  • -
  • in: 
  • +
  • in:
  • Description: @@ -78,10 +78,10 @@
      -
    • ISBN:  
    • +
    • ISBN:
    • -
    • ISSN: 
    • +
    • ISSN:
    • Collection: @@ -93,7 +93,7 @@
      • "> -  
      • +
    • @@ -126,7 +126,7 @@
    • URL: - ">  + ">
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl index d3b3bb25ce..f57d5d8869 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl @@ -6,6 +6,8 @@ + +
      @@ -26,7 +28,6 @@

      results found for '' - Perform a new search

      @@ -34,13 +35,11 @@

      No results match your search for “” in Catalog.

      - Perform a new search

      No result found !

      You did not specify any search criteria.

      - Perform a new search @@ -94,7 +93,11 @@ Count - class="highlight"> + + + + + """> @@ -312,7 +315,7 @@
      - +
      @@ -334,7 +337,6 @@
      -
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl index 975a320bfb..3e760b2f78 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl @@ -22,10 +22,11 @@ $(document).ready(function(){ }); }); -function confirmDelete(s){ - if (window.confirm(s)) - return true; +function confirmDelete(s,n){ + if (window.confirm(s)) { + location.href="/cgi-bin/koha/virtualshelves/shelves.pl?shelves=1&DEL-=1"; } else { return false; + } } /** * this function checks all checkbox @@ -129,8 +130,9 @@ function confirmDelete(s){ - - + +
    +