diff --git a/README.md b/README.md index 87432aa..f556ba1 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,8 @@ - Database: http://localhost:8096 - Template-Engine: https://github.com/cho45/micro-template.js - Test-Accounts: - - dog@probuddy.xy \ No newline at end of file + - dog@probuddy.xy + - info@coaching4dogs.xx (kein Admin-Account) + - benny@probuddy.de + - timo@tbuddy.de + - tretslag@gmail.com \ No newline at end of file diff --git a/src/client/app/js/app/core/Dict.js b/src/client/app/js/app/core/Dict.js index 4f003a6..b6964a5 100644 --- a/src/client/app/js/app/core/Dict.js +++ b/src/client/app/js/app/core/Dict.js @@ -276,6 +276,7 @@ app.core.Dict = { "ACTIONMENU_CREATE_MESSAGE" : "Nachricht erstellen...", "ACTIONMENU_CREATE_APPOINTMENT" : "Termin erstellen...", "ACTIONMENU_INVITE" : "Mitglieder einladen...", + "ACTIONMENU_MANAGER_CONSOLE" : "Manager-Konsole", "FROM" : "Von", "SUBJECT" : "Betreff", "DATE" : "", diff --git a/src/client/app/tmpl/gui-actionbutton.html b/src/client/app/tmpl/gui-actionbutton.html index 390daea..ee723f2 100644 --- a/src/client/app/tmpl/gui-actionbutton.html +++ b/src/client/app/tmpl/gui-actionbutton.html @@ -23,6 +23,11 @@ <% var currentUser = app.model.SessionUser ? app.model.SessionUser.getUserProfile() : null; %> <% var adminGroups = app.model.SessionUser ? app.model.SessionUser.getAdminGroups() : null; %> <% if ( currentUser && 0 < adminGroups.length ) { %> +
  • +
    +   <%= _lc( 'ACTIONMENU_MANAGER_CONSOLE' ) %> +
    +
  •   <%= _lc( 'ACTIONMENU_INVITE' ) %> @@ -38,16 +43,16 @@   <%= _lc( 'ACTIONMENU_CATEGORY_MANAGEMENT' ) %>
  • -
  • - -   <%= _lc( 'ACTIONMENU_STATS' ) %> - -
  • -
  • - -   <%= _lc( 'ACTIONMENU_CREATE_APPOINTMENT' ) %> - -
  • +
  • + +   <%= _lc( 'ACTIONMENU_STATS' ) %> + +
  • +
  • + +   <%= _lc( 'ACTIONMENU_CREATE_APPOINTMENT' ) %> + +
  • <% } %> \ No newline at end of file diff --git a/src/client/app/tmpl/home-appointment-item.html b/src/client/app/tmpl/home-appointment-item.html index 7652b69..13463c2 100644 --- a/src/client/app/tmpl/home-appointment-item.html +++ b/src/client/app/tmpl/home-appointment-item.html @@ -210,7 +210,6 @@ <% let ma; %> <% ma = homeState.getMembersForAppointment( a, 'accepted' ); %> - <% console.log( ma ) %> <% if ( ma.length > 0 ) { %> diff --git a/src/server/server/config/boot_local.php b/src/server/server/config/boot_local.php index e10f62e..67bbc4d 100644 --- a/src/server/server/config/boot_local.php +++ b/src/server/server/config/boot_local.php @@ -35,3 +35,6 @@ Francis_Utils_Config::set( 'slack.logWebhook', "https://hooks.slack.com/services // Google analytics Francis_Utils_Config::set( 'analytics.trackingId', 'UA-139730172-1' ); + +// Manager console +Francis_Utils_Config::set( 'url.manager', 'https://manager.probuddy.de/' ); diff --git a/src/server/server/control/TB_Server_Control_Auth.php b/src/server/server/control/TB_Server_Control_Auth.php index 15914da..35573f9 100644 --- a/src/server/server/control/TB_Server_Control_Auth.php +++ b/src/server/server/control/TB_Server_Control_Auth.php @@ -346,7 +346,8 @@ class TB_Server_Control_Auth 'url' => Francis_Utils_Config::get( 'url.client' ), 'onesignal.appId' => Francis_Utils_Config::get( 'onesignal.appId' ), 'environment' => Francis_Utils_Config::get( 'environment' ), - 'version' => Francis_Utils_Config::get( 'version' ) + 'version' => Francis_Utils_Config::get( 'version' ), + 'manager.url' => Francis_Utils_Config::get( 'url.manager' ), ); $resp->addData( 'config', $config ); }