Skip to content

Commit aef7eb7

Browse files
pietroppietrop
authored
Merge branch 'master' into tweet-that-clip
2 parents b340166 + f0bccf2 commit aef7eb7

5 files changed

Lines changed: 41 additions & 38 deletions

File tree

‎docs/CNAME‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎docs/favicon/favicon.ico‎

-5.43 KB
Binary file not shown.

‎docs/index.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939

4040
<title> : autoEdit</title>
4141
<!-- Bootstrap core CSS -->
42-
<link rel="stylesheet" href="/css/bootstrap.min.css" >
43-
<link rel="stylesheet" href="/css/custom.css">
42+
<link rel="stylesheet" href="/autoEdit_2/css/bootstrap.min.css" >
43+
<link rel="stylesheet" href="/autoEdit_2/css/custom.css">
4444
<!-- Custom styles for this template -->
45-
<link href="/css/landing.css" rel="stylesheet">
45+
<link href="/autoEdit_2/css/landing.css" rel="stylesheet">
4646
<script src="https://code.jquery.com/jquery-1.12.4.min.js"></script>
4747
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
4848
</head>
@@ -97,14 +97,14 @@ <h3>Fast text based video editing</h3>
9797
<div class="col-lg-2">
9898
<h5>Fast transcriptions</h5>
9999
<p>Always in under 5 minutes.</p>
100-
<img class="hidden-xs hidden-sm hidden-md" src="/img/arrow1.png">
100+
<img class="hidden-xs hidden-sm hidden-md" src="/autoEdit_2/img/arrow1.png">
101101
</div>
102102
<div class="col-lg-8">
103-
<img class="img-responsive" src="/img/3_transcription.gif" alt="">
103+
<img class="img-responsive" src="/autoEdit_2/img/3_transcription.gif" alt="">
104104
</div>
105105
<div class="col-lg-2">
106106
<br>
107-
<img class="hidden-xs hidden-sm hidden-md" src="/img/arrow2.png">
107+
<img class="hidden-xs hidden-sm hidden-md" src="/autoEdit_2/img/arrow2.png">
108108
<h5>Video editing</h5>
109109
<p>Export text selections to video sequence.</p>
110110
</div>
@@ -118,29 +118,29 @@ <h5>Video editing</h5>
118118
<h3>As featured on</h3>
119119
<div class="col-lg-4 text-center">
120120
<a href="http://www.niemanlab.org/2016/10/try-out-this-open-source-tool-for-editing-video-and-audio-transcripts/" target="_blank">
121-
<img src="/img/press/niemanlab_logo.png">
121+
<img src="/autoEdit_2/img/press/niemanlab_logo.png">
122122
</a>
123123
</div>
124124
<div class="col-lg-4 text-center">
125125
<a href="https://www.journalism.co.uk/news/tool-for-journalists-autoedit-to-edit-videos-quicker-using-transcriptions/s2/a684359/" target="_blank">
126-
<img src="/img/press/jcu_logo.png">
126+
<img src="/autoEdit_2/img/press/jcu_logo.png">
127127
</a>
128128
</div>
129129
<div class="col-lg-4 text-center">
130130
<a href="https://www.rjionline.org/stories/fl171-ibm-watson-speech-to-text" target="_blank">
131-
<img src="/img/press/rij.png">
131+
<img src="/autoEdit_2/img/press/rij.png">
132132
</a>
133133
</div>
134134
</div>
135135
<div class="row">
136136
<div class="col-lg-6 text-center">
137137
<a href="https://product.voxmedia.com/2016/11/22/13669486/faster-video-editing" target="_blank">
138-
<img src="/img/press/vox_product_logo.png">
138+
<img src="/autoEdit_2/img/press/vox_product_logo.png">
139139
</a>
140140
</div>
141141
<div class="col-lg-6 text-center">
142142
<a href="https://source.opennews.org/en-US/articles/video-editing-made-better-introducing-autoedit" target="_blank">
143-
<img src="/img/press/source.png">
143+
<img src="/autoEdit_2/img/press/source.png">
144144
</a>
145145
</div>
146146
</div>

‎lib/app/templates/transcription_form_template.html.ejs‎

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<br> To use a working version of the app <a href="https://github.com/OpenNewsLabs/autoEdit_2/releases" target="_blank"> download latest the release.</a> <br>
1010
To view demo/example transcriptions <a href="/demo/#transcriptions"> click here.</a><br>
1111
To view user manual example <a href="https://pietropassarelli.gitbooks.io/autoedit2-user-manual/content/" target="_blank"> click here.</a>
12-
</div>
12+
</div>
1313
<% }%>
1414
<!-- end demo notice -->
1515

@@ -28,7 +28,7 @@
2828
<div class="form-group">
2929
<label for="fileUpload">Choose an audio or video file to transcribe</label>
3030
<% if(window.process !== undefined ){%>
31-
31+
3232
<button id="btnElectronInputMediaFile" class="btn btn-default btn-xs" class="very-sweet-looking">Choose a File</button>
3333
3434
<input id="inputElectronInputMediaFile" name="file" type="file" disabled="disabled" style=" visibility: hidden;"/>
@@ -52,7 +52,7 @@
5252
<label class="radio-inline"><input class="languageRadio" type="radio" id="pocketSphinxOption" name="optradio" value="pocketsphinx">Pocketsphinx (offline/experimental) </label><br>
5353
<label class="radio-inline"><input class="languageRadio" type="radio" id="bbcOption" name="optradio" value="BBC" >BBC <i>(Need to be a BBC employee on BBC Network)</i></label><br>
5454
<label class="radio-inline"><input class="languageRadio" type="radio" id="captionsOption" name="optradio" value="captions">Caption File <code>.srt</code> </label><br>
55-
55+
5656
</div>
5757

5858
<!-- Nav tabs -->
@@ -84,38 +84,41 @@
8484
<div role="tabpanel" class="tab-pane " id="ibm">
8585
<br>
8686
<!-- IBM languages -->
87-
<div class="options">
87+
<div class="options">
8888
<div class="form-group">
8989
<label for="languageModelIBM">IBM Languages:</label>
9090
<select class="form-control" id="languageModelIBM">
91-
<option value="en-US_BroadbandModel" >US English - Broadband</option>
92-
<option value="en-US_NarrowbandModel">US English - Narrowband</option>
91+
<option value="en-US_BroadbandModel">US English - Broadband</option>
92+
<option value="en-US_NarrowbandModel">US English - Narrowband</option>
9393
<!-- <option disabled>_________</option> -->
94-
<option value="en-UK_BroadbandModel">UK English - Broadband </option>
95-
<option value="en-UK_NarrowbandModel">UK English - Narrowband </option>
94+
<option value="en-UK_BroadbandModel">UK English - Broadband</option>
95+
<option value="en-UK_NarrowbandModel">UK English - Narrowband</option>
9696
<!-- <option disabled>_________</option> -->
97-
<option value="es-ES_BroadbandModel">Spanish - Broadband </option>
98-
<option value="es-ES_NarrowbandModel">Spanish - Narrowband </option>
97+
<option value="it-IT_BroadbandModel">Italian - Broadband</option>
98+
<option value="it-IT_NarrowbandModel">Italian - Narrowband</option>
9999
<!-- <option disabled>_________</option> -->
100-
<option value="fr-FR_BroadbandModel">French - Broadband</option>
100+
<option value="es-ES_BroadbandModel">Spanish - Broadband</option>
101+
<option value="es-ES_NarrowbandModel">Spanish - Narrowband</option>
101102
<!-- <option disabled>_________</option> -->
102-
<option value="ja-JP_BroadbandModel"> Japanese - Broadband</option>
103-
<option value="ja-JP_NarrowbandModel"> Japanese - Narrowband </option>
103+
<option value="fr-FR_BroadbandModel">French - Broadband</option>
104+
<option value="fr-FR_NarrowbandModel">French - Narrowband</option>
104105
<!-- <option disabled>_________</option> -->
105-
<option value="ar-AR_BroadbandModel"> Modern Standard Arabic - Broadband </option>
106+
<option value="de-DE_BroadbandModel">German - Broadband</option>
107+
<option value="de-DE_NarrowbandModel">German - Narrowband</option>
108+
<!-- <option disabled>_________</option> -->
109+
<option value="ja-JP_BroadbandModel">Japanese - Broadband</option>
110+
<option value="ja-JP_NarrowbandModel">Japanese - Narrowband</option>
111+
<!-- <option disabled>_________</option> -->
112+
<option value="ar-AR_BroadbandModel">Modern Standard Arabic - Broadband</option>
106113
<!-- <option disabled>_________</option> -->
107-
<option value="pt-BR_BroadbandModel"> Brazilian Portuguese - Broadband</option>
108-
<option value="pt-BR_NarrowbandModel"> Brazilian Portuguese - Narrowband</option>
114+
<option value="pt-BR_BroadbandModel">Brazilian Portuguese - Broadband</option>
115+
<option value="pt-BR_NarrowbandModel">Brazilian Portuguese - Narrowband</option>
116+
<!-- <option disabled>_________</option> -->
117+
<option value="zh-CN_BroadbandModel">Mandarin Chinese - Broadband</option>
118+
<option value="zh-CN_NarrowbandModel">Mandarin Chinese - Narrowband</option>
109119
<!-- <option disabled>_________</option> -->
110-
<option value="zh-CN_BroadbandModel"> Mandarin Chinese - Broadband </option>
111-
<option value="zh-CN_NarrowbandModel">Mandarin Chinese - Narrowband </option>
112-
113-
<option value="ar-AR_BroadbandModel">Modern Standard Arabic - Broadband</option>
114-
115120
<option value="ko-KR_BroadbandModel">Korean - Broadband</option>
116121
<option value="ko-KR_NarrowbandModel">Korean - Narrowband</option>
117-
118-
<!-- TODO: add arabic option -->
119122
</select>
120123
<p class="help-block">choose the language of your media file. The default is English US.</p>
121124
<p class="help-block">IBM® recommends that you use narrowband model for decoding of telephone speech.</p>
@@ -221,12 +224,12 @@
221224
<!-- Eng Rev languages -->
222225
</div>
223226

224-
227+
225228
<div role="tabpanel" class="tab-pane" id="gentle">
226229
<br>
227230
<label for="languageModel">Gentle/Kaldi Speech To Text:</label><br>
228231
<i> <a href="https://pietropassarelli.gitbooks.io/autoedit2-user-manual/content/setup-stt-apis/setup-stt-apis-gentle.html" target="_blank">See User manual for extra setup needed</a>, Only support US English For now, only works on Mac OSX</i></div>
229-
232+
230233
<div role="tabpanel" class="tab-pane" id="pocketsphinx">
231234
<br>
232235
<label for="languageModel">Pocketsphinx Speech To Text:</label><br>
@@ -248,7 +251,7 @@
248251
<div role="tabpanel" class="tab-pane" id="captions">
249252
<br>
250253
<label for="languageModel">Captions <code>.srt</code> file:</label><br>
251-
254+
252255
<!-- srt -->
253256
<div class="form-group">
254257
<label for="fileUpload">Choose a caption file to <code>.srt</code> to associate with your audio or video file</label>

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"name": "autoEdit2",
33
"productName": "autoEdit2",
44
"version": "1.0.23-alpha.2",
5+
"version": "1.0.24",
56
"description": "Fast text based video editing app",
67
"main": "electron/main.js",
78
"scripts": {

0 commit comments

Comments
 (0)