-
Notifications
You must be signed in to change notification settings - Fork 64
UX Changes #546
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
UX Changes #546
Changes from 3 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,14 @@ | |
| <!-- Page Logo--> | ||
| {{ partial "header.html" . }} | ||
| </header> | ||
|
|
||
| {{- if .IsHome}} | ||
| <div> | ||
| <h2 style="margin-left: 2%;" class="Workshop-Projects-Header">Workshop Projects</h2> | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This will probably need to be localized |
||
| <p style="margin-left: 2%;">Here are the projects our organization has created.</p> | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This will probably need to be localized |
||
| </div> | ||
| {{- end}} | ||
|
|
||
| <article> | ||
| <aside> | ||
| <ul class="menu"> | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,86 +1,69 @@ | ||
| {{- $currentNode := . }} | ||
| {{- $showvisitedlinks := .Site.Params.showVisitedLinks -}} | ||
|
|
||
| {{- if eq .Site.Params.orderSectionsBy "title"}} | ||
| {{- range .Site.Home.Sections.ByTitle}} | ||
| {{- if (or (eq $currentNode .Site.Home) (.IsAncestor $currentNode))}} | ||
| {{- template "section-tree-nav" dict "sect" . "currentnode" $currentNode "showvisitedlinks" $showvisitedlinks}} | ||
| {{- end}} | ||
| {{- end}} | ||
| {{- else}} | ||
| {{- range .Site.Home.Sections.ByWeight}} | ||
| {{- if (or (eq $currentNode .Site.Home) (.IsAncestor $currentNode))}} | ||
| {{- template "section-tree-nav" dict "sect" . "currentnode" $currentNode "showvisitedlinks" $showvisitedlinks}} | ||
| {{- end}} | ||
| {{- end}} | ||
| {{- end}} | ||
| {{- $currentNode := . }} {{- $showvisitedlinks := .Site.Params.showVisitedLinks | ||
| -}} {{- if eq .Site.Params.orderSectionsBy "title"}} {{- range | ||
| .Site.Home.Sections.ByTitle}} {{- if (or (eq $currentNode .Site.Home) | ||
| (.IsAncestor $currentNode))}} {{- template "section-tree-nav" dict "sect" . | ||
| "currentnode" $currentNode "showvisitedlinks" $showvisitedlinks}} {{- end}} {{- | ||
| end}} {{- else}} {{- range .Site.Home.Sections.ByWeight}} {{- if (or (eq | ||
| $currentNode .Site.Home) (.IsAncestor $currentNode))}} {{- template | ||
| "section-tree-nav" dict "sect" . "currentnode" $currentNode "showvisitedlinks" | ||
| $showvisitedlinks}} {{- end}} {{- end}} {{- end}} | ||
|
|
||
| <!-- templates --> | ||
| {{- define "section-tree-nav" }} | ||
| {{- $showvisitedlinks := .showvisitedlinks }} | ||
| {{- $currentNode := .currentnode }} | ||
| {{- with .sect}} | ||
| {{- if and .IsSection (or (not .Params.hidden) $.showhidden)}} | ||
| {{- $numberOfPages := (add (len .Pages) (len .Sections)) }} | ||
| {{- safeHTML .Params.head}} | ||
| <li data-nav-id="{{.Permalink}}" class="dd-item | ||
| {{- define "section-tree-nav" }} {{- $showvisitedlinks := .showvisitedlinks }} | ||
| {{- $currentNode := .currentnode }} {{- with .sect}} {{- if and .IsSection (or | ||
| (not .Params.hidden) $.showhidden)}} {{- $numberOfPages := (add (len .Pages) | ||
| (len .Sections)) }} {{- safeHTML .Params.head}} | ||
| <li | ||
| data-nav-id="{{.Permalink}}" | ||
| class="dd-item | ||
| {{- if .IsAncestor $currentNode}} parent{{end}} | ||
| {{- if eq .Permalink $currentNode.Permalink}} active{{end}} | ||
| {{- if .Params.alwaysopen}} alwaysopen{{end -}} | ||
| {{- if ne $numberOfPages 0 }} haschildren{{end}} | ||
| "> | ||
| <div> | ||
| <a href="{{ .RelPermalink}}">{{safeHTML .Params.Pre}}{{.Title}}{{safeHTML .Params.Post}}</a> | ||
|
|
||
| {{- if ne $numberOfPages 0 }} | ||
| {{- if or (.IsAncestor $currentNode) (.Params.alwaysopen) }} | ||
| <i class="fa fa-angle-down fa-lg category-icon"></i> | ||
| {{- else -}} | ||
| <i class="fa fa-angle-right fa-lg category-icon"></i> | ||
| {{- end}} | ||
| {{- end}} | ||
| " | ||
| > | ||
| <div> | ||
| <a href="{{ .RelPermalink}}" | ||
| >{{safeHTML .Params.Pre}}{{.Title}}{{safeHTML .Params.Post}}</a | ||
| > | ||
|
|
||
| {{- if $showvisitedlinks}}<i class="fa fa-circle-thin read-icon"></i>{{end}} | ||
| </div> | ||
| {{- if ne $numberOfPages 0 }} | ||
| <ul> | ||
| {{- .Scratch.Set "pages" .Pages }} | ||
| {{- if .Sections}} | ||
| {{- .Scratch.Set "pages" (.Pages | union .Sections) }} | ||
| {{- end}} | ||
| {{- $pages := (.Scratch.Get "pages") }} | ||
|
|
||
| {{- if eq .Site.Params.orderPagesBy "title"}} | ||
| {{- range $pages.ByTitle }} | ||
| {{- if and .Params.hidden (not $.showhidden) }} | ||
| {{- else}} | ||
| {{- template "section-tree-nav" dict "sect" . "currentnode" $currentNode "showvisitedlinks" $showvisitedlinks }} | ||
| {{- end}} | ||
| {{- end}} | ||
| {{- else}} | ||
| {{- range $pages.ByWeight }} | ||
| {{- if and .Params.hidden (not $.showhidden) }} | ||
| {{- else}} | ||
| {{- template "section-tree-nav" dict "sect" . "currentnode" $currentNode "showvisitedlinks" $showvisitedlinks }} | ||
| {{- end}} | ||
| {{- end}} | ||
| {{- end}} | ||
| </ul> | ||
| {{- end}} | ||
| </li> | ||
| {{- else}} | ||
| {{- if not .Params.Hidden }} | ||
| <li data-nav-id="{{.Permalink}}" class="dd-item | ||
| {{- if eq .Permalink $currentNode.Permalink}} active{{end -}} | ||
| "> | ||
| <div> | ||
| <a href="{{ .RelPermalink}}"> | ||
| {{safeHTML .Params.Pre}}{{.LinkTitle}}{{safeHTML .Params.Post}} | ||
| </a> | ||
| {{- if $showvisitedlinks}}<i class="fa fa-circle-thin read-icon"></i>{{end}} | ||
| </div> | ||
| </li> | ||
| {{- end}} | ||
| {{- if ne $numberOfPages 0 }} {{- if or (.IsAncestor $currentNode) | ||
| (.Params.alwaysopen) }} | ||
| <i class="fa fa-angle-down fa-lg category-icon"></i> | ||
| {{- else -}} | ||
| <i class="fa fa-angle-up fa-lg category-icon"></i> | ||
| {{- end}} {{- end}} {{- if $showvisitedlinks}}<i | ||
| class="fa fa-circle-thin read-icon" | ||
| ></i | ||
| >{{end}} | ||
| </div> | ||
| {{- if ne $numberOfPages 0 }} | ||
| <ul> | ||
| {{- .Scratch.Set "pages" .Pages }} {{- if .Sections}} {{- .Scratch.Set | ||
| "pages" (.Pages | union .Sections) }} {{- end}} {{- $pages := (.Scratch.Get | ||
| "pages") }} {{- if eq .Site.Params.orderPagesBy "title"}} {{- range | ||
| $pages.ByTitle }} {{- if and .Params.hidden (not $.showhidden) }} {{- else}} | ||
| {{- template "section-tree-nav" dict "sect" . "currentnode" $currentNode | ||
| "showvisitedlinks" $showvisitedlinks }} {{- end}} {{- end}} {{- else}} {{- | ||
| range $pages.ByWeight }} {{- if and .Params.hidden (not $.showhidden) }} {{- | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Seems like visual studio code messed up the formatting here, let's see if we can fix this |
||
| else}} {{- template "section-tree-nav" dict "sect" . "currentnode" | ||
| $currentNode "showvisitedlinks" $showvisitedlinks }} {{- end}} {{- end}} {{- | ||
| end}} | ||
| </ul> | ||
| {{- end}} | ||
| {{- end}} | ||
| {{- end}} | ||
| </li> | ||
| {{- else}} {{- if not .Params.Hidden }} | ||
| <li | ||
| data-nav-id="{{.Permalink}}" | ||
| class="dd-item | ||
| {{- if eq .Permalink $currentNode.Permalink}} active{{end -}} | ||
| " | ||
| > | ||
| <div> | ||
| <a href="{{ .RelPermalink}}"> | ||
| {{safeHTML .Params.Pre}}{{.LinkTitle}}{{safeHTML .Params.Post}} | ||
| </a> | ||
| {{- if $showvisitedlinks}}<i class="fa fa-circle-thin read-icon"></i>{{end}} | ||
| </div> | ||
| </li> | ||
| {{- end}} {{- end}} {{- end}} {{- end}} | ||
Uh oh!
There was an error while loading. Please reload this page.