From 8c395f96deb3d9bc9c24e3c62b3709de12d44f39 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 15 Nov 2010 21:02:59 -0800
Subject: [PATCH] view directory cleanup

---
 {view => include}/acl_selectors.php |  0
 mod/group.php                       |  2 +-
 mod/message.php                     |  2 +-
 mod/network.php                     |  2 +-
 mod/photos.php                      |  4 ++--
 mod/profile.php                     |  2 +-
 mod/settings.php                    |  2 +-
 view/about.tpl                      | 14 --------------
 view/atom_cmnt.tpl                  | 21 ---------------------
 view/atom_item.tpl                  | 28 ----------------------------
 view/atom_tomb.tpl                  |  3 ---
 11 files changed, 7 insertions(+), 73 deletions(-)
 rename {view => include}/acl_selectors.php (100%)
 delete mode 100644 view/about.tpl
 delete mode 100644 view/atom_cmnt.tpl
 delete mode 100644 view/atom_item.tpl
 delete mode 100644 view/atom_tomb.tpl

diff --git a/view/acl_selectors.php b/include/acl_selectors.php
similarity index 100%
rename from view/acl_selectors.php
rename to include/acl_selectors.php
diff --git a/mod/group.php b/mod/group.php
index e5c6b92ae..01875d01f 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -113,7 +113,7 @@ function group_content(&$a) {
 
 
 	if(($a->argc == 2) && (intval($a->argv[1]))) {
-		require_once('view/acl_selectors.php');
+		require_once('include/acl_selectors.php');
 		$r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($a->argv[1]),
 			intval(local_user())
diff --git a/mod/message.php b/mod/message.php
index 9d7a86d55..3f5b71cc2 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('view/acl_selectors.php');
+require_once('include/acl_selectors.php');
 
 function message_init(&$a) {
 
diff --git a/mod/network.php b/mod/network.php
index a6e03440b..59fd12c4b 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -41,7 +41,7 @@ function network_content(&$a, $update = 0) {
 			'$geotag' => $geotag
 		));
 
-		require_once('view/acl_selectors.php');
+		require_once('include/acl_selectors.php');
 
 		$tpl = load_view_file("view/jot.tpl");
 		
diff --git a/mod/photos.php b/mod/photos.php
index addc04d76..f570d5b13 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once('Photo.php');
+require_once('include/Photo.php');
 require_once('include/items.php');
-require_once('view/acl_selectors.php');
+require_once('include/acl_selectors.php');
 require_once('include/bbcode.php');
 
 function photos_init(&$a) {
diff --git a/mod/profile.php b/mod/profile.php
index 8dd7b8ebf..240454017 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -159,7 +159,7 @@ function profile_content(&$a, $update = 0) {
 				'$geotag'  => $geotag
 			));
 
-			require_once('view/acl_selectors.php');
+			require_once('include/acl_selectors.php');
 
 			$tpl = load_view_file("view/jot.tpl");
 			if(is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))
diff --git a/mod/settings.php b/mod/settings.php
index 0687a498f..a40354c86 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -163,7 +163,7 @@ function settings_content(&$a) {
 		return;
 	}
 
-	require_once('view/acl_selectors.php');
+	require_once('include/acl_selectors.php');
 
 	$p = q("SELECT * FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
 		intval($_SESSION['uid'])
diff --git a/view/about.tpl b/view/about.tpl
deleted file mode 100644
index fa3d49cb7..000000000
--- a/view/about.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-<div id="about-jot-wrapper" >
-<p id="about-jot-desc" >
-Tell us about yourself. 
-</p>
-
-<textarea rows="15" cols="72" id="profile-jot-text" name="body" >$about</textarea>
-
-</div>
-<div id="about-jot-submit-wrapper" >
-<input type="submit" id="about-jot-submit" name="submit" value="Submit" />
-</div>
-<div id="profile-jot-end"></div>
-</div>
diff --git a/view/atom_cmnt.tpl b/view/atom_cmnt.tpl
deleted file mode 100644
index b70a6dc4e..000000000
--- a/view/atom_cmnt.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-	<entry>
-		<author>
-			<name>$name</name>
-			<uri>$profile_page</uri>
-			<link rel="photo"  type="image/jpeg" media:width="80" media:height="80" href="$thumb" />
-			<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="$thumb" />
-		</author>
-
-		<thr:in-reply-to ref="$parent_id" />
-		<id>$item_id</id>
-		<title>$title</title>
-		<published>$published</published>
-		<updated>$updated</updated>
-		<content type="$type" >$content</content>
-		<link rel="alternate" href="$alt" />
-		<dfrn:comment-allow>$comment_allow</dfrn:comment-allow>
-		<as:verb>$verb</as:verb>
-		$actobj
-		$mentioned
-	</entry>
-
diff --git a/view/atom_item.tpl b/view/atom_item.tpl
deleted file mode 100644
index 0d36b579d..000000000
--- a/view/atom_item.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-	<entry>
-		<author>
-			<name>$name</name>
-			<uri>$profile_page</uri>
-			<link rel="photo"  type="image/jpeg" media:width="80" media:height="80" href="$thumb" />
-			<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="$thumb" />
-		</author>
-		<dfrn:owner>
-			<name>$owner_name</name>
-			<uri>$owner_profile_page</uri>
-			<link rel="photo"  type="image/jpeg" media:width="80" media:height="80" href="$owner_thumb" />
-			<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="$owner_thumb" />
-		</dfrn:owner>
-
-		<id>$item_id</id>
-		<title>$title</title>
-		<published>$published</published>
-		<updated>$updated</updated>
-		<content type="$type" >$content</content>
-		<link rel="alternate" href="$alt" />
-		<dfrn:location>$location</dfrn:location>
-		<georss:point>$coord</georss:point>
-		<dfrn:comment-allow>$comment_allow</dfrn:comment-allow>
-		<as:verb>$verb</as:verb>
-		$actobj
-		$mentioned
-
-	</entry>
diff --git a/view/atom_tomb.tpl b/view/atom_tomb.tpl
deleted file mode 100644
index 99e1b943a..000000000
--- a/view/atom_tomb.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-
-	<at:deleted-entry ref="$id" when="$updated" />
-