From dbeadc1407293d0c7af36723db6fe5699890b845 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Wed, 22 Jul 2009 14:27:57 -0700 Subject: Use the Kohana cascading filesystem to locate resources loaded by the theme. Because the theme comes first, this means that themes can override any module resources, at the cost that we no longer have namespacing for JS and CSS files. The only file getting used outside of this model is themes/default/screen.css which is used in the admin theme. I fixed that by copying screen.css into admin_default and renaming its screen.css to admin_screen.css. I also copied over all the images that it was referencing. Fixes tickets #48 and #539. Theme API changes: - theme_script(), theme_url() and theme_css() are no longer needed - script(), url() and css() now refer to the first matching asset in the module load path, where gallery3/lib is at the end of the path --- themes/admin_default/images/ico-print.png | Bin 0 -> 989 bytes themes/admin_default/images/ico-separator.gif | Bin 0 -> 106 bytes themes/admin_default/images/ico-view-comments.png | Bin 0 -> 768 bytes themes/admin_default/images/ico-view-fullsize.png | Bin 0 -> 1046 bytes themes/admin_default/images/ico-view-hybrid.png | Bin 0 -> 494 bytes themes/admin_default/images/ico-view-slideshow.png | Bin 0 -> 960 bytes themes/admin_default/images/loading-lg.gif | Bin 0 -> 8238 bytes themes/admin_default/images/loading-sm.gif | Bin 0 -> 673 bytes 8 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 themes/admin_default/images/ico-print.png create mode 100644 themes/admin_default/images/ico-separator.gif create mode 100644 themes/admin_default/images/ico-view-comments.png create mode 100644 themes/admin_default/images/ico-view-fullsize.png create mode 100644 themes/admin_default/images/ico-view-hybrid.png create mode 100644 themes/admin_default/images/ico-view-slideshow.png create mode 100644 themes/admin_default/images/loading-lg.gif create mode 100644 themes/admin_default/images/loading-sm.gif (limited to 'themes/admin_default/images') diff --git a/themes/admin_default/images/ico-print.png b/themes/admin_default/images/ico-print.png new file mode 100644 index 00000000..b82a8e1e Binary files /dev/null and b/themes/admin_default/images/ico-print.png differ diff --git a/themes/admin_default/images/ico-separator.gif b/themes/admin_default/images/ico-separator.gif new file mode 100644 index 00000000..3de2d0d3 Binary files /dev/null and b/themes/admin_default/images/ico-separator.gif differ diff --git a/themes/admin_default/images/ico-view-comments.png b/themes/admin_default/images/ico-view-comments.png new file mode 100644 index 00000000..e5d3630f Binary files /dev/null and b/themes/admin_default/images/ico-view-comments.png differ diff --git a/themes/admin_default/images/ico-view-fullsize.png b/themes/admin_default/images/ico-view-fullsize.png new file mode 100644 index 00000000..0be23e9b Binary files /dev/null and b/themes/admin_default/images/ico-view-fullsize.png differ diff --git a/themes/admin_default/images/ico-view-hybrid.png b/themes/admin_default/images/ico-view-hybrid.png new file mode 100644 index 00000000..ee902e55 Binary files /dev/null and b/themes/admin_default/images/ico-view-hybrid.png differ diff --git a/themes/admin_default/images/ico-view-slideshow.png b/themes/admin_default/images/ico-view-slideshow.png new file mode 100644 index 00000000..82f61f63 Binary files /dev/null and b/themes/admin_default/images/ico-view-slideshow.png differ diff --git a/themes/admin_default/images/loading-lg.gif b/themes/admin_default/images/loading-lg.gif new file mode 100644 index 00000000..cc70a7a8 Binary files /dev/null and b/themes/admin_default/images/loading-lg.gif differ diff --git a/themes/admin_default/images/loading-sm.gif b/themes/admin_default/images/loading-sm.gif new file mode 100644 index 00000000..d0bce154 Binary files /dev/null and b/themes/admin_default/images/loading-sm.gif differ -- cgit v1.2.3 From 6246a917978e5d955c5e2fc49fc8c1a045aabedf Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Thu, 23 Jul 2009 17:33:57 -0700 Subject: Add in more images referenced by CSS that I forgot to copy over from the default theme when I combined the CSS --- themes/admin_default/images/ico-album.png | Bin 0 -> 397 bytes themes/admin_default/images/ico-error.png | Bin 0 -> 701 bytes themes/admin_default/images/ico-info.png | Bin 0 -> 778 bytes themes/admin_default/images/ico-success.png | Bin 0 -> 537 bytes themes/admin_default/images/ico-warning.png | Bin 0 -> 666 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 themes/admin_default/images/ico-album.png create mode 100644 themes/admin_default/images/ico-error.png create mode 100644 themes/admin_default/images/ico-info.png create mode 100644 themes/admin_default/images/ico-success.png create mode 100644 themes/admin_default/images/ico-warning.png (limited to 'themes/admin_default/images') diff --git a/themes/admin_default/images/ico-album.png b/themes/admin_default/images/ico-album.png new file mode 100644 index 00000000..affa1b84 Binary files /dev/null and b/themes/admin_default/images/ico-album.png differ diff --git a/themes/admin_default/images/ico-error.png b/themes/admin_default/images/ico-error.png new file mode 100644 index 00000000..c37bd062 Binary files /dev/null and b/themes/admin_default/images/ico-error.png differ diff --git a/themes/admin_default/images/ico-info.png b/themes/admin_default/images/ico-info.png new file mode 100644 index 00000000..12cd1aef Binary files /dev/null and b/themes/admin_default/images/ico-info.png differ diff --git a/themes/admin_default/images/ico-success.png b/themes/admin_default/images/ico-success.png new file mode 100644 index 00000000..a9925a06 Binary files /dev/null and b/themes/admin_default/images/ico-success.png differ diff --git a/themes/admin_default/images/ico-warning.png b/themes/admin_default/images/ico-warning.png new file mode 100644 index 00000000..628cf2da Binary files /dev/null and b/themes/admin_default/images/ico-warning.png differ -- cgit v1.2.3 From 8972d5f05ce4f37061bdd4dd2c8a1a19c1235611 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Thu, 3 Sep 2009 10:20:54 -0700 Subject: Move the loading images into lib/images and adjust everything to point at them, including jquery.autocomplete.css so that we don't have stuff from lib that points into a theme directory. They were common images anyway. Incidentally, rename sm/lg to small/large. --- lib/images/loading-large.gif | Bin 0 -> 8238 bytes lib/images/loading-small.gif | Bin 0 -> 673 bytes lib/jquery.autocomplete.css | 10 +++++----- themes/admin_default/css/screen.css | 6 +++--- themes/admin_default/images/loading-lg.gif | Bin 8238 -> 0 bytes themes/admin_default/images/loading-sm.gif | Bin 673 -> 0 bytes themes/default/css/screen.css | 6 +++--- themes/default/images/loading-lg.gif | Bin 8238 -> 0 bytes themes/default/images/loading-sm.gif | Bin 673 -> 0 bytes 9 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 lib/images/loading-large.gif create mode 100644 lib/images/loading-small.gif delete mode 100644 themes/admin_default/images/loading-lg.gif delete mode 100644 themes/admin_default/images/loading-sm.gif delete mode 100644 themes/default/images/loading-lg.gif delete mode 100644 themes/default/images/loading-sm.gif (limited to 'themes/admin_default/images') diff --git a/lib/images/loading-large.gif b/lib/images/loading-large.gif new file mode 100644 index 00000000..cc70a7a8 Binary files /dev/null and b/lib/images/loading-large.gif differ diff --git a/lib/images/loading-small.gif b/lib/images/loading-small.gif new file mode 100644 index 00000000..d0bce154 Binary files /dev/null and b/lib/images/loading-small.gif differ diff --git a/lib/jquery.autocomplete.css b/lib/jquery.autocomplete.css index cdf26f56..00cd1c9b 100644 --- a/lib/jquery.autocomplete.css +++ b/lib/jquery.autocomplete.css @@ -20,15 +20,15 @@ padding: 2px 5px; cursor: default; display: block; - /* - if width will be 100% horizontal scrollbar will apear + /* + if width will be 100% horizontal scrollbar will apear when scroll mode will be used */ /*width: 100%;*/ font: menu; font-size: 12px; - /* - it is very important, if line-height not setted or setted + /* + it is very important, if line-height not setted or setted in relative units scroll will be broken in firefox */ line-height: 16px; @@ -36,7 +36,7 @@ } .ac_loading { - background: white url('../themes/default/images/loading-sm.gif') right center no-repeat; + background: white url('images/loading-small.gif') right center no-repeat; } .ac_odd { diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css index c81db58d..4f802039 100644 --- a/themes/admin_default/css/screen.css +++ b/themes/admin_default/css/screen.css @@ -768,17 +768,17 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser { /* Ajax loading indicator ~~~~~~~~~~~~~~~~ */ .gLoadingLarge { - background: #e8e8e8 url('../images/loading-lg.gif') no-repeat center center; + background: #e8e8e8 url('../../../lib/images/loading-arge.gif') no-repeat center center; font-size: 0; } .gDialogLoadingLarge { - background: url('../images/loading-lg.gif') no-repeat center center !important; + background: url('../../../lib/images/loading-large.gif') no-repeat center center !important; font-size: 0; } .gLoadingSmall { - background: #e8e8e8 url('../images/loading-sm.gif') no-repeat center center; + background: #e8e8e8 url('../../../lib/images/loading-small.gif') no-repeat center center; font-size: 0; } diff --git a/themes/admin_default/images/loading-lg.gif b/themes/admin_default/images/loading-lg.gif deleted file mode 100644 index cc70a7a8..00000000 Binary files a/themes/admin_default/images/loading-lg.gif and /dev/null differ diff --git a/themes/admin_default/images/loading-sm.gif b/themes/admin_default/images/loading-sm.gif deleted file mode 100644 index d0bce154..00000000 Binary files a/themes/admin_default/images/loading-sm.gif and /dev/null differ diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index 96be8996..fd85d696 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -819,17 +819,17 @@ form .gError, /* Ajax loading indicator ~~~~~~~~~~~~~~~~ */ .gLoadingLarge { - background: #e8e8e8 url('../images/loading-lg.gif') no-repeat center center; + background: #e8e8e8 url('../../../lib/images/loading-large.gif') no-repeat center center; font-size: 0; } .gDialogLoadingLarge { - background: url('../images/loading-lg.gif') no-repeat center center !important; + background: url('../../../lib/images/loading-large.gif') no-repeat center center !important; font-size: 0; } .gLoadingSmall { - background: #e8e8e8 url('../images/loading-sm.gif') no-repeat center center; + background: #e8e8e8 url('../../../lib/images/loading-small.gif') no-repeat center center; font-size: 0; } diff --git a/themes/default/images/loading-lg.gif b/themes/default/images/loading-lg.gif deleted file mode 100644 index cc70a7a8..00000000 Binary files a/themes/default/images/loading-lg.gif and /dev/null differ diff --git a/themes/default/images/loading-sm.gif b/themes/default/images/loading-sm.gif deleted file mode 100644 index d0bce154..00000000 Binary files a/themes/default/images/loading-sm.gif and /dev/null differ -- cgit v1.2.3