diff --git a/README.txt b/README.txt index d83123f..1c0c93b 100644 --- a/README.txt +++ b/README.txt @@ -3,7 +3,7 @@ Contributors: levdbas Tags: time, hours, tracking, client, pre-paid Requires at least: 3.0.1 Tested up to: 4.8 -Stable tag: 1.4 +Stable tag: 1.4.1 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -44,9 +44,24 @@ Yes! Feel free to sent me any suggestions or feedback. I think this plugin can b == Changelog == += 1.4.1 = +Thank you [Jos Klever](https://wordpress.org/support/users/josklever/) for reviewing the plugin. + +bugs fixed: + +* link to setup page on plugin overview is fixed. +* better check on the $workFields array if it is really empty. + +enhancements: + +* code refactoring, reusing code from widget page on overview page +* and thus using the same feedback flow from the widget on the overview page. +* add extra feedback when there are no work activities filled in. Providing a button to the settings page as well. + + = 1.4 = -## New: +new: * new menu setup * main page with dashicon @@ -54,14 +69,14 @@ Yes! Feel free to sent me any suggestions or feedback. I think this plugin can b * settings page with that originally was located under settings * better access control to widget and buttons -## Enhancements: +Enhancements: * made the hour wheel more responsive * code refactoring by splitting code over multiple partials. * new translations * UI is more consistant with WordPress in general. -## Bugs fixed: +Bugs fixed: * fixed a bug where entering more then 24h on bought/used gave an error * fixed a bug where when deactivating the plugin, all data was lost diff --git a/admin/class-support-hours-admin.php b/admin/class-support-hours-admin.php index ab4ebcf..bf6ae33 100644 --- a/admin/class-support-hours-admin.php +++ b/admin/class-support-hours-admin.php @@ -147,7 +147,7 @@ public function add_action_links( $links ) { * Documentation : https://codex.wordpress.org/Plugin_API/Filter_Reference/plugin_action_links_(plugin_file_name) */ $settings_link = array( - '' . __('Settings', $this->plugin_name) . '', + '' . __('Settings', $this->plugin_name) . '', ); return array_merge( $settings_link, $links ); @@ -159,6 +159,7 @@ public function add_action_links( $links ) { */ public function display_plugin_page() { + include_once( 'partials/support-hours-functions.php' ); include_once( 'support-hours-admin-overview.php' ); } public function display_plugin_setup_page() { diff --git a/admin/css/support-hours-admin.min.css b/admin/css/support-hours-admin.min.css index 0f344e6..a4f1070 100644 --- a/admin/css/support-hours-admin.min.css +++ b/admin/css/support-hours-admin.min.css @@ -1 +1 @@ -.progress-bar{position:relative;width:100%;padding-bottom:100%}.progress-bar .background{background-color:#ccc}.progress-bar .left{background-color:#ccc;opacity:1}.progress-bar.midnight .rotate,.progress-bar.midnight .right{background-color:#e14d43}.progress-bar.midnight .innerCicle:hover .text{color:#e14d43}.progress-bar.ectoplasm .rotate,.progress-bar.ectoplasm .right{background-color:#a3b745}.progress-bar.ectoplasm .innerCicle:hover .text{color:#a3b745}.progress-bar.blue .rotate,.progress-bar.blue .right{background-color:#e1a948}.progress-bar.blue .innerCicle:hover .text{color:#e1a948}.progress-bar.ocean .rotate,.progress-bar.ocean .right{background-color:#9ebaa0}.progress-bar.ocean .innerCicle:hover .text{color:#9ebaa0}.progress-bar.coffee .rotate,.progress-bar.coffee .right{background-color:#c7a589}.progress-bar.coffee .innerCicle:hover .text{color:#c7a589}.progress-bar.sunrise .rotate,.progress-bar.sunrise .right{background-color:#dd823b}.progress-bar.sunrise .innerCicle:hover .text{color:#dd823b}.progress-bar .rotate{background-color:#008ec2}.progress-bar .right{background-color:#008ec2;transform:rotate(180deg);opacity:0}.progress-bar .innerCicle{width:90%;height:90%;margin:5%;position:absolute;z-index:12;border-radius:50%;background:white;transition:all 0.2s ease-in}.progress-bar .innerCicle .textHolder{display:block;top:50%;position:relative}.progress-bar .innerCicle .textHolder .text{text-align:center;display:block;color:#ccc;font-weight:bold;margin-top:-50px;font-size:35px;transition:all 0.2s ease-in;line-height:50px;position:absolute;width:100%}.progress-bar .innerCicle .textHolder .text.small{margin-top:-50px;line-height:50px;font-size:30px}.progress-bar .innerCicle:hover{width:94%;height:94%;margin:3%}.progress-bar .innerCicle:hover .text{font-size:45px;color:#008ec2}.progress-bar .innerCicle:hover .text.small{font-size:35px}.progress-bar div{border-radius:50%;height:100%;position:absolute;width:100%}.progress-bar .smallbr{display:none}@keyframes toggle{0%{opacity:0}100%{opacity:1}}@media screen and (max-width: 870px){.smallbr{display:block}.bigbr{display:none}.text{font-size:30px;line-height:40px;margin-top:-40px}.progress-bar:hover .text{font-size:40px}}@media screen and (max-width: 800px){.progress-bar{max-width:none;max-height:none}}#support_hours_dashboard_widget h3{margin:1.33em 0 0;font-size:16px;font-weight:bold}.bold{font-weight:bold;color:#444}.worktable{margin-top:20px;padding-bottom:10px;margin-bottom:10px}.worktable th{text-align:left}.total{border-top:1px solid #eee;border-bottom:1px solid #eee;margin:0 -12px;margin-top:10px;padding:8px 12px 4px;font-size:1rem;background:#fafafa}.currentDate{display:none}.rwd-table{margin:1em 0;min-width:300px}.rwd-table tr{border-top:1px solid #ddd;border-bottom:1px solid #ddd}.rwd-table th{display:none}.rwd-table td{display:block}.rwd-table td:first-child{padding-top:.5em}.rwd-table td:last-child{padding-bottom:.5em}.rwd-table td.remove:before{content:'';width:0}.rwd-table td:before{content:attr(data-th) ": ";font-weight:bold;width:6.5em;display:inline-block}@media (min-width: 480px){.rwd-table td:before{display:none}}.rwd-table th,.rwd-table td{text-align:left}@media (min-width: 480px){.rwd-table th,.rwd-table td{display:table-cell;padding:.25em .5em}.rwd-table th:first-child,.rwd-table td:first-child{padding-left:0}.rwd-table th:last-child,.rwd-table td:last-child{padding-right:0}}.clearfix{clear:both} +.progress-bar{position:relative;width:100%;padding-bottom:100%}.progress-bar .background{background-color:#ccc}.progress-bar .left{background-color:#ccc;opacity:1}.progress-bar.midnight .rotate,.progress-bar.midnight .right{background-color:#e14d43}.progress-bar.midnight .innerCicle:hover .text{color:#e14d43}.progress-bar.ectoplasm .rotate,.progress-bar.ectoplasm .right{background-color:#a3b745}.progress-bar.ectoplasm .innerCicle:hover .text{color:#a3b745}.progress-bar.blue .rotate,.progress-bar.blue .right{background-color:#e1a948}.progress-bar.blue .innerCicle:hover .text{color:#e1a948}.progress-bar.ocean .rotate,.progress-bar.ocean .right{background-color:#9ebaa0}.progress-bar.ocean .innerCicle:hover .text{color:#9ebaa0}.progress-bar.coffee .rotate,.progress-bar.coffee .right{background-color:#c7a589}.progress-bar.coffee .innerCicle:hover .text{color:#c7a589}.progress-bar.sunrise .rotate,.progress-bar.sunrise .right{background-color:#dd823b}.progress-bar.sunrise .innerCicle:hover .text{color:#dd823b}.progress-bar .rotate{background-color:#008ec2}.progress-bar .right{background-color:#008ec2;transform:rotate(180deg);opacity:0}.progress-bar .innerCicle{width:90%;height:90%;margin:5%;position:absolute;z-index:12;border-radius:50%;background:white;transition:all 0.2s ease-in}.progress-bar .innerCicle .textHolder{display:block;top:50%;position:relative}.progress-bar .innerCicle .textHolder .text{text-align:center;display:block;color:#ccc;font-weight:bold;margin-top:-50px;font-size:35px;transition:all 0.2s ease-in;line-height:50px;position:absolute;width:100%}.progress-bar .innerCicle .textHolder .text.small{margin-top:-50px;line-height:50px;font-size:30px}.progress-bar .innerCicle:hover{width:94%;height:94%;margin:3%}.progress-bar .innerCicle:hover .text{font-size:45px;color:#008ec2}.progress-bar .innerCicle:hover .text.small{font-size:35px}.progress-bar div{border-radius:50%;height:100%;position:absolute;width:100%}.progress-bar .smallbr{display:none}@keyframes toggle{0%{opacity:0}100%{opacity:1}}@media screen and (max-width: 870px){.smallbr{display:block}.bigbr{display:none}.text{font-size:30px;line-height:40px;margin-top:-40px}.progress-bar:hover .text{font-size:40px}}@media screen and (max-width: 800px){.progress-bar{max-width:none;max-height:none}}#support_hours_dashboard_widget h3{margin:1.33em 0 0;font-size:16px;font-weight:bold}.bold{font-weight:bold;color:#444}.worktable{margin-top:20px;padding-bottom:10px;margin-bottom:10px}.worktable th{text-align:left}.total{border-top:1px solid #eee;border-bottom:1px solid #eee;margin:0 -12px;margin-top:10px;padding:8px 12px 4px;font-size:1rem;background:#fafafa;margin-bottom:12px}.currentDate{display:none}.rwd-table{margin:1em 0;min-width:300px}.rwd-table tr{border-top:1px solid #ddd;border-bottom:1px solid #ddd}.rwd-table th{display:none}.rwd-table td{display:block}.rwd-table td:first-child{padding-top:.5em}.rwd-table td:last-child{padding-bottom:.5em}.rwd-table td.remove:before{content:'';width:0}.rwd-table td:before{content:attr(data-th) ": ";font-weight:bold;width:6.5em;display:inline-block}@media (min-width: 480px){.rwd-table td:before{display:none}}.rwd-table th,.rwd-table td{text-align:left}@media (min-width: 480px){.rwd-table th,.rwd-table td{display:table-cell;padding:.25em .5em}.rwd-table th:first-child,.rwd-table td:first-child{padding-left:0}.rwd-table th:last-child,.rwd-table td:last-child{padding-right:0}}.clearfix{clear:both} diff --git a/admin/css/support-hours-admin.scss b/admin/css/support-hours-admin.scss index d69d67e..916a1f0 100644 --- a/admin/css/support-hours-admin.scss +++ b/admin/css/support-hours-admin.scss @@ -185,6 +185,7 @@ $breakpoint-alpha: 480px; padding: 8px 12px 4px; font-size: 1rem; background:#fafafa; + margin-bottom: 12px; } .currentDate{ display: none; diff --git a/admin/partials/support-hours-admin-settings-workTable.php b/admin/partials/support-hours-admin-settings-workTable.php index a4f904b..0f7f821 100644 --- a/admin/partials/support-hours-admin-settings-workTable.php +++ b/admin/partials/support-hours-admin-settings-workTable.php @@ -1,7 +1,3 @@ - -
@@ -15,10 +11,7 @@ - + diff --git a/admin/partials/support-hours-admin-widget-bottomMessage.php b/admin/partials/support-hours-admin-widget-bottomMessage.php index a54798e..feb396c 100644 --- a/admin/partials/support-hours-admin-widget-bottomMessage.php +++ b/admin/partials/support-hours-admin-widget-bottomMessage.php @@ -1,3 +1,17 @@ + + + plugin_name); ?> + + = 5 && current_user_can('publish_pages')): ?> + plugin_name); ?> + + + + + plugin_name); ?> + + +

plugin_name); ?>
@@ -13,3 +27,4 @@

+ diff --git a/admin/partials/support-hours-admin-widget-workTable.php b/admin/partials/support-hours-admin-widget-workTable.php new file mode 100644 index 0000000..2c0021c --- /dev/null +++ b/admin/partials/support-hours-admin-widget-workTable.php @@ -0,0 +1,33 @@ + +

plugin_name); ?>

+ +
+ + + + + + + + + + + + + + + = 5){ + break; + } + } + ?> + +
plugin_name); ?>plugin_name); ?>plugin_name); ?>
+
+ plugin_name); ?> + : +
diff --git a/admin/partials/support-hours-functions.php b/admin/partials/support-hours-functions.php index 9a2e34a..ab750a7 100644 --- a/admin/partials/support-hours-functions.php +++ b/admin/partials/support-hours-functions.php @@ -48,7 +48,7 @@ function AddTime($workFields) { } } - // set of vars used in different files and functions. +// set of vars used in different files and functions. $options = get_option($this->plugin_name); $users = $options['users']; $email = $options['email']; @@ -61,9 +61,9 @@ function AddTime($workFields) { $bought_hours = $options['bought_hours']; $bought_hours = minuszeros($bought_hours); $current_color = get_user_option( 'admin_color' ); - $size = 'big'; // TODO:set code to functions. + if (strpos($used_hours, ':') !== false){ $size = 'small'; } else{ diff --git a/admin/support-hours-admin-overview.php b/admin/support-hours-admin-overview.php index 54792cd..04d6756 100644 --- a/admin/support-hours-admin-overview.php +++ b/admin/support-hours-admin-overview.php @@ -4,51 +4,29 @@ * Provide a page that can be seen from editor to admin. Shows all the time entries. * * @link http://basedonline.nl -* @since 1.0.0 +* @since 1.4.0 * * @package Support_Hours * @subpackage Support_Hours/admin */ -?> -plugin_name); - $bought_hours = $options['bought_hours']; - $workFields = $options['workFields']; - include_once( 'partials/support-hours-functions.php' ); +global $pagenow; ?>

-
- - - - - - - - - - - - - - - - - - - - -
plugin_name); ?>plugin_name); ?>plugin_name); ?>
-
- plugin_name); ?>: - plugin_name); ?> - plugin_name); ?> +

+ + plugin_name); ?> + +

+
- diff --git a/admin/support-hours-admin-settings.php b/admin/support-hours-admin-settings.php index 37cf366..afc1c6d 100644 --- a/admin/support-hours-admin-settings.php +++ b/admin/support-hours-admin-settings.php @@ -3,28 +3,27 @@ /** * Settings page of Support Hours * -* This file is used to markup the admin-facing aspects of the plugin. -* * @link http://basedonline.nl * @since 1.4.0 * * @package Support_Hours * @subpackage Support_Hours/admin */ - +?> +plugin_name); $bought_hours = $options['bought_hours']; $users = $options['users']; $email = $options['email']; $workFields = $options['workFields']; $user_ID = get_current_user_id(); + $i = 0; ?>

plugin_name); do_settings_sections($this->plugin_name); include_once( 'partials/support-hours-admin-settings-textFields.php' ); diff --git a/admin/support-hours-admin-widget.php b/admin/support-hours-admin-widget.php index f5e7a6a..6d4403b 100644 --- a/admin/support-hours-admin-widget.php +++ b/admin/support-hours-admin-widget.php @@ -1,44 +1,46 @@ -

- - plugin_name); ?> - -

+ elseif(empty($users) || empty($email)): + ?> - - -

- plugin_name); ?>. -

-

- plugin_name); ?> -

- - +

+ + plugin_name); ?> + +

+ + + +

+ plugin_name); ?>. +

+

+ plugin_name); ?> +

+ + diff --git a/languages/support-hours-nl_NL.mo b/languages/support-hours-nl_NL.mo index bfd35f7..75fa16d 100644 Binary files a/languages/support-hours-nl_NL.mo and b/languages/support-hours-nl_NL.mo differ diff --git a/languages/support-hours-nl_NL.po b/languages/support-hours-nl_NL.po index 5f18a5b..16aa260 100644 --- a/languages/support-hours-nl_NL.po +++ b/languages/support-hours-nl_NL.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Support hours\n" -"POT-Creation-Date: 2017-09-28 13:59+0200\n" -"PO-Revision-Date: 2017-09-28 13:59+0200\n" +"POT-Creation-Date: 2017-10-06 03:31+0200\n" +"PO-Revision-Date: 2017-10-06 04:25+0200\n" "Last-Translator: \n" "Language-Team: Erik van der Bas \n" "Language: nl_NL\n" @@ -76,67 +76,84 @@ msgstr "Aantal ingekochte Support Uren" msgid "Please enter a valid time" msgstr "Voer een valide tijd in" -#: admin/partials/support-hours-admin-settings-workTable.php:12 -#: admin/partials/support-hours-admin-settings-workTable.php:28 -#: admin/partials/support-hours-admin-settings-workTable.php:51 -#: admin/partials/support-hours-admin-widget-hourTable.php:6 -#: admin/support-hours-admin-overview.php:30 +#: admin/partials/support-hours-admin-settings-workTable.php:8 +#: admin/partials/support-hours-admin-settings-workTable.php:24 +#: admin/partials/support-hours-admin-settings-workTable.php:47 +#: admin/partials/support-hours-admin-widget-hourTable.php:5 +#: admin/support-hours-admin-overview.php:27 msgid "Date" msgstr "Datum" -#: admin/partials/support-hours-admin-settings-workTable.php:13 -#: admin/partials/support-hours-admin-settings-workTable.php:33 -#: admin/partials/support-hours-admin-settings-workTable.php:56 -#: admin/partials/support-hours-admin-widget-hourTable.php:7 -#: admin/support-hours-admin-overview.php:31 +#: admin/partials/support-hours-admin-settings-workTable.php:9 +#: admin/partials/support-hours-admin-settings-workTable.php:29 +#: admin/partials/support-hours-admin-settings-workTable.php:52 +#: admin/partials/support-hours-admin-widget-hourTable.php:6 +#: admin/support-hours-admin-overview.php:28 msgid "Description" msgstr "Beschrijving" -#: admin/partials/support-hours-admin-settings-workTable.php:14 -#: admin/partials/support-hours-admin-settings-workTable.php:37 -#: admin/partials/support-hours-admin-settings-workTable.php:60 -#: admin/partials/support-hours-admin-widget-hourTable.php:8 -#: admin/support-hours-admin-overview.php:32 +#: admin/partials/support-hours-admin-settings-workTable.php:10 +#: admin/partials/support-hours-admin-settings-workTable.php:33 +#: admin/partials/support-hours-admin-settings-workTable.php:56 +#: admin/partials/support-hours-admin-widget-hourTable.php:7 +#: admin/support-hours-admin-overview.php:29 msgid "Time used" msgstr "Tijd verbruikt" -#: admin/partials/support-hours-admin-settings-workTable.php:30 -#: admin/partials/support-hours-admin-settings-workTable.php:53 +#: admin/partials/support-hours-admin-settings-workTable.php:26 +#: admin/partials/support-hours-admin-settings-workTable.php:49 msgid "Today" msgstr "Vandaag" -#: admin/partials/support-hours-admin-settings-workTable.php:34 -#: admin/partials/support-hours-admin-settings-workTable.php:57 +#: admin/partials/support-hours-admin-settings-workTable.php:30 +#: admin/partials/support-hours-admin-settings-workTable.php:53 msgid "Description of the activity" msgstr "Beschrijving van de activiteit" -#: admin/partials/support-hours-admin-settings-workTable.php:69 +#: admin/partials/support-hours-admin-settings-workTable.php:65 msgid "Add activity" msgstr "Voeg activiteit toe" -#: admin/partials/support-hours-admin-settings-workTable.php:69 +#: admin/partials/support-hours-admin-settings-workTable.php:65 msgid "Save all changes" msgstr "Bijwerken" #: admin/partials/support-hours-admin-widget-bottomMessage.php:3 +msgid "Add new activity" +msgstr "Voeg nieuwe activiteit toe" + +#: admin/partials/support-hours-admin-widget-bottomMessage.php:6 +msgid "View all acitivities" +msgstr "Bekijk alle activiteiten" + +#: admin/partials/support-hours-admin-widget-bottomMessage.php:11 +msgid "Add first acitivity" +msgstr "Voeg eerste activiteit toe" + +#: admin/partials/support-hours-admin-widget-bottomMessage.php:16 +#: admin/support-hours-admin-overview.php:46 +msgid "Total" +msgstr "Totaal" + +#: admin/partials/support-hours-admin-widget-bottomMessage.php:21 msgid "Support hours used." msgstr "Support uren verbruikt." -#: admin/partials/support-hours-admin-widget-bottomMessage.php:5 +#: admin/partials/support-hours-admin-widget-bottomMessage.php:23 msgid "Support hours almost used" msgstr "Support Uren bijna gebruik" -#: admin/partials/support-hours-admin-widget-bottomMessage.php:7 +#: admin/partials/support-hours-admin-widget-bottomMessage.php:25 msgid "Need more support hours" msgstr "Heeft u meer support uren nodig" -#: admin/partials/support-hours-admin-widget-bottomMessage.php:9 -#: admin/support-hours-admin-widget.php:35 +#: admin/partials/support-hours-admin-widget-bottomMessage.php:27 +#: admin/support-hours-admin-widget.php:38 msgid "Contact me via" msgstr "Neem contact op via" #: admin/partials/support-hours-admin-widget-clock.php:15 -#: admin/support-hours-admin-overview.php:51 +#: admin/support-hours-admin-overview.php:48 msgid "hours" msgstr "uur" @@ -144,32 +161,19 @@ msgstr "uur" msgid "used" msgstr "verbruikt" -#: admin/partials/support-hours-admin-widget-hourTable.php:2 +#: admin/partials/support-hours-admin-widget-hourTable.php:1 msgid "Activities" msgstr "Activiteiten" -#: admin/partials/support-hours-admin-widget-hourTable.php:30 -msgid "Add new activity" -msgstr "Voeg nieuwe activiteit toe" - -#: admin/partials/support-hours-admin-widget-hourTable.php:33 -msgid "View all acitivities" -msgstr "Bekijk alle activiteiten" - -#: admin/partials/support-hours-admin-widget-hourTable.php:35 -#: admin/support-hours-admin-overview.php:49 -msgid "Total" -msgstr "Totaal" - -#: admin/partials/support-hours-admin-widget-hourTable.php:37 -msgid "Add first acitivity" -msgstr "Voeg eerste activiteit toe" - -#: admin/support-hours-admin-overview.php:50 +#: admin/support-hours-admin-overview.php:47 msgid "hours used of" msgstr "uren gebruikt van" -#: admin/support-hours-admin-settings.php:36 +#: admin/support-hours-admin-overview.php:52 +msgid "There are currently no activities logged" +msgstr "Er zijn momenteel nog geen activiteiten toegevoegd." + +#: admin/support-hours-admin-settings.php:37 msgid "" "You do not have access to this page because you are not a Support Hours " "manager. Please disable and enable this plugin if you need access again." @@ -178,11 +182,11 @@ msgstr "" "bent. Deactiveer en activeer de plugin opnieuw om weer toegang te krijgen " "tot deze pagina." -#: admin/support-hours-admin-widget.php:25 +#: admin/support-hours-admin-widget.php:28 msgid "Configure plugin!" msgstr "Configureer plugin!" -#: admin/support-hours-admin-widget.php:32 +#: admin/support-hours-admin-widget.php:35 msgid "No support Hours bought" msgstr "Geen support uren gekocht" diff --git a/support-hours.php b/support-hours.php index 151bf40..aaa5b33 100644 --- a/support-hours.php +++ b/support-hours.php @@ -16,7 +16,7 @@ * Plugin Name: Support Hours * Plugin URI: http://basedonline.nl * Description: The support-hours plugin can be used to give your customers insight on the status of their pre-paid support hours. - * Version: 1.4 + * Version: 1.4.1 * Author: Erik van der Bas * Author URI: http://basedonline.nl * License: GPL-2.0+