All files under ui/js/widgets/ are not needed for the current UI implementation. So remove them. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com&gt; --- ui/js/Makefile.am | 4 +- ui/js/widgets/button-dropDown.js | 37 -- ui/js/widgets/button-flat.js | 421 --------------------- ui/js/widgets/checkbox-flat.js | 88 ----- ui/js/widgets/circleGauge.js | 102 ----- ui/js/widgets/combobox.js | 129 ------- ui/js/widgets/dialog-flat.js | 122 ------ ui/js/widgets/filter-select.js | 138 ------- ui/js/widgets/gauge-flat.js | 128 ------- ui/js/widgets/line.js | 74 ---- ui/js/widgets/list-flat.js | 78 ---- ui/js/widgets/menu-flat.js | 116 ------ ui/js/widgets/message-flat.js | 99 ----- ui/js/widgets/messagebar-flat.js | 73 ---- ui/js/widgets/radio-flat.js | 88 ----- ui/js/widgets/samples/README.md | 1 - ui/js/widgets/samples/dialog.html | 53 --- ui/js/widgets/samples/gauge-flat.html | 55 --- ui/js/widgets/samples/grid.html | 82 ---- ui/js/widgets/samples/line.html | 170 --------- ui/js/widgets/samples/list.html | 48 --- .../menu-button-radio-checkbox-text-select.html | 104 ----- ui/js/widgets/samples/message.html | 51 --- ui/js/widgets/samples/messagebar-flat.html | 51 --- ui/js/widgets/samples/tabs.html | 70 ---- ui/js/widgets/select-menu.js | 86 ----- ui/js/widgets/selectmenu-flat.js | 132 ------- ui/js/widgets/textbox-flat.js | 41 -- 28 files changed, 2 insertions(+), 2639 deletions(-) delete mode 100644 ui/js/widgets/button-dropDown.js delete mode 100755 ui/js/widgets/button-flat.js delete mode 100644 ui/js/widgets/checkbox-flat.js delete mode 100644 ui/js/widgets/circleGauge.js delete mode 100644 ui/js/widgets/combobox.js delete mode 100644 ui/js/widgets/dialog-flat.js delete mode 100644 ui/js/widgets/filter-select.js delete mode 100755 ui/js/widgets/gauge-flat.js delete mode 100644 ui/js/widgets/line.js delete mode 100644 ui/js/widgets/list-flat.js delete mode 100644 ui/js/widgets/menu-flat.js delete mode 100644 ui/js/widgets/message-flat.js delete mode 100644 ui/js/widgets/messagebar-flat.js delete mode 100644 ui/js/widgets/radio-flat.js delete mode 100644 ui/js/widgets/samples/README.md delete mode 100644 ui/js/widgets/samples/dialog.html delete mode 100644 ui/js/widgets/samples/gauge-flat.html delete mode 100644 ui/js/widgets/samples/grid.html delete mode 100644 ui/js/widgets/samples/line.html delete mode 100644 ui/js/widgets/samples/list.html delete mode 100644 ui/js/widgets/samples/menu-button-radio-checkbox-text-select.html delete mode 100644 ui/js/widgets/samples/message.html delete mode 100644 ui/js/widgets/samples/messagebar-flat.html delete mode 100644 ui/js/widgets/samples/tabs.html delete mode 100644 ui/js/widgets/select-menu.js delete mode 100644 ui/js/widgets/selectmenu-flat.js delete mode 100644 ui/js/widgets/textbox-flat.js diff --git a/ui/js/Makefile.am b/ui/js/Makefile.am index feaacb5..832365f 100644 --- a/ui/js/Makefile.am +++ b/ui/js/Makefile.am @@ -17,13 +17,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -EXTRA_DIST = src widgets +EXTRA_DIST = src jsdir = $(datadir)/wok/ui/js dist_js_DATA = wok.min.js $(filter-out wok.min.js, $(wildcard *.js)) -wok.min.js: widgets/*.js src/*.js +wok.min.js: src/*.js cat $(sort $^) > $@ CLEANFILES = wok.min.js diff --git a/ui/js/widgets/button-dropDown.js b/ui/js/widgets/button-dropDown.js deleted file mode 100644 index a4f20e9..0000000 --- a/ui/js/widgets/button-dropDown.js +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Project Wok - * - * Copyright IBM, Corp. 2014-2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -(function($) { - $.widget('wok.dropdownButton', { - - _create : function() { - this.actionDiv = this.element; - this.actionDiv.addClass('btn dropdown popable'); - this.actionDiv.find('div').addClass('popover'); - this.actionDiv.find('button').addClass('button-big'); - }, - - destroy : function() { - this.actionDiv.removeClass('btn dropdown popable'); - this.actionDiv.find('div').removeClass('popover'); - this.actionDiv.find('button').removeClass('button-big'); - $.Widget.prototype.destroy.call(this); - } - }); -}(jQuery)); diff --git a/ui/js/widgets/button-flat.js b/ui/js/widgets/button-flat.js deleted file mode 100755 index 12d1dc9..0000000 --- a/ui/js/widgets/button-flat.js +++ /dev/null @@ -1,421 +0,0 @@ -/* - * Project Wok - * - * Copyright IBM, Corp. 2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -(function( factory ) { - if ( typeof define === "function" && define.amd ) { - - // AMD. Register as an anonymous module. - define([ - "jquery", - "./core", - "./widget" - ], factory ); - } else { - - // Browser globals - factory( jQuery ); - } -}(function( $ ) { - -var lastActive, - baseClasses = "ui-button ui-widget", - typeClasses = "ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only", - formResetHandler = function() { - var form = $( this ); - setTimeout(function() { - form.find( ":ui-button" ).button( "refresh" ); - }, 1 ); - }, - radioGroup = function( radio ) { - var name = radio.name, - form = radio.form, - radios = $( [] ); - if ( name ) { - name = name.replace( /'/g, "\\'" ); - if ( form ) { - radios = $( form ).find( "[name='" + name + "'][type=radio]" ); - } else { - radios = $( "[name='" + name + "'][type=radio]", radio.ownerDocument ) - .filter(function() { - return !this.form; - }); - } - } - return radios; - }; - -$.widget( "wok.buttonFlat", { - version: "@VERSION", - defaultElement: "<button>", - options: { - disabled: null, - text: true, - label: null, - icons: { - primary: null, - secondary: null - } - }, - _create: function() { - this.element.closest( "form" ) - .unbind( "reset" + this.eventNamespace ) - .bind( "reset" + this.eventNamespace, formResetHandler ); - - if ( typeof this.options.disabled !== "boolean" ) { - this.options.disabled = !!this.element.prop( "disabled" ); - } else { - this.element.prop( "disabled", this.options.disabled ); - } - - this._determineButtonType(); - this.hasTitle = !!this.buttonElement.attr( "title" ); - - var that = this, - options = this.options, - toggleButton = this.type === "checkbox" || this.type === "radio", - activeClass = !toggleButton ? "ui-state-active" : ""; - - if ( options.label === null ) { - options.label = (this.type === "input" ? this.buttonElement.val() : this.buttonElement.html()); - } - - this._hoverable( this.buttonElement ); - - this.buttonElement - .addClass( baseClasses ) - .attr( "role", "button" ) - .bind( "mouseenter" + this.eventNamespace, function() { - if ( options.disabled ) { - return; - } - if ( this === lastActive ) { - $( this ).addClass( "ui-state-active" ); - } - }) - .bind( "mouseleave" + this.eventNamespace, function() { - if ( options.disabled ) { - return; - } - $( this ).removeClass( activeClass ); - }) - .bind( "click" + this.eventNamespace, function( event ) { - if ( options.disabled ) { - event.preventDefault(); - event.stopImmediatePropagation(); - } - }); - - // Can't use _focusable() because the element that receives focus - // and the element that gets the ui-state-focus class are different - this._on({ - focus: function() { - this.buttonElement.addClass( "ui-state-focus" ); - }, - blur: function() { - this.buttonElement.removeClass( "ui-state-focus" ); - } - }); - - if ( toggleButton ) { - this.element.bind( "change" + this.eventNamespace, function() { - that.refresh(); - }); - } - - if ( this.type === "checkbox" ) { - this.buttonElement.bind( "click" + this.eventNamespace, function() { - if ( options.disabled ) { - return false; - } - }); - } else if ( this.type === "radio" ) { - this.buttonElement.bind( "click" + this.eventNamespace, function() { - if ( options.disabled ) { - return false; - } - $( this ).addClass( "ui-state-active" ); - that.buttonElement.attr( "aria-pressed", "true" ); - - var radio = that.element[ 0 ]; - radioGroup( radio ) - .not( radio ) - .map(function() { - return $( this ).button( "widget" )[ 0 ]; - }) - .removeClass( "ui-state-active" ) - .attr( "aria-pressed", "false" ); - }); - } else { - this.buttonElement - .bind( "mousedown" + this.eventNamespace, function() { - if ( options.disabled ) { - return false; - } - $( this ).addClass( "ui-state-active" ); - lastActive = this; - that.document.one( "mouseup", function() { - lastActive = null; - }); - }) - .bind( "mouseup" + this.eventNamespace, function() { - if ( options.disabled ) { - return false; - } - $( this ).removeClass( "ui-state-active" ); - }) - .bind( "keydown" + this.eventNamespace, function(event) { - if ( options.disabled ) { - return false; - } - if ( event.keyCode === $.ui.keyCode.SPACE || event.keyCode === $.ui.keyCode.ENTER ) { - $( this ).addClass( "ui-state-active" ); - } - }) - // see #8559, we bind to blur here in case the button element loses - // focus between keydown and keyup, it would be left in an "active" state - .bind( "keyup" + this.eventNamespace + " blur" + this.eventNamespace, function() { - $( this ).removeClass( "ui-state-active" ); - }); - - if ( this.buttonElement.is("a") ) { - this.buttonElement.keyup(function(event) { - if ( event.keyCode === $.ui.keyCode.SPACE ) { - // TODO pass through original event correctly (just as 2nd argument doesn't work) - $( this ).click(); - } - }); - } - } - - this._setOption( "disabled", options.disabled ); - this._resetButton(); - }, - - _determineButtonType: function() { - var ancestor, labelSelector, checked; - - if ( this.element.is("[type=checkbox]") ) { - this.type = "checkbox"; - } else if ( this.element.is("[type=radio]") ) { - this.type = "radio"; - } else if ( this.element.is("input") ) { - this.type = "input"; - } else { - this.type = "button"; - } - - if ( this.type === "checkbox" || this.type === "radio" ) { - // we don't search against the document in case the element - // is disconnected from the DOM - ancestor = this.element.parents().last(); - labelSelector = "label[for='" + this.element.attr("id") + "']"; - this.buttonElement = ancestor.find( labelSelector ); - if ( !this.buttonElement.length ) { - ancestor = ancestor.length ? ancestor.siblings() : this.element.siblings(); - this.buttonElement = ancestor.filter( labelSelector ); - if ( !this.buttonElement.length ) { - this.buttonElement = ancestor.find( labelSelector ); - } - } - this.element.addClass( "ui-helper-hidden-accessible" ); - - checked = this.element.is( ":checked" ); - if ( checked ) { - this.buttonElement.addClass( "ui-state-active" ); - } - this.buttonElement.prop( "aria-pressed", checked ); - } else { - this.buttonElement = this.element; - } - }, - - widget: function() { - return this.buttonElement; - }, - - _destroy: function() { - this.element - .removeClass( "ui-helper-hidden-accessible" ); - this.buttonElement - .removeClass( baseClasses + " ui-state-active " + typeClasses ) - .removeAttr( "role" ) - .removeAttr( "aria-pressed" ) - .html( this.buttonElement.find(".ui-button-text").html() ); - - if ( !this.hasTitle ) { - this.buttonElement.removeAttr( "title" ); - } - }, - - _setOption: function( key, value ) { - this._super( key, value ); - if ( key === "disabled" ) { - this.widget().toggleClass( "ui-state-disabled", !!value ); - this.element.prop( "disabled", !!value ); - if ( value ) { - if ( this.type === "checkbox" || this.type === "radio" ) { - this.buttonElement.removeClass( "ui-state-focus" ); - } else { - this.buttonElement.removeClass( "ui-state-focus ui-state-active" ); - } - } - return; - } - this._resetButton(); - }, - - refresh: function() { - //See #8237 & #8828 - var isDisabled = this.element.is( "input, button" ) ? this.element.is( ":disabled" ) : this.element.hasClass( "ui-button-disabled" ); - - if ( isDisabled !== this.options.disabled ) { - this._setOption( "disabled", isDisabled ); - } - if ( this.type === "radio" ) { - radioGroup( this.element[0] ).each(function() { - if ( $( this ).is( ":checked" ) ) { - $( this ).button( "widget" ) - .addClass( "ui-state-active" ) - .attr( "aria-pressed", "true" ); - } else { - $( this ).button( "widget" ) - .removeClass( "ui-state-active" ) - .attr( "aria-pressed", "false" ); - } - }); - } else if ( this.type === "checkbox" ) { - if ( this.element.is( ":checked" ) ) { - this.buttonElement - .addClass( "ui-state-active" ) - .attr( "aria-pressed", "true" ); - } else { - this.buttonElement - .removeClass( "ui-state-active" ) - .attr( "aria-pressed", "false" ); - } - } - }, - - _resetButton: function() { - if ( this.type === "input" ) { - if ( this.options.label ) { - this.element.val( this.options.label ); - } - return; - } - var buttonElement = this.buttonElement.removeClass( typeClasses ), - buttonText = $( "<span></span>", this.document[0] ) - .addClass( "ui-button-text" ) - .html( this.options.label ) - .appendTo( buttonElement.empty() ) - .text(), - icons = this.options.icons, - multipleIcons = icons.primary && icons.secondary, - buttonClasses = []; - - if ( icons.primary || icons.secondary ) { - if ( this.options.text ) { - buttonClasses.push( "ui-button-text-icon" + ( multipleIcons ? "s" : ( icons.primary ? "-primary" : "-secondary" ) ) ); - } - - if ( icons.primary ) { - buttonElement.prepend( "<span class='ui-button-icon-primary ui-icon " + icons.primary + "'></span>" ); - } - - if ( icons.secondary ) { - buttonElement.append( "<span class='ui-button-icon-secondary ui-icon " + icons.secondary + "'></span>" ); - } - - if ( !this.options.text ) { - buttonClasses.push( multipleIcons ? "ui-button-icons-only" : "ui-button-icon-only" ); - - if ( !this.hasTitle ) { - buttonElement.attr( "title", $.trim( buttonText ) ); - } - } - } else { - buttonClasses.push( "ui-button-text-only" ); - } - buttonElement.addClass( buttonClasses.join( " " ) ); - } -}); - -$.widget( "ui.buttonset", { - version: "@VERSION", - options: { - items: "button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)" - }, - - _create: function() { - this.element.addClass( "ui-buttonset" ); - }, - - _init: function() { - this.refresh(); - }, - - _setOption: function( key, value ) { - if ( key === "disabled" ) { - this.buttons.button( "option", key, value ); - } - - this._super( key, value ); - }, - - refresh: function() { - var rtl = this.element.css( "direction" ) === "rtl", - allButtons = this.element.find( this.options.items ), - existingButtons = allButtons.filter( ":ui-button" ); - - // Initialize new buttons - allButtons.not( ":ui-button" ).button(); - - // Refresh existing buttons - existingButtons.button( "refresh" ); - - this.buttons = allButtons - .map(function() { - return $( this ).button( "widget" )[ 0 ]; - }) - .removeClass( "ui-corner-all ui-corner-left ui-corner-right" ) - .filter( ":first" ) - .addClass( rtl ? "ui-corner-right" : "ui-corner-left" ) - .end() - .filter( ":last" ) - .addClass( rtl ? "ui-corner-left" : "ui-corner-right" ) - .end() - .end(); - }, - - _destroy: function() { - this.element.removeClass( "ui-buttonset" ); - this.buttons - .map(function() { - return $( this ).button( "widget" )[ 0 ]; - }) - .removeClass( "ui-corner-left ui-corner-right" ) - .end() - .button( "destroy" ); - } -}); - -return $.ui.button; - -})); diff --git a/ui/js/widgets/checkbox-flat.js b/ui/js/widgets/checkbox-flat.js deleted file mode 100644 index cd22205..0000000 --- a/ui/js/widgets/checkbox-flat.js +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Project Wok - * - * Copyright IBM, Corp. 2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -// How to use: -// $(".selector").checkboxFlat({ -// id: "t", //Checkbox base id. -// name: "test", //Checkbox name. -// content: ["apple", "banana", "orange", "cherry"], //Contents of the checkbox set. -// checked: [1,3] //Set the checked item, which starts with number 1. -// }); -// $(".selector").click(function() { -// console.log($(".selector").checkboxFlat("value")); //Get value of the checked checkbox. -// }); - - (function($) { - $.widget("wok.checkboxFlat", { - options: { - id: "", - name: "", - content: [], - checked: [] - }, - - _create: function() { - var that = this; - var idBase = that.options.id; - var name = that.options.name; - var checked = that.options.checked; - var content = that.options.content; - var html = ""; - for (var i=1;i<content.length+1;i++) { - if($.inArray(i,checked) < 0) { - html += "<div class='checkbox-item checkbox-inline icon-check-empty-1' id='" + idBase + i + "' name='" + name + "'></div>" + - "<label class='checkbox-label checkbox-inline' for='" + idBase + i + "'>" + content[i-1] + "</label>"; - } else { - html += "<div class='checkbox-item checkbox-inline icon-ok-squared' id='" + idBase + i + "' name='" + name + "'></div>" + - "<label class='checkbox-label checkbox-inline' for='" + idBase + i + "'>" + content[i-1] + "</label>"; - } - } - $(html).appendTo(that.element); - $(".checkbox-item").on("click", function() { - var tickID = $(this).attr("id"); - var tick = tickID.substring(idBase.length,tickID.length); - if($(this).hasClass("icon-check-empty-1")) { - $(this).removeClass("icon-check-empty-1"); - $(this).addClass("icon-ok-squared"); - checked.push(Number(tick)); - } else { - $(this).removeClass("icon-ok-squared"); - $(this).addClass("icon-check-empty-1"); - checked.splice($.inArray(Number(tick),checked),1); - } - }); - }, - - value: function() { - var value = new Array(); - var vContent = this.options.content; - var vChencked = this.options.checked; - for(var i=0;i<vChencked.length;i++) { - value.push(vContent[vChencked[i]-1]); - } - return value; - }, - - _destroy: function() { - this.element.remove(); - } - }); - })(jQuery); diff --git a/ui/js/widgets/circleGauge.js b/ui/js/widgets/circleGauge.js deleted file mode 100644 index b093143..0000000 --- a/ui/js/widgets/circleGauge.js +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Project Wok - * - * Copyright IBM, Corp. 2014-2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - (function($) { - $.widget('wok.circleGauge', { - - options : { - color : '#87C004', - fillColor : '#87C004', - lineWidth : 20, - shadowSize : '2px', - font : 'bold 13px Geneva, sans-serif', - textAlign : 'center', - radius : 35, - peakRate : 100, - display : 0, - circle : 0, - label : '' - }, - - _create : function() { - //valuesAttr="{" + this.element.data('value')+ "}"; - //console.info(valuesAttr); - //values=eval("(" + valuesAttr + ")"); - //$.extend(this.options, values); - this.options.display=this.element.data('display'); - this.options.percentage=this.element.data('percentage'); - this._fixupPeakRate(); - this._draw(); - }, - - setValues : function(values) { - $.extend(this.options, values); - this._fixupPeakRate(); - this._draw(); - }, - - _fixupPeakRate : function() { - if (this.options.circle>this.options.peakRate) { - this.options.peakRate=this.options.circle; - } - }, - - _draw : function() { - this.element.empty(); - var canvas = document.createElement('canvas'); - //this.element.append($(canvas)); //I don't quite understand this line so trying the one below... - this.element.append(canvas); - - var ctx = canvas.getContext('2d'); - var radius = this.options.radius; - - var shadowSize = 2; - var width = height = radius * 2; - $(canvas).attr('height', height); - $(canvas).attr('width', width); - - $(canvas).css({ - 'boxShadow' : shadowSize + 'px ' + shadowSize + 'px ' + shadowSize + 'px #fff, -' + shadowSize + 'px -' + shadowSize + 'px ' + shadowSize + 'px #eaeaea', - borderRadius : radius + 'px' - }); - - ctx.clearRect(0, 0, width, height); - ctx.fillStyle = this.options.fillColor; - ctx.font = this.options.font; - ctx.textAlign = 'center'; - var originPos = radius; - ctx.textBaseline = 'middle'; - ctx.fillText(this.options.display, originPos, originPos); - ctx.strokeStyle = this.options.color; - ctx.lineWidth = this.options.lineWidth; - ctx.beginPath(); - ctx.arc(originPos, originPos, radius, -.5 * Math.PI, (this.options.percentage / 50 - .5) * Math.PI); - ctx.stroke(); - }, - - destroy : function() { - this.element.empty(); - $.Widget.prototype.destroy.call(this); - } - }); -}(jQuery)); - -wok.circleGauge = function(selector) { - $(selector).circleGauge(); -}; diff --git a/ui/js/widgets/combobox.js b/ui/js/widgets/combobox.js deleted file mode 100644 index c2bb75b..0000000 --- a/ui/js/widgets/combobox.js +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Project Wok - * - * Copyright IBM, Corp. 2014-2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -(function($) { - $.widget('wok.combobox', { - _create : function() { - this.selectDiv = this.element; - this.listControl = this.selectDiv.find('ul').first(); - this.listControl.html(''); - this.target = this.selectDiv.find('input').first(); - this.selectDiv.addClass('btn-select dropdown popable'); - this.target.addClass('input'); - this.target.width(this.selectDiv.width()+10); - this.listControl.addClass('select-list'); - this.listControl.parent().addClass('popover'); - }, - - setData : function(options) { - var that = this; - var value = this.target.val(); - var selectedClass = 'active'; - var itemTag = 'li'; - if (options.length > 0) { - that.target.after($('<span class="arrow"></span>')); - that.listControl.on('click', itemTag, function(e) { - that.listControl.children().removeClass(selectedClass); - $(this).addClass(selectedClass); - var oldValue = that.target.val(); - var newValue = $(this).data('value'); - that.target.val(newValue); - if (oldValue !== newValue) { - that.target.change(); - } - }); - - that.selectDiv.click(function(e) { - that.listControl.html(''); - var items = that._dataList(options); - $.each(items, function(index, item) { - that.listControl.append(item); - }) - }); - - that.target.keyup(function(event) { - that.listControl.html(''); - var items = that._dataList(options); - var temp = 0; - $.each(items, function(index, item) { - if (item.text().indexOf(that.target.val()) == 0) { - that.listControl.append(item); - temp++; - } - }); - if (temp > 0 && that.listControl.html() !== '') { - that._open(); - } else { - that._close(); - } - }); - } - }, - - value : function(value) { - if (value === undefined) { - return this.target.val(); - } - this.target.val(value); - }, - - _dataList : function(options) { - var item; - var itemTag = 'li'; - var selectedClass = 'active'; - var items = []; - var that = this; - $.each(options, function(index, option) { - item = $('<' + itemTag + '>' + option.label +'</' + itemTag + '>'); - item.data('value', option.value); - if (option.value === that.target.val()) { - item.addClass(selectedClass); - } - items.push(item); - }); - return items; - }, - - clear : function() { - this.target.val(""); - }, - - _open : function() { - var isOpen = this.selectDiv.hasClass('open'); - if (!isOpen) { - this.selectDiv.addClass('open'); - } - }, - - _close : function() { - var isOpen = this.selectDiv.hasClass('open'); - if (isOpen) { - this.selectDiv.removeClass('open'); - } - }, - - destroy : function() { - this.selectDiv.removeClass('btn-select dropdown popable'); - this.target.removeClass('input'); - this.listControl.removeClass('select-list'); - this.listControl.parent().removeClass('popover'); - $.Widget.prototype.destroy.call(this); - } - }); -}(jQuery)); diff --git a/ui/js/widgets/dialog-flat.js b/ui/js/widgets/dialog-flat.js deleted file mode 100644 index b70af22..0000000 --- a/ui/js/widgets/dialog-flat.js +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Project Wok - * - * Copyright IBM, Corp. 2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* How to use: - * $(".selector").dialogFlat({ - * title: "Demo", //Title of the dialog. - * confirmText: "Ok", //Text of the confirm button, "Ok" is the default value. - * cancelText: "Cancel", //Text of the cancel button. - * width: "300", //Width of the dialog, "px" is the default unit. - * height: "500", //Height of the dialog, "px" is the default unit. - * confirmFunc: function() { - * //Function after confirm - * } - * }); - */ - -(function( $ ) { - $.widget("wok.dialogFlat", { - options: { - title: "", - autoOpen: true, - confirmText: "Ok", - cancelText: "Cancel", - confirmFunc: null, - height: "150", - width: "150" - }, - - _create: function() { - var that = this; - var w = that.options.width; - var h = that.options.height; - $(".body").addClass("style:'opacity:0.5'"); - that._open(); - that._setSize(w, h); - $(".dialog-container .dialog-cancel").on("click", that._destroy); - $(".dialog-container .dialog-okay").on("click", function() { - that._trigger("confirmFunc"); - that._destroy(); - }); - }, - - _open: function() { - var cfmTxt = this.options.confirmText; - var celTxt = this.options.cancelText; - var titleTxt = this.options.title; - var html = - "<div id='dialog-overlay'></div>" + - "<div class='dialog-border-grey'>" + - "<div class='dialog-container'>" + - "<div class='dialog-title h1 dark-gray'>" + titleTxt + "</div>" + - "<div class='dialog-body'>dafafdafdas</div>" + - "<div class='dialog-footer'>" + - "<div class='dialog-button dialog-okay'>" + cfmTxt + "</div>" + - "<div class='dialog-button dialog-cancel'>" + celTxt + "</div>" + - "</div>" + - "</div>" + - "</div>"; - if (this.options.autoOpen) { - $(html).appendTo($("body")); - var pageWidth = window.screen.width; - var pageHeight = window.screen.height; - var pageLeft = document.screenLeft - var pageTop = document.screenTop; - var topOffset = "-" + pageHeight + "px"; - $("#dialog-overlay").css({ - "opacity": "0.5", - "Left": pageLeft, - "Top": pageTop, - "background-color": "white", - "width": pageWidth, - "height": pageHeight, - "margin-top": topOffset, - "overflow": "hidden" - }); - } - }, - - _setSize: function(width, height) { - var wid = width + "px"; - var hei = height + "px"; - var cHeight = (height - 4) + "px"; - var bHeight = (height - 54) + "px"; - var tWidth = (width - 25) + "px"; - $(".dialog-border-grey").css({ - "width": wid, - "height": hei - }); - $(".dialog-container").css({ - "height": cHeight - }); - $(".dialog-container .dialog-body").css({ - "height": bHeight - }); - $(".dialog-container .dialog-title").css({ - "width": tWidth - }); - }, - - _destroy: function() { - $(".dialog-border-grey").remove(); - $("#dialog-overlay").remove(); - } - }); -})(jQuery); diff --git a/ui/js/widgets/filter-select.js b/ui/js/widgets/filter-select.js deleted file mode 100644 index d884962..0000000 --- a/ui/js/widgets/filter-select.js +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Project Wok - * - * Copyright IBM, Corp. 2014-2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -(function($) { - $.widget('wok.filterselect', { - _create : function() { - this.selectDiv = this.element; - this.listControl = this.selectDiv.find('ul').first(); - this.listControl.html(''); - this.target = this.selectDiv.find('input').first(); - this.selectDiv.addClass('btn-select dropdown popable'); - this.target.addClass('input'); - this.target.width(this.selectDiv.width()+10); - this.listControl.addClass('select-list'); - this.listControl.parent().addClass('popover'); - }, - - setData : function(options) { - var that = this; - var value = this.target.val(); - var selectedClass = 'active'; - var itemTag = 'li'; - if (options.length > 0) { - that.target.after($('<span class="arrow"></span>')); - that.listControl.on('click', itemTag, function(e) { - that.listControl.children().removeClass(selectedClass); - $(this).addClass(selectedClass); - var oldValue = that.target.val(); - var newValue = $(this).data('value'); - that.target.val(newValue); - if (oldValue !== newValue) { - that.target.change(); - that.target.removeClass("invalid-field"); - } - }); - - that.selectDiv.click(function(e) { - that.listControl.html(''); - var items = that._dataList(options); - if (items.length === 0) { - that.listControl.html(i18n['WOKAPI6005E']); - } else { - $.each(items, function(index, item) { - that.listControl.append(item); - }); - } - }); - - that.target.keyup(function(event) { - that.listControl.html(''); - var items = that._dataList(options); - var temp = 0; - $.each(items, function(index, item) { - if (item.text().indexOf(that.target.val()) == 0) { - that.listControl.append(item); - temp++; - } - }); - if (that.listControl.html() === '') { - that.target.addClass("invalid-field"); - that.listControl.html(i18n['WOKAPI6005E']); - } else { - that.target.removeClass("invalid-field"); - } - if (temp > 0) { - that._open(); - } - }); - } - }, - - value : function(value) { - if (value === undefined) { - return this.target.val(); - } - this.target.val(value); - }, - - _dataList : function(options) { - var item; - var itemTag = 'li'; - var selectedClass = 'active'; - var items = []; - var that = this; - $.each(options, function(index, option) { - item = $('<' + itemTag + '>' + option.label +'</' + itemTag + '>'); - item.data('value', option.value); - if (option.value === that.target.val()) { - item.addClass(selectedClass); - } - items.push(item); - }); - return items; - }, - - clear : function() { - this.target.val(""); - }, - - _open : function() { - var isOpen = this.selectDiv.hasClass('open'); - if (!isOpen) { - this.selectDiv.addClass('open'); - } - }, - - _close : function() { - var isOpen = this.selectDiv.hasClass('open'); - if (isOpen) { - this.selectDiv.removeClass('open'); - } - }, - - destroy : function() { - this.selectDiv.removeClass('btn-select dropdown popable'); - this.target.removeClass('input'); - this.listControl.removeClass('select-list'); - this.listControl.parent().removeClass('popover') - $.Widget.prototype.destroy.call(this); - } - }); -}(jQuery)); diff --git a/ui/js/widgets/gauge-flat.js b/ui/js/widgets/gauge-flat.js deleted file mode 100755 index aeb0fd5..0000000 --- a/ui/js/widgets/gauge-flat.js +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Project Wok - * - * Copyright IBM, Corp. 2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* - * How to use: - * $(".selector").gaugeFlat({ - * value: 25, // Value that you the gauge is going to show, varies from 0 to 100. - * color: "red" // Color showed, currently only "red", "yellow", "blue" and "purple" are supported. - * }); - * - * Set value: - * $(".selector").gaugeFlat("value", <value>); // Replace <value> with the value that is going to be showed. - * - * Get value: - * $(".selector").gaugeFlat("value"); // This returns the value of gauge. - * - */ - -(function( $ ) { - -return $.widget( "wok.gaugeFlat", { - version: "@VERSION", - options: { - max: 100, - value: 0, - color: "red" - }, - - min: 0, - - _create: function() { - this.oldValue = this.options.value = this._constrainedValue(); - - this.element - .addClass( "ui-gauge-flat ui-widget ui-widget-content ui-corner-all" ) - .attr({ - role: "gaugeflat", - "aria-valuemin": this.min - }); - var color = this.options.color; - if(color != "red" && color != "yellow" && color != "blue" && color != "purple") { - color = "red"; - } - - this.valueDiv = $( "<div class='ui-gauge-flat-value " + color + " ui-widget-header ui-corner-left'></div>" ) - .appendTo( this.element ); - - this._refreshValue(); - }, - - _destroy: function() { - this.element - .removeClass( "ui-gauge-flat ui-widget ui-widget-content ui-corner-all" ) - .removeAttr( "role" ) - .removeAttr( "aria-valuemin" ) - .removeAttr( "aria-valuemax" ) - .removeAttr( "aria-valuenow" ); - - this.valueDiv.remove(); - }, - - value: function( newValue ) { - if ( newValue === undefined ) { - return this.options.value; - } - - this.options.value = this._constrainedValue( newValue ); - this._refreshValue(); - }, - - _constrainedValue: function( newValue ) { - if ( newValue === undefined ) { - newValue = this.options.value; - } - - this.indeterminate = newValue === false; - - if ( typeof newValue !== "number" ) { - newValue = 0; - } - - return this.indeterminate ? false : - Math.min( this.options.max, Math.max( this.min, newValue ) ); - }, - - _setOptions: function( options ) { - var value = options.value; - delete options.value; - - this._super( options ); - - this.options.value = this._constrainedValue( value ); - this._refreshValue(); - }, - - _percentage: function() { - return this.indeterminate ? 100 : 100 * ( this.options.value - this.min ) / ( this.options.max - this.min ); - }, - - _refreshValue: function() { - var value = this.options.value, - percentage = this._percentage(); - - this.valueDiv - .toggle( this.indeterminate || value > this.min ) - .toggleClass( "ui-corner-right", value === this.options.max ) - .width( percentage.toFixed(0) + "%" ); - } -}); - -})(jQuery); diff --git a/ui/js/widgets/line.js b/ui/js/widgets/line.js deleted file mode 100644 index 8dd10b2..0000000 --- a/ui/js/widgets/line.js +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Project Wok - * - * Copyright IBM, Corp. 2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -$(function(){ -$.widget("wok.line", { - options: { - xShift: true, - minVal: 0, - maxVal: 100, - datasets: [] - }, - _create: function() { - this._build(); - }, - _build: function() { - this.element.empty(); - var maxX = this.element.width(); - var maxY = this.element.height(); - var svg = "<svg class='line' width='"+maxX+"' height='"+maxY+"'>"; - svg += "<line x1='0' y1='0' x2='"+maxX+"' y2='0' class='max'/>"; - svg += "<line x1='0' y1='"+maxY+"' x2='"+maxX+"' y2='"+maxY+"' class='min'/>"; - for(var i=0;i<this.options.datasets.length;i++){ - var data = this.options.datasets[i].data; - var points = ""; - for(var j=0;j<data.length;j++){ - if(data[j]){ - var xVal = maxX/(data.length-1)*j; - var yVal = (this.options.maxVal-data[j])*maxY/this.options.maxVal; - points += xVal+","+yVal+" "; - } - } - svg += "<polyline points='"+points+"' style='stroke:"+this.options.datasets[i].color+";'/>"; - } - svg += "</svg>"; - this.element.append(svg); - }, - addData: function(values){ - if(values.length<this.options.datasets.length) return; - for(var i=0;i<this.options.datasets.length;i++){ - this.options.datasets[i].data.push(values[i]); - if(this.options.xShift) this.options.datasets[i].data.splice(0,1); - } - this._build(); - }, - removeData: function(){ - for(var i=0;i<this.options.datasets.length;i++){ - var data = this.options.datasets[i].data; - data.splice(0,1); - if(this.options.xShift) data.push(null); - } - this._build(); - }, - _destroy: function() { - this.element.empty(); - } -}); -}); diff --git a/ui/js/widgets/list-flat.js b/ui/js/widgets/list-flat.js deleted file mode 100644 index 12ea43d..0000000 --- a/ui/js/widgets/list-flat.js +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Project Wok - * - * Copyright IBM, Corp. 2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - // How to use: - // $(".test-bar").listFlat({ - // title: "Hello World" //Set title. - // }); - // $(".test-bar").listFlat("addItem", "Hello", "2015", "icon-user", "button1"); - // //Add one item of the list, parameters are: name, info, icon and button-id - - - (function($) { - - $.widget("wok.listFlat", { - - options: { - title: null - }, - - _create: function() { - var that = this; - var listTitle = that.options.title; - var titleTrim = listTitle.replace(/\s*/g, ""); - var html = ""; - html += "<div class='list-titlef'>" + listTitle + "</div>" + - "<div class='list-content' id='list" + titleTrim + "'></div>"; - $(html).appendTo(that.element); - }, - - _getTitle: function() { - return this.options.title; - }, - - addItem: function(name, detail, icon, id) { - var title = this._getTitle().replace(/\s/g, ""); - var usedIcon = icon || ""; - var html = ""; - html += "<div class='list-item'>" + - "<span class='list-inline list-item-icon " + usedIcon + "'></span>" + - "<span class='list-inline list-item-info'>"+ - "<div class='list-item-name'>" + name + "</div>" + - "<div class='list-item-detail'>" + detail + "</div>" + - "</span>" + - "<span class='list-inline list-item-button' id='" + id + "'></span>" + - "</div>"; - $(html).appendTo($("#list" + title)); - $.each($(".list-item"), function(index, data) { - if(index%2 >0) { - $(this).addClass("list-item-even"); - } else { - $(this).addClass("list-item-odd"); - } - }) - console.log("title"); - }, - - _destory: function() { - this.element.remove(); - } - }); - })(jQuery); diff --git a/ui/js/widgets/menu-flat.js b/ui/js/widgets/menu-flat.js deleted file mode 100644 index 0da3593..0000000 --- a/ui/js/widgets/menu-flat.js +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Project Wok - * - * Copyright IBM, Corp. 2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - // How to use: - // $("#test-bar").menuFlat({ - // content: [1,2,3,4,5,6], //Set content of the menu. - // icon: "icon-edit-alt", //Set icon of the menu button. - // listIconList: ["icon-edit-alt","icon-edit-alt","icon-edit-alt","icon-edit-alt","icon-edit-alt","icon-user"] - // //Set icons of the menu list. - // // name is optional which set the name of the menu list. - // }); - // $("#test-bar0").on("click", function() { - // alert("hello"); - // }); - // $("#test-bar1").on("click", function() { - // console.log("hello"); - // }); - - - (function( $ ) { - $.widget("wok.menuFlat", { - - options: { - content: null, - name: null, - parentid: null, - icon: null, - listIconList: null - }, - - _create: function() { - var that = this; - var name = that.options.name || $(this.element).attr("id"); - var value = that.options.content; - var icon = that.options.icon || ""; - var parentid = $(this.element).attr("id"); - $("#" + parentid).addClass("menu-content"); - that.options.parentid = parentid; - var html = "<div class='menu-box' id='manu-" + name + "'>" + - "<span class='menu-icon-front " + icon + "'></span>" + - "<span class='menu-label'>"+ name + "</span>" + - "<span class='menu-icon icon-down-open'></span>" + - "</div>"; - $(html).appendTo(that.element); - html = that._setValue(value); - $(html).appendTo(that.element); - $(".menu-box", "#" + parentid).on("click", that._toggleOpt); - $(".menu-opt", "#" + parentid).on("click", that._toggleOpt); - $(document).mouseup(function(e) { - var container = $(".menu-opt"); - if(!container.is(e.target) && container.has(e.target).length === 0 && $(".menu-icon").hasClass("icon-up-open")) { - $(".menu-list", "#" + parentid).prop("style", "display:none"); - $(".menu-icon", "#" + parentid).removeClass("icon-up-open"); - $(".menu-icon", "#" + parentid).addClass("icon-down-open").css({ - "background": "#4E4D4F" - }); - } - }); - }, - - _setValue: function(value) { - var that = this; - var name = that.options.name; - var html = "<ul class='menu-list' name='" + name + "' style='display:none'>"; - var name = this.options.name || $(this.element).attr("id"); - $.each(value, function(index, data) { - that.options.content[index] = data.toString(); - var liIcon = that.options.listIconList[index] || ""; - html += "<li id='" + name + index + "' class='menu-opt'>" + - "<span class='list-icon-front " + liIcon + "'></span>" + - "<span>" + data + "</span>" + - "</li>"; - }); - html += "</ul>" - return html; - }, - - _toggleOpt: function() { - var thisButton = $(this).parent().attr("id") || $(this).parent().parent().attr("id"); - if($(".menu-icon", "#" + thisButton).hasClass("icon-down-open")) { - $(".menu-list", "#" + thisButton).prop("style", "display"); - $(".menu-icon", "#" + thisButton).removeClass("icon-down-open"); - $(".menu-icon", "#" + thisButton).addClass("icon-up-open").css({ - "background": "#3A393B" - }); - } else { - $(".menu-list", "#" + thisButton).prop("style", "display:none"); - $(".menu-icon", "#" + thisButton).removeClass("icon-up-open"); - $(".menu-icon", "#" + thisButton).addClass("icon-down-open").css({ - "background": "#4E4D4F" - }); - } - }, - - _destroy: function() { - this.element.remove(); - } - }); - })(jQuery); diff --git a/ui/js/widgets/message-flat.js b/ui/js/widgets/message-flat.js deleted file mode 100644 index 4393332..0000000 --- a/ui/js/widgets/message-flat.js +++ /dev/null @@ -1,99 +0,0 @@ -/* -* Project Wok -* -* Copyright IBM, Corp. 2015 -* -* Code derived from Project Kimchi -* -* Licensed under the Apache License, Version 2.0 (the 'License'); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an 'AS IS' BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -/* How to use: -* $(".selector").messageFlat({ -* contentMain: "This is a test", //Content you are going to add -* contentConfirm: "Sure?" //Content that inform user whether they want to continue. -* //Default value is: "Are you sure you want to go on?" -* confirm: function() { -* //Function after confirm -* } -* }); -*/ - -(function( $ ) { - $.widget("wok.messageFlat", { - options: { - autoOpen: true, - contentMain: null, - contentConfirm: "Are you sure you want to go on?", - confirm: null - }, - - _create: function() { - var that = this; - var msg = that.options.contentMain; - var cfm = that.options.contentConfirm; - $(".body").addClass("style:'opacity:0.5'"); - that._open(); - $(".message-type-icon").addClass("icon-help-circled-1"); - $(".message-dialog .message-content .message-main").text(msg); - $(".message-dialog .message-confirm-info").text(cfm); - $(".message-dialog .message-cancel").on("click", that.destroy); - $(".message-dialog .message-okay").on("click", function() { - that._trigger("confirm"); - that.destroy(); - }); - }, - - _open: function() { - var html = - "<div id='overlay'></div>" + - "<div class='border-grey'>" + - "<div class='message-dialog'>" + - "<div class='message-content'>" + - "<div class='message-inline message-type-icon'></div>" + - "<div class='message-inline message-main'></div>" + - "</div>" + - "<div class='message-confirm-info'></div>" + - "<div class='message-footer'>" + - "<div class='message-button message-okay'>Ok</div>" + - "<div class='message-button message-cancel'>Cancel</div>" + - "</div>" + - "</div>" + - "</div>"; - if (this.options.autoOpen) { - $(html).appendTo($("body")); - var pageWidth = window.screen.width; - var pageHeight = window.screen.height; - var pageLeft = document.screenLeft - var pageTop = document.screenTop; - var topOffset = "-" + pageHeight + "px"; - console.log(topOffset); - $("#overlay").css({ - "opacity": "0.5", - "Left": pageLeft, - "Top": pageTop, - "background-color": "white", - "width": pageWidth, - "height": pageHeight, - "margin-top": topOffset, - "overflow": "hidden" - }); - } - }, - - destroy: function() { - $(".border-grey").remove(); - $("#overlay").remove(); - } - }); -})(jQuery); diff --git a/ui/js/widgets/messagebar-flat.js b/ui/js/widgets/messagebar-flat.js deleted file mode 100644 index a050ad6..0000000 --- a/ui/js/widgets/messagebar-flat.js +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Project Wok - * - * Copyright IBM, Corp. 2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* -* Usage: - $(selector).messagebarFlat({ - content: "Test", //message you want to show in the messagebar - color: "red", //Three color supported: "red", "yellow" and "green", - dismissTime: 3000 //when set to "never", the messagebar will never disappear. - // Or setting it to numbers for the dismiss time you want to delay. - }); -*/ - -(function($) { - $.widget("wok.messagebarFlat", { - options : { - content : null, - color : "red", - dismissTime: 3000 - }, - - _create: function() { - var now = this._getTime(); - var that = this; - $("<div class='messagebar'><span class='messageHead'></span>" + - "<span class='messagebar-text'> " + this.options.content +": " + now + "</span></div>") - .addClass(this.options.color) - .appendTo(that.element); - $(".messageHead").addClass("dark-" + this.options.color); - $("<span class='messagebar-close icon-cancel-circled'></span>").on("click", function() { - that.destroy(); - }).appendTo($(".messagebar")); - var dismissDelay = this.options.dismissTime; - if (dismissDelay != "never") { - setTimeout(function() { - that.destroy() - }, dismissDelay); - } - }, - - _getTime: function() { - var CT = new Date(); - var currentDate = CT.getDate() + "/" + CT.getMonth()+1 + "/" +CT.getFullYear(); - var currentTime = CT.getHours() + ":" + CT.getMinutes() + ":" + CT.getSeconds(); - var now = currentDate + " " + currentTime; - return now; - }, - - destroy: function() { - var that = this; - that.element.fadeOut("normal", function() { - that.element.remove(); - }); - } - }); -})(jQuery); diff --git a/ui/js/widgets/radio-flat.js b/ui/js/widgets/radio-flat.js deleted file mode 100644 index 3cb8836..0000000 --- a/ui/js/widgets/radio-flat.js +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Project Wok - * - * Copyright IBM, Corp. 2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* - * //How to use: - * $(".selector").radioFlat({ - * id: "t", //Base id of the radio set. - * name: "test", //name of the radio. - * whichChecked: 2, //First selected position, starts from 1. - * content: ["apple", "banana", "orange", "cherry"] //set the content array. - * }); - * - * - * $(".test-bar").click(function() { - * console.log($(".test-bar").radioFlat("value")); //this is how to get the value of selected radio value - * }); - * - * - * - */ - - (function($) { - - $.widget("wok.radioFlat", { - options: { - id: "", - name: "", - whichChecked: "", - content:[], - }, - - _create: function() { - var that = this; - var radioName = this.options.name; - var labelID = this.options.id; - var checked = this.options.whichChecked; - var num = Number(this.options.content.length); - var html =""; - if(num >0) { - for(var i=1;i < num+1;i++) { - var tmpLabelID = labelID + i; - html += "<div class='icon-circle-empty inline-radio radio-label' id='" + tmpLabelID + "'></div>" + - "<label class='radio-content inline-radio' for='" + tmpLabelID + "'>" + that.options.content[i-1] + "</label>"; - } - $(html).appendTo(that.element); - $("#" + labelID + checked).attr("checked", "true"); - $("#" + labelID + checked).removeClass("icon-circle-empty"); - $("#" + labelID + checked).addClass("icon-dot-circled"); - } - $(".radio-label").on("click", function() { - $(".radio-label").removeClass("icon-dot-circled"); - $(".radio-label").addClass("icon-circle-empty"); - $(".radio-label").removeAttr("checked"); - $(this).removeClass("icon-circle-empty"); - $(this).addClass("icon-dot-circled"); - $(this).attr("checked", "true"); - var thisID = $(this).attr("id"); - that.options.whichChecked = thisID.substring(labelID.length,thisID.length); - }); - }, - - value: function() { - var value = Number(this.options.whichChecked) -1; - return this.options.content[value]; - }, - - _destroy: function() { - this.element.remove(); - } - }); - })(jQuery); diff --git a/ui/js/widgets/samples/README.md b/ui/js/widgets/samples/README.md deleted file mode 100644 index 9c8e425..0000000 --- a/ui/js/widgets/samples/README.md +++ /dev/null @@ -1 +0,0 @@ -This folder contains the usage of Kimchi new UI design widgets. \ No newline at end of file diff --git a/ui/js/widgets/samples/dialog.html b/ui/js/widgets/samples/dialog.html deleted file mode 100644 index ec67b97..0000000 --- a/ui/js/widgets/samples/dialog.html +++ /dev/null @@ -1,53 +0,0 @@ -<!-- -/* - * Project Wok - * - * Copyright IBM, Corp. 2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ ---> - -<!DOCTYPE html> -<html> - <head> - <meta charset="UTF-8"> - <title>Dialog Demo</title> - <script src="../../../libs/jquery-1.10.0.min.js"></script> - <script src="../../../libs/jquery-ui.min.js"></script> - <script src="../dialog-flat.js"></script> - <link rel="stylesheet" href="../../../libs/themes/base/jquery-ui.min.css"> - <link rel="stylesheet" href="../../../css/theme-default/dialog-flat.css"> - <link rel="stylesheet" href="../../../css/fontello/css/animation.css"> - <link rel="stylesheet" href="../../../css/fontello/css/fontello.css"> - </head> - <body> - <div class="dialog-demo"></div> - <script> - $(document).ready(function() { - $(".dialog-demo").dialogFlat({ - title: "Demo", //Title of the dialog. - confirmText: "Ok", //Text of the confirm button, "Ok" is the default value. - cancelText: "Cancel", //Text of the cancel button. - width: "600", //Width of the dialog, "px" is the default unit. - height: "500", //Height of the dialog, "px" is the default unit. - confirmFunc: function() { - alert("success");//Function after confirm - } - }); - }); - </script> - </body> -</html> diff --git a/ui/js/widgets/samples/gauge-flat.html b/ui/js/widgets/samples/gauge-flat.html deleted file mode 100644 index efa6eec..0000000 --- a/ui/js/widgets/samples/gauge-flat.html +++ /dev/null @@ -1,55 +0,0 @@ -<!--Sample code of gauge--> -<!-- -/* - * Project Wok - * - * Copyright IBM, Corp. 2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> -<!DOCTYPE html> -<html> - <head> - <meta charset="UTF-8"> - <title>Gauge Demo</title> - <script src="../../../libs/jquery-1.10.0.min.js"></script> - <script src="../../../libs/jquery-ui.min.js"></script> - <script src="../gauge-flat.js"></script> - <link rel="stylesheet" href="../../../libs/themes/base/jquery-ui.min.css"> - <link rel="stylesheet" href="../../../css/theme-default/gauge-flat.css"> - </head> - <body> - <div class="gauge-demo"></div> - <script> - $(document).ready(function() { - console.log("test started1"); - var gauged = $(".gauge-demo"); - gauged.gaugeFlat({ - value: 25, - color: "red" - }); - var gaugeAdd = function() { - var gaugeValue = gauged.gaugeFlat("value"); - gauged.gaugeFlat("value", gaugeValue + 1); - if (gaugeValue < 99) { - setTimeout(gaugeAdd, 300); - } - } - gaugeAdd(); - }); - </script> - </body> -</html> diff --git a/ui/js/widgets/samples/grid.html b/ui/js/widgets/samples/grid.html deleted file mode 100644 index ac667ac..0000000 --- a/ui/js/widgets/samples/grid.html +++ /dev/null @@ -1,82 +0,0 @@ -<!-- - * - * Project Wok - * - * Copyright IBM, Corp. 2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ---> - -<!DOCTYPE html> -<html> -<head> -<meta charset="UTF-8"> -<title>Wok</title> -<meta http-equiv="X-UA-Compatible" content="IE=edge"/> -<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> - -<link rel="stylesheet" href="../../../libs/themes/base/jquery-ui.min.css"> -<link rel="stylesheet" href="../../../fontello/css/fontello.css"> -<link rel="stylesheet" href="../../../fontello/css/animation.css"> -<link rel="stylesheet" href="../../../css/theme-default.min.css"> - -<script src="../../../libs/jquery-1.10.0.min.js"></script> -<script src="../../../libs/jquery-ui.min.js"></script> -<script src="../../../libs/jquery-ui-i18n.min.js"></script> -<script src="../../../js/wok.min.js"></script> - -<style type="text/css"> -body { - background: none; -} -input { - float: right; -} -.name { - width: 30%; -} -.project { - width: 30%; -} -.role { - width: 39%; -} -</style> -<script> -function init(){ - $('#ibmers').dataGrid({enableSorting: true}); - $('input').on('keyup', function(){ - $('#ibmers').dataGrid('filter', ($(this).val())); - }); -} -</script> -</head> -<body onload="init()"> -<div style="height: 50px; padding-top: 10px; padding-right: 50px;"><input type='text' placeholder='Filter' style='padding-left: 5px; height: 20px;'></div> -<div id="ibmers"> -<div><span class="name">Name</span><span class="project">Project</span><span class="role">Role</span></div> -<div> -<div><span class="name" val="tify">tify</span><span class="project" val="kimchi">kimchi</span><span class="role" val="designer">designer</span></div> -<div><span class="name" val="rick">rick</span><span class="project" val="finance">finance</span><span class="role" val="sponsor">sponsor</span></div> -<div><span class="name" val="icy">icy</span><span class="project" val="human resource">human resource</span><span class="role" val="administrator*">administrator</span></div> -<div><span class="name" val="paul">paul</span><span class="project" val="tomcat">tomcat</span><span class="role" val="dev lead">dev lead</span></div> -<div><span class="name" val="kapil">kapil</span><span class="project" val="apache">apache</span><span class="role" val="developer">developer</span></div> -<div><span class="name" val="adam">adam</span><span class="name" val="mongodb">mongodb</span><span class="role" val="dev lead">dev lead</span></div> -<div><span class="name" val="shikha">shikha</span><span class="project" val="mysql">mysql</span><span class="role" val="dev lead">dev lead</span></div> -</div> -</div> -</body> -</html> diff --git a/ui/js/widgets/samples/line.html b/ui/js/widgets/samples/line.html deleted file mode 100644 index 4ded4db..0000000 --- a/ui/js/widgets/samples/line.html +++ /dev/null @@ -1,170 +0,0 @@ -<!-- - * - * Project Wok - * - * Copyright IBM, Corp. 2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ---> - -<!DOCTYPE html> -<html> -<head> -<meta charset="UTF-8"> -<title>Wok</title> -<meta http-equiv="X-UA-Compatible" content="IE=edge"/> -<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> - -<link rel="stylesheet" href="../../../libs/themes/base/jquery-ui.min.css"> -<link rel="stylesheet" href="../../../fontello/css/fontello.css"> -<link rel="stylesheet" href="../../../fontello/css/animation.css"> -<link rel="stylesheet" href="../../../css/theme-default.min.css"> - -<script src="../../../libs/jquery-1.10.0.min.js"></script> -<script src="../../../libs/jquery-ui.min.js"></script> -<script src="../../../libs/jquery-ui-i18n.min.js"></script> -<script src="../../../js/wok.min.js"></script> - -<style type="text/css"> -body { - background: none; -} -.cell { - display: inline-block; - width: 49%; -} -.monitor { - width: 391px; - margin: 15px auto; -} -.chart { - width: 390px; - height: 200px; - margin-top: 20px; -} -.legend { - height: 25px; - line-height: 25px; - padding-left: 8px; - margin: 5px 30px 5px 0; - border-left: 3px solid; - display: inline-block; -} -</style> -<script> -function init(){ -$('#chart1').line({ - minVal: 0, - maxVal: 500, - datasets: [{ - data: new Array(50), - color: "#d9182d" - }] -}); -$('#chart2').line({ - minVal: 0, - maxVal: 500, - datasets: [{ - data: new Array(50), - color: "#008abf" - }] -}); -$('#chart3').line({ - minVal: 0, - maxVal: 500, - datasets: [{ - data: new Array(50), - color: "#fdb813" - }, { - data: new Array(50), - color: "#00a6a0" - }] -}); -$('#chart4').line({ - minVal: 0, - maxVal: 500, - datasets: [{ - data: new Array(50), - color: "#561289" - }, { - data: new Array(50), - color: "#238901" - }] -}); -setInterval(function(){ - $('#chart1').line('addData', [Math.round(Math.random()*500)]); -}, 1000); -setInterval(function(){ - $('#chart2').line('addData', [Math.round(Math.random()*500)]); -}, 1000); -setInterval(function(){ - $('#chart3').line('addData', [Math.round(Math.random()*500),Math.round(Math.random()*500)]); -}, 1000); -setInterval(function(){ - $('#chart4').line('addData', [Math.round(Math.random()*500),Math.round(Math.random()*500)]); -}, 1000); -} -</script> -</head> -<body onload="init()"> -<div> -<span class='cell'> - <div class="monitor"> - <div class="h1 grey">Processor</div> - <div class="c1 dark-grey bold"> - <span class="legend" style="border-color: #d9182d;">Used: 41%</span> - </div> - <div class="c1 light-grey">Maximum: 100%</div> - <div id="chart1" class='chart'></div> - </div> -</span> -<span class='cell'> - <div class="monitor"> - <div class="h1 grey">Memory</div> - <div class="c1 dark-grey bold"> - <span class="legend" style="border-color: #008abf;">Available: 49%</span> - </div> - <div class="c1 light-grey">Maximum: 280GB</div> - <div id="chart2" class='chart'></div> - </div> -</span> -</div> -<div> -<span class='cell'> - <div class="monitor"> - <div class="h1 grey">Storage IO</div> - <div class="c1 dark-grey bold"> - <span class="legend" style="border-color: #fdb813">Write: 6KB/S</span> - <span class="legend" style="border-color: #00a6a0">Read: 123KB/S</span> - </div> - <div class="c1 light-grey">Maximum: 79.04KB/S</div> - <div id="chart3" class='chart'></div> - </div> -</span> -<span class='cell'> - <div class="monitor"> - <div class="h1 grey">Network IO</div> - <div class="c1 dark-grey bold"> - <span class="legend" style="border-color: #561289">Received: 2KB/S</span> - <span class="legend" style="border-color: #238901">Sent: 1KB/S</span> - </div> - <div class="c1 light-grey">Maximum: 33.35KB/S</div> - <div id="chart4" class='chart'></div> - </div> -</span> -</div> -</body> -</html> diff --git a/ui/js/widgets/samples/list.html b/ui/js/widgets/samples/list.html deleted file mode 100644 index 39388b3..0000000 --- a/ui/js/widgets/samples/list.html +++ /dev/null @@ -1,48 +0,0 @@ -<!-- - * - * Project Wok - * - * Copyright IBM, Corp. 2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ---> - -<!DOCTYPE html> -<html> - <head> - <meta charset="UTF-8"> - <title>List Demo</title> - <script src="../../../libs/jquery-1.10.0.min.js"></script> - <script src="../../../libs/jquery-ui.min.js"></script> - <script src="../list-flat.js"></script> - <link rel="stylesheet" href="../../../libs/themes/base/jquery-ui.min.css"> - <link rel="stylesheet" href="../../../css/theme-default/list-flat.css"> - <link rel="stylesheet" href="../../../fontello/css/animation.css"> - <link rel="stylesheet" href="../../../fontello/css/fontello.css"> - </head> - <body> - <div class="list-demo"></div> - <script> - $(document).ready(function() { - $(".list-demo").listFlat({ - title: "Hello World" //Set title. - }); - $(".list-demo").listFlat("addItem", "Hello", "2015", "icon-user", "button1"); - //Add one item of the list, parameters are: name, info, icon and button-id - }); - </script> - </body> -</html> diff --git a/ui/js/widgets/samples/menu-button-radio-checkbox-text-select.html b/ui/js/widgets/samples/menu-button-radio-checkbox-text-select.html deleted file mode 100644 index 48ac2b1..0000000 --- a/ui/js/widgets/samples/menu-button-radio-checkbox-text-select.html +++ /dev/null @@ -1,104 +0,0 @@ -<!-- - * - * Project Wok - * - * Copyright IBM, Corp. 2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ---> - -<!DOCTYPE html> -<html> - <head> - <meta charset="UTF-8"> - <title>Demo</title> - <script src="../../../libs/jquery-1.10.0.min.js"></script> - <script src="../../../libs/jquery-ui.min.js"></script> - <script src="../menu-flat.js"></script> - <script src="../button-flat.js"></script> - <script src="../radio-flat.js"></script> - <script src="../checkbox-flat.js"></script> - <script src="../textbox-flat.js"></script> - <script src="../selectmenu-flat.js"></script> - <link rel="stylesheet" href="../../../libs/themes/base/jquery-ui.min.css"> - <link rel="stylesheet" href="../../../css/theme-default/menu-flat.css"> - <link rel="stylesheet" href="../../../css/theme-default/button-flat.css"> - <link rel="stylesheet" href="../../../css/theme-default/radio-flat.css"> - <link rel="stylesheet" href="../../../css/theme-default/checkbox-flat.css"> - <link rel="stylesheet" href="../../../css/theme-default/textbox-flat.css"> - <link rel="stylesheet" href="../../../css/theme-default/selectmenu-flat.css"> - <link rel="stylesheet" href="../../../fontello/css/animation.css"> - <link rel="stylesheet" href="../../../fontello/css/fontello.css"> - </head> - <body> - <div id="menu"></div> - <div style="height:50px"><div id="select"></div></div> - <div class="radio-demo"></div> - <div class="checkbox-demo"></div> - <input class="text-demo"> - <button class="button-demo">submit</button> - <script> - $(document).ready(function() { - $("#menu").menuFlat({ - content: [1,2,3,4,5,6], //Set content of the menu. - icon: "icon-edit-alt", //Set icon of the menu button. - listIconList: ["icon-edit-alt","icon-edit-alt","icon-edit-alt","icon-edit-alt","icon-edit-alt","icon-user"] - //Set icons of the menu list. - // name is optional which set the name of the menu list. - }); - $("#menu0").on("click", function() { - alert("hello"); - }); - $("#menu1").on("click", function() { - console.log("hello"); - }); - $("#select").selectmenuFlat({ - content: [1,2,3,4,5,6], //Set content of the select menu - selected: 2 // set the selected option, starts from "1" - }); - $("#select").selectmenuFlat("value", "4"); //Set value. - var t = $("#select").selectmenuFlat("value"); //Get value - console.log(t); - $(".radio-demo").radioFlat({ - id: "t", //Base id of the radio set. - name: "test", //name of the radio. - whichChecked: 2, //First selected position, starts from 1. - content: ["apple", "banana", "orange", "cherry"] //set the content array. - }); - $(".radio-demo").click(function() { - console.log($(".radio-demo").radioFlat("value")); //this is how to get the value of selected radio value - }); - $(".checkbox-demo").checkboxFlat({ - id: "t", //Checkbox base id. - name: "test", //Checkbox name. - content: ["apple", "banana", "orange", "cherry"], //Contents of the checkbox set. - checked: [1,3] //Set the checked item, which starts with number 1. - }); - $(".checkbox-demo").click(function() { - console.log($(".selector").checkboxFlat("value")); //Get value of the checked checkbox. - }); - $(".text-demo").textboxFlat({ - hint: "hint" - }); - $(".text-demo").css({ - "height": "30px", - "width": "200px" - }); - $(".button-demo").buttonFlat(); - }); - </script> - </body> -</html> diff --git a/ui/js/widgets/samples/message.html b/ui/js/widgets/samples/message.html deleted file mode 100644 index 0fd5c45..0000000 --- a/ui/js/widgets/samples/message.html +++ /dev/null @@ -1,51 +0,0 @@ -<!-- - * - * Project Wok - * - * Copyright IBM, Corp. 2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ---> - -<!DOCTYPE html> -<html> - <head> - <meta charset="UTF-8"> - <title>Message Demo</title> - <script src="../../../libs/jquery-1.10.0.min.js"></script> - <script src="../../../libs/jquery-ui.min.js"></script> - <script src="../message-flat.js"></script> - <link rel="stylesheet" href="../../../libs/themes/base/jquery-ui.min.css"> - <link rel="stylesheet" href="../../../css/theme-default/message-flat.css"> - <link rel="stylesheet" href="../../../fontello/css/animation.css"> - <link rel="stylesheet" href="../../../fontello/css/fontello.css"> - </head> - <body> - <div class="message-demo"></div> - <script> - $(document).ready(function() { - $(".message-demo").messageFlat({ - contentMain: "This is a test", //Content you are going to add - contentConfirm: "Sure?", //Content that inform user whether they want to continue. - //Default value is: "Are you sure you want to go on?" - confirm: function() { - alert("comfirmed") - } - }); - }); - </script> - </body> -</html> diff --git a/ui/js/widgets/samples/messagebar-flat.html b/ui/js/widgets/samples/messagebar-flat.html deleted file mode 100644 index 4014283..0000000 --- a/ui/js/widgets/samples/messagebar-flat.html +++ /dev/null @@ -1,51 +0,0 @@ -<!-- -/* - * Project Wok - * - * Copyright IBM, Corp. 2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ ---> - -<!DOCTYPE html> -<html> - <head> - <meta charset="UTF-8"> - <title>Sample of messagebar</title> - <meta http-equiv="X-UA-Compatible" content="IE=edge"/> - <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> - <link rel="stylesheet" href="../../../fontello/css/fontello.css"> - <link rel="stylesheet" href="../../../fontello/css/animation.css"> - <link rel="stylesheet" href="../../../libs/themes/base/jquery-ui.min.css"> - <link rel="stylesheet" href="../../../css/theme-default/messagebar-flat.css"> - <script src="../../../libs/jquery-1.10.0.min.js"></script> - <script src="../../../libs/jquery-ui.min.js"></script> - <script src="../messagebar-flat.js"></script> - </head> - <body> - <div class="message"></div> - <script> - $(document).ready(function() { - $(".message").messagebarFlat({ - content: "This is a test", - color: "red", - dismissTime: 1000 - }); - }); - </script> - </body> - -</html> diff --git a/ui/js/widgets/samples/tabs.html b/ui/js/widgets/samples/tabs.html deleted file mode 100644 index 0a5c401..0000000 --- a/ui/js/widgets/samples/tabs.html +++ /dev/null @@ -1,70 +0,0 @@ -<!-- - * - * Project Wok - * - * Copyright IBM, Corp. 2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ---> - -<!DOCTYPE html> -<html> -<head> -<meta charset="UTF-8"> -<title>Wok</title> -<meta http-equiv="X-UA-Compatible" content="IE=edge"/> -<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> - -<link rel="stylesheet" href="../../../libs/themes/base/jquery-ui.min.css"> -<link rel="stylesheet" href="../../../fontello/css/fontello.css"> -<link rel="stylesheet" href="../../../fontello/css/animation.css"> -<link rel="stylesheet" href="../../../css/theme-default.min.css"> - -<script src="../../../libs/jquery-1.10.0.min.js"></script> -<script src="../../../libs/jquery-ui.min.js"></script> -<script src="../../../libs/jquery-ui-i18n.min.js"></script> -<script src="../../../js/wok.min.js"></script> - -<style type="text/css"> -body { - background: none; -} -</style> -<script> -function init(){ - $( "#tabs" ).tabs(); -} -</script> -</head> -<body onload="init()"> -<div id="tabs"> - <ul> - <li><a href="#tabs-1">Nunc tincidunt</a></li> - <li><a href="#tabs-2">Proin dolor</a></li> - <li><a href="#tabs-3">Aenean lacinia</a></li> - </ul> - <div id="tabs-1"> - <p>Proin elit arcu, rutrum commodo, vehicula tempus, commodo a, risus. Curabitur nec arcu. Donec sollicitudin mi sit amet mauris. Nam elementum quam ullamcorper ante. Etiam aliquet massa et lorem. Mauris dapibus lacus auctor risus. Aenean tempor ullamcorper leo. Vivamus sed magna quis ligula eleifend adipiscing. Duis orci. Aliquam sodales tortor vitae ipsum. Aliquam nulla. Duis aliquam molestie erat. Ut et mauris vel pede varius sollicitudin. Sed ut dolor nec orci tincidunt interdum. Phasellus ipsum. Nunc tristique tempus lectus.</p> - </div> - <div id="tabs-2"> - <p>Morbi tincidunt, dui sit amet facilisis feugiat, odio metus gravida ante, ut pharetra massa metus id nunc. Duis scelerisque molestie turpis. Sed fringilla, massa eget luctus malesuada, metus eros molestie lectus, ut tempus eros massa ut dolor. Aenean aliquet fringilla sem. Suspendisse sed ligula in ligula suscipit aliquam. Praesent in eros vestibulum mi adipiscing adipiscing. Morbi facilisis. Curabitur ornare consequat nunc. Aenean vel metus. Ut posuere viverra nulla. Aliquam erat volutpat. Pellentesque convallis. Maecenas feugiat, tellus pellentesque pretium posuere, felis lorem euismod felis, eu ornare leo nisi vel felis. Mauris consectetur tortor et purus.</p> - </div> - <div id="tabs-3"> - <p>Mauris eleifend est et turpis. Duis id erat. Suspendisse potenti. Aliquam vulputate, pede vel vehicula accumsan, mi neque rutrum erat, eu congue orci lorem eget lorem. Vestibulum non ante. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Fusce sodales. Quisque eu urna vel enim commodo pellentesque. Praesent eu risus hendrerit ligula tempus pretium. Curabitur lorem enim, pretium nec, feugiat nec, luctus a, lacus.</p> - <p>Duis cursus. Maecenas ligula eros, blandit nec, pharetra at, semper at, magna. Nullam ac lacus. Nulla facilisi. Praesent viverra justo vitae neque. Praesent blandit adipiscing velit. Suspendisse potenti. Donec mattis, pede vel pharetra blandit, magna ligula faucibus eros, id euismod lacus dolor eget odio. Nam scelerisque. Donec non libero sed nulla mattis commodo. Ut sagittis. Donec nisi lectus, feugiat porttitor, tempor ac, tempor vitae, pede. Aenean vehicula velit eu tellus interdum rutrum. Maecenas commodo. Pellentesque nec elit. Fusce in lacus. Vivamus a libero vitae lectus hendrerit hendrerit.</p> - </div> -</body> -</html> diff --git a/ui/js/widgets/select-menu.js b/ui/js/widgets/select-menu.js deleted file mode 100644 index d176d00..0000000 --- a/ui/js/widgets/select-menu.js +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Project Wok - * - * Copyright IBM, Corp. 2014-2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -(function($) { - $.widget('wok.selectMenu', { - - _create : function() { - this.selectDiv = this.element; - this.listControl = this.selectDiv.find('ul').first(); - this.listControl.html(''); - this.target = this.selectDiv.find('input').first(); - this.label = this.selectDiv.find('span').first(); - this.selectDiv.addClass('btn dropdown popable'); - this.target.addClass('input'); - this.listControl.addClass('select-list'); - this.listControl.parent().addClass('popover'); - }, - - setData : function (options) { - var that = this; - var value = this.target.val(); - var selectedClass = 'active'; - var itemTag = 'li'; - var item; - that.listControl.find('li').remove(); - that.label.text(""); - that.target.val(""); - if (options.length > 0) { - $.each(options, function(index, option) { - item = $('<' + itemTag + '>' + option.label +'</' + itemTag + '>'); - item.data('value', option.value); - if(option.value === value) { - item.addClass(selectedClass); - that.label.text(option.label); - that.target.val(option.value); - } - that.listControl.append(item); - }); - that.listControl.on('click', itemTag, function() { - that.listControl.children().removeClass(selectedClass); - $(this).addClass(selectedClass); - that.label.text($(this).text()); - var oldValue = that.target.val(); - var newValue = $(this).data('value'); - that.target.val(newValue); - if(oldValue !== newValue) { - that.target.change(); - } - }); - } - }, - - value : function(data) { - if (data === undefined) { - return this.target.val(); - } - this.target.val(data.value); - this.label.val(data.label); - }, - - destroy : function() { - this.selectDiv.removeClass('btn dropdown popable'); - this.target.removeClass('input'); - this.label.removeClass('input'); - this.listControl.removeClass('select-list'); - this.listControl.parent().removeClass('popover'); - $.Widget.prototype.destroy.call(this); - } - }); -}(jQuery)); diff --git a/ui/js/widgets/selectmenu-flat.js b/ui/js/widgets/selectmenu-flat.js deleted file mode 100644 index 3cd34ef..0000000 --- a/ui/js/widgets/selectmenu-flat.js +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Project Wok - * - * Copyright IBM, Corp. 2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -// How to use: -// $(".selector").selectmenuFlat({ -// content: [1,2,3,4,5,6], //Set content of the select menu -// selected: 2 // set the selected option, starts from "1" -// }); -// $(".selector").selectmenuFlat("value", "4"); //Set value. -// var t = $(".selector").selectmenuFlat("value"); //Get value -// console.log(t); - - - (function( $ ) { - $.widget("wok.selectmenuFlat", { - - options: { - content: null, - name: null, - selected: null, - parentid: null - }, - - _create: function() { - var that = this; - var name = that.options.name || $(this.element).attr("id"); - var value = that.options.content; - var parentid = $(this.element).attr("id"); - that.options.parentid = parentid; - var html = "<div class='selected-box'>" + - "<input class='select-val'>" + - "<span class='select-label'></span>" + - "<span class='select-icon icon-down-open'></span>" + - "</div>"; - $(html).appendTo(that.element); - html = that._setValue(value); - $(html).appendTo(that.element); - $("#" + parentid).addClass("select-content"); - var sel = that.options.selected || 1; - sel = that.options.content[Number(sel) -1]; - that.options.selected = $.inArray(sel, that.options.content) + 1; - $(".select-val", "#" + parentid).text(sel); - $(".select-label", "#" + parentid).text(sel); - $(".selected-box", "#" + parentid).on("click", this._toggleOpt); - $(".selectmenu-opt", "#" + parentid).on("click", function() { - var selectedText = $(this).text(); - that.options.selected = $.inArray(selectedText, that.options.content) +1; - $(".selected-box .select-label", "#" + parentid).text(selectedText); - $(".select-val", "#" + parentid).text(selectedText); - $(".selectmenu-list", "#" + parentid).prop("style", "display:none"); - $(".select-icon", "#" + parentid).removeClass("icon-up-open"); - $(".select-icon", "#" + parentid).addClass("icon-down-open").css({ - "border-left": "none" - }); - }); - $(document).mouseup(function(e) { - var container = $(".selectmenu-opt"); - if(!container.is(e.target) && container.has(e.target).length === 0 && $(".select-icon").hasClass("icon-up-open")) { - $(".selectmenu-list", "#" + parentid).prop("style", "display:none"); - $(".select-icon", "#" + parentid).removeClass("icon-up-open"); - $(".select-icon", "#" + parentid).addClass("icon-down-open").css({ - "border-left": "none" - }); - } - }); - }, - - _setValue: function(value) { - var that = this; - var html = "<ul class='selectmenu-list' style='display:none'>"; - var name = this.options.name || $(this.element).attr("id"); - $.each(value, function(index, data) { - that.options.content[index] = data.toString(); - html += "<li id='" + name + index + "' class='selectmenu-opt'>" + data + "</li>"; - }); - html += "</ul>"; - return html; - }, - - _toggleOpt: function() { - var thisButton = $(this).parent().attr("id"); - if($(".select-icon", "#" + thisButton).hasClass("icon-down-open")) { - $(".selectmenu-list", "#" + thisButton).prop("style", "display"); - $(".select-icon", "#" + thisButton).removeClass("icon-down-open"); - $(".select-icon", "#" + thisButton).addClass("icon-up-open").css({ - "border-left": "1px solid #d8d8d8" - }); - } else { - $(".selectmenu-list", "#" + thisButton).prop("style", "display:none"); - $(".select-icon", "#" + thisButton).removeClass("icon-up-open"); - $(".select-icon", "#" + thisButton).addClass("icon-down-open").css({ - "border-left": "none" - }); - } - }, - - value: function(value) { - var parentid = this.options.parentid; - if(!value) { - return $(".selected-box .select-val", "#" + parentid).text(); - } - if (value <= this.options.content.length) { - this.options.selected = value; - var selectedText = this.options.content[value-1]; - $(".selected-box .select-label", "#" + parentid).text(selectedText); - $(".selected-box .select-val", "#" + parentid).text(selectedText); - } - }, - - _destroy: function() { - this.element.remove(); - } - }); - })(jQuery); diff --git a/ui/js/widgets/textbox-flat.js b/ui/js/widgets/textbox-flat.js deleted file mode 100644 index 40f6233..0000000 --- a/ui/js/widgets/textbox-flat.js +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Project Wok - * - * Copyright IBM, Corp. 2015 - * - * Code derived from Project Kimchi - * - * Licensed under the Apache License, Version 2.0 (the 'License'); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// How to use: -// $(".selector").textboxFlat({ -// hint: "hint" -// }); - - (function($) { - $.widget("wok.textboxFlat", { - optons: { - hint: "" - }, - - _create: function() { - this.element.addClass("textbox-container"); - this.element.attr("placeholder", this.options.hint); - }, - - destroy:function() { - this.element.remove(); - } - }); - })(jQuery); -- 2.5.0

Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com&gt; --- build-all.sh | 2 +- check_ui_code_errors.sh | 2 +- contrib/DEBIAN/postinst | 2 +- contrib/DEBIAN/postrm | 2 +- contrib/check_i18n.py | 2 +- contrib/wokd-upstart.conf.debian | 2 +- contrib/wokd-upstart.conf.fedora | 2 +- contrib/wokd.sysvinit | 2 +- po/pt_BR.po | 2 +- po/zh_CN.po | 2 +- src/nginx/wok.conf.in | 2 +- src/wok/Makefile.am | 2 +- src/wok/__init__.py | 2 +- src/wok/asynctask.py | 2 +- src/wok/auth.py | 2 +- src/wok/basemodel.py | 2 +- src/wok/cachebust.py | 2 +- src/wok/config.py.in | 2 +- src/wok/control/Makefile.am | 2 +- src/wok/control/__init__.py | 2 +- src/wok/control/base.py | 2 +- src/wok/control/config.py | 2 +- src/wok/control/plugins.py | 2 +- src/wok/control/tasks.py | 2 +- src/wok/control/utils.py | 2 +- src/wok/exception.py | 2 +- src/wok/i18n.py | 2 +- src/wok/model/Makefile.am | 2 +- src/wok/model/__init__.py | 2 +- src/wok/model/config.py | 2 +- src/wok/model/model.py | 2 +- src/wok/model/plugins.py | 2 +- src/wok/model/tasks.py | 2 +- src/wok/objectstore.py | 2 +- src/wok/plugins/Makefile.am | 2 +- src/wok/plugins/__init__.py | 2 +- src/wok/plugins/sample/Makefile.am | 2 +- src/wok/plugins/sample/__init__.py | 2 +- src/wok/plugins/sample/i18n.py | 2 +- src/wok/plugins/sample/model.py | 2 +- src/wok/plugins/sample/ui/Makefile.am | 2 +- src/wok/plugins/sample/ui/config/Makefile.am | 2 +- src/wok/plugins/sample/ui/js/Makefile.am | 2 +- src/wok/plugins/sample/ui/js/util.js | 2 +- src/wok/plugins/sample/ui/pages/Makefile.am | 2 +- src/wok/plugins/sample/ui/pages/i18n.json.tmpl | 2 +- src/wok/plugins/sample/ui/pages/sample-tab1.html.tmpl | 2 +- src/wok/plugins/sample/ui/pages/sample-tab2.html.tmpl | 2 +- src/wok/proxy.py | 2 +- src/wok/rollbackcontext.py | 2 +- src/wok/root.py | 2 +- src/wok/server.py | 2 +- src/wok/sslcert.py | 2 +- src/wok/template.py | 2 +- src/wok/utils.py | 2 +- src/wok/xmlutils/Makefile.am | 2 +- src/wok/xmlutils/__init__.py | 2 +- src/wok/xmlutils/utils.py | 2 +- src/wokd.in | 2 +- tests/Makefile.am | 2 +- tests/__init__.py | 2 +- tests/run_tests.sh.in | 2 +- tests/test_api.py | 2 +- tests/test_config.py.in | 2 +- tests/test_exception.py | 2 +- tests/test_objectstore.py | 2 +- tests/test_plugin.py | 2 +- tests/test_rollbackcontext.py | 2 +- tests/test_server.py | 2 +- tests/test_utils.py | 2 +- tests/utils.py | 2 +- ui/Makefile.am | 2 +- ui/base64/Makefile.am | 2 +- ui/css/Makefile.am | 2 +- ui/css/bootstrap-select.custom.css | 2 +- ui/css/bootstrap.custom.css | 2 +- ui/css/fontawesome/Makefile.am | 2 +- ui/css/jquery-ui.custom.css | 2 +- ui/css/opensans/Makefile.am | 2 +- ui/css/src/bootstrap-select.custom.scss | 2 +- ui/css/src/bootstrap.custom.scss | 2 +- ui/css/src/modules/_about.scss | 2 +- ui/css/src/modules/_animation.scss | 2 +- ui/css/src/modules/_base.scss | 2 +- ui/css/src/modules/_buttons.scss | 2 +- ui/css/src/modules/_datagrid.scss | 2 +- ui/css/src/modules/_loaders.scss | 2 +- ui/css/src/modules/_login.scss | 2 +- ui/css/src/modules/_menu-flat.scss | 2 +- ui/css/src/modules/_mixins.scss | 2 +- ui/css/src/modules/_modal-flat.scss | 2 +- ui/css/src/modules/_navbar-flat.scss | 2 +- ui/css/src/modules/_tables-flat.scss | 2 +- ui/css/src/modules/_toolbar.scss | 2 +- ui/css/src/modules/_utils.scss | 2 +- ui/css/src/modules/_validation.scss | 2 +- ui/css/src/modules/_wok-confirm.scss | 2 +- ui/css/src/modules/_wok-forms.scss | 2 +- ui/css/src/modules/_wok-grid.scss | 2 +- ui/css/src/modules/_wok-variables.scss | 2 +- ui/css/src/wok.scss | 2 +- ui/css/theme-default/about.css | 2 +- ui/css/theme-default/base.css | 2 +- ui/css/theme-default/button-flat.css | 2 +- ui/css/theme-default/button.css | 2 +- ui/css/theme-default/checkbox-flat.css | 2 +- ui/css/theme-default/circleGauge.css | 2 +- ui/css/theme-default/datagrid.css | 2 +- ui/css/theme-default/dialog-flat.css | 2 +- ui/css/theme-default/error.css | 2 +- ui/css/theme-default/form.css | 2 +- ui/css/theme-default/framework.css | 2 +- ui/css/theme-default/gauge-flat.css | 2 +- ui/css/theme-default/grid.css | 2 +- ui/css/theme-default/jquery-ui.custom.css | 2 +- ui/css/theme-default/line-chart.css | 2 +- ui/css/theme-default/line.css | 2 +- ui/css/theme-default/list-flat.css | 2 +- ui/css/theme-default/login-window.css | 2 +- ui/css/theme-default/menu-flat.css | 2 +- ui/css/theme-default/message-flat.css | 2 +- ui/css/theme-default/message.css | 2 +- ui/css/theme-default/messagebar-flat.css | 2 +- ui/css/theme-default/nav-tree.css | 2 +- ui/css/theme-default/navbar.css | 2 +- ui/css/theme-default/popover.css | 2 +- ui/css/theme-default/radio-flat.css | 2 +- ui/css/theme-default/reset.css | 2 +- ui/css/theme-default/selectmenu-flat.css | 2 +- ui/css/theme-default/tabs.css | 2 +- ui/css/theme-default/textbox-flat.css | 2 +- ui/css/theme-default/theme.css | 2 +- ui/css/theme-default/tile-check.css | 2 +- ui/css/theme-default/toolbar.css | 2 +- ui/css/theme-default/topbar.css | 2 +- ui/css/theme-default/window.css | 2 +- ui/css/wok.css | 2 +- ui/images/Makefile.am | 2 +- ui/images/theme-default/Makefile.am | 2 +- ui/js/Makefile.am | 2 +- ui/js/src/wok.api.js | 2 +- ui/js/src/wok.confirm.js | 2 +- ui/js/src/wok.cookie.js | 2 +- ui/js/src/wok.datagrid.js | 2 +- ui/js/src/wok.form.js | 2 +- ui/js/src/wok.grid.js | 2 +- ui/js/src/wok.lang.js | 2 +- ui/js/src/wok.line-chart.js | 2 +- ui/js/src/wok.list.js | 2 +- ui/js/src/wok.login.js | 2 +- ui/js/src/wok.main.js | 2 +- ui/js/src/wok.message.js | 2 +- ui/js/src/wok.object.js | 2 +- ui/js/src/wok.popable.js | 2 +- ui/js/src/wok.select.js | 2 +- ui/js/src/wok.string.js | 2 +- ui/js/src/wok.substitute.js | 2 +- ui/js/src/wok.topic.js | 2 +- ui/js/src/wok.user.js | 2 +- ui/js/src/wok.utils.js | 2 +- ui/js/src/wok.window.js | 2 +- ui/libs/Makefile.am | 2 +- ui/libs/bootstrap-editable/Makefile.am | 2 +- ui/libs/bootstrap-editable/dist/Makefile.am | 2 +- ui/libs/bootstrap-editable/dist/css/Makefile.am | 2 +- ui/libs/bootstrap-editable/dist/js/Makefile.am | 2 +- ui/libs/bootstrap-select/Makefile.am | 2 +- ui/libs/bootstrap-select/dist/Makefile.am | 2 +- ui/libs/bootstrap-select/dist/css/Makefile.am | 2 +- ui/libs/bootstrap-select/dist/js/Makefile.am | 2 +- ui/libs/bootstrap-switch/Makefile.am | 2 +- ui/libs/bootstrap-switch/dist/Makefile.am | 2 +- ui/libs/bootstrap-switch/dist/css/Makefile.am | 2 +- ui/libs/bootstrap-switch/dist/js/Makefile.am | 2 +- ui/libs/bootstrap/Makefile.am | 2 +- ui/libs/es5-shim/Makefile.am | 2 +- ui/libs/jquery-bootgrid/Makefile.am | 2 +- ui/libs/jquery-bootgrid/dist/Makefile.am | 2 +- ui/libs/jquery-bootgrid/dist/css/Makefile.am | 2 +- ui/libs/jquery-bootgrid/dist/js/Makefile.am | 2 +- ui/libs/jquery-i18n/Makefile.am | 2 +- ui/libs/jquery-ui/Makefile.am | 2 +- ui/libs/jquery-ui/themes/Makefile.am | 2 +- ui/libs/jquery-ui/themes/base/Makefile.am | 2 +- ui/libs/jquery-ui/themes/base/images/Makefile.am | 2 +- ui/libs/jquery/Makefile.am | 2 +- ui/libs/list-js/Makefile.am | 2 +- ui/libs/typeahead/Makefile.am | 2 +- ui/pages/Makefile.am | 2 +- ui/pages/error.html.tmpl | 2 +- ui/pages/i18n.json.tmpl | 2 +- ui/pages/login.html.tmpl | 2 +- ui/pages/wok-ui.html.tmpl | 2 +- 193 files changed, 193 insertions(+), 193 deletions(-) diff --git a/build-all.sh b/build-all.sh index e860377..5d79530 100755 --- a/build-all.sh +++ b/build-all.sh @@ -3,7 +3,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/check_ui_code_errors.sh b/check_ui_code_errors.sh index 8476cb7..4d9a8bd 100755 --- a/check_ui_code_errors.sh +++ b/check_ui_code_errors.sh @@ -3,7 +3,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/contrib/DEBIAN/postinst b/contrib/DEBIAN/postinst index 98f9c4e..54ea20d 100755 --- a/contrib/DEBIAN/postinst +++ b/contrib/DEBIAN/postinst @@ -2,7 +2,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2013-2016 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/contrib/DEBIAN/postrm b/contrib/DEBIAN/postrm index c22b5fb..bfb1973 100755 --- a/contrib/DEBIAN/postrm +++ b/contrib/DEBIAN/postrm @@ -2,7 +2,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2013-2016 # # Code derived from Project Kimchi # diff --git a/contrib/check_i18n.py b/contrib/check_i18n.py index 49e9f8e..452d49d 100755 --- a/contrib/check_i18n.py +++ b/contrib/check_i18n.py @@ -2,7 +2,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2014-2015 +# Copyright IBM Corp, 2014-2016 # # Code derived from Project Kimchi # diff --git a/contrib/wokd-upstart.conf.debian b/contrib/wokd-upstart.conf.debian index 82e9156..e9cb2b3 100644 --- a/contrib/wokd-upstart.conf.debian +++ b/contrib/wokd-upstart.conf.debian @@ -1,7 +1,7 @@ # # wokd - Wok Web Server # -# Copyright IBM, Corp. 2013 +# Copyright IBM Corp, 2015-2016 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/contrib/wokd-upstart.conf.fedora b/contrib/wokd-upstart.conf.fedora index f02ce34..6d693ba 100644 --- a/contrib/wokd-upstart.conf.fedora +++ b/contrib/wokd-upstart.conf.fedora @@ -1,7 +1,7 @@ # # wokd - Wok Web Server # -# Copyright IBM, Corp. 2013 +# Copyright IBM Corp, 2015-2016 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/contrib/wokd.sysvinit b/contrib/wokd.sysvinit index 10680ee..2c867d0 100644 --- a/contrib/wokd.sysvinit +++ b/contrib/wokd.sysvinit @@ -2,7 +2,7 @@ # # wokd Wok Web Server # -# Copyright IBM, Corp. 2013 +# Copyright IBM Corp, 2015-2016 # # Author: Aline Manera <alinefm(a)br.ibm.com&gt; # diff --git a/po/pt_BR.po b/po/pt_BR.po index 9ee4459..9fb21a9 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,5 +1,5 @@ # i18n portable object for kimchi. -# Copyright (C) IBM, Corp. 2013-2014 +# Copyright IBM Corp, 2013-2016 # ShaoHe Feng <shaohef(a)linux.vnet.ibm.com&gt;, 2013-04-18. # # This library is free software; you can redistribute it and/or diff --git a/po/zh_CN.po b/po/zh_CN.po index 8ef9981..ded610d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,5 +1,5 @@ # i18n portable object for kimchi. -# Copyright (C) IBM, Corp. 2013-2014 +# Copyright IBM Corp, 2013-2016 # ShaoHe Feng <shaohef(a)linux.vnet.ibm.com&gt;, 2013-04-18. # # This library is free software; you can redistribute it and/or diff --git a/src/nginx/wok.conf.in b/src/nginx/wok.conf.in index bb5b1ed..85790ff 100644 --- a/src/nginx/wok.conf.in +++ b/src/nginx/wok.conf.in @@ -1,6 +1,6 @@ # Project Wok # -# Copyright IBM, Corp. 2014-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/Makefile.am b/src/wok/Makefile.am index ed92130..9a2481f 100644 --- a/src/wok/Makefile.am +++ b/src/wok/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/__init__.py b/src/wok/__init__.py index 8da776e..9323207 100644 --- a/src/wok/__init__.py +++ b/src/wok/__init__.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/asynctask.py b/src/wok/asynctask.py index 7020980..ec3fbc1 100644 --- a/src/wok/asynctask.py +++ b/src/wok/asynctask.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/auth.py b/src/wok/auth.py index 3f1c8d5..ef3215c 100644 --- a/src/wok/auth.py +++ b/src/wok/auth.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/basemodel.py b/src/wok/basemodel.py index 032c760..2a81efe 100644 --- a/src/wok/basemodel.py +++ b/src/wok/basemodel.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2014-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/cachebust.py b/src/wok/cachebust.py index 66d7152..b7fda4d 100644 --- a/src/wok/cachebust.py +++ b/src/wok/cachebust.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/config.py.in b/src/wok/config.py.in index 13305fb..5d32ba4 100644 --- a/src/wok/config.py.in +++ b/src/wok/config.py.in @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2016 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/control/Makefile.am b/src/wok/control/Makefile.am index 2be54c1..d9e5a4d 100644 --- a/src/wok/control/Makefile.am +++ b/src/wok/control/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/control/__init__.py b/src/wok/control/__init__.py index 37cc02e..f6f8b22 100644 --- a/src/wok/control/__init__.py +++ b/src/wok/control/__init__.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/control/base.py b/src/wok/control/base.py index e1591b5..e7ee695 100644 --- a/src/wok/control/base.py +++ b/src/wok/control/base.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/control/config.py b/src/wok/control/config.py index c1e5ef0..338306c 100644 --- a/src/wok/control/config.py +++ b/src/wok/control/config.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2016 +# Copyright IBM Corp, 2016 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/control/plugins.py b/src/wok/control/plugins.py index 7758271..57dfa1b 100644 --- a/src/wok/control/plugins.py +++ b/src/wok/control/plugins.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/control/tasks.py b/src/wok/control/tasks.py index fef310b..4f3053b 100644 --- a/src/wok/control/tasks.py +++ b/src/wok/control/tasks.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/control/utils.py b/src/wok/control/utils.py index a9d7bc3..059c187 100644 --- a/src/wok/control/utils.py +++ b/src/wok/control/utils.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/exception.py b/src/wok/exception.py index 26ae2d1..878922a 100644 --- a/src/wok/exception.py +++ b/src/wok/exception.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/i18n.py b/src/wok/i18n.py index 785c82a..82d28d1 100644 --- a/src/wok/i18n.py +++ b/src/wok/i18n.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2014-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/model/Makefile.am b/src/wok/model/Makefile.am index 82b7a7b..4058598 100644 --- a/src/wok/model/Makefile.am +++ b/src/wok/model/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/model/__init__.py b/src/wok/model/__init__.py index 3d5632a..9323207 100644 --- a/src/wok/model/__init__.py +++ b/src/wok/model/__init__.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2014-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/model/config.py b/src/wok/model/config.py index 3b5619f..415098a 100644 --- a/src/wok/model/config.py +++ b/src/wok/model/config.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2016 +# Copyright IBM Corp, 2016 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/model/model.py b/src/wok/model/model.py index e8826f2..c5e7630 100644 --- a/src/wok/model/model.py +++ b/src/wok/model/model.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2014-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/model/plugins.py b/src/wok/model/plugins.py index 85d60b6..4beff44 100644 --- a/src/wok/model/plugins.py +++ b/src/wok/model/plugins.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2014-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/model/tasks.py b/src/wok/model/tasks.py index a3618db..9c32554 100644 --- a/src/wok/model/tasks.py +++ b/src/wok/model/tasks.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2014-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/objectstore.py b/src/wok/objectstore.py index 089bf80..59354f3 100644 --- a/src/wok/objectstore.py +++ b/src/wok/objectstore.py @@ -1,6 +1,6 @@ # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/plugins/Makefile.am b/src/wok/plugins/Makefile.am index 9f65fda..edbb39a 100644 --- a/src/wok/plugins/Makefile.am +++ b/src/wok/plugins/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/plugins/__init__.py b/src/wok/plugins/__init__.py index 005a244..346f90e 100644 --- a/src/wok/plugins/__init__.py +++ b/src/wok/plugins/__init__.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/plugins/sample/Makefile.am b/src/wok/plugins/sample/Makefile.am index 49983b8..7ba2574 100644 --- a/src/wok/plugins/sample/Makefile.am +++ b/src/wok/plugins/sample/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/plugins/sample/__init__.py b/src/wok/plugins/sample/__init__.py index 43a0758..ff96b15 100644 --- a/src/wok/plugins/sample/__init__.py +++ b/src/wok/plugins/sample/__init__.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/plugins/sample/i18n.py b/src/wok/plugins/sample/i18n.py index f5d7b92..321a086 100644 --- a/src/wok/plugins/sample/i18n.py +++ b/src/wok/plugins/sample/i18n.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2014 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/plugins/sample/model.py b/src/wok/plugins/sample/model.py index 0856c20..489aa15 100644 --- a/src/wok/plugins/sample/model.py +++ b/src/wok/plugins/sample/model.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/plugins/sample/ui/Makefile.am b/src/wok/plugins/sample/ui/Makefile.am index c785ba6..2b4ee1e 100644 --- a/src/wok/plugins/sample/ui/Makefile.am +++ b/src/wok/plugins/sample/ui/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/plugins/sample/ui/config/Makefile.am b/src/wok/plugins/sample/ui/config/Makefile.am index 4054045..d3663dd 100644 --- a/src/wok/plugins/sample/ui/config/Makefile.am +++ b/src/wok/plugins/sample/ui/config/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/plugins/sample/ui/js/Makefile.am b/src/wok/plugins/sample/ui/js/Makefile.am index 96d1f4a..46bfe29 100644 --- a/src/wok/plugins/sample/ui/js/Makefile.am +++ b/src/wok/plugins/sample/ui/js/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/plugins/sample/ui/js/util.js b/src/wok/plugins/sample/ui/js/util.js index 55909d1..5786c05 100644 --- a/src/wok/plugins/sample/ui/js/util.js +++ b/src/wok/plugins/sample/ui/js/util.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2014-2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/src/wok/plugins/sample/ui/pages/Makefile.am b/src/wok/plugins/sample/ui/pages/Makefile.am index e4df623..f1774dc 100644 --- a/src/wok/plugins/sample/ui/pages/Makefile.am +++ b/src/wok/plugins/sample/ui/pages/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2014-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/plugins/sample/ui/pages/i18n.json.tmpl b/src/wok/plugins/sample/ui/pages/i18n.json.tmpl index 3146025..124ac30 100644 --- a/src/wok/plugins/sample/ui/pages/i18n.json.tmpl +++ b/src/wok/plugins/sample/ui/pages/i18n.json.tmpl @@ -1,7 +1,7 @@ #* * Project Wok * - * Copyright IBM, Corp. 2014-2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/src/wok/plugins/sample/ui/pages/sample-tab1.html.tmpl b/src/wok/plugins/sample/ui/pages/sample-tab1.html.tmpl index 19b2c07..2777848 100644 --- a/src/wok/plugins/sample/ui/pages/sample-tab1.html.tmpl +++ b/src/wok/plugins/sample/ui/pages/sample-tab1.html.tmpl @@ -1,7 +1,7 @@ #* * Project Wok * - * Copyright IBM, Corp. 2014-2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/src/wok/plugins/sample/ui/pages/sample-tab2.html.tmpl b/src/wok/plugins/sample/ui/pages/sample-tab2.html.tmpl index 19b2c07..2777848 100644 --- a/src/wok/plugins/sample/ui/pages/sample-tab2.html.tmpl +++ b/src/wok/plugins/sample/ui/pages/sample-tab2.html.tmpl @@ -1,7 +1,7 @@ #* * Project Wok * - * Copyright IBM, Corp. 2014-2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/src/wok/proxy.py b/src/wok/proxy.py index f5351e3..f13dede 100644 --- a/src/wok/proxy.py +++ b/src/wok/proxy.py @@ -2,7 +2,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2014-2016 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/rollbackcontext.py b/src/wok/rollbackcontext.py index 14cd937..6ad8a90 100644 --- a/src/wok/rollbackcontext.py +++ b/src/wok/rollbackcontext.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/root.py b/src/wok/root.py index dcc2991..174a9b9 100644 --- a/src/wok/root.py +++ b/src/wok/root.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/server.py b/src/wok/server.py index 9fdf1a8..80c1da2 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2016 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/sslcert.py b/src/wok/sslcert.py index 47072e9..a3dd551 100644 --- a/src/wok/sslcert.py +++ b/src/wok/sslcert.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # Copyright (C) 2004-2005 OSAF. All Rights Reserved. # # Code derived from Project Kimchi diff --git a/src/wok/template.py b/src/wok/template.py index ed3873e..09f4dbe 100644 --- a/src/wok/template.py +++ b/src/wok/template.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/utils.py b/src/wok/utils.py index dfcd978..e2f1d8e 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2016 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/xmlutils/Makefile.am b/src/wok/xmlutils/Makefile.am index 1ae0f2b..b06b979 100644 --- a/src/wok/xmlutils/Makefile.am +++ b/src/wok/xmlutils/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2014-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/xmlutils/__init__.py b/src/wok/xmlutils/__init__.py index 3d5632a..9323207 100644 --- a/src/wok/xmlutils/__init__.py +++ b/src/wok/xmlutils/__init__.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2014-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wok/xmlutils/utils.py b/src/wok/xmlutils/utils.py index cabb859..7717d36 100644 --- a/src/wok/xmlutils/utils.py +++ b/src/wok/xmlutils/utils.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2014-2016 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/src/wokd.in b/src/wokd.in index 733338a..59a81f8 100644 --- a/src/wokd.in +++ b/src/wokd.in @@ -2,7 +2,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2016 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/tests/Makefile.am b/tests/Makefile.am index e9800a5..9ead666 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,7 @@ # # Project wok # -# Copyright IBM Corp, 2015 +# Copyright IBM Corp, 2013-2016 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/tests/__init__.py b/tests/__init__.py index 784a988..8cb9126 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/tests/run_tests.sh.in b/tests/run_tests.sh.in index d31b194..a259bda 100644 --- a/tests/run_tests.sh.in +++ b/tests/run_tests.sh.in @@ -2,7 +2,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2013-2016 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/tests/test_api.py b/tests/test_api.py index 3150c1e..e9c8714 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2016 +# Copyright IBM Corp, 2016 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/tests/test_config.py.in b/tests/test_config.py.in index d1a8576..28c7a57 100644 --- a/tests/test_config.py.in +++ b/tests/test_config.py.in @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2014-2016 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/tests/test_exception.py b/tests/test_exception.py index f012569..31eca08 100644 --- a/tests/test_exception.py +++ b/tests/test_exception.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2013-2016 # # Code delivered from Project Kimchi # diff --git a/tests/test_objectstore.py b/tests/test_objectstore.py index d11e6b7..3ea7b70 100644 --- a/tests/test_objectstore.py +++ b/tests/test_objectstore.py @@ -2,7 +2,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # Code delivered from Project Kimchi # diff --git a/tests/test_plugin.py b/tests/test_plugin.py index f2e12d3..7c5e8e8 100644 --- a/tests/test_plugin.py +++ b/tests/test_plugin.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2013-2016 # # Code delivered from Project Kimchi # diff --git a/tests/test_rollbackcontext.py b/tests/test_rollbackcontext.py index 3282be5..17607e5 100644 --- a/tests/test_rollbackcontext.py +++ b/tests/test_rollbackcontext.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2014-2015 +# Copyright IBM Corp, 2014-2016 # # Code delivered from Project Kimchi # diff --git a/tests/test_server.py b/tests/test_server.py index 8ffc388..1f5a236 100644 --- a/tests/test_server.py +++ b/tests/test_server.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2013-2016 # # Code delivered from Project Kimchi # diff --git a/tests/test_utils.py b/tests/test_utils.py index 745d3d6..bd00590 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # Code delivered from Project Kimchi # diff --git a/tests/utils.py b/tests/utils.py index 686b13b..bb9efb0 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2016 +# Copyright IBM Corp, 2013-2016 # # Code delivered from Project Kimchi # diff --git a/ui/Makefile.am b/ui/Makefile.am index 5170546..c3ee649 100644 --- a/ui/Makefile.am +++ b/ui/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2013-2016 # # Code derived from Project Kimchi # diff --git a/ui/base64/Makefile.am b/ui/base64/Makefile.am index ca2efca..b3024c1 100644 --- a/ui/base64/Makefile.am +++ b/ui/base64/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/ui/css/Makefile.am b/ui/css/Makefile.am index 170cc63..875783d 100644 --- a/ui/css/Makefile.am +++ b/ui/css/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2013-2016 # # Code derived from Project Kimchi # diff --git a/ui/css/bootstrap-select.custom.css b/ui/css/bootstrap-select.custom.css index f119b1c..3ed38c9 100644 --- a/ui/css/bootstrap-select.custom.css +++ b/ui/css/bootstrap-select.custom.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2015 + * Copyright IBM Corp, 2015-2016 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/css/bootstrap.custom.css b/ui/css/bootstrap.custom.css index 08746a7..7f35e61 100644 --- a/ui/css/bootstrap.custom.css +++ b/ui/css/bootstrap.custom.css @@ -2,7 +2,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2015 + * Copyright IBM Corp, 2015-2016 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/css/fontawesome/Makefile.am b/ui/css/fontawesome/Makefile.am index d52e6b5..ffd7be1 100644 --- a/ui/css/fontawesome/Makefile.am +++ b/ui/css/fontawesome/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/ui/css/jquery-ui.custom.css b/ui/css/jquery-ui.custom.css index ba3d95a..f38aa4b 100644 --- a/ui/css/jquery-ui.custom.css +++ b/ui/css/jquery-ui.custom.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/opensans/Makefile.am b/ui/css/opensans/Makefile.am index 2bf5980..a01c208 100644 --- a/ui/css/opensans/Makefile.am +++ b/ui/css/opensans/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/ui/css/src/bootstrap-select.custom.scss b/ui/css/src/bootstrap-select.custom.scss index cfac637..b678970 100644 --- a/ui/css/src/bootstrap-select.custom.scss +++ b/ui/css/src/bootstrap-select.custom.scss @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2015 + * Copyright IBM Corp, 2015-2016 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/css/src/bootstrap.custom.scss b/ui/css/src/bootstrap.custom.scss index f17f11c..62b7bff 100644 --- a/ui/css/src/bootstrap.custom.scss +++ b/ui/css/src/bootstrap.custom.scss @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2015 + * Copyright IBM Corp, 2015-2016 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/css/src/modules/_about.scss b/ui/css/src/modules/_about.scss index 4d9cdae..49a51d9 100644 --- a/ui/css/src/modules/_about.scss +++ b/ui/css/src/modules/_about.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015 +// Copyright IBM Corp, 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/ui/css/src/modules/_animation.scss b/ui/css/src/modules/_animation.scss index fe5fa56..e6a76e9 100644 --- a/ui/css/src/modules/_animation.scss +++ b/ui/css/src/modules/_animation.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015 +// Copyright IBM Corp, 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/ui/css/src/modules/_base.scss b/ui/css/src/modules/_base.scss index a79c9a3..5a488ee 100644 --- a/ui/css/src/modules/_base.scss +++ b/ui/css/src/modules/_base.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015 +// Copyright IBM Corp, 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/ui/css/src/modules/_buttons.scss b/ui/css/src/modules/_buttons.scss index 2942dac..85d9531 100644 --- a/ui/css/src/modules/_buttons.scss +++ b/ui/css/src/modules/_buttons.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015 +// Copyright IBM Corp, 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/ui/css/src/modules/_datagrid.scss b/ui/css/src/modules/_datagrid.scss index 3232539..8bb1ca1 100644 --- a/ui/css/src/modules/_datagrid.scss +++ b/ui/css/src/modules/_datagrid.scss @@ -1,7 +1,7 @@ // // Project Wok // - // Copyright IBM, Corp. 2015 + // Copyright IBM Corp, 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/ui/css/src/modules/_loaders.scss b/ui/css/src/modules/_loaders.scss index de787e8..d8667f0 100644 --- a/ui/css/src/modules/_loaders.scss +++ b/ui/css/src/modules/_loaders.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015 +// Copyright IBM Corp, 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/ui/css/src/modules/_login.scss b/ui/css/src/modules/_login.scss index b350640..3254981 100644 --- a/ui/css/src/modules/_login.scss +++ b/ui/css/src/modules/_login.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015-2016 +// Copyright IBM Corp, 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/ui/css/src/modules/_menu-flat.scss b/ui/css/src/modules/_menu-flat.scss index 179010c..ba9016b 100644 --- a/ui/css/src/modules/_menu-flat.scss +++ b/ui/css/src/modules/_menu-flat.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015 +// Copyright IBM Corp, 2015-2016 // // Licensed under the Apache License, Version 2.0 (the 'License'); // you may not use this file except in compliance with the License. diff --git a/ui/css/src/modules/_mixins.scss b/ui/css/src/modules/_mixins.scss index 4e4ee3c..22afa39 100644 --- a/ui/css/src/modules/_mixins.scss +++ b/ui/css/src/modules/_mixins.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015 +// Copyright IBM Corp, 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/ui/css/src/modules/_modal-flat.scss b/ui/css/src/modules/_modal-flat.scss index efe55df..47806ca 100644 --- a/ui/css/src/modules/_modal-flat.scss +++ b/ui/css/src/modules/_modal-flat.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015-2016 +// Copyright IBM Corp, 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/ui/css/src/modules/_navbar-flat.scss b/ui/css/src/modules/_navbar-flat.scss index 10e06f2..3c68ab2 100644 --- a/ui/css/src/modules/_navbar-flat.scss +++ b/ui/css/src/modules/_navbar-flat.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015-2016 +// Copyright IBM Corp, 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/ui/css/src/modules/_tables-flat.scss b/ui/css/src/modules/_tables-flat.scss index 906aeb7..397d04c 100644 --- a/ui/css/src/modules/_tables-flat.scss +++ b/ui/css/src/modules/_tables-flat.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015 +// Copyright IBM Corp, 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/ui/css/src/modules/_toolbar.scss b/ui/css/src/modules/_toolbar.scss index 9301a9a..7f042c1 100644 --- a/ui/css/src/modules/_toolbar.scss +++ b/ui/css/src/modules/_toolbar.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015 +// Copyright IBM Corp, 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/ui/css/src/modules/_utils.scss b/ui/css/src/modules/_utils.scss index 52b2379..8229cf7 100644 --- a/ui/css/src/modules/_utils.scss +++ b/ui/css/src/modules/_utils.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015 +// Copyright IBM Corp, 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/ui/css/src/modules/_validation.scss b/ui/css/src/modules/_validation.scss index 687b8a2..860d83c 100644 --- a/ui/css/src/modules/_validation.scss +++ b/ui/css/src/modules/_validation.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015 +// Copyright IBM Corp, 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/ui/css/src/modules/_wok-confirm.scss b/ui/css/src/modules/_wok-confirm.scss index c447b88..4126b1d 100644 --- a/ui/css/src/modules/_wok-confirm.scss +++ b/ui/css/src/modules/_wok-confirm.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015-2016 +// Copyright IBM Corp, 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/ui/css/src/modules/_wok-forms.scss b/ui/css/src/modules/_wok-forms.scss index d5d2dc3..ff348c2 100644 --- a/ui/css/src/modules/_wok-forms.scss +++ b/ui/css/src/modules/_wok-forms.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015 +// Copyright IBM Corp, 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/ui/css/src/modules/_wok-grid.scss b/ui/css/src/modules/_wok-grid.scss index acdaf2b..730d224 100644 --- a/ui/css/src/modules/_wok-grid.scss +++ b/ui/css/src/modules/_wok-grid.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015-2016 +// Copyright IBM Corp, 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/ui/css/src/modules/_wok-variables.scss b/ui/css/src/modules/_wok-variables.scss index e262fe9..1cd5ed2 100644 --- a/ui/css/src/modules/_wok-variables.scss +++ b/ui/css/src/modules/_wok-variables.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015-2016 +// Copyright IBM Corp, 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/ui/css/src/wok.scss b/ui/css/src/wok.scss index 8d87168..ad3663c 100755 --- a/ui/css/src/wok.scss +++ b/ui/css/src/wok.scss @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/about.css b/ui/css/theme-default/about.css index a4c287c..e394a25 100644 --- a/ui/css/theme-default/about.css +++ b/ui/css/theme-default/about.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2014-2015 + * Copyright IBM Corp, 2014-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/base.css b/ui/css/theme-default/base.css index ea7dca4..08ec9dc 100644 --- a/ui/css/theme-default/base.css +++ b/ui/css/theme-default/base.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/button-flat.css b/ui/css/theme-default/button-flat.css index d666bf2..ab276d6 100755 --- a/ui/css/theme-default/button-flat.css +++ b/ui/css/theme-default/button-flat.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/button.css b/ui/css/theme-default/button.css index 44aaf7a..7c7f0ca 100644 --- a/ui/css/theme-default/button.css +++ b/ui/css/theme-default/button.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2013-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/checkbox-flat.css b/ui/css/theme-default/checkbox-flat.css index 82f6a89..93dc145 100644 --- a/ui/css/theme-default/checkbox-flat.css +++ b/ui/css/theme-default/checkbox-flat.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/circleGauge.css b/ui/css/theme-default/circleGauge.css index 3c3c296..70aab5e 100644 --- a/ui/css/theme-default/circleGauge.css +++ b/ui/css/theme-default/circleGauge.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2014-2015 + * Copyright IBM Corp, 2014-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/datagrid.css b/ui/css/theme-default/datagrid.css index 1b33030..5579852 100644 --- a/ui/css/theme-default/datagrid.css +++ b/ui/css/theme-default/datagrid.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/dialog-flat.css b/ui/css/theme-default/dialog-flat.css index 62f1a74..d59e1c2 100644 --- a/ui/css/theme-default/dialog-flat.css +++ b/ui/css/theme-default/dialog-flat.css @@ -1,7 +1,7 @@ /* * Project Wok * -* Copyright IBM, Corp. 2015 +* Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/error.css b/ui/css/theme-default/error.css index 46f2960..0b5a48c 100644 --- a/ui/css/theme-default/error.css +++ b/ui/css/theme-default/error.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2013-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/form.css b/ui/css/theme-default/form.css index 23fd1ca..f1bd21c 100644 --- a/ui/css/theme-default/form.css +++ b/ui/css/theme-default/form.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2013-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/framework.css b/ui/css/theme-default/framework.css index e1e2200..c7cc9ca 100644 --- a/ui/css/theme-default/framework.css +++ b/ui/css/theme-default/framework.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2013-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/gauge-flat.css b/ui/css/theme-default/gauge-flat.css index 881b7ac..b726ca0 100755 --- a/ui/css/theme-default/gauge-flat.css +++ b/ui/css/theme-default/gauge-flat.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/grid.css b/ui/css/theme-default/grid.css index 711c7f8..9a4b83a 100644 --- a/ui/css/theme-default/grid.css +++ b/ui/css/theme-default/grid.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2013-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/jquery-ui.custom.css b/ui/css/theme-default/jquery-ui.custom.css index 61879f8..a616bb8 100644 --- a/ui/css/theme-default/jquery-ui.custom.css +++ b/ui/css/theme-default/jquery-ui.custom.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2014-2015 + * Copyright IBM Corp, 2014-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/line-chart.css b/ui/css/theme-default/line-chart.css index 393204d..7db4f9c 100644 --- a/ui/css/theme-default/line-chart.css +++ b/ui/css/theme-default/line-chart.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2013-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/line.css b/ui/css/theme-default/line.css index c90340e..250b3fd 100644 --- a/ui/css/theme-default/line.css +++ b/ui/css/theme-default/line.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/list-flat.css b/ui/css/theme-default/list-flat.css index 9156e03..fcfb0e6 100644 --- a/ui/css/theme-default/list-flat.css +++ b/ui/css/theme-default/list-flat.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/login-window.css b/ui/css/theme-default/login-window.css index 037f1ac..ae245e9 100644 --- a/ui/css/theme-default/login-window.css +++ b/ui/css/theme-default/login-window.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2013-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/menu-flat.css b/ui/css/theme-default/menu-flat.css index 186356e..0bed09d 100644 --- a/ui/css/theme-default/menu-flat.css +++ b/ui/css/theme-default/menu-flat.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/message-flat.css b/ui/css/theme-default/message-flat.css index 4c4b580..85ed633 100644 --- a/ui/css/theme-default/message-flat.css +++ b/ui/css/theme-default/message-flat.css @@ -1,7 +1,7 @@ /* * Project Wok * -* Copyright IBM, Corp. 2015 +* Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/message.css b/ui/css/theme-default/message.css index 5775334..872e16f 100644 --- a/ui/css/theme-default/message.css +++ b/ui/css/theme-default/message.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2013-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/messagebar-flat.css b/ui/css/theme-default/messagebar-flat.css index d63920a..278a61c 100644 --- a/ui/css/theme-default/messagebar-flat.css +++ b/ui/css/theme-default/messagebar-flat.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/nav-tree.css b/ui/css/theme-default/nav-tree.css index 689a24d..c9f12ec 100644 --- a/ui/css/theme-default/nav-tree.css +++ b/ui/css/theme-default/nav-tree.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2013-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/navbar.css b/ui/css/theme-default/navbar.css index 91692f1..16f0ea0 100644 --- a/ui/css/theme-default/navbar.css +++ b/ui/css/theme-default/navbar.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2013-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/popover.css b/ui/css/theme-default/popover.css index 43e9a0e..2cb26cb 100644 --- a/ui/css/theme-default/popover.css +++ b/ui/css/theme-default/popover.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2013-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/radio-flat.css b/ui/css/theme-default/radio-flat.css index 85681e9..424ef09 100644 --- a/ui/css/theme-default/radio-flat.css +++ b/ui/css/theme-default/radio-flat.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/reset.css b/ui/css/theme-default/reset.css index 2b5aa44..947e18c 100644 --- a/ui/css/theme-default/reset.css +++ b/ui/css/theme-default/reset.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2013-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/selectmenu-flat.css b/ui/css/theme-default/selectmenu-flat.css index 933f5fd..ee29874 100644 --- a/ui/css/theme-default/selectmenu-flat.css +++ b/ui/css/theme-default/selectmenu-flat.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/tabs.css b/ui/css/theme-default/tabs.css index 6a36307..42ca504 100644 --- a/ui/css/theme-default/tabs.css +++ b/ui/css/theme-default/tabs.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/textbox-flat.css b/ui/css/theme-default/textbox-flat.css index 7a0313a..a1d8208 100644 --- a/ui/css/theme-default/textbox-flat.css +++ b/ui/css/theme-default/textbox-flat.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/theme.css b/ui/css/theme-default/theme.css index 21d9c3b..8bea083 100644 --- a/ui/css/theme-default/theme.css +++ b/ui/css/theme-default/theme.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/tile-check.css b/ui/css/theme-default/tile-check.css index e9a11e5..34a9b16 100644 --- a/ui/css/theme-default/tile-check.css +++ b/ui/css/theme-default/tile-check.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2013-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/toolbar.css b/ui/css/theme-default/toolbar.css index 1d37f4d..d233dc2 100644 --- a/ui/css/theme-default/toolbar.css +++ b/ui/css/theme-default/toolbar.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2013-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/topbar.css b/ui/css/theme-default/topbar.css index d68cf98..33624aa 100644 --- a/ui/css/theme-default/topbar.css +++ b/ui/css/theme-default/topbar.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2013-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/theme-default/window.css b/ui/css/theme-default/window.css index fa836dd..7213cb3 100644 --- a/ui/css/theme-default/window.css +++ b/ui/css/theme-default/window.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2013-2016 * * Code derived from Project Kimchi * diff --git a/ui/css/wok.css b/ui/css/wok.css index ec69ec4..16679ff 100644 --- a/ui/css/wok.css +++ b/ui/css/wok.css @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/images/Makefile.am b/ui/images/Makefile.am index ef15cea..7220d86 100644 --- a/ui/images/Makefile.am +++ b/ui/images/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2013-2016 # # Code derived from Project Kimchi # diff --git a/ui/images/theme-default/Makefile.am b/ui/images/theme-default/Makefile.am index ad35a51..ece97b6 100644 --- a/ui/images/theme-default/Makefile.am +++ b/ui/images/theme-default/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2013-2016 # # Code derived from Project Kimchi # diff --git a/ui/js/Makefile.am b/ui/js/Makefile.am index 832365f..9f874cb 100644 --- a/ui/js/Makefile.am +++ b/ui/js/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2013-2016 # # Code derived from Project Kimchi # diff --git a/ui/js/src/wok.api.js b/ui/js/src/wok.api.js index c97dba8..24ea495 100644 --- a/ui/js/src/wok.api.js +++ b/ui/js/src/wok.api.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2016 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/js/src/wok.confirm.js b/ui/js/src/wok.confirm.js index 3e7ce54..fde76bf 100644 --- a/ui/js/src/wok.confirm.js +++ b/ui/js/src/wok.confirm.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2015 + * Copyright IBM Corp, 2015-2016 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/js/src/wok.cookie.js b/ui/js/src/wok.cookie.js index 41c3912..be87b03 100644 --- a/ui/js/src/wok.cookie.js +++ b/ui/js/src/wok.cookie.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/js/src/wok.datagrid.js b/ui/js/src/wok.datagrid.js index 9f2f17b..cc269f7 100644 --- a/ui/js/src/wok.datagrid.js +++ b/ui/js/src/wok.datagrid.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/js/src/wok.form.js b/ui/js/src/wok.form.js index 8915abf..5308306 100644 --- a/ui/js/src/wok.form.js +++ b/ui/js/src/wok.form.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2016 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/js/src/wok.grid.js b/ui/js/src/wok.grid.js index 39eac81..9d81401 100644 --- a/ui/js/src/wok.grid.js +++ b/ui/js/src/wok.grid.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2016 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/js/src/wok.lang.js b/ui/js/src/wok.lang.js index 783cbfa..b3791e7 100644 --- a/ui/js/src/wok.lang.js +++ b/ui/js/src/wok.lang.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/js/src/wok.line-chart.js b/ui/js/src/wok.line-chart.js index 8aff98a..e0113f3 100644 --- a/ui/js/src/wok.line-chart.js +++ b/ui/js/src/wok.line-chart.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2016 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/js/src/wok.list.js b/ui/js/src/wok.list.js index 6451822..7d8e27c 100644 --- a/ui/js/src/wok.list.js +++ b/ui/js/src/wok.list.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2016 + * Copyright IBM Corp, 2015-2016 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/js/src/wok.login.js b/ui/js/src/wok.login.js index bda64ca..ba63337 100644 --- a/ui/js/src/wok.login.js +++ b/ui/js/src/wok.login.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2014-2016 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js index c9cf28b..7d604b4 100644 --- a/ui/js/src/wok.main.js +++ b/ui/js/src/wok.main.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2016 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/js/src/wok.message.js b/ui/js/src/wok.message.js index 63bf84e..d602805 100644 --- a/ui/js/src/wok.message.js +++ b/ui/js/src/wok.message.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/js/src/wok.object.js b/ui/js/src/wok.object.js index 35484e8..7538422 100644 --- a/ui/js/src/wok.object.js +++ b/ui/js/src/wok.object.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2014-2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/js/src/wok.popable.js b/ui/js/src/wok.popable.js index 289e60f..0d41e44 100644 --- a/ui/js/src/wok.popable.js +++ b/ui/js/src/wok.popable.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/js/src/wok.select.js b/ui/js/src/wok.select.js index 43cb57f..2b0a966 100644 --- a/ui/js/src/wok.select.js +++ b/ui/js/src/wok.select.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/js/src/wok.string.js b/ui/js/src/wok.string.js index ea9e2ee..2bc4441 100644 --- a/ui/js/src/wok.string.js +++ b/ui/js/src/wok.string.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2014-2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/js/src/wok.substitute.js b/ui/js/src/wok.substitute.js index 30329a8..deb28f1 100644 --- a/ui/js/src/wok.substitute.js +++ b/ui/js/src/wok.substitute.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2014-2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/js/src/wok.topic.js b/ui/js/src/wok.topic.js index febbe0a..65219e2 100644 --- a/ui/js/src/wok.topic.js +++ b/ui/js/src/wok.topic.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/js/src/wok.user.js b/ui/js/src/wok.user.js index 2734f1e..20b4d24 100644 --- a/ui/js/src/wok.user.js +++ b/ui/js/src/wok.user.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/js/src/wok.utils.js b/ui/js/src/wok.utils.js index 07fab1f..e5701e6 100644 --- a/ui/js/src/wok.utils.js +++ b/ui/js/src/wok.utils.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/js/src/wok.window.js b/ui/js/src/wok.window.js index 4edf25e..1386e09 100644 --- a/ui/js/src/wok.window.js +++ b/ui/js/src/wok.window.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * diff --git a/ui/libs/Makefile.am b/ui/libs/Makefile.am index f001c66..c876b8b 100644 --- a/ui/libs/Makefile.am +++ b/ui/libs/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2016 +# Copyright IBM Corp, 2013-2016 # # Code derived from Project Kimchi # diff --git a/ui/libs/bootstrap-editable/Makefile.am b/ui/libs/bootstrap-editable/Makefile.am index af0ec14..b968c81 100644 --- a/ui/libs/bootstrap-editable/Makefile.am +++ b/ui/libs/bootstrap-editable/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/libs/bootstrap-editable/dist/Makefile.am b/ui/libs/bootstrap-editable/dist/Makefile.am index 1b43864..7fc43d5 100644 --- a/ui/libs/bootstrap-editable/dist/Makefile.am +++ b/ui/libs/bootstrap-editable/dist/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/libs/bootstrap-editable/dist/css/Makefile.am b/ui/libs/bootstrap-editable/dist/css/Makefile.am index 6816ea9..6aa2f7d 100644 --- a/ui/libs/bootstrap-editable/dist/css/Makefile.am +++ b/ui/libs/bootstrap-editable/dist/css/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/libs/bootstrap-editable/dist/js/Makefile.am b/ui/libs/bootstrap-editable/dist/js/Makefile.am index 880fc49..8c3bdd5 100644 --- a/ui/libs/bootstrap-editable/dist/js/Makefile.am +++ b/ui/libs/bootstrap-editable/dist/js/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/libs/bootstrap-select/Makefile.am b/ui/libs/bootstrap-select/Makefile.am index 858b32a..e06abf2 100644 --- a/ui/libs/bootstrap-select/Makefile.am +++ b/ui/libs/bootstrap-select/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/ui/libs/bootstrap-select/dist/Makefile.am b/ui/libs/bootstrap-select/dist/Makefile.am index bb579e0..7f810d4 100644 --- a/ui/libs/bootstrap-select/dist/Makefile.am +++ b/ui/libs/bootstrap-select/dist/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/ui/libs/bootstrap-select/dist/css/Makefile.am b/ui/libs/bootstrap-select/dist/css/Makefile.am index fe6158c..1e97846 100644 --- a/ui/libs/bootstrap-select/dist/css/Makefile.am +++ b/ui/libs/bootstrap-select/dist/css/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/ui/libs/bootstrap-select/dist/js/Makefile.am b/ui/libs/bootstrap-select/dist/js/Makefile.am index 4d3a796..3b19ded 100644 --- a/ui/libs/bootstrap-select/dist/js/Makefile.am +++ b/ui/libs/bootstrap-select/dist/js/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/ui/libs/bootstrap-switch/Makefile.am b/ui/libs/bootstrap-switch/Makefile.am index af0ec14..b968c81 100644 --- a/ui/libs/bootstrap-switch/Makefile.am +++ b/ui/libs/bootstrap-switch/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/libs/bootstrap-switch/dist/Makefile.am b/ui/libs/bootstrap-switch/dist/Makefile.am index 1b43864..7fc43d5 100644 --- a/ui/libs/bootstrap-switch/dist/Makefile.am +++ b/ui/libs/bootstrap-switch/dist/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/libs/bootstrap-switch/dist/css/Makefile.am b/ui/libs/bootstrap-switch/dist/css/Makefile.am index ac45858..b0e903c 100644 --- a/ui/libs/bootstrap-switch/dist/css/Makefile.am +++ b/ui/libs/bootstrap-switch/dist/css/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/libs/bootstrap-switch/dist/js/Makefile.am b/ui/libs/bootstrap-switch/dist/js/Makefile.am index 0b82c14..2980354 100644 --- a/ui/libs/bootstrap-switch/dist/js/Makefile.am +++ b/ui/libs/bootstrap-switch/dist/js/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/libs/bootstrap/Makefile.am b/ui/libs/bootstrap/Makefile.am index fe35d79..ac56d39 100644 --- a/ui/libs/bootstrap/Makefile.am +++ b/ui/libs/bootstrap/Makefile.am @@ -1,7 +1,7 @@ # # Project Wol # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/ui/libs/es5-shim/Makefile.am b/ui/libs/es5-shim/Makefile.am index 5bbe691..7e0e63c 100644 --- a/ui/libs/es5-shim/Makefile.am +++ b/ui/libs/es5-shim/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/ui/libs/jquery-bootgrid/Makefile.am b/ui/libs/jquery-bootgrid/Makefile.am index af0ec14..b968c81 100644 --- a/ui/libs/jquery-bootgrid/Makefile.am +++ b/ui/libs/jquery-bootgrid/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/libs/jquery-bootgrid/dist/Makefile.am b/ui/libs/jquery-bootgrid/dist/Makefile.am index 1b43864..7fc43d5 100644 --- a/ui/libs/jquery-bootgrid/dist/Makefile.am +++ b/ui/libs/jquery-bootgrid/dist/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/libs/jquery-bootgrid/dist/css/Makefile.am b/ui/libs/jquery-bootgrid/dist/css/Makefile.am index df3b5f0..ce13781 100644 --- a/ui/libs/jquery-bootgrid/dist/css/Makefile.am +++ b/ui/libs/jquery-bootgrid/dist/css/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/libs/jquery-bootgrid/dist/js/Makefile.am b/ui/libs/jquery-bootgrid/dist/js/Makefile.am index 1b2989b..2453464 100644 --- a/ui/libs/jquery-bootgrid/dist/js/Makefile.am +++ b/ui/libs/jquery-bootgrid/dist/js/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/libs/jquery-i18n/Makefile.am b/ui/libs/jquery-i18n/Makefile.am index f33a9fc..d5443ba 100644 --- a/ui/libs/jquery-i18n/Makefile.am +++ b/ui/libs/jquery-i18n/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/ui/libs/jquery-ui/Makefile.am b/ui/libs/jquery-ui/Makefile.am index 5c86d6e..d5bb253 100644 --- a/ui/libs/jquery-ui/Makefile.am +++ b/ui/libs/jquery-ui/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/ui/libs/jquery-ui/themes/Makefile.am b/ui/libs/jquery-ui/themes/Makefile.am index b8e9653..8594960 100644 --- a/ui/libs/jquery-ui/themes/Makefile.am +++ b/ui/libs/jquery-ui/themes/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/ui/libs/jquery-ui/themes/base/Makefile.am b/ui/libs/jquery-ui/themes/base/Makefile.am index 67547e2..1486544 100644 --- a/ui/libs/jquery-ui/themes/base/Makefile.am +++ b/ui/libs/jquery-ui/themes/base/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/ui/libs/jquery-ui/themes/base/images/Makefile.am b/ui/libs/jquery-ui/themes/base/images/Makefile.am index 437f8af..683596f 100644 --- a/ui/libs/jquery-ui/themes/base/images/Makefile.am +++ b/ui/libs/jquery-ui/themes/base/images/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/ui/libs/jquery/Makefile.am b/ui/libs/jquery/Makefile.am index 14cc1d3..72a4cd3 100644 --- a/ui/libs/jquery/Makefile.am +++ b/ui/libs/jquery/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/ui/libs/list-js/Makefile.am b/ui/libs/list-js/Makefile.am index 2fcc0fb..2474591 100644 --- a/ui/libs/list-js/Makefile.am +++ b/ui/libs/list-js/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # Code derived from Project Kimchi # diff --git a/ui/libs/typeahead/Makefile.am b/ui/libs/typeahead/Makefile.am index 566f8ff..f12d022 100644 --- a/ui/libs/typeahead/Makefile.am +++ b/ui/libs/typeahead/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2016 +# Copyright IBM Corp, 2016 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/pages/Makefile.am b/ui/pages/Makefile.am index 53a6e76..0b13c0d 100644 --- a/ui/pages/Makefile.am +++ b/ui/pages/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2013-2016 +# Copyright IBM Corp, 2013-2016 # # Code derived from Project Kimchi # diff --git a/ui/pages/error.html.tmpl b/ui/pages/error.html.tmpl index 298dbe2..89d0463 100644 --- a/ui/pages/error.html.tmpl +++ b/ui/pages/error.html.tmpl @@ -1,7 +1,7 @@ #* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2013-2016 * * Code derived from Project Kimchi * diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 7188a98..8ceb756 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -1,7 +1,7 @@ #* * Project Wok * - * Copyright IBM, Corp. 2014-2015 + * Copyright IBM Corp, 2014-2016 * * Code derived from Project Kimchi * diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index 434301e..11b2f2c 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -1,7 +1,7 @@ #* * Project Wok * - * Copyright IBM, Corp. 2014-2015 + * Copyright IBM Corp, 2014-2016 * * Code derived from Project Kimchi * diff --git a/ui/pages/wok-ui.html.tmpl b/ui/pages/wok-ui.html.tmpl index f2faafa..f4dd135 100644 --- a/ui/pages/wok-ui.html.tmpl +++ b/ui/pages/wok-ui.html.tmpl @@ -1,7 +1,7 @@ #* * Project Wok * - * Copyright IBM, Corp. 2013-2016 + * Copyright IBM Corp, 2015-2016 * * Code derived from Project Kimchi * -- 2.5.0

Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com&gt; --- Makefile.am | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/Makefile.am b/Makefile.am index dfaa38d..86d83a0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -48,24 +48,26 @@ I18N_FILES = src/wok/plugins/*/i18n.py \ check-local: PYTHONPATH=src contrib/check_i18n.py $(I18N_FILES) - @if [ -d '.git' ]; then \ - find . -path './.git' -prune -o \ - -name '*.py' -o -name '*.py.in' | \ - xargs $(PYFLAKES) | \ - while read LINE; do echo "$$LINE"; false; done \ - else \ - find . -name '*.py' -o -name '*.py.in' | \ - xargs $(PYFLAKES) | \ - while read LINE; do echo "$$LINE"; false; done \ + @if [ -d '.git' ]; then \ + find . -path './.git' -prune -o \ + -name '*.py' -o -name '*.py.in' | \ + xargs $(PYFLAKES) | \ + while read LINE; do echo "$$LINE"; false; done \ + else \ + find . -name '*.py' -o -name '*.py.in' | \ + xargs $(PYFLAKES) | \ + while read LINE; do echo "$$LINE"; false; done \ fi $(PEP8) --version $(PEP8) --filename '*.py,*.py.in' --exclude="$(PEP8_BLACKLIST)" . /bin/bash check_ui_code_errors.sh - @if $(GIT) rev-parse &> /dev/null ; then \ - echo "Whitespace verification ..."; \ - git grep --cached -Il '' | \ - grep -v '^ui/css/src/vendor/' | xargs egrep '.* +$$' \ - && echo "ERROR: Whitespaces found" || echo "Ok"; \ + @if $(GIT) rev-parse &> /dev/null ; then \ + echo "Whitespace verification ..."; \ + git grep --cached -Il '' | \ + grep -v '^ui/css/src/vendor/' | xargs egrep '.* +$$' \ + && echo "ERROR: Whitespaces found" || echo "Ok"; \ + echo "Check IBM license header and copyright date ..." ; \ + /bin/bash check-IBM-license-header.sh ; \ fi # Link built mo files in the source tree to enable use of translations from -- 2.5.0