-
Notifications
You must be signed in to change notification settings - Fork 589
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 #194 from google/2016.7
Release 2016.7
- Loading branch information
Showing
5 changed files
with
116 additions
and
62 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
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 |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| Copyright Davi Ferreira, http://www.daviferreira.com/ | ||
|
|
||
| This software consists of voluntary contributions made by many | ||
| individuals. For exact contribution history, see the revision history | ||
| available at https://github.com/yabwe/medium-editor | ||
|
|
||
| The following license applies to all parts of this software except as | ||
| documented below: | ||
|
|
||
| ==== | ||
|
|
||
| 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. | ||
|
|
||
| ==== | ||
|
|
||
| All files located in the node_modules directory are | ||
| externally maintained libraries used by this software which have their | ||
| own licenses; we recommend you read them, as their terms may differ from | ||
| the terms above. |
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,70 +1,84 @@ | ||
| {% extends "base.html" %} | ||
| {% block main %} | ||
|
|
||
| <div class="container"> | ||
|
|
||
| <div class="row"> | ||
| <div class="col-md-1"></div> | ||
| <div class="col-md-10"> | ||
|
|
||
| <div class="pull-right"> | ||
| <div class="btn-group"> | ||
| <div class="pull-left" style="margin-right:0px;margin-top: -6px;"> | ||
| <form action="{{ url_for('home_views.home') }}" method="post"> | ||
| {% if not sketches.all() %} | ||
| <div style="text-align: center"> | ||
| <br><br> | ||
| <h3>Welcome to Timesketch!</h3> | ||
| <form action="{{ url_for('home_views.home') }}" method="post"> | ||
| {{ form.name }} | ||
| {{ form.description }} | ||
| <button type="submit" class="btn btn-success"><i class="fa fa-plus"></i> Create new sketch</button> | ||
| <button type="submit" class="btn btn-success"><i class="fa fa-plus"></i> Create new sketch to get started</button> | ||
| {{ form.csrf_token }} | ||
| </form> | ||
| </div> | ||
| {% if upload_enabled %} | ||
| <ts-core-upload class="pull-left" style="margin-left:5px;margin-top: -6px;"></ts-core-upload> | ||
| {% endif %} | ||
| </div> | ||
| </form> | ||
| </div> | ||
| <br><br> | ||
| {% else %} | ||
|
|
||
| <div class="card" style="margin-top:7px;"> | ||
| <form class="form form-inline" method="get" action="{{ url_for('home_views.home') }}"> | ||
| <input type="search" id="q" name="q" class="search-input" placeholder="Search sketches" value="{{ query }}" autofocus> | ||
| </form> | ||
| </div> | ||
| <div class="container"> | ||
|
|
||
| {% if upload_enabled %} | ||
| <ts-core-upload-queue></ts-core-upload-queue> | ||
| {% endif %} | ||
| <div class="row"> | ||
| <div class="col-md-1"></div> | ||
| <div class="col-md-10"> | ||
|
|
||
| {% if sketches.all() %} | ||
| <div class="pull-right"> | ||
| <div class="btn-group"> | ||
| <div class="pull-left" style="margin-right:0px;margin-top: -6px;"> | ||
| <form action="{{ url_for('home_views.home') }}" method="post"> | ||
| {{ form.name }} | ||
| {{ form.description }} | ||
| <button type="submit" class="btn btn-success"><i class="fa fa-plus"></i> Create new sketch</button> | ||
| {{ form.csrf_token }} | ||
| </form> | ||
| </div> | ||
| {% if upload_enabled %} | ||
| <ts-core-upload class="pull-left" style="margin-left:5px;margin-top: -6px;"></ts-core-upload> | ||
| {% endif %} | ||
| </div> | ||
| </div> | ||
| <br><br> | ||
|
|
||
| <div class="card"> | ||
| <table class="table table-hover table-striped"> | ||
| <thead> | ||
| <tr> | ||
| <th></th> | ||
| <th width="110">Created by</th> | ||
| <th width="60">Status</th> | ||
| <th width="80">Timelines</th> | ||
| <th width="100">Saved views</th> | ||
| <th width="130px">Last activity</th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| {% for sketch in sketches.all() %} | ||
| <tr> | ||
| <td><a href="{{ url_for('sketch_views.overview', sketch_id=sketch.id) }}">{{ sketch.name }}</a></td> | ||
| <td>{{ sketch.user.name }}</td> | ||
| <td>{{ sketch.get_status.status }}</td> | ||
| <td style="text-align: center;"><a href="{{ url_for('sketch_views.timelines', sketch_id=sketch.id) }}">{{ sketch.timelines|count }}</a></td> | ||
| <td style="text-align: center;"><a href="{{ url_for('sketch_views.views', sketch_id=sketch.id) }}">{{ sketch.get_named_views|count }}</a></td> | ||
| <td>{{ sketch.updated_at.strftime('%Y-%m-%d %H:%M') }}</td> | ||
| </tr> | ||
| {% endfor %} | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| {% endif %} | ||
| <div class="col-md-1"></div> | ||
| </div> | ||
| <div class="card" style="margin-top:7px;"> | ||
| <form class="form form-inline" method="get" action="{{ url_for('home_views.home') }}"> | ||
| <input type="search" id="q" name="q" class="search-input" placeholder="Search sketches" value="{{ query }}" autofocus> | ||
| </form> | ||
| </div> | ||
|
|
||
| </div> | ||
| {% if upload_enabled %} | ||
| <ts-core-upload-queue></ts-core-upload-queue> | ||
| {% endif %} | ||
|
|
||
| {% if sketches.all() %} | ||
|
|
||
| <div class="card"> | ||
| <table class="table table-hover table-striped"> | ||
| <thead> | ||
| <tr> | ||
| <th></th> | ||
| <th width="110">Created by</th> | ||
| <th width="60">Status</th> | ||
| <th width="80">Timelines</th> | ||
| <th width="100">Saved views</th> | ||
| <th width="130px">Last activity</th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| {% for sketch in sketches.all() %} | ||
| <tr> | ||
| <td><a href="{{ url_for('sketch_views.overview', sketch_id=sketch.id) }}">{{ sketch.name }}</a></td> | ||
| <td>{{ sketch.user.name }}</td> | ||
| <td>{{ sketch.get_status.status }}</td> | ||
| <td style="text-align: center;"><a href="{{ url_for('sketch_views.timelines', sketch_id=sketch.id) }}">{{ sketch.timelines|count }}</a></td> | ||
| <td style="text-align: center;"><a href="{{ url_for('sketch_views.views', sketch_id=sketch.id) }}">{{ sketch.get_named_views|count }}</a></td> | ||
| <td>{{ sketch.updated_at.strftime('%Y-%m-%d %H:%M') }}</td> | ||
| </tr> | ||
| {% endfor %} | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| {% endif %} | ||
| <div class="col-md-1"></div> | ||
| </div> | ||
|
|
||
| </div> | ||
| {% endif %} | ||
| {% endblock %} |
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