Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 4331e53

Browse files
livecodealilivecodeali
authored
Merge pull request #1860 from livecode/merge-develop-8.2-15.12.2017
Merge develop 8.2 15.12.2017
2 parents d5f6504 + 0ba507a commit 4331e53

15 files changed

Lines changed: 251 additions & 195 deletions

‎Documentation/html_viewer/api.html.template‎

Lines changed: 47 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
<head>
4-
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6-
<meta name="viewport" content="width=device-width, initial-scale=1">
7-
8-
<title>LiveCode Dictionary</title>
9-
10-
<link href="[[tDocsCSSFolder]]/bootstrap.min.css" rel="stylesheet">
11-
<link href="[[tDocsCSSFolder]]/lcdoc.css" rel="stylesheet">
12-
<link href="[[tDocsCSSFolder]]/codestyle.css" rel="stylesheet">
3+
<head>
4+
<meta charset="utf-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6+
<meta name="viewport" content="width=device-width, initial-scale=1">
7+
8+
<title>LiveCode Dictionary</title>
9+
10+
<link href="[[tDocsCSSFolder]]/bootstrap.min.css" rel="stylesheet">
11+
<link href="[[tDocsCSSFolder]]/lcdoc.css" rel="stylesheet">
12+
<link href="[[tDocsCSSFolder]]/codestyle.css" rel="stylesheet">
1313
</head>
1414
<body>
1515

@@ -73,63 +73,62 @@
7373
<div class="row">
7474
<div class="col-md-3">
7575
<div class="bs-sidebar" id="lcdoc_sidebar">
76-
<div class="panel panel-default" id="filters_panel">
76+
<div class="panel panel-default" id="filters_panel">
7777
<div class="panel-heading">Filters</div>
7878
<div class="panel-body" id="filters_container">
7979
<div id="filters">none</div>
8080
<div id="filters_options"></div>
81-
</div>
81+
</div>
8282
</div>
8383
</div>
84-
</div>
84+
</div>
8585

86-
<div class="col-md-9">
87-
<div id="header_panel_holder">
86+
<div class="col-md-9">
87+
<div id="header_panel_holder">
8888
<div class="panel panel-default" id="lcdoc_list">
8989
<div id="table_header">
9090
<table class="table table-hover table-condensed" id="table_list_header">
9191
</table>
9292
</div>
93-
<div id="table_container">
93+
<div id="table_container">
9494
<table class="table table-hover table-condensed" id="table_list">
9595
</table>
9696
</div>
9797
<!-- header panel resizer -->
9898
<div id="resizer">
99-
</div>
100-
</div>
101-
</div>
99+
</div>
100+
</div>
101+
</div>
102102

103-
<div class="panel panel-default" id="lcdoc_body">
104-
<div class="panel-body" id="api_entry">
105-
</div>
106-
107-
</div>
108-
</div>
109-
</div>
103+
<div class="panel panel-default" id="lcdoc_body">
104+
<div class="panel-body" id="api_entry">
105+
</div>
106+
107+
</div>
108+
</div>
109+
</div>
110110
</div>
111-
112-
<script src="[[tDocsJSFolder]]/jquery-1.11.1.min.js"></script>
113-
<script src="[[tDocsJSFolder]]/jquery.session.js"></script>
114-
<script src="[[tDocsJSFolder]]/bootstrap.min.js"></script>
115-
<script src="[[tDocsJSFolder]]/marked.js"></script>
116-
<script src="[[tDocsJSFolder]]/highlight.pack.js"></script>
117-
<script src="[[tDocsJSFolder]]/jquery.mousewheel.min.js"></script>
118-
119-
<script charset="UTF-8" src="[[tDataPath]]"></script>
120-
<script src="[[tDocsJSFolder]]/dictionary_functions.js"></script>
121-
<script>
122-
123-
$(document).ready(function(e)
124-
{
125-
setEdition('[[ the editionType]]');
126-
setActions();
127-
dataFilter();
128-
displayLibraryChooser();
129-
130-
goEntryName('[[tLibraryName]]', '[[tEntryName]]', '[[tEntryType]]');
131-
document.getElementById("ui_filer").focus();
132-
});
111+
112+
<script src="[[tDocsJSFolder]]/jquery-1.11.1.min.js"></script>
113+
<script src="[[tDocsJSFolder]]/jquery.session.js"></script>
114+
<script src="[[tDocsJSFolder]]/bootstrap.min.js"></script>
115+
<script src="[[tDocsJSFolder]]/marked.js"></script>
116+
<script src="[[tDocsJSFolder]]/highlight.pack.js"></script>
117+
<script src="[[tDocsJSFolder]]/jquery.mousewheel.min.js"></script>
118+
119+
<script charset="UTF-8" src="[[tDataPath]]"></script>
120+
<script src="[[tDocsJSFolder]]/dictionary_functions.js"></script>
121+
<script>
122+
$(document).ready(function(e)
123+
{
124+
setEdition('[[ the editionType]]');
125+
setActions();
126+
dataFilter();
127+
displayLibraryChooser();
128+
129+
goEntryName('[[tLibraryName]]', '[[tEntryName]]', '[[tEntryType]]');
130+
document.getElementById("ui_filer").focus();
131+
});
133132
</script>
134133
</body>
135134
</html>

0 commit comments

Comments
 (0)