Disable edit requests

[cheatdb.git] / app / templates / packages / view.html

diff --git a/app/templates/packages/view.html b/app/templates/packages/view.html
index 1f6ada554f4db9fcad00a7fe546088ac95ffd981..2e62ea9d628b47760516eb4e67113e3be4925264 100644 (file)
--- a/app/templates/packages/view.html
+++ b/app/templates/packages/view.html
@@ -67,10 +67,17 @@
                                        <td>Name</td>
                                        <td>{{ package.name }}</td>
                                </tr>
+                               {% if package.provides %}
                                <tr>
                                        <td>Provides</td>
-                                       <td>{{ package.provides | join(', ') }}</td>
+                                       <td>{% for meta in package.provides %}
+                                               <a href="{{ url_for('meta_package_page', name=meta.name) }}">{{ meta.name }}</a>
+                                               {%- if not loop.last %}
+                                               ,
+                                               {% endif %}
+                                       {% endfor %}</td>
                                </tr>
+                               {% endif %}
                                <tr>
                                        <td>Author</td>
                                        <td class="{{ package.author.rank }}">
@@ -85,7 +92,18 @@
                                </tr>
                                <tr>
                                        <td>License</td>
-                                       <td>{{ package.license.name }}</td>
+                                       <td>
+                                               {% if package.license != package.media_license %}
+                                                       {{ package.license.name }} for code,<br />
+                                                       {{ package.media_license.name }} for media.
+                                               {% else %}
+                                                       {{ package.license.name }}
+                                               {% endif %}
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td>Added</td>
+                                       <td>{{ package.created_at | datetime }}</td>
                                </tr>
                        </table>
 
@@ -99,9 +117,9 @@
                                        <li><a href="{{ package.getEditURL() }}">Edit</a></li>
                                        <li><a href="{{ package.getNewScreenshotURL() }}">Add screenshot</a></li>
                                {% endif %}
-                               {% if current_user.is_authenticated %}
+                               {# {% if current_user.is_authenticated %}
                                        <li><a href="{{ package.getCreateEditRequestURL() }}">Suggest Changes</a></li>
-                               {% endif %}
+                               {% endif %} #}
                                {% if package.checkPerm(current_user, "MAKE_RELEASE") %}
                                        <li><a href="{{ package.getCreateReleaseURL() }}">Create Release</a></li>
                                {% endif %}
@@ -125,7 +143,7 @@
                                        {% if not rel.approved %}<i>{% endif %}
 
                                        <a href="{{ rel.url }}">{{ rel.title }}</a>,
-                                       created {{ rel.releaseDate }}.
+                                       created {{ rel.releaseDate | datetime }}.
                                        {% if rel.task_id %}
                                                <a href="{{ url_for('check_task', id=rel.task_id, r=package.getDetailsURL()) }}">Importing...</a>
                                        {% elif not rel.approved %}
@@ -159,21 +177,27 @@
 
        <!-- <table class="table-topalign">
                <tr>
-                       <td>
+                       <td> -->
                                <h3>Dependencies</h3>
                                <ul>
-                                       {% for p in package.harddeps %}
-                                               <li><a href="{{ p.getDetailsURL() }}">{{ p.title }}</a> by {{ p.author.display_name }}</li>
+                                       {% for dep in package.dependencies %}
+                                               <li>
+                                                       {%- if dep.package %}
+                                                               <a href="{{ dep.package.getDetailsURL() }}">{{ dep.package.title }}</a> by {{ dep.package.author.display_name }}
+                                                       {% elif dep.meta_package %}
+                                                               <a href="{{ url_for('meta_package_page', name=dep.meta_package.name) }}">{{ dep.meta_package.name }}</a>
+                                                       {% else %}
+                                                               {{ "Excepted package or meta_package in dep!" | throw }}
+                                                       {% endif %}
+                                                       {% if dep.optional %}
+                                                               [optional]
+                                                       {% endif %}
+                                               </li>
                                        {% else %}
-                                               {% if not package.softdeps %}
-                                               <li>No dependencies.</li>
-                                               {% endif %}
-                                       {% endfor %}
-                                       {% for p in package.softdeps %}
-                                               <li><a href="{{ p.getDetailsURL() }}">{{ p.title }}</a> by {{ p.author.display_name }} [optional]</li>
+                                               <li><i>No dependencies</i></li>
                                        {% endfor %}
                                </ul>
-                       </td>
+                       <!-- </td>
                        <td>
                                <h3>Required by</h3>
                                <ul>
@@ -192,19 +216,21 @@
                </tr>
        </table> -->
 
-       {% if current_user.is_authenticated or requests %}
-               <h3>Edit Requests</h3>
-
-               <ul>
-                       {% for r in requests %}
-                               <li>
-                                       <a href="{{ r.getURL() }}">{{ r.title }}</a>
-                                       by
-                                       <a href="{{ url_for('user_profile_page', username=r.author.username) }}">{{ r.author.display_name }}</a>
-                               </li>
-                       {% else %}
-                               <li>No edit requests have been made.</li>
-                       {% endfor %}
-               </ul>
-       {% endif %}
+       {#
+               {% if current_user.is_authenticated or requests %}
+                       <h3>Edit Requests</h3>
+
+                       <ul>
+                               {% for r in requests %}
+                                       <li>
+                                               <a href="{{ r.getURL() }}">{{ r.title }}</a>
+                                               by
+                                               <a href="{{ url_for('user_profile_page', username=r.author.username) }}">{{ r.author.display_name }}</a>
+                                       </li>
+                               {% else %}
+                                       <li>No edit requests have been made.</li>
+                               {% endfor %}
+                       </ul>
+               {% endif %}
+       #}
 {% endblock %}