From 9c52526b09b43207bc8bf755cad3684e720e5b38 Mon Sep 17 00:00:00 2001
From: Tyler Lemburg <trlemburg@gmail.com>
Date: Fri, 1 Apr 2016 13:19:22 -0500
Subject: [PATCH] Move www to public
---
.gitignore | 4 ++--
Gruntfile.js | 2 +-
README.md | 2 +-
{www => public}/css/main.css | 0
{www => public}/images/acronym_example.png | Bin
{www => public}/images/acronym_subject_example.png | Bin
.../images/acronym_subject_vert_example.png | Bin
{www => public}/images/acronym_vert_example.png | Bin
{www => public}/images/extension_example.png | Bin
{www => public}/images/extension_vert_example.png | Bin
{www => public}/images/org_only_example.png | Bin
{www => public}/images/org_only_vert_example.png | Bin
{www => public}/images/org_subject_1-2_example.png | Bin
.../images/org_subject_1-2_vert_example.png | Bin
{www => public}/images/org_subject_2-1_example.png | Bin
.../images/org_subject_2-1_vert_example.png | Bin
{www => public}/images/org_subject_2-2_example.png | Bin
.../images/org_subject_2-2_vert_example.png | Bin
{www => public}/images/org_subject_example.png | Bin
{www => public}/images/org_subject_vert_example.png | Bin
{www => public}/images/org_two_line_example.png | Bin
.../images/org_two_line_vert_example.png | Bin
{www => public}/images/spinner.svg | 0
{www => public}/images/test.pdf | Bin
{www => public}/images/test.png | Bin
{www => public}/images/test.svg | 0
{www => public}/index.php | 0
{www => public}/sample.htaccess | 0
{www => public}/videos/factory_milling.mp4 | Bin
src/Views/main_template.php | 2 +-
30 files changed, 5 insertions(+), 5 deletions(-)
rename {www => public}/css/main.css (100%)
rename {www => public}/images/acronym_example.png (100%)
rename {www => public}/images/acronym_subject_example.png (100%)
rename {www => public}/images/acronym_subject_vert_example.png (100%)
rename {www => public}/images/acronym_vert_example.png (100%)
rename {www => public}/images/extension_example.png (100%)
rename {www => public}/images/extension_vert_example.png (100%)
rename {www => public}/images/org_only_example.png (100%)
rename {www => public}/images/org_only_vert_example.png (100%)
rename {www => public}/images/org_subject_1-2_example.png (100%)
rename {www => public}/images/org_subject_1-2_vert_example.png (100%)
rename {www => public}/images/org_subject_2-1_example.png (100%)
rename {www => public}/images/org_subject_2-1_vert_example.png (100%)
rename {www => public}/images/org_subject_2-2_example.png (100%)
rename {www => public}/images/org_subject_2-2_vert_example.png (100%)
rename {www => public}/images/org_subject_example.png (100%)
rename {www => public}/images/org_subject_vert_example.png (100%)
rename {www => public}/images/org_two_line_example.png (100%)
rename {www => public}/images/org_two_line_vert_example.png (100%)
rename {www => public}/images/spinner.svg (100%)
rename {www => public}/images/test.pdf (100%)
rename {www => public}/images/test.png (100%)
rename {www => public}/images/test.svg (100%)
rename {www => public}/index.php (100%)
rename {www => public}/sample.htaccess (100%)
rename {www => public}/videos/factory_milling.mp4 (100%)
diff --git a/.gitignore b/.gitignore
index fbdf4776..45d34cea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
/config.inc.php
-/www/.htaccess
+/public/.htaccess
/.project
/.settings
-/www/wdn
+/public/wdn
/.buildpath
/node_modules
/vendor/composer
diff --git a/Gruntfile.js b/Gruntfile.js
index 5bac5db8..ed9c457f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,6 +1,6 @@
module.exports = function (grunt) {
var lessDir = 'less';
- var cssDir = 'www/css';
+ var cssDir = 'public/css';
var cssFiles = [
'main'
diff --git a/README.md b/README.md
index 680a3325..a36120e6 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
3. Install Inkscape on the VM `sudo yum --disablerepo=repoforgeextras install inkscape`
4. Install ImageMagick on the VM. `yum install -y ImageMagick ImageMagick-devel`
5. Create a config file for yourself. In the root, `cp config.sample.php config.inc.php` and edit as necessary.
-6. Create a htaccess file for yourself. In the root, `cp www/sample.htaccess www/.htaccess` and edit as necessary.
+6. Create a htaccess file for yourself. In the root, `cp public/sample.htaccess public/.htaccess` and edit as necessary.
7. You will need a database. Run the script `create_database.sql`, found in `/db`, on your SQL DB.
8. This creates several users, including the approvers. You will likely want to create a user for yourself in the users table with role `admin`.
9. The server should now be running at `localhost:8009`.
diff --git a/www/css/main.css b/public/css/main.css
similarity index 100%
rename from www/css/main.css
rename to public/css/main.css
diff --git a/www/images/acronym_example.png b/public/images/acronym_example.png
similarity index 100%
rename from www/images/acronym_example.png
rename to public/images/acronym_example.png
diff --git a/www/images/acronym_subject_example.png b/public/images/acronym_subject_example.png
similarity index 100%
rename from www/images/acronym_subject_example.png
rename to public/images/acronym_subject_example.png
diff --git a/www/images/acronym_subject_vert_example.png b/public/images/acronym_subject_vert_example.png
similarity index 100%
rename from www/images/acronym_subject_vert_example.png
rename to public/images/acronym_subject_vert_example.png
diff --git a/www/images/acronym_vert_example.png b/public/images/acronym_vert_example.png
similarity index 100%
rename from www/images/acronym_vert_example.png
rename to public/images/acronym_vert_example.png
diff --git a/www/images/extension_example.png b/public/images/extension_example.png
similarity index 100%
rename from www/images/extension_example.png
rename to public/images/extension_example.png
diff --git a/www/images/extension_vert_example.png b/public/images/extension_vert_example.png
similarity index 100%
rename from www/images/extension_vert_example.png
rename to public/images/extension_vert_example.png
diff --git a/www/images/org_only_example.png b/public/images/org_only_example.png
similarity index 100%
rename from www/images/org_only_example.png
rename to public/images/org_only_example.png
diff --git a/www/images/org_only_vert_example.png b/public/images/org_only_vert_example.png
similarity index 100%
rename from www/images/org_only_vert_example.png
rename to public/images/org_only_vert_example.png
diff --git a/www/images/org_subject_1-2_example.png b/public/images/org_subject_1-2_example.png
similarity index 100%
rename from www/images/org_subject_1-2_example.png
rename to public/images/org_subject_1-2_example.png
diff --git a/www/images/org_subject_1-2_vert_example.png b/public/images/org_subject_1-2_vert_example.png
similarity index 100%
rename from www/images/org_subject_1-2_vert_example.png
rename to public/images/org_subject_1-2_vert_example.png
diff --git a/www/images/org_subject_2-1_example.png b/public/images/org_subject_2-1_example.png
similarity index 100%
rename from www/images/org_subject_2-1_example.png
rename to public/images/org_subject_2-1_example.png
diff --git a/www/images/org_subject_2-1_vert_example.png b/public/images/org_subject_2-1_vert_example.png
similarity index 100%
rename from www/images/org_subject_2-1_vert_example.png
rename to public/images/org_subject_2-1_vert_example.png
diff --git a/www/images/org_subject_2-2_example.png b/public/images/org_subject_2-2_example.png
similarity index 100%
rename from www/images/org_subject_2-2_example.png
rename to public/images/org_subject_2-2_example.png
diff --git a/www/images/org_subject_2-2_vert_example.png b/public/images/org_subject_2-2_vert_example.png
similarity index 100%
rename from www/images/org_subject_2-2_vert_example.png
rename to public/images/org_subject_2-2_vert_example.png
diff --git a/www/images/org_subject_example.png b/public/images/org_subject_example.png
similarity index 100%
rename from www/images/org_subject_example.png
rename to public/images/org_subject_example.png
diff --git a/www/images/org_subject_vert_example.png b/public/images/org_subject_vert_example.png
similarity index 100%
rename from www/images/org_subject_vert_example.png
rename to public/images/org_subject_vert_example.png
diff --git a/www/images/org_two_line_example.png b/public/images/org_two_line_example.png
similarity index 100%
rename from www/images/org_two_line_example.png
rename to public/images/org_two_line_example.png
diff --git a/www/images/org_two_line_vert_example.png b/public/images/org_two_line_vert_example.png
similarity index 100%
rename from www/images/org_two_line_vert_example.png
rename to public/images/org_two_line_vert_example.png
diff --git a/www/images/spinner.svg b/public/images/spinner.svg
similarity index 100%
rename from www/images/spinner.svg
rename to public/images/spinner.svg
diff --git a/www/images/test.pdf b/public/images/test.pdf
similarity index 100%
rename from www/images/test.pdf
rename to public/images/test.pdf
diff --git a/www/images/test.png b/public/images/test.png
similarity index 100%
rename from www/images/test.png
rename to public/images/test.png
diff --git a/www/images/test.svg b/public/images/test.svg
similarity index 100%
rename from www/images/test.svg
rename to public/images/test.svg
diff --git a/www/index.php b/public/index.php
similarity index 100%
rename from www/index.php
rename to public/index.php
diff --git a/www/sample.htaccess b/public/sample.htaccess
similarity index 100%
rename from www/sample.htaccess
rename to public/sample.htaccess
diff --git a/www/videos/factory_milling.mp4 b/public/videos/factory_milling.mp4
similarity index 100%
rename from www/videos/factory_milling.mp4
rename to public/videos/factory_milling.mp4
diff --git a/src/Views/main_template.php b/src/Views/main_template.php
index b978723a..ab2f8964 100644
--- a/src/Views/main_template.php
+++ b/src/Views/main_template.php
@@ -5,7 +5,7 @@ $page = Templates::factory('Fixed', Templates::VERSION_4_1);
# this should be the server root, that is, the public directory of where static files come from.
# the templates library will stick /wdn/templates_4.1 on there for you
-$wdn_include_path = \Core::ROOT . '/www';
+$wdn_include_path = \Core::ROOT . '/public';
if (file_exists($wdn_include_path)) {
$page->setLocalIncludePath($wdn_include_path);
}
--
GitLab