added option ko.always_show_participants (default false)

eemeli · Oct 10, 2013 · ebcc228 · ebcc228
1 parent afde22d
commit ebcc228
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 16 deletions.
diff --git a/app.js b/app.js
@@ -25,7 +25,8 @@ var ko = {
 	'full_version': !navigator.userAgent.match(/Android [12]/),
 	'default_duration': 60,
 	'time_show_am_pm': false,
-	'abbrev_00_minutes': true // only for am/pm time
+	'abbrev_00_minutes': true, // only for am/pm time
+	'always_show_participants': false
 };
 if (typeof konopas_set == 'object') for (var i in konopas_set) ko[i] = konopas_set[i];
 
@@ -320,6 +321,7 @@ function show_prog_list(ls) {
 			+ '<div class="item" id="p' + ls[i].id + '">'
 				+ '<div class="title">' + ls[i].title + '</div>'
 				+ _item_loc(ls[i])
+				+ (ko.always_show_participants ? _item_people(ls[i]) : '')
 			+ '</div>');
 	}
 	EL("prog_ls").innerHTML = list.join('</div>');

diff --git a/skin/skin.css b/skin/skin.css
@@ -532,39 +532,48 @@ input[type="text"]:valid + #q_ctrl input {
   margin-bottom: 5px;
   cursor: pointer;
 }
-.item div {
-  float: left;
-  padding-right: 10px;
-  min-height: 1em;
-}
-.title {
+.item > div {
   margin-left: 40px;
 }
-.loc {
+.item .title {
+  margin: 3px 0 3px 40px;
+}
+.item .loc,
+.item > .item-people {
   color: #88847d;
   font-size: 0.875em;
-  clear: left;
-  margin: 3px 10px 0 40px;
+}
+.item .loc a,
+.item > .item-people a {
+  color: #88847d;
 }
 .extra {
+  margin: 0 !important;
   display: none;
   clear: left;
   padding: 0 0 0 10px;
 }
 .extra div {
   float: none;
 }
+.extra .item-people {
+  max-width: 600px;
+  margin: 1em 0;
+}
 .expanded {
   background: #f5e6c3;
 }
 .expanded .item_star {
   background: #f0d79d;
 }
+.expanded .title {
+  font-weight: 500;
+}
 .expanded .loc {
   color: #736f68;
 }
-.expanded .title {
-  font-weight: 500;
+.expanded .item > .item-people {
+  display: none;
 }
 .expanded .extra {
   display: block;

diff --git a/skin/skin.less b/skin/skin.less
@@ -251,20 +251,26 @@ input[type="text"] {
 
 .item {
 	clear: both; display: block; overflow: auto; padding-top: 5px; padding-left: 0; margin-bottom: 5px; cursor: pointer;
-	div { float:left; padding-right: 10px; min-height: 1em; }
+	> div { margin-left: 40px; }
+	.title { margin: 3px 0 3px 40px; }
+	.loc, > .item-people {
+		color: @fg-light; font-size: 0.875em;
+		a { color: @fg-light; }
+	}
 }
-.title { margin-left: 40px; }
-.loc { color: @fg-light; font-size: 0.875em; clear: left; margin: 3px 10px 0 40px; }
 .extra {
+	margin: 0 !important;
 	display: none; clear: left; padding: 0 0 0 10px;
 	div { float: none; }
+	.item-people { max-width: @main-width; margin: 1em 0; }
 }
 
 .expanded {
 	background: @bg-highlight;
 	.item_star { background: @bg-highlight-more; }
-	.loc { color: @fg-light-in-box; }
 	.title { .font-heavy; }
+	.loc { color: @fg-light-in-box; }
+	.item > .item-people { display: none; }
 	.extra { display: block; }
 }