diff --git a/templates/base.html b/templates/base.html index ff93441..3efe698 100644 --- a/templates/base.html +++ b/templates/base.html @@ -2,29 +2,32 @@ + {% block title %}rgit{% endblock %} - {% block head %}{% endblock %} - + {%- block head -%}{%- endblock %}

🏡 {% block header %}Git repository browser{% endblock %}

+ 🏡 + {% block header -%}Git repository browser{%- endblock %} +

-{% block nav %} +{%- block nav -%} -{% endblock %} +{%- endblock -%}

- {% block content %}{% endblock %} + {%- block content %}{% endblock -%}

- \ No newline at end of file + diff --git a/templates/index.html b/templates/index.html index a0f4c6f..2544395 100644 --- a/templates/index.html +++ b/templates/index.html @@ -12,44 +12,44 @@ - {% for (path, repositories) in repositories.iter() %} - {% if let Some(path) = path %} - {{ path }} - {% endif %} + {%- for (path, repositories) in repositories.iter() %} + {%- if let Some(path) = path %} + {{ path }} + {%- endif -%} - {%for repository in repositories %} - - - - {{ repository.name }} - - - - - {% if let Some(description) = repository.description %} - {{ description }} - {% else %} - Unnamed repository; edit this file 'description' to name the repository. - {% endif %} - - - - - {% if let Some(owner) = repository.owner %} - {{ owner }} - {% endif %} - - - - - - {{ repository.last_modified.clone()|timeago }} - - - - - {% endfor %} - {% endfor %} + {%- for repository in repositories %} + + + + {{- repository.name -}} + + + + + {%- if let Some(description) = repository.description -%} + {{- description -}} + {%- else -%} + Unnamed repository; edit this file 'description' to name the repository. + {%- endif -%} + + + + + {%- if let Some(owner) = repository.owner -%} + {{- owner -}} + {%- endif -%} + + + + + + {{- repository.last_modified.clone()|timeago -}} + + + + + {%- endfor -%} + {%- endfor %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/repo/about.html b/templates/repo/about.html index 29ae116..c0e8565 100644 --- a/templates/repo/about.html +++ b/templates/repo/about.html @@ -1,25 +1,25 @@ {% extends "repo/base.html" %} -{% block head %} -{% if let Some(readme) = readme %} - {% if readme.0 == crate::git::ReadmeFormat::Markdown %} - - - {% endif %} -{% endif %} +{% block head -%} +{%- if let Some(readme) = readme -%} + {%- if readme.0 == crate::git::ReadmeFormat::Markdown %} + + + {%- endif -%} +{%- endif -%} {% endblock %} {% block about_nav_class %}active{% endblock %} {% block content %} -{% if let Some(readme) = readme %} - {% match readme.0 %} - {% when crate::git::ReadmeFormat::Markdown %} +{% if let Some(readme) = readme -%} + {%- match readme.0 -%} + {%- when crate::git::ReadmeFormat::Markdown -%} {{ readme.1|safe }} - {% when crate::git::ReadmeFormat::Plaintext %} + {%- when crate::git::ReadmeFormat::Plaintext -%}

{{ readme.1 }}

- {% endmatch %} -{% else %} + {%- endmatch -%} +{%- else -%} No README in repository HEAD. -{% endif %} -{% endblock %} \ No newline at end of file +{%- endif %} +{% endblock %} diff --git a/templates/repo/base.html b/templates/repo/base.html index 5a0a087..b4b58dc 100644 --- a/templates/repo/base.html +++ b/templates/repo/base.html @@ -2,9 +2,9 @@ {% block title %}{{ repo.display() }}{% endblock %} -{% block header %} -index : {{ repo.display() }} -{% endblock %} +{%- block header -%} + index : {{ repo.display() }} +{%- endblock -%} {% block nav %}

diff --git a/templates/repo/commit.html b/templates/repo/commit.html index 113d8df..15097ea 100644 --- a/templates/repo/commit.html +++ b/templates/repo/commit.html @@ -1,9 +1,9 @@ {% extends "repo/base.html" %} {% block head %} - - -{% endblock %} + + +{%- endblock %} {% block commit_nav_class %}active{% endblock %} @@ -28,12 +28,12 @@ tree

{{ commit.tree() }}

- {% for parent in commit.parents() %} + {%- for parent in commit.parents() %} parent

{{ parent }}

- {% endfor %} + {%- endfor %} @@ -43,4 +43,4 @@

Diff

{{ commit.diff_stats|safe }}
 {{ commit.diff|safe }}

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/repo/diff.html b/templates/repo/diff.html index 958b234..42fd90d 100644 --- a/templates/repo/diff.html +++ b/templates/repo/diff.html @@ -1,9 +1,9 @@ {% extends "repo/base.html" %} -{% block head %} - - -{% endblock %} +{%- block head %} + + +{%- endblock -%} {% block diff_nav_class %}active{% endblock %} @@ -11,4 +11,4 @@

Diff

{{ commit.diff_stats|safe }}
 {{ commit.diff|safe }}

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/repo/file.html b/templates/repo/file.html index 9684a69..b933f81 100644 --- a/templates/repo/file.html +++ b/templates/repo/file.html @@ -1,12 +1,12 @@ {% extends "repo/base.html" %} {% block head %} - - -{% endblock %} + + +{%- endblock %} {% block tree_nav_class %}active{% endblock %} {% block content %}

{{ file.content|safe }}

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/repo/log.html b/templates/repo/log.html index e96eb5c..af7bf23 100644 --- a/templates/repo/log.html +++ b/templates/repo/log.html @@ -17,4 +17,4 @@ {% endif %} {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/repo/macros/refs.html b/templates/repo/macros/refs.html index 5ae7403..926eabf 100644 --- a/templates/repo/macros/refs.html +++ b/templates/repo/macros/refs.html @@ -1,88 +1,88 @@ -{% macro branch_table(branches) %} - - - Branch - Commit message - Author - Age - - +{%- macro branch_table(branches) -%} + + + Branch + Commit message + Author + Age + + - -{% for (name, commit) in branches %} - - {{ name }} - {{ commit.get().summary }} - -

- {{ commit.get().author.name }} - - - - {{ commit.get().author.time|timeago }} - - - -{% endfor %} - -{% endmacro %} + + {% for (name, commit) in branches -%} + + {{ name }} + {{ commit.get().summary }} + +

+ {{ commit.get().author.name }} + + + + {{- commit.get().author.time|timeago -}} + + + + {% endfor -%} + +{%- endmacro -%} -{% macro tag_table(tags) %} - - - Tag - Download - Author - Age - - +{%- macro tag_table(tags) -%} + + + Tag + Download + Author + Age + + - -{% for (name, tag) in tags %} - - {{ name }} - - - {% if let Some(tagger) = tag.get().tagger %} -

- {{ tagger.name }} - {% endif %} - - - {% if let Some(tagger) = tag.get().tagger %} - - {{ tagger.time|timeago }} - - {% endif %} - - -{% endfor %} - -{% endmacro %} + + {% for (name, tag) in tags -%} + + {{- name -}} + + + {% if let Some(tagger) = tag.get().tagger -%} +

+ {{ tagger.name }} + {%- endif %} + + + {% if let Some(tagger) = tag.get().tagger -%} + + {{- tagger.time|timeago -}} + + {%- endif %} + + + {% endfor -%} + +{%- endmacro -%} -{% macro commit_table(commits) %} - - - Age - Commit message - Author - - +{%- macro commit_table(commits) -%} + + + Age + Commit message + Author + + - -{% for commit in commits %} - - - - {{ commit.committer.time.clone()|timeago }} - - - {{ commit.summary }} - -

- {{ commit.author.name }} - - -{% endfor %} - -{% endmacro %} \ No newline at end of file + + {% for commit in commits -%} + + + + {{- commit.committer.time.clone()|timeago -}} + + + {{ commit.summary }} + +

+ {{ commit.author.name }} + + + {% endfor -%} + +{%- endmacro -%} diff --git a/templates/repo/refs.html b/templates/repo/refs.html index dc887e9..af93432 100644 --- a/templates/repo/refs.html +++ b/templates/repo/refs.html @@ -7,17 +7,17 @@ {% call refs::branch_table(refs.heads) %} - {% if !refs.tags.is_empty() %} - - - - - - - - + {%- if !refs.tags.is_empty() %} + + + + + + + + - {% call refs::tag_table(refs.tags) %} - {% endif %} + {%- call refs::tag_table(refs.tags) -%} + {%- endif %}

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/repo/summary.html b/templates/repo/summary.html index adbde6b..1d0b7d0 100644 --- a/templates/repo/summary.html +++ b/templates/repo/summary.html @@ -6,7 +6,7 @@ {% block content %} {% call refs::branch_table(refs.heads.iter().take(10)) %} - {% if refs.heads.len() > 10 %} + {%- if refs.heads.len() > 10 -%} @@ -15,9 +15,9 @@ - {% endif %} + {%- endif -%} - {% if !refs.tags.is_empty() %} + {%- if !refs.tags.is_empty() -%} @@ -27,8 +27,8 @@ - {% call refs::tag_table(refs.tags.iter().take(10)) %} - {% if refs.tags.len() > 10 %} + {%- call refs::tag_table(refs.tags.iter().take(10)) -%} + {%- if refs.tags.len() > 10 -%} @@ -37,8 +37,8 @@ - {% endif %} - {% endif %} + {%- endif -%} + {%- endif %} @@ -59,6 +59,6 @@ - {% endif %} + {%- endif %}

[...]

[...]

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/repo/tree.html b/templates/repo/tree.html index 3c8ff7a..7ca5e15 100644 --- a/templates/repo/tree.html +++ b/templates/repo/tree.html @@ -13,22 +13,23 @@ - {% for item in items %} + {% for item in items -%} - {% match item %} - {% when crate::git::TreeItem::Tree with (tree) %} -

{{ tree.mode|file_perms }}

{{ tree.name }}

- - - {% when crate::git::TreeItem::File with (file) %} -

{{ file.mode|file_perms }}

{{ file.name }}

{{ file.size }}

- - {% endmatch %} + {% match item -%} + {%- when crate::git::TreeItem::Tree with (tree) -%} +

{{ tree.mode|file_perms }}

{{ tree.name }}

+ + + + {%- when crate::git::TreeItem::File with (file) -%} +

{{ file.mode|file_perms }}

{{ file.name }}

{{ file.size }}

+ + {%- endmatch %} - {% endfor %} + {% endfor -%} -{% endblock %} \ No newline at end of file +{% endblock %}