зеркало из https://github.com/mozilla/CSOL-site.git
resolving conflicts from @curlee 's pull request
This commit is contained in:
Chris McAvoy
Коммит
83b6eaea33
|
|
@ -1,12 +1,12 @@
|
|||
{% extends 'auth/layout.html' %}
|
||||
{% set bodyClass = 'sign-up' %}
|
||||
{% set pageTitle = 'Sign Up' %}
|
||||
{% set pageTitle = 'Sign Up & Start Exploring' %}
|
||||
{% set navItem = 'sign-up' %}
|
||||
{% set months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'] %}
|
||||
|
||||
{% block content %}
|
||||
<form class="form-horizontal span6 offset3" method="post">
|
||||
<p class="lead">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
|
||||
<p class="lead">Explore badges you can earn and level up for citywide challenges. Create an account to get started!</p>
|
||||
<input type="hidden" name="_csrf" value="{{ csrfToken }}">
|
||||
<fieldset>
|
||||
<div class="control-group">
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
</div>
|
||||
{% else %}
|
||||
<p>To claim the badge you've earned, enter the "claim code" written on the paper badge you received from your teacher, counselor or mentor.</p>
|
||||
<p>Then hit the "Claim This Badge" button on your screen. Once you do this, the badge will be added to your dashboard and you can throw the piece of paper away (better yet, recycle it!).</p>
|
||||
<p>Then hit the "Claim This Badge" button on your screen. Once you do this, the badge will be added to your My Badges page and you can throw the piece of paper away (or, better yet, recycle it!).</p>
|
||||
|
||||
<h3>Already have a claim code?</h3>
|
||||
<form method="get" class="form-horizontal well span6 offset3">
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ doesn't have a URL #}
|
|||
{% include "includes/add-to-playlist-btn.html" %}
|
||||
{% endif %}
|
||||
</div>
|
||||
<a href="{{ itemUrl(url, item) }}"><img src="{{ item.image }}"></a>
|
||||
<a href="{{ item.url }}"><img src="{% if item.imageUrl %}{{ item.imageUrl }}{% else %}{% if item.image %}{{item.image}}{% else %}{{item.issuer.imageUrl}}{% endif %}{% endif %}"></a>
|
||||
<figcaption class="caption">
|
||||
<p>{{ item.name }}</p>
|
||||
{% if item.description %}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
{% if user %}
|
||||
{% if user.type == 'learner' %}
|
||||
<li class="dropdown backpack{% if navItem == 'backpack' %} active{% endif %}">
|
||||
<a class="dropdown-toggle" role="button" data-toggle="dropdown" id="backpack-menu-toggle">My Backpack <i class="caret"></i></a>
|
||||
<a class="dropdown-toggle" role="button" data-toggle="dropdown" id="backpack-menu-toggle">My CSOL <i class="caret"></i></a>
|
||||
<ul class="dropdown-menu" role="menu" id="backpack-menu" aria-labelledby="backpack-menu-toggle">
|
||||
<li role="presentation"{% if subNavItem == 'badges' %} class="active"{% endif %}>
|
||||
<a role="menuitem" tabindex="-1" href="/mybadges">My Badges</a>
|
||||
|
|
|
|||
|
|
@ -3,39 +3,46 @@
|
|||
{% set navItem = 'backpack' %}
|
||||
|
||||
{% block list %}
|
||||
{{ super() }}
|
||||
<li class="span3">
|
||||
<figure class="thumbnail">
|
||||
<a href="/claim"><img src="/media/img/add-badge.png"></a>
|
||||
<figcaption class="caption">
|
||||
<p>Claim another badge!</p>
|
||||
<p class="text-right"><a href="/claim" class="btn">+1</a></p>
|
||||
</figcaption>
|
||||
</figure>
|
||||
</li>
|
||||
{{ super() }}
|
||||
<li class="span3">
|
||||
<figure class="thumbnail">
|
||||
<a href="/claim"><img src="/media/img/add-badge.png"></a>
|
||||
<figcaption class="caption">
|
||||
<p>Claim another badge!</p>
|
||||
<p class="text-right"><a href="/claim" class="btn">+1</a></p>
|
||||
</figcaption>
|
||||
</figure>
|
||||
</li>
|
||||
{% endblock %}
|
||||
|
||||
{% block item_actions %}
|
||||
{#
|
||||
{{ super() }}
|
||||
<a class="btn show-tooltip" title="Add to your favorites" href="{{ item.url }}/favorite"><i class="icon-heart"></i></a>
|
||||
#}
|
||||
{% endblock %}
|
||||
|
||||
{% block modal %}
|
||||
<!-- Modal -->
|
||||
<div id="shareModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
||||
<h3 id="myModalLabel">Share This Badge</h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<a href="#" class="btn btn-block"><i class="icon-twitter"></i> Twitter</a>
|
||||
<a href="#" class="btn btn-block"><i class="icon-facebook"></i> Facebook</a>
|
||||
<a href="#" class="btn btn-block">Mozilla Backpack</a>
|
||||
</div>
|
||||
</div>
|
||||
<div id="trashModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
||||
<h3 id="myModalLabel">Are you sure you want to delete this badge?</h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<a href="#" class="btn btn-block">Cancel</a>
|
||||
<a href="#" class="btn btn-block">Yes</a>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Modal -->
|
||||
<div id="shareModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
||||
<h3 id="myModalLabel">Share This Badge</h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<a href="#" class="btn btn-block"><i class="icon-twitter"></i> Twitter</a>
|
||||
<a href="#" class="btn btn-block"><i class="icon-facebook"></i> Facebook</a>
|
||||
<a href="#" class="btn btn-block">Mozilla Backpack</a>
|
||||
</div>
|
||||
</div>
|
||||
<div id="trashModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
||||
<h3 id="myModalLabel">Are you sure you want to delete this badge?</h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<a href="#" class="btn btn-block">Cancel</a>
|
||||
<a href="#" class="btn btn-block">Yes</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -2,37 +2,37 @@
|
|||
{% block title %} | Dashboard{% endblock %}
|
||||
|
||||
{% block pageTitleWrapper %}
|
||||
<ul class="nav nav-tabs">
|
||||
{% block tabs %}
|
||||
<li{% if not current %} class="active"{% endif %}>
|
||||
<a href="/dashboard">Recent</a>
|
||||
</li>
|
||||
{% for dependant in dependants %}
|
||||
<li{% if dependant.username == current.username %} class="active"{% endif %}>
|
||||
<a href="/dashboard/{{ dependant.username }}">{{ dependant.getDisplayName() }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
{% endblock %}
|
||||
</ul>
|
||||
{{ super() }}
|
||||
<ul class="nav nav-tabs">
|
||||
{% block tabs %}
|
||||
<li{% if not current %} class="active"{% endif %}>
|
||||
<a href="/dashboard">Recent</a>
|
||||
</li>
|
||||
{% for dependant in dependants %}
|
||||
<li{% if dependant.username == current.username %} class="active"{% endif %}>
|
||||
<a href="/dashboard/{{ dependant.username }}">{{ dependant.getDisplayName() }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
{% endblock %}
|
||||
</ul>
|
||||
{{ super() }}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{% block activity %}
|
||||
{% for current in dependants %}
|
||||
<h3>{{ current.getDisplayName() }}'s recent activity</h3>
|
||||
{% if current.activities.length %}
|
||||
<ul class="activities thumbnails">
|
||||
{% for activity in current.activities %}
|
||||
<li class="span3">
|
||||
{% include "includes/learner-activity.html" %}
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% else %}
|
||||
<p>{{ current.getDisplayName() }} does not have any recent activity.</p>
|
||||
{% endif %}
|
||||
<p class="text-right"><a href="/dashboard/{{ current.username }}" class="btn">See all activity »</a></p>
|
||||
{% endfor %}
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
{% block activity %}
|
||||
{% for current in dependants %}
|
||||
<h3>{{ current.getDisplayName() }}'s recent activity</h3>
|
||||
{% if current.activities.length %}
|
||||
<ul class="activity thumbnails">
|
||||
{% for activity in current.activities %}
|
||||
<li class="span3">
|
||||
{% include "includes/learner-activity.html" %}
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% else %}
|
||||
<p>{{ current.getDisplayName() }} does not have any recent activity.</p>
|
||||
{% endif %}
|
||||
<p class="text-right"><a href="/dashboard/{{ dependant.username }}" class="btn">See all activity »</a></p>
|
||||
{% endfor %}
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче