Commit a8723120 authored by Matthieu Gautier's avatar Matthieu Gautier

Merge branch 'diff_cards' into 'master'

Emphasize application cards.

Closes #39

See merge request !33
parents 5c5f9284 a4c37eab
......@@ -71,6 +71,11 @@ STAFF_HOME_CARDS = [
card for card in STAFF_HOME_CARDS # pragma: no flakes
if card['url'] in ('user_list', 'server:settings')
]
# Mark staff cards as application cards.
for c in STAFF_HOME_CARDS:
c['class'] = 'application'
CUSTOM_CARDS = [
{
'id': 'radio_listen',
......
.no-underline {
text-decoration: none;
}
.card.tinted.application,
.card.tinted.appinventor,
.card.tinted.blog,
.card.tinted.bsfcampus,
.card.tinted.khanacademy,
.card.tinted.kolibri,
.card.tinted.koombookedu,
.card.tinted.library,
.card.tinted.mediacenter {
border: 2px solid #b9b9b9;
background-color: #eee;
}
{% load i18n static %}
<!DOCTYPE html>
<html{% if LANGUAGE_CODE|language_bidi %} dir="rtl"{% endif %}>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<title>{% block title %}{{ server_name }}{% endblock %}</title>
<link rel="icon" href="{% static 'branding/favicon.png' %}">
<link rel="stylesheet" href="{% static 'ideascube/vendor/font-awesome/css/font-awesome.min.css' %}" />
<!--[if lte IE 8]>
<link rel="stylesheet" type="text/css" href="{% static 'ideascube/vendor/purecss/pure-css-grids-old-ie-min.css' %}">
<![endif]-->
<!--[if gt IE 8]><!-->
<link rel="stylesheet" type="text/css" href="{% static 'ideascube/vendor/purecss/pure-css-grids-min.css' %}">
<!--<![endif]-->
<link rel="stylesheet" type="text/css" href="{% static "ideascube/main.css" %}" />
<link rel="stylesheet" type="text/css" href="{% static "irfi/overrides.css" %}" />
<link rel="stylesheet" type="text/css" href="{% static "branding/style.css" %}" />
{% block extra_head %}{% endblock %}
</head>
<body class="{% block body_class %}{% endblock %}">
{% block header %}
{% include 'ideascube/includes/header.html' %}
{% endblock header %}
<div class="content">
{% block content %}
{% endblock content %}
</div>
{% block footer %}
{% include 'ideascube/includes/footer.html' %}
{% endblock footer %}
{% block extra_foot %}{% endblock %}
</body>
</html>
{% load i18n %}
<a href="
{% if card.url|slice:'7' == 'http://' %}
{{ card.url }}
{% else %}
{% url card.url %}
{% endif %}" class="card tinted {{ card.class }}">
{% if card.fa %}<i class="fa fa-{{ card.fa }} fa-3x"></i>{% endif %}
<h4>
<span class="theme {{ card.category }}">{% trans card.category %}</span>
<span>{{ card.title }}</span>
</h4>
<p>{{ card.description }}</p>
</a>
{% load i18n %}
<a href="{% url 'message_create' %}" class="card tinted">
<a href="{% url 'message_create' %}" class="card tinted application">
<i class="fa fa-edit fa-3x"></i>
<h4>
{% comment %}Translators: Do not translate this, the translation is in Ideascube{% endcomment %}
......
{% load i18n %}
<a href="{% url 'message_create' %}" class="card tinted">
<i class="fa fa-music fa-3x"></i>
<h4>
{% comment %}Translators: Do not translate this, the translation is in Ideascube{% endcomment %}
<span class="theme discover">{% trans "discover" %}</span>
<span>
<<<<<<< HEAD
{% trans 'Post a new message' %}
=======
{% trans 'Participate' %}
>>>>>>> 9f649e9... fixup! Add a card pointing to
</span>
</h4>
<p>
{% trans 'Post a new message or a advertisement.' %}
</p>
</a>
{% load i18n %}
<a href="{% url 'radio_index' %}" class="card tinted">
<a href="{% url 'radio_index' %}" class="card tinted application">
<i class="fa fa-music fa-3x"></i>
<h4>
{% comment %}Translators: Do not translate this, the translation is in Ideascube{% endcomment %}
......
{% load i18n %}
<a href="{% url 'blog:index' %}" class="card tinted">
<a href="{% url 'blog:index' %}" class="card tinted application">
<i class="fa fa-newspaper-o fa-3x"></i>
<h4>
{% comment %}Translators: Do not translate this, the translation is in Ideascube{% endcomment %}
......
......@@ -3,7 +3,6 @@
{% block extra_head %}
<link rel="stylesheet" type="text/css" href="{% static "mediacenter/mediacenter.css" %}">
<link rel="stylesheet" type="text/css" href="{% static "irfi/overrides.css" %}">
{% endblock %}
{% block body_class %}mediacenter{% endblock %}
......
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