Fixed all issues for 1.5.2 also updated version information.

This were many small fixes, so I have done this directly in master.
blackus3r · Mar 2, 2017 · 7a3cb57 · 7a3cb57
1 parent 59d4ed3
commit 7a3cb57
Show file tree

Hide file tree

Showing 23 changed files with 112 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/Dockerfile b/Dockerfile
diff --git a/composer.json b/composer.json
diff --git a/composer.lock b/composer.lock
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/lang/post-worktime-logger-de_DE.mo b/lang/post-worktime-logger-de_DE.mo
diff --git a/lang/post-worktime-logger-de_DE.po b/lang/post-worktime-logger-de_DE.po
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Post Worktime Logger v1.5.0\n"
+"Project-Id-Version: Post Worktime Logger v1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2017-01-30 19:21:21+0000\n"
+"PO-Revision-Date: 2017-03-02 21:53:15+0000\n"
 "Last-Translator: admin <admin@localhost.de>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -20,42 +20,42 @@ msgstr ""
 "X-Poedit-SearchPath-0: .\n"
 "X-Textdomain-Support: yes"
 
-#: post-worktime-logger.php:100
+#: post-worktime-logger.php:101
 #@ post-worktime-logger
 msgid "You have to save the post, before we can track the time."
 msgstr "Sie müssen den Artikel einmal speichern, bevor die Zeitmessung beginnt."
 
-#: post-worktime-logger.php:139
+#: post-worktime-logger.php:140
 #@ post-worktime-logger
 msgid "Post Worktime"
 msgstr "Artikel Arbeitszeit"
 
-#: post-worktime-logger.php:117
+#: post-worktime-logger.php:118
 #@ post-worktime-logger
 msgid "Current worktime"
 msgstr "Aktuelle Arbeitszeit"
 
-#: post-worktime-logger.php:118
+#: post-worktime-logger.php:119
 #@ post-worktime-logger
 msgid "Total worktime"
 msgstr "Gesamte Arbeitszeit"
 
-#: post-worktime-logger.php:124
+#: post-worktime-logger.php:125
 #@ post-worktime-logger
 msgid "Pause"
 msgstr "Pausieren"
 
-#: post-worktime-logger.php:125
+#: post-worktime-logger.php:126
 #@ post-worktime-logger
 msgid "Resume"
 msgstr "Fortfahren"
 
-#: post-worktime-logger.php:126
+#: post-worktime-logger.php:127
 #@ post-worktime-logger
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: post-worktime-logger.php:153
+#: post-worktime-logger.php:154
 #@ post-worktime-logger
 msgid "Worktime"
 msgstr "Arbeitszeit"
@@ -115,7 +115,7 @@ msgstr "Sie verfügen nicht über die notwendigen Berechtigungen um auf diese Se
 
 #: settings.php:79
 #: settings.php:134
-#: settings.php:260
+#: settings.php:282
 #@ post-worktime-logger
 msgid "Statistics"
 msgstr "Statistiken"
@@ -141,38 +141,38 @@ msgstr "Keine Daten."
 msgid "Post Worktime Logger Settings"
 msgstr "Post Worktime Logger Einstellungen"
 
-#: settings.php:198
+#: settings.php:199
 #@ default
 msgid "Save Changes"
 msgstr "Änderungen speichern"
 
 #: settings.php:189
-#: settings.php:202
+#: settings.php:203
 #@ post-worktime-logger
 msgid "Reset whole worktime"
 msgstr "Gesamte Arbeitszeit zurücksetzen"
 
-#: settings.php:221
+#: settings.php:243
 #@ post-worktime-logger
 msgid "General"
 msgstr "Allgemein"
 
-#: settings.php:228
+#: settings.php:250
 #@ post-worktime-logger
 msgid "Enable control buttons"
 msgstr "Aktiviere Steuer-Buttons"
 
-#: settings.php:252
+#: settings.php:274
 #@ post-worktime-logger
 msgid "Inactivity Timeout"
 msgstr "Zeitunterbrechung durch Inaktivität"
 
-#: settings.php:335
+#: settings.php:357
 #@ post-worktime-logger
 msgid "This will allow you to pause, resume and reset the worktime."
 msgstr "Erlaubt Ihnen das pausieren, fortfahren und zurücksetzen der Arbeitszeit."
 
-#: settings.php:391
+#: settings.php:413
 #@ post-worktime-logger
 msgid "This option allows you to specify a certain number of minutes that can pass without activity before the timer pauses."
 msgstr "Erlaubt Ihnen die maximale Zeit der Abwesenheit in Minuten anzugeben, bis der Timer pausiert."
@@ -189,22 +189,22 @@ msgstr "Gesamte Arbeitszeit für Artikel: %d Minuten"
 msgid "Total worktime on posts: %d hours, %d minutes"
 msgstr "Gesamte Arbeitszeit für Artikel: %d Stunden, %d Minuten"
 
-#: settings.php:244
+#: settings.php:266
 #@ post-worktime-logger
 msgid "Disable Auto Start"
 msgstr "Deaktiviere Autostart"
 
-#: settings.php:267
+#: settings.php:289
 #@ post-worktime-logger
 msgid "number of posts"
 msgstr "Anzahl der Artikel"
 
-#: settings.php:353
+#: settings.php:375
 #@ post-worktime-logger
 msgid "Activate this to prevent the time from starting automatically on post editing."
 msgstr "Aktiviere dies, um das automatische Starten des Timers bei der Bearbeitung von Artikeln zu verhindern. "
 
-#: settings.php:409
+#: settings.php:431
 #@ post-worktime-logger
 msgid "Specify this amount of posts to be displayed on the statistics page top worktime chart"
 msgstr "Definiere die Anzahl der Artikel, die auf der Statistik-Seite dargestellt werden sollen. "
@@ -219,13 +219,63 @@ msgstr "Deaktiviere das Aufzeichnen der Arbeitszeit im Frontend"
 msgid "This will only affect logged in users."
 msgstr "Dies betrifft nur eingeloggte Nutzer."
 
-#: settings.php:236
+#: settings.php:258
 #@ post-worktime-logger
 msgid "Disable auto start for published posts"
 msgstr "Deaktiviere Autostart für bereits veröffentlichte Artikel"
 
-#: settings.php:372
+#: settings.php:394
 #@ post-worktime-logger
 msgid "Activate this to prevent the time from starting automatically on post editing for published posts."
 msgstr "Aktiviere dies, um das automatische Starten des Timers bei der Bearbeitung von bereits veröffentlichten Artikeln zu verhindern."
 
+#: settings.php:193
+#@ post-worktime-logger
+msgid "Current version"
+msgstr "Aktuelle Version"
+
+#: settings.php:207
+#@ post-worktime-logger
+msgid "Need Help?"
+msgstr "Brauchst du Hilfe?"
+
+#: settings.php:209
+#@ post-worktime-logger
+msgid "Do you need help or has found a bug? Please describe the problem in the support forum."
+msgstr "Brauchst du Hilfe oder hast einen Fehler gefunden? Bitte beschreibe das Problem im Support Forum."
+
+#: settings.php:211
+#@ post-worktime-logger
+msgid "Support Forum"
+msgstr "Support Forum"
+
+#: settings.php:212
+#@ post-worktime-logger
+msgid "Github"
+msgstr "Github"
+
+#: settings.php:216
+#@ post-worktime-logger
+msgid "Other Plugins"
+msgstr "Andere Plugins"
+
+#: settings.php:217
+#@ post-worktime-logger
+msgid "WP Keyword Monitor"
+msgstr "WP Keyword Monitor"
+
+#: settings.php:219
+#@ post-worktime-logger
+msgid "A powerful SEO tool to track your rankings."
+msgstr "Ein starkes SEO Tool, um deine Rackings zu überwachen."
+
+#: settings.php:224
+#@ post-worktime-logger
+msgid "Support Plugin Author"
+msgstr "Unterstütze den Plugin Autor"
+
+#: settings.php:225
+#@ post-worktime-logger
+msgid "Donate"
+msgstr "Spenden"
+
diff --git a/post-worktime-logger.php b/post-worktime-logger.php
@@ -9,12 +9,13 @@
 Plugin Name: Post Worktime Logger
 Plugin URI: https://wordpress.org/plugins/post-worktime-logger/
 Description: A plugin to track the worktime for each post.
-Version: 1.5.1
+Version: 1.5.2
 Author: Patrick Hausmann
 Author URI: https://profiles.wordpress.org/filme-blog/
 License: GPLv3
 Text Domain: post-worktime-logger
 */
+const PWL_VERSION = "1.5.2";
 
 if ( !defined('PLUGINDIR') )
 	define( 'PLUGINDIR', 'wp-content/plugins' );

diff --git a/readme.md b/readme.md
@@ -86,6 +86,11 @@ You can donate to this project via
 
 ## Changelog
 
+### 1.5.2
+* Improved settings page.
+* Implemented support to show current version number in settings page.
+* Fixed some warning messages.
+
 ### 1.5.1 
 * Fixed check to disable the widget on the static front page.
 * Fixed typo.

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
 Tags: worktime, work, clock, time, time-tracking, tracking, Zeiterfassung, worktime logger, post work time, working time, Stunden, Uhr, Timer
 Requires at least: 2.3.1
 Tested up to: 4.6
-Stable tag: 1.5.1
+Stable tag: 1.5.2
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl.html
 
@@ -46,6 +46,11 @@ You can donate to this project via PayPal by visiting this page: https://www.pay
 
 == Changelog ==
 
+= 1.5.2 =
+* Improved settings page.
+* Implemented support to show current version number in settings page.
+* Fixed some warning messages.
+
 = 1.5.1 =
 * Fixed check to disable the widget on the static front page.
 * Fixed typo.

diff --git a/resources/css/post-worktime-logger.css b/resources/css/post-worktime-logger.css
diff --git a/resources/js/Chart.bundle.min.js b/resources/js/Chart.bundle.min.js
diff --git a/resources/js/post-worktime-logger.js b/resources/js/post-worktime-logger.js
diff --git a/ruleset.xml b/ruleset.xml
diff --git a/screenshots/screenshot-1.png b/screenshots/screenshot-1.png
diff --git a/screenshots/screenshot-2.png b/screenshots/screenshot-2.png
diff --git a/screenshots/screenshot-3.png b/screenshots/screenshot-3.png
diff --git a/screenshots/screenshot-4.png b/screenshots/screenshot-4.png
diff --git a/screenshots/screenshot-5.png b/screenshots/screenshot-5.png
diff --git a/screenshots/screenshot-6.png b/screenshots/screenshot-6.png
diff --git a/screenshots/screenshot-7.png b/screenshots/screenshot-7.png
diff --git a/settings.php b/settings.php
@@ -188,8 +188,9 @@ public function createAdminSettingsPage()
     {
         $confirmMessage = __("Reset whole worktime", self::PWL_TEXT_DOMAIN).'?';
         ?>
-        <div class="wrap">
+        <div style="float: left; width:65%;"  class="wrap">
             <h1><?php echo __("Post Worktime Logger Settings", self::PWL_TEXT_DOMAIN); ?></h1>
+            <p class="description"><?php _e("Current version", PWL_TEXT_DOMAIN); echo ": ".PWL_VERSION; ?></p>
             <form class="pwl-reset-form" method="post" action="options.php">
                 <?php
                 // This prints out all hidden setting fields
@@ -202,6 +203,27 @@ public function createAdminSettingsPage()
                 <button name="action" value="pwlResetWholeWorktime" class="button danger"><?php _e("Reset whole worktime", self::PWL_TEXT_DOMAIN); ?></button>
             </form>
         </div>
+        <div style="float: left; width:25%;" class="wrap">
+            <h1><?php _e("Need Help?", PWL_TEXT_DOMAIN); ?></h1>
+            <p class="description">
+                <?php _e("Do you need help or has found a bug? Please describe the problem in the support forum.", PWL_TEXT_DOMAIN); ?>
+            </p>
+            <a target="_blank" href="https://wordpress.org/support/plugin/post-worktime-logger" class="button"><?php _e("Support Forum", WP_KEYWORD_MONITOR_TEXT_DOMAIN);?></a>
+            <a target="_blank" href="https://github.com/blackus3r/post-worktime-logger/" class="button"><?php _e("Github", WP_KEYWORD_MONITOR_TEXT_DOMAIN);?></a>
+        </div>
+
+        <div style="margin-top:20px; float: left; width:25%;" class="wrap">
+            <h1><?php _e("Other Plugins", PWL_TEXT_DOMAIN); ?></h1>
+            <a target="_blank" href="https://de.wordpress.org/plugins/wp-keyword-monitor/" class="button"><?php _e("WP Keyword Monitor", WP_KEYWORD_MONITOR_TEXT_DOMAIN);?></a>
+            <p class="description">
+                <?php _e("A powerful SEO tool to track your rankings.", PWL_TEXT_DOMAIN); ?>
+            </p>
+        </div>
+
+        <div style="margin-top:20px; float: left; width:25%;" class="wrap">
+            <h1><?php _e("Support Plugin Author", PWL_TEXT_DOMAIN); ?></h1>
+            <a target="_blank" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=28WZAXQDXYZ5A" class="button"><?php _e("Donate", WP_KEYWORD_MONITOR_TEXT_DOMAIN);?></a>
+        </div>
         <?php
     }
 

diff --git a/widget.php b/widget.php
@@ -85,8 +85,8 @@ public function form( $_instance )
         $_instance = wp_parse_args((array)$_instance, $defaults);
 
         $title = $_instance['title'];
-        $displayWorktimeForNotLoggedInUsers = $_instance['displayWorktimeForNotLoggedInUsers'];
-        $disableFrontendTimeTracking = $_instance['disableFrontendTimeTracking'];
+        $displayWorktimeForNotLoggedInUsers = isset($_instance['displayWorktimeForNotLoggedInUsers']) ? $_instance['displayWorktimeForNotLoggedInUsers'] : false;;
+        $disableFrontendTimeTracking = isset($_instance['disableFrontendTimeTracking']) ? $_instance['disableFrontendTimeTracking'] : false;
         $preText = $_instance['preText'];
         $afterText = $_instance['afterText'];
         ?>