Adds provider name to fix welcomepage text.

* Removes unused ADD_PEOPLE_APP_NAME * Moves deep-link header background and logo size as variables. * Fixes more numbers page space in the header. * Fixes left padding on deep-linking mobile page.
XoddX · Mar 15, 2019 · f5a7e0b · f5a7e0b
1 parent f94db0d
commit f5a7e0b
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 13 deletions.
diff --git a/css/_variables.scss b/css/_variables.scss
@@ -156,3 +156,9 @@ $welcomePageDescriptionColor: #fff;
 $welcomePageFontFamily: inherit;
 $welcomePageHeaderBackground: linear-gradient(-90deg, #1251AE 0%, #0074FF 50%, #1251AE 100%);
 $welcomePageTitleColor: #fff;
+
+/**
+ * Deep-linking page variables.
+ */
+$deepLinkingMobileLogoHeight: 40px;
+$deepLinkingMobileHeaderBackground: #f1f2f5;
diff --git a/css/deep-linking/_mobile.scss b/css/deep-linking/_mobile.scss
@@ -8,13 +8,13 @@
     .header {
         width: 100%;
         height: 70px;
-        background-color: #f1f2f5;
+        background-color: $deepLinkingMobileHeaderBackground;
         text-align: center;
         .logo {
             margin-top: 15px;
             margin-left: auto;
             margin-right: auto;
-            height: 40px;
+            height: $deepLinkingMobileLogoHeight;
         }
     }
 
@@ -133,6 +133,7 @@
 
         .dial-in-numbers-list {
             color: $unsupportedBrowserTextColor;
+            padding-left: 20px;
         }
 
         .dial-in-numbers-body {

diff --git a/css/modals/invite/_info.scss b/css/modals/invite/_info.scss
@@ -193,6 +193,7 @@
     .dial-in-conference-id {
         text-align: center;
         min-width: 200px;
+        margin-top: 40px;
     }
 
     .dial-in-conference-name,

diff --git a/doc/sipgw-config.md b/doc/sipgw-config.md
@@ -19,10 +19,6 @@ edit /etc/jitsi/jicofo/sip-communicator.properties (or similar), set the appropr
   peopleSearchQueryTypes: ['conferenceRooms'],
   peopleSearchUrl: 'https://api.yourdomain.com/testpath/searchpeople',
 ```
- - interface_config.js:
-```
-  ADD_PEOPLE_APP_NAME: 'Jitsi'
-```
 
 The combination of the above settings and providing a jwt token will enable a button under invite option which will show the dialog 'Add people'.
 

diff --git a/interface_config.js b/interface_config.js
@@ -29,6 +29,7 @@ var interfaceConfig = {
     DISPLAY_WELCOME_PAGE_CONTENT: true,
     APP_NAME: 'Jitsi Meet',
     NATIVE_APP_NAME: 'Jitsi Meet',
+    PROVIDER_NAME: 'Jitsi',
     LANG_DETECTION: false, // Allow i18n to detect the system language
     INVITATION_POWERED_BY: true,
 
@@ -153,11 +154,6 @@ var interfaceConfig = {
      */
     CONNECTION_INDICATOR_DISABLED: false,
 
-    /**
-     * The name of the application connected to the "Add people" search service.
-     */
-    // ADD_PEOPLE_APP_NAME: "",
-
     /**
      * If true, hides the video quality label indicating the resolution status
      * of the current large video.

diff --git a/lang/main.json b/lang/main.json
@@ -758,7 +758,7 @@
         },
         "calendar": "Calendar",
         "connectCalendarButton": "Connect your calendar",
-        "connectCalendarText": "Connect your calendar to view all your meetings in __app__. Plus, add __app__ meetings to your calendar and start them with one click.",
+        "connectCalendarText": "Connect your calendar to view all your meetings in __app__. Plus, add __provider__ meetings to your calendar and start them with one click.",
         "enterRoomTitle": "Start a new meeting",
         "go": "GO",
         "join": "JOIN",

diff --git a/react/features/calendar-sync/components/CalendarList.web.js b/react/features/calendar-sync/components/CalendarList.web.js
@@ -189,7 +189,8 @@ class CalendarList extends AbstractPage<Props> {
             <div className = 'meetings-list-empty'>
                 <p className = 'description'>
                     { t('welcomepage.connectCalendarText', {
-                        app: interfaceConfig.APP_NAME
+                        app: interfaceConfig.APP_NAME,
+                        provider: interfaceConfig.PROVIDER_NAME
                     }) }
                 </p>
                 <div