From 1bedc132d59d7362d15daf4ef09efd7087760c97 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Sun, 24 Feb 2019 17:24:35 +0100 Subject: Syntax highlighter by default --- _config.yml.dist | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/_config.yml.dist b/_config.yml.dist index ce5ed16..a42492f 100644 --- a/_config.yml.dist +++ b/_config.yml.dist @@ -53,6 +53,12 @@ google_cse_token: # git-wiki includes some internal themes that you can choose # check _layouts folder # +markdown: kramdown +highlighter: rouge +kramdown: + input: GFM + syntax_highlighter: rouge + defaults: - scope: -- cgit From 352cd1e503dc16ec5b2c35eb734c4c903736ac45 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Wed, 24 Apr 2019 13:27:37 +0200 Subject: Implemented docker files --- Dockerfile | 13 +++++++++++++ docker-compose.yml | 11 +++++++++++ 2 files changed, 24 insertions(+) create mode 100644 Dockerfile create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..ad7f289 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,13 @@ +FROM jekyll/jekyll:pages + +COPY Gemfile* /srv/jekyll/ + +WORKDIR /srv/jekyll + +RUN apk update && \ + apk add ruby-dev gcc make curl build-base libc-dev libffi-dev zlib-dev libxml2-dev libgcrypt-dev libxslt-dev python + +RUN bundle config build.nokogiri --use-system-libraries && \ + bundle install + +EXPOSE 4000 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..f1ddc3a --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,11 @@ +version: '3.7' +services: + git-wiki-github: + container_name: git-wiki-github + build: . + ports: + - 4000:4000 + - 35729:35729 + volumes: + - .:/srv/jekyll + command: bundle exec jekyll serve --host 0.0.0.0 --force_polling --livereload \ No newline at end of file -- cgit From f754490f2db095ce9185bdb15a4568028eeee686 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Wed, 24 Apr 2019 14:52:02 +0200 Subject: Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 0a2cae1..432c69c 100644 --- a/README.md +++ b/README.md @@ -22,3 +22,5 @@ You can fork/copy the master branch now and start your wiki in just 1 minute. Instructions and documentation: (http://drassil.github.io/git-wiki) + +Gitlab porting: (https://gitlab.com/drassil/git-wiki/) -- cgit From 35c737fc1436470b5e62f9f5cd6bb1d6878dfc6c Mon Sep 17 00:00:00 2001 From: Yehonal Date: Wed, 24 Apr 2019 14:39:50 +0200 Subject: Implemented service config and fixed action buttons --- _config.yml.dist | 2 ++ _includes/git-wiki/components/action_btn/page_actions.html | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/_config.yml.dist b/_config.yml.dist index a42492f..f031616 100644 --- a/_config.yml.dist +++ b/_config.yml.dist @@ -18,6 +18,8 @@ paginate_path: "/blog/page:num" permalink: /blog/posts/:year/:month/:day/:title:output_ext # (boolean) Enable/disable download buttons in sidebar show_downloads: true +# (string) specify git-wiki host. (github or gitlab) +service: "gitlab" # (string) Specify branch rendered by gitpages allowing wiki tool buttons to work git_branch: "master" # (string) Url of logo image, it can be full, absolute or relative. diff --git a/_includes/git-wiki/components/action_btn/page_actions.html b/_includes/git-wiki/components/action_btn/page_actions.html index 03f1d85..097dc51 100644 --- a/_includes/git-wiki/components/action_btn/page_actions.html +++ b/_includes/git-wiki/components/action_btn/page_actions.html @@ -8,14 +8,18 @@ Add new Edit + {% if site.service == "gitlab" %} + Delete + {% else %} Delete + {% endif %} History Source {% if site.blog_feature %} Add new post {% endif %} - {% if site.use_prose_io %} + {% if site.use_prose_io and site.service == "github" %}
Prose.io: Add -- cgit From 8c447f9f53c9630d525b1d1cdaf80038c875d944 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Fri, 30 Aug 2019 15:44:42 +0200 Subject: Use github service --- _config.yml.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml.dist b/_config.yml.dist index f031616..3b5f672 100644 --- a/_config.yml.dist +++ b/_config.yml.dist @@ -19,7 +19,7 @@ permalink: /blog/posts/:year/:month/:day/:title:output_ext # (boolean) Enable/disable download buttons in sidebar show_downloads: true # (string) specify git-wiki host. (github or gitlab) -service: "gitlab" +service: "github" # (string) Specify branch rendered by gitpages allowing wiki tool buttons to work git_branch: "master" # (string) Url of logo image, it can be full, absolute or relative. -- cgit From d6389dfe1fe101a465054793ddd973ddf6b50092 Mon Sep 17 00:00:00 2001 From: nekketsuuu Date: Sat, 4 Jan 2020 13:54:56 +0900 Subject: don't output logo if logo_url is not set --- _includes/git-wiki/sections/header/header.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_includes/git-wiki/sections/header/header.html b/_includes/git-wiki/sections/header/header.html index 8612103..8c7f5bb 100644 --- a/_includes/git-wiki/sections/header/header.html +++ b/_includes/git-wiki/sections/header/header.html @@ -1,7 +1,9 @@
+ {% if site.logo_url %} + {% endif %} {{ site.title }}
-- cgit From 7b1cdbe4b08c1621364805d26b26194f3a1d3c92 Mon Sep 17 00:00:00 2001 From: Vincenzo Tilotta Date: Mon, 6 Jan 2020 08:51:37 +0100 Subject: Added "Material Design Lite" theme (#65) * Added "Material Design Lite" theme * material theme: fix footer --- _layouts/git-wiki-material.html | 163 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) create mode 100644 _layouts/git-wiki-material.html diff --git a/_layouts/git-wiki-material.html b/_layouts/git-wiki-material.html new file mode 100644 index 0000000..e3e5cd6 --- /dev/null +++ b/_layouts/git-wiki-material.html @@ -0,0 +1,163 @@ +{% comment %} +# +# This layout uses Material Design Lite +# ------------------------------------- +# tAiLot - tailot@gmail.com +# ------------------------------------- +# +{% endcomment %} +{% include git-wiki/defines/defines.html %} + + + + + {% if site.inc_before_head %} + {% include {{ site.inc_before_head }} %} + {% endif %} + + {% include git-wiki/sections/head/meta.html %} + + + + + + + {% if site.inc_after_head %} + {% include {{ site.inc_after_head }} %} + {% endif %} + + + + +
+
+
+ + +
+
+
+ + {% if site.logo_url %} + logo + {% endif %} +

{{ site.description | default: site.github.project_tagline }}

+ {% if site.show_wiki_pages %} + {% include git-wiki/components/lists/page-list.html %} + {% endif %} + + {% if site.blog_feature and site.show_wiki_posts %} + {% include git-wiki/components/lists/post-list.html %} + {% endif %} + + {% if site.show_downloads %} + + + + {% endif %} + + {% if site.inc_after_header %} + {% include {{ site.inc_after_header }} %} + {% endif %} +
+
+
+
+
+
{{content}}
+
+
+
+ {% include git-wiki/sections/footer/footer.html %} +
+
+ +
+ + \ No newline at end of file -- cgit From f98b158f36f7b6323bca657d539ed60cfd723a8d Mon Sep 17 00:00:00 2001 From: Takuma Ishikawa Date: Mon, 6 Jan 2020 17:39:55 +0900 Subject: Escape several strings, especially title (#71) Co-authored-by: Yehonal --- 404.md | 2 +- .../git-wiki/components/action_btn/page_actions.html | 20 ++++++++++---------- _includes/git-wiki/components/lists/page-list.html | 2 +- _includes/git-wiki/components/lists/post-list.html | 2 +- _includes/git-wiki/components/logo/logo.html | 2 +- _includes/git-wiki/sections/header/header.html | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/404.md b/404.md index be7e403..1c6c557 100644 --- a/404.md +++ b/404.md @@ -10,6 +10,6 @@ is_wiki_page: false if (!filename.endsWith(".md")) filename+=".md"; - var url = '{{ site.github.repository_url }}/new/{{site.git_branch}}?filename={{ site.wiki_folder | default: 'wiki' }}/'+filename; + var url = '{{ site.github.repository_url }}/new/{{site.git_branch | escape}}?filename={{ site.wiki_folder | default: 'wiki' }}/'+filename; window.location=url; diff --git a/_includes/git-wiki/components/action_btn/page_actions.html b/_includes/git-wiki/components/action_btn/page_actions.html index 097dc51..b9151b4 100644 --- a/_includes/git-wiki/components/action_btn/page_actions.html +++ b/_includes/git-wiki/components/action_btn/page_actions.html @@ -5,28 +5,28 @@ History Source {% else %} - Add + Add new - Edit + Edit {% if site.service == "gitlab" %} - Delete + Delete {% else %} - Delete + Delete {% endif %} - History - Source + History + Source {% if site.blog_feature %} - Add + Add new post {% endif %} {% if site.use_prose_io and site.service == "github" %}
Prose.io: - Add + Add new - Edit + Edit {% if site.blog_feature %} - Add + Add new post {% endif %} {% endif %} diff --git a/_includes/git-wiki/components/lists/page-list.html b/_includes/git-wiki/components/lists/page-list.html index dea6758..8129bf0 100644 --- a/_includes/git-wiki/components/lists/page-list.html +++ b/_includes/git-wiki/components/lists/page-list.html @@ -15,7 +15,7 @@ {% if page.is_wiki_page != false and page.sitemap != false %}
  • {% assign title = page.title | default: page.name %} - {{title}} + {{title | escape}}
    • {% assign numPages = numPages | plus: 1 %} {% endif %} diff --git a/_includes/git-wiki/components/lists/post-list.html b/_includes/git-wiki/components/lists/post-list.html index d6fa663..579dab5 100644 --- a/_includes/git-wiki/components/lists/post-list.html +++ b/_includes/git-wiki/components/lists/post-list.html @@ -15,7 +15,7 @@ {% if post.layout != "null" and post.sitemap != false and post.title %}
  • - {{ post.title}} + {{ post.title | escape }}
    • {% assign numPages = numPages | plus: 1 %} {% endif %} diff --git a/_includes/git-wiki/components/logo/logo.html b/_includes/git-wiki/components/logo/logo.html index d33305e..375b06b 100644 --- a/_includes/git-wiki/components/logo/logo.html +++ b/_includes/git-wiki/components/logo/logo.html @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/_includes/git-wiki/sections/header/header.html b/_includes/git-wiki/sections/header/header.html index 8c7f5bb..262bed9 100644 --- a/_includes/git-wiki/sections/header/header.html +++ b/_includes/git-wiki/sections/header/header.html @@ -3,8 +3,8 @@ {% if site.logo_url %} + {{ site.title | escape }} {% endif %} - {{ site.title }}
    -- cgit From bc6f9f6875806a986f37e1e9a7a383d6f787e4d4 Mon Sep 17 00:00:00 2001 From: Takuma Ishikawa Date: Mon, 6 Jan 2020 17:40:10 +0900 Subject: format bug_report.md (#75) --- .github/ISSUE_TEMPLATE/bug_report.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index dd84ea7..f1912d4 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -10,7 +10,7 @@ assignees: '' **Describe the bug** A clear and concise description of what the bug is. -**To Reproduce** +**To reproduce** Steps to reproduce the behavior: 1. Go to '...' 2. Click on '....' @@ -24,15 +24,15 @@ A clear and concise description of what you expected to happen. If applicable, add screenshots to help explain your problem. **Desktop (please complete the following information):** - - OS: [e.g. iOS] - - Browser [e.g. chrome, safari] - - Version [e.g. 22] + - OS: [e.g. Windows 10] + - Browser: [e.g. chrome, safari] + - Version: [e.g. 22] **Smartphone (please complete the following information):** - Device: [e.g. iPhone6] - OS: [e.g. iOS8.1] - - Browser [e.g. stock browser, safari] - - Version [e.g. 22] + - Browser: [e.g. stock browser, safari] + - Version: [e.g. 22] **Additional context** Add any other context about the problem here. -- cgit From 28c72513f12c7361a75e76b3cb0672fada494b19 Mon Sep 17 00:00:00 2001 From: Takuma Ishikawa Date: Mon, 6 Jan 2020 19:32:27 +0900 Subject: rename *.dist files (#79) --- _config.yml | 134 +++++++++++++++++++++++++++++++++++++++++++++++++ _config.yml.dist | 134 ------------------------------------------------- wiki/main_page.md | 12 +++++ wiki/main_page.md.dist | 12 ----- 4 files changed, 146 insertions(+), 146 deletions(-) create mode 100644 _config.yml delete mode 100644 _config.yml.dist create mode 100644 wiki/main_page.md delete mode 100644 wiki/main_page.md.dist diff --git a/_config.yml b/_config.yml new file mode 100644 index 0000000..3b5f672 --- /dev/null +++ b/_config.yml @@ -0,0 +1,134 @@ +# (string) Title of your wiki +title: +# (string) Description of your wiki +description: +# (boolean) Enable/disable wiki page list in sidebar +show_wiki_pages: true +# (integer) Maximum number of wiki page to shown in sidebar +show_wiki_pages_limit: 10 +# (boolean) Enable/disable blog feature +blog_feature: true +# (boolean) Enable/disable wiki posts list in sidebar (needs blog_feature enabled) +show_wiki_posts: true +# (integer) Maximum number of wiki posts to shown in sidebar +show_wiki_posts_limit: 10 +# from jekyll (read jekyll doc) +paginate: 5 +paginate_path: "/blog/page:num" +permalink: /blog/posts/:year/:month/:day/:title:output_ext +# (boolean) Enable/disable download buttons in sidebar +show_downloads: true +# (string) specify git-wiki host. (github or gitlab) +service: "github" +# (string) Specify branch rendered by gitpages allowing wiki tool buttons to work +git_branch: "master" +# (string) Url of logo image, it can be full, absolute or relative. +logo_url: +# (string) The UA-XXXXX-Y code from google analytic to enable GA on your wiki +google_analytics: +# (string) folder where wiki pages are stored, it's needed for tool buttons +wiki_folder: wiki +# (boolean) if you're using github wiki as submodule then this config +# must be enabled to allow tool buttons to work properly +use_github_wiki: false +# (boolean) Enable "Edit with Prose.io" button in tools, it's a 3rd party +# service to edit github markdown pages easily +use_prose_io: true +# Select search_engine component from: +# - js: it uses a built in javascript component that uses generated js object +# - js_rss: it uses a built in javascript component that uses generated sitemap_full.xml to search inside your wiki with lunr library (slow and experimental) +# - github : it uses internal github repository search +# - google : it uses cse search bar, you need to configure google_cse_token +# +search_engine : "js" +# Setting google custom search engine for google +# cse search bar (https://cse.google.it/cse/) +google_cse_token: + +# +# Jekyll configurations +# + +# You can customize it changing default layout for all pages +# More info: https://jekyllrb.com/docs/configuration/ +# +# git-wiki includes some internal themes that you can choose +# check _layouts folder +# +markdown: kramdown +highlighter: rouge +kramdown: + input: GFM + syntax_highlighter: rouge + +defaults: + - + scope: + path: "wiki" + values: + permalink: /:basename + - + scope: + path: "" # an empty string here means all files in the project + values: + layout: "git-wiki-default" + - + scope: + path: "" + type: "pages" + values: + layout: "git-wiki-default" + - + scope: + path: "" + type: "posts" + values: + layout: "git-wiki-post" + - + scope: + path: blog + values: + layout: "git-wiki-blog" +sass: + style: compressed +plugins: + - jekyll-feed + - jekyll-redirect-from + - jekyll-seo-tag + - jekyll-sitemap + - jekyll-avatar + - jemoji + - jekyll-mentions + + +# +# INCLUDING HOOKS +# They are optional, change them only if you need +# Check wiki documentation to learn how they work +# + +inc_before_toc : +inc_after_toc : +inc_before_content : +inc_after_content : +inc_before_footer : +inc_after_footer : +inc_before_head : +inc_after_head : +inc_before_meta : +inc_after_meta : +inc_before_scripts : +inc_after_scripts : +inc_before_styles : +inc_after_styles : +inc_before_header : +inc_after_header : +inc_before_tail : +inc_after_tail : +inc_before_tools : +inc_after_tools : + +inc_before_page_list : +inc_after_page_list : +inc_before_post_list : +inc_after_post_list : diff --git a/_config.yml.dist b/_config.yml.dist deleted file mode 100644 index 3b5f672..0000000 --- a/_config.yml.dist +++ /dev/null @@ -1,134 +0,0 @@ -# (string) Title of your wiki -title: -# (string) Description of your wiki -description: -# (boolean) Enable/disable wiki page list in sidebar -show_wiki_pages: true -# (integer) Maximum number of wiki page to shown in sidebar -show_wiki_pages_limit: 10 -# (boolean) Enable/disable blog feature -blog_feature: true -# (boolean) Enable/disable wiki posts list in sidebar (needs blog_feature enabled) -show_wiki_posts: true -# (integer) Maximum number of wiki posts to shown in sidebar -show_wiki_posts_limit: 10 -# from jekyll (read jekyll doc) -paginate: 5 -paginate_path: "/blog/page:num" -permalink: /blog/posts/:year/:month/:day/:title:output_ext -# (boolean) Enable/disable download buttons in sidebar -show_downloads: true -# (string) specify git-wiki host. (github or gitlab) -service: "github" -# (string) Specify branch rendered by gitpages allowing wiki tool buttons to work -git_branch: "master" -# (string) Url of logo image, it can be full, absolute or relative. -logo_url: -# (string) The UA-XXXXX-Y code from google analytic to enable GA on your wiki -google_analytics: -# (string) folder where wiki pages are stored, it's needed for tool buttons -wiki_folder: wiki -# (boolean) if you're using github wiki as submodule then this config -# must be enabled to allow tool buttons to work properly -use_github_wiki: false -# (boolean) Enable "Edit with Prose.io" button in tools, it's a 3rd party -# service to edit github markdown pages easily -use_prose_io: true -# Select search_engine component from: -# - js: it uses a built in javascript component that uses generated js object -# - js_rss: it uses a built in javascript component that uses generated sitemap_full.xml to search inside your wiki with lunr library (slow and experimental) -# - github : it uses internal github repository search -# - google : it uses cse search bar, you need to configure google_cse_token -# -search_engine : "js" -# Setting google custom search engine for google -# cse search bar (https://cse.google.it/cse/) -google_cse_token: - -# -# Jekyll configurations -# - -# You can customize it changing default layout for all pages -# More info: https://jekyllrb.com/docs/configuration/ -# -# git-wiki includes some internal themes that you can choose -# check _layouts folder -# -markdown: kramdown -highlighter: rouge -kramdown: - input: GFM - syntax_highlighter: rouge - -defaults: - - - scope: - path: "wiki" - values: - permalink: /:basename - - - scope: - path: "" # an empty string here means all files in the project - values: - layout: "git-wiki-default" - - - scope: - path: "" - type: "pages" - values: - layout: "git-wiki-default" - - - scope: - path: "" - type: "posts" - values: - layout: "git-wiki-post" - - - scope: - path: blog - values: - layout: "git-wiki-blog" -sass: - style: compressed -plugins: - - jekyll-feed - - jekyll-redirect-from - - jekyll-seo-tag - - jekyll-sitemap - - jekyll-avatar - - jemoji - - jekyll-mentions - - -# -# INCLUDING HOOKS -# They are optional, change them only if you need -# Check wiki documentation to learn how they work -# - -inc_before_toc : -inc_after_toc : -inc_before_content : -inc_after_content : -inc_before_footer : -inc_after_footer : -inc_before_head : -inc_after_head : -inc_before_meta : -inc_after_meta : -inc_before_scripts : -inc_after_scripts : -inc_before_styles : -inc_after_styles : -inc_before_header : -inc_after_header : -inc_before_tail : -inc_after_tail : -inc_before_tools : -inc_after_tools : - -inc_before_page_list : -inc_after_page_list : -inc_before_post_list : -inc_after_post_list : diff --git a/wiki/main_page.md b/wiki/main_page.md new file mode 100644 index 0000000..79900de --- /dev/null +++ b/wiki/main_page.md @@ -0,0 +1,12 @@ +--- +redirect_from: "/" +--- + + +1) rename it in main_page.md + +2) Edit this page with your content + + +NOTE: +- do not delete "redirect_from" rule from the front matter of this file diff --git a/wiki/main_page.md.dist b/wiki/main_page.md.dist deleted file mode 100644 index 79900de..0000000 --- a/wiki/main_page.md.dist +++ /dev/null @@ -1,12 +0,0 @@ ---- -redirect_from: "/" ---- - - -1) rename it in main_page.md - -2) Edit this page with your content - - -NOTE: -- do not delete "redirect_from" rule from the front matter of this file -- cgit From 1a4b5f8418b673a0bced8ffb47fbaa4e023cb339 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Mon, 6 Jan 2020 11:34:02 +0100 Subject: theme config --- _config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/_config.yml b/_config.yml index 3b5f672..3329f3d 100644 --- a/_config.yml +++ b/_config.yml @@ -1,5 +1,6 @@ # (string) Title of your wiki title: +theme: jekyll-theme-git-wiki # (string) Description of your wiki description: # (boolean) Enable/disable wiki page list in sidebar -- cgit From 3a2296bf3993d772579b3f040422c2f4005157c5 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Mon, 6 Jan 2020 13:22:22 +0100 Subject: Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 432c69c..26d9415 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ It means: * Some **nice internal themes** to change your entire wiki UI with 1 simple configuration (see customization section below) * Integrated **Blogging** feature thanks to jekyll! -You can fork/copy the master branch now and start your wiki in just 1 minute. +You can use it with jekyll ["remote_theme"](https://github.com/benbalter/jekyll-remote-theme) feature or fork/copy the master branch now and start your wiki in just 1 minute. Instructions and documentation: (http://drassil.github.io/git-wiki) -- cgit From f685d1ac9060cad742685797932d58dfb112af1d Mon Sep 17 00:00:00 2001 From: Yehonal Date: Mon, 6 Jan 2020 13:26:37 +0100 Subject: Delete git-wiki-material.html Not working properly --- _layouts/git-wiki-material.html | 163 ---------------------------------------- 1 file changed, 163 deletions(-) delete mode 100644 _layouts/git-wiki-material.html diff --git a/_layouts/git-wiki-material.html b/_layouts/git-wiki-material.html deleted file mode 100644 index e3e5cd6..0000000 --- a/_layouts/git-wiki-material.html +++ /dev/null @@ -1,163 +0,0 @@ -{% comment %} -# -# This layout uses Material Design Lite -# ------------------------------------- -# tAiLot - tailot@gmail.com -# ------------------------------------- -# -{% endcomment %} -{% include git-wiki/defines/defines.html %} - - - - - {% if site.inc_before_head %} - {% include {{ site.inc_before_head }} %} - {% endif %} - - {% include git-wiki/sections/head/meta.html %} - - - - - - - {% if site.inc_after_head %} - {% include {{ site.inc_after_head }} %} - {% endif %} - - - - -
    -
    -
    - - -
    -
    -
    - - {% if site.logo_url %} - logo - {% endif %} -

    {{ site.description | default: site.github.project_tagline }}

    - {% if site.show_wiki_pages %} - {% include git-wiki/components/lists/page-list.html %} - {% endif %} - - {% if site.blog_feature and site.show_wiki_posts %} - {% include git-wiki/components/lists/post-list.html %} - {% endif %} - - {% if site.show_downloads %} - - - - {% endif %} - - {% if site.inc_after_header %} - {% include {{ site.inc_after_header }} %} - {% endif %} -
    -
    -
    -
    -
    -
    {{content}}
    -
    -
    -
    - {% include git-wiki/sections/footer/footer.html %} -
    -
    - -
    - - \ No newline at end of file -- cgit From 89fbb2f4a2ab7d8a51d665ea399e1b242528b30f Mon Sep 17 00:00:00 2001 From: Yehonal Date: Mon, 6 Jan 2020 14:01:22 +0100 Subject: Fixed wrong behaviour with title --- _includes/git-wiki/sections/header/header.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/git-wiki/sections/header/header.html b/_includes/git-wiki/sections/header/header.html index 262bed9..ea83b2c 100644 --- a/_includes/git-wiki/sections/header/header.html +++ b/_includes/git-wiki/sections/header/header.html @@ -3,8 +3,8 @@ {% if site.logo_url %} - {{ site.title | escape }} {% endif %} + {{ site.title | escape }}
    @@ -52,4 +52,4 @@ $(sidebar).attr('style', 'display: block;'); } } - \ No newline at end of file + -- cgit From 709b7cac2d096b476a54c83f38ba85634fec7dc4 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 16:51:07 +0100 Subject: test default value assignment --- _includes/git-wiki/defines/defines.html | 1 + 1 file changed, 1 insertion(+) diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index 0b47b7d..8ed7e0e 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,3 +1,4 @@ +{% capture site.git_branch %}{{site.git_branch | default: master}}{% endcapture %} {% assign version = "2.3.1" %} {% capture lchar %}{{page.url | slice: -1, 1}}{% endcapture %} {% capture url %} -- cgit From 75f27cf9b2a242203742b0d282020e78d1251309 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:00:04 +0100 Subject: another test --- _includes/git-wiki/defines/defines.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index 8ed7e0e..bc144f7 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,4 +1,4 @@ -{% capture site.git_branch %}{{site.git_branch | default: master}}{% endcapture %} +{% assign assign site.git_branch = site.git_branch | default: master %} {% assign version = "2.3.1" %} {% capture lchar %}{{page.url | slice: -1, 1}}{% endcapture %} {% capture url %} -- cgit From 585108c40ef255eb74b7ef02feb796e53e493015 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:03:55 +0100 Subject: debug --- _includes/git-wiki/defines/defines.html | 1 + 1 file changed, 1 insertion(+) diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index bc144f7..0715541 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,4 +1,5 @@ {% assign assign site.git_branch = site.git_branch | default: master %} +{{ site.git_branch }} {% assign version = "2.3.1" %} {% capture lchar %}{{page.url | slice: -1, 1}}{% endcapture %} {% capture url %} -- cgit From 8217361a5ce2499a0948e2f971f56d786dbe1a5f Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:13:03 +0100 Subject: try 3 --- _includes/git-wiki/defines/defines.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index 0715541..3ba0cdc 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,5 +1,7 @@ -{% assign assign site.git_branch = site.git_branch | default: master %} -{{ site.git_branch }} +{% assign site.git_branch = site.git_branch | default: master %} +branch: {{ site.git_branch | default: master }} +{% capture site.git_branch %}{{ site.git_branch | default: master }}{% endcapture %} +branch: {{ site.git_branch }} {% assign version = "2.3.1" %} {% capture lchar %}{{page.url | slice: -1, 1}}{% endcapture %} {% capture url %} -- cgit From 11d833832bd77d32188154a3aceacf6b95683d57 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:20:32 +0100 Subject: try 4 --- _includes/git-wiki/defines/defines.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index 3ba0cdc..3dcfee3 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,6 +1,6 @@ -{% assign site.git_branch = site.git_branch | default: master %} +{% assign site.git_branch = {{site.git_branch}} | default: master %} branch: {{ site.git_branch | default: master }} -{% capture site.git_branch %}{{ site.git_branch | default: master }}{% endcapture %} +{% capture site.git_branch %}{{site.git_branch | default: master}}{% endcapture %} branch: {{ site.git_branch }} {% assign version = "2.3.1" %} {% capture lchar %}{{page.url | slice: -1, 1}}{% endcapture %} -- cgit From 7eb1c4721ba117ba234d009cd8fb7fb1d88d2d34 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:22:46 +0100 Subject: try 5 --- _includes/git-wiki/defines/defines.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index 3dcfee3..fe3f34d 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,7 +1,7 @@ {% assign site.git_branch = {{site.git_branch}} | default: master %} -branch: {{ site.git_branch | default: master }} +branch: {{site.git_branch | default: master}} {% capture site.git_branch %}{{site.git_branch | default: master}}{% endcapture %} -branch: {{ site.git_branch }} +branch: {{site.git_branch}} {% assign version = "2.3.1" %} {% capture lchar %}{{page.url | slice: -1, 1}}{% endcapture %} {% capture url %} -- cgit From 74adfd258744f9f83bab74dc71d9af28d9cc43bc Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:25:15 +0100 Subject: try 6 --- _includes/git-wiki/defines/defines.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index fe3f34d..cf0a9b2 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,4 +1,5 @@ -{% assign site.git_branch = {{site.git_branch}} | default: master %} +branch: {{site.git_branch | default: master}} +{% assign site.git_branch = {{site.git_branch | default: master}} %} branch: {{site.git_branch | default: master}} {% capture site.git_branch %}{{site.git_branch | default: master}}{% endcapture %} branch: {{site.git_branch}} -- cgit From d27a494e02d886e469afdf7d78ca17f5e13db6d4 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:27:56 +0100 Subject: try 8 --- _includes/git-wiki/defines/defines.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index cf0a9b2..80a6185 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,4 +1,4 @@ -branch: {{site.git_branch | default: master}} +branch: {{ site.git_branch | default: master }} {% assign site.git_branch = {{site.git_branch | default: master}} %} branch: {{site.git_branch | default: master}} {% capture site.git_branch %}{{site.git_branch | default: master}}{% endcapture %} -- cgit From f5a13132c82f93d89c94fc99507e75a537fc3772 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:29:02 +0100 Subject: try 9 --- _includes/git-wiki/defines/defines.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index 80a6185..44d0114 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,4 +1,4 @@ -branch: {{ site.git_branch | default: master }} +branch: {{ git_branch | default: master }} {% assign site.git_branch = {{site.git_branch | default: master}} %} branch: {{site.git_branch | default: master}} {% capture site.git_branch %}{{site.git_branch | default: master}}{% endcapture %} -- cgit From cf74f41e89b01225c4cda44a44bce46db8f2e17d Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:35:01 +0100 Subject: try 10 --- _includes/git-wiki/defines/defines.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index 44d0114..2839252 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,4 +1,4 @@ -branch: {{ git_branch | default: master }} +branch: {{ testempty | default: "master" }} {% assign site.git_branch = {{site.git_branch | default: master}} %} branch: {{site.git_branch | default: master}} {% capture site.git_branch %}{{site.git_branch | default: master}}{% endcapture %} -- cgit From 93558f1e51f255689a40e1cddef5c0874104789b Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:40:31 +0100 Subject: try 11 --- _includes/git-wiki/defines/defines.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index 2839252..833c205 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,7 +1,4 @@ -branch: {{ testempty | default: "master" }} -{% assign site.git_branch = {{site.git_branch | default: master}} %} -branch: {{site.git_branch | default: master}} -{% capture site.git_branch %}{{site.git_branch | default: master}}{% endcapture %} +{% unless site.git_branch %}{% assign site.git_branch = "master" %}{% endif %} branch: {{site.git_branch}} {% assign version = "2.3.1" %} {% capture lchar %}{{page.url | slice: -1, 1}}{% endcapture %} -- cgit From cbb7afe77cc41d445485ba059821fdedac031b1d Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:43:53 +0100 Subject: fix --- _includes/git-wiki/defines/defines.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index 833c205..8707dcc 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,4 +1,4 @@ -{% unless site.git_branch %}{% assign site.git_branch = "master" %}{% endif %} +{% unless site.git_branch %}{% assign site.git_branch = "master" %}{% endunless %} branch: {{site.git_branch}} {% assign version = "2.3.1" %} {% capture lchar %}{{page.url | slice: -1, 1}}{% endcapture %} -- cgit From 2f28ef820291a0a53147c7354f2d8480f8c2a047 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:56:43 +0100 Subject: restored --- _config.yml | 1 - _includes/git-wiki/defines/defines.html | 2 -- 2 files changed, 3 deletions(-) diff --git a/_config.yml b/_config.yml index 3329f3d..3b5f672 100644 --- a/_config.yml +++ b/_config.yml @@ -1,6 +1,5 @@ # (string) Title of your wiki title: -theme: jekyll-theme-git-wiki # (string) Description of your wiki description: # (boolean) Enable/disable wiki page list in sidebar diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index 8707dcc..0b47b7d 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,5 +1,3 @@ -{% unless site.git_branch %}{% assign site.git_branch = "master" %}{% endunless %} -branch: {{site.git_branch}} {% assign version = "2.3.1" %} {% capture lchar %}{{page.url | slice: -1, 1}}{% endcapture %} {% capture url %} -- cgit From f787baf3be7257bd93cfd44a813b7f2d803cafb5 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Mon, 6 Jan 2020 19:02:51 +0100 Subject: Show title if no logo set in desktop mode --- _includes/git-wiki/sections/header/header.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_includes/git-wiki/sections/header/header.html b/_includes/git-wiki/sections/header/header.html index ea83b2c..cd2f322 100644 --- a/_includes/git-wiki/sections/header/header.html +++ b/_includes/git-wiki/sections/header/header.html @@ -17,6 +17,8 @@
    {% if site.logo_url %} {% include git-wiki/components/logo/logo.html %} + {% else %} + {{ site.title | escape }} {% endif %}
    -- cgit From 9d22819dbae5fd44f3bd4adb3eb38454200f6c7f Mon Sep 17 00:00:00 2001 From: Yehonal Date: Mon, 6 Jan 2020 19:09:46 +0100 Subject:

    for title --- _includes/git-wiki/sections/header/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/git-wiki/sections/header/header.html b/_includes/git-wiki/sections/header/header.html index cd2f322..38ec85b 100644 --- a/_includes/git-wiki/sections/header/header.html +++ b/_includes/git-wiki/sections/header/header.html @@ -18,7 +18,7 @@ {% if site.logo_url %} {% include git-wiki/components/logo/logo.html %} {% else %} - {{ site.title | escape }} +

    {{ site.title | escape }}

    {% endif %} -- cgit From 1d321d361b68ab833f17187b520b3be23382dccc Mon Sep 17 00:00:00 2001 From: Yehonal Date: Mon, 6 Jan 2020 20:28:58 +0100 Subject: Update main_page.md --- wiki/main_page.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/wiki/main_page.md b/wiki/main_page.md index 79900de..137e7c8 100644 --- a/wiki/main_page.md +++ b/wiki/main_page.md @@ -3,10 +3,4 @@ redirect_from: "/" --- -1) rename it in main_page.md - -2) Edit this page with your content - - -NOTE: -- do not delete "redirect_from" rule from the front matter of this file +For documentation and demo of git-wiki-theme visit this link: http://drassil.github.io/git-wiki/ -- cgit From 5c9f8b5c6d2cba73032777e96a6acd7e744ae2fd Mon Sep 17 00:00:00 2001 From: Yehonal Date: Mon, 6 Jan 2020 20:30:52 +0100 Subject: Update main_page.md --- wiki/main_page.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/main_page.md b/wiki/main_page.md index 137e7c8..3fdf34c 100644 --- a/wiki/main_page.md +++ b/wiki/main_page.md @@ -3,4 +3,4 @@ redirect_from: "/" --- -For documentation and demo of git-wiki-theme visit this link: http://drassil.github.io/git-wiki/ +For documentation and demo of git-wiki-theme visit this [link](http://drassil.github.io/git-wiki/) -- cgit From 961a73ba94bac1b23af77110aef279aa5f7761ff Mon Sep 17 00:00:00 2001 From: Yehonal Date: Mon, 6 Jan 2020 21:01:40 +0100 Subject: Update main_page.md --- wiki/main_page.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wiki/main_page.md b/wiki/main_page.md index 3fdf34c..78ac1c8 100644 --- a/wiki/main_page.md +++ b/wiki/main_page.md @@ -2,5 +2,6 @@ redirect_from: "/" --- +This is a sample of main page. You can edit it to start your wiki. -For documentation and demo of git-wiki-theme visit this [link](http://drassil.github.io/git-wiki/) +For documentation, installation guide and demo of git-wiki-theme visit this [link](http://drassil.github.io/git-wiki/) -- cgit From 36d85ddc0105c55cf8008893f5c7085167d47ab5 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Tue, 7 Jan 2020 08:09:04 +0100 Subject: Create general.md --- .github/ISSUE_TEMPLATE/general.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/general.md diff --git a/.github/ISSUE_TEMPLATE/general.md b/.github/ISSUE_TEMPLATE/general.md new file mode 100644 index 0000000..501a94c --- /dev/null +++ b/.github/ISSUE_TEMPLATE/general.md @@ -0,0 +1,8 @@ +--- +name: General +about: Everything related with Git-Wiki that doesn't fit in other categories +title: "[GENERAL]" +labels: general +assignees: '' + +--- -- cgit From fcaad425c74946f022409c7da2c88c9592fd9c28 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Tue, 7 Jan 2020 08:10:18 +0100 Subject: Create config.yml --- .github/ISSUE_TEMPLATE/config.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/config.yml diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000..736b9d9 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: Git Wiki Documentation + url: http://www.drassil.org/git-wiki/ + about: All information in our official wiki -- cgit From 7341eb7c340d8291b86268281db274e52cc3cf1b Mon Sep 17 00:00:00 2001 From: Yehonal Date: Tue, 7 Jan 2020 08:19:13 +0100 Subject: move searchdata under assets/js --- _includes/git-wiki/components/search/se_js.html | 2 +- assets/js/searchdata.js | 44 +++++++++++++++++++++++++ searchdata.js | 44 ------------------------- 3 files changed, 45 insertions(+), 45 deletions(-) create mode 100644 assets/js/searchdata.js delete mode 100644 searchdata.js diff --git a/_includes/git-wiki/components/search/se_js.html b/_includes/git-wiki/components/search/se_js.html index 85e168c..87396be 100644 --- a/_includes/git-wiki/components/search/se_js.html +++ b/_includes/git-wiki/components/search/se_js.html @@ -4,4 +4,4 @@ - + diff --git a/assets/js/searchdata.js b/assets/js/searchdata.js new file mode 100644 index 0000000..7c46fed --- /dev/null +++ b/assets/js/searchdata.js @@ -0,0 +1,44 @@ +--- +layout: null +is_wiki_page: false +--- +{% if site.search_engine == "js" %} +var jsondata=[ + {% for post in site.posts %} + { + "title" : "{{ post.title | escape }}", + "category" : "{{ post.category }}", + "tags" : "{{ post.tags | join: ', ' }}", + "url" : "{{ site.baseurl }}{{ post.url }}", + "date" : "{{ post.date }}", + "content" : "{{ post.content | strip_html | strip_newlines | remove: '"' }}" + } {% unless forloop.last %},{% endunless %} + {% endfor %} + , + {% for page in site.html_pages %} + { + {% assign title = page.title | default: page.name %} + {% if title != nil %} + "title" : "{{ title | escape }}", + "category" : "{{ page.category }}", + "tags" : "{{ page.tags | join: ', ' }}", + "url" : "{{ site.baseurl }}{{ page.url }}", + "date" : "{{ page.date }}", + "content" : "{{ page.content | strip_html | strip_newlines | remove: '"' }}" + {% endif %} + } {% unless forloop.last %},{% endunless %} + {% endfor %} +]; + +var sjs = SimpleJekyllSearch({ + searchInput: document.getElementById('search-input'), + resultsContainer: document.getElementById('results-container'), + json: jsondata, + searchResultTemplate: '
  • {title}
    • ', + noResultsText: 'No results found', + limit: 10, + fuzzy: false, + exclude: [] + }) +{% endif %} + diff --git a/searchdata.js b/searchdata.js deleted file mode 100644 index 7c46fed..0000000 --- a/searchdata.js +++ /dev/null @@ -1,44 +0,0 @@ ---- -layout: null -is_wiki_page: false ---- -{% if site.search_engine == "js" %} -var jsondata=[ - {% for post in site.posts %} - { - "title" : "{{ post.title | escape }}", - "category" : "{{ post.category }}", - "tags" : "{{ post.tags | join: ', ' }}", - "url" : "{{ site.baseurl }}{{ post.url }}", - "date" : "{{ post.date }}", - "content" : "{{ post.content | strip_html | strip_newlines | remove: '"' }}" - } {% unless forloop.last %},{% endunless %} - {% endfor %} - , - {% for page in site.html_pages %} - { - {% assign title = page.title | default: page.name %} - {% if title != nil %} - "title" : "{{ title | escape }}", - "category" : "{{ page.category }}", - "tags" : "{{ page.tags | join: ', ' }}", - "url" : "{{ site.baseurl }}{{ page.url