Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #62 from TachyonicProject/development
Photonic code cleanup #35
- Loading branch information
Showing
18 changed files
with
241 additions
and
137 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| The MIT License (MIT) | ||
|
|
||
| Copyright (c) 2013-2017 Cole Bemis | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
|
|
||
| The above copyright notice and this permission notice shall be included in all | ||
| copies or substantial portions of the Software. | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| SOFTWARE. |
Large diffs are not rendered by default.
Oops, something went wrong.
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,13 @@ | ||
| <header> | ||
| <span class="toggler-icon" onclick="toggle_navigation();"></span> | ||
| <a class="toggler-icon"><span data-feather="menu" onclick="toggle_sidebar();"></span></a> | ||
|
|
||
| <a class="header-brand" href="#"><img src="{{theme('logo.png') }}" alt="Logo" height="30">{{ G.app.config.get("application", 'name', fallback='Tachonic UI') }}</a> | ||
| <img class="header-brand" src="{{theme('logo.png') }}" alt="Logo"> | ||
| <span>{{ G.app.config.get("application", 'name', fallback='Tachonic UI') }}</span> | ||
|
|
||
| <form method="POST" action="{{APP}}/scope"> | ||
| {{ REQ.context.tenants_html }} | ||
| </form> | ||
| <div class="header-links"> | ||
| <a class="header-link" href="{{APP}}/logout">Sign out</a> | ||
| <a class="header-link" href="{{APP}}/logout"> <span data-feather="log-out"></span>Sign out</a> | ||
| </div> | ||
| </header> |
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,33 +1,28 @@ | ||
| {% if not REQ.credentials.authenticated %} | ||
| <div class="locked"></div> | ||
| <div class="modal-login modal"> | ||
| <div class="modal-header"> | ||
| Login | ||
| </div> | ||
| <h1>Login <span data-feather="chevrons-down"></span></h1> | ||
| <div class="modal-body"> | ||
| {% if error_title %} | ||
| <p class='red'>{{ error_title }} {{ error_description }} ({{ REQUEST_ID }})</p> | ||
| {% endif %} | ||
| <form method="post" action="{{APP}}/login" role="form"> | ||
| <div class="form-group has-feedback has-feedback-left"> | ||
| <label for="username" class="control-label sr-only">Email/Username</label> | ||
| <input name="username" type="username" id="username" class="form-control" placeholder="Username" value="{{ username }}" required autofocus> | ||
| <input name="username" type="username" id="username" class="form-control" placeholder="Username" value="{{ REQ.get_first('username', default='') }}" required autofocus> | ||
| <i class="form-control-feedback glyphicon glyphicon-user"></i> | ||
| </div> | ||
| <div class="form-group has-feedback has-feedback-left"> | ||
| <label for="password" class="sr-only">Password</label> | ||
| <input name="password" type="password" id="password" class="form-control" placeholder="Password" value="{{ password }}" required> | ||
| <input name="password" type="password" id="password" class="form-control" placeholder="Password" value="{{ REQ.get_first('password', default='') }}" required> | ||
| <i class="form-control-feedback glyphicon glyphicon-lock"></i> | ||
| </div> | ||
| <div class="form-group"> | ||
| <label for="domain" class="sr-only">Domain</label> | ||
| <input name="domain" type="text" id="domain" class="form-control" placeholder="Domain" value="{{ domain }}"> | ||
| <input name="domain" type="text" id="domain" class="form-control" placeholder="Domain" value="{{ REQ.get_first('domain', default='') }}"> | ||
| </div> | ||
| <button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button> | ||
| </form> | ||
| </div> | ||
| </div> | ||
|
|
||
|
|
||
|
|
||
| {% endif %} |
Oops, something went wrong.