External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-04 10:11:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

AC-939 Update browsable REST API branding to Tower.

Browse Source
This commit is contained in:
Chris Church
2014-01-23 05:22:55 -05:00
parent 8aa9fe9d7e
commit b6543be0cf
8 changed files with 77 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/api/templates/api/_list_common.md
View File

@@ -54,7 +54,7 @@ within all designated text fields of a model.
?search=findme ?search=findme
_New in AWX 1.4_ _New since AWX 1.4_
## Filtering ## Filtering
@@ -75,7 +75,7 @@ To exclude results matching certain criteria, prefix the field parameter with
?not__field=value ?not__field=value
(_New in AWX 1.4_) By default, all query string filters are AND'ed together, so (_New since AWX 1.4_) By default, all query string filters are AND'ed together, so
only the results matching *all* filters will be returned. To combine results only the results matching *all* filters will be returned. To combine results
matching *any* one of multiple criteria, prefix each query string parameter matching *any* one of multiple criteria, prefix each query string parameter
with `or__`: with `or__`:
@@ -83,10 +83,10 @@ with `or__`:
?or__field=value&or__field=othervalue ?or__field=value&or__field=othervalue
?or__not__field=value&or__field=othervalue ?or__not__field=value&or__field=othervalue
(_New in AWX 1.5_) The default AND filtering applies all filters simultaneously (_New in Ansible Tower 1.4.5_) The default AND filtering applies all filters
to each related object being filtered across database relationships. The chain simultaneously to each related object being filtered across database
filter instead applies filters separately for each related object. To use, relationships. The chain filter instead applies filters separately for each
prefix the query string parameter with `chain__`: related object. To use, prefix the query string parameter with `chain__`:
?chain__related__field=value&chain__related__field2=othervalue ?chain__related__field=value&chain__related__field2=othervalue
?chain__not__related__field=value&chain__related__field2=othervalue ?chain__not__related__field=value&chain__related__field2=othervalue

7
awx/api/templates/api/_new_in_awx.md
View File

@@ -1,3 +1,4 @@
{% if new_in_13 %}> _New in AWX 1.3_{% endif %} {% if new_in_13 %}> _New since AWX 1.3_{% endif %}
{% if new_in_14 %}> _New in AWX 1.4_{% endif %} {% if new_in_14 %}> _New since AWX 1.4_{% endif %}
{% if new_in_15 %}> _New in AWX 1.5_{% endif %} {% if new_in_145 %}> _New in Ansible Tower 1.4.5_{% endif %}
{% if new_in_15 %}> _New in Ansible Tower 1.5_{% endif %}

2
awx/api/templates/api/api_root_view.md
View File

@@ -1,4 +1,4 @@
The root of the AWX REST API. The root of the Ansible Tower REST API.
Make a GET request to this resource to obtain information about the available Make a GET request to this resource to obtain information about the available
API versions. API versions.

2
awx/api/templates/api/api_v1_config_view.md
View File

@@ -9,4 +9,4 @@ the following fields (some fields may not be visible to all users):
use when creating/editing a project. use when creating/editing a project.
* `time_zone`: The configured time zone for the server. * `time_zone`: The configured time zone for the server.
* `license_info`: Information about the current license. * `license_info`: Information about the current license.
* `version`: Version of AWX package installed. * `version`: Version of Ansible Tower (AWX) package installed.

2
awx/api/templates/api/api_v1_root_view.md
View File

@@ -1,4 +1,4 @@
Version 1 of the AWX REST API. Version 1 of the Ansible Tower REST API.
Make a GET request to this resource to obtain a list of all child resources Make a GET request to this resource to obtain a list of all child resources
available via the API. available via the API.

4
awx/api/templates/api/inventory_script_view.md
View File

@@ -10,7 +10,7 @@ object containing groups, including the hosts, children and variables for each
group. The response data is equivalent to that returned by passing the group. The response data is equivalent to that returned by passing the
`--list` argument to an inventory script. `--list` argument to an inventory script.
_(New in AWX 1.3)_ Specify a query string of `?hostvars=1` to retrieve the JSON _(New since AWX 1.3)_ Specify a query string of `?hostvars=1` to retrieve the JSON
object above including all host variables. The `['_meta']['hostvars']` object object above including all host variables. The `['_meta']['hostvars']` object
in the response contains an entry for each host with its variables. This in the response contains an entry for each host with its variables. This
response format can be used with Ansible 1.3 and later to avoid making a response format can be used with Ansible 1.3 and later to avoid making a
@@ -18,7 +18,7 @@ separate API request for each host. Refer to
[Tuning the External Inventory Script](http://www.ansibleworks.com/docs/api.html#tuning-the-external-inventory-script) [Tuning the External Inventory Script](http://www.ansibleworks.com/docs/api.html#tuning-the-external-inventory-script)
for more information on this feature. for more information on this feature.
_(New in AWX 1.4)_ By default, the inventory script will only return hosts that _(New since AWX 1.4)_ By default, the inventory script will only return hosts that
are enabled in the inventory. This feature allows disabled hosts to be skipped are enabled in the inventory. This feature allows disabled hosts to be skipped
when running jobs without removing them from the inventory. Specify a query when running jobs without removing them from the inventory. Specify a query
string of `?all=1` to return all hosts, including disabled ones. string of `?all=1` to return all hosts, including disabled ones.

2
awx/api/views.py
View File

@@ -59,7 +59,7 @@ class ApiRootView(APIView):
current = reverse('api:api_v1_root_view', args=[]) current = reverse('api:api_v1_root_view', args=[])
data = dict( data = dict(
description = 'AWX REST API', description = 'Ansible Tower REST API',
current_version = current, current_version = current,
available_versions = dict( available_versions = dict(
v1 = current v1 = current

74
awx/templates/rest_framework/api.html
View File

@@ -30,23 +30,23 @@ html body .navbar-inverse .nav > li > a {
} }
html body .navbar-inverse .nav > li > a:hover, html body .navbar-inverse .nav > li > a:hover,
html body .navbar-inverse .nav > li > a:focus { html body .navbar-inverse .nav > li > a:focus {
color: #2078be; color: #4e9998;
} }
html body .navbar .brand img { html body .navbar .brand img {
width: 200px; width: 200px;
margin-top: -6px; margin-top: -2px;
margin-right: 0.5em; margin-right: 0.75em;
} }
html body .navbar-inverse .nav li.dropdown.open > .dropdown-toggle, html body .navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
html body .navbar-inverse .nav li.dropdown.active > .dropdown-toggle, html body .navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
html body .navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle { html body .navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
background-color: #074979; background-color: #1a3333;
} }
html body .navbar-inverse .brand { html body .navbar-inverse .brand {
font-size: 1.2em; font-size: 1.2em;
color: #fff; color: #fff;
padding-top: 6px; padding-top: 18px;
padding-left: 4px; padding-left: 20px;
} }
html body .navbar-inverse .nav.pull-right { html body .navbar-inverse .nav.pull-right {
margin-top: 8px; margin-top: 8px;
@@ -68,11 +68,11 @@ html body .hero-unit h2,
html body .hero-unit h1, html body .hero-unit h1,
html body a, html body a,
html body a { html body a {
color: #2078be; color: #4e9998;
} }
html body .navbar .navbar-inner .dropdown-menu li a:hover, html body .navbar .navbar-inner .dropdown-menu li a:hover,
html body a:hover { html body a:hover {
color: #2078be; color: #4e9998;
} }
html body ul.breadcrumb, html body ul.breadcrumb,
html body .prettyprint, html body .prettyprint,
@@ -85,7 +85,12 @@ html body .prettyprint {
html body .str, html body .str,
html body .atv, html body .atv,
html body code { html body code {
color: #074979; color: #1a3333;
}
html body .kwd,
html body .ta,
html body .lit {
color: #346665;
} }
html body .str a { html body .str a {
text-decoration: underline; text-decoration: underline;
@@ -107,8 +112,7 @@ html body .description {
#footer a:hover { #footer a:hover {
color: #333; color: #333;
} }
img.awxlogo { img.towerlogo {
width: 125px;
margin-bottom: 0.5em; margin-bottom: 0.5em;
} }
html body .wrapper { html body .wrapper {
@@ -122,11 +126,55 @@ html body #footer {
html body #push { html body #push {
height: 0; height: 0;
} }
html body .btn-success {
color: #ffffff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #5bb75b; /* 66c8c7 l=6fd9d7 d=55a6a4 */
background-image: -moz-linear-gradient(top, #6fd9d7, #55a6a4);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#6fd9d7), to(#55a6a4));
background-image: -webkit-linear-gradient(top, #6fd9d7, #55a6a4);
background-image: -o-linear-gradient(top, #6fd9d7, #55a6a4);
background-image: linear-gradient(to bottom, #6fd9d7, #55a6a4);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff6fd9d7', endColorstr='#ff55a6a4', GradientType=0);
border-color: #55a6a4 #55a6a4 #41807e;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
}
html body .btn-success:hover,
html body .btn-success:active,
html body .btn-success.active,
html body .btn-success.disabled,
html body .btn-success[disabled] {
color: #ffffff;
background-color: #55a6a4;
}
html body .btn-group.open .btn-success.dropdown-toggle {
background-color: #55a6a4;
}
html body .btn-success:active,
html body .btn-success.active {
background-color:#41807e \9;
}
html body .dropdown-menu li>a:hover,
html body .dropdown-menu li>a:focus,
html body .dropdown-submenu:hover>a {
text-decoration: none;
color: #ffffff;
background-color: #55a6a4;
background-image: -moz-linear-gradient(top, #55a6a4, #41807e);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#55a6a4), to(#41807e));
background-image: -webkit-linear-gradient(top, #55a6a4, #41807e);
background-image: -o-linear-gradient(top, #55a6a4, #41807e);
background-image: linear-gradient(to bottom, #55a6a4, #41807e);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff55a6a4', endColorstr='#ff41807e', GradientType=0);
}
</style> </style>
{% endblock %} {% endblock %}
{% block branding %} {% block branding %}
<a class="brand" href="/api/"><img class="logo" src="{{ STATIC_URL }}img/logo.png">{% block branding_title %}{% trans 'REST API' %}{% endblock %}</a> <a class="brand" href="/api/"><img class="logo" src="{{ STATIC_URL }}img/tower_console_logo.png">{% block branding_title %}{% trans 'REST API' %}{% endblock %}</a>
{% endblock %} {% endblock %}
{% block userlinks %} {% block userlinks %}
@@ -139,7 +187,7 @@ html body #push {
{% block footer %} {% block footer %}
<div id="footer"> <div id="footer">
<img class="awxlogo" src="{{ STATIC_URL }}img/AWX_logo.png" /><br/> <img class="towerlogo" src="{{ STATIC_URL }}img/tower_console_bug.png" /><br/>
Copyright &copy; 2014 <a href="http://www.ansibleworks.com" target="_blank">AnsibleWorks, Inc.</a> All rights reserved. Copyright &copy; 2014 <a href="http://www.ansibleworks.com" target="_blank">AnsibleWorks, Inc.</a> All rights reserved.
</div> </div>
{% endblock %} {% endblock %}