Browse Source

Update templates

Update the templates to remove the excessive itemprop tags as it really
is not a good idea.  Cleanup a few minor things.
master
Andrew Senetar 6 years ago
parent
commit
eca067ae67

+ 2
- 1
.gitattributes View File

@@ -3,4 +3,5 @@
3 3
 
4 4
 # Diff Settings
5 5
 *.html diff=html
6
-*.rb   diff=ruby
6
+*.rb diff=ruby
7
+*.php diff=php

+ 2
- 2
static/js/app.js View File

@@ -23,7 +23,7 @@ function ready(){
23 23
 // zeptojs or jquery
24 24
 Modernizr.load([{
25 25
   test: '__proto__' in {},
26
-  yep: 'http://cdn.jsdelivr.net/foundation/4.3.1/js/vendor/zepto.js',
26
+  yep: 'http://cdn.jsdelivr.net/foundation/4.3.2/js/vendor/zepto.js',
27 27
   nope: 'http://cdn.jsdelivr.net/jquery/1.10.2/jquery-1.10.2.min.js',
28 28
   complete: function() {
29 29
     if( !window.jQuery && !window.Zepto )
@@ -37,7 +37,7 @@ Modernizr.load([{
37 37
 
38 38
 // Foundation
39 39
 { 
40
-  load: 'http://cdn.jsdelivr.net/foundation/4.3.1/js/foundation.min.js',
40
+  load: 'http://cdn.jsdelivr.net/foundation/4.3.2/js/foundation.min.js',
41 41
   complete: function(){
42 42
     if(!window.Foundation)
43 43
       Modernizr.load([{

+ 3
- 3
static/js/vendor/foundation.min.js
File diff suppressed because it is too large
View File


+ 1
- 0
static/sass/app.scss View File

@@ -176,6 +176,7 @@ body{ background-color: #fff; }
176 176
             margin-bottom: emCalc(7px);
177 177
             p:last-child { margin-bottom: emCalc(5px); }
178 178
             img.photo{ display: none; }
179
+            .fn{ display: none; }
179 180
         }
180 181
     }
181 182
     ul.item-list.featured li .author {

+ 0
- 32
templates/_article_footer.html View File

@@ -41,38 +41,6 @@
41 41
   {% endfor %}
42 42
 </ul></li>
43 43
 {% endif %}
44
-<li class="author-details" itemprop="author" itemscope itemtype="http://schema.org/Person">
45
-  {% if article.author.name in AUTHORS %}
46
-  {% set props = AUTHORS[article.author.name] %}
47
-  {% endif %}
48
-  <ul class="vcard brief row">
49
-    {% if props and props.vcard %}
50
-    <div class="small-4 columns">
51
-    {% for key, value in props.vcard if key=='photo' %}
52
-      <img src="{{ value }}" class="photo" itemprop="image" />
53
-    {% endfor %}
54
-  </div>
55
-  <div class="small-12 columns">
56
-    {% for key, value in props.vcard if key in ['fn', 'email', 'url', 'title', 'org']%}
57
-    {% if key == 'fn' %}
58
-    <li><a href="{{ SITEURL+'/'+article.author.url }}" itemprop="url"><span class="fn" itemprop="name">{{ value }}</span></a></li>
59
-    {% elif key == 'url' %}
60
-    <li class="url"><a itemprop="sameAs" href="{{ value }}">{{ value }}</a></li>
61
-    {% elif key == 'title' %}
62
-    <li class="title" itemprop="jobTitle">{{ value }}</li>
63
-    {% elif key == 'org' %}
64
-    <li class="org" itemprop="affiliation">{{ value }}</li>
65
-    {% else %}
66
-    <li class="{{ key }}" itemprop="{{ key }}">{{ value }}</li>
67
-    {% endif %}
68
-    {% endfor %}
69
-  </div>
70
-    {% else %}
71
-    <li><a class="url" href="{{ SITEURL+'/'+article.author.url }}" itemprop="url"></a><span class="fn" itemprop="name">{{ article.author.name }}</span></a></li>
72
-    <li itemprop="affiliation" class="org">{{ SITENAME }}</li>
73
-    {% endif %}
74
-  </ul>
75
-</li>
76 44
 <li><ul class="no-bullet no-margin">
77 45
 {% if article.prev_article %}
78 46
 <li class="left"><a href="{{ SITEURL }}/{{ article.prev_article.url}}">{{ article.prev_article.title }} (Older)</a></li>

+ 2
- 2
templates/_author_item.html View File

@@ -2,7 +2,7 @@
2 2
   {% if name in AUTHORS %}
3 3
   {% set props = AUTHORS[name] %}
4 4
   {% endif %}
5
-  <li class="row" itemprop="itemListElement" itemscope itemtype="http://schema.org/Person">
5
+  <li class="row" itemscope itemtype="http://schema.org/Person">
6 6
     <meta itemprop="memberOf" content="{{ SITENAME }}" />
7 7
     <div class="author">
8 8
       <div class="small-4 columns">
@@ -27,7 +27,7 @@
27 27
           {% for key, value in props.vcard %}
28 28
           <li class="{{key}}">
29 29
           {% if key == 'fn' %}
30
-          <span itemprop="name">{{ value }}</span>
30
+          <span class="fn" itemprop="name">{{ value }}</span>
31 31
           {% elif key == 'email' %}
32 32
           <a href="mailto:{{ value }}"itemprop="email">{{ value }}</a>
33 33
           {% elif key == 'url' %}

+ 5
- 6
templates/_list_item.html View File

@@ -1,16 +1,15 @@
1
-<li class="row" itemprop="itemListElement" itemscope itemtype="http://schema.org/Article">
1
+<li class="row">
2 2
   <div class="article">
3 3
     <div class="small-4 columns">
4 4
       {% if article.image %}
5
-      <a class="th" href="{{ SITEURL }}/{{ article.url }}"><img src="{{ SITEURL }}/static/{{article.image}}" itemprop="image" /></a>
5
+      <a class="th" href="{{ SITEURL }}/{{ article.url }}"><img src="{{ SITEURL }}/static/{{article.image}}" /></a>
6 6
       {% else %}
7 7
       <a class="th" href="{{ SITEURL }}/{{ article.url }}"><img src="{{ SITEURL }}/{{ FAVICON }}"/></a>
8 8
       {% endif %}
9 9
     </div>
10 10
     <div class="small-12 columns">
11 11
       <header>
12
-        <h3 itemprop="headline"><a href="{{ SITEURL }}/{{ article.url }}" itemprop="url">{{ article.title|title }}</a></h3>
13
-        <meta itemprop="name" content="{{ article.title }}"/>
12
+        <h3><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title|title }}</a></h3>
14 13
         {% if not category %}
15 14
         <div><span>Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></span></div>
16 15
         {% endif %}
@@ -31,9 +30,9 @@
31 30
       </div>
32 31
       <footer>
33 32
         <ul class="no-bullet">
34
-          <li>Published by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><a href="{{ SITEURL }}/{{ article.author.url }}" itemprop="url"><span itemprop="name">{{ article.author }}</span></a></span> on: <abbr class="published" title="{{ article.date.isoformat() }}" itemprop="datePublished">{{ article.locale_date }}</abbr></li>
33
+          <li>Published by <<a href="{{ SITEURL }}/{{ article.author.url }}" >{{ article.author }}</a> on: <abbr class="published" title="{{ article.date.isoformat() }}">{{ article.locale_date }}</abbr></li>
35 34
           {% if article.modified %}
36
-          <li>Last Modified on: <abbr title="{{ article.modified }}" itemprop="dateModified">{{ article.modified }}</abbr></li>
35
+          <li>Last Modified on: <abbr title="{{ article.modified }}">{{ article.modified }}</abbr></li>
37 36
           {% endif %}
38 37
         </ul>      
39 38
       </footer>

+ 12
- 23
templates/_navigation.html View File

@@ -7,26 +7,20 @@
7 7
         </li>
8 8
         <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
9 9
       </ul>
10
-      <section class="top-bar-section" itemscope itemtype="http://schema.org/SiteNavigationElement">
11
-      <meta itemprop="name" content="{{ SITENAME }} Navigation"/>
10
+      <section class="top-bar-section">
12 11
       <!-- Menu -->
13
-      <ul class="left" itemscope itemtype="http://schema.org/ItemList">
14
-          <meta itemprop="name" content="{{ SITENAME }} Menu Items"/>
15
-          <meta itemprop="ItemListOrder" content="Unordered"/>
12
+      <ul class="left">
16 13
           {% for item, url in MENUITEMS %}
17
-          <li itemprop="itemListElement">
14
+          <li>
18 15
             <a href="{{ url }}">{{ item|title }}</a>
19 16
           </li>
20 17
           {% endfor %}                    
21 18
           {% if DISPLAY_PAGES_ON_MENU != False %}
22 19
           {% if DISPLAY_PAGES_ON_MENU == 'Compact' %}
23
-          <li class="has-dropdown" itemprop="itemListElement" itemscope itemtype="http://schema.org/ItemList"><a>Pages</a>
24
-            <meta itemprop="name" content="Pages"/>
25
-            <meta itemprop="url" content="{{SITEURL}}/Pages.html"/>
26
-            <meta itemprop="ItemListOrder" content="Unordered"/>
20
+          <li class="has-dropdown"><a>Pages</a>
27 21
             <ul class="dropdown">
28 22
               {% for p in PAGES if not p.status == 'hidden' %}
29
-              <li {% if p == page %} class='active'{% endif %} itemprop="itemListElement">
23
+              <li {% if p == page %} class='active'{% endif %}>
30 24
                 <a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
31 25
               {% endfor %}
32 26
             </ul>
@@ -34,7 +28,7 @@
34 28
           {% endif %}
35 29
           {% if DISPLAY_PAGES_ON_MENU == 'Expanded' %}
36 30
           {% for p in PAGES if not p.status == 'hidden' %}
37
-          <li {% if p == page %} class='active'{% endif %} itemprop="itemListElement">
31
+          <li {% if p == page %} class='active'{% endif %}>
38 32
             <a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a>
39 33
           </li>
40 34
           {% endfor %}
@@ -42,13 +36,10 @@
42 36
           {% endif %}
43 37
           {% if DISPLAY_CATEGORIES_ON_MENU != False %}
44 38
           {% if DISPLAY_CATEGORIES_ON_MENU == 'Compact' %}
45
-          <li class="has-dropdown" itemprop="itemListElement" itemscope itemtype="http://schema.org/ItemList"><a>Categories</a>
46
-            <meta itemprop="name" content="Categories"/>
47
-            <meta itemprop="url" content="{{SITEURL}}/Categories.html"/>
48
-            <meta itemprop="ItemListOrder" content="Unordered"/>
39
+          <li class="has-dropdown"><a>Categories</a>
49 40
             <ul class="dropdown">
50 41
               {% for cat, null in categories %}
51
-              <li {% if cat == category %} class='active'{% endif %} itemprop="itemListElement">
42
+              <li {% if cat == category %} class='active'{% endif %}>
52 43
                 <a href="{{ SITEURL }}/{{ cat.url }}">{{ cat.name }}</a>
53 44
               </li>
54 45
               {% endfor %}
@@ -57,25 +48,23 @@
57 48
           {% endif %}
58 49
           {% if DISPLAY_CATEGORIES_ON_MENU == 'Expanded' %}
59 50
           {% for cat, null in categories %}
60
-          <li {% if cat == category %} class='active'{% endif %} itemprop="itemListElement">
51
+          <li {% if cat == category %} class='active'{% endif %}>
61 52
             <a href="{{ SITEURL }}/{{ cat.url }}">{}{ cat.name }}</a>
62 53
           </li>
63 54
           {% endfor %}
64 55
           {% endif %}
65 56
           {% endif %}
66 57
           {% if DISPLAY_ARCHIVE_ON_MENU %}
67
-          <li itemprop="itemListElement">
58
+          <li>
68 59
             <a href="{{ SITEURL }}/archives.html">Archives</a>
69 60
           </li>
70 61
           {% endif %}
71 62
         </ul>
72 63
         <!-- Social Links -->
73 64
         {% if SOCIAL %}
74
-        <ul class="right" itemscope itemtype="http://schema.org/ItemList">
75
-          <meta itemprop="name" content="site-social"/>
76
-          <meta itemprop="ItemListOrder" content="Unordered"/>
65
+        <ul class="right">
77 66
           {% for network, url in SOCIAL %}
78
-          <li itemprop="itemListElement"><a href="{{ url }}" title="{{ network|title }}"><i class="huge icon-{{ network }}"></i></a></li>
67
+          <li><a href="{{ url }}" title="{{ network|title }}"><i class="huge icon-{{ network }}"></i></a></li>
79 68
           {% endfor %}
80 69
         </ul>
81 70
         {% endif %}

+ 2
- 1
templates/article.html View File

@@ -20,6 +20,7 @@
20 20
 <meta itemprop="copyrightHolder" content="{{ COPYRIGHT_HOLDER|default(article.author.name) }}"/>
21 21
 <div class="article-details">
22 22
   <span class="published">Published on: <abbr title="{{ article.date.isoformat() }}" itemprop="datePublished">{{ article.locale_date }}</abbr></span>
23
+  <span class="author">By <a href="{{ SITEURL+'/'+article.author.url }}" rel="author">{{ article.author,name }}</a></span>
23 24
   <span class="category">In <a href="{{ article.category.url }}">{{ article.category.name }}</a></span>
24 25
   {% if article.modified %}
25 26
   <span class="modified">Last modified on: <abbr title="{{ article.modified }}" itemprop="dateModified">{{ article.modified }}</abbr></span>
@@ -27,7 +28,7 @@
27 28
 {% if article.tags %}
28 29
 <div>
29 30
   <meta itemprop="keywords" content="{{ article.tags|join(', ') }}"/>  
30
-  <span><a href="{{ SITEURL }}/tags.html"><i class="icon-tag"></i></a> </span>
31
+  <span><a href="{{ SITEURL }}/tags.html"><i class="icon-tag"></i></a></span>
31 32
   <ul class="tag-list">
32 33
   {% for tag in article.tags %}
33 34
     <li><a href="{{ SITEURL+'/'+tag.url }}">{{ tag.name }}</a></li>

+ 1
- 1
templates/author.html View File

@@ -1,6 +1,6 @@
1 1
 {% extends 'base.html' %}
2 2
 {% block content %}
3
-<ul class="item-list featured" itemscope itemtype="http://schema.org/ItemList">
3
+<ul class="item-list featured">
4 4
 {% include '_author_item.html' %}
5 5
 </ul>
6 6
 {{ super() }}

+ 1
- 3
templates/authors.html View File

@@ -1,9 +1,7 @@
1 1
 {% extends 'base.html' %}
2 2
 {% block content %}
3 3
 {% if authors %}
4
-<ul class="item-list" itemscope itemtype="http://schema.org/ItemList">
5
-  <meta itemprop="name" content="Authors"/>
6
-  <meta itemprop="itemListOrder" content="Unordered"/>
4
+<ul class="item-list">
7 5
   {% for author, articles  in authors %}
8 6
   {% include '_author_item.html' %}
9 7
   {% endfor %}

+ 22
- 24
templates/base.html View File

@@ -1,6 +1,6 @@
1 1
 <!DOCTYPE html>
2
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" itemscope itemtype="http://schema.org/WebPage" > <![endif]-->
3
-  <!--[if gt IE 8]><!--><html class="no-js" lang="{{ DEFAULT_LANG }}" itemscope itemtype="http://schema.org/WebPage"> <!--<![endif]-->
2
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
3
+  <!--[if gt IE 8]><!--><html class="no-js" lang="{{ DEFAULT_LANG }}"> <!--<![endif]-->
4 4
 <head>
5 5
   <!-- meta -->
6 6
   <meta charset="utf-8" />
@@ -11,16 +11,16 @@
11 11
   {% set page_descrip = article.summary|striptags if article else page.summary|striptags if page else PAGE_DESC[page_title.lower()]|default(SITE_DESCR) if PAGE_DESC else SITE_DESCR %}
12 12
   {% set page_tags = article.tags|join(', ') if (article and article.tags) else page.tags|join(', ') if (page and page.tags) else SITE_KEY %}
13 13
   {% set page_author = article.author if article else page.author if page else AUTHOR %}
14
-  <meta name="description" itemprop="description" content="{{ page_descrip }}" />
15
-  <meta name="keywords" itemprop="keywords" content="{{ page_tags }}" />
16
-  <meta name="author" itemprop="author" content="{{ page_author }}" />
17
-  <meta name="organization" itemprop="sourceOrganization" content="{{ SITENAME }}"/>
18
-  <meta name="publisher" itemprop="publisher" content="{{ SITENAME }}"/>
19
-  <meta name="language" itemprop="inLanguage" content="{{ DEFAULT_LANG }}" />
14
+  <meta name="description" content="{{ page_descrip }}" />
15
+  <meta name="keywords" content="{{ page_tags }}" />
16
+  <meta name="author" content="{{ page_author }}" />
17
+  <meta name="organization" content="{{ SITENAME }}"/>
18
+  <meta name="publisher" content="{{ SITENAME }}"/>
19
+  <meta name="language" content="{{ DEFAULT_LANG }}" />
20 20
 
21 21
   <!-- title -->
22
-  <title itemprop="name">{% block title %}{{ SITENAME }}{{ ' - '+page_title if not page_title.lower() =='index' }}{% endblock %}</title>
23
-  <meta itemprop="url" content="{{ SITEURL+'/'+output_file }}"/>
22
+  <title>{% block title %}{{ SITENAME }}{{ ' - '+page_title if not page_title.lower() =='index' }}{% endblock %}</title>
23
+  <meta content="{{ SITEURL+'/'+output_file }}"/>
24 24
   
25 25
   <!-- Stylesheets -->
26 26
   <link rel="stylesheet" href="{{ SITEURL }}/theme/css/app.css" />
@@ -29,7 +29,7 @@
29 29
   <link href='http://fonts.googleapis.com/css?family=Source+Code+Pro|Open+Sans' rel='stylesheet' type='text/css'> 
30 30
   
31 31
   <!-- Favicon -->
32
-  <link rel="shortcut icon" href="{{ SITEURL }}/{{ FAVICON }}" itemprop="thumbnailUrl"/> 
32
+  <link rel="shortcut icon" href="{{ SITEURL }}/{{ FAVICON }}" /> 
33 33
 
34 34
   <!-- RSS/ATOM -->
35 35
   {% include '_feeds.html' %}
@@ -44,16 +44,15 @@
44 44
   <div class="row">
45 45
     <div id="main" class="large-13 columns push-3">
46 46
       <section>
47
-        <header itemscope itemtype="http://schema.org/WPHeader">
47
+        <header>
48 48
           {% block content_title %} 
49
-          <h1 itemprop="name"><a href="{{ SITEURL+'/'+output_file }}" rel="bookmark" title="Bookmark to {{ page_title }}">{{ page_title if not page_title.lower()=='index' else SITENAME }}</a></h1>
49
+          <h1><a href="{{ SITEURL+'/'+output_file }}" rel="bookmark" title="Bookmark to {{ page_title }}">{{ page_title if not page_title.lower()=='index' else SITENAME }}</a></h1>
50 50
           {% endblock %}
51 51
           <h2 class="print_header subheader">From: <a href="{{ SITEURL }}">{{ SITENAME }}</a></h2>
52 52
           {% block content_image %}{% endblock %}
53 53
         </header>
54 54
         {% block content %}
55
-        <ul class="item-list" itemscope itemtype="http://schema.org/ItemList">
56
-          <meta itemprop="name" content="Article List"/>
55
+        <ul class="item-list">
57 56
           {% for article in articles_page.object_list %}
58 57
           {% include '_list_item.html' %}
59 58
           {% endfor %}
@@ -65,28 +64,27 @@
65 64
       </section>
66 65
     </div>
67 66
     <div id="mainAside" class="large-3 columns pull-13">
68
-      <aside itemscope itemtype="http://schema.org/WPSideBar">
69
-        <meta itemprop="name" content="{{ SITENAME }} Sidebar"/>
67
+      <aside>
70 68
         {% block aside %}
71 69
         {% if GOOGLE_SEARCH %}
72 70
         {% include '_google_search.html' %}
73 71
         {% endif %}
74 72
         <h3>Blog Links</h3>
75
-        <ul id='blogRoll' class="no-bullet" itemscope itemtype="http://schema.org/ItemList">
73
+        <ul id='blogRoll' class="no-bullet">
76 74
           {% if INCLUDE_CATS_LINK %}
77
-          <li itemprop="itemListElement"><a href="{{ SITEURL }}/categories.html">Categories</a></li>
75
+          <li><a href="{{ SITEURL }}/categories.html">Categories</a></li>
78 76
           {% endif %}
79 77
           {% if INCLUDE_TAGS_LINK %}
80
-          <li itemprop="itemListElement"><a href="{{ SITEURL }}/tags.html">Tags</a></li>
78
+          <li><a href="{{ SITEURL }}/tags.html">Tags</a></li>
81 79
           {% endif %}
82 80
           {% if INCLUDE_ARCH_LINK %}
83
-          <li itemprop="itemListElement"><a href="{{ SITEURL }}/archives.html">Archives</a></li>
81
+          <li><a href="{{ SITEURL }}/archives.html">Archives</a></li>
84 82
           {% endif %}
85 83
           {% if INCLUDE_AUTH_LINK %}
86
-          <li itemprop="itemListElement"><a href="{{ SITEURL }}/authors.html">Authors</a></li>
84
+          <li><a href="{{ SITEURL }}/authors.html">Authors</a></li>
87 85
           {% endif %}
88 86
           {% for link in LINKS %}
89
-          <li itemprop="itemListElement"><a class="external" href="{{ link[1] }}">{{ link[0] }}</a></li>
87
+          <li><a class="external" href="{{ link[1] }}">{{ link[0] }}</a></li>
90 88
           {% endfor %}
91 89
         </ul>
92 90
         {% endblock %}
@@ -96,7 +94,7 @@
96 94
   <footer class="row" >
97 95
     <div class="large-16 columns" id="mainFooter">
98 96
       <span class="print_footer"><a href="{{ SITEURL }}/{{ output_file }}"> Fetched from: {{ output_file }}</a> on {{ NOW.isoformat() }}</span>
99
-      &copy;<span itemprop="copyrightHolder"> {{ COPYRIGHT_HOLDER|default(AUTHOR) }} </span><span itemprop="copyrightYear">{{ COPYRIGHT_YEAR }}</span>
97
+      &copy;<span> {{ COPYRIGHT_HOLDER|default(AUTHOR) }} </span><span>{{ COPYRIGHT_YEAR }}</span>
100 98
     </div>
101 99
   </footer>
102 100
   <script src="{{ SITEURL }}/theme/js/app.js"></script>

+ 1
- 2
templates/categories.html View File

@@ -3,8 +3,7 @@
3 3
 <h2>Recent Articles by Category</h2>
4 4
 {% for cat, articles in categories %}
5 5
 <h3><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></h3>
6
-<ul class="item-list" itemscope itemtype="http://schema.org/ItemList">
7
-  <meta itemprop="name" content="{{ cat }} recent articles"/>
6
+<ul class="item-list">
8 7
 {% for article in articles[0:3] %}
9 8
 {% include '_list_item.html' %}
10 9
 {% endfor %}

+ 1
- 2
templates/index.html View File

@@ -3,8 +3,7 @@
3 3
 <p>{{ SITE_DESCR }}</p>
4 4
 {% if articles and ARTICLES_ON_INDEX %}
5 5
 <h2>Recent Articles:</h2>
6
-<ul class="item-list" itemscope itemtype="http://schema.org/ItemList">
7
-<meta name="Recent Articles"/>
6
+<ul class="item-list">
8 7
 {% for article in articles[0:ARTICLES_ON_INDEX] %}
9 8
 {% include '_list_item.html' %}
10 9
 {% endfor %}

Loading…
Cancel
Save