Merge remote-tracking branch 'friendika-master/master'

.gitignore

@@ -1,3 +1,4 @@
+favicon.*
 .htconfig.php
 \#*
 wip/*

.htaccess

@@ -3,6 +3,8 @@ Options -Indexes
 AddType application/x-java-archive .jar
 AddType audio/ogg .oga
 
+#php_value suhosin.get.max_value_length = 2048
+
 <FilesMatch "\.(out|log)$">
 Deny from all
 </FilesMatch>

addon/oembed/oembed.php

@@ -18,6 +18,10 @@ function oembed_uninstall() {
 }
 
 function oembed_hook_page_header($a, &$b){
+
+	if(($a->module !== 'network') && ($a->module !== 'profile'))
+		return; 
+
   $b .= '<script src="addon/oembed/oembed.js"></script>
   <style>#oembed.hide { display: none } 
   #oembed {
@@ -33,11 +37,11 @@ function oembed_hook_page_header($a, &$b){
   <div id="oembed" class="hide"><input id="oembed_url">&nbsp;
     <input type="button" value="Embed" onclick="oembed_do()" style="float:left;">
     <a onclick="oembed(); return false;" style="float:right;"><img onmouseout="imgdull(this);" onmouseover="imgbright(this);" class="wall-item-delete-icon" src="images/b_drophide.gif" style="width: 16px; height: 16px;"></a>
-    <p style="clear:both">Paste a link from 5min.com, Amazon Product Image, blip.tv, Clikthrough, CollegeHumor Video, 
+    <div style="clear:both">Paste a link from 5min.com, Amazon Product Image, blip.tv, Clikthrough, CollegeHumor Video, 
       Daily Show with Jon Stewart, Dailymotion, dotSUB.com, Flickr Photos, Funny or Die Video, 
       Google Video, Hulu, Kinomap, LiveJournal UserPic, Metacafe, National Film Board of Canada, 
       Phodroid Photos, Photobucket, Qik Video, Revision3, Scribd, SlideShare, TwitPic, Twitter Status, 
-      Viddler Video, Vimeo, Wikipedia, Wordpress.com, XKCD Comic, YFrog, YouTube</p> 
+      Viddler Video, Vimeo, Wikipedia, Wordpress.com, XKCD Comic, YFrog, YouTube</div> 
   </div>
   ';
 }

boot.php

@@ -2,7 +2,7 @@
 
 set_time_limit(0);
 
-define ( 'FRIENDIKA_VERSION',      '2.1.932' );
+define ( 'FRIENDIKA_VERSION',      '2.1.933' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.1'  );
 define ( 'DB_UPDATE_VERSION',      1045   );
 
@@ -352,10 +352,12 @@ class App {
 
 	function init_pagehead() {
 		$this->page['title'] = $this->config['sitename'];
-		$tpl = load_view_file("view/head.tpl");
+		$tpl = load_view_file('view/head.tpl');
 		$this->page['htmlhead'] = replace_macros($tpl,array(
 			'$baseurl' => $this->get_baseurl() . '/',
-			'$generator' => 'Friendika' . ' ' . FRIENDIKA_VERSION
+			'$generator' => 'Friendika' . ' ' . FRIENDIKA_VERSION,
+			'$delitem' => t('Delete this item?'),
+			'$comment' => t('Comment')
 		));
 	}
 

include/items.php

@@ -762,7 +762,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 	if(! $rino_enable)
 		$rino = 0;
 
-	$url = $contact['notify'] . '?dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : '');
+	$url = $contact['notify'] . '?f=&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : '');
 
 	logger('dfrn_deliver: ' . $url);
 

include/main.js

@@ -113,12 +113,18 @@
 
 		$.get(update_url,function(data) {
 			in_progress = false;
+			$('.ccollapse-wrapper',data).each(function() {
+				var ident = $(this).attr('id');
+				if($('#' + ident).length) {
+					$('#' + ident).replaceWith($(this));
+				}
+			});
 			$('.wall-item-outside-wrapper',data).each(function() {
 				var ident = $(this).attr('id');
 				if($('#' + ident).length == 0) { 
-                                        $('img',this).each(function() {
+					$('img',this).each(function() {
-                                                $(this).attr('src',$(this).attr('dst'));
+						$(this).attr('src',$(this).attr('dst'));
-                                        });
+					});
 					$('#' + prev).after($(this));
 				}
 				else { 
@@ -127,11 +133,9 @@
 					$('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
 					$('#' + ident + ' ' + '.wall-item-like').replaceWith($(this).find('.wall-item-like'));
 					$('#' + ident + ' ' + '.wall-item-dislike').replaceWith($(this).find('.wall-item-dislike'));
-                                        $('#' + ident + ' ' + '.my-comment-photo').each(function() {
+					$('#' + ident + ' ' + '.my-comment-photo').each(function() {
-                                                $(this).attr('src',$(this).attr('dst'));
+						$(this).attr('src',$(this).attr('dst'));
-                                        });
+					});
-
-
 				}
 				prev = ident; 
 			});

include/poller.php

@@ -167,7 +167,7 @@ function poller_run($argv, $argc){
 				if(intval($contact['duplex']) && $contact['issued-id'])
 					$idtosend = '1:' . $orig_id;		
 
-				$url = $contact['poll'] . '?dfrn_id=' . $idtosend 
+				$url = $contact['poll'] . '?f=&dfrn_id=' . $idtosend 
 					. '&dfrn_version=' . DFRN_PROTOCOL_VERSION 
 					. '&type=data&last_update=' . $last_update ;
 	

mod/dfrn_poll.php

@@ -63,7 +63,7 @@ function dfrn_poll_init(&$a) {
 		
 		if(count($r)) {
 
-			$s = fetch_url($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
+			$s = fetch_url($r[0]['poll'] . '?f=&dfrn_id=' . $my_id . '&type=profile-check');
 
 			logger("dfrn_poll: old profile returns " . $s, LOGGER_DATA);
 
@@ -366,7 +366,7 @@ function dfrn_poll_content(&$a) {
 			// URL reply
 
 			$s = fetch_url($r[0]['poll'] 
-				. '?dfrn_id=' . $encrypted_id 
+				. '?f=&dfrn_id=' . $encrypted_id 
 				. '&type=profile-check'
 				. '&dfrn_version=' . DFRN_PROTOCOL_VERSION
 				. '&challenge=' . $challenge

mod/dfrn_request.php

@@ -172,7 +172,7 @@ function dfrn_request_post(&$a) {
 					$dfrn_request = $contact_record['request'];
 
 				if(strlen($dfrn_request) && strlen($confirm_key))
-					$s = fetch_url($dfrn_request . '?confirm_key=' . $confirm_key);
+					$s = fetch_url($dfrn_request . '?f=&confirm_key=' . $confirm_key);
 				
 				// (ignore reply, nothing we can do it failed)
 

mod/network.php

@@ -70,7 +70,8 @@ function network_content(&$a, $update = 0) {
 			'$utubeurl' => t('Please enter a YouTube link:'),
 			'$vidurl' => t("Please enter a video\x28.ogg\x29 link/URL:"),
 			'$audurl' => t("Please enter an audio\x28.ogg\x29 link/URL:"),
-			'$whereareu' => t('Where are you right now?') 
+			'$whereareu' => t('Where are you right now?'),
+			'$title' => t('Enter a title for this item') 
 		));
 
 
@@ -101,6 +102,7 @@ function network_content(&$a, $update = 0) {
 			'$audio' => t('Insert Vorbis [.ogg] audio'),
 			'$setloc' => t('Set your location'),
 			'$noloc' => t('Clear browser location'),
+			'$title' => t('Set title'),
 			'$wait' => t('Please wait'),
 			'$permset' => t('Permission settings'),
 			'$content' => '',

mod/notifications.php

@@ -65,12 +65,11 @@ function notifications_content(&$a) {
 	else
 		$sql_extra = " AND `ignore` = 0 ";
 
-
+	$o .= '<h1>' . t('Pending Friend/Connect Notifications') . '</h1>' . "\r\n";
-	$tpl = load_view_file('view/intros-top.tpl');
+	
-	$o .= replace_macros($tpl,array(
+	$o .= '<div id="notification-show-hide-wrapper" >';
-		'$hide_url' => ((strlen($sql_extra)) ? 'notifications/all' : 'notifications' ),
+	$o .= '<a href="' . ((strlen($sql_extra)) ? 'notifications/all' : 'notifications' ) . '" id="notifications-show-hide-link" >'
-		'$hide_text' => ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests'))
+		. ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests')) . '</a></div>' . "\r\n";
-	)); 
 
 
 	$r = q("SELECT COUNT(*)	AS `total` FROM `intro` 
@@ -141,7 +140,7 @@ function notifications_content(&$a) {
 
 	if ($a->config['register_policy'] == REGISTER_APPROVE &&	
 		$a->config['admin_email'] === $a->user['email']){
-		$o .= load_view_file('view/registrations-top.tpl');
+		$o .= '<h1>' . t('User registrations waiting for confirm') . '</h1>' . "\r\n";
 		
 		$r = q("SELECT `register`.*, `contact`.`name`, `user`.`email`
 				 FROM `register`

mod/oexchange.php

@@ -0,0 +1,53 @@
+<?php
+
+
+function oexchange_init(&$a) {
+
+	if(($a->argc > 1) && ($a->argv[1] === 'xrd')) {
+		$tpl = load_view_file('view/oexchange_xrd.tpl');
+
+		$o = replace_macros($tpl, array('$base' => $a->get_baseurl()));
+		echo $o;
+		killme();
+	}
+
+		
+
+
+}
+
+function oexchange_content(&$a) {
+
+	if(! local_user()) {
+		$o = login(false);
+		return $o;
+	}
+
+	if(($a->argc > 1) && $a->argv[1] === 'done') {
+		notice( t('Post successful.') . EOL);
+		return;
+	}
+
+	$url = (((x($_GET,'url')) && strlen($_GET['url'])) ? notags(trim($_GET['url'])) : '');
+
+	$s = fetch_url($a->get_baseurl() . '/parse_url&url=' . $url);
+
+	if(! strlen($s))
+		return;
+
+	require_once('include/html2bbcode.php');
+
+	$post = array();
+
+	$post['profile_uid'] = local_user();
+	$post['return'] = '/oexchange/done' ;
+	$post['body'] = html2bbcode($s);
+	$post['type'] = 'wall';
+
+	$_POST = $post;
+	require_once('mod/item.php');
+	item_post($a);
+
+}
+
+

mod/profile.php

@@ -138,7 +138,8 @@ function profile_content(&$a, $update = 0) {
 				'$utubeurl' => t('Please enter a YouTube link:'),
 				'$vidurl' => t("Please enter a video\x28.ogg\x29 link/URL:"),
 				'$audurl' => t("Please enter an audio\x28.ogg\x29 link/URL:"),
-				'$whereareu' => t('Where are you right now?') 
+				'$whereareu' => t('Where are you right now?'),
+				'$title' => t('Enter a title for this item') 
 			));
 
 			require_once('include/acl_selectors.php');
@@ -169,6 +170,7 @@ function profile_content(&$a, $update = 0) {
 				'$audio' => t('Insert Vorbis [.ogg] audio'),
 				'$setloc' => t('Set your location'),
 				'$noloc' => t('Clear browser location'),
+				'$title' => t('Set title'),
 				'$wait' => t('Please wait'),
 				'$permset' => t('Permission settings'),
 				'$content' => '',

mod/profile_photo.php

@@ -196,9 +196,11 @@ function profile_photo_content(&$a) {
 		$o .= replace_macros($tpl,array(
 			'$filename' => $filename,
 			'$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
-			'$image_url' => $a->get_baseurl() . '/photo/' . $filename
+			'$image_url' => $a->get_baseurl() . '/photo/' . $filename,
-			));
+			'$title' => t('Crop Image'),
-
+			'$desc' => t('Please adjust the image cropping for optimum viewing.'),
+			'$done' => t('Done Editing')
+		));
 		return $o;
 	}
 

util/run_xgettext.sh

@@ -25,7 +25,7 @@ echo "extract strings to $OUTFILE.."
 find ../../ -name "*.php" | xargs xgettext $KEYWORDS $OPTS -o "$OUTFILE" --from-code=UTF-8
 
 echo "setup base info.."
-sed -i "s/SOME DESCRIPTIVE TITLE./FRIENDIKA Distribuited Social Network/g" "$OUTFILE"
+sed -i "s/SOME DESCRIPTIVE TITLE./FRIENDIKA Distributed Social Network/g" "$OUTFILE"
 sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2010, 2011 Mike Macgirvin/g" "$OUTFILE"
 sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR./Mike Macgirvin, 2010/g" "$OUTFILE"
 sed -i "s/PACKAGE VERSION/$F9KVERSION/g" "$OUTFILE"

util/strings.php

@@ -8,6 +8,8 @@ $a->strings['Not Found'] = 'Not Found';
 $a->strings['Page not found.' ] = 'Page not found.' ;
 $a->strings['Permission denied'] = 'Permission denied';
 $a->strings['Permission denied.'] = 'Permission denied.';
+$a->strings['Delete this item?'] = 'Delete this item?';
+$a->strings['Comment'] = 'Comment';
 $a->strings['Create a New Account'] = 'Create a New Account';
 $a->strings['Register'] = 'Register';
 $a->strings['Nickname or Email address: '] = 'Nickname or Email address: ';
@@ -172,6 +174,9 @@ $a->strings["%d required parameter was not found at the given location"] = array
 	1 => "%d required parameters were not found at the given location",
 );
 $a->strings['Global Directory'] = 'Global Directory';
+$a->strings['Age: '] = 'Age: ';
+$a->strings['Gender: '] = 'Gender: ';
+$a->strings["No entries \x28some entries may be hidden\x29."] = "No entries \x28some entries may be hidden\x29.";
 $a->strings['Item not found.'] = 'Item not found.';
 $a->strings['Private Message'] = 'Private Message';
 $a->strings["I like this \x28toggle\x29"] = "I like this \x28toggle\x29";
@@ -204,6 +209,14 @@ $a->strings['The profile address specified does not provide adequate information
 $a->strings['Limited profile. This person will be unable to receive direct/personal notifications from you.'] = 'Limited profile. This person will be unable to receive direct/personal notifications from you.';
 $a->strings['Unable to retrieve contact information.'] = 'Unable to retrieve contact information.';
 $a->strings['following'] = 'following';
+$a->strings['This is Friendika version'] = 'This is Friendika version';
+$a->strings['running at web location'] = 'running at web location';
+$a->strings['Shared content within the Friendika network is provided under the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 license</a>'] = 'Shared content within the Friendika network is provided under the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 license</a>';
+$a->strings['Please visit <a href="http://project.friendika.com">Project.Friendika.com</a> to learn more about the Friendika project.'] = 'Please visit <a href="http://project.friendika.com">Project.Friendika.com</a> to learn more about the Friendika project.';
+$a->strings['Bug reports and issues: please visit'] = 'Bug reports and issues: please visit';
+$a->strings['Suggestions, praise, donations, etc. - please email "Info" at Friendika - dot com'] = 'Suggestions, praise, donations, etc. - please email "Info" at Friendika - dot com';
+$a->strings['Installed plugins/addons/apps'] = 'Installed plugins/addons/apps';
+$a->strings['No installed plugins/addons/apps'] = 'No installed plugins/addons/apps';
 $a->strings['Group created.'] = 'Group created.';
 $a->strings['Could not create group.'] = 'Could not create group.';
 $a->strings['Group not found.'] = 'Group not found.';
@@ -303,9 +316,12 @@ $a->strings['No such group'] = 'No such group';
 $a->strings['Group is empty'] = 'Group is empty';
 $a->strings['Group: '] = 'Group: ';
 $a->strings['View in context'] = 'View in context';
+$a->strings['See more posts like this'] = 'See more posts like this';
+$a->strings['See all %d comments'] = 'See all %d comments';
 $a->strings['Invalid request identifier.'] = 'Invalid request identifier.';
 $a->strings['Discard'] = 'Discard';
 $a->strings['Ignore'] = 'Ignore';
+$a->strings['Pending Friend/Connect Notifications'] = 'Pending Friend/Connect Notifications';
 $a->strings['Show Ignored Requests'] = 'Show Ignored Requests';
 $a->strings['Hide Ignored Requests'] = 'Hide Ignored Requests';
 $a->strings['Claims to be known to you: '] = 'Claims to be known to you: ';
@@ -319,6 +335,7 @@ $a->strings['Friend/Connect Request'] = 'Friend/Connect Request';
 $a->strings['New Follower'] = 'New Follower';
 $a->strings['Approve'] = 'Approve';
 $a->strings['No notifications.'] = 'No notifications.';
+$a->strings['User registrations waiting for confirm'] = 'User registrations waiting for confirm';
 $a->strings['No registrations.'] = 'No registrations.';
 $a->strings['Login failed.'] = 'Login failed.';
 $a->strings["Welcome back "] = "Welcome back ";
@@ -360,6 +377,9 @@ $a->strings['Profile'] = 'Profile';
 $a->strings['Photos'] = 'Photos';
 $a->strings['Image uploaded but image cropping failed.'] = 'Image uploaded but image cropping failed.';
 $a->strings['Unable to process image'] = 'Unable to process image';
+$a->strings['Crop Image'] = 'Crop Image';
+$a->strings['Please adjust the image cropping for optimum viewing.'] = 'Please adjust the image cropping for optimum viewing.';
+$a->strings['Done Editing'] = 'Done Editing';
 $a->strings['Image uploaded successfully.'] = 'Image uploaded successfully.';
 $a->strings['Profile Name is required.'] = 'Profile Name is required.';
 $a->strings['Profile updated.'] = 'Profile updated.';
@@ -368,7 +388,6 @@ $a->strings['Profile-'] = 'Profile-';
 $a->strings['New profile created.'] = 'New profile created.';
 $a->strings['Profile unavailable to clone.'] = 'Profile unavailable to clone.';
 $a->strings['This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.'] = 'This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.';
-$a->strings['Age: '] = 'Age: ';
 $a->strings['Profile Image'] = 'Profile Image';
 $a->strings['Invalid OpenID url'] = 'Invalid OpenID url';
 $a->strings['Please enter the required information.'] = 'Please enter the required information.';
@@ -418,6 +437,7 @@ $a->strings['No Plugin settings configured'] = 'No Plugin settings configured';
 $a->strings['OpenID: '] = 'OpenID: ';
 $a->strings["&nbsp;\x28Optional\x29 Allow this OpenID to login to this account."] = "&nbsp;\x28Optional\x29 Allow this OpenID to login to this account.";
 $a->strings['Profile is <strong>not published</strong>.'] = 'Profile is <strong>not published</strong>.';
+$a->strings['Export Personal Data'] = 'Export Personal Data';
 $a->strings['Default Post Permissions'] = 'Default Post Permissions';
 $a->strings['Tag removed'] = 'Tag removed';
 $a->strings['Remove Item Tag'] = 'Remove Item Tag';
@@ -725,6 +745,7 @@ $a->strings['America/Managua'] = 'America/Managua';
 $a->strings['America/Manaus'] = 'America/Manaus';
 $a->strings['America/Marigot'] = 'America/Marigot';
 $a->strings['America/Martinique'] = 'America/Martinique';
+$a->strings['America/Matamoros'] = 'America/Matamoros';
 $a->strings['America/Mazatlan'] = 'America/Mazatlan';
 $a->strings['America/Mendoza'] = 'America/Mendoza';
 $a->strings['America/Menominee'] = 'America/Menominee';
@@ -743,6 +764,7 @@ $a->strings['America/Nome'] = 'America/Nome';
 $a->strings['America/Noronha'] = 'America/Noronha';
 $a->strings['America/North_Dakota/Center'] = 'America/North_Dakota/Center';
 $a->strings['America/North_Dakota/New_Salem'] = 'America/North_Dakota/New_Salem';
+$a->strings['America/Ojinaga'] = 'America/Ojinaga';
 $a->strings['America/Panama'] = 'America/Panama';
 $a->strings['America/Pangnirtung'] = 'America/Pangnirtung';
 $a->strings['America/Paramaribo'] = 'America/Paramaribo';
@@ -759,6 +781,7 @@ $a->strings['America/Regina'] = 'America/Regina';
 $a->strings['America/Resolute'] = 'America/Resolute';
 $a->strings['America/Rio_Branco'] = 'America/Rio_Branco';
 $a->strings['America/Rosario'] = 'America/Rosario';
+$a->strings['America/Santa_Isabel'] = 'America/Santa_Isabel';
 $a->strings['America/Santarem'] = 'America/Santarem';
 $a->strings['America/Santiago'] = 'America/Santiago';
 $a->strings['America/Santo_Domingo'] = 'America/Santo_Domingo';
@@ -787,6 +810,7 @@ $a->strings['America/Yellowknife'] = 'America/Yellowknife';
 $a->strings['Antarctica/Casey'] = 'Antarctica/Casey';
 $a->strings['Antarctica/Davis'] = 'Antarctica/Davis';
 $a->strings['Antarctica/DumontDUrville'] = 'Antarctica/DumontDUrville';
+$a->strings['Antarctica/Macquarie'] = 'Antarctica/Macquarie';
 $a->strings['Antarctica/Mawson'] = 'Antarctica/Mawson';
 $a->strings['Antarctica/McMurdo'] = 'Antarctica/McMurdo';
 $a->strings['Antarctica/Palmer'] = 'Antarctica/Palmer';
@@ -849,6 +873,7 @@ $a->strings['Asia/Makassar'] = 'Asia/Makassar';
 $a->strings['Asia/Manila'] = 'Asia/Manila';
 $a->strings['Asia/Muscat'] = 'Asia/Muscat';
 $a->strings['Asia/Nicosia'] = 'Asia/Nicosia';
+$a->strings['Asia/Novokuznetsk'] = 'Asia/Novokuznetsk';
 $a->strings['Asia/Novosibirsk'] = 'Asia/Novosibirsk';
 $a->strings['Asia/Omsk'] = 'Asia/Omsk';
 $a->strings['Asia/Oral'] = 'Asia/Oral';

view/cropbody.tpl

@@ -1,9 +1,9 @@
-<h1>Crop Image</h1>
+<h1>$title</h1>
 <p id="cropimage-desc">
-Please adjust the image cropping for optimum viewing.
+$desc
 </p>
 <div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="" />
+<img src="$image_url" id="croppa" class="imgCrop" alt="$title" />
 </div>
 <div id="cropimage-preview-wrapper" >
 <div id="previewWrap" ></div>
@@ -41,7 +41,6 @@ Please adjust the image cropping for optimum viewing.
 
 <form action="profile_photo/$resource" id="crop-image-form" method="post" />
 
-<input type="hidden" name="imagename" value="$hash" />
 <input type="hidden" name="cropfinal" value="1" />
 <input type="hidden" name="xstart" id="x1" />
 <input type="hidden" name="ystart" id="y1" />
@@ -51,7 +50,7 @@ Please adjust the image cropping for optimum viewing.
 <input type="hidden" name="width"  id="width" />
 
 <div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="Done Editing" />
+<input type="submit" name="submit" value="$done" />
 </div>
 
 </form>

view/de/cropbody.tpl

@@ -1,58 +0,0 @@
-<h1>Bild zuschneiden</h1>
-<p id="cropimage-desc">
-Zur optimalen Darstellung des Bildes kann es nun auf einen Bereich
-zugeschnitten werden. Bitte wähle diesen Bereich.
-</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/$resource" id="crop-image-form" method="post" />
-
-<input type="hidden" name="imagename" value="$hash" />
-<input type="hidden" name="cropfinal" value="1" />
-<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>

view/de/head.tpl

@@ -1,31 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="$baseurl" />
-<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
-
-<!--[if IE]>
-<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-<script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
-<script type="text/javascript" src="$baseurl/include/main.js" ></script>
-<script>
-
-	function confirmDelete() { return confirm("Delete this item?"); }
-	function commentOpen(obj,id) {
-		if(obj.value == 'Comment') {
-			obj.value = '';
-			obj.className = "comment-edit-text-full";
-			openMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-	function commentClose(obj,id) {
-		if(obj.value == '') {
-			obj.value = 'Comment';
-			obj.className="comment-edit-text-empty";
-			closeMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-
-</script>
-
-

view/de/intros-top.tpl

@@ -1,7 +0,0 @@
-<h1>Schwebende Freundschafts/Kontakt Benachrichtigungen</h1>
-
-<div id="notification-show-hide-wrapper" >
-<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
-</div>
-
-

view/de/profile.php

@@ -1,72 +0,0 @@
-<!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']; ?>">In Verbindung treten</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">Standort:
-			<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">Geschlecht: <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>
-

view/de/registrations-top.tpl

@@ -1,3 +0,0 @@
-<h1>Schwebende Neuanmeldungen</h1>
-
-

view/de/settings_nick_unset.tpl

@@ -1,16 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-Deine Profil URL ist im Moment <strong>'$baseurl/profile/$uid'</strong>.
-Wenn du einen Spitznamen wählst kann man diese URL freundlicher ausdrücken
-z.B. <strong>'spitzname@$basepath'</strong>.
-<br />
-Einmal gewählt kann der Spitzname nicht mehr geändert werden. Er
-<strong>muss</strong> mit einem Buchstaben beginnen. Es sind ausschließlich
-Buchstaben, Zahlen sowie Binde- und Unterstriche erlaubt.
-</p>
-<label id="settings-nick-label" for="settings-nick" >URL Spitzname: </label>
-<input type="text" name="nick" id="settings-nick" value="$nickname" />
-</div>
-<div id="settings-nick-end" ></div>
-

view/en/head.tpl

@@ -1,32 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="$baseurl" />
-<meta name="generator" content="$generator" />
-<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
-
-<!--[if IE]>
-<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-<script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
-<script type="text/javascript" src="$baseurl/include/main.js" ></script>
-<script>
-
-	function confirmDelete() { return confirm("Delete this item?"); }
-	function commentOpen(obj,id) {
-		if(obj.value == 'Comment') {
-			obj.value = '';
-			obj.className = "comment-edit-text-full";
-			openMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-	function commentClose(obj,id) {
-		if(obj.value == '') {
-			obj.value = 'Comment';
-			obj.className="comment-edit-text-empty";
-			closeMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-
-</script>
-
-

view/en/intros-top.tpl

@@ -1,7 +0,0 @@
-<h1>Pending Friend/Connect Notifications</h1>
-
-<div id="notification-show-hide-wrapper" >
-<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
-</div>
-
-

view/en/profile.php

@@ -1,72 +0,0 @@
-<!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>
-

view/en/registrations-top.tpl

@@ -1,3 +0,0 @@
-<h1>User registrations waiting for confirm</h1>
-
-

view/en/settings_nick_unset.tpl

@@ -1,14 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-Your profile URL is currently <strong>'$baseurl/profile/$uid'</strong>.
-Setting a nickname will allow a friendly profile URL such as
-<strong>'nickname@$basepath'</strong>.
-<br />
-Once set, it can never be changed. The nickname <strong>must</strong> start with a letter; and only letters, numbers, dashes, and underscores are allowed.
-</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>
-

view/fr/cropbody.tpl

@@ -1,57 +0,0 @@
-<h1>Crop Image</h1>
-<p id="cropimage-desc">
-Merci d'ajuster le cadre de l'image pour un affichage optimal.
-</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/$resource" id="crop-image-form" method="post" />
-
-<input type="hidden" name="imagename" value="$hash" />
-<input type="hidden" name="cropfinal" value="1" />
-<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="Edition terminée" />
-</div>
-
-</form>

view/fr/head.tpl

@@ -1,32 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="$baseurl" />
-<meta name="generator" content="$generator" />
-<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
-
-<!--[if IE]>
-<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-<script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
-<script type="text/javascript" src="$baseurl/include/main.js" ></script>
-<script>
-
-	function confirmDelete() { return confirm("Effacer cet élément?"); }
-	function commentOpen(obj,id) {
-		if(obj.value == 'Comment') {
-			obj.value = '';
-			obj.className = "comment-edit-text-full";
-			openMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-	function commentClose(obj,id) {
-		if(obj.value == '') {
-			obj.value = 'Comment';
-			obj.className="comment-edit-text-empty";
-			closeMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-
-</script>
-
-

view/fr/intros-top.tpl

@@ -1,7 +0,0 @@
-<h1>Demandes d'amitié/mise en relation en attente</h1>
-
-<div id="notification-show-hide-wrapper" >
-<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
-</div>
-
-

view/fr/profile.php

@@ -1,72 +0,0 @@
-<!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">Localisation:
-			<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">Genre: <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>
-

view/fr/registrations-top.tpl

@@ -1,3 +0,0 @@
-<h1>Inscriptions d'utilisateurs en attente de confirmation</h1>
-
-

view/fr/settings_nick_unset.tpl

@@ -1,14 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-Votre adresse (URL) de profil est actuellement <strong>'$baseurl/profile/$uid'</strong>.
-Choisir un pseudo vous donnera une URL plus simple à retenir, comme 
-<strong>'nickname@$basepath'</strong>.
-<br />
-Une fois défini, il ne pourra plus changer. Le pseudo <strong>doit</strong> débuter par une lettre; et seuls lettres, nombres, tirets et sous-tirets (_) sont autorisés.
-</p>
-<label id="settings-nick-label" for="settings-nick" >Pseudo: </label>
-<input type="text" name="nick" id="settings-nick" value="$nickname" />
-</div>
-<div id="settings-nick-end" ></div>
-

view/head.tpl

@@ -11,9 +11,9 @@
 <script type="text/javascript" src="$baseurl/include/main.js" ></script>
 <script>
 
-	function confirmDelete() { return confirm("Ta bort?"); }
+	function confirmDelete() { return confirm("$delitem"); }
 	function commentOpen(obj,id) {
-		if(obj.value == 'Comment') {
+		if(obj.value == '$comment') {
 			obj.value = '';
 			obj.className = "comment-edit-text-full";
 			openMenu("comment-edit-submit-wrapper-" + id);
@@ -21,10 +21,12 @@
 	}
 	function commentClose(obj,id) {
 		if(obj.value == '') {
-			obj.value = 'Comment';
+			obj.value = '$comment';
 			obj.className="comment-edit-text-empty";
 			closeMenu("comment-edit-submit-wrapper-" + id);
 		}
 	}
 
 </script>
+
+

view/it/cropbody.tpl

@@ -1,57 +0,0 @@
-<h1>Ritaglia Immagine</h1>
-<p id="cropimage-desc">
-Sistema il ritaglio dell'immagine per una visualizzazione ottimale.
-</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/$resource" id="crop-image-form" method="post" />
-
-<input type="hidden" name="imagename" value="$hash" />
-<input type="hidden" name="cropfinal" value="1" />
-<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="Fatto" />
-</div>
-
-</form>

view/it/head.tpl

@@ -1,32 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="$baseurl" />
-<meta name="generator" content="$generator" />
-<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
-
-<!--[if IE]>
-<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-<script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
-<script type="text/javascript" src="$baseurl/include/main.js" ></script>
-<script>
-
-	function confirmDelete() { return confirm("Cancellare questo elemento?"); }
-	function commentOpen(obj,id) {
-		if(obj.value == 'Comment') {
-			obj.value = '';
-			obj.className = "comment-edit-text-full";
-			openMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-	function commentClose(obj,id) {
-		if(obj.value == '') {
-			obj.value = 'Comment';
-			obj.className="comment-edit-text-empty";
-			closeMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-
-</script>
-
-

view/it/intros-top.tpl

@@ -1,7 +0,0 @@
-<h1>Notifiche di Amicizia/Collegamento in Attesa</h1>
-
-<div id="notification-show-hide-wrapper" >
-<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
-</div>
-
-

view/it/profile.php

@@ -1,72 +0,0 @@
-<!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']; ?>">Connetti</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>
-

view/it/registrations-top.tpl

@@ -1,3 +0,0 @@
-<h1>Registrazioni in attesa di conferma</h1>
-
-

view/it/settings_nick_unset.tpl

@@ -1,15 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-L'URL del tuo profilo &egrave; <strong>'$baseurl/profile/$uid'</strong>.
-Impostare un soprannome permetter&agrave; di avere un URL più aimchevole, come
-<strong>'soprannome@$basepath'</strong>.
-<br />
-Una volta impostato, non potr&agreve; pi&ugrave; essere cambiato. Il soprannome <strong>deve</strong>
-cominciare con una lettera; nel soprannome sono permessi solo lettere, numeri, trattini (-) e underscore (_).
-</p>
-<label id="settings-nick-label" for="settings-nick" >Soprannome: </label>
-<input type="text" name="nick" id="settings-nick" value="$nickname" />
-</div>
-<div id="settings-nick-end" ></div>
-

view/jot-header.tpl

@@ -126,6 +126,13 @@ tinyMCE.init({
 		}
 	}
 
+	function jotTitle() {
+		reply = prompt("$title", $('#jot-title').val());
+		if(reply && reply.length) {
+			$('#jot-title').val(reply);
+		}
+	}
+
 	function jotShare(id) {
 		$('#like-rotator-' + id).show();
 		$.get('share/' + id, function(data) {

view/jot.tpl

@@ -12,6 +12,7 @@
 		<input type="hidden" name="return" value="$return_path" />
 		<input type="hidden" name="location" id="jot-location" value="$defloc" />
 		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="title" id="jot-title" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
 
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >$content</textarea>
@@ -40,6 +41,10 @@
 	<div id="profile-nolocation-wrapper" style="display: none;" >
 		<img id="profile-nolocation" src="images/noglobe.gif" alt="$noloc" title="$noloc" onclick="jotClearLocation();" />
 	</div> 
+	<div id="profile-title-wrapper" style="display: $visitor;" >
+		<img id="profile-title" src="images/article.gif" alt="$title" title="$title" onclick="jotTitle();" />
+	</div> 
+
 	<div id="profile-jot-plugin-wrapper">
   	$jotplugins
 	</div>

view/oexchange_xrd.tpl

@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
+        
+    <Subject>$base</Subject>
+
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/vendor">Friendika</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/title">Friendika Social Network</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/name">Friendika</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Friendika</Property>
+
+    <Link 
+        rel="icon" 
+        href="$base/images/friendika-16.png"
+        type="image/png" 
+        />
+
+    <Link 
+        rel="icon32" 
+        href="$base/images/friendika-32.png"
+        type="image/png" 
+        />
+
+    <Link 
+        rel= "http://www.oexchange.org/spec/0.8/rel/offer" 
+        href="$base/oexchange"
+        type="text/html" 
+        />
+</XRD>
+

view/sv/cropbody.tpl

@@ -1,57 +0,0 @@
-<h1>Besk&auml;r bilden</h1>
-<p id="cropimage-desc">
-V&auml;lj hur du vill att bilden ska besk&auml;ras.
-</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/$resource" id="crop-image-form" method="post" />
-
-<input type="hidden" name="imagename" value="$hash" />
-<input type="hidden" name="cropfinal" value="1" />
-<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="Spara" />
-</div>
-
-</form>

view/sv/intros-top.tpl

@@ -1,6 +0,0 @@
-<h1>V&auml;ntande f&ouml;rfr&aring;gningar om v&auml;nskap/kontakt</h1>
-
-<div id="notification-show-hide-wrapper" >
-<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
-</div>
-

view/sv/profile.php

@@ -1,71 +0,0 @@
-<!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>

view/sv/registrations-top.tpl

@@ -1 +0,0 @@
-<h1>Registreringar från användare som inv&auml;ntar godk&auml;nnande</h1>

view/sv/settings_nick_unset.tpl

@@ -1,12 +0,0 @@
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-Din profiladress &auml;r f&ouml;r n&auml;rvarande<strong>'$baseurl/profile/$uid'</strong>.
-Genom att ange ett smeknamn/nick kan din adress bli enklare, s&aring; h&auml;r:
-<strong>'nickname@$basepath'</strong>.
-<br />
-N&auml;r smeknamn/nick har angetts kan det <strong>inte</strong> &auml;ndras. Det <strong>m&aring;ste</strong> inledas med en bokstav, och bara bokst&auml;ver, siffror, bindestreck och understrykningstecken f&aring;r anv&auml;ndas.
-</p>
-<label id="settings-nick-label" for="settings-nick" >URL Smeknamn/nick: </label>
-<input type="text" name="nick" id="settings-nick" value="$nickname" />
-</div>
-<div id="settings-nick-end" ></div>

view/theme/duepuntozero/style.css

@@ -215,7 +215,8 @@ div.wall-item-content-wrapper.shiny {
 #profile-youtube, 
 #profile-video, 
 #profile-audio,
-#profile-link, 
+#profile-link,
+#profile-title, 
 #wall-image-upload,
 #profile-upload-wrapper,
 #wall-image-upload-div,
@@ -1056,41 +1057,45 @@ input#dfrn-url {
 }
 #profile-upload-wrapper {
 	float: left;
-	margin-left: 50px;
+	margin-left: 30px;
 }
 
 #profile-rotator {
 	float: left;
-	margin-left: 50px;
+	margin-left: 30px;
 }
 #profile-link-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-youtube-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-video-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-audio-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-location-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-nolocation-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
+}
+#profile-title-wrapper {
+	float: left;
+	margin-left: 15px;
 }
 
 #profile-jot-perms {
 	float: left;
-	margin-left: 150px;
+	margin-left: 100px;
 	font-weight: bold;
 	font-size: 1.2em;
 }
@@ -2099,7 +2104,7 @@ a.mail-list-link {
 
 .tool-wrapper {
   float: left;
-  margin-left: 20px;
+  margin-left: 15px;
 }
 
 .tool-link {

view/theme/loozah/style.css

@@ -111,7 +111,8 @@ blockquote:before {
 #profile-youtube, 
 #profile-video,
 #profile-audio, 
-#profile-link, 
+#profile-link,
+#profile-title, 
 #wall-image-upload,
 #profile-upload-wrapper,
 #wall-image-upload-div,
@@ -1119,41 +1120,46 @@ padding: 5px 10px 0px;
 }
 #profile-upload-wrapper {
 	float: left;
-	margin-left: 50px;
+	margin-left: 30px;
 }
 
 #profile-rotator {
 	float: left;
-	margin-left: 50px;
+	margin-left: 30px;
 }
 #profile-link-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-youtube-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-video-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-audio-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-location-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-nolocation-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
+}
+
+#profile-title-wrapper {
+	float: left;
+	margin-left: 15px;
 }
 
 #profile-jot-perms {
 	float: left;
-	margin-left: 150px;
+	margin-left: 100px;
 	font-weight: bold;
 	font-size: 1.2em;
 }
@@ -2115,7 +2121,7 @@ a.mail-list-link {
 
 .tool-wrapper {
   float: left;
-  margin-left: 20px;
+  margin-left: 15px;
 }
 .tool-link {
   cursor: pointer;

view/xrd_host.tpl

@@ -7,5 +7,6 @@
     <Link rel='lrdd' template='http://$domain/xrd/?uri={uri}' />
     <Link rel='acct-mgmt' href='http://$domain/amcd' />
     <Link rel='http://services.mozilla.com/amcd/0.1' href='http://$domain/amcd' />
-
+	<Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml" 
+		href="http://$domain/oexchange/xrd" />
 </XRD>