diff options
| -rwxr-xr-x | bootlex/static/bootstrap.css | 1 | ||||
| -rw-r--r-- | bootlex/static/pastie.css | 129 | ||||
| -rw-r--r-- | bootlex/templates/article.html | 2 | ||||
| -rw-r--r-- | bootlex/templates/base.html | 9 | ||||
| -rw-r--r-- | bootlex/templates/index.html | 22 |
5 files changed, 87 insertions, 76 deletions
diff --git a/bootlex/static/bootstrap.css b/bootlex/static/bootstrap.css index b353cf7..e25d620 100755 --- a/bootlex/static/bootstrap.css +++ b/bootlex/static/bootstrap.css @@ -133,6 +133,7 @@ textarea { } body { margin: 0; + margin-top: 40px; font-family: "Arimo", sans-serif; font-size: 18px; line-height: 23px; diff --git a/bootlex/static/pastie.css b/bootlex/static/pastie.css index c23fa49..783e793 100644 --- a/bootlex/static/pastie.css +++ b/bootlex/static/pastie.css @@ -1,60 +1,69 @@ -.codehilite .hll { background-color: #ffffcc } -.codehilite .c { color: #888888 } /* Comment */ -.codehilite .err { color: #a61717; background-color: #e3d2d2 } /* Error */ -.codehilite .k { color: #008800; font-weight: bold } /* Keyword */ -.codehilite .cm { color: #888888 } /* Comment.Multiline */ -.codehilite .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ -.codehilite .c1 { color: #888888 } /* Comment.Single */ -.codehilite .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */ -.codehilite .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ -.codehilite .ge { font-style: italic } /* Generic.Emph */ -.codehilite .gr { color: #aa0000 } /* Generic.Error */ -.codehilite .gh { color: #303030 } /* Generic.Heading */ -.codehilite .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ -.codehilite .go { color: #888888 } /* Generic.Output */ -.codehilite .gp { color: #555555 } /* Generic.Prompt */ -.codehilite .gs { font-weight: bold } /* Generic.Strong */ -.codehilite .gu { color: #606060 } /* Generic.Subheading */ -.codehilite .gt { color: #aa0000 } /* Generic.Traceback */ -.codehilite .kc { color: #008800; font-weight: bold } /* Keyword.Constant */ -.codehilite .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */ -.codehilite .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */ -.codehilite .kp { color: #008800 } /* Keyword.Pseudo */ -.codehilite .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */ -.codehilite .kt { color: #888888; font-weight: bold } /* Keyword.Type */ -.codehilite .m { color: #0000DD; font-weight: bold } /* Literal.Number */ -.codehilite .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ -.codehilite .na { color: #336699 } /* Name.Attribute */ -.codehilite .nb { color: #003388 } /* Name.Builtin */ -.codehilite .nc { color: #bb0066; font-weight: bold } /* Name.Class */ -.codehilite .no { color: #003366; font-weight: bold } /* Name.Constant */ -.codehilite .nd { color: #555555 } /* Name.Decorator */ -.codehilite .ne { color: #bb0066; font-weight: bold } /* Name.Exception */ -.codehilite .nf { color: #0066bb; font-weight: bold } /* Name.Function */ -.codehilite .nl { color: #336699; font-style: italic } /* Name.Label */ -.codehilite .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ -.codehilite .py { color: #336699; font-weight: bold } /* Name.Property */ -.codehilite .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ -.codehilite .nv { color: #336699 } /* Name.Variable */ -.codehilite .ow { color: #008800 } /* Operator.Word */ -.codehilite .w { color: #bbbbbb } /* Text.Whitespace */ -.codehilite .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ -.codehilite .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ -.codehilite .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ -.codehilite .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ -.codehilite .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ -.codehilite .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ -.codehilite .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ -.codehilite .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ -.codehilite .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ -.codehilite .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ -.codehilite .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ -.codehilite .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ -.codehilite .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ -.codehilite .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ -.codehilite .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ -.codehilite .bp { color: #003388 } /* Name.Builtin.Pseudo */ -.codehilite .vc { color: #336699 } /* Name.Variable.Class */ -.codehilite .vg { color: #dd7700 } /* Name.Variable.Global */ -.codehilite .vi { color: #3333bb } /* Name.Variable.Instance */ -.codehilite .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */ +.codehilite { background-color: #ffffcc } +.codehilite .c { color: #586E75 } /* Comment */ +.codehilite .err { color: #93A1A1 } /* Error */ +.codehilite .g { color: #93A1A1 } /* Generic */ +.codehilite .k { color: #859900 } /* Keyword */ +.codehilite .l { color: #93A1A1 } /* Literal */ +.codehilite .n { color: #93A1A1 } /* Name */ +.codehilite .o { color: #859900 } /* Operator */ +.codehilite .x { color: #CB4B16 } /* Other */ +.codehilite .p { color: #93A1A1 } /* Punctuation */ +.codehilite .cm { color: #586E75 } /* Comment.Multiline */ +.codehilite .cp { color: #859900 } /* Comment.Preproc */ +.codehilite .c1 { color: #586E75 } /* Comment.Single */ +.codehilite .cs { color: #859900 } /* Comment.Special */ +.codehilite .gd { color: #2AA198 } /* Generic.Deleted */ +.codehilite .ge { color: #93A1A1; font-style: italic } /* Generic.Emph */ +.codehilite .gr { color: #DC322F } /* Generic.Error */ +.codehilite .gh { color: #CB4B16 } /* Generic.Heading */ +.codehilite .gi { color: #859900 } /* Generic.Inserted */ +.codehilite .go { color: #93A1A1 } /* Generic.Output */ +.codehilite .gp { color: #93A1A1 } /* Generic.Prompt */ +.codehilite .gs { color: #93A1A1; font-weight: bold } /* Generic.Strong */ +.codehilite .gu { color: #CB4B16 } /* Generic.Subheading */ +.codehilite .gt { color: #93A1A1 } /* Generic.Traceback */ +.codehilite .kc { color: #CB4B16 } /* Keyword.Constant */ +.codehilite .kd { color: #268BD2 } /* Keyword.Declaration */ +.codehilite .kn { color: #859900 } /* Keyword.Namespace */ +.codehilite .kp { color: #859900 } /* Keyword.Pseudo */ +.codehilite .kr { color: #268BD2 } /* Keyword.Reserved */ +.codehilite .kt { color: #DC322F } /* Keyword.Type */ +.codehilite .ld { color: #93A1A1 } /* Literal.Date */ +.codehilite .m { color: #2AA198 } /* Literal.Number */ +.codehilite .s { color: #2AA198 } /* Literal.String */ +.codehilite .na { color: #93A1A1 } /* Name.Attribute */ +.codehilite .nb { color: #B58900 } /* Name.Builtin */ +.codehilite .nc { color: #268BD2 } /* Name.Class */ +.codehilite .no { color: #CB4B16 } /* Name.Constant */ +.codehilite .nd { color: #268BD2 } /* Name.Decorator */ +.codehilite .ni { color: #CB4B16 } /* Name.Entity */ +.codehilite .ne { color: #CB4B16 } /* Name.Exception */ +.codehilite .nf { color: #268BD2 } /* Name.Function */ +.codehilite .nl { color: #93A1A1 } /* Name.Label */ +.codehilite .nn { color: #93A1A1 } /* Name.Namespace */ +.codehilite .nx { color: #93A1A1 } /* Name.Other */ +.codehilite .py { color: #93A1A1 } /* Name.Property */ +.codehilite .nt { color: #268BD2 } /* Name.Tag */ +.codehilite .nv { color: #268BD2 } /* Name.Variable */ +.codehilite .ow { color: #859900 } /* Operator.Word */ +.codehilite .w { color: #93A1A1 } /* Text.Whitespace */ +.codehilite .mf { color: #2AA198 } /* Literal.Number.Float */ +.codehilite .mh { color: #2AA198 } /* Literal.Number.Hex */ +.codehilite .mi { color: #2AA198 } /* Literal.Number.Integer */ +.codehilite .mo { color: #2AA198 } /* Literal.Number.Oct */ +.codehilite .sb { color: #586E75 } /* Literal.String.Backtick */ +.codehilite .sc { color: #2AA198 } /* Literal.String.Char */ +.codehilite .sd { color: #93A1A1 } /* Literal.String.Doc */ +.codehilite .s2 { color: #2AA198 } /* Literal.String.Double */ +.codehilite .se { color: #CB4B16 } /* Literal.String.Escape */ +.codehilite .sh { color: #93A1A1 } /* Literal.String.Heredoc */ +.codehilite .si { color: #2AA198 } /* Literal.String.Interpol */ +.codehilite .sx { color: #2AA198 } /* Literal.String.Other */ +.codehilite .sr { color: #DC322F } /* Literal.String.Regex */ +.codehilite .s1 { color: #2AA198 } /* Literal.String.Single */ +.codehilite .ss { color: #2AA198 } /* Literal.String.Symbol */ +.codehilite .bp { color: #268BD2 } /* Name.Builtin.Pseudo */ +.codehilite .vc { color: #268BD2 } /* Name.Variable.Class */ +.codehilite .vg { color: #268BD2 } /* Name.Variable.Global */ +.codehilite .vi { color: #268BD2 } /* Name.Variable.Instance */ +.codehilite .il { color: #2AA198 } /* Literal.Number.Integer.Long */
\ No newline at end of file diff --git a/bootlex/templates/article.html b/bootlex/templates/article.html index 5a533fe..18ba9a3 100644 --- a/bootlex/templates/article.html +++ b/bootlex/templates/article.html @@ -5,7 +5,7 @@ <div class="header"> <h1>{{ article.title }}</h1> </div> - <p class="meta"><small><span>{% if article.author %}<a href="{{ SITEURL }}author/{{ article.author }}/">{{ article.author }}</a> - {% endif %}</span><span>{{ article.locale_date }}</span> - <span class="tags">{% if article.tags %}{% for tag in article.tags %}<a href="/tag/{{ tag }}/">{{ tag }}</a>{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}</span></small></p> + <p class="meta"><small><span>{% if article.author %}<a href="{{ SITEURL }}author/{{ article.author.slug }}/">{{ article.author }}</a> - {% endif %}</span><span>{{ article.locale_date }}</span> - <span class="tags">{% if article.tags %}{% for tag in article.tags %}<a href="/tag/{{ tag }}/">{{ tag }}</a>{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}</span></small></p> <div class="entry-content"> {{ article.content }} </div><!-- /.entry-content --> diff --git a/bootlex/templates/base.html b/bootlex/templates/base.html index bbb8797..711bda6 100644 --- a/bootlex/templates/base.html +++ b/bootlex/templates/base.html @@ -14,13 +14,6 @@ </head> <body> - <div class="navbar"> - <div class="navbar-inner"> - <div class="container"> - <h1><a class="brand" href="{{ SITEURL }}">{{ SITENAME }}</a></h1> - </div> - </div> - </div> <div class="container"> <div class="row"> <div class="span8"> @@ -69,7 +62,7 @@ <div class="row"> <div class="span12"> <div id="about"> - <p>Proudly powered by <a href="http://twitter.github.com/bootstrap/">bootstrap</a>, <a href="http://docs.notmyidea.org/alexis/pelican/">pelican</a>, <a href="http://python.org">python</a> and <a href="http://www.julo.ch/pages/about">Alex</a>!</p> + <p>Proudly powered by <a href="http://twitter.github.com/bootstrap/">bootstrap</a>, <a href="http://docs.notmyidea.org/alexis/pelican/">pelican</a>, <a href="http://python.org">python</a> and <a href="http://www.julo.ch/about/">Alex</a>!</p> </div><!-- /#about --> </div><!-- /#contentinfo --> </div> diff --git a/bootlex/templates/index.html b/bootlex/templates/index.html index 9da666a..02ff0ee 100644 --- a/bootlex/templates/index.html +++ b/bootlex/templates/index.html @@ -13,7 +13,7 @@ <div class="header"> <h2>{{ article.title }}</h2> </div> - <p class="meta"><small><span>{% if article.author %}<a href="{{ SITEURL }}author/{{ article.author }}/">{{ article.author }}</a> - {% endif %}</span><span>{{ article.locale_date }}</span> - <span class="tags">{% if article.tags %}{% for tag in article.tags %}<a href="/tag/{{ tag }}/">{{ tag }}</a>{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}</span></small></p> + <p class="meta"><small><span>{% if article.author %}<a href="{{ SITEURL }}author/{{ article.author.slug }}/">{{ article.author }}</a> - {% endif %}</span><span>{{ article.locale_date }}</span> - <span class="tags">{% if article.tags %}{% for tag in article.tags %}<a href="/tag/{{ tag }}/">{{ tag }}</a>{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}</span></small></p> <div class="entry-content"> {{ article.summary }} </div><!-- /.entry-content --> @@ -32,20 +32,28 @@ </ul><!-- /#posts-list --> <div class="pagination pagination-centered"> <ul> - {% if articles_page.has_previous() %} - <li><a href="{{ SITEURL }}{% if articles_page.previous_page_number() != 1 %}{{ page_name }}{{ articles_page.previous_page_number() }}/{% endif %}">←</a></li> - {% endif %} {% if articles_page.has_previous() and (articles_page.previous_page_number() != 1) %} <li><a href="{{ SITEURL }}">1</a></li> + {% endif %} + {% if articles_page.previous_page_number() - 1 == 2 %} + <li><a href="{{ articles_page.previous_page_number() - 1}}">{{ articles_page.previous_page_number() - 1}}</a></li> + {% elif articles_page.previous_page_number() - 1 > 1 %} <li class="disabled"><a href="#">...</a></li> {% endif %} + {% if articles_page.has_previous() %} + <li><a href="{{ SITEURL }}{% if articles_page.previous_page_number() != 1 %}{{ page_name }}{{ articles_page.previous_page_number() }}/{% endif %}">{{ articles_page.previous_page_number() }}</a></li> + {% endif %} <li class="active"><a href="#">{{ articles_page.number }}</a></li> {% if articles_page.has_next() %} - <li><a href="{{ SITEURL }}{{ page_name }}{{ articles_page.next_page_number() }}/">→</a></li> + <li><a href="{{ SITEURL }}{{ page_name }}{{ articles_page.next_page_number() }}/">{{ articles_page.next_page_number() }}</a></li> {% endif %} - {% if articles_page.has_next() and (articles_page.next_page_number() != articles_paginator.num_pages) %} + {% if articles_paginator.num_pages - articles_page.next_page_number() == 2 %} + <li><a href="{{ articles_page.next_page_number() + 1}}">{{ articles_page.next_page_number() + 1}}</a></li> + {% elif articles_paginator.num_pages - articles_page.next_page_number() > 2 %} <li class="disabled"><a href="#">...</a></li> - <li><a href="{{ SITEURL }}{{ page_name }}{{ articles_page.num_pages }}/">{{ articles_paginator.num_pages }}</a></li> + {% endif %} + {% if articles_page.has_next() and (articles_page.next_page_number() != articles_paginator.num_pages) %} + <li><a href="{{ SITEURL }}{{ page_name }}{{ articles_paginator.num_pages }}/">{{ articles_paginator.num_pages }}</a></li> {% endif %} </ul> </div> |