New logo

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)
-                                       ]]
-                              []
-                         ,text model.flags.config.appName]
+                         [img [class "image"
+                              ,src "assets/docspell-webapp/0.1.0-SNAPSHOT/img/logo-96.png"][]
+                         ,div [class "content"]
+                              [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"][]
-                           ,text "Create new invitations"
+                           [img [class "ui image"
+                                ,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"][]
-                           ,text "Sign up @ Docspell"
+                           [img [class "ui image"
+                                ,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