[ARVADOS] updated: f3d919829c017376eeccd27db9908b7f5a6e32aa
git at public.curoverse.com
git at public.curoverse.com
Thu Feb 6 16:14:16 EST 2014
Summary of changes:
apps/workbench/Gemfile | 6 +-
apps/workbench/Gemfile.lock | 19 +-
.../app/assets/javascripts/application.js | 12 +-
apps/workbench/app/assets/javascripts/editable.js | 10 +
.../workbench/app/assets/javascripts/provenance.js | 13 +-
.../{application.css => application.css.scss} | 37 +++-
.../app/assets/stylesheets/badges.css.scss | 20 ++
.../stylesheets/bootstrap_and_overrides.css.less | 30 ---
apps/workbench/app/assets/stylesheets/loading.css | 2 +-
.../api_client_authorizations_controller.rb | 5 +
.../app/controllers/application_controller.rb | 76 +++++++
.../app/controllers/collections_controller.rb | 6 +-
apps/workbench/app/controllers/jobs_controller.rb | 12 +
.../controllers/pipeline_instances_controller.rb | 10 +
apps/workbench/app/helpers/application_helper.rb | 6 +-
apps/workbench/app/helpers/provenance_helper.rb | 4 +-
.../{_help.html.erb => _show_help.html.erb} | 0
.../views/application/_arvados_attr_value.html.erb | 2 +-
.../app/views/application/_arvados_object.html.erb | 88 --------
.../application/_breadcrumb_page_name.html.erb | 2 +-
.../app/views/application/_breadcrumbs.html.erb | 18 --
.../app/views/application/_content.html.erb | 21 ++
.../app/views/application/_content_layout.html.erb | 3 +
.../.gitkeep => views/application/_index.html.erb} | 0
.../app/views/application/_show_api.html.erb | 27 +++
.../views/application/_show_attributes.html.erb | 14 +-
.../app/views/application/_show_json.html.erb | 3 +
.../app/views/application/_show_metadata.html.erb | 58 +++++
.../{_recent.html.erb => _show_recent.html.erb} | 2 +-
.../app/views/application/_svg_div.html.erb | 4 +-
.../workbench/app/views/application/index.html.erb | 25 +--
apps/workbench/app/views/application/show.html.erb | 48 ++---
.../{_help.html.erb => _show_help.html.erb} | 0
.../app/views/authorized_keys/index.html.erb | 1 -
.../app/views/collections/_index_tbody.html.erb | 24 ++-
.../app/views/collections/_show_files.html.erb | 4 +-
.../{_recent.html.erb => _show_recent.html.erb} | 27 ++-
.../{index.html.erb => _show_recent.html.erb} | 0
.../{show.html.erb => _show_provenance.html.erb} | 2 -
.../{_recent.html.erb => _show_recent.html.erb} | 5 -
.../app/views/layouts/application.html.erb | 237 +++++++++++++++-----
apps/workbench/app/views/links/_recent.html.erb | 2 +-
.../_collections_notification.html.erb | 7 +
.../notifications/_jobs_notification.html.erb | 8 +
.../notifications/_pipelines_notification.html.erb | 7 +
.../notifications/_ssh_key_notification.html.erb | 20 ++
.../{show.html.erb => _show_components.html.erb} | 17 --
.../views/pipeline_instances/_show_graph.html.erb | 19 ++
.../{show.js.erb => _show_graph.js.erb} | 0
.../{_recent.html.erb => _show_recent.html.erb} | 13 +-
...ompare.html.erb => _show_text_compare.html.erb} | 41 ++---
.../app/views/pipeline_instances/compare.html.erb | 88 +-------
.../{show.html.erb => _show_attributes.html.erb} | 3 -
.../{_recent.html.erb => _show_recent.html.erb} | 0
.../{_help.html.erb => _show_help.html.erb} | 0
apps/workbench/app/views/users/_home.html.erb | 29 ---
.../app/views/users/_notifications.html.erb | 20 +--
.../{_help.html.erb => _show_help.html.erb} | 0
58 files changed, 666 insertions(+), 491 deletions(-)
create mode 100644 apps/workbench/app/assets/javascripts/editable.js
rename apps/workbench/app/assets/stylesheets/{application.css => application.css.scss} (80%)
create mode 100644 apps/workbench/app/assets/stylesheets/badges.css.scss
delete mode 100644 apps/workbench/app/assets/stylesheets/bootstrap_and_overrides.css.less
rename apps/workbench/app/views/api_client_authorizations/{_help.html.erb => _show_help.html.erb} (100%)
create mode 100644 apps/workbench/app/views/application/_content.html.erb
create mode 100644 apps/workbench/app/views/application/_content_layout.html.erb
copy apps/workbench/app/{mailers/.gitkeep => views/application/_index.html.erb} (100%)
create mode 100644 apps/workbench/app/views/application/_show_api.html.erb
create mode 100644 apps/workbench/app/views/application/_show_json.html.erb
create mode 100644 apps/workbench/app/views/application/_show_metadata.html.erb
rename apps/workbench/app/views/application/{_recent.html.erb => _show_recent.html.erb} (97%)
rename apps/workbench/app/views/authorized_keys/{_help.html.erb => _show_help.html.erb} (100%)
delete mode 100644 apps/workbench/app/views/authorized_keys/index.html.erb
rename apps/workbench/app/views/collections/{_recent.html.erb => _show_recent.html.erb} (74%)
rename apps/workbench/app/views/groups/{index.html.erb => _show_recent.html.erb} (100%)
rename apps/workbench/app/views/jobs/{show.html.erb => _show_provenance.html.erb} (77%)
rename apps/workbench/app/views/jobs/{_recent.html.erb => _show_recent.html.erb} (97%)
create mode 100644 apps/workbench/app/views/notifications/_collections_notification.html.erb
create mode 100644 apps/workbench/app/views/notifications/_jobs_notification.html.erb
create mode 100644 apps/workbench/app/views/notifications/_pipelines_notification.html.erb
create mode 100644 apps/workbench/app/views/notifications/_ssh_key_notification.html.erb
rename apps/workbench/app/views/pipeline_instances/{show.html.erb => _show_components.html.erb} (74%)
create mode 100644 apps/workbench/app/views/pipeline_instances/_show_graph.html.erb
rename apps/workbench/app/views/pipeline_instances/{show.js.erb => _show_graph.js.erb} (100%)
rename apps/workbench/app/views/pipeline_instances/{_recent.html.erb => _show_recent.html.erb} (86%)
copy apps/workbench/app/views/pipeline_instances/{compare.html.erb => _show_text_compare.html.erb} (61%)
rename apps/workbench/app/views/pipeline_templates/{show.html.erb => _show_attributes.html.erb} (94%)
rename apps/workbench/app/views/pipeline_templates/{_recent.html.erb => _show_recent.html.erb} (100%)
rename apps/workbench/app/views/repositories/{_help.html.erb => _show_help.html.erb} (100%)
rename apps/workbench/app/views/virtual_machines/{_help.html.erb => _show_help.html.erb} (100%)
via f3d919829c017376eeccd27db9908b7f5a6e32aa (commit)
via 2df993a2ad31f13bb37b647d0ca30a1a764a05c3 (commit)
via eced5bd383723669001192dac00cc6ced94b260a (commit)
via 3a1b569ab49c1e77bc9b3d7a9f38cf9de753ec47 (commit)
via 928565a23bf5ff54fb524b6c38f8e2b0f4b27725 (commit)
via dcd5dad4a40baef826270f43ae80d7b39a3b9113 (commit)
via e9047106c462a8767abe9abd06cd7090d31cbc16 (commit)
via 8ac83bf6c1464344721514494c8c50ad6679a5bc (commit)
via c16a97576716f81c721bcd0c889309cb75e3eb9a (commit)
via 0863b0df409012677f0911ac3a068195067f7c7b (commit)
via c0c1111f322159333fdf14e3d3e8ce0c00662734 (commit)
via 928aa8a0496f0c6f37579cac821e1048ce6cca96 (commit)
from 42e1486d6ba962e9959e5464746d3bbc0e47bed7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit f3d919829c017376eeccd27db9908b7f5a6e32aa
Merge: 42e1486 2df993a
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Thu Feb 6 16:14:36 2014 -0500
Merge branch '1979-workbench-ui-PA'
commit 2df993a2ad31f13bb37b647d0ca30a1a764a05c3
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Thu Feb 6 15:58:43 2014 -0500
badges.css.scss doesn't actually require bootstrap
diff --git a/apps/workbench/app/assets/stylesheets/badges.css.scss b/apps/workbench/app/assets/stylesheets/badges.css.scss
index e38b364..b3d3da3 100644
--- a/apps/workbench/app/assets/stylesheets/badges.css.scss
+++ b/apps/workbench/app/assets/stylesheets/badges.css.scss
@@ -1,7 +1,6 @@
/* Colors
* Contextual variations of badges
* Bootstrap 3.0 removed contexts for badges, we re-introduce them, based on what is done for labels
- *= require bootstrap
*/
.badge-error {
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list