diff options
| author | Belen Barros Pena <belen.barros.pena@intel.com> | 2014-02-19 21:08:15 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-09 12:24:01 -0700 |
| commit | 0bad725381d0e09017a840d27bc1601edcd84a13 (patch) | |
| tree | 60bf7f49d9671d9c81de07417fd267a56f3669da | |
| parent | 4717749fd651e6983a31e3cefe3f210d2646ca87 (diff) | |
| download | poky-0bad725381d0e09017a840d27bc1601edcd84a13.tar.gz | |
bitbake: toaster: Move long content toggle to main.js
I have move all javascript needed for toggling very long
values for bitbake variables to main.js. I have changed the
names of the classes involved to make them more generic,
since I hope we'll be able to reuse them in other parts
of the Toaster interface.
.full-variable is now .full
.full-variable-hide is now full-hide
.full-variable-show is now full-show
I have also removed all the inline scripting in base.html, since
it is no longer needed.
(Bitbake rev: 73828f047385ced160c7900cad24535aa8d325cd)
Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | bitbake/lib/toaster/toastergui/static/js/main.js | 15 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/base.html | 52 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/configvars.html | 6 |
3 files changed, 18 insertions, 55 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/js/main.js b/bitbake/lib/toaster/toastergui/static/js/main.js index ce4f578112..c80f716edb 100644 --- a/bitbake/lib/toaster/toastergui/static/js/main.js +++ b/bitbake/lib/toaster/toastergui/static/js/main.js | |||
| @@ -75,4 +75,19 @@ $(document).ready(function() { | |||
| 75 | }); | 75 | }); |
| 76 | }); | 76 | }); |
| 77 | 77 | ||
| 78 | // toggle for long content (variables, python stack trace, etc) | ||
| 79 | $('.full, .full-hide').hide(); | ||
| 80 | $('.full-show').click(function(){ | ||
| 81 | $('.full').slideDown(function(){ | ||
| 82 | $('.full-hide').show(); | ||
| 83 | }); | ||
| 84 | $(this).hide(); | ||
| 85 | }); | ||
| 86 | $('.full-hide').click(function(){ | ||
| 87 | $(this).hide(); | ||
| 88 | $('.full').slideUp(function(){ | ||
| 89 | $('.full-show').show(); | ||
| 90 | }); | ||
| 91 | }); | ||
| 92 | |||
| 78 | }); | 93 | }); |
diff --git a/bitbake/lib/toaster/toastergui/templates/base.html b/bitbake/lib/toaster/toastergui/templates/base.html index 96f093f627..16a1812789 100644 --- a/bitbake/lib/toaster/toastergui/templates/base.html +++ b/bitbake/lib/toaster/toastergui/templates/base.html | |||
| @@ -49,58 +49,6 @@ function reload_params(params) { | |||
| 49 | } | 49 | } |
| 50 | </script> | 50 | </script> |
| 51 | 51 | ||
| 52 | <script> | ||
| 53 | $(document).ready(function() { | ||
| 54 | //show or hide selected columns on load | ||
| 55 | $("input:checkbox").each(function(){ | ||
| 56 | var selectedType = $(this).val(); | ||
| 57 | if($(this).is(":checked")){ | ||
| 58 | $("."+selectedType).show(); | ||
| 59 | } | ||
| 60 | else{ | ||
| 61 | $("."+selectedType).hide(); | ||
| 62 | } | ||
| 63 | }); | ||
| 64 | //edit columns functionality (show / hide table columns) | ||
| 65 | $("input:checkbox").change(); | ||
| 66 | $("input:checkbox").change(function(){ | ||
| 67 | var selectedType = $(this).val(); | ||
| 68 | if($(this).is(":checked")){ | ||
| 69 | $("."+selectedType).show(); | ||
| 70 | } | ||
| 71 | else{ | ||
| 72 | $("."+selectedType).hide(); | ||
| 73 | } | ||
| 74 | }); | ||
| 75 | //turn edit columns dropdown into a multi-select menu | ||
| 76 | $('.dropdown-menu input, .dropdown-menu label').click(function(e) { | ||
| 77 | e.stopPropagation(); | ||
| 78 | }); | ||
| 79 | //show help information inside modal dialogs | ||
| 80 | $("#filter-variables i").tooltip({ html: true, delay: {show: 500} }); | ||
| 81 | //show applied filter tooltip | ||
| 82 | $('.filtered').tooltip({container:'body', placement:'bottom', delay:{hide:1500}, html:true}); | ||
| 83 | //hide the applied filter tooltip when you click the filter button | ||
| 84 | $('.btn-primary').on('click', function () { | ||
| 85 | $('.tooltip').hide(); | ||
| 86 | }); | ||
| 87 | |||
| 88 | $('.full-variable, .full-variable-hide').hide(); | ||
| 89 | $('.full-variable-show').click(function(){ | ||
| 90 | $('.full-variable').slideDown(function(){ | ||
| 91 | $('.full-variable-hide').show(); | ||
| 92 | }); | ||
| 93 | $(this).hide(); | ||
| 94 | }); | ||
| 95 | $('.full-variable-hide').click(function(){ | ||
| 96 | $(this).hide(); | ||
| 97 | $('.full-variable').slideUp(function(){ | ||
| 98 | $('.full-variable-show').show(); | ||
| 99 | }); | ||
| 100 | }); | ||
| 101 | }); | ||
| 102 | </script> | ||
| 103 | |||
| 104 | </head> | 52 | </head> |
| 105 | 53 | ||
| 106 | <body style="height: 100%"> | 54 | <body style="height: 100%"> |
diff --git a/bitbake/lib/toaster/toastergui/templates/configvars.html b/bitbake/lib/toaster/toastergui/templates/configvars.html index cd41cca7e5..ecd5a0f3d8 100644 --- a/bitbake/lib/toaster/toastergui/templates/configvars.html +++ b/bitbake/lib/toaster/toastergui/templates/configvars.html | |||
| @@ -73,12 +73,12 @@ | |||
| 73 | <h4>{{variable.variable_name}} value is:</h4> | 73 | <h4>{{variable.variable_name}} value is:</h4> |
| 74 | <p> | 74 | <p> |
| 75 | <span>{{variable.variable_value|string_slice:':570'}} | 75 | <span>{{variable.variable_value|string_slice:':570'}} |
| 76 | <span class="full-variable"> {{variable.variable_value|string_slice:'570:'}} | 76 | <span class="full"> {{variable.variable_value|string_slice:'570:'}} |
| 77 | </span> | 77 | </span> |
| 78 | <a class="btn btn-mini full-variable-show">...</a> | 78 | <a class="btn btn-mini full-show">...</a> |
| 79 | </span> | 79 | </span> |
| 80 | </p> | 80 | </p> |
| 81 | <a class="btn btn-mini full-variable-hide">Collapse variable value<i class="icon-caret-up"></i> | 81 | <a class="btn btn-mini full-hide">Collapse variable value<i class="icon-caret-up"></i> |
| 82 | </a> | 82 | </a> |
| 83 | {% endif %} | 83 | {% endif %} |
| 84 | {% else %} | 84 | {% else %} |