Browse Source

Bug 22023: Further improve responsive layout handling of staff client menu bar

This patch makes a number of changes in order to improve the way the
staff client's header menu adjusts at narrower browser widths:

 - Updated version of Bootstrap 3.3.7 which includes the "collapse"
   JavaScript plugin.
 - Modified default Bootstrap CSS using Bootstrap's customization tool.
   These changes facilitate the removal of some custom CSS (overriding
   Bootstrap) from staff-global.scss.
 - Added Bootstrap config file for loading customizations at
   https://getbootstrap.com/docs/3.3/customize/
 - Revised button classes for buttons in Bootstrap-styled toolbars.

   The modified default CSS resets the base font size in Bootstrap to
   better match our global CSS. A side-effect of this is that toolbar
   buttons ended up looking smaller than they should. Changing the
   button class solves this.

 - Restructure the header menu in order to allow different rules to
   govern the appearance of the navigational part of the menu
   (Circulation, Search, etc) and the user menu (Set library, My
   account, Log out).

 - Modify the cart JS to so that the popup works well at narrow widths.

To test, apply the patch, regenerate the staff client CSS, and clear
your browser cache.

 - Log in to the staff client and observe the layout of the header menu
   as you adjust the browser to various widths.
   - Confirm that sections of the menu "collapse" as the window gets
     narrower.
   - Confirm that dropdown menus behave correctly and that links work.
   - Confirm that the Cart link works as expected when the cart empty
     and when it has items.
- Install and enable multiple translations, including at least one
  set of sub-languages (e.g. fr-FR and fr-CA).
  - Test the appearance of the language menus in the footer at
    various browser widths.
- View pages with button toolbars and confirm that they appear unchanged
  (e.g. biblio detail page, patron detail page).

NOTE: While this patch is intended to make improvements to staff client
responsiveness, it does so within a limited scope. There are still many
pages which do not work well at narrower browser widths.

Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
19.05.x
Owen Leonard 4 years ago
committed by Nick Clemens
parent
commit
a344b8cf8c
  1. 8
      koha-tmpl/intranet-tmpl/lib/bootstrap/bootstrap-theme.min.css
  2. 8
      koha-tmpl/intranet-tmpl/lib/bootstrap/bootstrap.min.css
  3. 8
      koha-tmpl/intranet-tmpl/lib/bootstrap/bootstrap.min.js
  4. 426
      koha-tmpl/intranet-tmpl/lib/bootstrap/config.json
  5. 335
      koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
  6. 10
      koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
  7. 6
      koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc
  8. 8
      koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
  9. 20
      koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
  10. 19
      koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
  11. 2
      koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
  12. 4
      koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc
  13. 20
      koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
  14. 6
      koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
  15. 6
      koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc
  16. 21
      koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc
  17. 18
      koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
  18. 6
      koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc
  19. 10
      koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
  20. 18
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
  21. 10
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
  22. 6
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
  23. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
  24. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
  25. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
  26. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
  27. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
  28. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
  29. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
  30. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
  31. 6
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
  32. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
  33. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
  34. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
  35. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
  36. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
  37. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
  38. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
  39. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
  40. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
  41. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
  42. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
  43. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt
  44. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
  45. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
  46. 8
      koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
  47. 14
      koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
  48. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
  49. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
  50. 22
      koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
  51. 8
      koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
  52. 16
      koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
  53. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
  54. 14
      koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
  55. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
  56. 6
      koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
  57. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
  58. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
  59. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
  60. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt
  61. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
  62. 6
      koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
  63. 10
      koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
  64. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
  65. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
  66. 6
      koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
  67. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
  68. 6
      koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
  69. 33
      koha-tmpl/intranet-tmpl/prog/js/basket.js

8
koha-tmpl/intranet-tmpl/lib/bootstrap/bootstrap-theme.min.css

File diff suppressed because one or more lines are too long

8
koha-tmpl/intranet-tmpl/lib/bootstrap/bootstrap.min.css

File diff suppressed because one or more lines are too long

8
koha-tmpl/intranet-tmpl/lib/bootstrap/bootstrap.min.js

File diff suppressed because one or more lines are too long

426
koha-tmpl/intranet-tmpl/lib/bootstrap/config.json

@ -0,0 +1,426 @@
{
"vars": {
"@gray-base": "#000",
"@gray-darker": "lighten(@gray-base, 13.5%)",
"@gray-dark": "lighten(@gray-base, 20%)",
"@gray": "lighten(@gray-base, 33.5%)",
"@gray-light": "lighten(@gray-base, 46.7%)",
"@gray-lighter": "lighten(@gray-base, 93.5%)",
"@brand-primary": "darken(#428bca, 6.5%)",
"@brand-success": "#5cb85c",
"@brand-info": "#5bc0de",
"@brand-warning": "#f0ad4e",
"@brand-danger": "#d9534f",
"@body-bg": "#fff",
"@text-color": "@gray-dark",
"@link-color": "@brand-primary",
"@link-hover-color": "darken(@link-color, 15%)",
"@link-hover-decoration": "underline",
"@font-family-sans-serif": "Arial, Verdana, Helvetica, sans-serif",
"@font-family-serif": "Georgia, \"Times New Roman\", Times, serif",
"@font-family-monospace": "\"Courier New\", Courier, monospace",
"@font-family-base": "@font-family-sans-serif",
"@font-size-base": "12px",
"@font-size-large": "ceil((@font-size-base * 1.25))",
"@font-size-small": "ceil((@font-size-base * 0.85))",
"@font-size-h1": "floor((@font-size-base * 2.6))",
"@font-size-h2": "floor((@font-size-base * 2.15))",
"@font-size-h3": "ceil((@font-size-base * 1.7))",
"@font-size-h4": "ceil((@font-size-base * 1.25))",
"@font-size-h5": "@font-size-base",
"@font-size-h6": "ceil((@font-size-base * 0.85))",
"@line-height-base": "1.428571429",
"@line-height-computed": "floor((@font-size-base * @line-height-base))",
"@headings-font-family": "inherit",
"@headings-font-weight": "500",
"@headings-line-height": "1.1",
"@headings-color": "inherit",
"@icon-font-path": "\"../fonts/\"",
"@icon-font-name": "\"glyphicons-halflings-regular\"",
"@icon-font-svg-id": "\"glyphicons_halflingsregular\"",
"@padding-base-vertical": "6px",
"@padding-base-horizontal": "12px",
"@padding-large-vertical": "10px",
"@padding-large-horizontal": "16px",
"@padding-small-vertical": "5px",
"@padding-small-horizontal": "10px",
"@padding-xs-vertical": "1px",
"@padding-xs-horizontal": "5px",
"@line-height-large": "1.3333333",
"@line-height-small": "1.5",
"@border-radius-base": "4px",
"@border-radius-large": "6px",
"@border-radius-small": "3px",
"@component-active-color": "#fff",
"@component-active-bg": "@brand-primary",
"@caret-width-base": "4px",
"@caret-width-large": "5px",
"@table-cell-padding": "8px",
"@table-condensed-cell-padding": "5px",
"@table-bg": "transparent",
"@table-bg-accent": "#f9f9f9",
"@table-bg-hover": "#f5f5f5",
"@table-bg-active": "@table-bg-hover",
"@table-border-color": "#ddd",
"@btn-font-weight": "normal",
"@btn-default-color": "#333",
"@btn-default-bg": "#fff",
"@btn-default-border": "#ccc",
"@btn-primary-color": "#fff",
"@btn-primary-bg": "@brand-primary",
"@btn-primary-border": "darken(@btn-primary-bg, 5%)",
"@btn-success-color": "#fff",
"@btn-success-bg": "@brand-success",
"@btn-success-border": "darken(@btn-success-bg, 5%)",
"@btn-info-color": "#fff",
"@btn-info-bg": "@brand-info",
"@btn-info-border": "darken(@btn-info-bg, 5%)",
"@btn-warning-color": "#fff",
"@btn-warning-bg": "@brand-warning",
"@btn-warning-border": "darken(@btn-warning-bg, 5%)",
"@btn-danger-color": "#fff",
"@btn-danger-bg": "@brand-danger",
"@btn-danger-border": "darken(@btn-danger-bg, 5%)",
"@btn-link-disabled-color": "@gray-light",
"@btn-border-radius-base": "@border-radius-base",
"@btn-border-radius-large": "@border-radius-large",
"@btn-border-radius-small": "@border-radius-small",
"@input-bg": "#fff",
"@input-bg-disabled": "@gray-lighter",
"@input-color": "@gray",
"@input-border": "#ccc",
"@input-border-radius": "@border-radius-base",
"@input-border-radius-large": "@border-radius-large",
"@input-border-radius-small": "@border-radius-small",
"@input-border-focus": "#66afe9",
"@input-color-placeholder": "#999",
"@input-height-base": "(@line-height-computed + (@padding-base-vertical * 2) + 2)",
"@input-height-large": "(ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2)",
"@input-height-small": "(floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2)",
"@form-group-margin-bottom": "15px",
"@legend-color": "@gray-dark",
"@legend-border-color": "#e5e5e5",
"@input-group-addon-bg": "@gray-lighter",
"@input-group-addon-border-color": "@input-border",
"@cursor-disabled": "not-allowed",
"@dropdown-bg": "#fff",
"@dropdown-border": "rgba(0,0,0,.15)",
"@dropdown-fallback-border": "#ccc",
"@dropdown-divider-bg": "#e5e5e5",
"@dropdown-link-color": "@gray-dark",
"@dropdown-link-hover-color": "#FFFFFF",
"@dropdown-link-hover-bg": "#0081c2",
"@dropdown-link-active-color": "@component-active-color",
"@dropdown-link-active-bg": "#f5f5f5",
"@dropdown-link-disabled-color": "@gray-light",
"@dropdown-header-color": "@gray-light",
"@dropdown-caret-color": "#000",
"@screen-xs": "480px",
"@screen-xs-min": "@screen-xs",
"@screen-phone": "@screen-xs-min",
"@screen-sm": "768px",
"@screen-sm-min": "@screen-sm",
"@screen-tablet": "@screen-sm-min",
"@screen-md": "992px",
"@screen-md-min": "@screen-md",
"@screen-desktop": "@screen-md-min",
"@screen-lg": "1200px",
"@screen-lg-min": "@screen-lg",
"@screen-lg-desktop": "@screen-lg-min",
"@screen-xs-max": "(@screen-sm-min - 1)",
"@screen-sm-max": "(@screen-md-min - 1)",
"@screen-md-max": "(@screen-lg-min - 1)",
"@grid-columns": "12",
"@grid-gutter-width": "30px",
"@grid-float-breakpoint": "@screen-sm-min",
"@grid-float-breakpoint-max": "(@grid-float-breakpoint - 1)",
"@container-tablet": "(720px + @grid-gutter-width)",
"@container-sm": "@container-tablet",
"@container-desktop": "(940px + @grid-gutter-width)",
"@container-md": "@container-desktop",
"@container-large-desktop": "(1140px + @grid-gutter-width)",
"@container-lg": "@container-large-desktop",
"@navbar-height": "20px",
"@navbar-margin-bottom": "0",
"@navbar-border-radius": "0",
"@navbar-padding-horizontal": ".3em",
"@navbar-padding-vertical": ".4em",
"@navbar-collapse-max-height": "340px",
"@navbar-default-color": "#777",
"@navbar-default-bg": "#e6f0f2",
"@navbar-default-border": "0",
"@navbar-default-link-color": "#004D99",
"@navbar-default-link-hover-color": "#538200",
"@navbar-default-link-hover-bg": "transparent",
"@navbar-default-link-active-color": "#538200",
"@navbar-default-link-active-bg": "transparent",
"@navbar-default-link-disabled-color": "#ccc",
"@navbar-default-link-disabled-bg": "transparent",
"@navbar-default-brand-color": "@navbar-default-link-color",
"@navbar-default-brand-hover-color": "darken(@navbar-default-brand-color, 10%)",
"@navbar-default-brand-hover-bg": "transparent",
"@navbar-default-toggle-hover-bg": "#ddd",
"@navbar-default-toggle-icon-bar-bg": "#888",
"@navbar-default-toggle-border-color": "#ddd",
"@navbar-inverse-color": "lighten(@gray-light, 15%)",
"@navbar-inverse-bg": "#222",
"@navbar-inverse-border": "darken(@navbar-inverse-bg, 10%)",
"@navbar-inverse-link-color": "lighten(@gray-light, 15%)",
"@navbar-inverse-link-hover-color": "#fff",
"@navbar-inverse-link-hover-bg": "transparent",
"@navbar-inverse-link-active-color": "@navbar-inverse-link-hover-color",
"@navbar-inverse-link-active-bg": "darken(@navbar-inverse-bg, 10%)",
"@navbar-inverse-link-disabled-color": "#444",
"@navbar-inverse-link-disabled-bg": "transparent",
"@navbar-inverse-brand-color": "@navbar-inverse-link-color",
"@navbar-inverse-brand-hover-color": "#fff",
"@navbar-inverse-brand-hover-bg": "transparent",
"@navbar-inverse-toggle-hover-bg": "#333",
"@navbar-inverse-toggle-icon-bar-bg": "#fff",
"@navbar-inverse-toggle-border-color": "#333",
"@nav-link-padding": "10px 15px",
"@nav-link-hover-bg": "@gray-lighter",
"@nav-disabled-link-color": "@gray-light",
"@nav-disabled-link-hover-color": "@gray-light",
"@nav-tabs-border-color": "#ddd",
"@nav-tabs-link-hover-border-color": "@gray-lighter",
"@nav-tabs-active-link-hover-bg": "@body-bg",
"@nav-tabs-active-link-hover-color": "@gray",
"@nav-tabs-active-link-hover-border-color": "#ddd",
"@nav-tabs-justified-link-border-color": "#ddd",
"@nav-tabs-justified-active-link-border-color": "@body-bg",
"@nav-pills-border-radius": "@border-radius-base",
"@nav-pills-active-link-hover-bg": "@component-active-bg",
"@nav-pills-active-link-hover-color": "@component-active-color",
"@pagination-color": "@link-color",
"@pagination-bg": "#fff",
"@pagination-border": "#ddd",
"@pagination-hover-color": "@link-hover-color",
"@pagination-hover-bg": "@gray-lighter",
"@pagination-hover-border": "#ddd",
"@pagination-active-color": "#fff",
"@pagination-active-bg": "@brand-primary",
"@pagination-active-border": "@brand-primary",
"@pagination-disabled-color": "@gray-light",
"@pagination-disabled-bg": "#fff",
"@pagination-disabled-border": "#ddd",
"@pager-bg": "@pagination-bg",
"@pager-border": "@pagination-border",
"@pager-border-radius": "15px",
"@pager-hover-bg": "@pagination-hover-bg",
"@pager-active-bg": "@pagination-active-bg",
"@pager-active-color": "@pagination-active-color",
"@pager-disabled-color": "@pagination-disabled-color",
"@jumbotron-padding": "30px",
"@jumbotron-color": "inherit",
"@jumbotron-bg": "@gray-lighter",
"@jumbotron-heading-color": "inherit",
"@jumbotron-font-size": "ceil((@font-size-base * 1.5))",
"@jumbotron-heading-font-size": "ceil((@font-size-base * 4.5))",
"@state-success-text": "#3c763d",
"@state-success-bg": "#dff0d8",
"@state-success-border": "darken(spin(@state-success-bg, -10), 5%)",
"@state-info-text": "#31708f",
"@state-info-bg": "#d9edf7",
"@state-info-border": "darken(spin(@state-info-bg, -10), 7%)",
"@state-warning-text": "#8a6d3b",
"@state-warning-bg": "#fcf8e3",
"@state-warning-border": "darken(spin(@state-warning-bg, -10), 5%)",
"@state-danger-text": "#a94442",
"@state-danger-bg": "#f2dede",
"@state-danger-border": "darken(spin(@state-danger-bg, -10), 5%)",
"@tooltip-max-width": "200px",
"@tooltip-color": "#fff",
"@tooltip-bg": "#000",
"@tooltip-opacity": ".9",
"@tooltip-arrow-width": "5px",
"@tooltip-arrow-color": "@tooltip-bg",
"@popover-bg": "#fff",
"@popover-max-width": "276px",
"@popover-border-color": "rgba(0,0,0,.2)",
"@popover-fallback-border-color": "#ccc",
"@popover-title-bg": "darken(@popover-bg, 3%)",
"@popover-arrow-width": "10px",
"@popover-arrow-color": "@popover-bg",
"@popover-arrow-outer-width": "(@popover-arrow-width + 1)",
"@popover-arrow-outer-color": "fadein(@popover-border-color, 5%)",
"@popover-arrow-outer-fallback-color": "darken(@popover-fallback-border-color, 20%)",
"@label-default-bg": "@gray-light",
"@label-primary-bg": "@brand-primary",
"@label-success-bg": "@brand-success",
"@label-info-bg": "@brand-info",
"@label-warning-bg": "@brand-warning",
"@label-danger-bg": "@brand-danger",
"@label-color": "#fff",
"@label-link-hover-color": "#fff",
"@modal-inner-padding": "15px",
"@modal-title-padding": "15px",
"@modal-title-line-height": "@line-height-base",
"@modal-content-bg": "#fff",
"@modal-content-border-color": "rgba(0,0,0,.2)",
"@modal-content-fallback-border-color": "#999",
"@modal-backdrop-bg": "#000",
"@modal-backdrop-opacity": ".5",
"@modal-header-border-color": "#e5e5e5",
"@modal-footer-border-color": "@modal-header-border-color",
"@modal-lg": "900px",
"@modal-md": "600px",
"@modal-sm": "300px",
"@alert-padding": "15px",
"@alert-border-radius": "@border-radius-base",
"@alert-link-font-weight": "bold",
"@alert-success-bg": "@state-success-bg",
"@alert-success-text": "@state-success-text",
"@alert-success-border": "@state-success-border",
"@alert-info-bg": "@state-info-bg",
"@alert-info-text": "@state-info-text",
"@alert-info-border": "@state-info-border",
"@alert-warning-bg": "@state-warning-bg",
"@alert-warning-text": "@state-warning-text",
"@alert-warning-border": "@state-warning-border",
"@alert-danger-bg": "@state-danger-bg",
"@alert-danger-text": "@state-danger-text",
"@alert-danger-border": "@state-danger-border",
"@progress-bg": "#f5f5f5",
"@progress-bar-color": "#fff",
"@progress-border-radius": "@border-radius-base",
"@progress-bar-bg": "@brand-primary",
"@progress-bar-success-bg": "@brand-success",
"@progress-bar-warning-bg": "@brand-warning",
"@progress-bar-danger-bg": "@brand-danger",
"@progress-bar-info-bg": "@brand-info",
"@list-group-bg": "#fff",
"@list-group-border": "#ddd",
"@list-group-border-radius": "@border-radius-base",
"@list-group-hover-bg": "#f5f5f5",
"@list-group-active-color": "@component-active-color",
"@list-group-active-bg": "@component-active-bg",
"@list-group-active-border": "@list-group-active-bg",
"@list-group-active-text-color": "lighten(@list-group-active-bg, 40%)",
"@list-group-disabled-color": "@gray-light",
"@list-group-disabled-bg": "@gray-lighter",
"@list-group-disabled-text-color": "@list-group-disabled-color",
"@list-group-link-color": "#555",
"@list-group-link-hover-color": "@list-group-link-color",
"@list-group-link-heading-color": "#333",
"@panel-bg": "#fff",
"@panel-body-padding": "15px",
"@panel-heading-padding": "10px 15px",
"@panel-footer-padding": "@panel-heading-padding",
"@panel-border-radius": "@border-radius-base",
"@panel-inner-border": "#ddd",
"@panel-footer-bg": "#f5f5f5",
"@panel-default-text": "@gray-dark",
"@panel-default-border": "#ddd",
"@panel-default-heading-bg": "#f5f5f5",
"@panel-primary-text": "#fff",
"@panel-primary-border": "@brand-primary",
"@panel-primary-heading-bg": "@brand-primary",
"@panel-success-text": "@state-success-text",
"@panel-success-border": "@state-success-border",
"@panel-success-heading-bg": "@state-success-bg",
"@panel-info-text": "@state-info-text",
"@panel-info-border": "@state-info-border",
"@panel-info-heading-bg": "@state-info-bg",
"@panel-warning-text": "@state-warning-text",
"@panel-warning-border": "@state-warning-border",
"@panel-warning-heading-bg": "@state-warning-bg",
"@panel-danger-text": "@state-danger-text",
"@panel-danger-border": "@state-danger-border",
"@panel-danger-heading-bg": "@state-danger-bg",
"@thumbnail-padding": "4px",
"@thumbnail-bg": "@body-bg",
"@thumbnail-border": "#ddd",
"@thumbnail-border-radius": "@border-radius-base",
"@thumbnail-caption-color": "@text-color",
"@thumbnail-caption-padding": "9px",
"@well-bg": "#f5f5f5",
"@well-border": "darken(@well-bg, 7%)",
"@badge-color": "#fff",
"@badge-link-hover-color": "#fff",
"@badge-bg": "@gray-light",
"@badge-active-color": "@link-color",
"@badge-active-bg": "#fff",
"@badge-font-weight": "bold",
"@badge-line-height": "1",
"@badge-border-radius": "10px",
"@breadcrumb-padding-vertical": "8px",
"@breadcrumb-padding-horizontal": "15px",
"@breadcrumb-bg": "#f5f5f5",
"@breadcrumb-color": "#ccc",
"@breadcrumb-active-color": "@gray-light",
"@breadcrumb-separator": "\"/\"",
"@carousel-text-shadow": "0 1px 2px rgba(0,0,0,.6)",
"@carousel-control-color": "#fff",
"@carousel-control-width": "15%",
"@carousel-control-opacity": ".5",
"@carousel-control-font-size": "20px",
"@carousel-indicator-active-bg": "#fff",
"@carousel-indicator-border-color": "#fff",
"@carousel-caption-color": "#fff",
"@close-font-weight": "bold",
"@close-color": "#000",
"@close-text-shadow": "0 1px 0 #fff",
"@code-color": "#c7254e",
"@code-bg": "#f9f2f4",
"@kbd-color": "#fff",
"@kbd-bg": "#333",
"@pre-bg": "#f5f5f5",
"@pre-color": "@gray-dark",
"@pre-border-color": "#ccc",
"@pre-scrollable-max-height": "340px",
"@component-offset-horizontal": "180px",
"@text-muted": "@gray-light",
"@abbr-border-color": "@gray-light",
"@headings-small-color": "@gray-light",
"@blockquote-small-color": "@gray-light",
"@blockquote-font-size": "(@font-size-base * 1.25)",
"@blockquote-border-color": "@gray-lighter",
"@page-header-border-color": "@gray-lighter",
"@dl-horizontal-offset": "@component-offset-horizontal",
"@dl-horizontal-breakpoint": "@grid-float-breakpoint",
"@hr-border": "@gray-lighter"
},
"css": [
"type.less",
"code.less",
"grid.less",
"tables.less",
"forms.less",
"buttons.less",
"responsive-utilities.less",
"button-groups.less",
"input-groups.less",
"navs.less",
"navbar.less",
"breadcrumbs.less",
"pagination.less",
"pager.less",
"labels.less",
"badges.less",
"thumbnails.less",
"alerts.less",
"progress-bars.less",
"media.less",
"list-group.less",
"panels.less",
"responsive-embed.less",
"close.less",
"component-animations.less",
"dropdowns.less",
"tooltip.less",
"popovers.less",
"modals.less"
],
"js": [
"alert.js",
"button.js",
"dropdown.js",
"modal.js",
"tooltip.js",
"popover.js",
"collapse.js",
"transition.js"
],
"customizerUrl": "<none>"
}

335
koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss

@ -1285,16 +1285,6 @@ details[open] {
}
#header {
&.navbar {
margin-bottom: 0;
}
&.navbar-default {
background: #E6F0F2;
border: 0;
box-shadow: none;
}
+ #breadcrumbs {
margin-top: 1em;
}
@ -1889,6 +1879,12 @@ dd {
}
}
.dropdown-menu {
li {
list-style-type: none;
}
}
.btn-toolbar {
fieldset {
&.action {
@ -2444,10 +2440,6 @@ li {
vertical-align: top;
}
#toplevelmenu {
padding: 0;
}
#CheckAll,
#CheckNone,
#CheckPending {
@ -2542,13 +2534,6 @@ li {
}
}
@media (max-width: 767px) {
#marcPreview {
margin: 0;
width: auto;
}
}
#cartDetails {
background-color: #FFFFFF;
border: 1px solid #739ACF;
@ -3306,6 +3291,50 @@ video {
}
// Bootstrap overrides
nav {
background: #E6F0F2 none;
border: 0;
}
.navbar-collapse {
background: #E6F0F2 none;
box-shadow: none;
}
.navbar-nav {
li {
list-style: none;
&.open {
li {
a {
font-weight: normal;
}
}
}
a {
font-weight: bold;
padding-bottom: .4em;
padding-top: .4em;
}
}
}
.nav .open > a,
.nav .open > a:hover,
.nav .open > a:focus {
background-color: transparent;
border: 0;
}
.nav > li > a:hover,
.nav > li > a:focus {
background-color: transparent;
text-decoration: none;
}
button,
.btn {
border-color: #ADADAD #ADADAD #949494;
@ -3322,67 +3351,21 @@ button,
padding: 3px 5px;
}
.dropdown-menu {
border-color: rgba(0, 0, 0, .2);
border-top: 0;
font-size: 12px;
li {
list-style: none outside none;
> a,
&.nav-header {
padding: 4px 20px;
cursor: pointer;
&:hover,
&:focus {
background-image: linear-gradient(to bottom, #0088CC, #0077B3);
background-repeat: repeat-x;
color: #FFFFFF;
text-decoration: none;
}
}
#toolbar {
.dropdown-menu {
border-top-width: 1px;
font-size: 13px;
}
}
.navbar {
color: #333;
min-height: 20px;
.nav {
> li {
list-style: none outside none;
padding: 0 .6em;
> a {
color: #004D99;
font-weight: bold;
padding: .4em .2em;
&:focus,
&:hover {
color: #538200;
}
}
}
li {
.dropdown {
&.open > .dropdown-toggle:focus,
&.active > .dropdown-toggle:focus,
&.open.active > .dropdown-toggle:focus {
background: #E6F0F2 none;
box-shadow: none;
}
}
}
&.floating {
border-radius: 0;
margin-top: 0;
}
}
#changelanguage {
background: #FFF none;
border-top: 1px solid #EEE;
min-height: $language-footer-min-height;
.dropdown-menu {
@ -3402,6 +3385,14 @@ button,
line-height: 20px;
}
}
.navbar-nav {
li {
a {
line-height: 20px;
}
}
}
}
.loggedout {
@ -3410,16 +3401,6 @@ button,
padding: .4em .2em;
}
.navbar-static-top {
.navbar-inner {
background: #E6F0F2 none;
border: 0;
box-shadow: none;
min-height: 0;
padding-left: 0;
}
}
.navbar-fixed-bottom {
.navbar-inner {
min-height: 0;
@ -3990,34 +3971,6 @@ span {
width: 12%;
}
.navbar-default {
.navbar-nav {
> .open {
> a {
&:hover,
&:focus {
background: #E6F0F2 none;
box-shadow: none;
}
}
}
}
&.navbar-fixed-bottom {
.navbar-nav {
> .open {
> a {
&:hover,
&:focus {
background: transparent none;
box-shadow: none;
}
}
}
}
}
}
#interlibraryloans {
#dataPreviewLabel {
margin: .3em 0;
@ -4459,64 +4412,148 @@ span {
}
}
.header-menu-link {
display: none;
font-weight: bold;
padding: .4em .6em;
}
#user-menu {
position: absolute;
right: 5px;
top: 0;
}
@media (min-width: 200px) {
.navbar-nav > li {
float: left;
}
@media (max-width: 767px) {
.header-menu-link {
display: inline-block;
}
.navbar-right {
float: right !important;
margin-right: -15px;
#catalog-search-link {
display: none;
padding: 0;
}
.navbar-nav {
float: left;
margin: 0;
#cartmenulink {
background: transparent none;
padding-left: 1.5em;
}
#changelanguage {
li {
float: left;
li {
float: none;
}
}
.open {
.dropdown-menu {
background-color: #FFF;
border: 1px solid rgba(0, 0, 0, .15);
box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
float: left;
border: 1px solid #ccc;
position: absolute;
width: auto;
}
}
}
&.dropdown-menu-left {
left: auto;
right: 0;
}
#header {
background-color: #FFF;
border: 1px solid #CCC;
margin-bottom: 1em;
&.dropdown-menu-right {
right: auto;
}
a {
font-weight: normal;
padding-left: 1.5em;
&:hover {
background-color: #0070A9;
color: #FFF;
}
}
}
.navbar-default {
.navbar-nav {
.open {
.dropdown-menu {
> li {
> a {
&:hover,
&:focus {
background-color: #0081C2;
background-image: linear-gradient(to bottom, #0088CC, #0077B3);
background-repeat: repeat-x;
color: #FFFFFF;
text-decoration: none;
}
}
ul {
border: 0;
box-shadow: unset;
float: none;
left: auto;
position: relative;
right: auto;
&.dropdown-menu {
display: block;
}
}
.dropdown-menu {
li {
a {
color: #004D99;
&:hover {
color: #FFF;
}
}
}
}
.dropdown-toggle {
display: none;
}
}
h1#logo {
float: none;
margin: auto;
}
#marcPreview {
margin: 0;
width: auto;
}
.navbar-fixed-bottom .nav > li {
border-right: 0;
}
#user-menu {
.open {
.dropdown-menu {
background-color: #FFF;
border: 1px solid #ccc;
position: absolute;
}
}
li {
float: left;
li {
float: none;
}
}
}
}
@media (max-width: 768px) {
.navbar-nav {
li {
a {
padding: .4em .6em;
}
}
}
}
@media (min-width: 800px) {
#helper {
i {
display: none;

10
koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc

@ -11,7 +11,7 @@ function confirm_deletion() {
<div id="toolbar" class="btn-toolbar">
[% IF ( booksellerid ) %]
<div class="btn-group">
<a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-plus"></i> New
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-plus"></i> New
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
@ -27,15 +27,15 @@ function confirm_deletion() {
</ul>
</div>
[% IF ( CAN_user_acquisition_vendors_manage ) %]
<div class="btn-group"><a class="btn btn-default btn-sm" id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]&amp;op=enter"><i class="fa fa-pencil"></i> Edit vendor</a></div>
<div class="btn-group"><a class="btn btn-default" id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]&amp;op=enter"><i class="fa fa-pencil"></i> Edit vendor</a></div>
[% UNLESS ( basketcount OR subscriptioncount ) %]
<div class="btn-group"><a class="btn btn-default btn-sm" id="deletesupplier" href="javascript:confirm_deletion()"><i class="fa fa-trash"></i> Delete vendor</a></div>
<div class="btn-group"><a class="btn btn-default" id="deletesupplier" href="javascript:confirm_deletion()"><i class="fa fa-trash"></i> Delete vendor</a></div>
[% END %]
[% END %]
[% IF CAN_user_acquisition_order_receive && basketcount %]
<div class="btn-group"><a class="btn btn-default btn-sm" id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | html %]"><i class="fa fa-inbox"></i> Receive shipments</a></div>
<div class="btn-group"><a class="btn btn-default" id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | html %]"><i class="fa fa-inbox"></i> Receive shipments</a></div>
[% END %]
[% ELSE %]
<div class="btn-group"><a class="btn btn-default btn-sm" href="/cgi-bin/koha/acqui/supplier.pl?op=enter"><i class="fa fa-plus"></i> New vendor</a></div>
<div class="btn-group"><a class="btn btn-default" href="/cgi-bin/koha/acqui/supplier.pl?op=enter"><i class="fa fa-plus"></i> New vendor</a></div>
[% END %]
</div>

6
koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc

@ -4,7 +4,7 @@
<div id="toolbar" class="btn-toolbar">
[% IF ( CAN_user_editauthorities ) %]
<div class="btn-group">
<a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" href="#">
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#">
<i class="fa fa-plus"></i> New authority
<span class="caret"></span>
</a>
@ -23,7 +23,7 @@
[% IF ( authid ) %]
[% IF ( CAN_user_editauthorities ) %]
<div class="btn-group">
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-pencil"></i> Edit <span class="caret"></span>
</button>
<ul class="dropdown-menu">
@ -40,7 +40,7 @@
[% END %]
<div class="btn-group">
<a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-download"></i> Save
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-download"></i> Save
<span class="caret"></span>
</a>
<ul class="dropdown-menu">

8
koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc

@ -2,7 +2,7 @@
<div id="toolbar" class="btn-toolbar">
[% IF ( budget_period_id ) %]
<div class="btn-group">
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form">New budget</a></li>
[% IF ( budget_period_locked || !CAN_user_acquisition_budget_add_del ) %]
@ -15,7 +15,7 @@
</div>
<div class="btn-group">
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form&amp;budget_period_id=[% budget_period_id | uri %]">Edit budget [% budget_period_description | html %]</a></li>
<li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=duplicate_form&amp;budget_period_id=[% budget_period_id | uri %]">Duplicate budget [% budget_period_description | html %]</a></li>
@ -23,7 +23,7 @@
</div>
<div class="btn-group">
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Planning <span class="caret"></span></button>
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Planning <span class="caret"></span></button>
<ul class="dropdown-menu">
[% IF ( CAN_user_acquisition_planning_manage ) %]
<li>
@ -56,7 +56,7 @@
</div>
[% ELSE %]
<div class="btn-group"><a class="btn btn-default btn-sm" id="newrootbudget" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form"><i class="fa fa-plus"></i> New budget</a></div>
<div class="btn-group"><a class="btn btn-default" id="newrootbudget" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form"><i class="fa fa-plus"></i> New budget</a></div>
[% END %]
</div>

20
koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc

@ -4,7 +4,7 @@
[% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items ||
CAN_user_serials_create_subscription ) %]
<div class="btn-group">
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>
<ul class="dropdown-menu">
[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
<li><a id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New record</a></li>
@ -29,7 +29,7 @@ CAN_user_serials_create_subscription ) %]
[% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items || CAN_user_tools_items_batchmod || CAN_user_tools_items_batchdel ) or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
<div class="btn-group">
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
<ul class="dropdown-menu">
[% IF CAN_user_editcatalogue_edit_catalogue or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
<li><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | html %]">Edit record</a></li>
@ -86,7 +86,7 @@ CAN_user_serials_create_subscription ) %]
[% END %]
<div class="btn-group">
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> Save <span class="caret"></span></button>
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> Save <span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="/cgi-bin/koha/catalogue/export.pl?format=bibtex&amp;op=export&amp;bib=[% biblionumber | uri %]">BIBTEX</a></li>
<li><a href="#" data-toggle="modal" data-target="#exportModal_">Dublin Core</a></li>
@ -101,25 +101,25 @@ CAN_user_serials_create_subscription ) %]
[% IF ( virtualshelves && intranetbookbag ) %]
<div class="btn-group">
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">Add to <span class="caret"></span></button>
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">Add to <span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="#" id="addtocart">Cart</a></li>
<li><a href="#" id="addtoshelf">List</a></li>
</ul>
</div>
[% ELSIF ( virtualshelves ) %]
<div class="btn-group"><a id="addtoshelf" class="btn btn-default btn-sm"><i class="fa fa-list"></i> Add to list</a> </div>
<div class="btn-group"><a id="addtoshelf" class="btn btn-default"><i class="fa fa-list"></i> Add to list</a> </div>
[% ELSIF ( intranetbookbag ) %]
<div class="btn-group"><a id="addtocart" class="btn btn-default btn-sm"><i class="fa fa-shopping-cart"></i> Add to cart</a> </div>
<div class="btn-group"><a id="addtocart" class="btn btn-default"><i class="fa fa-shopping-cart"></i> Add to cart</a> </div>
[% END %]
<div class="btn-group"><a id="printbiblio" class="btn btn-default btn-sm"><i class="fa fa-print"></i> Print</a></div>
<div class="btn-group"><a id="printbiblio" class="btn btn-default"><i class="fa fa-print"></i> Print</a></div>
[% IF ( CAN_user_reserveforothers ) %]
[% UNLESS ( norequests ) %]
[% IF ( holdfor ) %]
<div class="btn-group">
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-sticky-note-o"></i>
Place hold
<span class="caret"></span>
@ -130,13 +130,13 @@ CAN_user_serials_create_subscription ) %]
</ul>
</div>
[% ELSE %]
<div class="btn-group"><a id="placehold" class="btn btn-default btn-sm" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | html %]"><i class="fa fa-sticky-note-o"></i> Place hold</a></div>
<div class="btn-group"><a id="placehold" class="btn btn-default" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | html %]"><i class="fa fa-sticky-note-o"></i> Place hold</a></div>
[% END %]
[% END %]
[% END %]
[% IF Koha.Preference('ArticleRequests') %]
<div class="btn-group"><a id="placehold" class="btn btn-default btn-sm" href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% biblionumber | html %]"><i class="fa fa-file-text-o"></i> Request article</a></div>
<div class="btn-group"><a id="placehold" class="btn btn-default" href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% biblionumber | html %]"><i class="fa fa-file-text-o"></i> Request article</a></div>
[% END %]
[% FOREACH p IN plugins %]

19
koha-tmpl/intranet-tmpl/prog/en/includes/header.inc

@ -1,8 +1,13 @@
[% USE raw %]
[% USE Branches %]
[% USE Koha %]
<div id="header" class="navbar navbar-default">
<div class="container-fluid">
<nav class="navbar">
<div class="navbar-header">
<a href="#" class="header-menu-link collapsed" data-toggle="collapse" data-target="#header" aria-expanded="false" aria-controls="header">
<i class="fa fa-bars"></i> Menu
</a>
</div>
<div id="header" class="navbar-collapse collapse">
<ul id="toplevelmenu" class="nav navbar-nav">
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a></li>[% END %]
[% IF CAN_user_borrowers_edit_borrowers %]<li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li>[% END %]
@ -55,7 +60,8 @@
</ul>
</li>
</ul>
<ul class="nav navbar-nav navbar-right">
</div>
<ul id="user-menu" class="nav navbar-nav navbar-right">
[% IF ( loggedinusername ) %]
<li class="dropdown">
<a href="#" id="logged-in-menu" role="button" class="dropdown-toggle" data-toggle="dropdown">
@ -82,7 +88,7 @@
</span>
<b class="caret"></b>
</a>
<ul class="dropdown-menu dropdown-menu-left" role="menu" aria-labelledby="logged-in-menu">
<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="logged-in-menu">
<li class="loggedin-menu-label">
Logged in as:<br />
@ -148,7 +154,8 @@
</li>
[% END %]
</ul>
</div>
[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
[% IF ( intranetbookbag ) %]<div id="cartDetails">Your cart is empty.</div>[% END %]
</div>
</nav>

2
koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc

@ -25,7 +25,7 @@
[% END %]
[% END %]
<span class="caret"></span></a>
<ul id="sub[% languages_loo.rfc4646_subtag | html %]" class="dropdown-menu dropdown-menu-right">
<ul id="sub[% languages_loo.rfc4646_subtag | html %]" class="dropdown-menu dropdown-menu-left">
[% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
[% IF ( sublanguages_loo.enabled ) %]
[% IF ( sublanguages_loo.sublanguage_current ) %]

4
koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc

@ -1,7 +1,7 @@
[% INCLUDE 'blocking_errors.inc' %]
<div id="toolbar" class="btn-toolbar">
<div class="btn-group">
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=new">Label batch</a></li>
<li><a href="/cgi-bin/koha/labels/label-edit-layout.pl?op=new">Layout</a></li>
@ -10,7 +10,7 @@
</ul>
</div>
<div class="btn-group">
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-edit"></i> Manage <span class="caret"></span></button>
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-edit"></i> Manage <span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Label batches</a></li>
<li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Layouts</a></li>

20
koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc

@ -7,26 +7,26 @@
<div id="toolbar" class="btn-toolbar">
[% IF CAN_user_borrowers_edit_borrowers %]
[% IF ( guarantor ) %]
<a id="editpatron" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;guarantorid=[% guarantor.borrowernumber | html %]&amp;categorycode=[% patron.categorycode | html %]">
<a id="editpatron" class="btn btn-default" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;guarantorid=[% guarantor.borrowernumber | html %]&amp;categorycode=[% patron.categorycode | html %]">
[% ELSE %]
<a id="editpatron" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;categorycode=[% patron.categorycode | html %]">
<a id="editpatron" class="btn btn-default" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;categorycode=[% patron.categorycode | html %]">
[% END %]
<i class="fa fa-pencil"></i> Edit</a>
[% END %]
[% IF CAN_user_borrowers_edit_borrowers %]
[% IF patron.is_adult AND Koha.Preference("borrowerRelationship") %]
<a id="addchild" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% patron.borrowernumber | html %]"><i class="fa fa-plus"></i> Add child</a>
<a id="addchild" class="btn btn-default" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% patron.borrowernumber | html %]"><i class="fa fa-plus"></i> Add child</a>
[% END %]
[% IF CAN_user_borrowers_edit_borrowers %]
<a id="changepassword" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber | html %]"><i class="fa fa-lock"></i> Change password</a>
<a id="changepassword" class="btn btn-default" href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber | html %]"><i class="fa fa-lock"></i> Change password</a>
[% END %]
<a id="duplicate" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;categorycode=[% patron.categorycode | html %]"><i class="fa fa-copy"></i> Duplicate</a>
<a id="duplicate" class="btn btn-default" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;categorycode=[% patron.categorycode | html %]"><i class="fa fa-copy"></i> Duplicate</a>
[% END %]
[% IF CAN_user_circulate_circulate_remaining_permissions %]
<div class="btn-group">
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-print"></i> Print <span class="caret"></span></button>
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-print"></i> Print <span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a id="printsummary" href="#">Print summary</a></li>
<li><a id="printslip" href="#">Print slip</a></li>
@ -39,14 +39,14 @@
[% END %]
[% IF ( CAN_user_reserveforothers ) %]
<a id="searchtohold" class="btn btn-default btn-sm" href="#"><i class="fa fa-search"></i> Search to hold</a>
<a id="searchtohold" class="btn btn-default" href="#"><i class="fa fa-search"></i> Search to hold</a>
[% END %]
<a id="addnewmessageLabel" href="#add_message_form" data-toggle="modal" class="btn btn-default btn-sm"><i class="fa fa-comment-o"></i> Add message</a>
<a id="addnewmessageLabel" href="#add_message_form" data-toggle="modal" class="btn btn-default"><i class="fa fa-comment-o"></i> Add message</a>
<div class="btn-group">
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">More <span class="caret"></span></button>
<ul class="dropdown-menu">
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">More <span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-right">
[% IF CAN_user_borrowers_edit_borrowers %]
<li><a id="renewpatron" href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | html %]&amp;destination=[% destination | html %]&amp;reregistration=y">Renew patron</a></li>
[% ELSE %]

6
koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc

@ -6,21 +6,21 @@
[% UNLESS ( no_add ) %]
<div id="toolbar" class="btn-toolbar">
<div class="btn-group" id="new-patron-button">
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New patron <span class="caret"></span></button>
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New patron <span class="caret"></span></button>
<ul class="dropdown-menu">
[% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;categorycode=[% category.categorycode | uri %]">[% category.description | html %]</a></li>[% END %]
</ul>
</div>
[% IF Koha.Preference('PatronQuickAddFields') || Koha.Preference('BorrowerMandatoryField') %]
<div class="btn-group" id="quick-add-new-patron-button">
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> Quick add new patron <span class="caret"></span></button>
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> Quick add new patron <span class="caret"></span></button>
<ul class="dropdown-menu">
[% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;categorycode=[% category.categorycode | uri %]&amp;quickadd=true">[% category.description | html %]</a></li>[% END %]
</ul>
</div>
[% END %]
[% IF CAN_user_tools_manage_patron_lists %]
<a class="btn btn-default btn-sm" href="/cgi-bin/koha/patron_lists/lists.pl" id="patron-lists-button"><i class="fa fa-edit"></i> Patron lists</a>
<a class="btn btn-default" href="/cgi-bin/koha/patron_lists/lists.pl" id="patron-lists-button"><i class="fa fa-edit"></i> Patron lists</a>
[% END %]
</div>

6
koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc

@ -1,5 +1,5 @@
<div id="toolbar" class="btn-toolbar">
<div class="btn-group"><a class="btn btn-default btn-sm" id="add_quote" href="#"><i class="fa fa-plus"></i> Add quote</a></div>
<div class="btn-group"><a class="btn btn-default btn-sm" id="delete_quote" href="#"><i class="fa fa-trash"></i> Delete quote(s)</a></div>
<div class="btn-group"><a class="btn btn-default btn-sm" id="import_quotes" href="/cgi-bin/koha/tools/quotes-upload.pl"><i class="fa fa-folder-open"></i> Import quotes</a></div>
<div class="btn-group"><a class="btn btn-default" id="add_quote" href="#"><i class="fa fa-plus"></i> Add quote</a></div>
<div class="btn-group"><a class="btn btn-default" id="delete_quote" href="#"><i class="fa fa-trash"></i> Delete quote(s)</a></div>
<div class="btn-group"><a class="btn btn-default" id="import_quotes" href="/cgi-bin/koha/tools/quotes-upload.pl"><i class="fa fa-folder-open"></i> Import quotes</a></div>
</div>

21
koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc

@ -2,7 +2,7 @@
<div id="toolbar" class="btn-toolbar">
[% IF ( CAN_user_reports_create_reports ) %]
<div class="btn-group">
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New report <span class="caret"></span></button>
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New report <span class="caret"></span></button>
<ul class="dropdown-menu">
<li id="newmenuc"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">New guided report</a> </li>
<li id="newsql"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL">New SQL report</a> </li>
@ -17,13 +17,13 @@
[% IF ( CAN_user_reports_create_reports ) %]
[% UNLESS ( editsql ) # Do not show edit button on edit page %]
<div class="btn-group">
<a id="editreport" class="btn btn-default btn-sm" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&amp;phase=Edit%20SQL">
<a id="editreport" class="btn btn-default" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&amp;phase=Edit%20SQL">
<i class="fa fa-pencil"></i> Edit
</a>
</div>
[% END %]
<div class="btn-group">
<a class="btn btn-default btn-sm" title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&amp;sql=[% original_sql || sql |uri %]&amp;reportname=[% reportname |uri %]&amp;notes=[% notes |uri %]">
<a class="btn btn-default" title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&amp;sql=[% original_sql || sql |uri %]&amp;reportname=[% reportname |uri %]&amp;notes=[% notes |uri %]">
<i class="fa fa-copy"></i> Duplicate
</a>
</div>
@ -31,7 +31,7 @@
[% IF ( CAN_user_reports_delete_reports ) %]
<div class="btn-group">
<a class="delete btn btn-default btn-sm" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&phase=Delete%20Saved">
<a class="delete btn btn-default" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&phase=Delete%20Saved">
<i class="fa fa-trash"></i> Delete
</a>
</div>
@ -39,12 +39,12 @@
[% UNLESS ( errors ) # Unless there are errors saving a report %]
<div class="btn-group">
<a id="runreport" class="btn btn-default btn-sm" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&amp;phase=Run%20this%20report">
<a id="runreport" class="btn btn-default" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&amp;phase=Run%20this%20report">
<i class="fa fa-play"></i> Run report
</a>
</div>
<div class="btn-group">
<a class="btn btn-default btn-sm" href="/cgi-bin/koha/tools/scheduler.pl?id=[% id | html %]">
<a class="btn btn-default" href="/cgi-bin/koha/tools/scheduler.pl?id=[% id | html %]">
<i class="fa fa-clock-o"></i> Schedule
</a>
</div>
@ -92,7 +92,7 @@
<div class="btn-group">
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="format"><i class="fa fa-upload"></i> Download <span class="caret"></span></button>
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" id="format"><i class="fa fa-upload"></i> Download <span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a id="csv" href="/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Export&amp;format=csv&amp;report_id=[% id | html %]&amp;reportname=[% name |uri %][% PROCESS params %]">[% PROCESS 'delimiter_text.inc' %]</a></li>
<li><a id="tab" href="/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Export&amp;format=tab&amp;report_id=[% id | html %]&amp;reportname=[% name |uri %][% PROCESS params %]">Tab separated text</a></li>
@ -103,11 +103,12 @@
</ul>
</div>
<div class="btn-group">
<a class="btn btn-default btn-sm toggle_sql" id="toggle_sql_hid" href="#"><i class="fa fa-eye"></i> Show SQL code</a>
<a class="btn btn-default btn-sm toggle_sql" id="toggle_sql_vis" href="#" style="display:none;"><i class="fa fa-eye-slash"></i> Hide SQL code</a>
<a class="btn btn-default toggle_sql" id="toggle_sql_hid" href="#"><i class="fa fa-eye"></i> Show SQL code</a>
<a class="btn btn-default toggle_sql" id="toggle_sql_vis" href="#" style="display:none;"><i class="fa fa-eye-slash"></i> Hide SQL code</a>
</div>
<div class="btn-group">
<a class="btn btn-default btn-sm" href="#" data-toggle="modal" data-target="#chartModal"><i class="fa fa-bar-chart"></i> Create chart</a>
<a class="btn btn-default toggle_chart_settings" id="toggle_chart_settings_hid" href="#"><i class="fa fa-eye"></i> Show chart settings</a>
<a class="btn btn-default toggle_chart_settings" id="toggle_chart_settings_vis" href="#" style="display:none;"><i class="fa fa-eye-slash"></i> Hide chart settings</a>
</div>
[% END %]

18
koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc

@ -4,9 +4,9 @@
<div id="toolbar" class="btn-toolbar">
[% IF CAN_user_serials_create_subscription %]
[% IF biblionumber_for_new_subscription %]
<div class="btn-group"><a id="newsubscription" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription | html %]"><i class="fa fa-plus"></i> New subscription</a></div>
<div class="btn-group"><a id="newsubscription" class="btn btn-default" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription | html %]"><i class="fa fa-plus"></i> New subscription</a></div>
[% ELSE %]
<div class="btn-group"><a id="newsubscription" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div>
<div class="btn-group"><a id="newsubscription" class="btn btn-default" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div>
[% END %]
[% IF Koha.Preference('Mana') == 1 and Koha.Preference('AutoShareWithMana').grep('subscription').size == 0 %]
[% IF one_language_enabled==0 or mana_id %]
@ -20,7 +20,7 @@
[% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %]
[% UNLESS ( cannotedit ) %]
<div class="btn-group">
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
<ul class="dropdown-menu">
[% IF ( CAN_user_serials_edit_subscription ) %]
<li>
@ -58,16 +58,16 @@
[% IF not cannotedit or CAN_user_serials_receive_serials %]
[% IF CAN_user_serials_renew_subscription and not closed %]
<div class="btn-group"><a id="renew" class="btn btn-default btn-sm" href="#"><i class="fa fa-refresh"></i> Renew</a></div>
<div class="btn-group"><a id="renew" class="btn btn-default" href="#"><i class="fa fa-refresh"></i> Renew</a></div>
[% END %]
[% IF CAN_user_serials_receive_serials and not closed %]
<div class="btn-group"><a id="receive" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscriptionid | html %]&amp;serstatus=1,3"><i class="fa fa-inbox"></i> Receive</a></div>
<div class="btn-group"><a id="receive" class="btn btn-default" href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscriptionid | html %]&amp;serstatus=1,3"><i class="fa fa-inbox"></i> Receive</a></div>
[% END %]
[% UNLESS cannotedit %]