Skip to content

Commit 4965794

Browse files
emgeieremgeier
committed
centralize navbar code, cleanup persName with placeName embedded during json transformation, fixed keyboard menu bug
1 parent 82bc118 commit 4965794

5 files changed

Lines changed: 426 additions & 231 deletions

File tree

‎about.html‎

Lines changed: 3 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -69,107 +69,12 @@
6969
<script type="text/javascript" src="/resources/keyboard/layouts/ms-Greek.min.js"></script>
7070
<script type="text/javascript" src="/resources/keyboard/layouts/ms-Russian.min.js"></script>
7171
<script type="text/javascript" src="/resources/keyboard/layouts/ms-Arabic.min.js"></script>
72-
<script type="text/javascript">
73-
$(document).ready(function () {
74-
$('[data-toggle="tooltip"]').tooltip({ container: 'body' })
72+
<script type="text/javascript" src="/resources/js/keyboard.js"></script>
7573

76-
$('.keyboard').keyboard({
77-
openOn: null,
78-
stayOpen: false,
79-
alwaysOpen: false,
80-
autoAccept: true,
81-
usePreview: false,
82-
initialFocus: true,
83-
rtl : true,
84-
layout: 'syriac-phonetic',
85-
hidden: function(event, keyboard, el){
86-
// keyboard.destroy();
87-
}
88-
});
89-
90-
$('.keyboard-select').click(function () {
91-
var keyboardID = '#' + $(this).data("keyboard-id")
92-
var kb = $(keyboardID).getkeyboard();
93-
//var kb = $('#searchField').getkeyboard();
94-
// change layout based on link ID
95-
kb.options.layout = this.id
96-
// open keyboard if layout is different, or time from it last closing is &gt; 200 ms
97-
if (kb.last.layout !== kb.options.layout || (new Date().getTime() - kb.last.eventTime) &gt; 200) {
98-
kb.reveal();
99-
}
100-
});
101-
//Change fonts
102-
$('.swap-font').on('click', function(){
103-
var selectedFont = $(this).data("font-id")
104-
$('.selectableFont').not('.syr').css('font-family', selectedFont);
105-
$("*:lang(syr)").css('font-family', selectedFont)
106-
});
107-
108-
})
109-
</script>
11074
</head>
11175
<body id="body">
112-
<nav class="navbar navbar-default navbar-fixed-top" role="navigation" data-template="app:fix-links">
113-
114-
<div class="navbar-header">
115-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
116-
<span class="sr-only">Toggle navigation</span>
117-
<span class="icon-bar"></span>
118-
<span class="icon-bar"></span>
119-
<span class="icon-bar"></span>
120-
</button>
121-
<a class="navbar-brand banner-container" href="/index.html">
122-
<span class="syriaca-icon syriaca-mss banner-icon"><span class="path1"></span><span class="path2"></span><span class="path3"></span><span class="path4"></span>
123-
</span>
124-
<span class="banner-text">Syriac Manuscripts in the British Library</span>
125-
</a>
126-
127-
</div>
128-
129-
<div class="navbar-collapse collapse pull-right" id="navbar-collapse-1">
130-
131-
<ul class="nav navbar-nav">
132-
133-
<li>
134-
<a href="/browse.html" class="nav-text">Browse</a>
135-
136-
</li>
137-
138-
<li data-template="app:shared-content" data-template-path="/templates/shared-links.html"></li>
139-
140-
<li>
141-
<a href="/search.html" class="nav-text">Advanced Search</a>
142-
143-
</li>
144-
145-
<li>
146-
147-
<div id="search-wrapper">
148-
149-
<form class="navbar-form navbar-right search-box" role="search" action="/search.html" method="get">
150-
151-
<div class="form-group">
152-
<input type="text" class="form-control keyboard" placeholder="search" name="keyword" id="keywordNav" />
153-
<span data-template="app:keyboard-select-menu" data-template-input-id="keywordNav"></span>
154-
<button class="btn btn-default search-btn" id="searchbtn" type="submit" title="Search">
155-
<span class="glyphicon glyphicon-search"></span>
156-
</button>
157-
158-
</div>
159-
160-
</form>
161-
162-
</div>
163-
164-
</li>
165-
166-
<li data-template="app:shared-content" data-template-path="/templates/fontMenu.html"></li>
167-
168-
</ul>
169-
170-
</div>
171-
172-
</nav>
76+
<script src="resources/js/navbar-search.js"></script>
77+
<div id="navbar-container"></div>
17378
<div xmlns:xi="http://www.w3.org/2001/XInclude" data-template="templates:surround" data-template-with="templates/bl.html" data-template-at="content">
17479

17580
<div class="main-content-block">

‎index.html‎

Lines changed: 3 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -69,107 +69,12 @@
6969
<script type="text/javascript" src="/resources/keyboard/layouts/ms-Greek.min.js"></script>
7070
<script type="text/javascript" src="/resources/keyboard/layouts/ms-Russian.min.js"></script>
7171
<script type="text/javascript" src="/resources/keyboard/layouts/ms-Arabic.min.js"></script>
72-
<script type="text/javascript">
73-
$(document).ready(function () {
74-
$('[data-toggle="tooltip"]').tooltip({ container: 'body' })
72+
<script type="text/javascript" src="/resources/js/keyboard.js"></script>
7573

76-
$('.keyboard').keyboard({
77-
openOn: null,
78-
stayOpen: false,
79-
alwaysOpen: false,
80-
autoAccept: true,
81-
usePreview: false,
82-
initialFocus: true,
83-
rtl : true,
84-
layout: 'syriac-phonetic',
85-
hidden: function(event, keyboard, el){
86-
// keyboard.destroy();
87-
}
88-
});
89-
90-
$('.keyboard-select').click(function () {
91-
var keyboardID = '#' + $(this).data("keyboard-id")
92-
var kb = $(keyboardID).getkeyboard();
93-
//var kb = $('#searchField').getkeyboard();
94-
// change layout based on link ID
95-
kb.options.layout = this.id
96-
// open keyboard if layout is different, or time from it last closing is &gt; 200 ms
97-
if (kb.last.layout !== kb.options.layout || (new Date().getTime() - kb.last.eventTime) &gt; 200) {
98-
kb.reveal();
99-
}
100-
});
101-
//Change fonts
102-
$('.swap-font').on('click', function(){
103-
var selectedFont = $(this).data("font-id")
104-
$('.selectableFont').not('.syr').css('font-family', selectedFont);
105-
$("*:lang(syr)").css('font-family', selectedFont)
106-
});
107-
108-
})
109-
</script>
11074
</head>
11175
<body id="body">
112-
<nav class="navbar navbar-default navbar-fixed-top" role="navigation" data-template="app:fix-links">
113-
114-
<div class="navbar-header">
115-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
116-
<span class="sr-only">Toggle navigation</span>
117-
<span class="icon-bar"></span>
118-
<span class="icon-bar"></span>
119-
<span class="icon-bar"></span>
120-
</button>
121-
<a class="navbar-brand banner-container" href="/index.html">
122-
<span class="syriaca-icon syriaca-mss banner-icon"><span class="path1"></span><span class="path2"></span><span class="path3"></span><span class="path4"></span>
123-
</span>
124-
<span class="banner-text">Syriac Manuscripts in the British Library</span>
125-
</a>
126-
127-
</div>
128-
129-
<div class="navbar-collapse collapse pull-right" id="navbar-collapse-1">
130-
131-
<ul class="nav navbar-nav">
132-
133-
<li>
134-
<a href="/browse.html" class="nav-text">Browse</a>
135-
136-
</li>
137-
138-
<li data-template="app:shared-content" data-template-path="/templates/shared-links.html"></li>
139-
140-
<li>
141-
<a href="/search.html" class="nav-text">Advanced Search</a>
142-
143-
</li>
144-
145-
<li>
146-
147-
<div id="search-wrapper">
148-
149-
<form class="navbar-form navbar-right search-box" role="search" action="/search.html" method="get">
150-
151-
<div class="form-group">
152-
<input type="text" class="form-control keyboard" placeholder="search" name="keyword" id="keywordNav" />
153-
<span data-template="app:keyboard-select-menu" data-template-input-id="keywordNav"></span>
154-
<button class="btn btn-default search-btn" id="searchbtn" type="submit" title="Search">
155-
<span class="glyphicon glyphicon-search"></span>
156-
</button>
157-
158-
</div>
159-
160-
</form>
161-
162-
</div>
163-
164-
</li>
165-
166-
<li data-template="app:shared-content" data-template-path="/templates/fontMenu.html"></li>
167-
168-
</ul>
169-
170-
</div>
171-
172-
</nav>
76+
<script src="resources/js/navbar-search.js"></script>
77+
<div id="navbar-container"></div>
17378
<div xmlns:xi="http://www.w3.org/2001/XInclude" data-template="templates:surround" data-template-with="templates/bl.html" data-template-at="content">
17479

17580
<div class="main-content-block">

0 commit comments

Comments
 (0)