Set the loading gifs into the generated themes. Requires adding another task step to copy the loading gifs.
This commit is contained in:
parent
906b200478
commit
a923fd9714
BIN
modules/themeroller/data/images/loading-large.gif
Normal file
BIN
modules/themeroller/data/images/loading-large.gif
Normal file
Binary file not shown.
After Width: | Height: | Size: 8.0 KiB |
BIN
modules/themeroller/data/images/loading-small.gif
Normal file
BIN
modules/themeroller/data/images/loading-small.gif
Normal file
Binary file not shown.
After Width: | Height: | Size: 673 B |
@ -117,6 +117,7 @@ class themeroller {
|
||||
$parameters["views"] = $is_admin ? glob(MODPATH . "themeroller/data/admin_views/*.html.php") :
|
||||
glob(MODPATH . "themeroller/data/views/*.html.php");
|
||||
$parameters["css_files"] = $css_files;
|
||||
$parameters["gifs"] = glob(MODPATH . "themeroller/data/images/*.gif");
|
||||
$parameters["images"] =
|
||||
glob("$css_path/development-bundle/themes/$original_name/images/ui-bg*.png");
|
||||
$thumb_dir = $is_admin ? "admin_thumbnail" : "site_thumbnail";
|
||||
|
@ -51,6 +51,7 @@ class themeroller_task_Core {
|
||||
+ count($parameters["masks"]) // number of images to generate
|
||||
+ count($parameters["icons"]) // number of icon images to generate
|
||||
+ count($parameters["css_files"]) // number of css files
|
||||
+ count($parameters["gifs"]) // number of static files
|
||||
+ count($parameters["images"])); // number of image files to copy
|
||||
|
||||
$task->status = t("Starting up");
|
||||
@ -101,6 +102,23 @@ class themeroller_task_Core {
|
||||
|
||||
if (empty($parameters["views"])){
|
||||
$task->status = t("Themeroller images copied");
|
||||
$task->set("mode", "copy_gif_images");
|
||||
}
|
||||
break;
|
||||
case "copy_gif_images":
|
||||
$task->status = t("Copying gif images");
|
||||
while (!empty($parameters["gifs"]) && microtime(true) - $start < 1.5) {
|
||||
$gif = array_shift($parameters["gifs"]);
|
||||
$target = "{$theme_path}images/" . basename($gif);
|
||||
if (!file_exists($target)) {
|
||||
copy($gif, $target);
|
||||
$task->log(t("Copied gif image: %path", array("path" => basename($gif))));
|
||||
}
|
||||
$completed++;
|
||||
}
|
||||
|
||||
if (empty($parameters["gifs"])){
|
||||
$task->status = t("Gif images copied");
|
||||
$task->set("mode", "copy_css");
|
||||
}
|
||||
break;
|
||||
|
@ -960,7 +960,7 @@ div#g-action-status {
|
||||
}
|
||||
|
||||
.g-breadcrumbs li {
|
||||
background: transparent url('images/ico-separator.gif') no-repeat scroll left center;
|
||||
background: transparent url('../images/ico-separator.png') no-repeat scroll left center;
|
||||
float: left;
|
||||
padding: 1em 8px 1em 18px;
|
||||
}
|
||||
@ -1202,7 +1202,7 @@ a > .sf-sub-indicator {
|
||||
}
|
||||
|
||||
.rtl .g-breadcrumbs li {
|
||||
background: transparent url('images/ico-separator-rtl.gif') no-repeat scroll right center;
|
||||
background: transparent url('../images/ico-separator-rtl.png') no-repeat scroll right center;
|
||||
padding: 1em 18px 1em 8px;
|
||||
}
|
||||
|
||||
|
@ -10,8 +10,9 @@
|
||||
* 3) Page layout containers
|
||||
* 4) Content blocks in specific layout containers
|
||||
* 5) Navigation and menus
|
||||
* 6) jQuery and jQuery UI
|
||||
* 8) States and interactions
|
||||
* 6) Positioning and order
|
||||
* 7) Navigation and menus
|
||||
* 8) jQuery and jQuery UI
|
||||
* 9) Organize module style
|
||||
* 10) Tag module styles
|
||||
* 11) Right-to-left language styles
|
||||
@ -1062,7 +1063,7 @@ div#g-action-status {
|
||||
}
|
||||
|
||||
.g-breadcrumbs li {
|
||||
background: transparent url('images/ico-separator.gif') no-repeat scroll left center;
|
||||
background: transparent url('../images/ico-separator.png') no-repeat scroll left center;
|
||||
float: left;
|
||||
padding: 1em 8px 1em 18px;
|
||||
}
|
||||
@ -1132,6 +1133,11 @@ div#g-action-status {
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
/* Autocomplete ~~~~~~~~~~ */
|
||||
.ac_loading {
|
||||
background: #<?= $bgColorContent ?> url('../images/loading-small.gif') right center no-repeat !important;
|
||||
}
|
||||
|
||||
/** *******************************************************************
|
||||
* 9) Organize module style
|
||||
*********************************************************************/
|
||||
@ -1287,7 +1293,7 @@ div#g-action-status {
|
||||
}
|
||||
|
||||
.rtl .g-breadcrumbs li {
|
||||
background: transparent url('images/ico-separator-rtl.gif') no-repeat scroll right center;
|
||||
background: transparent url('../images/ico-separator-rtl.png') no-repeat scroll right center;
|
||||
padding: 1em 18px 1em 8px;
|
||||
}
|
||||
|
||||
@ -1444,7 +1450,7 @@ div#g-action-status {
|
||||
|
||||
/*** shadows for all but IE6 ***/
|
||||
.rtl .sf-shadow ul {
|
||||
background: url('superfish/images/shadow.png') no-repeat bottom left;
|
||||
background: url('../../../lib/superfish/images/shadow.png') no-repeat bottom left;
|
||||
padding: 0 0 9px 8px;
|
||||
border-top-right-radius: 0;
|
||||
border-bottom-left-radius: 0;
|
||||
|
Reference in New Issue
Block a user