Skip to content

Commit

Permalink
Revert "Revert "Merge branch 'release/0.7.4' into release/0.7.3""
Browse files Browse the repository at this point in the history 
This reverts commit 1f99abd.
  • Loading branch information
@rajiv-bhatia
rajiv-bhatia committed May 3, 2022
1 parent 7d26c12 commit aca7d67
Show file tree
Hide file tree
Showing 14 changed files with 558 additions and 298 deletions.
3 changes: 3 additions & 0 deletions _data/sidebars/overview_sidebar.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ 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
Expand Down
2 changes: 1 addition & 1 deletion _includes/custom/versionconfig.html
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{% assign gpconnectVersion = "0.7.3" %}
{% assign gpconnectVersion = "0.7.4" %}
{% assign fhirVersion = "DSTU2" %}
{% assign versionBanner = "version_0_current" %}
109 changes: 71 additions & 38 deletions _includes/sidebar.html
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,71 @@
{% include custom/versionconfig.html %}
{% include custom/sidebarconfigs.html %}


<img src="{{ "/images/logo.png" }}" alt="NHS Digital Logo" height="110" width="110" />
<li class="sidebarTitle" style="list-style-type:none;">GP Connect API {{ gpconnectVersion }}<br/><span style="font-size: smaller;">FHIR&reg; {{ fhirVersion }}</span></li>
<li class="sidebarSection" style="list-style-type:none;">{{sidebar.title}}</li>

<ul class="nav">
{% if showbackbutton == true %}
<li id="gpcnavlink" style="list-style-type:none;">
<a href="./"> {{ backbuttontext }}</a>
</li>
{% endif %}
</ul>

<ul id="mysidebar" class="nav">
{% include {{the_sidebar}} menuitems=sidebar.children %}
</ul>

<br>
<br>
<div class="panel panel-quick">
<div class="panel-heading">Quick links</div>
<div class="panel-body">
<ul style="padding-left:20px; color: #000000">
{% for item in quicklinks %}
{{item.url}}
{% endfor %}
</ul>
<br>
<span class="glyphicon glyphicon-arrow-left" aria-hidden="true"></span>
<a href="javascript:history.go(-1)"> Go back to previous page</a>
</div>
</div>
</div>
<!-- this highlights the active parent class in the navgoco sidebar. this is critical so that the parent expands when you're viewing a page. This must appear below the sidebar code above. Otherwise, if placed inside customscripts.js, the script runs before the sidebar code runs and the class never gets inserted.-->
<script>$("li.active").parents('li').toggleClass("active");</script>
{% include custom/versionconfig.html %}
{% include custom/sidebarconfigs.html %}

<img src="{{ "/images/logo.png" }}" alt="NHS Digital Logo" height="110" width="110" alt="NHS Digital Logo" />

<p><strong>GP Connect API {{ gpconnectVersion }}</strong><br /><span style="font-size: smaller;">FHIR&reg; {{ fhirVersion }}</span></p>
<p><strong>{{sidebar.title}}</strong></p>


<ul class="nav">
{% if showbackbutton == true %}
<li id="gpcnavlink" style="list-style-type:none;">
<a href="./"> {{ backbuttontext }}</a>
</li>
{% endif %}
</ul>

<ul id="mysidebar" role="tree" class="nav">
{% include {{the_sidebar}} menuitems=sidebar.children %}
</ul>

<br />
<br />
<div class="panel panel-quick">
<div class="panel-heading">Quick links</div>
<div class="panel-body">
<ul style="padding-left:20px; color: #000000">
{% for item in quicklinks %}
{{item.url}}
{% endfor %}
</ul>
<br>
<span class="glyphicon glyphicon-arrow-left" aria-hidden="true"></span>
<a href="javascript:history.go(-1)"> Go back to previous page</a>
</div>
</div>
</div>
<!-- this highlights the active parent class in the navgoco sidebar. this is critical so that the parent expands when you're viewing a page. This must appear below the sidebar code above. Otherwise, if placed inside customscripts.js, the script runs before the sidebar code runs and the class never gets inserted.-->
<script>
$("[id^=nav_item]").on('click', function () {

$('ul#mysidebar li a').each(function () {
$(this).removeAttr("aria-expanded");
});

var $el = $(this);

if ($el.parent("li").hasClass("active") === false) {
$el.attr("aria-expanded", "true");
}

$el.closest("ul").parents("li").children("a").each(function () {
$(this).attr('aria-expanded', 'true');
});

if ($el.data('url') !== '' && typeof ($el.data('url')) !== "undefined") {
var re = new RegExp(/^.*\//);
window.location.assign(re.exec(window.location.href) + $el.data('url').replace(/^\//g, ''));
}
});

if (window.location.pathname === '/') {
$('ul#mysidebar li:first > a').attr("aria-expanded", "true");
}

$('a[data-url="' + window.location.pathname + '"]').parents("li.tree-parent").children("a").each(function () {
$(this).attr('aria-expanded', 'true');
});

$("li.active").parents("li").toggleClass("active");
</script>
30 changes: 15 additions & 15 deletions _includes/sidebar_menu_list_items.liquid
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{% for item in include.menuitems %}

{% comment %} Is this supposed to be ouput on the `web`site?{% endcomment %}
{% if item.output contains "web" %}
<li class="{% if item.children.size > 0 %} tree-parent {% endif %} {% if page.url == item.url %}active{% endif %}">
{% if item.children.size > 0 %} {% endif %}
<a href="{{item.url | remove: "/"}}">{{ item.title }}</a>
{% if item.children.size > 0 %}
<ul class="nav nav-list" style="font-size:98%">
{% include sidebar_menu_list_items.liquid menuitems=item.children %}
</ul>
{% endif %}
</li>
{% endif %}{% comment %} /"if web" {% endcomment %}

{% 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" %}
<li class="{% if item.children.size > 0 %}tree-parent{% endif %} {% if page.url == item.url %}active{% endif %}">
{% if item.children.size > 0 %} {% endif %}
<a id="nav_item_{{i}}" data-url="{{item.url}}" href="#">{{ item.title }}</a>
{% if item.children.size > 0 %}
<ul class="nav nav-list" style="font-size:98%">
{% include sidebar_menu_list_items.liquid menuitems=item.children %}
</ul>
{% endif %}
</li>
{% endif %}{% comment %} /"if web" {% endcomment %}
{% endfor %}{% comment %} /each item {% endcomment %}
186 changes: 93 additions & 93 deletions _layouts/default.html
View file
Original file line number Diff line number Diff line change
@@ -1,93 +1,93 @@
<!DOCTYPE html>
<head>
{% seo %}
{% include head.html %}
<script>
$(document).ready(function() {
// Initialize navgoco with default options
$("#mysidebar").navgoco({
caretHtml: '',
accordion: true,
openClass: 'active', // open
save: false, // leave false or nav highlighting doesn't work right
cookie: {
name: 'navgoco',
expires: false,
path: '/'
},
slide: {
duration: 400,
easing: 'swing'
}
});

$("#collapseAll").click(function(e) {
e.preventDefault();
$("#mysidebar").navgoco('toggle', false);
});

$("#expandAll").click(function(e) {
e.preventDefault();
$("#mysidebar").navgoco('toggle', true);
});

});

</script>
<script>
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
</script>


<link rel="stylesheet" href="css/default.min.css">
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.13.1/highlight.min.js"></script>
<script>
$(document).ready(function(){
hljs.initHighlightingOnLoad();
});
</script>


{% if page.datatable == true %}
<link rel="stylesheet" type="text/css" href="//cdn.datatables.net/1.10.5/css/jquery.dataTables.css">
<script type="text/javascript" charset="utf8" src="//cdn.datatables.net/1.10.5/js/jquery.dataTables.js"></script>
<script>
$(document).ready(function(){

$('table.datatable').DataTable( {
paging: false,
stateSave: true
}
);
</script>
{% endif %}


</head>
<body>
{% include topnav.html %}
<!-- Page Content -->
<div class="container">
<div class="col-lg-12">&nbsp;</div>
<!-- Content Row -->
<div class="row">
<!-- Sidebar Column -->
<div class="col-md-3">

{% include sidebar.html %}
<!-- Content Column -->
<div class="col-md-9">
{{content}}
</div>
<!-- /.row -->
</div>
<!-- /.container -->
</div>

</body>
{% if site.google_analytics %}
{% include google_analytics.html %}
{% endif %}
</html>
<!DOCTYPE html>
<head>
{% seo %}
{% include head.html %}
<script>
$(document).ready(function() {
// Initialize navgoco with default options
$("#mysidebar").navgoco({
caretHtml: '',
accordion: true,
openClass: 'active', // open
save: false, // leave false or nav highlighting doesn't work right
cookie: {
name: 'navgoco',
expires: false,
path: '/'
},
slide: {
duration: 400,
easing: 'swing'
}
});

$("#collapseAll").click(function(e) {
e.preventDefault();
$("#mysidebar").navgoco('toggle', false);
});

$("#expandAll").click(function(e) {
e.preventDefault();
$("#mysidebar").navgoco('toggle', true);
});

});

</script>
<script>
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
</script>


<link rel="stylesheet" href="css/default.min.css">
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.13.1/highlight.min.js"></script>
<script>
$(document).ready(function(){
hljs.initHighlightingOnLoad();
});
</script>


{% if page.datatable == true %}
<link rel="stylesheet" type="text/css" href="//cdn.datatables.net/1.10.5/css/jquery.dataTables.css">
<script type="text/javascript" charset="utf8" src="//cdn.datatables.net/1.10.5/js/jquery.dataTables.js"></script>
<script>
$(document).ready(function(){

$('table.datatable').DataTable( {
paging: false,
stateSave: true
}
);
</script>
{% endif %}


</head>
<body>
{% include topnav.html %}
<!-- Page Content -->
<div class="container">
<div class="col-lg-12">&nbsp;<a href="#main" class="screen-reader-focusable">Skip to main content</a></div>
<!-- Content Row -->
<div class="row">
<!-- Sidebar Column -->
<div class="col-md-3">

{% include sidebar.html %}
<!-- Content Column -->
<div class="col-md-9">
{{content}}
</div>
<!-- /.row -->
</div>
<!-- /.container -->
</div>

</body>
{% if site.google_analytics %}
{% include google_analytics.html %}
{% endif %}
</html>
Loading

0 comments on commit aca7d67

Please sign in to comment.