Merge branch 'master' of edugit.org:Teckids/team-sysadmin/teckids-pelican

templates/index.html

-{% extends 'base.html' %}
-
-{% block content %}
-<h2>{{ SITENAME }}</h2>
-{% endblock %}

templates/page.html

@@ -9,11 +9,9 @@
         
         <meta itemprop='url' content='{{ SITEURL }}/{{ page.url }}' />
         <meta itemprop='name' content='{{ SITENAME }} - {{ page.title|striptags }}' />
-        <meta itemprop='image' content='{{ SITEURL }}/images/frontpage/wilber-big.png' />
 
         <meta property='og:url' content='{{ SITEURL }}/{{ page.url }}' />
         <meta property='og:title' content='{{ SITENAME }} - {{ page.title|striptags }}' />
-        <meta property='og:image' content='{{ SITEURL }}/images/frontpage/wilber-big.png' />
 
         {% if page.authors %}
         {% for author in page.authors %}

templates/page_default.html

+{% extends "base.html" %}
+{% block title %}{{ SITENAME }} — News{%endblock%}
+
+{% block head %}
+{{ super() }}
+<meta itemprop='url' content='{{ SITEURL }}' />
+<meta itemprop='name' content='{{ SITENAME }} — News' />
+<meta itemprop='image' content='{{ SITELOGO }}' />
+
+<meta property='og:url' content='{{ SITEURL }}' />
+<meta property='og:title' content='{{ SITENAME }} — News' />
+<meta property='og:image' content='{{ SITELOGO }}' />
+
+{% endblock head %}
+
+{% block content %}
+
+    <div class="container title">
+        <div class="row clearfix">
+            <div class="column full">
+                {% block content_title %}
+                    <h1>Recent News</h1>
+                    <div class='feed-text'><a href="https://teckids.edugit.io/feeds/all.atom.xml">Feed <i class='fa fa-rss'></i></a></div>
+                {% endblock %}
+            </div>
+        </div>
+    </div>
+
+    <section id="articles">
+        <div class="container">
+            {% for article in articles_page.object_list %}
+                <div class='row clearfix'>
+
+                    <div class="column full">
+                        <h3 class="entry-title">
+                            <a href="/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">
+                                {{ article.title }}
+                            </a>
+                        </h3>
+
+                        <div class='post-info'>
+                            <abbr class="published" title="{{ article.date.isoformat() }}"> {{ article.locale_date }} </abbr>
+
+                            <address class="vcard author">by
+                                {% for author in article.authors %}
+                                    <a class="url fn" href="/{{ author.url }}">{{ author }}</a>
+                                {% endfor %}
+                            </address>
+
+                        </div>
+
+                        <div class='entry-content'>
+                            {% if article.summary %}
+                            {{ article.summary }}
+                            {% else %}
+                            {{ article.content|truncate() }}
+                            {% endif %}
+                        </div>
+                    </div>
+
+                </div>
+                <hr />
+            {% endfor %}
+            {% if articles_page.has_other_pages() %}
+                {% include 'pagination.html' %}
+            {% endif %}
+        </div>
+    </section><!-- /#content -->
+
+{% endblock content %}

templates/page_with_carousel.html

+{% extends 'base.html' %}
+
+{% block template_content %}
+    <div id="myCarousel" class="carousel slide" data-ride="carousel">
+        <div class="carousel-inner">
+            {% for item in page.images %}
+                {% set image = item.split('|') %}
+                    <div class="item {% if loop.first %} active {% endif %}">
+                        <img class="center-block carousel-image" src="{{ image[1] }}" alt="{{ image[0] }}">
+                        <div class="carousel-caption d-none d-md-block">
+                            <h3>{{ image[0] }}</h3>
+                        </div>
+                    </div>
+             {% endfor %}
+        </div>
+     <a class="left carousel-control" href="#myCarousel" data-slide="prev">
+      <span class="glyphicon glyphicon-chevron-left"></span>
+      <span class="sr-only">Previous</span>
+     </a>
+     <a class="right carousel-control" href="#myCarousel" data-slide="next">
+      <span class="glyphicon glyphicon-chevron-right"></span>
+      <span class="sr-only">Next</span>
+     </a>
+
+    </div>
+
+{% endblock %}
+
+{% block content %}
+
+    <section class='page_content'>
+        <div class='container'>
+            <div class='row clearfix'>
+                <div class='column full'>
+                    {% block data %}
+                    {{ page.content }}
+                    {% endblock data %}
+                </div>
+            </div>
+        </div>
+    </section>
+
+	{% if page.modified  and PAGES_DEBUG == true %}
+		<p>
+            <small>Created: {{ page.locale_date }}</small>,  
+            <small>Last updated: {{ page.locale_modified }}</small>
+		</p>
+	{% endif %}
+
+
+    {% if PAGES_DEBUG == true %}
+    <div class='page_content debug'>
+        
+        <div>
+            <p>Debug stuff.  Ignore</p>
+            <p>
+                url: {{ page.url }} <br/>
+                slug: {{ page.slug }}<br/>
+                {% if page.parent %}
+                page parent: {{ page.parent }}<br/>
+                page parent url: {{ page.parent.url }} <br/>
+                page parent title: {{ page.parent.title }}
+                {% endif %}
+            </p>
+        
+            <p>page parents</p>
+        <ul>
+            <li>page.parents.length: {{ page.parents|length }}</li>
+            {% for parent in page.parents %}
+            <li>url: {{ parent.url }} - title: {{ parent.title }}<br/>
+                <a href="/{{ parent.url }}">{{ parent.title }}</a></li>
+            {% endfor %}
+        </ul>
+        <p>page children</p>
+        <ul>
+            {% for child in page.children %}
+            <li>url: {{ child.url }} - title: {{ child.title }}<br/>
+                <a href="/{{ child.url }}">{{ child.title }}</a></li>
+            {% endfor %}
+        </ul>
+        </div>
+    </div>
+    {% endif %}
+{% endblock %}