Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project/core/templates/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -194,4 +194,4 @@ <h3 class="title">{% trans "Sponsors" %} </h3>
var aboutView = new cw.AboutView();
</script>

{% block content %}
{% endblock content %}
2 changes: 0 additions & 2 deletions project/core/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@
<body class="{% block body_class %}{% endblock body_class %}" id="{% block body_id %}{% endblock body_id %}">
{% include "global_nav.html" %}

{% block content %}{% endblock content %}

{% include "static_footer.html" %}

{% block extra_js %}{% endblock extra_js %}
Expand Down
3 changes: 0 additions & 3 deletions project/core/templates/email/base_email_template.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<title>{{ title }}</title>
</head>
<body style="background-color: #f6f6f6;font-family: sans-serif;color: #181818;line-height: 1.5;width: 100%;margin: 0 !important;">
{%block content%}
<div class="wrapper" style="margin:auto;margin-top:16px;max-width:600px;width: 100%;">
<div class="main" style="margin:8px;margin-bottom:24px;width:auto;background-color: #ffffff;border-radius: 8px;padding: 32px;">
<table width="100%">
Expand Down Expand Up @@ -36,7 +35,5 @@ <h1 style="color: #1acbab;">{{ greeting }}</h1>
</div>
</div>
</div>
{%endblock content%}

</body>
</html>
6 changes: 2 additions & 4 deletions project/core/templates/global_nav.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{% load notifications_tags %}
{% load static %}
{%block content%}

<nav class="nav" id="js-global-nav">
<div class="nav-wrapper ">
<!-- Left Nav (Logo) -->
Expand Down Expand Up @@ -63,4 +61,4 @@ <h4>Notifications</h4>
<script>
cw.initGlobalNav();
</script>
{%endblock content%}

4 changes: 0 additions & 4 deletions project/core/templates/landing.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<!--[if gt IE 8]> <html class="no-js"> <!--<![endif]-->
<html>


<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -24,9 +23,7 @@
<link rel="stylesheet" href="./static/less/landing.css">
<link href="https://fonts.googleapis.com/css?family=Lato:300,400,600,700" rel="stylesheet">
</head>

<body>
{%block content%}
<!--[if lt IE 7]>
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="#">upgrade your browser</a> to improve your experience.</p>
<![endif]-->
Expand Down Expand Up @@ -178,6 +175,5 @@ <h2 class="subtitle">{% translate "Democratically Contributed Media" %}</h2>
<hr>
<span><a href="/">CiviWiki</a></span>
</footer>
{%endblock content%}
</body>
</html>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% block content %}

{% if notification.length > 0 %}
<div class="container">
<div class="section">
Expand All @@ -18,4 +18,4 @@
</div>
</div>
{% endif %}
{% endblock content %}

Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{% block content %}

<div class="notification-item">
<span class="link-lato gray-text">{{time}}</span>
<span class="header-lato">{{ popup_string }}</span>
{%if link%}
<a href="{{ link }}" class="link-lato">LINK</a>
{%endif%}
</div>
{% endblock content%}

4 changes: 2 additions & 2 deletions project/core/templates/static_footer.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- Footer for static pages -->
{% load static %}
{% load i18n %}
{%block content%}

<footer class="page-footer static-footer">
<!-- Top block for external links -->
<div class="container">
Expand Down Expand Up @@ -50,4 +50,4 @@
</div>
</div>
</footer>
{%endblock content%}

3 changes: 1 addition & 2 deletions project/core/templates/static_nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
{% load static %}
{% load i18n %}

{%block content%}
<nav class="static-nav transparent">
<div class="nav-wrapper">
<!-- Left Nav (Logo) -->
Expand Down Expand Up @@ -30,4 +29,4 @@
</ul>
</div>
</nav>
{%endblock content%}