diff options
-rw-r--r-- | _config.yml | 4 | ||||
-rw-r--r-- | _includes/header.html | 13 | ||||
-rw-r--r-- | _includes/sb_sidebar.html | 8 | ||||
-rw-r--r-- | _includes/sb_sidebar_news.html | 2 | ||||
-rw-r--r-- | _includes/sb_sidebar_settings.html | 6 | ||||
-rw-r--r-- | _includes/sb_whatsnew.html | 2 | ||||
-rw-r--r-- | _layouts/default.html | 29 | ||||
-rw-r--r-- | _layouts/home.html | 3 | ||||
-rw-r--r-- | _layouts/welcome.html | 17 | ||||
-rw-r--r-- | assets/css/style.css | 18 | ||||
-rw-r--r-- | development/index.textile | 7 | ||||
-rw-r--r-- | documentation/crash/index.html | 3 | ||||
-rw-r--r-- | documentation/design/index.html | 3 | ||||
-rw-r--r-- | documentation/index.markdown | 1 | ||||
-rw-r--r-- | documentation/manual/index.html | 3 | ||||
-rw-r--r-- | documentation/perl/index.html | 3 | ||||
-rw-r--r-- | documentation/settings/index.markdown | 2 | ||||
-rw-r--r-- | documentation/signals/index.html | 3 | ||||
-rw-r--r-- | documentation/special_vars/index.html | 3 | ||||
-rw-r--r-- | documentation/startup/index.markdown | 1 | ||||
-rw-r--r-- | download/index.textile | 45 | ||||
-rw-r--r-- | gsearch/index.html | 17 |
22 files changed, 92 insertions, 101 deletions
diff --git a/_config.yml b/_config.yml index 02de85a..ed05366 100644 --- a/_config.yml +++ b/_config.yml @@ -16,6 +16,10 @@ gems: - jekyll-redirect-from - jekyll-sitemap +whitelist: + - jekyll-redirect-from + - jekyll-sitemap + paginate: 8 paginate_path: "news/:num/" diff --git a/_includes/header.html b/_includes/header.html index bfb47e6..a87fae9 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -34,10 +34,17 @@ {% endif %} {% endif %} {% endfor %} - <li><a rel="external" href="//irssi-import.github.io/themes/">Themes</a></li> - <li><a rel="external" href="http://scripts.irssi.org/">Scripts</a></li> - <li><a rel="external" href="https://github.com/irssi/irssi/issues">Bugs</a></li> + <li><a href="//irssi-import.github.io/themes/">Themes</a></li> + <li><a href="http://scripts.irssi.org/">Scripts</a></li> + <li><a href="https://github.com/irssi/irssi/issues">Bugs</a></li> + <li class="hidden-lg"><a href="{{ site.baseurl }}/gsearch/">Search</a></li> </ul> + <form class="navbar-form navbar-right gsearch-form hidden-xs hidden-sm hidden-md" role="search" action="{{ site.baseurl }}/gsearch/"> + <div class="form-group"> + <input type="text" class="form-control" placeholder="Search" name="q" required> + </div> + <button type="submit" class="btn btn-default"><i class="glyphicon glyphicon-search"></i></button> + </form> </div> </div> </nav> diff --git a/_includes/sb_sidebar.html b/_includes/sb_sidebar.html deleted file mode 100644 index 419f9a8..0000000 --- a/_includes/sb_sidebar.html +++ /dev/null @@ -1,8 +0,0 @@ -{% if page.title contains 'News' %} -{% include sb_sidebar_news.html %} -{% endif %} -{% case page.url %} -{% when "/documentation/settings/" %} -{% include sb_sidebar_settings.html %} - -{% endcase %} diff --git a/_includes/sb_sidebar_news.html b/_includes/sb_sidebar_news.html index a39ac3a..5190fa2 100644 --- a/_includes/sb_sidebar_news.html +++ b/_includes/sb_sidebar_news.html @@ -1,4 +1,4 @@ <div> - <a class="twitter-timeline" data-widget-id="600720083413962752" href="https://twitter.com/IrssiProject" data-screen-name="IrssiProject" height="400">Tweets by @IrssiProject</a> + <a class="twitter-timeline" data-widget-id="600720083413962752" href="https://twitter.com/IrssiProject" data-screen-name="IrssiProject">Tweets by @IrssiProject</a> <script type="text/javascript" src="//platform.twitter.com/widgets.js"></script> </div> diff --git a/_includes/sb_sidebar_settings.html b/_includes/sb_sidebar_settings.html index d41106f..ec37efe 100644 --- a/_includes/sb_sidebar_settings.html +++ b/_includes/sb_sidebar_settings.html @@ -1,9 +1,3 @@ -<hr /> - -<p>Here you can find all the Irssi settings that you can set with /set explained.</p> - -<p>Use the Quick Nav feature below to rapidly find the description of a setting if you're looking for a specific one.</p> - <h4>Quick Nav</h4> <p> diff --git a/_includes/sb_whatsnew.html b/_includes/sb_whatsnew.html index 6762834..0a9a497 100644 --- a/_includes/sb_whatsnew.html +++ b/_includes/sb_whatsnew.html @@ -1 +1 @@ -<p style="text-align:right"><small>October 11<sup>th</sup> 2014</small></p><p><a href="/2014/10/11/irssi-0.8.17-released">Irssi 0.8.17 has been released!</a></p> +<p><small>2014-10-11</small> <a href="/2014/10/11/irssi-0.8.17-released">Irssi 0.8.17 has been released!</a> </p> diff --git a/_layouts/default.html b/_layouts/default.html index 2620e24..1d57e03 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -7,34 +7,17 @@ <div class="page-content"> <div class="container"> + {% if page.sidebar %} <div class="col-xs-12 col-md-8"> {{ content }} </div> <div class="col-xs-12 col-md-4"> - <h2>What's this?</h2> - <p> - You are visiting the official website for the IRC - client Irssi, for more information see the about - section. - </p> - <h4 style='margin-bottom:0'>Search this site</h4> - <div><script> - (function() { - var cx = '013138746835038969445:mlfkigveyj4'; - var gcse = document.createElement('script'); - gcse.type = 'text/javascript'; - gcse.async = true; - gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') + - '//cse.google.com/cse.js?cx=' + cx; - var s = document.getElementsByTagName('script')[0]; - s.parentNode.insertBefore(gcse, s); - })(); -</script> -<gcse:searchbox-only></gcse:searchbox-only></div> - <h4>What's new?</h4> - {% include sb_whatsnew.html %} - {% include sb_sidebar.html %} + <br /> + {% include {{page.sidebar}} %} </div> + {% else %} + {{ content }} + {% endif %} </div> </div> diff --git a/_layouts/home.html b/_layouts/home.html index e135f91..b79b027 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -1,5 +1,6 @@ --- layout: default +sidebar: sb_sidebar_news.html --- <h1>News{% if paginator.page > 1 %} Archive{% endif %}</h1> @@ -9,6 +10,4 @@ layout: default {{ post.content }} {% endfor %} -{% unless paginator.page > 1 %}<a href="//github.com/irssi-import/irssi-import.github.io"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/a6677b08c955af8400f44c6298f40e7d19cc5b2d/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677261795f3664366436642e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png"></a>{% endunless %} - {% include paginate.html %} diff --git a/_layouts/welcome.html b/_layouts/welcome.html index 0e0717d..824d585 100644 --- a/_layouts/welcome.html +++ b/_layouts/welcome.html @@ -66,23 +66,8 @@ </div> <div class="row"> <div class="hidden-xs col-sm-12 col-md-3"> - <div class="row"><div class="col-md-12 col-sm-8"> <h3>What's new</h3> - {% include sb_whatsnew.html %}</div><div class="col-md-12 col-sm-4"> - <h4 style='margin-bottom:0'>Search this site</h4> - <div><script> - (function() { - var cx = '013138746835038969445:mlfkigveyj4'; - var gcse = document.createElement('script'); - gcse.type = 'text/javascript'; - gcse.async = true; - gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') + - '//cse.google.com/cse.js?cx=' + cx; - var s = document.getElementsByTagName('script')[0]; - s.parentNode.insertBefore(gcse, s); - })(); -</script> - <gcse:searchbox-only></gcse:searchbox-only></div></div></div> + {% include sb_whatsnew.html %} </div> <div class="col-sm-4 col-md-3"> <h3>Themes</h3> diff --git a/assets/css/style.css b/assets/css/style.css index 1e23575..d959fd3 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -132,8 +132,10 @@ select .header { background-color: #ffeeff; background-repeat: no-repeat; background-position: 5% 95%; - box-shadow: 20px 20px 15px black, inset 0 0 10px white; - border-radius: 5px; + background-size: cover; + border: 5px solid black; + box-shadow: 0px 0px 5px black, inset 0 0 10px white; + border-radius: 10px; background-blend-mode: darken; transition-duration: 1s; } @@ -155,3 +157,15 @@ select .header { height: 250px; } } + +blockquote { + font-size: inherit; +} + +.gsearch-form input.form-control { + width: 120px; +} + +.twitter-timeline { + height: 80vh !important; +} diff --git a/development/index.textile b/development/index.textile index 91011b2..30b56ce 100644 --- a/development/index.textile +++ b/development/index.textile @@ -2,7 +2,6 @@ layout: page title: Contributing permalink: /development/ -categories: [ _nav, _9 ] --- h3. Development sources @@ -13,8 +12,6 @@ bc. git clone https://github.com/irssi/irssi After check-out, you *must* run @./autogen.sh@. It may be necessary to install additional packages. More information can be found on "(rel-external)the wiki.":https://github.com/shabble/irssi-docs/wiki/Irssi-0.8.17#compiling-from-git -*Note*, the @INSTALL@ document is **not** valid for Git clones, only for release tarballs (even though it is also included in the Git checkout) - h2. Helping Development Hey you! Irssi is desperately looking for developers. No groundbreaking development has occured since ten years. Apart from fixing "(rel-external)bugs"://github.com/irssi/irssi/issues and reviewing "(rel-external)patches"://github/com/irssi/irssi/pulls, there are also many huge issues which noone is tackling at the moment. Some of those are: @@ -23,12 +20,14 @@ Hey you! Irssi is desperately looking for developers. No groundbreaking developm * Rewrite the core to optionally work in a distributed manner (where you can run the server connections on one server and connect to it with multiple fe-text front-ends) * Revamp the API to better integrate multiple scripting languages (like Javascript, Lua) and require less (Perl-specific) glue code * Fix and improve network Proxy support (SSL-enabled proxies, SSL connections over proxies, native SOCKS proxies in Irssi, better TOR support, per network proxies) ("#148"://github.com/irssi/irssi/pull/148) -* Extend the IRC code to work better with any IRCv3 features, finish integration of SASL ("(rel-external)#222"://github.com/irssi/irssi/pull/222) +* Extend the IRC code to work better with any IRCv3 features. * XMPP improvements * Website improvements Also review the "(rel-external)Unofficial Roadmap"://github.com/shabble/irssi-docs/wiki/Roadmap for a further source of TODOs. +If you're lucky, you might find issues in the tracker that are "(rel-external)labeled 'easy'"://github.com/irssi/irssi/labels/easy + h3. Scripts Perl scripts can be submitted to the "(rel-external)Irssi Script Repository":http://scripts.irssi.org/ by following the instructions and sending a Pull Request on Github. Next to the perl and signals "documentation":/documentation/, the "(rel-external)Unofficial Irssi Scripting Documentation Wiki"://github.com/shabble/irssi-docs/wiki may have additional helpful resources about writing scripts. diff --git a/documentation/crash/index.html b/documentation/crash/index.html new file mode 100644 index 0000000..283928d --- /dev/null +++ b/documentation/crash/index.html @@ -0,0 +1,3 @@ +--- +redirect_to: https://github.com/irssi/irssi/blob/master/docs/crash.txt +--- diff --git a/documentation/design/index.html b/documentation/design/index.html new file mode 100644 index 0000000..93689e9 --- /dev/null +++ b/documentation/design/index.html @@ -0,0 +1,3 @@ +--- +redirect_to: https://github.com/irssi/irssi/blob/master/docs/design.txt +--- diff --git a/documentation/index.markdown b/documentation/index.markdown index 8009cba..e97952e 100644 --- a/documentation/index.markdown +++ b/documentation/index.markdown @@ -14,6 +14,7 @@ categories: [ _nav ] - [Writing good bug reports](//github.com/irssi/irssi/blob/master/docs/crash.txt){:rel='external'} - [Design](//github.com/irssi/irssi/blob/master/docs/design.txt){:rel='external'} - [Manual](//github.com/irssi/irssi/blob/master/docs/manual.txt){:rel='external'}, a bit dated and unfinished +- [Contributing](/development) ### Miscellaneous - [Tips & Tricks](tips) diff --git a/documentation/manual/index.html b/documentation/manual/index.html new file mode 100644 index 0000000..de77fe9 --- /dev/null +++ b/documentation/manual/index.html @@ -0,0 +1,3 @@ +--- +redirect_to: https://github.com/irssi/irssi/blob/master/docs/manual.txt +--- diff --git a/documentation/perl/index.html b/documentation/perl/index.html new file mode 100644 index 0000000..b74a4ac --- /dev/null +++ b/documentation/perl/index.html @@ -0,0 +1,3 @@ +--- +redirect_to: https://github.com/irssi/irssi/blob/master/docs/perl.txt +--- diff --git a/documentation/settings/index.markdown b/documentation/settings/index.markdown index c0f5869..1b620ee 100644 --- a/documentation/settings/index.markdown +++ b/documentation/settings/index.markdown @@ -2,8 +2,8 @@ layout: page title: Settings Documentation permalink: documentation/settings/ +sidebar: sb_sidebar_settings.html --- -{% assign sidebar = "xxx" %} Irssi 0.8.10 settings notes. Gathered through much effort by Rocco Caputo rcaputo at cpan dot org (aka dngor). Includes original work by Nei, and advice and guidance from irc.freenode.net #irssi. This is not an attempt to document Irssi completely. It should be used along with the documents at [Documentation](/documentation) for more complete understanding of how irssi works. For example, the startup HOWTO and tips/tricks show sample uses for these settings, including some very useful stuff. diff --git a/documentation/signals/index.html b/documentation/signals/index.html new file mode 100644 index 0000000..33046fa --- /dev/null +++ b/documentation/signals/index.html @@ -0,0 +1,3 @@ +--- +redirect_to: https://github.com/irssi/irssi/blob/master/docs/signals.txt +--- diff --git a/documentation/special_vars/index.html b/documentation/special_vars/index.html new file mode 100644 index 0000000..799ef89 --- /dev/null +++ b/documentation/special_vars/index.html @@ -0,0 +1,3 @@ +--- +redirect_to: https://github.com/irssi/irssi/blob/master/docs/special_vars.txt +--- diff --git a/documentation/startup/index.markdown b/documentation/startup/index.markdown index a009a29..0fe1692 100644 --- a/documentation/startup/index.markdown +++ b/documentation/startup/index.markdown @@ -2,6 +2,7 @@ layout: page title: Startup How-To permalink: documentation/startup/ +redirect_from: /beginner/ --- ### To new Irssi users (not to new IRC users ..) diff --git a/download/index.textile b/download/index.textile index 19ec75a..2d09bbe 100644 --- a/download/index.textile +++ b/download/index.textile @@ -9,8 +9,6 @@ There are several ways you can get Irssi: # "Ready-Made Packages":#packages # "Compiling from Sources":#sources -* "Miscellaneous Links":#misc - h2(#packages). Distributions' Packages <div class="row"> @@ -18,7 +16,7 @@ h2(#packages). Distributions' Packages div{margin-bottom:1ex}. !{padding-right:1ex}/assets/Windows.png!*Windows* -p. Dowload setup.exe from "(rel-external)Cygwin":https://www.cygwin.com/ and select irssi during the package selection step. To start irssi, open MinTTY (link should be on your Desktop) and type @irssi@ +p. Download setup.exe from "(rel-external)Cygwin":https://www.cygwin.com/ and select irssi during the package selection step. To start irssi, open MinTTY (link should be on your Desktop) and type @irssi@ </div> <div class="col-md-4"> @@ -31,18 +29,20 @@ You may find more up to date version on "(rel-external)Debian Backports":http:// </div> <div class="col-md-4"> -div{margin-bottom:1ex}. !{padding-right:1ex}/assets/gentoo.png!*Gentoo* +div{margin-bottom:1ex}. !{padding-right:1ex}/assets/macosx.png!*OS X* -@emerge irssi@ +Install "(rel-external)Homebrew":http://brew.sh/, then +@brew install irssi@ +You can also install Git with @--HEAD@ </div> </div> <div class="row"> <div class="col-md-4"> -div{margin-bottom:1ex}. !{padding-right:1ex}/assets/slackware.png!*Slackware* +div{margin-bottom:1ex}. !{padding-right:1ex}/assets/gentoo.png!*Gentoo* -@slackpkg install irssi@ +@emerge irssi@ </div> <div class="col-md-4"> @@ -79,27 +79,18 @@ div{margin-bottom:1ex}. !{padding-right:1ex}/assets/opencsw.png!*Solaris* </div> <div class="col-md-4"> -div{margin-bottom:1ex}. !{padding-right:1ex}/assets/macosx.png!*Apple MacOS* +div{margin-bottom:1ex}. !{padding-right:1ex}/assets/slackware.png!*Slackware* -Install "(rel-external)Homebrew":http://brew.sh/, then -@brew install irssi@. -You can also install Git with: -@brew install --HEAD irssi@ +@slackpkg install irssi@ </div> </div> h2(#sources). Sources -h3. Sources for the latest release - Latest release version: *0.8.17* - "(rel-external)Downloads"://github.com/irssi-import/irssi/releases -They sources are pretty easy to compile once you have all the prerequisites: - -bc. ./configure && make && sudo make install - -but read the included @INSTALL@ file if you get into trouble. +See the included "(rel-external)INSTALL"://github.com/irssi/irssi/blob/master/INSTALL file for building instructions To verify the signatures: @@ -111,27 +102,15 @@ bc. gpg --verify irssi-0.8.17.tar.gz.asc (This key is different from the one used to sign binaries of versions before 0.8.10. More gpg help can be found from GPG manual) - -"(rel-external)GLIB":https://developer.gnome.org/glib/ (at least version 2.0) is required to compile Irssi - h3. Development sources -"Git":1 - You can also get the development version. To check it out, run +"(rel-external)Git":1 - You can also get the development version. To check it out, run bc. git clone https://github.com/irssi/irssi After check-out, you *must* run @./autogen.sh@. It may be necessary to install additional packages. More information can be found on "(rel-external)the wiki.":https://github.com/shabble/irssi-docs/wiki/Irssi-0.8.17#compiling-from-git -*Note*, the @INSTALL@ document is **not** valid for Git clones, only for release tarballs (even though it is also included in the Git checkout) - - -h2(#misc). Misc - -* "(rel-external)Commit Log"://github.com/irssi/irssi/commits/master -* "(rel-external)Release ChangeLog"://github.com/irssi-import/irssi/releases -* "(rel-external)Czech translation patch":http://nomi.cz/download/releases/irssi-cz/ -* "(rel-external)IrssiX":http://adlr.info/?Irssix for Mac OS X / Cocoa -* "(rel-external)MacIrssi"://github.com/MacIrssi/MacIrssi is another interface for the Mac users you may want to take a look at. +See also: "(rel-external)Commit Log"://github.com/irssi/irssi/commits/master [1]https://github.com/irssi/irssi diff --git a/gsearch/index.html b/gsearch/index.html index 69b9bc1..0357cd3 100644 --- a/gsearch/index.html +++ b/gsearch/index.html @@ -4,4 +4,19 @@ title: Search results permalink: /gsearch/ --- <div class="row"> -<gcse:searchresults-only linkTarget="_self"></gcse:searchresults-only></div> + +<script> + (function() { + var cx = '013138746835038969445:mlfkigveyj4'; + var gcse = document.createElement('script'); + gcse.type = 'text/javascript'; + gcse.async = true; + gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') + + '//cse.google.com/cse.js?cx=' + cx; + var s = document.getElementsByTagName('script')[0]; + s.parentNode.insertBefore(gcse, s); + })(); +</script> +<gcse:search linkTarget="_self"></gcse:search> + +</div> |