- Kimchi-devel - oVirt List Archives

[PATCH V2] [Wok] Use correct gettext package for building
by Lucio Correia 16 Dec '15

16 Dec '15

The correct gettext package needs to be installed in each distro in order autogen does not show the following error messages: warning: macro 'AM_GNU_GETTEXT' not found in library warning: macro 'AM_GNU_GETTEXT_VERSION' not found in library Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- contrib/DEBIAN/control.in | 1 + contrib/wok.spec.fedora.in | 1 + contrib/wok.spec.suse.in | 1 + docs/README.md | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index 185b187..9105ea6 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -16,6 +16,7 @@ Depends: python-cherrypy3 (>= 3.2.0), fonts-font-awesome, texlive-fonts-extra Build-Depends: xsltproc, + gettext, openssl, python-lxml, pkg-config, diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in index ff7589d..a73ca76 100644 --- a/contrib/wok.spec.fedora.in +++ b/contrib/wok.spec.fedora.in @@ -19,6 +19,7 @@ Requires: python-ldap Requires: python-psutil >= 0.6.0 Requires: fontawesome-fonts Requires: open-sans-fonts +BuildRequires: gettext-devel BuildRequires: libxslt BuildRequires: openssl BuildRequires: python-lxml diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in index 192163b..a13c154 100644 --- a/contrib/wok.spec.suse.in +++ b/contrib/wok.spec.suse.in @@ -20,6 +20,7 @@ Requires: nginx Requires: python-psutil >= 0.6.0 Requires: fontawesome-fonts Requires: google-opensans-fonts +BuildRequires: gettext-tools BuildRequires: libxslt-tools BuildRequires: openssl BuildRequires: python-lxml diff --git a/docs/README.md b/docs/README.md index 1965960..5a2e7c5 100644 --- a/docs/README.md +++ b/docs/README.md @@ -49,7 +49,7 @@ Install Dependencies **For Fedora and RHEL:** - $ sudo yum install gcc make autoconf automake gettext git \ + $ sudo yum install gcc make autoconf automake gettext-devel git \ python-cherrypy python-cheetah python-imaging\ PyPAM m2crypto python-jsonschema rpm-build \ python-psutil python-ldap python-lxml \ -- 1.9.1

3 2

[PATCH V2] [Kimchi] Use correct gettext package for building
by Lucio Correia 16 Dec '15

16 Dec '15

The correct gettext package needs to be installed in each distro in order autogen does not show the following error messages: warning: macro 'AM_GNU_GETTEXT' not found in library warning: macro 'AM_GNU_GETTEXT_VERSION' not found in library Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- contrib/DEBIAN/control.in | 1 + contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + docs/README.md | 6 +++--- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index 40e7727..a023455 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -27,6 +27,7 @@ Depends: wok, spice-html5, python-magic Build-Depends: xsltproc, + gettext, python-lxml, python-dev, python-pip diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index ebf102c..a28ddab 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -30,6 +30,7 @@ Requires: iscsi-initiator-utils Requires: python-libguestfs Requires: libguestfs-tools Requires: python-magic +BuildRequires: gettext-devel BuildRequires: libxslt BuildRequires: python-lxml BuildRequires: python-devel diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index 3cec7f4..f2f2880 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -30,6 +30,7 @@ Requires: open-iscsi Requires: python-libguestfs Requires: guestfs-tools Requires: python-magic +BuildRequires: gettext-tools BuildRequires: libxslt-tools BuildRequires: python-lxml BuildRequires: python-devel diff --git a/docs/README.md b/docs/README.md index bdfbd81..dc58556 100644 --- a/docs/README.md +++ b/docs/README.md @@ -48,7 +48,7 @@ Install Dependencies **For fedora and RHEL:** - $ sudo yum install wok libvirt-python libvirt \ + $ sudo yum install wok libvirt-python libvirt gettext-devel \ libvirt-daemon-config-network python-imaging \ qemu-kvm python-ethtool sos python-ipaddr \ nfs-utils iscsi-initiator-utils pyparted \ @@ -81,14 +81,14 @@ channel at RHN Classic or Red Hat Satellite. qemu-kvm python-parted python-ethtool sosreport \ xsltproc python-ipaddr python-lxml open-iscsi \ python-guestfs libguestfs-tools spice-html5 \ - python-magic python-paramiko \ + python-magic python-paramiko gettext \ # These dependencies are only required if you want to run the tests: $ sudo apt-get install pep8 pyflakes python-requests python-mock **For openSUSE:** - $ sudo zypper install wok libvirt-python libvirt \ + $ sudo zypper install wok libvirt-python libvirt gettext-tools \ libvirt-daemon-config-network python-imaging \ kvm python-ethtool python-ipaddr nfs-client \ open-iscsi python-parted python-libguestfs \ -- 1.9.1

3 2

[PATCH] Page not found error handling for tab-ext.xml
by atreyee＠linux.vnet.ibm.com 16 Dec '15

16 Dec '15

From: Atreyee Mukhopadhyay <atreyee(a)linux.vnet.ibm.com> *** BLURB HERE *** Atreyee Mukhopadhyay (1): Page not found error handling for tab-ext.xml ui/js/src/wok.main.js | 5 +++++ 1 file changed, 5 insertions(+) -- 2.1.0

2 2

[PATCH] [Wok] Page not found error handling for tab-ext.xml
by atreyee＠linux.vnet.ibm.com 16 Dec '15

16 Dec '15

From: Atreyee Mukhopadhyay <atreyee(a)linux.vnet.ibm.com> Changes for handling page not found error of tab-ext.xml for plugins not having UI tabs. Atreyee Mukhopadhyay (1): Page not found error handling for tab-ext.xml ui/js/src/wok.main.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.1.0

2 3

[PATCH] Issue #795 : Jquery-bootgrid plugin js file issue.
by atreyee＠linux.vnet.ibm.com 15 Dec '15

15 Dec '15

From: Atreyee Mukhopadhyay <atreyee(a)linux.vnet.ibm.com> While loading the page Jquery-bootgrid plugin library file jquery.bootgrid.min.js is showing javascript error. Relacing the plugin file with the correct library file. --- ui/libs/jquery-bootgrid/dist/js/jquery.bootgrid.min.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/libs/jquery-bootgrid/dist/js/jquery.bootgrid.min.js b/ui/libs/jquery-bootgrid/dist/js/jquery.bootgrid.min.js index 8841266..0d534cb 100644 --- a/ui/libs/jquery-bootgrid/dist/js/jquery.bootgrid.min.js +++ b/ui/libs/jquery-bootgrid/dist/js/jquery.bootgrid.min.js @@ -1,6 +1,6 @@ -/*! +/*! * jQuery Bootgrid v1.3.1 - 09/11/2015 * Copyright (c) 2014-2015 Rafael Staib (http://www.jquery-bootgrid.com) * Licensed under MIT http://www.opensource.org/licenses/MIT */ -!function(a,b,c){"use strict";function d(a){function b(b){return c.identifier&&b[c.identifier]===a[c.identifier]}var c=this;return this.rows.contains(b)?!1:(this.rows.push(a),!0)}function e(b){var c=this.footer?this.footer.find(b):a(),d=this.header?this.header.find(b):a();return a.merge(c,d)}function f(b){return b?a.extend({},this.cachedParams,{ctx:b}):this.cachedParams}function g(){var b={current:this.current,rowCount:this.rowCount,sort:this.sortDictionary,searchPhrase:this.searchPhrase},c=this.options.post;return c=a.isFunction(c)?c():c,this.options.requestHandler(a.extend(!0,b,c))}function h(b){return"."+a.trim(b).replace(/\s+/gm,".")}function i(){var b=this.options.url;return a.isFunction(b)?b():b}function j(){this.element.trigger("initialize"+H),m.call(this),this.selection=this.options.selection&&null!=this.identifier,o.call(this),q.call(this),C.call(this),A.call(this),r.call(this),n.call(this),this.element.trigger("initialized"+H)}function k(a){this.options.highlightR! +!function(a,b,c){"use strict";function d(a){function b(b){return c.identifier&&b[c.identifier]===a[c.identifier]}var c=this;return this.rows.contains(b)?!1:(this.rows.push(a),!0)}function e(b){var c=this.footer?this.footer.find(b):a(),d=this.header?this.header.find(b):a();return a.merge(c,d)}function f(b){return b?a.extend({},this.cachedParams,{ctx:b}):this.cachedParams}function g(){var b={current:this.current,rowCount:this.rowCount,sort:this.sortDictionary,searchPhrase:this.searchPhrase},c=this.options.post;return c=a.isFunction(c)?c():c,this.options.requestHandler(a.extend(!0,b,c))}function h(b){return"."+a.trim(b).replace(/\s+/gm,".")}function i(){var b=this.options.url;return a.isFunction(b)?b():b}function j(){this.element.trigger("initialize"+H),m.call(this),this.selection=this.options.selection&&null!=this.identifier,o.call(this),q.call(this),C.call(this),A.call(this),r.call(this),n.call(this),this.element.trigger("initialized"+H)}function k(a){this.options.highlightR! ows}function l(a){return a.visible}function m(){var b=this,c=this.element.find("thead > tr").first(),d=!1;c.children().each(function(){var c=a(this),e=c.data(),f={id:e.columnId,identifier:null==b.identifier&&e.identifier||!1,converter:b.options.converters[e.converter||e.type]||b.options.converters.string,text:c.text(),align:e.align||"left",headerAlign:e.headerAlign||"left",cssClass:e.cssClass||"",headerCssClass:e.headerCssClass||"",formatter:b.options.formatters[e.formatter]||null,order:d||"asc"!==e.order&&"desc"!==e.order?null:e.order,searchable:!(e.searchable===!1),sortable:!(e.sortable===!1),visible:!(e.visible===!1),visibleInSelection:!(e.visibleInSelection===!1),width:a.isNumeric(e.width)?e.width+"px":"string"==typeof e.width?e.width:null};b.columns.push(f),null!=f.order&&(b.sortDictionary[f.id]=f.order),f.identifier&&(b.identifier=f.id,b.converter=f.converter),b.options.multiSort||null===f.order||(d=!0)})}function n(){function c(a){for(var b,c=new RegExp(e.searchPhras! e,e.options.caseSensitive?"g":"gi"),d=0;d<e.columns.length;d++)if(b=e.columns[d],b.searchable&&b.visible&&b.converter.to(a[b.id]).search(c)>-1)return!0;return!1}function d(a,b){e.currentRows=a,p.call(e,b),e.options.keepSelection||(e.selectedRows=[]),y.call(e,a),t.call(e),v.call(e),e.element._bgBusyAria(!1).trigger("loaded"+H)}var e=this;if(this.element._bgBusyAria(!0).trigger("load"+H),F.call(this),this.options.ajax){var f=g.call(this),h=i.call(this);if(null==h||"string"!=typeof h||0===h.length)throw new Error("Url setting must be a none empty string or a function that returns one.");this.xqr&&this.xqr.abort();var j={url:h,data:f,success:function(b){e.xqr=null,"string"==typeof b&&(b=a.parseJSON(b)),b=e.options.responseHandler(b),e.current=b.current,d(b.rows,b.total)},error:function(a,b,c){e.xqr=null,"abort"!==b&&(u.call(e),e.element._bgBusyAria(!1).trigger("loaded"+H))}};j=a.extend(this.options.ajaxSettings,j),this.xqr=a.ajax(j)}else{var k=this.searchPhrase.length>0?this.ro! ws.where(c):this.rows,l=k.length;-1!==this.rowCount&&(k=k.page(this.cur! rent,this.rowCount)),b.setTimeout(function(){d(k,l)},10)}}function o(){if(!this.options.ajax){var b=this,c=this.element.find("tbody > tr");c.each(function(){var c=a(this),e=c.children("td"),f={};a.each(b.columns,function(a,b){f[b.id]=b.converter.from(e.eq(a).text())}),d.call(b,f)}),p.call(this,this.rows.length),G.call(this)}}function p(a){this.total=a,this.totalPages=-1===this.rowCount?1:Math.ceil(this.total/this.rowCount)}function q(){var b=this.options.templates,c=this.element.parent().hasClass(this.options.css.responsiveTable)?this.element.parent():this.element;this.element.addClass(this.options.css.table),0===this.element.children("tbody").length&&this.element.append(b.body),1&this.options.navigation&&(this.header=a(b.header.resolve(f.call(this,{id:this.element._bgId()+"-header"}))),c.before(this.header)),2&this.options.navigation&&(this.footer=a(b.footer.resolve(f.call(this,{id:this.element._bgId()+"-footer"}))),c.after(this.footer))}function r(){if(0!==this.options.na! vigation){var b=this.options.css,c=h(b.actions),d=e.call(this,c);if(d.length>0){var g=this,i=this.options.templates,j=a(i.actions.resolve(f.call(this)));if(this.options.ajax){var k=i.icon.resolve(f.call(this,{iconCss:b.iconRefresh})),l=a(i.actionButton.resolve(f.call(this,{content:k,text:this.options.labels.refresh}))).on("click"+H,function(a){a.stopPropagation(),g.current=1,n.call(g)});j.append(l)}x.call(this,j),s.call(this,j),E.call(this,d,j)}}}function s(b){if(this.options.columnSelection&&this.columns.length>1){var c=this,d=this.options.css,e=this.options.templates,g=e.icon.resolve(f.call(this,{iconCss:d.iconColumns})),i=a(e.actionDropDown.resolve(f.call(this,{content:g}))),j=h(d.dropDownItem),k=h(d.dropDownItemCheckbox),m=h(d.dropDownMenuItems);a.each(this.columns,function(b,g){if(g.visibleInSelection){var o=a(e.actionDropDownCheckboxItem.resolve(f.call(c,{name:g.id,label:g.text,checked:g.visible}))).on("click"+H,j,function(b){b.stopPropagation();var d=a(this),e=d.find! (k);if(!e.prop("disabled")){g.visible=e.prop("checked");var f=c.columns! .where(l).length>1;d.parents(m).find(j+":has("+k+":checked)")._bgEnableAria(f).find(k)._bgEnableField(f),c.element.find("tbody").empty(),C.call(c),n.call(c)}});i.find(h(d.dropDownMenuItems)).append(o)}}),b.append(i)}}function t(){if(0!==this.options.navigation){var b=h(this.options.css.infos),c=e.call(this,b);if(c.length>0){var d=this.current*this.rowCount,g=a(this.options.templates.infos.resolve(f.call(this,{end:0===this.total||-1===d||d>this.total?this.total:d,start:0===this.total?0:d-this.rowCount+1,total:this.total})));E.call(this,c,g)}}}function u(){var a=this.element.children("tbody").first(),b=this.options.templates,c=this.columns.where(l).length;this.selection&&(c+=1),a.html(b.noResults.resolve(f.call(this,{columns:c})))}function v(){if(0!==this.options.navigation){var b=h(this.options.css.pagination),c=e.call(this,b)._bgShowAria(-1!==this.rowCount);if(-1!==this.rowCount&&c.length>0){var d=this.options.templates,g=this.current,i=this.totalPages,j=a(d.pagination.reso! lve(f.call(this))),k=i-g,l=-1*(this.options.padding-g),m=k>=this.options.padding?Math.max(l,1):Math.max(l-this.options.padding+k,1),n=2*this.options.padding+1,o=i>=n?n:i;w.call(this,j,"first","«","first")._bgEnableAria(g>1),w.call(this,j,"prev","<","prev")._bgEnableAria(g>1);for(var p=0;o>p;p++){var q=p+m;w.call(this,j,q,q,"page-"+q)._bgEnableAria()._bgSelectAria(q===g)}0===o&&w.call(this,j,1,1,"page-1")._bgEnableAria(!1)._bgSelectAria(),w.call(this,j,"next",">","next")._bgEnableAria(i>g),w.call(this,j,"last","»","last")._bgEnableAria(i>g),E.call(this,c,j)}}}function w(b,c,d,e){var g=this,i=this.options.templates,j=this.options.css,k=f.call(this,{css:e,text:d,page:c}),l=a(i.paginationItem.resolve(k)).on("click"+H,h(j.paginationButton),function(b){b.stopPropagation(),b.preventDefault();var c=a(this),d=c.parent();if(!d.hasClass("active")&&!d.hasClass("disabled")){var e={first:1,prev:g.current-1,next:g.current+1,last:g.totalPages},f=c.data("page");g.current=e! [f]||f,n.call(g)}c.trigger("blur")});return b.append(l),l}function x(b)! {function c(a){return-1===a?d.options.labels.all:a}var d=this,e=this.options.rowCount;if(a.isArray(e)){var g=this.options.css,i=this.options.templates,j=a(i.actionDropDown.resolve(f.call(this,{content:c(this.rowCount)}))),k=h(g.dropDownMenu),l=h(g.dropDownMenuText),m=h(g.dropDownMenuItems),o=h(g.dropDownItemButton);a.each(e,function(b,e){var g=a(i.actionDropDownItem.resolve(f.call(d,{text:c(e),action:e})))._bgSelectAria(e===d.rowCount).on("click"+H,o,function(b){b.preventDefault();var e=a(this),f=e.data("action");f!==d.rowCount&&(d.current=1,d.rowCount=f,e.parents(m).children().each(function(){var b=a(this),c=b.find(o).data("action");b._bgSelectAria(c===f)}),e.parents(k).find(l).text(c(f)),n.call(d))});j.find(m).append(g)}),b.append(j)}}function y(b){if(b.length>0){var c=this,d=this.options.css,e=this.options.templates,g=this.element.children("tbody").first(),i=!0,j="";a.each(b,function(b,g){var h="",k=' data-row-id="'+(null==c.identifier?b:g[c.identifier])+'"',l="";if(c.se! lection){var m=-1!==a.inArray(g[c.identifier],c.selectedRows),n=e.select.resolve(f.call(c,{type:"checkbox",value:g[c.identifier],checked:m}));h+=e.cell.resolve(f.call(c,{content:n,css:d.selectCell})),i=i&&m,m&&(l+=d.selected,k+=' aria-selected="true"')}var o=null!=g.status&&c.options.statusMapping[g.status];o&&(l+=o),a.each(c.columns,function(b,i){if(i.visible){var j=a.isFunction(i.formatter)?i.formatter.call(c,i,g):i.converter.to(g[i.id]),k=i.cssClass.length>0?" "+i.cssClass:"";h+=e.cell.resolve(f.call(c,{content:null==j||""===j?" ":j,css:("right"===i.align?d.right:"center"===i.align?d.center:d.left)+k,style:null==i.width?"":"width:"+i.width+";"}))}}),l.length>0&&(k+=' class="'+l+'"'),j+=e.row.resolve(f.call(c,{attr:k,cells:h}))}),c.element.find("thead "+h(c.options.css.selectBox)).prop("checked",i),g.html(j),z.call(this,g)}else u.call(this)}function z(b){var c=this,d=h(this.options.css.selectBox);this.selection&&b.off("click"+H,d).on("click"+H,d,function(b){b.stopPro! pagation();var d=a(this),e=c.converter.from(d.val());d.prop("checked")?! c.select([e]):c.deselect([e])}),b.off("click"+H,"> tr").on("click"+H,"> tr",function(b){b.stopPropagation();var d=a(this),e=null==c.identifier?d.data("row-id"):c.converter.from(d.data("row-id")+""),f=null==c.identifier?c.currentRows[e]:c.currentRows.first(function(a){return a[c.identifier]===e});c.selection&&c.options.rowSelect&&(d.hasClass(c.options.css.selected)?c.deselect([e]):c.select([e])),c.element.trigger("click"+H,[c.columns,f])})}function A(){if(0!==this.options.navigation){var c=this.options.css,d=h(c.search),g=e.call(this,d);if(g.length>0){var i=this,j=this.options.templates,k=null,l="",m=h(c.searchField),n=a(j.search.resolve(f.call(this))),o=n.is(m)?n:n.find(m);o.on("keyup"+H,function(c){c.stopPropagation();var d=a(this).val();(l!==d||13===c.which&&""!==d)&&(l=d,(13===c.which||0===d.length||d.length>=i.options.searchSettings.characters)&&(b.clearTimeout(k),k=b.setTimeout(function(){B.call(i,d)},i.options.searchSettings.delay)))}),E.call(this,g,n)}}}function B(a)! {this.searchPhrase!==a&&(this.current=1,this.searchPhrase=a,n.call(this))}function C(){var b=this,c=this.element.find("thead > tr"),d=this.options.css,e=this.options.templates,g="",i=this.options.sorting;if(this.selection){var j=this.options.multiSelect?e.select.resolve(f.call(b,{type:"checkbox",value:"all"})):"";g+=e.rawHeaderCell.resolve(f.call(b,{content:j,css:d.selectCell}))}if(a.each(this.columns,function(a,c){if(c.visible){var h=b.sortDictionary[c.id],j=i&&h&&"asc"===h?d.iconUp:i&&h&&"desc"===h?d.iconDown:"",k=e.icon.resolve(f.call(b,{iconCss:j})),l=c.headerAlign,m=c.headerCssClass.length>0?" "+c.headerCssClass:"";g+=e.headerCell.resolve(f.call(b,{column:c,icon:k,sortable:i&&c.sortable&&d.sortable||"",css:("right"===l?d.right:"center"===l?d.center:d.left)+m,style:null==c.width?"":"width:"+c.width+";"}))}}),c.html(g),i){var k=h(d.sortable);c.off("click"+H,k).on("click"+H,k,function(c){c.preventDefault(),D.call(b,a(this)),G.call(b),n.call(b)})}if(this.selection&&this.op! tions.multiSelect){var l=h(d.selectBox);c.off("click"+H,l).on("click"+H! ,l,function(c){c.stopPropagation(),a(this).prop("checked")?b.select():b.deselect()})}}function D(a){var b=this.options.css,c=h(b.icon),d=a.data("column-id")||a.parents("th").first().data("column-id"),e=this.sortDictionary[d],f=a.find(c);if(this.options.multiSort||(a.parents("tr").first().find(c).removeClass(b.iconDown+" "+b.iconUp),this.sortDictionary={}),e&&"asc"===e)this.sortDictionary[d]="desc",f.removeClass(b.iconUp).addClass(b.iconDown);else if(e&&"desc"===e)if(this.options.multiSort){var g={};for(var i in this.sortDictionary)i!==d&&(g[i]=this.sortDictionary[i]);this.sortDictionary=g,f.removeClass(b.iconDown)}else this.sortDictionary[d]="asc",f.removeClass(b.iconDown).addClass(b.iconUp);else this.sortDictionary[d]="asc",f.addClass(b.iconUp)}function E(b,c){b.each(function(b,d){a(d).before(c.clone(!0)).remove()})}function F(){var a=this;b.setTimeout(function(){if("true"===a.element._bgAria("busy")){var b=a.options.templates,c=a.element.children("thead").first(),d=a.elem! ent.children("tbody").first(),e=d.find("tr > td").first(),g=a.element.height()-c.height()-(e.height()+20),h=a.columns.where(l).length;a.selection&&(h+=1),d.html(b.loading.resolve(f.call(a,{columns:h}))),-1!==a.rowCount&&g>0&&d.find("tr > td").css("padding","20px 0 "+g+"px")}},250)}function G(){function a(c,d,e){function f(a){return"asc"===h.order?a:-1*a}e=e||0;var g=e+1,h=b[e];return c[h.id]>d[h.id]?f(1):c[h.id]<d[h.id]?f(-1):b.length>g?a(c,d,g):0}var b=[];if(!this.options.ajax){for(var c in this.sortDictionary)(this.options.multiSort||0===b.length)&&b.push({id:c,order:this.sortDictionary[c]});b.length>0&&this.rows.sort(a)}}var H=".rs.jquery.bootgrid",I=function(b,c){this.element=a(b),this.origin=this.element.clone(),this.options=a.extend(!0,{},I.defaults,this.element.data(),c);var d=this.options.rowCount=this.element.data().rowCount||c.rowCount||this.options.rowCount;this.columns=[],this.current=1,this.currentRows=[],this.identifier=null,this.selection=!1,this.converter=nu! ll,this.rowCount=a.isArray(d)?d[0]:d,this.rows=[],this.searchPhrase="",! this.selectedRows=[],this.sortDictionary={},this.total=0,this.totalPages=0,this.cachedParams={lbl:this.options.labels,css:this.options.css,ctx:{}},this.header=null,this.footer=null,this.xqr=null};if(I.defaults={navigation:3,padding:2,columnSelection:!0,rowCount:[10,25,50,-1],selection:!1,multiSelect:!1,rowSelect:!1,keepSelection:!1,highlightRows:!1,sorting:!0,multiSort:!1,searchSettings:{delay:250,characters:1},ajax:!1,ajaxSettings:{method:"POST"},post:{},url:"",caseSensitive:!0,requestHandler:function(a){return a},responseHandler:function(a){return a},converters:{numeric:{from:function(a){return+a},to:function(a){return a+""}},string:{from:function(a){return a},to:function(a){return a}}},css:{actions:"actions btn-group",center:"text-center",columnHeaderAnchor:"column-header-anchor",columnHeaderText:"text",dropDownItem:"dropdown-item",dropDownItemButton:"dropdown-item-button",dropDownItemCheckbox:"dropdown-item-checkbox",dropDownMenu:"dropdown btn-group",dropDownMenuItems:"! dropdown-menu pull-right",dropDownMenuText:"dropdown-text",footer:"bootgrid-footer container-fluid",header:"bootgrid-header container-fluid",icon:"icon glyphicon",iconColumns:"glyphicon-th-list",iconDown:"glyphicon-chevron-down",iconRefresh:"glyphicon-refresh",iconSearch:"glyphicon-search",iconUp:"glyphicon-chevron-up",infos:"infos",left:"text-left",pagination:"pagination",paginationButton:"button",responsiveTable:"table-responsive",right:"text-right",search:"search form-group",searchField:"search-field form-control",selectBox:"select-box",selectCell:"select-cell",selected:"active",sortable:"sortable",table:"bootgrid-table table"},formatters:{},labels:{all:"All",infos:"Showing {{ctx.start}} to {{ctx.end}} of {{ctx.total}} entries",loading:"Loading...",noResults:"No results found!",refresh:"Refresh",search:"Search"},statusMapping:{0:"success",1:"info",2:"warning",3:"danger"},templates:{actionButton:'<button class="btn btn-default" type="button" title="{{ctx.text}}">{{ctx.con! tent}}</button>',actionDropDown:'<div class="{{css.dropDownMenu}}"><but! ton class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown"><span class="{{css.dropDownMenuText}}">{{ctx.content}}</span> <span class="caret"></span></button><ul class="{{css.dropDownMenuItems}}" role="menu"></ul></div>',actionDropDownItem:'<li><a data-action="{{ctx.action}}" class="{{css.dropDownItem}} {{css.dropDownItemButton}}">{{ctx.text}}</a></li>',actionDropDownCheckboxItem:'<li><label class="{{css.dropDownItem}}"><input name="{{ctx.name}}" type="checkbox" value="1" class="{{css.dropDownItemCheckbox}}" {{ctx.checked}} /> {{ctx.label}}</label></li>',actions:'<div class="{{css.actions}}"></div>',body:"<tbody></tbody>",cell:'<td class="{{ctx.css}}" style="{{ctx.style}}">{{ctx.content}}</td>',footer:'<div id="{{ctx.id}}" class="{{css.footer}}"><div class="row"><div class="col-sm-6"><p class="{{css.pagination}}"></p></div><div class="col-sm-6 infoBar"><p class="{{css.infos}}"></p></div></div></div>',header:'<div id="{{ctx.id}}" class="{{css.header}}"><! div class="row"><div class="col-sm-12 actionBar"><p class="{{css.search}}"></p><p class="{{css.actions}}"></p></div></div></div>',headerCell:'<th data-column-id="{{ctx.column.id}}" class="{{ctx.css}}" style="{{ctx.style}}"><a href="javascript:void(0);" class="{{css.columnHeaderAnchor}} {{ctx.sortable}}"><span class="{{css.columnHeaderText}}">{{ctx.column.text}}</span>{{ctx.icon}}</a></th>',icon:'<span class="{{css.icon}} {{ctx.iconCss}}"></span>',infos:'<div class="{{css.infos}}">{{lbl.infos}}</div>',loading:'<tr><td colspan="{{ctx.columns}}" class="loading">{{lbl.loading}}</td></tr>',noResults:'<tr><td colspan="{{ctx.columns}}" class="no-results">{{lbl.noResults}}</td></tr>',pagination:'<ul class="{{css.pagination}}"></ul>',paginationItem:'<li class="{{ctx.css}}"><a data-page="{{ctx.page}}" class="{{css.paginationButton}}">{{ctx.text}}</a></li>',rawHeaderCell:'<th class="{{ctx.css}}">{{ctx.content}}</th>',row:"<tr{{ctx.attr}}>{{ctx.cells}}</tr>",search:'<div class="{{css.s! earch}}"><div class="input-group"><span class="{{css.icon}} input-group! -addon {{css.iconSearch}}"></span> <input type="text" class="{{css.searchField}}" placeholder="{{lbl.search}}" /></div></div>',select:'<input name="select" type="{{ctx.type}}" class="{{css.selectBox}}" value="{{ctx.value}}" {{ctx.checked}} />'}},I.prototype.append=function(a){if(this.options.ajax);else{for(var b=[],c=0;c<a.length;c++)d.call(this,a[c])&&b.push(a[c]);G.call(this),k.call(this,b),n.call(this),this.element.trigger("appended"+H,[b])}return this},I.prototype.clear=function(){if(this.options.ajax);else{var b=a.extend([],this.rows);this.rows=[],this.current=1,this.total=0,n.call(this),this.element.trigger("cleared"+H,[b])}return this},I.prototype.destroy=function(){return a(b).off(H),1&this.options.navigation&&this.header.remove(),2&this.options.navigation&&this.footer.remove(),this.element.before(this.origin).remove(),this},I.prototype.reload=function(){return this.current=1,n.call(this),this},I.prototype.remove=function(a){if(null!=this.identifier){if(this.options! .ajax);else{a=a||this.selectedRows;for(var b,c=[],d=0;d<a.length;d++){b=a[d];for(var e=0;e<this.rows.length;e++)if(this.rows[e][this.identifier]===b){c.push(this.rows[e]),this.rows.splice(e,1);break}}this.current=1,n.call(this),this.element.trigger("removed"+H,[c])}}return this},I.prototype.search=function(a){if(a=a||"",this.searchPhrase!==a){var b=h(this.options.css.searchField),c=e.call(this,b);c.val(a)}return B.call(this,a),this},I.prototype.select=function(b){if(this.selection){b=b||this.currentRows.propValues(this.identifier);for(var c,d,e=[];b.length>0&&(this.options.multiSelect||1!==e.length);)if(c=b.pop(),-1===a.inArray(c,this.selectedRows))for(d=0;d<this.currentRows.length;d++)if(this.currentRows[d][this.identifier]===c){e.push(this.currentRows[d]),this.selectedRows.push(c);break}if(e.length>0){var f=h(this.options.css.selectBox),g=this.selectedRows.length>=this.currentRows.length;for(d=0;!this.options.keepSelection&&g&&d<this.currentRows.length;)g=-1!==a.inArray(t! his.currentRows[d++][this.identifier],this.selectedRows);for(this.eleme! nt.find("thead "+f).prop("checked",g),this.options.multiSelect||this.element.find("tbody > tr "+f+":checked").trigger("click"+H),d=0;d<this.selectedRows.length;d++)this.element.find('tbody > tr[data-row-id="'+this.selectedRows[d]+'"]').addClass(this.options.css.selected)._bgAria("selected","true").find(f).prop("checked",!0);this.element.trigger("selected"+H,[e])}}return this},I.prototype.deselect=function(b){if(this.selection){b=b||this.currentRows.propValues(this.identifier);for(var c,d,e,f=[];b.length>0;)if(c=b.pop(),e=a.inArray(c,this.selectedRows),-1!==e)for(d=0;d<this.currentRows.length;d++)if(this.currentRows[d][this.identifier]===c){f.push(this.currentRows[d]),this.selectedRows.splice(e,1);break}if(f.length>0){var g=h(this.options.css.selectBox);for(this.element.find("thead "+g).prop("checked",!1),d=0;d<f.length;d++)this.element.find('tbody > tr[data-row-id="'+f[d][this.identifier]+'"]').removeClass(this.options.css.selected)._bgAria("selected","false").find(g).prop(! "checked",!1);this.element.trigger("deselected"+H,[f])}}return this},I..prototype.sort=function(b){var c=b?a.extend({},b):{};return c===this.sortDictionary?this:(this.sortDictionary=c,C.call(this),G.call(this),n.call(this),this)},I.prototype.getColumnSettings=function(){return a.merge([],this.columns)},I.prototype.getCurrentPage=function(){return this.current},I.prototype.getCurrentRows=function(){return a.merge([],this.currentRows)},I.prototype.getRowCount=function(){return this.rowCount},I.prototype.getSearchPhrase=function(){return this.searchPhrase},I.prototype.getSelectedRows=function(){return a.merge([],this.selectedRows)},I.prototype.getSortDictionary=function(){return a.extend({},this.sortDictionary)},I.prototype.getTotalPageCount=function(){return this.totalPages},I.prototype.getTotalRowCount=function(){return this.total},a.fn.extend({_bgAria:function(a,b){return b?this.attr("aria-"+a,b):this.attr("aria-"+a)},_bgBusyAria:function(a){return null==a||a?this._bgAria("! busy","true"):this._bgAria("busy","false")},_bgRemoveAria:function(a){re! turn this.removeAttr("aria-"+a)},_bgEnableAria:function(a){return null==a||a?this.removeClass("disabled")._bgAria("disabled","false"):this.addClass("disabled")._bgAria("disabled","true")},_bgEnableField:function(a){return null==a||a?this.removeAttr("disabled"):this.attr("disabled","disable")},_bgShowAria:function(a){return null==a||a?this.show()._bgAria("hidden","false"):this.hide()._bgAria("hidden","true")},_bgSelectAria:function(a){return null==a||a?this.addClass("active")._bgAria("selected","true"):this.removeClass("active")._bgAria("selected","false")},_bgId:function(a){return a?this.attr("id",a):this.attr("id")}}),!String.prototype.resolve){var J={checked:function(a){return"boolean"==typeof a?a?'checked="checked"':"":a}};String.prototype.resolve=function(b,c){var d=this;return a.each(b,function(b,e){if(null!=e&&"function"!=typeof e)if("object"==typeof e){var f=c?a.extend([],c):[];f.push(b),d=d.resolve(e,f)+""}else{J&&J[b]&&"function"==typeof J[b]&&(e=J[b](e)),b=c?c.joi! n(".")+"."+b:b;var g=new RegExp("\\{\\{"+b+"\\}\\}","gm");d=d.replace(g,e.replace?e.replace(/\$/gi,"$"):e)}}),d}}Array.prototype.first||(Array.prototype.first=function(a){for(var b=0;b<this.length;b++){var c=this[b];if(a(c))return c}return null}),Array.prototype.contains||(Array.prototype.contains=function(a){for(var b=0;b<this.length;b++){var c=this[b];if(a(c))return!0}return!1}),Array.prototype.page||(Array.prototype.page=function(a,b){var c=(a-1)*b,d=c+b;return this.length>c?this.length>d?this.slice(c,d):this.slice(c):[]}),Array.prototype.where||(Array.prototype.where=function(a){for(var b=[],c=0;c<this.length;c++){var d=this[c];a(d)&&b.push(d)}return b}),Array.prototype.propValues||(Array.prototype.propValues=function(a){for(var b=[],c=0;c<this.length;c++)b.push(this[c][a]);return b});var K=a.fn.bootgrid;a.fn.bootgrid=function(b){var c=Array.prototype.slice.call(arguments,1),d=null,e=this.each(function(e){var f=a(this),g=f.data(H),h="object"==typeof b&&b;if((g||"des! troy"!==b)&&(g||(f.data(H,g=new I(this,h)),j.call(g)),"string"==typeof ! b))if(0===b.indexOf("get")&&0===e)d=g[b].apply(g,c);else if(0!==b.indexOf("get"))return g[b].apply(g,c)});return"string"==typeof b&&0===b.indexOf("get")?d:e},a.fn.bootgrid.Constructor=I,a.fn.bootgrid.noConflict=function(){return a.fn.bootgrid=K,this},a('[data-toggle="bootgrid"]').bootgrid()}(jQuery,window); -- 2.1.0

3 5

[PATCH] [Kimchi] Issue 776: Adding filter on Guest screen
by sguimaraes943＠gmail.com 15 Dec '15

15 Dec '15

From: samhenri <samuel.guimaraes(a)eldorado.org.br> This patch adds Filter to Guests screen. samhenri (1): Issue 776: Adding filter on Guest screen ui/js/src/kimchi.guest_main.js | 56 +++++++++++++++++++++++++++++++++++++----- ui/pages/tabs/guests.html.tmpl | 32 ++++++++++++++---------- 2 files changed, 69 insertions(+), 19 deletions(-) -- 1.9.3

2 2

[PATCH] [Kimchi] Moved Kimchi SCSS files from Wok to Kimchi
by sguimaraes943＠gmail.com 15 Dec '15

15 Dec '15

From: samhenri <samuel.guimaraes(a)eldorado.org.br> Removed unused Kimchi files (mostly images) and added some SCSS files that were on Wok project to Kimchi. samhenri (1): Moved Kimchi SCSS files from Wok to Kimchi .gitignore | 1 + configure.ac | 1 - ui/css/Makefile.am | 11 +- ui/css/src/kimchi.scss | 43 +++ ui/css/src/modules/_edit-guests.scss | 367 ++++++++++++++++++++++ ui/css/src/modules/_guests.scss | 353 +++++++++++++++++++++ ui/css/src/modules/_iso-list.scss | 126 ++++++++ ui/css/src/modules/_network.scss | 121 ++++++++ ui/css/src/modules/_storage.scss | 390 ++++++++++++++++++++++++ ui/css/src/modules/_templates.scss | 315 +++++++++++++++++++ ui/css/theme-default/icon.css | 106 ------- ui/css/theme-default/storage.css | 52 ---- ui/images/Makefile.am | 2 - ui/images/theme-default/Makefile.am | 20 -- ui/images/theme-default/ac22_pause.png | Bin 1219 -> 0 bytes ui/images/theme-default/ac22_pause_grey.png | Bin 1175 -> 0 bytes ui/images/theme-default/ac24_resume.png | Bin 1341 -> 0 bytes ui/images/theme-default/ac24_resume_grey.png | Bin 1282 -> 0 bytes ui/images/theme-default/arrow-down-black.png | Bin 2942 -> 0 bytes ui/images/theme-default/arrow-down-disable.png | Bin 472 -> 0 bytes ui/images/theme-default/arrow-down.png | Bin 537 -> 0 bytes ui/images/theme-default/arrow-up.png | Bin 510 -> 0 bytes ui/images/theme-default/arrow_out.png | Bin 3048 -> 0 bytes ui/images/theme-default/group.png | Bin 1703 -> 0 bytes ui/images/theme-default/host-icon-sprite.png | Bin 1034 -> 0 bytes ui/images/theme-default/icon-back.png | Bin 244 -> 0 bytes ui/images/theme-default/icon-camera.png | Bin 4860 -> 0 bytes ui/images/theme-default/icon-design.png | Bin 4562 -> 0 bytes ui/images/theme-default/icon-detail.png | Bin 3079 -> 0 bytes ui/images/theme-default/icon-iso.png | Bin 4188 -> 0 bytes ui/images/theme-default/icon-list.png | Bin 2983 -> 0 bytes ui/images/theme-default/icon-load.png | Bin 3678 -> 0 bytes ui/images/theme-default/icon-local.png | Bin 425 -> 0 bytes ui/images/theme-default/icon-power-down.png | Bin 4372 -> 0 bytes ui/images/theme-default/icon-power-up.png | Bin 4367 -> 0 bytes ui/images/theme-default/icon-qcow2.png | Bin 4684 -> 0 bytes ui/images/theme-default/icon-raw.png | Bin 4679 -> 0 bytes ui/images/theme-default/icon-remote.png | Bin 1005 -> 0 bytes ui/images/theme-default/icon-reset.png | Bin 4576 -> 0 bytes ui/images/theme-default/icon-search.png | Bin 4197 -> 0 bytes ui/images/theme-default/icon-sort.png | Bin 3421 -> 0 bytes ui/images/theme-default/icon-tree.png | Bin 3526 -> 0 bytes ui/images/theme-default/icon-user.png | Bin 5366 -> 0 bytes ui/images/theme-default/icon-volume-default.png | Bin 4265 -> 0 bytes ui/images/theme-default/kimchi-loading15x15.gif | Bin 1653 -> 0 bytes ui/images/theme-default/loading.gif | Bin 2190 -> 0 bytes ui/images/theme-default/user.png | Bin 1322 -> 0 bytes ui/pages/guest-edit.html.tmpl | 5 + ui/pages/guest-storage-add.html.tmpl | 7 + ui/pages/network-add.html.tmpl | 4 + ui/pages/storagepool-add-volume.html.tmpl | 4 + ui/pages/storagepool-add.html.tmpl | 3 +- ui/pages/tabs/guests.html.tmpl | 4 +- ui/pages/tabs/network.html.tmpl | 3 +- ui/pages/tabs/storage.html.tmpl | 4 +- ui/pages/tabs/templates.html.tmpl | 1 + ui/pages/template-add.html.tmpl | 1 - ui/pages/template-edit.html.tmpl | 5 +- 58 files changed, 1753 insertions(+), 196 deletions(-) create mode 100644 ui/css/src/kimchi.scss create mode 100644 ui/css/src/modules/_edit-guests.scss create mode 100644 ui/css/src/modules/_guests.scss create mode 100644 ui/css/src/modules/_iso-list.scss create mode 100644 ui/css/src/modules/_network.scss create mode 100644 ui/css/src/modules/_storage.scss create mode 100644 ui/css/src/modules/_templates.scss delete mode 100644 ui/css/theme-default/icon.css delete mode 100644 ui/css/theme-default/storage.css delete mode 100644 ui/images/theme-default/Makefile.am delete mode 100644 ui/images/theme-default/ac22_pause.png delete mode 100644 ui/images/theme-default/ac22_pause_grey.png delete mode 100644 ui/images/theme-default/ac24_resume.png delete mode 100644 ui/images/theme-default/ac24_resume_grey.png delete mode 100644 ui/images/theme-default/arrow-down-black.png delete mode 100644 ui/images/theme-default/arrow-down-disable.png delete mode 100644 ui/images/theme-default/arrow-down.png delete mode 100644 ui/images/theme-default/arrow-up.png delete mode 100644 ui/images/theme-default/arrow_out.png delete mode 100644 ui/images/theme-default/group.png delete mode 100644 ui/images/theme-default/host-icon-sprite.png delete mode 100644 ui/images/theme-default/icon-back.png delete mode 100644 ui/images/theme-default/icon-camera.png delete mode 100644 ui/images/theme-default/icon-design.png delete mode 100644 ui/images/theme-default/icon-detail.png delete mode 100644 ui/images/theme-default/icon-iso.png delete mode 100644 ui/images/theme-default/icon-list.png delete mode 100644 ui/images/theme-default/icon-load.png delete mode 100644 ui/images/theme-default/icon-local.png delete mode 100644 ui/images/theme-default/icon-power-down.png delete mode 100644 ui/images/theme-default/icon-power-up.png delete mode 100644 ui/images/theme-default/icon-qcow2.png delete mode 100644 ui/images/theme-default/icon-raw.png delete mode 100644 ui/images/theme-default/icon-remote.png delete mode 100644 ui/images/theme-default/icon-reset.png delete mode 100644 ui/images/theme-default/icon-search.png delete mode 100644 ui/images/theme-default/icon-sort.png delete mode 100644 ui/images/theme-default/icon-tree.png delete mode 100644 ui/images/theme-default/icon-user.png delete mode 100644 ui/images/theme-default/icon-volume-default.png delete mode 100644 ui/images/theme-default/kimchi-loading15x15.gif delete mode 100644 ui/images/theme-default/loading.gif delete mode 100644 ui/images/theme-default/user.png -- 1.9.3

2 2

[PATCH] [Wok] Removed Kimchi references and SCSS files from Wok
by sguimaraes943＠gmail.com 15 Dec '15

15 Dec '15

From: samhenri <samuel.guimaraes(a)eldorado.org.br> This patch removes all the old Kimchi references from Wok. The removed files will be added to Kimchi in another patch. samhenri (1): Removed Kimchi references and SCSS files from Wok ui/css/src/modules/_edit-guests.scss | 367 -------------------------------- ui/css/src/modules/_guests.scss | 364 -------------------------------- ui/css/src/modules/_iso-list.scss | 126 ----------- ui/css/src/modules/_line-chart.scss | 210 ------------------- ui/css/src/modules/_loaders.scss | 10 + ui/css/src/modules/_network.scss | 121 ----------- ui/css/src/modules/_storage.scss | 391 ----------------------------------- ui/css/src/modules/_templates.scss | 315 ---------------------------- ui/css/src/modules/_utils.scss | 28 +++ ui/css/src/modules/_validation.scss | 17 ++ ui/css/src/wok.scss | 45 +--- ui/pages/wok-ui.html.tmpl | 2 +- 12 files changed, 59 insertions(+), 1937 deletions(-) delete mode 100644 ui/css/src/modules/_edit-guests.scss delete mode 100644 ui/css/src/modules/_guests.scss delete mode 100644 ui/css/src/modules/_iso-list.scss delete mode 100644 ui/css/src/modules/_line-chart.scss delete mode 100644 ui/css/src/modules/_network.scss delete mode 100644 ui/css/src/modules/_storage.scss delete mode 100644 ui/css/src/modules/_templates.scss create mode 100644 ui/css/src/modules/_utils.scss -- 1.9.3

2 2

[PATCH] [Kimchi] Update Kimchi objectstore versioning.
by pvital＠linux.vnet.ibm.com 15 Dec '15

15 Dec '15

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> This patch is part of the solution for the Ginger Issue #51 and it depends on Wok's "Upgrade objectstore schema" patch. With the new structure of the objectstore changed in Wok 2.0.0, the schema of the objectstore file needs to be checked and, if necessary, updated to reflect the new structure. This patch removes from Kimchi the methods used to check the objectstore schema and upgrade it if necessary. These methods are now present in wok.plugins and are common to any Wok plugin. Paulo Vital (1): Update Kimchi objectstore versioning. root.py | 4 ++-- utils.py | 40 ---------------------------------------- 2 files changed, 2 insertions(+), 42 deletions(-) -- 2.5.0

4 7

[PATCH] [Wok] Upgrade objectstore schema.
by pvital＠linux.vnet.ibm.com 15 Dec '15

15 Dec '15

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> This patch is part of the solution for the Ginger Issue #51 and it's a basic dependence for the following plugins' patches: + [Kimchi] Update Kimchi objectstore versioning. + [Ginger] Issue #51 - Update objectstores with 'Version' field. + [GingerBase] Issue #51 - Update objectstores with 'Version' field. With the new structure of the objectstore changed in Wok 2.0.0, the schema of the objectstore file (when used by any plugin) needs to be checked and, if necessary, updated to reflect the new structure. This patch adds to utils.py file some common methods to support the operations in the plugin's objectstore files. These methods were moved from Kimchi plugin since they will be used by other plugins to do the same. Paulo Vital (1): Upgrade objectstore schema. src/wok/utils.py | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) -- 2.5.0

3 3