merge
authorDominique Hazaël-Massieux <dom@w3.org>
Fri, 20 Jul 2012 15:35:24 +0200
changeset 742 d958fd164272
parent 741 2289a0499dbf (current diff)
parent 739 c97c915e36f4 (diff)
child 743 0e58fabc0175
merge
--- a/node.js/public/css/style_.css	Fri Jul 20 15:34:18 2012 +0200
+++ b/node.js/public/css/style_.css	Fri Jul 20 15:35:24 2012 +0200
@@ -43,6 +43,25 @@
 .mainList {
 	list-style-type: none;
 	margin: 0 0 5px;
+	display: table;
+	width: 100%;
+	border-collapse: collapse;
+}
+.mainList li {
+	margin: 0;
+	padding: 5px 0;
+	padding-left:36px;
+	border-top: 1px solid lightgrey;
+	min-height: 48px;
+	display:table-row;
+	
+}
+.mainList li > div {
+	display: table-cell;
+	vertical-align: middle;
+	height: 58px;
+	position: relative;
+	padding-left: 46px;
 }
 .mainList li a:first-child:hover {
 	text-decoration: none;
@@ -51,14 +70,12 @@
 	text-decoration: underline;
 }
 .mainList img {
-	margin-right: 3px;
+	margin: 5px 3px 5px 5px;
+	position: absolute;
+	top:0;
+	left:0;
 }
 
-.mainList li {
-	margin: 0;
-	padding: 5px 0;
-	border-top: 1px solid lightgrey;
-}
 
 .mainList li:first-child {
 	border-top: 1px solid lightgrey;
--- a/node.js/views/index.ejs	Fri Jul 20 15:34:18 2012 +0200
+++ b/node.js/views/index.ejs	Fri Jul 20 15:35:24 2012 +0200
@@ -3,6 +3,7 @@
 <ul id="messages" class="mainList">
 <% for (var s = 0; s < statusupdates.length; s++) { %>
 <li>
+<div>
 	<a href="<%= baseurl %>/people/profile/<%= statusupdates[s].author.slug %>">
 		<img src="<% if (statusupdates[s].author.picture_thumb) { %><%=statusupdates[s].author.picture_thumb%><% } else { %><%= baseurl %>/img/default-pic.png<% } %>" width='36' alt="Picture of <%= statusupdates[s].author.given + " " + statusupdates[s].author.family %>">
 		<span><%= statusupdates[s].author.given + " " + statusupdates[s].author.family %></span>
@@ -13,6 +14,7 @@
 	<%= statusupdates[s].content %>
 <% } %>
 	<span class="label label-warning"><%= elapsedTime(statusupdates[s].time) %></span>
+</div>
 </li>
 <% } %>
 </ul>
--- a/node.js/views/layout.ejs	Fri Jul 20 15:34:18 2012 +0200
+++ b/node.js/views/layout.ejs	Fri Jul 20 15:35:24 2012 +0200
@@ -22,6 +22,7 @@
 	</div>
 	</footer>
 
+	<script src="<%= baseurl %>/js/libs/bootstrap.js"></script>
 	<script src="<%= baseurl %>/js/libs/jquery-1.5.1.min.js"></script>
 	<script src="<%= baseurl %>/js/libs/jquery.form.js"></script>
 	<script src="<%= baseurl %>/js/mylibs/forms.js"></script>
--- a/node.js/views/schedule/addEvent.ejs	Fri Jul 20 15:34:18 2012 +0200
+++ b/node.js/views/schedule/addEvent.ejs	Fri Jul 20 15:35:24 2012 +0200
@@ -2,14 +2,14 @@
 <div class="control-group">
 	<label class="control-label" for="name">Name</label>
 	<div class="controls">
-		<input id="name" name="name" required>
+		<input id="name" name="name" class="input-xlarge" required>
 	</div>
 </div>
 
 <div class="control-group">
 	<label class="control-label" for="day">Day</label>
 	<div class="controls">
-		<select id="day" name='day'>
+		<select id="day" name='day' class="input-xlarge">
 			<option value='20121029'>Monday</option>
 			<option value='20121030'>Tuesday</option>
 			<option value='20121031'>Wednesday</option>
@@ -38,7 +38,7 @@
 <div class="control-group">
 	<label class="control-label" for="room">Room</label>
 	<div class="controls">
-		<select id="room" name='room'>
+		<select id="room" name='room' class="input-xlarge">
 			<option>Unknown</option>
 			<% for (var p  in places) { %> 
 			<option value="<%= places[p].shortname %>"><%= places[p].name %></option>
@@ -53,14 +53,14 @@
 <div class="control-group">
 	<label class="control-label" for="presenters">Presenters</label>
 	<div class="controls">
-		<input id="presenters" name='presenters'>
+		<input id="presenters" name='presenters' class="input-xlarge">
 	</div>
 </div>
 
 <div class="control-group">
 	<label class="control-label" for="confidentiality">Confidentiality</label>
 	<div class="controls">
-		<select id="confidentiality" name="confidentiality">
+		<select id="confidentiality" name="confidentiality" class="input-xlarge">
 			<option>public</option>
 			<option value="member">W3C Member-only</option>
 		</select>
@@ -70,7 +70,7 @@
 <div class="control-group">
 	<label class="control-label" for="observers">Observers</label>
 	<div class="controls">
-		<select id="observers" name="observers">
+		<select id="observers" name="observers" class="input-xlarge">
 			<option value="chairs">Allowed, to the Chairs discretion</option>
 			<option value="no">Not allowed</option>
 		</select>
--- a/node.js/views/schedule/admin.ejs	Fri Jul 20 15:34:18 2012 +0200
+++ b/node.js/views/schedule/admin.ejs	Fri Jul 20 15:35:24 2012 +0200
@@ -1,18 +1,17 @@
 <%- messages()%>
 <h2>Schedule</h2>
 <form action='' method='post'>
-<p><label>URI of JSON schedule: <input type="url" name="schedule"></label></p>
-<p><input type="submit" name="updateSchedule"></p>
+	<p><label>URI of JSON schedule: <input type="url" name="schedule"></label></p>
+	<p><input type="submit" name="updateSchedule"></p>
 </form>
 
-<h2>Events</h2>
-<h3>Add new event</h3>
-<form action='' method='post'>
+<h2>Add new event</h2>
+<form action='' method='post' class="form-horizontal">
 <%- partial('schedule/addEvent.ejs', {places: places, includeDetails: true}) %>
 </form>
 
-<h3>Update existing event</h3>
-<p>Pick the event you want to edit:</p>
-<dl id="accordion" class="list-accordion">
-<%- partial("schedule/full-schedule.ejs", {days: days, timeslots: timeslots, schedule:schedule, expanded: expanded}) %>
+<h2>Update existing event</h2>
+	<p>Pick the event you want to edit:</p>
+	<dl id="accordion" class="list-accordion">
+	<%- partial("schedule/full-schedule.ejs", {days: days, timeslots: timeslots, schedule:schedule, expanded: expanded}) %>
 </dl>
\ No newline at end of file