From 1f99abded7dac19d0a419618496b0bd847594d16 Mon Sep 17 00:00:00 2001 From: rajiv-bhatia Date: Tue, 3 May 2022 17:49:14 +0100 Subject: [PATCH] Revert "Merge branch 'release/0.7.4' into release/0.7.3" This reverts commit c7414c6489e95463ad8909414d900670242decb6, reversing changes made to 6dcf50da5cc391ba92d6173a7b7ad85417b21230. --- _data/sidebars/overview_sidebar.yml | 3 - _includes/custom/versionconfig.html | 2 +- _includes/sidebar.html | 109 ++++----- _includes/sidebar_menu_list_items.liquid | 30 +-- _layouts/default.html | 186 ++++++++-------- _layouts/page.html | 149 +++++++------ css/customstyles.css | 206 ++++-------------- css/lavish-bootstrap.css | 5 +- css/theme-blue.css | 44 ++-- .../accessrecord_view_administrative_items.md | 2 - .../accessrecord_view_clinical_items.md | 3 - .../accessrecord_view_medications.md | 14 +- .../accessrecord_view_referrals.md | 59 +---- pages/overview/release_notes/0_7_4.md | 44 ---- 14 files changed, 298 insertions(+), 558 deletions(-) delete mode 100644 pages/overview/release_notes/0_7_4.md diff --git a/_data/sidebars/overview_sidebar.yml b/_data/sidebars/overview_sidebar.yml index 925f9642f..c3b8de09b 100644 --- a/_data/sidebars/overview_sidebar.yml +++ b/_data/sidebars/overview_sidebar.yml @@ -30,9 +30,6 @@ children: - title: Release notes output: web children: - - title: 0.7.4 - url: /overview_release_notes_0_7_4.html - output: web - title: 0.7.3 url: /overview_release_notes_0_7_3.html output: web diff --git a/_includes/custom/versionconfig.html b/_includes/custom/versionconfig.html index d3c0d3410..adf4729e0 100644 --- a/_includes/custom/versionconfig.html +++ b/_includes/custom/versionconfig.html @@ -1,3 +1,3 @@ -{% assign gpconnectVersion = "0.7.4" %} +{% assign gpconnectVersion = "0.7.3" %} {% assign fhirVersion = "DSTU2" %} {% assign versionBanner = "version_0_current" %} diff --git a/_includes/sidebar.html b/_includes/sidebar.html index feebae712..41f5f6124 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -1,71 +1,38 @@ -{% include custom/versionconfig.html %} -{% include custom/sidebarconfigs.html %} - -NHS Digital Logo - -

GP Connect API {{ gpconnectVersion }}
FHIR® {{ fhirVersion }}

-

{{sidebar.title}}

- - - - - - -
-
-
-
Quick links
-
-
    - {% for item in quicklinks %} - {{item.url}} - {% endfor %} -
-
- - Go back to previous page -
-
- - - +{% include custom/versionconfig.html %} +{% include custom/sidebarconfigs.html %} + + +NHS Digital Logo +
  • GP Connect API {{ gpconnectVersion }}
    FHIR® {{ fhirVersion }}
  • +
  • {{sidebar.title}}
  • + + + + + +
    +
    +
    +
    Quick links
    +
    +
      + {% for item in quicklinks %} + {{item.url}} + {% endfor %} +
    +
    + + Go back to previous page +
    +
    + + + \ No newline at end of file diff --git a/_includes/sidebar_menu_list_items.liquid b/_includes/sidebar_menu_list_items.liquid index 10686ccae..a3fff68ef 100644 --- a/_includes/sidebar_menu_list_items.liquid +++ b/_includes/sidebar_menu_list_items.liquid @@ -1,16 +1,16 @@ -{% assign i = 0 %} -{% for item in include.menuitems %} - {% assign i = i | plus:1 %} - {% comment %} Is this supposed to be output on the `web`site?{% endcomment %} - {% if item.output contains "web" %} -
  • - {% if item.children.size > 0 %} {% endif %} - {{ item.title }} - {% if item.children.size > 0 %} - - {% endif %} -
  • - {% endif %}{% comment %} /"if web" {% endcomment %} +{% for item in include.menuitems %} + + {% comment %} Is this supposed to be ouput on the `web`site?{% endcomment %} + {% if item.output contains "web" %} +
  • + {% if item.children.size > 0 %} {% endif %} + {{ item.title }} + {% if item.children.size > 0 %} + + {% endif %} +
  • + {% endif %}{% comment %} /"if web" {% endcomment %} + {% endfor %}{% comment %} /each item {% endcomment %} \ No newline at end of file diff --git a/_layouts/default.html b/_layouts/default.html index a68ffece3..870870486 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,93 +1,93 @@ - - - {% seo %} - {% include head.html %} - - - - - - - - - - {% if page.datatable == true %} - - - - {% endif %} - - - - -{% include topnav.html %} - -
    - - -
    - -
    - - {% include sidebar.html %} - -
    - {{content}} -
    - -
    - -
    - - -{% if site.google_analytics %} -{% include google_analytics.html %} -{% endif %} - + + + {% seo %} + {% include head.html %} + + + + + + + + + + {% if page.datatable == true %} + + + + {% endif %} + + + + +{% include topnav.html %} + +
    +
     
    + +
    + +
    + + {% include sidebar.html %} + +
    + {{content}} +
    + +
    + +
    + + +{% if site.google_analytics %} +{% include google_analytics.html %} +{% endif %} + diff --git a/_layouts/page.html b/_layouts/page.html index 94fff4586..12fbbc2a6 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -1,75 +1,74 @@ ---- -layout: default ---- -
    - - {% include custom/versionconfig.html %} - - {% include {{versionBanner}}.html %} - - {% unless jekyll.environment != "production" %} - - {% if site.github_editme_path %} - {% include github_improve_me.html %} - {% endif %} - - {% endunless %} - -
    -

    {{ page.title }}

    -
    - -{% if page.simple_map == true %} - - - -{% include custom/{{page.map_name}}.html %} - -{% elsif page.complex_map == true %} - - - -{% include custom/{{page.map_name}}.html %} - -{% endif %} - -{% if page.div %} -
    -{% endif %} - -
    - - {% if page.summary %} -
    {{page.summary}}
    - {% endif %} - - {% include twittershare.html %} - - {% unless page.toc == false %} - {% include toc.html %} - {% endunless %} - - {{content}} - - - - {% if site.disqus %} -{% include disqus.html %} - {% endif %} - -
    -{% if page.div %} -
    -{% endif %} - -{{site.data.alerts.hr_shaded}} - -{% include footer.html %} +--- +layout: default +--- + + {% include custom/versionconfig.html %} + + {% include {{versionBanner}}.html %} + + {% unless jekyll.environment != "production" %} + + {% if site.github_editme_path %} + {% include github_improve_me.html %} + {% endif %} + + {% endunless %} + +
    +

    {{ page.title }}

    +
    + +{% if page.simple_map == true %} + + + +{% include custom/{{page.map_name}}.html %} + +{% elsif page.complex_map == true %} + + + +{% include custom/{{page.map_name}}.html %} + +{% endif %} + +{% if page.div %} +
    +{% endif %} + +
    + + {% if page.summary %} +
    {{page.summary}}
    + {% endif %} + + {% include twittershare.html %} + + {% unless page.toc == false %} + {% include toc.html %} + {% endunless %} + + {{content}} + + + + {% if site.disqus %} +{% include disqus.html %} + {% endif %} + +
    +{% if page.div %} +
    +{% endif %} + +{{site.data.alerts.hr_shaded}} + +{% include footer.html %} diff --git a/css/customstyles.css b/css/customstyles.css index 443b75f4f..6858d6801 100644 --- a/css/customstyles.css +++ b/css/customstyles.css @@ -1,7 +1,5 @@ body { font-size:15px; - overflow-wrap: break-word; - word-wrap: break-word; } .bs-callout { padding: 20px; @@ -24,72 +22,52 @@ body { margin-top: -5px; } .bs-callout-default { - border-style: solid; - border-width: 1px; - border-left-width: 5px; - border-right-width: 1px; - border-color: #777; + border-left-color: #777; } .bs-callout-default h4 { color: #777; } .bs-callout-primary { - border-style: solid; - border-width: 1px; - border-left-width: 5px; - border-right-width: 1px; - border-color: #428bca; + border-left-color: #428bca; } .bs-callout-primary h4 { color: #428bca; } .bs-callout-success { - border-style: solid; - border-width: 1px; - border-left-width: 5px; - border-right-width: 1px; - border-color: #5cb85c; + border-left-color: #5cb85c; } .bs-callout-success h4 { color: #5cb85c; } .bs-callout-danger { - border-style: solid; - border-width: 1px; - border-left-width: 5px; - border-right-width: 1px; - border-color: #d9534f; + border-left-color: #d9534f; } .bs-callout-danger h4 { color: #d9534f; } .bs-callout-warning { - border-style: solid; - border-width: 1px; - border-left-width: 5px; - border-right-width: 1px; - border-color: #f0ad4e; + border-left-color: #f0ad4e; } .bs-callout-warning h4 { color: #f0ad4e; } .bs-callout-info { - border-style: solid; - border-width: 1px; - border-left-width: 5px; - border-right-width: 1px; - border-color: #5bc0de; + border-left-color: #5bc0de; } .bs-callout-info h4 { color: #5bc0de; } + .gi-2x{font-size: 2em;} .gi-3x{font-size: 3em;} .gi-4x{font-size: 4em;} .gi-5x{font-size: 5em;} + + + .breadcrumb > .active {color: #777 !important;} /* make room for the nav bar */ @@ -281,14 +259,12 @@ div#toc ul li { margin: 8px 0px 8px 22px; font-size: 90%; list-style: square; - overflow-wrap: break-word; - word-wrap: break-word; } div#toc ul { background-color: whitesmoke; padding: 5px; border-radius: 5px; - max-width: 500px; + max-width: 400px; color: gray; } @@ -403,33 +379,33 @@ ul#mysidebar, #mysidebar ul{ } #mysidebar ul li a { - padding: 4px 10px 4px 25px; + padding: 4px 10px 4px 15px; font-size: 12px; } #mysidebar ul li ul li a { - padding: 4px 10px 4px 45px; + padding: 4px 10px 4px 25px; font-size: 12px; } #mysidebar ul li ul li ul li a { - padding: 4px 10px 4px 55px; + padding: 4px 10px 4px 35px; } #mysidebar ul li ul li ul li ul li a { - padding: 4px 10px 4px 65px; + padding: 4px 10px 4px 45px; } #mysidebar ul li ul li ul li ul li ul li a { - padding: 4px 10px 4px 75px; + padding: 4px 10px 4px 55px; } #mysidebar ul li ul li ul li ul li ul li ul li a { - padding: 4px 10px 4px 85px; + padding: 4px 10px 4px 65px; } #mysidebar ul li ul li ul li ul li ul li ul li ul li a { - padding: 4px 10px 4px 95px; + padding: 4px 10px 4px 75px; } #mysidebar .page-link{ @@ -458,10 +434,6 @@ ul#mysidebar, #mysidebar ul{ display:block; } -.tree-arrow.expanded .nav-list{ - display:block; -} - #mysidebar li.active a.show-hide, #mysidebar a.show-hide:hover, #mysidebar a.show-hide:active{ @@ -480,7 +452,7 @@ ul#mysidebar, #mysidebar ul{ /* navgoco sidebar styles (customized)*/ .nav a { - color: #333 !important; + color: #333; display: block; outline: none; text-decoration: none; @@ -492,32 +464,21 @@ ul#mysidebar, #mysidebar ul{ font-weight: bolder; } - -/* \25b4 up arrow, \25be down arrow, \25b8 right arrow */ - -.content_wrap a { - color: #000000 !important; } - - .nav li > a > span:after { - content: '\25b8'; + content: '\25be'; } .nav li.active > a > span:after { - content: '\25be'; + content: '\25b4'; } .nav a:hover, .nav li.active > a { - background-color: #ffffff !important; - color: #ffffff !important; -} - -.nav > li.active > a { - background-color: #005eb8 !important; + background-color: #8D8D8D; + color: #f5f5f5; } -.nav > li > a:hover { - background-color: #005eb8 !important; +.nav > li.active > a { + background-color: #347DBE; } .nav li a { @@ -553,11 +514,11 @@ ul#mysidebar { color: #0010fc; font-weight:bold; padding-left:20px; - background-color: #f1f1f1 !important; + background-color: #dfefff !important; } .nav ul li a { - background-color: #f1f1f1; + background-color: #f3f9ff; } .nav li a { @@ -569,12 +530,13 @@ ul#mysidebar { } .nav ul li a { + border-top:1px solid #dfefff; padding-left: 15px; } .nav #gpcnavlink > a:before { - content: '\25c2'; - vertical-align: center; + content: '\25c0'; + font-size: 10px; } #gpcnavlink { @@ -761,8 +723,8 @@ a.fa.fa-envelope-o.mailto { font-weight: 600; } -h3 {color: #000000; font-weight:normal; font-size:130%; overflow-wrap: break-word; word-wrap: break-word;} -h4 {color: #808080; font-weight:normal; font-size:120%; font-style:italic; overflow-wrap: break-word; word-wrap: break-word;} +h3 {color: #ED1951; font-weight:normal; font-size:130%;} +h4 {color: #808080; font-weight:normal; font-size:120%; font-style:italic;} .alert, .callout { overflow: hidden; @@ -883,7 +845,7 @@ ol.series li { span.muted {color: #666;} -table code {background-color: transparent; overflow-wrap: break-word;} +table code {background-color: transparent;} .highlight .err { color: #a61717; @@ -1128,7 +1090,7 @@ span.label.label-primary { } a code { - color: #000000; + color: #248EC2; } code + a > code { @@ -1324,8 +1286,8 @@ table > tbody > tr.tableSubHeading { } .capability-not-available { - color: #8c0023!important; - font-weight: bold!important; + color: #aaaaaa; + font-weight: normal; } @media (max-width:700px) { @@ -1340,8 +1302,6 @@ hr { .resource { font-weight: normal; - overflow-wrap: break-word; - word-wrap: break-word; } .resource-attributes { @@ -1354,9 +1314,6 @@ hr { border-right: 0px; border-top: 0px; width: 100%; - overflow-wrap: break-word; - word-wrap: break-word; - table-layout: fixed; } table.resource-attributes tr td { @@ -1370,23 +1327,17 @@ table.resource-attributes tr td { .resource-attributes tr td:nth-child(1) { padding-left: 10px; - width: 35%; - overflow-wrap: break-word; - word-wrap: break-word; + width: 33%; } .resource-attributes tr td:nth-child(2) { background-color: transparent; - width: 31%; - overflow-wrap: break-word; - word-wrap: break-word; + width: 33%; } .resource-attributes tr td:nth-child(3) { padding-left: 25px; - width: 34%; - overflow-wrap: break-word; - word-wrap: break-word; + width: 33%; } .resource-page h3 { @@ -1564,81 +1515,4 @@ a.no_icon:after } .panel-quick > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #FFFFFF; -} - -.screen-reader-text { - border: 0; - clip: rect(1px, 1px, 1px, 1px); - clip-path: inset(50%); - height: 1px; - margin: -1px; - overflow: hidden; - padding: 0; - position: absolute; - width: 1px; - word-wrap: normal !important; -} - -.blue-diagram { - margin: auto; - width: 40%; - border-style: solid; - border-width: 1px; - border-left-width: 5px; - border-right-width: 1px; - border-color: #4672C4; - background-color: #4672C4; - padding: 4px 10px; - color: #ffffff; - text-align: center; - font-size: 12px; -} - -.blue-diagram-full { - margin: auto; - width: 100%; - border-style: solid; - border-width: 1px; - border-left-width: 5px; - border-right-width: 1px; - border-color: #4672C4; - background-color: #4672C4; - padding: 4px 10px; - color: #ffffff; - text-align: center; - font-size: 12px; -} - -.flex-container { - display: flex; -} - -.flex-child { - flex: 1; -} - -.flex-child:first-child { - margin-right: 20px; -} - - -.screen-reader, .screen-reader-focusable { - border: 0; - clip: rect(0 0 0 0); - height: 1px; - margin: -1px; - overflow: hidden; - padding: 0; - position: absolute; - white-space: nowrap; - width: 1px; } - -.screen-reader-focusable:active, -.screen-reader-focusable:focus { - clip: auto; - height: auto; - margin: 0; - overflow: visible; - position: static; - white-space: normal; - width: auto; } +} \ No newline at end of file diff --git a/css/lavish-bootstrap.css b/css/lavish-bootstrap.css index bfa848bad..9381a442d 100644 --- a/css/lavish-bootstrap.css +++ b/css/lavish-bootstrap.css @@ -271,7 +271,7 @@ textarea { background-image: none; } a { - color: #000000; + color: #248EC2; text-decoration: none; } a:hover, @@ -601,9 +601,8 @@ code { font-size: 90%; color: #444; background-color: #f0f0f0; + white-space: nowrap; border-radius: 4px; - overflow-wrap: break-word; - word-wrap: break-word; } pre { diff --git a/css/theme-blue.css b/css/theme-blue.css index 09cdd6cd0..4d65fb5d6 100644 --- a/css/theme-blue.css +++ b/css/theme-blue.css @@ -1,28 +1,28 @@ .summary { - color: #005eb8; + color: #005EB8; border-left: 5px solid #ED1951; font-size:16px; } -h3 {color: #000000; } -h4 {color: #005eb8; } +h3 {color: #005EB8; } +h4 {color: #005EB8; } .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus { - background-color: #005eb8; + background-color: #005EB8; color: white; } .nav > li.active > a { - background-color: #005eb8; + background-color: #005EB8; } .nav > li > a:hover { - background-color: #005eb8; + background-color: #005EB8; } div.navbar-collapse .dropdown-menu > li > a:hover { - background-color: #005eb8; + background-color: #005EB8; } .nav li.thirdlevel > a { @@ -38,32 +38,32 @@ a[data-toggle="tooltip"] { } .navbar-inverse { - background-color: #005eb8; - border-color: #005eb8; + background-color: #005EB8; + border-color: #005EB8; } .navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus { - color: #005eb8; + color: #005EB8; } .navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus { - background-color: #005eb8; + background-color: #005EB8; color: #ffffff; } /* not sure if using this ...*/ .navbar-inverse .navbar-collapse, .navbar-inverse .navbar-form { - border-color: #005eb8 !important; + border-color: #005EB8 !important; } .btn-primary { color: #ffffff; - background-color: #005eb8; - border-color: #005eb8; + background-color: #005EB8; + border-color: #005EB8; } .navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus { - background-color: #005eb8; + background-color: #005EB8; } .btn-primary:hover, @@ -71,15 +71,15 @@ a[data-toggle="tooltip"] { .btn-primary:active, .btn-primary.active, .open .dropdown-toggle.btn-primary { - background-color: #005eb8; - border-color: #005eb8; + background-color: #005EB8; + border-color: #005EB8; } .printTitle { - color: #005eb8 !important; + color: #005EB8 !important; } -body.print h1 {color: #005eb8 !important; font-size:28px !important;} +body.print h1 {color: #005EB8 !important; font-size:28px !important;} body.print h2 {color: #595959 !important; font-size:20px !important;} body.print h3 {color: #E50E51 !important; font-size:14px !important;} body.print h4 {color: #679DCE !important; font-size:14px; font-style: italic !important;} @@ -89,14 +89,14 @@ body.print h4 {color: #679DCE !important; font-size:14px; font-style: italic !im } div.sidebarTitle { - color: #005eb8; + color: #005EB8; } li.sidebarTitle { margin-top:0px; font-weight:bold; font-size:100%; - color: #005eb8; + color: #ED1951; margin-bottom:10px; margin-left: 5px; } @@ -105,7 +105,7 @@ li.sidebarSection { margin-top:0px; font-weight:bold; font-size:100%; - color: #005eb8; + color: #005EB8; margin-bottom:10px; margin-left: 5px; } diff --git a/pages/accessrecord/accessrecord_view_administrative_items.md b/pages/accessrecord/accessrecord_view_administrative_items.md index eaf6854b9..3869966b2 100644 --- a/pages/accessrecord/accessrecord_view_administrative_items.md +++ b/pages/accessrecord/accessrecord_view_administrative_items.md @@ -48,8 +48,6 @@ Providers **MUST** return all the columns as described in the table below, sorte | 2 | `Entry` | A short human readable free-text title for the administrative item | `free-text` | | 3 | `Details` | Longer human readable details for the administrative item, codes such as READ or SNOMED **MUST NOT** be included. | `free-text` | -The provider **MAY** include or exclude items which are included in the [observations](accessrecord_view_observations.html) view. -If 'observations' are included, all the details which are included in the Value, Range and Details columns in the observations view **MUST** be included in the Details column of this view. ## HTML view ## diff --git a/pages/accessrecord/accessrecord_view_clinical_items.md b/pages/accessrecord/accessrecord_view_clinical_items.md index 75696a774..40aecfb9e 100644 --- a/pages/accessrecord/accessrecord_view_clinical_items.md +++ b/pages/accessrecord/accessrecord_view_clinical_items.md @@ -47,9 +47,6 @@ Providers must return all the columns as described in the table below, sorted by | 1 | `Date`