From 3e6b6f6dcf8736f106c855033c0bd2a109feac50 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Mon, 25 May 2009 14:08:23 +0000 Subject: [PATCH] Refactored loading indicator to be common for both runo and reindeer themes. Added progress indicator styles to reindeer (copied from runo). svn changeset:7997/svn branch:6.0 --- .../VAADIN/themes/base/common/common.css | 17 ++++- .../common/img/ajax-loader-big.gif | Bin .../common/img/ajax-loader-medium.gif | Bin .../{runo => base}/common/img/ajax-loader.gif | Bin .../common/img/loading-indicator-delay.gif | Bin .../common/img/loading-indicator-wait.gif | Bin .../common/img/loading-indicator.gif | Bin .../progressindicator/progressindicator.css | 17 +++-- WebContent/VAADIN/themes/base/styles.css | 34 +++++++--- .../reindeer/progressindicator/img/base.gif | Bin 0 -> 827 bytes .../progressindicator/img/disabled.gif | Bin 0 -> 179 bytes .../progressindicator/img/progress.png | Bin 0 -> 148 bytes .../progressindicator/progressindicator.css | 13 ++++ WebContent/VAADIN/themes/reindeer/styles.css | 49 ++++++++++++--- .../VAADIN/themes/runo/common/common.css | 20 ------ .../progressindicator/progressindicator.css | 4 +- WebContent/VAADIN/themes/runo/styles.css | 58 +++++++++--------- 17 files changed, 136 insertions(+), 76 deletions(-) rename WebContent/VAADIN/themes/{runo => base}/common/img/ajax-loader-big.gif (100%) rename WebContent/VAADIN/themes/{runo => base}/common/img/ajax-loader-medium.gif (100%) rename WebContent/VAADIN/themes/{runo => base}/common/img/ajax-loader.gif (100%) rename WebContent/VAADIN/themes/{runo => base}/common/img/loading-indicator-delay.gif (100%) rename WebContent/VAADIN/themes/{runo => base}/common/img/loading-indicator-wait.gif (100%) rename WebContent/VAADIN/themes/{runo => base}/common/img/loading-indicator.gif (100%) mode change 100755 => 100644 create mode 100644 WebContent/VAADIN/themes/reindeer/progressindicator/img/base.gif create mode 100644 WebContent/VAADIN/themes/reindeer/progressindicator/img/disabled.gif create mode 100644 WebContent/VAADIN/themes/reindeer/progressindicator/img/progress.png create mode 100644 WebContent/VAADIN/themes/reindeer/progressindicator/progressindicator.css diff --git a/WebContent/VAADIN/themes/base/common/common.css b/WebContent/VAADIN/themes/base/common/common.css index 3ed9b8daad..68052dc36f 100644 --- a/WebContent/VAADIN/themes/base/common/common.css +++ b/WebContent/VAADIN/themes/base/common/common.css @@ -9,9 +9,12 @@ .v-app { height: 100%; } -.v-app-loading { +div.v-app-loading { /* You can use this to provide indication for the user that the application is loading. */ /* It is applied to the same element as .v-app */ + background-image: url(img/loading-indicator.gif); + background-repeat: no-repeat; + background-position: 50%; } .v-view { height: 100%; @@ -145,11 +148,21 @@ .v-loading-indicator, .v-loading-indicator-delay, .v-loading-indicator-wait { - height: 16px; position: absolute; top: 0; right: 0; z-index: 30000; + width: 31px; + height: 31px; + background: transparent url(img/loading-indicator.gif); + margin-right: 5px; + margin-top: 5px; +} +.v-loading-indicator-delay { + background-image: url(img/loading-indicator-delay.gif); +} +.v-loading-indicator-wait { + background-image: url(img/loading-indicator-wait.gif); } /* Debug dialog */ .v-debug-console { diff --git a/WebContent/VAADIN/themes/runo/common/img/ajax-loader-big.gif b/WebContent/VAADIN/themes/base/common/img/ajax-loader-big.gif similarity index 100% rename from WebContent/VAADIN/themes/runo/common/img/ajax-loader-big.gif rename to WebContent/VAADIN/themes/base/common/img/ajax-loader-big.gif diff --git a/WebContent/VAADIN/themes/runo/common/img/ajax-loader-medium.gif b/WebContent/VAADIN/themes/base/common/img/ajax-loader-medium.gif similarity index 100% rename from WebContent/VAADIN/themes/runo/common/img/ajax-loader-medium.gif rename to WebContent/VAADIN/themes/base/common/img/ajax-loader-medium.gif diff --git a/WebContent/VAADIN/themes/runo/common/img/ajax-loader.gif b/WebContent/VAADIN/themes/base/common/img/ajax-loader.gif similarity index 100% rename from WebContent/VAADIN/themes/runo/common/img/ajax-loader.gif rename to WebContent/VAADIN/themes/base/common/img/ajax-loader.gif diff --git a/WebContent/VAADIN/themes/runo/common/img/loading-indicator-delay.gif b/WebContent/VAADIN/themes/base/common/img/loading-indicator-delay.gif similarity index 100% rename from WebContent/VAADIN/themes/runo/common/img/loading-indicator-delay.gif rename to WebContent/VAADIN/themes/base/common/img/loading-indicator-delay.gif diff --git a/WebContent/VAADIN/themes/runo/common/img/loading-indicator-wait.gif b/WebContent/VAADIN/themes/base/common/img/loading-indicator-wait.gif similarity index 100% rename from WebContent/VAADIN/themes/runo/common/img/loading-indicator-wait.gif rename to WebContent/VAADIN/themes/base/common/img/loading-indicator-wait.gif diff --git a/WebContent/VAADIN/themes/runo/common/img/loading-indicator.gif b/WebContent/VAADIN/themes/base/common/img/loading-indicator.gif old mode 100755 new mode 100644 similarity index 100% rename from WebContent/VAADIN/themes/runo/common/img/loading-indicator.gif rename to WebContent/VAADIN/themes/base/common/img/loading-indicator.gif diff --git a/WebContent/VAADIN/themes/base/progressindicator/progressindicator.css b/WebContent/VAADIN/themes/base/progressindicator/progressindicator.css index 18b1f1e4a7..d50954e7e8 100644 --- a/WebContent/VAADIN/themes/base/progressindicator/progressindicator.css +++ b/WebContent/VAADIN/themes/base/progressindicator/progressindicator.css @@ -16,10 +16,14 @@ overflow: hidden; /* for IE6 */ background: #ddd; } -.v-progressindicator-indeterminate { - height: 16px; - width: 16px; +div.v-progressindicator-indeterminate { + height: 20px; + width: 20px; overflow: hidden; /* for IE6 */ + background: #fff url(../common/img/ajax-loader-medium.gif) no-repeat 50%; + border-radius: 4px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; } /* Hide obsolete elements in indeterminate mode */ .v-progressindicator-indeterminate .v-progressindicator-wrapper, @@ -28,8 +32,9 @@ .v-progressindicator-indeterminate-disabled .v-progressindicator-indicator { display: none; } -.v-progressindicator-indeterminate-disabled { - height: 16px; - width: 16px; +div.v-progressindicator-indeterminate-disabled { + height: 20px; + width: 20px; overflow: hidden; /* for IE6 */ + background: transparent; } \ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css index 2a54452477..db38809535 100644 --- a/WebContent/VAADIN/themes/base/styles.css +++ b/WebContent/VAADIN/themes/base/styles.css @@ -176,9 +176,12 @@ .v-app { height: 100%; } -.v-app-loading { +div.v-app-loading { /* You can use this to provide indication for the user that the application is loading. */ /* It is applied to the same element as .v-app */ + background-image: url(common/img/loading-indicator.gif); + background-repeat: no-repeat; + background-position: 50%; } .v-view { height: 100%; @@ -312,11 +315,21 @@ .v-loading-indicator, .v-loading-indicator-delay, .v-loading-indicator-wait { - height: 16px; position: absolute; top: 0; right: 0; z-index: 30000; + width: 31px; + height: 31px; + background: transparent url(common/img/loading-indicator.gif); + margin-right: 5px; + margin-top: 5px; +} +.v-loading-indicator-delay { + background-image: url(common/img/loading-indicator-delay.gif); +} +.v-loading-indicator-wait { + background-image: url(common/img/loading-indicator-wait.gif); } /* Debug dialog */ .v-debug-console { @@ -722,10 +735,14 @@ overflow: hidden; /* for IE6 */ background: #ddd; } -.v-progressindicator-indeterminate { - height: 16px; - width: 16px; +div.v-progressindicator-indeterminate { + height: 20px; + width: 20px; overflow: hidden; /* for IE6 */ + background: #fff url(common/img/ajax-loader-medium.gif) no-repeat 50%; + border-radius: 4px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; } /* Hide obsolete elements in indeterminate mode */ .v-progressindicator-indeterminate .v-progressindicator-wrapper, @@ -734,10 +751,11 @@ .v-progressindicator-indeterminate-disabled .v-progressindicator-indicator { display: none; } -.v-progressindicator-indeterminate-disabled { - height: 16px; - width: 16px; +div.v-progressindicator-indeterminate-disabled { + height: 20px; + width: 20px; overflow: hidden; /* for IE6 */ + background: transparent; } /* ./WebContent/VAADIN/themes/base/select/select.css */ diff --git a/WebContent/VAADIN/themes/reindeer/progressindicator/img/base.gif b/WebContent/VAADIN/themes/reindeer/progressindicator/img/base.gif new file mode 100644 index 0000000000000000000000000000000000000000..6c6f15ef9e94ad4bb7a0f154da95aa81a3d99999 GIT binary patch literal 827 zcmZ?wbhEHb!jztqDTZf)6WyyFCOuX-t90kk zQUyl?i3WuQ4hmoD4k>=*@X@RFeJIR%Ah66Nngg35h7W{QQ;Z^c9*5j`C^zAWg2!f# z9R->$0z7OD0s$Id>J9=82>}|iR8Z;+rv}$7T^4Mn=qr47@to-+_SizSY!ADNCdVZm zC%qU}K^A7_1dBI+n~p5v*YJ^=>3P7o<8oleHUVsA7$_XJ2~1L(tZM1kD*J&kmaEC6 zdjYqDBTHi=ql3z?hC_=!ipyyA`#u-yyv?a$>Vn-n3yvE2PnmO)#j_6>EHxa{n}EUc zh9N+p@xXx#+W(pkC%xA&5$JVD6p}jfvW%$bKVvO!fF0mhZnPJkUgf&o%5`f_f43{dI2~R9Uw{d*|nZn_~FVfSg{6VOc}?P0#NX>Jz!>aQZSGJ$IuIJ zzFvC;#~nRl8WwjKsc|r3GeXetZ`(Nprke#7{V>GZy13gY}%c`4GiIf2@DPnjRG3Knw*$6e&-fzJGQL2 PlI50$70X#MCI)K&9(oIX literal 0 HcmV?d00001 diff --git a/WebContent/VAADIN/themes/reindeer/progressindicator/img/disabled.gif b/WebContent/VAADIN/themes/reindeer/progressindicator/img/disabled.gif new file mode 100644 index 0000000000000000000000000000000000000000..7a64d034b2e075903853ae437452598c3df18e5d GIT binary patch literal 179 zcmZ?wbhEHb{< zdGy4oWh+))zINmAvExgYt=O`C$Fv!<4jnx