diff options
| author | Peter Fraenkel <pnf@podsnap.com> | 2014-08-21 12:53:41 -0400 |
|---|---|---|
| committer | Peter Fraenkel <pnf@podsnap.com> | 2014-08-21 12:53:41 -0400 |
| commit | cfa5f40283668540cda45794200809640f251acd (patch) | |
| tree | cf2bd8ffbea3ed4c01b5690ffd8ae2702976b583 /notmyidea-cms | |
| parent | 1cd742a84a81f135234be021cf4fe7b8ff2c13ff (diff) | |
| parent | a928687830876af8c919606bae47195af65bc82d (diff) | |
| download | pelican-themes-cfa5f40283668540cda45794200809640f251acd.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Keep the latex and tag-specific feeds in bootstrap3
Conflicts:
pelican-bootstrap3/templates/base.html
Diffstat (limited to 'notmyidea-cms')
| -rw-r--r-- | notmyidea-cms/README.md | 7 | ||||
| -rw-r--r-- | notmyidea-cms/templates/article.html | 2 | ||||
| -rw-r--r-- | notmyidea-cms/templates/base.html | 2 | ||||
| -rw-r--r-- | notmyidea-cms/templates/index.html | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/notmyidea-cms/README.md b/notmyidea-cms/README.md new file mode 100644 index 0000000..86f7194 --- /dev/null +++ b/notmyidea-cms/README.md @@ -0,0 +1,7 @@ +# notmyidea-cms #
+
+
+
+## Screenshot ##
+
+
diff --git a/notmyidea-cms/templates/article.html b/notmyidea-cms/templates/article.html index 6f50605..1d869c0 100644 --- a/notmyidea-cms/templates/article.html +++ b/notmyidea-cms/templates/article.html @@ -4,7 +4,7 @@ <section id="content" class="body"> <article> <header> <h1 class="entry-title"><a href="{{ article.url }}" - rel="bookmark" title="Permalink to {{ article.title }}">{{ article.title + rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h1> {% include 'twitter.html' %} </header> <div class="entry-content"> {% include 'article_infos.html' %}<!-- /.post-info --> diff --git a/notmyidea-cms/templates/base.html b/notmyidea-cms/templates/base.html index 387125b..a782e50 100644 --- a/notmyidea-cms/templates/base.html +++ b/notmyidea-cms/templates/base.html @@ -68,7 +68,7 @@ <div class="widget social"> <h2>Social</h2> <ul> - <li><a href="{{ SITEURL }}/{{ FEED }}" rel="alternate">atom feed</a></li> + <li><a href="{{ SITEURL }}/{{ FEED_ALL_ATOM }}" rel="alternate">atom feed</a></li> {% if FEED_RSS %} <li><a href="{{ SITEURL }}/{{ FEED_RSS }}" rel="alternate">rss feed</a></li> {% endif %} diff --git a/notmyidea-cms/templates/index.html b/notmyidea-cms/templates/index.html index 1e4bad3..5e1e676 100644 --- a/notmyidea-cms/templates/index.html +++ b/notmyidea-cms/templates/index.html @@ -19,7 +19,7 @@ {% else %} <li><article class="hentry"> <header> - <h1><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h1> + <h1><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h1> </header> <div class="entry-content"> |