Skip to content

Commit 740005f

Browse files
sfrostsfrost
committed
switch lines
1 parent 754b33a commit 740005f

File tree

3 files changed

+101
-68
lines changed

3 files changed

+101
-68
lines changed

‎template/base.html‎

Lines changed: 83 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,85 @@
1-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
2-
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3-
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en" dir="ltr">
4-
<head>
5-
<title>{%block title%}{%endblock%} - PostgresOpen</title>
6-
<meta http-equiv="Content-Type" content="text/xhtml; charset=utf-8" />
7-
<link rel="shortcut icon" href="/favicon.ico" />
8-
<style type="text/css" media="screen" title="Normal Text">@import url("/media/css/base.css");</style>
9-
<style type="text/css" media="screen" title="Normal Text">@import url("/media/css/geckofixes.css");</style>
10-
{%comment%}
11-
<link rel="alternate" type="application/rss+xml" title="PostgreSQL Europe News" href="/feeds/news/" />
12-
<link rel="alternate" type="application/rss+xml" title="PostgreSQL Europe Events" href="/feeds/events/" />
13-
{%endcomment%}
14-
{%block extrahead%}{%endblock%}
15-
</head>
16-
<body>
17-
<div id="pgContainerWrap">
18-
<div id="pgContainer">
19-
<div id="pgHeaderContainer">
20-
<div id="pgHeader">
21-
<div id="pgHeaderLogoLeft">
22-
<a href="https://postgresopen.org/"><img alt="PostgresOpen" height="80" width="230" src="/media/img/layout/hdr_left.png" /></a>
23-
</div>
24-
<div id="pgHeaderLogoRight">
25-
<a href="/"><img width="210" height="80" alt="PostgresOpen" src="/media/img/layout/hdr_right.png" /></a>
26-
</div>
27-
</div> <!-- pgHeader -->
1+
{% load staticfiles %}
2+
<!DOCTYPE html>
3+
<html lang="en">
4+
<head>
5+
<meta charset="UTF-8">
6+
<title>PostgresOpen</title>
7+
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
8+
<meta name="description" content="" />
9+
<meta name="keywords" content="" />
10+
<!--[if lte IE 8]><script src="/ext/2016/shared/js/html5shiv.js"></script><![endif]-->
11+
<script src="/ext/2016/shared/js/jquery.min.js"></script>
12+
<script src="/ext/2016/shared/js/skel.min.js"></script>
13+
<script src="/ext/2016/shared/js/skel-layers.min.js"></script>
14+
<script src="/ext/2016/shared/js/init.js"></script>
15+
<script src="/ext/2016/shared/js/feed.js"></script>
16+
<noscript>
17+
<link rel="stylesheet" href="/ext/2016/shared/css/skel.css" />
18+
<link rel="stylesheet" href="/ext/2016/shared/css/style.css" />
19+
<link rel="stylesheet" href="/ext/2016/shared/css/style-xlarge.css" />
20+
<link rel="stylesheet" href="/ext/2016/shared/css/feed.css" />
21+
</noscript>
22+
<script>
23+
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
24+
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
25+
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
26+
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
2827

29-
<div id="pgTopNav">
30-
<div id="pgTopNavLeft"><img width="7" height="23" alt="" src="/media/img/layout/nav_lft.png" /></div>
31-
<div id="pgTopNavRight"><img width="7" height="23" alt="" src="/media/img/layout/nav_rgt.png" /></div>
32-
<ul id="pgTopNavList">
33-
<li><a href="/" title="Home">Home</a></li>
34-
<li><a href="/about" title="About">About</a></li>
35-
<li><a href="/events" title="Events">Events</a></li>
36-
</ul>
37-
</div> <!-- pgTopNav -->
38-
</div> <!-- pgHeaderContainer -->
39-
<div id="pgContent">
40-
{%block content%}{%endblock%}
41-
<br class="pgClearBoth" />
42-
</div> <!-- pgContent -->
43-
<div id="pgFooter">
44-
<a class="navFooter" href="/about/privacypolicy">Privacy Policy</a> |
45-
<a class="navFooter" href="/about/website">About the website</a><br/>
46-
Copyright &copy; 2008-2016 PostgresOpen
47-
</div> <!-- pgFooter -->
48-
</div>
49-
</div> <!-- pgContainerWrap -->
50-
</body>
28+
ga('create', 'UA-76808262-1', 'auto');
29+
ga('send', 'pageview');
30+
</script>
31+
</head>
32+
<body class="{{page}}">
33+
34+
<!-- Header -->
35+
<header id="header">
36+
<h1><a href="/">PostgresOpen</a></h1>
37+
<nav id="nav">
38+
<ul>
39+
<li><a href="https://2016.postgresopen.org/">2016</a></li>
40+
<li><a href="https://2015.postgresopen.org/">2015</a></li>
41+
</ul>
42+
</nav>
43+
</header>
44+
45+
{%block content%}{%endblock%}
46+
47+
<!-- Footer -->
48+
<footer id="footer">
49+
<div class="container">
50+
<section class="links">
51+
<div class="row">
52+
<section class="6u 6u(medium) 12u$(small)">
53+
<h3>Contact Us</h3>
54+
<br><a href="#">[email protected]</a>
55+
</section>
56+
</div>
57+
</section>
58+
<div class="row">
59+
<div class="8u 12u$(medium)">
60+
<ul class="copyright">
61+
<li>&copy; Untitled. All rights reserved.</li>
62+
</ul>
63+
</div>
64+
<div class="4u$ 12u$(medium)">
65+
<ul class="icons">
66+
<li>
67+
<a class="icon rounded fa-facebook"><span class="label">Facebook</span></a>
68+
</li>
69+
<li>
70+
<a class="icon rounded fa-twitter"><span class="label">Twitter</span></a>
71+
</li>
72+
<li>
73+
<a class="icon rounded fa-google-plus"><span class="label">Google+</span></a>
74+
</li>
75+
<li>
76+
<a class="icon rounded fa-linkedin"><span class="label">LinkedIn</span></a>
77+
</li>
78+
</ul>
79+
</div>
80+
</div>
81+
</div>
82+
</footer>
83+
84+
</body>
5185
</html>

‎template/braintreepayment/invoice_payment.html‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{%extends conftemplbase %}
1+
{%extends "base.html" %}
22
{%block title%}Invoice payment{%endblock%}
33
{%block extrahead%}
44
<script src="https://js.braintreegateway.com/v2/braintree.js"></script>
@@ -14,26 +14,27 @@
1414
{%block content%}
1515
<!-- Content
1616
================================================== -->
17-
<main class="main-content">
18-
19-
<div class="container">
17+
<section id="main" class="wrapper">
2018

2119
<div class="container">
2220

2321
<!-- ConfReg -->
24-
<section class="section">
25-
<div class="title-bordered" data-animation="fadeInUp" data-animation-delay="0">
26-
27-
<h2>Invoice payment</h2>
28-
</div>
29-
30-
<p>You are about to make a payment of <strong>{{currency_symbol}}{{invoice.total_amount}}</strong> for invoice #{{invoice.id}}.</p>
22+
<header class="major">
23+
<span class="header"><img src="/ext/2016/shared/images/policy.svg" alt="" /></span>
24+
<h2>Invoice payment</h2>
25+
</header>
26+
27+
<section>
28+
<hr>
29+
<p>
30+
<p>You are about to make a payment of <b>{{currency_symbol}}{{invoice.total_amount}}</b> for invoice #{{invoice.id}}.</p>
31+
</p>
32+
<hr>
3133
</section>
34+
</div>
3235
<!-- Secondary Header -->
36+
<div class="container">
3337
<section class="section">
34-
<div class="clearfix">
35-
<div class="title title__lg pull-left">
36-
3738

3839
<form id="checkout" method="post" action="/p/braintree/">{%csrf_token%}
3940
<input type="hidden" name="invoice" value="{{invoice.id}}">
@@ -46,12 +47,10 @@ <h2>Invoice payment</h2>
4647
<input type="submit" value="Submit payment">
4748
</form>
4849

49-
</div>
50-
</div>
50+
<hr>
5151
</section>
5252
<!-- Secondary Header -->
5353
</div>
54-
</main>
55-
54+
</section>
5655

5756
{%endblock%}

‎template/confreg/regform_completed.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ <h3>Your registration details</h3>
110110
<hr>
111111
</section>
112112

113+
</div>
113114
</section>
114-
</div>
115115

116116

117117
{%endblock%}

0 commit comments

Comments
 (0)