Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
5318d84
Issue #2212149: Make task queue refresh configurable.
jonpugh Aug 6, 2016
866739e
Set it to use the current default refresh time, 30 seconds.
jonpugh Aug 6, 2016
a94e2e9
Issue #2212149 by Jon Pugh: Improve task queue AJAX refresh, remove o…
jonpugh Aug 9, 2016
0d020a7
Issue #2212149 by Jon Pugh: Improve task queue AJAX refresh, remove o…
jonpugh Aug 9, 2016
0778394
Merge branch '11494427-hosting-task-js-remove' of git.drupal.org:proj…
jonpugh Aug 9, 2016
3096abe
Merge branch '7.x-3.x' into 11494427-hosting-task-js-remove
jonpugh Oct 18, 2016
58d6121
Issue #2212149: Improve task queue AJAX refresh. Progress in implemen…
jonpugh Oct 19, 2016
f7ce315
Issue #2212149: Improve task queue AJAX refresh. Progress in implemen…
jonpugh Oct 19, 2016
04a4bdd
Issue #2212149: Improve task queue AJAX refresh. Progress in implemen…
jonpugh Oct 19, 2016
4cbe547
Issue #2212149: Improve task queue AJAX refresh. Progress in implemen…
jonpugh Oct 19, 2016
078cd39
Issue #2212149: Improve task queue AJAX refresh. Progress in implemen…
jonpugh Oct 19, 2016
c58aa94
Merge branch '11494427-hosting-task-js-remove' into 2212149-tasks-ref…
jonpugh Oct 19, 2016
ee239e6
Issue #2212149: Improve task queue AJAX refresh. Progress in implemen…
jonpugh Oct 19, 2016
d133c6f
Issue #2212149: Improve task queue AJAX refresh. Progress in implemen…
jonpugh Oct 19, 2016
8b397e2
Issue #2212149: Improve task queue AJAX refresh. Progress in implemen…
jonpugh Oct 19, 2016
b16e3dc
Issue #2212149: Improve task queue AJAX refresh. Progress in implemen…
jonpugh Oct 19, 2016
293f21a
Issue #2212149: Improve task queue AJAX refresh. Progress in implemen…
jonpugh Oct 19, 2016
fd15e79
Issue #2212149: Improve task queue AJAX refresh. Progress in implemen…
jonpugh Oct 19, 2016
7dbcf22
Merge branch '7.x-3.x' of git.drupal.org:project/hosting into 2212149…
jonpugh Oct 20, 2016
b4040d7
Issue #2212149: Improve task queue AJAX refresh. Progress in implemen…
jonpugh Oct 20, 2016
49b2e72
Fixing bad property
jonpugh Oct 20, 2016
bd0c48f
Check for NID to avoid warning.
jonpugh Oct 20, 2016
2bffde0
Check for type cache before returning it.
jonpugh Oct 20, 2016
0534bfe
Ensure $return variable exists.
jonpugh Oct 20, 2016
2db4606
Adding comments to hosting_task_fetch_tasks()
jonpugh Oct 20, 2016
94c26b2
Merge branch '7.x-3.x' of git.drupal.org:project/hosting into 2212149…
jonpugh Oct 20, 2016
68bca3f
Issue #2212149: Output static data into "noscript" tags so we have ou…
jonpugh Oct 22, 2016
204f75a
Override placeholder italics from "created" field.
jonpugh Oct 22, 2016
42f66e2
Updating hosting task view: Moving type and date to the right locations.
jonpugh Oct 22, 2016
bbb4a34
Moving templates to templates folder.
jonpugh Oct 22, 2016
973a8f9
Attach to Id hostingAvailableTasks
jonpugh Oct 22, 2016
b43b9c8
Don't hide in template when "hidden".
jonpugh Oct 22, 2016
f9c6526
Attach to Id hostingAvailableTasks
jonpugh Oct 22, 2016
8b193d2
Refresh time every 1000 ms, not 100ms!
jonpugh Oct 22, 2016
999183f
Hide task if hidden.
jonpugh Oct 22, 2016
b994acc
Change timestamp human
jonpugh Oct 22, 2016
b852a40
Adding static task output for the NOSCRIPT tag so Aegir still works w…
jonpugh Oct 22, 2016
6a7b4a2
Adding tasks data watcher to re-attach "timeago" plugin when new task…
jonpugh Oct 24, 2016
1d6d490
Check for hostingTasks element before attaching.
jonpugh Oct 24, 2016
18a7949
Attach to correct ID.
jonpugh Oct 24, 2016
f6e59a4
Output readable date format, not time ago.
jonpugh Oct 24, 2016
c749562
Adding a field handler for task type so we can output a human readabl…
jonpugh Oct 24, 2016
0a74afb
Adding a helper function hosting_task_type_name() to get a readable n…
jonpugh Oct 24, 2016
a3fabaf
Remove reference node type display: we will add to task title.
jonpugh Oct 24, 2016
d99f5a7
Refactor hosting_task_type_name() to return the right task metadata d…
jonpugh Oct 24, 2016
bddc1d2
Put the type field back in the view.
jonpugh Oct 24, 2016
918de6c
Adding description to views field selector to alert user to the need …
jonpugh Oct 24, 2016
40ee80a
Be more specific in task titles for tasks that are the same across ob…
jonpugh Oct 24, 2016
653f2df
Merge branch '7.x-3.x' of git.drupal.org:project/hosting into 2212149…
jonpugh Oct 24, 2016
deef8a4
Adding dependency to "timeago" module.
jonpugh Oct 25, 2016
6a8da29
Issue #2212149: Improving Task AJAX
jonpugh Oct 25, 2016
a76087e
Merge branch '7.x-3.x' of git.drupal.org:project/hosting into 2212149…
jonpugh Oct 26, 2016
04a05b6
Install libraries in the update hook and set the right variable for d…
jonpugh Oct 27, 2016
4e480d6
Ensure data exists before altering it.
jonpugh Oct 27, 2016
f15b49b
Adding views template for global and contextual task views. Adding mo…
jonpugh Oct 27, 2016
d1e3480
Removing unused hook_init()
jonpugh Oct 28, 2016
0ef2a5c
Assign ID to task rows.
jonpugh Oct 28, 2016
22ea55b
When timestamp_executed is empty, empty the HTML of the TIME element.
jonpugh Oct 28, 2016
bdc6542
Keep timestamp_executed and timestamp_executed_human empty.
jonpugh Oct 28, 2016
260fe0f
Unset HTML on empty datetimes at the beginning of the tasks data watc…
jonpugh Oct 28, 2016
ecd74d2
Output something in timestamp_executed_human or JS throws an error.
jonpugh Oct 28, 2016
ba2022c
Complete refactor of the Vue.js hostingTasks implementation! This dr…
jonpugh Oct 28, 2016
cfb3373
Calculate an updated DELTA server side.
jonpugh Oct 28, 2016
6cb06b9
Only setup hostingTasks vue if it exists.
jonpugh Oct 29, 2016
cb51fde
Handle loading tasks on node tasks tab
jonpugh Oct 30, 2016
99c43a7
Only show timestamp executed and delta if there is one.
jonpugh Oct 30, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions hosting.css
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,18 @@ td.hosting-actions .hosting-button-disabled {
text-transform: none;
}

.view-hosting-task-list .hosting-status time {
font-size:0.8em;
color: #555;
text-transform: uppercase;
padding: 0 1em 0 0;
white-space: nowrap;
}

.view-hosting-task-list .hosting-status time em.placeholder {
font-style: normal;
}

/**
* Status icons, colors.
*/
Expand Down
4 changes: 2 additions & 2 deletions migrate/hosting_migrate.module
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ function hosting_migrate_hosting_tasks() {
$tasks = array();

$tasks['site']['migrate'] = array(
'title' => t('Migrate'),
'title' => t('Migrate Site'),
'description' => t('Move the site to a new platform.'),
'dialog' => TRUE,
);

$tasks['platform']['migrate'] = array(
'title' => t('Migrate'),
'title' => t('Migrate Sites'),
'description' => t('Migrate sites to a new platform.'),
'page arguments' => array('hosting_migrate_platform', 1),
'dialog' => TRUE,
Expand Down
6 changes: 2 additions & 4 deletions platform/hosting_platform.module
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@ function hosting_platform_node_info() {
function hosting_platform_hosting_tasks() {
$tasks = array();
$tasks['platform']['verify'] = array(
'title' => t('Verify'),
'title' => t('Verify Platform'),
'description' => t('Verify that the platform is correctly installed and working.'),
'weight' => 10,
'provision_save' => TRUE,
);
$tasks['platform']['delete'] = array(
'title' => t('Delete'),
'title' => t('Delete Platform'),
'description' => t('Deleting this platform will completely remove it from the hosting system.
This process can not be undone. It can not be performed if you have sites currently
running on this platform.
Expand Down Expand Up @@ -775,8 +775,6 @@ function hosting_platform_view($node, $view_mode, $langcode = NULL) {
'changed' => $node->changed,
);
drupal_add_js($settings, array('type' => 'setting', 'scope' => JS_DEFAULT));

drupal_add_js(drupal_get_path('module', 'hosting_task') . '/hosting_task.js');
}

return $node;
Expand Down
6 changes: 2 additions & 4 deletions server/hosting_server.module
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,14 @@ function hosting_server_menu() {
function hosting_server_hosting_tasks() {
$tasks = array();
$tasks['server']['verify'] = array(
'title' => t('Verify'),
'title' => t('Verify Server'),
'description' => t('Verify that the server is correctly installed and working.'),
'weight' => 10,
'provision_save' => TRUE,
);

$tasks['server']['delete'] = array(
'title' => t('Delete'),
'title' => t('Delete Server'),
'description' => t('Delete the server.'),
);

Expand Down Expand Up @@ -729,8 +729,6 @@ function hosting_server_view($node, $view_mode, $langcode = NULL) {
'changed' => $node->changed,
);
drupal_add_js($settings, array('type' => 'setting', 'scope' => JS_DEFAULT));

drupal_add_js(drupal_get_path('module', 'hosting_task') . '/hosting_task.js');
}
}

Expand Down
4 changes: 2 additions & 2 deletions site/hosting_site.module
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ function hosting_site_hosting_tasks() {
);

$tasks['site']['verify'] = array(
'title' => t('Verify'),
'title' => t('Verify Site'),
'description' => t('Confirm that the site has been correctly installed and regenerate all configuration files to match the hosting front end.'),
'provision_save' => TRUE,
);
Expand All @@ -311,7 +311,7 @@ function hosting_site_hosting_tasks() {
It may be disabled again if needed.'),
);
$tasks['site']['delete'] = array(
'title' => t('Delete'),
'title' => t('Delete Site'),
'description' => t('Deleting this site will completely remove it from the hosting system,
but will keep the last backup available. This process can not be undone.
Are you really sure you want to delete this site?'),
Expand Down
2 changes: 0 additions & 2 deletions site/hosting_site.nodeapi.inc
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,6 @@ function hosting_site_view($node, $view_mode, $langcode = NULL) {
'changed' => $node->changed,
);
drupal_add_js($settings, array('type' => 'setting', 'scope' => JS_DEFAULT));

drupal_add_js(drupal_get_path('module', 'hosting_task') . '/hosting_task.js');
}
return $node;
}
Expand Down
2 changes: 2 additions & 0 deletions task/hosting_task.info
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ name = Hosting tasks
description = Allow Hostmaster to keep track of tasks that have been processed on the servers.
package = Hosting
dependencies[] = hosting
dependencies[] = timeago
core = 7.x

files[] = includes/views/handlers/hosting_task_handler_field_status.inc
files[] = includes/views/handlers/hosting_task_handler_field_type.inc
files[] = includes/views/handlers/hosting_task_handler_filter_type.inc
files[] = includes/views/handlers/hosting_task_handler_filter_status.inc
files[] = includes/views/handlers/hosting_task_handler_sort_default.inc
8 changes: 8 additions & 0 deletions task/hosting_task.install
Original file line number Diff line number Diff line change
Expand Up @@ -325,4 +325,12 @@ function hosting_task_update_6200() {
*/
function hosting_task_update_7000() {
drupal_flush_all_caches();
}

/**
* Install timeago and libraries module and set the default format for the hosting_timeago date type.
*/
function hosting_task_update_7001() {
module_enable(array('timeago', 'libraries'));
variable_set('date_format_hosting_timeago', '<\s\p\a\n \c\l\a\s\s="\t\i\m\e\a\g\o" \t\i\t\l\e="c">n/j/y - g:ia</\s\p\a\n>');
}
Loading