Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Improve design of activity panel #200

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.

Sign up for GitHub

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

Merged
fredfalcon merged 1 commit into from
Jun 6, 2017
Merged

Improve design of activity panel #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions website/static/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,4 +227,36 @@ a:hover{
height: auto;
}

.activity-strip {
height:120px;
overflow:hidden;
}

.activity-strip .activity-strip-section {
overflow:hidden;
float:left;
width:80%;
display:inline-flex;
}

.activity-strip-section > div {
margin-left: 20px;
font-size: 20px;
font-weight: bold;
}
.activity-strip-section > div a {
text-decoration: none;
}
.activity-strip-section > div > .small {
font-size: initial;
font-weight: initial;
}
.activity-screenshot {
float:right;
display:block;
overflow:hidden;
}
.activity-screenshot img {
width: 100px;
height: 95%;
}
82 changes: 42 additions & 40 deletions website/templates/_activity.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,53 @@
{% load gravatar %}
<div class="list-group-item" style="height:120px; overflow:hidden;">
<div style=" overflow:hidden; float:left; width:100%; height: 62px; clear:both; display:inline; padding-right:110px;" >
<div style="float:left;margin-right:10px">
{% if activity.actor.socialaccount_set.all.0.get_avatar_url %}
<img src="{{activity.actor.socialaccount_set.all.0.get_avatar_url}}" width="50" height="50">
{% else %}
{% gravatar activity.actor.email 50 %}
{% endif %}
</div>
{% if activity.verb == "logged in" %}
<i class="fa fa-sign-in fa-fw"></i>
{% elif activity.verb == "found a bug on website" %}
<i class="fa fa-bug fa-fw"></i>
<div class="list-group-item activity-strip">
<div class="activity-strip-section">

{% if activity.actor.socialaccount_set.all.0.get_avatar_url %}
<img src="{{activity.actor.socialaccount_set.all.0.get_avatar_url}}" width="100" class="img-responsive img-rounded">
{% else %}
<img src="{% gravatar_url activity.actor.email 100 %}" width="100" class="img-responsive img-rounded">
{% endif %}

{% if activity.action_object %}
{% if activity.action_object.get_absolute_url %}
<a href="{{ activity.action_object.get_absolute_url }}">{{ activity.action_object }}</a>
{% else %}
<a href="{{ activity.action_object_url }}">{{ activity.action_object }}</a>
<div>
{% if activity.action_object %}
{% if activity.action_object.get_absolute_url %}
<a href="{{ activity.action_object.get_absolute_url }}">{{ activity.action_object }}</a>
{% else %}
<a href="{{ activity.action_object_url }}">{{ activity.action_object }}</a>
{% endif %}
{% endif %}
{% endif %}
{% if activity.action_object and activity.target %}to{% endif %}
{% if activity.target %}
{% if activity.target.get_absolute_url %}
<a href="/domain/{{ activity.target.domain_name }}">
<img src="http://www.{{activity.target.domain_name}}/favicon.ico" height="25" onerror="this.onerror=null; this.style.display ='none';">
</a>
<a href="{{ activity.target.get_absolute_url }}" style="margin-left:10px;">{{ activity.target }}</a>
{% else %}
<a href="{{ activity.target_url }}"> - {{ activity.target }}</a>

{% if activity.action_object and activity.target %}to{% endif %}

{% if activity.target %}
{% if activity.target.get_absolute_url %}
<a href="/domain/{{ activity.target.domain_name }}">
<img src="http://www.{{activity.target.domain_name}}/favicon.ico" height="25" onerror="this.onerror=null; this.style.display='none';">
</a>
<a href="{{ activity.target.get_absolute_url }}" style="">{{ activity.target }}</a>
{% else %}
<a href="{{ activity.target_url }}"> - {{ activity.target }}</a>
{% endif %}
{% endif %}
{% endif %}
</div>
<div style="clear:both; width:50%; display:inline-block; margin-top:2px; ">
{% if activity.actor.get_absolute_url %}
<a href="{{ activity.actor.get_absolute_url }}">{{ activity.actor }}</a>
{% else %}
<a href="{{ activity.actor_url }}">{{ activity.actor }}</a>
{% endif %}
{{ activity.verb }} <a href="/domain/{{ activity.target.domain_name }}">{{ activity.target.domain_title }}</a> {{ activity.timestamp|timesince }} ago |
<a href="//{{ activity.target.domain_name }}">{{ activity.target.domain_name }}</a>

<div class="small">
{% if activity.actor.get_absolute_url %}
<a href="{{ activity.actor.get_absolute_url }}" class="text-capitalize">
{{ activity.actor }}
</a>
{% else %}
<a href="{{ activity.actor_url }}">{{ activity.actor }}</a>
{% endif %}
{{ activity.verb }} <a href="/domain/{{ activity.target.domain_name }}">{{ activity.target.domain_title }}</a> {{ activity.timestamp|timesince }} ago |
<a href="//{{ activity.target.domain_name }}">{{ activity.target.domain_name }}</a>
</div>
</div>
</div>
<div style="float:right; display:block; margin-top: -60px; overflow:hidden; height: 72px;">

<div class="activity-screenshot">
{% if activity.target.screenshot %}
<a href="{{ activity.target.get_absolute_url }}">
<img src="{{ activity.target.screenshot.url }}" width="100" style="float:right;" >
<img src="{{ activity.target.screenshot.url }}">
</a>
{% endif %}
</div>
Expand Down