Skip to content

Commit

Permalink
Some trello issue with new responsive design #1
Browse files Browse the repository at this point in the history
  • Loading branch information
@yaniv14
yaniv14 committed Jan 1, 2014
1 parent c3bf6e0 commit 51c1a03
Show file tree
Hide file tree
Showing 6 changed files with 94 additions and 97 deletions.
26 changes: 13 additions & 13 deletions src/communities/templates/communities/upcoming.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,15 @@
{% endwith %}
</div>
<div class="col-xs-12">
{% if cperms.communities.viewupcoming_community %}
{% if cperms.communities.viewupcoming_draft or object.upcoming_meeting_is_published %}
<div class="pull-right">
{% if cperms.community.editupcoming_community %}
<a data-rel="form" href="{% url "upcoming_edit" community.id %}" style="color: #6C6C6E;display: block; text-align: left;"> <i class="fa fa-edit"></i> <span>{% trans "Edit" %}</span></a>
{% endif %}
</div>
{% endif %}
{% endif %}
<div class="pull-left">
<h1>
{% if object.upcoming_meeting_title and cperms.communities.viewupcoming_community %}
Expand All @@ -57,15 +66,6 @@ <h1>
{% endif %}
</h1>
</div>
{% if cperms.communities.viewupcoming_community %}
{% if cperms.communities.viewupcoming_draft or object.upcoming_meeting_is_published %}
<div class="pull-right">
{% if cperms.community.editupcoming_community %}
<a data-rel="form" href="{% url "upcoming_edit" community.id %}" style="color: #6C6C6E;display: block; text-align: left;"> <i class="fa fa-edit"></i> <span>{% trans "Edit" %}</span></a>
{% endif %}
</div>
{% endif %}
{% endif %}
</div>
</div>
{% if cperms.communities.viewupcoming_community %}
Expand All @@ -77,7 +77,7 @@ <h1>
</div>
{% endif %}

<div class="oc_detail_top row clear" style="margin-right: -5px;margin-left: -5px;border:0;background: none;">
<div class="oc_detail_top row clear" style="border:0;background: none;">
<span class="pull-left">
<div class="pull-left">
<h5><i class="fa fa-calendar"></i> {{ object|display_upcoming_time }}&nbsp;&nbsp;</h5>
Expand All @@ -92,16 +92,16 @@ <h5><a data-rel="form" href="{% url "upcoming_edit_participants" community.id %
{% endif %}
</span>
{% if cperms.community.editupcoming_community %}
<span class="pull-right">
<span class="pull-right" style="line-height: 35px;">
{% if object.upcoming_meeting_started %}
<form method="post" class="btn btn-default" action="{% url "upcoming_end" community.id %}">
{% csrf_token %}
<button style="border: 0; outline: none;background: 0;padding: 0;">
<button style="color: #666;border: 0; outline: none;background: 0;padding: 0;">
<i class="fa fa-undo"></i> <span>{% trans "Undo Start Meeting" %}</span>
</button>
</form>
{% else %}
<button style="border: 0; outline: none;background: 0;padding: 0;"
<button style="color: #666;border: 0; outline: none;background: 0;padding: 0;"
data-rel="form" data-url="{% url "upcoming_start" community.id %}" >
<i class="fa fa-play-circle"></i> <span>{% trans "Start Meeting" %}</span>
</button>
Expand Down
8 changes: 4 additions & 4 deletions src/issues/templates/issues/_issue_title.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
{% load opencommunity %}

<div class="col-xs-12">
<h1>{{object.title}}</h1>
<div class="pull-left">
<h5 style="clear: both;">{% trans "By:" %} {{ object.created_by}}. {{ object.created_at}}</h5>
</div>
<h1 class="pull-left">{{object.title}}</h1>
{% if not object.in_closed_meeting %}
{% if cperms.issues.editopen_issue or object.created_by == user %}
<div class="pull-right">
Expand All @@ -16,6 +13,9 @@ <h5>
</div>
{% endif %}
{% endif %}
<div>
<h5 style="clear: both;">{% trans "By:" %} {{ object.created_by}}. {{ object.created_at}}</h5>
</div>
</div>
<div class="clearfix"></div>
<span class="loader">
Expand Down
14 changes: 2 additions & 12 deletions src/issues/templates/issues/issue_detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,14 @@
</ul>
</div>

<div class="issue_left_column col-sm-9 col-xs-12" style="margin-bottom: -40px;">
<div class="issue_left_column col-sm-9 col-xs-12{% if object.agenda_items.count %} tabs-margin{% endif %}" style="margin-bottom: -40px;">
<div class="issue_left_column_inner">

{% with can_straw_vote=object.can_straw_vote %}

{% csrf_token %}
{% if object.agenda_items.count %}
<ul
data-filter=".filter"
class="nav nav-tabs"
style="
float: left;
margin-top: -31px;
margin-left:-23px;
border-bottom: 0;
padding-top: 0;"
>
<ul data-filter=".filter" class="nav nav-tabs">

{% if not object.is_archived %}
<li{% if not meeting %} class="active"{% endif %}>
Expand Down Expand Up @@ -133,7 +124,6 @@
<script src="{{ STATIC_URL }}js/hogan-2.0.0.js"></script>
<script src="{{STATIC_URL}}js/issues.js"></script>
<script src="{% url 'jsi18n' %}"></script>

<script>
$(function() {

Expand Down
75 changes: 38 additions & 37 deletions src/issues/templates/issues/proposal_detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,40 @@ <h5>{% trans "Proposals" %}</h5>
<div class="proposal" data-id="{{object.id}}" data-accepted="{{object.status}}">

<div class="pull-left">
<h1 style="padding-right: 10px;padding-left: 130px;">{{object.title}}</h1>
<h1 style="padding: 5px 10px;">{{object.title}}</h1>
</div>
<div class="pull-right">
{% if cperms.issues.view_proposal_in_discussion or not proposal.is_open %}
{% if object.status == object.statuses.ACCEPTED or object.status == object.statuses.REJECTED %}
<div class="{{object.get_status_class}}">

{% if object.status == object.statuses.ACCEPTED %}
<i class="fa fa-check-circle"></i> {% trans "Proposal accepted" %}!
{% endif %}
{% if object.status == object.statuses.REJECTED %}
<i class="fa fa-times-circle"></i> {% trans "Proposal rejected" %}!
{% endif %}

{% if object.decided_at_meeting %}
<a href="{{ object.decided_at_meeting.get_absolute_url }}" class="text-center" style="display: block;">({{ object.decided_at_meeting.get_title_or_date }})</a>
{% endif %}

{% if object.can_vote and cperms.issues.acceptopen_proposal %}
<a href="#" class="unaccept btn btn-warning btn-md" data-value="{{object.statuses.IN_DISCUSSION}}">{% trans "Cancel approval" %}</a>
{% endif %}
</div>
{% endif %}
{% endif %}
{% if cperms.issues.editclosed_proposal or object.is_open %}
{% if cperms.issues.editopen_proposal or object.created_by == user %}
<div class="col-xs-12 text-right">
{% if not object.is_task or cperms.issues.edittask_proposal %}
<a href="{{object.get_edit_url}}" data-rel="form" style="color: #6C6C6E;"> <i class="fa fa-edit"></i> <span>{% trans "Edit" %}</span> </a>
{% endif %}
<a href="{{object.get_delete_url}}" data-rel="form" style="color: #6C6C6E;"> <i class="fa fa-trash-o"></i> <span>{% trans "Delete" %}</span> </a>
</div>
{% endif %}
{% endif %}
</div>
<div class="oc_detail_top row clear" style="margin-right: -5px;margin-left: -5px;border:0;background: none;">
{% if object.type == 1 %}
Expand All @@ -82,24 +115,14 @@ <h5><span class="glyphicon glyphicon-user"></span> {% trans "Assigned to" %}: {{
{% endif %}
{% if object.due_by %}
<div class="pull-left">
<h5><span class="glyphicon glyphicon-calendar"></span> {% trans "Due by" %}: {{ object.due_by }}&nbsp;&nbsp;</h5>
<h5><span class="glyphicon glyphicon-calendar"></span> {% trans "Due by" %}: {{ object.due_by|date:"d/m/Y" }}&nbsp;&nbsp;</h5>
</div>
{% endif %}
{% endif %}
<div class="pull-left">
<h5><span class="glyphicon glyphicon-user"></span> {% trans "By:" %} {{ object.created_by}}. {{ object.created_at}}</h5>
<h5 style="line-height: 18px;"> {% trans "By:" %} {{ object.created_by }}. {{ object.created_at|date:"d/m/Y" }}</h5>
</div>
<div class="col-xs-12" style="border-top: 1px solid; clear: both;margin-bottom: 10px;"></div>
{% if cperms.issues.editclosed_proposal or object.is_open %}
{% if cperms.issues.editopen_proposal or object.created_by == user %}
<div class="col-xs-12 text-right">
{% if not object.is_task or cperms.issues.edittask_proposal %}
<a href="{{object.get_edit_url}}" data-rel="form" style="color: #6C6C6E;"> <i class="fa fa-edit"></i> <span>{% trans "Edit" %}</span> </a>
{% endif %}
<a href="{{object.get_delete_url}}" data-rel="form" style="color: #6C6C6E;"> <i class="fa fa-trash-o"></i> <span>{% trans "Delete" %}</span> </a>
</div>
{% endif %}
{% endif %}
<h5 style="clear: both;">
{% if object.content %}
{{object.content|userhtml}}
Expand All @@ -108,28 +131,6 @@ <h5 style="clear: both;">
</div>
</div>

{% if cperms.issues.view_proposal_in_discussion or not proposal.is_open %}
{% if object.status == object.statuses.ACCEPTED or object.status == object.statuses.REJECTED %}
<div class="{{object.get_status_class}}">

{% if object.status == object.statuses.ACCEPTED %}
<i class="fa fa-check-circle"></i> {% trans "Proposal accepted" %}!
{% endif %}
{% if object.status == object.statuses.REJECTED %}
<i class="fa fa-times-circle"></i> {% trans "Proposal rejected" %}!
{% endif %}

{% if object.decided_at_meeting %}
<a href="{{ object.decided_at_meeting.get_absolute_url }}" class="text-center" style="display: block;">({{ object.decided_at_meeting.get_title_or_date }})</a>
{% endif %}

{% if object.can_vote and cperms.issues.acceptopen_proposal %}
<a href="#" class="unaccept btn btn-oc btn-lg" data-value="{{object.statuses.IN_DISCUSSION}}">{% trans "Cancel approval" %}</a>
{% endif %}
</div>
{% endif %}
{% endif %}

{% with proposal=object c=proposal.issue.community %}
{% if proposal.can_straw_vote and cperms.issues.vote and user|member_of:c %}
{% include 'issues/_vote.html' %}
Expand All @@ -146,12 +147,12 @@ <h5 style="clear: both;">
{% csrf_token %}
<div class="narrow accept_reject_btns accept-buttons text-center">
{% if object.status != object.statuses.ACCEPTED %}
<button class="btn btn-default btn-lg" name="accepted" value="{{object.statuses.ACCEPTED}}" style="border-bottom: 5px solid #62d39f">
<button class="btn btn-default btn-lg" name="accepted" value="{{object.statuses.ACCEPTED}}" style="border-bottom: 5px solid #a4cb53">
{% trans "Accept proposal" %}
</button>
{% endif %}
{% if object.status != object.statuses.REJECTED %}
<button class="btn btn-default btn-lg" name="accepted" value="{{object.statuses.REJECTED}}" style="border-bottom: 5px solid #de5757">
<button class="btn btn-default btn-lg" name="accepted" value="{{object.statuses.REJECTED}}" style="border-bottom: 5px solid #d95e59">
{% trans "Reject proposal" %}
</button>
{% endif %}
Expand Down
20 changes: 20 additions & 0 deletions src/ocd/static/new_style-rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,19 @@
#members-list nav.oc_navbar ul li:nth-child(3) a {
text-decoration: underline;
}
.dropdown-menu {
min-width: 120px;
}
.issue_left_column_inner ul.nav.nav-tabs {
float: left;
margin-top: -31px;
margin-left: -14px;
border-bottom: 0;
padding-top: 0;
}
.tabs-margin {
margin-top: 20px;
}

@media (min-width: 768px) {
.proposal_right_column {
Expand Down Expand Up @@ -251,4 +264,11 @@
/*.issue_left_column_inner ul.nav.nav-tabs {
padding-top: 37px !important;
}*/
.issue_left_column_inner ul.nav.nav-tabs {
margin-left: -23px;
}
.tabs-margin {
margin-top: 0;
}

}
48 changes: 17 additions & 31 deletions src/ocd/static/style-rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ ul.errorlist li {
color: #fff;
text-shadow: none;
background-color: #194e5c;
border-color: #fff;
/*border-color: #fff;*/
}
.btn-oc:hover {
opacity: 0.9;
Expand Down Expand Up @@ -392,14 +392,16 @@ ul li.issue.oc_li a.addremove {

#agenda li .grab {
width: 40px;
height: 40px;
/*height: 40px;*/
background: url('images/drag-handle.png') center no-repeat;
float: right;
cursor: move;
position: absolute;
height: 100%;
}
#ordered li .grab {
width: 60px;
height: 45px;
/*height: 45px;*/
background: url('images/drag-handle-white.png') #3d3c3c center no-repeat;
float: right;
cursor: move;
Expand Down Expand Up @@ -440,7 +442,7 @@ ul li.issue.oc_li a.addremove {
top: 10px;
left: 85px;
background: transparent;
color: #fff;
color: #666;
font-size: 14px;
font-weight: bold;
cursor: pointer;
Expand Down Expand Up @@ -660,7 +662,7 @@ table.issue-table {
font-size: 18px;
padding-left: 30px;
padding-right: 10px;
background: url(images/arrow-left.png) #448698 no-repeat 10px 50%;
background: url(images/arrow-left.png) #f5f6de no-repeat 10px 50%;
word-break: break-word;
}
.issue-table tr td.title {
Expand Down Expand Up @@ -717,7 +719,7 @@ table.issue-table tr td {
overflow: hidden;
}
.meeting-table thead tr th a {
color: #fff;
color: #666;
text-decoration: none;
/* display: block;*/
max-height: 2.6em;
Expand All @@ -731,6 +733,7 @@ table.issue-table tr td {
}
.meeting-table thead tr th.count a {
width: 38px;
color: #fff;
}
.issue-table tr td.icon {
/*font-size: 30px;*/
Expand Down Expand Up @@ -846,41 +849,24 @@ ul.proposals li.prop-content p {
margin: 10px 0;
}
.unaccept {
position: absolute;
/*position: absolute;
top: 0;
left: 0;
margin: 7px;
margin: 7px;*/
}
#proposal-detail .accepted {
position: absolute;
/*position: absolute;
top: 0;
left: 0;
left: 0;*/
font-size: 14px;
padding: 10px;
/*position: relative;
background: url(images/accepted.png) no-repeat right center #b8d29a;
border: 1px solid #d8e0df;
padding: 17px 50px;
font-size: 18px;
font-weight: bold;
margin-bottom: 20px;
margin-top: 20px;*/
/*padding: 10px;*/
}
#proposal-detail .rejected {
position: absolute;
/*position: absolute;
top: 0;
left: 0;
left: 0;*/
font-size: 14px;
padding: 10px;
/*position: relative;
background: url(images/proposal-rejected.png) no-repeat #d2af7d;
background-position: 99% 50%;
border: 1px solid #e8d8df;
padding: 17px 50px;
font-size: 18px;
font-weight: bold;
margin-bottom: 20px;
margin-top: 20px;*/
/*padding: 10px;*/
}
#proposal-detail .accepted a:hover,
#proposal-detail .rejected a:hover {
Expand Down

0 comments on commit 51c1a03

Please sign in to comment.