GP-36357: Make the same style for all sqltsk pages.

awg-github · awg-github · commit 62d3e48a1d3a · 2023-08-17T13:26:25.000+03:00
diff --git a/CRM/Sqltasks/Form/SqltaskSettings.php b/CRM/Sqltasks/Form/SqltaskSettings.php
@@ -17,6 +17,10 @@ public function buildQuickForm() {
 
     $this->assign('settingsNames', [Settings::SQLTASKS_IS_DISPATCHER_DISABLED, Settings::SQLTASKS_MAX_FAILS_NUMBER]);
     $this->assign('SqltaskManagerLink', CRM_Utils_System::url('civicrm/a/', NULL, TRUE, "/sqltasks/manage"));
+
+    CRM_Core_Resources::singleton()->addStyleFile('de.systopia.sqltasks', 'css/sqlTaskGeneral.css');
+    CRM_Core_Resources::singleton()->addScriptFile('de.systopia.sqltasks', 'js/AddBodyClass.js', 1000, 'html-header');
+
     parent::buildQuickForm();
   }
 
diff --git a/CRM/Sqltasks/Form/SqltasksExecutionList.php b/CRM/Sqltasks/Form/SqltasksExecutionList.php
@@ -42,6 +42,9 @@ public function buildQuickForm() {
     $this->add('datepicker', 'end_date', E::ts('End date'), ['class' => 'medium'], FALSE, ['time' => FALSE]);
     $this->add('number', 'limit_per_page', ts('Limit per page'), ['class' => 'medium'], FALSE);
     $this->addButtons([['type' => 'submit', 'name' => E::ts('Submit'), 'isDefault' => TRUE]]);
+
+    CRM_Core_Resources::singleton()->addStyleFile('de.systopia.sqltasks', 'css/sqlTaskGeneral.css');
+    CRM_Core_Resources::singleton()->addScriptFile('de.systopia.sqltasks', 'js/AddBodyClass.js', 1000, 'html-header');
   }
 
   public function postProcess() {
diff --git a/CRM/Sqltasks/Page/GlobalTokenManager.php b/CRM/Sqltasks/Page/GlobalTokenManager.php
@@ -10,6 +10,9 @@ public function run() {
     $this->assign('tokens', json_encode((CRM_Sqltasks_GlobalToken::singleton())->getAllTokenData()));
     $this->assign('maxLengthOfTokenName', CRM_Sqltasks_GlobalToken::MAX_LENGTH_OF_TOKEN_NAME);
 
+    CRM_Core_Resources::singleton()->addStyleFile('de.systopia.sqltasks', 'css/sqlTaskGeneral.css');
+    CRM_Core_Resources::singleton()->addScriptFile('de.systopia.sqltasks', 'js/AddBodyClass.js', 1000, 'html-header');
+
     parent::run();
   }
 
diff --git a/CRM/Sqltasks/Page/SqltasksExecutionView.php b/CRM/Sqltasks/Page/SqltasksExecutionView.php
@@ -25,6 +25,9 @@ public function run() {
     $this->assign('sqltasksExecution', $sqltasksExecution);
     $this->assign('logsTaskExecution', $sqltasksExecution['decoded_logs']);
 
+    CRM_Core_Resources::singleton()->addStyleFile('de.systopia.sqltasks', 'css/sqlTaskGeneral.css');
+    CRM_Core_Resources::singleton()->addScriptFile('de.systopia.sqltasks', 'js/AddBodyClass.js', 1000, 'html-header');
+
     parent::run();
   }
 
diff --git a/CRM/Sqltasks/Page/Templates.php b/CRM/Sqltasks/Page/Templates.php
@@ -14,6 +14,9 @@ function ($bao) { return $bao->mapToArray(); },
 
     $this->assign("defaultTemplateId", Civi::settings()->get("sqltasks_default_template"));
 
+    CRM_Core_Resources::singleton()->addStyleFile('de.systopia.sqltasks', 'css/sqlTaskGeneral.css');
+    CRM_Core_Resources::singleton()->addScriptFile('de.systopia.sqltasks', 'js/AddBodyClass.js', 1000, 'html-header');
+
     parent::run();
   }
 
diff --git a/ang/actions/ErrorHandler.html b/ang/actions/ErrorHandler.html
@@ -28,7 +28,7 @@
         <div class="sql-tasks">
             <action-additional-info model='model' fieldPrefix="'error_handler'" index='index'></action-additional-info>
 
-            <div class="help" style="margin-left: 5px; margin-right: 5px;">
+            <div class="help sql-task-help" style="margin-left: 5px; margin-right: 5px;">
                 {{ts('This action will be triggered if the execution of the task has reported errors, or has failed completely.')}}
             </div>
 
diff --git a/ang/actions/SuccessHandler.html b/ang/actions/SuccessHandler.html
@@ -28,7 +28,7 @@
         <div class="sql-tasks">
             <action-additional-info model='model' fieldPrefix="'success_handler'" index='index'></action-additional-info>
 
-            <div class="help" style="margin-left: 5px; margin-right: 5px;">
+            <div class="help sql-task-help" style="margin-left: 5px; margin-right: 5px;">
                 {{ts('This action will be triggered after the')}}
                 <strong>{{ts('successful')}}</strong>
                 {{ts('execution of the task.')}}
diff --git a/ang/configImport.ang.php b/ang/configImport.ang.php
@@ -8,7 +8,7 @@
     0 => 'ang/*.js',
   ],
   'css' => [
-    0 => 'css/sqlTaskHideCiviUi.css',
+    0 => 'css/sqlTaskGeneral.css',
   ],
   'partials' => [
     0 => 'ang/configImport',
diff --git a/ang/configImport.js b/ang/configImport.js
@@ -24,7 +24,7 @@
     .module(moduleName)
     .controller("configImport", function($scope, $location, taskId) {
       setTimeout(function() {
-        CRM.$('body').addClass('sql-task-manager-angular-page-wrapper');
+        CRM.$('body').addClass('sql-task-body-page-wrapper');
       }, 0);
 
       $scope.ts = CRM.ts();
diff --git a/ang/deleteTask.ang.php b/ang/deleteTask.ang.php
@@ -8,7 +8,7 @@
     0 => 'ang/*.js',
   ],
   'css' => [
-    0 => 'css/sqlTaskHideCiviUi.css',
+    0 => 'css/sqlTaskGeneral.css',
   ],
   'partials' => [
     0 => 'ang/deleteTask',
diff --git a/ang/deleteTask.js b/ang/deleteTask.js
@@ -24,7 +24,7 @@
     .module(moduleName)
     .controller("deleteTask", function($scope, $location, taskId) {
       setTimeout(function() {
-        CRM.$('body').addClass('sql-task-manager-angular-page-wrapper');
+        CRM.$('body').addClass('sql-task-body-page-wrapper');
       }, 0);
 
       $scope.ts = CRM.ts();
diff --git a/ang/deleteTask/deleteTask.html b/ang/deleteTask/deleteTask.html
@@ -1,23 +1,34 @@
-<div id="crm-main-content-wrapper">
+<div class="crm-form-block">
+  <div class="sql-task__form-wrap">
     <h1 crm-page-title>{{ts('Delete Task') + ' "' + taskData.name + '"'}}</h1>
-    <h3>{{ts('Delete Task')}} <span ng-if="taskData">"{{taskData.name}}"</span></h3>
     <div>
+
+      <div class="sql-task-delete-page-content">
         <p ng-if="taskData">
-            {{ts('You are about to delete plugin')}} "{{taskData.name}}" [{{taskData.id}}]. {{ts('You should consider simply
-            disabling it, since all data
-            will be lost.')}}
+          {{ts('You are about to delete plugin')}} "{{taskData.name}}" [{{taskData.id}}]. {{ts('You should consider simply
+          disabling it, since all data
+          will be lost.')}}
         </p>
         <p ng-if="!taskData">
-            {{ts("Task doesn't exist or not created.")}}
+          {{ts("Task doesn't exist or not created.")}}
         </p>
-        <a class="button" href="javascript:;" ng-if="taskData" ng-click="onTaskDelete()">
-            <span>
-                <span class="icon ui-icon-trash css_left"></span>
-                <span>{{ts('Delete')}}</span>
-            </span>
+      </div>
+
+      <div class="sql-task__button-wrap">
+        <a class="sql-task__button sql-task__search-button crm-form-submit default crm-button crm-hover-button"
+           ng-click="onTaskDelete()"
+           href="javascript:;" title="{ts}Go to the SQL Task Manager{/ts}">
+          <span class="crm-i fa-trash"></span>
+          <span>{{ts('Delete')}}</span>
         </a>
-        <a class="button" href="javascript:;" ng-click="onBackPress()">
-            <span>{{ts('Back')}}</span>
+
+        <a class="sql-task__button sql-task__search-button crm-form-submit default crm-button crm-hover-button"
+           ng-click="onBackPress()"
+           href="javascript:;" title="{ts}Go to the SQL Task Manager{/ts}">
+          <span class="crm-i fa-list"></span>
+          <span>{{ts('Back')}}</span>
         </a>
+      </div>
     </div>
+  </div>
 </div>
diff --git a/ang/sqlTaskConfigurator.ang.php b/ang/sqlTaskConfigurator.ang.php
@@ -4,13 +4,13 @@
 // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
 return [
   'requires' => ['ngRoute', 'ui.sortable'],
-  'js' => [ 
+  'js' => [
     0 => 'ang/sqlTaskConfigurator.js',
     1 => 'ang/actions/*.js',
   ],
   'css' => [
     0 => 'css/sqlTaskConfigurator.css',
-    1 => 'css/sqlTaskHideCiviUi.css',
+    1 => 'css/sqlTaskGeneral.css',
   ],
   'partials' => [
     0 => 'ang/sqlTaskConfigurator',
diff --git a/ang/sqlTaskConfigurator.js b/ang/sqlTaskConfigurator.js
@@ -22,7 +22,7 @@
 
   angular.module(moduleName).service('loaderService', function() {
     setTimeout(function() {
-      CRM.$('body').addClass('sql-task-manager-angular-page-wrapper');
+      CRM.$('body').addClass('sql-task-body-page-wrapper');
     }, 0);
 
     //loader for execution block
diff --git a/ang/sqlTaskConfigurator/sqlTaskConfigurator.html b/ang/sqlTaskConfigurator/sqlTaskConfigurator.html
@@ -21,7 +21,7 @@ <h1 crm-page-title>{{ts('Configure SQL Task')}}</h1>
               <span>{{ts('This task was archived at %1 and cannot be changed. Please unarchive the task to change it.', { '1' : taskOptions.archive_date })}}</span>
             </div>
 
-            <div class="sql-tasks-basic-information-block">
+            <div class="sql-tasks-basic-information-block border-bottom">
                 <h3>{{ts('Basic Information')}}:</h3>
                 <div class="spacer"></div>
                 <div class="crm-section">
@@ -64,7 +64,7 @@ <h3>{{ts('Basic Information')}}:</h3>
                 </div>
             </div>
 
-            <div class="sql-tasks-execution-block" ng-class="{'loading' : !isExecutionBlockLoaded()}" id="sqlTasksExecutionBlock">
+            <div class="sql-tasks-execution-block border-bottom" ng-class="{'loading' : !isExecutionBlockLoaded()}" id="sqlTasksExecutionBlock">
                 <h3>{{ts('Execution')}}:</h3>
                 <div class="spacer"></div>
                 <div class="sql-task-preloader-wrap">
@@ -438,11 +438,13 @@ <h3>{{ts('Actions')}}:</h3>
                         </div>
                     </div>
                     <br />
-                    <div class="help">
-                        <strong>{{ts('Caution!')}}</strong>
-                        {{ts('Be aware that these tasks can execute arbitrary SQL statements, which')}}
-                        <i>{{ts('can potentially destroy your database')}}</i>.
-                        {{ts('Only use this if you really know what you\'re doing, and always keep a backup of your database before experimenting.', {'domain' : 'de.systopia.sqltasks'})}}
+                    <div class="sql-task-footer-help">
+                        <div class="help">
+                          <strong>{{ts('Caution!')}}</strong>
+                          {{ts('Be aware that these tasks can execute arbitrary SQL statements, which')}}
+                          <i>{{ts('can potentially destroy your database')}}</i>.
+                          {{ts('Only use this if you really know what you\'re doing, and always keep a backup of your database before experimenting.', {'domain' : 'de.systopia.sqltasks'})}}
+                        </div>
                     </div>
                 </div>
             </div>
diff --git a/ang/sqlTaskManager.ang.php b/ang/sqlTaskManager.ang.php
@@ -10,7 +10,7 @@
     ],
   'css' => [
     0 => 'css/sqlTaskManager.css',
-    1 => 'css/sqlTaskHideCiviUi.css',
+    1 => 'css/sqlTaskGeneral.css',
   ],
   'partials' => [
     0 => 'ang/sqlTaskManager',
diff --git a/ang/sqlTaskManager.js b/ang/sqlTaskManager.js
@@ -23,7 +23,7 @@
     .controller("sqlTaskManagerCtrl", function($scope, $location, highlightTaskId, $timeout) {
       //to add ability to use styles only for this page
       setTimeout(function() {
-        CRM.$('body').addClass('sql-task-manager-angular-page-wrapper');
+        CRM.$('body').addClass('sql-task-body-page-wrapper');
       }, 0);
 
       $scope.url = CRM.url;
diff --git a/ang/sqlTaskManager/sqlTaskManager.html b/ang/sqlTaskManager/sqlTaskManager.html
@@ -64,14 +64,22 @@ <h1 crm-page-title>{{ts('SQL Task Manager')}}</h1>
                 <div class="sql-task-manager-dashboard__title-text">Info</div>
             </div>
             <div class="sql-task-manager-dashboard__content">
-                <a class="sql-task-info-view-logs" href="{{url('civicrm/sqltasks-execution/list');}}"
-                   target="_blank"
-                   title="{{ts('Show task execution logs', {'domain' : 'de.systopia.sqltasks'})}}">
+                <div class="sql-task-manager-dashboard__links-wrap">
+                  <a class="sql-task-info-view-logs" href="{{url('civicrm/sqltasks-execution/list');}}"
+                     target="_blank"
+                     title="{{ts('Show task execution logs', {'domain' : 'de.systopia.sqltasks'})}}">
                     <div class="sql-task-manager-dashboard__ico">
-                        <i class="crm-i fa-bars"></i>
+                      <i class="crm-i fa-bars"></i>
                     </div>
                     {{ts('Show task execution logs', {'domain' : 'de.systopia.sqltasks'})}}
-                </a>
+                  </a>
+                  <a class="sql-task-info-view-logs" href="{{url('civicrm/sqltasks/global-token-manager');}}"
+                     target="_blank"
+                     title="{{ts('Global Token Manager', {'domain' : 'de.systopia.sqltasks'})}}">
+                    <span class="crm-i fa-book"></span>
+                    <span>{{ts('Global Token Manager', {'domain' : 'de.systopia.sqltasks'})}}</span>
+                  </a>
+                </div>
 
               <ul class="sql-task-manager-dashboard__dispatcher-info-messages">
                 <li ng-repeat="message in infoMessages" ng-bind-html="message.text" class="sql-task-manager-dashboard__dispatcher-info-message sql-task-manager-dashboard__dispatcher-info-message-type-{{message.type}}" ></li>
diff --git a/ang/taskRunner.ang.php b/ang/taskRunner.ang.php
@@ -10,7 +10,7 @@
     ],
   'css' => [
     0 => 'css/taskRunner.css',
-    1 => 'css/sqlTaskHideCiviUi.css',
+    1 => 'css/sqlTaskGeneral.css',
   ],
   'partials' => [
     0 => 'ang/taskRunner',
diff --git a/ang/taskRunner.js b/ang/taskRunner.js
@@ -20,7 +20,7 @@
 
   angular.module(moduleName).controller("taskRunnerCtrl", function($scope, $location, taskId) {
     setTimeout(function() {
-      CRM.$('body').addClass('sql-task-manager-angular-page-wrapper');
+      CRM.$('body').addClass('sql-task-body-page-wrapper');
     }, 0);
 
     $scope.taskId = taskId;
diff --git a/css/sqlTaskConfigurator.css b/css/sqlTaskConfigurator.css
@@ -80,6 +80,10 @@ select.pixelInput {
   display: none;
 }
 
+.sql-tasks-actions-block.loading .sql-tasks-actions-wrap, .sql-tasks-execution-block.border-bottom {
+  border-bottom: 1px solid #e8eef0;
+}
+
 .sql-tasks-actions-block.loading .sql-task-preloader-wrap, .sql-tasks-execution-block.loading .sql-task-preloader-wrap {
   display: block;
 }
@@ -106,6 +110,10 @@ select.pixelInput {
   height: auto;
 }
 
+.crm-container .sql-tasks .sql-tasks-basic-information-block.border-bottom  {
+  border-bottom: 1px solid #e8eef0;
+}
+
 .crm-container .sql-tasks .crm-sqltask-apiv4 .api-url-controls {
   cursor: pointer;
   display: inline-block;
@@ -212,3 +220,11 @@ i.crm-i.fa-toggle-on.sql-task-custom-toggle-icon {
 i.crm-i.fa-toggle-on.fa-flip-horizontal.sql-task-custom-toggle-icon {
   color: #ff0000;
 }
+
+.sql-task-footer-help {
+  padding: 10px;
+}
+
+.sql-task-help {
+  max-width: 810px;
+}
diff --git a/css/sqlTaskGeneral.css b/css/sqlTaskGeneral.css
diff --git a/css/sqlTaskHideCiviUi.css b/css/sqlTaskHideCiviUi.css
diff --git a/css/sqlTaskManager.css b/css/sqlTaskManager.css
diff --git a/js/AddBodyClass.js b/js/AddBodyClass.js
diff --git a/templates/CRM/Sqltasks/Form/SqltaskSettings.tpl b/templates/CRM/Sqltasks/Form/SqltaskSettings.tpl
diff --git a/templates/CRM/Sqltasks/Form/SqltasksExecutionList.tpl b/templates/CRM/Sqltasks/Form/SqltasksExecutionList.tpl
diff --git a/templates/CRM/Sqltasks/Page/GlobalTokenManager.tpl b/templates/CRM/Sqltasks/Page/GlobalTokenManager.tpl
diff --git a/templates/CRM/Sqltasks/Page/Templates.tpl b/templates/CRM/Sqltasks/Page/Templates.tpl

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,10 @@ public function buildQuickForm() {`
`17`	`17`
`18`	`18`	`$this->assign('settingsNames', [Settings::SQLTASKS_IS_DISPATCHER_DISABLED, Settings::SQLTASKS_MAX_FAILS_NUMBER]);`
`19`	`19`	`$this->assign('SqltaskManagerLink', CRM_Utils_System::url('civicrm/a/', NULL, TRUE, "/sqltasks/manage"));`
	`20`	`+`
	`21`	`+ CRM_Core_Resources::singleton()->addStyleFile('de.systopia.sqltasks', 'css/sqlTaskGeneral.css');`
	`22`	`+ CRM_Core_Resources::singleton()->addScriptFile('de.systopia.sqltasks', 'js/AddBodyClass.js', 1000, 'html-header');`
	`23`	`+`
`20`	`24`	`parent::buildQuickForm();`
`21`	`25`	`}`
`22`	`26`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,9 @@ public function buildQuickForm() {`
`42`	`42`	`$this->add('datepicker', 'end_date', E::ts('End date'), ['class' => 'medium'], FALSE, ['time' => FALSE]);`
`43`	`43`	`$this->add('number', 'limit_per_page', ts('Limit per page'), ['class' => 'medium'], FALSE);`
`44`	`44`	`$this->addButtons([['type' => 'submit', 'name' => E::ts('Submit'), 'isDefault' => TRUE]]);`
	`45`	`+`
	`46`	`+ CRM_Core_Resources::singleton()->addStyleFile('de.systopia.sqltasks', 'css/sqlTaskGeneral.css');`
	`47`	`+ CRM_Core_Resources::singleton()->addScriptFile('de.systopia.sqltasks', 'js/AddBodyClass.js', 1000, 'html-header');`
`45`	`48`	`}`
`46`	`49`
`47`	`50`	`public function postProcess() {`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,9 @@ public function run() {`
`10`	`10`	`$this->assign('tokens', json_encode((CRM_Sqltasks_GlobalToken::singleton())->getAllTokenData()));`
`11`	`11`	`$this->assign('maxLengthOfTokenName', CRM_Sqltasks_GlobalToken::MAX_LENGTH_OF_TOKEN_NAME);`
`12`	`12`
	`13`	`+ CRM_Core_Resources::singleton()->addStyleFile('de.systopia.sqltasks', 'css/sqlTaskGeneral.css');`
	`14`	`+ CRM_Core_Resources::singleton()->addScriptFile('de.systopia.sqltasks', 'js/AddBodyClass.js', 1000, 'html-header');`
	`15`	`+`
`13`	`16`	`parent::run();`
`14`	`17`	`}`
`15`	`18`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,9 @@ public function run() {`
`25`	`25`	`$this->assign('sqltasksExecution', $sqltasksExecution);`
`26`	`26`	`$this->assign('logsTaskExecution', $sqltasksExecution['decoded_logs']);`
`27`	`27`
	`28`	`+ CRM_Core_Resources::singleton()->addStyleFile('de.systopia.sqltasks', 'css/sqlTaskGeneral.css');`
	`29`	`+ CRM_Core_Resources::singleton()->addScriptFile('de.systopia.sqltasks', 'js/AddBodyClass.js', 1000, 'html-header');`
	`30`	`+`
`28`	`31`	`parent::run();`
`29`	`32`	`}`
`30`	`33`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@ function ($bao) { return $bao->mapToArray(); },`
`14`	`14`
`15`	`15`	`$this->assign("defaultTemplateId", Civi::settings()->get("sqltasks_default_template"));`
`16`	`16`
	`17`	`+ CRM_Core_Resources::singleton()->addStyleFile('de.systopia.sqltasks', 'css/sqlTaskGeneral.css');`
	`18`	`+ CRM_Core_Resources::singleton()->addScriptFile('de.systopia.sqltasks', 'js/AddBodyClass.js', 1000, 'html-header');`
	`19`	`+`
`17`	`20`	`parent::run();`
`18`	`21`	`}`
`19`	`22`