Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit c3c8b62379545a0032ac54de9f714174ee515bf0
Author: Adam Samalik <asamalik(a)redhat.com>
Date: Fri Jul 31 09:42:41 2015 +0200
update copr form info
---------------------------------------------------------------
.../coprs_frontend/coprs/templates/_helpers.html | 13 ++++++++++++-
.../coprs/templates/coprs/_coprs_forms.html | 20 ++++++--------------
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/templates/_helpers.html
b/frontend/coprs_frontend/coprs/templates/_helpers.html
index d420411..f8573fd 100644
--- a/frontend/coprs_frontend/coprs/templates/_helpers.html
+++ b/frontend/coprs_frontend/coprs/templates/_helpers.html
@@ -1,4 +1,4 @@
-{% macro render_field(field, label=None, class='') %}
+{% macro render_field(field, label=None, class='', info=None) %}
{% if not kwargs['hidden'] %}
{% if field.errors %}
<div class="form-group has-error">
@@ -10,11 +10,22 @@
</label>
<div class="col-sm-10">
{{ field(class="form-control", **kwargs)|safe }}
+ <ul class="list-unstyled">
+ {% if info %}
+ <li class="help-block">
+ <small class="text-muted pficon pficon-info">
+ {{info|safe}}
+ </small>
+ </li>
+ {% endif %}
{% if field.errors %}
{% for error in field.errors %}
+ <li class="help-block">
<span class="help-block">{{ error }}</span>
+ </li>
{% endfor %}
{% endif %}
+ </ul>
</div>
</div>
{% else %}
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
b/frontend/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
index 974bc31..56f393c 100644
--- a/frontend/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
+++ b/frontend/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
@@ -22,21 +22,13 @@
{{ render_field(form.name, hidden = True) }}
{{ render_field(form.name, label='Project Name', disabled = True) }}
{% endif %}
- {{ render_field(form.description, rows=5, cols=50, placeholder='Optional -
describe your project briefly.') }}
- {{ render_field(form.instructions, rows=5, cols=50, placeholder='Optional -
describe how your project can be installed. Where users can report bugs and issues. Link
to wiki is good as well.') }}
- {{ render_field(form.homepage, label='Homepage', placeholder='Optional -
project homepage') }}
- {{ render_field(form.contact, label='Contact', placeholder='Optional -
email address or contact url') }}
+ {{ render_field(form.description, rows=5, cols=50, placeholder='Optional -
describe your project briefly.',
+ info='You can use <a
href="http://daringfireball.net/projects/markdown/syntax">ma...
syntax</a>, inline HTMLis forbidden.') }}
+ {{ render_field(form.instructions, rows=5, cols=50, placeholder='Optional -
describe how your project can be installed. Where users can report bugs and issues. Link
to wiki is good as well.', info='You can use <a
href="http://daringfireball.net/projects/markdown/syntax">ma...
syntax</a>, inline HTMLis forbidden.') }}
- <div class="form-group">
- <label class="col-sm-2 control-label"
for="textInput-markup">
- </label>
- <div class="col-sm-10">
- <small class="text-muted pficon pficon-info">
- You can use <a
href="http://daringfireball.net/projects/markdown/syntax">ma...
syntax</a>, inline HTML is forbidden.
- </small>
- </div>
- </div>
+ {{ render_field(form.homepage, label='Homepage', placeholder='Optional -
project homepage') }}
+ {{ render_field(form.contact, label='Contact', placeholder='Optional -
email address or contact url', info="Use e-mail address or a link to your issue
tracker. This information will be shown publicly.") }}
{% if form._mock_chroots_error %}
<div class="form-group has-error">
@@ -59,7 +51,7 @@
</div>
{% endfor %}{% endfor %}
{% if form._mock_chroots_error %}
- <span class=" help-block"> {{ form._mock_chroots_error
}}</span>
+ <span class="help-block pficon pficon-warning-triangle-o"> {{
form._mock_chroots_error }}</span>
{% endif %}
</div>
</div>