Test project dashboard ux changes

privacy-backends
Anthony Johnson 2014-08-22 00:59:50 -07:00
parent f926420280
commit 2aa8ffd4c2
4 changed files with 37 additions and 30 deletions

View File

@ -41,14 +41,26 @@ def make_document_url(project, version=None, page=None):
return base_url + path
@register.filter(is_safe=True)
def restructuredtext(value):
def restructuredtext(value, short=False):
try:
from docutils.core import publish_parts
except ImportError:
if settings.DEBUG:
raise template.TemplateSyntaxError("Error in 'restructuredtext' filter: The Python docutils library isn't installed.")
raise template.TemplateSyntaxError(
"Error in 'restructuredtext' filter: "
"The Python docutils library isn't installed."
)
return force_text(value)
else:
docutils_settings = getattr(settings, "RESTRUCTUREDTEXT_FILTER_SETTINGS", {})
parts = publish_parts(source=force_bytes(value), writer_name="html4css1", settings_overrides=docutils_settings)
return mark_safe(force_text(parts["fragment"]))
docutils_settings = getattr(settings, "RESTRUCTUREDTEXT_FILTER_SETTINGS",
{})
parts = publish_parts(source=force_bytes(value), writer_name="html4css1",
settings_overrides=docutils_settings)
out = force_text(parts["fragment"])
try:
if short:
out = out.split("\n")[0]
except IndexError:
pass
finally:
return mark_safe(out)

View File

@ -258,6 +258,8 @@ ALLOW_PRIVATE_REPOS = False
GLOBAL_ANALYTICS_CODE = 'UA-17997319-1'
GRAVATAR_DEFAULT_IMAGE = 'identicon'
LOG_FORMAT = "[%(asctime)s] %(levelname)s [%(name)s:%(lineno)s] %(message)s"
LOGGING = {

View File

@ -1,4 +1,6 @@
{% load i18n %}
{% load core_tags %}
{% load gravatar %}
<!-- BEGIN project bar -->
<div id="project_bar">
@ -6,29 +8,23 @@
<div class="project-title">
<h1><a href="{{ project.get_absolute_url }}">{{ project }}</a></h1>
(
{% for user in project.users.all %}
<a href="{{ user.get_absolute_url }}" class="quiet">{{ user }}</a>{% if not forloop.last %}, {% endif %}
{% endfor %}
)
{% comment %}
{% if project.version %}<span class="quiet">version {{ project.version }} </span>{% endif %}
{% endcomment %}
</div>
<div class="options">
{% if project.description %}
<div id="project_description">
{{ project.description|restructuredtext:True }}
</div>
{% endif %}
{% if project.get_latest_build %}
{% if not project.get_latest_build.success and project.get_latest_build.state == 'finished' %}
<p class="build-failure">{% blocktrans with project.get_builds_url as url %}Build failed (<a href="{{ url }}">why</a>){% endblocktrans %}</p>
{% else %}
{# always keep an empty <p> around to keep spacing #}
{# consistent between pages. #}
<p class="build-success">&nbsp;</p>
{% endif %}
{% elif not request.GET.docs_not_built %}
<p class="build-missing">{% trans "There are no builds for this project" %}.{% if request.user in project.users.all %} <a href="{% url "projects_edit" project.slug %}">{% trans "Is the repo correct?" %}</a>{% endif %}</p>
{% endif %}
</div>
<div class="options">
<ul>
<li class="{{ overview_active }}"><a href="{{ project.get_absolute_url }}">{% trans "Overview" %}</a></li>

View File

@ -1,20 +1,10 @@
{% load i18n %}
{% load core_tags %}
{% load gravatar %}
<div id="project_details">
<div class="wrapper">
<div id="project_description">
{% if project.description %}
<h3>{% trans "Description" %}</h3>
<div id="project_description">
<p>
{{ project.description|restructuredtext }}
</p>
</div>
{% endif %}
</div>
<!-- BEGIN search bar -->
<div class="search">
<form action="{% url "haystack_project" %}" method="GET">
@ -100,6 +90,13 @@
</a>
{% include "core/badge_markup.html" with badge_url=badge_url site_url=site_url %}
<h3>{% trans "Owners" %}</h3>
<p>
{% for user in project.users.all %}
<a href="{% url "profiles_profile_detail" user.username %}">{% gravatar user.email 32 user.email %}</a>
{% endfor %}
</p>
{% if project.tags.count %}
<h3>{% trans "Tags" %}</h3>
<p>