Merge RC 0.8 in feature/refactor

2 files changed, 140 insertions, 128 deletions

diff --git a/templates/goto.tmpl.php b/templates/goto.tmpl.php
index bceac150..2456cec1 100644
--- a/templates/goto.tmpl.php
+++ b/templates/goto.tmpl.php
@@ -26,8 +26,7 @@
     \OCP\Util::addStyle('polls', 'main');
     \OCP\Util::addStyle('polls', 'vote');
     \OCP\Util::addScript('polls', 'vote');
-
-    $layout = "classic";
+    
     $userId = $_['userId'];
     $userMgr = $_['userMgr'];
     $urlGenerator = $_['urlGenerator'];
@@ -75,7 +74,7 @@ $pollUrl = $urlGenerator->linkToRouteAbsolute('polls.page.goto_poll', ['hash' =>
 
 <div id="app">
     <div id="app-content">
-        <div id="app-content-wrapper" class="<?php p($layout); ?>">
+        <div id="app-content-wrapper">
 			<div id="controls">
                 <div id="breadcrump">
                     <?php if (User::isLoggedIn()) : ?>
@@ -396,20 +395,3 @@ $pollUrl = $urlGenerator->linkToRouteAbsolute('polls.page.goto_poll', ['hash' =>
         </div>
     </div>
 </div>
-
-<?php
-//adapted from jsxc.chat
-function getHsl($str) {
-    $hash = 0;
-    for ($i=0; $i<strlen($str); $i++) {
-        $utf16_char = mb_convert_encoding($str[$i], "utf-16", "utf-8");
-        $char = hexdec(bin2hex($utf16_char));
-        $hash = (($hash << 5) - $hash) + $char;
-        $hash |= 0; // Convert to 32bit integer
-    }
-    $hue = abs($hash) % 360;
-    $saturation = 90;
-    $lightness = 65;
-    return 'hsl(' . $hue . ', ' . $saturation . '%, ' . $lightness . '%)';
-}
-?>
diff --git a/templates/main.tmpl.php b/templates/main.tmpl.php
index 968eb65e..8263af8b 100644
--- a/templates/main.tmpl.php
+++ b/templates/main.tmpl.php
@@ -41,9 +41,9 @@
                             </a>
                         </div>
                     </div>
-                    <div class="actions creatable" style="">
+                    <div class="creatable" style="">
                         <a href="<?php p($urlGenerator->linkToRoute('polls.page.create_poll')); ?>" class="button new">
-                            <span class="icon icon-add"></span><span class="hidden-visually">Neu</span>
+                            <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>
@@ -54,123 +54,153 @@
             <h2><?php p($l->t('No existing polls.')); ?></h2>
         </div>
     <?php else : ?>
-            <table class="polltable has-controls">
-                <thead>
-                    <tr>
-                        <th id="headerName" class="columnheader name">
-                            <div id="headerName-container">
-                                <a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Title')); ?></span><span class="sort-indicator"></span></a>
+            <div class="table has-controls">
+                <div class ="row table-header">
+
+                    <div class="wrapper group-master">
+                        <div class="wrapper group-1">
+                            <div class="wrapper group-1-1">
+                                <div class="column name">        <?php p($l->t('Title')); ?></div>
+                                <div class="column description"></div>
+                            </div>
+                            <div class="wrapper group-1-2">
+                                <div class="column actions"></div>
+                            </div>
+                        </div>
+                        <div class="wrapper group-2">
+                            <div class="column owner">   <?php p($l->t('By')); ?></div>
+                            <div class="wrapper group-2-1">
+                                <div class="column access">      <?php p($l->t('Access')); ?></div>
+                                <div class="column created">         <?php p($l->t('Created')); ?></div>
                             </div>
-                        </th>
-                        <th id="headerCreated" class="columnheader created">
-                            <a class="name sort columntitle" data-sort="created"><span><?php p($l->t('Created')); ?></span><span class="sort-indicator"></span></a>
-                        </th>
-                        <th id="headerPrincipal" class="columnheader principal">
-                            <a class="name sort columntitle" data-sort="principal"><span><?php p($l->t('By')); ?></span><span class="sort-indicator"></span></a>
-                        </th>
-                        <th id="headerExpiry" class="columnheader expiry">
-                            <a class="name sort columntitle" data-sort="expiry"><span><?php p($l->t('Expires')); ?></span><span class="sort-indicator"></span></a>
-                        </th>
-                        <th id="headerParticipations" class="columnheader participations">
-                            <a class="name sort columntitle" data-sort="voted"><span><?php p($l->t('participated')); ?></span><span class="sort-indicator"></span></a>
-                        </th>
-                        <th id="headerAccess" class="columnheader access">
-                            <a class="name sort columntitle" data-sort="access"><span><?php p($l->t('Access')); ?></span><span class="sort-indicator"></span></a>
-                        </th>
-                        <th id="headerOptions" class="columnheader options">
-                            <a class="name columntitle" <span><?php p($l->t('Options')); ?></span><span class="sort-indicator"></span></a>
-                        </th>
-                    </tr>
-                </thead>
-                <tbody id="polllist">
+                            <div class="wrapper group-2-2">
+                                <div class="column expiry">          <?php p($l->t('Expires')); ?></div>
+                                <div class="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()));
-                            $desc_str = $poll->getDescription();
-                            if (strlen($desc_str) > 100) {
-                                $desc_str = substr($desc_str, 0, 80) . '...';
+                        $owner = $poll->getOwner();
+
+                        $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);
+
+                        $comments = $_['comments'];
+                        $commented_class = 'commented_no';
+                        $commented_title = 'You did not comment';
+                        $commented_count = count($comments);
+
+                        if ($owner === $userId) {
+                            $owner = $l->t('Yourself');
+                        }
+
+                        if ($poll->getExpire() !== null) {
+                            // $expiry_date = date('d.m.Y', strtotime($poll->getExpire()));
+                            $expiry_date = OCP\relative_modified_date(strtotime($poll->getExpire())); // does not work, because relative_modified_date seems not to recognise future time diffs
+                            $expiry_style = ' progress';
+                            if (date('U') > strtotime($poll->getExpire())) {
+                                $expiry_date = OCP\relative_modified_date(strtotime($poll->getExpire()));
+                                $expiry_style = ' expired';
+                            }
+                        } else {
+                            $expiry_style = ' endless';
+                            $expiry_date = $l->t('Never');
+                        }
+
+                        for ($i = 0; $i < count($participated); $i++) {
+                            if ($poll->getId() == intval($participated[$i]->getPollId())) {
+                                $participated_class = 'partic_yes';
+                                $participated_title = 'You voted';
+                                array_splice($participated, $i, 1);
+                                break;
+                            }
+                        }
+
+                        for ($i = 0; $i < count($comments); $i++) {
+                            if ($poll->getId() === intval($comments[$i]->getPollId())) {
+                                $commented_class = 'partic_yes';
+                                $commented_title = 'You commented';
+                                array_splice($comments, $i, 1);
+                                break;
                             }
-                        ?>
-                    <tr>
-                        <td class="pollitem name">
-                            <div class="thumbnail progress"></div>  <!-- Image to display status or type of poll */ -->
-                            <a class="name" href="<?php p($pollUrl); ?>">
-                                <div class="nametext">
-                                    <div class="innernametext"><?php p($poll->getTitle()); ?></div>
-                                    <div class="description"><?php p($desc_str); ?></div>
+                        }
+                    ?>
+
+
+                    <div class="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 status or type of poll */ -->
+                                <a href="<?php p($pollUrl); ?>" class="wrapper group-1-1">
+                                    <div class="column name">                          <?php p($poll->getTitle()); ?></div>
+                                    <div class="column description">                   <?php p($poll->getDescription()); ?></div>
+                                </a>
+                                <div class="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>
+                                                <button class="menuitem copy_link action permanent" data-url="<?php p($pollUrl); ?>" title="<?php p($l->t('Click to get link')); ?>">
+                                                    <span class="cl_link icon-clippy"></span>
+                                                    <span>Copy Link</span>
+                                                </button>
+                                            </li>
+                            <?php if ($poll->getOwner() === $userId) : ?>
+                                            <li>
+                                                <button class="menuitem delete_poll action permanent" id="id_del_<?php p($poll->getId()); ?>" data-value="<?php p($poll->getTitle()); ?>">
+                                                    <span class="cl_delete icon-delete"></span>
+                                                    <span>Delete poll</span>
+                                                </button>
+                                            </li>
+                                            <li>
+                                                <a href="<?php p($urlGenerator->linkToRoute('polls.page.edit_poll', ['hash' => $poll->getHash()])); ?>" class="menuitem action permanent" id="id_edit_<?php p($poll->getId()); ?>">
+                                                    <span class="icon-rename"></span>
+                                                    <span>Edit Poll</span>
+                                                </a>
+                                            </li>
+                            <?php endif; ?>
+                                        </ul>
+
+                                    </div>
+
                                 </div>
-                            </a>
-                        </td>
-                        <td class="pollitem created"><?php p(date('d.m.Y H:i', strtotime($poll->getCreated()))); ?></td>
-                        <td class="pollitem principal">
-                            <?php
-                                if ($poll->getOwner() === $userId) {
-                                    p($l->t('Yourself'));
-                                } else {
-                                    p($userMgr->get($poll->getOwner()));
-                                }
-                            ?>
-                        </td>
-                            <?php
-                                if ($poll->getExpire() !== null) {
-                                    $style = '';
-                                    if (date('U') > strtotime($poll->getExpire())) {
-                                        $style = 'expired';
-                                    }
-                                    print_unescaped('<td class="pollitem expiry ' . $style . '">' . date('d.m.Y', strtotime($poll->getExpire())) . '</td>');
-                                } else {
-                                    print_unescaped('<td class="pollitem expiry">' . $l->t('Never') . '</td>');
-                                }
-                            ?>
-                        <td class="pollitem participations">
-                            <?php
-                                $partic_class = 'partic_no';
-                                $partic_polls = $_['participations'];
-                                for ($i = 0; $i < count($partic_polls); $i++) {
-                                    if ($poll->getId() == intval($partic_polls[$i]->getPollId())) {
-                                        $partic_class = 'partic_yes';
-                                        array_splice($partic_polls, $i, 1);
-                                        break;
-                                    }
-                                }
-                            ?>
-                            <div class="partic_all <?php p($partic_class); ?>">
                             </div>
-                            |
-                            <?php
-                                $partic_class = 'partic_no';
-                                $partic_comm = $_['comments'];
-                                for ($i = 0; $i < count($partic_comm); $i++) {
-                                    if ($poll->getId() === intval($partic_comm[$i]->getPollId())) {
-                                        $partic_class = 'partic_yes';
-                                        array_splice($partic_comm, $i, 1);
-                                        break;
-                                    }
-                                }
-                            ?>
-                            <div class="partic_all <?php p($partic_class); ?>">
+                            <div class="wrapper group-2">
+                                <div class="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="column access"><?php p($l->t($poll->getAccess())); ?></div>
+                                    <div class="column created" data-timestamp="<?php p(strtotime($poll->getCreated())); ?>" data-value="<?php p($poll->getCreated()); ?>"><?php p(OCP\relative_modified_date(strtotime($poll->getCreated()))); ?></div>
+                                </div>
+                                <div class="wrapper group-2-2">
+                                    <div class="column expiry<?php p($expiry_style); ?>" data-value="<?php p($poll->getExpire()); ?>"> <?php p($expiry_date); ?></div>
+                                    <div class="column participants">
+                                        <div class="symbol partic_voted icon-<?php p($participated_class); ?>" title="<?php p($participated_title); ?>"></div>
+                                        <div class="symbol partic_commented icon-<?php p($commented_class); ?>" title="<?php p($commented_title); ?>"></div>
+                                    </div>
+                                </div>
                             </div>
-                        </td>
-                        <td class="pollitem access">
-                            <?php p($l->t($poll->getAccess())); ?>
-                        </td>
-                        <td class="pollitem options">
-                            <?php if ($poll->getOwner() === $userId) : ?>
-                            <input type="button" id="id_del_<?php p($poll->getId()); ?>" class="table_button cl_delete icon-delete action permanent"></input>
-                            <a href="<?php p($urlGenerator->linkToRoute('polls.page.edit_poll', ['hash' => $poll->getHash()])); ?>"><input type="button" id="id_edit_<?php p($poll->getId()); ?>" class="table_button icon-rename action permanent"></input></a>
-                            <?php endif; ?>
-                            <input type="button" class="table_button cl_link icon-public action permanent" data-url="<?php p($pollUrl); ?>" title="<?php p($l->t('Click to get link')); ?>"></input>
-                        </td>
-                    </tr>
+                        </div>
+                    </div>
                 <?php endforeach; ?>
-                </tbody>
-            </table>
-            <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>
     <?php endif; ?>
-            
         </div>
     </div>
 
@@ -192,7 +222,7 @@ function getGroups($userId) {
 }
 
 function userHasAccess($poll, $userId) {
-    if($poll === null) {
+    if ($poll === null) {
         return false;
     }
     $access = $poll->getAccess();