diff options
Diffstat (limited to 'app/templates')
| -rw-r--r-- | app/templates/macros/packagegridtile.html | 15 | ||||
| -rw-r--r-- | app/templates/packages/create_edit.html | 4 | ||||
| -rw-r--r-- | app/templates/packages/view.html | 24 |
3 files changed, 38 insertions, 5 deletions
diff --git a/app/templates/macros/packagegridtile.html b/app/templates/macros/packagegridtile.html index 45f1f45..bfc827f 100644 --- a/app/templates/macros/packagegridtile.html +++ b/app/templates/macros/packagegridtile.html @@ -8,6 +8,21 @@ <p> {{ package.shortDesc }} </p> + + + {% if not package.license.is_foss and not package.media_license.is_foss and package.type != package.type.TXP %} + <p style="color:#f33;"> + <b>Warning:</b> Non-free code and media. + </p> + {% elif not package.license.is_foss and package.type != package.type.TXP %} + <p style="color:#f33;"> + <b>Warning:</b> Non-free code. + </p> + {% elif not package.media_license.is_foss %} + <p style="color:#f33;"> + <b>Warning:</b> Non-free media. + </p> + {% endif %} </div> </a></li> {% endmacro %} diff --git a/app/templates/packages/create_edit.html b/app/templates/packages/create_edit.html index 52a1d4b..86ee413 100644 --- a/app/templates/packages/create_edit.html +++ b/app/templates/packages/create_edit.html @@ -26,7 +26,9 @@ {{ render_field(form.shortDesc, class_="pkg_meta") }} {{ render_field(form.desc, class_="pkg_meta") }} {{ render_multiselect_field(form.tags, class_="pkg_meta") }} - {{ render_field(form.license, class_="pkg_meta") }} + <div class="pkg_meta"> + {{ render_field(form.license, class_="not_txp") }} + </div> {{ render_field(form.media_license, class_="pkg_meta") }} <div class="pkg_meta"> diff --git a/app/templates/packages/view.html b/app/templates/packages/view.html index 2e62ea9..e4555f0 100644 --- a/app/templates/packages/view.html +++ b/app/templates/packages/view.html @@ -61,7 +61,21 @@ <aside class="asideright box box_grey"> <h3>Details</h3> + <div class="box-body"> + {% if not package.license.is_foss and not package.media_license.is_foss and package.type != package.type.TXP %} + <div class="box box_grey alert alert-error" style="margin-top: 0;"> + <b>Warning:</b> Non-free code and media. + </div> + {% elif not package.license.is_foss and package.type != package.type.TXP %} + <div class="box box_grey alert alert-error" style="margin-top: 0;"> + <b>Warning:</b> Non-free code. + </div> + {% elif not package.media_license.is_foss %} + <div class="box box_grey alert alert-error" style="margin-top: 0;"> + <b>Warning:</b> Non-free media. + </div> + {% endif %} <table> <tr> <td>Name</td> @@ -93,11 +107,13 @@ <tr> <td>License</td> <td> - {% if package.license != package.media_license %} + {% if package.license == package.media_license %} + {{ package.license.name }} + {% elif package.type == package.type.TXP %} + {{ package.media_license.name }} + {% else %} {{ package.license.name }} for code,<br /> {{ package.media_license.name }} for media. - {% else %} - {{ package.license.name }} {% endif %} </td> </tr> @@ -108,7 +124,7 @@ </table> <ul class="buttonset linedbuttonset"> - {% if package.getDownloadRelease() %}<li><a href="{{ package.getDownloadURL() }}">Download</a></li>{% endif %} + {% if package.getDownloadRelease() %}<li><a href="{{ package.getDownloadURL() }}" class="btn_green">Download</a></li>{% endif %} {% if package.repo %}<li><a href="{{ package.repo }}">View Source</a></li>{% endif %} {% if package.forums %}<li><a href="https://forum.minetest.net/viewtopic.php?t={{ package.forums }}">Forums</a></li>{% endif %} {% if package.issueTracker %}<li><a href="{{ package.issueTracker }}">Issue Tracker</a></li>{% endif %} |