diff options
| -rw-r--r-- | .gitmodules | 14 | ||||
| m--------- | blue-penguin | 0 | ||||
| m--------- | chameleon | 0 | ||||
| m--------- | martin-pelican | 0 | ||||
| m--------- | mg | 0 | ||||
| m--------- | pelican-iliork | 0 | ||||
| -rwxr-xr-x | simple-bootstrap/templates/base.html | 1 | ||||
| -rw-r--r-- | simple-bootstrap/templates/piwik.html | 16 | ||||
| -rw-r--r-- | tuxlite_tbs/static/bootstrap-collapse.js | 167 | ||||
| -rw-r--r-- | tuxlite_tbs/static/bootstrap.min.css | 4 | ||||
| -rw-r--r-- | tuxlite_tbs/static/images/icons/glyphicons-halflings-white.png | bin | 0 -> 8777 bytes | |||
| -rw-r--r-- | tuxlite_tbs/static/images/icons/glyphicons-halflings.png | bin | 0 -> 12799 bytes | |||
| -rw-r--r-- | tuxlite_tbs/templates/base.html | 19 | ||||
| -rw-r--r-- | tuxlite_tbs/templates/tags.html | 2 | ||||
| -rw-r--r-- | tuxlite_tbs/templates/twitter.html | 4 | ||||
| m--------- | voidy-bootstrap | 0 |
16 files changed, 211 insertions, 16 deletions
diff --git a/.gitmodules b/.gitmodules index 24e373b..c64e0e4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -75,7 +75,7 @@ url = https://github.com/talha131/pelican-elegant.git [submodule "niu-x2"] path = niu-x2 - url = http://github.com/wilbur-ma/niu-x2 + url = https://github.com/wilbur-ma/niu-x2.git [submodule "storm"] path = storm url = https://github.com/redVi/storm.git @@ -109,9 +109,6 @@ [submodule "voidy-bootstrap"] path = voidy-bootstrap url = https://github.com/robulouski/voidy-bootstrap.git -[submodule "pelican-iliork"] - path = pelican-iliork - url = https://github.com/yuex/pelican-iliork.git [submodule "burrito"] path = burrito url = https://github.com/fly/burrito.git @@ -142,3 +139,12 @@ [submodule "ptemplate"] path = ptemplate url = https://github.com/spinner-dev/ptemplate.git +[submodule "chameleon"] + path = chameleon + url = https://github.com/yuex/pelican-iliork.git +[submodule "mg"] + path = mg + url = https://github.com/lucachr/pelican-mg.git +[submodule "martin-pelican"] + path = martin-pelican + url = https://github.com/cpaulik/martin-pelican diff --git a/blue-penguin b/blue-penguin -Subproject 2f838b651b28666cf9db28962d2b3f4ebbceefe +Subproject 4ea9f35b517e67488f330799e8637e2e045d657 diff --git a/chameleon b/chameleon new file mode 160000 +Subproject 5ae012eb35a747834f207badc95e8f31f6246ad diff --git a/martin-pelican b/martin-pelican new file mode 160000 +Subproject 13b90271c0841e69407be3f79032d35d84c48c2 diff --git a/mg b/mg new file mode 160000 +Subproject 6293f47f052d5d3b6f59db7f9f52bb00a4a9b72 diff --git a/pelican-iliork b/pelican-iliork deleted file mode 160000 -Subproject 078a96fbf815017bd2ebbbb362fd357f21a7e0e diff --git a/simple-bootstrap/templates/base.html b/simple-bootstrap/templates/base.html index 68b8a10..d9c71b9 100755 --- a/simple-bootstrap/templates/base.html +++ b/simple-bootstrap/templates/base.html @@ -59,5 +59,6 @@ </footer><!-- /#contentinfo --> </div><!-- container --> {% include 'analytics.html' %} + {% include 'piwik.html' %} </body> </html> diff --git a/simple-bootstrap/templates/piwik.html b/simple-bootstrap/templates/piwik.html new file mode 100644 index 0000000..bf6baaa --- /dev/null +++ b/simple-bootstrap/templates/piwik.html @@ -0,0 +1,16 @@ +{% if PIWIK_URL and PIWIK_SITE_ID %} +<script type="text/javascript"> +{% if PIWIK_SSL_URL %} + var pkBaseURL = (("https:" == document.location.protocol) ? "https://{{ PIWIK_SSL_URL }}/" : "http://{{ PIWIK_URL }}/"); +{% else %} + var pkBaseURL = (("https:" == document.location.protocol) ? "https://{{ PIWIK_URL }}/" : "http://{{ PIWIK_URL }}/"); +{% endif %} +document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); +</script><script type="text/javascript"> +try { +var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", {{ PIWIK_SITE_ID }}); +piwikTracker.trackPageView(); +piwikTracker.enableLinkTracking(); +} catch( err ) {} +</script><noscript><p><img src="http://{{ PIWIK_URL }}/piwik.php?idsite={{ PIWIK_SITE_ID }}" style="border:0" alt="" /></p></noscript> +{% endif %} diff --git a/tuxlite_tbs/static/bootstrap-collapse.js b/tuxlite_tbs/static/bootstrap-collapse.js new file mode 100644 index 0000000..74a73a8 --- /dev/null +++ b/tuxlite_tbs/static/bootstrap-collapse.js @@ -0,0 +1,167 @@ +/* ============================================================= + * bootstrap-collapse.js v2.3.2 + * http://twitter.github.com/bootstrap/javascript.html#collapse + * ============================================================= + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================ */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* COLLAPSE PUBLIC CLASS DEFINITION + * ================================ */ + + var Collapse = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, $.fn.collapse.defaults, options) + + if (this.options.parent) { + this.$parent = $(this.options.parent) + } + + this.options.toggle && this.toggle() + } + + Collapse.prototype = { + + constructor: Collapse + + , dimension: function () { + var hasWidth = this.$element.hasClass('width') + return hasWidth ? 'width' : 'height' + } + + , show: function () { + var dimension + , scroll + , actives + , hasData + + if (this.transitioning || this.$element.hasClass('in')) return + + dimension = this.dimension() + scroll = $.camelCase(['scroll', dimension].join('-')) + actives = this.$parent && this.$parent.find('> .accordion-group > .in') + + if (actives && actives.length) { + hasData = actives.data('collapse') + if (hasData && hasData.transitioning) return + actives.collapse('hide') + hasData || actives.data('collapse', null) + } + + this.$element[dimension](0) + this.transition('addClass', $.Event('show'), 'shown') + $.support.transition && this.$element[dimension](this.$element[0][scroll]) + } + + , hide: function () { + var dimension + if (this.transitioning || !this.$element.hasClass('in')) return + dimension = this.dimension() + this.reset(this.$element[dimension]()) + this.transition('removeClass', $.Event('hide'), 'hidden') + this.$element[dimension](0) + } + + , reset: function (size) { + var dimension = this.dimension() + + this.$element + .removeClass('collapse') + [dimension](size || 'auto') + [0].offsetWidth + + this.$element[size !== null ? 'addClass' : 'removeClass']('collapse') + + return this + } + + , transition: function (method, startEvent, completeEvent) { + var that = this + , complete = function () { + if (startEvent.type == 'show') that.reset() + that.transitioning = 0 + that.$element.trigger(completeEvent) + } + + this.$element.trigger(startEvent) + + if (startEvent.isDefaultPrevented()) return + + this.transitioning = 1 + + this.$element[method]('in') + + $.support.transition && this.$element.hasClass('collapse') ? + this.$element.one($.support.transition.end, complete) : + complete() + } + + , toggle: function () { + this[this.$element.hasClass('in') ? 'hide' : 'show']() + } + + } + + + /* COLLAPSE PLUGIN DEFINITION + * ========================== */ + + var old = $.fn.collapse + + $.fn.collapse = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('collapse') + , options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option) + if (!data) $this.data('collapse', (data = new Collapse(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.collapse.defaults = { + toggle: true + } + + $.fn.collapse.Constructor = Collapse + + + /* COLLAPSE NO CONFLICT + * ==================== */ + + $.fn.collapse.noConflict = function () { + $.fn.collapse = old + return this + } + + + /* COLLAPSE DATA-API + * ================= */ + + $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) { + var $this = $(this), href + , target = $this.attr('data-target') + || e.preventDefault() + || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 + , option = $(target).data('collapse') ? 'toggle' : $this.data() + $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') + $(target).collapse(option) + }) + +}(window.jQuery);
\ No newline at end of file diff --git a/tuxlite_tbs/static/bootstrap.min.css b/tuxlite_tbs/static/bootstrap.min.css index 5e1aee0..d5af94c 100644 --- a/tuxlite_tbs/static/bootstrap.min.css +++ b/tuxlite_tbs/static/bootstrap.min.css @@ -212,8 +212,8 @@ table .span9{float:none;width:684px;margin-left:0;} table .span10{float:none;width:764px;margin-left:0;} table .span11{float:none;width:844px;margin-left:0;} table .span12{float:none;width:924px;margin-left:0;} -[class^="icon-"]{display:inline-block;width:14px;height:14px;vertical-align:text-top;background-image:url(../img/glyphicons-halflings.png);background-position:14px 14px;background-repeat:no-repeat;*margin-right:.3em;}[class^="icon-"]:last-child{*margin-left:0;} -.icon-white{background-image:url(../img/glyphicons-halflings-white.png);} +[class^="icon-"]{display:inline-block;width:14px;height:14px;vertical-align:text-top;background-image:url(./images/icons/glyphicons-halflings.png);background-position:14px 14px;background-repeat:no-repeat;*margin-right:.3em;}[class^="icon-"]:last-child{*margin-left:0;} +.icon-white{background-image:url(./images/icons/glyphicons-halflings-white.png);} .icon-glass{background-position:0 0;} .icon-music{background-position:-24px 0;} .icon-search{background-position:-48px 0;} diff --git a/tuxlite_tbs/static/images/icons/glyphicons-halflings-white.png b/tuxlite_tbs/static/images/icons/glyphicons-halflings-white.png Binary files differnew file mode 100644 index 0000000..3bf6484 --- /dev/null +++ b/tuxlite_tbs/static/images/icons/glyphicons-halflings-white.png diff --git a/tuxlite_tbs/static/images/icons/glyphicons-halflings.png b/tuxlite_tbs/static/images/icons/glyphicons-halflings.png Binary files differnew file mode 100644 index 0000000..a996999 --- /dev/null +++ b/tuxlite_tbs/static/images/icons/glyphicons-halflings.png diff --git a/tuxlite_tbs/templates/base.html b/tuxlite_tbs/templates/base.html index 866d6a5..62ffdaa 100644 --- a/tuxlite_tbs/templates/base.html +++ b/tuxlite_tbs/templates/base.html @@ -20,16 +20,16 @@ <!-- So Firefox can bookmark->"abo this site" --> {% if FEED_ALL_ATOM %} - <link href="{{ FEED_ALL_ATOM }}" rel="alternate" title="{{ SITENAME }}" type="application/atom+xml"> + <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" rel="alternate" title="{{ SITENAME }}" type="application/atom+xml"> {% endif %} {% if FEED_ATOM %} - <link href="{{ FEED_ATOM }}" rel="alternate" title="{{ SITENAME }}" type="application/atom+xml"> + <link href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" rel="alternate" title="{{ SITENAME }}" type="application/atom+xml"> {% endif %} {% if FEED_RSS %} - <link href="{{ FEED_RSS }}" rel="alternate" title="{{ SITENAME }}" type="application/rss+xml"> + <link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" rel="alternate" title="{{ SITENAME }}" type="application/rss+xml"> {% endif %} {% if FEED_ALL_RSS %} - <link href="{{ FEED_ALL_RSS }}" rel="alternate" title="{{ SITENAME }}" type="application/rss+xml"> + <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" rel="alternate" title="{{ SITENAME }}" type="application/rss+xml"> {% endif %} </head> @@ -82,7 +82,7 @@ Site </li> - <li><a href="{{ SITEURL }}/{{ ARCHIVES_URL }}">Archives</a> + <li><a href="{{ SITEURL }}/archives.html">Archives</a> <li><a href="{{ SITEURL }}/tags.html">Tags</a> @@ -156,12 +156,17 @@ <footer> <br /> -<p><a href="{{ SITEURL }}">{{ SITENAME }}</a> © {{ AUTHOR }} 2012</p> +{% if articles %} + {% set copy_date = articles[0].date.strftime('%Y') %} +{% else %} + {% set copy_date = '' %} +{% endif %} +<p><a href="{{ SITEURL }}">{{ SITENAME }}</a> © {{ AUTHOR }} {{ copy_date }}</p> </footer> </div> <!-- /container --> <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script> -<script src="http://twitter.github.com/bootstrap/assets/js/bootstrap-collapse.js"></script> +<script src="{{ SITEURL }}/theme/bootstrap-collapse.js"></script> {% include "analytics.html" %} {% include "github.html" %} </body> diff --git a/tuxlite_tbs/templates/tags.html b/tuxlite_tbs/templates/tags.html index db1c520..94a5fc3 100644 --- a/tuxlite_tbs/templates/tags.html +++ b/tuxlite_tbs/templates/tags.html @@ -2,7 +2,7 @@ {% block title %}{{ SITENAME }} <small>[tgs]</small>{% endblock %} {% block content %} <ul> -{% for tag, articles in tags %} +{% for tag, articles in tags|sort %} <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a></li> {% endfor %} </ul> diff --git a/tuxlite_tbs/templates/twitter.html b/tuxlite_tbs/templates/twitter.html index c6b159f..17b49e1 100644 --- a/tuxlite_tbs/templates/twitter.html +++ b/tuxlite_tbs/templates/twitter.html @@ -1,3 +1,3 @@ {% if TWITTER_USERNAME %} -<a href="http://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="{{TWITTER_USERNAME}}">Tweet</a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script> -{% endif %}
\ No newline at end of file +<a href="http://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-text="{{article.title}}" data-via="{{TWITTER_USERNAME}}">Tweet</a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script> +{% endif %} diff --git a/voidy-bootstrap b/voidy-bootstrap -Subproject 7321b8c296dabccec660eaeec9c7edb54cd51d2 +Subproject a008df6cd97936f6dff714bb9e6edca5015d992 |
