Browse Source

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.
efficient_tiling
damencho 6 years ago
parent
commit
f5a7e0bccb

+ 6
- 0
css/_variables.scss View File

156
 $welcomePageFontFamily: inherit;
156
 $welcomePageFontFamily: inherit;
157
 $welcomePageHeaderBackground: linear-gradient(-90deg, #1251AE 0%, #0074FF 50%, #1251AE 100%);
157
 $welcomePageHeaderBackground: linear-gradient(-90deg, #1251AE 0%, #0074FF 50%, #1251AE 100%);
158
 $welcomePageTitleColor: #fff;
158
 $welcomePageTitleColor: #fff;
159
+
160
+/**
161
+ * Deep-linking page variables.
162
+ */
163
+$deepLinkingMobileLogoHeight: 40px;
164
+$deepLinkingMobileHeaderBackground: #f1f2f5;

+ 3
- 2
css/deep-linking/_mobile.scss View File

8
     .header {
8
     .header {
9
         width: 100%;
9
         width: 100%;
10
         height: 70px;
10
         height: 70px;
11
-        background-color: #f1f2f5;
11
+        background-color: $deepLinkingMobileHeaderBackground;
12
         text-align: center;
12
         text-align: center;
13
         .logo {
13
         .logo {
14
             margin-top: 15px;
14
             margin-top: 15px;
15
             margin-left: auto;
15
             margin-left: auto;
16
             margin-right: auto;
16
             margin-right: auto;
17
-            height: 40px;
17
+            height: $deepLinkingMobileLogoHeight;
18
         }
18
         }
19
     }
19
     }
20
 
20
 
133
 
133
 
134
         .dial-in-numbers-list {
134
         .dial-in-numbers-list {
135
             color: $unsupportedBrowserTextColor;
135
             color: $unsupportedBrowserTextColor;
136
+            padding-left: 20px;
136
         }
137
         }
137
 
138
 
138
         .dial-in-numbers-body {
139
         .dial-in-numbers-body {

+ 1
- 0
css/modals/invite/_info.scss View File

193
     .dial-in-conference-id {
193
     .dial-in-conference-id {
194
         text-align: center;
194
         text-align: center;
195
         min-width: 200px;
195
         min-width: 200px;
196
+        margin-top: 40px;
196
     }
197
     }
197
 
198
 
198
     .dial-in-conference-name,
199
     .dial-in-conference-name,

+ 0
- 4
doc/sipgw-config.md View File

19
   peopleSearchQueryTypes: ['conferenceRooms'],
19
   peopleSearchQueryTypes: ['conferenceRooms'],
20
   peopleSearchUrl: 'https://api.yourdomain.com/testpath/searchpeople',
20
   peopleSearchUrl: 'https://api.yourdomain.com/testpath/searchpeople',
21
 ```
21
 ```
22
- - interface_config.js:
23
-```
24
-  ADD_PEOPLE_APP_NAME: 'Jitsi'
25
-```
26
 
22
 
27
 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'.
23
 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'.
28
 
24
 

+ 1
- 5
interface_config.js View File

29
     DISPLAY_WELCOME_PAGE_CONTENT: true,
29
     DISPLAY_WELCOME_PAGE_CONTENT: true,
30
     APP_NAME: 'Jitsi Meet',
30
     APP_NAME: 'Jitsi Meet',
31
     NATIVE_APP_NAME: 'Jitsi Meet',
31
     NATIVE_APP_NAME: 'Jitsi Meet',
32
+    PROVIDER_NAME: 'Jitsi',
32
     LANG_DETECTION: false, // Allow i18n to detect the system language
33
     LANG_DETECTION: false, // Allow i18n to detect the system language
33
     INVITATION_POWERED_BY: true,
34
     INVITATION_POWERED_BY: true,
34
 
35
 
153
      */
154
      */
154
     CONNECTION_INDICATOR_DISABLED: false,
155
     CONNECTION_INDICATOR_DISABLED: false,
155
 
156
 
156
-    /**
157
-     * The name of the application connected to the "Add people" search service.
158
-     */
159
-    // ADD_PEOPLE_APP_NAME: "",
160
-
161
     /**
157
     /**
162
      * If true, hides the video quality label indicating the resolution status
158
      * If true, hides the video quality label indicating the resolution status
163
      * of the current large video.
159
      * of the current large video.

+ 1
- 1
lang/main.json View File

758
         },
758
         },
759
         "calendar": "Calendar",
759
         "calendar": "Calendar",
760
         "connectCalendarButton": "Connect your calendar",
760
         "connectCalendarButton": "Connect your calendar",
761
-        "connectCalendarText": "Connect your calendar to view all your meetings in __app__. Plus, add __app__ meetings to your calendar and start them with one click.",
761
+        "connectCalendarText": "Connect your calendar to view all your meetings in __app__. Plus, add __provider__ meetings to your calendar and start them with one click.",
762
         "enterRoomTitle": "Start a new meeting",
762
         "enterRoomTitle": "Start a new meeting",
763
         "go": "GO",
763
         "go": "GO",
764
         "join": "JOIN",
764
         "join": "JOIN",

+ 2
- 1
react/features/calendar-sync/components/CalendarList.web.js View File

189
             <div className = 'meetings-list-empty'>
189
             <div className = 'meetings-list-empty'>
190
                 <p className = 'description'>
190
                 <p className = 'description'>
191
                     { t('welcomepage.connectCalendarText', {
191
                     { t('welcomepage.connectCalendarText', {
192
-                        app: interfaceConfig.APP_NAME
192
+                        app: interfaceConfig.APP_NAME,
193
+                        provider: interfaceConfig.PROVIDER_NAME
193
                     }) }
194
                     }) }
194
                 </p>
195
                 </p>
195
                 <div
196
                 <div

Loading…
Cancel
Save