From d84cab1278ce5abaed83c6e314897bbe0e2ee9ee Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Thu, 8 May 2014 10:00:08 -0400 Subject: [PATCH] turn navbar into a directive for hotkey integration includes a sample hotkey (eg-accesskey) declaration -- more work to do here Signed-off-by: Bill Erickson --- Open-ILS/src/templates/staff/t_base.tt2 | 9 ++- Open-ILS/src/templates/staff/t_base_js.tt2 | 7 +-- Open-ILS/src/templates/staff/t_navbar.tt2 | 9 +-- Open-ILS/web/js/ui/default/staff/navbar.js | 47 -------------- Open-ILS/web/js/ui/default/staff/services/core.js | 2 +- .../web/js/ui/default/staff/services/navbar.js | 73 ++++++++++++++++++++++ 6 files changed, 89 insertions(+), 58 deletions(-) delete mode 100644 Open-ILS/web/js/ui/default/staff/navbar.js create mode 100644 Open-ILS/web/js/ui/default/staff/services/navbar.js diff --git a/Open-ILS/src/templates/staff/t_base.tt2 b/Open-ILS/src/templates/staff/t_base.tt2 index aade37c657..4476612473 100644 --- a/Open-ILS/src/templates/staff/t_base.tt2 +++ b/Open-ILS/src/templates/staff/t_base.tt2 @@ -9,11 +9,18 @@ + - [% INCLUDE "staff/t_navbar.tt2" %] + + + + +
[% content %]
[% # status bar along bottom of page diff --git a/Open-ILS/src/templates/staff/t_base_js.tt2 b/Open-ILS/src/templates/staff/t_base_js.tt2 index 22318015ee..bf0cc98721 100644 --- a/Open-ILS/src/templates/staff/t_base_js.tt2 +++ b/Open-ILS/src/templates/staff/t_base_js.tt2 @@ -1,8 +1,5 @@ - - - [% - EG_VERSION = '0.0.1'; # FIXME: build optoin + EG_VERSION = '0.0.1'; # FIXME: build option EXPAND_JS_IMPORTS = 1; # FIXME: env option? %] @@ -34,7 +31,7 @@ - + diff --git a/Open-ILS/src/templates/staff/t_navbar.tt2 b/Open-ILS/src/templates/staff/t_navbar.tt2 index bf093202e8..0d56a2445c 100644 --- a/Open-ILS/src/templates/staff/t_navbar.tt2 +++ b/Open-ILS/src/templates/staff/t_navbar.tt2 @@ -16,7 +16,7 @@