Skip to content

Commit

Permalink
refs #45: Removing main pages from the sidebar and adding the cookie …
Browse files Browse the repository at this point in the history 
…policy in the footer, so it is accessible.
  • Loading branch information
marcello.gorla committed Jan 24, 2020
1 parent 5426690 commit 2ba11b1
Show file tree
Hide file tree
Showing 4 changed files with 183 additions and 0 deletions.
5 changes: 5 additions & 0 deletions custom/custom-styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,8 @@
.content img {
margin-left: 0;
}

.footer-content {
font-size: 0.925rem;
text-align: right;
}
128 changes: 128 additions & 0 deletions custom/templates/layout.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
<!DOCTYPE html>
<html lang="{{config.locale}}">
<head>
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-108536377-6"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'UA-108536377-6', { 'anonymize_ip': true });
</script>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>{{#meta.title}}{{meta.title}} - {{/meta.title}}{{config.site_title}}</title>
{{#meta.description}}<meta name="description" content="{{meta.description}}">{{/meta.description}}
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="{{config.base_url}}/favicon.ico">
<link rel="icon" type="image/png" href="{{config.base_url}}/favicon.png" />
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800" />
<link rel="stylesheet" href="{{config.base_url}}/lib/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="{{config.base_url}}/lib/highlightjs/styles/solarized_light.css">
<link rel="stylesheet" href="{{config.base_url}}/styles/spark.css">
<link rel="stylesheet" href="{{config.base_url}}/styles/ghostdown.css">
<link rel="stylesheet" href="{{config.base_url}}/styles/custom.css">
{{#config.rtl_layout}}
<link rel="stylesheet" href="{{config.base_url}}/styles/spark.rtl.css">
<link rel="stylesheet" href="{{config.base_url}}/lib/bootstrap-rtl/dist/css/bootstrap-rtl.min.css">
{{/config.rtl_layout}}
{{{config.analytics}}}
</head>
<body class="{{body_class}}">
<!-- Header -->
<header class="header">
<div class="container-fluid">
<div class="row">
<div class="col-sm-3">
<a href="{{config.base_url}}/" class="logo">
<i class="spark-icon icon-sparkfabrik">&#xe800;</i>
<span>{{config.site_title}}</span>
</a>
</div>
<div class="col-sm-9">
<form class="search-form form-inline" action="{{config.base_url}}/">
<div class="form-group{{#config.authentication}} pushed {{/config.authentication}}">
<label class="sr-only" for="search">{{lang.global.search}}</label>
<input type="search" class="form-control" name="search" id="search" size="30" value="{{search}}" placeholder="{{lang.global.search}}">
</div>
</form>
{{#config.authentication}}
<form class="form-inline form-login">
{{#loggedIn}}
<a href="{{config.base_url}}/logout" class="btn btn-info">{{lang.login.logout}}</a>
{{/loggedIn}}
{{^loggedIn}}
<a href="{{config.base_url}}/login" class="btn btn-info">{{lang.login.login}}</a>
{{/loggedIn}}
</form>
{{/config.authentication}}
</div>
</div>
</div>
</header>
<!-- Main -->
<div class="container-fluid">
{{{yield}}}
</div>
<!-- Footer -->
<footer class="footer">
<div class="container-fluid">
<div class="footer-content pull-right">
<p><a href="{{config.base_url}}/cookie-policy">Cookie Policy</a></p>
{{#config.copyright}}
<p>{{{config.copyright}}}</p>
{{/config.copyright}}
</div>
</div>
</footer>
{{#config.allow_editing}}
{{#loggedIn}}
<!-- Modal: Add Page -->
<div class="modal fade" id="addModal" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="{{lang.global.close}}">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title">{{lang.global.addPage}}</h4>
</div>
<div class="modal-body">
<div class="form-group">
<label for="page-name" class="control-label">{{lang.global.pageName}}:</label>
<input type="text" class="form-control" id="page-name">
</div>
</div>
<div class="modal-footer">
<button class="btn btn-default" data-dismiss="modal" type="button">{{lang.global.cancel}}</button>
<button class="btn btn-primary" id="add-page-confirm" type="button">{{lang.global.save}}</button>
</div>
</div>
</div>
</div>
<!-- Modal: Delete Page -->
<div class="modal fade" id="deleteModal" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-body">
<h4 class="modal-title" id="myModalLabel">{{lang.global.reallyDeletePage}}</h4>
</div>
<div class="modal-footer">
<button class="btn btn-default" data-dismiss="modal" type="button">{{lang.global.no}}</button>
<button class="btn btn-primary" id="delete-page-confirm" type="button">{{lang.global.yes}}</button>
</div>
</div>
</div>
</div>
{{/loggedIn}}
{{/config.allow_editing}}
<!-- JavaScript -->
<script src="{{config.base_url}}/lib/jquery/dist/jquery.min.js"></script>
<script src="{{config.base_url}}/lib/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="{{config.base_url}}/lib/highlightjs/highlight.pack.min.js"></script>
<script src="{{config.base_url}}/lib/fitvids/fitvids.min.js"></script>
<script src="{{config.base_url}}/lib/masonry-layout/dist/masonry.pkgd.min.js"></script>
<script src="{{config.base_url}}/scripts/ghostdown.js"></script>
<script src="{{config.base_url}}/scripts/spark.js"></script>
</body>
</html>
48 changes: 48 additions & 0 deletions custom/templates/page.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<div class="row">
<div class="col-sm-3 hidden-xs">
<ul class="menu">
{{#canEdit}}
<li><input id="newCategory" type="text" class="form-control" placeholder="{{lang.page.addCategory}}"/></li>
{{/canEdit}}
{{#pages}}
<li class="category">
{{^is_index}}
<h5 class="category-title">{{title}} {{#canEdit}}<a class="add-page" data-toggle="modal" data-target="#addModal" title="{{lang.page.addPage}}"><span style="font-weight: bold; font-size: 16px; cursor:pointer">&#43;</span></a>{{/canEdit}}</h5>
<ul class="pages">
{{#files}}
<li class="page{{#active}} active{{/active}}"><a href="{{config.base_url}}/{{slug}}">{{title}}</a></li>
{{/files}}
</ul>
{{/is_index}}
</li>
{{/pages}}
</ul>
</div>
<div class="col-sm-9">
<section class="content">
{{#canEdit}}
<div class="btn-group btn-group-sm pull-right">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
{{lang.page.actions}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li><a class="goto-edit">{{lang.page.editPage}}</a></li>
<li><a data-toggle="modal" data-target="#deleteModal">{{lang.page.deletePage}}</a></li>
</ul>
</div>
{{/canEdit}}
{{#meta.title}}<h1 class="title">{{meta.title}}</h1>{{/meta.title}}
{{{content}}}
<div class="page-meta clearfix">
{{#config.support_email}}
<div class="contact-support pull-left">
<span class="glyphicon glyphicon-envelope"></span> {{lang.page.needHelp}} <a href="mailto:{{config.support_email}}">{{lang.page.getInTouch}}</a>
</div>
{{/config.support_email}}
<div class="last-updated pull-right">
{{lang.global.lastUpdated}} {{last_modified}}
</div>
</div>
</section>
</div>
</div>
2 changes: 2 additions & 0 deletions docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ documentation:
- ./content:/srv/locke/content
- ./custom/config.js:/srv/locke/config.js
- ./custom/custom-styles.css:/srv/locke/themes/spark/public/styles/custom.css
- ./custom/templates/layout.html:/srv/locke/themes/spark/templates/layout.html
- ./custom/templates/page.html:/srv/locke/themes/spark/templates/page.html

0 comments on commit 2ba11b1

Please sign in to comment.