v1.3.3 Ausgabe Options-Details im Modul-Output

FriendsOfREDAXO · May 18, 2018 · 9537933 · 9537933
1 parent 98697c3
commit 9537933
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -13,6 +13,10 @@
 
 Last Changes
 -------
+### Version 1.3.3 // 18.05.2018
+
+* Ausgabe Options-Details im Modul-Output
+
 ### Version 1.3.2 // 18.05.2018
 
 * Bugfix

diff --git a/module/module_output.inc b/module/module_output.inc
@@ -20,11 +20,34 @@ if ($poll_id > 0) {
             foreach ($poll->getOptions() as $option) {
                 $hits = $option->getHits();
                 $percent = (int)($hits / $hits_all * 100);
-                $results .= '<li><span class="poll-vote-value"><span>' . $percent . ' %</span > [' . $option->getHits() . ']</span >' . $option->title . '</li> ';
+
+                $description = '';
+                if(rex_media::get($option->media)){
+                    $description = '<div class="poll-description">' . $option->description . '</div>';
+                }
+
+                $picture = '';
+                if(rex_media::get($option->media)){
+                    $picture = '<div class="poll-picture"><img src="/media/'.$option->media.'"/></div>';
+                }
+
+                $link = '';
+                if(rex_media::get($option->media)){
+                    $link = '<div class="poll-link"><a href="'.rex_getUrl($option->link).'">mehr Informationen</a></div>';
+                }
+
                 $results .= '
-                    <div class="progress bb-progress-thin">
-                       <div class="progress-bar bb-blue-bg" role="progressbar" aria-valuenow="' . $percent . '" aria-valuemin="0" aria-valuemax="100" style="width: ' . $percent . '%;"></div>
-                    </div>
+                    <li>
+                        <div class="poll-title">' . $option->title . '</div>
+                        '.$description.'                        
+                        '.$picture.'                        
+                        '.$link.'
+                        <div class="progress bb-progress-thin">
+                            <div class="progress-bar bb-blue-bg" role="progressbar" aria-valuenow="' . $percent . '" aria-valuemin="0" aria-valuemax="100" style="width: ' . $percent . '%;">
+                                <span class="poll-vote-value"><span>' . $percent . ' %</span > [' . $option->getHits() . ']</span>
+                            </div>
+                        </div>
+                    </li>
                  ';
             }
 

diff --git a/package.yml b/package.yml
@@ -1,5 +1,5 @@
 package: poll
-version: '1.3.2'
+version: '1.3.3'
 author: Friends Of REDAXO
 supportpage: www.github.org/friendsofredaxo/poll