Skip to content

Port templates in core to Django templating syntax #1494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brylie merged 14 commits into from
Feb 11, 2023
Merged

Port templates in core to Django templating syntax #1494

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4911a08
Port templates in core to django templating syntax
Nehemiah60 Jan 31, 2023
155d3d0
Port templates in core to django templating syntax
Nehemiah60 Jan 31, 2023
98fb90d
Port templates in core to django templating syntax
Nehemiah60 Jan 31, 2023
bc4c1a9
Port templates in core to django templating syntax
Nehemiah60 Feb 1, 2023
1622bce
Port templates in core to django templating syntax
Nehemiah60 Feb 2, 2023
51f03eb
Port templates in core to django templating syntax
Nehemiah60 Feb 2, 2023
2a55488
Port templates in core to django templating syntax
Nehemiah60 Feb 2, 2023
c3359ae
Port templates in core to django templating syntax
Nehemiah60 Feb 4, 2023
4cd458f
Port templates in core to django templating syntax
Nehemiah60 Feb 4, 2023
5c4d502
Template porting
Nehemiah60 Feb 9, 2023
4db1ff8
Template porting
Nehemiah60 Feb 9, 2023
ac3a41b
Template porting
Nehemiah60 Feb 9, 2023
6f969c9
Template porting
Nehemiah60 Feb 10, 2023
fb7e2d1
Edited the base html file in templates
Nehemiah60 Feb 11, 2023
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
20 changes: 8 additions & 12 deletions project/core/templates/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
{% extends "base.html" %}
{% load static %}
{% load i18n %}
{% block content %}
Copy link
Contributor

@brylie brylie Feb 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move this block definition to line 12, after the page_title block


{% block extra_css %}
<link type="text/css" rel="stylesheet/less" href="{% static "less/about.less" %}"/>
<link type="text/css" rel="stylesheet/less" href="{% static " less/about.less" %}" />
{% endblock extra_css %}

{% block page_title %}{% trans "About Us" %}{% endblock page_title %}

{% block backbone_template %}

Copy link
Contributor

@brylie brylie Feb 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{% block content %}

<script id="about-template" type="text/template">
<header>
<div class="content-header center">
Expand Down Expand Up @@ -185,17 +186,12 @@ <h3 class="title">{% trans "Sponsors" %} </h3>
</div>
</main>
</script>
{% endblock backbone_template %}

{% block content %}
{% include "static_nav.html" %}
<div id="about"></div>
{% endblock content %}

{% block extra_js %}
<!-- Backbone Views File -->
<script src="{% static "js/static/about_view.js" %}" type="text/javascript"></script>
<div id="about"></div>
<script src="{% static " js/static/about_view.js" %}" type="text/javascript"></script>
<script type="text/javascript">
var aboutView = new cw.AboutView();
</script>
{% endblock extra_js %}

{% block content %}
2 changes: 1 addition & 1 deletion project/core/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

</head>

{% block backbone_template %}{% endblock backbone_template %}


<body class="{% block body_class %}{% endblock body_class %}" id="{% block body_id %}{% endblock body_id %}">
{% include "global_nav.html" %}
Expand Down
5 changes: 4 additions & 1 deletion project/core/templates/email/base_email_template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<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 @@ -35,5 +36,7 @@ <h1 style="color: #1acbab;">{{ greeting }}</h1>
</div>
</div>
</div>
{%endblock content%}

</body>
</html>
</html>
20 changes: 8 additions & 12 deletions project/core/templates/general_message.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@
{% load i18n %}

{% block extra_css %}
<link type="text/css" rel="stylesheet/less" href="{% static "less/base.less" %}"/>
<link type="text/css" rel="stylesheet/less" href="{% static " less/base.less" %}" />
{% endblock extra_css %}

{% block page_title %}{{ title }}{% endblock page_title %}

{% block backbone_template %}
{%block content%}
<script id="general-template" type="text/template">
<div id="general-section" class="center container section">
<div class="row">
Expand All @@ -29,18 +28,15 @@
</div>
</div>
</script>
{% endblock backbone_template %}


{% block body_id %}general_wrapper{% endblock body_id %}
{% block content %}
<div id="general">
</div>
{% endblock content %}

{% block extra_js %}
<!-- Backbone Views File -->
<script type="text/javascript" src="{% static "js/general_view.js" %}"></script>
<div id="general">
</div>

<script type="text/javascript" src="{% static " js/general_view.js" %}"></script>
<script type="text/javascript">
var generalView = new cw.GeneralView();
</script>
{% endblock extra_js %}
{%endblock content%}
2 changes: 2 additions & 0 deletions project/core/templates/global_nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{% 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,3 +64,4 @@ <h4>Notifications</h4>
<script>
cw.initGlobalNav();
</script>
{%endblock content%}
19 changes: 6 additions & 13 deletions project/core/templates/how_it_works.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@

<!-- How it Works -->
{% block extra_css %}
<link type="text/css" rel="stylesheet/less" href="{% static "less/how_it_works.less" %}"/>
<link type="text/css" rel="stylesheet/less" href="{% static " less/how_it_works.less" %}" />
{% endblock extra_css %}

{% block backbone_template %}
{%block content%}
<script id="howitworks-template" type="text/template">
<div class="content-header center">
<div class="container section">
Expand Down Expand Up @@ -38,17 +37,11 @@ <h4 class="dark-purple">{% trans "Still not sure about something in CiviWiki?" %
</div>
</div>
</script>
{% endblock backbone_template %}

{% block content %}
{% include "static_nav.html" %}
<div id="howitworks"></div>
{% endblock content %}

{% block extra_js %}
<!-- Backbone Views File -->
<script src="{% static "js/static/how_it_works_view.js" %}" type="text/javascript"></script>
<div id="howitworks"></div>
<script src="{% static " js/static/how_it_works_view.js" %}" type="text/javascript"></script>
<script type="text/javascript">
var howitworksView = new cw.HowItWorksView();
var howitworksView = new cw.HowItWorksView();
</script>
{% endblock extra_js %}
{%endblock content%}
4 changes: 3 additions & 1 deletion project/core/templates/landing.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
</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 @@ -177,5 +178,6 @@ <h2 class="subtitle">{% translate "Democratically Contributed Media" %}</h2>
<hr>
<span><a href="/">CiviWiki</a></span>
</footer>
{%endblock content%}
</body>
</html>
</html>
36 changes: 18 additions & 18 deletions project/core/templates/partials/notifications/notification_base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{% verbatim %}
{{# if (notification.length > 0) { }}
{% block content %}
{% if notification.length > 0 %}
<div class="container">
<div class="section">
{% for notifications in notification %}
<div class="col s12">
<li>{{notifications}}</li>
</div>
{% endfor %}
</div>
</div>
{% else %}
<div class="section no-state">
<div class="container">
<div class="section">
{{# _.each(notification, function (n) { }}
<div class="col s12">
{{= cw.underscorePartial('notification-item-template', n)}}
</div>
{{# }, this); }}
</div>
</div>
{{# } else { }}
<div class="section no-state">
<div class="container">
<div class="section">
<div class="center title-lato grey-text">NO NOTIFICATIONS</div>
</div>
</div>
<div class="center title-lato grey-text">NO NOTIFICATIONS</div>
</div>
{{# } }}
{% endverbatim %}
</div>
</div>
{% endif %}
{% endblock content %}
8 changes: 4 additions & 4 deletions project/core/templates/partials/notifications/notification_item.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{% verbatim %}
{% block content %}
<div class="notification-item">
<span class="link-lato gray-text">{{time}}</span>
<span class="header-lato">{{ popup_string }}</span>
{{# if (link) { }}
{%if link%}
<a href="{{ link }}" class="link-lato">LINK</a>
{{# } }}
{%endif%}
</div>
{% endverbatim %}
{% endblock content%}
3 changes: 2 additions & 1 deletion project/core/templates/static_footer.html
View file
Open in desktop
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,3 +50,4 @@
</div>
</div>
</footer>
{%endblock content%}
3 changes: 2 additions & 1 deletion project/core/templates/static_nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% load static %}
{% load i18n %}


{%block content%}
<nav class="static-nav transparent">
<div class="nav-wrapper">
<!-- Left Nav (Logo) -->
Expand Down Expand Up @@ -30,3 +30,4 @@
</ul>
</div>
</nav>
{%endblock content%}
10 changes: 2 additions & 8 deletions project/core/templates/support_us.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

{% block page_title %}{% trans "Support Us" %}{% endblock page_title %}

{% block backbone_template %}
{%block content%}
<script id="supportus-template" type="text/template">
<!-- Main Picture and title using Parallax -->
<div class="parallax-container">
Expand Down Expand Up @@ -122,21 +122,15 @@ <h4 class="center">{% trans "Spread the Word" %} </h4>
</div>

</script>
{% endblock backbone_template %}

{% block content %}
{% include "static_nav.html" %}
<div id="supportus"></div>
{% endblock content %}

{% block extra_js %}
<!-- Backbone Views File -->
<script src="{% static "js/static/support_us_view.js" %}" type="text/javascript"></script>
<script type="text/javascript">
var supportusView = new cw.SupportusView();
$(document).ready(function(){


});
</script>
{% endblock extra_js %}
{% endblock content %}