From 02faa2a18f6740467b98ddf09263159f2e2f3af1 Mon Sep 17 00:00:00 2001 From: "Gervaise H. Henry" <gervaise.henry@utsouthwestern.edu> Date: Wed, 1 Jan 2020 23:27:03 -0600 Subject: [PATCH] Fix repository layout --- layouts/custom/contact.html | 3 +- layouts/custom/hu.donor.deep.html | 4 +- layouts/custom/hu.donor.shallow.html | 7 +- layouts/custom/people.html | 1 + layouts/custom/publications.html | 10 +- layouts/custom/repository.html | 209 ++++++++++++--------------- 6 files changed, 102 insertions(+), 132 deletions(-) diff --git a/layouts/custom/contact.html b/layouts/custom/contact.html index 36f50cb..2f2a808 100644 --- a/layouts/custom/contact.html +++ b/layouts/custom/contact.html @@ -36,5 +36,6 @@ 214-648-6096 </div> <hr> +</div> - {{ partial "footer.html" . }} \ No newline at end of file +{{ partial "footer.html" . }} \ No newline at end of file diff --git a/layouts/custom/hu.donor.deep.html b/layouts/custom/hu.donor.deep.html index c3c91eb..e17ede4 100644 --- a/layouts/custom/hu.donor.deep.html +++ b/layouts/custom/hu.donor.deep.html @@ -62,7 +62,7 @@ } </style> -<body> +<div class="content"> <div class="select"> <div class="columnS ui-widget"> <label for="gene" style="font-family:sans-serif; font-size:18px;"><b>Gene:</b></label> @@ -138,7 +138,7 @@ <div><span style="font-size:16px;"><a href="https://doi.org/10.25548/W-R8CM" target="_blank">GUDMAP: W-R8CM</a></span></div> </div> -</body> +</div> {{ partial "footer.html" . }} diff --git a/layouts/custom/hu.donor.shallow.html b/layouts/custom/hu.donor.shallow.html index 0e9cf0a..0d5407c 100644 --- a/layouts/custom/hu.donor.shallow.html +++ b/layouts/custom/hu.donor.shallow.html @@ -4,9 +4,6 @@ <h1>{{ .Title }}</h1> <h2>{{ .Description }}</h2> </div> -<div class="content"> - {{ .Content }} -</div> <style> .content { @@ -62,7 +59,7 @@ } </style> -<body> +<div class="content"> <div class="select"> <div class="columnS ui-widget"> <label for="gene" style="font-family:sans-serif; font-size:18px;"><b>Gene:</b></label> @@ -138,7 +135,7 @@ <div><span style="font-size:16px;"><a href="https://doi.org/10.25548/W-R8CM" target="_blank">GUDMAP: W-R8CM</a></span></div> </div> -</body> +</div> {{ partial "footer.html" . }} diff --git a/layouts/custom/people.html b/layouts/custom/people.html index b867f93..9a5d26b 100644 --- a/layouts/custom/people.html +++ b/layouts/custom/people.html @@ -33,6 +33,7 @@ box-shadow: 4px 4px 5px #888; } </style> + <div class="content"> <div class="current"> {{ range where .Pages.ByWeight "Params.current" true }} diff --git a/layouts/custom/publications.html b/layouts/custom/publications.html index 90f9dfe..687e4d5 100644 --- a/layouts/custom/publications.html +++ b/layouts/custom/publications.html @@ -1,5 +1,10 @@ {{ partial "header.html" . }} +<div class="header"> + <h1>{{ .Title }}</h1> + <h2>{{ .Description }}</h2> +</div> + <style> @media (min-width: 1000px) { .column { @@ -21,10 +26,7 @@ } } </style> -<div class="header"> - <h1>{{ .Title }}</h1> - <h2>{{ .Description }}</h2> -</div> + <div class="content"> <br> <div> diff --git a/layouts/custom/repository.html b/layouts/custom/repository.html index 5af08b5..cb09aa7 100644 --- a/layouts/custom/repository.html +++ b/layouts/custom/repository.html @@ -4,31 +4,8 @@ <h1>{{ .Title }}</h1> <h2>{{ .Description }}</h2> </div> -<div class="content"> - {{ .Content }} -</div> <style> - .pure-menu-heading { - font-family: sans-serif; - line-height: 1.15; - } - - .pure-menu { - font-family: sans-serif; - line-height: 1.15; - } - - .pure-menu-social { - font-family: sans-serif; - line-height: 1.15; - } - - .small-print { - color: #777; - font-family: sans-serif; - } - .content { margin: 0; max-width: none; @@ -53,6 +30,12 @@ padding: 5px; } + .row { + display: flex; + flex-wrap: wrap; + justify-content: center; + } + th, td { padding: 5px 15px; @@ -64,8 +47,89 @@ } </style> +<div class="content"> + <div class="select"> + <div id="jstree"></div> + </div> + <div style="color: grey; background-color: #191818;"> + <h4 id="total"></h4> + <h5>Patients</h5> + </div> + <div style="color: grey; background-color: #191818;"> + <h4 id="filters"></h4> + <h5>Filters</h5> + </div> + <p id="test">Test</p> + <hr> + <div> + <div class="row"> + <div> + <div class="panel_canvas" style="text-align:center;"> + <p>Disease Status</p> + <hr> + <canvas id="doughnut-dis" width="150" height="150"></canvas> + </div> + </div> + <div> + <div class="panel_canvas" style="text-align:center;"> + <p>BMI</p> + <hr> + <canvas id="doughnut-bmi" width="150" height="150"></canvas> + </div> + </div> + <div> + <div class="panel_canvas" style="text-align:center;"> + <p>Type 2 Diabetes</p> + <hr> + <canvas id="doughnut-t2d" width="150" height="150"></canvas> + </div> + </div> + <div> + <div class="panel_canvas" style="text-align:center;"> + <p>Ethnicity</p> + <hr> + <canvas id="doughnut-eth" width="150" height="150"></canvas> + </div> + </div> + <div> + <div class="panel_canvas" style="text-align:center;"> + <p>Age</p> + <hr> + <canvas id="doughnut-age" width="150" height="150"></canvas> + </div> + </div> + <div> + <div class="panel_canvas" style="text-align:center;"> + <p>Prostate Volume</p> + <hr> + <canvas id="doughnut-prv" width="150" height="150"></canvas> + </div> + </div> + <div> + <div class="panel_canvas" style="text-align:center;"> + <p>PSA</p> + <hr> + <canvas id="doughnut-psa" width="150" height="150"></canvas> + </div> + </div> + </div> + </div> + <hr> + <div class="container" align=center style="max-width: none;"> + <table id="samplesTable" border="1"> + <tr> + <th>Disease</th> + <th>ID</th> + <th>Age</th> + <th>Ethnicity</th> + </tr> + </table> + </div> +</div> + +{{ partial "footer.html" . }} + <head> - <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script> <link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/smoothness/jquery-ui.css"> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script> @@ -802,99 +866,4 @@ }); } </script> -</head> - -<body> - <div class="select"> - <div id="jstree"></div> - </div> - <br> - <div class="container" style="max-width: none;"> - <div class="row"> - <div class="col-8" style="color: grey; background-color: #191818;"> - <h4 id="total"></h4> - <h5>Patients</h5> - </div> - <div class="col-4 text-right" style="color: grey; background-color: #191818;"> - <i class='fa fa-user icon'></i> - </div> - </div> - <div class="row"> - <div class="col-8" style="color: grey; background-color: #191818;"> - <h4 id="filters"></h4> - <h5>Filters</h5> - </div> - <div class="col-4 text-right" style="color: grey; background-color: #191818;"> - <i class='fa fa-filter icon'></i> - </div> - </div> - </div> - <p id="test">Test</p> - <hr> - <div class="container" align=center style="max-width: none;"> - <div class="row"> - <div class="col"> - <div class="panel_canvas" style="text-align:center;"> - <p>Disease Status</p> - <hr> - <canvas id="doughnut-dis" width="150" height="150"></canvas> - </div> - </div> - <div class="col"> - <div class="panel_canvas" style="text-align:center;"> - <p>BMI</p> - <hr> - <canvas id="doughnut-bmi" width="150" height="150"></canvas> - </div> - </div> - <div class="col"> - <div class="panel_canvas" style="text-align:center;"> - <p>Type 2 Diabetes</p> - <hr> - <canvas id="doughnut-t2d" width="150" height="150"></canvas> - </div> - </div> - <div class="col"> - <div class="panel_canvas" style="text-align:center;"> - <p>Ethnicity</p> - <hr> - <canvas id="doughnut-eth" width="150" height="150"></canvas> - </div> - </div> - <div class="col"> - <div class="panel_canvas" style="text-align:center;"> - <p>Age</p> - <hr> - <canvas id="doughnut-age" width="150" height="150"></canvas> - </div> - </div> - <div class="col"> - <div class="panel_canvas" style="text-align:center;"> - <p>Prostate Volume</p> - <hr> - <canvas id="doughnut-prv" width="150" height="150"></canvas> - </div> - </div> - <div class="col"> - <div class="panel_canvas" style="text-align:center;"> - <p>PSA</p> - <hr> - <canvas id="doughnut-psa" width="150" height="150"></canvas> - </div> - </div> - </div> - </div> - <hr> - <div class="container" align=center style="max-width: none;"> - <table id="samplesTable" border="1"> - <tr> - <th>Disease</th> - <th>ID</th> - <th>Age</th> - <th>Ethnicity</th> - </tr> - </table> - </div> -</body> - -{{ partial "footer.html" . }} \ No newline at end of file +</head> \ No newline at end of file -- GitLab