Merge branch 'master' into download-url

UB-Mannheim · Dec 11, 2017 · 3504d80 · 3504d80
2 parents 24b5050 + 3a24d4f
commit 3504d80
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 15 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -5,11 +5,12 @@ MAINTAINER Konstantin Baierer <[email protected]>
 EXPOSE 8080
 COPY . /ocr-fileformat
 WORKDIR /ocr-fileformat
-RUN apk add --no-cache openjdk8-jre php7 php7-json python py-lxml git make ca-certificates wget bash gcc libc-dev \
+RUN apk add --no-cache openjdk8-jre php7 php7-json php7-openssl python py-lxml git make ca-certificates wget bash gcc libc-dev \
     && update-ca-certificates \
     && make install \
     && cp docker.config.php web/config.local.php \
     && sed -i '/^upload_max_filesize/ s/=.*$/= 100M' \
+    && sed -i 's/;extension=php_openssl.dll/extension=php_openssl.dll/' /etc/php7/php.ini \
     && mv web /ocr-fileformat-web \
     && rm -rf /ocr-fileformat \
     && apk del git make wget gcc libc-dev

diff --git a/web/index.html b/web/index.html
@@ -40,6 +40,23 @@
 
         <div class="tab-pane active" id="transform">
 
+          <div class="row">
+
+              <div class="col-xs-3">
+
+                <!-- Nav tabs -->
+                <ul class="nav nav-tabs nav-justified" role="tablist">
+                  <li role="presentation" class="active">
+                    <a role="tab" data-toggle="tab" href="#transform-url-tab" tabindex=-1>URL</a>
+                  </li>
+                  <li role="presentation">
+                    <a role="tab" data-toggle="tab" href="#transform-file-tab" tabindex=-1>Upload</a>
+                  </li>
+                </ul>
+
+              </div>
+          </div>
+
           <div class="row">
 
               <div class="col-xs-6">
@@ -61,16 +78,6 @@
                   </div>
                 </div>
 
-                <!-- Nav tabs -->
-                <ul class="nav nav-tabs nav-justified" role="tablist">
-                  <li role="presentation" class="active">
-                    <a role="tab" data-toggle="tab" href="#transform-url-tab" tabindex=-1>URL</a>
-                  </li>
-                  <li role="presentation">
-                    <a role="tab" data-toggle="tab" href="#transform-file-tab" tabindex=-1>Upload</a>
-                  </li>
-                </ul>
-
               </div>
 
               <div class="col-xs-6">
@@ -180,21 +187,21 @@ <h3>Examples</h3>
         <h4>ABBYY FineReader</h4>
 
         <ul>
-          <li><a href="http://digi.bib.uni-mannheim.de/~stweil/ocr-praxis/Testseiten/abbyy/417576986_0031.xml">http://digi.bib.uni-mannheim.de/~stweil/ocr-praxis/Testseiten/abbyy/417576986_0031.xml</a></li>
+          <li><a href="https://digi.bib.uni-mannheim.de/~stweil/ocr-praxis/Testseiten/abbyy/417576986_0031.xml">https://digi.bib.uni-mannheim.de/~stweil/ocr-praxis/Testseiten/abbyy/417576986_0031.xml</a></li>
         </ul>
 
         <h4>hOCR</h4>
         <ul>
           <li><a href="https://cdn.rawgit.com/kba/ocr-fileformat-samples/master/samples/hocr/1.1/wetzel_reisebegleiter_1901_0021.hocr">https://cdn.rawgit.com/kba/ocr-fileformat-samples/master/samples/hocr/1.1/wetzel_reisebegleiter_1901_0021.hocr</a></li>
-          <li><a href="http://digi.bib.uni-mannheim.de/~stweil/ocr-praxis/0001-tesseract.hocr">http://digi.bib.uni-mannheim.de/~stweil/ocr-praxis/0001-tesseract.hocr</a></li>
+          <li><a href="https://digi.bib.uni-mannheim.de/~stweil/ocr-praxis/0001-tesseract.hocr">https://digi.bib.uni-mannheim.de/~stweil/ocr-praxis/0001-tesseract.hocr</a></li>
           </ul>
 
           <h4>ALTO</h4>
           <ul>
 
             <li><a href="http://chroniclingamerica.loc.gov/lccn/sn86069133/1910-10-31/ed-1/seq-1/ocr.xml">http://chroniclingamerica.loc.gov/lccn/sn86069133/1910-10-31/ed-1/seq-1/ocr.xml</a></li>
-            <li><a href="http://digi.bib.uni-mannheim.de/~stweil/ocr-praxis/Testseiten/">http://digi.bib.uni-mannheim.de/~stweil/ocr-praxis/Testseiten/</a></li>
-            <li><a href="http://digi.bib.uni-mannheim.de/~stweil/ocr-praxis/Testseiten/alto/417576986_0031.xml">http://digi.bib.uni-mannheim.de/~stweil/ocr-praxis/Testseiten/alto/417576986_0031.xml</a></li>
+            <li><a href="https://digi.bib.uni-mannheim.de/~stweil/ocr-praxis/Testseiten/">https://digi.bib.uni-mannheim.de/~stweil/ocr-praxis/Testseiten/</a></li>
+            <li><a href="https://digi.bib.uni-mannheim.de/~stweil/ocr-praxis/Testseiten/alto/417576986_0031.xml">https://digi.bib.uni-mannheim.de/~stweil/ocr-praxis/Testseiten/alto/417576986_0031.xml</a></li>
             <li><a href="https://rawgit.com/kba/ocr-fileformat-samples/master/samples/alto/2.0/wetzel_reisebegleiter_1901_0021.alto">https://rawgit.com/kba/ocr-fileformat-samples/master/samples/alto/2.0/wetzel_reisebegleiter_1901_0021.alto</a></li>
 
           </ul>