diff --git a/_includes/people_chip.html b/_includes/people_chip.html new file mode 100644 index 0000000000000000000000000000000000000000..e949b2bb800cf44ec7b055f48af542c9862414ad --- /dev/null +++ b/_includes/people_chip.html @@ -0,0 +1,19 @@ +{% capture purl %}/people/{{person}}/{% endcapture %} +{% assign pname = person %} +{% assign pimg = "" %} + +{% for pp in site.pages %} + {% if pp.url == purl %} + {% assign pname = pp.fullname %} + {% assign pimg = pp.pic %} + {% endif %} +{% endfor %} + +<a href="{{ site.baseurl }}{{purl}}"> + <div class="chip"> + {% if pimg != "" %} + <img src="{{ site.baseurl }}/{{pimg}}"> + {% endif %} + {{pname}} + </div> +</a> \ No newline at end of file diff --git a/_layouts/project.html b/_layouts/project.html index e3d431f26cc7f2e59acb857357f04cbd70a892b4..5c836140fa6b79324bf53afba420ec8453b81c46 100644 --- a/_layouts/project.html +++ b/_layouts/project.html @@ -2,37 +2,73 @@ layout: default --- -<div class="page"> - <h1 class="page-title"> - {{page.title}} - {% if page.start %} - {{page.start}} - {% if page.end %} {{page.end}}{% endif %} - {% endif %} -</h1> -{% if page.subtitle %}<h2>{{page.subtitle}}</h2>{% endif %} -{% if page.funding %} - <p>funded by {{page.funding}} - {% if page.program or page.grantid %}({% endif %} - {% if page.program %}{{page.program}}{% endif %} - {% if page.grantid %} - {{page.grantid}}{% endif %} - {% if page.program or page.grantid %}){% endif %} - </p> -{% endif %} - -{{ content }} - - {% if page.people %} - <h3>People</h3> - {{page.people}} - {% endif %} - {% if page.collaborators %} - <h3>Collaborators</h3> - {{page.collaborators}} - {% endif %} - - {% if page.homepage %} - <h3>Project Home Page</h3> - <a href="{{page.url}}">{{page.homepage}}</a> - {% endif %} +<div class="row"> + <div class="col s12 m5 left"> + <div class="card"> + <div class="card-content"> + <span class="card-title">{{page.title}}</span> + {% if page.subtitle %}<h6>{{page.subtitle}}</h6>{% endif %} + + {% if page.homepage %} + <p> + <a href="{{page.url}}">{{page.homepage}}</a> + </p> + {% endif %} + + {% if page.start %} + <p> + <b>From:</b> {{page.start}} {% if page.end %} <b>To:</b> {{page.end}} {% endif %} + </p> + {% endif %} + + </div> + + <div class="card-tabs"> + <ul class="tabs tabs-fixed-width"> + {% if page.funding %} + <li class="tab"><a href="#funding">Funding</a></li> + {% endif %} + {% if page.people %} + <li class="tab"><a href="#people">People</a></li> + {% endif %} + {% if page.collaborators %} + <li class="tab"><a href="#collaborators">Collaborators</a></li> + {% endif %} + </ul> + </div> + <div class="card-content grey lighten-4"> + {% if page.funding %} + <div id="funding"> + funded by {{page.funding}} + {% if page.program or page.grantid %}({% endif %} + {% if page.program %}{{page.program}}{% endif %} + {% if page.grantid %} - {{page.grantid}}{% endif %} + {% if page.program or page.grantid %}){% endif %} + </div> + {% endif %} + + {% if page.people %} + <div id="people"> + {% assign people = page.people | split: ',' %} + + {% for person in people %} + {% include people_chip.html person=person %} + {% endfor %} + </div> + {% endif %} + + {% if page.collaborators %} + <div id="collaborators"> + {{page.collaborators}} + </div> + {% endif %} + + + </div> + </div> + </div> + <p> + {{content}} + </p> </div> diff --git a/_layouts/system.html b/_layouts/system.html index 73cd7e84a8210eb0b74fffc0268b456f1c2fd5cc..4ade3d656a26b370d05e99b65a3a1b055bcd880e 100644 --- a/_layouts/system.html +++ b/_layouts/system.html @@ -2,29 +2,60 @@ layout: default --- -<div class="page"> - <h1 class="page-title"> - {{page.title}} - {% if page.start %} - {{page.start}} - {% if page.end %} {{page.end}}{% endif %} - {% endif %} -</h1> -{% if page.subtitle %}<h2>{{page.subtitle}}</h2>{% endif %} - -{{ content }} - - {% if page.people %} - <h3>People</h3> - {{page.people}} - {% endif %} - - {% if page.collaborators %} - <h3>Collaborators</h3> - {{page.collaborators}} - {% endif %} - - {% if page.homepage %} - <h3>Project Home Page</h3> - <a href="{{page.url}}">{{page.homepage}}</a> - {% endif %} -</div> +<div class="row"> + <div class="col s12 m5 left"> + <div class="card"> + <div class="card-content"> + <span class="card-title">{{page.title}}</span> + {% if page.subtitle %}<h6>{{page.subtitle}}</h6>{% endif %} + + {% if page.homepage %} + <p> + <a href="{{page.url}}">{{page.homepage}}</a> + </p> + {% endif %} + + {% if page.start %} + <p> + <b>From:</b> {{page.start}} {% if page.end %} <b>To:</b> {{page.end}} {% endif %} + </p> + {% endif %} + + </div> + + <div class="card-tabs"> + <ul class="tabs tabs-fixed-width"> + {% if page.people %} + <li class="tab"><a href="#people">People</a></li> + {% endif %} + {% if page.collaborators %} + <li class="tab"><a href="#collaborators">Collaborators</a></li> + {% endif %} + </ul> + </div> + <div class="card-content grey lighten-4"> + + {% if page.people %} + <div id="people"> + {% assign people = page.people | split: ',' %} + + {% for person in people %} + {% include people_chip.html person=person %} + {% endfor %} + </div> + {% endif %} + + {% if page.collaborators %} + <div id="collaborators"> + {{page.collaborators}} + </div> + {% endif %} + + + </div> + </div> + </div> + <p> + {{content}} + </p> +</div> \ No newline at end of file diff --git a/public/css/main.css b/public/css/main.css index 75a34236e7eee443e0bdde3c40fbeddef6267bb1..e7de137782272499d5f4c548c7388ca173b44887 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -36,6 +36,21 @@ h1, h2, h3, h4, h5, h6 { background-color: #5B78FD; } +/* tabs color */ +.tabs .tab a{ + color:#5B78FD; +} +.tabs .tab a:hover,.tabs .tab a.active { + background-color:transparent; + color:#5B78FD; +} +.tabs .tab.disabled a,.tabs .tab.disabled a:hover { + color:rgba(102,147,153,0.7); +} +.tabs .indicator { + background-color: #5B78FD; +} + /** sizing for navigation */ nav.top-nav { height: 122px;