New logo

.gitignore

@@ -1,3 +1,4 @@
+#artwork/*.png
 target/
 dev.conf
 elm-stuff

artwork/logo-only-mc.svg

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="134.51514mm"
+   height="134.51514mm"
+   viewBox="0 0 134.51514 134.51514"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="logo-only-mc.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.65748305"
+     inkscape:cx="415.42839"
+     inkscape:cy="-537.033"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:snap-text-baseline="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="2371"
+     inkscape:window-height="2141"
+     inkscape:window-x="1468"
+     inkscape:window-y="18"
+     inkscape:window-maximized="0">
+    <sodipodi:guide
+       position="157.48529,365.37511"
+       orientation="0,1"
+       id="guide4763"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-36.01786,-22.720551)">
+    <path
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.48060441;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
+       id="path4746"
+       sodipodi:type="arc"
+       sodipodi:cx="103.27543"
+       sodipodi:cy="89.978119"
+       sodipodi:rx="67.257568"
+       sodipodi:ry="67.257568"
+       sodipodi:start="6.0364656"
+       sodipodi:end="6.0351217"
+       sodipodi:open="true"
+       d="M 168.49635,73.552185 A 67.257568,67.257568 0 0 1 119.72327,155.19352 67.257568,67.257568 0 0 1 38.065555,106.44787 67.257568,67.257568 0 0 1 86.783766,24.773782 67.257568,67.257568 0 0 1 168.47422,73.46455"
+       inkscape:export-xdpi="93"
+       inkscape:export-ydpi="93" />
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.34951028;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
+       id="path4746-6"
+       sodipodi:type="arc"
+       sodipodi:cx="103.54803"
+       sodipodi:cy="89.966118"
+       sodipodi:rx="48.911774"
+       sodipodi:ry="48.911774"
+       sodipodi:start="6.0364656"
+       sodipodi:end="6.0351217"
+       sodipodi:open="true"
+       d="M 150.97869,78.020673 A 48.911774,48.911774 0 0 1 115.50941,137.39277 48.911774,48.911774 0 0 1 56.1254,101.94343 48.911774,48.911774 0 0 1 91.554782,42.547517 48.911774,48.911774 0 0 1 150.9626,77.956942"
+       inkscape:export-xdpi="93"
+       inkscape:export-ydpi="93" />
+    <g
+       id="g4744"
+       transform="translate(8.5571306,109.20034)"
+       style="fill:#000000;fill-opacity:1;stroke:none">
+      <path
+         sodipodi:open="true"
+         d="M 127.64333,-27.960568 A 34.40884,35.990559 0 0 1 102.69116,15.727003 34.40884,35.990559 0 0 1 60.915205,-10.357512 34.40884,35.990559 0 0 1 85.83933,-54.062594 34.40884,35.990559 0 0 1 127.63202,-28.007418"
+         sodipodi:end="6.0351217"
+         sodipodi:start="6.0364643"
+         sodipodi:ry="35.990559"
+         sodipodi:rx="34.40884"
+         sodipodi:cy="-19.170753"
+         sodipodi:cx="94.276443"
+         sodipodi:type="arc"
+         id="path4677-7-3-9"
+         style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.12413885;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
+         inkscape:export-xdpi="93"
+         inkscape:export-ydpi="93" />
+      <rect
+         transform="matrix(0.9932084,0.11634897,-0.12978749,0.99154183,0,0)"
+         ry="6.490634"
+         y="-93.584991"
+         x="112.29646"
+         height="97.792213"
+         width="15.056865"
+         id="rect4736-4"
+         style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.15839411;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
+         inkscape:export-xdpi="93"
+         inkscape:export-ydpi="93" />
+      <flowRoot
+         xml:space="preserve"
+         id="flowRoot4789"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:192px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
+         transform="matrix(0.26458333,0,0,0.26458333,-8.5571306,-109.20034)"><flowRegion
+           id="flowRegion4791"
+           style="font-size:192px;fill:#000000;fill-opacity:1"><rect
+             id="rect4793"
+             width="200"
+             height="308.57144"
+             x="480"
+             y="733.94824"
+             style="font-size:192px;fill:#000000;fill-opacity:1" /></flowRegion><flowPara
+           id="flowPara4795" /></flowRoot>    </g>
+  </g>
+</svg>

artwork/logo-only.svg

@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="134.51514mm"
+   height="134.51514mm"
+   viewBox="0 0 134.51514 134.51514"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="logo-only.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="-280.5528"
+     inkscape:cy="36.929238"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g4744"
+     showgrid="false"
+     inkscape:snap-text-baseline="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="2371"
+     inkscape:window-height="2141"
+     inkscape:window-x="1468"
+     inkscape:window-y="18"
+     inkscape:window-maximized="0">
+    <sodipodi:guide
+       position="157.48529,365.37511"
+       orientation="0,1"
+       id="guide4763"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-36.01786,-22.720551)">
+    <path
+       style="opacity:1;fill:#1c2d61;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.48060441;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
+       id="path4746"
+       sodipodi:type="arc"
+       sodipodi:cx="103.27543"
+       sodipodi:cy="89.978119"
+       sodipodi:rx="67.257568"
+       sodipodi:ry="67.257568"
+       sodipodi:start="6.0364656"
+       sodipodi:end="6.0351217"
+       sodipodi:open="true"
+       d="M 168.49635,73.552185 A 67.257568,67.257568 0 0 1 119.72327,155.19352 67.257568,67.257568 0 0 1 38.065555,106.44787 67.257568,67.257568 0 0 1 86.783766,24.773782 67.257568,67.257568 0 0 1 168.47422,73.46455" />
+    <path
+       style="opacity:1;fill:#f0f8ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.34951028;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
+       id="path4746-6"
+       sodipodi:type="arc"
+       sodipodi:cx="103.54803"
+       sodipodi:cy="89.966118"
+       sodipodi:rx="48.911774"
+       sodipodi:ry="48.911774"
+       sodipodi:start="6.0364656"
+       sodipodi:end="6.0351217"
+       sodipodi:open="true"
+       d="M 150.97869,78.020673 A 48.911774,48.911774 0 0 1 115.50941,137.39277 48.911774,48.911774 0 0 1 56.1254,101.94343 48.911774,48.911774 0 0 1 91.554782,42.547517 48.911774,48.911774 0 0 1 150.9626,77.956942" />
+    <g
+       id="g4744"
+       transform="translate(8.5571306,109.20034)"
+       style="fill:#9c0011;fill-opacity:1;stroke:none">
+      <path
+         sodipodi:open="true"
+         d="M 127.64333,-27.960568 A 34.40884,35.990559 0 0 1 102.69116,15.727003 34.40884,35.990559 0 0 1 60.915205,-10.357512 34.40884,35.990559 0 0 1 85.83933,-54.062594 34.40884,35.990559 0 0 1 127.63202,-28.007418"
+         sodipodi:end="6.0351217"
+         sodipodi:start="6.0364643"
+         sodipodi:ry="35.990559"
+         sodipodi:rx="34.40884"
+         sodipodi:cy="-19.170753"
+         sodipodi:cx="94.276443"
+         sodipodi:type="arc"
+         id="path4677-7-3-9"
+         style="opacity:1;fill:#9c0011;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.12413885;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers" />
+      <rect
+         transform="matrix(0.9932084,0.11634897,-0.12978749,0.99154183,0,0)"
+         ry="6.490634"
+         y="-93.584991"
+         x="112.29646"
+         height="97.792213"
+         width="15.056865"
+         id="rect4736-4"
+         style="opacity:1;fill:#9c0011;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.15839411;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers" />
+      <flowRoot
+         xml:space="preserve"
+         id="flowRoot4789"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:192px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
+         transform="matrix(0.26458333,0,0,0.26458333,-8.5571306,-109.20034)"><flowRegion
+           id="flowRegion4791"
+           style="font-size:192px"><rect
+             id="rect4793"
+             width="200"
+             height="308.57144"
+             x="480"
+             y="733.94824"
+             style="font-size:192px" /></flowRegion><flowPara
+           id="flowPara4795" /></flowRoot>    </g>
+  </g>
+</svg>

artwork/make-png.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+inkscape -z -e logo-96.png -w 96 -h 96 logo-only.svg
+inkscape -z -e logo-400.png -w 400 -h 400 logo-only.svg
+inkscape -z -e logo-mc-96.png -w 96 -h 96 logo-only-mc.svg
+inkscape -z -e logo-mc-400.png -w 400 -h 400 logo-only-mc.svg

modules/microsite/src/main/resources/microsite/img/favicon.png

@@ -1 +1 @@
-../../../../../../webapp/src/main/webjar/favicon/android-icon-96x96.png
+../../../../../../../artwork/logo-96.png

modules/microsite/src/main/resources/microsite/img/navbar_brand.png

@@ -0,0 +1 @@
+../../../../../../../artwork/logo-96.png

modules/microsite/src/main/resources/microsite/img/navbar_brand2x.png

@@ -0,0 +1 @@
+../../../../../../../artwork/logo-96.png

modules/microsite/src/main/resources/microsite/img/sidebar_brand.png

@@ -0,0 +1 @@
+../../../../../../../artwork/logo-96.png

modules/microsite/src/main/resources/microsite/img/sidebar_brand2x.png

@@ -0,0 +1 @@
+../../../../../../../artwork/logo-96.png

modules/microsite/src/main/tut/doc/tools.md

@@ -10,7 +10,7 @@ for integrating docspell.
 
 ## consumedir
 
-The `consumerdir` is a bash script that works in two modes:
+The `consumerdir.sh` is a bash script that works in two modes:
 
 - Go through all files in given directories (non recursively) and sent
   each to docspell.
@@ -31,15 +31,39 @@ files. For this the `sha256sum` command is required.
 Example for watching two directories:
 
 ``` bash
-./tools/consumedir.sh --path ~/Downloads --path ~/pdfs/ -m /var/run/consumedir -dv http://localhost:7880/api/v1/open/upload/item/5DxhjkvWf9S-CkWqF3Kr892-WgoCspFWDo7-XBykwCyAUxQ
+./tools/consumedir.sh --path ~/Downloads --path ~/pdfs -m /var/run/consumedir -dv http://localhost:7880/api/v1/open/upload/item/5DxhjkvWf9S-CkWqF3Kr892-WgoCspFWDo7-XBykwCyAUxQ
 ```
 
 The script by default watches the given directories. If the `-o`
 option is used, it will instead go through these directories and
 upload all pdf files in there.
 
-Example for uploading all immediatly:
+Example for uploading all immediatly (the same as above only with `-o`
+added):
 
 ``` bash
 ./tools/consumedir.sh -o --path ~/Downloads --path ~/pdfs/ -m /var/run/consumedir -dv http://localhost:7880/api/v1/open/upload/item/5DxhjkvWf9S-CkWqF3Kr892-WgoCspFWDo7-XBykwCyAUxQ
 ```
+
+
+### Systemd
+
+The script can be used with systemd to run as a service. This is an
+example unit file:
+
+```
+[Unit]
+After=networking.target
+Description=Docspell Consumedir
+
+[Service]
+Environment="PATH=/set/a/path"
+
+ExecStartPre=mkdir -p /var/run/consumedir && chown -R someuser /var/run/consumedir
+ExecStart=/bin/su -s /bin/bash someuser -c "consumedir.sh --path '/a/path/' -m '/var/run/consumedir' 'http://localhost:7880/api/v1/open/upload/item/5DxhjkvWf9S-CkWqF3Kr892-WgoCspFWDo7-XBykwCyAUxQ'"
+```
+
+This unit file is just an example, it needs some fiddling. It assumes
+an existing user `someuser` that is used to run this service. The url
+`http://localhost:7880/api/v1/open/upload/...` is an anonymous upload
+url as described [here](./uploading.html).

modules/webapp/src/main/elm/App/View.elm

@@ -59,10 +59,12 @@ defaultLayout model =
                    [ a [class "header item narrow-item"
                        ,Page.href HomePage
                        ]
-                         [i [classList [("umbrella icon", True)
+                         [img [class "image"
-                                       ]]
+                              ,src "assets/docspell-webapp/0.1.0-SNAPSHOT/img/logo-96.png"][]
-                              []
+                         ,div [class "content"]
-                         ,text model.flags.config.appName]
+                              [text model.flags.config.appName
+                              ]
+                         ]
                    , (loginInfo model)
                    ]
               ]
@@ -150,7 +152,9 @@ loginInfo model =
                                      ]
                           ]
                          [menuEntry model HomePage
-                            [i [class "umbrella icon"][]
+                            [img [class "image icon"
+                                 ,src "assets/docspell-webapp/0.1.0-SNAPSHOT/img/logo-mc-96.png"
+                                 ][]
                             ,text "Items"
                             ]
                          ,div [class "divider"][]

modules/webapp/src/main/elm/Page/Login/View.elm

@@ -13,7 +13,9 @@ view model =
              [div [class "row"]
                   [div [class "six wide column ui segment login-view"]
                        [h1 [class "ui center aligned icon header"]
-                            [i [class "umbrella icon"][]
+                            [img [class "ui image"
+                                 ,src "assets/docspell-webapp/0.1.0-SNAPSHOT/img/logo-96.png"
+                                 ][]
                             ,div [class "content"]
                                  [text "Sign in to Docspell"
                                  ]

modules/webapp/src/main/elm/Page/NewInvite/View.elm

@@ -15,8 +15,12 @@ view flags model =
              [div [class "row"]
                   [div [class "eight wide column ui segment newinvite-view"]
                        [h1 [class "ui cener aligned icon header"]
-                           [i [class "umbrella icon"][]
+                           [img [class "ui image"
-                           ,text "Create new invitations"
+                                ,src "assets/docspell-webapp/0.1.0-SNAPSHOT/img/logo-96.png"
+                                ][]
+                           ,div [class "content"]
+                                [text "Create new invitations"
+                                ]
                            ]
                        ,inviteMessage flags
                        ,Html.form [classList [("ui large form raised segment",  True)

modules/webapp/src/main/elm/Page/Register/View.elm

@@ -14,8 +14,11 @@ view flags model =
              [div [class "row"]
                   [div [class "six wide column ui segment register-view"]
                        [h1 [class "ui cener aligned icon header"]
-                           [i [class "umbrella icon"][]
+                           [img [class "ui image"
-                           ,text "Sign up @ Docspell"
+                                ,src "assets/docspell-webapp/0.1.0-SNAPSHOT/img/logo-96.png"][]
+                           ,div [class "content"]
+                                [text "Sign up @ Docspell"
+                                ]
                            ]
                        ,Html.form [class "ui large error form raised segment", onSubmit RegisterSubmit]
                            [div [class "required field"]

modules/webapp/src/main/webjar/docspell.css

@@ -17,6 +17,17 @@
     box-shadow: 1px 1px 0px 0px black;
 }
 
+.default-layout .top-menu a.header.item img {
+    width: 24px;
+    height: 24px;
+}
+.default-layout .top-menu a.header.item .content {
+    margin-left: 0.5em;
+}
+.default-layout a.icon.item img.image.icon {
+    width: 18.75px;
+}
+
 .default-layout .ui.multiple.search.dropdown>input.search {
     width: 3.5em;
 }

modules/webapp/src/main/webjar/img/logo-400.png

@@ -0,0 +1 @@
+../../../../../../artwork/logo-400.png

modules/webapp/src/main/webjar/img/logo-96.png

@@ -0,0 +1 @@
+../../../../../../artwork/logo-96.png

modules/webapp/src/main/webjar/img/logo-mc-400.png

@@ -0,0 +1 @@
+../../../../../../artwork/logo-mc-400.png

modules/webapp/src/main/webjar/img/logo-mc-96.png

@@ -0,0 +1 @@
+../../../../../../artwork/logo-mc-96.png

modules/webapp/src/main/webjar/img/logo-only-mc.svg

@@ -0,0 +1 @@
+../../../../../../artwork/logo-only-mc.svg

modules/webapp/src/main/webjar/img/logo-only.svg

@@ -0,0 +1 @@
+../../../../../../artwork/logo-only.svg