Initial checkin

39 files changed, 1249 insertions, 0 deletions

diff --git a/view/about.tpl b/view/about.tpl
new file mode 100644
index 000000000..fa3d49cb7
--- /dev/null
+++ b/view/about.tpl
@@ -0,0 +1,14 @@
+
+<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/contact_selectors.php b/view/contact_selectors.php
new file mode 100644
index 000000000..186a50e7a
--- /dev/null
+++ b/view/contact_selectors.php
@@ -0,0 +1,21 @@
+<?php
+
+
+function select_contact_profile($current) {
+
+	$o = '';
+	$o .= "<select id=\"contact_profile_selector\" name=\"profile_id\" />";
+
+	$r = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
+                        intval($_SESSION['uid']));
+
+	if(count($r)) {
+		foreach($r as $rr) {
+			$selected = (($rr['profile-name'] == $current) ? " selected=\"selected\" " : "");
+			$o .= "<option value=\"{$rr['profile-name']}\" $selected >{$rr['profile-name']}</option>";
+		}
+	}
+	$o .= "</select>";
+	return $o;
+}
+
diff --git a/view/contact_self.tpl b/view/contact_self.tpl
new file mode 100644
index 000000000..7f5467b39
--- /dev/null
+++ b/view/contact_self.tpl
@@ -0,0 +1,9 @@
+
+<img src="$thumb" alt="$name" >
+
+<p>$name</p>
+<p>
+This is you.
+</p>
+
+<hr />
\ No newline at end of file
diff --git a/view/contact_template.tpl b/view/contact_template.tpl
new file mode 100644
index 000000000..c590ba3d1
--- /dev/null
+++ b/view/contact_template.tpl
@@ -0,0 +1,16 @@
+
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-$id" >
+<div class="contact-entry-photo" id="contact-entry-photo-$id" >
+	<a href="$url" title="Visit $name's profile" /><img src="$thumb" alt="$name" ></a>
+</div>
+<div class="contact-entry-name" id="contact-entry-name-$id" >$name</div>
+</div>
+<div class="contact-entry-edit-links" >
+<a href="contacts/$id/edit" class="contact-entry-edit-link" ><img src="images/b_edit.gif" alt="Edit contact" title="Edit contact" /></a>
+<a href="contacts/$id/block" class="contact-edit-block-link" ><img src="images/b_block.gif" alt="Block contact" title="Block contact"/></a>
+<a href="contacts/$id/drop" class="contact-entry-block-link"><img src="images/b_drop.gif" alt="Delete contact" title="Delete contact"/></a>
+</div>
+<div class="contact-entry-end" ></div>
+
+
+<hr />
\ No newline at end of file
diff --git a/view/contacts-top.tpl b/view/contacts-top.tpl
new file mode 100644
index 000000000..20740ad87
--- /dev/null
+++ b/view/contacts-top.tpl
@@ -0,0 +1,5 @@
+<h1>Contacts</h1>
+
+<div id="contacts-main" >
+<a href="$hide_url" id="contacts-show-hide-link">$hide_text</a>
+</div>
diff --git a/view/cropbody.tpl b/view/cropbody.tpl
new file mode 100644
index 000000000..03baf61e7
--- /dev/null
+++ b/view/cropbody.tpl
@@ -0,0 +1,56 @@
+<h1>Crop Image</h1>
+<p id="cropimage-desc">
+Please adjust the image cropping for optimum viewing.
+</p>
+<div id="cropimage-wrapper">
+<img src="$image_url" id="croppa" class="imgCrop" alt="" />
+</div>
+<div id="cropimage-preview-wrapper" >
+<div id="previewWrap" ></div>
+</div>
+
+<script type="text/javascript" language="javascript">
+
+	function onEndCrop( coords, dimensions ) {
+		$( 'x1' ).value = coords.x1;
+		$( 'y1' ).value = coords.y1;
+		$( 'x2' ).value = coords.x2;
+		$( 'y2' ).value = coords.y2;
+		$( 'width' ).value = dimensions.width;
+		$( 'height' ).value = dimensions.height;
+	}
+
+	Event.observe( window, 'load', function() {
+		new Cropper.ImgWithPreview(
+		'croppa',
+		{
+			previewWrap: 'previewWrap',
+			minWidth: 175,
+			minHeight: 175,
+			maxWidth: 640,
+			maxHeight: 640,
+			ratioDim: { x: 100, y:100 },
+			displayOnInit: true,
+			onEndCrop: onEndCrop
+		}
+		);
+	}
+	);
+
+</script>
+
+<form action="profile_photo/$profile_id/$resource" id="crop-image-form" method="post" />
+
+<input type="hidden" name="imagename" value="$hash" />
+<input type="hidden" name="xstart" id="x1" />
+<input type="hidden" name="ystart" id="y1" />
+<input type="hidden" name="xfinal" id="x2" />
+<input type="hidden" name="yfinal" id="y2" />
+<input type="hidden" name="height" id="height" />
+<input type="hidden" name="width"  id="width" />
+
+<div id="crop-image-submit-wrapper" >
+<input type="submit" name="submit" value="Done Editing" />
+</div>
+
+</form>
diff --git a/view/crophead.tpl b/view/crophead.tpl
new file mode 100644
index 000000000..2bfb7abe0
--- /dev/null
+++ b/view/crophead.tpl
@@ -0,0 +1,6 @@
+      <script type="text/javascript" src="cropper/lib/prototype.js" language="javascript"></script>
+
+      <script type="text/javascript" src="cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
+
+      <script type="text/javascript" src="cropper/cropper.js" language="javascript"></script>
+      <link rel="stylesheet" href="cropper/cropper.css" type="text/css" />
diff --git a/view/custom_tinymce.css b/view/custom_tinymce.css
new file mode 100644
index 000000000..48621c42c
--- /dev/null
+++ b/view/custom_tinymce.css
@@ -0,0 +1,35 @@
+body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:14px; margin:8px;}
+body {background:#FFF;}
+body.mceForceColors {background:#FFF; color:#000;}
+h1 {font-size: 2em}
+h2 {font-size: 1.5em}
+h3 {font-size: 1.17em}
+h4 {font-size: 1em}
+h5 {font-size: .83em}
+h6 {font-size: .75em}
+.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}
+a.mceItemAnchor {display:inline-block; width:11px !important; height:11px  !important; background:url(img/items.gif) no-repeat 0 0;}
+td.mceSelected, th.mceSelected {background-color:#3399ff !important}
+img {border:0;}
+table {cursor:default}
+table td, table th {cursor:text}
+ins {border-bottom:1px solid green; text-decoration: none; color:green}
+del {color:red; text-decoration:line-through}
+cite {border-bottom:1px dashed blue}
+acronym {border-bottom:1px dotted #CCC; cursor:help}
+abbr {border-bottom:1px dashed #CCC; cursor:help}
+
+/* IE */
+* html body {
+scrollbar-3dlight-color:#F0F0EE;
+scrollbar-arrow-color:#676662;
+scrollbar-base-color:#F0F0EE;
+scrollbar-darkshadow-color:#DDD;
+scrollbar-face-color:#E0E0DD;
+scrollbar-highlight-color:#F0F0EE;
+scrollbar-shadow-color:#F0F0EE;
+scrollbar-track-color:#F5F5F5;
+}
+
+img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px}
+font[face=mceinline] {font-family:inherit !important}
diff --git a/view/default.php b/view/default.php
new file mode 100644
index 000000000..25d8ea1dc
--- /dev/null
+++ b/view/default.php
@@ -0,0 +1,15 @@
+<!DOCTYPE html >

+<html>

+<head>

+  <title><?php echo $page['title'] ?></title>

+  <?php echo $page['htmlhead'] ?>

+</head>

+<body>

+	<header><?php echo $page['header']; ?></header>

+	<nav><?php echo $page['nav']; ?></nav>

+	<aside><?php echo $page['aside']; ?></aside>

+	<section><?php echo $page['content']; ?></section>

+	<footer><?php echo $page['footer']; ?></footer>

+</body>

+</html>

+

diff --git a/view/dfrn_req_confirm.tpl b/view/dfrn_req_confirm.tpl
new file mode 100644
index 000000000..1914e4c0e
--- /dev/null
+++ b/view/dfrn_req_confirm.tpl
@@ -0,0 +1,17 @@
+
+<p id="dfrn-request-homecoming" >
+Welcome home $username. 
+<br />
+Please confirm your introduction to $dfrn_url.
+
+</p>
+<form id="dfrn-request-homecoming-form" action="dfrn_request/$uid" method="post"> 
+<input type="hidden" name="dfrn_url" value="$dfrn_url" />
+<input type="hidden" name="confirm_key" value="$confirm_key" />
+<input type="hidden" name="localconfirm" value="1" />
+$aes_allow
+
+<div id="dfrn-request-homecoming-submit-wrapper" >
+<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="Confirm" />
+</div>
+</form>
\ No newline at end of file
diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl
new file mode 100644
index 000000000..df935ae2a
--- /dev/null
+++ b/view/dfrn_request.tpl
@@ -0,0 +1,54 @@
+
+<h1>Personal Introduction</h1>
+
+<p id="dfrn-request-intro">
+You may introduce yourself to this member if you have a valid <a href="http://dfrn.org">DFRN profile</a>.
+</p>
+
+<form action="dfrn_request/$uid" method="post" />
+
+<div id="dfrn-request-url-wrapper" >
+	<label id="dfrn-url-label" for="dfrn-url" >Your DFRN Profile URL:</label>
+	<input type="text" name="dfrn_url" id="dfrn-url" size="32" />
+	<div id="dfrn-request-url-end"></div>
+</div>
+
+<p id="dfrn-request-options">
+Please answer the following:
+</p>
+
+<div id="dfrn-request-info-wrapper" >
+
+<p id="doiknowyou">
+Do I know you?
+</p>
+
+		<div id="dfrn-request-know-yes-wrapper">
+		<label id="dfrn-request-knowyou-yes-label" for="dfrn-request-knowyouyes">Yes</label>
+		<input type="radio" name="knowyou" id="knowyouyes" value="1" />
+
+		<div id="dfrn-request-knowyou-break" ></div>	
+		</div>
+		<div id="dfrn-request-know-no-wrapper">
+		<label id="dfrn-request-knowyou-no-label" for="dfrn-request-knowyouno">No</label>
+		<input type="radio" name="knowyou" id="knowyouno" value="0" checked="checked" />
+
+		<div id="dfrn-request-knowyou-end"></div>
+		</div>
+
+
+<p id="dfrn-request-message-desc">
+Add a personal note:
+</p>
+	<div id="dfrn-request-message-wrapper">
+	<textarea name="dfrn-request-message" rows="4" cols="64" ></textarea>
+	</div>
+
+
+</div>
+
+	<div id="dfrn-request-submit-wrapper">
+		<input type="submit" name="submit" id="dfrn-request-submit-button" value="Submit Request" />
+		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="Cancel" />
+	</div>
+</form>
diff --git a/view/head.tpl b/view/head.tpl
new file mode 100644
index 000000000..3a7bcc604
--- /dev/null
+++ b/view/head.tpl
@@ -0,0 +1,8 @@
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<base href="$baseurl" />
+<link rel="stylesheet" type="text/css" href="$baseurl/view/style.css" media="all" />
+
+<!--[if IE]>
+<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
+
diff --git a/view/intro_complete_eml.tpl b/view/intro_complete_eml.tpl
new file mode 100644
index 000000000..414caaa7a
--- /dev/null
+++ b/view/intro_complete_eml.tpl
@@ -0,0 +1,28 @@
+
+Dear $username,
+
+	An approval was recently processed at $sitename for a personal
+introduction you initiated.
+
+	You are now connected to '$fn' at '$dfrn_url'. 
+
+Your access privileges to this profile MAY have been elevated. Please
+view their profile from within your $sitename "Contacts" page going 
+forward. Should you visit the URL without going through $sitename,
+you will only see this person's public profile. 
+
+At $sitename, "relationships" are allowed to be one sided. Be advised 
+that your communications with this person may be partially limited 
+if they do not request (and you accept) a reciprocal relationship.
+
+You may now send them directed messages, and you also may have the 
+ability to receive non-public status messages and view otherwise 
+hidden profiles. Should this turn into a mutual relationship you 
+will both have this level of access.
+
+
+Sincerely,
+
+	$sitename Administrator
+
+ 
diff --git a/view/intros-top.tpl b/view/intros-top.tpl
new file mode 100644
index 000000000..71007dbf6
--- /dev/null
+++ b/view/intros-top.tpl
@@ -0,0 +1,7 @@
+<h1>Pending Introductions / Notifications</h1>
+
+<div id="notification-show-hide-wrapper" >
+<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
+</div>
+
+
diff --git a/view/intros.tpl b/view/intros.tpl
new file mode 100644
index 000000000..75739005b
--- /dev/null
+++ b/view/intros.tpl
@@ -0,0 +1,21 @@
+
+<div class="intro-wrapper" id="intro-$contact-id" >
+<hr class="intro-top" />
+<p class="intro-desc">Notification type: Introduction</p>
+<div class="intro-fullname" id="intro-fullname-$contact-id" >$fullname</div>
+<a class="intro-url-link" id="intro-url-link-$contact-id" href="$url" ><img id="photo-$contact-id" class="intro-photo" src="$photo" width="175" height=175" name="$fullname" alt="fullname" /></a>
+<div class="intro-knowyou">Presumably known to you? <strong>$knowyou</strong></div>
+<div class="intro-note" id="intro-note-$contact-id">$note</div>
+<div class="intro-wrapper-end" id="intro-wrapper-end-$contact-id"></div>
+
+<form class="intro-approve-form" action="dfrn_confirm" method="post">
+<input type="hidden" name="dfrn_id" value="$dfrn-id" >
+<input type="hidden" name="intro_id" value="$intro_id" >
+<input class="intro-submit-approve" type="submit" name="submit" value="Approve" />
+</form>
+<form class="intro-form" action="notifications/$intro_id" method="post">
+<input class="intro-submit-ignore" type="submit" name="submit" value="Ignore" />
+<input class="intro-submit-discard" type="submit" name="submit" value="Discard" />
+</form>
+</div>
+<div class="intro-end"></div>
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
new file mode 100644
index 000000000..e5607b6bb
--- /dev/null
+++ b/view/jot-header.tpl
@@ -0,0 +1,35 @@
+<script language="javascript" type="text/javascript"
+          src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+          <script language="javascript" type="text/javascript">
+
+
+tinyMCE.init({
+	theme : "advanced",
+	mode : "textareas",
+	plugins : "bbcode",
+	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
+	theme_advanced_buttons2 : "",
+	theme_advanced_buttons3 : "",
+	theme_advanced_toolbar_location : "top",
+	theme_advanced_toolbar_align : "center",
+	theme_advanced_styles : "Code=codeStyle;Quote=quoteStyle",
+	content_css : "bbcode.css",
+	entity_encoding : "raw",
+	add_unload_trigger : false,
+	remove_linebreaks : false,
+	content_css: "$baseurl/view/custom_tinymce.css"
+
+
+});
+</script>
+
+<!--
+
+	relative_urls: false,
+        document_base_url : "$baseurl/",
+         external_image_list_url : "$baseurl/include/imagelist-js.php",
+         content_css : "$baseurl/view/tiny.css"
+
+});
+</script>
+-->
\ No newline at end of file
diff --git a/view/jot-plain.tpl b/view/jot-plain.tpl
new file mode 100644
index 000000000..e3d2fa687
--- /dev/null
+++ b/view/jot-plain.tpl
@@ -0,0 +1,15 @@
+
+<div id="profile-jot-wrapper" >
+<p id="profile-jot-desc" >
+What's on your mind?
+</p>
+<form id="profile-jot-form" action="item" method="post" >
+<input type="hidden" name="type" value="jot" />
+<textarea rows="5" cols="64" id="profile-jot-text" name="body" ></textarea>
+
+</div>
+<div id="profile-jot-submit-wrapper" >
+<input type="submit" id="profile-jot-submit" name="submit" value="Submit" onclick="doCheck();" />
+</div>
+</div>
+<div id="profile-jot-end"></div>
diff --git a/view/jot-save.tpl b/view/jot-save.tpl
new file mode 100644
index 000000000..6de692e07
--- /dev/null
+++ b/view/jot-save.tpl
@@ -0,0 +1,31 @@
+
+<div id="profile-jot-wrapper" >
+<p id="profile-jot-desc" >
+What's on your mind?
+</p>
+<form id="profile-jot-form" action="item" method="post" onclick="doCheck();" >
+<input type="hidden" name="type" value="jot" />
+        <div class="richeditor">
+                <div class="editbar">
+                        <button title="bold" onclick="doClick('bold');" type="button"><b>B</b></button>
+                        <button title="italic" onclick="doClick('italic');" type="button"><i>I</i></button>
+                        <button title="underline" onclick="doClick('underline');" type="button"><u>U</u></button>
+                        <button title="hyperlink" onclick="doLink();" type="button" style="background-image:url('editor/images/url.gif');"></button>
+                        <button title="image" onclick="doImage();" type="button" style="background-image:url('editor/images/img.gif');"></button>
+                        <button title="list" onclick="doClick('InsertUnorderedList');" type="button" style="background-image:url('editor/images/icon_list.gif');"></button>
+                        <button title="color" onclick="showColorGrid2('none')" type="button" style="background-image:url('$baseurl/editor/images/colors.gif');"></button><span id="colorpicker201" class="colorpicker201"></span>
+                        <button title="quote" onclick="doQuote();" type="button" style="background-image:url('editor/images/icon_quote.png');"></button>
+                        <button title="youtube" onclick="InsertYoutube();" type="button" style="background-image:url('editor/images/icon_youtube.gif');"></button>
+                        <button title="switch to source" type="button" onclick="javascript:SwitchEditor()" style="background-image:url('editor/images/icon_html.gif');"></button>
+		</div>
+
+<textarea rows="5" cols="64" id="profile-jot-text" name="body" ></textarea>
+<script type="text/javascript">initEditor("profile-jot-text", true);</script>
+
+</div>
+<div id="profile-jot-submit-wrapper" >
+<input type="submit" id="profile-jot-submit" name="submit" value="Submit" onclick="doCheck();" />
+
+</div>
+<div id="profile-jot-end"></div>
+</div>
\ No newline at end of file
diff --git a/view/jot.tpl b/view/jot.tpl
new file mode 100644
index 000000000..f005ab78e
--- /dev/null
+++ b/view/jot.tpl
@@ -0,0 +1,18 @@
+
+<div id="profile-jot-wrapper" >
+<p id="profile-jot-desc" >
+What's on your mind?
+</p>
+<form id="profile-jot-form" action="item" method="post" >
+<input type="hidden" name="type" value="jot" />
+<input type="hidden" name="profile_uid" value="$profile_uid" />
+
+<textarea rows="5" cols="64" id="profile-jot-text" name="body" ></textarea>
+
+</div>
+<div id="profile-jot-submit-wrapper" >
+<input type="submit" id="profile-jot-submit" name="submit" value="Submit" />
+
+</div>
+<div id="profile-jot-end"></div>
+</div>
diff --git a/view/login.tpl b/view/login.tpl
new file mode 100644
index 000000000..2ce7241fc
--- /dev/null
+++ b/view/login.tpl
@@ -0,0 +1,25 @@
+
+<form action="" method="post" >
+<input type="hidden" name="auth-params" value="login" />
+<div id="login-name-wrapper">
+        <label for="login-name" id="label-login-name">Email address: </label>
+        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
+</div>
+<div id="login-name-end" ></div>
+<div id="login-password-wrapper">
+        <label for="login-password" id="label-login-password">Password: </label>
+        <input type="password" maxlength="60" name="password" id="login-password" value="" />
+</div>
+<div id="login-password-end"></div>
+<div id="login-extra-links">
+	<div id="login-extra-filler">&nbsp;</div>
+	$register_html
+        <a href="lost-password" name="Lost your password?" id="lost-password-link" >Password Reset</a>
+</div>
+<div id="login-extra-end"></div>
+<div id="login-submit-wrapper" >
+        <input type="submit" name="submit" id="login-submit-button" value="Login" />
+</div>
+<div id="login-submit-end"></div>
+</form>
+
diff --git a/view/logout.tpl b/view/logout.tpl
new file mode 100644
index 000000000..9a6c1d763
--- /dev/null
+++ b/view/logout.tpl
@@ -0,0 +1,6 @@
+<form action="" method="post" >
+<div class="logout-wrapper">
+<input type="hidden" name="auth-params" value="logout" />
+<input type="submit" name="submit" id="logout-button" value="Logout" />
+</div>
+</form>
diff --git a/view/profile-in-directory.tpl b/view/profile-in-directory.tpl
new file mode 100644
index 000000000..a120a24c1
--- /dev/null
+++ b/view/profile-in-directory.tpl
@@ -0,0 +1,16 @@
+<p id="profile-in-directory">
+Publish this profile in site directory? 
+</p>
+
+		<div id="profile-in-dir-yes-wrapper">
+		<label id="profile-in-dir-yes-label" for="profile-in-dir-yes">Yes</label>
+		<input type="radio" name="profile_in_directory" id="profile-in-dir-yes" checked="checked" value="1" />
+
+		<div id="profile-in-dir-break" ></div>	
+		</div>
+		<div id="profile-in-dir-no-wrapper">
+		<label id="profile-in-dir-no-label" for="profile-in-dir-no">No</label>
+		<input type="radio" name="profile_in_directory" id="profile-in-dir-no" value="0"  />
+
+		<div id="profile-in-dir-end"></div>
+		</div>
diff --git a/view/profile.php b/view/profile.php
new file mode 100644
index 000000000..54087404a
--- /dev/null
+++ b/view/profile.php
@@ -0,0 +1,66 @@
+<!DOCTYPE html ><?php // This is a perfect example of why I prefer to use template files rather than mixed PHP/HTML ?>

+<html>

+<head>

+  <title><?php echo $page['title']; ?></title>

+  <?php echo $page['htmlhead']; ?>

+</head>

+<body>

+<header><?php echo $page['header']; ?></header>

+<nav><?php echo $page['nav']; ?></nav>

+<aside>

+<?php if((is_array($profile)) && count($profile)) { ?>

+<div class="vcard">

+	<?php if(strlen($profile['name'])) { ?>

+		<div class="fn"><?php echo $profile['name']; ?></div>

+	<?php } ?>

+

+	<?php if(strlen($profile['photo'])) { ?>

+		<div id="profile-photo-wrapper"><img class="photo" src="<?php echo $profile['photo']; ?>" alt="<?php echo $profile['name']; ?>" /></div>

+	<?php } ?>

+

+	<div id="profile-extra-links">

+	<a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['uid']; ?>">Introductions</a>

+	</div>

+

+	<?php if ( (strlen($profile['address'])) 

+		|| (strlen($profile['locality']))

+		|| (strlen($profile['region'])) 

+		|| (strlen($profile['postal-code'])) 

+		|| (strlen($profile['country-name']))) { ?>

+		<div class="location">Location:

+			<div class="adr">

+				<div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></div>

+				<div class="city-state-zip"><span class="locality"><?php echo $profile['locality']; ?></span><?php if(strlen($profile['region'])) echo ', '; ?><span class="region"><?php echo $profile['region'] ?></span><?php if(strlen($profile['postal-code'])) { ?> <span class="postal-code"><?php echo $profile['postal-code']; ?></span><?php } ?></div>

+				<div class="country-name"><?php echo $profile['country-name']; ?></div>

+			</div>

+		</div>

+

+	<?php } ?>

+

+	<?php if(strlen($profile['gender'])) { ?>

+		<div class="mf">Gender: <span class="x-gender"><?php echo $profile['gender']; ?></span></div>

+

+	<?php } ?>

+

+	<?php if(strlen($profile['pubkey'])) { ?>

+		<div class="key" style="display: none"><?php echo $profile['pubkey']; ?></div>

+	<?php } ?>

+</div>

+<?php } ?>

+<?php if(strlen($profile['marital'])) { ?>

+<div class="marital"><span class="marital-label">Status: </span><span class="marital-text"><?php echo $profile['marital']; ?></span></div>

+<?php } ?>

+<?php if(strlen($profile['url'])) { ?>

+<div class="homepage"><span class="homepage-label">Status: </span><span class="homepage-url"><?php echo $profile['homepage']; ?></span></div>

+<?php } ?>

+<?php echo $page['aside'] ?>

+</aside>

+<section>

+<?php echo $page['content']; ?>

+</section>

+<footer>

+<?php echo $page['footer']; ?>

+</footer>

+</body>

+</html>

+

diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl
new file mode 100644
index 000000000..25fc6fd4e
--- /dev/null
+++ b/view/profile_edit.tpl
@@ -0,0 +1,91 @@
+<h1>Edit Profile Details</h1>
+
+$default
+
+<div id="profile-edit-wrapper" >
+<form id="profile-edit-form" action="profiles/$profile_id" method="post" >
+
+<div id="profile-edit-profile-name-wrapper" >
+<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >Profile Name: </label>
+<input type="text size="32" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div>
+</div>
+<div id="profile-edit-profile-name-end"></div>
+
+<div id="profile-edit-name-wrapper" >
+<label id="profile-edit-name-label" for="profile-edit-name" >Your Full Name: </label>
+<input type="text size="32" name="name" id="profile-edit-name" value="$name" />
+</div>
+<div id="profile-edit-name-end"></div>
+
+<div id="profile-edit-gender-wrapper" >
+<label id="profile-edit-gender-label" for="profile-edit-" >Your Gender: </label>
+$gender
+</div>
+<div id="profile-edit-gender-end"></div>
+
+
+<div id="profile-edit-address-wrapper" >
+<label id="profile-edit-address-label" for="profile-edit-address" >Street Address: </label>
+<input type="text size="32" name="address" id="profile-edit-address" value="$address" />
+</div>
+<div id="profile-edit-address-end"></div>
+
+<div id="profile-edit-locality-wrapper" >
+<label id="profile-edit-locality-label" for="profile-edit-locality" >Locality/City: </label>
+<input type="text size="32" name="locality" id="profile-edit-locality" value="$locality" />
+</div>
+<div id="profile-edit-locality-end"></div>
+
+<div id="profile-edit-region-wrapper" >
+<label id="profile-edit-region-label" for="profile-edit-region" >Region/State: </label>
+<input type="text size="32" name="region" id="profile-edit-region" value="$region" />
+</div>
+<div id="profile-edit-region-end"></div>
+
+<div id="profile-edit-postal-code-wrapper" >
+<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >Postal/Zip Code: </label>
+<input type="text size="32" name="postal_code" id="profile-edit-postal-code" value="$postal_code" />
+</div>
+<div id="profile-edit-postal-code-end"></div>
+
+<div id="profile-edit-country-name-wrapper" >
+<label id="profile-edit-country-name-label" for="profile-edit-country-name" >Country: </label>
+<input type="text size="32" name="country_name" id="profile-edit-country-name" value="$country_name" />
+</div>
+<div id="profile-edit-country-name-end"></div>
+
+
+<div id="profile-edit-marital-wrapper" >
+<label id="profile-edit-marital-label" for="profile-edit-marital" >Marital Status: </label>
+$marital
+</div>
+<div id="profile-edit-marital-end"></div>
+
+<div id="profile-edit-homepage-wrapper" >
+<label id="profile-edit-homepage-label" for="profile-edit-homepage" >Homepage URL: </label>
+<input type="text size="32" name="homepage" id="profile-edit-homepage" value="$homepage" />
+</div>
+<div id="profile-edit-homepage-end"></div>
+
+$profile_in_dir
+
+<div id="about-jot-wrapper" >
+<p id="about-jot-desc" >
+Tell us about yourself. 
+</p>
+
+<textarea rows="13" cols="72" id="profile-jot-text" name="about" >$about</textarea>
+
+</div>
+<div id="about-jot-end"></div>
+</div>
+
+
+<div id="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" id="profile-edit-submit-button" value="Submit" />
+</div>
+<div id="profile-edit-submit-end"></div>
+
+
+</form>
+</div>
\ No newline at end of file
diff --git a/view/profile_entry.tpl b/view/profile_entry.tpl
new file mode 100644
index 000000000..9b3be79d3
--- /dev/null
+++ b/view/profile_entry.tpl
@@ -0,0 +1,13 @@
+
+<div class="profile-listing" >
+<div class="profile-listing-photo-wrapper" >
+<a class="profile-listing-photo-edit-link" id="profile-listing-photo-edit-link-$id" title="Edit/Change Profile Photo" href="profile_photo/$id" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="Profile Image" /></a>
+</div>
+<div class="profile-listing-name" id="profile-listing-name-$id">$profile_name</div>
+<div class="profile-listing-edit-buttons-wrapper" id="profile-listing-edit-buttons-wrapper-$id">
+<a href="profiles/$id" class="profile-listing-edit-link" ><img src="images/b_edit.gif" alt="Edit Profile" title="Edit Profile" /></a>
+<a href="profiles/drop/$id" class="profile-listing-drop-link" ><img src="images/b_drop.gif" alt="Delete Profile" title="Delete Profile" /></a>
+</div>
+</div>
+<div class="profile-listing-end"></div>
+
diff --git a/view/profile_entry_default.tpl b/view/profile_entry_default.tpl
new file mode 100644
index 000000000..bd74b9c54
--- /dev/null
+++ b/view/profile_entry_default.tpl
@@ -0,0 +1,11 @@
+
+<div class="profile-listing" >
+<div class="profile-listing-photo-wrapper" >
+<a class="profile-listing-photo-edit-link" id="profile-listing-photo-edit-link-$id" title="Edit/Change Profile Photo" href="profile_photo/$id" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="Profile Image" /></a>
+</div>
+<div class="profile-listing-name" id="profile-listing-name-$id">$profile_name</div>
+<div class="profile-listing-edit-buttons-wrapper" id="profile-listing-edit-buttons-wrapper-$id">
+<a href="profiles/$id" class="profile-listing-edit-link" ><img src="images/b_edit.gif" alt="Edit Profile" title="Edit Profile" /></a>
+</div>
+</div>
+<div class="profile-listing-end"></div>
diff --git a/view/profile_listing_header.tpl b/view/profile_listing_header.tpl
new file mode 100644
index 000000000..ce052658d
--- /dev/null
+++ b/view/profile_listing_header.tpl
@@ -0,0 +1,8 @@
+<h1>Profiles</h1>
+<p id="profile-listing-desc" >
+Click photo to change profile image or use controls to edit/delete profile details.
+</p>
+<div id="profile-listing-new-link-wrapper" >
+<a href="profiles/new" id="profile-listing-new-link" name="Create New Profile" >Create New Profile</a>
+</div>
+
diff --git a/view/profile_photo.tpl b/view/profile_photo.tpl
new file mode 100644
index 000000000..0bd5d7b1b
--- /dev/null
+++ b/view/profile_photo.tpl
@@ -0,0 +1,14 @@
+<h1>Upload Profile Photo</h1>
+
+<form enctype="multipart/form-data" action="profile_photo/$profile_id" method="post">
+
+<div id="profile-photo-upload-wrapper">
+<label id="profile-photo-upload-label" for="profile-photo-upload">Upload File: </label>
+<input name="userfile" type="file" id="profile-photo-upload" size="48" />
+</div>
+
+<div id="profile-photo-submit-wrapper">
+<input type="submit" name="submit" id="profile-photo-submit" value="Upload">
+</div>
+
+</form>
\ No newline at end of file
diff --git a/view/profile_selectors.php b/view/profile_selectors.php
new file mode 100644
index 000000000..c6e64403a
--- /dev/null
+++ b/view/profile_selectors.php
@@ -0,0 +1,32 @@
+<?php
+
+
+function gender_selector($current="",$suffix="") {
+	$select = array('','Male','Female','Other');
+
+	$o .= "<select name=\"gender$suffix\" id=\"gender-select$suffix\" size=\"1\" >";
+	foreach($select as $selection) {
+		$selected = (($selection == $current) ? ' selected="selected" ' : '');
+		$o .= "<option value=\"$selection\" $selected >$selection</option>";
+	}
+	$o .= '</select>';
+	return $o;
+}	
+
+
+function marital_selector($current="",$suffix="") {
+	$select = array('','Single', 'Lonely', 'Available', 'Unavailable', 'Dating', 'Unfaithful', 'Sex Addict', 'Friends', 'Friends/Benefits', 'Casual', 'Engaged', 'Married', 'Partners', 'Cohabiting', 'Happy', 'Not Looking', 'Swinger', 'Betrayed', 'Separated', 'Unstable', 'Divorced', 'Widowed', 'Uncertain', 'Complicated', 'Don\'t care', 'Ask me' );
+
+	$o .= "<select name=\"marital[]\" id=\"marital-select\" multiple=\"multiple\" size=\"2\" >";
+	foreach($select as $selection) {
+		$selected = (($selection == $current) ? ' selected="selected" ' : '');
+		$o .= "<option value=\"$selection\" $selected >$selection</option>";
+	}
+	$o .= '</select>';
+	return $o;
+}	
+
+
+//function birthday_selector($current = '') {
+//	if($current && (strlen($current)
+//}
\ No newline at end of file
diff --git a/view/register-link.tpl b/view/register-link.tpl
new file mode 100644
index 000000000..7f3fca4d6
--- /dev/null
+++ b/view/register-link.tpl
@@ -0,0 +1 @@
+	<a href="register" name="Create a New Account" id="register-link" >Register</a>
diff --git a/view/register.tpl b/view/register.tpl
new file mode 100644
index 000000000..f3cff3a1b
--- /dev/null
+++ b/view/register.tpl
@@ -0,0 +1,15 @@
+
+<form action="register" method="post" />
+	$registertext
+	<div id="register-name-wrapper" >
+		<label for="register-name" id="label-register-name" >Your Full Name (e.g. Joe Smith): <label>
+		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="" >
+	</div>
+	<div id="register-email-wrapper" >
+		<label for="register-email" id="label-register-email" >Your Email Address: <label>
+		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="" >
+	</div>
+	<div id="register-submit-wrapper">
+		<input type="submit" name="submit" id="register-submit-button" value="Register" />
+	</div>
+</form>
diff --git a/view/register_open_eml.tpl b/view/register_open_eml.tpl
new file mode 100644
index 000000000..bbfdc9940
--- /dev/null
+++ b/view/register_open_eml.tpl
@@ -0,0 +1,18 @@
+
+Dear $username,
+	Thank you for registering at $sitename. Your account has been created. 
+The login details are as follows:
+
+
+Site Location:	$siteurl
+Login Name:	$email
+Password:	$password
+
+You may change your password from your account settings page after logging in.
+
+Thank you and welcome to $sitename.
+
+Sincerely,
+	$sitename Administrator
+
+ 
diff --git a/view/settings.tpl b/view/settings.tpl
new file mode 100644
index 000000000..d73e45a41
--- /dev/null
+++ b/view/settings.tpl
@@ -0,0 +1,49 @@
+<h1>Account Settings</h1>
+
+<form action="settings" id="settings-form" method="post" >
+
+<div id="settings-username-wrapper" >
+<label id="settings-username-label" for="settings-username" >Username: </label>
+<input type="text" name="username" id="settings-username" value="$username" />
+</div>
+<div id="settings-username-end" ></div>
+
+<div id="settings-email-wrapper" >
+<label id="settings-email-label" for="settings-email" >Email Address: </label>
+<input type="text" name="email" id="settings-email" value="$email" />
+</div>
+<div id="settings-email-end" ></div>
+
+$nickname_block
+
+
+<div id="settings-timezone-wrapper" >
+<label id="settings-timezone-label" for="timezone_select" >Your Timezone: </label>
+$zoneselect
+</div>
+<div id="settings-timezone-end" ></div>
+
+<div id="settings-password-wrapper" >
+<p id="settings-password-desc" >
+Leave password fields blank unless changing
+</p>
+<label id="settings-password-label" for="settings-password" >New Password: </label>
+<input type="password" id="settings-password" name="password" ></input>
+</div>
+<div id="settings-password-end" ></div>
+
+<div id="settings-confirm-wrapper" >
+<label id="settings-confirm-label" for="settings-confirm" >Confirm: </label>
+<input type="password" id="settings-confirm" name="confirm" ></input>
+</div>
+<div id="settings-confirm-end" ></div>
+
+
+<div id="settings-submit-wrapper" >
+<input type="submit" name="submit" id="settings-submit" value="Submit" />
+</div>
+
+</form>
+
+
+
diff --git a/view/settings_nick_set.tpl b/view/settings_nick_set.tpl
new file mode 100644
index 000000000..e25aa42ce
--- /dev/null
+++ b/view/settings_nick_set.tpl
@@ -0,0 +1,8 @@
+
+<div id="settings-nick-wrapper" >
+<p id="settings-nickname-desc">
+Your nickname cannot be changed. It is set to <strong>$nickname</strong><br />
+Your profile is located at <strong>$baseurl/profile/$nickname</strong>
+</p>
+</div>
+<div id="settings-nick-end" ></div>
diff --git a/view/settings_nick_unset.tpl b/view/settings_nick_unset.tpl
new file mode 100644
index 000000000..0ea99d68b
--- /dev/null
+++ b/view/settings_nick_unset.tpl
@@ -0,0 +1,13 @@
+
+<div id="settings-nick-wrapper" >
+<p id="settings-nickname-desc">
+Setting a nickname will allow a friendly profile URL such as
+<strong>$baseurl/profile/nickname</strong>
+Once set, it can never be changed. Only letter, numbers, spaces and 
+underscore are allowed and the nickname must start with a space. 
+</p>
+<label id="settings-nick-label" for="settings-nick" >URL Nickname: </label>
+<input type="text" name="nick" id="settings-nick" value="$nickname" />
+</div>
+<div id="settings-nick-end" ></div>
+
diff --git a/view/sidenote.tpl b/view/sidenote.tpl
new file mode 100644
index 000000000..dbc120cc0
--- /dev/null
+++ b/view/sidenote.tpl
@@ -0,0 +1,17 @@
+
+<div id="sidenote-wrapper" >
+<p id="sidenote-desc" >
+Write something
+</p>
+<form id="sidenote-form" action="profiles/$profile_id" method="post" >
+<input type="hidden" name="type" value="sidenote" />
+
+<textarea rows="40" cols="24" id="sidenote-text" name="sidenote" >$sidenote</textarea>
+
+</div>
+<div id="sidenote-submit-wrapper" >
+<input type="submit" id="sidenote-submit" name="submit" value="Submit" />
+
+</div>
+<div id="sidenote-end"></div>
+</div>
diff --git a/view/silho.gif b/view/silho.gif
new file mode 100644
index 000000000..048bdebc0
--- /dev/null
+++ b/view/silho.gif
diff --git a/view/style.css b/view/style.css
new file mode 100644
index 000000000..cd1548451
--- /dev/null
+++ b/view/style.css
@@ -0,0 +1,421 @@
+
+body { 
+	background: #EEEEEE;
+	font-family: verdana, sans-serif;
+	font-size: 1.0em;
+	margin-left: 10px;
+}
+
+img.photo {
+	border: 1px solid #AAAAAA;
+	padding: 5px;
+	background: #FFFFFF;
+}
+
+aside {
+	position: absolute;
+	left: 0px;
+	top: 60px;
+	right: 250px;
+	width: 250px;
+	margin-left: 20px;
+	margin-right: 0px;
+	font-size: 0.9em;
+}
+section {
+	position: absolute;
+	left: 270px;
+	top: 60px;
+	margin-left: 20px;
+	margin-right: 20px;
+}
+h1 {
+	font-size: 1.6em;
+}
+
+nav {
+	position: absolute;
+	top: 0px;
+	height: 30px;
+	left: 0px;
+	right: 0px;
+	margin-top: 20px;
+}
+
+footer {
+	position: absolute;
+	left: 0px;
+	right: 0px;
+	bottom: 0px;
+	margin: 20px 20px 20px 20px;
+}
+.fn {
+	font-size: 1.4em;
+	margin-bottom: 10px;
+	line-height: 1.5;
+}
+
+.powered {
+	font-size: 0.6em;
+}
+.error-message {
+	color: #FF0000;
+	font-size: 1.1em;
+	border: 1px solid #FF8888;
+	background-color: #FFEEEE;
+	padding: 10px;
+}
+.nav-link {
+	float: right;
+	margin-left: 0px;
+	margin-right: 10px;
+	padding: 5px;
+	border: 1px solid black;
+	background: #DDDDFF;
+	font-size: 0.7em;
+	font-weight: bold;
+	
+}
+
+.nav-commlink {
+	float: left;
+	margin-left: 10px;
+	margin-right: 0px;
+	padding: 5px;
+	border: 1px solid black;
+	background: #DDDDFF;
+	font-size: 0.7em;
+	font-weight: bold;
+}
+#nav-end {
+	clear: both;
+}
+
+.login-extra-links {
+	font-size: 0.7em;
+}
+
+#profile-extra-links {
+	margin-top: 20px;
+	margin-bottom: 20px;
+	margin-left: 20px;
+	margin-right: 20px;
+}
+
+#label-register-name, #label-register-email {
+	float: left;
+	width: 350px;
+	margin-top: 10px;
+}
+
+#register-name, #register-email {
+	float: left;
+	margin-top: 10px;
+}
+
+#register-name-wrapper, #register-email-wrapper, #register-submit-wrapper {
+	clear: both;
+}
+
+#register-submit-button {
+	margin-top: 10px;
+	margin-left: 350px;
+}
+
+#label-login-name, #label-login-password, #login-extra-filler {
+	float: left;
+	width: 150px;
+	margin-bottom: 20px;
+}
+
+
+#login-name, #login-password {
+	float: left;
+	width: 150px;
+}
+
+#register-link, #lost-password-link {
+	float: left;
+	font-size: 0.7em;
+	margin-right: 15px;
+}
+
+#login-name-end, #login-password-end, #login-extra-end, #login-submit-end {
+	clear: both;
+}
+
+#login-submit-button {
+	margin-top: 10px;
+	margin-left: 150px;
+}
+
+input#dfrn-url {
+	float: left;
+	background: url(silho.gif) no-repeat;
+	background-position: 4px center;
+	font-size: 15px;
+	padding-left: 24px;
+	height: 24px;
+	background-color: #FFFFFF;
+	color: #000000;
+	margin-bottom: 20px;
+}
+
+#dfrn-url-label {
+	float: left;
+	width: 250px;
+}
+
+#dfrn-request-url-end {
+	clear: both;
+}
+
+#knowyouyes, #knowyouno {
+	float: left;
+}
+
+#dfrn-request-knowyou-yes-wrapper, #dfrn-request-knowyou-no-wrapper {
+
+	float: none;
+}
+#dfrn-request-knowyou-yes-label, #dfrn-request-knowyou-no-label {
+	float: left;
+	width: 75px;
+	margin-left: 50px;
+	margin-bottom: 7px;
+}
+#dfrn-request-knowyou-break, #dfrn-request-knowyou-end {
+	clear: both;
+
+}
+
+#dfrn-request-message-wrapper {
+	margin-bottom: 50px;
+}
+#dfrn-request-submit-wrapper {
+	clear: both;
+	margin-left: 50px;
+}
+
+#dfrn-request-info-wrapper {
+	margin-left: 50px;
+}
+
+#settings-username-end, #settings-email-end, #settings-nick-end, #settings-timezone-end, #settings-password-end, #settings-confirm-end {
+	margin-bottom: 5px;
+	clear: both;
+}
+
+#settings-username-label, #settings-email-label, #settings-nick-label, #settings-timezone-label, #settings-password-label, #settings-confirm-label {
+	float: left;
+	width: 200px;
+}
+
+#settings-username, #settings-email, #settings-nick, #timezone-select, #settings-password, #settings-confirm {
+	float: left;
+	margin-bottom: 20px;
+}
+
+#settings-nick-desc {
+	width: 500px;
+}
+
+#settings-nick {
+	margin-bottom: 50px;
+}
+
+#cropimage-wrapper, #cropimage-preview-wrapper {
+	float: left;
+	padding: 30px;
+}
+
+#crop-image-form {
+	margin-top: 30px;
+	clear: both;
+}
+
+.intro-fullname {
+	font-size: 1.1em;
+	font-weight: bold;
+
+}
+.intro-desc {
+	margin-bottom: 20px;
+}
+
+.intro-note {
+	padding: 10px;
+}
+
+.intro-end {
+	padding: 30px;
+}
+
+.intro-approve-form, .intro-form {
+	float: left;
+}
+.intro-submit-approve, .intro-submit-ignore {
+	margin-right: 20px;
+}
+.intro-top {
+	width: 500px;
+	margin-bottom: 30px;
+}
+.intro-end {
+	clear: both;
+	margin-bottom: 30px;
+}
+#profile-edit-default-desc {
+	color: #FF0000;
+	border: 1px solid #FF8888;
+	background-color: #FFEEEE;
+	padding: 7px;
+
+
+}
+
+
+#profile-edit-profile-name-label,
+#profile-edit-name-label,
+#profile-edit-gender-label,
+#profile-edit-address-label,
+#profile-edit-locality-label,
+#profile-edit-region-label,
+#profile-edit-postal-code-label,
+#profile-edit-country-name-label,
+#profile-edit-marital-label,
+#profile-edit-homepage-label {
+	float: left;
+	width: 175px;
+}
+
+#profile-edit-profile-name,
+#profile-edit-name,
+#gender-select,
+#profile-edit-address,
+#profile-edit-locality,
+#profile-edit-region,
+#profile-edit-postal-code,
+#profile-edit-country-name,
+#marital-select,
+#profile-in-dir-yes,
+#profile-in-dir-no {
+	float: left;
+	margin-bottom: 20px;
+}
+
+#profile-in-dir-yes-label, #profile-in-dir-no-label {
+	margin-left: 125px;
+	float: left;
+	width: 50px;
+}
+
+#profile-edit-homepage {
+	float: left;
+	margin-bottom: 35px;
+}
+
+#profile-edit-profile-name-end,
+#profile-edit-name-end,
+#profile-edit-gender-end,
+#profile-edit-address-end,
+#profile-edit-locality-end,
+#profile-edit-region-end,
+#profile-edit-postal-code-end,
+#profile-edit-country-name-end,
+#profile-edit-marital-end,
+#profile-edit-homepage-end,
+#profile-in-dir-break, 
+#profile-in-dir-end {
+	clear: both;
+}
+
+#gender-select, #marital-select {
+ width: 145px;
+}
+
+#profile-edit-profile-name-wrapper .required {
+	color: #FF0000;
+	float: left;
+}
+
+
+.contact-entry-photo img {
+	border: none;
+}
+
+.contact-entry-edit-links img {
+	border: none;
+	margin-right: 15px;
+}
+
+.wall-item-photo-wrapper {
+	margin-top: 20px;
+	width: 100px;
+	float: left;
+}
+.wall-item-wrapper {
+	margin-top: 30px;
+	float: left;
+}
+
+.wall-item-wrapper-end {
+	clear: both;
+}
+.wall-item-name-link {
+	font-weight: bold;
+	text-decoration: none;
+	color: #3172BD;
+}
+.wall-item-photo {
+	border: none;
+}
+
+#profile-jot-submit-wrapper {
+	margin-top: 15px;
+}
+#profile-jot-end {
+	margin-bottom: 30px;
+}
+#about-jot-submit-wrapper {
+	margin-top: 15px;
+}
+#about-jot-end {
+	margin-bottom: 30px;
+}
+#contacts-main {
+	margin-bottom: 30px;
+}
+
+#profile-listing-new-link-wrapper {
+	margin-bottom: 30px;
+}
+
+.profile-listing-edit-buttons-wrapper {
+/*	float: left;*/
+	clear: both;
+}
+.profile-listing-photo-edit-link {
+	float: left;
+	width: 125px;
+}
+.profile-listing-end {
+	clear: both;
+}
+.profile-listing-edit-buttons-wrapper img{
+	border: none;
+	margin-right: 20px;
+}
+.profile-listing {
+	margin-top: 25px;
+}
+.profile-listing-name {
+	float: left;
+	margin-top: 10px;
+}
+.fortune {
+	margin-top: 50px;
+	color: #3172BD;
+	font-weight: bold;
+	margin-bottom: 20px;
+}
\ No newline at end of file
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
new file mode 100644
index 000000000..898aafdaa
--- /dev/null
+++ b/view/wall_item.tpl
@@ -0,0 +1,14 @@
+<div class="wall-item-outside-wrapper" id="wall-item-outside-wrapper-$id" >
+<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" >
+<a href="$profile_url" title="View $name's profile" class="wall-item-photo-link" id="wall-item-photo-link-$id">
+<img src="$thumb" class="wall-item-photo" id="wall-item-photo-$id" height="80" width="80" alt="$name" /></a>
+</div>
+<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
+<a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-$id" >$name</span></a>
+<span class="wall-item-body" id="wall-item-body-$id" >$body</span>
+<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
+</div>
+<div class="wall-item-wrapper-end"></div>
+</div>
+<div class="wall-item-outside-wrapper-end" ></div>
+