openstack/murano-dashboard
Code Issues Proposed changes

Merge "Use 'trimmed' for blocktrans in html page"

Browse Source
This commit is contained in:
Jenkins 2016-06-17 13:35:13 +00:00 committed by Gerrit Code Review
commit d791127dbd
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
muranodashboard/templates/catalog/index.html
View File

@ -111,7 +111,7 @@
{% else %} {% else %}
<p class="col-xs-12 alert alert-info"> <p class="col-xs-12 alert alert-info">
{% if no_apps %} {% if no_apps %}
{% blocktrans %}There are no applications in the catalog. You can import apps from {% blocktrans trimmed %}There are no applications in the catalog. You can import apps from
<a href="{{ repo_url }}" target="_blank"> {{ repo_url }}</a>.{% endblocktrans %} <a href="{{ repo_url }}" target="_blank"> {{ repo_url }}</a>.{% endblocktrans %}
<br><br> <br><br>
{% blocktrans trimmed %}Go to {% blocktrans trimmed %}Go to

2
muranodashboard/templates/packages/_import_bundle.html
View File

@ -28,7 +28,7 @@
<div class='description-by_name'> <div class='description-by_name'>
<h3>{% trans "Description" %}:</h3> <h3>{% trans "Description" %}:</h3>
<p><strong>{% trans "Bundle Name" %}: </strong>{% trans "Bundle's full name."%}</p> <p><strong>{% trans "Bundle Name" %}: </strong>{% trans "Bundle's full name."%}</p>
<p>{% blocktrans %}The bundle is going to be installed from <a href="{{murano_repo_url}}" target="_blank">{{murano_repo_url}}</a> repository.{% endblocktrans %}</p> <p>{% blocktrans trimmed %}The bundle is going to be installed from <a href="{{murano_repo_url}}" target="_blank">{{murano_repo_url}}</a> repository.{% endblocktrans %}</p>
</div> </div>
<div class='description-by_url'> <div class='description-by_url'>
<h3>{% trans "Description" %}:</h3> <h3>{% trans "Description" %}:</h3>

2
muranodashboard/templates/packages/_upload.html
View File

@ -46,7 +46,7 @@
<h3>{% trans "Description" %}:</h3> <h3>{% trans "Description" %}:</h3>
<p><strong>{% trans "Package Name" %}: </strong>{% trans "Fully qualified package name." %}</p> <p><strong>{% trans "Package Name" %}: </strong>{% trans "Fully qualified package name." %}</p>
<p><strong>{% trans "Package Version" %}: </strong>{% trans "Version of the package (optional)." %}</p> <p><strong>{% trans "Package Version" %}: </strong>{% trans "Version of the package (optional)." %}</p>
<p>{% blocktrans %}The package is going to be imported from <a href="{{murano_repo_url}}" target="_blank">{{murano_repo_url}}</a> repository.{% endblocktrans %}</p> <p>{% blocktrans trimmed %}The package is going to be imported from <a href="{{murano_repo_url}}" target="_blank">{{murano_repo_url}}</a> repository.{% endblocktrans %}</p>
</div> </div>
<div class='description-by_url'> <div class='description-by_url'>
<h3>{% trans "Description" %}:</h3> <h3>{% trans "Description" %}:</h3>

4
muranodashboard/templates/services/_overview.html
View File

@ -14,7 +14,7 @@
</dd><br> </dd><br>
{% elif key == 'Instances' %} {% elif key == 'Instances' %}
{% for instance in value %} {% for instance in value %}
<dt>{% blocktrans %}Instance{{forloop.counter}} name{% endblocktrans %}</dt> <dt>{% blocktrans trimmed %}Instance{{forloop.counter}} name{% endblocktrans %}</dt>
<dd> <dd>
<a href=" {% url 'horizon:project:instances:detail' instance.id %}"> <a href=" {% url 'horizon:project:instances:detail' instance.id %}">
{{ instance.name }} {{ instance.name }}
@ -30,7 +30,7 @@
</dd><br> </dd><br>
{% elif key == 'Stacks'%} {% elif key == 'Stacks'%}
{% for stack in value %} {% for stack in value %}
<dt>{% blocktrans %}Heat Orchestration stack{{forloop.counter}} name{% endblocktrans %}</dt> <dt>{% blocktrans trimmed %}Heat Orchestration stack{{forloop.counter}} name{% endblocktrans %}</dt>
<dd> <dd>
<a href=" {% url 'horizon:project:stacks:detail' stack.id %}"> <a href=" {% url 'horizon:project:stacks:detail' stack.id %}">
{{ stack.name }} {{ stack.name }}