diff --git a/core/basepage.php b/core/basepage.php index 5be25888..7f6f55db 100644 --- a/core/basepage.php +++ b/core/basepage.php @@ -383,7 +383,7 @@ class BasePage $this->add_html_header("", 40); - # static handler will map these to themes/foo/static/bar.ico or ext/handle_static/static/bar.ico + # static handler will map these to themes/foo/static/bar.ico or ext/static_files/static/bar.ico $this->add_html_header("", 41); $this->add_html_header("", 42); @@ -425,7 +425,7 @@ class BasePage "vendor/bower-asset/jquery-timeago/jquery.timeago.js", "vendor/bower-asset/tablesorter/jquery.tablesorter.min.js", "vendor/bower-asset/js-cookie/src/js.cookie.js", - "ext/handle_static/modernizr-3.3.1.custom.js", + "ext/static_files/modernizr-3.3.1.custom.js", ], zglob("ext/{" . Extension::get_enabled_extensions_as_string() . "}/script.js"), zglob("themes/$theme_name/script.js") diff --git a/core/install.php b/core/install.php index 898bda37..f9219cc1 100644 --- a/core/install.php +++ b/core/install.php @@ -345,8 +345,8 @@ function exit_with_page($title, $body, $code=0) Shimmie Installer - - + +
diff --git a/ext/browser_search/main.php b/ext/browser_search/main.php index 7764c448..d29326e0 100644 --- a/ext/browser_search/main.php +++ b/ext/browser_search/main.php @@ -24,7 +24,7 @@ class BrowserSearch extends Extension $search_title = $config->get_string(SetupConfig::TITLE); $search_form_url = make_link('post/list/{searchTerms}'); $suggenton_url = make_link('browser_search/')."{searchTerms}"; - $icon_b64 = base64_encode(file_get_contents("ext/handle_static/static/favicon.ico")); + $icon_b64 = base64_encode(file_get_contents("ext/static_files/static/favicon.ico")); // Now for the XML $xml = " diff --git a/ext/handle_ico/test.php b/ext/handle_ico/test.php index 2c3b9b93..db0aea34 100644 --- a/ext/handle_ico/test.php +++ b/ext/handle_ico/test.php @@ -4,7 +4,7 @@ class IcoFileHandlerTest extends ShimmiePHPUnitTestCase public function testIcoHander() { $this->log_in_as_user(); - $image_id = $this->post_image("ext/handle_static/static/favicon.ico", "shimmie favicon"); + $image_id = $this->post_image("ext/static_files/static/favicon.ico", "shimmie favicon"); $page = $this->get_page("post/view/$image_id"); $this->assertEquals(200, $page->code); diff --git a/ext/handle_static/info.php b/ext/static_files/info.php similarity index 67% rename from ext/handle_static/info.php rename to ext/static_files/info.php index 5b6b1ada..abfdd7c0 100644 --- a/ext/handle_static/info.php +++ b/ext/static_files/info.php @@ -1,8 +1,8 @@ get_string(SetupConfig::THEME, "default"); $theme_file = "themes/$theme_name/static/$f_pagename"; - $static_file = "ext/handle_static/static/$f_pagename"; + $static_file = "ext/static_files/static/$f_pagename"; if (file_exists($theme_file) || file_exists($static_file)) { $filename = file_exists($theme_file) ? $theme_file : $static_file; diff --git a/ext/handle_static/modernizr-3.3.1.custom.js b/ext/static_files/modernizr-3.3.1.custom.js similarity index 100% rename from ext/handle_static/modernizr-3.3.1.custom.js rename to ext/static_files/modernizr-3.3.1.custom.js diff --git a/ext/handle_static/script.js b/ext/static_files/script.js similarity index 100% rename from ext/handle_static/script.js rename to ext/static_files/script.js diff --git a/ext/handle_static/static/README.txt b/ext/static_files/static/README.txt similarity index 100% rename from ext/handle_static/static/README.txt rename to ext/static_files/static/README.txt diff --git a/ext/handle_static/static/apple-touch-icon.png b/ext/static_files/static/apple-touch-icon.png similarity index 100% rename from ext/handle_static/static/apple-touch-icon.png rename to ext/static_files/static/apple-touch-icon.png diff --git a/ext/handle_static/static/favicon.ico b/ext/static_files/static/favicon.ico similarity index 100% rename from ext/handle_static/static/favicon.ico rename to ext/static_files/static/favicon.ico diff --git a/ext/handle_static/static/favicon.png b/ext/static_files/static/favicon.png similarity index 100% rename from ext/handle_static/static/favicon.png rename to ext/static_files/static/favicon.png diff --git a/ext/handle_static/static/favicon.svg b/ext/static_files/static/favicon.svg similarity index 100% rename from ext/handle_static/static/favicon.svg rename to ext/static_files/static/favicon.svg diff --git a/ext/handle_static/static/favicon_64.png b/ext/static_files/static/favicon_64.png similarity index 100% rename from ext/handle_static/static/favicon_64.png rename to ext/static_files/static/favicon_64.png diff --git a/ext/handle_static/static/grey.gif b/ext/static_files/static/grey.gif similarity index 100% rename from ext/handle_static/static/grey.gif rename to ext/static_files/static/grey.gif diff --git a/ext/handle_static/static/robots.txt b/ext/static_files/static/robots.txt similarity index 100% rename from ext/handle_static/static/robots.txt rename to ext/static_files/static/robots.txt diff --git a/ext/handle_static/style.css b/ext/static_files/style.css similarity index 100% rename from ext/handle_static/style.css rename to ext/static_files/style.css diff --git a/ext/handle_static/test.php b/ext/static_files/test.php similarity index 75% rename from ext/handle_static/test.php rename to ext/static_files/test.php index 29284a03..f33b7281 100644 --- a/ext/handle_static/test.php +++ b/ext/static_files/test.php @@ -1,5 +1,5 @@ Shimmie Error - - + +