Commit 76ac919e authored by Olga Brani's avatar Olga Brani
Browse files

Various presentation fixes

parent d30a7346
......@@ -225,7 +225,7 @@ table.alt-style tr td:first-child,
table.alt-style tr th:first-child { padding-left:5px; }
table.alt-style tr td a { margin:0 0 0 20px; }
table.alt-style tr td:first-child a { margin:0; }
.content a.submit { margin:0; display:inline-block; margin:10px 0 ; height:auto;}
.content a.submit { margin:0; display:inline-block; margin:10px 0 ; height:auto; min-width:100px; text-align:center;}
table.alt-style tr:nth-child(2n) td { background:#F2F2F2 }
dl.alt-style { width:500px; }
dl.alt-style dt { width:50%; float:left; color:#3582AC; font-weight:normal;}
......@@ -317,4 +317,9 @@ dl.alt-style dt:nth-child(2n) { background:black; }
.billing .resource-cat-2.filter-item a:hover { color:#4085A5 }
.table_sorting tr th { cursor:pointer; }
.table_sorting tr th:hover { text-decoration:underline }
\ No newline at end of file
.table_sorting tr th:hover { text-decoration:underline }
table.alt-style tr.tr1 td,
table.alt-style tr.tmore1 td { background:#F2F2F2 }
table.alt-style tr.tr2 td,
table.alt-style tr.tmore2 td { background:#fff }
\ No newline at end of file
......@@ -203,6 +203,21 @@ $(document).ready(function() {
$(".table_sorting").tablesorter();
$('table .more-info').click(function(e){
e.preventDefault();
$(this).toggleClass('open');
$(this).parents('tr').next('tr').toggle();
check_table_info();
})
function check_table_info() {
if ($('table .more-info').hasClass('open')){
$(this).text('[- Less Info]')
} else {
$(this).text('[+ More Info]')
}
}
});
$(window).resize(function() {
......
......@@ -13,6 +13,16 @@
</h2>
<div class="details">
<p>{{ object.desc }}</p>
<dl class="alt-style">
<dt>Homepage url</dt>
<dd>
{% if object.homepage%}
<a href="{{ object.homepage }}">{{ object.homepage }}</a>
{% else %}
Not set yet
{% endif %}
</dd>
</dl>
</div>
<div class="full-dotted">
<h3>DETAILS:</h3>
......@@ -45,11 +55,10 @@
</div>
<div class="full-dotted">
<h3>POLICIES:</h3>
<h3>RESOURCES:</h3>
{% if quota %}
<dl class="alt-style">
<dt>Resrouce</dt>
<dd>Limit</dd>
{% for k in quota|dkeys %}
<dt>{{ k }}</dt>
......@@ -67,7 +76,7 @@
<caption>MEMBERS:</caption>
<thead>
<tr>
<th>Email</th>
<th>User Id</th>
<th>Name</th>
<th>Status</th>
</tr>
......@@ -85,8 +94,8 @@
{% else %}
<td>Pending
{% if user in m.group.owner.all %}
<a href="{% url approve_member m.group.id m.person.id %}">Approve</a>
<a href="{% url disapprove_member m.group.id m.person.id %}">Disapprove</a>
<a href="{% url approve_member m.group.id m.person.id %}">Accept</a>
<a href="{% url disapprove_member m.group.id m.person.id %}">Reject</a>
{% endif %}
</td>
{% endif %}
......
......@@ -5,7 +5,7 @@
<div class="maincol {% block innerpage.class %}{% endblock %}">
<form action="" method="post"
class="withlabels">{% csrf_token %}
<h2><span>NEW GROUP</span></h2>
<h2><span>CREATE {{ kind|upper }}</span></h2>
{% include "im/form_render.html" %}
<div class="form-row submit">
<input type="submit" class="submit altcol" value="SUBMIT" />
......
......@@ -4,6 +4,7 @@
{% block page.body %}
<div class="maincol {% block innerpage.class %}{% endblock %}">
<h2>GROUPS</h2>
{% if form %}
<p>You can search for a group by name</p>
<form action="{% url group_search %}" method="post" class="withlabels signup">{% csrf_token %}
......@@ -20,13 +21,13 @@
<li>
<div>
<p>WELCOME!<br />Connect with a world of people who share your passions.<br />With millions of groups at your fingertips, it's easy to find the group that's best for you -- no matter your interest.</p>
<p class="btn"><a href="{% url group_create_list %}" class="submit">Create a group</a></p>
<p class="btn"><a href="{% url group_create_list %}" class="submit">CREATE</a></p>
</div>
</li>
<li>
<div>
<p>LOOKING FOR A GROUP?</p><p>Well, this is the place to start!</br>sdofuisd ofuaofi usdiof uiofu osifuaoi ufisdfiousf oiusd<br /><img alt="THINK ABOUT IT" src="/static/medialibrary/2012/06/behind_okeanos.png"></p>
<p class="btn"><a href="{% url group_search %}" class="submit">Join a group</a></p>
<p class="btn"><a href="{% url group_search %}" class="submit">JOIN</a></p>
</div>
</li>
</ul>
......@@ -38,30 +39,34 @@
{% with d|lookup:'own' as mine %}
{% if mine %}
<div class="full-dotted">
<table class="alt-style table_sorting" id="">
<table class="alt-style table_sorting complex" id="">
<caption>MY GROUPS</caption>
<thead>
<tr>
<th>Name</th>
<th>Type</th>
<th>Issue date</th>
<th>Expiration date</th>
<th>Participants</th>
<th>Activation</th>
<th>Moderation</th>
<th>Issued</th>
<th>Expires</th>
<th>Enrolled</th>
<th>Status</th>
<th>Moderated</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
{% for o in mine %}
<tr>
<td><a class="extra-link" href="{% url group_detail o.id %}">{{o.name}}</a></td>
<tr class="{% cycle 'tr1' 'tr2' %}">
<td><a class="extra-link" href="{% url group_detail o.id %}">{{o.name|cut:"http://"|cut:"/" }}</a></td>
<td>{{o.kind|capfirst}}</td>
<td>{{o.issue_date|date:"d/m/Y"}}</td>
<td>{{o.expiration_date|date:"d/m/Y"}}</td>
<td>{{ o.approved_members|length }}/{{ o.members|length }}</td>
<td>{{ o.approved_members|length }}</td>
<td>{% if o.is_enabled %}Active{% else %}Pending{% endif %}</td>
<td>{% if o.moderation_enabled%}Yes{% else %}No{% endif %}</td>
<td><a href="#" class="more-info">[ + More Info ]</a></td>
</tr>
<tr class="{% cycle 'tmore1' 'tmore2' %}" style="display:none">
<td colspan="8">{{o.desc}}</td>
</tr>
{% endfor %}
</tbody>
......@@ -74,51 +79,58 @@
{% if other %}
<div class="full-dotted">
<table class="alt-style table_sorting">
<caption>I PARTICIPATE IN</caption>
<caption>
{% if is_search %}
SEARCH RESULTS
{% else %}
I PARTICIPATE IN
{% endif %}
</caption>
<thead>
<tr>
<th>Name</th>
<th>Type</th>
<th>Issue date</th>
<th>Expiration date</th>
<th>Issued</th>
<th>Expires</th>
<th>Participants</th>
<th>Activation</th>
<th>Enrolled</th>
<th>Enrollment status</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
{% for o in other %}
<tr>
<td><a class="extra-link" href="{% url group_detail o.id %}">{{o.name}}</a></td>
<td><a class="extra-link" href="{% url group_detail o.id %}">{{o.name|cut:"http://"|cut:"/" }}</a></td>
<td>{{o.kind|capfirst}}</td>
<td>{{o.issue_date|date:"d/m/Y"}}</td>
<td>{{o.expiration_date|date:"d/m/Y"}}</td>
<td>{{ o.approved_members|length }}</td>
<td>{% if o.is_enabled %}Active{% else %}Pending{% endif %}</td>
<td>
{% if user in o.approved_members %}
<td>
Active
<form action="{% url group_leave o.id %}" method="post" class="link-like">{% csrf_token %}
<input type="submit" value="LEAVE GROUP" />
</form>
Registered
<form action="{% url group_leave o.id %}" method="post" class="link-like">{% csrf_token %}
<input type="submit" value="LEAVE GROUP" />
</form>
</td>
{% else %}
{% if user in o.members %}
<td>Pending</td>
Pending
{% else %}
<td>Not member
Not member
<form action="{% url group_join o.id %}" method="post" class="link-like">{% csrf_token %}
<input type="submit" value="JOIN GROUP" />
</form>
</td>
{% endif %}
{% endif %}
</td>
</tr>
{% endfor %}
</tbody>
......@@ -135,4 +147,5 @@
{% endif %}
{% endwith %}
</div>
</div>
{% endblock %}
......@@ -15,7 +15,7 @@
{% endwith %}
<div class="form-row submit">
<input type="submit" class="submit altcol" value="SEND" />
<input type="submit" class="submit altcol" value="INVITE" />
</div>
</form>
{% endif %}
......@@ -26,7 +26,7 @@
<h2>You have <em>{{ inviter.invitations }}</em> invitation{{ inviter.invitations|pluralize }} left.</h2>
{% if sent|length %}
<table class="zebra-striped id-sorted">
<table class="alt-style">
<thead>
<tr>
<th>Email</th>
......@@ -50,14 +50,5 @@
</div>
<div class="rightcol">
{% if inviter.invitations %}
<form action="{% url invite %}" method="post"
class="innerlabels">{% csrf_token %}
<h2>INVITE SOMEONE ELSE</h2>
{% with invitation_form as form %}
{% include "im/form_render.html" %}
{% endwith %}
{% endif %}
{% endblock %}
{% endblock %}
\ No newline at end of file
......@@ -679,7 +679,8 @@ def group_add(request, kind_name='default'):
)
t = template_loader.get_template(template_name)
c = RequestContext(request, {
'form': form
'form': form,
'kind': kind,
}, context_processors)
return HttpResponse(t.render(c))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment