[Kimchi-devel] [wok V3 0/6] Make wok branch identical to wok V3

Paulo Ricardo Paz Vital pvital at linux.vnet.ibm.com
Thu Sep 3 20:56:41 UTC 2015


Reviewed-By: Paulo Vital <pvital at linux.vnet.ibm.com>

Works for all patches of this patchset.
The "make check-local" is reporting errors but they are solved in the patchset 
[Kimchi-devel] [wok 0/3] Fix code issues pointed by make check-local


On Wed, 2015-08-05 at 10:19 -0300, Lucio Correia wrote:
> These changes are already included in "[PATCH V3 00/34] Split code
> into Wok
> server and	Kimchi plugin" and don't need to be reviewed again.
> 
> This patchset is just to make the upstream branch "wok" identical to 
> "[PATCH V3 00/34] Split code into Wok server and Kimchi plugin".
> 
> 
> Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
> 
> 
> Lucio Correia (6):
>   Move back some basic UI files to wok
>   Renamed some moved-back kimchi-named files to wok
>   Unduplicate some UI files
>   Update makefiles to reflect UI changes
>   Replace kimchi by wok calls to reflect UI changes
>   Create an icon.css with kimchi plugin specific layout
> 
>  plugins/kimchi/configure.ac                        |    4 -
>  plugins/kimchi/ui/Makefile.am                      |    2 +-
>  plugins/kimchi/ui/css/theme-default/button.css     |  524 ----------
> ----------
>  plugins/kimchi/ui/css/theme-default/icon.css       |  106 ++++
>  plugins/kimchi/ui/css/theme-default/message.css    |  135 -----
>  plugins/kimchi/ui/css/theme-default/popover.css    |  124 -----
>  plugins/kimchi/ui/images/theme-default/bg-mask.png |  Bin 2899 -> 0
> bytes
>  .../ui/images/theme-default/folder-arrow-down.png  |  Bin 2956 -> 0
> bytes
>  .../kimchi/ui/images/theme-default/logo-white.png  |  Bin 9879 -> 0
> bytes
>  plugins/kimchi/ui/js/Makefile.am                   |    4 +-
>  .../ui/js/src/kimchi.guest_storage_add.main.js     |    4 +-
>  plugins/kimchi/ui/js/src/kimchi.host.js            |   14 +-
>  .../kimchi/ui/js/src/kimchi.template_edit_main.js  |    4 +-
>  plugins/kimchi/ui/libs/Makefile.am                 |   22 -
>  plugins/kimchi/ui/libs/themes/Makefile.am          |   18 -
>  plugins/kimchi/ui/libs/themes/base/Makefile.am     |   22 -
>  .../kimchi/ui/libs/themes/base/images/Makefile.am  |   20 -
>  .../ui-bg_diagonals-thick_18_b81900_40x40.png      |  Bin 457 -> 0
> bytes
>  .../ui-bg_diagonals-thick_20_666666_40x40.png      |  Bin 351 -> 0
> bytes
>  .../base/images/ui-bg_flat_10_000000_40x100.png    |  Bin 244 -> 0
> bytes
>  .../base/images/ui-bg_glass_100_f6f6f6_1x400.png   |  Bin 301 -> 0
> bytes
>  .../base/images/ui-bg_glass_100_fdf5ce_1x400.png   |  Bin 387 -> 0
> bytes
>  .../images/ui-bg_gloss-wave_35_f6a828_500x100.png  |  Bin 5854 -> 0
> bytes
>  .../ui-bg_highlight-soft_100_eeeeee_1x100.png      |  Bin 317 -> 0
> bytes
>  .../ui-bg_highlight-soft_75_ffe45c_1x100.png       |  Bin 367 -> 0
> bytes
>  .../themes/base/images/ui-icons_228ef1_256x240.png |  Bin 4599 -> 0
> bytes
>  .../themes/base/images/ui-icons_ef8c08_256x240.png |  Bin 4599 -> 0
> bytes
>  .../themes/base/images/ui-icons_ffd27a_256x240.png |  Bin 4599 -> 0
> bytes
>  .../themes/base/images/ui-icons_ffffff_256x240.png |  Bin 6468 -> 0
> bytes
>  plugins/kimchi/ui/pages/error.html.tmpl            |   69 ---
>  ui/css/theme-default/button.css                    |   85 ----
>  .../ui => ui}/css/theme-default/circleGauge.css    |    0
>  .../kimchi/ui => ui}/css/theme-default/form.css    |    0
>  .../kimchi/ui => ui}/css/theme-default/grid.css    |    2 +-
>  .../css/theme-default/jquery-ui.custom.css         |    0
>  .../ui => ui}/css/theme-default/line-chart.css     |    0
>  .../ui => ui}/css/theme-default/tile-check.css     |    0
>  .../kimchi/ui => ui}/css/theme-default/toolbar.css |    0
>  .../ui => ui}/images/theme-default/alert.png       |  Bin 3537 ->
> 3537 bytes
>  ui/images/theme-default/arrow-down.png             |  Bin 0 -> 537
> bytes
>  .../ui => ui}/images/theme-default/check-green.png |  Bin 3501 ->
> 3501 bytes
>  .../ui => ui}/images/theme-default/check-grey.png  |  Bin 3535 ->
> 3535 bytes
>  .../images/theme-default/folder-arrow-right.png    |  Bin 2958 ->
> 2958 bytes
>  .../ui => ui}/images/theme-default/icon-alert.png  |  Bin 3545 ->
> 3545 bytes
>  .../ui => ui}/images/theme-default/icon-event.png  |  Bin 3791 ->
> 3791 bytes
>  .../images/theme-default/icon-setting.png          |  Bin 3664 ->
> 3664 bytes
>  .../ui => ui}/images/theme-default/icon-tool.png   |  Bin 4466 ->
> 4466 bytes
>  .../ui => ui}/images/theme-default/thumb-guest.png |  Bin 3896 ->
> 3896 bytes
>  .../ui => ui}/images/theme-default/thumb-host.png  |  Bin 5069 ->
> 5069 bytes
>  .../images/theme-default/wok-loading.gif           |  Bin 6181 ->
> 6181 bytes
>  .../js/src/kimchi.form.js => ui/js/src/wok.form.js |    0
>  .../js/src/kimchi.grid.js => ui/js/src/wok.grid.js |   10 +-
>  .../js/src/wok.line-chart.js                       |    4 +-
>  .../kimchi.select.js => ui/js/src/wok.select.js    |    2 +-
>  .../kimchi/ui => ui}/js/widgets/circleGauge.js     |    4 +-
>  .../base/images/ui-bg_glass_65_ffffff_1x400.png    |  Bin 246 -> 246
> bytes
>  .../themes/base/images/ui-icons_222222_256x240.png |  Bin 7006 ->
> 7006 bytes
>  57 files changed, 131 insertions(+), 1048 deletions(-)
>  delete mode 100644 plugins/kimchi/ui/css/theme-default/button.css
>  create mode 100644 plugins/kimchi/ui/css/theme-default/icon.css
>  delete mode 100644 plugins/kimchi/ui/css/theme-default/message.css
>  delete mode 100644 plugins/kimchi/ui/css/theme-default/popover.css
>  delete mode 100644 plugins/kimchi/ui/images/theme-default/bg
> -mask.png
>  delete mode 100644 plugins/kimchi/ui/images/theme-default/folder
> -arrow-down.png
>  delete mode 100644 plugins/kimchi/ui/images/theme-default/logo
> -white.png
>  delete mode 100644 plugins/kimchi/ui/libs/Makefile.am
>  delete mode 100644 plugins/kimchi/ui/libs/themes/Makefile.am
>  delete mode 100644 plugins/kimchi/ui/libs/themes/base/Makefile.am
>  delete mode 100644
> plugins/kimchi/ui/libs/themes/base/images/Makefile.am
>  delete mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui
> -bg_diagonals-thick_18_b81900_40x40.png
>  delete mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui
> -bg_diagonals-thick_20_666666_40x40.png
>  delete mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui
> -bg_flat_10_000000_40x100.png
>  delete mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui
> -bg_glass_100_f6f6f6_1x400.png
>  delete mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui
> -bg_glass_100_fdf5ce_1x400.png
>  delete mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui
> -bg_gloss-wave_35_f6a828_500x100.png
>  delete mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui
> -bg_highlight-soft_100_eeeeee_1x100.png
>  delete mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui
> -bg_highlight-soft_75_ffe45c_1x100.png
>  delete mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui
> -icons_228ef1_256x240.png
>  delete mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui
> -icons_ef8c08_256x240.png
>  delete mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui
> -icons_ffd27a_256x240.png
>  delete mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui
> -icons_ffffff_256x240.png
>  delete mode 100644 plugins/kimchi/ui/pages/error.html.tmpl
>  rename {plugins/kimchi/ui => ui}/css/theme-default/circleGauge.css
> (100%)
>  rename {plugins/kimchi/ui => ui}/css/theme-default/form.css (100%)
>  rename {plugins/kimchi/ui => ui}/css/theme-default/grid.css (98%)
>  rename {plugins/kimchi/ui => ui}/css/theme-default/jquery
> -ui.custom.css (100%)
>  rename {plugins/kimchi/ui => ui}/css/theme-default/line-chart.css
> (100%)
>  rename {plugins/kimchi/ui => ui}/css/theme-default/tile-check.css
> (100%)
>  rename {plugins/kimchi/ui => ui}/css/theme-default/toolbar.css
> (100%)
>  rename {plugins/kimchi/ui => ui}/images/theme-default/alert.png
> (100%)
>  create mode 100644 ui/images/theme-default/arrow-down.png
>  rename {plugins/kimchi/ui => ui}/images/theme-default/check
> -green.png (100%)
>  rename {plugins/kimchi/ui => ui}/images/theme-default/check-grey.png
> (100%)
>  rename {plugins/kimchi/ui => ui}/images/theme-default/folder-arrow
> -right.png (100%)
>  rename {plugins/kimchi/ui => ui}/images/theme-default/icon-alert.png
> (100%)
>  rename {plugins/kimchi/ui => ui}/images/theme-default/icon-event.png
> (100%)
>  rename {plugins/kimchi/ui => ui}/images/theme-default/icon
> -setting.png (100%)
>  rename {plugins/kimchi/ui => ui}/images/theme-default/icon-tool.png
> (100%)
>  rename {plugins/kimchi/ui => ui}/images/theme-default/thumb
> -guest.png (100%)
>  rename {plugins/kimchi/ui => ui}/images/theme-default/thumb-host.png
> (100%)
>  rename plugins/kimchi/ui/images/theme-default/kimchi-loading.gif =>
> ui/images/theme-default/wok-loading.gif (100%)
>  rename plugins/kimchi/ui/js/src/kimchi.form.js =>
> ui/js/src/wok.form.js (100%)
>  rename plugins/kimchi/ui/js/src/kimchi.grid.js =>
> ui/js/src/wok.grid.js (98%)
>  rename plugins/kimchi/ui/js/src/kimchi.line-chart.js =>
> ui/js/src/wok.line-chart.js (98%)
>  rename plugins/kimchi/ui/js/src/kimchi.select.js =>
> ui/js/src/wok.select.js (97%)
>  rename {plugins/kimchi/ui => ui}/js/widgets/circleGauge.js (97%)
>  rename {plugins/kimchi/ui => ui}/libs/themes/base/images/ui
> -bg_glass_65_ffffff_1x400.png (100%)
>  rename {plugins/kimchi/ui => ui}/libs/themes/base/images/ui
> -icons_222222_256x240.png (100%)
> 
> _______________________________________________
> Kimchi-devel mailing list
> Kimchi-devel at ovirt.org
> http://lists.ovirt.org/mailman/listinfo/kimchi-devel




More information about the Kimchi-devel mailing list