From d30c61355aebf094f1fdcbeffb2ee1c0c360f1cc Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Tue, 11 Feb 2014 15:49:45 +0100 Subject: [PATCH] Upgrade FontAwesome to 4.0.3 --- install.sh | 13 +- src/sunstone/public/js/layout.js | 14 +- src/sunstone/public/js/plugins/acls-tab.js | 4 +- .../public/js/plugins/clusters-tab.js | 20 +- src/sunstone/public/js/plugins/config-tab.js | 2 +- .../public/js/plugins/dashboard-tab.js | 14 +- .../public/js/plugins/datastores-tab.js | 4 +- src/sunstone/public/js/plugins/files-tab.js | 6 +- src/sunstone/public/js/plugins/groups-tab.js | 2 +- src/sunstone/public/js/plugins/hosts-tab.js | 4 +- src/sunstone/public/js/plugins/images-tab.js | 10 +- src/sunstone/public/js/plugins/infra-tab.js | 4 +- .../public/js/plugins/marketplace-tab.js | 6 +- .../public/js/plugins/oneflow-dashboard.js | 2 +- .../public/js/plugins/oneflow-services.js | 14 +- .../public/js/plugins/oneflow-templates.js | 14 +- src/sunstone/public/js/plugins/system-tab.js | 4 +- .../public/js/plugins/templates-tab.js | 66 +- src/sunstone/public/js/plugins/users-tab.js | 2 +- src/sunstone/public/js/plugins/vms-tab.js | 36 +- src/sunstone/public/js/plugins/vnets-tab.js | 10 +- .../public/js/plugins/vresources-tab.js | 4 +- src/sunstone/public/js/sunstone-util.js | 76 +- src/sunstone/public/js/sunstone.js | 32 +- .../4.0/fontawesome/css/font-awesome-ie7.css | 1203 ---------- .../fontawesome/css/font-awesome-ie7.min.css | 384 ---- .../4.0/fontawesome/css/font-awesome.css | 1479 ------------- .../4.0/fontawesome/css/font-awesome.min.css | 407 +--- .../4.0/fontawesome/font/FontAwesome.otf | Bin 61896 -> 0 bytes .../fontawesome/font/fontawesome-webfont.eot | Bin 37405 -> 0 bytes .../fontawesome/font/fontawesome-webfont.woff | Bin 43572 -> 0 bytes .../4.0/fontawesome/fonts/FontAwesome.otf | Bin 0 -> 62856 bytes .../fontawesome/fonts/fontawesome-webfont.eot | Bin 0 -> 38205 bytes .../{font => fonts}/fontawesome-webfont.svg | 31 +- .../{font => fonts}/fontawesome-webfont.ttf | Bin 79076 -> 80652 bytes .../fonts/fontawesome-webfont.woff | Bin 0 -> 44432 bytes .../4.0/fontawesome/less/bootstrap.less | 84 - .../vendor/4.0/fontawesome/less/core.less | 129 -- .../vendor/4.0/fontawesome/less/extras.less | 93 - .../fontawesome/less/font-awesome-ie7.less | 1953 ----------------- .../4.0/fontawesome/less/font-awesome.less | 33 - .../vendor/4.0/fontawesome/less/icons.less | 381 ---- .../vendor/4.0/fontawesome/less/mixins.less | 48 - .../vendor/4.0/fontawesome/less/path.less | 14 - .../4.0/fontawesome/less/variables.less | 735 ------- .../4.0/fontawesome/scss/_bootstrap.scss | 84 - .../vendor/4.0/fontawesome/scss/_core.scss | 129 -- .../vendor/4.0/fontawesome/scss/_extras.scss | 93 - .../vendor/4.0/fontawesome/scss/_icons.scss | 381 ---- .../vendor/4.0/fontawesome/scss/_mixins.scss | 48 - .../vendor/4.0/fontawesome/scss/_path.scss | 14 - .../4.0/fontawesome/scss/_variables.scss | 734 ------- .../fontawesome/scss/font-awesome-ie7.scss | 1953 ----------------- .../4.0/fontawesome/scss/font-awesome.scss | 33 - src/sunstone/views/index.erb | 2 +- 55 files changed, 186 insertions(+), 10622 deletions(-) delete mode 100644 src/sunstone/public/vendor/4.0/fontawesome/css/font-awesome-ie7.css delete mode 100644 src/sunstone/public/vendor/4.0/fontawesome/css/font-awesome-ie7.min.css delete mode 100644 src/sunstone/public/vendor/4.0/fontawesome/css/font-awesome.css delete mode 100644 src/sunstone/public/vendor/4.0/fontawesome/font/FontAwesome.otf delete mode 100755 src/sunstone/public/vendor/4.0/fontawesome/font/fontawesome-webfont.eot delete mode 100755 src/sunstone/public/vendor/4.0/fontawesome/font/fontawesome-webfont.woff create mode 100644 src/sunstone/public/vendor/4.0/fontawesome/fonts/FontAwesome.otf create mode 100755 src/sunstone/public/vendor/4.0/fontawesome/fonts/fontawesome-webfont.eot rename src/sunstone/public/vendor/4.0/fontawesome/{font => fonts}/fontawesome-webfont.svg (96%) rename src/sunstone/public/vendor/4.0/fontawesome/{font => fonts}/fontawesome-webfont.ttf (91%) create mode 100755 src/sunstone/public/vendor/4.0/fontawesome/fonts/fontawesome-webfont.woff delete mode 100644 src/sunstone/public/vendor/4.0/fontawesome/less/bootstrap.less delete mode 100644 src/sunstone/public/vendor/4.0/fontawesome/less/core.less delete mode 100644 src/sunstone/public/vendor/4.0/fontawesome/less/extras.less delete mode 100644 src/sunstone/public/vendor/4.0/fontawesome/less/font-awesome-ie7.less delete mode 100644 src/sunstone/public/vendor/4.0/fontawesome/less/font-awesome.less delete mode 100644 src/sunstone/public/vendor/4.0/fontawesome/less/icons.less delete mode 100644 src/sunstone/public/vendor/4.0/fontawesome/less/mixins.less delete mode 100644 src/sunstone/public/vendor/4.0/fontawesome/less/path.less delete mode 100644 src/sunstone/public/vendor/4.0/fontawesome/less/variables.less delete mode 100644 src/sunstone/public/vendor/4.0/fontawesome/scss/_bootstrap.scss delete mode 100644 src/sunstone/public/vendor/4.0/fontawesome/scss/_core.scss delete mode 100644 src/sunstone/public/vendor/4.0/fontawesome/scss/_extras.scss delete mode 100644 src/sunstone/public/vendor/4.0/fontawesome/scss/_icons.scss delete mode 100644 src/sunstone/public/vendor/4.0/fontawesome/scss/_mixins.scss delete mode 100644 src/sunstone/public/vendor/4.0/fontawesome/scss/_path.scss delete mode 100644 src/sunstone/public/vendor/4.0/fontawesome/scss/_variables.scss delete mode 100644 src/sunstone/public/vendor/4.0/fontawesome/scss/font-awesome-ie7.scss delete mode 100644 src/sunstone/public/vendor/4.0/fontawesome/scss/font-awesome.scss diff --git a/install.sh b/install.sh index 027ea2bc09..5457096840 100755 --- a/install.sh +++ b/install.sh @@ -347,7 +347,7 @@ SUNSTONE_DIRS="$SUNSTONE_LOCATION/routes \ $SUNSTONE_LOCATION/public/vendor/4.0/jquery_layout \ $SUNSTONE_LOCATION/public/vendor/4.0/fontawesome \ $SUNSTONE_LOCATION/public/vendor/4.0/fontawesome/css \ - $SUNSTONE_LOCATION/public/vendor/4.0/fontawesome/font \ + $SUNSTONE_LOCATION/public/vendor/4.0/fontawesome/fonts \ $SUNSTONE_LOCATION/public/vendor/4.0/jgrowl \ $SUNSTONE_LOCATION/public/vendor/4.0/foundation \ $SUNSTONE_LOCATION/public/vendor/4.0/nouislider \ @@ -563,7 +563,7 @@ INSTALL_SUNSTONE_FILES=( SUNSTONE_PUBLIC_NEW_VENDOR_FOUNDATION:$SUNSTONE_LOCATION/public/vendor/4.0/foundation SUNSTONE_PUBLIC_NEW_VENDOR_JQUERYLAYOUT:$SUNSTONE_LOCATION/public/vendor/4.0/jquery_layout SUNSTONE_PUBLIC_NEW_VENDOR_FONTAWESOME:$SUNSTONE_LOCATION/public/vendor/4.0/fontawesome - SUNSTONE_PUBLIC_NEW_VENDOR_FONTAWESOME_FONT:$SUNSTONE_LOCATION/public/vendor/4.0/fontawesome/font + SUNSTONE_PUBLIC_NEW_VENDOR_FONTAWESOME_FONT:$SUNSTONE_LOCATION/public/vendor/4.0/fontawesome/fonts SUNSTONE_PUBLIC_NEW_VENDOR_FONTAWESOME_CSS:$SUNSTONE_LOCATION/public/vendor/4.0/fontawesome/css SUNSTONE_PUBLIC_NEW_VENDOR_NOUISLIDER:$SUNSTONE_LOCATION/public/vendor/4.0/nouislider SUNSTONE_PUBLIC_NEW_VENDOR_JDPICKER:$SUNSTONE_LOCATION/public/vendor/4.0/jdpicker_1.1 @@ -1661,10 +1661,11 @@ SUNSTONE_PUBLIC_NEW_VENDOR_FONTAWESOME_CSS="\ src/sunstone/public/vendor/4.0/fontawesome/css/font-awesome.min.css" SUNSTONE_PUBLIC_NEW_VENDOR_FONTAWESOME_FONT="\ -src/sunstone/public/vendor/4.0/fontawesome/font/fontawesome-webfont.eot \ -src/sunstone/public/vendor/4.0/fontawesome/font/fontawesome-webfont.woff \ -src/sunstone/public/vendor/4.0/fontawesome/font/fontawesome-webfont.ttf \ -src/sunstone/public/vendor/4.0/fontawesome/font/fontawesome-webfont.svg \ +src/sunstone/public/vendor/4.0/fontawesome/fonts/fontawesome-webfont.eot \ +src/sunstone/public/vendor/4.0/fontawesome/fonts/fontawesome-webfont.woff \ +src/sunstone/public/vendor/4.0/fontawesome/fonts/fontawesome-webfont.ttf \ +src/sunstone/public/vendor/4.0/fontawesome/fonts/fontawesome-webfont.svg \ +src/sunstone/public/vendor/4.0/fontawesome/fonts/FontAwesome.otf \ " SUNSTONE_PUBLIC_NEW_VENDOR_NOUISLIDER="\ diff --git a/src/sunstone/public/js/layout.js b/src/sunstone/public/js/layout.js index 40122459e3..6094943c09 100644 --- a/src/sunstone/public/js/layout.js +++ b/src/sunstone/public/js/layout.js @@ -107,10 +107,10 @@ function setupTabs(){ //are hidden subtabs.fadeToggle('fast'); $(this).removeClass('active'); - $('span',subtabs).removeClass(' icon-caret-down'); - $('span',subtabs).addClass(' icon-caret-left'); + $('span',subtabs).removeClass(' fa fa-caret-down'); + $('span',subtabs).addClass(' fa fa-caret-left'); //toggle icon on this tab - $('span',this).toggleClass(' icon-caret-left icon-caret-down'); + $('span',this).toggleClass(' fa fa-caret-left fa fa-caret-down'); return false; } else { @@ -156,8 +156,8 @@ $(document).ready(function () { //, south__spacing_open: 0 , west__spacing_open: 10 , west__spacing_closed: 10 - , west__togglerContent_open: '' - , west__togglerContent_closed: '' + , west__togglerContent_open: '' + , west__togglerContent_closed: '' , north__maxSize: 200 , south__maxSize: 200 , south__closable: false @@ -176,8 +176,8 @@ $(document).ready(function () { , center__paneSelector: ".inner-center" , south__paneSelector: ".inner-south" , south__size: dialog_height - , south__togglerContent_open: '' - , south__togglerContent_closed: '' + , south__togglerContent_open: '' + , south__togglerContent_closed: '' , south__resizable: true , south__spacing_open: 10 , south__spacing_closed: 0 diff --git a/src/sunstone/public/js/plugins/acls-tab.js b/src/sunstone/public/js/plugins/acls-tab.js index 84b4ee2817..f9c60c8bdc 100644 --- a/src/sunstone/public/js/plugins/acls-tab.js +++ b/src/sunstone/public/js/plugins/acls-tab.js @@ -25,7 +25,7 @@ var acls_tab_content = '\
\

\ \ - '+tr("Access Control Lists")+'\ + '+tr("Access Control Lists")+'\ \ \  \ @@ -631,7 +631,7 @@ $(document).ready(function(){ infoListener(dataTable_acls); $('div#acls_tab div.legend_div').hide(); - + dataTable_acls.fnSort( [ [1,config['user_config']['table_order']] ] ); } }) diff --git a/src/sunstone/public/js/plugins/clusters-tab.js b/src/sunstone/public/js/plugins/clusters-tab.js index 3bedb5a61b..e58cb6ddfa 100644 --- a/src/sunstone/public/js/plugins/clusters-tab.js +++ b/src/sunstone/public/js/plugins/clusters-tab.js @@ -104,7 +104,7 @@ var create_cluster_tmpl ='
\
  • \
    \
    \ - \ + \
    \
    \ \ @@ -121,7 +121,7 @@ var create_cluster_tmpl ='
    \
  • \
    \
    \ - \ + \
    \
    \ \ @@ -138,7 +138,7 @@ var create_cluster_tmpl ='
    \
  • \
    \
    \ - \ + \
    \
    \ \ @@ -273,7 +273,7 @@ function setupCreateClusterDialog(){ selected_hosts_list[host_id]=1; host_row_hash[host_id]=this; $(this).children().each(function(){$(this).addClass('markrowchecked');}); - $('div#selected_hosts_div', dialog).append(''+name+' '); + $('div#selected_hosts_div', dialog).append(''+name+' '); } else { @@ -310,7 +310,7 @@ function setupCreateClusterDialog(){ selected_vnets_list[vnet_id]=1; vnet_row_hash[vnet_id]=this; $(this).children().each(function(){$(this).addClass('markrowchecked');}); - $('div#selected_vnets_div', dialog).append(''+name+' '); + $('div#selected_vnets_div', dialog).append(''+name+' '); } else { @@ -347,7 +347,7 @@ function setupCreateClusterDialog(){ selected_datastore_list[ds_id]=1; datastore_row_hash[ds_id]=this; $(this).children().each(function(){$(this).addClass('markrowchecked');}); - $('div#selected_datastores_div', dialog).append(''+name+' '); + $('div#selected_datastores_div', dialog).append(''+name+' '); } else { @@ -365,8 +365,8 @@ function setupCreateClusterDialog(){ }); // Add tag listeners - $( "#cluster_create_tabs span.icon-remove",$create_cluster_dialog).die(); - $( "#cluster_create_tabs span.icon-remove" ).live( "click", function() { + $( "#cluster_create_tabs span.fa fa-times",$create_cluster_dialog).die(); + $( "#cluster_create_tabs span.fa fa-times" ).live( "click", function() { // Remove the tag $(this).parent().remove(); @@ -878,7 +878,7 @@ var clusters_tab_content = '\
    \

    \ \ - '+tr("Clusters")+'\ + '+tr("Clusters")+'\ \ \  \ @@ -1276,7 +1276,7 @@ function updateClusterInfo(request,cluster){ '+tr("Name")+'\ '+cluster_info.NAME+'\
    \ - \ + \
    \ \ \ diff --git a/src/sunstone/public/js/plugins/config-tab.js b/src/sunstone/public/js/plugins/config-tab.js index d758b96b00..5396626902 100644 --- a/src/sunstone/public/js/plugins/config-tab.js +++ b/src/sunstone/public/js/plugins/config-tab.js @@ -401,7 +401,7 @@ function updateUserConfigInfo(request,user_json) { '+ info.GNAME +'\ \
    \ - \ + \
    \ \ \ diff --git a/src/sunstone/public/js/plugins/dashboard-tab.js b/src/sunstone/public/js/plugins/dashboard-tab.js index d8479b8b4e..d50db8a482 100644 --- a/src/sunstone/public/js/plugins/dashboard-tab.js +++ b/src/sunstone/public/js/plugins/dashboard-tab.js @@ -21,7 +21,7 @@ var dashboard_tab_content = '\
    \

    \ \ - '+tr("Dashboard")+'\ + '+tr("Dashboard")+'\ \ \  \ @@ -45,7 +45,7 @@ var dashboard_tab_content = '\ var widgets = { "storage" : '
    \
    \ -
    '+tr("Storage")+'
    \ +
    '+tr("Storage")+'
    \
    \
    \
    \ @@ -60,7 +60,7 @@ var widgets = {
    ', "users" : '
    \
    \ -
    '+tr("Users")+'
    \ +
    '+tr("Users")+'
    \
    \
    \
    \ @@ -75,7 +75,7 @@ var widgets = {
    ', "network" : '
    \
    \ -
    '+tr("Network")+'
    \ +
    '+tr("Network")+'
    \
    \
    \
    \ @@ -90,7 +90,7 @@ var widgets = {
    ', "hosts" : '
    \
    \ -
    '+tr("Hosts")+'
    \ +
    '+tr("Hosts")+'
    \
    \
    \
    \ @@ -128,7 +128,7 @@ var widgets = {
    ', "vms" : '
    \
    \ -
    '+tr("Virtual Machines")+'
    \ +
    '+tr("Virtual Machines")+'
    \
    \
    \
    \ @@ -166,7 +166,7 @@ var widgets = { } var dashboard_tab = { - title: ''+tr("Dashboard"), + title: ''+tr("Dashboard"), content: dashboard_tab_content, showOnTopMenu: false } diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index 77027df9ea..ebfb23f1c0 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -24,7 +24,7 @@ var datastores_tab_content = '\
    \

    \ \ - '+tr("Datastores")+'\ + '+tr("Datastores")+'\ \ \  \ @@ -768,7 +768,7 @@ function updateDatastoreInfo(request,ds){ '+tr("Name")+'\ '+info.NAME+'\
    \ - \ + \
    \ \ \ diff --git a/src/sunstone/public/js/plugins/files-tab.js b/src/sunstone/public/js/plugins/files-tab.js index b5af1e0ce8..682d89af96 100644 --- a/src/sunstone/public/js/plugins/files-tab.js +++ b/src/sunstone/public/js/plugins/files-tab.js @@ -23,7 +23,7 @@ var files_tab_content = '\
    \

    \ \ - '+tr("Files & Kernels")+'\ + '+tr("Files & Kernels")+'\ \ \ '+tr("TOTAL")+' \ @@ -528,7 +528,7 @@ function updateFileInfo(request,img){ '+tr("Name")+'\ '+img_info.NAME+'\
    \ - \ + \
    \ \ \ @@ -541,7 +541,7 @@ function updateFileInfo(request,img){ '+tr("Type")+'\ '+OpenNebula.Helper.image_type(img_info.TYPE)+'\
    \ - \ + \
    \ \ \ diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js index eb32455a46..7d4089bdc5 100644 --- a/src/sunstone/public/js/plugins/groups-tab.js +++ b/src/sunstone/public/js/plugins/groups-tab.js @@ -45,7 +45,7 @@ var groups_tab_content = '\
    \

    \ \ - '+tr("Groups")+'\ + '+tr("Groups")+'\ \ \ '+tr("TOTAL")+'\ diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js index 4762d0c68e..b86acd2b50 100644 --- a/src/sunstone/public/js/plugins/hosts-tab.js +++ b/src/sunstone/public/js/plugins/hosts-tab.js @@ -25,7 +25,7 @@ var hosts_tab_content = '\
    \

    \ \ - '+tr("Hosts")+'\ + '+tr("Hosts")+'\ \ \ '+tr("TOTAL")+' \ @@ -783,7 +783,7 @@ function updateHostInfo(request,host){ '+tr("Name")+'\ '+host_info.NAME+'\
    \ - \ + \
    \ \ \ diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js index a349542a03..36dc3a9726 100644 --- a/src/sunstone/public/js/plugins/images-tab.js +++ b/src/sunstone/public/js/plugins/images-tab.js @@ -25,7 +25,7 @@ var images_tab_content = '\
    \

    \ \ - '+tr("Images")+'\ + '+tr("Images")+'\ \ \ '+tr("TOTAL")+' \ @@ -212,7 +212,7 @@ var create_image_tmpl = \

    \
    \ -

    '+tr("Advanced options")+'

    \ +

    '+tr("Advanced options")+'

    \
    \
    \
    \ @@ -719,7 +719,7 @@ function updateImageInfo(request,img){ '+tr("Name")+'\ '+img_info.NAME+'\
    \ - \ + \
    \ \ \ @@ -732,7 +732,7 @@ function updateImageInfo(request,img){ '+tr("Type")+'\ '+OpenNebula.Helper.image_type(img_info.TYPE)+'\
    \ - \ + \
    \ \ \ @@ -745,7 +745,7 @@ function updateImageInfo(request,img){ '+tr("Persistent")+'\ '+(parseInt(img_info.PERSISTENT) ? tr("yes") : tr("no"))+'\
    \ - \ + \
    \ \ \ diff --git a/src/sunstone/public/js/plugins/infra-tab.js b/src/sunstone/public/js/plugins/infra-tab.js index 9d7975f70f..a55b127450 100644 --- a/src/sunstone/public/js/plugins/infra-tab.js +++ b/src/sunstone/public/js/plugins/infra-tab.js @@ -15,9 +15,9 @@ /* -------------------------------------------------------------------------- */ var infra_tab = { - title: ''+tr("Infrastructure") + title: ''+tr("Infrastructure") } Sunstone.addMainTab('infra-tab',infra_tab); -$(document).ready(function(){}); \ No newline at end of file +$(document).ready(function(){}); diff --git a/src/sunstone/public/js/plugins/marketplace-tab.js b/src/sunstone/public/js/plugins/marketplace-tab.js index 47440ac164..340d428f2b 100644 --- a/src/sunstone/public/js/plugins/marketplace-tab.js +++ b/src/sunstone/public/js/plugins/marketplace-tab.js @@ -167,7 +167,7 @@ var market_buttons = { "Marketplace.refresh" : { type: "action", layout: "refresh", - text: '', + text: '', alwaysActive: true }, "Marketplace.import" : { @@ -198,7 +198,7 @@ var marketplace_tab_content = '\
    \

    \ \ - '+tr("OpenNebula Marketplace")+'\ + '+tr("OpenNebula Marketplace")+'\ \ \  \ @@ -240,7 +240,7 @@ var marketplace_tab_content = '\ var marketplace_tab = { - title: '' + tr("Marketplace"), + title: '' + tr("Marketplace"), content: marketplace_tab_content, buttons: market_buttons }; diff --git a/src/sunstone/public/js/plugins/oneflow-dashboard.js b/src/sunstone/public/js/plugins/oneflow-dashboard.js index c949fdcaf4..3ae8096452 100644 --- a/src/sunstone/public/js/plugins/oneflow-dashboard.js +++ b/src/sunstone/public/js/plugins/oneflow-dashboard.js @@ -15,7 +15,7 @@ //------------------------------------------------------------------------- // var oneflow_dashboard_tab = { - title: ' OneFlow' + title: ' OneFlow' } diff --git a/src/sunstone/public/js/plugins/oneflow-services.js b/src/sunstone/public/js/plugins/oneflow-services.js index 00f9d998c7..0151f0e18e 100644 --- a/src/sunstone/public/js/plugins/oneflow-services.js +++ b/src/sunstone/public/js/plugins/oneflow-services.js @@ -688,7 +688,7 @@ var role_buttons = { }, "Role.resume" : { type: "action", - text: '', + text: '', layout: "vmsplay_buttons", tip: tr("This will resume selected VMs") }, @@ -830,7 +830,7 @@ var role_vm_buttons = { }, "RoleVM.resume" : { type: "action", - text: '', + text: '', layout: "vmsplay_buttons", tip: tr("This will resume selected VMs") }, @@ -939,7 +939,7 @@ var service_tab_content = '\
    \

    \ \ - '+tr("OneFlow - Services")+'\ + '+tr("OneFlow - Services")+'\ \ \  \ @@ -1650,9 +1650,9 @@ function updateServiceInfo(request,elem){ var info = []; if (this.scale_up) { - info.push(""); + info.push(""); } else if (this.disposed) { - info.push(""); + info.push(""); } else { info.push(""); } @@ -1749,8 +1749,8 @@ function updateServiceInfo(request,elem){ // //open the Vresources submenu in case it was closed // var vres_menu = $('div#menu li#li_vres_tab') // $('li.vres_tab', vres_menu.parent()).fadeIn('fast'); - // $('span', vres_menu).removeClass('ui-icon-circle-plus'); - // $('span', vres_menu).addClass('ui-icon-circle-minus'); + // $('span', vres_menu).removeClass('ui-fa fa-circle-plus'); + // $('span', vres_menu).addClass('ui-fa fa-circle-minus'); // // showTab('vms_tab'); // diff --git a/src/sunstone/public/js/plugins/oneflow-templates.js b/src/sunstone/public/js/plugins/oneflow-templates.js index 8198406722..9c8a1be798 100644 --- a/src/sunstone/public/js/plugins/oneflow-templates.js +++ b/src/sunstone/public/js/plugins/oneflow-templates.js @@ -71,7 +71,7 @@ var service_template_tab_content = '\
    \

    \ \ - '+tr("OneFlow - Templates")+'\ + '+tr("OneFlow - Templates")+'\ \ \  \ @@ -178,7 +178,7 @@ var create_service_template_tmpl = '\

    \
    \
    \ -
    '+tr("Add another role")+'
    \ +
    '+tr("Add another role")+'
    \
    \
      \
    \ @@ -314,7 +314,7 @@ var role_tab_content = '\ \ \ '+tr("Elasticty policies")+'\ -
    '+tr("Add")+'
    \ +
    '+tr("Add")+'
    \ \ \ \ @@ -371,7 +371,7 @@ var role_tab_content = '\ \ \ '+tr("Scheduled policies")+'\ -
    '+tr("Add")+'
    \ +
    '+tr("Add")+'
    \ \ \ \ @@ -1035,7 +1035,7 @@ function setup_role_tab_content(role_section, html_role_id) { \ \ \ - \ + \ \ '); new_tr.appendTo($("#elasticity_policies_tbody", role_section)); @@ -1066,7 +1066,7 @@ function setup_role_tab_content(role_section, html_role_id) { \ \ \ - \ + \ \ ') new_tr.appendTo($("#scheduled_policies_tbody", role_section)) @@ -1119,7 +1119,7 @@ function setupCreateServiceTemplateDialog(){ var a = $("
    \ "+tr("Role ")+role_id+" \ - \ + \ \
    ").appendTo($("dl#roles_tabs")); diff --git a/src/sunstone/public/js/plugins/system-tab.js b/src/sunstone/public/js/plugins/system-tab.js index 07a464d6b5..da4fb100de 100644 --- a/src/sunstone/public/js/plugins/system-tab.js +++ b/src/sunstone/public/js/plugins/system-tab.js @@ -15,11 +15,11 @@ /* -------------------------------------------------------------------------- */ var system_tab = { - title: ''+tr("System") + title: ''+tr("System") } Sunstone.addMainTab('system-tab',system_tab); $(document).ready(function(){ -}); \ No newline at end of file +}); diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index 6439db2562..dbb18c0252 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -22,7 +22,7 @@ var templates_tab_content = '\
    \

    \ \ - '+tr("Templates")+'\ + '+tr("Templates")+'\ \ \  \ @@ -198,7 +198,7 @@ var easy_provision_vm_template_tmpl ='\ '+tr("Step 2: Select a template")+'\
    \
    \ - \ + \
    \
    \ \ @@ -246,7 +246,7 @@ var easy_provision_vm_template_tmpl ='\ '+tr("Step 3: Select an operating system")+'\
    \
    \ - \ + \
    \
    \ \ @@ -723,7 +723,7 @@ function generate_capacity_tab_content() { '
    '+ '
    '+ '
    '+ - '

    '+tr("Advanced options")+'

    '+ + '

    '+tr("Advanced options")+'

    '+ '
    '+ '
    '+ '
    '+ @@ -932,7 +932,7 @@ function generate_disk_tab_content(str_disk_tab_id, str_datatable_id){ '
    '+ '
    '+ '
    ' + - '' + + '' + '
    ' + '
    '+ ''+ @@ -972,7 +972,7 @@ function generate_disk_tab_content(str_disk_tab_id, str_datatable_id){ '
    '+ '
    '+ '
    '+ - '

    '+tr("Advanced options")+'

    '+ + '

    '+tr("Advanced options")+'

    '+ '
    '+ '
    '+ '
    '+ @@ -1218,7 +1218,7 @@ function generate_disk_tab_content(str_disk_tab_id, str_datatable_id){ '
    '+ '
    '+ '
    '+ - '

    '+tr("Advanced options")+'

    '+ + '

    '+tr("Advanced options")+'

    '+ '
    '+ '
    '+ '
    '+ @@ -1701,7 +1701,7 @@ function setup_disk_tab_content(disk_section, str_disk_tab_id, str_datatable_id) function generate_nic_tab_content(str_nic_tab_id, str_datatable_id){ var html = '
    '+ '
    ' + - '' + + '' + '
    ' + '
    '+ ''+ @@ -1737,7 +1737,7 @@ function generate_nic_tab_content(str_nic_tab_id, str_datatable_id){ '
    '+ '
    '+ '
    '+ - '

    '+tr("Advanced options")+'

    '+ + '

    '+tr("Advanced options")+'

    '+ '
    '+ '
    '+ '
    '+ @@ -1994,7 +1994,7 @@ function updateTemplateInfo(request,template){ '+tr("Name")+'\ '+template_info.NAME+'\
    \ - \ + \
    \ \ \ @@ -2158,7 +2158,7 @@ function add_disks_tab(dialog) { var html_tab_content = '
  • '+ '
    '+ - '
    '+ + '
    '+ '
    '+ '
      '+ '
    '+ @@ -2208,7 +2208,7 @@ function add_disk_tab(disk_id, dialog) { $(html_tab_content).appendTo($("ul#template_create_storage_tabs_content", dialog)); var a = $("
    \ - "+tr("DISK")+" \ + "+tr("DISK")+" \
    ").appendTo($("dl#template_create_storage_tabs", dialog)); $(document).foundationTabs("set_tab", a); @@ -2229,7 +2229,7 @@ function add_nics_tab(dialog) { var html_tab_content = '
  • '+ '
    '+ - '
    '+ + '
    '+ '
    '+ '
      '+ '
    '+ @@ -2275,7 +2275,7 @@ function add_nic_tab(nic_id, dialog) { '
  • ' // Append the new div containing the tab and add the tab to the list - var a = $("
    "+tr("NIC")+"
    ").appendTo($("dl#template_create_network_tabs", dialog)); + var a = $("
    "+tr("NIC")+"
    ").appendTo($("dl#template_create_network_tabs", dialog)); $(html_tab_content).appendTo($("ul#template_create_network_tabs_content", dialog)); @@ -2494,7 +2494,7 @@ function add_osTab(dialog) { '
    '+ '
    '+ '
    ' + - '' + + '' + '
    ' + '
    '+ ''+ @@ -2565,7 +2565,7 @@ function add_osTab(dialog) { '
    '+ '
    '+ '
    ' + - '' + + '' + '
    ' + '
    '+ ''+ @@ -3000,7 +3000,7 @@ function add_ioTab(dialog) { var cell3 = row.insertCell(2); - cell3.innerHTML = ""; + cell3.innerHTML = ""; }); $( "#ioTab i.remove-tab", dialog).live( "click", function() { @@ -3085,7 +3085,7 @@ function add_contextTab(dialog) { '
  • '+ '
    '+ '
    ' + - '' + + '' + '
    ' + '
    '+ ''+ @@ -3202,7 +3202,7 @@ function add_contextTab(dialog) { var cell3 = row.insertCell(2); - cell3.innerHTML = ""; + cell3.innerHTML = ""; }); $( "#contextTab i.remove-tab" ).live( "click", function() { @@ -3272,7 +3272,7 @@ function add_contextTab(dialog) { file_row_hash[file_id]=this; $(this).children().each(function(){$(this).addClass('markrowchecked');}); if ($('#tag_file_'+aData[1], $('div#selected_files_spans', dialog)).length == 0 ) { - $('#selected_files_spans', dialog).append(''+aData[4]+' '); + $('#selected_files_spans', dialog).append(''+aData[4]+' '); } } else { $('input.check_item', this).removeAttr('checked'); @@ -3293,8 +3293,8 @@ function add_contextTab(dialog) { return true; }); - $( "span.icon-remove", $("#selected_files_spans") ).die() - $( "span.icon-remove", $("#selected_files_spans") ).live( "click", function() { + $( "span.fa fa-times", $("#selected_files_spans") ).die() + $( "span.fa fa-times", $("#selected_files_spans") ).live( "click", function() { $(this).parent().remove(); var file_id = $(this).parent().attr("image_id"); @@ -3352,7 +3352,7 @@ function add_schedulingTab(dialog) { '
    '+ '
    '+ '
    ' + - '' + + '' + '
    ' + '
    '+ ''+ @@ -3389,7 +3389,7 @@ function add_schedulingTab(dialog) { '