Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add organization and user names on dataset pages #1847

Merged
merged 6 commits into from Aug 23, 2018
Merged
Diff settings

Always

Just for now

@@ -192,6 +192,16 @@ <h3 class="text-left">{{ _('Producer') }}</h3>
{% endwith %}
</div>
</div>
{% elif dataset.owner %}
<div class="panel panel-default text-center">
<div class="panel-body">
<h3 class="text-left">{{ _('Author') }}</h3>

{% with user=dataset.owner %}
{% include theme('user/sidebar-user.html') %}
{% endwith %}
</div>
</div>
{% endif %}

{# Information panel #}
@@ -3,6 +3,9 @@
<img src="{{ organization.logo|placeholder('organization') }}"
alt="{{ organization.name }}" class="organization-logo producer img-responsive"/>
</a>

<h4>{{ organization.name }}</h4>

<div class="caption text-left">
{% if organization.description %}
<p>
@@ -0,0 +1,34 @@
<a href="{{ url_for('users.show', user=user, _external=True) }}"
title="{{ user.name }}">
<img src="{{ user.logo|placeholder('organization') }}"

This comment has been minimized.

Copy link
@noirbizarre

noirbizarre Aug 23, 2018

Member

Placeholder should be user

alt="{{ user.name }}" class="organization-logo producer img-responsive"/>
</a>

<h4>{{ user.first_name }} {{ user.last_name }}</h4>

This comment has been minimized.

Copy link
@noirbizarre

noirbizarre Aug 23, 2018

Member

{{ user.fullname }}


<div class="caption text-left">
{% if user.description %}

This comment has been minimized.

Copy link
@noirbizarre

noirbizarre Aug 23, 2018

Member

user.about ?

<p>
{{ user.about|mdstrip(180) }}
</p>
{% else %}
<br/>
{% endif %}
<a href="{{ url_for('users.show', user=user) }}"
class="btn btn-sm btn-block btn-left btn-warning">
<span class="fa fa-users"></span>
{{ _('View Profile') }}
</a>
<button type="button" class="btn btn-sm btn-block btn-left btn-warning" @click="$refs.discussions.start('')"
v-tooltip="'{{ _('Contact the producer') }}'" tooltip-placement="left">
<span class="fa fa-envelope-o"></span>
{# TRANSLATORS: This is an action (present indicative). #}
{{ _('Contact') }}
</button>
<follow-button with-label classes="btn-block btn-sm btn-left btn-warning"
{% if is_following(user) %}following{% endif %}
url="{{ url_for('api.user_followers', id=user.id|string) }}"
tooltip="{{ _('I\'ll be informed about this user news') }}"
>
</follow-button>
</div>
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.