From c7b671aa2dcc3d7570a00818b48d821ff3fbf06a Mon Sep 17 00:00:00 2001
From: erik <eeeeeee@utpost.se>
Date: Tue, 22 Mar 2011 11:07:18 -0700
Subject: [PATCH] Edited view/sv/profile.php via GitHub

---
 view/sv/profile.php | 143 ++++++++++++++++++++++----------------------
 1 file changed, 71 insertions(+), 72 deletions(-)
diff --git a/view/sv/profile.php b/view/sv/profile.php
index fa7372668c..6c551e1851 100644
--- a/view/sv/profile.php
+++ b/view/sv/profile.php
@@ -1,72 +1,71 @@
-<!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 if(x($page,'title')) echo $page['title']; ?></title>
-  <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
-</head>
-<body>
-<header><?php if(x($page,'header')) echo $page['header']; ?></header>
-<nav><div id="top-margin"></div><?php if(x($page,'nav')) 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">
-	<ul>
-	<?php if($profile['uid'] != $_SESSION['uid']) { ?>
-	<li><a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['nickname']; ?>">Connect</a></li>
-	<?php } ?>
-	</ul>
-
-	</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>
-				<span class="city-state-zip"><span class="locality"><?php echo $profile['locality']; ?></span><?php if(strlen($profile['locality'])) 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 } ?></span>
-				<span class="country-name"><?php echo $profile['country-name']; ?></span>
-			</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"><span class="heart">&hearts;</span> Status: </span><span class="marital-text"><?php echo $profile['marital']; ?></span></div>
-<?php } ?>
-<?php if(strlen($profile['homepage'])) { ?>
-<div class="homepage"><span class="homepage-label">Homepage: </span><span class="homepage-url"><?php echo linkify($profile['homepage']); ?></span></div>
-<?php } ?>
-<?php if(x($page,'aside')) echo $page['aside'] ?>
-</aside>
-<section>
-<?php if(x($page,'content')) echo $page['content']; ?>
-<div id="page-footer"></div>
-</section>
-<footer>
-<?php if(x($page,'footer')) echo $page['footer']; ?>
-</footer>
-</body>
-</html>
-
+<!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 if(x($page,'title')) echo $page['title']; ?></title>
+  <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
+</head>
+<body>
+<header><?php if(x($page,'header')) echo $page['header']; ?></header>
+<nav><div id="top-margin"></div><?php if(x($page,'nav')) 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">
+	<ul>
+	<?php if($profile['uid'] != $_SESSION['uid']) { ?>
+	<li><a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['nickname']; ?>">Connect</a></li>
+	<?php } ?>
+	</ul>
+
+	</div>
+
+	<?php if ( (strlen($profile['address'])) 
+		|| (strlen($profile['locality']))
+		|| (strlen($profile['region'])) 
+		|| (strlen($profile['postal-code'])) 
+		|| (strlen($profile['country-name']))) { ?>
+		<div class="location">Plats:
+			<div class="adr">
+				<div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></div>
+				<span class="city-state-zip"><span class="locality"><?php echo $profile['locality']; ?></span><?php if(strlen($profile['locality'])) 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 } ?></span>
+				<span class="country-name"><?php echo $profile['country-name']; ?></span>
+			</div>
+		</div>
+
+	<?php } ?>
+
+	<?php if(strlen($profile['gender'])) { ?>
+		<div class="mf">K&ouml;n: <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"><span class="heart">&hearts;</span> Civilstatus: </span><span class="marital-text"><?php echo $profile['marital']; ?></span></div>
+<?php } ?>
+<?php if(strlen($profile['homepage'])) { ?>
+<div class="homepage"><span class="homepage-label">Webbplats: </span><span class="homepage-url"><?php echo linkify($profile['homepage']); ?></span></div>
+<?php } ?>
+<?php if(x($page,'aside')) echo $page['aside'] ?>
+</aside>
+<section>
+<?php if(x($page,'content')) echo $page['content']; ?>
+<div id="page-footer"></div>
+</section>
+<footer>
+<?php if(x($page,'footer')) echo $page['footer']; ?>
+</footer>
+</body>
+</html>
