Merge branch 'master' into develop-0.9

5 files changed, 230 insertions, 214 deletions

diff --git a/templates/goto.tmpl.php b/templates/goto.tmpl.php
index dcb3aa39..ea3f1eb8 100644
--- a/templates/goto.tmpl.php
+++ b/templates/goto.tmpl.php
@@ -28,11 +28,11 @@
 	\OCP\Util::addStyle('polls', 'vote');
 	\OCP\Util::addStyle('polls', 'sidebar');
 	if (!User::isLoggedIn()) {
-		\OCP\Util::addStyle('polls', 'public');
+		Util::addStyle('polls', 'public');
 	}
-
-	\OCP\Util::addScript('polls', 'app');
-	\OCP\Util::addScript('polls', 'vote');
+	
+	Util::addScript('polls', 'app');
+	Util::addScript('polls', 'vote');
 
 	$userId = $_['userId'];
 	/** @var \OCP\IUserManager $userMgr */
@@ -109,14 +109,17 @@
 
 	<div id="app-content" class="<?php p($statusClass . ' ' . $pollTypeClass . ' ' . $maybe); ?>">
 		<div id="controls" class="controls">
+			
 			<div id="breadcrump" class="breadcrump">
-				<?php if (User::isLoggedIn()) : ?>
+
+	<?php if (User::isLoggedIn()) : ?>
 				<div class="crumb svg">
 					<a href="<?php p($urlGenerator->linkToRoute('polls.page.index')); ?>">
-						<img class="svg" src="<?php print_unescaped(\OCP\Template::image_path('core', 'places/home.svg')); ?>" alt="Home">
+						<img class="svg" src="<?php print_unescaped(Template::image_path('core', 'places/home.svg')); ?>" alt="Home">
 					</a>
 				</div>
-				<?php endif; ?>
+	<?php endif; ?>
+
 				<div class="crumb svg last">
 					<span><?php p($poll->getTitle()); ?></span>
 				</div>
@@ -134,45 +137,47 @@
 			</a>
 		</div>
 
-		<div id="votings" class="main-container">
-			<div class="wordwrap description"><span><?php print_unescaped($description); ?></span>
-			<?php
-				if ($expired) {
-					print_unescaped('<span class="' . $statusClass . '">' . $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())))) . '</span>');
-				}?>
+		d<div id="votings" class="main-container">
+			<div class="wordwrap description">
+				<span>
+					<?php print_unescaped($description); ?>
+				</span>
+					<?php if ($expired) { print_unescaped('<span class="' . $statusClass . '">' . $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())))) . '</span>'); }?>
 			</div>
+			
 			<div class="table">
-					<ul class="flex-row header" >
-						<?php
-						foreach ($options as $optionElement) {
-							if ($poll->getType() === 0) {
-								print_unescaped('<li id="slot_' . $optionElement->getId() . '" title="' . $optionElement->getPollOptionText() . ' ' . date_default_timezone_get() . '" class="flex-column vote time has-tooltip" data-timestamp="' . $timestamp . '"data-value-utc="' . $optionElement->getPollOptionText() . '">');
-
-								$timestamp = strtotime($optionElement->getPollOptionText());
-								print_unescaped('	<div class="date-box flex-column">');
-								print_unescaped('		<div class="month">' . $l->t(date('M', $timestamp)) . '</div>');
-								print_unescaped('		<div class="day">' . date('j', $timestamp) . '</div>');
-								print_unescaped('		<div class="dayow">' . $l->t(date('D', $timestamp)) . '</div>');
-								print_unescaped('		<div class="time">' . date('G:i', $timestamp) . ' UTC</div>');
-								print_unescaped('	</div>');
-							} else {
-								print_unescaped('<li id="slot_' . $optionElement->getId() . '" title="' . $optionElement->getPollOptionText() . '" class="flex-column vote option">');
-								print_unescaped('	<div class="date-box flex-column">' . $optionElement->getPollOptionText() . '</div>');
-							}
-							print_unescaped('<div class="counter flex-row">');
-							print_unescaped('	<div class="yes flex-row">');
-							print_unescaped('		<div class="svg"></div>');
-							print_unescaped('		<div id="counter_yes_voteid_' . $optionElement->getId() . '" class ="result-cell yes" data-voteId="' . $optionElement->getId() . '">0</div>');
-							print_unescaped('	</div>');
-							print_unescaped('	<div class="no flex-row">');
-							print_unescaped('		<div class="svg"></div>');
-							print_unescaped('		<div id="counter_no_voteid_' . $optionElement->getId() . '" class ="result-cell no" data-voteId="' . $optionElement->getId() . '">0</div>');
+				<ul class="flex-row header" >
+					<?php
+					foreach ($options as $optionElement) {
+						if ($poll->getType() === 0) {
+							print_unescaped('<li id="slot_' . $optionElement->getId() . '" title="' . $optionElement->getPollOptionText() . ' ' . date_default_timezone_get() . '" class="flex-column vote time has-tooltip" data-timestamp="' . $timestamp . '"data-value-utc="' . $optionElement->getPollOptionText() . '">');
+
+							$timestamp = strtotime($optionElement->getPollOptionText());
+							print_unescaped('	<div class="date-box flex-column">');
+							print_unescaped('		<div class="month">' . $l->t(date('M', $timestamp)) . '</div>');
+							print_unescaped('		<div class="day">' . date('j', $timestamp) . '</div>');
+							print_unescaped('		<div class="dayow">' . $l->t(date('D', $timestamp)) . '</div>');
+							print_unescaped('		<div class="time">' . date('G:i', $timestamp) . ' UTC</div>');
 							print_unescaped('	</div>');
-							print_unescaped('</div>');
+						} else {
+							print_unescaped('<li id="slot_' . $optionElement->getId() . '" title="' . $optionElement->getPollOptionText() . '" class="flex-column vote option">');
+							print_unescaped('	<div class="date-box flex-column">' . $optionElement->getPollOptionText() . '</div>');
 						}
-						?>
-						</li>
-					</ul>
+						print_unescaped('<div class="counter flex-row">');
+						print_unescaped('	<div class="yes flex-row">');
+						print_unescaped('		<div class="svg"></div>');
+						print_unescaped('		<div id="counter_yes_voteid_' . $optionElement->getId() . '" class ="result-cell yes" data-voteId="' . $optionElement->getId() . '">0</div>');
+						print_unescaped('	</div>');
+						print_unescaped('	<div class="no flex-row">');
+						print_unescaped('		<div class="svg"></div>');
+						print_unescaped('		<div id="counter_no_voteid_' . $optionElement->getId() . '" class ="result-cell no" data-voteId="' . $optionElement->getId() . '">0</div>');
+						print_unescaped('	</div>');
+						print_unescaped('</div>');
+					}
+					?>
+					</li>
+				</ul>
+				
 				<ul class="flex-column table-body">
 					<?php
 					if ($votes !== null) {
@@ -231,7 +236,7 @@
 								foreach ($others[$usr] as $vote) {
 									if ($optionElement->getPollOptionText() === $vote->getVoteOptionText()) {
 										$class = $vote->getVoteAnswer();
- 										break;
+										break;
 									}
 									$class = 'no';
 								}
@@ -277,7 +282,7 @@
 								foreach ($userVoted as $vote) {
 									if ($optionElement->getPollOptionText() === $vote->getVoteOptionText()) {
 										$class = $vote->getVoteAnswer();
- 										break;
+										break;
 									} else {
 										$class = 'unvoted';
 									}
@@ -299,11 +304,12 @@
 					?>
 				</ul>
 			</div>
-			<?php if ($updatedPoll) : ?>
-				<div class="updated-poll alert">
+
+	<?php if ($updatedPoll) : ?>
+			<div class="updated-poll alert">
 				<p> <?php p($l->t('This poll was updated since your last visit. Please check your votes.')); ?></p>
-				</div>
-			<?php endif; ?>
+			</div>
+	<?php endif; ?>
 			
 			<div class="submitPoll flex-row">
 				<div>
@@ -317,12 +323,14 @@
 						<input type="button" id="submit_finish_vote" class="button btn primary" value="<?php p($l->t('Vote!')); ?>" />
 					</form>
 				</div>
-			<?php if (User::isLoggedIn()) : ?>
+
+	<?php if (User::isLoggedIn()) : ?>
 				<div 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>
 				</div>
-			<?php endif; ?>
+	<?php endif; ?>
+
 			</div>
 		</div>
 
@@ -394,30 +402,31 @@
 			</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; ?>
+	<?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; ?>
+	
 		<ul class="tabHeaders">
 			<li class="tabHeader selected" data-tabid="commentsTabView" data-tabindex="0">
 				<a href="#"><?php p($l->t('Comments')); ?></a>
 			</li>
 		</ul>
+		
 		<div class="tabsContainer">
 			<div id="commentsTabView" class="tab commentsTabView">
 				<div class="newCommentRow comment new-comment">
-				<?php if (User::isLoggedIn()) : ?>
+	
+	<?php if (User::isLoggedIn()) : ?>
 					<div class="authorRow user-cell flex-row">
 						<div class="avatar has-tooltip" title="<?php p($userId)?>"></div>
 						<div class="author"><?php p($userId) ?></div>
 					</div>
-
-				<?php else: ?>
+	<?php else: ?>
 					<a href="<?php p($urlGenerator->linkToRouteAbsolute('core.login.showLoginForm')); ?>"><?php p($l->t('Login or ...')); ?></a>
 					<div class="authorRow user-cell flex-row">
 						<div class="avatar has-tooltip" title="?"></div>
@@ -425,7 +434,8 @@
 							<input type="text" name="user_name_comm" id="user_name_comm" placeholder="<?php p($l->t('Your name here')); ?>" />
 						</div>
 					</div>
-				<?php endif; ?>
+	<?php endif; ?>
+
 					<form class="newCommentForm flex-row" 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); ?>" />
@@ -477,7 +487,7 @@
 						<div class="authorRow user-cell flex-row">
 							<div class="avatar has-tooltip" title="<?php p($avatarName)?>"></div>
 							<div class="author"><?php p($displayName) ?></div>
-							<div class="date has-tooltip live-relative-timestamp datespan" data-timestamp="<?php p(strtotime($comment->getDt()) * 1000); ?>" title="<?php p($comment->getDt()) ?>"><?php p(\OCP\Template::relative_modified_date(strtotime($comment->getDt()))) ?></div>
+							<div class="date has-tooltip live-relative-timestamp datespan" data-timestamp="<?php p(strtotime($comment->getDt()) * 1000); ?>" title="<?php p($comment->getDt()) ?>"><?php p(Template::relative_modified_date(strtotime($comment->getDt()))) ?></div>
 						</div>
 						<div class="message wordwrap comment-content"><?php p($comment->getComment()); ?></div>
 					</li>
@@ -485,6 +495,6 @@
 				</ul>
 			</div>
 		</div>
-		</div>
-		<form id="form_delete_poll" name="form_delete_poll" action="<?php p($urlGenerator->linkToRoute('polls.page.delete_poll')); ?>" method="POST"></form>
 	</div>
+	
+	<form id="form_delete_poll" name="form_delete_poll" action="<?php p($urlGenerator->linkToRoute('polls.page.delete_poll')); ?>" method="POST"></form>
diff --git a/templates/main.tmpl.php b/templates/main.tmpl.php
index 228f282d..4d83c540 100644
--- a/templates/main.tmpl.php
+++ b/templates/main.tmpl.php
@@ -22,11 +22,12 @@
 	 */
 
 	use OCP\User; //To do: replace according to API
+	use OCP\Util;
+	use OCP\Template;
 
-	\OCP\Util::addStyle('polls', 'main');
-	\OCP\Util::addStyle('polls', 'list');
-	\OCP\Util::addScript('polls', 'app');
-	\OCP\Util::addScript('polls', 'start');
+	Util::addStyle('polls', 'list');
+	Util::addScript('polls', 'app');
+	Util::addScript('polls', 'start');
 
 	$userId = $_['userId'];
 	/** @var \OCP\IUserManager $userMgr */
@@ -38,175 +39,177 @@
 ?>
 
 	<div id="app-content">
-		<div id="app-content-wrapper">
-				<div id="controls">
-					<div class="breadcrump">
-						<div class="crumb svg last">
-							<a href="<?php p($urlGenerator->linkToRoute('polls.page.index')); ?>">
-								<img class="svg" src="<?php print_unescaped(\OCP\Template::image_path('core', 'places/home.svg')); ?>" alt="Home">
-							</a>
-						</div>
-					</div>
-					<div class="actions creatable" style="">
-						<a href="<?php p($urlGenerator->linkToRoute('polls.page.create_poll')); ?>" class="button new">
-							<span class="symbol icon-add"></span><span class="hidden-visually">Neu</span>
-						</a>
-						<input class="stop icon-close" style="display:none" value="" type="button">
-					</div>
+		<div id="controls">
+			<div class="breadcrump">
+				<div class="crumb svg last">
+					<a href="<?php p($urlGenerator->linkToRoute('polls.page.index')); ?>">
+						<img class="svg" src="<?php print_unescaped(Template::image_path('core', 'places/home.svg')); ?>" alt="Home">
+					</a>
 				</div>
+			</div>
+			<div class="actions creatable" style="">
+				<a href="<?php p($urlGenerator->linkToRoute('polls.page.create_poll')); ?>" class="button new">
+					<span class="symbol icon-add"></span><span class="hidden-visually">Neu</span>
+				</a>
+				<input class="stop icon-close" style="display:none" value="" type="button">
+			</div>
+		</div>
+
 	<?php if (count($_['polls']) === 0) : ?>
 		<div id="emptycontent" class="">
 			<div class="icon-polls"></div>
 			<h2><?php p($l->t('No existing polls.')); ?></h2>
 		</div>
 	<?php else : ?>
-			<div class="table main-container has-controls">
-				<div class ="table-row table-header">
 
-					<div class="wrapper group-master">
-						<div class="wrapper group-1">
-							<div class="wrapper group-1-1">
-								<div class="flex-column name">		<?php p($l->t('Title')); ?></div>
-							</div>
-							<div class="wrapper group-1-2">
-								<div class="flex-column actions"></div>
-							</div>
+		<div class="table main-container has-controls">
+			<div class ="table-row table-header">
+				<div class="wrapper group-master">
+					<div class="wrapper group-1">
+						<div class="wrapper group-1-1">
+							<div class="flex-column name">		<?php p($l->t('Title')); ?></div>
 						</div>
-						<div class="wrapper group-2">
-							<div class="flex-column owner">   <?php p($l->t('By')); ?></div>
-							<div class="wrapper group-2-1">
-								<div class="flex-column access">	  <?php p($l->t('Access')); ?></div>
-								<div class="flex-column created">		 <?php p($l->t('Created')); ?></div>
-							</div>
-							<div class="wrapper group-2-2">
-								<div class="flex-column expiry">		  <?php p($l->t('Expires')); ?></div>
-								<div class="flex-column participants">	<?php p($l->t('participated')); ?></div>
-							</div>
+						<div class="wrapper group-1-2">
+							<div class="flex-column actions"></div>
 						</div>
-					 </div>
-				</div>
+					</div>
+					<div class="wrapper group-2">
+						<div class="flex-column owner">   <?php p($l->t('By')); ?></div>
+						<div class="wrapper group-2-1">
+							<div class="flex-column access">	  <?php p($l->t('Access')); ?></div>
+							<div class="flex-column created">		 <?php p($l->t('Created')); ?></div>
+						</div>
+						<div class="wrapper group-2-2">
+							<div class="flex-column expiry">		  <?php p($l->t('Expires')); ?></div>
+							<div class="flex-column participants">	<?php p($l->t('participated')); ?></div>
+						</div>
+					</div>
+				 </div>
+			</div>
 
-				<?php foreach ($polls as $poll) : ?>
-					<?php
-						if (!userHasAccess($poll, $userId)) {
-							continue;
-						}
-						// direct url to poll
-						$pollUrl = $urlGenerator->linkToRouteAbsolute('polls.page.goto_poll', array('hash' => $poll->getHash()));
-						$owner = $poll->getOwner();
+	<?php foreach ($polls as $poll) : ?>
 
-						$expiry_style = '';
-						$participated = $_['votes'];
-						$participated_class = 'partic_no';
-						$participated_title = 'You did not vote';
-						$participated_count = count($participated);
+		<?php
+		if (!userHasAccess($poll, $userId)) {
+			continue;
+		}
+		// direct url to poll
+		$pollUrl = $urlGenerator->linkToRouteAbsolute('polls.page.goto_poll', array('hash' => $poll->getHash()));
+		$owner = $poll->getOwner();
 
-						$comments = $_['comments'];
-						$commented_class = 'commented_no';
-						$commented_title = 'You did not comment';
-						$commented_count = count($comments);
+		$expiry_style = '';
+		if ($poll->getType() === 0) {
+			$participated = $_['participations'];
+		} else {
+			$participated = $_['participations_text'];
+		}
+		$participated_class = 'partic_no';
+		$participated_title = 'You did not vote';
+		$participated_count = count($participated);
 
-						if ($owner === $userId) {
-							$owner = $l->t('Yourself');
-						}
+		$comments = $_['comments'];
+		$commented_class = 'commented_no';
+		$commented_title = 'You did not comment';
+		$commented_count = count($comments);
 
-						$timestamp_style = '';
-						$expiry_style = ' endless';
-						$expiry_date = $l->t('Never');
+		if ($owner === $userId) {
+			$owner = $l->t('Yourself');
+		}
 
-						if ($poll->getExpire() !== null) {
-							$expiry_date = \OCP\Template::relative_modified_date(strtotime($poll->getExpire())); // does not work, because relative_modified_date seems not to recognise future time diffs
-							$expiry_style = ' progress';
-							$timestamp_style = ' live-relative-timestamp';
-							if (date('U') > strtotime($poll->getExpire())) {
-								$expiry_date = \OCP\Template::relative_modified_date(strtotime($poll->getExpire()));
-								$expiry_style = ' expired';
-							}
-						}
 
-						for ($i = 0; $i < count($participated); $i++) {
-							if ($poll->getId() === $participated[$i]->getPollId()) {
-								$participated_class = 'partic_yes';
-								$participated_title = 'You voted in this poll';
-								array_splice($participated, $i, 1);
-								break;
-							}
-						}
+		$timestamp_style = '';
+		$expiry_style = ' endless';
+		$expiry_date = $l->t('Never');
 
-						for ($i = 0; $i < count($comments); $i++) {
-							if ($poll->getId() === $comments[$i]->getPollId()) {
-								$commented_class = 'commented_yes';
-								$commented_title = 'You commented this poll';
-								array_splice($comments, $i, 1);
-								break;
-							}
-						}
-					?>
+		if ($poll->getExpire() !== null) {
+			$expiry_date = Template::relative_modified_date(strtotime($poll->getExpire())); // does not work, because relative_modified_date seems not to recognise future time diffs
+			$expiry_style = ' progress';
+			$timestamp_style = ' live-relative-timestamp';
+			if (date('U') > strtotime($poll->getExpire())) {
+				$expiry_date = Template::relative_modified_date(strtotime($poll->getExpire()));
+				$expiry_style = ' expired';
+			}
+		}
 
-					<div class="table-row table-body">
-						<div class="wrapper group-master">
-							<div class="wrapper group-1">
-								<div class="thumbnail <?php p($expiry_style . ' ' . $commented_class . ' ' . $participated_class); ?>"></div><!-- Image to display the status or type of poll -->
-								<a href="<?php p($pollUrl); ?>" class="wrapper group-1-1">
-									<div class="flex-column name">						  <?php p($poll->getTitle()); ?></div>
-									<div class="flex-column description">				   <?php p($poll->getDescription()); ?></div>
-								</a>
-								<div class="flex-column actions">
-									<div class="icon-more popupmenu" value="<?php p($poll->getId()); ?>" id="expand_<?php p($poll->getId()); ?>"></div>
-									<div class="popovermenu bubble menu hidden" id="expanddiv_<?php p($poll->getId()); ?>">
-										<ul>
-											<li>
-												<a class="menuitem alt-tooltip copy-link has-tooltip action permanent" data-toggle="tooltip" data-clipboard-text="<?php p($pollUrl); ?>" title="<?php p($l->t('Click to get link')); ?>" href="#">
-													<span class="icon-clippy"></span>
-													<span><?php p($l->t('Copy Link')); ?></span>
-												</a>
-											</li>
-							<?php if ($poll->getOwner() === $userId) : ?>
-											<li>
-												<a id="id_del_<?php p($poll->getId()); ?>" class="menuitem alt-tooltip delete-poll action permanent" data-value="<?php p($poll->getTitle()); ?>" href="#">
-													<span class="icon-delete"></span>
-													<span><?php p($l->t('Delete poll')); ?></span>
-												</a>
-											</li>
-											<li>
-												<a id="id_edit_<?php p($poll->getId()); ?>" class="menuitem action permanent" href="<?php p($urlGenerator->linkToRoute('polls.page.edit_poll', ['hash' => $poll->getHash()])); ?>">
-													<span class="icon-rename"></span>
-													<span><?php p($l->t('Edit Poll')); ?></span>
-												</a>
-											</li>
-							<?php endif; ?>
-										</ul>
+		for ($i = 0; $i < count($participated); $i++) {
+			if ($poll->getId() === $participated[$i]->getPollId()) {
+				$participated_class = 'partic_yes';
+				$participated_title = 'You voted in this poll';
+				array_splice($participated, $i, 1);
+				break;
+			}
+		}
 
-									</div>
+		for ($i = 0; $i < count($comments); $i++) {
+			if ($poll->getId() === $comments[$i]->getPollId()) {
+				$commented_class = 'commented_yes';
+				$commented_title = 'You commented this poll';
+				array_splice($comments, $i, 1);
+				break;
+			}
+		}
+		?>
+			<div class="table-row table-body">
+				<div class="wrapper group-master">
+					<div class="wrapper group-1">
+						<div class="thumbnail <?php p($expiry_style . ' ' . $commented_class . ' ' . $participated_class); ?>"></div><!-- Image to display the status or type of poll -->
+						<a href="<?php p($pollUrl); ?>" class="wrapper group-1-1">
+							<div class="flex-column name">						  <?php p($poll->getTitle()); ?></div>
+							<div class="flex-column description">				   <?php p($poll->getDescription()); ?></div>
+						</a>
+						<div class="flex-column actions">
+							<div class="icon-more popupmenu" value="<?php p($poll->getId()); ?>" id="expand_<?php p($poll->getId()); ?>"></div>
+							<div class="popovermenu bubble menu hidden" id="expanddiv_<?php p($poll->getId()); ?>">
+								<ul>
+									<li>
+										<a class="menuitem alt-tooltip copy-link has-tooltip action permanent" data-toggle="tooltip" data-clipboard-text="<?php p($pollUrl); ?>" title="<?php p($l->t('Click to get link')); ?>" href="#">
+											<span class="icon-clippy"></span>
+											<span>Copy Link</span>
+										</a>
+									</li>
+		<?php if ($poll->getOwner() === $userId) : ?>
+									<li>
+										<a id="id_del_<?php p($poll->getId()); ?>" class="menuitem alt-tooltip delete-poll action permanent" data-value="<?php p($poll->getTitle()); ?>" href="#">
+											<span class="icon-delete"></span>
+											<span>Delete poll</span>
+										</a>
+									</li>
+									<li>
+										<a id="id_edit_<?php p($poll->getId()); ?>" class="menuitem action permanent" href="<?php p($urlGenerator->linkToRoute('polls.page.edit_poll', ['hash' => $poll->getHash()])); ?>">
+											<span class="icon-rename"></span>
+											<span>Edit Poll</span>
+										</a>
+									</li>
+		<?php endif; ?>
+								</ul>
 
-								</div>
 							</div>
-							<div class="wrapper group-2">
-								<div class="flex-column owner">
-									<div class="avatardiv" title="<?php p($poll->getOwner()); ?>" style="height: 32px; width: 32px;"></div>
-									<div class="name-cell"><?php p($owner); ?></div>
-								</div>
-								<div class="wrapper group-2-1">
-									<div class="flex-column access"><?php p($l->t($poll->getAccess())); ?></div>
-									<div class="flex-column created has-tooltip live-relative-timestamp" data-timestamp="<?php p(strtotime($poll->getCreated()) * 1000); ?>" data-value="<?php p($poll->getCreated()); ?>"><?php p(\OCP\Template::relative_modified_date(strtotime($poll->getCreated()))); ?></div>
-								</div>
-								<div class="wrapper group-2-2">
-									<div class="flex-column has-tooltip expiry<?php p($expiry_style . $timestamp_style); ?>" data-timestamp="<?php p(strtotime($poll->getExpire()) * 1000); ?>" data-value="<?php p($poll->getExpire()); ?>"> <?php p($expiry_date); ?></div>
-									<div class="flex-column participants">
-										<div class="symbol alt-tooltip partic_voted icon-<?php p($participated_class); ?>" title="<?php p($participated_title); ?>"></div>
-										<div class="symbol alt-tooltip partic_commented icon-<?php p($commented_class); ?>" title="<?php p($commented_title); ?>"></div>
-									</div>
-								</div>
+						</div>
+					</div>
+					<div class="wrapper group-2">
+						<div class="flex-column owner">
+							<div class="avatardiv" title="<?php p($poll->getOwner()); ?>" style="height: 32px; width: 32px;"></div>
+							<div class="name-cell"><?php p($owner); ?></div>
+						</div>
+						<div class="wrapper group-2-1">
+							<div class="flex-column access"><?php p($l->t($poll->getAccess())); ?></div>
+							<div class="flex-column created has-tooltip live-relative-timestamp" data-timestamp="<?php p(strtotime($poll->getCreated()) * 1000); ?>" data-value="<?php p($poll->getCreated()); ?>"><?php p(Template::relative_modified_date(strtotime($poll->getCreated()))); ?></div>
+						</div>
+						<div class="wrapper group-2-2">
+							<div class="flex-column has-tooltip expiry<?php p($expiry_style . $timestamp_style); ?>" data-timestamp="<?php p(strtotime($poll->getExpire()) * 1000); ?>" data-value="<?php p($poll->getExpire()); ?>"> <?php p($expiry_date); ?></div>
+							<div class="flex-column participants">
+								<div class="symbol alt-tooltip partic_voted icon-<?php p($participated_class); ?>" title="<?php p($participated_title); ?>"></div>
+								<div class="symbol alt-tooltip partic_commented icon-<?php p($commented_class); ?>" title="<?php p($commented_title); ?>"></div>
 							</div>
 						</div>
 					</div>
-				<?php endforeach; ?>
+				</div>
 			</div>
-			<form id="form_delete_poll" name="form_delete_poll" action="<?php p($urlGenerator->linkToRoute('polls.page.delete_poll')); ?>" method="POST"></form>
-	<?php endif; ?>
+	<?php endforeach; ?> 
 		</div>
 	</div>
-
+	<form id="form_delete_poll" name="form_delete_poll" action="<?php p($urlGenerator->linkToRoute('polls.page.delete_poll')); ?>" method="POST"></form>
+<?php endif; ?>
 
 
 <?php
diff --git a/templates/no.acc.tmpl.php b/templates/no.acc.tmpl.php
index ed31ad7a..f6499ccf 100644
--- a/templates/no.acc.tmpl.php
+++ b/templates/no.acc.tmpl.php
@@ -21,7 +21,8 @@
 	 *
 	 */
 
-	\OCP\Util::addStyle('polls', 'main');
+	use OCP\Util;
+	Util::addStyle('polls', 'main');
 ?>
 <div id="app">
 	<div id="app-content">
diff --git a/templates/no.create.tmpl.php b/templates/no.create.tmpl.php
index 883cdc3b..188aba66 100644
--- a/templates/no.create.tmpl.php
+++ b/templates/no.create.tmpl.php
@@ -21,7 +21,8 @@
 	 *
 	 */
 
-	\OCP\Util::addStyle('polls', 'main');
+	use OCP\Util;
+	Util::addStyle('polls', 'main');
 ?>
 <div id="app">
 	<div id="app-content">
diff --git a/templates/no.delete.tmpl.php b/templates/no.delete.tmpl.php
index 8777e28a..7906e05e 100644
--- a/templates/no.delete.tmpl.php
+++ b/templates/no.delete.tmpl.php
@@ -21,7 +21,8 @@
 	 *
 	 */
 
-	\OCP\Util::addStyle('polls', 'main');
+	use OCP\Util;
+	Util::addStyle('polls', 'main');
 ?>
 <div id="app">
 	<div id="app-content">