From e4fed928d9365ba3e096a02e590cd741de4d2cb2 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaad@spinpunch.com>
Date: Thu, 10 Mar 2016 13:27:34 +0500
Subject: Adding or separator between ldap, username, email, github

Updating code theme name

Updating conditions for login page

updated the 2.0 Dockerfile to include the proper location of mm gzip

Fixing search loading icon on mobile

Adding or separator between ldap, username, email and github
---
 web/react/components/login.jsx                     |  34 +++++++++++++++++++++
 web/react/utils/constants.jsx                      |   6 ++--
 .../images/themes/code_themes/solarized-dark.png   | Bin 0 -> 81942 bytes
 .../images/themes/code_themes/solarized-light.png  | Bin 0 -> 82868 bytes
 .../images/themes/code_themes/solarized_dark.png   | Bin 81942 -> 0 bytes
 .../images/themes/code_themes/solarized_light.png  | Bin 82868 -> 0 bytes
 6 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 web/static/images/themes/code_themes/solarized-dark.png
 create mode 100644 web/static/images/themes/code_themes/solarized-light.png
 delete mode 100644 web/static/images/themes/code_themes/solarized_dark.png
 delete mode 100644 web/static/images/themes/code_themes/solarized_light.png

(limited to 'web')

diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index 581b8e0b5..1c393c679 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -19,6 +19,8 @@ export default class Login extends React.Component {
     render() {
         const teamDisplayName = this.props.teamDisplayName;
         const teamName = this.props.teamName;
+        const ldapEnabled = global.window.mm_config.EnableLdap === 'true';
+        const usernameSigninEnabled = global.window.mm_config.EnableSignInWithUsername === 'true';
 
         let loginMessage = [];
         if (global.window.mm_config.EnableSignUpWithGitLab === 'true') {
@@ -173,6 +175,22 @@ export default class Login extends React.Component {
             );
         }
 
+        if (ldapEnabled && (loginMessage.length > 0 || emailSignup || usernameSigninEnabled)) {
+            ldapLogin = (
+                <div>
+                    <div className='or__container'>
+                        <FormattedMessage
+                            id='login.or'
+                            defaultMessage='or'
+                        />
+                    </div>
+                    <LoginLdap
+                        teamName={this.props.teamName}
+                    />
+                </div>
+            );
+        }
+
         let findTeams = null;
         if (!Utils.isMobileApp()) {
             findTeams = (
@@ -197,6 +215,22 @@ export default class Login extends React.Component {
             );
         }
 
+        if (usernameSigninEnabled && (loginMessage.length > 0 || emailSignup || ldapEnabled)) {
+            usernameLogin = (
+                <div>
+                    <div className='or__container'>
+                        <FormattedMessage
+                            id='login.or'
+                            defaultMessage='or'
+                        />
+                    </div>
+                    <LoginUsername
+                        teamName={this.props.teamName}
+                    />
+                </div>
+            );
+        }
+
         return (
             <div className='signup-team__container'>
                 <h5 className='margin--less'>
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index 4b1f73b79..3147bbd6a 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -267,7 +267,7 @@ export default {
             buttonColor: '#FFFFFF',
             mentionHighlightBg: '#984063',
             mentionHighlightLink: '#A4FFEB',
-            codeTheme: 'solarized_dark'
+            codeTheme: 'solarized-dark'
         },
         windows10: {
             type: 'Windows Dark',
@@ -386,11 +386,11 @@ export default {
             uiName: 'Code Theme',
             themes: [
                 {
-                    id: 'solarized_dark',
+                    id: 'solarized-dark',
                     uiName: 'Solarized Dark'
                 },
                 {
-                    id: 'solarized_light',
+                    id: 'solarized-light',
                     uiName: 'Solarized Light'
                 },
                 {
diff --git a/web/static/images/themes/code_themes/solarized-dark.png b/web/static/images/themes/code_themes/solarized-dark.png
new file mode 100644
index 000000000..582df48f9
Binary files /dev/null and b/web/static/images/themes/code_themes/solarized-dark.png differ
diff --git a/web/static/images/themes/code_themes/solarized-light.png b/web/static/images/themes/code_themes/solarized-light.png
new file mode 100644
index 000000000..d2c2702fb
Binary files /dev/null and b/web/static/images/themes/code_themes/solarized-light.png differ
diff --git a/web/static/images/themes/code_themes/solarized_dark.png b/web/static/images/themes/code_themes/solarized_dark.png
deleted file mode 100644
index 582df48f9..000000000
Binary files a/web/static/images/themes/code_themes/solarized_dark.png and /dev/null differ
diff --git a/web/static/images/themes/code_themes/solarized_light.png b/web/static/images/themes/code_themes/solarized_light.png
deleted file mode 100644
index d2c2702fb..000000000
Binary files a/web/static/images/themes/code_themes/solarized_light.png and /dev/null differ
-- 
cgit v1.2.3-1-g7c22