Skip to content

Commit

Permalink
html: removed left rails
Browse files Browse the repository at this point in the history 
- removed left panel in /profile, /toolbox, /new/funding
- replaces newletter and pushed it to the bottom

Fixes: gitcoinco#411
  • Loading branch information
Aditya Anand committed Feb 27, 2018
1 parent 377d02d commit 45ea667
Show file tree
Hide file tree
Showing 5 changed files with 100 additions and 109 deletions.
4 changes: 4 additions & 0 deletions app/assets/v2/css/base.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,10 @@ body.bounty_details #title {
-o-filter: grayscale(0%);
}

.body {
padding-bottom: 4em;
}

.profile_details .dot {
border-radius: 6px;
width: 12px;
Expand Down
182 changes: 89 additions & 93 deletions app/dashboard/templates/profile_details.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,8 @@
{% include 'shared/nav_internal.html' %}
</div>
<div class="row no-gutter">
<div class="col-2" style="background: #eee; ">
{% include 'shared/current_balance.html' %}
{% include 'shared/sidebar_search.html' %}
</div>

<div class="col body">
<div class="container-fluid" id="profile_detail">
{% include 'shared/bounty_def.html' %}

<div class="row mt-0 ml-0" id="profile_details">

<div id="hero" class="pt-4">
Expand Down Expand Up @@ -66,105 +59,108 @@ <h2 class="mt-3">
</li>
</ul>
</div>
{% if stats|length > 0 %}
<ul id="stats">
{% for stat in stats %}
<li>
{{stat.0}}
<span>
{{stat.1}}
</span>
</li>
{% endfor %}
</ul>
{% endif %}
<div style="width: 100%" class="pr-2">
<div>
<h4>{{profile.handle}} has Participated in these Funded Issues</h4>
<ul class="bounties">
{% if bounties|length == 0 %}
<div class="offset-md-2 col-sm-12 col-md-8">
{% if stats|length > 0 %}
<ul id="stats">
{% for stat in stats %}
<li>
No funded issues found
{{stat.0}}
<span>
{{stat.1}}
</span>
</li>
{% endif %}
{% if bounties|length > 0 %}
<li style="height:50px; font-weight: bold;">
<div class='relationship'>
Relationship
</div>
<div class='status'>
Status
</div>
<div class="details">
Details
</div>
</li>
{% for b in bounties %}
{% endfor %}
</ul>
{% endif %}
<div style="width: 100%" class="pr-2">
<div>
<h4>{{profile.handle}} has Participated in these Funded Issues</h4>
<ul class="bounties">
{% if bounties|length == 0 %}
<li>
<a href="{{b.url}}">
No funded issues found
</li>
{% endif %}
{% if bounties|length > 0 %}
<li style="height:50px; font-weight: bold;">
<div class='relationship'>
<p>
{% if profile.handle == b.fulfiller_github_username %}
Worker
{% elif profile.handle == b.bounty_owner_github_username %}
Funder
{% elif profile.handle == b.org_name %}
Repo Owner
{% else %}
Worker
{% endif %}
</p>
Relationship
</div>
<div class='status'>
<p>
{{b.status}}
</p>
Status
</div>
<div class="details">
<img style="max-width: 30px;" src="{{b.local_avatar_url}}">
<h6 style="display: inline;">
{{b.title_or_desc}}
</h6>
<p>
{{b.desc}}
</p>
</div>
<div class="amount">
<a class="btn btn-sm btn-darkBlue font-smaller-2">
{{b.value_true}} {{b.token_name}},
{{b.value_in_usdt}}
USD
</a>
Details
</div>
</li>
{% for b in bounties %}
<li>
<a href="{{b.url}}">
<div class='relationship'>
<p>
{% if profile.handle == b.fulfiller_github_username %}
Worker
{% elif profile.handle == b.bounty_owner_github_username %}
Funder
{% elif profile.handle == b.org_name %}
Repo Owner
{% else %}
Worker
{% endif %}
</p>
</div>
<div class='status'>
<p>
{{b.status}}
</p>
</div>
<div class="details">
<img style="max-width: 30px;" src="{{b.local_avatar_url}}">
<h6 style="display: inline;">
{{b.title_or_desc}}
</h6>
<p>
{{b.desc}}
</p>
</div>
<div class="amount">
<a class="btn btn-sm btn-darkBlue font-smaller-2">
{{b.value_true}} {{b.token_name}},
{{b.value_in_usdt}}
USD
</a>
</div>
</a>
</li>
{% endfor %}
{% endif %}
</ul>
</div>
<div>
<h4>Repos</h4>
<ul class="repos">
{% for r in profile.repos_data %}
<li>
<div class="dot">&nbsp;</div>
<a href="{% url "explorer" %}?q={{r.html_url}}">
<p class="meta mr-3">{{r.stargazers_count}} stars</p>
<h6>
{{r.full_name}}</h6>
{% if r.description %}
<p class="mb-1">{{r.description}}</p>
{% endif %}
</a>
</li>
{% endfor %}
{% endif %}
</ul>
</div>
<div>
<h4>Repos</h4>
<ul class="repos">
{% for r in profile.repos_data %}
<li>
<div class="dot">&nbsp;</div>
<a href="{% url "explorer" %}?q={{r.html_url}}">
<p class="meta mr-3">{{r.stargazers_count}} stars</p>
<h6>
{{r.full_name}}</h6>
{% if r.description %}
<p class="mb-1">{{r.description}}</p>
{% endif %}
</a>
</li>
{% endfor %}
{% if profile.repos_data|length == 0 %}
<li>
No repos
</li>
{% endif %}
</ul>
{% if profile.repos_data|length == 0 %}
<li>
No repos
</li>
{% endif %}
</ul>
</div>
</div>
{% include 'shared/newsletter.html' %}
</div>
</div>
</div>
Expand Down
13 changes: 3 additions & 10 deletions app/dashboard/templates/submit_bounty.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,13 @@
{% include 'shared/nav_internal.html' %}
</div>
<div class="row no-gutter">
<div class="col-2" style="background: #eee; ">
{% include 'shared/current_balance.html' %}
{% include 'shared/sidebar_search.html' %}
</div>

<div class="col body">
<div class="col-12 body">
<div class="container-fluid no-gutter">
{% include 'shared/bounty_def.html' %}
<div class="row font-smaller-2" id="form_container">
{% include 'shared/no_metamask_error.html' %}
{% include 'shared/zero_balance_error.html' %}
{% include 'shared/unlock_metamask.html' %}
<div class="col d-flex align-items-center justify-content-center" id="primary_form">
<div class="col offset-md-1 col-md-10 d-flex align-items-center justify-content-center" id="primary_form">
<div class="d-flex justify-content-center flex-column mt-5 w-50" id="primary_subform">
{% include 'shared/bounty_nav.html' with active_item=1 %}
<div class="w-100" style="text-align: center;">
Expand Down Expand Up @@ -141,9 +135,8 @@ <h3>Fund an Issue</h3>
<div class="w-100 mb-5 mt-1">
<a class="float-right" target=new href="https://github.com/gitcoinco/gitcoinco/issues?q=is%3Aissue+is%3Aopen+label%3Ahelp">Having trouble? Click here.</a>
</div>

{% include 'shared/newsletter.html' %}
</div>

</div>
</div>
</div>
Expand Down
6 changes: 1 addition & 5 deletions app/dashboard/templates/toolbox.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,8 @@
<div class="container-fluid header dash">
{% include 'shared/nav_internal.html' %}
<div class="row no-gutter">
<div class="col-2" style="background: #eee; ">
{% include 'shared/current_balance.html' %}
{% include 'shared/sidebar_search.html' %}
</div>
<div class="col body">
<div class="container-fluid">
<div class="container-fluid col-12 offset-md-2 col-md-8">
<div class = "toolbox">
<div class="row no-gutters">
<div class="col-md-5 col-12">
Expand Down
4 changes: 3 additions & 1 deletion app/dashboard/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,8 @@ def new_bounty(request):
'eth_usd_conv_rate': eth_usd_conv_rate(),
'conf_time_spread': conf_time_spread(),
'from_email': request.session.get('email', ''),
'from_handle': request.session.get('handle', '')
'from_handle': request.session.get('handle', ''),
'newsletter_headline': 'Be the first to know about new funded issues.'
}

return TemplateResponse(request, 'submit_bounty.html', params)
Expand Down Expand Up @@ -575,6 +576,7 @@ def profile(request, handle):
params = {
'title': 'Profile',
'active': 'profile_details',
'newsletter_headline': "Be the first to know about new funded issues.",
}

profile = profile_helper(handle)
Expand Down

0 comments on commit 45ea667

Please sign in to comment.