From f112ec8ddd15ec428ef9b09ef43fb8204b1a422c Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Fri, 1 Mar 2013 21:06:29 +0200
Subject: [PATCH] Site Structure Updates

---
 .htaccess                        | 2 +-
 storage/database/menu.table.xml  | 2 +-
 storage/database/pages.table.xml | 2 +-
 storage/database/users.table.xml | 2 +-
 storage/pages/2.page.txt         | 6 +++++-
 storage/pages/3.page.txt         | 4 ----
 6 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 storage/pages/3.page.txt

diff --git a/.htaccess b/.htaccess
index 9685b5a..753e230 100644
--- a/.htaccess
+++ b/.htaccess
@@ -19,7 +19,7 @@ Options -Indexes
 # Setting rewrite rules.
 <IfModule mod_rewrite.c>
 	RewriteEngine on
-	RewriteBase /projects/monstra-cms/
+	RewriteBase /%siteurlhere%/
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_FILENAME} !-d
 	RewriteRule ^(.*)$ index.php [QSA,L]
diff --git a/storage/database/menu.table.xml b/storage/database/menu.table.xml
index 85e9472..0b77f53 100644
--- a/storage/database/menu.table.xml
+++ b/storage/database/menu.table.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<root><options><autoincrement>4</autoincrement></options><fields><name/><link/><target/><order/><category/></fields><menu><id>1</id><uid>30152dec4d</uid><name>Home</name><link>home</link><category/><target/><order>1</order></menu><menu><id>2</id><uid>b8f8bb4daf</uid><name>Users</name><link>users</link><category/><target/><order>2</order></menu><menu><id>4</id><uid>5690966333</uid><name>About</name><link>about</link><category/><target/><order>3</order></menu></root>
+<root><options><autoincrement>3</autoincrement></options><fields><name/><link/><target/><order/><category/></fields><menu><id>1</id><uid>30152dec4d</uid><name>Home</name><link>home</link><category/><target/><order>1</order></menu><menu><id>2</id><uid>b8f8bb4daf</uid><name>Users</name><link>users</link><category/><target/><order>2</order></menu><menu><id>3</id><uid>1a1a394611</uid><name>Forum</name><link>http://forum.monstra.org/</link><category/><target>_blank</target><order>3</order></menu></root>
diff --git a/storage/database/pages.table.xml b/storage/database/pages.table.xml
index b13ef8a..8aff0fe 100644
--- a/storage/database/pages.table.xml
+++ b/storage/database/pages.table.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<root><options><autoincrement>3</autoincrement></options><fields><slug/><robots_index/><robots_follow/><template/><title/><parent/><status/><description/><keywords/><content/><date/><author/><expand/><access/></fields><pages><id>1</id><uid>ffa3ab3863</uid><content/><slug>error404</slug><robots_index>index</robots_index><robots_follow>follow</robots_follow><template>index</template><parent/><status>published</status><title>error404</title><description/><keywords/><date>1328270400</date><author>Monstra</author><access>public</access></pages><pages><id>2</id><uid>9c20ad0bf1</uid><content/><slug>home</slug><robots_index>index</robots_index><robots_follow>follow</robots_follow><template>home</template><parent/><status>published</status><title>Home</title><description/><keywords/><date>1355596403</date><author>Monstra</author><access>public</access></pages><pages><id>3</id><uid>2304fe8ab7</uid><content/><slug>about</slug><template>index</template><parent/><status>published</status><access>public</access><expand>0</expand><robots_index>index</robots_index><robots_follow>follow</robots_follow><title>About</title><description/><keywords/><date>1355596403</date><author>Monstra</author></pages></root>
+<root><options><autoincrement>2</autoincrement></options><fields><slug/><robots_index/><robots_follow/><template/><title/><parent/><status/><description/><keywords/><content/><date/><author/><expand/><access/></fields><pages><id>1</id><uid>ffa3ab3863</uid><content/><slug>error404</slug><robots_index>index</robots_index><robots_follow>follow</robots_follow><template>index</template><parent/><status>published</status><title>error404</title><description/><keywords/><date>1328270400</date><author>Monstra</author><access>public</access></pages><pages><id>2</id><uid>9c20ad0bf1</uid><content/><slug>home</slug><robots_index>index</robots_index><robots_follow>follow</robots_follow><template>index</template><parent/><status>published</status><title>Home</title><description/><keywords/><date>1333368000</date><author>Monstra</author><access>public</access></pages></root>
diff --git a/storage/database/users.table.xml b/storage/database/users.table.xml
index 8a2106e..0d023b6 100644
--- a/storage/database/users.table.xml
+++ b/storage/database/users.table.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<root><options><autoincrement>1</autoincrement></options><fields><login/><password/><email/><role/><date_registered/><firstname/><lastname/><login/><twitter/><skype/><hash/><about_me/></fields><users><id>1</id><uid>39f93e26b7</uid><firstname/><lastname/><twitter/><skype/><about_me/><login>admin</login><password>5d1e3697d706b0e24e574b56e79affda</password><email>admin@admin.com</email><hash>rMyy0lJ9LQe9</hash><date_registered>1357302731</date_registered><role>admin</role></users></root>
+<root><options><autoincrement>0</autoincrement></options><fields><login/><password/><email/><role/><date_registered/><firstname/><lastname/><login/><twitter/><skype/><hash/><about_me/></fields></root>
\ No newline at end of file
diff --git a/storage/pages/2.page.txt b/storage/pages/2.page.txt
index 565211b..ac8bce4 100644
--- a/storage/pages/2.page.txt
+++ b/storage/pages/2.page.txt
@@ -1,2 +1,6 @@
+&lt;h2&gt;Thank you for using Monstra :)&lt;/h2&gt;
+&lt;br /&gt;
 &lt;h3&gt;Demo content&lt;/h3&gt;
-&lt;p&gt;Cupcake ipsum dolor sit amet biscuit I love soufflé soufflé. Faworki faworki candy toffee. Cake sesame snaps tiramisu halvah. Tootsie roll lemon drops jelly beans wafer croissant. Soufflé liquorice donut tiramisu. Marzipan I love chocolate danish I love. Caramels chupa chups cheesecake caramels. Sweet roll dessert dragée tiramisu tiramisu pie tart. I love donut gummies carrot cake. Jujubes chupa chups cotton candy marzipan tiramisu. Gummies candy canes chocolate cake. Soufflé marshmallow chocolate bar gummies chocolate sugar plum. Bonbon marshmallow I love jelly.&lt;/p&gt;
\ No newline at end of file
+&lt;p&gt;Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed quis est vitae ipsum mattis vulputate. Nam consectetuer. Aenean sit amet massa. In cursus risus. Pellentesque sed est. Vestibulum convallis porta tellus. Sed ante libero, ornare id, pellentesque ac, tincidunt egestas, purus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Nam tellus pede, mollis eu, tincidunt sit amet, eleifend et, ligula. Mauris sapien sem, convallis non, commodo quis, vehicula vel, dui. Sed fringilla, dolor in gravida nonummy, tortor nisi auctor nibh, nec sodales sapien felis non risus. Donec odio metus, tincidunt nec, gravida sit amet, pretium eu, lacus. Etiam venenatis. Morbi ultrices, risus aliquet viverra mattis, ipsum nibh vehicula ligula, sit amet dignissim eros purus ac risus. Nunc faucibus magna id ante. In sodales tincidunt nibh. Proin porttitor est. In ultrices vulputate metus.&lt;/p&gt;
+
+{block get=&quot;test&quot;}
\ No newline at end of file
diff --git a/storage/pages/3.page.txt b/storage/pages/3.page.txt
deleted file mode 100644
index f2be35a..0000000
--- a/storage/pages/3.page.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-&lt;h3&gt;About page&lt;/h3&gt;
-&lt;p&gt;Cupcake ipsum dolor sit amet biscuit I love soufflé soufflé. Faworki faworki candy toffee. Cake sesame snaps tiramisu halvah. Tootsie roll lemon drops jelly beans wafer croissant. Soufflé liquorice donut tiramisu. Marzipan I love chocolate danish I love. Caramels chupa chups cheesecake caramels. Sweet roll dessert dragée tiramisu tiramisu pie tart. I love donut gummies carrot cake. Jujubes chupa chups cotton candy marzipan tiramisu. Gummies candy canes chocolate cake. Soufflé marshmallow chocolate bar gummies chocolate sugar plum. Bonbon marshmallow I love jelly.&lt;/p&gt;
-
-&lt;p&gt;I love wafer dessert dessert chupa chups wafer. Sweet roll croissant topping tart tootsie roll I love powder. Chupa chups sugar plum carrot cake powder candy I love sugar plum. Bonbon cake sweet marshmallow jelly. Fruitcake candy canes wafer brownie. Chocolate cake jujubes brownie chocolate chocolate cake sweet caramels marshmallow gummi bears. Tootsie roll candy canes tootsie roll I love cheesecake wafer. Cupcake pastry chocolate danish oat cake marzipan marzipan dessert. I love soufflé muffin liquorice. Sweet roll pastry powder cupcake fruitcake cake. Jelly-o brownie gingerbread cheesecake applicake applicake croissant pudding. Cookie liquorice sweet roll. Sesame snaps topping gummies halvah bear claw I love.&lt;/p&gt;
\ No newline at end of file