Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #8384: Remove dependence on ui-alchemy_rails and compass. #4837

Merged
merged 1 commit into from Dec 2, 2014
Merged

Fixes #8384: Remove dependence on ui-alchemy_rails and compass. #4837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions app/assets/javascripts/katello/common/index.js
View file
Open in desktop
Expand Up @@ -15,7 +15,6 @@
//= require "katello/common/katello"
//= require "katello/common/menu"
//= require "katello/common/notices"
//= require "katello/common/bastion-routes.js"
//= require "katello/common/routes"
//= require "katello/common/chosen.jquery"
//= require "katello/common/spin.min"
Expand All @@ -24,6 +23,3 @@
//= require "katello/common/panel"
//= require "katello/common/katello_object"
//= require "katello/widgets/tipsy.custom"
//= require "katello/widgets/path_selector"
//= require "katello/common/env_select_scroll"
//= require "katello/common/env_select"
13 changes: 1 addition & 12 deletions app/assets/javascripts/katello/common/katello.common.js
View file
Open in desktop
Expand Up @@ -50,7 +50,7 @@ KT.common = (function() {
$.extend(settings, params);

var message = "<div style='margin:20px;'><span class='status_confirm_icon'/><div style='margin-left: 24px; display:table;height:1%;'>" + settings.message + "</div></div>",
warning_message = (settings.warning_message === undefined) ? undefined : "<div style='margin:20px;'><span class='status_warning_icon'/><div style='margin-left: 24px; display:table;height:1%;color:red;'>" + settings.warning_message + "</div></div>",
warning_message = (settings.warning_message === undefined) ? undefined : "<div style='margin:20px;'><span class='icon-warning-sign'/><div style='margin-left: 24px; display:table;height:1%;color:red;'>" + settings.warning_message + "</div></div>",
html = (warning_message === undefined) ? message : "<div>"+message+warning_message+"</div>",
buttons = {
"Yes": {
Expand Down Expand Up @@ -152,17 +152,6 @@ KT.common = (function() {
spinner_path : function() {
return "/assets/spinner.gif";
},
jscroll_init: function(element) {
element.jScrollPane({ hideFocus: true });
},
jscroll_resize: function(element) {
element.resize(function(event){
var element = $('.scroll-pane');
if (element.length){
element.data('jsp').reinitialise();
}
});
},
to_human_readable_bytes : function(bytes) {
var sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'],
i;
Expand Down
2 changes: 0 additions & 2 deletions app/assets/javascripts/katello/common/katello.js
View file
Open in desktop
Expand Up @@ -314,7 +314,6 @@ $(document).ready(function (){
$(".helptip-close").live('click', KT.helptip.handle_open);

// Add a handler for ellipsis
$(".one-line-ellipsis").ellipsis(true);
$(".tipsify").tipsy({ live : true, gravity: 's', fade: true, delayIn : 350 });
$(".tipsify-west").tipsy({ gravity: 'w', hoverable : 'true' });

Expand All @@ -336,7 +335,6 @@ $(window).ready(function(){
$(this).hide();
$('body').css('cursor', 'default');
});
$().UItoTop({ easingType: 'easeOutQuart' });

//allow all buttons with class .button to be clicked via enter or space button
$('.button').live('keyup', function(e){
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/katello/common/search.js
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@ KT.favorite = function(form, input) {
form.find(".qdropdown").html(data);

// process the elements of the list and truncate any that are too long with ellipsis (...) (e.g. jquery.text-overflow.js)
$(".one-line-ellipsis").ellipsis();
$(".one-line-ellipsis").trunk8({lines: 1});
},
error = function(data) {
},
Expand Down
21 changes: 4 additions & 17 deletions app/assets/javascripts/katello/common/vendor.js
View file
Open in desktop
Expand Up @@ -16,20 +16,7 @@
//= require "jquery.ui.tabs"
//= require "jquery.ui.progressbar"
//= require "jquery.ui.effect.all"
//= require "alchemy/jquery/plugins/jquery.hoverIntent"
//= require "alchemy/jquery/plugins/jquery.ui.totop"
//= require "alchemy/jquery/plugins/jquery.jnotify"
//= require "alchemy/jquery/plugins/jquery.text-overflow"
//= require "alchemy/jquery/plugins/jquery.linkHover"
//= require "alchemy/jquery/plugins/jquery.sparkline.min"
//= require "alchemy/jquery/plugins/jquery.mousewheel"
//= require "alchemy/jquery/plugins/jquery.jscrollpane"
//= require "alchemy/jquery/plugins/jquery.ba-bbq"
//= require "alchemy/jquery/plugins/jquery.tipsy"
//= require "alchemy/jquery/plugins/jquery.form"
//= require "alchemy/jquery/plugins/jquery.periodicalupdater"
//= require "alchemy/jquery/plugins/jquery.jeditable"
//= require "alchemy/jquery/plugins/jquery.jeditable.ajaxupload"
//= require "alchemy/jquery/plugins/jquery.ajaxfileupload"
//= require "alchemy/jquery/plugins/jquery.fancyqueries"
//= require "alchemy/jquery/plugins/jquery.ba-resize"
//= require "katello/jquery.ba-bbq"
//= require "katello/jquery.periodicalupdater"
//= require "katello/jquery.tipsy"
//= require "katello/jquery.trunk8"
2 changes: 1 addition & 1 deletion app/assets/javascripts/katello/content_search/content_search.js
View file
Open in desktop
Expand Up @@ -231,7 +231,7 @@ KT.content_search = function(paths_in){

if( KT.permissions.current_organization.editable ){
footer = $('<a/>', { "href" : "/lifecycle_environments"});
footer.append($('<i/>', { "class" : "gears_icon", "data-change_on_hover" : "dark" }));
footer.append($('<i/>', { "class" : "icon-gears", "data-change_on_hover" : "dark" }));
footer.append($('<span/>').html(katelloI18n.manage_environments));
footer = footer[0].outerHTML;
} else {
Expand Down
6 changes: 4 additions & 2 deletions app/assets/javascripts/katello/content_search/index.js
View file
Open in desktop
Expand Up @@ -11,8 +11,10 @@
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
*/

//= require "alchemy/jquery/plugins/chosen.jquery"
//= require "katello/chosen.jquery"
//= require "katello/jquery.hoverIntent"
//= require "katello/common/env_select_scroll"
//= require "katello/widgets/path_selector"
//= require "katello/widgets/comparison_grid"
//= require "katello/content_search/content_search"
//= require "katello/widgets/auto_complete"
//= require "alchemy/jquery/plugins/jquery.trunk8"
7 changes: 1 addition & 6 deletions app/assets/javascripts/katello/dashboard/dashboard.js
View file
Open in desktop
Expand Up @@ -112,10 +112,7 @@ KT.dashboard = (function(){
parent.parent().parent().find('.dropbutton').fadeIn();

// Add a handler for ellipsis
parent.find(".one-line-ellipsis").ellipsis();

KT.common.jscroll_init(parent.find('.scroll-pane'));
KT.common.jscroll_resize(parent.find('.jspPane'));
parent.find(".one-line-ellipsis").trunk8({lines: 1});

var proc = KT.dashboard.widget_map[id];
if (proc) {
Expand All @@ -128,14 +125,12 @@ KT.dashboard = (function(){
$("#dashboard_errata").delegate(".collapsed", "click", function() {
var btn = $(this);
btn.parents(".errata_item").siblings().show();
KT.common.jscroll_init($("#dashboard_errata").find('.scroll-pane'));
btn.removeClass("collapsed").addClass("expanded");
});

$("#dashboard_errata").delegate(".expanded", "click", function() {
var btn = $(this);
btn.parents(".errata_item").siblings().hide();
KT.common.jscroll_init($("#dashboard_errata").find('.scroll-pane'));
btn.removeClass("expanded").addClass("collapsed");
});
},
Expand Down
3 changes: 0 additions & 3 deletions app/assets/javascripts/katello/dashboard/index.js
View file
Open in desktop
Expand Up @@ -11,7 +11,4 @@
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
*/

//= require "alchemy/jquery/plugins/flot-0.7/jquery.flot.js"
//= require "alchemy/jquery/plugins/flot-0.7/jquery.flot.pie"
//= require "katello/widgets/scroll_pane"
//= require "katello/dashboard/dashboard"
2 changes: 0 additions & 2 deletions app/assets/javascripts/katello/providers/index.js
View file
Open in desktop
Expand Up @@ -11,8 +11,6 @@
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
*/

//= require "alchemy/jquery/plugins/jquery.treeTable"
//= require "alchemy/jquery/plugins/jquery.uitablefilter"
//= require "katello/providers/provider"
//= require "katello/providers/repo_discovery"
//= require "katello/providers/repo"
6 changes: 0 additions & 6 deletions app/assets/javascripts/katello/providers/provider_redhat.js
View file
Open in desktop
Expand Up @@ -14,11 +14,6 @@
$(document).ready(function() {
var spinner = '<i class="icon-spinner inline-icon icon-spin"></i>';

KT.common.jscroll_init($('.scroll-pane'));
KT.common.jscroll_resize($('.jspPane'));



$("#content_tabs").tabs({
cache: true,
load: function(event, ui) {
Expand Down Expand Up @@ -156,7 +151,6 @@ KT.redhat_provider_page = (function($) {
$('#input_repo_'+id).show();
},
on_node_show = function(a, b, c){
$.sparkline_display_visible();
},
hide_repos = function(content_id){
var row = $('#repo_set_' + content_id);
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/katello/providers/redhat/index.js
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
*/

//= require "alchemy/jquery/plugins/jquery.treeTable"
//= require "katello/jquery.treeTable"
//= require "katello/widgets/jquery.jeditable.helpers"
//= require "katello/widgets/tabs"
//= require "katello/providers/provider_redhat"
2 changes: 1 addition & 1 deletion app/assets/javascripts/katello/sync_management/index.js
View file
Open in desktop
Expand Up @@ -11,5 +11,5 @@
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
*/

//= require "alchemy/jquery/plugins/jquery.treeTable"
//= require "katello/jquery.treeTable"
//= require "katello/sync_management/sync_management"
2 changes: 1 addition & 1 deletion app/assets/javascripts/katello/widgets/comparison_grid.js
View file
Open in desktop
Expand Up @@ -816,7 +816,7 @@ KT.comparison_grid.templates = (function(i18n) {

if ( data['hover_details'] ) {
hover_details = $('<span/>', {
'class' : 'details-icon hover_details',
'class' : 'icon-circle hover_details',
'original-title' : data['hover_details']
});
}
Expand Down
15 changes: 0 additions & 15 deletions app/assets/javascripts/katello/widgets/filtertable/index.js
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions app/assets/javascripts/katello/widgets/scroll_pane.js
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions app/assets/javascripts/katello/widgets/treetable/index.js
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions app/assets/stylesheets/katello/_grid.scss
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions app/assets/stylesheets/katello/_katello_base.scss
View file
Open in desktop
@@ -1,7 +1,3 @@
@import "compass";
@import "alchemy/vars";
@import "alchemy/colors";
@import "alchemy/mixins";
@import "katello/katello_vars";
@import "katello/katello_colors";
@import "katello/katello_mixins";
2 changes: 1 addition & 1 deletion app/assets/stylesheets/katello/_katello_colors.scss
View file
Open in desktop
Expand Up @@ -76,7 +76,7 @@ $border_color: #d7d7d7;
$table-border_color: $border_color;

@mixin widget-background-color {
@include background-image(linear-gradient(top, #F9F9F9, #E4E4E4));
background-image: linear-gradient(top, #F9F9F9, #E4E4E4);
}

$widget-border-color: #C9C9C9;
Expand Down
14 changes: 2 additions & 12 deletions app/assets/stylesheets/katello/_katello_mixins.scss
View file
Open in desktop
Expand Up @@ -39,7 +39,7 @@
&:hover {
background: $breadcrumbbg_color !important;
color: #000;
@include text-shadow(none);
text-shadow: none;

&:after { border-left-color: $breadcrumbbg_color !important; }
}
Expand All @@ -49,7 +49,7 @@
&:hover {
background: $listhover_color !important;
color: $white_color;
@include text-shadow(2px 2px 2px rgba(0,0,0,0.6));
text-shadow: 2px 2px 2px rgba(0,0,0,0.6);
&:after {
border-left-color: $listhover_color !important;
}
Expand All @@ -76,13 +76,3 @@
@include crumb-disable-hover-selected;
}
}

@mixin product-sprite {
background: $base_product_icon;
height: 16px;
width: 16px;
margin-top: 2px;
margin-left: 4px;
margin-right: 4px;
float: left;
}
46 changes: 0 additions & 46 deletions app/assets/stylesheets/katello/_katello_vars.scss
View file
Open in desktop
Expand Up @@ -11,11 +11,8 @@ $ui_totop_img: url("icons/ui.totop.png") no-repeat left top;
$ui_totop_hover_img: url("icons/ui.totop.png") no-repeat left -32px;
$ninesixty_img: url("960.png") repeat-y top center;
$input_background_img: url("input-bg.png") repeat-x 0 0 #f0f0f0;
$arrow_min_img: url("icons/expander-collapsed.png") no-repeat top center;
$arrow_max_img: url("icons/expander-expanded.png") no-repeat top center;
$info_icon: url("icons/info.png") no-repeat scroll 98% 6px transparent;
$info_hover_icon: url("icons/info.png") no-repeat scroll 98% 6px transparent;
$edit_icon: url("icons/edit.png") no-repeat scroll 98% 6px transparent;
$edit_hover_icon: url("icons/edit-hover.png") no-repeat scroll 98% 6px #F2F2F2;
$home_icon_black: url("icons/breadcrumb-icons.png") -16px -16px no-repeat;
$home_icon_green: url("icons/breadcrumb-icons.png") -16px 0px no-repeat;
Expand All @@ -39,49 +36,6 @@ $status_icons_red: url("icons/status_icons_sprite.png") no-repeat -25
$status_icons_red_small: url("icons/status_icons_sprite.png") no-repeat -15px -25px;
$icon_menu_arrow: url("icons/icon_menu_arrow.gif") no-repeat 0 0;

//Images
$spinner_img: url("../alchemy/icons/spinner.gif") no-repeat 0 0 transparent;

$arrow_min_img_small: url("../alchemy/icons/action-icons.png") -544px -16px no-repeat;
$arrow_max_img_small: url("../alchemy/icons/action-icons.png") -528px -16px no-repeat;
$x_icon_grey: url("../alchemy/icons/action-icons.png") -32px 0px no-repeat;
$x_icon_black: url("../alchemy/icons/action-icons.png") -32px -16px no-repeat;
$add_icon_black: url("../alchemy/icons/action-icons.png") -48px -16px no-repeat;
$edit_icon_black: url("../alchemy/icons/action-icons.png") -16px -16px no-repeat;
$circle_x_icon_black: url("../alchemy/icons/action-icons.png") -160px -16px no-repeat;
$circle_x_icon_grey: url("../alchemy/icons/action-icons.png") -160px 0px no-repeat;
$play_icon_black: url("../alchemy/icons/action-icons.png") -176px -16px no-repeat;
$play_icon_grey: url("../alchemy/icons/action-icons.png") -176px 0 no-repeat;
$comp_icon_black: url("../alchemy/icons/action-icons.png") -320px -16px no-repeat;
$search_icon_white: url("../alchemy/icons/action-icons.png") no-repeat 0 0;
$base_product_icon: url("../alchemy/icons/objects.png") no-repeat 0 0;
$custom_product_icon: url("../alchemy/icons/objects.png") no-repeat -16px 0;
$rh_product_icon: url("../alchemy/icons/objects.png") no-repeat -48px 0;
$arrow_icon_menu: url("../alchemy/icons/arrow_icon.png") no-repeat -26px 0;
$arrow_icon_menu_hover: url("../alchemy/icons/arrow_icon.png") no-repeat -13px 0;
$gears_icon_black: url("../alchemy/icons/action-icons.png") -64px -16px no-repeat;
$gears_icon_grey: url("../alchemy/icons/action-icons.png") -64px 0px no-repeat;
$warning_icon_triangle: url("../alchemy/icons/action-icons.png") -384px -16px no-repeat;
$warning_icon_black: url("../alchemy/icons/action-icons.png") -432px -16px no-repeat;
$error_icon_black: url("../alchemy/icons/action-icons.png") -384px -16px no-repeat;
$check_icon_black: url("../alchemy/icons/action-icons.png") -448px -16px no-repeat;
$clock_icon_black: url("../alchemy/icons/action-icons.png") -464px -16px no-repeat;
$gear_icon: url("../alchemy/icons/action-icons.png") -480px 0px no-repeat;
$gear_icon_dark: url("../alchemy/icons/action-icons.png") -480px -16px no-repeat;
$plus_icon_black: url("../alchemy/icons/action-icons.png") -400px -16px no-repeat;
$bug_icon_black: url("../alchemy/icons/action-icons.png") -416px -16px no-repeat;
$shield_icon_black: url("../alchemy/icons/action-icons.png") -432px -16px no-repeat;
$download_icon_black: url("../alchemy/icons/action-icons.png") -513px 0px no-repeat;
$download_icon_grey: url("../alchemy/icons/action-icons.png") -513px -16px no-repeat;
$details_icon_grey: url("../alchemy/icons/action-icons.png") -257px 0px no-repeat;
$details_icon_black: url("../alchemy/icons/action-icons.png") -257px -16px no-repeat;
$package_icon_grey: url("../alchemy/icons/action-icons.png") -560px 0px no-repeat;
$package_icon_black: url("../alchemy/icons/action-icons.png") -560px -16px no-repeat;
$erratum_icon_grey: url("../alchemy/icons/action-icons.png") -576px 0px no-repeat;
$erratum_icon_black: url("../alchemy/icons/action-icons.png") -576px -16px no-repeat;
$host_collection_icon_grey: url("../alchemy/icons/action-icons.png") -590px 0px no-repeat;
$host_collection_icon_black: url("../alchemy/icons/action-icons.png") -590px -16px no-repeat;

@mixin action-icon($icon) {
background: $icon;
margin-left: 6px;
Expand Down
2 changes: 0 additions & 2 deletions app/assets/stylesheets/katello/_overrides.scss
View file
Open in desktop
Expand Up @@ -12,9 +12,7 @@
*/
$primary_color: rgb(0, 112, 143);
$static_width: 1152px;
$spritePath: url("../alchemy/icons/action-icons.png");
$FontAwesomePath: "../bastion/font-awesome";
$font_path: "../alchemy/";


// Foreman Overrides
Expand Down