Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Added Sorting #5

Closed
wants to merge 1 commit into from
Closed

Added Sorting #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions dist/css/main.less.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/main.min.less.css
View file
Open in desktop

Large diffs are not rendered by default.

656 changes: 353 additions & 303 deletions index.html
View file
Open in desktop

Large diffs are not rendered by default.

59 changes: 31 additions & 28 deletions src/html/_experience.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,32 @@
<section class="description experience">
<div class="hidden-sm hidden-xs col-md-1 col-caret">
<i class="fa fa-angle-right"></i>

<li class="sort">
<section class="description experience">
<div class="hidden-sm hidden-xs col-md-1 col-caret">
<i class="fa fa-angle-right"></i>
</div>
<div class="col-sm-12 col-md-11">
<div class="flex-row flex-space-between">
<div class="padding-right-10">
<h1>{{experience.role | trim}}</h1>
<!--(bake-start _if="experience.company")-->
<h2>{{experience.company | trim}}</h2>
<!--(bake-end)-->
<!--(bake-start _if="experience.organization")-->
<h2>{{experience.organization | trim}}</h2>
<!--(bake-end)-->
</div>
<div class="volunteer-dateloc">
<!--(bake-start _if="experience.date")-->
<h6 class="date">{{experience.date | trim}}</h6>
<!--(bake-end)-->
<!--(bake-start _if="experience.location")-->
<h6 class="location">{{experience.location | trim}}</h6>
<!--(bake-end)-->
</div>
</div>
<!--(bake-start _if="experience.description")-->
<p>{{experience.description | trim}}</p>
<!--(bake-end)-->
</div>
<div class="col-sm-12 col-md-11">
<div class="flex-row flex-space-between">
<div class="padding-right-10">
<h1>{{experience.role | trim}}</h1>
<!--(bake-start _if="experience.company")-->
<h2>{{experience.company | trim}}</h2>
<!--(bake-end)-->
<!--(bake-start _if="experience.organization")-->
<h2>{{experience.organization | trim}}</h2>
<!--(bake-end)-->
</div>
<div class="volunteer-dateloc">
<!--(bake-start _if="experience.date")-->
<h6 class="date">{{experience.date | trim}}</h6>
<!--(bake-end)-->
<!--(bake-start _if="experience.location")-->
<h6 class="location">{{experience.location | trim}}</h6>
<!--(bake-end)-->
</div>
</div>
<!--(bake-start _if="experience.description")-->
<p>{{experience.description | trim}}</p>
<!--(bake-end)-->
</div>
</section>
</section>
</li>
4 changes: 4 additions & 0 deletions src/html/_head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@

<link rel="stylesheet" href="dist/css/main.min.less.css">
<link rel="icon" href="dist/img/icns/favicon-192.png" sizes="192x192" type="image/png">

<script src="https://code.jquery.com/jquery-1.12.4.js"></script>
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
<script src="src/js/sort.js"></script>
148 changes: 82 additions & 66 deletions src/html/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,72 +71,84 @@ <h2 class="profession">{{personal_info.profession | trim}}</h2>
<div class="flex-row flex-start col-md-6 half-page">
<!--(bake-start _if="experiences.length")-->
<!--(bake _section-header.html title="Work Experience")-->
<!--(bake _experience.html _foreach="experience:experiences")-->
<ul id="sort-experience" class="sort">
<!--(bake _experience.html _foreach="experience:experiences")-->
</ul>
<!--(bake-end)-->

<!--(bake-start _if="projects.length")-->
<!--(bake _section-header.html title="Open Source Projects")-->
<!--(bake-start _foreach="project:projects")-->
<section class="description project">
<div class="hidden-sm hidden-xs col-md-1 col-caret">
<i class="fa fa-angle-right"></i>
</div>
<div class="col-sm-12 col-md-11">
<div class="flex-row flex-space-between">
<h1>{{project.name | trim}}
<!--(bake-start _if="project.github")-->
<a href="{{project.github | trim}}" target="_blank"><i class="fa fa-github"></i></a>
<!--(bake-end)-->
<!--(bake-start _if="project.link")-->
<a href="{{project.link | trim}}" target="_blank"><i class="fa fa-globe"></i></a>
<!--(bake-end)-->
</h1>
</div>
<p>{{project.description | trim}}</p>
</div>
</section>
<!--(bake-end)-->
<ul id="sort-projects" class="sort">
<!--(bake-start _foreach="project:projects")-->
<li class="sort">
<section class="description project">
<div class="hidden-sm hidden-xs col-md-1 col-caret">
<i class="fa fa-angle-right"></i>
</div>
<div class="col-sm-12 col-md-11">
<div class="flex-row flex-space-between">
<h1>{{project.name | trim}}
<!--(bake-start _if="project.github")-->
<a href="{{project.github | trim}}" target="_blank"><i class="fa fa-github"></i></a>
<!--(bake-end)-->
<!--(bake-start _if="project.link")-->
<a href="{{project.link | trim}}" target="_blank"><i class="fa fa-globe"></i></a>
<!--(bake-end)-->
</h1>
</div>
<p>{{project.description | trim}}</p>
</div>
</section>
</li>
<!--(bake-end)-->
</ul>
<!--(bake-end)-->

<!--(bake-start _if="volunteering_experience.length")-->
<!--(bake _section-header.html title="Volunteering Experience")-->
<!--(bake _experience.html _foreach="experience:volunteering_experience")-->
<ul id="sort-volunteer" class="sort">
<!--(bake _experience.html _foreach="experience:volunteering_experience")-->
</ul>
<!--(bake-end)-->
</div>

<div class="flex-row flex-start col-md-6 half-page">
<!--(bake-start _if="education.length")-->
<!--(bake _section-header.html title="Education")-->
<!--(bake-start _foreach="school:education")-->
<section class="description education">
<div class="hidden-sm hidden-xs col-md-1 col-caret">
<i class="fa fa-angle-right"></i>
</div>
<div class="col-sm-12 col-md-11">
<div class="flex-row flex-space-between">
<div class="padding-right-10">
<h1>{{school.degree | trim}}</h1>
<h2>{{school.name | trim}}</h2>
<ul id="sort-education" class="sort">
<!--(bake-start _foreach="school:education")-->
<li class="sort">
<section class="description education">
<div class="hidden-sm hidden-xs col-md-1 col-caret">
<i class="fa fa-angle-right"></i>
</div>
<!--(bake-start _if="school.date")-->
<h6 class="date">{{school.date | trim}}</h6>
<!--(bake-end)-->
</div>
<!--(bake-start _if="school.description")-->
<p>{{school.description | trim}}</p>
<!--(bake-end)-->
</div>
</section>
<!--(bake-end)-->
<div class="col-sm-12 col-md-11">
<div class="flex-row flex-space-between">
<div class="padding-right-10">
<h1>{{school.degree | trim}}</h1>
<h2>{{school.name | trim}}</h2>
</div>
<!--(bake-start _if="school.date")-->
<h6 class="date">{{school.date | trim}}</h6>
<!--(bake-end)-->
</div>
<!--(bake-start _if="school.description")-->
<p>{{school.description | trim}}</p>
<!--(bake-end)-->
</div>
</section>
</li>
<!--(bake-end)-->
</ul>
<!--(bake-end)-->

<!--(bake-start _if="skills.length")-->
<!--(bake _section-header.html title="Skills")-->
<section class="description skills">
<div class="col-md-12 flex-row flex-space-between">
<ul>
<ul id="sort-skill" class="sort">
<!--(bake-start _foreach="skill:skills")-->
<li>{{skill | trim}}</li>
<li>&#8226; {{skill | trim}}</li>
<!--(bake-end)-->
</ul>
</div>
Expand All @@ -145,41 +157,45 @@ <h6 class="date">{{school.date | trim}}</h6>

<!--(bake-start _if="certificates.length")-->
<!--(bake _section-header.html title="Certifications")-->
<ul id="sort-certifications" class="sort">
<!--(bake-start _foreach="certificate:certificates")-->
<section class="description certificate">
<div class="hidden-sm hidden-xs col-md-1 col-caret">
<i class="fa fa-angle-right"></i>
</div>
<div class="col-sm-12 col-md-11">
<div class="flex-row flex-space-between">
<div>
<h1>{{certificate.title | trim}}</h1>
<h2>{{certificate.authority | trim}}</h2>
<li class="sort">
<section class="description certificate">
<div class="hidden-sm hidden-xs col-md-1 col-caret">
<i class="fa fa-angle-right"></i>
</div>
<div class="col-sm-12 col-md-11">
<div class="flex-row flex-space-between">
<div>
<h1>{{certificate.title | trim}}</h1>
<h2>{{certificate.authority | trim}}</h2>
</div>
<!--(bake-start _if="certificate.date")-->
<h6 class="date">{{certificate.date | trim}}</h6>
<!--(bake-end)-->
</div>
<!--(bake-start _if="certificate.date")-->
<h6 class="date">{{certificate.date | trim}}</h6>
<!--(bake-start _if="certificate.description")-->
<p>{{certificate.description | trim}}</p>
<!--(bake-end)-->
</div>
<!--(bake-start _if="certificate.description")-->
<p>{{certificate.description | trim}}</p>
<!--(bake-end)-->
</div>
</section>
</section>
</li>
<!--(bake-end)-->
</ul>
<!--(bake-end)-->

<!--(bake-start _if="honors.length")-->
<!--(bake _section-header.html title="Honors & Awards")-->
<section class="description honors">
<div class="col-md-12 flex-row flex-space-between">
<ul>
<ul id="sort-honors">
<!--(bake-start _foreach="honor:honors")-->
<li class="sort">
<div class="flex-row flex-space-between">
<li>
{{honor.title | trim}}
</li>
&#8226; {{honor.title | trim}}
<span>{{honor.date | trim}}</span>
</div>
<li>
<!--(bake-end)-->
</ul>
</div>
Expand All @@ -190,10 +206,10 @@ <h6 class="date">{{certificate.date | trim}}</h6>
<!--(bake _section-header.html title="Languages")-->
<section class="description languages">
<div class="col-md-12 flex-row flex-space-between">
<ul>
<ul id="sort-language" class="sort">
<!--(bake-start _foreach="language:languages")-->
<li class="inline fifty">
<strong>{{language.name | trim}}</strong> - {{language.level | trim}}
&#8226; <strong>{{language.name | trim}}</strong> - {{language.level | trim}}
</li>
<!--(bake-end)-->
</ul>
Expand Down
28 changes: 28 additions & 0 deletions src/js/sort.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
$( function() {
$( "#sort-language" ).sortable();
$( "#sort-language" ).disableSelection();

$( "#sort-honors" ).sortable();
$( "#sort-honors" ).disableSelection();

$( "#sort-skill" ).sortable();
$( "#sort-skill" ).disableSelection();

$( "#sort-experience" ).sortable();
$( "#sort-experience" ).disableSelection();

$( "#sort-education" ).sortable();
$( "#sort-education" ).disableSelection();

$( "#sort-opensource" ).sortable();
$( "#sort-opensource" ).disableSelection();

$( "#sort-certifications" ).sortable();
$( "#sort-certifications" ).disableSelection();

$( "#sort-projects" ).sortable();
$( "#sort-projects" ).disableSelection();

$( "#sort-volunteer" ).sortable();
$( "#sort-volunteer" ).disableSelection();
});
11 changes: 11 additions & 0 deletions src/less/base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,14 @@ a:hover {
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
padding: 4px;
}

/** SORT **/

.sort li:hover, div.sort:hover { cursor: pointer; background: #ccc;}

li.sort:hover { cursor: pointer; background: #ccc;}
ul.sort {padding-left: 0px;}
li.sort {float: left;list-style-type: none; width: 100%;}
.bullet {margin-right: 5px;}

main .description ul { list-style-type: none; padding-left: 6%; }