Paired-With: Randall Hansen
Signed-off-by: Pieter van de Bruggen <[email protected]>
---
Local-branch: tickets/next/6989
app/views/layouts/application.html.haml | 2 +-
app/views/reports/_resource_statuses.html.haml | 9 +-
public/javascripts/application.js | 11 +-
public/javascripts/jquery.min.js | 148 +-----------------------
4 files changed, 15 insertions(+), 155 deletions(-)
diff --git a/app/views/layouts/application.html.haml
b/app/views/layouts/application.html.haml
index 3749cea..4ae18e4 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -12,7 +12,7 @@
$.noConflict();
= stylesheet_link_tag 'reset', 'layout', 'forms', 'tables',
'jquery.ui.custom', 'jquery.ui.combobox', 'typography', 'links',
'token-input-facebook', 'tipsy', 'application', 'colorbox', :cache => 'all'
- = javascript_include_tag 'prototype', 'jquery-ui.min',
'jquery.tokeninput', 'excanvas.min', 'raphael-min', 'grafico.min',
'jquery.form', 'jquery.placeholders', 'jquery.ui.combobox',
'jquery.colorbox.js', 'jquery.tipsy', 'jquery-tabify.min', 'search',
'application', :cache => 'all'
+ = javascript_include_tag 'prototype', 'jquery-ui.min',
'jquery.tokeninput', 'excanvas.min', 'raphael-min', 'grafico.min',
'jquery.form', 'jquery.placeholders', 'jquery.ui.combobox',
'jquery.colorbox.js', 'jquery.tipsy', 'search', 'application', :cache => 'all'
- body_classes = [ "#{controller.controller_name}_controller",
"#{controller.controller_name}_#{controller.action_name}_action" ]
- body_classes << "#{controller.controller_name}_form_action" if %w[new
create edit update].include?(controller.action_name)
diff --git a/app/views/reports/_resource_statuses.html.haml
b/app/views/reports/_resource_statuses.html.haml
index f828596..f0dac77 100644
--- a/app/views/reports/_resource_statuses.html.haml
+++ b/app/views/reports/_resource_statuses.html.haml
@@ -7,11 +7,10 @@
%dl.expandable-list
- report.resource_statuses.sort_by(&:time).each_with_index do |status,
index|
%dt{:class => cycle( 'odd', 'even' )}
- %div.expandable-list-item
- - if status.events.empty?
- %span{:class => 'non-expandable-bullet'}= status.name
- - else
- = link_to h(status.name), {}, {:class => 'expandable-link
collapsed-link', :id => "expand-#{index}"}
+ - if status.events.empty?
+ %span{:class => 'non-expandable-bullet'}= status.name
+ - else
+ = link_to h(status.name), {}, {:class => 'expandable-link
collapsed-link', :id => "expand-#{index}"}
- if status.file or status.line
= "(#{status.file}:#{status.line})"
%dd.expandable.collapsed{:id => "expandable-#{index}"}
diff --git a/public/javascripts/application.js
b/public/javascripts/application.js
index 9dd6428..e17cdb9 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -58,7 +58,7 @@ jQuery(document).ready(function(J) {
show_ticks: false,
start_at_zero: false,
stroke_width: 3,
- vertical_label_unit: "s",
+ vertical_label_unit: "s"
}
);
@@ -96,7 +96,7 @@ jQuery(document).ready(function(J) {
labels: label_data,
padding_top: 10,
left_padding: 50,
- show_ticks: false,
+ show_ticks: false
}
);
@@ -132,10 +132,11 @@ function init_expandable_list() {
}
function toggle_expandable_link() {
+ expansionTime = 100; // ms
jQuery(this).toggleClass('collapsed-link');
+ jQuery(this.id.replace('expand', '#expandable'))
+ .toggle('blind', {}, expansionTime);
if (jQuery(this).hasClass('collapsed-link')) {
- jQuery(this.id.replace('expand', '#expandable'))
- .hide('blind');
if (jQuery('.expandable-link').not('.collapsed-link').size() == 0) {
var old_text = jQuery('.collapse-all').text();
jQuery('.collapse-all')
@@ -144,8 +145,6 @@ function toggle_expandable_link() {
.text( old_text.replace( 'collapse', 'expand' ));
}
} else {
- jQuery(this.id.replace('expand', '#expandable'))
- .show('blind', {}, 1000);
if (jQuery('.expandable-link.collapsed-link').size() == 0) {
var old_text = jQuery('.expand-all').text();
jQuery('.expand-all')
diff --git a/public/javascripts/jquery.min.js b/public/javascripts/jquery.min.js
index 7c24308..d5636d7 100644
--- a/public/javascripts/jquery.min.js
+++ b/public/javascripts/jquery.min.js
@@ -1,154 +1,16 @@
/* This is jQuery 1.5.2; it was jQuery 1.4.2 */
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
