Skip to content

Commit

Permalink
Redesign project home page
Browse files Browse the repository at this point in the history
  • Loading branch information
@oliverroick
oliverroick committed Aug 4, 2015
1 parent d500d72 commit 895b705
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 53 deletions.
67 changes: 26 additions & 41 deletions geokey/templates/projects/project_overview.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,48 +25,11 @@ <h1>{{project.name}}</h1>
<div class="container">
{% include 'snippets/messages.html' %}

<div class="row">
<div class="col-sm-8" id="stats-bock">
<h3 class="header">Overview <a href="{% url 'admin:project_settings' project.id %}" class="btn btn-sm btn-default">Edit settings</a></h3>

<div class="row" id="stats">
<div class="col-sm-4">
<a href="{% url 'admin:category_list' project.id %}"><span class="number">{{ project.categories.count }}</span><br>categories</a>
</div>
<div class="col-sm-4">
<a href="{% url 'admin:subset_list' project.id %}"><span class="number">{{ project.subsets.count }}</span><br>subsets</a>
</div>
<div class="col-sm-4">
<a href="{% url 'admin:usergroup_list' project.id %}"><span class="number">{{ project.usergroups.count }}</span><br>user groups</a>
</div>
</div>

{% if project.description %}
<h4>Project description</h4>
{{ project.description|safe }}
{% endif %}

<h3 class="header">Activity</h3>
<div class="row" id="stats">
<div class="col-sm-4">
<span class="number">{{ allcontributions }}</span><br>contributions
</div>
<div class="col-sm-4">
<span class="number">{{ comments }}</span><br>comments
</div>
<div class="col-sm-4">
<span class="number">{{ files }}</span><br>files
</div>
</div>
<div class="row" id="overview-block">
<div class="col-sm-12">
<h3 class="header">Overview <small><a href="#" id="help-link">Click here for help</a></small></h3>
</div>
{% include 'snippets/project-help.html' %}

<div class="col-sm-4">
<div class="alert alert-info">
<h4>Do you need help?</h4>
<p><a href="#" id="help-link">Click here to get started.</a></p>
</div>

<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">Categories <a href="{% url 'admin:category_list' project.id %}" class="badge pull-right">{{ project.categories.count }} &raquo;</a></h4>
Expand All @@ -87,7 +50,9 @@ <h4 class="panel-title">Categories <a href="{% url 'admin:category_list' project
<a href="{% url 'admin:category_create' project.id %}" class="btn btn-sm btn-success">Create category</a>
</div>
</div>
</div>

<div class="col-sm-4">
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">Subsets <a href="{% url 'admin:subset_list' project.id %}" class="badge pull-right">{{ project.subsets.count }} &raquo;</a></h4>
Expand All @@ -108,7 +73,9 @@ <h4 class="panel-title">Subsets <a href="{% url 'admin:subset_list' project.id %
<a href="{% url 'admin:subset_create' project.id %}" class="btn btn-sm btn-success">Create subset</a>
</div>
</div>
</div>

<div class="col-sm-4">
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">User groups <a href="{% url 'admin:usergroup_list' project.id %}" class="badge pull-right">{% plus project.usergroups.count 1 %} &raquo;</a></span></h4>
Expand All @@ -130,7 +97,25 @@ <h4 class="panel-title">User groups <a href="{% url 'admin:usergroup_list' proje
</div>
</div>
</div>
</div>

{% include 'snippets/project-help.html' %}

<div class="row">
<div class="col-sm-8" id="stats-bock">
<h3 class="header">Activity</h3>
<div class="row" id="stats">
<div class="col-sm-4">
<span class="number">{{ allcontributions }}</span><br>contributions
</div>
<div class="col-sm-4">
<span class="number">{{ comments }}</span><br>comments
</div>
<div class="col-sm-4">
<span class="number">{{ files }}</span><br>files
</div>
</div>
</div>
</div>
</div>
{% endblock %}
Expand All @@ -139,7 +124,7 @@ <h4 class="panel-title">User groups <a href="{% url 'admin:usergroup_list' proje
<script type="text/javascript">
$('#help-link').click(function (event) {
$('#help-block').removeClass('hidden');
$('#stats-bock').addClass('hidden');
$('#overview-block').addClass('hidden');
event.preventDefault();
});

Expand Down
26 changes: 14 additions & 12 deletions geokey/templates/snippets/project-help.html
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
<div id="help-block" class="col-sm-8 hidden">
<h3 class="header">Getting started</h3>
<h4><span class="step">1</span> Create categories</h4>
<p>Categories define what data you want your contributers to map. Say you want to create a map of the favourite places in London; then you would create a category for each restaurants, bar and great outdoor spots you like.</p>
<p>Each category will have fields, that specify what information will be collected for that category. For example, a restaurant has a name, an address and the cuisine.</p>
<p>Based on categories, the client application will create forms your contirbutors have to fill in order to add data to your project.</p>
<div id="help-block" class="row hidden">
<div class="col-sm-8">
<h3 class="header">Getting started</h3>
<h4><span class="step">1</span> Create categories</h4>
<p>Categories define what data you want your contributers to map. Say you want to create a map of the favourite places in London; then you would create a category for each restaurants, bar and great outdoor spots you like.</p>
<p>Each category will have fields, that specify what information will be collected for that category. For example, a restaurant has a name, an address and the cuisine.</p>
<p>Based on categories, the client application will create forms your contirbutors have to fill in order to add data to your project.</p>

<h4><span class="step">2</span> Provide access to your data through data groupings</h4>
<p>Data groupings provide users access to a subset of all data collected within a project. For each data group you create a set of filters to decide which data can be found in that data grouping. For example, you can create a grouping with all Italian restaurants that have a rating higher than 5.</p>
<h4><span class="step">2</span> Provide access to your data through data groupings</h4>
<p>Data groupings provide users access to a subset of all data collected within a project. For each data group you create a set of filters to decide which data can be found in that data grouping. For example, you can create a grouping with all Italian restaurants that have a rating higher than 5.</p>

<p>You can also select user groups, which will be allowed to access the data in a data grouping.</p>
<p>You can also select user groups, which will be allowed to access the data in a data grouping.</p>

<h4><span class="step">3</span> Grant permissions to users with user groups.</h4>
<p>Using user groups you can grant users permissions to your project. For each user group you can set whether its members can moderate, contribute or only read data. Furthermore, you can grant user groups access to the data groupings you created before.</p>
</div>
<h4><span class="step">3</span> Grant permissions to users with user groups.</h4>
<p>Using user groups you can grant users permissions to your project. For each user group you can set whether its members can moderate, contribute or only read data. Furthermore, you can grant user groups access to the data groupings you created before.</p>
</div>
</div>

0 comments on commit 895b705

Please sign in to comment.