Skip to content

Commit 2d231b3

Browse files
icfung828icfung828
authored
Merge branch 'master' into rachel-branch
2 parents be05099 + 4289394 commit 2d231b3

File tree

82 files changed

+1472
-971
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+1472
-971
lines changed

‎_config.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ baseurl: /web-twain/docs/
3131

3232
theme: jekyll-theme-cayman
3333

34+
useVersionTreeV2: true
35+
3436
plugins:
3537
- jemoji
3638

‎_data/full_tree.yml‎

Lines changed: 290 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,290 @@
1+
tree_list:
2+
- name: About
3+
path: /about/
4+
startVersion:
5+
endVersion:
6+
childList:
7+
- name: Resource
8+
path: /about/resources.html
9+
startVersion:
10+
endVersion:
11+
- name: License
12+
path: /about/license.html
13+
startVersion:
14+
endVersion:
15+
- name: Support
16+
path: /about/getsupport.html
17+
startVersion:
18+
endVersion:
19+
- name: Getting Started
20+
path: /getstarted/
21+
startVersion:
22+
endVersion:
23+
childList:
24+
- name: HelloWorld
25+
path: /getstarted/helloworld.html
26+
startVersion:
27+
endVersion:
28+
- name: Hardware
29+
path: /getstarted/hardware.html
30+
startVersion:
31+
endVersion:
32+
- name: Platform
33+
path: /getstarted/platform.html
34+
startVersion:
35+
endVersion:
36+
- name: FileTypes
37+
path: /getstarted/filetype.html
38+
startVersion:
39+
endVersion:
40+
- name: Features
41+
path: /indepth/features/
42+
startVersion:
43+
endVersion:
44+
childList:
45+
- name: Initialize
46+
path: /indepth/features/initialize.html
47+
startVersion:
48+
endVersion:
49+
- name: Input
50+
path: /indepth/features/input.html
51+
startVersion:
52+
endVersion:
53+
- name: Output
54+
path: /indepth/features/output.html
55+
startVersion:
56+
endVersion:
57+
- name: Buffer
58+
path: /indepth/features/buffer.html
59+
startVersion:
60+
endVersion:
61+
- name: Viewer
62+
path: /indepth/features/viewer.html
63+
startVersion:
64+
endVersion:
65+
- name: UI
66+
path: /indepth/features/ui.html
67+
startVersion:
68+
endVersion:
69+
- name: Edit
70+
path: /indepth/features/edit.html
71+
startVersion:
72+
endVersion:
73+
- name: Barcode
74+
path: /indepth/features/barcode.html
75+
startVersion:
76+
endVersion:
77+
- name: OCR
78+
path: /indepth/features/ocr.html
79+
startVersion:
80+
endVersion:
81+
- name: PDF
82+
path: /indepth/features/pdf.html
83+
startVersion:
84+
endVersion:
85+
- name: Development
86+
path: /indepth/development/
87+
startVersion:
88+
endVersion:
89+
childList:
90+
- name: Angular Integration
91+
path: /indepth/development/angular.html
92+
startVersion:
93+
endVersion:
94+
- name: React Integration
95+
path: /indepth/development/react.html
96+
startVersion:
97+
endVersion:
98+
- name: Vue Integration
99+
path: /indepth/development/vue.html
100+
startVersion:
101+
endVersion:
102+
- name: Server-side Scripting
103+
path: /indepth/development/Server-script.html
104+
startVersion:
105+
endVersion:
106+
- name: Professional Service
107+
path: /indepth/development/Pro-service.html
108+
startVersion:
109+
endVersion: 17.1.1
110+
- name: Upgrade Guide
111+
path: /indepth/development/upgrade.html
112+
startVersion:
113+
endVersion:
114+
- name: About ActiveX
115+
path: /indepth/development/activex.html
116+
startVersion:
117+
endVersion:
118+
- name: FileTypes
119+
path: /indepth/development/armmips.html
120+
startVersion:
121+
endVersion: 17.1.1
122+
- name: ARM64 & MIPS64 Support
123+
path: /indepth/development/armmips.html
124+
startVersion: 17.1.1
125+
endVersion:
126+
- name: Professional Service
127+
path: /indepth/development/Pro-service.html
128+
startVersion: 17.1.1
129+
endVersion:
130+
- name: Deployment
131+
path: /indepth/deployment/
132+
startVersion:
133+
endVersion:
134+
childList:
135+
- name: Server Setup
136+
path: /indepth/deployment/server.html
137+
startVersion:
138+
endVersion:
139+
- name: Service Setup
140+
path: /indepth/deployment/service.html
141+
startVersion:
142+
endVersion:
143+
- name: Schedule
144+
path: /info/schedule/
145+
startVersion:
146+
endVersion:
147+
childList:
148+
- name: Server Setup
149+
path: /info/schedule/stable.html
150+
startVersion:
151+
endVersion: 17.1.1
152+
- name: Service Setup
153+
path: /info/schedule/Addon.html
154+
startVersion:
155+
endVersion: 17.1.1
156+
- name: Service Setup
157+
path: /info/schedule/deprecated.html
158+
startVersion:
159+
endVersion: 17.1.1
160+
- name: Stable
161+
path: /info/schedule/stable.html
162+
startVersion: 17.1.1
163+
endVersion:
164+
- name: Addon
165+
path: /info/schedule/Addon.html
166+
startVersion: 17.1.1
167+
endVersion:
168+
- name: Deprecated
169+
path: /info/schedule/deprecated.html
170+
startVersion: 17.1.1
171+
endVersion:
172+
- name: API Reference
173+
path: /info/api/
174+
startVersion:
175+
endVersion:
176+
childList:
177+
- name: Dynamsoft_DWT
178+
path: /info/api/Dynamsoft_WebTwainEnv.html
179+
startVersion:
180+
endVersion:
181+
- name: Dynamsoft_Enum
182+
path: /info/api/Dynamsoft_Enum.html
183+
startVersion:
184+
endVersion:
185+
- name: WebTwain_Scanner
186+
path: /info/api/WebTwain_Acquire.html
187+
startVersion:
188+
endVersion:
189+
- name: WebTwain_Buffer
190+
path: /info/api/WebTwain_Buffer.html
191+
startVersion:
192+
endVersion:
193+
- name: WebTwain_Viewer
194+
path: /info/api/WebTwain_Viewer.html
195+
startVersion:
196+
endVersion:
197+
- name: WebTwain_Edit
198+
path: /info/api/WebTwain_Edit.html
199+
startVersion:
200+
endVersion:
201+
- name: WebTwain_IO
202+
path: /info/api/WebTwain_IO.html
203+
startVersion:
204+
endVersion:
205+
- name: WebTwain_Util
206+
path: /info/api/WebTwain_Util.html
207+
startVersion:
208+
endVersion:
209+
- name: Addon_BarcodeReader
210+
path: /info/api/Addon_BarcodeReader.html
211+
startVersion:
212+
endVersion:
213+
- name: Addon_Camera
214+
path: /info/api/Addon_Camera.html
215+
startVersion:
216+
endVersion:
217+
- name: Addon_OCR
218+
path: /info/api/Addon_OCR.html
219+
startVersion:
220+
endVersion: 17.1.1
221+
- name: Addon_OCRPro
222+
path: /info/api/Addon_OCRPro.html
223+
startVersion:
224+
endVersion: 17.1.1
225+
- name: Addon_PDF
226+
path: /info/api/Addon_PDF.html
227+
startVersion:
228+
endVersion:
229+
- name: Addon_Webcam
230+
path: /info/api/Addon_Webcam.html
231+
startVersion:
232+
endVersion:
233+
- name: Dynamsoft_FileUploader
234+
path: /info/api/Dynamsoft_FileUploader.html
235+
startVersion:
236+
endVersion:
237+
- name: API Appendix
238+
path: /info/api/appendix.html
239+
startVersion:
240+
endVersion:
241+
- name: FAQ
242+
path: /faq/
243+
startVersion:
244+
endVersion:
245+
isHashNode: true
246+
childList:
247+
- name: SDK Download/Free Trial
248+
path: /faq/#sdk-downloadfree-trial
249+
startVersion:
250+
endVersion:
251+
- name: Capture/Image Source
252+
path: /faq/#captureimage-source
253+
startVersion:
254+
endVersion:
255+
- name: Image Viewer
256+
path: /faq/#image-viewer
257+
startVersion:
258+
endVersion:
259+
- name: Image Editing
260+
path: /faq/#image-editing
261+
startVersion:
262+
endVersion:
263+
- name: UI Customization
264+
path: /faq/#ui-customization
265+
startVersion:
266+
endVersion:
267+
- name: Document Saving
268+
path: /faq/#document-saving
269+
startVersion:
270+
endVersion:
271+
- name: Security
272+
path: /faq/#security
273+
startVersion:
274+
endVersion:
275+
- name: Addon
276+
path: /faq/#addon
277+
startVersion:
278+
endVersion:
279+
- name: Project Deployment and End-user Installation
280+
path: /faq/#project-deployment-and-end-user-installation
281+
startVersion:
282+
endVersion:
283+
- name: Error Troubleshooting
284+
path: /faq/#error-troubleshooting
285+
startVersion:
286+
endVersion:
287+
- name: Licensing and Purchase
288+
path: /faq/#licensing-and-purchase
289+
startVersion:
290+
endVersion:

‎_includes/dwtNav.html‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@
3636
<li class="item">
3737
<a class="pdf" href="https://www.dynamsoft.com/web-twain/pdf-to-image-javascript">PDF Rasterizer</a>
3838
</li>
39-
<li class="item">
40-
<a class="ocr" href="https://www.dynamsoft.com/web-twain/cpp-ocr-library">Text Recognition (OCR)</a>
41-
</li>
4239
<li class="item">
4340
<a class="barcode" href="https://www.dynamsoft.com/web-twain/barcode-recognition-document">Barcode Recognition</a>
4441
</li>
@@ -96,24 +93,21 @@
9693
<a href="https://www.dynamsoft.com/web-twain/features/mobile-web-capture-sdk/">Mobile Web Capture</a>
9794
</li>
9895
<li class="item">
99-
<a href="https://www.dynamsoft.com/web-twain/pdf-to-image-javascript">PDF Rasterizer</a>
100-
</li>
101-
<li class="item">
102-
<a href="https://www.dynamsoft.com/web-twain/cpp-ocr-library">Text Recognition (OCR)</a>
96+
<a href="https://www.dynamsoft.com/web-twain/pdf-to-image-javascript/">PDF Rasterizer</a>
10397
</li>
10498
<li class="item">
105-
<a href="https://www.dynamsoft.com/web-twain/barcode-recognition-document">Barcode Recognition</a>
99+
<a href="https://www.dynamsoft.com/web-twain/barcode-recognition-document/">Barcode Recognition</a>
106100
</li>
107101
</ul>
108102
</li>
109103
<li class="item">
110-
<a class="textUpperCase" href="https://www.dynamsoft.com/web-twain/resources">Resources</a>
104+
<a class="textUpperCase" href="https://www.dynamsoft.com/web-twain/resources/">Resources</a>
111105
</li>
112106
<li class="item">
113-
<a id="DWTBuyBtn" class="textUpperCase" href="https://www.dynamsoft.com/store/dynamic-web-twain">Buy</a>
107+
<a id="DWTBuyBtn" class="textUpperCase" href="https://www.dynamsoft.com/store/dynamic-web-twain/">Buy</a>
114108
</li>
115109
<li class="item">
116-
<a class="orangeLink textUpperCase" href="https://www.dynamsoft.com/web-twain/downloads">Download Free Trial</a>
110+
<a class="orangeLink textUpperCase" href="https://www.dynamsoft.com/web-twain/downloads/">Download Free Trial</a>
117111
</li>
118112
</ul>
119113
</div>

‎_includes/sidelist-about/about.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<li><a href="{{ site.about }}" class="otherLinkColour">About</a>
22
<ul>
33
{%- if page.url contains '/about/' -%}
4-
<li><a href="{{ site.about }}features.html" class="otherLinkColour">Specification</a></li>
54
<li><a href="{{ site.about }}resources.html" class="otherLinkColour">Resources</a></li>
65
<li><a href="{{ site.about }}license.html" class="otherLinkColour">License</a></li>
76
<li><a href="{{ site.about }}getsupport.html" class="otherLinkColour">Support</a></li>

‎_includes/sidelist-indepth/development.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<li><a href="{{site.indepth}}development/angular.html" class="otherLinkColour">Angular Integration</a></li>
55
<li><a href="{{site.indepth}}development/react.html" class="otherLinkColour">React Integration</a></li>
66
<li><a href="{{site.indepth}}development/vue.html" class="otherLinkColour">Vue Integration</a></li>
7-
<!--<li><a href="{{site.indepth}}development/mvc.html" class="otherLinkColour">MVC Integration</a></li> -->
87
<li><a href="{{site.indepth}}development/Server-script.html" class="otherLinkColour">Server-side Scripting</a></li>
9-
<li><a href="{{site.indepth}}development/Pro-service.html" class="otherLinkColour">Professional Service</a></li>
8+
<li><a href="{{site.indepth}}development/mobile-web-capture.html" class="otherLinkColour">Mobile Web Capture</a></li>
109
<li><a href="{{site.indepth}}development/upgrade.html" class="otherLinkColour">Upgrade Guide</a></li>
1110
<li><a href="{{site.indepth}}development/activex.html" class="otherLinkColour">About ActiveX</a></li>
1211
<li><a href="{{site.indepth}}development/armmips.html" class="otherLinkColour">ARM64 & MIPS64 Support</a></li>
12+
<li><a href="{{site.indepth}}development/Pro-service.html" class="otherLinkColour">Professional Service</a></li>
1313
{%- endif -%}
1414
</ul>
1515
</li>

0 commit comments

Comments
 (0)