README.md

@@ -44,7 +44,6 @@ The following optional attributes modify the behavior of the list of commits:
 * `max=NUM`: Optional; `NUM`: Positive integer; list not more than `NUM` commits (example: `5`).
 * `ref_name=STRING`: Optional: list only commit from branch or reference name `STRING` (examples: `main`, `v1.1`).
 * `default_branch`: Optional; if set, list only commits from the project's default branch.
-* `author="none"`: Optional; do not print names of authors in the commit list.
 
 ## Author and License
 

lang/linuxfoo-gitlab-de_DE.po

@@ -22,8 +22,8 @@ msgid "http://tk-sls.de/ref/gitlab-list-commits"
 msgstr "http://tk-sls.de/ref/gitlab-list-commits"
 
 #. Description of the plugin
-msgid "Summary: Embed list of most recent commits to a Gitlab project from a Gitlab instance's public REST API. Example: Add [gitlab-list-commits url=https://tk-sls.de/gitlab project_id=42 commits=\"all\" since=\"3 month\" max=5 releases=\"latest\"] for a list of at most 5 commits to that project that were made since at most 3 months ago, followed by alink to the latest release of the project (if any). To disable the list of commits, set commits=\"none\". To disable printing the author name of a commit, set author=\"none\". To generate a list of all releases, set releases=\"all\". To disable the list of releases, omit the \"releases\" attribute or set releases=\"none\"."
+msgid "Summary: Embed list of most recent commits to a Gitlab project from a Gitlab instance's public REST API. Example: Add [gitlab-list-commits url=https://tk-sls.de/gitlab project_id=42 commits=\"all\" since=\"3 month\" max=5 releases=\"latest\"] for a list of at most 5 commits to that project that were made since at most 3 months ago, followed by alink to the latest release of the project (if any). To disable the list of commits, set commits=\"none\". To generate a list of all releases, set releases=\"all\". To disable the list of releases, omit the \"releases\" attribute or set releases=\"none\"."
-msgstr "Zusammenfassung: Bette Liste der neuesten Commits eines Gitlab-Projektes ein, die mit Gitlabs REST API abgerufen wird. Beispiel: Füge folgenden Shortcode zu einem Artikel hinzu, um die letzten 5 Commits anzuzeigen, die nicht älter als 3 Monate sind: [gitlab-list-commits url=https://tk-sls.de/gitlab project_id=42 since=\"3 month\" max=5]. Um die Liste der Commits zu deaktivieren: commits=\"none\". Um die Ausgabe der Autor-Namens pro Commit zu deaktivieren: author=\"none\". Um eine Liste von Releases hinzuzufügen: releases=\"all\". Um nur die neueste Release anzuzeigen: releases=\"latest\"."
+msgstr "Zusammenfassung: Bette Liste der neuesten Commits eines Gitlab-Projektes ein, die mit Gitlabs REST API abgerufen wird. Beispiel: Füge folgenden Shortcode zu einem Artikel hinzu, um die letzten 5 Commits anzuzeigen, die nicht älter als 3 Monate sind: [gitlab-list-commits url=https://tk-sls.de/gitlab project_id=42 since=\"3 month\" max=5]. Um die Liste der Commits zu deaktivieren: commits=\"none\". Um eine Liste von Releases hinzuzufügen: releases=\"all\". Um nur die neueste Release anzuzeigen: releases=\"latest\"."
 
 #. Author of the plugin
 msgid "Tilman Kranz"

lang/linuxfoo-gitlab.pot

@@ -23,7 +23,7 @@ msgid "http://tk-sls.de/ref/gitlab-list-commits"
 msgstr ""
 
 #. Description of the plugin
-msgid "Summary: Embed list of most recent commits to a Gitlab project from a Gitlab instance's public REST API. Example: Add [gitlab-list-commits url=https://tk-sls.de/gitlab project_id=42 commits=\"all\" since=\"3 month\" max=5 releases=\"latest\"] for a list of at most 5 commits to that project that were made since at most 3 months ago, followed by alink to the latest release of the project (if any). To disable the list of commits, set commits=\"none\". To disable printing the author name of a commit, set author=\"none\". To generate a list of all releases, set releases=\"all\". To disable the list of releases, omit the \"releases\" attribute or set releases=\"none\"."
+msgid "Summary: Embed list of most recent commits to a Gitlab project from a Gitlab instance's public REST API. Example: Add [gitlab-list-commits url=https://tk-sls.de/gitlab project_id=42 commits=\"all\" since=\"3 month\" max=5 releases=\"latest\"] for a list of at most 5 commits to that project that were made since at most 3 months ago, followed by alink to the latest release of the project (if any). To disable the list of commits, set commits=\"none\". To generate a list of all releases, set releases=\"all\". To disable the list of releases, omit the \"releases\" attribute or set releases=\"none\"."
 msgstr ""
 
 #. Author of the plugin

linuxfoo-gitlab.php

@@ -3,7 +3,7 @@
 /*
 Plugin Name: Gitlab REST API Shortcodes
 Plugin URI: http://tk-sls.de/ref/gitlab-list-commits
-Description: Summary: Embed list of most recent commits to a Gitlab project from a Gitlab instance's public REST API. Example: Add [gitlab-list-commits url=https://tk-sls.de/gitlab project_id=42 commits="all" since="3 month" max=5 releases="latest"] for a list of at most 5 commits to that project that were made since at most 3 months ago, followed by alink to the latest release of the project (if any). To disable the list of commits, set commits="none". To disable printing the author name of a commit, set author="none". To generate a list of all releases, set releases="all". To disable the list of releases, omit the "releases" attribute or set releases="none".
+Description: Summary: Embed list of most recent commits to a Gitlab project from a Gitlab instance's public REST API. Example: Add [gitlab-list-commits url=https://tk-sls.de/gitlab project_id=42 commits="all" since="3 month" max=5 releases="latest"] for a list of at most 5 commits to that project that were made since at most 3 months ago, followed by alink to the latest release of the project (if any). To disable the list of commits, set commits="none". To generate a list of all releases, set releases="all". To disable the list of releases, omit the "releases" attribute or set releases="none".
 Author: Tilman Kranz
 Version: 1.4
 Author URI: https://tk-sls.de
@@ -28,14 +28,6 @@ class LinuxfooGitlab {
             '</span>';
     }
 
-    static function project_header($atts, $project) {
-        return
-            '<span class="project_header">'.
-                __('Gitlab project', 'linuxfoo-gitlab').' '.
-                '<a href="'.$project->web_url.'">'.$project->name.'</a>'.
-            '</span>';
-    }
-
     static function format_since($since) {
         preg_match('/^([0-9]+)\s+(.*)$/', $since, $m);
         $num = $m[1];
@@ -56,34 +48,42 @@ class LinuxfooGitlab {
     }
 
     static function format_commit($atts, $commit) {
+        $out = '';
+
         preg_match('/^....-..-../', $commit->committed_date, $m);
+        $date = $m[0];
 
-        $result = $m[0].' ';
+        $title = htmlspecialchars($commit->title, ENT_NOQUOTES|ENT_HTML5|ENT_SUBSTITUTE, 'UTF-8', FALSE);
 
-        if($atts['author']==null || $atts['author']!='none')
+        $out .= 
-            $result .=
+            $date.' '.
-                __('by', 'linuxfoo-gitlab').' '.$commit->author_name;
+            __('by', 'linuxfoo-gitlab').' '.$commit->author_name.
-
-        $result .=
             ': '.
-            '<a href="'.$commit->web_url.'">'.$commit->short_id.'</a> '.
+            '<a href="'.$commit->web_url.'">'.$commit->short_id.'</a> '.$title;
-            htmlspecialchars($commit->title, ENT_NOQUOTES|ENT_HTML5|ENT_SUBSTITUTE, 'UTF-8', FALSE);
 
-        return $result;
+        return $out;
     }
 
     static function format_commit_stats($atts, $commits_count, $branch) {
-        return
+        $out = '';
-            (
+
-                ($commits_count==0)
+        if($commits_count==0) {
-                    ? __('No commits', 'linuxfoo-gitlab')
+            $out .=
+                __('No commits', 'linuxfoo-gitlab').
+                (is_null($branch) ? '' : ' '.__('in branch', 'linuxfoo-gitlab').' "'.$branch.'"').
+                (is_null($atts['since']) ? '' : ' '.('since '.$atts['since'].' ago')).'.';
+        }
+        else {
+            $out .=
                 /* translators: %d: maximum number of commits displayed */
-                    : sprintf(__('Last %d commits', 'linuxfoo-gitlab'), $commits_count)
+                sprintf(__('Last %d commits', 'linuxfoo-gitlab'), $commits_count).
-            ).
                 (is_null($branch) ? '' : ' '.__('in branch', 'linuxfoo-gitlab').' "'.$branch.'"').
                 (is_null($atts['since']) ? '' : ' '.self::format_since($atts['since'])).':';
         }
 
+        return $out;
+    }
+
 	static function commits_list($atts, $project_url) {
         $since = null;
 
@@ -144,13 +144,13 @@ class LinuxfooGitlab {
                     '</span>';
 
                 if($commits_count>0) {
-                    $out .= '<span class="commits" role="list">';
+                    $out .= '<ul class="commits">';
 
                     foreach($commits as $commit) {
-                        $out .= '<span class="commit">'.self::format_commit($atts, $commit).'</span>';
+                        $out .= '<li>'.self::format_commit($atts, $commit).'</li>';
                     }
 
-                    $out .= '</span>';
+                    $out .= '</ul>';
                 }
             }
         }
@@ -183,32 +183,32 @@ class LinuxfooGitlab {
                 else {
                     if(count($releases)==0) {
                         $out .=
-                            '<span class="releases">'.
+                            '<p class="releases">'.
                                 __('This project has currently no releases.', 'linuxfoo-gitlab').
-                            '</span>';
+                            '</p>';
                     }
                     elseif($atts['releases']=='latest') {
                         $out .=
-                            '<span class="releases">'.
+                            '<p class="releases">'.
                                 __('Latest release', 'linuxfoo-gitlab').': '.
                                '<a href="'.$releases[0]->_links->self.'">'.$releases[0]->name.'</a>'.
-                            '</span>';
+                            '</p>';
                     }
                     elseif($atts['releases']=='all') {
                         $out .=
-                            '<span class="releases">'.
+                            '<p class="releases">'.
                                 __('Releases', 'linuxfoo-gitlab').': '.
-                            '</span>'.
+                            '</p>'.
-                            '<span class="releases" role="list">';
+                            '<ul class="releases">';
 
                         foreach($releases as $release) {
                             $out .=
-                                '<span class="release">'.
+                                '<li>'.
                                     '<a href="'.$release->_links->self.'">'.$release->name.'</a>'.
-                                '</span>';
+                                '</li>';
                         }
 
-                        $out .= '</span>';
+                        $out .= '</ul>';
                     }
                 }
             }
@@ -224,7 +224,7 @@ class LinuxfooGitlab {
 	static function show_project($atts, $content, $tag) {
 		global $post;
 
-        $out = '<span class="linuxfoo_gitlab">';
+        $out = '<div class="linuxfoo_gitlab">';
 
         if(
             is_null($atts['url']) ||
@@ -255,14 +255,19 @@ class LinuxfooGitlab {
                     $out .= self::error('Project information not readable.');
                 }
                 else {
-                    $out .= self::project_header($atts, $project);
+                    $out .=
+                        '<span class="project_header">'.
+                            __('Gitlab project', 'linuxfoo-gitlab').' '.
+                            '<a href="'.$project->web_url.'">'.$project->name.'</a>'.
+                        '</span>';
+
                     $out .= self::commits_list($atts, $project_url);
                     $out .= self::releases_list($atts, $project_url);
                 }
             }
         }
 
-        $out .= '</span>';
+        $out .= '</div>';
 
         return $out;
     }

styles.css

@@ -1,17 +1,13 @@
 .linuxfoo_gitlab {
-    display: block;
     border: 1px dashed #8a8a8a;
     border-radius: .5em;
     padding: .25em .5em;
 }
-.linuxfoo_gitlab .commits, .linuxfoo_gitlab .releases {
+.linuxfoo_gitlab .commits {
-    display: block;
     margin: .25em 0 .25em 0;
 }
-.linuxfoo_gitlab .commit, .linuxfoo_gitlab .release {
+.linuxfoo_gitlab .releases {
-    display: list-item;
+    margin: .25em 0 .25em 0;
-    list-style-type: square;
-    margin: 0 0 0 1em;
 }
 .linuxfoo_gitlab .project_header {
     display: block;