Fixes theforeman#3811 updating to bootstrap 3

app/assets/javascripts/application.js

@@ -20,6 +20,7 @@ $(function() {
 function onContentLoad(){
   if($('.autocomplete-clear').size() == 0){
     $('.autocomplete-input').scopedSearch();
+    $('.ui-helper-hidden-accessible').remove();
   }
 
   $('.flash.error').each(function(index, item) {
@@ -39,18 +40,18 @@ function onContentLoad(){
    });
 
   // adds buttons classes to all links
-  $("#title_action a").addClass("btn");
-  $("#title_action li a").removeClass("btn").addClass("la");
-  $("#title_action span").removeClass("btn").addClass("btn-group");
-  $("#title_action a[href*='new']").addClass("btn-success");
+  $("#title_action a").addClass("btn btn-default");
+  $("#title_action li a").removeClass("btn btn-default").addClass("la");
+  $("#title_action span").removeClass("btn btn-default").addClass("btn-group");
+  $("#title_action a[href*='new']").removeClass('btn-default').addClass("btn-success");
 
   if ($("#login-form").size() > 0) {
     $("#login_login").focus();
     return false;
   }
 
   // highlight tabs with errors
-  $(".tab-content").find(".control-group.error").each(function() {
+  $(".tab-content").find(".form-group.error").each(function() {
     var id = $(this).parentsUntil(".tab-content").last().attr("id");
     $("a[href=#"+id+"]").addClass("tab-error");
   })
@@ -61,7 +62,7 @@ function onContentLoad(){
   $('*[title]').not('*[rel]').tooltip();
   $('[data-table=inline]').not('.dataTable').dataTable(
       {
-        "sDom": "<'row'<'span6'f>r>t<'row'<'span6'i><'span6'p>>",
+        "sDom": "<'row'<'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
         "sPaginationType": "bootstrap"
       }
   );
@@ -117,7 +118,7 @@ function mark_params_override(){
     });
   });
   $('#params-tab').removeClass("tab-error");
-  if ($("#params").find('.control-group.error').length > 0) $('#params-tab').addClass('tab-error');
+  if ($("#params").find('.form-group.error').length > 0) $('#params-tab').addClass('tab-error');
   $('a[rel="popover"]').popover({html: true});
 }
 
@@ -237,7 +238,7 @@ $(function() {
   $('#bookmarks-modal .modal-footer .btn-primary').on('click', function(){
      $('#bookmarks-modal .modal-body .btn-primary').click();
   });
-  $("#bookmarks-modal").bind('shown', function () {
+  $("#bookmarks-modal").bind('shown.bs.modal', function () {
     var query = encodeURI($("#search").val());
     var url = $("#bookmark").attr('data-url');
     $("#bookmarks-modal .modal-body").empty();
@@ -259,7 +260,7 @@ function filter_by_level(item){
     $('.label-info').closest('tr').show();
     $('.label-default').closest('tr').show();
     $('.label-warning').closest('tr').show();
-    $('.label-important').closest('tr').show();
+    $('.label-danger').closest('tr').show();
   }
   if(level == 'notice'){
     $('.label-info').closest('tr').show();
@@ -271,13 +272,13 @@ function filter_by_level(item){
     $('.label-info').closest('tr').hide();
     $('.label-default').closest('tr').hide();
     $('.label-warning').closest('tr').show();
-    $('.label-important').closest('tr').show();
+    $('.label-danger').closest('tr').show();
   }
   if(level == 'error'){
     $('.label-info').closest('tr').hide();
     $('.label-default').closest('tr').hide();
     $('.label-warning').closest('tr').hide();
-    $('.label-important').closest('tr').show();
+    $('.label-danger').closest('tr').show();
   }
   if($("#report_log tr:visible ").size() ==1 || $("#report_log tr:visible ").size() ==2 && $('#ntsh:visible').size() > 0 ){
     $('#ntsh').show();
@@ -401,9 +402,24 @@ function notify(item, type) {
 function filter_permissions(item){
   var term = $(item).val().trim();
   if (term.length > 0) {
-    $(".control-group .collapse").parents('.control-group').hide();
-    $(".control-group .control-label:icontains('"+term+"')").parents('.control-group').show();
+    $(".form-group .collapse").parents('.form-group').hide();
+    $(".form-group .control-label:icontains('"+term+"')").parents('.form-group').show();
   } else{
-    $(".control-group .collapse").parents('.control-group').show();
+    $(".form-group .collapse").parents('.form-group').show();
   }
 }
+
+// Create a closure so that we can define intermediary
+// method pointers that don't collide with other items
+// in the global name space.
+(function(){
+// Store a reference to the original remove method.
+var originalShowMethod = jQuery.fn.show;
+
+// Define overriding method.
+jQuery.fn.show = function(){
+$(this).removeClass('hidden').removeClass('hide')
+// Execute the original method.
+return originalShowMethod.apply( this, arguments );
+}
+})();

app/assets/javascripts/charts.js

@@ -175,7 +175,7 @@ function flot_zoom(target, options, ranges) {
         yaxis: { min: ranges.yaxis.from, max: ranges.yaxis.to }
       }));
   if(target.parents('.stats-well').find('.reset-zoom').size() == 0){
-    target.parents('.stats-well').prepend("<a class='reset-zoom btn btn-small'>" + _('Reset zoom') + "</a>");
+    target.parents('.stats-well').prepend("<a class='reset-zoom btn btn-sm'>" + _('Reset zoom') + "</a>");
   }
 }
 
@@ -235,9 +235,11 @@ function search_on_click(event, item) {
 function get_pie_chart(div, url) {
   if($("#"+div).length == 0)
   {
-    $('body').append('<div id="' + div + '" class="modal fade"></div>');
-    $("#"+div).append('<div class="modal-header"><a href="#" class="close" data-dismiss="modal">&times;</a><h3>' + _('Fact Chart') + '</h3></div>')
-        .append('<div id="' + div + '-body" class="fact_chart modal-body">' + _('Loading') + ' ...</div>');
+    $('body').append('<div id="' + div + '" class="modal fade"><div class="modal-dialog"><div class="modal-content"></div></div></div>');
+    $("#"+div+" .modal-content").append('<div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button><h4 class="modal-title">' + _('Fact Chart') + '</h4></div>')
+        .append('<div id="' + div + '-body" class="fact_chart modal-body">' + _('Loading') + ' ...</div>')
+        .append('<div class="modal-footer"></div>')
+
     $("#"+div).modal('show');
     $.getJSON(url, function(data) {
       var target = $("#"+div+"-body");

app/assets/javascripts/config_template.js

@@ -117,7 +117,7 @@ function set_fullscreen(){
   $('.logo-bar').addClass('hidden');
   $editor.resize();
   $('#main').append($('.exit-fullscreen'));
-  $('.exit-fullscreen').show();
+  $('.exit-fullscreen').removeClass('hidden');
   $(window).scrollTop(0);
 }
 
@@ -132,7 +132,7 @@ function exit_fullscreen(){
       .width($(".template_text").width()+10)
   $(".template_text").hide();
   $editor.resize();
-  $('.exit-fullscreen').hide()
+  $('.exit-fullscreen').addClass('hidden');
 }
 
 function set_preview(){

app/assets/javascripts/host_checkbox.js

@@ -105,11 +105,11 @@ function toggle_multiple_ok_button(elem){
 $(function() {
   $('#submit_multiple a').click(function(){
     if ($.foremanSelectedHosts.length == 0 || $(this).hasClass('dropdown-toggle')) { return false }
-    var title = $(this).attr('data-original-title');
+    var title = $(this).attr('data-dialog-title');
     var url = $(this).attr('href') + "?" + $.param({host_ids: $.foremanSelectedHosts});
-    $('#confirmation-modal .modal-header h3').text(title);
+    $('#confirmation-modal .modal-header h4').text(title);
     $('#confirmation-modal .modal-body').empty().append("<img class='modal-loading' src='/assets/spinner.gif'>");
-    $('#confirmation-modal').modal({show: "true", backdrop: "static"});
+    $('#confirmation-modal').modal();
     $("#confirmation-modal .modal-body").load(url + " #content",
         function(response, status, xhr) {
           $("#loading").hide();

app/assets/javascripts/host_edit.js

@@ -100,7 +100,7 @@ function submit_host(){
 }
 
 function clear_errors(){
-  $('.error').children().children('.help-inline').remove();
+  $('.error').children().children('.help-block').remove();
   $('.error').removeClass('error');
   $('.tab-error').removeClass('tab-error');
   $('.alert-error').remove();
@@ -121,8 +121,8 @@ function update_progress(data){
   var task_list_size = $('p',data).size();
   if (task_list_size == 0 || stop_pooling == true) return;
 
-  var done_tasks = $('.icon-check',data).size();
-  var failed_tasks = $('.icon-remove',data).size();
+  var done_tasks = $('.glyphicon-check',data).size();
+  var failed_tasks = $('.glyphicon-remove',data).size();
   var $progress = $('.progress');
 
   $("#host-progress").show();
@@ -164,7 +164,7 @@ function add_puppet_class(item){
   links.attr('onclick', 'remove_puppet_class(this)');
   links.attr('data-original-title', _('Click to undo adding this class'));
   links.tooltip();
-  link.removeClass('icon-plus-sign').addClass('icon-remove-sign');
+  link.removeClass('glyphicon-plus-sign').addClass('glyphicon-minus-sign');
 
   $('#selected_classes').append(content);
 
@@ -183,7 +183,7 @@ function remove_puppet_class(item){
   $('#puppetclass_' + id + '_params_loading').remove();
   $('[id^="puppetclass_' + id + '_params\\["]').remove();
   $('#params-tab').removeClass("tab-error");
-  if ($("#params").find('.control-group.error').length > 0) $('#params-tab').addClass('tab-error');
+  if ($("#params").find('.form-group.error').length > 0) $('#params-tab').addClass('tab-error');
 
   return false;
 }

app/assets/javascripts/lookup_keys.js

@@ -3,6 +3,8 @@ $(function() {
   //select the first tab
   $('.smart-var-tabs li a span').hide();
   select_first_tab();
+  // expend inner form fields
+  $('.tabs-left .col-md-4').removeClass('col-md-4').addClass('col-md-8')
   //make the remove variable button visible only on the active pill
   $(document).on('click', '.smart-var-tabs li a', function(){ show_delete_button(this);});
   //remove variable click event
@@ -152,18 +154,18 @@ function toggleOverrideValue(item) {
   type_field.attr('disabled', override ? null : 'disabled');
   validator_type_field.attr('disabled', override ? null : 'disabled');
   default_value_field.attr('disabled', override ? null : 'disabled' );
-  pill_icon.attr("class", override ? 'icon-flag' : "icon- ");
+  pill_icon.attr("class", override ? 'glyphicon glyphicon-flag' : "glyphicon- ");
   override_value_div.toggle(override);
 }
 
 function filterByEnvironment(item){
   if ($(item).val()=="") {
-    $('ul.smart-var-tabs li[data-used-environments] a').removeClass('muted');
+    $('ul.smart-var-tabs li[data-used-environments] a').removeClass('text-muted');
     return;
   }
   var selected = $(item).find('option:selected').text();
-  $('ul.smart-var-tabs li[data-used-environments] a').addClass('muted');
-  $('ul.smart-var-tabs li[data-used-environments*="'+selected+'"] a').removeClass('muted');
+  $('ul.smart-var-tabs li[data-used-environments] a').addClass('text-muted');
+  $('ul.smart-var-tabs li[data-used-environments*="'+selected+'"] a').removeClass('text-muted');
 }
 
 function filterByClassParam(item) {

app/assets/javascripts/noVNC.js

@@ -12,18 +12,18 @@ function updateState(rfb, state, oldstate, msg) {
   sb = $D('noVNC_status');
   cad = $D('sendCtrlAltDelButton');
   switch (state) {
-    case 'failed':       level = "important";  break;
-    case 'fatal':        level = "important";  break;
-    case 'normal':       level = "success";    break;
-    case 'disconnected': level = "";           break;
-    case 'loaded':       level = "success";    break;
-    default:             level = "warning";    break;
+    case 'failed':       level = "danger";  break;
+    case 'fatal':        level = "danger";  break;
+    case 'normal':       level = "success"; break;
+    case 'disconnected': level = "default"; break;
+    case 'loaded':       level = "success"; break;
+    default:             level = "warning"; break;
   }
 
   cad.disabled = state !== "normal";
 
   if (typeof(msg) !== 'undefined') {
-    sb.setAttribute("class", "span7 label label-" + level);
+    sb.setAttribute("class", "col-md-7 label label-" + level);
     s.innerHTML = msg;
   }
 }

app/assets/javascripts/spice.js

@@ -25,7 +25,7 @@ function disconnect() {
 
 function spice_error(e) {
   $('#spice-status').text(e);
-  $('#spice-status').removeClass('label-success').addClass('label-important');
+  $('#spice-status').removeClass('label-success').addClass('label-danger');
   disconnect();
 }
 

app/assets/javascripts/topbar.js

@@ -3,7 +3,7 @@ $(function() {
   $('.persist-header').after(clone);
   $('.persist-header:first').hide();
   $('.persist-header:last').css({
-    'position': 'static'
+    'position': 'static', 'top': '0'
   });
 
   mark_active_menu();
@@ -15,11 +15,16 @@ $(function() {
 })
 
 //open main menu on hover
-$(document).on('mouseenter', '.dropdown.menu_tab_dropdown', function(){
+$(document).on('mouseenter', '.collapse .dropdown.menu_tab_dropdown', function(){
   if(!$(this).hasClass('open')){
     $(this).find('.dropdown-toggle:first').click();
   }
 });
+$(document).on('mouseleave', '.collapse .dropdown.menu_tab_dropdown', function(){
+  if($(this).hasClass('open')){
+    $(this).find('.dropdown-toggle:first').click();
+  }
+});
 
 function mark_active_menu() {
   $("[class^='menu_tab_']").removeClass('active');

app/assets/javascripts/two-pane.js

@@ -89,10 +89,10 @@ function hide_columns(){
   $('.two-pane-right').remove();
   $('.pagination').hide();
   if ($('.two-pane-left').length == 0){
-    $('.table-two-pane').wrap( "<div class='row'><div class='span3 two-pane-left'></div></div>");
+    $('.table-two-pane').wrap( "<div class='row'><div class='col-md-3 two-pane-left'></div></div>");
   }
   var placeholder = spinner_placeholder(_('Loading'));
-  $('.two-pane-left').after("<div class='span9 two-pane-right'><div class='well'>" + placeholder + "</div></div>");
+  $('.two-pane-left').after("<div class='col-md-9 two-pane-right'><div class='well'>" + placeholder + "</div></div>");
 
 }
 
@@ -105,7 +105,6 @@ function right_pane_content(response){
     $('.two-pane-right').html(form_content);
     $('.two-pane-right form').removeClass('form-horizontal');
     $('.two-pane-right form').prepend("<div class='fr close-button'><a class='two-pane-close' href='#'>&times;</a></div>");
-    $('.form-actions div').addClass('pull-right');
     $('.form-actions a').addClass('two-pane-close');
     fix_multi_checkbox();
   } else {
@@ -116,15 +115,15 @@ function right_pane_content(response){
 }
 
 function fix_multi_checkbox(){
-  $('.two-pane-right .icon-check').parents('.control-group').each(function(){
+  $('.two-pane-right .glyphicon-icon-check').parents('.form-group').each(function(){
     var label = $(this).find('.control-label').hide().text();
     $(this).find('a').append(label).addClass('select-all');
   })
 }
 
 // clear form errors classes.
 function clear_errors(){
-  $('.error .help-inline').hide();
+  $('.error .help-block').hide();
   $('.error').removeClass('error');
   $('.tab-error').removeClass('tab-error');
   $('.alert-error').remove();