-
Notifications
You must be signed in to change notification settings - Fork 19
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Added branding changes #1072
Merged
+140
−175
Merged
Added branding changes #1072
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,59 +1,56 @@ | ||
| <div class="tendrl-login-view-container"> | ||
| <img src="/images/bg-login.jpg" alt="" class="adjusted"> | ||
| <div class="login-page"> | ||
| <span id="badge"> | ||
| <img src="/images/logo.png" alt="Tendrl logo"> | ||
| </span> | ||
| <div class="container"> | ||
| <div class="login-pf-page"> | ||
| <div class="container-fluid"> | ||
| <div class="row"> | ||
| <div class="col-sm-12"> | ||
| <div id="brand"> | ||
| <img class="nav-brand-name brand-name-img" src="/images/name.png" alt="tendrl | Unified Storage Manager" /> | ||
| </div> | ||
| <!--/#brand--> | ||
| </div> | ||
| <!--/.col-*--> | ||
| <div class="col-sm-6 col-md-5 col-lg-3 login"> | ||
| <div class="alert alert-danger" ng-if="loginCntrl.errorMsg.length > 0"> | ||
| <span class="pficon pficon-error-circle-o"></span> | ||
| <label ng-bind="loginCntrl.errorMsg"></label> | ||
| </div> | ||
| <form class="form-horizontal" name="loginCntrl.signInForm" ng-submit="loginCntrl.login()"> | ||
| <div class="form-group" ng-class="{'has-error': loginCntrl.signInForm.username.$dirty && loginCntrl.signInForm.username.$error.required }"> | ||
| <label for="inputUsername" class="col-sm-3 col-md-3">Username</label> | ||
| <div class="col-sm-8 col-md-8"> | ||
| <input class="form-control" id="username" tabindex="1" type="text" ng-model="loginCntrl.user.username" ng-trim="false" name="username" placeholder="Username" required /> | ||
| </div> | ||
| <div> | ||
| <div class="col-sm-3 col-md-3"></div> | ||
| <span class="col-sm-8 col-md-8 help-block" ng-show="loginCntrl.signInForm.username.$dirty && loginCntrl.signInForm.username.$error.required">Username is required</span> | ||
| </div> | ||
| </div> | ||
| <div class="form-group" ng-class="{ 'has-error': loginCntrl.signInForm.username.$dirty && loginCntrl.signInForm.username.$error.required }"> | ||
| <label for="inputPassword" class="col-sm-3 col-md-3">Password</label> | ||
| <div class="col-sm-8 col-md-8"> | ||
| <input class="form-control" type="password" name="password" id="password" tabindex="2" placeholder="Password" ng-model="loginCntrl.user.password" required /> | ||
| </div> | ||
| <div> | ||
| <div class="col-sm-3 col-md-3"></div> | ||
| <span class="col-sm-8 col-md-8 help-block" ng-show="loginCntrl.signInForm.password.$dirty && loginCntrl.signInForm.password.$error.required">Password is required</span> | ||
| <div class="col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3 col-lg-6 col-lg-offset-3"> | ||
| <header class="login-pf-page-header"> | ||
| <img class="login-pf-brand" src="/images/name.png" alt="tendrl | Unified Storage Manager" /> | ||
| </header> | ||
| <div class="row"> | ||
| <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2 col-lg-6 col-lg-offset-3"> | ||
| <div class="card-pf"> | ||
| <header class="login-pf-header"> | ||
| <select class="selectpicker"> | ||
| <option>English</option> | ||
| </select> | ||
| <h1>Log In to Your Account</h1> | ||
| </header> | ||
| <div class="text-danger validation-msg" ng-if="loginCntrl.errorMsg.length > 0"> | ||
| <label ng-bind="loginCntrl.errorMsg"></label> | ||
| </div> | ||
| <form name="loginCntrl.signInForm" ng-submit="loginCntrl.login()" novalidate> | ||
| <div class="form-group form-group has-feedback" ng-class="{'has-error': (loginCntrl.signInForm.$submitted || loginCntrl.signInForm.username.$dirty) && loginCntrl.signInForm.username.$invalid }"> | ||
| <label class="sr-only" for="username">Username</label> | ||
| <input class="form-control" name="username" id="username" tabindex="1" type="text" placeholder="Username" ng-model="loginCntrl.user.username" ng-trim="false" required autofocus> | ||
| <div class="help-block" ng-show="(loginCntrl.signInForm.$submitted || loginCntrl.signInForm.username.$dirty) && loginCntrl.signInForm.username.$invalid">Enter your Username</div> | ||
| </div> | ||
| <div class="form-group" class="form-group has-feedback" ng-class="{ 'has-error': (loginCntrl.signInForm.$submitted || loginCntrl.signInForm.password.$dirty) && loginCntrl.signInForm.password.$invalid }"> | ||
| <label class="sr-only" for="password">Password | ||
| </label> | ||
| <input class="form-control" id="password" name="password" type="password" tabindex="2" placeholder="Password" ng-model="loginCntrl.user.password" required> | ||
| <div class="help-block" ng-show="(loginCntrl.signInForm.$submitted || loginCntrl.signInForm.password.$dirty) && loginCntrl.signInForm.password.$invalid">Enter your password | ||
| </div> | ||
| </div> | ||
| <button type="submit" class="btn btn-primary btn-block btn-lg"> | ||
| <i class="glyphicon glyphicon-refresh glyphicon-refresh-animate hidden" data-ng-class="{'hidden': loginCntrl.formSubmitInProgress !== true }"> | ||
| </i> | ||
| <span class="submit-button-text">Log In</span> | ||
| </button> | ||
| </form> | ||
| <p class="login-pf-signup"></p> | ||
| </div> | ||
| </div> | ||
| <div class="form-group"> | ||
| <div class="col-xs-4 col-md-offset-7 col-xs-offset-7 col-sm-offset-7 col-sm-4 col-md-4 submit"> | ||
| <button type="submit" class="btn btn-primary btn-lg"> | ||
| <i class="glyphicon glyphicon-refresh glyphicon-refresh-animate hidden" data-ng-class="{'hidden': loginCntrl.formSubmitInProgress !== true }"> | ||
| </i> | ||
| <span class="submit-button-text">Log In</span> | ||
| </button> | ||
| </div> | ||
| </div> | ||
| </form> | ||
| <!-- col --> | ||
| </div> | ||
| <!-- row --> | ||
| </div> | ||
| <!--/.col-*--> | ||
| <!-- col --> | ||
| </div> | ||
| <!--/.row--> | ||
| <!-- row --> | ||
| </div> | ||
| <!--/.container--> | ||
| <!-- container --> | ||
| </div> | ||
| </div> | ||
| <!-- login-pf-page --> | ||
| <!-- login-pf-page --> | ||
| </div> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Neha can we anyhow import the package.json file to use the release version. I think it will be a headache for us while building the UI package to change it every time. Just a thought!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@cloudbehl Agreed. But since the package.json file doesn't get copied to the dist folder and its not a good idea to keep the package manager configuration file in the production environment, I need to make it configurable here. In future, this version number should be available from the API.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good idea to make it configurable for now.