JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
gitweb / wfpl-cms.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 00f6a23)
fix more paths (s/code/inc/)
authorJason Woofenden <jason@jasonwoof.com>
Tue, 3 Mar 2015 02:17:23 +0000 (21:17 -0500)
committerJason Woofenden <jason@jasonwoof.com>
Tue, 3 Mar 2015 02:17:23 +0000 (21:17 -0500)
.gitmodules patch | blob | history
Makefile patch | blob | history
admin.php patch | blob | history
admin_admins.php patch | blob | history
admin_files.php patch | blob | history
admin_images.php patch | blob | history
admin_pages.html patch | blob | history
admin_pages.php patch | blob | history
contact.php patch | blob | history
inc/wfpl patch | blob | history
styl.styl patch | blob | history

diff --git a/.gitmodules b/.gitmodules
index 6ece393..002e8ba 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "code/wfpl"]
-       path = code/wfpl
+[submodule "inc/wfpl"]
+       path = inc/wfpl
        url = /home/jasonwoof/www/wfpl.git
-[submodule "code/ckeditor"]
-       path = code/ckeditor
+[submodule "inc/ckeditor"]
+       path = inc/ckeditor
        url = /home/jasonwoof/www/ckeditor.git
diff --git a/Makefile b/Makefile
index 6829dac..58a7ae5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,5 +36,5 @@ style.css: styl.styl .image-mtimes.styl
                ; exit 1 \
        )
 
-tags: *.php code/*.php code/wfpl/*.php
-       exuberant-ctags *.php code/*.php code/wfpl/*.php
+tags: *.php code/*.php inc/wfpl/*.php
+       exuberant-ctags *.php code/*.php inc/wfpl/*.php
diff --git a/admin.php b/admin.php
index 8442e97..68f9b38 100644 (file)
--- a/admin.php
+++ b/admin.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('code/wfpl/session.php');
+require_once('inc/wfpl/session.php');
 
 function admin_main() {
        if(!logged_in_as_admin()) {
diff --git a/admin_admins.php b/admin_admins.php
index acef408..bc3961f 100644 (file)
--- a/admin_admins.php
+++ b/admin_admins.php
@@ -5,8 +5,8 @@
 define('ADMIN_ADMINS_DB_FIELDS', 'name,username,password,privs');
 
 
-require_once('code/wfpl/format.php');
-require_once('code/wfpl/email.php');
+require_once('inc/wfpl/format.php');
+require_once('inc/wfpl/email.php');
 
 function admin_admins_get_fields() {
        $data = array();
diff --git a/admin_files.php b/admin_files.php
index 034cfdf..ba0e507 100644 (file)
--- a/admin_files.php
+++ b/admin_files.php
@@ -13,7 +13,7 @@
 # To save results to a database, you'll need to create the files table
 # (the file admin_files.sql should help with this), and create the file
 # 'code/db_connect.php' which calls db_connect() see:
-# code/wfpl/examples/db_connect.php
+# inc/wfpl/examples/db_connect.php
 #
 # if you rename any of the database fields, you'll need to update this:
 
@@ -27,9 +27,9 @@ $GLOBALS['upload_directory'] = 'files/';
 $GLOBALS['filename_file_name'] = uniqid() . getmypid() . '.txt';
 
 
-require_once('code/wfpl/format.php');
-require_once('code/wfpl/email.php');
-require_once('code/wfpl/upload.php');
+require_once('inc/wfpl/format.php');
+require_once('inc/wfpl/email.php');
+require_once('inc/wfpl/upload.php');
 
 function admin_files_get_fields() {
        $data = array();
diff --git a/admin_images.php b/admin_images.php
index 917526c..8b6e513 100644 (file)
--- a/admin_images.php
+++ b/admin_images.php
@@ -13,7 +13,7 @@
 # To save results to a database, you'll need to create the cms_images table
 # (the file admin_images.sql should help with this), and create the file
 # 'code/db_connect.php' which calls db_connect() see:
-# code/wfpl/examples/db_connect.php
+# inc/wfpl/examples/db_connect.php
 #
 # if you rename any of the database fields, you'll need to update this:
 
@@ -30,8 +30,8 @@ $GLOBALS['image_thumb_max_height'] = '70';
 $GLOBALS['image_file_name'] = uniqid() . getmypid() . '.jpg'; # comment this out to use uploader's filename
 
 
-require_once('code/wfpl/format.php');
-require_once('code/wfpl/upload.php');
+require_once('inc/wfpl/format.php');
+require_once('inc/wfpl/upload.php');
 
 # example: 200x300
 function format_width_height($str) {
diff --git a/admin_pages.html b/admin_pages.html
index f8309df..7f923d6 100644 (file)
--- a/admin_pages.html
+++ b/admin_pages.html
@@ -4,11 +4,11 @@
 <head>
        <title><!--~$title show {~-->~$host~ Admin: <!--~listings once_if {~-->Pages Listing<!--~}~--><!--~form {~--><!--~id {~-->Add a new page<!--~}~--><!--~id unset {~-->Edit page "~title html~"<!--~}~--><!--~}~--><!--~}~--></title>
        <!--~$head {~-->
-       <script type="text/javascript" src="code/ckeditor/ckeditor.js"></script>
+       <script type="text/javascript" src="inc/ckeditor/ckeditor.js"></script>
        <style>
                /* icon in cke buttons */
                .cke_button_icon.cke_button__wfpl_images_icon {
-                       background-image: url(/code/ckeditor/plugins/icons.png?t=D5AC);
+                       background-image: url(/inc/ckeditor/plugins/icons.png?t=D5AC);
                        background-position: 0 -1504px;
                }
                .cke_wfpl_images_dialog * {
diff --git a/admin_pages.php b/admin_pages.php
index 0736879..829f3a5 100644 (file)
--- a/admin_pages.php
+++ b/admin_pages.php
@@ -5,8 +5,8 @@
 define('ADMIN_PAGES_DB_FIELDS', 'title,filename,navbar,nav_title,content,description,keywords');
 
 
-require_once('code/wfpl/format.php');
-require_once('code/wfpl/email.php');
+require_once('inc/wfpl/format.php');
+require_once('inc/wfpl/email.php');
 
 function format_cms_filename($str) {
        $str = format_filename($str);
diff --git a/contact.php b/contact.php
index 743a953..b2a4cc7 100644 (file)
--- a/contact.php
+++ b/contact.php
@@ -9,8 +9,8 @@ $GLOBALS['contact_form_recipient'] = 'fixme@example.com';
 $GLOBALS['contact_robot_answer'] = 1002;
 
 
-require_once('code/wfpl/format.php');
-require_once('code/wfpl/email.php');
+require_once('inc/wfpl/format.php');
+require_once('inc/wfpl/email.php');
 
 function contact_get_fields() {
        $data = array();
diff --git a/inc/wfpl b/inc/wfpl
index 23dfbcc..fe9a487 160000 (submodule)
--- a/inc/wfpl
+++ b/inc/wfpl
@@ -1 +1 @@
-Subproject commit 23dfbcc20fc6d20fb5be211e5af50cdcb8565c8e
+Subproject commit fe9a487e1b5ed0700481aee4609055dc6c47505d
diff --git a/styl.styl b/styl.styl
index d979446..72c2e05 100644 (file)
--- a/styl.styl
+++ b/styl.styl
@@ -1,4 +1,4 @@
-@require 'code/wfpl/stylus-helpers.styl'
+@require 'inc/wfpl/stylus-helpers.styl'
 @require '.image-mtimes.styl'
 
 // dimensions
wfpl-cms; A simple website/cms framework using WFPL