Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions quarry/web/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<link rel="shortcut icon" href="/static/img/favicon.png" type="image/x-icon">
<link rel="icon" href="/static/img/favicon.png" type="image/x-icon">
<meta name="viewport" content="width=device-width, initial-scale=1">

<title>{% block title %}Quarry{% endblock %}</title>
{% if jsvars %}
<script>
Expand All @@ -19,14 +18,12 @@
<!-- Latest compiled and minified CSS with theme -->
<link rel="stylesheet" href="//tools-static.wmflabs.org/fontcdn/css?family=Open+Sans:300italic,400italic,700italic,400,300,700">
<link rel="stylesheet" href="/static/vendor/yeti.bootstrap.min.css">

<link rel="stylesheet" href="/static/css/base.css">
<script src="//tools-static.wmflabs.org/cdnjs/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<!-- Latest compiled and minified JavaScript -->
<script src="//tools-static.wmflabs.org/cdnjs/ajax/libs/twitter-bootstrap/3.2.0/js/bootstrap.min.js"></script>
{% block head %} {% endblock %}
</head>

<body>
{% if config['MAINTENANCE_MSG'] %}
<div class="maintenance-msg">
Expand Down Expand Up @@ -74,13 +71,12 @@
</ul>
</li>
{% else %}
<li><a href="/login?next={{request.path}}">Login</a></li>
<li><a href="/login?next={{request.path}}" rel="nofollow">Login</a></li>
{% endif %}
</ul>
</div><!--/.nav-collapse -->
</div>
</div>

{% with messages = get_flashed_messages(with_categories=true) %}
{% if messages %}
<ul class=flashes>
Expand All @@ -96,7 +92,6 @@

{% block content %}
{% endblock %}

<div id="footer">
<div class="container">
<div class="row">
Expand All @@ -105,8 +100,8 @@
<a href="https://wikitech.wikimedia.org/wiki/Wikitech:Cloud_Services_Terms_of_use">Terms of Use</a> |
<a href="https://github.com/toolforge/quarry">Source Code</a> |
<a href="https://meta.wikimedia.org/wiki/Research:Quarry">Documentation</a> |
<a href="https://phabricator.wikimedia.org/maniphest/task/edit/form/102/?title=%5Bfeedback%5D%20%3Cyour%20request%20here%3E&description=%3D%3D%20Why%0D%0A%0D%0AA%20brief%20explanation%20of%20the%20problem%20you%20want%20sorted%20out%0D%0A%0D%0A%3D%3D%20How%0D%0A%0D%0AIf%20you%20have%20any%20ideas%2C%20an%20explanation%20on%20how%20it%20could%20be%20solved&projects=quarry&subscribers=dcaro%2Ckomla&priority=triage">Propose a Feature</a> |
<a href="https://phabricator.wikimedia.org/maniphest/task/edit/form/43/?title=%5Bbug%5D%20%3Cyour%20request%20here%3E&description=%3D%3D%20What%20happened%3F%0D%0A%0D%0AA%20brief%20explanation%20of%20the%20problem%20you%20found%20(if%20you%20can%20give%20screenshots%20please%20do)%0D%0A%0D%0A%3D%3D%20What%20should%20have%20happened%3F%0D%0A%0D%0AWhat%20is%20it%20that%20you%20expected%20to%20happen%20instead&projects=quarry&subscribers=dcaro%2Ckomla&priority=triage">Report a bug</a>
<a href="https://phabricator.wikimedia.org/maniphest/task/edit/form/102/?title=%5Bfeedback%5D%20%3Cyour%20request%20here%3E&description=%3D%3D%20Why%0D%0A%0A%0AA%20brief%20explanation%20of%20the%20problem%20you%20want%20sorted%20out%0D%0A%0A%3D%3D%20How%0D%0A%0AIf%20you%20have%20any%20ideas%2C%20an%20explanation%20on%20how%20it%20could%20be%20solved&projects=quarry&subscribers=dcaro%2Ckomla&priority=triage">Propose a Feature</a> |
<a href="https://phabricator.wikimedia.org/maniphest/task/edit/form/43/?title=%5Bbug%5D%20%3Cyour%20request%20here%3E&description=%3D%3D%20What%20happened%3F%0A%0A%0AA%20brief%20explanation%20of%20the%20problem%20you%20found%20(if%20you%20can%20give%20screenshots%20please%20do)%0A%0A%3D%3D%20What%20should%20have%20happened%3F%0A%0A%0AWhat%20is%20it%20that%20you%20expected%20to%20happen%20instead&projects=quarry&subscribers=dcaro%2Ckomla&priority=triage">Report a bug</a>
</div>
<div class="pull-right">
Hosted on <a href="https://wikitech.wikimedia.org/wiki/Portal:Cloud_VPS">Wikimedia Cloud VPS</a>, written in <a href="https://python.org">Python</a> by <a href="mailto:yuvipanda@gmail.com">YuviPanda</a>
Expand Down
5 changes: 1 addition & 4 deletions quarry/web/templates/query/view.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@
<div id="content" class="container {% if jsvars.can_edit %}edit{% else %}no-edit{% endif %} {% if jsvars.is_starred %}starred{% endif %} {% if query.published %}published {% endif %}">
<div class="row" id="title-container">


<div class="col-md-10">
<h2><input type="textbox" id="title" {% if jsvars.can_edit %}placeholder="Click to add title..."{% else %}readonly{% endif %} value="{% if query.title %}{{query.title}}{% endif %}"> </input></h2>
</div>

<div class="col-md-2" id="title-actions-container">
{% if user and not jsvars.can_edit %}
<a id="un-star-query" class="btn btn-info btn-sm only-starred">
Expand All @@ -39,7 +37,7 @@ <h2><input type="textbox" id="title" {% if jsvars.can_edit %}placeholder="Click
<a id="query-history" title="View history of runs for this query" href="/history/{{ query.id }}" class="btn btn-info btn-sm">
History
</a>
<a id="fork-query" title="Create a copy of this query to modify and execute" href="/fork/{{ query.id }}{% if rev_id %}/{{ rev_id }}{% endif %}" class="btn btn-info btn-sm">
<a id="fork-query" title="Create a copy of this query to modify and execute" href="/fork/{{ query.id }}{% if rev_id %}/{{ rev_id }}{% endif %}" class="btn btn-info btn-sm" rel="nofollow">
Fork
</a>
</div>
Expand Down Expand Up @@ -106,7 +104,6 @@ <h3>SQL</h3>
All SQL code is licensed under <a href="https://creativecommons.org/publicdomain/zero/1.0/">CC0 License</a>.
</div>
</div>

<div id="query-result-container">
<h4 id="query-status">Checking query status...</h4>
<div id="query-result"></div>
Expand Down
Loading