Skip to content

Commit

Permalink
moved people ranges to sub-menu + general code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
eemeli committed Oct 5, 2014
1 parent 57f8865 commit 5ebf38b
Show file tree
Hide file tree
Showing 12 changed files with 109 additions and 183 deletions.
3 changes: 0 additions & 3 deletions i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,10 @@

"search_hint": "<b>Hint:</b> search is for full words in the item title, description, tags, location, and participants. You may use * and ? as wildcards and \"quoted words\" for exact phrases.",
"search_example": "For example, you could try <b>{X}</b>",
"part_filter": "{T, select, first{All participants by first name} last{All participants by last name} other{All programme participants}}",
"no_ko_id": "No ID set! Please assign konopas_set.id a unique identifier.",
"old_browser": "Unfortunately, your browser doesn't support some of the Javascript features required by KonOpas. To use, please try a different browser.",
"item_not_found": "Programme id <b>{ID}</b> not found!",
"item_tags": "{T, select, tags{Tags} track{Track} type{Type} other{{T}}}",
"last_ended": "There last programme item ended {D, plural, =0{} one{one day and} other{# days and}} {H, plural, =0{} one{one hour and} other{# hours and}} {M, plural, one{one minute} other{# minutes}} ago.",
"next_start": "The next programme item starts in {D, plural, =0{} one{one day and} other{# days and}} {H, plural, =0{} one{one hour and} other{# hours and}} {M, plural, one{one minute} other{# minutes}}.",
"star_export_this": "Your current selection is encoded in <a href=\"{THIS}\" target=\"_blank\">this page's URL</a>, which you may open elsewhere to share your selection.",
"star_export_share": "For easier sharing, you can also generate a <a href=\"{SHORT}\">shorter link</a> or a <a href=\"{QR}\">QR code</a>.",
"star_import_this": "Your previously selected items are shown with a highlighted interior, while those imported via <a href=\"{THIS}\">this link</a> have a highlighted border.",
Expand Down
3 changes: 0 additions & 3 deletions i18n/fi.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,10 @@

"search_hint": "<b>Vinkki:</b> Haku etsii sanoja otsikosta, tiedoista, tägeistä, paikoista ja osanottajista. Voit käyttää * ja ? -merkkejä villikortteina ja \"sanoja lainausmerkeissä\" täsmälliseen hakuun.",
"search_example": "Esimerkiksi voisit kokeilla <b>{X}</b>",
"part_filter": "{T, select, first{Kaikki osanottajat etunimen mukaan} last{Kaikki osanottajat sukunimen mukaan} other{Kaikki osanottajat}}",
"no_ko_id": "Ei asetettua ID:tä. Aseta konopas_set.id uniikiksi tunnisteeksi.",
"old_browser": "Selaimesi ei tue kaikkia KonOppaan tarvitsemia Javascript-ominaisuuksia. Ole hyvä ja kokeile toista selainta.",
"item_not_found": "Ohjelmaa <b>{ID}</b> ei löydy!",
"item_tags": "{T, select, tags{Tägit} track{Track} type{Tyyppi} other{{T}}}",
"last_ended": "Viimeinen ohjelma loppui {D, plural, =0{} one{päivä ja} other{# päivää ja}} {H, plural, =0{} one{tunti ja} other{# tuntia ja}} {M, plural, one{yksi minuutti} other{# minuuttia}} sitten.",
"next_start": "Seuraava ohjelma alkaa {D, plural, =0{} one{yhden päivän ja} other{# päivän ja}} {H, plural, =0{} one{yhden tunnin ja} other{# tunnin ja}} {M, plural, one{yhden minuutin} other{# minuutin}} kuluttua.",
"star_export_this": "Valintasi ovat tallennettu <a href=\"{THIS}\" target=\"_blank\">sivun osoitteeseen</a>. Voit avata sen toisaalla jakaaksesi valintasi.",
"star_export_share": "Jakamisen helpottamiseksi voit myös generoida <a href=\"{SHORT}\">lyhytlinkin</a> tai <a href=\"{QR}\">QR-koodin</a>.",
"star_import_this": "Aiemmin valitsemillasi ohjelmilla on korostettu tausta ja <a href=\"{THIS}\">tämän linkin</a> kautta tuoduilla on korostettu reuna.",
Expand Down
3 changes: 0 additions & 3 deletions i18n/sv.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,10 @@

"search_hint": "<b>Tips:</b> sökning sker efter hela ord i programpunkternas titel, beskrivning, taggar, sal och deltagare. Det går att använda * och ? som jokertecken och \"citerade ord\" för exakta fraser.",
"search_example": "Prova till exempel <b>{X}</b>",
"part_filter": "{T, select, first{Alla deltagare efter förnamn} last{Alla deltagare efter efternamn} other{Visa alla deltagare i programmet}}",
"no_ko_id": "ID saknas! Ge konopas_set.id en unik identifierare.",
"old_browser": "Tyvärr hanterar din webbläsare inte några av de JavaScript-funktioner som KonOpas behöver. Du behöver använda en annan webbläsare.",
"item_not_found": "Hittade inte program-ID <b>{ID}</b>!",
"item_tags": "{T, select, tags{Tags} track{Tracks} type{Types} other{{T}}}",
"last_ended": "There last program item ended {D, plural, =0{} one{one day and} other{# days and}} {H, plural, =0{} one{one hour and} other{# hours and}} {M, plural, one{one minute} other{# minutes}} ago.",
"next_start": "Nästa programpunkt börjar om {D, plural, =0{} one{one day and} other{# day and}} {H, plural, =0{} one{en timme och} other{# timmar och}} {M, plural, one{en minut} other{# minuter}}.",
"star_export_this": "Dina aktuella stjärnmarkeringar är lagrade i <a href=\"{THIS}\" target=\"_blank\">adressen till denna sida</a>, som du kan öppna på en annan plats och dela med dig av.",
"star_export_share": "Dela enklare med en <a href=\"{SHORT}\">kortare länk</a> eller en <a href=\"{QR}\">QR-kod</a>.",
"star_import_this": "Dina tidigare stjärnmarkerade punkter har ett markerat innanmäte, medan de som importerats via <a href=\"{THIS}\">denna länk</a> har en markerad kant.",
Expand Down
9 changes: 4 additions & 5 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ <h1><a href="#info" alt="CONVENTION" title="CONVENTION">

<ul id="tabs">
<li id="tab_star"><a href="#star" data-txt>My con</a>
<li id="tab_prog"><a href="#" data-txt>Program</a><div id="day-sidebar"></div>
<li id="tab_part"><a href="#part" data-txt>People</a>
<li id="tab_prog"><a href="#" data-txt>Program</a><div id="day-sidebar" class="sub-side"></div>
<li id="tab_part"><a href="#part" data-txt>People</a><div id="part-sidebar" class="sub-side"></div>
<li id="tab_info"><a href="#info" data-txt>Info</a>
</ul>

Expand All @@ -77,12 +77,11 @@ <h1><a href="#info" alt="CONVENTION" title="CONVENTION">
</form>
<div id="filter_sum"></div>
</div>
<div id="day-narrow"></div>
<div id="next_start_note"></div>
<div id="day-narrow" class="sub-narrow"></div>
</div>

<div id="part_view" class="view">
<div id="part_filters" class="filters"></div>
<div id="part-narrow" class="sub-narrow"></div>
<ul id="part_names"></ul>
<div id="part_info"></div>
</div>
Expand Down
21 changes: 21 additions & 0 deletions skin/head.less
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,25 @@
border: @border-normal;
}

.sub-side {
ul { margin: -3px 0 3px 0; font-size: 0.8em; font-weight: 400; }
li { border: none !important; padding: 3px 6px !important; }
li:after { content: " «"; }
}
.sub-narrow {
display: table;
width: 100%;
ul { display: table-row !important; margin-top: 20px !important; padding-left: 0; }
li {
display: table-cell;
text-align: center;
text-decoration: none;
padding: 6px;
cursor: pointer;
&:before { content: "» "; }
}
}

#refresh { display: none; }
#refresh.enabled {
display: inline-block;
Expand Down Expand Up @@ -104,6 +123,7 @@
border-top-left-radius: @border-radius;
border-top-right-radius: @border-radius;
}
.sub-side { display: none !important; }
}

@media (min-width: 700px) {
Expand All @@ -122,6 +142,7 @@
border-top-left-radius: @border-radius;
border-bottom-left-radius: @border-radius;
}
.sub-narrow { display: none !important; }
#main { position: absolute; top: 0; left: (@page-margin + @side-width + @side-margin); right: 10px; }
#main p { max-width: @main-width; }
}
1 change: 0 additions & 1 deletion skin/main.less
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ ul.popup, .popup ul {

.view { display: none; }

@import "next.less";
@import "star.less";
@import "prog.less";
@import "part.less";
Expand Down
37 changes: 0 additions & 37 deletions skin/next.less

This file was deleted.

15 changes: 11 additions & 4 deletions skin/part.less
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,19 @@
}

#name_sort li { display: inline-block; padding: 0 10px; }
#name_range {
display: inline-block; margin: 5px 0 20px 0; padding: 0;
li { display: inline-block; width: 60px; text-align: right; }

.name-list {
display: none;
.part & { display: block; }
/*margin: 5px 0 20px 0; padding: 0;
li { display: inline-block; width: 60px; text-align: right; }*/
}

#part_names {
list-style-type: none; margin: 0; -webkit-column-width: 260px; -moz-column-width: 260px; column-width: 260px;
list-style-type: none;
margin: 20px 0 0 10px;
padding: 0;
-webkit-column-width: 260px; -moz-column-width: 260px; column-width: 260px;
li { cursor: auto; }
a { text-decoration: none; }
&.fn-only, &.ln-only {
Expand Down
20 changes: 0 additions & 20 deletions skin/prog.less
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,6 @@
display: none;
.prog & { display: block; }
}
#day-sidebar {
ul { margin: -3px 0 3px 0; font-size: 0.8em; font-weight: 400; }
li { border: none; padding: 3px 6px; }
li:after { content: " «"; }
}
#day-narrow {
display: table;
width: 100%;
ul { display: table-row; margin-top: 20px !important; padding-left: 0; }
li {
display: table-cell;
text-align: center;
text-decoration: none;
padding: 6px;
cursor: pointer;
&:before { content: "» "; }
}
}
@media (min-width: 700px) { #day-narrow { display: none !important; } }
@media (max-width: 699px) { #day-sidebar { display: none !important; } }

#prog_filters {
margin-left: (-1 * @side-margin);
Expand Down
9 changes: 4 additions & 5 deletions src/item.js
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,10 @@ KonOpas.Item.show_list = function(ls, opt) {
star_els[i].onclick = function() { konopas.stars.toggle(this, this.id.substr(1)); return false; };
}

var star_list = konopas.stars.list();
for (var i = 0, l = star_list.length; i < l; ++i) {
var el = _el('s' + star_list[i]);
if (el) el.classList.add("has_star");
}
konopas.stars.list().forEach(function(s){
var el = _el('s' + s);
if (el) el.classList.add('has_star');
});

if (opt.id) {
var it = document.getElementById('p' + opt.id);
Expand Down
Loading

0 comments on commit 5ebf38b

Please sign in to comment.