Parcourir la source

- More whitelabeling.

Thanks to xet7 !
Lauri Ojansivu il y a 6 ans
Parent
commit
2969161afb

+ 1 - 1
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 && \

+ 5 - 4
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

+ 12 - 12
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

+ 3 - 3
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}}
+        option(value="{{value}}") {{_ value}}

+ 4 - 0
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

+ 1 - 1
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;
     };
   }

+ 1 - 1
models/settings.js

@@ -231,7 +231,7 @@ if (Meteor.isServer) {
       const setting = Settings.findOne({});
       if (!setting.productName) {
         return {
-          productName: 'Wekan',
+          productName: '',
         };
       } else {
         return {

+ 1 - 1
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
 

+ 0 - 0
public/wekan-favicon.png → public/favicon.png


+ 0 - 0
public/wekan-150.png → public/logo-150.png


+ 0 - 0
public/wekan-150.svg → public/logo-150.svg


+ 0 - 0
public/wekan-logo-header.png → public/logo-header.png


+ 0 - 0
public/wekan-logo.png → public/logo.png


+ 5 - 5
public/wekan-manifest.json → 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"
     }

+ 0 - 0
public/old-wekan-logo.png → public/old-logo.png


+ 1 - 1
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: