Skip to content

Commit

Permalink
Merge pull request #784 from akvo/feature/v3_780_my_project
Browse files Browse the repository at this point in the history
[#780] Added dummy table to myrsr projects page
  • Loading branch information
KasperBrandt committed Oct 7, 2014
2 parents 8f69a77 + 03bc3dc commit 518bc28
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 4 deletions.
46 changes: 44 additions & 2 deletions akvo/templates/myrsr/my_projects.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,49 @@
{% block title %}{% trans "MyRSR - my proejcts" %}{% endblock %}

{% block myrsr_main %}
<div class="row">
<h2>MyRSR projects</h2>
<div class="col-md-9 table-responsive">
<h2>{% trans "My project" %}s</h2>
<table class="table table-striped">
<tr>
<td>Image</td>
<td>Location</td>
<td>Status</td>
<td>.</td>
</tr>
<tr>
<td class="media">
<a class="pull-left" href="#">
<img class="media-object"
src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI2NCIgaGVpZ2h0PSI2NCI+PHJlY3Qgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0IiBmaWxsPSIjZWVlIi8+PHRleHQgdGV4dC1hbmNob3I9Im1pZGRsZSIgeD0iMzIiIHk9IjMyIiBzdHlsZT0iZmlsbDojYWFhO2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1zaXplOjEycHg7Zm9udC1mYW1pbHk6QXJpYWwsSGVsdmV0aWNhLHNhbnMtc2VyaWY7ZG9taW5hbnQtYmFzZWxpbmU6Y2VudHJhbCI+NjR4NjQ8L3RleHQ+PC9zdmc+"
alt="...">
</a>
<div class="media-body">
<h4 class="media-heading">Title</h4>
<p class="small">Subtitle</p>
</div>
</td>
<td>...</td>
<td>...</td>
<td>View, Edit, Publish</td>
</tr>
<tr>
<td class="media">
<a class="pull-left" href="#">
<img class="media-object"
src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI2NCIgaGVpZ2h0PSI2NCI+PHJlY3Qgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0IiBmaWxsPSIjZWVlIi8+PHRleHQgdGV4dC1hbmNob3I9Im1pZGRsZSIgeD0iMzIiIHk9IjMyIiBzdHlsZT0iZmlsbDojYWFhO2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1zaXplOjEycHg7Zm9udC1mYW1pbHk6QXJpYWwsSGVsdmV0aWNhLHNhbnMtc2VyaWY7ZG9taW5hbnQtYmFzZWxpbmU6Y2VudHJhbCI+NjR4NjQ8L3RleHQ+PC9zdmc+"
alt="...">
</a>
<div class="media-body">
<h4 class="media-heading">Title</h4>
<p class="small">Subtitle</p>
</div>
</td>
<td>...</td>
<td>...</td>
<td>View, Edit, Publish</td>
</tr>
</table>

</div>

{% endblock %}
6 changes: 4 additions & 2 deletions akvo/urls/rsr.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
url(r'^register/$', 'akvo.rsr.views.register', name='register'),

# Activation view
url(r'^activate/(?P<activation_key>\w+)/$', 'akvo.rsr.views.activate', name='activate'),
url(r'^activate/(?P<activation_key>\w+)/$', 'akvo.rsr.views.activate',
name='activate'),

# Sign in view
url(r'^sign_in/$', 'akvo.rsr.views.sign_in', name='sign_in'),
Expand All @@ -44,7 +45,8 @@
url(r'^myrsr/projects/$', 'akvo.rsr.views.my_projects', name='my_projects'),

# Change password view
url(r'^myrsr/password_change/$', 'akvo.rsr.views.password_change', name='password_change')
url(r'^myrsr/password_change/$', 'akvo.rsr.views.password_change',
name='password_change')
)

handler403 = 'akvo.rsr.views.forbidden'
Expand Down

0 comments on commit 518bc28

Please sign in to comment.