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.

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

1180 ui issues #1213

Merged
merged 3 commits into from
Feb 25, 2015
Merged

1180 ui issues #1213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8cbb81
[#1212][#1208][#1196] fix
loicsans Feb 25, 2015
a961989
[#1198] Fixed
loicsans Feb 25, 2015
900e935
[#1196] Commas in large amounts
KasperBrandt Feb 25, 2015
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
23 changes: 18 additions & 5 deletions akvo/rsr/static/rsr/v3/css/src/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,6 @@ dl.dl-horizontal dt {
dl.dl-horizontal dt.totalFinance {
margin-top: 30px;
font-weight: bold; }
@media only screen and (max-width: 768px) {
dl.dl-horizontal dd {
margin-left: 100px; } }
dl.dl-horizontal dd.totalFinance {
margin-top: 30px;
font-weight: bold; }
Expand Down Expand Up @@ -503,8 +500,15 @@ nav.navbar-fixed-top {
color: white; }
@media only screen and (max-width: 768px) {
.twoColumns a {
width: 95%;
padding: 2px 5%;
width: 98%;
padding: 2px 1%;
float: none;
margin: 2px 0 2px 0;
display: block; } }
@media only screen and (min-width: 768px) and (max-width: 1024px) {
.twoColumns a {
width: 98%;
padding: 2px 1%;
float: none;
margin: 2px 0 2px 0;
display: block; } }
Expand Down Expand Up @@ -815,6 +819,12 @@ h4.detailedInfo {
color: rgba(32, 32, 36, 0.5); }
.main-list li .additionalInfo div span {
margin-left: 5px; }
@media only screen and (max-width: 768px) {
.main-list li dl.dl-horizontal dd {
margin-left: 100px; } }
@media only screen and (min-width: 768px) and (max-width: 1024px) {
.main-list li dl.dl-horizontal dd {
margin-left: 80px; } }
.main-list .excerpt {
overflow: hidden;
text-overflow: ellipsis;
Expand Down Expand Up @@ -964,6 +974,9 @@ header.projectHeader {
width: calc(100%-2px);
height: 300px; }

.orgMap .mapInfoWindow img {
display: none; }

div.projectTopRow {
position: relative;
background: rgba(245, 245, 245, 0.5);
Expand Down
56 changes: 39 additions & 17 deletions akvo/rsr/static/rsr/v3/css/src/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,6 @@ dl {
}
}
dd {
@include responsive(small-max-screens) {
margin-left: 100px;
}

&.totalFinance {
margin-top: 30px;
font-weight: bold;
Expand Down Expand Up @@ -407,40 +403,41 @@ nav.navbar-fixed-top {
}
}
}
@include responsive (ipadAir) {
.navbar-header {

@include responsive(ipadAir) {
.navbar-header {
float: none;
}
.navbar-left,.navbar-right {
.navbar-left, .navbar-right {
float: none !important;
}
.navbar-toggle {
display: block;
}
.navbar-collapse {
border-top: 1px solid transparent;
box-shadow: inset 0 1px 0 rgba(255,255,255,0.1);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
}
.navbar-fixed-top {
top: 0;
border-width: 0 0 1px;
}
.navbar-collapse.collapse {
display: none!important;
display: none !important;
}
.navbar-nav {
float: none!important;
float: none !important;
margin-top: 7.5px;
}
.navbar-nav>li {
.navbar-nav > li {
float: none;
}
.navbar-nav>li>a {
.navbar-nav > li > a {
padding-top: 10px;
padding-bottom: 10px;
}
.collapse.in{
display:block !important;
.collapse.in {
display: block !important;
}
}

Expand Down Expand Up @@ -541,8 +538,15 @@ nav.navbar-fixed-top {
color: white;
}
@include responsive(small-max-screens) {
width: 95%;
padding: 2px 5%;
width: 98%;
padding: 2px 1%;
float: none;
margin: 2px 0 2px 0;
display: block;
}
@include responsive(ipadAir) {
width: 98%;
padding: 2px 1%;
float: none;
margin: 2px 0 2px 0;
display: block;
Expand Down Expand Up @@ -930,6 +934,18 @@ h4.detailedInfo {
}
}
}
dl {
&.dl-horizontal {
dd {
@include responsive(small-max-screens) {
margin-left: 100px;
}
@include responsive(ipadAir) {
margin-left: 80px;
}
}
}
}
}
.excerpt {
@include noWrapBlockTxt;
Expand Down Expand Up @@ -1132,7 +1148,13 @@ header {
height: 300px;
}
}

.orgMap {
.mapInfoWindow {
img {
display: none;
}
}
}
div.projectTopRow {
position: relative;
background: rgba(245, 245, 245, 0.5);
Expand Down
6 changes: 3 additions & 3 deletions akvo/templates/myrsr/my_projects.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
{% block title %}{% trans "MyRSR - my projects" %}{% endblock %}

{% block myrsr_main %}
<div class="table-responsive">
<div>
<h3>{% trans "My project" %}s</h3>
{% if page %}
<table class="table table-striped">
<table class="table table-striped table-responsive">
<thead>
<tr>
<th>Project</th><th>Location</th><th>Status</th><th>Actions</th></tr>
Expand Down Expand Up @@ -50,7 +50,7 @@ <h4 class="media-heading">{{ project.title }}</h4>
</a>
{% endif %}
{% has_perm 'rsr.post_updates' project as can_add_update %}
<a href="{% url 'add-update' project.pk %}">Add an update</a>
<a href="{% url 'add-update' project.pk %}">Add update</a>
</div>
</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions akvo/templates/myrsr/my_updates.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
{% block myrsr_main %}
<h3>My updates</h3>
{% if page %}
<div class="table-responsive" id="updates">
<table class="table table-striped">
<div id="updates">
<table class="table table-striped table-responsive">
<thead><tr><th>Media</th><th>Title</th><th>Date</th><th>Project</th><th>Actions</th></tr></thead>
<tbody>
{% for update in page %}
Expand Down
4 changes: 2 additions & 2 deletions akvo/templates/myrsr/myrsr_base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="container">
<div class="row">
{% block myrsr_menu %}
<div class="col-sm-2 myRsrMenu">
<div class="col-md-2 myRsrMenu">
<h4 class="hidden">MyRSR</h4>
{% with current_path=request.get_full_path %}
<nav class="navbar navbar-nav" role="navigation">
Expand All @@ -26,7 +26,7 @@ <h4 class="hidden">MyRSR</h4>
{% endwith %}
</div>
{% endblock %}
<div class="col-sm-10">
<div class="col-md-10">
{% block myrsr_main %}{% endblock %}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion akvo/templates/organisation_directory.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% block title %}{% trans 'Organisations' %}{% endblock %}
{% block maincontent %}

<section id="map" class="touch-navbar">
<section id="map" class="touch-navbar orgMap">
{% coll_map page '100%' '100%' %}
</section>

Expand Down
20 changes: 10 additions & 10 deletions akvo/templates/project_finance.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends "base.html" %}

{% load compressed i18n rsr_utils %}
{% load compressed i18n rsr_utils humanize %}

{% block title %}{{project.title}}{% endblock title%}

Expand All @@ -14,17 +14,17 @@
<h4 class="">{% trans "Project financial details" %}:</h4>
<dl class="dl-horizontal">
{% for budget_item in project.budget_items.all %}
<dt>{{budget_item.label.label}}:</dt><dd><span class="currency">{% if project.currency = 'EUR' %}€{% elif project.currency = 'USD' %}${% endif %}</span>{{budget_item.amount}}</dd>
<dt>{{budget_item.label.label}}:</dt><dd><span class="currency">{{project.get_currency_display}}</span>{{budget_item.amount|floatformat|intcomma}}</dd>
{% endfor %}
<dt class="totalFinance">{% trans "Total" %}:</dt><dd class="totalFinance"><span class="currency">{% if project.currency = 'EUR' %}€{% elif project.currency = 'USD' %}${% endif %}</span>{{project.budget}}</dd>
<dt class="totalFinance">{% trans "Total" %}:</dt><dd class="totalFinance"><span class="currency">{{project.get_currency_display}}</span>{{project.budget|floatformat|intcomma}}</dd>
</dl>
</div>
<div class="col-sm-4">
<h4 class="">{% trans "Project funding" %}:</h4>
<dl class="dl-horizontal">
<dt>{% trans "Budget" %}:</dt><dd><span class="currency">{% if project.currency = 'EUR' %}€{% elif project.currency = 'USD' %}${% endif %}</span>{{project.budget}}</dd>
<dt>{% trans "Funded" %}:</dt><dd><span class="currency">{% if project.currency = 'EUR' %}€{% elif project.currency = 'USD' %}${% endif %}</span>{{project.funds}}</dd>
<dt class="totalFinance">{% trans "Funds needed" %}:</dt><dd class="totalFinance"><span class="currency">{% if project.currency = 'EUR' %}€{% elif project.currency = 'USD' %}${% endif %}</span>{{project.funds_needed}}</dd>
<dt>{% trans "Budget" %}:</dt><dd><span class="currency">{{project.get_currency_display}}</span>{{project.budget|floatformat|intcomma}}</dd>
<dt>{% trans "Funded" %}:</dt><dd><span class="currency">{{project.get_currency_display}}</span>{{project.funds|floatformat|intcomma}}</dd>
<dt class="totalFinance">{% trans "Funds needed" %}:</dt><dd class="totalFinance"><span class="currency">{{project.get_currency_display}}</span>{{project.funds_needed|floatformat|intcomma}}</dd>
</dl>
</div>
<div class="col-sm-4">
Expand All @@ -34,27 +34,27 @@ <h4 class="">{% trans "Current funders" %}:</h4>
<dt><a href="{% url 'organisation-main' partnership.organisation.pk %}">{% img partnership.organisation 80 60 partnership.organisation.name %}</a></dt>
<dd>
<a href="{% url 'organisation-main' partnership.organisation.pk %}">{{partnership.organisation}}</a>
<br><span class="currency">{% if project.currency = 'EUR' %}€{% elif project.currency = 'USD' %}${% endif %}</span>{{partnership.funding_amount}}
<br><span class="currency">{{project.get_currency_display}}</span>{{partnership.funding_amount|floatformat|intcomma}}
</dd>
</dl>
{% endfor %}
<h4>{% trans "Donations" %}:</h4>
<dl class="dl-horizontal">
{% for donation in project.all_donations %}
<dt>{% if donation.is_anonymous %}{% trans "Anonymous" %}{% else %}{{donation.name}}{% endif %}:</dt><dd><span class="currency">{% if project.currency = 'EUR' %}€{% elif project.currency = 'USD' %}${% endif %}</span>{{donation.amount}}</dd>
<dt>{% if donation.is_anonymous %}{% trans "Anonymous" %}{% else %}{{donation.name}}{% endif %}:</dt><dd><span class="currency">{{project.get_currency_display}}</span>{{donation.amount|floatformat|intcomma}}</dd>
{% empty %}
<dt>{% trans "No donations" %}</dt><dd></dd>
{% endfor %}
{% if project.all_donations %}
<dt class="totalFinance">{% trans "Total" %}:</dt><dd class="totalFinance"><span class="currency">{% if project.currency = 'EUR' %}€{% elif project.currency = 'USD' %}${% endif %}</span>{{project.all_donations_amount}}</dd>
<dt class="totalFinance">{% trans "Total" %}:</dt><dd class="totalFinance"><span class="currency">{{project.get_currency_display}}</span>{{project.all_donations_amount|floatformat|intcomma}}</dd>
{% endif %}
</dl>
</div>
</div>
<div class="row verticalPadding">
<h4 class="">{% trans "Project transactions" %}:</h4>
{% for transaction in project.transactions.all %}
<dt>{{transaction.description}}:</dt><dd><span class="currency">{% if transaction.currency = 'EUR' %}€{% elif project.currency = 'USD' %}${% endif %}</span>{{transaction.value}}</dd>
<dt>{{transaction.description}}:</dt><dd><span class="currency">{{project.get_currency_display}}</span>{{transaction.value|floatformat|intcomma}}</dd>
{% empty %}
<p class="small noInfoBlock"><i class="noItem">{% trans "No transactions for this project" %}</i></p>
{% endfor %}
Expand Down