katello 2.2.2 → 2.4.0.rc1

data/app/assets/javascripts/katello/common/env_select.js

@@ -1,15 +1,3 @@
-/**
- Copyright 2014 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
 var env_select =   {
     /* Click callback should be a function:
      *

data/app/assets/javascripts/katello/common/experimental/katello-globals.module.js

@@ -1,16 +1,3 @@
-/**
- * Copyright 2014 Red Hat, Inc.
- *
- * This software is licensed to you under the GNU General Public
- * License as published by the Free Software Foundation; either version
- * 2 of the License (GPLv2) or (at your option) any later version.
- * There is NO WARRANTY for this software, express or implied,
- * including the implied warranties of MERCHANTABILITY,
- * NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- * have received a copy of GPLv2 along with this software; if not, see
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- */
-
 /**
  * @ngdoc module
  * @name  Katello.globals

data/app/assets/javascripts/katello/common/index.js

@@ -1,25 +1,8 @@
-/* Copyright 2014 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
 //= require "katello/common/katello.global"
 //= require "katello/common/katello.common.js"
 //= require "katello/common/katello"
 //= require "katello/common/menu"
-//= require "katello/common/notices"
-//= require "katello/common/routes"
 //= require "katello/common/chosen.jquery"
 //= require "katello/common/spin.min"
 //= require "katello/common/jquery.jeditable.custominputs"
-//= require "katello/common/search"
-//= require "katello/common/panel"
 //= require "katello/common/katello_object"
-//= require "katello/widgets/tipsy.custom"

data/app/assets/javascripts/katello/common/jquery.jeditable.custominputs.js

@@ -1,16 +1,3 @@
-/**
- Copyright 2014 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
 $(document).ready(function() {
 
     // override textfield
@@ -23,18 +10,6 @@ $(document).ready(function() {
         $(':input:first', this).val($("<div/>").html(string).text());
     };
 
-    $.editable.addInputType('custom_info', {
-        element: function(settings, original) {
-            var input = $("<input/>");
-            $(this).append(input);
-            return input;
-        },
-        content: function(string, settings, original) {
-            var input = $(':input:first', this);
-            $(input).val($("<div/>").html(string).text());
-        }
-    });
-
     // Create a custom input type for checkboxes
     $.editable.addInputType("checkbox", {
         element : function(settings, original) {
@@ -202,23 +177,4 @@ $(document).ready(function() {
             });
         }
     });
-
-    $.editable.addInputType( 'timepicker', {
-        /* create input element */
-        element: function( settings, original ) {
-            var form = $( this ), input = $( '<input data-change="false"/>' );
-            if (settings.width !== 'none') { input.width(settings.width); }
-            if (settings.height !== 'none') { input.height(settings.height); }
-            input.attr( 'autocomplete','off' );
-            form.append( input );
-            return input;
-        },
-
-        plugin: function( settings, original ) {
-            var form = this, input = form.find( "input" );
-            settings.onblur = 'ignore';
-            input.timepickr({convention: 12})
-                .click();
-        }
-    });
 });

data/app/assets/javascripts/katello/common/katello.common.js

@@ -1,16 +1,3 @@
-/**
- * Copyright 2014 Red Hat, Inc.
- *
- * This software is licensed to you under the GNU General Public
- * License as published by the Free Software Foundation; either version
- * 2 of the License (GPLv2) or (at your option) any later version.
- * There is NO WARRANTY for this software, express or implied,
- * including the implied warranties of MERCHANTABILITY,
- * NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- * have received a copy of GPLv2 along with this software; if not, see
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- */
-
 //requires jQuery
 KT.common = (function() {
     var root_url;

data/app/assets/javascripts/katello/common/katello.global.js

@@ -1,16 +1,3 @@
-/**
- Copyright 2014 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
 //Katello global object namespace that all others should be attached to
 var KT = {};
 

data/app/assets/javascripts/katello/common/katello.js

@@ -1,17 +1,3 @@
-/**
- * Copyright 2014 Red Hat, Inc.
- *
- * This software is licensed to you under the GNU General Public
- * License as published by the Free Software Foundation; either version
- * 2 of the License (GPLv2) or (at your option) any later version.
- * There is NO WARRANTY for this software, express or implied,
- * including the implied warranties of MERCHANTABILITY,
- * NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- * have received a copy of GPLv2 along with this software; if not, see
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- */
-
-
 /*
  * Katello Global JavaScript File
  * Author: @jrist
@@ -97,54 +83,6 @@ KT.getData = function(fieldNames) {
     return data;
 };
 
-
-KT.helptip =  (function($) {
-    var enable = function(key, url) {
-        $.ajax({
-          type: "POST",
-          url: url,
-          data: { "key":key},
-          cache: false
-          });
-        },
-        disable = function(key, url) {
-          $.ajax({
-            type: "POST",
-            url: url,
-            data: { "key":key},
-            cache: false
-           });
-        },
-        handle_close = function(){
-          var key = this.id.split("helptip-opened_")[1],
-              url = $(this).attr('data-url');
-
-          $("#helptip-opened_" + key).hide();
-          $("#helptip-closed_" + key).show();
-
-          $(document).trigger('helptip-closed');
-
-          disable(key, url);
-        },
-        handle_open = function(){
-          var key = this.id.split("helptip-closed_")[1],
-              url = $(this).attr('data-url');
-
-          $("#helptip-opened_" + key).show();
-          $("#helptip-closed_" + key).hide();
-
-          $(document).trigger('helptip-opened');
-
-          enable(key, url);
-        };
-
-    return {
-        handle_close    :    handle_close,
-        handle_open     :    handle_open
-    };
-})(jQuery);
-
-
 //Add backwards compatible version of Object.keys
 // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Object/keys
 if(!Object.keys) {
@@ -309,15 +247,9 @@ $(document).ready(function (){
         onInputField = false;
     });
 
-    //Add a handler for helptips
-    $(".helptip-open").live('click', KT.helptip.handle_close);
-    $(".helptip-close").live('click', KT.helptip.handle_open);
-
     // Add a handler for ellipsis
-    $(".tipsify").tipsy({ live : true, gravity: 's', fade: true, delayIn : 350 });
-    $(".tipsify-west").tipsy({ gravity: 'w', hoverable : 'true' });
-
-    KT.tipsy.custom.enable_forms_tooltips();
+    $(".tipsify").tooltip({ placement: 'bottom', delay : 350 });
+    $(".tipsify-left").tooltip({ placement: 'left'});
 
     KT.common.orgSwitcherSetup();
 });

data/app/assets/javascripts/katello/common/katello_object.js

@@ -1,16 +1,3 @@
-/**
- Copyright 2014 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- */
-
 KT.object = KT.object || {};
 
 // The KT Object label will handle the interaction where a user enters a

data/app/assets/javascripts/katello/common/menu.js

@@ -1,16 +1,3 @@
-/**
- Copyright 2014 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- */
-
 /*
  * Katello JavaScript Menu File
  * Author: jrist

data/app/assets/javascripts/katello/common/vendor.js

@@ -1,15 +1,3 @@
-/* Copyright 2014 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
 //= require "bastion/underscore/underscore"
 //= require "jquery.ui.dialog"
 //= require "jquery.ui.sortable"
@@ -18,5 +6,4 @@
 //= require "jquery.ui.effect.all"
 //= require "katello/jquery.ba-bbq"
 //= require "katello/jquery.periodicalupdater"
-//= require "katello/jquery.tipsy"
 //= require "katello/jquery.trunk8"

data/app/assets/javascripts/katello/containers/container.js

@@ -1,16 +1,3 @@
-/**
- Copyright 2014 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
 var KT = KT ? KT : {};
 
 KT.container = (function(){

data/app/assets/javascripts/katello/hosts/activation_key_edit.js

@@ -39,10 +39,10 @@ function ktErrorLoadingActivationKeys(error) {
 
 function ktFindParamContainer(name){
     var ret;
-    $("div#parameters table.row input[ type = 'text']").each(function () {
+    $("div#parameters .fields input[ type = 'text']").each(function () {
         var element = $(this);
         if(element.val() == name) {
-            ret = element.closest('table.row');
+            ret = element.closest('.fields');
             return false;
         }
         return true;
@@ -78,7 +78,7 @@ function ktSetParam(name, value) {
     if(value) {
         if(! paramContainer) { // we create the param for kt_activation_keys
             $("div#parameters a.btn-success").click();
-            paramContainer = $("div#parameters table.row").last();
+            paramContainer = $("div#parameters .fields").last();
             paramContainer.find("input").val(name);
         }
         paramContainer.find("textarea").val(value);

data/app/assets/javascripts/katello/hosts/host_and_hostgroup_edit.js

@@ -34,16 +34,18 @@ KT.hosts.fetchContentViews = function () {
 };
 
 KT.hosts.signalContentViewFetch = function(fetching) {
-    var select = KT.hosts.getContentViewSelect(),
+    var select = KT.hosts.getContentViewSelect();
+    var select2 = KT.hosts.getContentViewSelect2();
         //parent = select.parent(),
         spinner = $('<img>').attr('src', '/assets/spinner.gif'),
         spinner_id = "content_view_spinner";
 
     if(fetching) {
         select.hide();
+        select2.hide();
         $(spinner).attr('id', spinner_id).insertAfter(select);
     } else {
-        select.show();
+        select2.show();
         $('#' + spinner_id).remove();
     }
 };
@@ -74,6 +76,14 @@ KT.hosts.getPuppetEnvironmentSelect = function() {
     return select;
 };
 
+KT.hosts.getContentViewSelect2 = function() {
+    var select = $("#s2id_host_content_view_id").first();
+    if(select.length === 0) {
+        select = $("#s2id_hostgroup_content_view_id").first();
+    }
+    return select;
+};
+
 KT.hosts.getContentViewSelect = function() {
     var select = $("#host_content_view_id").first();
     if(select.length === 0) {
@@ -158,8 +168,12 @@ KT.hosts.toggle_installation_medium = function() {
                     if ($("#kt_kickstart_url").length == 0) {
                       $('label[for="medium_id"]').after("<div id='kt_kickstart_url' class='col-md-8'></div>");
                     }
+
                     $("#host_medium_id").hide();
+                    $("#s2id_host_medium_id").hide();
+
                     $("#hostgroup_medium_id").hide();
+                    $("#s2id_hostgroup_medium_id").hide();
                     // populate kickstart_url inside div created above
                     $("#kt_kickstart_url").html(result.name+"<br />"+result.path);
                 }
@@ -172,7 +186,7 @@ KT.hosts.toggle_installation_medium = function() {
 };
 
 KT.hosts.show_medium_selectbox = function() {
-    $("#host_medium_id").show();
-    $("#hostgroup_medium_id").show();
+    $("#s2id_host_medium_id").show();
+    $("#s2id_hostgroup_medium_id").show();
     $("#kt_kickstart_url").html('');
 };

data/app/assets/javascripts/katello/html5/index.js

@@ -1,14 +1,2 @@
-/* Copyright 2014 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
 //= require "katello/html5/html5"
 //= require "katello/html5/excanvas"

data/app/assets/javascripts/katello/organizations/download_certificate.js

@@ -1,16 +1,3 @@
-/**
- Copyright 2014 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- */
-
 $(document).ready(function() {
     $('#download_debug_cert_key').live('click', function(e) {
         e.preventDefault();

data/app/assets/javascripts/katello/providers/provider_redhat.js

@@ -1,16 +1,3 @@
-/**
- Copyright 2014 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
 $(document).ready(function() {
     var spinner = '<i class="icon-spinner inline-icon icon-spin"></i>';
 
@@ -55,10 +42,11 @@ KT.redhat_provider_page = (function($) {
         } else {
             options['repo'] = "0";
         }
-
+        options['pulp_id'] = checkbox.attr("data-pulp-id");
         options['content_id'] = checkbox.attr("data-content-id");
         options['releasever'] = checkbox.attr("data-releasever");
         options['basearch'] = checkbox.attr("data-basearch");
+        options['registry_name'] = checkbox.attr("data-registry-name");
 
         $(checkbox).hide();
         $('#spinner_'+id).removeClass('hidden').show();