diff --git a/view/layout/default.html b/view/layout/default.html index 6dff868..21761ea 100644 --- a/view/layout/default.html +++ b/view/layout/default.html @@ -24,7 +24,7 @@ - {{> header}} + {{> page-header}}
@@ -36,7 +36,7 @@
- {{> footer}} + {{> page-footer}} diff --git a/view/partial/graph.html b/view/partial/graph.html new file mode 100644 index 0000000..2f418bd --- /dev/null +++ b/view/partial/graph.html @@ -0,0 +1,35 @@ +
+
+
+
+
    +
    + +
    +
    + + \ No newline at end of file diff --git a/view/partial/footer.html b/view/partial/page-footer.html similarity index 100% rename from view/partial/footer.html rename to view/partial/page-footer.html diff --git a/view/partial/header.html b/view/partial/page-header.html similarity index 100% rename from view/partial/header.html rename to view/partial/page-header.html diff --git a/view/partial/result-header.html b/view/partial/result-header.html new file mode 100644 index 0000000..00dbbf7 --- /dev/null +++ b/view/partial/result-header.html @@ -0,0 +1,10 @@ +
    +
    +
    +
    +

    {{simplify-url task.url}} - results for {{date-format mainResult.date format="DD MMM YYYY"}}

    +

    ({{task.standard}})

    +
    +
    +
    +
    \ No newline at end of file diff --git a/view/partial/result-selector.html b/view/partial/result-selector.html new file mode 100644 index 0000000..9b87f19 --- /dev/null +++ b/view/partial/result-selector.html @@ -0,0 +1,19 @@ +
    +
    +
    +
    +

    Select a date to show stats for

    + +
    +
    +
    +
    \ No newline at end of file diff --git a/view/partial/result.html b/view/partial/result.html new file mode 100644 index 0000000..3ea0091 --- /dev/null +++ b/view/partial/result.html @@ -0,0 +1,115 @@ +
    +
    +
    + +
    +
    +
    +
    + Download CSV +
    +
    + Download JSON +
    +
    +
    +
    + + + + +
    + +
    + {{#if mainResult.count.error}} +
    + - + Errors ( {{mainResult.count.error}} ) +
    +
    + + + Back to top +
    + {{else}} +

    Well done! You have 0 errors.

    + {{/if}} + + {{#if mainResult.count.warning}} +
    + + + Warnings ( {{mainResult.count.warning}} ) +
    +
    + + Back to top +
    + + {{else}} +

    Well done! You have 0 warnings.

    + {{/if}} + + {{#if mainResult.count.notice}} +
    + + + Notices ( {{mainResult.count.notice}} ) +
    +
    + + Back to top +
    + {{else}} +

    Well done! You have 0 notices.

    + {{/if}} + +
    + + + Ignored Rules +
    +
    + + Back to top +
    +
    \ No newline at end of file diff --git a/view/partial/results-table.html b/view/partial/results-table.html deleted file mode 100644 index 75e1677..0000000 --- a/view/partial/results-table.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - {{#results}} - - - - - - - {{/results}} - -
    pa11y results for this URL
    DateErrorsWarningsNotices
    {{date-format date format="DD MMM YYYY"}}{{count.error}}{{count.warning}}{{count.notice}}
    \ No newline at end of file diff --git a/view/partial/task-header.html b/view/partial/task-header.html new file mode 100644 index 0000000..db3d969 --- /dev/null +++ b/view/partial/task-header.html @@ -0,0 +1,20 @@ +
    +
    +
    +
    +

    {{simplify-url task.url}}

    +

    ({{task.standard}})

    +
    +
    + + + {{#if mainResult}} + +
    Last run : {{date-format mainResult.date format="DD MMM YYYY"}}
    + {{else}} +
    Not yet run
    + {{/if}} +
    +
    +
    +
    \ No newline at end of file diff --git a/view/result/index.html b/view/result/index.html index b27f6c2..f66ff6b 100644 --- a/view/result/index.html +++ b/view/result/index.html @@ -3,4 +3,6 @@ {{task.url}} ({{task.standard}}) {{date-format mainResult.date format="DD MMM YYYY"}} {{/content}} -

    {{task.url}} ({{task.standard}}) {{date-format mainResult.date format="DD MMM YYYY"}}

    +{{> result-header}} + +{{> result}} \ No newline at end of file diff --git a/view/task/index.html b/view/task/index.html index 4cdbc87..b0b30ff 100644 --- a/view/task/index.html +++ b/view/task/index.html @@ -13,192 +13,24 @@ {{/added}} -
    -
    -
    -
    -

    {{simplify-url task.url}}

    -

    ({{task.standard}})

    -
    -
    - - - {{#if task.lastResult}} - -
    Last run : {{date-format task.lastResult.date format="DD MMM YYYY"}}
    - {{else}} -
    Not yet run
    - {{/if}} -
    -
    -
    -
    +{{> task-header}} {{#if results}} -
    -
    -
    -
    -
      -
      - -
      -
      + + {{> graph}} - - -
      -
      -
      -
      -

      Select a date to show stats for

      - -
      -
      -
      -
      + {{> result-selector}} {{/if}} -
      - {{#if results}} -
      -
      - -
      -
      -
      - -
      - Download CSV -
      - -
      - Download JSON -
      -
      -
      -
      - {{/if}} - - -
      -

      Your other tracked URLs

      -

      No other URLs

      - - - - -
      -
      - -
      - {{#if results}} - {{#if mainResult.count.error}} -
      - - - Errors ( {{mainResult.count.error}} ) -
      -
      - - - Back to top -
      - {{else}} -

      Well done! You have 0 errors.

      - {{/if}} - - {{#if mainResult.count.warning}} -
      - + - Warnings ( {{mainResult.count.warning}} ) -
      -
      - - Back to top -
      - - {{else}} -

      Well done! You have 0 warnings.

      - {{/if}} - - {{#if mainResult.count.notice}} -
      - + - Notices ( {{mainResult.count.notice}} ) -
      -
      - - Back to top -
      - {{else}} -

      Well done! You have 0 notices.

      - {{/if}} - -
      - + - Ignored Rules -
      -
      - - Back to top -
      - - {{else}} +{{#if mainResult}} + {{> result}} +{{else}} +

      There are no results to show

      pa11y has not been run against this URL yet so there are no results to show.

      To run pa11y for this URL now click here

      - {{/if}} -
      - +
      +{{/if}} \ No newline at end of file