Flex and sidebar

1 files changed, 362 insertions, 329 deletions

diff --git a/templates/goto.tmpl.php b/templates/goto.tmpl.php
index 60c45908..af221a0f 100644
--- a/templates/goto.tmpl.php
+++ b/templates/goto.tmpl.php
@@ -40,368 +40,401 @@
 	$hideNames = $poll->getIsAnonymous() && $poll->getFullAnonymous();
 	$notification = $_['notification'];
 
-	if ($poll->getExpire() == null) {
+	if ($poll->getExpire() === null) {
 		$expired = false;
 	} else {
 		$expired = time() > strtotime($poll->getExpire());
 	}
-?>
+	
+	if ($expired) {
+		$statusClass = "expired-vote";
+	} else {
+		$statusClass = "open-vote";
+		if (time() < strtotime($poll->getExpire())) {
+			$statusClass = $statusClass . ' endless';
+		}
+	}
 
-<?php
-if (   $poll->getDescription() != null 
-	&& $poll->getDescription() != ''
-) {
-	$description = nl2br($poll->getDescription());
-} else {
-	$description = $l->t('No description provided.');
-}
+ 	if ($poll->getType() == '0') {
+		$pollType = 'date-poll';
+		$pollTypeClass = 'date-poll';
+	} else if ($poll->getType() == '1') {
+		$pollType = 'option-poll';
+		$pollTypeClass = 'option-poll';
+	}
+
+	if (   $poll->getDescription() != null 
+		&& $poll->getDescription() != ''
+	) {
+		$description = nl2br($poll->getDescription());
+	} else {
+		$description = $l->t('No description provided.');
+	}
 
-// init array for counting 'yes'-votes for each date
-$total_y = array();
-$total_n = array();
-for ($i = 0 ; $i < count($dates) ; $i++) {
-	$total_y[$i] = 0;
-	$total_n[$i] = 0;
-}
-$user_voted = array();
+	// init array for counting 'yes'-votes for each date
+	$total = array();
+	for ($i = 0 ; $i < count($dates) ; $i++) {
+		$total['yes'][$i] = 0;
+		$total['no'][$i] = 0;
+	}
 
-$pollUrl = $urlGenerator->linkToRouteAbsolute('polls.page.goto_poll', ['hash' => $poll->getHash()]);
+	$userVoted = array();
+	$pollUrl = $urlGenerator->linkToRouteAbsolute('polls.page.goto_poll', ['hash' => $poll->getHash()]);
 ?>
 
 <div id="app">
-	<div id="app-content">
-		<div id="app-content-wrapper">
-			<div id="controls">
-				<div id="breadcrump">
-					<?php if (User::isLoggedIn()) : ?>
-					<div class="crumb svg" data-dir="/">
-						<a href="<?php p($urlGenerator->linkToRoute('polls.page.index')); ?>">
-							<img class="svg" src="<?php print_unescaped(OCP\image_path("core", "places/home.svg")); ?>"" alt="Home">
-						</a>
-					</div>
-					<div class="crumb svg last">
-						<span><?php p($poll->getTitle()); ?></span>
-					</div>
-					<?php endif; ?>
+	<div id="app-content" class="<?php p($statusClass . ' ' . $pollTypeClass); ?>">
+		<div id="controls">
+			<div id="breadcrump">
+				<?php if (User::isLoggedIn()) : ?>
+				<div class="crumb svg" data-dir="/">
+					<a href="<?php p($urlGenerator->linkToRoute('polls.page.index')); ?>">
+						<img class="svg" src="<?php print_unescaped(OCP\image_path("core", "places/home.svg")); ?>"" alt="Home">
+					</a>
+				</div>
+				<div class="crumb svg last">
+					<span><?php p($poll->getTitle()); ?></span>
+				</div>
+				<?php endif; ?>
 
-					<?php if (!User::isLoggedIn()) : ?>
-					<div class="col-100">
-						<h2><?php p($poll->getTitle()); ?></h2>
-					</div>
-					<?php endif; ?>
+				<?php if (!User::isLoggedIn()) : ?>
+				<div class="col-100">
+					<h2><?php p($poll->getTitle()); ?></h2>
 				</div>
-				<div title="Details" class="button details">
-					<span class="symbol icon-details"></span>
-				</div>			
+				<?php endif; ?>
 			</div>
-			<div class="table has-controls">
-				<div class="col-70">
-					<div class="wordwrap desc"><?php p($description); ?></div>
-					<div class="scroll_div">
-						<table class="vote_table">
-							<thead>
-									<?php
+			
+			
+			<a id="switchDetails" class="button details" title="Details" href="#">
+				<span class="symbol icon-details"></span>
+				<?php if (count($comments)) : ?>
+					<div id="comment-counter" class="badge"><?php p(count($comments)) ?></div>
+				<?php else: ?>
+					<div class="badge no-comments"><?php p(count($comments)) ?></div>
+				<?php endif; ?>
+			</a>			
+		</div>
+		<div id="votings" class="main-container">
+			<div class="wordwrap description"><?php p($description); ?></div>
+			<div class="table">
+				<div id="header-row" class="row-container header" >
+					<div class="column first"></div>
+					<?php
+					foreach ($dates as $el) {
+						if ($poll->getType() == '0') {
+							$datavalue = strtotime($el->getDt());
+							print_unescaped('<div id="slot-' . $datavalue . '" title="' . $el->getDt() . ' ' . date_default_timezone_get() . '" class="column time-slot" data-value="' . $datavalue . '" value="' . $el->getDt() . '">');
+							
+							print_unescaped('<div class="month">' . $l->t(date('M', $datavalue))  . '</div>');
+							print_unescaped('<div class="day">'   .       date('j', $datavalue)   . '</div>');
+							print_unescaped('<div class="dayow">' . $l->t(date('D', $datavalue))  . '</div>');
+							print_unescaped('<div class="time">'  .       date('G:i', $datavalue) . ' UTC</div>');
+							print_unescaped('</div>');
+						} else {
+							print_unescaped('<div title="' . preg_replace('/_\d+$/', '', $el->getText()) . '" class="column vote-option">' . preg_replace('/_\d+$/', '', $el->getText()) . '</div>');
+						}
+					}
+					?>
+				</div>
+				<div class="votes">
+					<?php
+					if ($votes != null) {
+						//group by user
+						$others = array();
+						foreach ($votes as $vote) {
+							if (!isset($others[$vote->getUserId()])) {
+								$others[$vote->getUserId()] = array();
+							}
+							array_push($others[$vote->getUserId()], $vote);
+						}
+						$userCnt = 0;
+						foreach (array_keys($others) as $usr) {
+							$userCnt++;
+							if ($usr == $userId) {
+								// if poll expired, just put current user among the others;
+								// otherwise skip here to add current user as last row (to vote)
+								if (!$expired) {
+									$userVoted = $others[$usr];
+									continue;
+								}
+							}
+							print_unescaped('<div class="row-container">');
+							print_unescaped('	<div class="column first">');
+							print_unescaped('		<div class="avatar-cell">');
+							if (	$userMgr->get($usr) != null 
+								&& !$isAnonymous && !$hideNames
+							) {
+								print_unescaped('			<div class="poll avatardiv" title="'.($usr).'"></div>');
+								print_unescaped('		</div>');
+								print_unescaped('	<div colspan="2" class="name">');
+								p($userMgr->get($usr)->getDisplayName());
+							} else {
+								if ($isAnonymous || $hideNames) {
+									print_unescaped('			<div class="poll avatardiv" title="'.($userCnt).'"></div>');
+									print_unescaped('		</div>');
+									print_unescaped('	<div colspan="2" class="name">');
+									p('Anonymous');
+								} else {
+									print_unescaped('			<div class="poll avatardiv" title="'.($usr).'"></div>');
+									print_unescaped('		</div>');
+									print_unescaped('	<div colspan="2" class="name">');
+									p($usr);
+								}
+							}
+							print_unescaped('	</div>');
+							print_unescaped('</div>');
+
+							// loop over dts
+							$i_tot = 0;
+							foreach ($dates as $dt) {
+								if ($poll->getType() == '0') {
+									$dateId = strtotime($dt->getDt());
+									$pollId = "pollid_" . $dt->getId();
+								} else {
+									$dateId = $dt->getText();
+									$pollId = "pollid_" . $dt->getId();
+								}
+								// look what user voted for this dts
+								$found = false;
+								foreach ($others[$usr] as $vote) {
+									$voteVal = null;
 									if ($poll->getType() == '0') {
-										print_unescaped('<tr id="time-slots-header">');
+										$voteVal = strtotime($vote->getDt());
 									} else {
-										print_unescaped('<tr id="vote-options-header">');
-									}
-                                    print_unescaped('<th class="first_header_cell" colspan="3"></th>');
-									foreach ($dates as $el) {
-										if ($poll->getType() == '0') {
-											$datavalue = strtotime($el->getDt());
-											print_unescaped('<th id="slot-' . $datavalue . '" title="' . $el->getDt() . ' ' . date_default_timezone_get() . '" class="time-slot" data-value="' . $datavalue . '" value="' . $el->getDt() . '">');
-											
-											print_unescaped('<div class="month">' . $l->t(date('M', $datavalue)) . '</div>');
-											print_unescaped('<div class="day">' . date('j', $datavalue) . '</div>');
-											print_unescaped('<div class="dayow">' . $l->t(date('D', $datavalue)) . '</div>');
-											print_unescaped('<div class="time">' . date('G:i', $datavalue) . ' UTC</div>');
-											print_unescaped('</th>');
-										} else {
-                                            print_unescaped('<th title="' . preg_replace('/_\d+$/', '', $el->getText()) . '" class="vote-option">' . preg_replace('/_\d+$/', '', $el->getText()) . '</th>');
-										}
-									}
-									print_unescaped('</tr>');
-									?>
-							</thead>
-							<tbody class="votes">
-								<?php
-								if ($votes != null) {
-									//group by user
-									$others = array();
-									foreach ($votes as $vote) {
-										if (!isset($others[$vote->getUserId()])) {
-											$others[$vote->getUserId()] = array();
-										}
-										array_push($others[$vote->getUserId()], $vote);
+										$voteVal = $vote->getText();
 									}
-									$userCnt = 0;
-									foreach (array_keys($others) as $usr) {
-										$userCnt++;
-										if ($usr == $userId) {
-											// if poll expired, just put current user among the others;
-											// otherwise skip here to add current user as last row (to vote)
-											if (!$expired) {
-												$user_voted = $others[$usr];
-												continue;
-											}
-										}
-										print_unescaped('<tr>');
-										print_unescaped('<td class="avatar-cell">');
-										if (	$userMgr->get($usr) != null 
-											&& !$isAnonymous && !$hideNames
-										) {
-											print_unescaped('<div class="poll avatardiv" title="'.($usr).'"></div>');
-											print_unescaped('</td>');
-											print_unescaped('<td colspan="2" class="name">');
-											p($userMgr->get($usr)->getDisplayName());
+									if ($dateId == $voteVal) {
+										if ($vote->getType() == '1') {
+											$cl = 'poll-cell yes';
+											$total['yes'][$i_tot]++;
+										} else if ($vote->getType() == '0') {
+											$cl = 'poll-cell no';
+											$total['no'][$i_tot]++;
+										} else if ($vote->getType() == '2') {
+											$cl = 'poll-cell maybe';
 										} else {
-											if ($isAnonymous || $hideNames) {
-											print_unescaped('<div class="poll avatardiv" title="'.($userCnt).'"></div>');
-											print_unescaped('</td>');
-											print_unescaped('<td colspan="2" class="name">');
-											} else {
-												print_unescaped('<div class="poll avatardiv" title="'.($usr).'"></div>');
-												print_unescaped('</td>');
-												print_unescaped('<td colspan="2" class="name">');
-												p($usr);
-											}
+											$cl = 'poll-cell unvoted';
 										}
-										print_unescaped('</td>');
-
-										// loop over dts
-										$i_tot = 0;
-										foreach ($dates as $dt) {
-											if ($poll->getType() == '0') {
-												$date_id = strtotime($dt->getDt());
-												$poll_id = "pollid_" . $dt->getId();
-											} else {
-												$date_id = $dt->getText();
-												$poll_id = "pollid_" . $dt->getId();
-											}
-											// look what user voted for this dts
-											$found = false;
-											foreach ($others[$usr] as $vote) {
-												$voteVal = null;
-												if ($poll->getType() == '0') {
-													$voteVal = strtotime($vote->getDt());
-												} else {
-													$voteVal = $vote->getText();
-												}
-												if ($date_id == $voteVal) {
-													if ($vote->getType() == '1') {
-														$cl = 'poll-cell yes';
-														$total_y[$i_tot]++;
-													} else if ($vote->getType() == '0') {
-														$cl = 'poll-cell no';
-														$total_n[$i_tot]++;
-													} else if ($vote->getType() == '2') {
-														$cl = 'poll-cell maybe';
-													} else {
-														$cl = 'poll-cell unvoted';
-													}
-													$found = true;
-													break;
-												}
-											}
-											if (!$found) {
-												$cl = 'poll-cell unvoted';
-											}
-											// Make the td clickable
-											print_unescaped('<td class="' . $cl . '"><div></div></td>');
-											// Make the div clickable
-											// print_unescaped('<td><div class="' . $cl . '"></div></td>');
-											$i_tot++;
-										}
-										print_unescaped('</tr>');
+										$found = true;
+										break;
 									}
 								}
-								$total_y_others = array_merge(array(), $total_y);
-								$total_n_others = array_merge(array(), $total_n);
-								if (!$expired) {
-									print_unescaped('<tr class="current-user">');
-									print_unescaped('<td class="avatar-cell">');
-									if (User::isLoggedIn()) {
-										print_unescaped('<div class="poll avatardiv" title="'.($userId).'"></div>');
-										print_unescaped('</td>');
-										print_unescaped('<td class="name">');
-										p($userMgr->get($userId)->getDisplayName());
+								if (!$found) {
+									$cl = 'poll-cell unvoted';
+								}
+								print_unescaped('<div class="column ' . $cl . '"><div></div></div>');
+								$i_tot++;
+							}
+							print_unescaped('</div>');
+						}
+					}
+					$totalYesOthers = array_merge(array(), $total['yes']);
+					$totalNoOthers = array_merge(array(), $total['no']);
+					if (!$expired) {
+						print_unescaped('<div class="row-container current-user">');
+						print_unescaped('	<div class="column first">');
+						print_unescaped('		<div class="avatar-cell">');
+						if (User::isLoggedIn()) {
+							print_unescaped('			<div class="poll avatardiv" title="'.($userId).'"></div>');
+							print_unescaped('		</div>');
+							print_unescaped('		<div class="name">');
+							p($userMgr->get($userId)->getDisplayName());
+						} else {
+							print_unescaped('			<div class="poll avatardiv" title="?"></div>');
+							print_unescaped('		</div>');
+							print_unescaped('		<div id="id_ac_detected" class="external current-user"><input type="text" name="user_name" id="user_name" placeholder="' . $l->t('Your name here') . '" />');
+						}
+						print_unescaped('		</div>');
+						print_unescaped('	<div class="toggle-all toggle maybe">');
+						print_unescaped('		<div id="toggle"></div>');
+						print_unescaped('	</div>');
+						print_unescaped('</div>');
+						$i_tot = 0;
+						foreach ($dates as $dt) {
+							if ($poll->getType() == '0') {
+								$dateId = strtotime($dt->getDt());
+								$pollId = "pollid_" . $dt->getId();
+							} else {
+								$dateId = $dt->getText();
+								$pollId = "pollid_" . $dt->getId();
+							}
+							// see if user already has data for this event
+							$cl = 'poll-cell active unvoted ';
+							if (isset($userVoted)) {
+								foreach ($userVoted as $obj) {
+									$voteVal = null;
+									if($poll->getType() == '0') {
+										$voteVal = strtotime($obj->getDt());
 									} else {
-										print_unescaped('<div class="poll avatardiv" title="?"></div>');
-										print_unescaped('</td>');
-										print_unescaped('<td id="id_ac_detected" class="external current-user"><input type="text" name="user_name" id="user_name" placeholder="' . $l->t('Your name here') . '" />');
+										$voteVal = $obj->getText();
 									}
-									print_unescaped('</td><td class="toggle-all toggle maybe"><div id="toggle" class=""></div><img class="svg" src="../../../../core/img/actions/play-next.svg" "="" alt=""></td>');
-									// print_unescaped('</td><td class="toggle-cell"><div id="toggle" class="toggle-all toggle maybe"></div><img class="svg" src="../../../../core/img/actions/play-next.svg" "="" alt=""></td>');
-									$i_tot = 0;
-									foreach ($dates as $dt) {
-										if ($poll->getType() == '0') {
-											$date_id = strtotime($dt->getDt());
-											$poll_id = "pollid_" . $dt->getId();
-										} else {
-											$date_id = $dt->getText();
-											$poll_id = "pollid_" . $dt->getId();
+									if ($voteVal == $dateId) {
+										if ($obj->getType() == '1') {
+											$cl = 'poll-cell active yes';
+											$total['yes'][$i_tot]++;
+										} else if ($obj->getType() == '0') {
+											$cl = 'poll-cell active no';
+											$total['no'][$i_tot]++;
+										} else if($obj->getType() == '2') {
+											$cl = 'poll-cell active maybe';
 										}
-										// see if user already has data for this event
-										$cl = 'poll-cell active unvoted ';
-										if (isset($user_voted)) {
-											foreach ($user_voted as $obj) {
-												$voteVal = null;
-												if($poll->getType() == '0') {
-													$voteVal = strtotime($obj->getDt());
-												} else {
-													$voteVal = $obj->getText();
-												}
-												if ($voteVal == $date_id) {
-													if ($obj->getType() == '1') {
-														$cl = 'poll-cell active yes';
-														$total_y[$i_tot]++;
-													} else if ($obj->getType() == '0') {
-														$cl = 'poll-cell active no';
-														$total_n[$i_tot]++;
-													} else if($obj->getType() == '2') {
-														$cl = 'poll-cell active maybe';
-													}
-													break;
-												}
-											}
-										}
-										// Make the td clickable
-										print_unescaped('<td id="' . $poll_id . '" class="cl_click ' . $cl . '" data-value="' . $date_id . '"><div></div></td>');
-										// Make the div clickable
-										// print_unescaped('<td><div id="' . $date_id . '" class="cl_click ' . $cl . '"></div></td>');
-
-										$i_tot++;
+										break;
 									}
 								}
-								?>
-							</tbody>
-							<tbody class="summary">
+							}
+							print_unescaped('<div id="' . $pollId . '" class="column cl_click ' . $cl . '" data-value="' . $dateId . '"><div></div></div>');
+
+							$i_tot++;
+						}
+						print_unescaped('</div>');
+					}
+					?>
+				</div>
+					<?php
+						$diffArray = $total['yes'];
+						for($i = 0 ; $i < count($diffArray) ; $i++) {
+							$diffArray[$i] = ($total['yes'][$i] - $total['no'][$i]);
+						}
+						$maxVotes = max($diffArray);
+					?>
+					<div class="row-container total">
+						<div class="column first"><?php p($l->t('Total')); ?></div>
+						<?php for ($i = 0 ; $i < count($dates) ; $i++) : ?>
+							<div class="column total">
 								<?php
-									$diff_array = $total_y;
-									for($i = 0 ; $i < count($diff_array) ; $i++) {
-										$diff_array[$i] = ($total_y[$i] - $total_n[$i]);
-									}
-									$max_votes = max($diff_array);
+								$classSuffix = "pollid_" . $dates[$i]->getId();
+								if (isset($total['yes'][$i])) {
+									$val = $total['yes'][$i];
+								} else {
+									$val = 0;
+								}
 								?>
-								<tr class="total">
-									<th colspan="3"><?php p($l->t('Total')); ?></th>
-									<?php for ($i = 0 ; $i < count($dates) ; $i++) : ?>
-										<td class="total">
-											<?php
-											$classSuffix = "pollid_" . $dates[$i]->getId();
-											if (isset($total_y[$i])) {
-												$val = $total_y[$i];
-											} else {
-												$val = 0;
-											}
-											?>
-											<div id="id_y_<?php p($classSuffix); ?>" class="result-cell yes" data-value=<?php p(isset($total_y_others[$i]) ? $total_y_others[$i] : '0'); ?>>
-												<?php p($val); ?>
-											</div>
-											<div id="id_n_<?php p($classSuffix); ?>" class="result-cell no" data-value=<?php p(isset($total_n_others[$i]) ? $total_n_others[$i] : '0'); ?>>
-												<?php p(isset($total_n[$i]) ? $total_n[$i] : '0'); ?>
-											</div>
-										</td>
-									<?php endfor; ?>
-								</tr>
-								<tr class="best">
-									<th colspan="3"><?php p($l->t('Best option')); ?></th>
-									<?php
-									for ($i = 0; $i < count($dates); $i++) {
-										$check = '';
-										if ($total_y[$i] - $total_n[$i] == $max_votes) {
-											$check = 'icon-checkmark';
-										}
-										print_unescaped('<td class="win_row ' . $check . '" id="id_total_' . $i . '"></td>');
-									}
-									?>
-								</tr>
-							</tbody>
-						</table>
-						<form class="finish_vote" name="finish_vote" action="<?php p($urlGenerator->linkToRoute('polls.page.insert_vote')); ?>" method="POST">
-							<input type="hidden" name="pollId" value="<?php p($poll->getId()); ?>" />
-							<input type="hidden" name="userId" value="<?php p($userId); ?>" />
-							<input type="hidden" name="dates" value="<?php p($poll->getId()); ?>" />
-							<input type="hidden" name="types" value="<?php p($poll->getId()); ?>" />
-							<input type="hidden" name="receiveNotifications" />
-							<input type="hidden" name="changed" />
-							<input type="button" id="submit_finish_vote" class="button btn" value="<?php p($l->t('Vote!')); ?>" />
-						</form>
-						<?php if (User::isLoggedIn()) : ?>
-						<span class="notification">
-							<input type="checkbox" id="check_notif" class="checkbox" <?php if ($notification != null) print_unescaped(' checked'); ?> />
-							<label for="check_notif"><?php p($l->t('Receive notification email on activity')); ?></label>
-						</span>
-						<?php endif; ?>
+								<div id="id_y_<?php p($classSuffix); ?>" class="result-cell yes" data-value=<?php p(isset($totalYesOthers[$i]) ? $totalYesOthers[$i] : '0'); ?>>
+									<?php p($val); ?>
+								</div>
+								<div id="id_n_<?php p($classSuffix); ?>" class="result-cell no" data-value=<?php p(isset($totalNoOthers[$i]) ? $totalNoOthers[$i] : '0'); ?>>
+									<?php p(isset($total['no'][$i]) ? $total['no'][$i] : '0'); ?>
+								</div>
+							</div>
+						<?php endfor; ?>
 					</div>
-				</div>
-				<div id="app-sidebar" class="detailsView scroll-container">
-					<div class="input-group share">
-						<div class="input-group-addon">
-							<span class="icon-share"></span><?php p($l->t('Link')); ?>
-						</div>
-						<input type="text" value="<?php p($pollUrl);?>" readonly="readonly">
+					<div class="row-container best">
+						<div class="column first"></div>
+						<?php
+						for ($i = 0; $i < count($dates); $i++) {
+							$check = '';
+							if ($total['yes'][$i] - $total['no'][$i] == $maxVotes) {
+								$check = 'icon-checkmark';
+							}
+							print_unescaped('<div class="column win_row ' . $check . '" id="id_total_' . $i . '"><span>');
+							p($l->t('Best option'));
+							print_unescaped('</span></div>');
+						}
+						?>
 					</div>
-					<?php if ($expired) : ?>
-						<div id="expired_info">
-							<h2><?php p($l->t('Poll expired')); ?></h2>
+			</div>
+			<form class="finish_vote" name="finish_vote" action="<?php p($urlGenerator->linkToRoute('polls.page.insert_vote')); ?>" method="POST">
+				<input type="hidden" name="pollId" value="<?php p($poll->getId()); ?>" />
+				<input type="hidden" name="userId" value="<?php p($userId); ?>" />
+				<input type="hidden" name="dates" value="<?php p($poll->getId()); ?>" />
+				<input type="hidden" name="types" value="<?php p($poll->getId()); ?>" />
+				<input type="hidden" name="receiveNotifications" />
+				<input type="hidden" name="changed" />
+				<input type="button" id="submit_finish_vote" class="button btn" value="<?php p($l->t('Vote!')); ?>" />
+			</form>
+		<?php if (User::isLoggedIn()) : ?>
+			<span class="notification">
+				<input type="checkbox" id="check_notif" class="checkbox" <?php if ($notification != null) print_unescaped(' checked'); ?> />
+				<label for="check_notif"><?php p($l->t('Receive notification email on activity')); ?></label>
+			</span>
+		<?php endif; ?>
+		</div>
+					
+		<div id="app-sidebar" class="detailsView scroll-container">
+			<a id="closeDetails" class="close icon-close" href="#" alt="<?php $l->t('Close');?>"></a>
+			<div class="input-group share">
+				<div class="input-group-addon">
+					<span class="icon-share"></span><?php p($l->t('Link')); ?>
+				</div>
+				<input type="text" value="<?php p($pollUrl);?>" readonly="readonly">
+			</div>
+			<div class="poll-info owner">
+				<div class="avatardiv" title="<?php p($poll->getOwner()); ?>" style="height: 32px; width: 32px;"></div>
+				<div class="name-cell"><?php p($poll->getOwner() . ' ' . $userId);?></div>
+			</div>
+			<div class="poll-info expiry">
+				
+				<?php 
+					p($l->t('Poll expires: '));
+					if ($poll->getExpire() != null) {
+						p(OCP\relative_modified_date(strtotime($poll->getExpire())));
+					} else {
+						p($l->t('Never'));
+					}
+					print_unescaped('<div class="participant">');
+					p(var_dump($options));
+					print_unescaped('</div>');
+
+				?>
+			</div>
+
+			<?php if ($expired) : ?>
+				<div id="expired_info">
+					<h2><?php p($l->t('Poll expired')); ?></h2>
+					<p>
+						<?php p($l->t('The poll expired on %s. Voting is disabled, but you can still comment.', array(date('d.m.Y H:i', strtotime($poll->getExpire()))))); ?>
+					</p>
+				</div>
+			<?php endif; ?>
+			<h2><?php p($l->t('Comments')); ?></h2>
+			<div class="comments">
+				<div class="comment new-comment">
+					<form name="send_comment" action="<?php p($urlGenerator->linkToRoute('polls.page.insert_comment')); ?>" method="POST">
+						<input type="hidden" name="pollId" value="<?php p($poll->getId()); ?>" />
+						<input type="hidden" name="userId" value="<?php p($userId); ?>" />
+						<div class="comment-content">
+						<?php if (!User::isLoggedIn()) : ?>
+							<a href="<?php p($urlGenerator->linkToRouteAbsolute('core.login.showLoginForm')); ?>"><?php p($l->t('Login')); ?></a>
+							<?php p($l->t('or')); ?>
+							<?php print_unescaped('<div id="id_ac_detected" class="column external current-user"><input type="text" name="user_name_comm" id="user_name_comm" placeholder="' . $l->t('Your name here') . '" /></div>'); ?>
+						<?php else: ?>
+							<?php p($l->t('Logged in as') . ' ' . $userId); ?>
+						<?php endif; ?>
+							<textarea id="commentBox" name="commentBox"></textarea>
 							<p>
-								<?php p($l->t('The poll expired on %s. Voting is disabled, but you can still comment.', array(date('d.m.Y H:i', strtotime($poll->getExpire()))))); ?>
+								<input type="button" id="submit_send_comment" class="button btn" value="<?php p($l->t('Send!')); ?>" />
+								<span class="icon-loading-small" style="float:right;"></span>
 							</p>
 						</div>
-					<?php endif; ?>
-					<h2><?php p($l->t('Comments')); ?></h2>
-					<div class="comments">
-						<div class="comment new-comment">
-							<form name="send_comment" action="<?php p($urlGenerator->linkToRoute('polls.page.insert_comment')); ?>" method="POST">
-								<input type="hidden" name="pollId" value="<?php p($poll->getId()); ?>" />
-								<input type="hidden" name="userId" value="<?php p($userId); ?>" />
-								<div class="comment-content">
-								<?php if (!User::isLoggedIn()) : ?>
-									<a href="<?php p($urlGenerator->linkToRouteAbsolute('core.login.showLoginForm')); ?>"><?php p($l->t('Login')); ?></a>
-									<?php p($l->t('or')); ?>
-									<?php print_unescaped('<th id="id_ac_detected" class="external current-user"><input type="text" name="user_name_comm" id="user_name_comm" placeholder="' . $l->t('Your name here') . '" /></th>'); ?>
-								<?php else: ?>
-									<?php p($l->t('Logged in as') . ' ' . $userId); ?>
-								<?php endif; ?>
-									<textarea id="commentBox" name="commentBox"></textarea>
-									<p>
-										<input type="button" id="submit_send_comment" class="button btn" value="<?php p($l->t('Send!')); ?>" />
-										<span class="icon-loading-small" style="float:right;"></span>
-									</p>
-								</div>
-							</form>
-						</div>
-						<?php if ($comments != null) : ?>
-							<?php foreach ($comments as $comment) : ?>
-								<div class="comment">
-									<div class="comment-header">
-										<?php
-										print_unescaped('<span class="comment-date">' . date('d.m.Y H:i:s', strtotime($comment->getDt())) . '</span>');
-										if ($isAnonymous || $hideNames) {
-											p('Anonymous');
-										} else {
-											if ($userMgr->get($comment->getUserId()) != null) {
-												p($userMgr->get($comment->getUserId())->getDisplayName());
-											} else {
-												print_unescaped('<i>');
-												p($comment->getUserId());
-												print_unescaped('</i>');
-											}
-										}
-										?>
-									</div>
-									<div class="wordwrap comment-content">
-										<?php p($comment->getComment()); ?>
-									</div>
-								</div>
-							<?php endforeach; ?>
-						<?php else : ?>
-							<?php p($l->t('No comments yet. Be the first.')); ?>
-						<?php endif; ?>
-					</div>
+					</form>
 				</div>
+				<?php if ($comments != null) : ?>
+					<?php foreach ($comments as $comment) : ?>
+						<div class="comment">
+							<div class="comment-header">
+								<?php
+								print_unescaped('<span class="comment-date">' . date('d.m.Y H:i:s', strtotime($comment->getDt())) . '</span>');
+								if ($isAnonymous || $hideNames) {
+									p('Anonymous');
+								} else {
+									if ($userMgr->get($comment->getUserId()) != null) {
+										p($userMgr->get($comment->getUserId())->getDisplayName());
+									} else {
+										print_unescaped('<i>');
+										p($comment->getUserId());
+										print_unescaped('</i>');
+									}
+								}
+								?>
+							</div>
+							<div class="wordwrap comment-content">
+								<?php p($comment->getComment()); ?>
+							</div>
+						</div>
+					<?php endforeach; ?>
+				<?php else : ?>
+					<?php p($l->t('No comments yet. Be the first.')); ?>
+				<?php endif; ?>
 			</div>
 		</div>
 	</div>