From: Michael Wood <[email protected]> Stick with the old style icons as we customise these with font-awesome.
Signed-off-by: Michael Wood <[email protected]> --- .../toaster/toastergui/static/js/layerdetails.js | 8 ++++---- .../lib/toaster/toastergui/static/js/libtoaster.js | 4 ++-- .../toaster/toastergui/templates/customrecipe.html | 2 +- .../toaster/toastergui/templates/layer_btn.html | 2 +- .../toaster/toastergui/templates/layerdetails.html | 24 +++++++++++----------- .../toastergui/templates/pkg_add_rm_btn.html | 2 +- .../lib/toaster/toastergui/templates/project.html | 4 ++-- .../toaster/toastergui/templates/projectconf.html | 18 ++++++++-------- .../toastergui/templates/projecttopbar.html | 2 +- 9 files changed, 33 insertions(+), 33 deletions(-) diff --git a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js index 7f4828e..d545406 100644 --- a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js +++ b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js @@ -98,7 +98,7 @@ function layerDetailsPageInit (ctx) { }); }); - $(".glyphicon glyphicon-pencil").click(function (){ + $(".icon-pencil").click(function (){ var mParent = $(this).parent("dd"); mParent.prev().css("margin-top", "10px"); mParent.children("form").slideDown(); @@ -134,7 +134,7 @@ function layerDetailsPageInit (ctx) { mParent.children(".delete-current-value").show(); } - mParent.children(".glyphicon glyphicon-pencil").show(); + mParent.children(".icon-pencil").show(); mParent.prev().css("margin-top", "0px"); }); }); @@ -387,9 +387,9 @@ function layerDetailsPageInit (ctx) { }); - layerDepsList.find(".glyphicon glyphicon-trash").click(layerDepRemoveClick); + layerDepsList.find(".icon-trash").click(layerDepRemoveClick); layerDepsList.find("a").tooltip(); - $(".glyphicon glyphicon-trash").tooltip(); + $(".icon-trash").tooltip(); $(".commit").tooltip(); } diff --git a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js b/bitbake/lib/toaster/toastergui/static/js/libtoaster.js index 50d9c8f..d48c7f7 100644 --- a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js +++ b/bitbake/lib/toaster/toastergui/static/js/libtoaster.js @@ -557,8 +557,8 @@ $(document).ready(function() { // show task type and outcome in task details pages $(".task-info").tooltip({ container: 'body', html: true, delay: {show: 200}, placement: 'right' }); - // initialise the tooltips for the glyphicon glyphicon-pencil icons - $(".glyphicon glyphicon-pencil").tooltip({ container: 'body', html: true, delay: {show: 400}, title: "Change" }); + // initialise the tooltips for the icon-pencil icons + $(".icon-pencil").tooltip({ container: 'body', html: true, delay: {show: 400}, title: "Change" }); // initialise the tooltips for the download icons $(".icon-download-alt").tooltip({ container: 'body', html: true, delay: { show: 200 } }); diff --git a/bitbake/lib/toaster/toastergui/templates/customrecipe.html b/bitbake/lib/toaster/toastergui/templates/customrecipe.html index ebf2fd2..6dbdf47 100644 --- a/bitbake/lib/toaster/toastergui/templates/customrecipe.html +++ b/bitbake/lib/toaster/toastergui/templates/customrecipe.html @@ -233,7 +233,7 @@ </dd> </dl> <!-- - <i class="glyphicon glyphicon-trash no-tooltip"></i> + <i class="icon-trash no-tooltip"></i> <a href="#" class="error" id="delete">Delete custom image</a> --> </div> diff --git a/bitbake/lib/toaster/toastergui/templates/layer_btn.html b/bitbake/lib/toaster/toastergui/templates/layer_btn.html index d5ce9ff..1be29fe 100644 --- a/bitbake/lib/toaster/toastergui/templates/layer_btn.html +++ b/bitbake/lib/toaster/toastergui/templates/layer_btn.html @@ -3,7 +3,7 @@ style="display:none;" {% endif %} > - <i class="glyphicon glyphicon-trash"></i> + <i class="icon-trash"></i> Remove layer </button> <button class="btn btn-block layer-add-{{data.pk}} layerbtn" data-layer='{ "id": {{data.pk}}, "name": "{{data.layer.name}}", "layerdetailurl": "{%url 'layerdetails' extra.pid data.pk%}"}' data-directive="add" diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html b/bitbake/lib/toaster/toastergui/templates/layerdetails.html index b4601ed..2f254da 100644 --- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html +++ b/bitbake/lib/toaster/toastergui/templates/layerdetails.html @@ -24,13 +24,13 @@ {# If this is not an imported layer then hide the edit ui #} {% if not layerversion.layer_source_id or layerversion.layer_source.sourcetype != layerversion.layer_source.TYPE_IMPORTED %} <style scoped> - .glyphicon glyphicon-pencil { + .icon-pencil { display:none; } .delete-current-value{ display: none; } - li .glyphicon glyphicon-trash { + li .icon-trash { display:none; } .add-deps { @@ -105,7 +105,7 @@ </button> {% else %} <button id="add-remove-layer-btn" data-directive="remove" class="btn btn-block btn-lg btn-danger"> - <span class="glyphicon glyphicon-trash"></span> + <span class="icon-trash"></span> Remove the {{layerversion.layer.name}} layer from your project </button> {% endif %} @@ -130,7 +130,7 @@ <a href="#" style="display:none" class="btn btn-link cancel">Cancel</a> </div> </form> - <i class="glyphicon glyphicon-pencil" ></i> + <i class="icon-pencil" ></i> </dd> <dt> <i class="icon-question-sign get-help" title="Subdirectory within the repository where the layer is located, if not in the root (usually only used if the repository contains more than one layer)"></i> @@ -149,8 +149,8 @@ <a href="#" style="display:none" class="btn btn-link cancel">Cancel</a> </div> </form> - <i id="change-subdir" class="glyphicon glyphicon-pencil"></i> - <span class="glyphicon glyphicon-trash delete-current-value" data-toggle="tooltip" title="Delete"></span> + <i id="change-subdir" class="icon-pencil"></i> + <span class="icon-trash delete-current-value" data-toggle="tooltip" title="Delete"></span> </dd> <dt> <i class="icon-question-sign get-help" title="The Git branch, tag or commit"></i> @@ -165,7 +165,7 @@ <a href="#" style="display:none" class="btn btn-link cancel">Cancel</a> </div> </form> - <i class="glyphicon glyphicon-pencil"></i> + <i class="icon-pencil"></i> </dd> <dt> <i class="icon-question-sign get-help" title="Other layers this layer depends upon"></i> @@ -176,7 +176,7 @@ {% for ld in layerversion.dependencies.all %} <li data-layer-id="{{ld.depends_on.id}}"> <a data-toggle="tooltip" title="{{ld.depends_on.layer.vcs_url}} | {{ld.depends_on.get_vcs_reference}}" href="{% url 'layerdetails' project.id ld.depends_on.id %}">{{ld.depends_on.layer.name}}</a> - <span class="glyphicon glyphicon-trash " data-toggle="tooltip" title="Delete"></span> + <span class="icon-trash " data-toggle="tooltip" title="Delete"></span> </li> {% endfor %} </ul> @@ -244,8 +244,8 @@ <button class="btn change-btn" data-layer-prop="summary" type="button">Save</button> <a href="#" class="btn btn-link cancel">Cancel</a> </form> - <i class="glyphicon glyphicon-pencil"></i> - <span class="glyphicon glyphicon-trash delete-current-value" data-toggle="tooltip" title="Delete"></span> + <i class="icon-pencil"></i> + <span class="icon-trash delete-current-value" data-toggle="tooltip" title="Delete"></span> </dd> <dt> Description @@ -258,8 +258,8 @@ <button class="btn change-btn" data-layer-prop="description" type="button" >Save</button> <a href="#" class="btn btn-link cancel">Cancel</a> </form> - <i class="glyphicon glyphicon-pencil"></i> - <span class="glyphicon glyphicon-trash delete-current-value" data-toggle="tooltip" title="Delete"></span> + <i class="icon-pencil"></i> + <span class="icon-trash delete-current-value" data-toggle="tooltip" title="Delete"></span> </dd> {% if layerversion.layer.up_id %} <dt>Layer index</dt> diff --git a/bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html b/bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html index 40eff15..0c71c8a 100644 --- a/bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html +++ b/bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html @@ -18,7 +18,7 @@ display:none {% endif %} "> - <i class="glyphicon glyphicon-trash no-tooltip"></i> + <i class="icon-trash no-tooltip"></i> Remove package </button> <button class="btn btn-block add-rm-package-btn" data-directive="add" data-id="{{data.pk}}" data-package-url="{% url 'xhr_customrecipe_packages' extra.recipe_id data.pk %}" data-name="{{data.name}}" style=" diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html index cdcc83b..94c5a47 100644 --- a/bitbake/lib/toaster/toastergui/templates/project.html +++ b/bitbake/lib/toaster/toastergui/templates/project.html @@ -54,7 +54,7 @@ <div class="well well-transparent" id="machine-section"> <h3>Machine</h3> - <p class="lead"><span id="project-machine-name"></span> <i title="" data-original-title="" id="change-machine-toggle" class="glyphicon glyphicon-pencil"></i></p> + <p class="lead"><span id="project-machine-name"></span> <i title="" data-original-title="" id="change-machine-toggle" class="icon-pencil"></i></p> <form id="select-machine-form" style="display:none;"> <div class="alert alert-info"> @@ -90,7 +90,7 @@ <!-- Comment out the ability to change the project release, until we decide what to do with this functionality --> - <!--i title="" data-original-title="" id="release-change-toggle" class="glyphicon glyphicon-pencil"></i--> + <!--i title="" data-original-title="" id="release-change-toggle" class="icon-pencil"></i--> </p> <!-- Comment out the ability to change the project release, until we decide what to do with this functionality --> diff --git a/bitbake/lib/toaster/toastergui/templates/projectconf.html b/bitbake/lib/toaster/toastergui/templates/projectconf.html index 6f1a141..56d5c1f 100644 --- a/bitbake/lib/toaster/toastergui/templates/projectconf.html +++ b/bitbake/lib/toaster/toastergui/templates/projectconf.html @@ -17,7 +17,7 @@ </dt> <dd class="lead"> <span id="distro">{{distro}}</span> - <i class="glyphicon glyphicon-pencil" id="change-distro-icon"></i> + <i class="icon-pencil" id="change-distro-icon"></i> <form id="change-distro-form" style="display:none;"> <div class="input-append"> <span id="edit-distro-name-div" class="control-group"> @@ -38,7 +38,7 @@ </dt> <dd class="lead"> <span id="dl_dir"{% if dl_dir %}{%else%} class="muted"{%endif%}>{% if dl_dir %}{{dl_dir}}{%else%}Not set{%endif%}</span> - <i class="glyphicon glyphicon-pencil" id="change-dl_dir-icon"></i> + <i class="icon-pencil" id="change-dl_dir-icon"></i> <form id="change-dl_dir-form" style="display:none;"> <div class="row"> <span class="help-block col-md-4">To set DL_DIR type the absolute path of the download folder.</span> @@ -60,7 +60,7 @@ </dt> <dd class="lead"> <span id="image_fstypes">{{fstypes}}</span> - <i class="glyphicon glyphicon-pencil" id="change-image_fstypes-icon"></i> + <i class="icon-pencil" id="change-image_fstypes-icon"></i> <form id="change-image_fstypes-form" style="display:none;"> <label>Type the image types you want to build:</label> <div class="input-append" id="validate-image_fstypes"> @@ -84,8 +84,8 @@ </dt> <dd class="lead"> <span id="image_install"{% if image_install_append %}{%else%} class="muted"{%endif%}>{% if image_install_append %}{{image_install_append}}{%else%}Not set{%endif%}</span> - <i class="glyphicon glyphicon-pencil" id="change-image_install-icon"></i> - <i class="glyphicon glyphicon-trash" id="delete-image_install-icon" {% if image_install_append %}{%else%}style="display:none;"{%endif%}></i> + <i class="icon-pencil" id="change-image_install-icon"></i> + <i class="icon-trash" id="delete-image_install-icon" {% if image_install_append %}{%else%}style="display:none;"{%endif%}></i> <form id="change-image_install-form" style="display:none;"> <div class="row"> <span class="help-block col-md-4">To set IMAGE_INSTALL_append to more than one package, type the package names separated by a space.</span> @@ -106,7 +106,7 @@ </dt> <dd class="lead"> <span id="package_classes">{{package_classes}}</span> - <i id="change-package_classes-icon" class="glyphicon glyphicon-pencil"></i> + <i id="change-package_classes-icon" class="icon-pencil"></i> <form id="change-package_classes-form" style="display:none;"> <label> Root file system package format @@ -142,7 +142,7 @@ </dt> <dd class="lead"> <span id="sstate_dir"{% if sstate_dir %}{%else%} class="muted"{%endif%}>{% if sstate_dir %}{{sstate_dir}}{%else%}Not set{%endif%}</span> - <i class="glyphicon glyphicon-pencil" id="change-sstate_dir-icon"></i> + <i class="icon-pencil" id="change-sstate_dir-icon"></i> <form id="change-sstate_dir-form" style="display:none;"> <div class="row"> <span class="help-block col-md-4">To set SSTATE_DIR type the absolute path of the download folder.</span> @@ -420,10 +420,10 @@ } } if (var_context == undefined) { - orightml += '<div> <dt><span id="config_var_entry_'+configvars_sorted[i][2]+'" class="js-config-var-name"></span><i class="glyphicon glyphicon-trash js-icon-trash-config_var" id="config_var_trash_'+configvars_sorted[i][2]+'" x-data="'+configvars_sorted[i][2]+'"></i> </dt>' + orightml += '<div> <dt><span id="config_var_entry_'+configvars_sorted[i][2]+'" class="js-config-var-name"></span><i class="icon-trash js-icon-trash-config_var" id="config_var_trash_'+configvars_sorted[i][2]+'" x-data="'+configvars_sorted[i][2]+'"></i> </dt>' orightml += '<dd class="lead">' orightml += ' <span id="config_var_value_'+configvars_sorted[i][2]+'"></span>' - orightml += ' <i class="glyphicon glyphicon-pencil js-icon-pencil-config_var" x-data="'+configvars_sorted[i][2]+'"></i>' + orightml += ' <i class="icon-pencil js-icon-pencil-config_var" x-data="'+configvars_sorted[i][2]+'"></i>' orightml += ' <form id="change-config_var-form_'+configvars_sorted[i][2]+'" style="display:none;">' orightml += ' <div class="input-append">' orightml += ' <input type="text" class="input-xlarge js-new-config_var" id="new-config_var_'+configvars_sorted[i][2]+'" value="">' diff --git a/bitbake/lib/toaster/toastergui/templates/projecttopbar.html b/bitbake/lib/toaster/toastergui/templates/projecttopbar.html index 042599d..1cf59a5 100644 --- a/bitbake/lib/toaster/toastergui/templates/projecttopbar.html +++ b/bitbake/lib/toaster/toastergui/templates/projecttopbar.html @@ -27,7 +27,7 @@ <h1 id="project-name-container"> <span id="project-name">{{project.name}}</span> - <i class="glyphicon glyphicon-pencil" data-original-title="" id="project-change-form-toggle" title=""></i> + <i class="icon-pencil" data-original-title="" id="project-change-form-toggle" title=""></i> {% if project.is_default %} <i class="icon-question-sign get-help heading-help" title="" data-original-title="This project shows information about the builds you start from the command line while Toaster is running"></i> -- 1.9.1 -- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
