- More whitelabeling.

Thanks to xet7 !

16 files changed, 34 insertions, 29 deletions

diff --git a/Dockerfile b/Dockerfile
index 326b8101..fa0eebe7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -310,7 +310,7 @@ RUN \
     cd /home/wekan/app &&\
     mkdir -p ./public/api && \
     python3 ./openapi/generate_openapi.py --release $(git describe --tags --abbrev=0) > ./public/api/wekan.yml && \
-    /opt/nodejs/bin/api2html -c ./public/wekan-logo-header.png -o ./public/api/wekan.html ./public/api/wekan.yml; \
+    /opt/nodejs/bin/api2html -c ./public/logo-header.png -o ./public/api/wekan.html ./public/api/wekan.yml; \
     # Build app
     cd /home/wekan/app && \
     gosu wekan:wekan /home/wekan/.meteor/meteor add standard-minifier-js && \
diff --git a/client/components/main/header.jade b/client/components/main/header.jade
index c0781303..75e84c0c 100644
--- a/client/components/main/header.jade
+++ b/client/components/main/header.jade
@@ -45,15 +45,16 @@ template(name="header")
     #header-main-bar(class="{{#if wrappedHeader}}wrapper{{/if}}")
       +Template.dynamic(template=headerBar)
 
-      unless hideLogo
+      //unless hideLogo
 
         //-
           On sandstorm, the logo shouldn't be clickable, because we only have one
           page/document on it, and we don't want to see the home page containing
           the list of all boards.
-        unless currentSetting.hideLogo
-          a.wekan-logo(href="{{pathFor 'home'}}" title="{{_ 'header-logo-title'}}")
-            img(src="{{pathFor '/wekan-logo-header.png'}}" alt="Wekan")
+
+      //  unless currentSetting.hideLogo
+      //    a.wekan-logo(href="{{pathFor 'home'}}" title="{{_ 'header-logo-title'}}")
+      //    img(src="{{pathFor '/logo-header.png'}}" alt="")
 
   if appIsOffline
     +offlineWarning
diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade
index 3be676a3..0d39ed37 100644
--- a/client/components/main/layouts.jade
+++ b/client/components/main/layouts.jade
@@ -1,5 +1,5 @@
 head
-  title Wekan
+  title ""
   meta(name="viewport"
    content="maximum-scale=1.0,width=device-width,initial-scale=1.0,user-scalable=0")
   meta(http-equiv="X-UA-Compatible" content="IE=edge")
@@ -7,20 +7,20 @@ head
     where the application is deployed with a path prefix, but it seems to be
     difficult to do that cleanly with Blaze -- at least without adding extra
     packages.
-  link(rel="shortcut icon" href="/wekan-favicon.png")
-  link(rel="apple-touch-icon" href="/wekan-favicon.png")
-  link(rel="mask-icon" href="/wekan-150.svg")
-  link(rel="manifest" href="/wekan-manifest.json")
+  link(rel="shortcut icon" href="/favicon.png")
+  link(rel="apple-touch-icon" href="/favicon.png")
+  link(rel="mask-icon" href="/logo-150.svg")
+  link(rel="manifest" href="/manifest.json")
 
 template(name="userFormsLayout")
   section.auth-layout
-    if currentSetting.hideLogo
-      h1
-        br
-        br
-    else
-      h1.at-form-landing-logo
-        img(src="{{pathFor '/wekan-logo.png'}}" alt="Wekan")
+    //if currentSetting.hideLogo
+    h1
+      br
+      br
+    //else
+    //  h1.at-form-landing-logo
+    //    img(src="{{pathFor '/logo.png'}}" alt="")
     section.auth-dialog
       +Template.dynamic(template=content)
       if currentSetting.displayAuthenticationMethod
diff --git a/client/components/settings/settingBody.jade b/client/components/settings/settingBody.jade
index 220dbb50..89911e09 100644
--- a/client/components/settings/settingBody.jade
+++ b/client/components/settings/settingBody.jade
@@ -134,7 +134,7 @@ template(name='announcementSettings')
 
 template(name='layoutSettings')
   ul#layout-setting.setting-detail
-    li.layout-form
+    //li.layout-form
       .title {{_ 'hide-logo'}}
       .form-group.flex
         input.form-control#hide-logo(type="radio" name="hideLogo" value="true" checked="{{#if currentSetting.hideLogo}}checked{{/if}}")
@@ -154,7 +154,7 @@ template(name='layoutSettings')
     li.layout-form
       .title {{_ 'custom-product-name'}}
       .form-group
-        input.form-control#product-name(type="text", placeholder="Wekan" value="{{currentSetting.productName}}")
+        input.form-control#product-name(type="text", placeholder="" value="{{currentSetting.productName}}")
     li.layout-form
       .title {{_ 'add-custom-html-after-body-start'}}
       textarea#customHTMLafterBodyStart.form-control= currentSetting.customHTMLafterBodyStart
@@ -171,4 +171,4 @@ template(name='selectAuthenticationMethod')
       if isSelected value
         option(value="{{value}}" selected) {{_ value}}
       else
-        option(value="{{value}}") {{_ value}}
\ No newline at end of file
+        option(value="{{value}}") {{_ value}}
diff --git a/client/components/settings/settingBody.styl b/client/components/settings/settingBody.styl
index 7f8bd4c0..dbf91a6c 100644
--- a/client/components/settings/settingBody.styl
+++ b/client/components/settings/settingBody.styl
@@ -52,6 +52,10 @@
 
     .main-body
       padding: 0.1em 1em
+      -webkit-user-select: auto // Safari 3.1+
+      -moz-user-select: auto // Firefox 2+
+      -ms-user-select: auto // IE 10+
+      user-select: auto // Standard syntax
 
       ul
         li
diff --git a/client/lib/popup.js b/client/lib/popup.js
index 5b640f50..9abe48aa 100644
--- a/client/lib/popup.js
+++ b/client/lib/popup.js
@@ -184,7 +184,7 @@ window.Popup = new class {
       // positives.
       const title = TAPi18n.__(translationKey);
       // when popup showed as full of small screen, we need a default header to clearly see [X] button
-      const defaultTitle = Utils.isMiniScreen() ? 'Wekan' : false;
+      const defaultTitle = Utils.isMiniScreen() ? '' : false;
       return title !== translationKey ? title : defaultTitle;
     };
   }
diff --git a/models/settings.js b/models/settings.js
index 4fcc36ac..e0f94fca 100644
--- a/models/settings.js
+++ b/models/settings.js
@@ -231,7 +231,7 @@ if (Meteor.isServer) {
       const setting = Settings.findOne({});
       if (!setting.productName) {
         return {
-          productName: 'Wekan',
+          productName: '',
         };
       } else {
         return {
diff --git a/openapi/README.md b/openapi/README.md
index c353ffd4..e3fb7fd9 100644
--- a/openapi/README.md
+++ b/openapi/README.md
@@ -20,7 +20,7 @@ Now that we have the OpenAPI, it's easy enough to convert the YAML file into som
 [shins](https://github.com/Mermade/shins) and [api2html](https://github.com/tobilg/api2html),
 or even [ReDoc](https://github.com/Rebilly/ReDoc):
 
-    api2html -c ../public/wekan-logo-header.png -o api.html ../public/wekan_api.yml
+    api2html -c ../public/logo-header.png -o api.html ../public/wekan_api.yml
 
 or
 
diff --git a/public/wekan-favicon.png b/public/favicon.png
index 8beb85f4..8beb85f4 100644
--- a/public/wekan-favicon.png
+++ b/public/favicon.png
diff --git a/public/wekan-150.png b/public/logo-150.png
index e8e89c62..e8e89c62 100644
--- a/public/wekan-150.png
+++ b/public/logo-150.png
diff --git a/public/wekan-150.svg b/public/logo-150.svg
index 51d4eede..51d4eede 100644
--- a/public/wekan-150.svg
+++ b/public/logo-150.svg
diff --git a/public/wekan-logo-header.png b/public/logo-header.png
index 16ffa102..16ffa102 100644
--- a/public/wekan-logo-header.png
+++ b/public/logo-header.png
diff --git a/public/wekan-logo.png b/public/logo.png
index b553239e..b553239e 100644
--- a/public/wekan-logo.png
+++ b/public/logo.png
diff --git a/public/wekan-manifest.json b/public/manifest.json
index a1c18518..e35583c0 100644
--- a/public/wekan-manifest.json
+++ b/public/manifest.json
@@ -1,16 +1,16 @@
 {
-  "name": "Wekan",
-  "short_name": "Wekan",
-  "description": "The open-source Trello-like kanban",
+  "name": "Kanban",
+  "short_name": "Kanban",
+  "description": "The open-source kanban",
   "lang": "en-US",
   "icons": [
     {
-      "src": "/wekan-150.png",
+      "src": "/logo-150.png",
       "type": "image/png",
       "sizes": "150x150"
     },
     {
-      "src": "/wekan-150.svg",
+      "src": "/logo-150.svg",
       "type": "image/svg+xml",
       "sizes": "150x150"
     }
diff --git a/public/old-wekan-logo.png b/public/old-logo.png
index 6a2740f2..6a2740f2 100644
--- a/public/old-wekan-logo.png
+++ b/public/old-logo.png
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 07c65e5a..2b4ab48b 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -115,7 +115,7 @@ parts:
             # we temporary need api2html and mkdirp
             npm install -g api2html
             npm install -g mkdirp
-            api2html -c ./public/wekan-logo-header.png -o ./public/api/wekan.html ./public/api/wekan.yml
+            api2html -c ./public/logo-header.png -o ./public/api/wekan.html ./public/api/wekan.yml
             npm uninstall -g mkdirp
             npm uninstall -g api2html
             # Node Fibers 100% CPU usage issue: