Merge remote branch 'upstream/master'

Conflicts:
	update.php

boot.php

@@ -8,11 +8,12 @@ require_once('include/datetime.php');
 require_once('include/pgettext.php');
 require_once('include/nav.php');
 require_once('include/cache.php');
+require_once('library/Mobile_Detect/Mobile_Detect.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1407' );
+define ( 'FRIENDICA_VERSION',      '3.0.1421' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1153      );
+define ( 'DB_UPDATE_VERSION',      1154      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -191,6 +192,7 @@ define ( 'NOTIFY_SUGGEST',  0x0020 );
 define ( 'NOTIFY_PROFILE',  0x0040 );
 define ( 'NOTIFY_TAGSELF',  0x0080 );
 define ( 'NOTIFY_TAGSHARE', 0x0100 );
+define ( 'NOTIFY_POKE',     0x0200 );
 
 define ( 'NOTIFY_SYSTEM',   0x8000 );
 
@@ -215,7 +217,7 @@ define ( 'TERM_OBJ_PHOTO', 2 );
  * various namespaces we may need to parse
  */
 
-define ( 'NAMESPACE_ZOT',             'http://purl.org/macgirvin/zot' );
+define ( 'NAMESPACE_ZOT',             'http://purl.org/zot' );
 define ( 'NAMESPACE_DFRN' ,           'http://purl.org/macgirvin/dfrn/1.0' );
 define ( 'NAMESPACE_THREAD' ,         'http://purl.org/syndication/thread/1.0' );
 define ( 'NAMESPACE_TOMB' ,           'http://purl.org/atompub/tombstones/1.0' );
@@ -250,6 +252,8 @@ define ( 'ACTIVITY_UPDATE',      NAMESPACE_ACTIVITY_SCHEMA . 'update' );
 define ( 'ACTIVITY_TAG',         NAMESPACE_ACTIVITY_SCHEMA . 'tag' );
 define ( 'ACTIVITY_FAVORITE',    NAMESPACE_ACTIVITY_SCHEMA . 'favorite' );
 
+define ( 'ACTIVITY_POKE',        NAMESPACE_ZOT . '/activity/poke' );
+
 define ( 'ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment' );
 define ( 'ACTIVITY_OBJ_NOTE',    NAMESPACE_ACTIVITY_SCHEMA . 'note' );
 define ( 'ACTIVITY_OBJ_PERSON',  NAMESPACE_ACTIVITY_SCHEMA . 'person' );
@@ -556,7 +560,7 @@ if(! class_exists('App')) {
 				$interval = 40000;
 
 			$this->page['title'] = $this->config['sitename'];
-			$tpl = file_get_contents('view/head.tpl');
+			$tpl = get_markup_template('head.tpl');
 			$this->page['htmlhead'] = replace_macros($tpl,array(
 				'$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
 				'$local_user' => local_user(),
@@ -569,6 +573,13 @@ if(! class_exists('App')) {
 			));
 		}
 
+		function init_page_end() {
+			$tpl = get_markup_template('end.tpl');
+			$this->page['end'] = replace_macros($tpl,array(
+				'$baseurl' => $this->get_baseurl() // FIXME for z_path!!!!
+			));
+		}
+
 		function set_curl_code($code) {
 			$this->curl_code = $code;
 		}
@@ -744,9 +755,10 @@ if(! function_exists('check_config')) {
 							// If the update fails or times-out completely you may need to
 							// delete the config entry to try again.
 
-							if(get_config('database','update_' . $x))
+							$t = get_config('database','update_' . $x);
+							if($t !== false)
 								break;
-							set_config('database','update_' . $x, '1');
+							set_config('database','update_' . $x, time());
 
 							// call the specific update
 
@@ -769,13 +781,14 @@ if(! function_exists('check_config')) {
 									. 'Content-transfer-encoding: 8bit' );
 								//try the logger
 								logger('CRITICAL: Update Failed: '. $x);
+								break;
 							}
-							else
+							else {
 								set_config('database','update_' . $x, 'success');
-								
+								set_config('system','build', $x + 1);
+							}								
 						}
 					}
-					set_config('system','build', DB_UPDATE_VERSION);
 				}
 			}
 		}
@@ -1238,6 +1251,12 @@ if(! function_exists('get_birthdays')) {
 		if(! local_user())
 			return $o;
 
+		$mobile_detect = new Mobile_Detect();
+		$is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
+
+		if($is_mobile)
+			return $o;
+
 		$bd_format = t('g A l F d') ; // 8 AM Friday January 18
 		$bd_short = t('F d');
 
@@ -1317,6 +1336,13 @@ if(! function_exists('get_events')) {
 		if(! local_user())
 			return $o;
 
+
+		$mobile_detect = new Mobile_Detect();
+		$is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
+
+		if($is_mobile)
+			return $o;
+
 		$bd_format = t('g A l F d') ; // 8 AM Friday January 18
 		$bd_short = t('F d');
 
@@ -1438,8 +1464,17 @@ if(! function_exists('current_theme')) {
 	
 		$a = get_app();
 	
+		$mobile_detect = new Mobile_Detect();
+		$is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
+	
+		if($is_mobile) {
+			$system_theme = ((isset($a->config['system']['mobile-theme'])) ? $a->config['system']['mobile-theme'] : '');
+			$theme_name = ((isset($_SESSION) && x($_SESSION,'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme);
+		}
+		if(!$is_mobile || ($system_theme === '' && $theme_name === '')) {
 			$system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
 			$theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme);
+		}
 
 		if($theme_name &&
 				(file_exists('view/theme/' . $theme_name . '/style.css') ||
@@ -1576,18 +1611,21 @@ if(! function_exists('profile_tabs')){
 				'url' => $url,
 				'sel' => ((!isset($tab)&&$a->argv[0]=='profile')?'active':''),
 				'title' => t('Status Messages and Posts'),
+				'id' => 'status-tab',
 			),
 			array(
 				'label' => t('Profile'),
 				'url' 	=> $url.'/?tab=profile',
 				'sel'	=> ((isset($tab) && $tab=='profile')?'active':''),
 				'title' => t('Profile Details'),
+				'id' => 'profile-tab',
 			),
 			array(
 				'label' => t('Photos'),
 				'url'	=> $a->get_baseurl() . '/photos/' . $nickname,
 				'sel'	=> ((!isset($tab)&&$a->argv[0]=='photos')?'active':''),
 				'title' => t('Photo Albums'),
+				'id' => 'photo-tab',
 			),
 		);
 	
@@ -1597,12 +1635,14 @@ if(! function_exists('profile_tabs')){
 				'url'	=> $a->get_baseurl() . '/events',
 				'sel' 	=>((!isset($tab)&&$a->argv[0]=='events')?'active':''),
 				'title' => t('Events and Calendar'),
+				'id' => 'events-tab',
 			);
 			$tabs[] = array(
 				'label' => t('Personal Notes'),
 				'url'	=> $a->get_baseurl() . '/notes',
 				'sel' 	=>((!isset($tab)&&$a->argv[0]=='notes')?'active':''),
 				'title' => t('Only You Can See This'),
+				'id' => 'notes-tab',
 			);
 		}
 

database.sql

@@ -456,6 +456,7 @@ CREATE TABLE IF NOT EXISTS `hook` (
   `hook` char(255) NOT NULL,
   `file` char(255) NOT NULL,
   `function` char(255) NOT NULL,
+  `priority` int(11) UNSIGNED NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 

include/Contact.php

@@ -192,6 +192,7 @@ function contact_photo_menu($contact) {
 	$status_link="";
 	$photos_link="";
 	$posts_link="";
+	$poke_link="";
 
 	$sparkle = false;
 	if($contact['network'] === NETWORK_DFRN) {
@@ -211,10 +212,12 @@ function contact_photo_menu($contact) {
 		$pm_url = $a->get_baseurl() . '/message/new/' . $contact['id'];
 	}
 
+	$poke_link = $a->get_baseurl() . '/poke/?f=&c=' . $contact['id'];
 	$contact_url = $a->get_baseurl() . '/contacts/' . $contact['id'];
 	$posts_link = $a->get_baseurl() . '/network/?cid=' . $contact['id'];
 
 	$menu = Array(
+		t("Poke") => $poke_link,
 		t("View Status") => $status_link,
 		t("View Profile") => $profile_link,
 		t("View Photos") => $photos_link,		

include/Photo.php

@@ -4,6 +4,11 @@ if(! class_exists("Photo")) {
 class Photo {
 
     private $image;
+
+    /**
+     * Put back gd stuff, not everybody have Imagick
+     */
+    private $imagick;
     private $width;
     private $height;
     private $valid;
@@ -14,20 +19,74 @@ class Photo {
      * supported mimetypes and corresponding file extensions
      */
     static function supportedTypes() {
+        if(class_exists('Imagick')) {
+            /**
+             * Imagick::queryFormats won't help us a lot there...
+             * At least, not yet, other parts of friendica uses this array
+             */
+            $t = array(
+                'image/jpeg' => 'jpg',
+                'image/png' => 'png',
+                'image/gif' => 'gif'
+            );
+        } else {
             $t = array();
             $t['image/jpeg'] ='jpg';
             if (imagetypes() & IMG_PNG) $t['image/png'] = 'png';
+        }
+
         return $t;
     }
 
-	public function __construct($data, $type="image/jpeg") {
+    public function __construct($data, $type=null) {
-
+        $this->imagick = class_exists('Imagick');
         $this->types = $this->supportedTypes();
         if (!array_key_exists($type,$this->types)){
             $type='image/jpeg';
         }
-		$this->valid = false;
         $this->type = $type;
+
+        if($this->is_imagick()) {
+            $this->image = new Imagick();
+            $this->image->readImageBlob($data);
+
+            /**
+             * Setup the image to the format it will be saved to
+             */
+            $map = $this->get_FormatsMap();
+            $format = $map[$type];
+            $this->image->setFormat($format);
+
+            // Always coalesce, if it is not a multi-frame image it won't hurt anyway
+            $this->image = $this->image->coalesceImages();
+
+            /**
+             * setup the compression here, so we'll do it only once
+             */
+            switch($this->getType()){
+                case "image/png":
+                    $quality = get_config('system','png_quality');
+                    if((! $quality) || ($quality > 9))
+                        $quality = PNG_QUALITY;
+                    /**
+                     * From http://www.imagemagick.org/script/command-line-options.php#quality:
+                     *
+                     * 'For the MNG and PNG image formats, the quality value sets
+                     * the zlib compression level (quality / 10) and filter-type (quality % 10).
+                     * The default PNG "quality" is 75, which means compression level 7 with adaptive PNG filtering,
+                     * unless the image has a color map, in which case it means compression level 7 with no PNG filtering'
+                     */
+                    $quality = $quality * 10;
+                    $this->image->setCompressionQuality($quality);
+                    break;
+                case "image/jpeg":
+                    $quality = get_config('system','jpeg_quality');
+                    if((! $quality) || ($quality > 100))
+                        $quality = JPEG_QUALITY;
+                    $this->image->setCompressionQuality($quality);
+            }
+        } else {
+            $this->valid = false;
             $this->image = @imagecreatefromstring($data);
             if($this->image !== FALSE) {
                 $this->width  = imagesx($this->image);
@@ -37,36 +96,101 @@ class Photo {
                 imagesavealpha($this->image, true);
             }
         }
+    }
 
     public function __destruct() {
-		if($this->image)
+        if($this->image) {
+            if($this->is_imagick()) {
+                $this->image->clear();
+                $this->image->destroy();
+                return;
+            }
             imagedestroy($this->image);
         }
+    }
+
+    public function is_imagick() {
+        return $this->imagick;
+    }
+
+    /**
+     * Maps Mime types to Imagick formats
+     */
+    public function get_FormatsMap() {
+        $m = array(
+            'image/jpeg' => 'JPG',
+            'image/png' => 'PNG',
+            'image/gif' => 'GIF'
+        );
+        return $m;
+    }
 
     public function is_valid() {
+        if($this->is_imagick())
+            return ($this->image !== FALSE);
         return $this->valid;
     }
 
     public function getWidth() {
+        if(!$this->is_valid())
+            return FALSE;
+
+        if($this->is_imagick())
+            return $this->image->getImageWidth();
         return $this->width;
     }
 
     public function getHeight() {
+        if(!$this->is_valid())
+            return FALSE;
+
+        if($this->is_imagick())
+            return $this->image->getImageHeight();
         return $this->height;
     }
 
     public function getImage() {
+        if(!$this->is_valid())
+            return FALSE;
+
+        if($this->is_imagick()) {
+            /* Clean it */
+            $this->image = $this->image->deconstructImages();
+            return $this->image;
+        }
         return $this->image;
     }
 
     public function getType() {
+        if(!$this->is_valid())
+            return FALSE;
+
         return $this->type;
     }
+
     public function getExt() {
-		return $this->types[$this->type];
+        if(!$this->is_valid())
+            return FALSE;
+
+        return $this->types[$this->getType()];
     }
 
     public function scaleImage($max) {
+        if(!$this->is_valid())
+            return FALSE;
+
+        if($this->is_imagick()) {
+            /**
+             * If it is not animated, there will be only one iteration here,
+             * so don't bother checking
+             */
+            // Don't forget to go back to the first frame
+            $this->image->setFirstIterator();
+            do {
+                $this->image->resizeImage($max, $max, imagick::FILTER_LANCZOS, 1, true);
+            } while ($this->image->nextImage());
+            return;
+        }
 
         $width = $this->width;
         $height = $this->height;
@@ -114,16 +238,38 @@ class Photo {
         $this->image = $dest;
         $this->width  = imagesx($this->image);
         $this->height = imagesy($this->image);
-
     }
 
     public function rotate($degrees) {
+        if(!$this->is_valid())
+            return FALSE;
+
+        if($this->is_imagick()) {
+            $this->image->setFirstIterator();
+            do {
+                $this->image->rotateImage(new ImagickPixel(), $degrees);
+            } while ($this->image->nextImage());
+            return;
+        }
+
         $this->image  = imagerotate($this->image,$degrees,0);
         $this->width  = imagesx($this->image);
         $this->height = imagesy($this->image);
     }
 
     public function flip($horiz = true, $vert = false) {
+        if(!$this->is_valid())
+            return FALSE;
+
+        if($this->is_imagick()) {
+            $this->image->setFirstIterator();
+            do {
+                if($horiz) $this->image->flipImage();
+                if($vert) $this->image->flopImage();
+            } while ($this->image->nextImage());
+            return;
+        }
+
         $w = imagesx($this->image);
         $h = imagesy($this->image);
         $flipped = imagecreate($w, $h);
@@ -143,6 +289,9 @@ class Photo {
     public function orient($filename) {
         // based off comment on http://php.net/manual/en/function.imagerotate.php
 
+        if(!$this->is_valid())
+            return FALSE;
+
         if( (! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg') )
             return;
 
@@ -189,6 +338,11 @@ class Photo {
 
 
     public function scaleImageUp($min) {
+        if(!$this->is_valid())
+            return FALSE;
+
+        if($this->is_imagick())
+            return $this->scaleImage($min);
 
         $width = $this->width;
         $height = $this->height;
@@ -236,12 +390,21 @@ class Photo {
         $this->image = $dest;
         $this->width  = imagesx($this->image);
         $this->height = imagesy($this->image);
-
     }
 
 
 
     public function scaleImageSquare($dim) {
+        if(!$this->is_valid())
+            return FALSE;
+
+        if($this->is_imagick()) {
+            $this->image->setFirstIterator();
+            do {
+                $this->image->resizeImage($dim, $dim, imagick::FILTER_LANCZOS, 1, false);
+            } while ($this->image->nextImage());
+            return;
+        }
 
         $dest = imagecreatetruecolor( $dim, $dim );
         imagealphablending($dest, false);
@@ -257,6 +420,23 @@ class Photo {
 
 
     public function cropImage($max,$x,$y,$w,$h) {
+        if(!$this->is_valid())
+            return FALSE;
+
+        if($this->is_imagick()) {
+            $this->image->setFirstIterator();
+            do {
+                $this->image->cropImage($w, $h, $x, $y);
+                /**
+                 * We need to remove the canva,
+                 * or the image is not resized to the crop:
+                 * http://php.net/manual/en/imagick.cropimage.php#97232
+                 */
+                $this->image->setImagePage(0, 0, 0, 0);
+            } while ($this->image->nextImage());
+            return $this->scaleImage($max);
+        }
+
         $dest = imagecreatetruecolor( $max, $max );
         imagealphablending($dest, false);
         imagesavealpha($dest, true);
@@ -270,41 +450,45 @@ class Photo {
     }
 
     public function saveImage($path) {
-		switch($this->type){
+        if(!$this->is_valid())
-			case "image/png":
+            return FALSE;
-				$quality = get_config('system','png_quality');
-				if((! $quality) || ($quality > 9))
-					$quality = PNG_QUALITY;
-				imagepng($this->image, $path, $quality);
-				break;
-			default:
-				$quality = get_config('system','jpeg_quality');
-				if((! $quality) || ($quality > 100))
-					$quality = JPEG_QUALITY;
-				imagejpeg($this->image,$path,$quality);
-		}
 
+        $string = $this->imageString();
+        file_put_contents($path, $string);
     }
 
     public function imageString() {
+        if(!$this->is_valid())
+            return FALSE;
+
+        if($this->is_imagick()) {
+            /* Clean it */
+            $this->image = $this->image->deconstructImages();
+            $string = $this->image->getImagesBlob();
+            return $string;
+        }
+
+        $quality = FALSE;
+
         ob_start();
-		switch($this->type){
+
+        switch($this->getType()){
             case "image/png":
                 $quality = get_config('system','png_quality');
                 if((! $quality) || ($quality > 9))
                     $quality = PNG_QUALITY;
                 imagepng($this->image,NULL, $quality);
                 break;
-			default:
+            case "image/jpeg":
                 $quality = get_config('system','jpeg_quality');
                 if((! $quality) || ($quality > 100))
                     $quality = JPEG_QUALITY;
-
                 imagejpeg($this->image,NULL,$quality);
         }
-		$s = ob_get_contents();
+        $string = ob_get_contents();
         ob_end_clean();
-		return $s;
+
+        return $string;
     }
 
 
@@ -354,10 +538,10 @@ class Photo {
                 dbesc(datetime_convert()),
                 dbesc(datetime_convert()),
                 dbesc(basename($filename)),
-				dbesc($this->type),
+                dbesc($this->getType()),
                 dbesc($album),
-				intval($this->height),
+                intval($this->getHeight()),
-				intval($this->width),
+                intval($this->getWidth()),
                 dbesc($this->imageString()),
                 intval($scale),
                 intval($profile),
@@ -379,10 +563,10 @@ class Photo {
                 dbesc(datetime_convert()),
                 dbesc(datetime_convert()),
                 dbesc(basename($filename)),
-				dbesc($this->type),
+                dbesc($this->getType()),
                 dbesc($album),
-				intval($this->height),
+                intval($this->getHeight()),
-				intval($this->width),
+                intval($this->getWidth()),
                 dbesc($this->imageString()),
                 intval($scale),
                 intval($profile),
@@ -418,13 +602,23 @@ function guess_image_type($filename, $fromcurl=false) {
             $type = $headers['Content-Type'];
     }
     if (is_null($type)){
+        // Guessing from extension? Isn't that... dangerous?
+        if(class_exists('Imagick')) {
+            /**
+             * Well, this not much better,
+             * but at least it comes from the data inside the image,
+             * we won't be tricked by a manipulated extension
+             */
+            $image = new Imagick($filename);
+            $type = $image->getImageMimeType();
+        } else {
             $ext = pathinfo($filename, PATHINFO_EXTENSION);
             $types = Photo::supportedTypes();
             $type = "image/jpeg";
             foreach ($types as $m=>$e){
                 if ($ext==$e) $type = $m;
             }
-
+        }
     }
     logger('Photo: guess_image_type: type='.$type, LOGGER_DEBUG);
     return $type;
@@ -451,10 +645,7 @@ function import_profile_photo($photo,$uid,$cid) {
     $filename = basename($photo);
     $img_str = fetch_url($photo,true);
 
-	// guess mimetype from headers or filename
     $type = guess_image_type($photo,true);
-
-	
     $img = new Photo($img_str, $type);
     if($img->is_valid()) {
 

include/conversation.php

@@ -162,6 +162,49 @@ function localize_item(&$item){
 		$item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto;
 
 	}
+	if (stristr($item['verb'],ACTIVITY_POKE)) {
+		$verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1));
+		if(! $verb)
+			return;
+		if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return;
+
+		$Aname = $item['author-name'];
+		$Alink = $item['author-link'];
+		
+		$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
+		
+		$obj = parse_xml_string($xmlhead.$item['object']);
+		$links = parse_xml_string($xmlhead."<links>".unxmlify($obj->link)."</links>");
+		
+		$Bname = $obj->title;
+		$Blink = ""; $Bphoto = "";
+		foreach ($links->link as $l){
+			$atts = $l->attributes();
+			switch($atts['rel']){
+				case "alternate": $Blink = $atts['href'];
+				case "photo": $Bphoto = $atts['href'];
+			}
+			
+		}
+		
+		$A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
+		$B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]';
+		if ($Bphoto!="") $Bphoto = '[url=' . zrl($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]';
+
+		// we can't have a translation string with three positions but no distinguishable text
+		// So here is the translate string.
+
+		$txt = t('%1$s poked %2$s');
+
+		// now translate the verb
+
+		$txt = str_replace( t('poked'), t($verb), $txt);
+
+		// then do the sprintf on the translation string
+
+		$item['body'] = sprintf($txt, $A, $B). "\n\n\n" . $Bphoto;
+
+	}
     if ($item['verb']===ACTIVITY_TAG){
 		$r = q("SELECT * from `item`,`contact` WHERE 
 		`item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
@@ -867,6 +910,7 @@ function item_photo_menu($item){
 		 if(! count($a->contacts))
 			load_contact_links(local_user());
 	}
+	$poke_link="";
 	$contact_url="";
 	$pm_url="";
 	$status_link="";
@@ -896,6 +940,7 @@ function item_photo_menu($item){
 		}
 	}
 	if(($cid) && (! $item['self'])) {
+		$poke_link = $a->get_baseurl($ssl_state) . '/poke/?f=&c=' . $cid;
 		$contact_url = $a->get_baseurl($ssl_state) . '/contacts/' . $cid;
 		$posts_link = $a->get_baseurl($ssl_state) . '/network/?cid=' . $cid;
 
@@ -918,6 +963,7 @@ function item_photo_menu($item){
 		t("Network Posts") => $posts_link, 
 		t("Edit Contact") => $contact_url,
 		t("Send PM") => $pm_url,
+		t("Poke") => $poke_link
 	);
 	
 	
@@ -929,7 +975,7 @@ function item_photo_menu($item){
 
 	$o = "";
 	foreach($menu as $k=>$v){
-		if ($v!="") $o .= "<li><a href='$v'>$k</a></li>\n";
+		if ($v!="") $o .= "<li><a href=\"$v\">$k</a></li>\n";
 	}
 	return $o;
 }}
@@ -1009,7 +1055,6 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 		$plaintext = true;
 
 	$tpl = get_markup_template('jot-header.tpl');
-	
 	$a->page['htmlhead'] .= replace_macros($tpl, array(
 		'$newpost' => 'true',
 		'$baseurl' => $a->get_baseurl(true),
@@ -1026,6 +1071,23 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 	));
 
 
+	$tpl = get_markup_template('jot-end.tpl');
+	$a->page['end'] .= replace_macros($tpl, array(
+		'$newpost' => 'true',
+		'$baseurl' => $a->get_baseurl(true),
+		'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+		'$geotag' => $geotag,
+		'$nickname' => $x['nickname'],
+		'$ispublic' => t('Visible to <strong>everybody</strong>'),
+		'$linkurl' => t('Please enter a link URL:'),
+		'$vidurl' => t("Please enter a video link/URL:"),
+		'$audurl' => t("Please enter an audio link/URL:"),
+		'$term' => t('Tag term:'),
+		'$fileas' => t('Save to Folder:'),
+		'$whereareu' => t('Where are you right now?')
+	));
+
+
 	$tpl = get_markup_template("jot.tpl");
 		
 	$jotplugins = '';
@@ -1101,6 +1163,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 		'$bang' => $x['bang'],
 		'$profile_uid' => $x['profile_uid'],
 		'$preview' => t('Preview'),
+		'$mobileapp' => t('Friendica mobile web'),
 	));
 
 

include/diaspora.php

@@ -2120,7 +2120,6 @@ function diaspora_unshare($me,$contact) {
 }
 
 
-
 function diaspora_send_status($item,$owner,$contact,$public_batch = false) {
 
 	$a = get_app();
@@ -2154,8 +2153,12 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) {
 		}
 	}
 */
-	// Removal of tags
+	/**
-	$body = preg_replace('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $body);
+	 * Transform #tags, strip off the [url] and replace spaces with underscore
+	 */
+	$body = preg_replace_callback('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', create_function('$match',
+		'return \'#\'. str_replace(\' \', \'_\', $match[2]);'
+	), $body);
 
 	//if(strlen($title))
 	//	$body = "[b]".html_entity_decode($title)."[/b]\n\n".$body;

include/enotify.php

@@ -147,6 +147,24 @@ function notification($params) {
 		$itemlink =  $params['link'];
 	}
 
+	if($params['type'] == NOTIFY_POKE) {
+
+		$subject =	sprintf( t('[Friendica:Notify] %1$s poked you') , $params['source_name']);
+		$preamble = sprintf( t('%1$s poked you at %2$s') , $params['source_name'], $sitename);
+		$epreamble = sprintf( t('%1$s [url=%2$s]poked you[/url].') , 
+								'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
+								$params['link']); 
+
+		$subject = str_replace('poked', t($params['activity']), $subject);
+		$preamble = str_replace('poked', t($params['activity']), $preamble);
+		$epreamble = str_replace('poked', t($params['activity']), $epreamble);
+
+		$sitelink = t('Please visit %s to view and/or reply to the conversation.');
+		$tsitelink = sprintf( $sitelink, $siteurl );
+		$hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '">' . $sitename . '</a>');
+		$itemlink =  $params['link'];
+	}
+
 	if($params['type'] == NOTIFY_TAGSHARE) {
 		$subject =	sprintf( t('[Friendica:Notify] %s tagged your post') , $params['source_name']);
 		$preamble = sprintf( t('%1$s tagged your post at %2$s') , $params['source_name'], $sitename);

include/items.php

@@ -2107,6 +2107,118 @@ function local_delivery($importer,$data) {
 	$feed->enable_order_by_date(false);
 	$feed->init();
 
+
+	if($feed->error())
+		logger('local_delivery: Error parsing XML: ' . $feed->error());
+
+
+	// Check at the feed level for updated contact name and/or photo
+
+	$name_updated  = '';
+	$new_name = '';
+	$photo_timestamp = '';
+	$photo_url = '';
+
+
+	$rawtags = $feed->get_feed_tags( NAMESPACE_DFRN, 'owner');
+	if(! $rawtags)
+		$rawtags = $feed->get_feed_tags( SIMPLEPIE_NAMESPACE_ATOM_10, 'author');
+	if($rawtags) {
+		$elems = $rawtags[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10];
+		if($elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated']) {
+			$name_updated = $elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated'];
+			$new_name = $elems['name'][0]['data'];
+		} 
+		if((x($elems,'link')) && ($elems['link'][0]['attribs']['']['rel'] === 'photo') && ($elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated'])) {
+			$photo_timestamp = datetime_convert('UTC','UTC',$elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated']);
+			$photo_url = $elems['link'][0]['attribs']['']['href'];
+		}
+	}
+
+	if((is_array($contact)) && ($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $importer['avatar-date'])) {
+		logger('local_delivery: Updating photo for ' . $importer['name']);
+		require_once("Photo.php");
+		$photo_failure = false;
+		$have_photo = false;
+
+		$r = q("SELECT `resource-id` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d LIMIT 1",
+			intval($importer['id']),
+			intval($importer['importer_uid'])
+		);
+		if(count($r)) {
+			$resource_id = $r[0]['resource-id'];
+			$have_photo = true;
+		}
+		else {
+			$resource_id = photo_new_resource();
+		}
+			
+		$img_str = fetch_url($photo_url,true);
+		// guess mimetype from headers or filename
+		$type = guess_image_type($photo_url,true);
+		
+		
+		$img = new Photo($img_str, $type);
+		if($img->is_valid()) {
+			if($have_photo) {
+				q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND `contact-id` = %d AND `uid` = %d",
+					dbesc($resource_id),
+					intval($importer['id']),
+					intval($importer['importer_uid'])
+				);
+			}
+				
+			$img->scaleImageSquare(175);
+				
+			$hash = $resource_id;
+			$r = $img->store($importer['importer_uid'], $importer['id'], $hash, basename($photo_url), 'Contact Photos', 4);
+				
+			$img->scaleImage(80);
+			$r = $img->store($importer['importer_uid'], $importer['id'], $hash, basename($photo_url), 'Contact Photos', 5);
+
+			$img->scaleImage(48);
+			$r = $img->store($importer['importer_uid'], $importer['id'], $hash, basename($photo_url), 'Contact Photos', 6);
+
+			$a = get_app();
+
+			q("UPDATE `contact` SET `avatar-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s'  
+				WHERE `uid` = %d AND `id` = %d LIMIT 1",
+				dbesc(datetime_convert()),
+				dbesc($a->get_baseurl() . '/photo/' . $hash . '-4.'.$img->getExt()),
+				dbesc($a->get_baseurl() . '/photo/' . $hash . '-5.'.$img->getExt()),
+				dbesc($a->get_baseurl() . '/photo/' . $hash . '-6.'.$img->getExt()),
+				intval($importer['importer_uid']),
+				intval($importer['id'])
+			);
+		}
+	}
+
+	if((is_array($contact)) && ($name_updated) && (strlen($new_name)) && ($name_updated > $contact['name-date'])) {
+		$r = q("select * from contact where uid = %d and id = %d limit 1",
+			intval($importer['importer_uid']),
+			intval($importer['id'])
+		);
+
+		$x = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
+			dbesc(notags(trim($new_name))),
+			dbesc(datetime_convert()),
+			intval($importer['importer_uid']),
+			intval($importer['id'])
+		);
+
+		// do our best to update the name on content items
+
+		if(count($r)) {
+			q("update item set `author-name` = '%s' where `author-name` = '%s' and `author-link` = '%s' and uid = %d",
+				dbesc(notags(trim($new_name))),
+				dbesc($r[0]['name']),
+				dbesc($r[0]['url']),
+				intval($importer['importer_uid'])
+			);
+		}
+	}
+
+
 /*
 	// Currently unsupported - needs a lot of work
 	$reloc = $feed->get_feed_tags( NAMESPACE_DFRN, 'relocate' );
@@ -2958,7 +3070,57 @@ function local_delivery($importer,$data) {
 				$datarray['owner-avatar'] = $importer['thumb'];
 			}
 
-			$r = item_store($datarray);
+			$posted_id = item_store($datarray);
+
+			if(stristr($datarray['verb'],ACTIVITY_POKE)) {
+				$verb = urldecode(substr($datarray['verb'],strpos($datarray['verb'],'#')+1));
+				if(! $verb)
+					continue;
+				$xo = parse_xml_string($datarray['object'],false);
+
+				if(($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) {
+
+					// somebody was poked/prodded. Was it me?
+
+					$links = parse_xml_string("<links>".unxmlify($xo->link)."</links>",false);
+
+			        foreach($links->link as $l) {
+            			$atts = $l->attributes();
+            			switch($atts['rel']) {
+                			case "alternate": 
+								$Blink = $atts['href'];
+								break;
+							default:
+								break;
+			            }
+        			}
+					if($Blink && link_compare($Blink,$a->get_baseurl() . '/profile/' . $importer['nickname'])) {
+
+						// send a notification
+						require_once('include/enotify.php');
+								
+						notification(array(
+							'type'         => NOTIFY_POKE,
+							'notify_flags' => $importer['notify-flags'],
+							'language'     => $importer['language'],
+							'to_name'      => $importer['username'],
+							'to_email'     => $importer['email'],
+							'uid'          => $importer['importer_uid'],
+							'item'         => $datarray,
+							'link'		   => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
+							'source_name'  => stripslashes($datarray['author-name']),
+							'source_link'  => $datarray['author-link'],
+							'source_photo' => ((link_compare($datarray['author-link'],$importer['url'])) 
+								? $importer['thumb'] : $datarray['author-avatar']),
+							'verb'         => $datarray['verb'],
+							'otype'        => 'person',
+							'activity'     => $verb,
+
+						));
+					}
+				}
+			}			
+
 			continue;
 		}
 	}

include/plugin.php

@@ -111,7 +111,7 @@ function reload_plugins() {
 
 
 if(! function_exists('register_hook')) {
-function register_hook($hook,$file,$function) {
+function register_hook($hook,$file,$function,$priority=0) {
 
 	$r = q("SELECT * FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `function` = '%s' LIMIT 1",
 		dbesc($hook),
@@ -121,10 +121,11 @@ function register_hook($hook,$file,$function) {
 	if(count($r))
 		return true;
 
-	$r = q("INSERT INTO `hook` (`hook`, `file`, `function`) VALUES ( '%s', '%s', '%s' ) ",
+	$r = q("INSERT INTO `hook` (`hook`, `file`, `function`, `priority`) VALUES ( '%s', '%s', '%s', '%s' ) ",
 		dbesc($hook),
 		dbesc($file),
-		dbesc($function)
+		dbesc($function),
+		dbesc($priority)
 	);
 	return $r;
 }}
@@ -145,7 +146,7 @@ if(! function_exists('load_hooks')) {
 function load_hooks() {
 	$a = get_app();
 	$a->hooks = array();
-	$r = q("SELECT * FROM `hook` WHERE 1");
+	$r = q("SELECT * FROM `hook` WHERE 1 ORDER BY `priority` DESC");
 	if(count($r)) {
 		foreach($r as $rr) {
 			if(! array_key_exists($rr['hook'],$a->hooks))
@@ -255,6 +256,7 @@ function get_theme_info($theme){
 		'author' => array(),
 		'maintainer' => array(),
 		'version' => "",
+		'credits' => "",
 		'experimental' => false,
 		'unsupported' => false
 	);

include/text.php

@@ -706,6 +706,22 @@ function linkify($s) {
 	return($s);
 }}
 
+function get_poke_verbs() {
+	
+	// index is present tense verb
+	// value is array containing past tense verb, translation of present, translation of past
+
+	$arr = array(
+		'poke' => array( 'poked', t('poke'), t('poked')),
+		'ping' => array( 'pinged', t('ping'), t('pinged')),
+		'prod' => array( 'prodded', t('prod'), t('prodded')),
+		'slap' => array( 'slapped', t('slap'), t('slapped')),
+		'finger' => array( 'fingered', t('finger'), t('fingered')),
+		'rebuff' => array( 'rebuffed', t('rebuff'), t('rebuffed')),
+	);
+	call_hooks('poke_verbs', $arr);
+	return $arr;
+}
 
 /**
  * 
@@ -1562,7 +1578,7 @@ function undo_post_tagging($s) {
 
 function fix_mce_lf($s) {
 	$s = str_replace("\r\n","\n",$s);
-	$s = str_replace("\n\n","\n",$s);
+//	$s = str_replace("\n\n","\n",$s);
 	return $s;
 }
 

index.php

@@ -118,6 +118,12 @@ if(! x($_SESSION,'authenticated'))
 
 $a->init_pagehead();
 
+/**
+ * Build the page ending -- this is stuff that goes right before
+ * the closing </body> tag
+ */
+
+$a->init_page_end();
 
 
 if(! x($_SESSION,'sysmsg'))

js/acl.min.js

@@ -0,0 +1 @@
+function ACL(e,t){that=this,that.url=e,that.kp_timer=null,t==undefined&&(t=[]),that.allow_cid=t[0]||[],that.allow_gid=t[1]||[],that.deny_cid=t[2]||[],that.deny_gid=t[3]||[],that.group_uids=[],that.nw=4,that.list_content=$("#acl-list-content"),that.item_tpl=unescape($(".acl-list-item[rel=acl-template]").html()),that.showall=$("#acl-showall"),t.length==0&&that.showall.addClass("selected"),that.showall.click(that.on_showall),$(".acl-button-show").live("click",that.on_button_show),$(".acl-button-hide").live("click",that.on_button_hide),$("#acl-search").keypress(that.on_search),$("#acl-wrapper").parents("form").submit(that.on_submit),that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$("#acl-fields").html(""),$(that.allow_gid).each(function(e,t){aclfileds.append("<input type='hidden' name='group_allow[]' value='"+t+"'>")}),$(that.allow_cid).each(function(e,t){aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+t+"'>")}),$(that.deny_gid).each(function(e,t){aclfileds.append("<input type='hidden' name='group_deny[]' value='"+t+"'>")}),$(that.deny_cid).each(function(e,t){aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+t+"'>")})},ACL.prototype.search=function(){var e=$("#acl-search").val();that.list_content.html(""),that.get(0,100,e)},ACL.prototype.on_search=function(e){that.kp_timer&&clearTimeout(that.kp_timer),that.kp_timer=setTimeout(that.search,1e3)},ACL.prototype.on_showall=function(e){return e.preventDefault(),e.stopPropagation(),that.showall.hasClass("selected")?!1:(that.showall.addClass("selected"),that.allow_cid=[],that.allow_gid=[],that.deny_cid=[],that.deny_gid=[],that.update_view(),!1)},ACL.prototype.on_button_show=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_allow($(this).parent().attr("id")),!1},ACL.prototype.on_button_hide=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_deny($(this).parent().attr("id")),!1},ACL.prototype.set_allow=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.allow_gid.indexOf(id)<0?that.allow_gid.push(id):that.allow_gid.remove(id),that.deny_gid.indexOf(id)>=0&&that.deny_gid.remove(id);break;case"c":that.allow_cid.indexOf(id)<0?that.allow_cid.push(id):that.allow_cid.remove(id),that.deny_cid.indexOf(id)>=0&&that.deny_cid.remove(id)}that.update_view()},ACL.prototype.set_deny=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.deny_gid.indexOf(id)<0?that.deny_gid.push(id):that.deny_gid.remove(id),that.allow_gid.indexOf(id)>=0&&that.allow_gid.remove(id);break;case"c":that.deny_cid.indexOf(id)<0?that.deny_cid.push(id):that.deny_cid.remove(id),that.allow_cid.indexOf(id)>=0&&that.allow_cid.remove(id)}that.update_view()},ACL.prototype.update_view=function(){that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0?(that.showall.addClass("selected"),$("#jot-perms-icon").removeClass("lock").addClass("unlock"),$("#jot-public").show(),$(".profile-jot-net input").attr("disabled",!1),typeof editor!="undefined"&&editor!=0&&$("#profile-jot-desc").html(ispublic)):(that.showall.removeClass("selected"),$("#jot-perms-icon").removeClass("unlock").addClass("lock"),$("#jot-public").hide(),$(".profile-jot-net input").attr("disabled","disabled"),$("#profile-jot-desc").html("&nbsp;")),$("#acl-list-content .acl-list-item").each(function(){$(this).removeClass("groupshow grouphide")}),$("#acl-list-content .acl-list-item").each(function(){itemid=$(this).attr("id"),type=itemid[0],id=parseInt(itemid.substr(1)),btshow=$(this).children(".acl-button-show").removeClass("selected"),bthide=$(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var e="";that.allow_gid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected"),e="groupshow"),that.deny_gid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"),e="grouphide"),$(that.group_uids[id]).each(function(t,n){e=="grouphide"&&$("#c"+n).removeClass("groupshow");if(e!=""){var r=$("#c"+n).attr("class");if(r==undefined)return!0;var i=r.indexOf("grouphide");i==-1&&$("#c"+n).addClass(e)}});break;case"c":that.allow_cid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected")),that.deny_cid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"))}})},ACL.prototype.get=function(e,t,n){var r={start:e,count:t,search:n};$.ajax({type:"POST",url:that.url,data:r,dataType:"json",success:that.populate})},ACL.prototype.populate=function(e){var t=Math.ceil(e.tot/that.nw)*42;that.list_content.height(t),$(e.items).each(function(){html="<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>",html=html.format(this.photo,this.name,this.type,this.id,"",this.network,this.link),this.uids!=undefined&&(that.group_uids[this.id]=this.uids),that.list_content.append(html)}),that.update_view()};

js/country.js

@@ -275,7 +275,7 @@ aStates[249]="|'Adan|'Ataq|Abyan|Al Bayda'|Al Hudaydah|Al Jawf|Al Mahrah|Al Mahw
 aStates[250]="|Kosovo|Montenegro|Serbia|Vojvodina";
 aStates[251]="|Central|Copperbelt|Eastern|Luapula|Lusaka|North-Western|Northern|Southern|Western";
 aStates[252]="|Bulawayo|Harare|ManicalandMashonaland Central|Mashonaland East|Mashonaland West|Masvingo|Matabeleland North|Matabeleland South|Midlands";
-aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|DFRN|Distributed Friend Network|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hikado|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste?|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Recolutionari.es|SPRACI|Sysfu Social Club|theshi.re|Tumpambae|Uzmiac|Other";
+aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|DFRN|Distributed Friend Network|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hikado|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Optimistisch|Recolutionari.es|Sparkling Network|SPRACI|Styliztique|Sysfu Social Club|Trevena|theshi.re|Tumpambae|Uzmiac|Other";
 /* 
  * gArCountryInfo
  * (0) Country name

js/fk.autocomplete.min.js

@@ -0,0 +1,5 @@
+/**
+ * Friendica people autocomplete
+ *
+ * require jQuery, jquery.textareas
+ */function ACPopup(e,t){this.idsel=-1,this.element=e,this.searchText="",this.ready=!0,this.kp_timer=!1,this.url=t;var n=530,r=130;if(typeof e.editorId=="undefined")style=$(e).offset(),n=$(e).width(),r=$(e).height();else{var i=e.getContainer();typeof i!="undefined"&&(style=$(i).offset(),n=$(i).width(),r=$(i).height())}style.top=style.top+r,style.width=n,style.position="absolute",style.display="none",this.cont=$("<div class='acpopup'></div>"),this.cont.css(style),$("body").append(this.cont)}function ContactAutocomplete(e,t){this.pattern=/@([^ \n]+)$/,this.popup=null;var n=this;$(e).unbind("keydown"),$(e).unbind("keyup"),$(e).keydown(function(e){n.popup!==null&&n.popup.onkey(e)}),$(e).keyup(function(e){cpos=$(this).getSelection(),cpos.start==cpos.end&&(match=$(this).val().substring(0,cpos.start).match(n.pattern),match!==null?(n.popup===null&&(n.popup=new ACPopup(this,t)),n.popup.ready&&match[1]!==n.popup.searchText&&n.popup.search(match[1]),n.popup.ready||(n.popup=null)):n.popup!==null&&(n.popup.close(),n.popup=null))})}ACPopup.prototype.close=function(){$(this.cont).remove(),this.ready=!1},ACPopup.prototype.search=function(e){var t=this;this.searchText=e,this.kp_timer&&clearTimeout(this.kp_timer),this.kp_timer=setTimeout(function(){t._search()},500)},ACPopup.prototype._search=function(){console.log("_search");var e=this,t={start:0,count:100,search:this.searchText,type:"c"};$.ajax({type:"POST",url:this.url,data:t,dataType:"json",success:function(t){e.cont.html(""),t.tot>0?(e.cont.show(),$(t.items).each(function(){html="<img src='{0}' height='16px' width='16px'>{1} ({2})".format(this.photo,this.name,this.nick),e.add(html,this.nick.replace(" ","")+"+"+this.id+" - "+this.link)})):e.cont.hide()}})},ACPopup.prototype.add=function(e,n){var r=this,i=$("<div class='acpopupitem' title='"+n+"'>"+e+"</div>");i.click(function(e){t=$(this).attr("title").replace(new RegExp(" - .*"),""),typeof r.element.container=="undefined"?(el=$(r.element),sel=el.getSelection(),sel.start=sel.start-r.searchText.length,el.setSelection(sel.start,sel.end).replaceSelectedText(t+" ").collapseSelection(!1),r.close()):(txt=tinyMCE.activeEditor.getContent(),newtxt=txt.replace(r.searchText,t+" "),tinyMCE.activeEditor.setContent(newtxt),tinyMCE.activeEditor.focus(),r.close())}),$(this.cont).append(i)},ACPopup.prototype.onkey=function(e){e.keyCode=="13"&&(this.idsel>-1?(this.cont.children()[this.idsel].click(),e.preventDefault()):this.close()),e.keyCode=="38"&&(cmax=this.cont.children().size()-1,this.idsel--,this.idsel<0&&(this.idsel=cmax),e.preventDefault());if(e.keyCode=="40"||e.keyCode=="9")cmax=this.cont.children().size()-1,this.idsel++,this.idsel>cmax&&(this.idsel=0),e.preventDefault();if(e.keyCode=="38"||e.keyCode=="40"||e.keyCode=="9")this.cont.children().removeClass("selected"),$(this.cont.children()[this.idsel]).addClass("selected");e.keyCode=="27"&&this.close()},function(e){e.fn.contact_autocomplete=function(e){this.each(function(){new ContactAutocomplete(this,e)})}}(jQuery);

js/jquery.htmlstream.min.js

@@ -0,0 +1,6 @@
+/* jQuery ajax stream plugin
+* Version 0.1
+* Copyright (C) 2009 Chris Tarquini
+* Licensed under a Creative Commons Attribution-Share Alike 3.0 Unported License (http://creativecommons.org/licenses/by-sa/3.0/)
+* Permissions beyond the scope of this license may be available by contacting petros000[at]hotmail.com.
+*/(function(e){var t=e.ajax,n=e.get,r=e.post,i=!0;e.ajaxSetup({stream:!1,pollInterval:500}),e.enableAjaxStream=function(a){typeof a=="undefined"&&(a=!i),a?(e.ajax=s,e.get=o,e.post=u,i=!0):(e.ajax=t,e.get=n,e.post=r,i=!1)};var s=e.ajax=function(n){n=jQuery.extend(!0,n,jQuery.extend(!0,{},jQuery.ajaxSettings,n));if(n.stream){var r=0,i=0,s=null,o=0,u=!1,a=function(e){s=e,l()},f=function(){c("stream")},l=function(){u||(r=setTimeout(f,n.pollInterval))},c=function(t){typeof t=="undefined"&&(t="stream");if(s.status<3)return;var r=s.responseText;if(t=="stream"){if(r.length<=o){l();return}lastlength=r.length;if(i==r.length){l();return}}var u=r.substr(i);i=r.length,e.isFunction(n.OnDataRecieved)&&n.OnDataRecieved(u,t,s.responseText,s),s.status!=4&&l()},h=function(e,t){clearTimeout(r),u=!0,c(t)};if(e.isFunction(n.success)){var p=n.success;n.success=function(e,t){h(e,t),p(e,t)}}else n.success=h;if(e.isFunction(n.beforeSend)){var d=n.beforeSend;n.beforeSend=function(e){d(e),a(e)}}else n.beforeSend=a}t(n)},o=e.get=function(t,n,r,i,s){if(e.isFunction(n)){var o=r;r=n,e.isFunction(o)&&(s=o),n=null}e.isFunction(i)&&(s=i,i=undefined);var u=e.isFunction(s);return jQuery.ajax({type:"GET",url:t,data:n,success:r,dataType:i,stream:u,OnDataRecieved:s})},u=e.post=function(t,n,r,i,s){if(e.isFunction(n)){var o=r;r=n}e.isFunction(i)&&(s=i,i=undefined);var u=e.isFunction(s);return jQuery.ajax({type:"POST",url:t,data:n,success:r,dataType:i,stream:u,OnDataRecieved:s})}})(jQuery);

js/main.js

@@ -641,7 +641,7 @@ Array.prototype.remove = function(item) {
 function previewTheme(elm) {
 	theme = $(elm).val();
 	$.getJSON('pretheme?f=&theme=' + theme,function(data) {
-			$('#theme-preview').html('<div id="theme-desc">' + data.desc + '</div><a href="' + data.img + '"><img src="' + data.img + '" width="320" height="240" alt="' + theme + '" /></a>');
+			$('#theme-preview').html('<div id="theme-desc">' + data.desc + '</div><div id="theme-version">' + data.version + '</div><div id="theme-credits">' + data.credits + '</div><a href="' + data.img + '"><img src="' + data.img + '" width="320" height="240" alt="' + theme + '" /></a>');
 	});
 
 }

js/webtoolkit.base64.min.js

@@ -0,0 +1,6 @@
+/**
+*
+*  Base64 encode / decode
+*  http://www.webtoolkit.info/
+*
+**/var Base64={_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",encode:function(e){var t="",n,r,i,s,o,u,a,f=0;e=Base64._utf8_encode(e);while(f<e.length)n=e.charCodeAt(f++),r=e.charCodeAt(f++),i=e.charCodeAt(f++),s=n>>2,o=(n&3)<<4|r>>4,u=(r&15)<<2|i>>6,a=i&63,isNaN(r)?u=a=64:isNaN(i)&&(a=64),t=t+this._keyStr.charAt(s)+this._keyStr.charAt(o)+this._keyStr.charAt(u)+this._keyStr.charAt(a);return t},decode:function(e){var t="",n,r,i,s,o,u,a,f=0;e=e.replace(/[^A-Za-z0-9\+\/\=]/g,"");while(f<e.length)s=this._keyStr.indexOf(e.charAt(f++)),o=this._keyStr.indexOf(e.charAt(f++)),u=this._keyStr.indexOf(e.charAt(f++)),a=this._keyStr.indexOf(e.charAt(f++)),n=s<<2|o>>4,r=(o&15)<<4|u>>2,i=(u&3)<<6|a,t+=String.fromCharCode(n),u!=64&&(t+=String.fromCharCode(r)),a!=64&&(t+=String.fromCharCode(i));return t=Base64._utf8_decode(t),t},_utf8_encode:function(e){e=e.replace(/\r\n/g,"\n");var t="";for(var n=0;n<e.length;n++){var r=e.charCodeAt(n);r<128?t+=String.fromCharCode(r):r>127&&r<2048?(t+=String.fromCharCode(r>>6|192),t+=String.fromCharCode(r&63|128)):(t+=String.fromCharCode(r>>12|224),t+=String.fromCharCode(r>>6&63|128),t+=String.fromCharCode(r&63|128))}return t},_utf8_decode:function(e){var t="",n=0,r=c1=c2=0;while(n<e.length)r=e.charCodeAt(n),r<128?(t+=String.fromCharCode(r),n++):r>191&&r<224?(c2=e.charCodeAt(n+1),t+=String.fromCharCode((r&31)<<6|c2&63),n+=2):(c2=e.charCodeAt(n+1),c3=e.charCodeAt(n+2),t+=String.fromCharCode((r&15)<<12|(c2&63)<<6|c3&63),n+=3);return t}};

library/Mobile_Detect/Mobile_Detect.php

@@ -0,0 +1,221 @@
+<?php
+/**
+ * Mobile Detect
+ * $Id: Mobile_Detect.php 49 2012-06-06 20:46:30Z serbanghita@gmail.com $
+ * 
+ * @usage      require_once 'Mobile_Detect.php';
+ *             $detect = new Mobile_Detect();
+ *             $detect->isMobile() or $detect->isTablet()
+ * 
+ *             For more specific usage see the documentation navigate to:
+ *             http://code.google.com/p/php-mobile-detect/wiki/Mobile_Detect
+ * 
+ * @license    http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+
+class Mobile_Detect {
+    
+    protected $detectionRules;
+    protected $userAgent = null;
+    protected $accept = null;
+    // Assume the visitor has a desktop environment.
+    protected $isMobile = false;
+    protected $isTablet = false;
+    protected $phoneDeviceName = null;
+    protected $tabletDevicename = null;
+    protected $operatingSystemName = null;
+    protected $userAgentName = null;
+    // List of mobile devices (phones)
+    protected $phoneDevices = array(     
+            'iPhone'        => '(iPhone.*Mobile|iPod|iTunes)',
+            'BlackBerry'    => 'BlackBerry|rim[0-9]+',
+            'HTC'           => 'HTC|HTC.*(6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT',
+            'Nexus'         => 'Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus',
+            'Dell'          => 'Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35',
+            'Motorola'      => '\bDroid\b.*Build|DROIDX|HRI39|MOT\-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT909|XT910|XT912|XT928',
+            'Samsung'       => 'Samsung|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9300 |GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-P6810|GT-P7100|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100',
+            'Sony'          => 'E10i|SonyEricsson|SonyEricssonLT15iv',
+            'Asus'          => 'Asus.*Galaxy',
+            'Palm'          => 'PalmSource|Palm', // avantgo|blazer|elaine|hiptop|plucker|xiino ; @todo - complete the regex.
+	        'Vertu'         => 'Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature', // Just for fun ;)
+            'GenericPhone'  => '(mmp|pocket|psp|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|wap|nokia|Series40|Series60|S60|SonyEricsson|N900|PPC;|MAUI.*WAP.*Browser|LG-P500)'
+    );
+    // List of tablet devices.
+    protected $tabletDevices = array(
+        'BlackBerryTablet'  => 'PlayBook|RIM Tablet',
+        'iPad'              => 'iPad|iPad.*Mobile', // @todo: check for mobile friendly emails topic.
+        'Kindle'            => 'Kindle|Silk.*Accelerated',
+        'SamsungTablet'     => 'SAMSUNG.*Tablet|Galaxy.*Tab|GT-P1000|GT-P1010|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P1000|GT-P3100|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7300|GT-P7320|GT-P7500|GT-P7510|GT-P7511',
+        'HTCtablet'         => 'HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200',
+	    'MotorolaTablet'    => 'xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617',
+        'AsusTablet'        => 'Transformer|TF101',
+        'NookTablet'        => 'NookColor|nook browser|BNTV250A|LogicPD Zoom2',
+        'AcerTablet'        => 'Android.*\b(A100|A101|A200|A500|A501|A510|W500|W500P|W501|W501P)\b',
+	    'YarvikTablet'      => 'Android.*(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468)',
+        'GenericTablet'     => 'Tablet(?!.*PC)|ViewPad7|LG-V909|MID7015|BNTV250A|LogicPD Zoom2|\bA7EB\b|CatNova8|A1_07|CT704|CT1002|\bM721\b',
+    );
+    // List of mobile Operating Systems.
+    protected $operatingSystems = array(
+        'AndroidOS'         => '(android.*mobile|android(?!.*mobile))',
+        'BlackBerryOS'      => '(blackberry|rim tablet os)',
+        'PalmOS'            => '(avantgo|blazer|elaine|hiptop|palm|plucker|xiino)',
+        'SymbianOS'         => 'Symbian|SymbOS|Series60|Series40|\bS60\b',
+        'WindowsMobileOS'   => 'IEMobile|Windows Phone|Windows CE.*(PPC|Smartphone)|MSIEMobile|Window Mobile|XBLWP7',
+        'iOS'               => '(iphone|ipod|ipad)',
+        'FlashLiteOS'       => '',
+        'JavaOS'            => '',
+        'NokiaOS'           => '',
+        'webOS'             => '',
+        'badaOS'            => '\bBada\b',
+        'BREWOS'            => '',
+    );
+    // List of mobile User Agents.
+    protected $userAgents = array(      
+      'Chrome'          => '\bCrMo\b|Chrome\/[.0-9]* Mobile',
+      'Dolfin'          => '\bDolfin\b',
+      'Opera'           => 'Opera.*Mini|Opera.*Mobi|Android.*Opera',
+      'Skyfire'         => 'skyfire',
+      'IE'              => 'IEMobile|MSIEMobile',
+      'Firefox'         => 'fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile',
+      'Bolt'            => 'bolt',
+      'TeaShark'        => 'teashark',
+      'Blazer'          => 'Blazer',
+      'Safari'          => 'Mobile.*Safari|Safari.*Mobile',
+      'Midori'          => 'midori',
+      'GenericBrowser'  => 'NokiaBrowser|OviBrowser|SEMC.*Browser'
+    );
+    
+    function __construct(){
+        
+        // Merge all rules together.
+        $this->detectionRules = array_merge(
+                                            $this->phoneDevices, 
+                                            $this->tabletDevices, 
+                                            $this->operatingSystems, 
+                                            $this->userAgents
+                                            );
+        $this->userAgent    = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : null;
+        $this->accept       = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
+        
+        if (
+		isset($_SERVER['HTTP_X_WAP_PROFILE']) ||
+        isset($_SERVER['HTTP_X_WAP_CLIENTID']) ||
+        isset($_SERVER['HTTP_WAP_CONNECTION']) ||
+		isset($_SERVER['HTTP_PROFILE']) ||
+		isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA']) || // Reported by Nokia devices (eg. C3)
+        isset($_SERVER['HTTP_X_NOKIA_IPADDRESS']) ||
+        isset($_SERVER['HTTP_X_NOKIA_GATEWAY_ID']) ||
+        isset($_SERVER['HTTP_X_ORANGE_ID']) ||
+        isset($_SERVER['HTTP_X_VODAFONE_3GPDPCONTEXT']) ||
+        isset($_SERVER['HTTP_X_HUAWEI_USERID']) ||
+        isset($_SERVER['HTTP_UA_OS']) || // Reported by Windows Smartphones
+        (isset($_SERVER['HTTP_UA_CPU']) && $_SERVER['HTTP_UA_CPU'] == 'ARM') // Seen this on a HTC
+		) {
+                $this->isMobile = true;
+        } elseif (!empty($this->accept) && (strpos($this->accept, 'text/vnd.wap.wml') !== false || strpos($this->accept, 'application/vnd.wap.xhtml+xml') !== false)) {
+                $this->isMobile = true;
+        } else {
+                $this->_detect();
+        }        
+        
+    }
+	
+    public function getRules()
+    {
+        return $this->detectionRules;
+    }
+    
+    /**
+     * Magic overloading method.
+     * 
+     * @method boolean is[...]()
+     * @param string $name
+     * @param array $arguments
+     * @return mixed 
+     */
+    public function __call($name, $arguments)
+    {
+                
+        $key = substr($name, 2);
+        return $this->_detect($key);
+        
+    }
+    
+    /**
+     * Private method that does the detection of the 
+     * mobile devices.
+     * 
+     * @param string $key
+     * @return boolean|null 
+     */
+    private function _detect($key='')
+    {
+
+        if(empty($key)){ 
+
+            // Begin general search.
+            foreach($this->detectionRules as $_regex){
+                if(empty($_regex)){ continue; }
+                if(preg_match('/'.$_regex.'/is', $this->userAgent)){
+                    $this->isMobile = true;
+                    return true;
+                } 
+            }
+            return false;
+
+        } else {
+            
+            // Search for a certain key.
+            // Make the keys lowecase so we can match: isIphone(), isiPhone(), isiphone(), etc.
+            $key = strtolower($key);
+            $_rules = array_change_key_case($this->detectionRules);
+            
+            if(array_key_exists($key, $_rules)){
+                if(empty($_rules[$key])){ return null; }
+                if(preg_match('/'.$_rules[$key].'/is', $this->userAgent)){
+                    $this->isMobile = true;
+                    return true;
+                } else {
+                    return false;
+                }           
+            } else {
+                trigger_error("Method $key is not defined", E_USER_WARNING);
+            }
+            
+            return false;
+
+        }
+
+    }
+        
+    /**
+    * Check if the device is mobile.
+    * Returns true if any type of mobile device detected, including special ones
+    * @return bool
+    */
+    public function isMobile()
+    {
+	    return $this->isMobile;
+    } 
+    
+    /**
+    * Check if the device is a tablet.
+    * Return true if any type of tablet device is detected.
+    * @return boolean 
+    */
+    public function isTablet()
+    {
+
+	foreach($this->tabletDevices as $_regex){
+	    if(preg_match('/'.$_regex.'/is', $this->userAgent)){
+		$this->isTablet = true;
+		return true;
+	    }
+	}
+
+	return false;        
+
+    }
+    
+    
+}

mod/admin.php

@@ -471,6 +471,9 @@ function admin_page_dbsync(&$a) {
 
 	if($a->argc > 3 && intval($a->argv[3]) && $a->argv[2] === 'mark') {
 		set_config('database', 'update_' . intval($a->argv[3]), 'success');
+		$curr = get_config('system','build');
+		if(intval($curr) == intval($a->argv[3]))
+			set_config('system','build',intval($curr) + 1);
 		info( t('Update has been marked successful') . EOL);
 		goaway($a->get_baseurl(true) . '/admin/dbsync');
 	}

mod/contacts.php

@@ -45,22 +45,16 @@ function contacts_init(&$a) {
 	$a->page['aside'] .= networks_widget('contacts',$_GET['nets']);
 	$base = $a->get_baseurl();
 
-	$a->page['htmlhead'] .= '<script src="' . $a->get_baseurl(true) . '/library/jquery_ac/friendica.complete.js" ></script>';
+	$tpl = get_markup_template("contacts-head.tpl");
-	$a->page['htmlhead'] .= <<< EOT
+	$a->page['htmlhead'] .= replace_macros($tpl,array(
-
+		'$baseurl' => $a->get_baseurl(true),
-<script>$(document).ready(function() { 
+		'$base' => $base
-	var a; 
+	));
-	a = $("#contacts-search").autocomplete({ 
+	$tpl = get_markup_template("contacts-end.tpl");
-		serviceUrl: '$base/acl',
+	$a->page['end'] .= replace_macros($tpl,array(
-		minChars: 2,
+		'$baseurl' => $a->get_baseurl(true),
-		width: 350,
+		'$base' => $base
-	});
+	));
-	a.setOptions({ params: { type: 'a' }});
-
-}); 
-
-</script>
-EOT;
 
 
 }
@@ -247,6 +241,10 @@ function contacts_content(&$a) {
 			'$baseurl' => $a->get_baseurl(true),
 			'$editselect' => $editselect,
 		));
+		$a->page['end'] .= replace_macros(get_markup_template('contact_end.tpl'), array(
+			'$baseurl' => $a->get_baseurl(true),
+			'$editselect' => $editselect,
+		));
 
 		require_once('include/contact_selectors.php');
 

mod/display.php

@@ -16,15 +16,7 @@ function display_content(&$a) {
 
 	$o = '<div id="live-display"></div>' . "\r\n";
 
-	$a->page['htmlhead'] .= <<<EOT
+	$a->page['htmlhead'] .= get_markup_template('display-head.tpl');
-<script>
-$(document).ready(function() {
-	$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-	// make auto-complete work in more places
-	$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-});
-</script>
-EOT;
 
 
 	$nick = (($a->argc > 1) ? $a->argv[1] : '');
@@ -126,7 +118,7 @@ EOT;
 
 	}
 	else {
-		$r = q("SELECT `id` FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
+		$r = q("SELECT `id`,`deleted` FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
 			dbesc($item_id),
 			dbesc($item_id)
 		);

mod/editpost.php

@@ -36,7 +36,6 @@ function editpost_content(&$a) {
 	$o .= '<h2>' . t('Edit post') . '</h2>';
 
 	$tpl = get_markup_template('jot-header.tpl');
-	
 	$a->page['htmlhead'] .= replace_macros($tpl, array(
 		'$baseurl' => $a->get_baseurl(),
 		'$editselect' =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
@@ -45,6 +44,15 @@ function editpost_content(&$a) {
 		'$nickname' => $a->user['nickname']
 	));
 
+	$tpl = get_markup_template('jot-end.tpl');
+	$a->page['end'] .= replace_macros($tpl, array(
+		'$baseurl' => $a->get_baseurl(),
+		'$editselect' =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+		'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
+		'$geotag' => $geotag,
+		'$nickname' => $a->user['nickname']
+	));
+
 
 	$tpl = get_markup_template("jot.tpl");
 		
@@ -124,6 +132,7 @@ function editpost_content(&$a) {
 		'$profile_uid' => $_SESSION['uid'],
 		'$preview' => t('Preview'),
 		'$jotplugins' => $jotplugins,
+		'$mobileapp' => t('Friendica mobile web'),
 	));
 
 	return $o;

mod/events.php

@@ -145,6 +145,9 @@ function events_content(&$a) {
 	$htpl = get_markup_template('event_head.tpl');
 	$a->page['htmlhead'] .= replace_macros($htpl,array('$baseurl' => $a->get_baseurl()));
 
+	$etpl = get_markup_template('event_end.tpl');
+	$a->page['end'] .= replace_macros($etpl,array('$baseurl' => $a->get_baseurl()));
+
 	$o ="";
 	// tabs
 	$tabs = profile_tabs($a, True);	

mod/message.php

@@ -18,24 +18,17 @@ function message_init(&$a) {
 	));
 	$base = $a->get_baseurl();
 
-	$a->page['htmlhead'] .= '<script src="' . $a->get_baseurl(true) . '/library/jquery_ac/friendica.complete.js" ></script>';
+	$head_tpl = get_markup_template('message-head.tpl');
-	$a->page['htmlhead'] .= <<< EOT
+	$a->page['htmlhead'] .= replace_macros($head_tpl,array(
+		'$baseurl' => $a->get_baseurl(true),
+		'$base' => $base
+	));
 
-<script>$(document).ready(function() { 
+	$end_tpl = get_markup_template('message-end.tpl');
-	var a; 
+	$a->page['end'] .= replace_macros($end_tpl,array(
-	a = $("#recip").autocomplete({ 
+		'$baseurl' => $a->get_baseurl(true),
-		serviceUrl: '$base/acl',
+		'$base' => $base
-		minChars: 2,
+	));
-		width: 350,
-		onSelect: function(value,data) {
-			$("#recip-complete").val(data);
-		}			
-	});
-
-}); 
-
-</script>
-EOT;
 	
 }
 
@@ -242,7 +235,6 @@ function message_content(&$a) {
 
 
 		$tpl = get_markup_template('msg-header.tpl');
-
 		$a->page['htmlhead'] .= replace_macros($tpl, array(
 			'$baseurl' => $a->get_baseurl(true),
 			'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
@@ -250,6 +242,14 @@ function message_content(&$a) {
 			'$linkurl' => t('Please enter a link URL:')
 		));
 	
+		$tpl = get_markup_template('msg-end.tpl');
+		$a->page['end'] .= replace_macros($tpl, array(
+			'$baseurl' => $a->get_baseurl(true),
+			'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+			'$nickname' => $a->user['nickname'],
+			'$linkurl' => t('Please enter a link URL:')
+		));
+	
 		$preselect = (isset($a->argv[2])?array($a->argv[2]):false);
 			
 
@@ -399,12 +399,17 @@ function message_content(&$a) {
 		require_once("include/bbcode.php");
 
 		$tpl = get_markup_template('msg-header.tpl');
-	
 		$a->page['htmlhead'] .= replace_macros($tpl, array(
 			'$nickname' => $a->user['nickname'],
 			'$baseurl' => $a->get_baseurl(true)
 		));
 
+		$tpl = get_markup_template('msg-end.tpl');
+		$a->page['end'] .= replace_macros($tpl, array(
+			'$nickname' => $a->user['nickname'],
+			'$baseurl' => $a->get_baseurl(true)
+		));
+
 
 		$mails = array();
 		$seen = 0;

mod/parse_url.php

@@ -302,11 +302,16 @@ function parse_url_content(&$a) {
 
 	$image = "";
 
+        if($siteinfo["image"] != ""){
+            /*
+              Execute below code only if image is present in siteinfo
+             */
             foreach ($siteinfo["images"] as $imagedata)
 		if($textmode)
                     $image .= '[img='.$imagedata["width"].'x'.$imagedata["height"].']'.$imagedata["src"].'[/img]';
 		else
                     $image .= '<img height="'.$imagedata["height"].'" width="'.$imagedata["width"].'" src="'.$imagedata["src"].'" alt="photo" />';
+        }
 
 	if(strlen($text)) {
 		if($textmode)

mod/photos.php

@@ -69,30 +69,11 @@ function photos_init(&$a) {
 		$a->page['aside'] .= $o;
 
 
-		$a->page['htmlhead'] .= "<script> var ispublic = '" . t('everybody') . "';" ;
+		$tpl = get_markup_template("photos_head.tpl");
+		$a->page['htmlhead'] .= replace_macros($tpl,array(
+			'$ispublic' => t('everybody')
+		));
 
-		$a->page['htmlhead'] .= <<< EOT
-
-		$(document).ready(function() {
-
-			$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-				var selstr;
-				$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-					selstr = $(this).text();
-					$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-					$('#jot-public').hide();
-				});
-				if(selstr == null) { 
-					$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-					$('#jot-public').show();
-				}
-
-			}).trigger('change');
-
-		});
-
-		</script>
-EOT;
 	}
 
 	return;
@@ -962,7 +943,7 @@ function photos_content(&$a) {
 		$selname = (($datum) ? hex2bin($datum) : '');
 
 
-		$albumselect = '<select id="photos-upload-album-select" name="album" size="4">';
+		$albumselect = '';
 
 		
 		$albumselect .= '<option value="" ' . ((! $selname) ? ' selected="selected" ' : '') . '>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
@@ -977,8 +958,6 @@ function photos_content(&$a) {
 
 		$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
-		$albumselect .= '</select>';
-
 		$uploader = '';
 
 		$ret = array('post_url' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'],
@@ -988,7 +967,7 @@ function photos_content(&$a) {
 
 		call_hooks('photo_upload_form',$ret);
 
-		$default_upload = '<input type="file" name="userfile" /> 	<div class="photos-upload-submit-wrapper" >
+		$default_upload = '<input id="photos-upload-choose" type="file" name="userfile" /> 	<div class="photos-upload-submit-wrapper" >
 		<input type="submit" name="submit" value="' . t('Submit') . '" id="photos-upload-submit" /> </div>';
 
 
@@ -1195,15 +1174,12 @@ function photos_content(&$a) {
 			
 		}
 
-		if(! $cmd !== 'edit') {
+		if( $cmd === 'edit') {
-			$a->page['htmlhead'] .= '<script>
+			$tpl = get_markup_template('photo_edit_head.tpl');
-				$(document).keydown(function(event) {' . "\n";
+			$a->page['htmlhead'] .= replace_macros($tpl,array(
-
+				'$prevlink' => $prevlink,
-			if($prevlink)
+				'$nextlink' => $nextlink
-				$a->page['htmlhead'] .= 'if(event.ctrlKey && event.keyCode == 37) { event.preventDefault(); window.location.href = \'' . $prevlink . '\'; }' . "\n";
+			));
-			if($nextlink)
-				$a->page['htmlhead'] .= 'if(event.ctrlKey && event.keyCode == 39) { event.preventDefault(); window.location.href = \'' . $nextlink . '\'; }' . "\n";
-			$a->page['htmlhead'] .= '});</script>';
 		}
 
 		if($prevlink)

mod/poke.php

@@ -0,0 +1,206 @@
+<?php
+
+require_once('include/security.php');
+require_once('include/bbcode.php');
+require_once('include/items.php');
+
+
+function poke_init(&$a) {
+
+	if(! local_user())
+		return;
+
+	$uid = local_user();
+	$verb = notags(trim($_GET['verb']));
+	
+	if(! $verb) 
+		return;
+
+	$verbs = get_poke_verbs();
+
+	if(! array_key_exists($verb,$verbs))
+		return;
+
+	$activity = ACTIVITY_POKE . '#' . urlencode($verbs[$verb][0]);
+
+	$contact_id = intval($_GET['cid']);
+	if(! $contact_id)
+		return;
+
+	$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : 0);
+
+
+	logger('poke: verb ' . $verb . ' contact ' . $contact_id, LOGGER_DEBUG);
+
+
+	$r = q("SELECT * FROM `contact` WHERE `id` = %d and  `uid` = %d LIMIT 1",
+		intval($contact_id),
+		intval($uid)
+	);
+
+	if(! count($r)) {
+		logger('poke: no contact ' . $contact_id);
+		return;
+	}
+
+	$target = $r[0];
+
+	if($parent) {
+		$r = q("select uri, private, allow_cid, allow_gid, deny_cid, deny_gid 
+			from item where id = %d and parent = %d and uid = %d limit 1",
+			intval($parent),
+			intval($parent),
+			intval($uid)
+		);
+		if(count($r)) {
+			$parent_uri = $r[0]['uri'];
+			$private    = $r[0]['private'];
+			$allow_cid  = $r[0]['allow_cid'];
+			$allow_gid  = $r[0]['allow_gid'];
+			$deny_cid   = $r[0]['deny_cid'];
+			$deny_gid   = $r[0]['deny_gid'];
+		}
+	}
+	else {
+
+		$private = ((x($_GET,'private')) ? intval($_GET['private']) : 0);
+
+		$allow_cid     = (($private) ? '<' . $target['id']. '>' : $a->user['allow_cid']);
+		$allow_gid     = (($private) ? '' : $a->user['allow_gid']);
+		$deny_cid      = (($private) ? '' : $a->user['deny_cid']);
+		$deny_gid      = (($private) ? '' : $a->user['deny_gid']);
+	}
+
+	$poster = $a->contact;
+
+	$uri = item_new_uri($a->get_hostname(),$owner_uid);
+
+	$arr = array();
+
+	$arr['uid']           = $uid;
+	$arr['uri']           = $uri;
+	$arr['parent-uri']    = (($parent_uri) ? $parent_uri : $uri);
+	$arr['type']          = 'activity';
+	$arr['wall']          = 1;
+	$arr['contact-id']    = $poster['id'];
+	$arr['owner-name']    = $poster['name'];
+	$arr['owner-link']    = $poster['url'];
+	$arr['owner-avatar']  = $poster['thumb'];
+	$arr['author-name']   = $poster['name'];
+	$arr['author-link']   = $poster['url'];
+	$arr['author-avatar'] = $poster['thumb'];
+	$arr['title']         = '';
+	$arr['allow_cid']     = $allow_cid;
+	$arr['allow_gid']     = $allow_gid;
+	$arr['deny_cid']      = $deny_cid;
+	$arr['deny_gid']      = $deny_gid;
+	$arr['last-child']    = 1;
+	$arr['visible']       = 1;
+	$arr['verb']          = $activity;
+	$arr['private']       = $private;
+	$arr['object-type']   = ACTIVITY_OBJ_PERSON;
+
+	$arr['origin']        = 1;
+	$arr['body']          = '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' . ' ' . t($verbs[$verb][0]) . ' ' . '[url=' . $target['url'] . ']' . $target['name'] . '[/url]';
+
+	$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $target['name'] . '</title><id>' . $a->get_baseurl() . '/contact/' . $target['id'] . '</id>';
+	$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $target['url'] . '" />' . "\n");
+
+	$arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $target['photo'] . '" />' . "\n");
+	$arr['object'] .= '</link></object>' . "\n";
+
+	$item_id = item_store($arr);
+	if($item_id) {
+		q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
+			dbesc($a->get_baseurl() . '/display/' . $poster['nickname'] . '/' . $item_id),
+			intval($uid),
+			intval($item_id)
+		);
+		proc_run('php',"include/notifier.php","tag","$item_id");
+	}
+
+
+	call_hooks('post_local_end', $arr);
+
+	proc_run('php',"include/notifier.php","like","$post_id");
+
+	return;
+}
+
+
+
+function poke_content(&$a) {
+
+	if(! local_user()) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
+
+	$name = '';
+	$id = '';
+
+	if(intval($_GET['c'])) {
+		$r = q("select id,name from contact where id = %d and uid = %d limit 1",
+			intval($_GET['c']),
+			intval(local_user())
+		);
+		if(count($r)) {
+			$name = $r[0]['name'];
+			$id = $r[0]['id'];
+		}
+	}
+
+
+	$base = $a->get_baseurl();
+
+	$a->page['htmlhead'] .= '<script src="' . $a->get_baseurl(true) . '/library/jquery_ac/friendica.complete.js" ></script>';
+	$a->page['htmlhead'] .= <<< EOT
+
+<script>$(document).ready(function() { 
+	var a; 
+	a = $("#poke-recip").autocomplete({ 
+		serviceUrl: '$base/acl',
+		minChars: 2,
+		width: 350,
+		onSelect: function(value,data) {
+			$("#poke-recip-complete").val(data);
+		}			
+	});
+	a.setOptions({ params: { type: 'a' }});
+
+
+}); 
+
+</script>
+EOT;
+
+	$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0');
+
+
+
+	$verbs = get_poke_verbs();
+
+	$shortlist = array();
+	foreach($verbs as $k => $v)
+		if($v[1] !== 'NOTRANSLATION')
+			$shortlist[] = array($k,$v[1]);
+
+
+	$tpl = get_markup_template('poke_content.tpl');
+
+	$o = replace_macros($tpl,array(
+		'$title' => t('Poke/Prod'),
+		'$desc' => t('poke, prod or do other things to somebody'),
+		'$clabel' => t('Recipient'),
+		'$choice' => t('Choose what you wish to do to recipient'),
+		'$verbs' => $shortlist,
+		'$parent' => $parent,
+		'$prv_desc' => t('Make this post private'),
+		'$submit' => t('Submit'),
+		'$name' => $name,
+		'$id' => $id
+	));
+
+	return $o;
+
+}

mod/pretheme.php

@@ -7,10 +7,16 @@ function pretheme_init(&$a) {
 		$info = get_theme_info($theme);
 		if($info) {
 			// unfortunately there will be no translation for this string
-			$desc = $info['description'] . ' ' . $info['version'];
+			$desc = $info['description'];
+			$version = $info['version'];
+			$credits = $info['credits'];
 		}
-		else $desc = '';
+		else {
-		echo json_encode(array('img' => get_theme_screenshot($theme), 'desc' => $desc));
+			$desc = '';
+			$version = '';
+			$credits = '';
+		}
+		echo json_encode(array('img' => get_theme_screenshot($theme), 'desc' => $desc, 'version' => $version, 'credits' => $credits));
 	}
 	killme();
 }

mod/profile_photo.php

@@ -279,6 +279,7 @@ function profile_photo_crop_ui_head(&$a, $ph){
 	$a->config['imagecrop_resolution'] = $smallest;
 	$a->config['imagecrop_ext'] = $ph->getExt();
 	$a->page['htmlhead'] .= get_markup_template("crophead.tpl");
+	$a->page['end'] .= get_markup_template("cropend.tpl");
 	return;
 }}
 

mod/profiles.php

@@ -546,6 +546,10 @@ function profiles_content(&$a) {
 			'$baseurl' => $a->get_baseurl(true),
 			'$editselect' => $editselect,
 		));
+		$a->page['end'] .= replace_macros(get_markup_template('profed_end.tpl'), array(
+			'$baseurl' => $a->get_baseurl(true),
+			'$editselect' => $editselect,
+		));
 
 
 		$opt_tpl = get_markup_template("profile-hide-friends.tpl");
@@ -557,9 +561,6 @@ function profiles_content(&$a) {
 			'$no_selected' => (($r[0]['hide-friends'] == 0) ? " checked=\"checked\" " : "")
 		));
 
-		$a->page['htmlhead'] .= "<script type=\"text/javascript\" src=\"js/country.js\" ></script>";
-
-
 
 
 

mod/register.php

@@ -12,7 +12,7 @@ function register_post(&$a) {
 	call_hooks('register_post', $arr);
 
 	$max_dailies = intval(get_config('system','max_daily_registrations'));
-	if($max_dailes) {
+	if($max_dailies) {
 		$r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");
 		if($r && $r[0]['total'] >= $max_dailies) {
 			return;
@@ -182,7 +182,7 @@ function register_content(&$a) {
 	}
 
 	$max_dailies = intval(get_config('system','max_daily_registrations'));
-	if($max_dailes) {
+	if($max_dailies) {
 		$r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");
 		if($r && $r[0]['total'] >= $max_dailies) {
 			logger('max daily registrations exceeded.');

mod/settings.php

@@ -18,30 +18,10 @@ function settings_init(&$a) {
 
 	// These lines provide the javascript needed by the acl selector
 
-	$a->page['htmlhead'] .= "<script> var ispublic = '" . t('everybody') . "';" ;
+	$tpl = get_markup_template("settings-head.tpl");
-
+	$a->page['htmlhead'] .= replace_macros($tpl,array(
-	$a->page['htmlhead'] .= <<< EOT
+		'$ispublic' => t('everybody')
-
+	));
-	$(document).ready(function() {
-
-		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $(this).text();
-				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$('#jot-public').hide();
-			});
-			if(selstr == null) { 
-				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$('#jot-public').show();
-			}
-
-		}).trigger('change');
-
-	});
-
-	</script>
-EOT;
 
 
 
@@ -373,6 +353,8 @@ function settings_post(&$a) {
 		$notify += intval($_POST['notify6']);
 	if(x($_POST,'notify7'))
 		$notify += intval($_POST['notify7']);
+	if(x($_POST,'notify8'))
+		$notify += intval($_POST['notify8']);
 
 	$email_changed = false;
 
@@ -779,6 +761,11 @@ function settings_content(&$a) {
 			'$theme_config' => $theme_config,
 		));
 		
+		$tpl = get_markup_template("settings_display_end.tpl");
+		$a->page['end'] .= replace_macros($tpl, array(
+			'$theme'	=> array('theme', t('Display Theme:'), $theme_selected, '', $themes)
+		));
+
 		return $o;
 	}
 	
@@ -1025,6 +1012,7 @@ function settings_content(&$a) {
 		'$notify5'	=> array('notify5', t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''),
 		'$notify6'  => array('notify6', t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, ''),		
 		'$notify7'  => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''),		
+		'$notify8'  => array('notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''),		
 		
 		
 		'$h_advn' => t('Advanced Account/Page Type Settings'),

mod/wallmessage.php

@@ -116,7 +116,6 @@ function wallmessage_content(&$a) {
 
 
 	$tpl = get_markup_template('wallmsg-header.tpl');
-
 	$a->page['htmlhead'] .= replace_macros($tpl, array(
 		'$baseurl' => $a->get_baseurl(true),
 		'$editselect' => '/(profile-jot-text|prvmail-text)/',
@@ -124,6 +123,14 @@ function wallmessage_content(&$a) {
 		'$linkurl' => t('Please enter a link URL:')
 	));
 
+	$tpl = get_markup_template('wallmsg-end.tpl');
+	$a->page['end'] .= replace_macros($tpl, array(
+		'$baseurl' => $a->get_baseurl(true),
+		'$editselect' => '/(profile-jot-text|prvmail-text)/',
+		'$nickname' => $user['nickname'],
+		'$linkurl' => t('Please enter a link URL:')
+	));
+	
 
 	
 	$tpl = get_markup_template('wallmessage.tpl');

update.php

@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1153 );
+define( 'UPDATE_VERSION' , 1154 );
 
 /**
  *
@@ -1336,3 +1336,10 @@ function update_1152() {
 		return UPDATE_FAILED;
 	return UPDATE_SUCCESS;
 }
+
+function update_1153() {
+	$r = q("ALTER TABLE `hook` ADD `priority` INT(11) UNSIGNED NOT NULL DEFAULT '0'");
+	
+	if(!$r) return UPDATE_FAILED;
+	return UPDATE_SUCCESS;
+}

util/messages.po

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1407\n"
+"Project-Id-Version: 3.0.1421\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-17 10:00-0700\n"
+"POT-Creation-Date: 2012-07-31 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,11 +36,11 @@ msgstr ""
 
 #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
 #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/photos.php:135 ../../mod/photos.php:957
+#: ../../mod/api.php:31 ../../mod/photos.php:116 ../../mod/photos.php:938
-#: ../../mod/editpost.php:10 ../../mod/install.php:151
+#: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:109
-#: ../../mod/notifications.php:66 ../../mod/contacts.php:145
+#: ../../mod/notifications.php:66 ../../mod/contacts.php:139
-#: ../../mod/settings.php:106 ../../mod/settings.php:537
+#: ../../mod/settings.php:86 ../../mod/settings.php:519
-#: ../../mod/settings.php:542 ../../mod/manage.php:86 ../../mod/network.php:6
+#: ../../mod/settings.php:524 ../../mod/manage.php:86 ../../mod/network.php:6
 #: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
@@ -48,15 +48,15 @@ msgstr ""
 #: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:125
 #: ../../mod/item.php:141 ../../mod/profile_photo.php:19
 #: ../../mod/profile_photo.php:142 ../../mod/profile_photo.php:153
-#: ../../mod/profile_photo.php:166 ../../mod/message.php:45
+#: ../../mod/profile_photo.php:166 ../../mod/message.php:38
-#: ../../mod/message.php:175 ../../mod/allfriends.php:9
+#: ../../mod/message.php:168 ../../mod/allfriends.php:9
 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53
 #: ../../mod/follow.php:9 ../../mod/display.php:138 ../../mod/profiles.php:7
 #: ../../mod/profiles.php:408 ../../mod/delegate.php:6
 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
-#: ../../addon/facebook/facebook.php:516 ../../addon/dav/layout.fnk.php:353
+#: ../../addon/facebook/facebook.php:516 ../../addon/dav/layout.fnk.php:354
-#: ../../include/items.php:3593 ../../index.php:309
+#: ../../include/items.php:3813 ../../index.php:315
 msgid "Permission denied."
 msgstr ""
 
@@ -85,8 +85,8 @@ msgstr ""
 msgid "Return to contact editor"
 msgstr ""
 
-#: ../../mod/crepair.php:148 ../../mod/settings.php:557
+#: ../../mod/crepair.php:148 ../../mod/settings.php:539
-#: ../../mod/settings.php:583 ../../mod/admin.php:661 ../../mod/admin.php:670
+#: ../../mod/settings.php:565 ../../mod/admin.php:664 ../../mod/admin.php:673
 msgid "Name"
 msgstr ""
 
@@ -123,20 +123,20 @@ msgid "New photo from this URL"
 msgstr ""
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:436 ../../mod/photos.php:992 ../../mod/photos.php:1063
+#: ../../mod/events.php:439 ../../mod/photos.php:971 ../../mod/photos.php:1042
-#: ../../mod/photos.php:1309 ../../mod/photos.php:1349
+#: ../../mod/photos.php:1285 ../../mod/photos.php:1325
-#: ../../mod/photos.php:1389 ../../mod/photos.php:1420
+#: ../../mod/photos.php:1365 ../../mod/photos.php:1396
 #: ../../mod/install.php:246 ../../mod/install.php:284
-#: ../../mod/localtime.php:45 ../../mod/content.php:691
+#: ../../mod/localtime.php:45 ../../mod/poke.php:169 ../../mod/content.php:691
-#: ../../mod/contacts.php:343 ../../mod/settings.php:555
+#: ../../mod/contacts.php:341 ../../mod/settings.php:537
-#: ../../mod/settings.php:709 ../../mod/settings.php:770
+#: ../../mod/settings.php:691 ../../mod/settings.php:752
-#: ../../mod/settings.php:971 ../../mod/group.php:85 ../../mod/message.php:294
+#: ../../mod/settings.php:958 ../../mod/group.php:85 ../../mod/message.php:294
-#: ../../mod/message.php:473 ../../mod/admin.php:422 ../../mod/admin.php:658
+#: ../../mod/message.php:478 ../../mod/admin.php:422 ../../mod/admin.php:661
-#: ../../mod/admin.php:794 ../../mod/admin.php:993 ../../mod/admin.php:1080
+#: ../../mod/admin.php:797 ../../mod/admin.php:996 ../../mod/admin.php:1083
-#: ../../mod/profiles.php:577 ../../mod/invite.php:119
+#: ../../mod/profiles.php:578 ../../mod/invite.php:119
 #: ../../addon/fromgplus/fromgplus.php:40
 #: ../../addon/facebook/facebook.php:619
-#: ../../addon/snautofollow/snautofollow.php:64
+#: ../../addon/snautofollow/snautofollow.php:64 ../../addon/bg/bg.php:90
 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
 #: ../../addon/nsfw/nsfw.php:57 ../../addon/page/page.php:210
 #: ../../addon/planets/planets.php:158
@@ -144,10 +144,12 @@ msgstr ""
 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
 #: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92
 #: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41
+#: ../../addon/forumlist/forumlist.php:169
 #: ../../addon/impressum/impressum.php:82
 #: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57
 #: ../../addon/qcomment/qcomment.php:61
 #: ../../addon/openstreetmap/openstreetmap.php:70
+#: ../../addon/group_text/group_text.php:84
 #: ../../addon/libravatar/libravatar.php:99
 #: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:87
 #: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
@@ -159,18 +161,18 @@ msgstr ""
 #: ../../addon/statusnet/statusnet.php:318
 #: ../../addon/statusnet/statusnet.php:325
 #: ../../addon/statusnet/statusnet.php:353
-#: ../../addon/statusnet/statusnet.php:567 ../../addon/tumblr/tumblr.php:90
+#: ../../addon/statusnet/statusnet.php:576 ../../addon/tumblr/tumblr.php:90
 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48
 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
-#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:387
+#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:394
 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
 #: ../../addon/posterous/posterous.php:103
 #: ../../view/theme/cleanzero/config.php:80
 #: ../../view/theme/diabook/theme.php:757
 #: ../../view/theme/diabook/config.php:190
 #: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70
-#: ../../include/conversation.php:653
+#: ../../include/conversation.php:696
 msgid "Submit"
 msgstr ""
 
@@ -178,16 +180,16 @@ msgstr ""
 msgid "Help:"
 msgstr ""
 
-#: ../../mod/help.php:34 ../../addon/dav/layout.fnk.php:116
+#: ../../mod/help.php:34 ../../addon/dav/layout.fnk.php:225
 #: ../../include/nav.php:86
 msgid "Help"
 msgstr ""
 
-#: ../../mod/help.php:38 ../../index.php:218
+#: ../../mod/help.php:38 ../../index.php:224
 msgid "Not Found"
 msgstr ""
 
-#: ../../mod/help.php:41 ../../index.php:221
+#: ../../mod/help.php:41 ../../index.php:227
 msgid "Page not found."
 msgstr ""
 
@@ -217,90 +219,90 @@ msgstr ""
 msgid "Event title and start time are required."
 msgstr ""
 
-#: ../../mod/events.php:260
+#: ../../mod/events.php:263
 msgid "l, F j"
 msgstr ""
 
-#: ../../mod/events.php:282
+#: ../../mod/events.php:285
 msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:304 ../../include/text.php:1094
+#: ../../mod/events.php:307 ../../include/text.php:1110
 msgid "link to source"
 msgstr ""
 
-#: ../../mod/events.php:328 ../../view/theme/diabook/theme.php:131
+#: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131
-#: ../../include/nav.php:52 ../../boot.php:1596
+#: ../../include/nav.php:52 ../../boot.php:1634
 msgid "Events"
 msgstr ""
 
-#: ../../mod/events.php:329
+#: ../../mod/events.php:332
 msgid "Create New Event"
 msgstr ""
 
-#: ../../mod/events.php:330 ../../addon/dav/layout.fnk.php:154
+#: ../../mod/events.php:333 ../../addon/dav/layout.fnk.php:263
 msgid "Previous"
 msgstr ""
 
-#: ../../mod/events.php:331 ../../mod/install.php:205
+#: ../../mod/events.php:334 ../../mod/install.php:205
-#: ../../addon/dav/layout.fnk.php:157
+#: ../../addon/dav/layout.fnk.php:266
 msgid "Next"
 msgstr ""
 
-#: ../../mod/events.php:404
+#: ../../mod/events.php:407
 msgid "hour:minute"
 msgstr ""
 
-#: ../../mod/events.php:414
+#: ../../mod/events.php:417
 msgid "Event details"
 msgstr ""
 
-#: ../../mod/events.php:415
+#: ../../mod/events.php:418
 #, php-format
 msgid "Format is %s %s. Starting date and Title are required."
 msgstr ""
 
-#: ../../mod/events.php:417
+#: ../../mod/events.php:420
 msgid "Event Starts:"
 msgstr ""
 
-#: ../../mod/events.php:417 ../../mod/events.php:431
+#: ../../mod/events.php:420 ../../mod/events.php:434
 msgid "Required"
 msgstr ""
 
-#: ../../mod/events.php:420
+#: ../../mod/events.php:423
 msgid "Finish date/time is not known or not relevant"
 msgstr ""
 
-#: ../../mod/events.php:422
+#: ../../mod/events.php:425
 msgid "Event Finishes:"
 msgstr ""
 
-#: ../../mod/events.php:425
+#: ../../mod/events.php:428
 msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../mod/events.php:427
+#: ../../mod/events.php:430
 msgid "Description:"
 msgstr ""
 
-#: ../../mod/events.php:429 ../../mod/directory.php:132
+#: ../../mod/events.php:432 ../../mod/directory.php:132
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:469
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:447
-#: ../../boot.php:1173
+#: ../../boot.php:1186
 msgid "Location:"
 msgstr ""
 
-#: ../../mod/events.php:431
+#: ../../mod/events.php:434
 msgid "Title:"
 msgstr ""
 
-#: ../../mod/events.php:433
+#: ../../mod/events.php:436
 msgid "Share this event"
 msgstr ""
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:845 ../../mod/settings.php:556
+#: ../../mod/dfrn_request.php:845 ../../mod/settings.php:538
-#: ../../mod/settings.php:582 ../../addon/js_upload/js_upload.php:45
+#: ../../mod/settings.php:564 ../../addon/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr ""
 
@@ -317,6 +319,7 @@ msgid "Select a tag to remove: "
 msgstr ""
 
 #: ../../mod/tagrm.php:93 ../../mod/delegate.php:130
+#: ../../addon/dav/common/wdcal_edit.inc.php:468
 msgid "Remove"
 msgstr ""
 
@@ -344,55 +347,55 @@ msgid ""
 msgstr ""
 
 #: ../../mod/api.php:105 ../../mod/dfrn_request.php:833
-#: ../../mod/settings.php:887 ../../mod/settings.php:893
+#: ../../mod/settings.php:874 ../../mod/settings.php:880
-#: ../../mod/settings.php:901 ../../mod/settings.php:905
+#: ../../mod/settings.php:888 ../../mod/settings.php:892
-#: ../../mod/settings.php:910 ../../mod/settings.php:916
+#: ../../mod/settings.php:897 ../../mod/settings.php:903
-#: ../../mod/settings.php:922 ../../mod/settings.php:928
+#: ../../mod/settings.php:909 ../../mod/settings.php:915
-#: ../../mod/settings.php:958 ../../mod/settings.php:959
+#: ../../mod/settings.php:945 ../../mod/settings.php:946
-#: ../../mod/settings.php:960 ../../mod/settings.php:961
+#: ../../mod/settings.php:947 ../../mod/settings.php:948
-#: ../../mod/settings.php:962 ../../mod/register.php:234
+#: ../../mod/settings.php:949 ../../mod/register.php:234
-#: ../../mod/profiles.php:554
+#: ../../mod/profiles.php:558
 msgid "Yes"
 msgstr ""
 
 #: ../../mod/api.php:106 ../../mod/dfrn_request.php:834
-#: ../../mod/settings.php:887 ../../mod/settings.php:893
+#: ../../mod/settings.php:874 ../../mod/settings.php:880
-#: ../../mod/settings.php:901 ../../mod/settings.php:905
+#: ../../mod/settings.php:888 ../../mod/settings.php:892
-#: ../../mod/settings.php:910 ../../mod/settings.php:916
+#: ../../mod/settings.php:897 ../../mod/settings.php:903
-#: ../../mod/settings.php:922 ../../mod/settings.php:928
+#: ../../mod/settings.php:909 ../../mod/settings.php:915
-#: ../../mod/settings.php:958 ../../mod/settings.php:959
+#: ../../mod/settings.php:945 ../../mod/settings.php:946
-#: ../../mod/settings.php:960 ../../mod/settings.php:961
+#: ../../mod/settings.php:947 ../../mod/settings.php:948
-#: ../../mod/settings.php:962 ../../mod/register.php:235
+#: ../../mod/settings.php:949 ../../mod/register.php:235
-#: ../../mod/profiles.php:555
+#: ../../mod/profiles.php:559
 msgid "No"
 msgstr ""
 
-#: ../../mod/photos.php:46 ../../boot.php:1590
+#: ../../mod/photos.php:46 ../../boot.php:1627
 msgid "Photo Albums"
 msgstr ""
 
-#: ../../mod/photos.php:54 ../../mod/photos.php:156 ../../mod/photos.php:971
+#: ../../mod/photos.php:54 ../../mod/photos.php:137 ../../mod/photos.php:952
-#: ../../mod/photos.php:1055 ../../mod/photos.php:1070
+#: ../../mod/photos.php:1034 ../../mod/photos.php:1049
-#: ../../mod/photos.php:1498 ../../mod/photos.php:1510
+#: ../../mod/photos.php:1474 ../../mod/photos.php:1486
 #: ../../addon/communityhome/communityhome.php:110
 #: ../../view/theme/diabook/theme.php:598
 msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/photos.php:61 ../../mod/photos.php:1080 ../../mod/photos.php:1548
+#: ../../mod/photos.php:61 ../../mod/photos.php:1059 ../../mod/photos.php:1524
 msgid "Upload New Photos"
 msgstr ""
 
-#: ../../mod/photos.php:72 ../../mod/settings.php:21
+#: ../../mod/photos.php:74 ../../mod/settings.php:23
 msgid "everybody"
 msgstr ""
 
-#: ../../mod/photos.php:145
+#: ../../mod/photos.php:126
 msgid "Contact information unavailable"
 msgstr ""
 
-#: ../../mod/photos.php:156 ../../mod/photos.php:660 ../../mod/photos.php:1055
+#: ../../mod/photos.php:137 ../../mod/photos.php:641 ../../mod/photos.php:1034
-#: ../../mod/photos.php:1070 ../../mod/profile_photo.php:60
+#: ../../mod/photos.php:1049 ../../mod/profile_photo.php:60
 #: ../../mod/profile_photo.php:67 ../../mod/profile_photo.php:74
 #: ../../mod/profile_photo.php:177 ../../mod/profile_photo.php:261
 #: ../../mod/profile_photo.php:270
@@ -402,217 +405,217 @@ msgstr ""
 msgid "Profile Photos"
 msgstr ""
 
-#: ../../mod/photos.php:166
+#: ../../mod/photos.php:147
 msgid "Album not found."
 msgstr ""
 
-#: ../../mod/photos.php:184 ../../mod/photos.php:1064
+#: ../../mod/photos.php:165 ../../mod/photos.php:1043
 msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/photos.php:247 ../../mod/photos.php:1310
+#: ../../mod/photos.php:228 ../../mod/photos.php:1286
 msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/photos.php:591
+#: ../../mod/photos.php:572
 msgid "was tagged in a"
 msgstr ""
 
-#: ../../mod/photos.php:591 ../../mod/like.php:145 ../../mod/tagger.php:70
+#: ../../mod/photos.php:572 ../../mod/like.php:145 ../../mod/tagger.php:70
 #: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1346
+#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1362
 #: ../../include/diaspora.php:1793 ../../include/conversation.php:114
-#: ../../include/conversation.php:187
+#: ../../include/conversation.php:230
 msgid "photo"
 msgstr ""
 
-#: ../../mod/photos.php:591
+#: ../../mod/photos.php:572
 msgid "by"
 msgstr ""
 
-#: ../../mod/photos.php:696 ../../addon/js_upload/js_upload.php:315
+#: ../../mod/photos.php:677 ../../addon/js_upload/js_upload.php:315
 msgid "Image exceeds size limit of "
 msgstr ""
 
-#: ../../mod/photos.php:704
+#: ../../mod/photos.php:685
 msgid "Image file is empty."
 msgstr ""
 
-#: ../../mod/photos.php:736 ../../mod/profile_photo.php:126
+#: ../../mod/photos.php:717 ../../mod/profile_photo.php:126
 #: ../../mod/wall_upload.php:99
 msgid "Unable to process image."
 msgstr ""
 
-#: ../../mod/photos.php:763 ../../mod/profile_photo.php:266
+#: ../../mod/photos.php:744 ../../mod/profile_photo.php:266
 #: ../../mod/wall_upload.php:125
 msgid "Image upload failed."
 msgstr ""
 
-#: ../../mod/photos.php:849 ../../mod/community.php:16
+#: ../../mod/photos.php:830 ../../mod/community.php:16
 #: ../../mod/dfrn_request.php:759 ../../mod/viewcontacts.php:17
 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
 msgid "Public access denied."
 msgstr ""
 
-#: ../../mod/photos.php:859
+#: ../../mod/photos.php:840
 msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/photos.php:938
+#: ../../mod/photos.php:919
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../mod/photos.php:1002
+#: ../../mod/photos.php:981
 #, php-format
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr ""
 
-#: ../../mod/photos.php:1005
+#: ../../mod/photos.php:984
 #, php-format
 msgid "You have used %1$.2f Mbytes of photo storage."
 msgstr ""
 
-#: ../../mod/photos.php:1011
+#: ../../mod/photos.php:990
 msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/photos.php:1015 ../../mod/photos.php:1059
+#: ../../mod/photos.php:994 ../../mod/photos.php:1038
 msgid "New album name: "
 msgstr ""
 
-#: ../../mod/photos.php:1016
+#: ../../mod/photos.php:995
 msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/photos.php:1017
+#: ../../mod/photos.php:996
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/photos.php:1019 ../../mod/photos.php:1305
+#: ../../mod/photos.php:998 ../../mod/photos.php:1281
 msgid "Permissions"
 msgstr ""
 
-#: ../../mod/photos.php:1074
+#: ../../mod/photos.php:1053
 msgid "Edit Album"
 msgstr ""
 
-#: ../../mod/photos.php:1098 ../../mod/photos.php:1531
+#: ../../mod/photos.php:1077 ../../mod/photos.php:1507
 msgid "View Photo"
 msgstr ""
 
-#: ../../mod/photos.php:1133
+#: ../../mod/photos.php:1112
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../mod/photos.php:1135
+#: ../../mod/photos.php:1114
 msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/photos.php:1185
+#: ../../mod/photos.php:1164
 msgid "View photo"
 msgstr ""
 
-#: ../../mod/photos.php:1185
+#: ../../mod/photos.php:1164
 msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/photos.php:1186
+#: ../../mod/photos.php:1165
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:1192 ../../mod/content.php:601
+#: ../../mod/photos.php:1171 ../../mod/content.php:601
-#: ../../include/conversation.php:563
+#: ../../include/conversation.php:606
 msgid "Private Message"
 msgstr ""
 
-#: ../../mod/photos.php:1214
+#: ../../mod/photos.php:1190
 msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/photos.php:1282
+#: ../../mod/photos.php:1258
 msgid "Tags: "
 msgstr ""
 
-#: ../../mod/photos.php:1285
+#: ../../mod/photos.php:1261
 msgid "[Remove any tag]"
 msgstr ""
 
-#: ../../mod/photos.php:1295
+#: ../../mod/photos.php:1271
 msgid "Rotate CW (right)"
 msgstr ""
 
-#: ../../mod/photos.php:1296
+#: ../../mod/photos.php:1272
 msgid "Rotate CCW (left)"
 msgstr ""
 
-#: ../../mod/photos.php:1298
+#: ../../mod/photos.php:1274
 msgid "New album name"
 msgstr ""
 
-#: ../../mod/photos.php:1301
+#: ../../mod/photos.php:1277
 msgid "Caption"
 msgstr ""
 
-#: ../../mod/photos.php:1303
+#: ../../mod/photos.php:1279
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/photos.php:1307
+#: ../../mod/photos.php:1283
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/photos.php:1327 ../../mod/content.php:665
+#: ../../mod/photos.php:1303 ../../mod/content.php:665
-#: ../../include/conversation.php:627
+#: ../../include/conversation.php:670
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1328 ../../mod/content.php:666
+#: ../../mod/photos.php:1304 ../../mod/content.php:666
-#: ../../include/conversation.php:628
+#: ../../include/conversation.php:671
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1329 ../../include/conversation.php:1066
+#: ../../mod/photos.php:1305 ../../include/conversation.php:1128
 msgid "Share"
 msgstr ""
 
-#: ../../mod/photos.php:1330 ../../mod/editpost.php:104
+#: ../../mod/photos.php:1306 ../../mod/editpost.php:112
 #: ../../mod/content.php:482 ../../mod/content.php:842
-#: ../../mod/wallmessage.php:145 ../../mod/message.php:293
+#: ../../mod/wallmessage.php:152 ../../mod/message.php:293
-#: ../../mod/message.php:474 ../../include/conversation.php:444
+#: ../../mod/message.php:479 ../../include/conversation.php:487
-#: ../../include/conversation.php:804 ../../include/conversation.php:1085
+#: ../../include/conversation.php:847 ../../include/conversation.php:1147
 msgid "Please wait"
 msgstr ""
 
-#: ../../mod/photos.php:1346 ../../mod/photos.php:1386
+#: ../../mod/photos.php:1322 ../../mod/photos.php:1362
-#: ../../mod/photos.php:1417 ../../mod/content.php:688
+#: ../../mod/photos.php:1393 ../../mod/content.php:688
-#: ../../include/conversation.php:650
+#: ../../include/conversation.php:693
 msgid "This is you"
 msgstr ""
 
-#: ../../mod/photos.php:1348 ../../mod/photos.php:1388
+#: ../../mod/photos.php:1324 ../../mod/photos.php:1364
-#: ../../mod/photos.php:1419 ../../mod/content.php:690
+#: ../../mod/photos.php:1395 ../../mod/content.php:690
-#: ../../include/conversation.php:652 ../../boot.php:565
+#: ../../include/conversation.php:695 ../../boot.php:569
 msgid "Comment"
 msgstr ""
 
-#: ../../mod/photos.php:1350 ../../mod/editpost.php:125
+#: ../../mod/photos.php:1326 ../../mod/editpost.php:133
-#: ../../mod/content.php:700 ../../include/conversation.php:662
+#: ../../mod/content.php:700 ../../include/conversation.php:705
-#: ../../include/conversation.php:1103
+#: ../../include/conversation.php:1165
 msgid "Preview"
 msgstr ""
 
-#: ../../mod/photos.php:1447 ../../mod/content.php:439
+#: ../../mod/photos.php:1423 ../../mod/content.php:439
-#: ../../mod/content.php:720 ../../mod/settings.php:618
+#: ../../mod/content.php:720 ../../mod/settings.php:600
-#: ../../mod/settings.php:707 ../../mod/group.php:168 ../../mod/admin.php:665
+#: ../../mod/settings.php:689 ../../mod/group.php:168 ../../mod/admin.php:668
-#: ../../include/conversation.php:401 ../../include/conversation.php:682
+#: ../../include/conversation.php:444 ../../include/conversation.php:725
 msgid "Delete"
 msgstr ""
 
-#: ../../mod/photos.php:1537
+#: ../../mod/photos.php:1513
 msgid "View Album"
 msgstr ""
 
-#: ../../mod/photos.php:1546
+#: ../../mod/photos.php:1522
 msgid "Recent Photos"
 msgstr ""
 
@@ -670,75 +673,79 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:80 ../../include/conversation.php:1052
+#: ../../mod/editpost.php:88 ../../include/conversation.php:1114
 msgid "Post to Email"
 msgstr ""
 
-#: ../../mod/editpost.php:95 ../../mod/content.php:707
+#: ../../mod/editpost.php:103 ../../mod/content.php:707
-#: ../../mod/settings.php:617 ../../include/conversation.php:669
+#: ../../mod/settings.php:599 ../../include/conversation.php:712
 msgid "Edit"
 msgstr ""
 
-#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
+#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
-#: ../../mod/message.php:291 ../../mod/message.php:471
+#: ../../mod/message.php:291 ../../mod/message.php:476
-#: ../../include/conversation.php:1067
+#: ../../include/conversation.php:1129
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:97 ../../include/conversation.php:1069
+#: ../../mod/editpost.php:105 ../../include/conversation.php:1131
 msgid "Attach file"
 msgstr ""
 
-#: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
+#: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151
-#: ../../mod/message.php:292 ../../mod/message.php:472
+#: ../../mod/message.php:292 ../../mod/message.php:477
-#: ../../include/conversation.php:1071
+#: ../../include/conversation.php:1133
 msgid "Insert web link"
 msgstr ""
 
-#: ../../mod/editpost.php:99
+#: ../../mod/editpost.php:107
 msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../mod/editpost.php:100
+#: ../../mod/editpost.php:108
 msgid "Insert Vorbis [.ogg] video"
 msgstr ""
 
-#: ../../mod/editpost.php:101
+#: ../../mod/editpost.php:109
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/editpost.php:102 ../../include/conversation.php:1077
+#: ../../mod/editpost.php:110 ../../include/conversation.php:1139
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:103 ../../include/conversation.php:1079
+#: ../../mod/editpost.php:111 ../../include/conversation.php:1141
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:1086
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1148
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:1095
+#: ../../mod/editpost.php:121 ../../include/conversation.php:1157
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:1096
+#: ../../mod/editpost.php:122 ../../include/conversation.php:1158
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:1082
+#: ../../mod/editpost.php:125 ../../include/conversation.php:1144
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:1084
+#: ../../mod/editpost.php:127 ../../include/conversation.php:1146
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/editpost.php:120 ../../include/conversation.php:1098
+#: ../../mod/editpost.php:128 ../../include/conversation.php:1160
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
+#: ../../mod/editpost.php:135 ../../include/conversation.php:1166
+msgid "Friendica mobile web"
+msgstr ""
+
 #: ../../mod/dfrn_request.php:93
 msgid "This introduction has already been accepted."
 msgstr ""
@@ -820,7 +827,7 @@ msgstr ""
 msgid "Disallowed profile URL."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:122
+#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:116
 msgid "Failed to update contact record."
 msgstr ""
 
@@ -856,7 +863,7 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:715 ../../include/items.php:2984
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:3204
 msgid "[Name Withheld]"
 msgstr ""
 
@@ -908,7 +915,7 @@ msgstr ""
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:839 ../../mod/settings.php:652
+#: ../../mod/dfrn_request.php:839 ../../mod/settings.php:634
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr ""
@@ -1182,7 +1189,7 @@ msgid ""
 msgstr ""
 
 #: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:447
+#: ../../include/bb2diaspora.php:425
 msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
@@ -1215,6 +1222,26 @@ msgstr ""
 msgid "Please select your timezone:"
 msgstr ""
 
+#: ../../mod/poke.php:163
+msgid "Poke/Prod"
+msgstr ""
+
+#: ../../mod/poke.php:164
+msgid "poke, prod or do other things to somebody"
+msgstr ""
+
+#: ../../mod/poke.php:165
+msgid "Recipient"
+msgstr ""
+
+#: ../../mod/poke.php:166
+msgid "Choose what you wish to do to recipient"
+msgstr ""
+
+#: ../../mod/poke.php:168
+msgid "Make this post private"
+msgstr ""
+
 #: ../../mod/match.php:12
 msgid "Profile Match"
 msgstr ""
@@ -1228,7 +1255,7 @@ msgid "is interested in:"
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1117
+#: ../../include/contact_widgets.php:9 ../../boot.php:1130
 msgid "Connect"
 msgstr ""
 
@@ -1257,28 +1284,28 @@ msgid "Group: "
 msgstr ""
 
 #: ../../mod/content.php:438 ../../mod/content.php:719
-#: ../../include/conversation.php:400 ../../include/conversation.php:681
+#: ../../include/conversation.php:443 ../../include/conversation.php:724
 msgid "Select"
 msgstr ""
 
 #: ../../mod/content.php:455 ../../mod/content.php:812
-#: ../../mod/content.php:813 ../../include/conversation.php:417
+#: ../../mod/content.php:813 ../../include/conversation.php:460
-#: ../../include/conversation.php:774 ../../include/conversation.php:775
+#: ../../include/conversation.php:817 ../../include/conversation.php:818
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
 #: ../../mod/content.php:465 ../../mod/content.php:824
-#: ../../include/conversation.php:427 ../../include/conversation.php:786
+#: ../../include/conversation.php:470 ../../include/conversation.php:829
 #, php-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../../mod/content.php:480 ../../include/conversation.php:442
+#: ../../mod/content.php:480 ../../include/conversation.php:485
 msgid "View in context"
 msgstr ""
 
-#: ../../mod/content.php:586 ../../include/conversation.php:548
+#: ../../mod/content.php:586 ../../include/conversation.php:591
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -1286,93 +1313,93 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../../mod/content.php:587 ../../addon/page/page.php:76
-#: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:87
+#: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:188 ../../include/conversation.php:549
+#: ../../include/contact_widgets.php:188 ../../include/conversation.php:592
-#: ../../boot.php:566
+#: ../../boot.php:570
 msgid "show more"
 msgstr ""
 
-#: ../../mod/content.php:665 ../../include/conversation.php:627
+#: ../../mod/content.php:665 ../../include/conversation.php:670
 msgid "like"
 msgstr ""
 
-#: ../../mod/content.php:666 ../../include/conversation.php:628
+#: ../../mod/content.php:666 ../../include/conversation.php:671
 msgid "dislike"
 msgstr ""
 
-#: ../../mod/content.php:668 ../../include/conversation.php:630
+#: ../../mod/content.php:668 ../../include/conversation.php:673
 msgid "Share this"
 msgstr ""
 
-#: ../../mod/content.php:668 ../../include/conversation.php:630
+#: ../../mod/content.php:668 ../../include/conversation.php:673
 msgid "share"
 msgstr ""
 
-#: ../../mod/content.php:692 ../../include/conversation.php:654
+#: ../../mod/content.php:692 ../../include/conversation.php:697
 msgid "Bold"
 msgstr ""
 
-#: ../../mod/content.php:693 ../../include/conversation.php:655
+#: ../../mod/content.php:693 ../../include/conversation.php:698
 msgid "Italic"
 msgstr ""
 
-#: ../../mod/content.php:694 ../../include/conversation.php:656
+#: ../../mod/content.php:694 ../../include/conversation.php:699
 msgid "Underline"
 msgstr ""
 
-#: ../../mod/content.php:695 ../../include/conversation.php:657
+#: ../../mod/content.php:695 ../../include/conversation.php:700
 msgid "Quote"
 msgstr ""
 
-#: ../../mod/content.php:696 ../../include/conversation.php:658
+#: ../../mod/content.php:696 ../../include/conversation.php:701
 msgid "Code"
 msgstr ""
 
-#: ../../mod/content.php:697 ../../include/conversation.php:659
+#: ../../mod/content.php:697 ../../include/conversation.php:702
 msgid "Image"
 msgstr ""
 
-#: ../../mod/content.php:698 ../../include/conversation.php:660
+#: ../../mod/content.php:698 ../../include/conversation.php:703
 msgid "Link"
 msgstr ""
 
-#: ../../mod/content.php:699 ../../include/conversation.php:661
+#: ../../mod/content.php:699 ../../include/conversation.php:704
 msgid "Video"
 msgstr ""
 
-#: ../../mod/content.php:732 ../../include/conversation.php:694
+#: ../../mod/content.php:732 ../../include/conversation.php:737
 msgid "add star"
 msgstr ""
 
-#: ../../mod/content.php:733 ../../include/conversation.php:695
+#: ../../mod/content.php:733 ../../include/conversation.php:738
 msgid "remove star"
 msgstr ""
 
-#: ../../mod/content.php:734 ../../include/conversation.php:696
+#: ../../mod/content.php:734 ../../include/conversation.php:739
 msgid "toggle star status"
 msgstr ""
 
-#: ../../mod/content.php:737 ../../include/conversation.php:699
+#: ../../mod/content.php:737 ../../include/conversation.php:742
 msgid "starred"
 msgstr ""
 
-#: ../../mod/content.php:738 ../../include/conversation.php:700
+#: ../../mod/content.php:738 ../../include/conversation.php:743
 msgid "add tag"
 msgstr ""
 
-#: ../../mod/content.php:742 ../../include/conversation.php:704
+#: ../../mod/content.php:742 ../../include/conversation.php:747
 msgid "save to folder"
 msgstr ""
 
-#: ../../mod/content.php:814 ../../include/conversation.php:776
+#: ../../mod/content.php:814 ../../include/conversation.php:819
 msgid "to"
 msgstr ""
 
-#: ../../mod/content.php:815 ../../include/conversation.php:777
+#: ../../mod/content.php:815 ../../include/conversation.php:820
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../mod/content.php:816 ../../include/conversation.php:778
+#: ../../mod/content.php:816 ../../include/conversation.php:821
 msgid "via Wall-To-Wall:"
 msgstr ""
 
@@ -1391,8 +1418,8 @@ msgid "Discard"
 msgstr ""
 
 #: ../../mod/notifications.php:51 ../../mod/notifications.php:160
-#: ../../mod/notifications.php:206 ../../mod/contacts.php:316
+#: ../../mod/notifications.php:206 ../../mod/contacts.php:314
-#: ../../mod/contacts.php:370
+#: ../../mod/contacts.php:368
 msgid "Ignore"
 msgstr ""
 
@@ -1417,7 +1444,7 @@ msgstr ""
 msgid "Introductions"
 msgstr ""
 
-#: ../../mod/notifications.php:100 ../../mod/message.php:183
+#: ../../mod/notifications.php:100 ../../mod/message.php:176
 #: ../../include/nav.php:128
 msgid "Messages"
 msgstr ""
@@ -1444,7 +1471,7 @@ msgid "suggested by %s"
 msgstr ""
 
 #: ../../mod/notifications.php:153 ../../mod/notifications.php:200
-#: ../../mod/contacts.php:376
+#: ../../mod/contacts.php:374
 msgid "Hide this contact from others"
 msgstr ""
 
@@ -1457,7 +1484,7 @@ msgid "if applicable"
 msgstr ""
 
 #: ../../mod/notifications.php:157 ../../mod/notifications.php:204
-#: ../../mod/admin.php:663
+#: ../../mod/admin.php:666
 msgid "Approve"
 msgstr ""
 
@@ -1566,307 +1593,307 @@ msgstr ""
 msgid "Home Notifications"
 msgstr ""
 
-#: ../../mod/contacts.php:83 ../../mod/contacts.php:163
+#: ../../mod/contacts.php:77 ../../mod/contacts.php:157
 msgid "Could not access contact record."
 msgstr ""
 
-#: ../../mod/contacts.php:97
+#: ../../mod/contacts.php:91
 msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../mod/contacts.php:120
+#: ../../mod/contacts.php:114
 msgid "Contact updated."
 msgstr ""
 
-#: ../../mod/contacts.php:185
+#: ../../mod/contacts.php:179
 msgid "Contact has been blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:185
+#: ../../mod/contacts.php:179
 msgid "Contact has been unblocked"
 msgstr ""
 
-#: ../../mod/contacts.php:199
+#: ../../mod/contacts.php:193
 msgid "Contact has been ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:199
+#: ../../mod/contacts.php:193
 msgid "Contact has been unignored"
 msgstr ""
 
-#: ../../mod/contacts.php:215
+#: ../../mod/contacts.php:209
 msgid "Contact has been archived"
 msgstr ""
 
-#: ../../mod/contacts.php:215
+#: ../../mod/contacts.php:209
 msgid "Contact has been unarchived"
 msgstr ""
 
-#: ../../mod/contacts.php:228
+#: ../../mod/contacts.php:222
 msgid "Contact has been removed."
 msgstr ""
 
-#: ../../mod/contacts.php:258
+#: ../../mod/contacts.php:256
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr ""
 
-#: ../../mod/contacts.php:262
+#: ../../mod/contacts.php:260
 #, php-format
 msgid "You are sharing with %s"
 msgstr ""
 
-#: ../../mod/contacts.php:267
+#: ../../mod/contacts.php:265
 #, php-format
 msgid "%s is sharing with you"
 msgstr ""
 
-#: ../../mod/contacts.php:284
+#: ../../mod/contacts.php:282
 msgid "Private communications are not available for this contact."
 msgstr ""
 
-#: ../../mod/contacts.php:287
+#: ../../mod/contacts.php:285
 msgid "Never"
 msgstr ""
 
-#: ../../mod/contacts.php:291
+#: ../../mod/contacts.php:289
 msgid "(Update was successful)"
 msgstr ""
 
-#: ../../mod/contacts.php:291
+#: ../../mod/contacts.php:289
 msgid "(Update was not successful)"
 msgstr ""
 
-#: ../../mod/contacts.php:293
+#: ../../mod/contacts.php:291
 msgid "Suggest friends"
 msgstr ""
 
-#: ../../mod/contacts.php:297
+#: ../../mod/contacts.php:295
 #, php-format
 msgid "Network type: %s"
 msgstr ""
 
-#: ../../mod/contacts.php:300 ../../include/contact_widgets.php:183
+#: ../../mod/contacts.php:298 ../../include/contact_widgets.php:183
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/contacts.php:305
+#: ../../mod/contacts.php:303
 msgid "View all contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:310 ../../mod/contacts.php:369
+#: ../../mod/contacts.php:308 ../../mod/contacts.php:367
-#: ../../mod/admin.php:667
+#: ../../mod/admin.php:670
 msgid "Unblock"
 msgstr ""
 
-#: ../../mod/contacts.php:310 ../../mod/contacts.php:369
+#: ../../mod/contacts.php:308 ../../mod/contacts.php:367
-#: ../../mod/admin.php:666
+#: ../../mod/admin.php:669
 msgid "Block"
 msgstr ""
 
-#: ../../mod/contacts.php:313
+#: ../../mod/contacts.php:311
 msgid "Toggle Blocked status"
 msgstr ""
 
-#: ../../mod/contacts.php:316 ../../mod/contacts.php:370
+#: ../../mod/contacts.php:314 ../../mod/contacts.php:368
 msgid "Unignore"
 msgstr ""
 
-#: ../../mod/contacts.php:319
+#: ../../mod/contacts.php:317
 msgid "Toggle Ignored status"
 msgstr ""
 
-#: ../../mod/contacts.php:323
+#: ../../mod/contacts.php:321
 msgid "Unarchive"
 msgstr ""
 
-#: ../../mod/contacts.php:323
+#: ../../mod/contacts.php:321
 msgid "Archive"
 msgstr ""
 
-#: ../../mod/contacts.php:326
+#: ../../mod/contacts.php:324
 msgid "Toggle Archive status"
 msgstr ""
 
-#: ../../mod/contacts.php:329
+#: ../../mod/contacts.php:327
 msgid "Repair"
 msgstr ""
 
-#: ../../mod/contacts.php:332
+#: ../../mod/contacts.php:330
 msgid "Advanced Contact Settings"
 msgstr ""
 
-#: ../../mod/contacts.php:338
+#: ../../mod/contacts.php:336
 msgid "Communications lost with this contact!"
 msgstr ""
 
-#: ../../mod/contacts.php:341
+#: ../../mod/contacts.php:339
 msgid "Contact Editor"
 msgstr ""
 
-#: ../../mod/contacts.php:344
+#: ../../mod/contacts.php:342
 msgid "Profile Visibility"
 msgstr ""
 
-#: ../../mod/contacts.php:345
+#: ../../mod/contacts.php:343
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
-#: ../../mod/contacts.php:346
+#: ../../mod/contacts.php:344
 msgid "Contact Information / Notes"
 msgstr ""
 
-#: ../../mod/contacts.php:347
+#: ../../mod/contacts.php:345
 msgid "Edit contact notes"
 msgstr ""
 
-#: ../../mod/contacts.php:352 ../../mod/contacts.php:544
+#: ../../mod/contacts.php:350 ../../mod/contacts.php:542
 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: ../../mod/contacts.php:353
+#: ../../mod/contacts.php:351
 msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../mod/contacts.php:354
+#: ../../mod/contacts.php:352
 msgid "Ignore contact"
 msgstr ""
 
-#: ../../mod/contacts.php:355
+#: ../../mod/contacts.php:353
 msgid "Repair URL settings"
 msgstr ""
 
-#: ../../mod/contacts.php:356
+#: ../../mod/contacts.php:354
 msgid "View conversations"
 msgstr ""
 
-#: ../../mod/contacts.php:358
+#: ../../mod/contacts.php:356
 msgid "Delete contact"
 msgstr ""
 
-#: ../../mod/contacts.php:362
+#: ../../mod/contacts.php:360
 msgid "Last update:"
 msgstr ""
 
-#: ../../mod/contacts.php:364
+#: ../../mod/contacts.php:362
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/contacts.php:366 ../../mod/admin.php:1138
+#: ../../mod/contacts.php:364 ../../mod/admin.php:1141
 msgid "Update now"
 msgstr ""
 
-#: ../../mod/contacts.php:373
+#: ../../mod/contacts.php:371
 msgid "Currently blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:374
+#: ../../mod/contacts.php:372
 msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:375
+#: ../../mod/contacts.php:373
 msgid "Currently archived"
 msgstr ""
 
-#: ../../mod/contacts.php:376
+#: ../../mod/contacts.php:374
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
-#: ../../mod/contacts.php:429
+#: ../../mod/contacts.php:427
 msgid "Suggestions"
 msgstr ""
 
-#: ../../mod/contacts.php:432
+#: ../../mod/contacts.php:430
 msgid "Suggest potential friends"
 msgstr ""
 
-#: ../../mod/contacts.php:435 ../../mod/group.php:191
+#: ../../mod/contacts.php:433 ../../mod/group.php:191
 msgid "All Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:438
+#: ../../mod/contacts.php:436
 msgid "Show all contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:441
+#: ../../mod/contacts.php:439
 msgid "Unblocked"
 msgstr ""
 
-#: ../../mod/contacts.php:444
+#: ../../mod/contacts.php:442
 msgid "Only show unblocked contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:448
+#: ../../mod/contacts.php:446
 msgid "Blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:451
+#: ../../mod/contacts.php:449
 msgid "Only show blocked contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:455
+#: ../../mod/contacts.php:453
 msgid "Ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:458
+#: ../../mod/contacts.php:456
 msgid "Only show ignored contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:462
+#: ../../mod/contacts.php:460
 msgid "Archived"
 msgstr ""
 
-#: ../../mod/contacts.php:465
+#: ../../mod/contacts.php:463
 msgid "Only show archived contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:469
+#: ../../mod/contacts.php:467
 msgid "Hidden"
 msgstr ""
 
-#: ../../mod/contacts.php:472
+#: ../../mod/contacts.php:470
 msgid "Only show hidden contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:520
+#: ../../mod/contacts.php:518
 msgid "Mutual Friendship"
 msgstr ""
 
-#: ../../mod/contacts.php:524
+#: ../../mod/contacts.php:522
 msgid "is a fan of yours"
 msgstr ""
 
-#: ../../mod/contacts.php:528
+#: ../../mod/contacts.php:526
 msgid "you are a fan of"
 msgstr ""
 
-#: ../../mod/contacts.php:545 ../../mod/nogroup.php:41
+#: ../../mod/contacts.php:543 ../../mod/nogroup.php:41
 msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/contacts.php:566 ../../view/theme/diabook/theme.php:129
+#: ../../mod/contacts.php:564 ../../view/theme/diabook/theme.php:129
 #: ../../include/nav.php:139
 msgid "Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:570
+#: ../../mod/contacts.php:568
 msgid "Search your contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:571 ../../mod/directory.php:57
+#: ../../mod/contacts.php:569 ../../mod/directory.php:57
 msgid "Finding: "
 msgstr ""
 
-#: ../../mod/contacts.php:572 ../../mod/directory.php:59
+#: ../../mod/contacts.php:570 ../../mod/directory.php:59
 #: ../../include/contact_widgets.php:33
 msgid "Find"
 msgstr ""
@@ -1888,10 +1915,10 @@ msgstr ""
 #: ../../mod/register.php:90 ../../mod/register.php:144
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
 #: ../../addon/facebook/facebook.php:702
-#: ../../addon/facebook/facebook.php:1192
+#: ../../addon/facebook/facebook.php:1200
 #: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2993
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3213
-#: ../../boot.php:767
+#: ../../boot.php:779
 msgid "Administrator"
 msgstr ""
 
@@ -1901,7 +1928,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:83 ../../boot.php:899
+#: ../../mod/lostpass.php:83 ../../boot.php:912
 msgid "Password Reset"
 msgstr ""
 
@@ -1945,524 +1972,529 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: ../../mod/settings.php:50 ../../include/nav.php:137
+#: ../../mod/settings.php:30 ../../include/nav.php:137
 msgid "Account settings"
 msgstr ""
 
-#: ../../mod/settings.php:55
+#: ../../mod/settings.php:35
 msgid "Display settings"
 msgstr ""
 
-#: ../../mod/settings.php:61
+#: ../../mod/settings.php:41
 msgid "Connector settings"
 msgstr ""
 
-#: ../../mod/settings.php:66
+#: ../../mod/settings.php:46
 msgid "Plugin settings"
 msgstr ""
 
-#: ../../mod/settings.php:71
+#: ../../mod/settings.php:51
 msgid "Connected apps"
 msgstr ""
 
-#: ../../mod/settings.php:76
+#: ../../mod/settings.php:56
 msgid "Export personal data"
 msgstr ""
 
-#: ../../mod/settings.php:81
+#: ../../mod/settings.php:61
 msgid "Remove account"
 msgstr ""
 
-#: ../../mod/settings.php:89 ../../mod/admin.php:753 ../../mod/admin.php:958
+#: ../../mod/settings.php:69 ../../mod/admin.php:756 ../../mod/admin.php:961
-#: ../../addon/dav/layout.fnk.php:116 ../../addon/mathjax/mathjax.php:36
+#: ../../addon/dav/layout.fnk.php:225 ../../addon/mathjax/mathjax.php:36
 #: ../../view/theme/diabook/theme.php:643
 #: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137
 msgid "Settings"
 msgstr ""
 
-#: ../../mod/settings.php:133
+#: ../../mod/settings.php:113
 msgid "Missing some important data!"
 msgstr ""
 
-#: ../../mod/settings.php:136 ../../mod/settings.php:581
+#: ../../mod/settings.php:116 ../../mod/settings.php:563
 msgid "Update"
 msgstr ""
 
-#: ../../mod/settings.php:241
+#: ../../mod/settings.php:221
 msgid "Failed to connect with email account using the settings provided."
 msgstr ""
 
-#: ../../mod/settings.php:246
+#: ../../mod/settings.php:226
 msgid "Email settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:305
+#: ../../mod/settings.php:285
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:310
+#: ../../mod/settings.php:290
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:321
+#: ../../mod/settings.php:301
 msgid "Password changed."
 msgstr ""
 
-#: ../../mod/settings.php:323
+#: ../../mod/settings.php:303
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:386
+#: ../../mod/settings.php:368
 msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/settings.php:388
+#: ../../mod/settings.php:370
 msgid " Name too short."
 msgstr ""
 
-#: ../../mod/settings.php:394
+#: ../../mod/settings.php:376
 msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:396
+#: ../../mod/settings.php:378
 msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:450
+#: ../../mod/settings.php:432
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:454
+#: ../../mod/settings.php:436
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:484 ../../addon/facebook/facebook.php:495
+#: ../../mod/settings.php:466 ../../addon/facebook/facebook.php:495
 #: ../../addon/impressum/impressum.php:77
 #: ../../addon/openstreetmap/openstreetmap.php:80
 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
-#: ../../addon/twitter/twitter.php:382
+#: ../../addon/twitter/twitter.php:389
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:554 ../../mod/settings.php:580
+#: ../../mod/settings.php:536 ../../mod/settings.php:562
-#: ../../mod/settings.php:616
+#: ../../mod/settings.php:598
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:558 ../../mod/settings.php:584
+#: ../../mod/settings.php:540 ../../mod/settings.php:566
-#: ../../addon/statusnet/statusnet.php:561
+#: ../../addon/statusnet/statusnet.php:570
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/settings.php:559 ../../mod/settings.php:585
+#: ../../mod/settings.php:541 ../../mod/settings.php:567
-#: ../../addon/statusnet/statusnet.php:560
+#: ../../addon/statusnet/statusnet.php:569
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/settings.php:560 ../../mod/settings.php:586
+#: ../../mod/settings.php:542 ../../mod/settings.php:568
 msgid "Redirect"
 msgstr ""
 
-#: ../../mod/settings.php:561 ../../mod/settings.php:587
+#: ../../mod/settings.php:543 ../../mod/settings.php:569
 msgid "Icon url"
 msgstr ""
 
-#: ../../mod/settings.php:572
+#: ../../mod/settings.php:554
 msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/settings.php:615
+#: ../../mod/settings.php:597
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/settings.php:619
+#: ../../mod/settings.php:601
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:620
+#: ../../mod/settings.php:602
 msgid "No name"
 msgstr ""
 
-#: ../../mod/settings.php:621
+#: ../../mod/settings.php:603
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/settings.php:632
+#: ../../mod/settings.php:614
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:640 ../../addon/widgets/widgets.php:123
+#: ../../mod/settings.php:622 ../../addon/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:652 ../../mod/settings.php:653
+#: ../../mod/settings.php:634 ../../mod/settings.php:635
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: ../../mod/settings.php:652 ../../mod/settings.php:653
+#: ../../mod/settings.php:634 ../../mod/settings.php:635
 msgid "enabled"
 msgstr ""
 
-#: ../../mod/settings.php:652 ../../mod/settings.php:653
+#: ../../mod/settings.php:634 ../../mod/settings.php:635
 msgid "disabled"
 msgstr ""
 
-#: ../../mod/settings.php:653
+#: ../../mod/settings.php:635
 msgid "StatusNet"
 msgstr ""
 
-#: ../../mod/settings.php:685
+#: ../../mod/settings.php:667
 msgid "Email access is disabled on this site."
 msgstr ""
 
-#: ../../mod/settings.php:691
+#: ../../mod/settings.php:673
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/settings.php:696
+#: ../../mod/settings.php:678
 msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: ../../mod/settings.php:697
+#: ../../mod/settings.php:679
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr ""
 
-#: ../../mod/settings.php:698
+#: ../../mod/settings.php:680
 msgid "Last successful email check:"
 msgstr ""
 
-#: ../../mod/settings.php:700
+#: ../../mod/settings.php:682
 msgid "IMAP server name:"
 msgstr ""
 
-#: ../../mod/settings.php:701
+#: ../../mod/settings.php:683
 msgid "IMAP port:"
 msgstr ""
 
-#: ../../mod/settings.php:702
+#: ../../mod/settings.php:684
 msgid "Security:"
 msgstr ""
 
-#: ../../mod/settings.php:702 ../../mod/settings.php:707
+#: ../../mod/settings.php:684 ../../mod/settings.php:689
+#: ../../addon/dav/common/wdcal_edit.inc.php:191
 msgid "None"
 msgstr ""
 
-#: ../../mod/settings.php:703
+#: ../../mod/settings.php:685
 msgid "Email login name:"
 msgstr ""
 
-#: ../../mod/settings.php:704
+#: ../../mod/settings.php:686
 msgid "Email password:"
 msgstr ""
 
-#: ../../mod/settings.php:705
+#: ../../mod/settings.php:687
 msgid "Reply-to address:"
 msgstr ""
 
-#: ../../mod/settings.php:706
+#: ../../mod/settings.php:688
 msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: ../../mod/settings.php:707
+#: ../../mod/settings.php:689
 msgid "Action after import:"
 msgstr ""
 
-#: ../../mod/settings.php:707
+#: ../../mod/settings.php:689
 msgid "Mark as seen"
 msgstr ""
 
-#: ../../mod/settings.php:707
+#: ../../mod/settings.php:689
 msgid "Move to folder"
 msgstr ""
 
-#: ../../mod/settings.php:708
+#: ../../mod/settings.php:690
 msgid "Move to folder:"
 msgstr ""
 
-#: ../../mod/settings.php:768
+#: ../../mod/settings.php:750
 msgid "Display Settings"
 msgstr ""
 
-#: ../../mod/settings.php:774
+#: ../../mod/settings.php:756 ../../mod/settings.php:766
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:775
+#: ../../mod/settings.php:757
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/settings.php:775
+#: ../../mod/settings.php:757
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/settings.php:776
+#: ../../mod/settings.php:758
 msgid "Number of items to display on the network page:"
 msgstr ""
 
-#: ../../mod/settings.php:776
+#: ../../mod/settings.php:758
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../mod/settings.php:777
+#: ../../mod/settings.php:759
 msgid "Don't show emoticons"
 msgstr ""
 
-#: ../../mod/settings.php:848
+#: ../../mod/settings.php:835
 msgid "Normal Account Page"
 msgstr ""
 
-#: ../../mod/settings.php:849
+#: ../../mod/settings.php:836
 msgid "This account is a normal personal profile"
 msgstr ""
 
-#: ../../mod/settings.php:852
+#: ../../mod/settings.php:839
 msgid "Soapbox Page"
 msgstr ""
 
-#: ../../mod/settings.php:853
+#: ../../mod/settings.php:840
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: ../../mod/settings.php:856
+#: ../../mod/settings.php:843
 msgid "Community Forum/Celebrity Account"
 msgstr ""
 
-#: ../../mod/settings.php:857
+#: ../../mod/settings.php:844
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: ../../mod/settings.php:860
+#: ../../mod/settings.php:847
 msgid "Automatic Friend Page"
 msgstr ""
 
-#: ../../mod/settings.php:861
+#: ../../mod/settings.php:848
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: ../../mod/settings.php:864
+#: ../../mod/settings.php:851
 msgid "Private Forum [Experimental]"
 msgstr ""
 
-#: ../../mod/settings.php:865
+#: ../../mod/settings.php:852
 msgid "Private forum - approved members only"
 msgstr ""
 
-#: ../../mod/settings.php:877
+#: ../../mod/settings.php:864
 msgid "OpenID:"
 msgstr ""
 
-#: ../../mod/settings.php:877
+#: ../../mod/settings.php:864
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:887
+#: ../../mod/settings.php:874
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: ../../mod/settings.php:893
+#: ../../mod/settings.php:880
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: ../../mod/settings.php:901
+#: ../../mod/settings.php:888
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: ../../mod/settings.php:905
+#: ../../mod/settings.php:892
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: ../../mod/settings.php:910
+#: ../../mod/settings.php:897
 msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: ../../mod/settings.php:916
+#: ../../mod/settings.php:903
 msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: ../../mod/settings.php:922
+#: ../../mod/settings.php:909
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:928
+#: ../../mod/settings.php:915
 msgid "Permit unknown people to send you private mail?"
 msgstr ""
 
-#: ../../mod/settings.php:936
+#: ../../mod/settings.php:923
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:939 ../../mod/profile_photo.php:214
+#: ../../mod/settings.php:926 ../../mod/profile_photo.php:214
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:944
+#: ../../mod/settings.php:931
 msgid "Your Identity Address is"
 msgstr ""
 
-#: ../../mod/settings.php:955
+#: ../../mod/settings.php:942
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: ../../mod/settings.php:955
+#: ../../mod/settings.php:942
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: ../../mod/settings.php:956
+#: ../../mod/settings.php:943
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: ../../mod/settings.php:957
+#: ../../mod/settings.php:944
 msgid "Advanced Expiration"
 msgstr ""
 
-#: ../../mod/settings.php:958
+#: ../../mod/settings.php:945
 msgid "Expire posts:"
 msgstr ""
 
-#: ../../mod/settings.php:959
+#: ../../mod/settings.php:946
 msgid "Expire personal notes:"
 msgstr ""
 
-#: ../../mod/settings.php:960
+#: ../../mod/settings.php:947
 msgid "Expire starred posts:"
 msgstr ""
 
-#: ../../mod/settings.php:961
+#: ../../mod/settings.php:948
 msgid "Expire photos:"
 msgstr ""
 
-#: ../../mod/settings.php:962
+#: ../../mod/settings.php:949
 msgid "Only expire posts by others:"
 msgstr ""
 
-#: ../../mod/settings.php:969
+#: ../../mod/settings.php:956
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:977
+#: ../../mod/settings.php:964
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:978
+#: ../../mod/settings.php:965
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:979
+#: ../../mod/settings.php:966
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:979
+#: ../../mod/settings.php:966
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:983
+#: ../../mod/settings.php:970
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:984 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:971 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr ""
 
-#: ../../mod/settings.php:985
+#: ../../mod/settings.php:972
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:986
+#: ../../mod/settings.php:973
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:987
+#: ../../mod/settings.php:974
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:988
+#: ../../mod/settings.php:975
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:991
+#: ../../mod/settings.php:978
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:993
+#: ../../mod/settings.php:980
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:993 ../../mod/settings.php:1012
+#: ../../mod/settings.php:980 ../../mod/settings.php:999
 msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: ../../mod/settings.php:994
+#: ../../mod/settings.php:981
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:995
+#: ../../mod/settings.php:982
 msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/settings.php:1012
+#: ../../mod/settings.php:999
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/settings.php:1015
+#: ../../mod/settings.php:1002
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1016
+#: ../../mod/settings.php:1003
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/settings.php:1017
+#: ../../mod/settings.php:1004
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/settings.php:1018
+#: ../../mod/settings.php:1005
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/settings.php:1019
+#: ../../mod/settings.php:1006
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../mod/settings.php:1020
+#: ../../mod/settings.php:1007
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:1021
+#: ../../mod/settings.php:1008
 msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/settings.php:1022
+#: ../../mod/settings.php:1009
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:1023
+#: ../../mod/settings.php:1010
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:1024
+#: ../../mod/settings.php:1011
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1012
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:1026
+#: ../../mod/settings.php:1013
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:1027
+#: ../../mod/settings.php:1014
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1030
+#: ../../mod/settings.php:1015
+msgid "You are poked/prodded/etc. in a post"
+msgstr ""
+
+#: ../../mod/settings.php:1018
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1031
+#: ../../mod/settings.php:1019
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
@@ -2564,14 +2596,15 @@ msgstr ""
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1602
+#: ../../mod/notes.php:44 ../../boot.php:1641
 msgid "Personal Notes"
 msgstr ""
 
 #: ../../mod/notes.php:63 ../../mod/filer.php:30
 #: ../../addon/facebook/facebook.php:770
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:187
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:236
-#: ../../addon/dav/layout.fnk.php:384 ../../include/text.php:677
+#: ../../addon/dav/layout.fnk.php:441 ../../addon/dav/layout.fnk.php:488
+#: ../../include/text.php:677
 msgid "Save"
 msgstr ""
 
@@ -2580,7 +2613,7 @@ msgstr ""
 msgid "Number of daily wall messages for %s exceeded. Message failed."
 msgstr ""
 
-#: ../../mod/wallmessage.php:56 ../../mod/message.php:66
+#: ../../mod/wallmessage.php:56 ../../mod/message.php:59
 msgid "No recipient selected."
 msgstr ""
 
@@ -2588,15 +2621,15 @@ msgstr ""
 msgid "Unable to check your home location."
 msgstr ""
 
-#: ../../mod/wallmessage.php:62 ../../mod/message.php:73
+#: ../../mod/wallmessage.php:62 ../../mod/message.php:66
 msgid "Message could not be sent."
 msgstr ""
 
-#: ../../mod/wallmessage.php:65 ../../mod/message.php:76
+#: ../../mod/wallmessage.php:65 ../../mod/message.php:69
 msgid "Message collection failure."
 msgstr ""
 
-#: ../../mod/wallmessage.php:68 ../../mod/message.php:79
+#: ../../mod/wallmessage.php:68 ../../mod/message.php:72
 msgid "Message sent."
 msgstr ""
 
@@ -2604,34 +2637,35 @@ msgstr ""
 msgid "No recipient."
 msgstr ""
 
-#: ../../mod/wallmessage.php:124 ../../mod/message.php:250
+#: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
-#: ../../include/conversation.php:1020
+#: ../../mod/message.php:242 ../../mod/message.php:250
+#: ../../include/conversation.php:1065 ../../include/conversation.php:1082
 msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../mod/wallmessage.php:131 ../../mod/message.php:278
+#: ../../mod/wallmessage.php:138 ../../mod/message.php:278
 msgid "Send Private Message"
 msgstr ""
 
-#: ../../mod/wallmessage.php:132
+#: ../../mod/wallmessage.php:139
 #, php-format
 msgid ""
 "If you wish for %s to respond, please check that the privacy settings on "
 "your site allow private mail from unknown senders."
 msgstr ""
 
-#: ../../mod/wallmessage.php:133 ../../mod/message.php:279
+#: ../../mod/wallmessage.php:140 ../../mod/message.php:279
-#: ../../mod/message.php:462
+#: ../../mod/message.php:467
 msgid "To:"
 msgstr ""
 
-#: ../../mod/wallmessage.php:134 ../../mod/message.php:284
+#: ../../mod/wallmessage.php:141 ../../mod/message.php:284
-#: ../../mod/message.php:464
+#: ../../mod/message.php:469
 msgid "Subject:"
 msgstr ""
 
-#: ../../mod/wallmessage.php:140 ../../mod/message.php:288
+#: ../../mod/wallmessage.php:147 ../../mod/message.php:288
-#: ../../mod/message.php:467 ../../mod/invite.php:113
+#: ../../mod/message.php:472 ../../mod/invite.php:113
 msgid "Your message:"
 msgstr ""
 
@@ -2773,7 +2807,7 @@ msgstr ""
 msgid "Group name changed."
 msgstr ""
 
-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:308
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:314
 msgid "Permission denied"
 msgstr ""
 
@@ -2815,7 +2849,7 @@ msgstr ""
 
 #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
-#: ../../include/nav.php:50 ../../boot.php:1581
+#: ../../include/nav.php:50 ../../boot.php:1617
 msgid "Profile"
 msgstr ""
 
@@ -2919,7 +2953,7 @@ msgstr ""
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:865
+#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:878
 msgid "Register"
 msgstr ""
 
@@ -2928,17 +2962,17 @@ msgid "People Search"
 msgstr ""
 
 #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1586
+#: ../../addon/facebook/facebook.php:1594
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
 #: ../../view/theme/diabook/theme.php:565
 #: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1793
 #: ../../include/conversation.php:109 ../../include/conversation.php:118
-#: ../../include/conversation.php:182 ../../include/conversation.php:191
+#: ../../include/conversation.php:225 ../../include/conversation.php:234
 msgid "status"
 msgstr ""
 
-#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1590
+#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1598
 #: ../../addon/communityhome/communityhome.php:172
 #: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1809
 #: ../../include/conversation.php:126
@@ -2952,8 +2986,8 @@ msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
-#: ../../mod/admin.php:702 ../../mod/admin.php:901 ../../mod/display.php:37
+#: ../../mod/admin.php:705 ../../mod/admin.php:904 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3472
+#: ../../mod/display.php:142 ../../include/items.php:3692
 msgid "Item not found."
 msgstr ""
 
@@ -2962,7 +2996,7 @@ msgid "Access denied."
 msgstr ""
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
-#: ../../include/nav.php:51 ../../boot.php:1587
+#: ../../include/nav.php:51 ../../boot.php:1624
 msgid "Photos"
 msgstr ""
 
@@ -3056,7 +3090,7 @@ msgstr ""
 msgid "Upload Profile Photo"
 msgstr ""
 
-#: ../../mod/profile_photo.php:212
+#: ../../mod/profile_photo.php:212 ../../addon/dav/layout.fnk.php:152
 msgid "Upload"
 msgstr ""
 
@@ -3106,15 +3140,15 @@ msgstr ""
 msgid "New Message"
 msgstr ""
 
-#: ../../mod/message.php:70
+#: ../../mod/message.php:63
 msgid "Unable to locate contact information."
 msgstr ""
 
-#: ../../mod/message.php:198
+#: ../../mod/message.php:191
 msgid "Message deleted."
 msgstr ""
 
-#: ../../mod/message.php:228
+#: ../../mod/message.php:221
 msgid "Conversation removed."
 msgstr ""
 
@@ -3137,7 +3171,7 @@ msgstr ""
 msgid "%s and You"
 msgstr ""
 
-#: ../../mod/message.php:350 ../../mod/message.php:455
+#: ../../mod/message.php:350 ../../mod/message.php:460
 msgid "Delete conversation"
 msgstr ""
 
@@ -3156,17 +3190,17 @@ msgstr[1] ""
 msgid "Message not available."
 msgstr ""
 
-#: ../../mod/message.php:438
+#: ../../mod/message.php:443
 msgid "Delete message"
 msgstr ""
 
-#: ../../mod/message.php:457
+#: ../../mod/message.php:462
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr ""
 
-#: ../../mod/message.php:461
+#: ../../mod/message.php:466
 msgid "Send Reply"
 msgstr ""
 
@@ -3187,15 +3221,15 @@ msgstr ""
 msgid "Site"
 msgstr ""
 
-#: ../../mod/admin.php:97 ../../mod/admin.php:657 ../../mod/admin.php:669
+#: ../../mod/admin.php:97 ../../mod/admin.php:660 ../../mod/admin.php:672
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:98 ../../mod/admin.php:751 ../../mod/admin.php:793
+#: ../../mod/admin.php:98 ../../mod/admin.php:754 ../../mod/admin.php:796
 msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:99 ../../mod/admin.php:956 ../../mod/admin.php:992
+#: ../../mod/admin.php:99 ../../mod/admin.php:959 ../../mod/admin.php:995
 msgid "Themes"
 msgstr ""
 
@@ -3203,7 +3237,7 @@ msgstr ""
 msgid "DB updates"
 msgstr ""
 
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1079
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1082
 msgid "Logs"
 msgstr ""
 
@@ -3219,19 +3253,19 @@ msgstr ""
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../mod/admin.php:183 ../../mod/admin.php:639
+#: ../../mod/admin.php:183 ../../mod/admin.php:642
 msgid "Normal Account"
 msgstr ""
 
-#: ../../mod/admin.php:184 ../../mod/admin.php:640
+#: ../../mod/admin.php:184 ../../mod/admin.php:643
 msgid "Soapbox Account"
 msgstr ""
 
-#: ../../mod/admin.php:185 ../../mod/admin.php:641
+#: ../../mod/admin.php:185 ../../mod/admin.php:644
 msgid "Community/Celebrity Account"
 msgstr ""
 
-#: ../../mod/admin.php:186 ../../mod/admin.php:642
+#: ../../mod/admin.php:186 ../../mod/admin.php:645
 msgid "Automatic Friend Account"
 msgstr ""
 
@@ -3247,9 +3281,9 @@ msgstr ""
 msgid "Message queues"
 msgstr ""
 
-#: ../../mod/admin.php:212 ../../mod/admin.php:420 ../../mod/admin.php:656
+#: ../../mod/admin.php:212 ../../mod/admin.php:420 ../../mod/admin.php:659
-#: ../../mod/admin.php:750 ../../mod/admin.php:792 ../../mod/admin.php:955
+#: ../../mod/admin.php:753 ../../mod/admin.php:795 ../../mod/admin.php:958
-#: ../../mod/admin.php:991 ../../mod/admin.php:1078
+#: ../../mod/admin.php:994 ../../mod/admin.php:1081
 msgid "Administration"
 msgstr ""
 
@@ -3313,7 +3347,7 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
-#: ../../mod/admin.php:430 ../../addon/statusnet/statusnet.php:558
+#: ../../mod/admin.php:430 ../../addon/statusnet/statusnet.php:567
 msgid "Site name"
 msgstr ""
 
@@ -3554,226 +3588,226 @@ msgid ""
 "default 50."
 msgstr ""
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:477
 msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../mod/admin.php:484
-#, php-format
-msgid "Executing %s failed. Check system logs."
-msgstr ""
-
 #: ../../mod/admin.php:487
 #, php-format
-msgid "Update %s was successfully applied."
+msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../mod/admin.php:491
+#: ../../mod/admin.php:490
 #, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
+msgid "Update %s was successfully applied."
 msgstr ""
 
 #: ../../mod/admin.php:494
 #, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr ""
+
+#: ../../mod/admin.php:497
+#, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../mod/admin.php:509
+#: ../../mod/admin.php:512
 msgid "No failed updates."
 msgstr ""
 
-#: ../../mod/admin.php:513
+#: ../../mod/admin.php:516
 msgid "Failed Updates"
 msgstr ""
 
-#: ../../mod/admin.php:514
+#: ../../mod/admin.php:517
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr ""
 
-#: ../../mod/admin.php:515
+#: ../../mod/admin.php:518
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../mod/admin.php:516
+#: ../../mod/admin.php:519
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../mod/admin.php:541
+#: ../../mod/admin.php:544
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:548
+#: ../../mod/admin.php:551
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:587
+#: ../../mod/admin.php:590
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:595
+#: ../../mod/admin.php:598
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:595
+#: ../../mod/admin.php:598
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:659
+#: ../../mod/admin.php:662
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:660
+#: ../../mod/admin.php:663
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:661
+#: ../../mod/admin.php:664
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:661 ../../mod/admin.php:670
+#: ../../mod/admin.php:664 ../../mod/admin.php:673
 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr ""
 
-#: ../../mod/admin.php:662
+#: ../../mod/admin.php:665
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:664
+#: ../../mod/admin.php:667
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:670
+#: ../../mod/admin.php:673
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:670
+#: ../../mod/admin.php:673
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:670
+#: ../../mod/admin.php:673
 msgid "Last item"
 msgstr ""
 
-#: ../../mod/admin.php:670
+#: ../../mod/admin.php:673
 msgid "Account"
 msgstr ""
 
-#: ../../mod/admin.php:672
+#: ../../mod/admin.php:675
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:673
+#: ../../mod/admin.php:676
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:714
+#: ../../mod/admin.php:717
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:718
+#: ../../mod/admin.php:721
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:728 ../../mod/admin.php:926
+#: ../../mod/admin.php:731 ../../mod/admin.php:929
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:730 ../../mod/admin.php:928
+#: ../../mod/admin.php:733 ../../mod/admin.php:931
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:752 ../../mod/admin.php:957
+#: ../../mod/admin.php:755 ../../mod/admin.php:960
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:760 ../../mod/admin.php:967
+#: ../../mod/admin.php:763 ../../mod/admin.php:970
 msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:761 ../../mod/admin.php:968
+#: ../../mod/admin.php:764 ../../mod/admin.php:971
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:890
+#: ../../mod/admin.php:893
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:949
+#: ../../mod/admin.php:952
 msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/admin.php:997
+#: ../../mod/admin.php:1000
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:998
+#: ../../mod/admin.php:1001
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:1025
+#: ../../mod/admin.php:1028
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:1081
+#: ../../mod/admin.php:1084
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:1087
+#: ../../mod/admin.php:1090
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:1088
+#: ../../mod/admin.php:1091
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:1088
+#: ../../mod/admin.php:1091
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
-#: ../../mod/admin.php:1089
+#: ../../mod/admin.php:1092
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:1139
+#: ../../mod/admin.php:1142
 msgid "Close"
 msgstr ""
 
-#: ../../mod/admin.php:1145
+#: ../../mod/admin.php:1148
 msgid "FTP Host"
 msgstr ""
 
-#: ../../mod/admin.php:1146
+#: ../../mod/admin.php:1149
 msgid "FTP Path"
 msgstr ""
 
-#: ../../mod/admin.php:1147
+#: ../../mod/admin.php:1150
 msgid "FTP User"
 msgstr ""
 
-#: ../../mod/admin.php:1148
+#: ../../mod/admin.php:1151
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/profile.php:21 ../../boot.php:1030
+#: ../../mod/profile.php:21 ../../boot.php:1043
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -3860,7 +3894,7 @@ msgstr ""
 msgid "No contacts in common."
 msgstr ""
 
-#: ../../mod/share.php:28 ../../include/bb2diaspora.php:286
+#: ../../mod/share.php:28
 msgid "link"
 msgstr ""
 
@@ -3938,7 +3972,7 @@ msgstr ""
 msgid "Address"
 msgstr ""
 
-#: ../../mod/profiles.php:205 ../../addon/dav/layout.fnk.php:310
+#: ../../mod/profiles.php:205 ../../addon/dav/common/wdcal_edit.inc.php:183
 msgid "Location"
 msgstr ""
 
@@ -3985,210 +4019,211 @@ msgstr ""
 msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../mod/profiles.php:553
+#: ../../mod/profiles.php:557
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: ../../mod/profiles.php:576
+#: ../../mod/profiles.php:577
 msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../mod/profiles.php:578
+#: ../../mod/profiles.php:579
 msgid "View this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:579
+#: ../../mod/profiles.php:580
 msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../mod/profiles.php:580
+#: ../../mod/profiles.php:581
 msgid "Clone this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:581
+#: ../../mod/profiles.php:582
 msgid "Delete this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:582
+#: ../../mod/profiles.php:583
 msgid "Profile Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:583
+#: ../../mod/profiles.php:584
 msgid "Your Full Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:584
+#: ../../mod/profiles.php:585
 msgid "Title/Description:"
 msgstr ""
 
-#: ../../mod/profiles.php:585
+#: ../../mod/profiles.php:586
 msgid "Your Gender:"
 msgstr ""
 
-#: ../../mod/profiles.php:586
+#: ../../mod/profiles.php:587
 #, php-format
 msgid "Birthday (%s):"
 msgstr ""
 
-#: ../../mod/profiles.php:587
+#: ../../mod/profiles.php:588
 msgid "Street Address:"
 msgstr ""
 
-#: ../../mod/profiles.php:588
+#: ../../mod/profiles.php:589
 msgid "Locality/City:"
 msgstr ""
 
-#: ../../mod/profiles.php:589
+#: ../../mod/profiles.php:590
 msgid "Postal/Zip Code:"
 msgstr ""
 
-#: ../../mod/profiles.php:590
+#: ../../mod/profiles.php:591
 msgid "Country:"
 msgstr ""
 
-#: ../../mod/profiles.php:591
+#: ../../mod/profiles.php:592
 msgid "Region/State:"
 msgstr ""
 
-#: ../../mod/profiles.php:592
+#: ../../mod/profiles.php:593
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: ../../mod/profiles.php:593
+#: ../../mod/profiles.php:594
 msgid "Who: (if applicable)"
 msgstr ""
 
-#: ../../mod/profiles.php:594
+#: ../../mod/profiles.php:595
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../mod/profiles.php:595
+#: ../../mod/profiles.php:596
 msgid "Since [date]:"
 msgstr ""
 
-#: ../../mod/profiles.php:596 ../../include/profile_advanced.php:46
+#: ../../mod/profiles.php:597 ../../include/profile_advanced.php:46
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../mod/profiles.php:597
+#: ../../mod/profiles.php:598
 msgid "Homepage URL:"
 msgstr ""
 
-#: ../../mod/profiles.php:598 ../../include/profile_advanced.php:50
+#: ../../mod/profiles.php:599 ../../include/profile_advanced.php:50
 msgid "Hometown:"
 msgstr ""
 
-#: ../../mod/profiles.php:599 ../../include/profile_advanced.php:54
+#: ../../mod/profiles.php:600 ../../include/profile_advanced.php:54
 msgid "Political Views:"
 msgstr ""
 
-#: ../../mod/profiles.php:600
+#: ../../mod/profiles.php:601
 msgid "Religious Views:"
 msgstr ""
 
-#: ../../mod/profiles.php:601
+#: ../../mod/profiles.php:602
 msgid "Public Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:602
+#: ../../mod/profiles.php:603
 msgid "Private Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:603 ../../include/profile_advanced.php:62
+#: ../../mod/profiles.php:604 ../../include/profile_advanced.php:62
 msgid "Likes:"
 msgstr ""
 
-#: ../../mod/profiles.php:604 ../../include/profile_advanced.php:64
+#: ../../mod/profiles.php:605 ../../include/profile_advanced.php:64
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../mod/profiles.php:605
+#: ../../mod/profiles.php:606
 msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../mod/profiles.php:606
+#: ../../mod/profiles.php:607
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: ../../mod/profiles.php:607
+#: ../../mod/profiles.php:608
 msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: ../../mod/profiles.php:608
+#: ../../mod/profiles.php:609
 msgid "Tell us about yourself..."
 msgstr ""
 
-#: ../../mod/profiles.php:609
+#: ../../mod/profiles.php:610
 msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:610
+#: ../../mod/profiles.php:611
 msgid "Contact information and Social Networks"
 msgstr ""
 
-#: ../../mod/profiles.php:611
+#: ../../mod/profiles.php:612
 msgid "Musical interests"
 msgstr ""
 
-#: ../../mod/profiles.php:612
+#: ../../mod/profiles.php:613
 msgid "Books, literature"
 msgstr ""
 
-#: ../../mod/profiles.php:613
+#: ../../mod/profiles.php:614
 msgid "Television"
 msgstr ""
 
-#: ../../mod/profiles.php:614
+#: ../../mod/profiles.php:615
 msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: ../../mod/profiles.php:615
+#: ../../mod/profiles.php:616
 msgid "Love/romance"
 msgstr ""
 
-#: ../../mod/profiles.php:616
+#: ../../mod/profiles.php:617
 msgid "Work/employment"
 msgstr ""
 
-#: ../../mod/profiles.php:617
+#: ../../mod/profiles.php:618
 msgid "School/education"
 msgstr ""
 
-#: ../../mod/profiles.php:622
+#: ../../mod/profiles.php:623
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/profiles.php:632 ../../mod/directory.php:109
+#: ../../mod/profiles.php:633 ../../mod/directory.php:109
 msgid "Age: "
 msgstr ""
 
-#: ../../mod/profiles.php:671
+#: ../../mod/profiles.php:672
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:672 ../../boot.php:1139
+#: ../../mod/profiles.php:673 ../../boot.php:1152
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:673 ../../boot.php:1140
+#: ../../mod/profiles.php:674 ../../boot.php:1153
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:684 ../../boot.php:1150
+#: ../../mod/profiles.php:685 ../../boot.php:1163
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:686 ../../boot.php:1153
+#: ../../mod/profiles.php:687 ../../boot.php:1166
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:687 ../../boot.php:1154
+#: ../../mod/profiles.php:688 ../../boot.php:1167
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:1024
+#: ../../mod/filer.php:29 ../../include/conversation.php:1069
+#: ../../include/conversation.php:1086
 msgid "Save to Folder:"
 msgstr ""
 
@@ -4196,7 +4231,7 @@ msgstr ""
 msgid "- select -"
 msgstr ""
 
-#: ../../mod/tagger.php:103 ../../include/conversation.php:199
+#: ../../mod/tagger.php:103 ../../include/conversation.php:242
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
@@ -4312,17 +4347,17 @@ msgid "Gender: "
 msgstr ""
 
 #: ../../mod/directory.php:134 ../../include/profile_advanced.php:17
-#: ../../boot.php:1175
+#: ../../boot.php:1188
 msgid "Gender:"
 msgstr ""
 
 #: ../../mod/directory.php:136 ../../include/profile_advanced.php:37
-#: ../../boot.php:1178
+#: ../../boot.php:1191
 msgid "Status:"
 msgstr ""
 
 #: ../../mod/directory.php:138 ../../include/profile_advanced.php:48
-#: ../../boot.php:1180
+#: ../../boot.php:1193
 msgid "Homepage:"
 msgstr ""
 
@@ -4688,7 +4723,7 @@ msgstr ""
 msgid "Activate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:799 ../../addon/dav/layout.fnk.php:360
+#: ../../addon/facebook/facebook.php:799 ../../addon/dav/layout.fnk.php:361
 msgid "The new values have been saved."
 msgstr ""
 
@@ -4702,23 +4737,23 @@ msgid ""
 "conflict."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1141
+#: ../../addon/facebook/facebook.php:1149
 msgid "View on Friendica"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1174
+#: ../../addon/facebook/facebook.php:1182
 msgid "Facebook post failed. Queued for retry."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1214
+#: ../../addon/facebook/facebook.php:1222
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1215
+#: ../../addon/facebook/facebook.php:1223
 msgid "Facebook connection became invalid"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1216
+#: ../../addon/facebook/facebook.php:1224
 #, php-format
 msgid ""
 "Hi %1$s,\n"
@@ -4740,23 +4775,35 @@ msgstr ""
 msgid "Automatically follow any StatusNet followers/mentioners"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:184
+#: ../../addon/bg/bg.php:51
+msgid "Bg settings updated."
+msgstr ""
+
+#: ../../addon/bg/bg.php:82
+msgid "Bg Settings"
+msgstr ""
+
+#: ../../addon/bg/bg.php:84 ../../addon/numfriends/numfriends.php:79
+msgid "How many contacts to display on profile sidebar"
+msgstr ""
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:233
 msgid "Lifetime of the cache (in hours)"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:189
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:238
 msgid "Cache Statistics"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:192
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:241
 msgid "Number of items"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:194
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:243
 msgid "Size of the cache"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:196
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:245
 msgid "Delete the whole cache"
 msgstr ""
 
@@ -4794,6 +4841,156 @@ msgstr ""
 msgid "Connect on Friendica!"
 msgstr ""
 
+#: ../../addon/morepokes/morepokes.php:19
+msgid "bitchslap"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:19
+msgid "bitchslapped"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:20
+msgid "shag"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:20
+msgid "shagged"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:21
+msgid "do something obscenely biological to"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:21
+msgid "did something obscenely biological to"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:22
+msgid "point out the new poke feature to"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:22
+msgid "pointed out the new poke feature to"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:23
+msgid "declare undying love for"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:23
+msgid "declared undying love for"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:24
+msgid "set fire to"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:25
+msgid "patent"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:25
+msgid "patented"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:26
+msgid "stroke beard"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:26
+msgid "stroked their beard at"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:27
+msgid ""
+"bemoan the declining standards of modern secondary and tertiary education to"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:27
+msgid ""
+"bemoans the declining standards of modern secondary and tertiary education to"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:28
+msgid "hug"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:28
+msgid "hugged"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:29
+msgid "kiss"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:29
+msgid "kissed"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:30
+msgid "raise eyebrows at"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:30
+msgid "raised their eyebrows at"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:31
+msgid "insult"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:31
+msgid "insulted"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:32
+msgid "praise"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:32
+msgid "praised"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:33
+msgid "be dubious of"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:33
+msgid "was dubious of"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:34
+msgid "eat"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:34
+msgid "ate"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:35
+msgid "giggle and fawn at"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:35
+msgid "giggled and fawned at"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:36
+msgid "doubt"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:36
+msgid "doubted"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:37
+msgid "glare"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:37
+msgid "glared at"
+msgstr ""
+
 #: ../../addon/yourls/yourls.php:55
 msgid "YourLS Settings"
 msgstr ""
@@ -4878,10 +5075,11 @@ msgid "%s - Click to open/close"
 msgstr ""
 
 #: ../../addon/page/page.php:61 ../../addon/page/page.php:91
+#: ../../addon/forumlist/forumlist.php:54
 msgid "Forums"
 msgstr ""
 
-#: ../../addon/page/page.php:129
+#: ../../addon/page/page.php:129 ../../addon/forumlist/forumlist.php:88
 msgid "Forums:"
 msgstr ""
 
@@ -4893,7 +5091,7 @@ msgstr ""
 msgid "Page Settings"
 msgstr ""
 
-#: ../../addon/page/page.php:196
+#: ../../addon/page/page.php:196 ../../addon/forumlist/forumlist.php:155
 msgid "How many forums to display on sidebar without paging"
 msgstr ""
 
@@ -4917,7 +5115,7 @@ msgstr ""
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:886
+#: ../../include/nav.php:64 ../../boot.php:899
 msgid "Login"
 msgstr ""
 
@@ -4945,205 +5143,533 @@ msgid "Latest likes"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1344
+#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1360
-#: ../../include/conversation.php:106 ../../include/conversation.php:179
+#: ../../include/conversation.php:106 ../../include/conversation.php:222
 msgid "event"
 msgstr ""
 
-#: ../../addon/dav/common/wdcal_configuration.php:126
+#: ../../addon/dav/dav_caldav_backend_virtual_friendica.inc.php:36
-msgid "U.S. Time Format (mm/dd/YYYY)"
+msgid "Friendicy-Native events"
 msgstr ""
 
-#: ../../addon/dav/common/wdcal_configuration.php:205
+#: ../../addon/dav/common/wdcal_backend.inc.php:92
-msgid "German Time Format (dd.mm.YYYY)"
+#: ../../addon/dav/common/wdcal_backend.inc.php:166
-msgstr ""
+#: ../../addon/dav/common/wdcal_backend.inc.php:178
-
+#: ../../addon/dav/common/wdcal_backend.inc.php:206
-#: ../../addon/dav/common/calendar.fnk.php:517
+#: ../../addon/dav/common/wdcal_backend.inc.php:214
-#: ../../addon/dav/common/calendar.fnk.php:533
+#: ../../addon/dav/common/wdcal_backend.inc.php:229
-#: ../../addon/dav/layout.fnk.php:200
-msgid "Error"
-msgstr ""
-
-#: ../../addon/dav/common/calendar.fnk.php:568
-#: ../../addon/dav/common/calendar.fnk.php:637
-#: ../../addon/dav/common/calendar.fnk.php:664
-#: ../../addon/dav/layout.fnk.php:231
 msgid "No access"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:119
+#: ../../addon/dav/common/wdcal_edit.inc.php:30
-msgid "New event"
+#: ../../addon/dav/common/wdcal_edit.inc.php:738
+msgid "Could not open component for editing"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:123
+#: ../../addon/dav/common/wdcal_edit.inc.php:140
-msgid "Today"
+#: ../../addon/dav/layout.fnk.php:143 ../../addon/dav/layout.fnk.php:422
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:132
-msgid "Day"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:139
-msgid "Week"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:146
-msgid "Month"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:151
-msgid "Reload"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:162
-msgid "Date"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:224
-msgid "Not found"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:292 ../../addon/dav/layout.fnk.php:365
 msgid "Go back to the calendar"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:300
+#: ../../addon/dav/common/wdcal_edit.inc.php:144
-msgid "Starts"
+msgid "Event data"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:305
+#: ../../addon/dav/common/wdcal_edit.inc.php:146 ../../addon/dav/main.php:206
-msgid "Ends"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:312
-msgid "Description"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:315
-msgid "Notification"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:324
-msgid "Minutes"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:327
-msgid "Hours"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:330
-msgid "Days"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:331
-msgid "before"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:367
-msgid "Calendar Settings"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:373
-msgid "Date format"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:382
-msgid "Time zone"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:387
-msgid "Limitations"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:391 ../../addon/libravatar/libravatar.php:82
-msgid "Warning"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:395
-msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:402
-msgid "Synchronizing this calendar with the iPhone"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:413
-msgid "Synchronizing your Friendica-Contacts with the iPhone"
-msgstr ""
-
-#: ../../addon/dav/dav_carddav_backend_friendica_community.inc.php:37
-msgid "Friendica-Contacts"
-msgstr ""
-
-#: ../../addon/dav/dav_carddav_backend_friendica_community.inc.php:38
-msgid "Your Friendica-Contacts"
-msgstr ""
-
-#: ../../addon/dav/main.php:244
 msgid "Calendar"
 msgstr ""
 
-#: ../../addon/dav/main.php:247
+#: ../../addon/dav/common/wdcal_edit.inc.php:163
+msgid "Special color"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:169
+msgid "Subject"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:173
+msgid "Starts"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:178
+msgid "Ends"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:185
+msgid "Description"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:188
+msgid "Recurrence"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:190
+msgid "Frequency"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:194
+#: ../../include/contact_selectors.php:59
+msgid "Daily"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:197
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:200
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:203
+msgid "Yearly"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:214
+#: ../../include/datetime.php:288
+msgid "days"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:215
+#: ../../include/datetime.php:287
+msgid "weeks"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:216
+#: ../../include/datetime.php:286
+msgid "months"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:217
+#: ../../include/datetime.php:285
+msgid "years"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:218
+msgid "Interval"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:218
+msgid "All %select% %time%"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:222
+#: ../../addon/dav/common/wdcal_edit.inc.php:260
+#: ../../addon/dav/common/wdcal_edit.inc.php:481
+msgid "Days"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:231
+#: ../../addon/dav/common/wdcal_edit.inc.php:254
+#: ../../addon/dav/common/wdcal_edit.inc.php:270
+#: ../../addon/dav/common/wdcal_edit.inc.php:293
+#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:880
+msgid "Sunday"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:235
+#: ../../addon/dav/common/wdcal_edit.inc.php:274
+#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:880
+msgid "Monday"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:238
+#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:880
+msgid "Tuesday"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:241
+#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:880
+msgid "Wednesday"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:244
+#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:880
+msgid "Thursday"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:247
+#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:880
+msgid "Friday"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:250
+#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:880
+msgid "Saturday"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:297
+msgid "First day of week:"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:350
+#: ../../addon/dav/common/wdcal_edit.inc.php:373
+msgid "Day of month"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:354
+msgid "#num#th of each month"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:357
+msgid "#num#th-last of each month"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:360
+msgid "#num#th #wkday# of each month"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:363
+msgid "#num#th-last #wkday# of each month"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:372
+#: ../../addon/dav/layout.fnk.php:255
+msgid "Month"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:377
+msgid "#num#th of the given month"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:380
+msgid "#num#th-last of the given month"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:383
+msgid "#num#th #wkday# of the given month"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:386
+msgid "#num#th-last #wkday# of the given month"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:413
+msgid "Repeat until"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:417
+msgid "Infinite"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:420
+msgid "Until the following date"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:423
+msgid "Number of times"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:429
+msgid "Exceptions"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:432
+msgid "none"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:449
+msgid "Notification"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:466
+msgid "Notify by"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:469
+msgid "E-Mail"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:470
+msgid "On Friendica / Display"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:474
+msgid "Time"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:478
+msgid "Hours"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:479
+msgid "Minutes"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:480
+msgid "Seconds"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:482
+msgid "Weeks"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:485
+msgid "before the"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:486
+msgid "start of the event"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:487
+msgid "end of the event"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:492
+msgid "Add a notification"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:687
+msgid "The event #name# will start at #date"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:696
+msgid "#name# is about to begin."
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:769
+msgid "Saved"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_configuration.php:148
+msgid "U.S. Time Format (mm/dd/YYYY)"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_configuration.php:243
+msgid "German Time Format (dd.mm.YYYY)"
+msgstr ""
+
+#: ../../addon/dav/common/dav_caldav_backend_private.inc.php:39
+msgid "Private Events"
+msgstr ""
+
+#: ../../addon/dav/dav_carddav_backend_virtual_friendica.inc.php:53
+msgid "Friendica-Contacts"
+msgstr ""
+
+#: ../../addon/dav/dav_carddav_backend_virtual_friendica.inc.php:54
+msgid "Your Friendica-Contacts"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:99 ../../addon/dav/layout.fnk.php:136
+msgid ""
+"Something went wrong when trying to import the file. Sorry. Maybe some "
+"events were imported anyway."
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:131
+msgid "Something went wrong when trying to import the file. Sorry."
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:134
+msgid "The ICS-File has been imported."
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:138
+msgid "No file was uploaded."
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:147
+msgid "Import a ICS-file"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:150
+msgid "ICS-File"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:151
+msgid "Overwrite all #num# existing events"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:228
+msgid "New event"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:232
+msgid "Today"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:241
+msgid "Day"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:248
+msgid "Week"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:260
+msgid "Reload"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:271
+msgid "Date"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:313
+msgid "Error"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:380
+msgid "The calendar has been updated."
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:393
+msgid "The new calendar has been created."
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:417
+msgid "The calendar has been deleted."
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:424
+msgid "Calendar Settings"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:430
+msgid "Date format"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:439
+msgid "Time zone"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:445
+msgid "Calendars"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:487
+msgid "Create a new calendar"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:496
+msgid "Limitations"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:500 ../../addon/libravatar/libravatar.php:82
+msgid "Warning"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:504
+msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:511
+msgid "Synchronizing this calendar with the iPhone"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:522
+msgid "Synchronizing your Friendica-Contacts with the iPhone"
+msgstr ""
+
+#: ../../addon/dav/main.php:169
+msgid ""
+"The current version of this plugin has not been set up correctly. Please "
+"contact the system administrator of your installation of friendica to fix "
+"this."
+msgstr ""
+
+#: ../../addon/dav/main.php:209
 msgid "Extended calendar with CalDAV-support"
 msgstr ""
 
-#: ../../addon/dav/main.php:263
+#: ../../addon/dav/main.php:246 ../../addon/dav/main.php:247
+#: ../../include/delivery.php:463 ../../include/enotify.php:26
+#: ../../include/notifier.php:685
+msgid "noreply"
+msgstr ""
+
+#: ../../addon/dav/main.php:249
+msgid "Notification: "
+msgstr ""
+
+#: ../../addon/dav/main.php:276
 msgid "The database tables have been installed."
 msgstr ""
 
-#: ../../addon/dav/main.php:264
+#: ../../addon/dav/main.php:277
 msgid "An error occurred during the installation."
 msgstr ""
 
-#: ../../addon/dav/main.php:280
+#: ../../addon/dav/main.php:283
+msgid "The database tables have been updated."
+msgstr ""
+
+#: ../../addon/dav/main.php:285
+msgid "An error occurred during the update."
+msgstr ""
+
+#: ../../addon/dav/main.php:301
 msgid "No system-wide settings yet."
 msgstr ""
 
-#: ../../addon/dav/main.php:283
+#: ../../addon/dav/main.php:304
 msgid "Database status"
 msgstr ""
 
-#: ../../addon/dav/main.php:286
+#: ../../addon/dav/main.php:307
 msgid "Installed"
 msgstr ""
 
-#: ../../addon/dav/main.php:289
+#: ../../addon/dav/main.php:310
 msgid "Upgrade needed"
 msgstr ""
 
-#: ../../addon/dav/main.php:289
+#: ../../addon/dav/main.php:310
+msgid ""
+"Please back up all calendar data (the tables beginning with dav_*) before "
+"proceeding. While all calendar events <i>should</i> be converted to the new "
+"database structure, it's always safe to have a backup. Below, you can have a "
+"look at the database-queries that will be made when pressing the 'update'-"
+"button."
+msgstr ""
+
+#: ../../addon/dav/main.php:310
 msgid "Upgrade"
 msgstr ""
 
-#: ../../addon/dav/main.php:292
+#: ../../addon/dav/main.php:313
 msgid "Not installed"
 msgstr ""
 
-#: ../../addon/dav/main.php:292
+#: ../../addon/dav/main.php:313
 msgid "Install"
 msgstr ""
 
-#: ../../addon/dav/main.php:297
+#: ../../addon/dav/main.php:317
+msgid "Unknown"
+msgstr ""
+
+#: ../../addon/dav/main.php:317
+msgid ""
+"Something really went wrong. I cannot recover from this state automatically, "
+"sorry. Please go to the database backend, back up the data, and delete all "
+"tables beginning with 'dav_' manually. Afterwards, this installation routine "
+"should be able to reinitialize the tables automatically."
+msgstr ""
+
+#: ../../addon/dav/main.php:322
 msgid "Troubleshooting"
 msgstr ""
 
-#: ../../addon/dav/main.php:298
+#: ../../addon/dav/main.php:323
 msgid "Manual creation of the database tables:"
 msgstr ""
 
-#: ../../addon/dav/main.php:299
+#: ../../addon/dav/main.php:324
 msgid "Show SQL-statements"
 msgstr ""
 
-#: ../../addon/dav/calendar.friendica.fnk.php:151
+#: ../../addon/dav/calendar.friendica.fnk.php:193
 msgid "Private Calendar"
 msgstr ""
 
-#: ../../addon/dav/calendar.friendica.fnk.php:158
+#: ../../addon/dav/calendar.friendica.fnk.php:194
 msgid "Friendica Events: Mine"
 msgstr ""
 
-#: ../../addon/dav/calendar.friendica.fnk.php:161
+#: ../../addon/dav/calendar.friendica.fnk.php:195
 msgid "Friendica Events: Contacts"
 msgstr ""
 
@@ -5381,6 +5907,30 @@ msgstr ""
 msgid "URL to embed:"
 msgstr ""
 
+#: ../../addon/forumlist/forumlist.php:57
+msgid "show/hide"
+msgstr ""
+
+#: ../../addon/forumlist/forumlist.php:72
+msgid "No forum subscriptions"
+msgstr ""
+
+#: ../../addon/forumlist/forumlist.php:124
+msgid "Forumlist settings updated."
+msgstr ""
+
+#: ../../addon/forumlist/forumlist.php:153
+msgid "Forumlist Settings"
+msgstr ""
+
+#: ../../addon/forumlist/forumlist.php:158
+msgid "Randomise Forumlist/Forum list"
+msgstr ""
+
+#: ../../addon/forumlist/forumlist.php:161
+msgid "Show forumlists/forums on profile forumlist"
+msgstr ""
+
 #: ../../addon/impressum/impressum.php:36
 msgid "Impressum"
 msgstr ""
@@ -5539,6 +6089,19 @@ msgstr ""
 msgid "The default zoom level. (1:world, 18:highest)"
 msgstr ""
 
+#: ../../addon/group_text/group_text.php:46
+#: ../../addon/editplain/editplain.php:46
+msgid "Editplain settings updated."
+msgstr ""
+
+#: ../../addon/group_text/group_text.php:76
+msgid "Group Text"
+msgstr ""
+
+#: ../../addon/group_text/group_text.php:78
+msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+msgstr ""
+
 #: ../../addon/libravatar/libravatar.php:14
 msgid "Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"
 msgstr ""
@@ -5659,10 +6222,6 @@ msgid ""
 "be either the MathJax CDN or another installation of MathJax."
 msgstr ""
 
-#: ../../addon/editplain/editplain.php:46
-msgid "Editplain settings updated."
-msgstr ""
-
 #: ../../addon/editplain/editplain.php:76
 msgid "Editplain Settings"
 msgstr ""
@@ -5868,7 +6427,7 @@ msgstr ""
 msgid "Clear OAuth configuration"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:559
+#: ../../addon/statusnet/statusnet.php:568
 msgid "API URL"
 msgstr ""
 
@@ -5908,10 +6467,6 @@ msgstr ""
 msgid "Numfriends Settings"
 msgstr ""
 
-#: ../../addon/numfriends/numfriends.php:79
-msgid "How many contacts to display on profile sidebar"
-msgstr ""
-
 #: ../../addon/gnot/gnot.php:48
 msgid "Gnot settings updated."
 msgstr ""
@@ -6085,11 +6640,11 @@ msgstr ""
 msgid "Send linked #-tags and @-names to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:389
+#: ../../addon/twitter/twitter.php:396
 msgid "Consumer key"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:390
+#: ../../addon/twitter/twitter.php:397
 msgid "Consumer secret"
 msgstr ""
 
@@ -6490,18 +7045,6 @@ msgstr ""
 msgid "Twice daily"
 msgstr ""
 
-#: ../../include/contact_selectors.php:59
-msgid "Daily"
-msgstr ""
-
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
-msgstr ""
-
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
-msgstr ""
-
 #: ../../include/contact_selectors.php:77
 msgid "OStatus"
 msgstr ""
@@ -6758,11 +7301,11 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/event.php:20 ../../include/bb2diaspora.php:453
+#: ../../include/event.php:20 ../../include/bb2diaspora.php:431
 msgid "Starts:"
 msgstr ""
 
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:461
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:439
 msgid "Finishes:"
 msgstr ""
 
@@ -6770,11 +7313,6 @@ msgstr ""
 msgid "(no subject)"
 msgstr ""
 
-#: ../../include/delivery.php:463 ../../include/enotify.php:26
-#: ../../include/notifier.php:685
-msgid "noreply"
-msgstr ""
-
 #: ../../include/Scrape.php:572
 msgid " on Last.fm"
 msgstr ""
@@ -6814,127 +7352,147 @@ msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/text.php:864
+#: ../../include/text.php:715
-msgid "Monday"
+msgid "poke"
 msgstr ""
 
-#: ../../include/text.php:864
+#: ../../include/text.php:715 ../../include/conversation.php:201
-msgid "Tuesday"
+msgid "poked"
 msgstr ""
 
-#: ../../include/text.php:864
+#: ../../include/text.php:716
-msgid "Wednesday"
+msgid "ping"
 msgstr ""
 
-#: ../../include/text.php:864
+#: ../../include/text.php:716
-msgid "Thursday"
+msgid "pinged"
 msgstr ""
 
-#: ../../include/text.php:864
+#: ../../include/text.php:717
-msgid "Friday"
+msgid "prod"
 msgstr ""
 
-#: ../../include/text.php:864
+#: ../../include/text.php:717
-msgid "Saturday"
+msgid "prodded"
 msgstr ""
 
-#: ../../include/text.php:864
+#: ../../include/text.php:718
-msgid "Sunday"
+msgid "slap"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:718
+msgid "slapped"
+msgstr ""
+
+#: ../../include/text.php:719
+msgid "finger"
+msgstr ""
+
+#: ../../include/text.php:719
+msgid "fingered"
+msgstr ""
+
+#: ../../include/text.php:720
+msgid "rebuff"
+msgstr ""
+
+#: ../../include/text.php:720
+msgid "rebuffed"
+msgstr ""
+
+#: ../../include/text.php:884
 msgid "January"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:884
 msgid "February"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:884
 msgid "March"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:884
 msgid "April"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:884
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:884
 msgid "June"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:884
 msgid "July"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:884
 msgid "August"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:884
 msgid "September"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:884
 msgid "October"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:884
 msgid "November"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:884
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:954
+#: ../../include/text.php:970
 msgid "bytes"
 msgstr ""
 
-#: ../../include/text.php:974 ../../include/text.php:989
+#: ../../include/text.php:990 ../../include/text.php:1005
 msgid "remove"
 msgstr ""
 
-#: ../../include/text.php:974 ../../include/text.php:989
+#: ../../include/text.php:990 ../../include/text.php:1005
 msgid "[remove]"
 msgstr ""
 
-#: ../../include/text.php:977
+#: ../../include/text.php:993
 msgid "Categories:"
 msgstr ""
 
-#: ../../include/text.php:992
+#: ../../include/text.php:1008
 msgid "Filed under:"
 msgstr ""
 
-#: ../../include/text.php:1008 ../../include/text.php:1020
+#: ../../include/text.php:1024 ../../include/text.php:1036
 msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/text.php:1126 ../../include/user.php:236
+#: ../../include/text.php:1142 ../../include/user.php:236
 msgid "default"
 msgstr ""
 
-#: ../../include/text.php:1138
+#: ../../include/text.php:1154
 msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:1348
+#: ../../include/text.php:1364
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:1350
+#: ../../include/text.php:1366
 msgid "comment"
 msgstr ""
 
-#: ../../include/text.php:1351
+#: ../../include/text.php:1367
 msgid "post"
 msgstr ""
 
-#: ../../include/text.php:1506
+#: ../../include/text.php:1522
 msgid "Item filed"
 msgstr ""
 
@@ -6942,11 +7500,11 @@ msgstr ""
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: ../../include/diaspora.php:2174
+#: ../../include/diaspora.php:2177
 msgid "Attachments:"
 msgstr ""
 
-#: ../../include/network.php:842
+#: ../../include/network.php:843
 msgid "view full size"
 msgstr ""
 
@@ -6993,7 +7551,7 @@ msgstr ""
 msgid "Contacts not in any group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:885
+#: ../../include/nav.php:46 ../../boot.php:898
 msgid "Logout"
 msgstr ""
 
@@ -7001,7 +7559,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1575
+#: ../../include/nav.php:49 ../../boot.php:1610
 msgid "Status"
 msgstr ""
 
@@ -7081,11 +7639,11 @@ msgstr ""
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1133
+#: ../../include/nav.php:138 ../../boot.php:1146
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1133
+#: ../../include/nav.php:138 ../../boot.php:1146
 msgid "Manage/edit profiles"
 msgstr ""
 
@@ -7198,26 +7756,10 @@ msgstr ""
 msgid "less than a second ago"
 msgstr ""
 
-#: ../../include/datetime.php:285
-msgid "years"
-msgstr ""
-
-#: ../../include/datetime.php:286
-msgid "months"
-msgstr ""
-
 #: ../../include/datetime.php:287
 msgid "week"
 msgstr ""
 
-#: ../../include/datetime.php:287
-msgid "weeks"
-msgstr ""
-
-#: ../../include/datetime.php:288
-msgid "days"
-msgstr ""
-
 #: ../../include/datetime.php:289
 msgid "hour"
 msgstr ""
@@ -7247,12 +7789,12 @@ msgstr ""
 msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/datetime.php:472 ../../include/items.php:1561
+#: ../../include/datetime.php:472 ../../include/items.php:1620
 #, php-format
 msgid "%s's birthday"
 msgstr ""
 
-#: ../../include/datetime.php:473 ../../include/items.php:1562
+#: ../../include/datetime.php:473 ../../include/items.php:1621
 #, php-format
 msgid "Happy Birthday %s"
 msgstr ""
@@ -7261,11 +7803,11 @@ msgstr ""
 msgid "From: "
 msgstr ""
 
-#: ../../include/bbcode.php:102 ../../include/bbcode.php:313
+#: ../../include/bbcode.php:102 ../../include/bbcode.php:317
 msgid "Image/photo"
 msgstr ""
 
-#: ../../include/bbcode.php:278 ../../include/bbcode.php:298
+#: ../../include/bbcode.php:282 ../../include/bbcode.php:302
 msgid "$1 wrote:"
 msgstr ""
 
@@ -7350,7 +7892,8 @@ msgid "%s commented on an item/conversation you have been following."
 msgstr ""
 
 #: ../../include/enotify.php:116 ../../include/enotify.php:131
-#: ../../include/enotify.php:144 ../../include/enotify.php:157
+#: ../../include/enotify.php:144 ../../include/enotify.php:162
+#: ../../include/enotify.php:175
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
@@ -7385,68 +7928,83 @@ msgstr ""
 msgid "%1$s [url=%2$s]tagged you[/url]."
 msgstr ""
 
-#: ../../include/enotify.php:151
-#, php-format
-msgid "[Friendica:Notify] %s tagged your post"
-msgstr ""
-
 #: ../../include/enotify.php:152
 #, php-format
-msgid "%1$s tagged your post at %2$s"
+msgid "[Friendica:Notify] %1$s poked you"
 msgstr ""
 
 #: ../../include/enotify.php:153
 #, php-format
-msgid "%1$s tagged [url=%2$s]your post[/url]"
+msgid "%1$s poked you at %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:164
+#: ../../include/enotify.php:154
-msgid "[Friendica:Notify] Introduction received"
-msgstr ""
-
-#: ../../include/enotify.php:165
 #, php-format
-msgid "You've received an introduction from '%1$s' at %2$s"
+msgid "%1$s [url=%2$s]poked you[/url]."
 msgstr ""
 
-#: ../../include/enotify.php:166
+#: ../../include/enotify.php:169
 #, php-format
-msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
+msgid "[Friendica:Notify] %s tagged your post"
 msgstr ""
 
-#: ../../include/enotify.php:169 ../../include/enotify.php:187
+#: ../../include/enotify.php:170
 #, php-format
-msgid "You may visit their profile at %s"
+msgid "%1$s tagged your post at %2$s"
 msgstr ""
 
 #: ../../include/enotify.php:171
 #, php-format
+msgid "%1$s tagged [url=%2$s]your post[/url]"
+msgstr ""
+
+#: ../../include/enotify.php:182
+msgid "[Friendica:Notify] Introduction received"
+msgstr ""
+
+#: ../../include/enotify.php:183
+#, php-format
+msgid "You've received an introduction from '%1$s' at %2$s"
+msgstr ""
+
+#: ../../include/enotify.php:184
+#, php-format
+msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
+msgstr ""
+
+#: ../../include/enotify.php:187 ../../include/enotify.php:205
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr ""
+
+#: ../../include/enotify.php:189
+#, php-format
 msgid "Please visit %s to approve or reject the introduction."
 msgstr ""
 
-#: ../../include/enotify.php:178
+#: ../../include/enotify.php:196
 msgid "[Friendica:Notify] Friend suggestion received"
 msgstr ""
 
-#: ../../include/enotify.php:179
+#: ../../include/enotify.php:197
 #, php-format
 msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:180
+#: ../../include/enotify.php:198
 #, php-format
 msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
 msgstr ""
 
-#: ../../include/enotify.php:185
+#: ../../include/enotify.php:203
 msgid "Name:"
 msgstr ""
 
-#: ../../include/enotify.php:186
+#: ../../include/enotify.php:204
 msgid "Photo:"
 msgstr ""
 
-#: ../../include/enotify.php:189
+#: ../../include/enotify.php:207
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
@@ -7506,23 +8064,18 @@ msgstr ""
 msgid "following"
 msgstr ""
 
-#: ../../include/items.php:2991
+#: ../../include/items.php:3211
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:2991
+#: ../../include/items.php:3211
 msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/items.php:3660
+#: ../../include/items.php:3880
 msgid "Archives"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:286 ../../include/bb2diaspora.php:296
-#: ../../include/bb2diaspora.php:297
-msgid "image/photo"
-msgstr ""
-
 #: ../../include/user.php:38
 msgid "An invitation is required."
 msgstr ""
@@ -7613,247 +8166,256 @@ msgstr ""
 msgid "stopped following"
 msgstr ""
 
-#: ../../include/Contact.php:218 ../../include/conversation.php:915
+#: ../../include/Contact.php:220 ../../include/conversation.php:966
+msgid "Poke"
+msgstr ""
+
+#: ../../include/Contact.php:221 ../../include/conversation.php:960
 msgid "View Status"
 msgstr ""
 
-#: ../../include/Contact.php:219 ../../include/conversation.php:916
+#: ../../include/Contact.php:222 ../../include/conversation.php:961
 msgid "View Profile"
 msgstr ""
 
-#: ../../include/Contact.php:220 ../../include/conversation.php:917
+#: ../../include/Contact.php:223 ../../include/conversation.php:962
 msgid "View Photos"
 msgstr ""
 
-#: ../../include/Contact.php:221 ../../include/Contact.php:234
+#: ../../include/Contact.php:224 ../../include/Contact.php:237
-#: ../../include/conversation.php:918
+#: ../../include/conversation.php:963
 msgid "Network Posts"
 msgstr ""
 
-#: ../../include/Contact.php:222 ../../include/Contact.php:234
+#: ../../include/Contact.php:225 ../../include/Contact.php:237
-#: ../../include/conversation.php:919
+#: ../../include/conversation.php:964
 msgid "Edit Contact"
 msgstr ""
 
-#: ../../include/Contact.php:223 ../../include/Contact.php:234
+#: ../../include/Contact.php:226 ../../include/Contact.php:237
-#: ../../include/conversation.php:920
+#: ../../include/conversation.php:965
 msgid "Send PM"
 msgstr ""
 
-#: ../../include/conversation.php:224
+#: ../../include/conversation.php:197
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr ""
+
+#: ../../include/conversation.php:267
 msgid "post/item"
 msgstr ""
 
-#: ../../include/conversation.php:225
+#: ../../include/conversation.php:268
 #, php-format
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:823
+#: ../../include/conversation.php:866
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:978
+#: ../../include/conversation.php:1024
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:978
+#: ../../include/conversation.php:1024
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:982
+#: ../../include/conversation.php:1028
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/conversation.php:984
+#: ../../include/conversation.php:1030
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:990
+#: ../../include/conversation.php:1036
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:993
+#: ../../include/conversation.php:1039
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:994
+#: ../../include/conversation.php:1040
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:994
+#: ../../include/conversation.php:1040
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1019
+#: ../../include/conversation.php:1064 ../../include/conversation.php:1081
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:1021
+#: ../../include/conversation.php:1066 ../../include/conversation.php:1083
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:1022
+#: ../../include/conversation.php:1067 ../../include/conversation.php:1084
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:1023
+#: ../../include/conversation.php:1068 ../../include/conversation.php:1085
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:1025
+#: ../../include/conversation.php:1070 ../../include/conversation.php:1087
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:1068
+#: ../../include/conversation.php:1130
 msgid "upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:1070
+#: ../../include/conversation.php:1132
 msgid "attach file"
 msgstr ""
 
-#: ../../include/conversation.php:1072
+#: ../../include/conversation.php:1134
 msgid "web link"
 msgstr ""
 
-#: ../../include/conversation.php:1073
+#: ../../include/conversation.php:1135
 msgid "Insert video link"
 msgstr ""
 
-#: ../../include/conversation.php:1074
+#: ../../include/conversation.php:1136
 msgid "video link"
 msgstr ""
 
-#: ../../include/conversation.php:1075
+#: ../../include/conversation.php:1137
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1076
+#: ../../include/conversation.php:1138
 msgid "audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1078
+#: ../../include/conversation.php:1140
 msgid "set location"
 msgstr ""
 
-#: ../../include/conversation.php:1080
+#: ../../include/conversation.php:1142
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:1087
+#: ../../include/conversation.php:1149
 msgid "permissions"
 msgstr ""
 
-#: ../../include/plugin.php:388 ../../include/plugin.php:390
+#: ../../include/plugin.php:390 ../../include/plugin.php:392
 msgid "Click here to upgrade."
 msgstr ""
 
-#: ../../include/plugin.php:396
+#: ../../include/plugin.php:398
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr ""
 
-#: ../../include/plugin.php:401
+#: ../../include/plugin.php:403
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../boot.php:564
+#: ../../boot.php:568
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:567
+#: ../../boot.php:571
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:762
+#: ../../boot.php:774
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:764
+#: ../../boot.php:776
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:864
+#: ../../boot.php:877
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:888
+#: ../../boot.php:901
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:889
+#: ../../boot.php:902
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:892
+#: ../../boot.php:905
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:898
+#: ../../boot.php:911
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1065
+#: ../../boot.php:1078
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1125
+#: ../../boot.php:1138
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1241 ../../boot.php:1320
+#: ../../boot.php:1260 ../../boot.php:1346
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1242 ../../boot.php:1321
+#: ../../boot.php:1261 ../../boot.php:1347
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1287 ../../boot.php:1361
+#: ../../boot.php:1306 ../../boot.php:1387
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1299
+#: ../../boot.php:1318
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1300
+#: ../../boot.php:1319
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1354
+#: ../../boot.php:1380
 msgid "[No description]"
 msgstr ""
 
-#: ../../boot.php:1372
+#: ../../boot.php:1398
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1373
+#: ../../boot.php:1399
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1578
+#: ../../boot.php:1613
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1584
+#: ../../boot.php:1620
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1599
+#: ../../boot.php:1637
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1605
+#: ../../boot.php:1644
 msgid "Only You Can See This"
 msgstr ""

view/admin_aside.tpl

@@ -5,7 +5,7 @@
 		$("nav").bind('nav-update',  function(e,data){
 			var elm = $('#pending-update');
 			var register = $(data).find('register').text();
-			if (register=="0") { reigster=""; elm.hide();} else { elm.show(); }
+			if (register=="0") { register=""; elm.hide();} else { elm.show(); }
 			elm.html(register);
 		});
 	});

view/birthdays_reminder.tpl

@@ -5,6 +5,6 @@
 {{ for $events as $event }}
 <div class="birthday-list" id="birthday-$event.id"></a> <a href="$event.link">$event.title</a> $event.date </div>
 {{ endfor }}
-</div></div>
+</div>
 {{ endif }}
 

view/common_tabs.tpl

@@ -1,5 +1,5 @@
 <ul class="tabs">
 	{{ for $tabs as $tab }}
-		<li><a href="$tab.url" class="tab button $tab.sel"{{ if $tab.title }} title="$tab.title"{{ endif }}>$tab.label</a></li>
+		<li id="$tab.id"><a href="$tab.url" class="tab button $tab.sel"{{ if $tab.title }} title="$tab.title"{{ endif }}>$tab.label</a></li>
 	{{ endfor }}
 </ul>

view/contacts-head.tpl

@@ -0,0 +1,17 @@
+
+<script src="$baseurl/library/jquery_ac/friendica.complete.js" ></script>
+
+<script>
+$(document).ready(function() { 
+	var a; 
+	a = $("#contacts-search").autocomplete({ 
+		serviceUrl: '$base/acl',
+		minChars: 2,
+		width: 350,
+	});
+	a.setOptions({ params: { type: 'a' }});
+
+}); 
+
+</script>
+

view/display-head.tpl

@@ -0,0 +1,8 @@
+<script>
+$(document).ready(function() {
+	$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+	// make auto-complete work in more places
+	$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+});
+</script>
+

view/events_reminder.tpl

@@ -5,6 +5,6 @@
 {{ for $events as $event }}
 <div class="event-list" id="event-$event.id"></a> <a href="events/$event.link">$event.title</a> $event.date </div>
 {{ endfor }}
-</div></div>
+</div>
 {{ endif }}
 

view/invite.tpl

@@ -23,4 +23,5 @@ $msg_text
 <input type="submit" name="submit" value="$submit" />
 </div>
 
+</div>
 </form>

view/jot-header.tpl

@@ -283,9 +283,9 @@ function enableOnUser(){
 				if(reply && reply.length) {
 					commentBusy = true;
 					$('body').css('cursor', 'wait');
-					$.get('filer/' + id + '?term=' + reply);
+					$.get('filer/' + id + '?term=' + reply, NavUpdate);
-					if(timer) clearTimeout(timer);
+//					if(timer) clearTimeout(timer);
-					timer = setTimeout(NavUpdate,3000);
+//					timer = setTimeout(NavUpdate,3000);
 					liking = 1;
 					$.fancybox.close();
 				} else {

view/message-head.tpl

@@ -0,0 +1,17 @@
+<script src="$baseurl/library/jquery_ac/friendica.complete.js" ></script>
+
+<script>$(document).ready(function() { 
+	var a; 
+	a = $("#recip").autocomplete({ 
+		serviceUrl: '$base/acl',
+		minChars: 2,
+		width: 350,
+		onSelect: function(value,data) {
+			$("#recip-complete").val(data);
+		}			
+	});
+
+}); 
+
+</script>
+

view/photo_edit.tpl

@@ -28,7 +28,7 @@
 	<div id="photo-edit-rotate-end"></div>
 
 	<div id="photo-edit-perms" class="photo-edit-perms" >
-		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button" title="$permissions"/>
+		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button popupbox" title="$permissions"/>
 			<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
 		</a>
 		<div id="photo-edit-perms-menu-end"></div>
@@ -47,9 +47,4 @@
 	<div id="photo-edit-end"></div>
 </form>
 
-<script>
+
-	$("a#photo-edit-perms-menu").fancybox({
-		'transitionIn' : 'none',
-		'transitionOut' : 'none'
-	}); 
-</script>

view/photo_edit_head.tpl

@@ -0,0 +1,11 @@
+
+<script>
+
+	$(document).keydown(function(event) {
+
+		if("$prevlink" != '') { if(event.ctrlKey && event.keyCode == 37) { event.preventDefault(); window.location.href = "$prevlink"; }}
+		if("$nextlink" != '') { if(event.ctrlKey && event.keyCode == 39) { event.preventDefault(); window.location.href = "$nextlink"; }}
+
+	});
+
+</script>

view/photos_head.tpl

@@ -0,0 +1,26 @@
+
+<script>
+
+	var ispublic = "$ispublic";
+
+
+	$(document).ready(function() {
+
+		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+			var selstr;
+			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+				selstr = $(this).text();
+				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$('#jot-public').hide();
+			});
+			if(selstr == null) { 
+				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$('#jot-public').show();
+			}
+
+		}).trigger('change');
+
+	});
+
+</script>
+

view/photos_upload.tpl

@@ -12,7 +12,9 @@
 	<div id="photos-upload-new-end"></div>
 	<div id="photos-upload-exist-wrapper">
 		<div id="photos-upload-existing-album-text">$existalbumtext</div>
+		<select id="photos-upload-album-select" name="album" size="4">
 		$albumselect
+		</select>
 	</div>
 	<div id="photos-upload-exist-end"></div>
 
@@ -23,9 +25,10 @@
 
 
 	<div id="photos-upload-perms" class="photos-upload-perms" >
-		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button" />
+		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
 		<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
 		</a>
+	</div>
 	<div id="photos-upload-perms-end"></div>
 
 	<div style="display: none;">
@@ -43,9 +46,3 @@
 	<div class="photos-upload-end" ></div>
 </form>
 
-<script>
-	$("a#photos-upload-perms-menu").fancybox({
-		'transitionIn' : 'none',
-		'transitionOut' : 'none'
-	}); 
-</script>

view/poke_content.tpl

@@ -0,0 +1,32 @@
+<h3>$title</h3>
+
+<div id="poke-desc">$desc</div>
+
+<form action="poke" method="get">
+<br />
+<br />
+
+<div id="poke-recip-label">$clabel</div>
+<br />
+<input id="poke-recip" type="text" size="64" maxlength="255" value="$name" name="pokename" autocomplete="off" />
+<input id="poke-recip-complete" type="hidden" value="$id" name="cid" />
+<input id="poke-parent" type="hidden" value="$parent" name="parent" />
+<br />
+<br />
+<div id="poke-action-label">$choice</div>
+<br />
+<br />
+<select name="verb" id="poke-verb-select" >
+{{ for $verbs as $v }}
+<option value="$v.0">$v.1</option>
+{{ endfor }}
+</select>
+<br />
+<br />
+<div id="poke-private-desc">$prv_desc</div>
+<input type="checkbox" name="private" {{ if $parent }}disabled="disabled"{{ endif }} value="1" />
+<br />
+<br />
+<input type="submit" name="submit" value="$submit" />
+</form>
+

view/profed_head.tpl

@@ -1,3 +1,5 @@
+<script type="text/javascript" src="js/country.js" ></script>
+
 <script language="javascript" type="text/javascript"
           src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
           <script language="javascript" type="text/javascript">

view/profile_edit.tpl

@@ -172,7 +172,6 @@ $lbl_about
 
 </div>
 <div id="about-jot-end"></div>
-</div>
 
 
 <div id="interest-jot-wrapper" >
@@ -184,7 +183,6 @@ $lbl_hobbies
 
 </div>
 <div id="interest-jot-end"></div>
-</div>
 
 
 <div id="likes-jot-wrapper" >
@@ -196,7 +194,6 @@ $lbl_likes
 
 </div>
 <div id="likes-jot-end"></div>
-</div>
 
 
 <div id="dislikes-jot-wrapper" >
@@ -208,7 +205,6 @@ $lbl_dislikes
 
 </div>
 <div id="dislikes-jot-end"></div>
-</div>
 
 
 <div id="contact-jot-wrapper" >
@@ -220,7 +216,6 @@ $lbl_social
 
 </div>
 <div id="contact-jot-end"></div>
-</div>
 
 
 <div class="profile-edit-submit-wrapper" >
@@ -238,7 +233,6 @@ $lbl_music
 
 </div>
 <div id="music-jot-end"></div>
-</div>
 
 <div id="book-jot-wrapper" >
 <p id="book-jot-desc" >
@@ -249,7 +243,6 @@ $lbl_book
 
 </div>
 <div id="book-jot-end"></div>
-</div>
 
 
 
@@ -262,7 +255,6 @@ $lbl_tv
 
 </div>
 <div id="tv-jot-end"></div>
-</div>
 
 
 
@@ -275,7 +267,6 @@ $lbl_film
 
 </div>
 <div id="film-jot-end"></div>
-</div>
 
 
 <div class="profile-edit-submit-wrapper" >
@@ -293,7 +284,6 @@ $lbl_love
 
 </div>
 <div id="romance-jot-end"></div>
-</div>
 
 
 
@@ -306,7 +296,6 @@ $lbl_work
 
 </div>
 <div id="work-jot-end"></div>
-</div>
 
 
 
@@ -319,7 +308,6 @@ $lbl_school
 
 </div>
 <div id="education-jot-end"></div>
-</div>
 
 
 

view/settings-head.tpl

@@ -0,0 +1,25 @@
+
+<script>
+	var ispublic = "$ispublic";
+
+
+	$(document).ready(function() {
+
+		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+			var selstr;
+			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+				selstr = $(this).text();
+				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$('#jot-public').hide();
+			});
+			if(selstr == null) { 
+				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$('#jot-public').show();
+			}
+
+		}).trigger('change');
+
+	});
+
+</script>
+

view/settings.tpl

@@ -123,6 +123,7 @@ $group_select
 {{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
 {{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
 {{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify8 }}{{endinc}}
 </div>
 
 </div>

view/theme/dispy/head.tpl

@@ -25,6 +25,7 @@
 <!-- in dispy-dark -->
 <script>
 	var updateInterval = $update_interval;
+	var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
 
 	function confirmDelete() { return confirm("$delitem"); }
 	function commentOpen(obj,id) {
@@ -32,6 +33,7 @@
 			obj.value = '';
 			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
 			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			$("#mod-cmnt-wrap-" + id).show();
 			openMenu("comment-edit-submit-wrapper-" + id);
 		}
 	}
@@ -40,6 +42,7 @@
 			obj.value = '$comment';
 			$("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
 			$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
+			$("#mod-cmnt-wrap-" + id).hide();
 			closeMenu("comment-edit-submit-wrapper-" + id);
 		}
 	}
@@ -74,6 +77,7 @@
 		ins = ins.replace('&amp;','&');
 		ins = ins.replace('&quot;','"');
 		$("#comment-edit-text-" + id).val(tmpStr + ins);
+		$(obj).val('');
 	}
 
 	function showHideComments(id) {

view/theme/duepuntozero/prv_message.tpl

@@ -9,7 +9,7 @@ $parent
 <div id="prvmail-to-label">$to</div>
 
 {{ if $showinputs }}
-<input type="text" id="recip" name="messageto" value="$prefill" maxlength="255" size="64" tabindex="10" />
+<input type="text" id="recip" name="messagerecip" value="$prefill" maxlength="255" size="64" tabindex="10" />
 <input type="hidden" id="recip-complete" name="messageto" value="$preid">
 {{ else }}
 $select

view/theme/frost-mobile/TODO

@@ -0,0 +1,24 @@
+Photo album display?
+
+- The "lock" icon for private items
+	- change it to black?
+	- when clicked, the popup window displays poorly
+
+- Edit photo page: bottom buttons are off-center in Dolphin Mini
+
+- Pager: looks weird when only "prev" is there
+
+- BB code buttons for status updates
+
+- Get "add contact" back on contacts page
+
+- Admin: access to more pages than summary?
+
+- Embedded video playback is way too big
+
+- Needs to be faster!
+	- Reduce DOM elements (~2400 for 10 items, ~8400 for 40 items)
+	- Automatically set limit of 10 items for Network and Profile?
+
+
+

view/theme/frost-mobile/acl_selector.tpl

@@ -0,0 +1,22 @@
+<div id="acl-wrapper">
+	<input id="acl-search">
+	<a href="#" id="acl-showall">$showall</a>
+	<div id="acl-list">
+		<div id="acl-list-content">
+		</div>
+	</div>
+	<span id="acl-fields"></span>
+</div>
+
+<div class="acl-list-item" rel="acl-template" style="display:none">
+	<img src="{0}"><p>{1}</p>
+	<a href="#" class='acl-button-show'>$show</a>
+	<a href="#" class='acl-button-hide'>$hide</a>
+</div>
+
+<script>
+	window.allowCID = $allowcid;
+	window.allowGID = $allowgid;
+	window.denyCID = $denycid;
+	window.denyGID = $denygid;
+</script>

view/theme/frost-mobile/admin_aside.tpl

@@ -0,0 +1,31 @@
+
+<h4><a href="$admurl">$admtxt</a></h4>
+<ul class='admin linklist'>
+	<li class='admin button $admin.site.2'><a href='$admin.site.0'>$admin.site.1</a></li>
+	<li class='admin button $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li>
+	<li class='admin button $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li>
+	<li class='admin button $admin.themes.2'><a href='$admin.themes.0'>$admin.themes.1</a></li>
+	<li class='admin button $admin.dbsync.2'><a href='$admin.dbsync.0'>$admin.dbsync.1</a></li>
+</ul>
+
+{{ if $admin.update }}
+<ul class='admin linklist'>
+	<li class='admin button $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
+	<li class='admin button $admin.update.2'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
+</ul>
+{{ endif }}
+
+
+{{ if $admin.plugins_admin }}<h4>$plugadmtxt</h4>{{ endif }}
+<ul class='admin linklist'>
+	{{ for $admin.plugins_admin as $l }}
+	<li class='admin button $l.2'><a href='$l.0'>$l.1</a></li>
+	{{ endfor }}
+</ul>
+	
+	
+<h4>$logtxt</h4>
+<ul class='admin linklist'>
+	<li class='admin button $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li>
+</ul>
+

view/theme/frost-mobile/admin_site.tpl

@@ -0,0 +1,56 @@
+
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+	
+	<form action="$baseurl/admin/site" method="post">
+    <input type='hidden' name='form_security_token' value='$form_security_token'>
+
+	{{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
+	{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$language }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$theme }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
+	
+	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+	
+	<h3>$registration</h3>
+	{{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
+	
+	{{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
+	
+	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+
+	<h3>$upload</h3>
+	{{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
+	
+	<h3>$corporate</h3>
+	{{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
+	
+	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+	
+	<h3>$advanced</h3>
+	{{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
+	
+	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+	
+	</form>
+</div>

view/theme/frost-mobile/comment_item.tpl

@@ -0,0 +1,74 @@
+<!--		<script>
+		$(document).ready( function () {
+			$(document).mouseup(function(e) {
+				var container = $("#comment-edit-wrapper-$id");
+				if( container.has(e.target).length === 0) {
+					commentClose(document.getElementById('comment-edit-text-$id'),$id);
+					cmtBbClose($id);
+				}
+			});
+		});
+		</script>-->
+
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;" >
+			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;" >
+				<input type="hidden" name="type" value="$type" />
+				<input type="hidden" name="profile_uid" value="$profile_uid" />
+				<input type="hidden" name="parent" value="$parent" />
+				<input type="hidden" name="return" value="$return_path" />
+				<input type="hidden" name="jsreload" value="$jsreload" />
+				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+				<!--<div class="comment-edit-photo" id="comment-edit-photo-$id" >-->
+					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-$id" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+				<!--</div>-->
+				<!--<div class="comment-edit-photo-end"></div>-->
+				<ul class="comment-edit-bb-$id">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="$edbold"
+						onclick="insertFormatting('$comment','b', $id);"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="$editalic"
+						onclick="insertFormatting('$comment','i', $id);"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="$eduline"
+						onclick="insertFormatting('$comment','u', $id);"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="$edquote"
+						onclick="insertFormatting('$comment','quote', $id);"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="$edcode"
+						onclick="insertFormatting('$comment','code', $id);"></a></li>
+<!--					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="$edimg"
+						onclick="insertFormatting('$comment','img', $id);"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="$edurl"
+						onclick="insertFormatting('$comment','url', $id);"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="$edvideo"
+						onclick="insertFormatting('$comment','video', $id);"></a></li>-->
+				</ul>	
+				<!--<div class="comment-edit-bb-end"></div>-->
+<!--				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);cmtBbClose($id);" >$comment</textarea>-->
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" >$comment</textarea>
+				{{ if $qcomment }}
+					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+					<option value=""></option>
+				{{ for $qcomment as $qc }}
+					<option value="$qc">$qc</option>				
+				{{ endfor }}
+					</select>
+				{{ endif }}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<!--<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="preview-link fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>-->
+				</div>
+
+				<!--<div class="comment-edit-end"></div>-->
+			</form>
+
+		</div>

view/theme/frost-mobile/contact_edit.tpl

@@ -0,0 +1,88 @@
+
+<h2>$header</h2>
+
+<div id="contact-edit-wrapper" >
+
+	$tab_str
+
+	<div id="contact-edit-drop-link" >
+		<a href="contacts/$contact_id/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>
+	</div>
+
+	<div id="contact-edit-drop-link-end"></div>
+
+
+	<div id="contact-edit-nav-wrapper" >
+		<div id="contact-edit-links">
+			<ul>
+				<li><div id="contact-edit-rel">$relation_text</div></li>
+				<li><div id="contact-edit-nettype">$nettype</div></li>
+				{{ if $lost_contact }}
+					<li><div id="lost-contact-message">$lost_contact</div></li>
+				{{ endif }}
+				{{ if $insecure }}
+					<li><div id="insecure-message">$insecure</div></li>
+				{{ endif }}
+				{{ if $blocked }}
+					<li><div id="block-message">$blocked</div></li>
+				{{ endif }}
+				{{ if $ignored }}
+					<li><div id="ignore-message">$ignored</div></li>
+				{{ endif }}
+				{{ if $archived }}
+					<li><div id="archive-message">$archived</div></li>
+				{{ endif }}
+
+				<li>&nbsp;</li>
+
+				{{ if $common_text }}
+					<li><div id="contact-edit-common"><a href="$common_link">$common_text</a></div></li>
+				{{ endif }}
+				{{ if $all_friends }}
+					<li><div id="contact-edit-allfriends"><a href="allfriends/$contact_id">$all_friends</a></div></li>
+				{{ endif }}
+
+
+				<li><a href="network/?cid=$contact_id" id="contact-edit-view-recent">$lblrecent</a></li>
+				{{ if $lblsuggest }}
+					<li><a href="fsuggest/$contact_id" id="contact-edit-suggest">$lblsuggest</a></li>
+				{{ endif }}
+
+			</ul>
+		</div>
+	</div>
+	<div id="contact-edit-nav-end"></div>
+
+
+<form action="contacts/$contact_id" method="post" >
+<input type="hidden" name="contact_id" value="$contact_id">
+
+	{{ if $poll_enabled }}
+		<div id="contact-edit-poll-wrapper">
+			<div id="contact-edit-last-update-text">$lastupdtext <span id="contact-edit-last-updated">$last_update</span></div>
+			<span id="contact-edit-poll-text">$updpub $poll_interval</span> <span id="contact-edit-update-now" class="button"><a id="update_now_link" href="contacts/$contact_id/update" >$udnow</a></span>
+		</div>
+	{{ endif }}
+	<div id="contact-edit-end" ></div>
+
+	{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
+
+<div id="contact-edit-info-wrapper">
+<h4>$lbl_info1</h4>
+	<textarea id="contact-edit-info" rows="8" cols="35" name="info">$info</textarea>
+	<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
+</div>
+<div id="contact-edit-info-end"></div>
+
+
+<div id="contact-edit-profile-select-text">
+<h4>$lbl_vis1</h4>
+<p>$lbl_vis2</p> 
+</div>
+$profile_select
+<div id="contact-edit-profile-select-end"></div>
+
+<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
+
+</form>
+</div>

view/theme/frost-mobile/contact_template.tpl

@@ -0,0 +1,30 @@
+
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
+	<div class="contact-entry-photo-wrapper" >
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
+		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id);" 
+		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
+
+<!--			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>-->
+			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">
+			<img src="$contact.thumb" $contact.sparkle alt="$contact.name" />
+			</span>
+
+			{{ if $contact.photo_menu }}
+<!--			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>-->
+                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
+                    <ul>
+                        $contact.photo_menu
+                    </ul>
+                </div>
+			{{ endif }}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div><br />
+{{ if $contact.alt_text }}<div class="contact-entry-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
+	<div class="contact-entry-network" id="contact-entry-network-$contact.id" >$contact.network</div>
+
+	<div class="contact-entry-end" ></div>
+</div>

view/theme/frost-mobile/contacts-end.tpl

@@ -0,0 +1,4 @@
+
+<script src="$baseurl/library/jquery_ac/friendica.complete.min.js" ></script>
+
+

view/theme/frost-mobile/contacts-head.tpl

@@ -0,0 +1,5 @@
+
+<script>
+	window.autocompleteType = 'contacts-head';
+</script>
+

view/theme/frost-mobile/contacts-template.tpl

@@ -0,0 +1,28 @@
+<h1>$header{{ if $total }} ($total){{ endif }}</h1>
+
+{{ if $finding }}<h4>$finding</h4>{{ endif }}
+
+<div id="contacts-search-wrapper">
+<form id="contacts-search-form" action="$cmd" method="get" >
+<span class="contacts-search-desc">$desc</span>
+<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="$search" />
+<input type="submit" name="submit" id="contacts-search-submit" value="$submit" />
+</form>
+</div>
+<div id="contacts-search-end"></div>
+
+$tabs
+
+
+<div id="contacts-display-wrapper">
+{{ for $contacts as $contact }}
+	{{ inc contact_template.tpl }}{{ endinc }}
+{{ endfor }}
+</div>
+<div id="contact-edit-end"></div>
+
+$paginate
+
+
+
+

view/theme/frost-mobile/conversation.tpl

@@ -0,0 +1,27 @@
+{{ for $threads as $thread }}
+<div id="tread-wrapper-$thread.id" class="tread-wrapper">
+	{{ for $thread.items as $item }}
+		{{if $item.comment_firstcollapsed}}
+			<div class="hide-comments-outer">
+			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
+			</div>
+			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
+		{{endif}}
+		{{if $item.comment_lastcollapsed}}</div>{{endif}}
+		
+		{{ inc $item.template }}{{ endinc }}
+		
+		
+	{{ endfor }}
+</div>
+{{ endfor }}
+
+<div id="conversation-end"></div>
+
+<!--{{ if $dropping }}
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
+  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+  <div id="item-delete-selected-desc" >$dropping</div>
+</div>
+<div id="item-delete-selected-end"></div>-->
+{{ endif }}

view/theme/frost-mobile/cropbody.tpl

@@ -0,0 +1,27 @@
+<h1>$title</h1>
+<p id="cropimage-desc">
+$desc
+</p>
+<div id="cropimage-wrapper">
+<img src="$image_url" id="croppa" class="imgCrop" alt="$title" />
+</div>
+<div id="cropimage-preview-wrapper" >
+<div id="previewWrap" ></div>
+</div>
+
+<form action="profile_photo/$resource" id="crop-image-form" method="post" />
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
+<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" />
+</div>
+
+</form>

view/theme/frost-mobile/cropend.tpl

@@ -0,0 +1,4 @@
+      <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
+      <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
+      <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
+      <script type="text/javascript" language="javascript">initCrop();</script>

view/theme/frost-mobile/crophead.tpl

@@ -0,0 +1 @@
+      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />

view/theme/frost-mobile/default.php

@@ -0,0 +1,42 @@
+<!DOCTYPE html >
+<html>
+<head>
+  <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
+</head>
+<body>
+	<?php if( $a->module === 'home' ) { ?>
+	<center>
+	<div class="login-button">
+	<a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendika-1600.png" title="Click to log in"></a>
+	</div>
+	</center>
+	<?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
+	?>
+
+	<div class='section-wrapper'>
+	<section><?php if(x($page,'content')) echo $page['content']; ?>
+	</section>
+	</div>
+
+	<?php } else {
+
+	if(x($page,'nav')) echo $page['nav']; ?>
+	<div class='main-container'>
+		<div class='main-content-container'>
+		<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
+		<div class='section-wrapper'>
+		<section><?php if(x($page,'content')) echo $page['content']; ?>
+			<div id="page-footer"></div>
+		</section>
+		</div>
+		<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
+		<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
+		</div>
+	</div>
+	<?php } ?>
+	<?php if(x($page,'end')) echo $page['end']; ?>
+</body>
+</html>
+

view/theme/frost-mobile/display-head.tpl

@@ -0,0 +1,4 @@
+<script>
+	window.autoCompleteType = 'display-head';
+</script>
+

view/theme/frost-mobile/end.tpl

@@ -0,0 +1,19 @@
+<!--[if IE]>
+<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
+<!--<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
+<script type="text/javascript">
+  tinyMCE.init({ mode : "none"});
+</script>-->
+<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
+<script type="text/javascript">var $j = jQuery.noConflict();</script>
+<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
+<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/fk.autocomplete.min.js" ></script>
+<!--<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>-->
+<!--<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>-->
+<script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
+<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/acl.min.js" ></script>
+<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.min.js" ></script>
+<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/theme.min.js"></script>
+<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/main.min.js" ></script>
+

view/theme/frost-mobile/event_end.tpl

@@ -0,0 +1,4 @@
+<script language="javascript" type="text/javascript"
+          src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script>
+
+

view/theme/frost-mobile/event_head.tpl

@@ -0,0 +1,6 @@
+<link rel='stylesheet' type='text/css' href='$baseurl/library/fullcalendar/fullcalendar.css' />
+
+<script language="javascript" type="text/javascript">
+window.aclType = 'event_head';
+</script>
+

view/theme/frost-mobile/field_checkbox.tpl

@@ -0,0 +1,6 @@
+	
+	<div class='field checkbox'>
+		<label id='label_id_$field.0' for='id_$field.0'>$field.1</label>
+		<input type="checkbox" name='$field.0' id='id_$field.0' value="1" {{ if $field.2 }}checked="checked"{{ endif }}><br />
+		<span class='field_help' id='help_id_$field.0'>$field.3</span>
+	</div>

view/theme/frost-mobile/field_input.tpl

@@ -0,0 +1,6 @@
+	
+	<div class='field input' id='wrapper_$field.0'>
+		<label for='id_$field.0'>$field.1</label><br />
+		<input name='$field.0' id='id_$field.0' value="$field.2">
+		<span class='field_help'>$field.3</span>
+	</div>

view/theme/frost-mobile/field_openid.tpl

@@ -0,0 +1,6 @@
+	
+	<div class='field input openid' id='wrapper_$field.0'>
+		<label for='id_$field.0'>$field.1</label><br />
+		<input name='$field.0' id='id_$field.0' value="$field.2">
+		<span class='field_help'>$field.3</span>
+	</div>

view/theme/frost-mobile/field_password.tpl

@@ -0,0 +1,6 @@
+	
+	<div class='field password' id='wrapper_$field.0'>
+		<label for='id_$field.0'>$field.1</label><br />
+		<input type='password' name='$field.0' id='id_$field.0' value="$field.2">
+		<span class='field_help'>$field.3</span>
+	</div>

view/theme/frost-mobile/field_themeselect.tpl

@@ -0,0 +1,9 @@
+
+	<div class='field select'>
+		<label for='id_$field.0'>$field.1</label>
+		<select name='$field.0' id='id_$field.0' onchange="previewTheme(this);" >
+			{{ for $field.4 as $opt=>$val }}<option value="$opt" {{ if $opt==$field.2 }}selected="selected"{{ endif }}>$val</option>{{ endfor }}
+		</select>
+		<span class='field_help'>$field.3</span>
+		<div id="theme-preview"></div>
+	</div>

view/theme/frost-mobile/head.tpl

@@ -0,0 +1,27 @@
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta content='width=device-width, minimum-scale=1 maximum-scale=1' name='viewport'>
+<meta content='True' name='HandheldFriendly'>
+<meta content='320' name='MobileOptimized'>
+<base href="$baseurl/" />
+<meta name="generator" content="$generator" />
+<!--<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />-->
+<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
+
+<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
+
+<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
+<link rel="search"
+         href="$baseurl/opensearch" 
+         type="application/opensearchdescription+xml" 
+         title="Search in Friendica" />
+
+<script>
+	window.delItem = "$delitem";
+	window.commentEmptyText = "$comment";
+	window.showMore = "$showmore";
+	window.showFewer = "$showfewer";
+	var updateInterval = $update_interval;
+	var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
+</script>
+

view/theme/frost-mobile/jot-end.tpl

@@ -0,0 +1,5 @@
+
+<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
+
+<script>if(typeof window.jotInit != 'undefined') initEditor();</script>
+

view/theme/frost-mobile/jot-header.tpl

@@ -0,0 +1,15 @@
+
+<script>
+	window.editSelect = $editselect;
+	window.isPublic = "$ispublic";
+	window.nickname = "$nickname";
+	window.linkURL = "$linkurl";
+	window.vidURL = "$vidurl";
+	window.audURL = "$audurl";
+	window.whereAreU = "$whereareu";
+	window.term = "$term";
+	window.baseURL = "$baseurl";
+	window.geoTag = function () { $geotag }
+</script>
+
+

view/theme/frost-mobile/jot.tpl

@@ -0,0 +1,86 @@
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="character-counter" class="grey"></div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="$action" method="post" >
+		<input type="hidden" name="type" value="$ptyp" />
+		<input type="hidden" name="profile_uid" value="$profile_uid" />
+		<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="post_id" value="$post_id" />
+		<input type="hidden" name="source" value="$mobileapp" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
+		<div id="jot-text-wrap">
+		<!--<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />-->
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
+		</div>
+
+<div id="profile-jot-submit-wrapper" class="jothidden">
+	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
+
+	<div id="profile-upload-wrapper" style="display: $visitor;" >
+		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
+	</div> 
+	<div id="profile-attach-wrapper" style="display: $visitor;" >
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
+	</div> 
+
+	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+	</div> 
+	<div id="profile-video-wrapper" style="display: $visitor;" >
+		<a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" style="display: $visitor;" >
+		<a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" style="display: $visitor;" >
+		<a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" style="display: none;" >
+		<a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
+	</div> 
+
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
+	</div>
+
+	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>
+
+	<div id="profile-jot-perms-end"></div>
+
+
+	<div id="profile-jot-plugin-wrapper">
+  	$jotplugins
+	</div>
+
+	<div id="profile-rotator-wrapper" style="display: $visitor;" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+	</div> 
+	
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper">
+			$acl
+			<hr style="clear:both"/>
+			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
+			<div id="profile-jot-email-end"></div>
+			$jotnets
+		</div>
+	</div>
+
+
+</div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+		{{ if $content }}<script>window.jotInit = true;</script>{{ endif }}

view/theme/frost-mobile/js/acl.js

@@ -0,0 +1,258 @@
+function ACL(backend_url, preset){
+	that = this;
+	
+	that.url = backend_url;
+	
+	that.kp_timer = null;
+	
+	if (preset==undefined) preset = [];
+	that.allow_cid = (preset[0] || []);
+	that.allow_gid = (preset[1] || []);
+	that.deny_cid  = (preset[2] || []);
+	that.deny_gid  = (preset[3] || []);
+	that.group_uids = [];
+	that.nw = 2; //items per row. should be calulated from #acl-list.width
+	
+	that.list_content = $j("#acl-list-content");
+	that.item_tpl = unescape($j(".acl-list-item[rel=acl-template]").html());
+	that.showall = $j("#acl-showall");
+
+	if (preset.length==0) that.showall.addClass("selected");
+	
+	/*events*/
+	that.showall.click(that.on_showall);
+	$j(".acl-button-show").live('click', that.on_button_show);
+	$j(".acl-button-hide").live('click', that.on_button_hide);
+	$j("#acl-search").keypress(that.on_search);
+	$j("#acl-wrapper").parents("form").submit(that.on_submit);
+	
+	/* startup! */
+	that.get(0,100);
+}
+
+ACL.prototype.on_submit = function(){
+	aclfileds = $j("#acl-fields").html("");
+	$j(that.allow_gid).each(function(i,v){
+		aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>");
+	});
+	$j(that.allow_cid).each(function(i,v){
+		aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>");
+	});
+	$j(that.deny_gid).each(function(i,v){
+		aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>");
+	});
+	$j(that.deny_cid).each(function(i,v){
+		aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>");
+	});	
+}
+
+ACL.prototype.search = function(){
+	var srcstr = $j("#acl-search").val();
+	that.list_content.html("");
+	that.get(0,100, srcstr);
+}
+
+ACL.prototype.on_search = function(event){
+	if (that.kp_timer) clearTimeout(that.kp_timer);
+	that.kp_timer = setTimeout( that.search, 1000);
+}
+
+ACL.prototype.on_showall = function(event){
+	event.preventDefault()
+	event.stopPropagation();
+	
+	if (that.showall.hasClass("selected")){
+		return false;
+	}
+	that.showall.addClass("selected");
+	
+	that.allow_cid = [];
+	that.allow_gid = [];
+	that.deny_cid  = [];
+	that.deny_gid  = [];
+	
+	that.update_view();
+	
+	return false;
+}
+
+ACL.prototype.on_button_show = function(event){
+	event.preventDefault()
+	event.stopImmediatePropagation()
+	event.stopPropagation();
+
+	/*that.showall.removeClass("selected");
+	$j(this).siblings(".acl-button-hide").removeClass("selected");
+	$j(this).toggleClass("selected");*/
+
+	that.set_allow($j(this).parent().attr('id'));
+
+	return false;
+}
+ACL.prototype.on_button_hide = function(event){
+	event.preventDefault()
+	event.stopImmediatePropagation()
+	event.stopPropagation();
+
+	/*that.showall.removeClass("selected");
+	$j(this).siblings(".acl-button-show").removeClass("selected");
+	$j(this).toggleClass("selected");*/
+
+	that.set_deny($j(this).parent().attr('id'));
+
+	return false;
+}
+
+ACL.prototype.set_allow = function(itemid){
+	type = itemid[0];
+	id 	 = parseInt(itemid.substr(1));
+	switch(type){
+		case "g":
+			if (that.allow_gid.indexOf(id)<0){
+				that.allow_gid.push(id)
+			}else {
+				that.allow_gid.remove(id);
+			}
+			if (that.deny_gid.indexOf(id)>=0) that.deny_gid.remove(id);
+			break;
+		case "c":
+			if (that.allow_cid.indexOf(id)<0){
+				that.allow_cid.push(id)
+			} else {
+				that.allow_cid.remove(id);
+			}
+			if (that.deny_cid.indexOf(id)>=0) that.deny_cid.remove(id);			
+			break;
+	}
+	that.update_view();
+}
+
+ACL.prototype.set_deny = function(itemid){
+	type = itemid[0];
+	id 	 = parseInt(itemid.substr(1));
+	switch(type){
+		case "g":
+			if (that.deny_gid.indexOf(id)<0){
+				that.deny_gid.push(id)
+			} else {
+				that.deny_gid.remove(id);
+			}
+			if (that.allow_gid.indexOf(id)>=0) that.allow_gid.remove(id);
+			break;
+		case "c":
+			if (that.deny_cid.indexOf(id)<0){
+				that.deny_cid.push(id)
+			} else {
+				that.deny_cid.remove(id);
+			}
+			if (that.allow_cid.indexOf(id)>=0) that.allow_cid.remove(id);
+			break;
+	}
+	that.update_view();
+}
+
+ACL.prototype.update_view = function(){
+	if (that.allow_gid.length==0 && that.allow_cid.length==0 &&
+		that.deny_gid.length==0 && that.deny_cid.length==0){
+			that.showall.addClass("selected");
+			/* jot acl */
+				$j('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$j('#jot-public').show();
+				$j('.profile-jot-net input').attr('disabled', false);			
+				if(typeof editor != 'undefined' && editor != false) {
+					$j('#profile-jot-desc').html(ispublic);
+				}
+			
+	} else {
+			that.showall.removeClass("selected");
+			/* jot acl */
+				$j('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$j('#jot-public').hide();
+				$j('.profile-jot-net input').attr('disabled', 'disabled');			
+				$j('#profile-jot-desc').html('&nbsp;');
+	}
+	$j("#acl-list-content .acl-list-item").each(function(){
+		$j(this).removeClass("groupshow grouphide");
+	});
+	
+	$j("#acl-list-content .acl-list-item").each(function(){
+		itemid = $j(this).attr('id');
+		type = itemid[0];
+		id 	 = parseInt(itemid.substr(1));
+		
+		btshow = $j(this).children(".acl-button-show").removeClass("selected");
+		bthide = $j(this).children(".acl-button-hide").removeClass("selected");	
+		
+		switch(type){
+			case "g":
+				var uclass = "";
+				if (that.allow_gid.indexOf(id)>=0){
+					btshow.addClass("selected");
+					bthide.removeClass("selected");
+					uclass="groupshow";
+				}
+				if (that.deny_gid.indexOf(id)>=0){
+					btshow.removeClass("selected");
+					bthide.addClass("selected");
+					uclass="grouphide";
+				}
+				
+				$j(that.group_uids[id]).each(function(i,v) {
+					if(uclass == "grouphide")
+						$j("#c"+v).removeClass("groupshow");
+					if(uclass != "") {
+						var cls = $j("#c"+v).attr('class');
+						if( cls == undefined)
+							return true;
+						var hiding = cls.indexOf('grouphide');
+						if(hiding == -1)
+							$j("#c"+v).addClass(uclass);
+					}
+				});
+				
+				break;
+			case "c":
+				if (that.allow_cid.indexOf(id)>=0){
+					btshow.addClass("selected");
+					bthide.removeClass("selected");
+				}
+				if (that.deny_cid.indexOf(id)>=0){
+					btshow.removeClass("selected");
+					bthide.addClass("selected");
+				}			
+		}
+		
+	});
+	
+}
+
+
+ACL.prototype.get = function(start,count, search){
+	var postdata = {
+		start:start,
+		count:count,
+		search:search,
+	}
+	
+	$j.ajax({
+		type:'POST',
+		url: that.url,
+		data: postdata,
+		dataType: 'json',
+		success:that.populate
+	});
+}
+
+ACL.prototype.populate = function(data){
+/*	var height = Math.ceil(data.tot / that.nw) * 42;
+	that.list_content.height(height);*/
+	$j(data.items).each(function(){
+		html = "<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";
+		html = html.format( this.photo, this.name, this.type, this.id, '', this.network, this.link );
+		if (this.uids!=undefined) that.group_uids[this.id] = this.uids;
+		//console.log(html);
+		that.list_content.append(html);
+	});
+	that.update_view();
+}
+

view/theme/frost-mobile/js/acl.min.js

@@ -0,0 +1 @@
+function ACL(e,t){that=this,that.url=e,that.kp_timer=null,t==undefined&&(t=[]),that.allow_cid=t[0]||[],that.allow_gid=t[1]||[],that.deny_cid=t[2]||[],that.deny_gid=t[3]||[],that.group_uids=[],that.nw=2,that.list_content=$j("#acl-list-content"),that.item_tpl=unescape($j(".acl-list-item[rel=acl-template]").html()),that.showall=$j("#acl-showall"),t.length==0&&that.showall.addClass("selected"),that.showall.click(that.on_showall),$j(".acl-button-show").live("click",that.on_button_show),$j(".acl-button-hide").live("click",that.on_button_hide),$j("#acl-search").keypress(that.on_search),$j("#acl-wrapper").parents("form").submit(that.on_submit),that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$j("#acl-fields").html(""),$j(that.allow_gid).each(function(e,t){aclfileds.append("<input type='hidden' name='group_allow[]' value='"+t+"'>")}),$j(that.allow_cid).each(function(e,t){aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+t+"'>")}),$j(that.deny_gid).each(function(e,t){aclfileds.append("<input type='hidden' name='group_deny[]' value='"+t+"'>")}),$j(that.deny_cid).each(function(e,t){aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+t+"'>")})},ACL.prototype.search=function(){var e=$j("#acl-search").val();that.list_content.html(""),that.get(0,100,e)},ACL.prototype.on_search=function(e){that.kp_timer&&clearTimeout(that.kp_timer),that.kp_timer=setTimeout(that.search,1e3)},ACL.prototype.on_showall=function(e){return e.preventDefault(),e.stopPropagation(),that.showall.hasClass("selected")?!1:(that.showall.addClass("selected"),that.allow_cid=[],that.allow_gid=[],that.deny_cid=[],that.deny_gid=[],that.update_view(),!1)},ACL.prototype.on_button_show=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_allow($j(this).parent().attr("id")),!1},ACL.prototype.on_button_hide=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_deny($j(this).parent().attr("id")),!1},ACL.prototype.set_allow=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.allow_gid.indexOf(id)<0?that.allow_gid.push(id):that.allow_gid.remove(id),that.deny_gid.indexOf(id)>=0&&that.deny_gid.remove(id);break;case"c":that.allow_cid.indexOf(id)<0?that.allow_cid.push(id):that.allow_cid.remove(id),that.deny_cid.indexOf(id)>=0&&that.deny_cid.remove(id)}that.update_view()},ACL.prototype.set_deny=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.deny_gid.indexOf(id)<0?that.deny_gid.push(id):that.deny_gid.remove(id),that.allow_gid.indexOf(id)>=0&&that.allow_gid.remove(id);break;case"c":that.deny_cid.indexOf(id)<0?that.deny_cid.push(id):that.deny_cid.remove(id),that.allow_cid.indexOf(id)>=0&&that.allow_cid.remove(id)}that.update_view()},ACL.prototype.update_view=function(){that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0?(that.showall.addClass("selected"),$j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show(),$j(".profile-jot-net input").attr("disabled",!1),typeof editor!="undefined"&&editor!=0&&$j("#profile-jot-desc").html(ispublic)):(that.showall.removeClass("selected"),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide(),$j(".profile-jot-net input").attr("disabled","disabled"),$j("#profile-jot-desc").html("&nbsp;")),$j("#acl-list-content .acl-list-item").each(function(){$j(this).removeClass("groupshow grouphide")}),$j("#acl-list-content .acl-list-item").each(function(){itemid=$j(this).attr("id"),type=itemid[0],id=parseInt(itemid.substr(1)),btshow=$j(this).children(".acl-button-show").removeClass("selected"),bthide=$j(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var e="";that.allow_gid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected"),e="groupshow"),that.deny_gid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"),e="grouphide"),$j(that.group_uids[id]).each(function(t,n){e=="grouphide"&&$j("#c"+n).removeClass("groupshow");if(e!=""){var r=$j("#c"+n).attr("class");if(r==undefined)return!0;var i=r.indexOf("grouphide");i==-1&&$j("#c"+n).addClass(e)}});break;case"c":that.allow_cid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected")),that.deny_cid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"))}})},ACL.prototype.get=function(e,t,n){var r={start:e,count:t,search:n};$j.ajax({type:"POST",url:that.url,data:r,dataType:"json",success:that.populate})},ACL.prototype.populate=function(e){$j(e.items).each(function(){html="<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>",html=html.format(this.photo,this.name,this.type,this.id,"",this.network,this.link),this.uids!=undefined&&(that.group_uids[this.id]=this.uids),that.list_content.append(html)}),that.update_view()};

view/theme/frost-mobile/js/fk.autocomplete.min.js

@@ -0,0 +1,5 @@
+/**
+ * Friendica people autocomplete
+ *
+ * require jQuery, jquery.textareas
+ */function ACPopup(e,t){this.idsel=-1,this.element=e,this.searchText="",this.ready=!0,this.kp_timer=!1,this.url=t;var n=530,r=130;if(typeof e.editorId=="undefined")style=$j(e).offset(),n=$j(e).width(),r=$j(e).height();else{var i=e.getContainer();typeof i!="undefined"&&(style=$j(i).offset(),n=$j(i).width(),r=$j(i).height())}style.top=style.top+r,style.width=n,style.position="absolute",style.display="none",this.cont=$j("<div class='acpopup'></div>"),this.cont.css(style),$j("body").append(this.cont)}function ContactAutocomplete(e,t){this.pattern=/@([^ \n]+)$/,this.popup=null;var n=this;$j(e).unbind("keydown"),$j(e).unbind("keyup"),$j(e).keydown(function(e){n.popup!==null&&n.popup.onkey(e)}),$j(e).keyup(function(e){cpos=$j(this).getSelection(),cpos.start==cpos.end&&(match=$j(this).val().substring(0,cpos.start).match(n.pattern),match!==null?(n.popup===null&&(n.popup=new ACPopup(this,t)),n.popup.ready&&match[1]!==n.popup.searchText&&n.popup.search(match[1]),n.popup.ready||(n.popup=null)):n.popup!==null&&(n.popup.close(),n.popup=null))})}ACPopup.prototype.close=function(){$j(this.cont).remove(),this.ready=!1},ACPopup.prototype.search=function(e){var t=this;this.searchText=e,this.kp_timer&&clearTimeout(this.kp_timer),this.kp_timer=setTimeout(function(){t._search()},500)},ACPopup.prototype._search=function(){console.log("_search");var e=this,t={start:0,count:100,search:this.searchText,type:"c"};$j.ajax({type:"POST",url:this.url,data:t,dataType:"json",success:function(t){e.cont.html(""),t.tot>0?(e.cont.show(),$j(t.items).each(function(){html="<img src='{0}' height='16px' width='16px'>{1} ({2})".format(this.photo,this.name,this.nick),e.add(html,this.nick.replace(" ","")+"+"+this.id+" - "+this.link)})):e.cont.hide()}})},ACPopup.prototype.add=function(e,n){var r=this,i=$j("<div class='acpopupitem' title='"+n+"'>"+e+"</div>");i.click(function(e){t=$j(this).attr("title").replace(new RegExp(" - .*"),""),typeof r.element.container=="undefined"?(el=$j(r.element),sel=el.getSelection(),sel.start=sel.start-r.searchText.length,el.setSelection(sel.start,sel.end).replaceSelectedText(t+" ").collapseSelection(!1),r.close()):(txt=tinyMCE.activeEditor.getContent(),newtxt=txt.replace(r.searchText,t+" "),tinyMCE.activeEditor.setContent(newtxt),tinyMCE.activeEditor.focus(),r.close())}),$j(this.cont).append(i)},ACPopup.prototype.onkey=function(e){e.keyCode=="13"&&(this.idsel>-1?(this.cont.children()[this.idsel].click(),e.preventDefault()):this.close()),e.keyCode=="38"&&(cmax=this.cont.children().size()-1,this.idsel--,this.idsel<0&&(this.idsel=cmax),e.preventDefault());if(e.keyCode=="40"||e.keyCode=="9")cmax=this.cont.children().size()-1,this.idsel++,this.idsel>cmax&&(this.idsel=0),e.preventDefault();if(e.keyCode=="38"||e.keyCode=="40"||e.keyCode=="9")this.cont.children().removeClass("selected"),$j(this.cont.children()[this.idsel]).addClass("selected");e.keyCode=="27"&&this.close()},function(e){$j.fn.contact_autocomplete=function(e){this.each(function(){new ContactAutocomplete(this,e)})}}(jQuery);

view/theme/frost-mobile/js/main.js

@@ -0,0 +1,663 @@
+
+  function openClose(theID) {
+    if(document.getElementById(theID).style.display == "block") { 
+      document.getElementById(theID).style.display = "none" 
+    }
+    else { 
+      document.getElementById(theID).style.display = "block" 
+    } 
+  }
+
+  function openMenu(theID) {
+      document.getElementById(theID).style.display = "block" 
+  }
+
+  function closeMenu(theID) {
+      document.getElementById(theID).style.display = "none" 
+  }
+
+
+
+	var src = null;
+	var prev = null;
+	var livetime = null;
+	var msie = false;
+	var stopped = false;
+	var totStopped = false;
+	var timer = null;
+	var pr = 0;
+	var liking = 0;
+	var in_progress = false;
+	var langSelect = false;
+	var commentBusy = false;
+	var last_popup_menu = null;
+	var last_popup_button = null;
+
+	$j(function() {
+		$j.ajaxSetup({cache: false});
+
+		msie = $j.browser.msie ;
+		
+		/* setup tooltips *//*
+		$j("a,.tt").each(function(){
+			var e = $j(this);
+			var pos="bottom";
+			if (e.hasClass("tttop")) pos="top";
+			if (e.hasClass("ttbottom")) pos="bottom";
+			if (e.hasClass("ttleft")) pos="left";
+			if (e.hasClass("ttright")) pos="right";
+			e.tipTip({defaultPosition: pos, edgeOffset: 8});
+		});*/
+		
+		
+		
+		/* setup onoff widgets */
+		$j(".onoff input").each(function(){
+			val = $j(this).val();
+			id = $j(this).attr("id");
+			$j("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
+			
+		});
+		$j(".onoff > a").click(function(event){
+			event.preventDefault();	
+			var input = $j(this).siblings("input");
+			var val = 1-input.val();
+			var id = input.attr("id");
+			$j("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
+			$j("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden");
+			input.val(val);
+			//console.log(id);
+		});
+		
+		/* setup field_richtext */
+		/*setupFieldRichtext();*/
+
+		/* popup menus */
+		function close_last_popup_menu(e) {
+
+ 			if( last_popup_menu ) {
+				if( '#' + last_popup_menu.attr('id') !== $j(e.target).attr('rel')) {
+		 			last_popup_menu.hide();
+					if (last_popup_menu.attr('id') == "nav-notifications-menu" ) $j('section').show();
+		 			last_popup_button.removeClass("selected");
+		 			last_popup_menu = null;
+		 			last_popup_button = null;
+				}
+			}
+		}
+		$j('img[rel^=#]').click(function(e){
+
+			close_last_popup_menu(e);
+			menu = $j( $j(this).attr('rel') );
+			e.preventDefault();
+			e.stopPropagation();
+
+			if (menu.attr('popup')=="false") return false;
+
+//			$j(this).parent().toggleClass("selected");
+//			menu.toggle();
+
+			if (menu.css("display") == "none") {
+				$j(this).parent().addClass("selected");
+				menu.show();
+				if (menu.attr('id') == "nav-notifications-menu" ) $j('section').hide();
+				last_popup_menu = menu;
+				last_popup_button = $j(this).parent();
+			} else {
+				$j(this).parent().removeClass("selected");
+				menu.hide();
+				if (menu.attr('id') == "nav-notifications-menu" ) $j('section').show();
+				last_popup_menu = null;
+				last_popup_button = null;
+			}
+			return false;
+		});
+		$j('html').click(function(e) {
+			close_last_popup_menu(e);
+		});
+		
+		// fancyboxes
+		/*$j("a.popupbox").fancybox({
+			'transitionIn' : 'elastic',
+			'transitionOut' : 'elastic'
+		});*/
+		
+
+		/* notifications template */
+		var notifications_tpl= unescape($j("#nav-notifications-template[rel=template]").html());
+		var notifications_all = unescape($j('<div>').append( $j("#nav-notifications-see-all").clone() ).html()); //outerHtml hack
+		var notifications_mark = unescape($j('<div>').append( $j("#nav-notifications-mark-all").clone() ).html()); //outerHtml hack
+		var notifications_empty = unescape($j("#nav-notifications-menu").html());
+		
+		/* nav update event  */
+		$j('nav').bind('nav-update', function(e,data){;
+			var invalid = $j(data).find('invalid').text();
+			if(invalid == 1) { window.location.href=window.location.href }
+
+			var net = $j(data).find('net').text();
+			if(net == 0) { net = ''; $j('#net-update').removeClass('show') } else { $j('#net-update').addClass('show') }
+			$j('#net-update').html(net);
+
+			var home = $j(data).find('home').text();
+			if(home == 0) { home = '';  $j('#home-update').removeClass('show') } else { $j('#home-update').addClass('show') }
+			$j('#home-update').html(home);
+			
+			var intro = $j(data).find('intro').text();
+			if(intro == 0) { intro = '';  $j('#intro-update').removeClass('show') } else { $j('#intro-update').addClass('show') }
+			$j('#intro-update').html(intro);
+
+			var mail = $j(data).find('mail').text();
+			if(mail == 0) { mail = '';  $j('#mail-update').removeClass('show') } else { $j('#mail-update').addClass('show') }
+			$j('#mail-update').html(mail);
+			
+			var intro = $j(data).find('intro').text();
+			if(intro == 0) { intro = '';  $j('#intro-update-li').removeClass('show') } else { $j('#intro-update-li').addClass('show') }
+			$j('#intro-update-li').html(intro);
+
+			var mail = $j(data).find('mail').text();
+			if(mail == 0) { mail = '';  $j('#mail-update-li').removeClass('show') } else { $j('#mail-update-li').addClass('show') }
+			$j('#mail-update-li').html(mail);
+
+			var eNotif = $j(data).find('notif')
+			
+			if (eNotif.children("note").length==0){
+				$j("#nav-notifications-menu").html(notifications_empty);
+			} else {
+				nnm = $j("#nav-notifications-menu");
+				nnm.html(notifications_all + notifications_mark);
+				//nnm.attr('popup','true');
+				eNotif.children("note").each(function(){
+					e = $j(this);
+					text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
+					html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen'));
+					nnm.append(html);
+				});
+			}
+			notif = eNotif.attr('count');
+			if (notif>0){
+				$j("#nav-notifications-linkmenu").addClass("on");
+			} else {
+				$j("#nav-notifications-linkmenu").removeClass("on");
+			}
+			if(notif == 0) { notif = ''; $j('#notify-update').removeClass('show') } else { $j('#notify-update').addClass('show') }
+			$j('#notify-update').html(notif);
+			
+			var eSysmsg = $j(data).find('sysmsgs');
+			eSysmsg.children("notice").each(function(){
+				text = $j(this).text();
+				$j.jGrowl(text, { sticky: false, theme: 'notice', life: 1500 });
+			});
+			eSysmsg.children("info").each(function(){
+				text = $j(this).text();
+				$j.jGrowl(text, { sticky: false, theme: 'info', life: 1000 });
+			});
+			
+		});
+		
+		
+ 		NavUpdate(); 
+		// Allow folks to stop the ajax page updates with the pause/break key
+/*		$j(document).keydown(function(event) {
+			if(event.keyCode == '8') {
+				var target = event.target || event.srcElement;
+				if (!/input|textarea/i.test(target.nodeName)) {
+					return false;
+				}
+			}
+			if(event.keyCode == '19' || (event.ctrlKey && event.which == '32')) {
+				event.preventDefault();
+				if(stopped == false) {
+					stopped = true;
+					if (event.ctrlKey) {
+						totStopped = true;
+					}
+					$j('#pause').html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />');
+				} else {
+					unpause();
+				}
+			} else {
+				if (!totStopped) {
+					unpause();
+				}
+			}
+		});*/
+		
+		
+	});
+
+	function NavUpdate() {
+
+		if(! stopped) {
+			var pingCmd = 'ping' + ((localUser != 0) ? '?f=&uid=' + localUser : '');
+			$j.get(pingCmd,function(data) {
+				$j(data).find('result').each(function() {
+					// send nav-update event
+					$j('nav').trigger('nav-update', this);
+					
+					
+					// start live update
+
+					
+
+					if($j('#live-network').length)   { src = 'network'; liveUpdate(); }
+					if($j('#live-profile').length)   { src = 'profile'; liveUpdate(); }
+					if($j('#live-community').length) { src = 'community'; liveUpdate(); }
+					if($j('#live-notes').length)     { src = 'notes'; liveUpdate(); }
+					if($j('#live-display').length) {
+						if(liking) {
+							liking = 0;
+							window.location.href=window.location.href 
+						}
+					}
+					if($j('#live-photos').length) {
+						if(liking) {
+							liking = 0;
+							window.location.href=window.location.href 
+						}
+					}
+
+					
+					
+					
+				});
+			}) ;
+		}
+		timer = setTimeout(NavUpdate,updateInterval);
+	}
+
+	function liveUpdate() {
+		if((src == null) || (stopped) || (! profile_uid)) { $j('.like-rotator').hide(); return; }
+		if(($j('.comment-edit-text-full').length) || (in_progress)) {
+			if(livetime) {
+				clearTimeout(livetime);
+			}
+			livetime = setTimeout(liveUpdate, 10000);
+			return;
+		}
+		if(livetime != null)
+			livetime = null;
+
+		prev = 'live-' + src;
+
+		in_progress = true;
+		var udargs = ((netargs.length) ? '/' + netargs : '');
+		var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0);
+
+		$j.get(update_url,function(data) {
+			in_progress = false;
+			//			$j('.collapsed-comments',data).each(function() {
+			//	var ident = $j(this).attr('id');
+			//	var is_hidden = $j('#' + ident).is(':hidden');
+			//	if($j('#' + ident).length) {
+			//		$j('#' + ident).replaceWith($j(this));
+			//		if(is_hidden)
+			//			$j('#' + ident).hide();
+			//	}
+			//});
+
+			// add a new thread
+
+			$j('.tread-wrapper',data).each(function() {
+				var ident = $j(this).attr('id');
+
+				if($j('#' + ident).length == 0 && profile_page == 1) {
+					$j('img',this).each(function() {
+						$j(this).attr('src',$j(this).attr('dst'));
+					});
+					$j('#' + prev).after($j(this));
+				}
+				else {
+					$j('img',this).each(function() {
+						$j(this).attr('src',$j(this).attr('dst'));
+					});
+					$j('#' + ident).replaceWith($j(this));
+				}
+				prev = ident;
+			});
+
+			// reset vars for inserting individual items
+
+			/*prev = 'live-' + src;
+
+			$j('.wall-item-outside-wrapper',data).each(function() {
+				var ident = $j(this).attr('id');
+
+				if($j('#' + ident).length == 0 && prev != 'live-' + src) {
+						$j('img',this).each(function() {
+							$j(this).attr('src',$j(this).attr('dst'));
+						});
+						$j('#' + prev).after($j(this));
+				}
+				else { 
+					$j('#' + ident + ' ' + '.wall-item-ago').replaceWith($j(this).find('.wall-item-ago')); 
+					if($j('#' + ident + ' ' + '.comment-edit-text-empty').length)
+						$j('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($j(this).find('.wall-item-comment-wrapper'));
+					$j('#' + ident + ' ' + '.hide-comments-total').replaceWith($j(this).find('.hide-comments-total'));
+					$j('#' + ident + ' ' + '.wall-item-like').replaceWith($j(this).find('.wall-item-like'));
+					$j('#' + ident + ' ' + '.wall-item-dislike').replaceWith($j(this).find('.wall-item-dislike'));
+					$j('#' + ident + ' ' + '.my-comment-photo').each(function() {
+						$j(this).attr('src',$j(this).attr('dst'));
+					});
+				}
+				prev = ident; 
+			});*/
+			
+			$j('.like-rotator').hide();
+			if(commentBusy) {
+				commentBusy = false;
+				$j('body').css('cursor', 'auto');
+			}
+			/* autocomplete @nicknames */
+			$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
+		});
+	}
+
+	function imgbright(node) {
+		$j(node).removeClass("drophide").addClass("drop");
+	}
+
+	function imgdull(node) {
+		$j(node).removeClass("drop").addClass("drophide");
+	}
+
+	// Since our ajax calls are asynchronous, we will give a few 
+	// seconds for the first ajax call (setting like/dislike), then 
+	// run the updater to pick up any changes and display on the page.
+	// The updater will turn any rotators off when it's done. 
+	// This function will have returned long before any of these
+	// events have completed and therefore there won't be any
+	// visible feedback that anything changed without all this
+	// trickery. This still could cause confusion if the "like" ajax call
+	// is delayed and NavUpdate runs before it completes.
+
+	function dolike(ident,verb) {
+		unpause();
+		$j('#like-rotator-' + ident.toString()).show();
+		$j.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
+//		if(timer) clearTimeout(timer);
+//		timer = setTimeout(NavUpdate,3000);
+		liking = 1;
+	}
+
+	function dostar(ident) {
+		ident = ident.toString();
+		//$j('#like-rotator-' + ident).show();
+		$j.get('starred/' + ident, function(data) {
+			if(data.match(/1/)) {
+				$j('#starred-' + ident).addClass('starred');
+				$j('#starred-' + ident).removeClass('unstarred');
+				$j('#star-' + ident).addClass('hidden');
+				$j('#unstar-' + ident).removeClass('hidden');
+			}
+			else {			
+				$j('#starred-' + ident).addClass('unstarred');
+				$j('#starred-' + ident).removeClass('starred');
+				$j('#star-' + ident).removeClass('hidden');
+				$j('#unstar-' + ident).addClass('hidden');
+			}
+			//$j('#like-rotator-' + ident).hide();	
+		});
+	}
+
+	function getPosition(e) {
+		var cursor = {x:0, y:0};
+		if ( e.pageX || e.pageY  ) {
+			cursor.x = e.pageX;
+			cursor.y = e.pageY;
+		}
+		else {
+			if( e.clientX || e.clientY ) {
+				cursor.x = e.clientX + (document.documentElement.scrollLeft || document.body.scrollLeft) - document.documentElement.clientLeft;
+				cursor.y = e.clientY + (document.documentElement.scrollTop  || document.body.scrollTop)  - document.documentElement.clientTop;
+			}
+			else {
+				if( e.x || e.y ) {
+					cursor.x = e.x;
+					cursor.y = e.y;
+				}
+			}
+		}
+		return cursor;
+	}
+
+	var lockvisible = false;
+
+	function lockview(event,id) {
+		event = event || window.event;
+		cursor = getPosition(event);
+		if(lockvisible) {
+			lockviewhide();
+		}
+		else {
+			lockvisible = true;
+			$j.get('lockview/' + id, function(data) {
+				$j('#panel').html(data);
+				$j('#panel').css({ 'left': cursor.x + 5 , 'top': cursor.y + 5});
+				$j('#panel').show();
+			});
+		}
+	}
+
+	function lockviewhide() {
+		lockvisible = false;
+		$j('#panel').hide();
+	}
+
+	function post_comment(id) {
+		unpause();
+		commentBusy = true;
+		$j('body').css('cursor', 'wait');
+		$j("#comment-preview-inp-" + id).val("0");
+		$j.post(  
+             "item",  
+             $j("#comment-edit-form-" + id).serialize(),
+			function(data) {
+				if(data.success) {
+					$j("#comment-edit-wrapper-" + id).hide();
+					$j("#comment-edit-text-" + id).val('');
+    	  			var tarea = document.getElementById("comment-edit-text-" + id);
+					if(tarea)
+						commentClose(tarea,id);
+					if(timer) clearTimeout(timer);
+					timer = setTimeout(NavUpdate,10);
+				}
+				if(data.reload) {
+					window.location.href=data.reload;
+				}
+			},
+			"json"  
+         );  
+         return false;  
+	}
+
+
+	function preview_comment(id) {
+		$j("#comment-preview-inp-" + id).val("1");
+		$j("#comment-edit-preview-" + id).show();
+		$j.post(  
+             "item",  
+             $j("#comment-edit-form-" + id).serialize(),
+			function(data) {
+				if(data.preview) {
+						
+					$j("#comment-edit-preview-" + id).html(data.preview);
+					$j("#comment-edit-preview-" + id + " a").click(function() { return false; });
+				}
+			},
+			"json"  
+         );  
+         return true;  
+	}
+
+
+
+	function preview_post() {
+		$j("#jot-preview").val("1");
+		$j("#jot-preview-content").show();
+		tinyMCE.triggerSave();
+		$j.post(  
+			"item",  
+			$j("#profile-jot-form").serialize(),
+			function(data) {
+				if(data.preview) {			
+					$j("#jot-preview-content").html(data.preview);
+					$j("#jot-preview-content" + " a").click(function() { return false; });
+				}
+			},
+			"json"  
+		);  
+		$j("#jot-preview").val("0");
+		return true;  
+	}
+
+
+	function unpause() {
+		// unpause auto reloads if they are currently stopped
+		totStopped = false;
+		stopped = false;
+	    $j('#pause').html('');
+	}
+		
+
+    function bin2hex(s){  
+        // Converts the binary representation of data to hex    
+        //   
+        // version: 812.316  
+        // discuss at: http://phpjs.org/functions/bin2hex  
+        // +   original by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)  
+        // +   bugfixed by: Onno Marsman  
+        // +   bugfixed by: Linuxworld  
+        // *     example 1: bin2hex('Kev');  
+        // *     returns 1: '4b6576'  
+        // *     example 2: bin2hex(String.fromCharCode(0x00));  
+        // *     returns 2: '00'  
+        var v,i, f = 0, a = [];  
+        s += '';  
+        f = s.length;  
+          
+        for (i = 0; i<f; i++) {  
+            a[i] = s.charCodeAt(i).toString(16).replace(/^([\da-f])$/,"0$1");  
+        }  
+          
+        return a.join('');  
+    }  
+
+	function groupChangeMember(gid, cid, sec_token) {
+		$j('body .fakelink').css('cursor', 'wait');
+		$j.get('group/' + gid + '/' + cid + "?t=" + sec_token, function(data) {
+				$j('#group-update-wrapper').html(data);
+				$j('body .fakelink').css('cursor', 'auto');				
+		});
+	}
+
+	function profChangeMember(gid,cid) {
+		$j('body .fakelink').css('cursor', 'wait');
+		$j.get('profperm/' + gid + '/' + cid, function(data) {
+				$j('#prof-update-wrapper').html(data);
+				$j('body .fakelink').css('cursor', 'auto');				
+		});
+	}
+
+	function contactgroupChangeMember(gid,cid) {
+		$j('body').css('cursor', 'wait');
+		$j.get('contactgroup/' + gid + '/' + cid, function(data) {
+				$j('body').css('cursor', 'auto');
+		});
+	}
+
+
+function checkboxhighlight(box) {
+  if($j(box).is(':checked')) {
+	$j(box).addClass('checkeditem');
+  }
+  else {
+	$j(box).removeClass('checkeditem');
+  }
+}
+
+function notifyMarkAll() {
+	$j.get('notify/mark/all', function(data) {
+		if(timer) clearTimeout(timer);
+		timer = setTimeout(NavUpdate,1000);
+	});
+}
+
+
+// code from http://www.tinymce.com/wiki.php/How-to_implement_a_custom_file_browser
+function fcFileBrowser (field_name, url, type, win) {
+    /* TODO: If you work with sessions in PHP and your client doesn't accept cookies you might need to carry
+       the session name and session ID in the request string (can look like this: "?PHPSESSID=88p0n70s9dsknra96qhuk6etm5").
+       These lines of code extract the necessary parameters and add them back to the filebrowser URL again. */
+
+
+    var cmsURL = baseurl+"/fbrowser/"+type+"/";
+
+    tinyMCE.activeEditor.windowManager.open({
+        file : cmsURL,
+        title : 'File Browser',
+        width : 420,  // Your dimensions may differ - toy around with them!
+        height : 400,
+        resizable : "yes",
+        inline : "yes",  // This parameter only has an effect if you use the inlinepopups plugin!
+        close_previous : "no"
+    }, {
+        window : win,
+        input : field_name
+    });
+    return false;
+  }
+
+function setupFieldRichtext(){
+	tinyMCE.init({
+		theme : "advanced",
+		mode : "specific_textareas",
+		editor_selector: "fieldRichtext",
+		plugins : "bbcode,paste, inlinepopups",
+		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
+		theme_advanced_buttons2 : "",
+		theme_advanced_buttons3 : "",
+		theme_advanced_toolbar_location : "top",
+		theme_advanced_toolbar_align : "center",
+		theme_advanced_blockformats : "blockquote,code",
+		paste_text_sticky : true,
+		entity_encoding : "raw",
+		add_unload_trigger : false,
+		remove_linebreaks : false,
+		force_p_newlines : false,
+		force_br_newlines : true,
+		forced_root_block : '',
+		convert_urls: false,
+		content_css: baseurl+"/view/custom_tinymce.css",
+		theme_advanced_path : false,
+		file_browser_callback : "fcFileBrowser",
+	});
+}
+
+
+/** 
+ * sprintf in javascript 
+ *	"{0} and {1}".format('zero','uno'); 
+ **/
+String.prototype.format = function() {
+    var formatted = this;
+    for (var i = 0; i < arguments.length; i++) {
+        var regexp = new RegExp('\\{'+i+'\\}', 'gi');
+        formatted = formatted.replace(regexp, arguments[i]);
+    }
+    return formatted;
+};
+// Array Remove
+Array.prototype.remove = function(item) {
+  to=undefined; from=this.indexOf(item);
+  var rest = this.slice((to || from) + 1 || this.length);
+  this.length = from < 0 ? this.length + from : from;
+  return this.push.apply(this, rest);
+};
+
+function previewTheme(elm) {
+	theme = $j(elm).val();
+	$j.getJSON('pretheme?f=&theme=' + theme,function(data) {
+			$j('#theme-preview').html('<div id="theme-desc">' + data.desc + '</div><div id="theme-version">' + data.version + '</div><div id="theme-credits">' + data.credits + '</div><a href="' + data.img + '"><img src="' + data.img + '" width="320" height="240" alt="' + theme + '" /></a>');
+	});
+
+}

view/theme/frost-mobile/js/theme.js

@@ -0,0 +1,764 @@
+$j(document).ready(function() {
+
+		/* enable tinymce on focus and click */
+		$j("#profile-jot-text").focus(enableOnUser);
+		$j("#profile-jot-text").click(enableOnUser);
+
+	if(typeof window.AjaxUpload != "undefined") {
+		switch(window.ajaxType) {
+			case 'jot-header':
+				var uploader = new window.AjaxUpload(
+					'wall-image-upload',
+					{ action: 'wall_upload/'+window.nickname,
+						name: 'userfile',
+						onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
+						onComplete: function(file,response) {
+							addeditortext(response);
+							$j('#profile-rotator').hide();
+						}				 
+					}
+				);
+
+				var file_uploader = new window.AjaxUpload(
+					'wall-file-upload',
+					{ action: 'wall_attach/'+window.nickname,
+						name: 'userfile',
+						onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
+						onComplete: function(file,response) {
+							addeditortext(response);
+							$j('#profile-rotator').hide();
+						}				 
+					}
+				);
+				break;
+			case 'msg-header':
+				var uploader = new window.AjaxUpload(
+					'prvmail-upload',
+					{ action: 'wall_upload/' + window.nickname,
+						name: 'userfile',
+						onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
+						onComplete: function(file,response) {
+							tinyMCE.execCommand('mceInsertRawHTML',false,response);
+							$j('#profile-rotator').hide();
+						}				 
+					}
+				);
+				break;
+			default:
+				break;
+		}
+	}
+
+	if(typeof acl=="undefined"){
+		acl = new ACL(
+			baseurl+"/acl",
+			[ window.allowCID,window.allowGID,window.denyCID,window.denyGID ]
+		);
+	}
+
+/*$j('html').click(function() { $j("#nav-notifications-menu" ).hide(); });*/
+
+	/*$j('.group-edit-icon').hover(
+		function() {
+			$j(this).addClass('icon'); $j(this).removeClass('iconspacer');},
+		function() {
+			$j(this).removeClass('icon'); $j(this).addClass('iconspacer');}
+	);
+
+	$j('.sidebar-group-element').hover(
+		function() {
+			id = $j(this).attr('id');
+			$j('#edit-' + id).addClass('icon'); $j('#edit-' + id).removeClass('iconspacer');},
+
+		function() {
+			id = $j(this).attr('id');
+			$j('#edit-' + id).removeClass('icon');$j('#edit-' + id).addClass('iconspacer');}
+	);
+
+
+	$j('.savedsearchdrop').hover(
+		function() {
+			$j(this).addClass('drop'); $j(this).addClass('icon'); $j(this).removeClass('iconspacer');},
+		function() {
+			$j(this).removeClass('drop'); $j(this).removeClass('icon'); $j(this).addClass('iconspacer');}
+	);
+
+	$j('.savedsearchterm').hover(
+		function() {
+			id = $j(this).attr('id');
+			$j('#drop-' + id).addClass('icon'); 	$j('#drop-' + id).addClass('drophide'); $j('#drop-' + id).removeClass('iconspacer');},
+
+		function() {
+			id = $j(this).attr('id');
+			$j('#drop-' + id).removeClass('icon');$j('#drop-' + id).removeClass('drophide'); $j('#drop-' + id).addClass('iconspacer');}
+	);*/
+
+	if(window.autoCompleteType == "display-head") {
+		//$j(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+		// make auto-complete work in more places
+		//$j(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+		$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+	}
+
+	if(window.aclType == "event_head") {
+		$j('#events-calendar').fullCalendar({
+			events: baseurl + '/events/json/',
+			header: {
+				left: 'prev,next today',
+				center: 'title',
+				right: 'month,agendaWeek,agendaDay'
+			},			
+			timeFormat: 'H(:mm)',
+			eventClick: function(calEvent, jsEvent, view) {
+				showEvent(calEvent.id);
+			},
+			
+			eventRender: function(event, element, view) {
+				//console.log(view.name);
+				if (event.item['author-name']==null) return;
+				switch(view.name){
+					case "month":
+					element.find(".fc-event-title").html(
+						"<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(
+							event.item['author-avatar'],
+							event.item['author-name'],
+							event.title
+					));
+					break;
+					case "agendaWeek":
+					element.find(".fc-event-title").html(
+						"<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(
+							event.item['author-avatar'],
+							event.item['author-name'],
+							event.item.desc,
+							event.item.location
+					));
+					break;
+					case "agendaDay":
+					element.find(".fc-event-title").html(
+						"<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(
+							event.item['author-avatar'],
+							event.item['author-name'],
+							event.item.desc,
+							event.item.location
+					));
+					break;
+				}
+			}
+			
+		});
+		
+		// center on date
+		var args=location.href.replace(baseurl,"").split("/");
+		if (args.length>=4) {
+			$j("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
+		} 
+		
+		// show event popup
+		var hash = location.hash.split("-")
+		if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
+	}	
+
+	if(window.aclType == "settings-head" || window.aclType == "photos_head" || window.aclType == "event_head") {
+		$j('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+			var selstr;
+			$j('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+				selstr = $j(this).text();
+				$j('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$j('#jot-public').hide();
+			});
+			if(selstr == null) { 
+				$j('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$j('#jot-public').show();
+			}
+
+		}).trigger('change');
+	}
+
+	switch(window.autocompleteType) {
+		case 'msg-header':
+			var a = $j("#recip").autocomplete({ 
+				serviceUrl: baseurl + '/acl',
+				minChars: 2,
+				width: 350,
+				onSelect: function(value,data) {
+					$j("#recip-complete").val(data);
+				}			
+			});
+			break;
+		case 'contacts-head':
+			var a = $j("#contacts-search").autocomplete({ 
+				serviceUrl: baseurl + '/acl',
+				minChars: 2,
+				width: 350,
+			});
+			a.setOptions({ params: { type: 'a' }});
+			break;
+		default:
+			break;
+	}
+
+
+	$j('#event-share-checkbox').change(function() {
+
+		if ($j('#event-share-checkbox').is(':checked')) { 
+			$j('#acl-wrapper').show();
+		}
+		else {
+			$j('#acl-wrapper').hide();
+		}
+	}).trigger('change');
+
+
+	$j(".popupbox").click(function () {
+		var parent = $j( $j(this).attr('href') ).parent();
+		if (parent.css('display') == 'none') {
+			parent.show();
+		} else {
+			parent.hide();
+		}
+		return false;
+	});
+
+});
+
+// update pending count //
+$j(function(){
+
+	$j("nav").bind('nav-update',  function(e,data){
+		var elm = $j('#pending-update');
+		var register = $j(data).find('register').text();
+		if (register=="0") { register=""; elm.hide();} else { elm.show(); }
+		elm.html(register);
+	});
+});
+
+
+
+function insertFormatting(comment,BBcode,id) {
+	
+	var tmpStr = $j("#comment-edit-text-" + id).val();
+	if(tmpStr == comment) {
+		tmpStr = "";
+		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+		openMenu("comment-edit-submit-wrapper-" + id);
+		$j("#comment-edit-text-" + id).val(tmpStr);
+	}
+
+	textarea = document.getElementById("comment-edit-text-" +id);
+	if (document.selection) {
+		textarea.focus();
+		selected = document.selection.createRange();
+		if (BBcode == "url"){
+			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+			} else			
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
+		var start = textarea.selectionStart;
+		var end = textarea.selectionEnd;
+		if (BBcode == "url"){
+			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+			} else
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+	}
+	return true;
+}
+
+function cmtBbOpen(id) {
+	$j(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+	$j(".comment-edit-bb-" + id).hide();
+}
+
+
+
+
+var editor=false;
+var textlen = 0;
+var plaintext = 'none';//window.editSelect;
+	var ispublic = window.isPublic;
+
+function initEditor(cb){
+	if (editor==false){
+//		$j("#profile-jot-text-loading").show();
+		if(plaintext == 'none') {
+//			$j("#profile-jot-text-loading").hide();
+			$j("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+			$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+			editor = true;
+/*			$j("a#jot-perms-icon").fancybox({
+				'transitionIn' : 'none',
+				'transitionOut' : 'none'
+			});*/
+			$j("a#jot-perms-icon, a#settings-default-perms-menu").click(function () {
+				var parent = $j("#profile-jot-acl-wrapper").parent();
+				if (parent.css('display') == 'none') {
+					parent.show();
+				} else {
+					parent.hide();
+				}
+//				$j("#profile-jot-acl-wrapper").parent().toggle();
+				return false;
+			});
+			$j(".jothidden").show();
+			if (typeof cb!="undefined") cb();
+			return;
+		}	
+/*		tinyMCE.init({
+			theme : "advanced",
+			mode : "specific_textareas",
+			editor_selector: window.editSelect,
+			auto_focus: "profile-jot-text",
+			plugins : "bbcode,paste,autoresize, inlinepopups",
+			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
+			theme_advanced_buttons2 : "",
+			theme_advanced_buttons3 : "",
+			theme_advanced_toolbar_location : "top",
+			theme_advanced_toolbar_align : "center",
+			theme_advanced_blockformats : "blockquote,code",
+			gecko_spellcheck : true,
+			paste_text_sticky : true,
+			entity_encoding : "raw",
+			add_unload_trigger : false,
+			remove_linebreaks : false,
+			force_p_newlines : false,
+			force_br_newlines : true,
+			forced_root_block : '',
+			convert_urls: false,
+			content_css: "$baseurl/view/custom_tinymce.css",
+			theme_advanced_path : false,
+			file_browser_callback : "fcFileBrowser",
+			setup : function(ed) {
+				cPopup = null;
+				ed.onKeyDown.add(function(ed,e) {
+					if(cPopup !== null)
+						cPopup.onkey(e);
+				});
+
+				ed.onKeyUp.add(function(ed, e) {
+					var txt = tinyMCE.activeEditor.getContent();
+					match = txt.match(/@([^ \n]+)$/);
+					if(match!==null) {
+						if(cPopup === null) {
+							cPopup = new ACPopup(this,baseurl+"/acl");
+						}
+						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
+						if(! cPopup.ready) cPopup = null;
+					}
+					else {
+						if(cPopup !== null) { cPopup.close(); cPopup = null; }
+					}
+
+					textlen = txt.length;
+					if(textlen != 0 && $j('#jot-perms-icon').is('.unlock')) {
+						$j('#profile-jot-desc').html(ispublic);
+					}
+					else {
+						$j('#profile-jot-desc').html('&nbsp;');
+					}	 
+
+				 //Character count
+
+					if(textlen <= 140) {
+						$j('#character-counter').removeClass('red');
+						$j('#character-counter').removeClass('orange');
+						$j('#character-counter').addClass('grey');
+					}
+					if((textlen > 140) && (textlen <= 420)) {
+						$j('#character-counter').removeClass('grey');
+						$j('#character-counter').removeClass('red');
+						$j('#character-counter').addClass('orange');
+					}
+					if(textlen > 420) {
+						$j('#character-counter').removeClass('grey');
+						$j('#character-counter').removeClass('orange');
+						$j('#character-counter').addClass('red');
+					}
+					$j('#character-counter').text(textlen);
+				});
+
+				ed.onInit.add(function(ed) {
+					ed.pasteAsPlainText = true;
+					$j("#profile-jot-text-loading").hide();
+					$j(".jothidden").show();
+					if (typeof cb!="undefined") cb();
+				});
+
+			}
+		});
+		editor = true;
+		// setup acl popup
+		$j("a#jot-perms-icon").fancybox({
+			'transitionIn' : 'elastic',
+			'transitionOut' : 'elastic'
+		}); */
+	} else {
+		if (typeof cb!="undefined") cb();
+	}
+}
+
+function enableOnUser(){
+	if (editor) return;
+	$j(this).val("");
+	initEditor();
+}
+
+function wallInitEditor() {
+	var plaintext = window.editSelect;
+
+	if(plaintext != 'none') {
+		tinyMCE.init({
+			theme : "advanced",
+			mode : "specific_textareas",
+			editor_selector: /(profile-jot-text|prvmail-text)/,
+			plugins : "bbcode,paste",
+			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_blockformats : "blockquote,code",
+			gecko_spellcheck : true,
+			paste_text_sticky : true,
+			entity_encoding : "raw",
+			add_unload_trigger : false,
+			remove_linebreaks : false,
+			force_p_newlines : false,
+			force_br_newlines : true,
+			forced_root_block : '',
+			convert_urls: false,
+			content_css: baseurl + "/view/custom_tinymce.css",
+				 //Character count
+			theme_advanced_path : false,
+			setup : function(ed) {
+				ed.onInit.add(function(ed) {
+					ed.pasteAsPlainText = true;
+					var editorId = ed.editorId;
+					var textarea = $j('#'+editorId);
+					if (typeof(textarea.attr('tabindex')) != "undefined") {
+						$j('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
+						textarea.attr('tabindex', null);
+					}
+				});
+			}
+		});
+	}
+	else
+		$j("#prvmail-text").contact_autocomplete(baseurl+"/acl");
+}
+
+
+
+
+function initCrop() {
+	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
+		});
+	});
+}
+
+
+function confirmDelete() { return confirm(window.delItem); }
+function commentOpen(obj,id) {
+	if(obj.value == window.commentEmptyText) {
+		obj.value = "";
+		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+		$j("#mod-cmnt-wrap-" + id).show();
+		openMenu("comment-edit-submit-wrapper-" + id);
+	}
+}
+function commentClose(obj,id) {
+	if(obj.value == "") {
+		obj.value = window.commentEmptyText;
+		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
+		$j("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
+		$j("#mod-cmnt-wrap-" + id).hide();
+		closeMenu("comment-edit-submit-wrapper-" + id);
+	}
+}
+
+
+function commentInsert(obj,id) {
+	var tmpStr = $j("#comment-edit-text-" + id).val();
+	if(tmpStr == window.commentEmptyText) {
+		tmpStr = "";
+		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+		openMenu("comment-edit-submit-wrapper-" + id);
+	}
+	var ins = $j(obj).html();
+	ins = ins.replace("&lt;","<");
+	ins = ins.replace("&gt;",">");
+	ins = ins.replace("&amp;","&");
+	ins = ins.replace("&quot;",'"');
+	$j("#comment-edit-text-" + id).val(tmpStr + ins);
+}
+
+function qCommentInsert(obj,id) {
+	var tmpStr = $j("#comment-edit-text-" + id).val();
+	if(tmpStr == window.commentEmptyText) {
+		tmpStr = "";
+		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+		openMenu("comment-edit-submit-wrapper-" + id);
+	}
+	var ins = $j(obj).val();
+	ins = ins.replace("&lt;","<");
+	ins = ins.replace("&gt;",">");
+	ins = ins.replace("&amp;","&");
+	ins = ins.replace("&quot;",'"');
+	$j("#comment-edit-text-" + id).val(tmpStr + ins);
+	$j(obj).val("");
+}
+
+function showHideComments(id) {
+	if( $j("#collapsed-comments-" + id).is(":visible")) {
+		$j("#collapsed-comments-" + id).hide();
+		$j("#hide-comments-" + id).html(window.showMore);
+	}
+	else {
+		$j("#collapsed-comments-" + id).show();
+		$j("#hide-comments-" + id).html(window.showFewer);
+	}
+}
+
+
+/*function deleteCheckedItems() {
+	var checkedstr = '';
+
+	$j('.item-select').each( function() {
+		if($j(this).is(':checked')) {
+			if(checkedstr.length != 0) {
+				checkedstr = checkedstr + ',' + $j(this).val();
+			}
+			else {
+				checkedstr = $j(this).val();
+			}
+		}	
+	});
+	$j.post('item', { dropitems: checkedstr }, function(data) {
+		window.location.reload();
+	});
+}*/
+
+function jotVideoURL() {
+	reply = prompt(window.vidURL);
+	if(reply && reply.length) {
+		addeditortext('[video]' + reply + '[/video]');
+	}
+}
+
+function jotAudioURL() {
+	reply = prompt(window.audURL);
+	if(reply && reply.length) {
+		addeditortext('[audio]' + reply + '[/audio]');
+	}
+}
+
+
+function jotGetLocation() {
+	reply = prompt(window.whereAreU, $j('#jot-location').val());
+	if(reply && reply.length) {
+		$j('#jot-location').val(reply);
+	}
+}
+
+function jotShare(id) {
+	if ($j('#jot-popup').length != 0) $j('#jot-popup').show();
+
+	$j('#like-rotator-' + id).show();
+	$j.get('share/' + id, function(data) {
+		if (!editor) $j("#profile-jot-text").val("");
+		initEditor(function(){
+			addeditortext(data);
+			$j('#like-rotator-' + id).hide();
+			$j(window).scrollTop(0);
+		});
+
+	});
+}
+
+function linkdropper(event) {
+	var linkFound = event.dataTransfer.types.contains("text/uri-list");
+	if(linkFound)
+		event.preventDefault();
+}
+
+switch(window.ajaxType) {
+	case 'jot-header':
+		function jotGetLink() {
+			reply = prompt(window.linkURL);
+			if(reply && reply.length) {
+				reply = bin2hex(reply);
+				$j('#profile-rotator').show();
+				$j.get('parse_url?binurl=' + reply, function(data) {
+					addeditortext(data);
+					$j('#profile-rotator').hide();
+				});
+			}
+		}
+
+		function linkdrop(event) {
+			var reply = event.dataTransfer.getData("text/uri-list");
+			event.target.textContent = reply;
+			event.preventDefault();
+			if(reply && reply.length) {
+				reply = bin2hex(reply);
+				$j('#profile-rotator').show();
+				$j.get('parse_url?binurl=' + reply, function(data) {
+					if (!editor) $j("#profile-jot-text").val("");
+					initEditor(function(){
+						addeditortext(data);
+						$j('#profile-rotator').hide();
+					});
+				});
+			}
+		}
+		break;
+	case 'msg-header':
+	case 'wallmsg-header':
+// TINYMCE -- BAD
+		function jotGetLink() {
+			reply = prompt(window.linkURL);
+			if(reply && reply.length) {
+				$j('#profile-rotator').show();
+				$j.get('parse_url?url=' + reply, function(data) {
+					tinyMCE.execCommand('mceInsertRawHTML',false,data);
+					$j('#profile-rotator').hide();
+				});
+			}
+		}
+
+		function linkdrop(event) {
+			var reply = event.dataTransfer.getData("text/uri-list");
+			event.target.textContent = reply;
+			event.preventDefault();
+			if(reply && reply.length) {
+				$j('#profile-rotator').show();
+				$j.get('parse_url?url=' + reply, function(data) {
+					tinyMCE.execCommand('mceInsertRawHTML',false,data);
+					$j('#profile-rotator').hide();
+				});
+			}
+		}
+
+		break;
+	default:
+		break;
+}
+
+function showEvent(eventid) {
+/*	$j.get(
+		baseurl + '/events/?id='+eventid,
+		function(data){
+			$j.fancybox(data);
+		}
+	);*/			
+}
+
+
+function itemTag(id) {
+	reply = prompt(window.term);
+	if(reply && reply.length) {
+		reply = reply.replace('#','');
+		if(reply.length) {
+
+			commentBusy = true;
+			$j('body').css('cursor', 'wait');
+
+			$j.get('tagger/' + id + '?term=' + reply, NavUpdate);
+			/*if(timer) clearTimeout(timer);
+			timer = setTimeout(NavUpdate,3000);*/
+			liking = 1;
+		}
+	}
+}
+
+function itemFiler(id) {
+	
+	$j.get('filer/', function(data){
+
+		var promptText = $j('#id_term_label', data).text();
+
+		reply = prompt(promptText);
+		if(reply && reply.length) {
+			commentBusy = true;
+			$j('body').css('cursor', 'wait');
+			$j.get('filer/' + id + '?term=' + reply, NavUpdate);
+/*				if(timer) clearTimeout(timer);
+			timer = setTimeout(NavUpdate,3000);*/
+			liking = 1;
+/*				$j.fancybox.close();*/
+		}
+	});
+
+/*		var bordercolor = $j("input").css("border-color");
+	
+	$j.get('filer/', function(data){
+		$j.fancybox(data);
+		$j("#id_term").keypress(function(){
+			$j(this).css("border-color",bordercolor);
+		})
+		$j("#select_term").change(function(){
+			$j("#id_term").css("border-color",bordercolor);
+		})
+		
+		$j("#filer_save").click(function(e){
+			e.preventDefault();
+			reply = $j("#id_term").val();
+			if(reply && reply.length) {
+				commentBusy = true;
+				$j('body').css('cursor', 'wait');
+				$j.get('filer/' + id + '?term=' + reply);
+				if(timer) clearTimeout(timer);
+				timer = setTimeout(NavUpdate,3000);
+				liking = 1;
+				$j.fancybox.close();
+			} else {
+				$j("#id_term").css("border-color","#FF0000");
+			}
+			return false;
+		});
+	});
+*/		
+}
+
+function jotClearLocation() {
+	$j('#jot-coord').val('');
+	$j('#profile-nolocation-wrapper').hide();
+}
+
+function addeditortext(data) {
+	if(plaintext == 'none') {
+		var currentText = $j("#profile-jot-text").val();
+		$j("#profile-jot-text").val(currentText + data);
+	}
+	/*else
+		tinyMCE.execCommand('mceInsertRawHTML',false,data);*/
+}
+
+if(typeof window.geoTag === 'function') window.geoTag();
+
+

view/theme/frost-mobile/lang_selector.tpl

@@ -0,0 +1,10 @@
+<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" ></div>
+<div id="language-selector" style="display: none;" >
+	<form action="#" method="post" >
+		<select name="system_language" onchange="this.form.submit();" >
+			{{ for $langs.0 as $v=>$l }}
+				<option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option>
+			{{ endfor }}
+		</select>
+	</form>
+</div>

view/theme/frost-mobile/login-style.css

@@ -0,0 +1,131 @@
+html {
+	width: 100%;
+}
+
+body {
+	font-family: helvetica,arial,freesans,clean,sans-serif;
+	font-size: 16px;
+	background-color: #ffffff;
+	color: #505050;/* ZP Change*/
+	margin: 0px;
+}
+
+a, a:visited, a:link { color: #3465a4; text-decoration: none; }
+a:hover {text-decoration: underline; }
+
+img { border :0px; }
+
+.login-button {
+	margin-top: 90px;
+	margin-left: auto;
+	margin-right: auto;
+	
+}
+
+img.login-button-image {
+	max-width: 300px;
+}
+
+.section-wrapper {
+	position: relative;
+	width: 300px;
+	margin-left: auto;
+	margin-right: auto;
+}
+
+.login-form {
+	margin-top: 40px;
+}
+
+.field {
+	position: relative;
+	margin-bottom: 15px;
+}
+
+.field label {
+	margin-left: 25px;
+	font-weight: 700;
+}
+
+.field input {
+	font-size: 18px;
+	width: 200px;
+	margin-left: 50px;
+}
+
+#login_openid {
+	margin-top: 50px;
+}
+
+#login_openid input {
+	background: url(login-bg.gif) no-repeat;
+	background-position: 0 50%;
+	width: 182px;
+	padding-left: 18px;
+}
+
+#login-footer {
+	margin-top: 10px;
+	text-align: center;
+}
+
+.login-extra-links, .agreement {
+	font-size: 14px;
+}
+
+#login-submit-button, #register-submit-button, #lostpass-submit-button {
+	font-size: 20px;
+	padding: 0.5em 1em;
+}
+
+#register-link {
+	margin-right: 100px;
+}
+
+.register-form {
+	margin-top: 15px;
+}
+
+.register-form h2, .lostpass-form h2 {
+	text-align: center;
+}
+
+.error-message {
+	width: 270px;
+	color: #FF0000;
+	font-size: 1.1em;
+	text-align: justify;
+	border: 1px solid #FF8888;
+	background-color: #FFEEEE;
+	padding: 10px;
+	margin-left: auto;
+	margin-right: auto;
+}
+
+.register-explain-wrapper {
+	width: 290px;
+	text-align: justify;
+	font-size: 14px;
+	margin-left: 5px;
+}
+
+#register-footer {
+	margin-top: 60px;
+	text-align: center;
+}
+
+.lostpass-form {
+	margin-top: 100px;
+}
+
+#lostpass-desc {
+	width: 290px;
+	margin-left: 5px;
+	margin-bottom: 30px;
+	text-align: justify;
+	font-size: 14px;
+}
+
+#login-submit-wrapper {
+	text-align: center;
+}

view/theme/frost-mobile/login.tpl

@@ -0,0 +1,43 @@
+
+<div class="login-form">
+<form action="$dest_url" method="post" >
+	<input type="hidden" name="auth-params" value="login" />
+
+	<div id="login_standard">
+	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
+	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
+	</div>
+	
+	{{ if $openid }}
+			<div id="login_openid">
+			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
+			</div>
+	{{ endif }}
+
+	<br />
+	<div id='login-footer'>
+<!--	<div class="login-extra-links">
+	By signing in you agree to the latest <a href="tos.html" title="$tostitle" id="terms-of-service-link" >$toslink</a> and <a href="privacy.html" title="$privacytitle" id="privacy-link" >$privacylink</a>
+	</div>-->
+
+	<br />
+	<div id="login-submit-wrapper" >
+		<input type="submit" name="submit" id="login-submit-button" value="$login" />
+	</div>
+
+	<br /><br />
+	<div class="login-extra-links">
+		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
+        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
+	</div>
+	</div>
+	
+	{{ for $hiddens as $k=>$v }}
+		<input type="hidden" name="$k" value="$v" />
+	{{ endfor }}
+	
+	
+</form>
+</div>
+
+<script type="text/javascript">window.loginName = "$lname.0";</script>

view/theme/frost-mobile/lostpass.tpl

@@ -0,0 +1,21 @@
+<div class="lostpass-form">
+<h2>$title</h2>
+<br /><br /><br />
+
+<form action="lostpass" method="post" >
+<div id="login-name-wrapper" class="field input">
+        <label for="login-name" id="label-login-name">$name</label><br />
+        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
+</div>
+<div id="login-extra-end"></div>
+<p id="lostpass-desc">
+$desc
+</p>
+<br />
+
+<div id="login-submit-wrapper" >
+        <input type="submit" name="submit" id="lostpass-submit-button" value="$submit" />
+</div>
+<div id="login-submit-end"></div>
+</form>
+</div>

view/theme/frost-mobile/message-end.tpl

@@ -0,0 +1,4 @@
+
+<script src="$baseurl/library/jquery_ac/friendica.complete.min.js" ></script>
+
+

view/theme/frost-mobile/moderated_comment.tpl

@@ -0,0 +1,61 @@
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+				<input type="hidden" name="type" value="$type" />
+				<input type="hidden" name="profile_uid" value="$profile_uid" />
+				<input type="hidden" name="parent" value="$parent" />
+				<input type="hidden" name="return" value="$return_path" />
+				<input type="hidden" name="jsreload" value="$jsreload" />
+				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
+					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<div id="mod-cmnt-wrap-$id" class="mod-cmnt-wrap" style="display:none">
+					<div id="mod-cmnt-name-lbl-$id" class="mod-cmnt-name-lbl">$lbl_modname</div>
+					<input type="text" id="mod-cmnt-name-$id" class="mod-cmnt-name" name="mod-cmnt-name" value="$modname" />
+					<div id="mod-cmnt-email-lbl-$id" class="mod-cmnt-email-lbl">$lbl_modemail</div>
+					<input type="text" id="mod-cmnt-email-$id" class="mod-cmnt-email" name="mod-cmnt-email" value="$modemail" />
+					<div id="mod-cmnt-url-lbl-$id" class="mod-cmnt-url-lbl">$lbl_modurl</div>
+					<input type="text" id="mod-cmnt-url-$id" class="mod-cmnt-url" name="mod-cmnt-url" value="$modurl" />
+				</div>
+				<ul class="comment-edit-bb-$id">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="$edbold"
+						onclick="insertFormatting('$comment','b', $id);"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="$editalic"
+						onclick="insertFormatting('$comment','i', $id);"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="$eduline"
+						onclick="insertFormatting('$comment','u', $id);"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="$edquote"
+						onclick="insertFormatting('$comment','quote', $id);"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="$edcode"
+						onclick="insertFormatting('$comment','code', $id);"></a></li>
+					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="$edimg"
+						onclick="insertFormatting('$comment','img', $id);"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="$edurl"
+						onclick="insertFormatting('$comment','url', $id);"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="$edvideo"
+						onclick="insertFormatting('$comment','video', $id);"></a></li>
+				</ul>	
+				<div class="comment-edit-bb-end"></div>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea>			
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>

view/theme/frost-mobile/msg-header.tpl

@@ -0,0 +1,9 @@
+
+<script language="javascript" type="text/javascript">
+	window.nickname = "$nickname";
+	window.linkURL = "$linkurl";
+	var plaintext = "none";
+	window.ajaxType = 'msg-header';
+	window.autocompleteType = 'msg-header';
+</script>
+

view/theme/frost-mobile/nav.tpl

@@ -0,0 +1,140 @@
+<nav>
+<!--	$langselector -->
+
+<!--	<div id="site-location">$sitelocation</div> -->
+
+	<span id="nav-link-wrapper" >
+
+<!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->
+	<div class="nav-button-container">
+<!--	<a class="system-menu-link nav-link" href="#system-menu" title="Menu">-->
+	<img rel="#system-menu-list" class="nav-link" src="/view/theme/frost-mobile/images/menu.png">
+<!--	</a>-->
+	<ul id="system-menu-list" class="nav-menu-list">
+		{{ if $nav.login }}
+		<a id="nav-login-link" class="nav-load-page-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
+		{{ endif }}
+
+		{{ if $nav.register }}
+		<a id="nav-register-link" class="nav-load-page-link $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>
+		{{ endif }}
+
+		{{ if $nav.manage }}
+		<li>
+		<a id="nav-manage-link" class="nav-load-page-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
+		</li>
+		{{ endif }}
+
+		{{ if $nav.settings }}
+		<li><a id="nav-settings-link" class="$nav.settings.2 nav-load-page-link" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>
+		{{ endif }}
+
+		{{ if $nav.profiles }}
+		<li><a id="nav-profiles-link" class="$nav.profiles.2 nav-load-page-link" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a></li>
+		{{ endif }}
+
+		{{ if $nav.admin }}
+		<li><a id="nav-admin-link" class="$nav.admin.2 nav-load-page-link" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>
+		{{ endif }}
+
+		<li><a id="nav-search-link" class="$nav.search.2 nav-load-page-link" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
+
+		{{ if $nav.apps }}
+		<li><a id="nav-apps-link" class="$nav.apps.2 nav-load-page-link" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a></li>
+		{{ endif }}
+
+		{{ if $nav.help }}
+		<li><a id="nav-help-link" class="$nav.help.2 nav-load-page-link" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>
+		{{ endif }}
+		
+		{{ if $nav.logout }}
+		<li><a id="nav-logout-link" class="$nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>
+		{{ endif }}
+	</ul>
+	</div>
+
+	{{ if $nav.notifications }}
+<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>-->
+	<div class="nav-button-container">
+<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">-->
+	<img rel="#nav-notifications-menu" class="nav-link" src="/view/theme/frost-mobile/images/notifications.png">
+<!--	</a>-->
+	<span id="notify-update" class="nav-ajax-left"></span>
+	<ul id="nav-notifications-menu" class="notifications-menu-popup">
+		<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+		<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
+		<li class="empty">$emptynotifications</li>
+	</ul>
+	</div>
+	{{ endif }}		
+
+<!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->
+	<div class="nav-button-container">
+<!--	<a class="contacts-menu-link nav-link" href="#contacts-menu" title="Contacts">-->
+	<img rel="#contacts-menu-list"  class="nav-link" src="/view/theme/frost-mobile/images/contacts.png">
+	<!--</a>-->
+	{{ if $nav.introductions }}
+	<span id="intro-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	<ul id="contacts-menu-list" class="nav-menu-list">
+		{{ if $nav.contacts }}
+		<li><a id="nav-contacts-link" class="$nav.contacts.2 nav-load-page-link" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a><li>
+		{{ endif }}
+
+		<li><a id="nav-directory-link" class="$nav.directory.2 nav-load-page-link" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a><li>
+
+		{{ if $nav.introductions }}
+		<li>
+		<a id="nav-notify-link" class="$nav.introductions.2 $sel.introductions nav-load-page-link" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
+		</li>
+		{{ endif }}
+	</ul>
+	</div>
+
+	{{ if $nav.messages }}
+<!--	<a id="nav-messages-link" class="nav-link $nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>-->
+	<div class="nav-button-container">
+	<a id="nav-messages-link" class="$nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >
+	<img src="/view/theme/frost-mobile/images/message.png" class="nav-link">
+	</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	</div>
+	{{ endif }}
+
+<!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->
+	<div class="nav-button-container">
+<!--	<a class="network-menu-link nav-link" href="#network-menu" title="Network">-->
+	<img rel="#network-menu-list" class="nav-link" src="/view/theme/frost-mobile/images/network.png">
+<!--	</a>-->
+	{{ if $nav.network }}
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	<ul id="network-menu-list" class="nav-menu-list">
+		{{ if $nav.network }}
+		<li>
+		<a id="nav-network-link" class="$nav.network.2 $sel.network nav-load-page-link" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+		</li>
+		<!--<span id="net-update" class="nav-ajax-left"></span>-->
+		{{ endif }}
+
+		{{ if $nav.home }}
+		<li><a id="nav-home-link" class="$nav.home.2 $sel.home nav-load-page-link" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a></li>
+		<!--<span id="home-update" class="nav-ajax-left"></span>-->
+		{{ endif }}
+
+		{{ if $nav.community }}
+		<li>
+		<a id="nav-community-link" class="$nav.community.2 $sel.community nav-load-page-link" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+		</li>
+		{{ endif }}
+	</ul>
+	</div>
+
+	</span>
+	<!--<span id="nav-end"></span>-->
+	<span id="banner">$banner</span>
+</nav>
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>

view/theme/frost-mobile/oembed_video.tpl

@@ -0,0 +1,4 @@
+<a href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); return false;' style='float:left; margin: 1em; position: relative;'>
+	<img width='$tw' height='$th' src='$turl' >
+	<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url($baseurl/images/icons/48/play.png) no-repeat center center;'></div>
+</a>

view/theme/frost-mobile/photo_edit.tpl

@@ -0,0 +1,53 @@
+
+<form action="photos/$nickname/$resource_id" method="post" id="photo_edit_form" >
+
+	<input type="hidden" name="item_id" value="$item_id" />
+
+	<label id="photo-edit-albumname-label" for="photo-edit-albumname">$newalbum</label>
+	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="$album" />
+
+	<div id="photo-edit-albumname-end"></div>
+
+	<label id="photo-edit-caption-label" for="photo-edit-caption">$capt_label</label>
+	<input id="photo-edit-caption" type="text" size="32" name="desc" value="$caption" />
+
+	<div id="photo-edit-caption-end"></div>
+
+	<label id="photo-edit-tags-label" for="photo-edit-newtag" >$tag_label</label>
+	<input name="newtag" id="photo-edit-newtag" size="32" title="$help_tags" type="text" />
+
+	<div id="photo-edit-tags-end"></div>
+	<div id="photo-edit-rotate-wrapper">
+		<div class="photo-edit-rotate-label">
+			$rotatecw
+		</div>
+		<input class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
+
+		<div class="photo-edit-rotate-label">
+			$rotateccw
+		</div>
+		<input class="photo-edit-rotate" type="radio" name="rotate" value="2" />
+	</div>
+	<div id="photo-edit-rotate-end"></div>
+
+	<div id="photo-edit-perms" class="photo-edit-perms" >
+		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="popupbox button" title="$permissions"/>
+			<span id="jot-perms-icon" class="icon $lockstate photo-perms-icon" ></span><div class="photo-jot-perms-text">$permissions</div>
+		</a>
+		<div id="photo-edit-perms-menu-end"></div>
+		
+		<div style="display: none;">
+			<div id="photo-edit-perms-select" >
+				$aclselect
+			</div>
+		</div>
+	</div>
+	<div id="photo-edit-perms-end"></div>
+
+	<input id="photo-edit-submit-button" type="submit" name="submit" value="$submit" />
+	<input id="photo-edit-delete-button" type="submit" name="delete" value="$delete" onclick="return confirmDelete()"; />
+
+	<div id="photo-edit-end"></div>
+</form>
+
+

view/theme/frost-mobile/photo_edit_head.tpl

@@ -0,0 +1,7 @@
+
+<script>
+	window.prevLink = "$prevlink";
+	window.nextLink = "$nextlink";
+	window.photoEdit = true;
+
+</script>

view/theme/frost-mobile/photo_view.tpl

@@ -0,0 +1,42 @@
+<div id="live-display"></div>
+<h3><a href="$album.0">$album.1</a></h3>
+
+<div id="photo-edit-link-wrap">
+{{ if $tools }}
+<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
+|
+<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
+{{ endif }}
+{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
+</div>
+
+<div id="photo-nav">
+	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0"><img src="view/theme/frost-mobile/images/arrow-left.png"></a></div>{{ endif }}
+	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0"><img src="view/theme/frost-mobile/images/arrow-right.png"></a></div>{{ endif }}
+</div>
+<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div>
+<div id="photo-photo-end"></div>
+<div id="photo-caption">$desc</div>
+{{ if $tags }}
+<div id="in-this-photo-text">$tags.0</div>
+<div id="in-this-photo">$tags.1</div>
+{{ endif }}
+{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
+
+{{ if $edit }}
+$edit
+{{ else }}
+
+{{ if $likebuttons }}
+<div id="photo-like-div">
+	$likebuttons
+	$like
+	$dislike	
+</div>
+{{ endif }}
+
+$comments
+
+$paginate
+{{ endif }}
+

view/theme/frost-mobile/photos_head.tpl

@@ -0,0 +1,5 @@
+
+<script>
+	window.isPublic = "$ispublic";
+</script>
+

view/theme/frost-mobile/photos_upload.tpl

@@ -0,0 +1,48 @@
+<h3>$pagename</h3>
+
+<div id="photos-usage-message">$usage</div>
+
+<form action="photos/$nickname" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
+	<div id="photos-upload-new-wrapper" >
+		<div id="photos-upload-newalbum-div">
+			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >$newalbum</label>
+		</div>
+		<input id="photos-upload-newalbum" type="text" name="newalbum" />
+	</div>
+	<div id="photos-upload-new-end"></div>
+	<div id="photos-upload-exist-wrapper">
+		<div id="photos-upload-existing-album-text">$existalbumtext</div>
+		<select id="photos-upload-album-select" name="album">
+		$albumselect
+		</select>
+	</div>
+	<div id="photos-upload-exist-end"></div>
+
+	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
+		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
+		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >$nosharetext</label>
+	</div>
+
+
+	<div id="photos-upload-perms" class="photos-upload-perms" >
+		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
+		<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
+		</a>
+	</div>
+	<div id="photos-upload-perms-end"></div>
+
+	<div style="display: none;">
+		<div id="photos-upload-permissions-wrapper">
+			$aclselect
+		</div>
+	</div>
+
+	<div id="photos-upload-spacer"></div>
+
+	$uploader
+
+	$default
+
+	<div class="photos-upload-end" ></div>
+</form>
+

view/theme/frost-mobile/profed_end.tpl

@@ -0,0 +1,8 @@
+
+<script type="text/javascript" src="js/country.min.js" ></script>
+
+<script language="javascript" type="text/javascript">
+	Fill_Country('$country_name');
+	Fill_States('$region');
+</script>
+

view/theme/frost-mobile/profed_head.tpl

@@ -0,0 +1,5 @@
+
+<script language="javascript" type="text/javascript">
+	window.editSelect = "none";
+</script>
+

view/theme/frost-mobile/profile_edit.tpl

@@ -0,0 +1,322 @@
+$default
+
+<h1>$banner</h1>
+
+<div id="profile-edit-links">
+<ul>
+<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="$viewprof">$viewprof</a></li>
+<li><a href="$profile_clone_link" id="profile-edit-clone-link" title="$cr_prof">$cl_prof</a></li>
+<li></li>
+<li><a href="$profile_drop_link" id="profile-edit-drop-link" title="$del_prof" $disabled >$del_prof</a></li>
+
+</ul>
+</div>
+
+<div id="profile-edit-links-end"></div>
+
+
+<div id="profile-edit-wrapper" >
+<form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
+<div id="profile-edit-profile-name-wrapper" >
+<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >$lbl_profname </label>
+<input type="text" size="28" 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" >$lbl_fullname </label>
+<input type="text" size="28" name="name" id="profile-edit-name" value="$name" />
+</div>
+<div id="profile-edit-name-end"></div>
+
+<div id="profile-edit-pdesc-wrapper" >
+<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >$lbl_title </label>
+<input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
+</div>
+<div id="profile-edit-pdesc-end"></div>
+
+
+<div id="profile-edit-gender-wrapper" >
+<label id="profile-edit-gender-label" for="gender-select" >$lbl_gender </label>
+$gender
+</div>
+<div id="profile-edit-gender-end"></div>
+
+<div id="profile-edit-dob-wrapper" >
+<label id="profile-edit-dob-label" for="dob-select" >$lbl_bd </label>
+<div id="profile-edit-dob" >
+$dob $age
+</div>
+</div>
+<div id="profile-edit-dob-end"></div>
+
+$hide_friends
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="profile-edit-address-wrapper" >
+<label id="profile-edit-address-label" for="profile-edit-address" >$lbl_address </label>
+<input type="text" size="28" 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" >$lbl_city </label>
+<input type="text" size="28" name="locality" id="profile-edit-locality" value="$locality" />
+</div>
+<div id="profile-edit-locality-end"></div>
+
+
+<div id="profile-edit-postal-code-wrapper" >
+<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >$lbl_zip </label>
+<input type="text" size="28" 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" >$lbl_country </label>
+<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
+<option selected="selected" >$country_name</option>
+<option>temp</option>
+</select>
+</div>
+<div id="profile-edit-country-name-end"></div>
+
+<div id="profile-edit-region-wrapper" >
+<label id="profile-edit-region-label" for="profile-edit-region" >$lbl_region </label>
+<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
+<option selected="selected" >$region</option>
+<option>temp</option>
+</select>
+</div>
+<div id="profile-edit-region-end"></div>
+
+<div id="profile-edit-hometown-wrapper" >
+<label id="profile-edit-hometown-label" for="profile-edit-hometown" >$lbl_hometown </label>
+<input type="text" size="28" name="hometown" id="profile-edit-hometown" value="$hometown" />
+</div>
+<div id="profile-edit-hometown-end"></div>
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="profile-edit-marital-wrapper" >
+<label id="profile-edit-marital-label" for="profile-edit-marital" >$lbl_marital </label>
+$marital
+</div>
+<label id="profile-edit-with-label" for="profile-edit-with" > $lbl_with </label>
+<input type="text" size="28" name="with" id="profile-edit-with" title="$lbl_ex1" value="$with" />
+<label id="profile-edit-howlong-label" for="profile-edit-howlong" > $lbl_howlong </label>
+<input type="text" size="28" name="howlong" id="profile-edit-howlong" title="$lbl_howlong" value="$howlong" />
+
+<div id="profile-edit-marital-end"></div>
+
+<div id="profile-edit-sexual-wrapper" >
+<label id="profile-edit-sexual-label" for="sexual-select" >$lbl_sexual </label>
+$sexual
+</div>
+<div id="profile-edit-sexual-end"></div>
+
+
+
+<div id="profile-edit-homepage-wrapper" >
+<label id="profile-edit-homepage-label" for="profile-edit-homepage" >$lbl_homepage </label>
+<input type="text" size="28" name="homepage" id="profile-edit-homepage" value="$homepage" />
+</div>
+<div id="profile-edit-homepage-end"></div>
+
+<div id="profile-edit-politic-wrapper" >
+<label id="profile-edit-politic-label" for="profile-edit-politic" >$lbl_politic </label>
+<input type="text" size="28" name="politic" id="profile-edit-politic" value="$politic" />
+</div>
+<div id="profile-edit-politic-end"></div>
+
+<div id="profile-edit-religion-wrapper" >
+<label id="profile-edit-religion-label" for="profile-edit-religion" >$lbl_religion </label>
+<input type="text" size="28" name="religion" id="profile-edit-religion" value="$religion" />
+</div>
+<div id="profile-edit-religion-end"></div>
+
+<div id="profile-edit-pubkeywords-wrapper" >
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >$lbl_pubkey </label>
+<input type="text" size="28" name="pub_keywords" id="profile-edit-pubkeywords" title="$lbl_ex2" value="$pub_keywords" />
+</div><div id="profile-edit-pubkeywords-desc">$lbl_pubdsc</div>
+<div id="profile-edit-pubkeywords-end"></div>
+
+<div id="profile-edit-prvkeywords-wrapper" >
+<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >$lbl_prvkey </label>
+<input type="text" size="28" name="prv_keywords" id="profile-edit-prvkeywords" title="$lbl_ex2" value="$prv_keywords" />
+</div><div id="profile-edit-prvkeywords-desc">$lbl_prvdsc</div>
+<div id="profile-edit-prvkeywords-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="about-jot-wrapper" class="profile-jot-box">
+<p id="about-jot-desc" >
+$lbl_about
+</p>
+
+<textarea rows="10" cols="30" id="profile-about-text" class="profile-edit-textarea" name="about" >$about</textarea>
+
+</div>
+<div id="about-jot-end"></div>
+
+
+<div id="interest-jot-wrapper" class="profile-jot-box" >
+<p id="interest-jot-desc" >
+$lbl_hobbies
+</p>
+
+<textarea rows="10" cols="30" id="interest-jot-text" class="profile-edit-textarea" name="interest" >$interest</textarea>
+
+</div>
+<div id="interest-jot-end"></div>
+
+
+<div id="likes-jot-wrapper" class="profile-jot-box" >
+<p id="likes-jot-desc" >
+$lbl_likes
+</p>
+
+<textarea rows="10" cols="30" id="likes-jot-text" class="profile-edit-textarea" name="likes" >$likes</textarea>
+
+</div>
+<div id="likes-jot-end"></div>
+
+
+<div id="dislikes-jot-wrapper" class="profile-jot-box" >
+<p id="dislikes-jot-desc" >
+$lbl_dislikes
+</p>
+
+<textarea rows="10" cols="30" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >$dislikes</textarea>
+
+</div>
+<div id="dislikes-jot-end"></div>
+
+
+<div id="contact-jot-wrapper" class="profile-jot-box" >
+<p id="contact-jot-desc" >
+$lbl_social
+</p>
+
+<textarea rows="10" cols="30" id="contact-jot-text" class="profile-edit-textarea" name="contact" >$contact</textarea>
+
+</div>
+<div id="contact-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="music-jot-wrapper" class="profile-jot-box" >
+<p id="music-jot-desc" >
+$lbl_music
+</p>
+
+<textarea rows="10" cols="30" id="music-jot-text" class="profile-edit-textarea" name="music" >$music</textarea>
+
+</div>
+<div id="music-jot-end"></div>
+
+<div id="book-jot-wrapper" class="profile-jot-box" >
+<p id="book-jot-desc" >
+$lbl_book
+</p>
+
+<textarea rows="10" cols="30" id="book-jot-text" class="profile-edit-textarea" name="book" >$book</textarea>
+
+</div>
+<div id="book-jot-end"></div>
+
+
+
+<div id="tv-jot-wrapper" class="profile-jot-box" >
+<p id="tv-jot-desc" >
+$lbl_tv 
+</p>
+
+<textarea rows="10" cols="30" id="tv-jot-text" class="profile-edit-textarea" name="tv" >$tv</textarea>
+
+</div>
+<div id="tv-jot-end"></div>
+
+
+
+<div id="film-jot-wrapper" class="profile-jot-box" >
+<p id="film-jot-desc" >
+$lbl_film
+</p>
+
+<textarea rows="10" cols="30" id="film-jot-text" class="profile-edit-textarea" name="film" >$film</textarea>
+
+</div>
+<div id="film-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="romance-jot-wrapper" class="profile-jot-box" >
+<p id="romance-jot-desc" >
+$lbl_love
+</p>
+
+<textarea rows="10" cols="30" id="romance-jot-text" class="profile-edit-textarea" name="romance" >$romance</textarea>
+
+</div>
+<div id="romance-jot-end"></div>
+
+
+
+<div id="work-jot-wrapper" class="profile-jot-box" >
+<p id="work-jot-desc" >
+$lbl_work
+</p>
+
+<textarea rows="10" cols="30" id="work-jot-text" class="profile-edit-textarea" name="work" >$work</textarea>
+
+</div>
+<div id="work-jot-end"></div>
+
+
+
+<div id="education-jot-wrapper" class="profile-jot-box" >
+<p id="education-jot-desc" >
+$lbl_school 
+</p>
+
+<textarea rows="10" cols="30" id="education-jot-text" class="profile-edit-textarea" name="education" >$education</textarea>
+
+</div>
+<div id="education-jot-end"></div>
+
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+</form>
+</div>
+

view/theme/frost-mobile/profile_vcard.tpl

@@ -0,0 +1,51 @@
+<div class="vcard">
+
+	<div class="fn label">$profile.name</div>
+	
+				
+	
+	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
+	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
+
+
+
+	{{ if $location }}
+		<dl class="location"><dt class="location-label">$location</dt> 
+		<dd class="adr">
+			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
+			<span class="city-state-zip">
+				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+				<span class="region">$profile.region</span>
+				<span class="postal-code">$profile.postal-code</span>
+			</span>
+			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+		</dd>
+		</dl>
+	{{ endif }}
+
+	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
+	
+	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
+
+	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
+
+	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
+
+	{{ inc diaspora_vcard.tpl }}{{ endinc }}
+
+	<div id="profile-vcard-break"></div>	
+	<div id="profile-extra-links">
+		<ul>
+			{{ if $connect }}
+				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
+			{{ endif }}
+			{{ if $wallmessage }}
+				<li><a id="wallmessage-link" href="wallmessage/$profile.nickname">$wallmessage</a></li>
+			{{ endif }}
+		</ul>
+	</div>
+</div>
+
+$contact_block
+
+

view/theme/frost-mobile/prv_message.tpl

@@ -0,0 +1,39 @@
+
+<h3>$header</h3>
+
+<div id="prvmail-wrapper" >
+<form id="prvmail-form" action="message" method="post" >
+
+$parent
+
+<div id="prvmail-to-label">$to</div>
+
+{{ if $showinputs }}
+<input type="text" id="recip" name="messageto" value="$prefill" maxlength="255" size="64" tabindex="10" />
+<input type="hidden" id="recip-complete" name="messageto" value="$preid">
+{{ else }}
+$select
+{{ endif }}
+
+<div id="prvmail-subject-label">$subject</div>
+<input type="text" size="28" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
+
+<div id="prvmail-message-label">$yourmessage</div>
+<textarea rows="8" cols="32" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
+
+
+<div id="prvmail-submit-wrapper" >
+	<input type="submit" id="prvmail-submit" name="submit" value="Submit" tabindex="13" />
+	<div id="prvmail-upload-wrapper" >
+		<div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
+	</div> 
+	<div id="prvmail-link-wrapper" >
+		<div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
+	</div> 
+	<div id="prvmail-rotator-wrapper" >
+		<img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+	</div> 
+</div>
+<div id="prvmail-end"></div>
+</form>
+</div>

view/theme/frost-mobile/register.tpl

@@ -0,0 +1,78 @@
+<div class='register-form'>
+<h2>$regtitle</h2>
+<br />
+
+<form action="register" method="post" id="register-form">
+
+	<input type="hidden" name="photo" value="$photo" />
+
+	$registertext
+
+	<p id="register-realpeople">$realpeople</p>
+
+	<br />
+	<div id="register-openid-wrapper"  class="field input" >
+			$oidhtml
+	</div>
+	<div id="register-openid-end" ></div>
+
+	<div class="register-explain-wrapper">
+	<p id="register-fill-desc">$fillwith $fillext</p>
+	</div>
+
+	<br /><br />
+
+{{ if $invitations }}
+
+	<p id="register-invite-desc">$invite_desc</p>
+	<div id="register-invite-wrapper" >
+		<label for="register-invite" id="label-register-invite" >$invite_label</label>
+		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="$invite_id" >
+	</div>
+	<div id="register-name-end" ></div>
+
+{{ endif }}
+
+
+	<div id="register-name-wrapper" class="field input" >
+		<label for="register-name" id="label-register-name" >$namelabel</label><br />
+		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="$username" >
+	</div>
+	<div id="register-name-end" ></div>
+
+
+	<div id="register-email-wrapper"  class="field input" >
+		<label for="register-email" id="label-register-email" >$addrlabel</label><br />
+		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="$email" >
+	</div>
+	<div id="register-email-end" ></div>
+
+	<div id="register-nickname-wrapper" class="field input" >
+		<label for="register-nickname" id="label-register-nickname" >$nicklabel</label><br />
+		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="$nickname" >
+	</div>
+	<div id="register-nickname-end" ></div>
+
+	<div class="register-explain-wrapper">
+	<p id="register-nickname-desc" >$nickdesc</p>
+	</div>
+
+	$publish
+
+	<div id="register-footer">
+<!--	<div class="agreement">
+	By clicking '$regbutt' you are agreeing to the latest <a href="tos.html" title="$tostitle" id="terms-of-service-link" >$toslink</a> and <a href="privacy.html" title="$privacytitle" id="privacy-link" >$privacylink</a>
+	</div>-->
+	<br />
+
+	<div id="register-submit-wrapper">
+		<input type="submit" name="submit" id="register-submit-button" value="$regbutt" />
+	</div>
+	<div id="register-submit-end" ></div>
+	</div>
+</form>
+<br /><br /><br />
+
+$license
+
+</div>

view/theme/frost-mobile/settings-head.tpl

@@ -0,0 +1,5 @@
+
+<script>
+	window.isPublic = "$ispublic";
+</script>
+

view/theme/frost-mobile/settings.tpl

@@ -0,0 +1,144 @@
+<h1>$ptitle</h1>
+
+$nickname_block
+
+<form action="settings" id="settings-form" method="post" autocomplete="off" >
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
+<h3 class="settings-heading">$h_pass</h3>
+
+{{inc field_password.tpl with $field=$password1 }}{{endinc}}
+{{inc field_password.tpl with $field=$password2 }}{{endinc}}
+
+{{ if $oid_enable }}
+{{inc field_input.tpl with $field=$openid }}{{endinc}}
+{{ endif }}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+<h3 class="settings-heading">$h_basic</h3>
+
+{{inc field_input.tpl with $field=$username }}{{endinc}}
+{{inc field_input.tpl with $field=$email }}{{endinc}}
+{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
+{{inc field_input.tpl with $field=$defloc }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+<h3 class="settings-heading">$h_prv</h3>
+
+
+<input type="hidden" name="visibility" value="$visibility" />
+
+{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
+
+$profile_in_dir
+
+$profile_in_net_dir
+
+$hide_friends
+
+$hide_wall
+
+$blockwall
+
+$blocktags
+
+$suggestme
+
+$unkmail
+
+
+{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
+
+{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
+
+
+<div class="field input">
+	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
+	<div style="display: none;">
+		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
+			<h3>$expire.advanced</h3>
+			{{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
+			{{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
+			{{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
+			{{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
+		</div>
+	</div>
+
+</div>
+
+
+<div id="settings-default-perms" class="settings-default-perms" >
+	<a href="#settings-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>$permissions $permdesc</a>
+	<div id="settings-default-perms-menu-end"></div>
+
+<!--	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >-->
+	
+	<div style="display: none;">
+		<div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
+			$aclselect
+		</div>
+	</div>
+
+<!--	</div>-->
+</div>
+<br/>
+<div id="settings-default-perms-end"></div>
+
+$group_select
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+
+<h3 class="settings-heading">$h_not</h3>
+<div id="settings-notifications">
+
+<div id="settings-activity-desc">$activity_options</div>
+
+{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
+
+
+<div id="settings-notify-desc">$lbl_not</div>
+
+<div class="group">
+{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
+</div>
+
+</div>
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+<h3 class="settings-heading">$h_advn</h3>
+<div id="settings-pagetype-desc">$h_descadvn</div>
+
+$pagetype
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+

view/theme/frost-mobile/settings_display_end.tpl

@@ -0,0 +1,2 @@
+	<script>$j(function(){ previewTheme($j("#id_$theme.0")[0]); });</script>
+

view/theme/frost-mobile/style.css

@@ -0,0 +1,3878 @@
+/**
+ * duepuntozero Frindika style
+ * Fabio Comuni <fabrix.xm@gmail.com>
+ *
+ * Heavily modified for Frost Mobile
+ * Zach P
+ */
+
+
+/* generals */
+html {
+	width: 320px;
+	margin-left: auto;
+	margin-right: auto;
+}
+
+body {
+	font-family: helvetica,arial,freesans,clean,sans-serif;
+	font-size: 16px;
+/*	line-height: 24px;*/
+	background-color: #ffffff;
+	background-image: url(head.jpg);
+	background-repeat: repeat-x;
+	color: #505050;
+	margin: 0px;
+}
+
+div.container {
+	display: block;
+/*	width: 100%;*/
+	margin-top: 0px;
+	margin-bottom: 0px;
+	margin-left: auto;
+	margin-right: auto;
+}
+
+a, a:visited, a:link { color: #3465a4; text-decoration: none; }
+a:hover {text-decoration: underline; }
+
+input {
+	border: 1px solid #666666;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;	
+	padding: 3px;
+}
+
+img { border :0px; }
+
+#id_openid_url, .openid input {
+   background: url(login-bg.gif) no-repeat;
+   background-position: 0 50%;
+   padding-left: 18px;
+   width: 252px;
+   margin-left: 20px;
+}
+.openid:hover {
+
+}
+
+/*#id_openid_url {
+	width: 384px;
+}*/
+
+code {
+	font-family: Courier, monospace;
+	white-space: pre;
+	display: block;
+	overflow: auto;
+	border: 1px solid #444;
+	background: #EEE;
+	color: #444;
+	padding: 10px;
+	margin-top: 20px; 
+}
+
+blockquote {
+	background-color: #f4f8f9;
+	border-left: 4px solid #dae4ee;
+	padding: 0.4em;
+}
+
+.icollapse-wrapper, .ccollapse-wrapper {
+	border: 1px solid #CCC;
+	padding: 5px;
+}
+
+.hide-comments-outer {
+	margin-left: 0px;
+	font-weight: 700;
+	opacity: 0.6;
+}
+.hide-comments {
+	margin-left: 5px;
+}
+
+#panel {
+	background-color: ivory;
+	position: absolute;
+	z-index: 2;
+	width: 30%;
+	padding: 25px;
+	border: 1px solid #444;
+}
+
+.heart {
+	color: #FF0000;
+	font-size: 100%;
+	margin-right: 5px;
+}
+
+
+
+/* nav */
+nav {
+	height: 94px;
+/*	width: 100%;*/
+	width: 320px;
+	display: block;
+	margin-top: 0px;
+	margin-bottom: 0px;
+	margin-left: auto;
+	margin-right: auto;
+}
+nav #site-location {
+	color: #888a85;
+	font-size: 0.8em;
+	position: absolute;
+}
+
+.error-message {
+	color: #FF0000;
+	font-size: 1.1em;
+	border: 1px solid #FF8888;
+	background-color: #FFEEEE;
+	padding: 10px;
+}
+
+.info-message {
+	color: #204a87;
+	font-size: 1.1em;
+	border: 1px solid #3465a4;
+	background-color: #d7e3f1;
+	padding: 10px;
+}
+
+
+nav #banner {
+/*	display: block;*/
+	display: none;
+	margin-top: 14px;
+	position: absolute;
+}
+nav #banner #logo-text a {
+	display: none;
+	font-size: 40px;
+	font-weight: bold;
+	margin-left: 3px;
+ 	color: #000000;
+
+}
+nav #banner #logo-text a:hover { text-decoration: none; }
+
+
+/* ZP REMOVE? nav-commlink */
+.nav-commlink, .nav-login-link {
+	display: block;
+	height: 15px;
+	margin-top: 67px;
+	margin-right: 2px;
+	/*padding: 6px 10px;*/
+	padding: 6px 3px;
+	float: left;
+	bottom: 140px;
+	border: 1px solid #babdb6;
+	border-bottom: 0px;
+	background-color: #aec0d3;
+	color: #565854;		
+	-moz-border-radius: 3px 3px 0px 0px;
+	-webkit-border-radius: 3px 3px 0px 0px;
+	border-radius: 3px 3px 0px 0px;	
+}
+
+.nav-commlink.selected {
+	background-color: #ffffff;
+	border-bottom: 1px solid #ffffff;
+	color: #000000 !important;
+	margin-top: 64px;
+	padding-top: 6px;
+	padding-bottom: 8px;
+}
+
+.nav-ajax-left.show {
+	position: absolute;
+	font-size: 0.8em;
+	top: 22px;
+	right: 2px;
+	padding: 1px 2px;
+	border-radius: 4px;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	background-color: gold !important;
+}
+
+
+
+nav #nav-link-wrapper .nav-link {
+	/*border-right: 1px solid #babdb6;*/
+}
+
+nav .nav-link {
+	margin-top: 24px;
+	margin-bottom: 0.2em;
+	margin-right: 1em;
+	margin-left: 1em;
+	background-color: transparent !important;
+}
+
+.nav-button-container {
+	float: right;
+	position: relative;
+}
+
+.nav-button-container .nav-ajax-left {
+}
+
+.nav-menu-list {
+	text-align: center;
+	text-size: 18px;
+	line-height: 24px;
+
+	border-left: 1px solid #aaa;/*#444444;*/
+	border-right: 1px solid #aaa;
+	border-top: 1px solid #aaa;
+	border-bottom: 1px solid #aaa;
+
+	background: #FFFFFF;
+
+	display: none;
+	list-style: none;
+
+	width: 8em;
+	position: absolute;
+	margin: 0px;
+/*	right: -33px;*/
+	padding: 1em 0px;
+
+	-moz-box-shadow: 3px 3px 5px #555;
+	-webkit-box-shadow: 3px 3px 5px #555;
+	box-shadow: 3px 3px 5px #555;
+
+	z-index: 10000;
+}
+
+#network-menu-list {
+	left: 3px;
+}
+
+#contacts-menu-list {
+	right: -30px;
+}
+
+#system-menu-list {
+	right: 3px;
+}
+
+
+div.main-container {
+/*	width: 100%;*/
+	margin: 0px auto;
+	display: block;
+	position: relative;
+}
+
+/*div.main-content-loading {
+	position: absolute;
+	top: 200px;
+	left: 50%;
+	display: none;
+}*/
+
+
+/* aside */
+aside {
+/*	display: block;*/
+	display: none;
+	min-height: 112px;
+
+	width: 250px;
+
+	padding: 1em;
+	margin: 1em 0px 0px 0px;
+
+	position: absolute;
+
+/*	float:left;*/
+}
+
+#dfrn-request-link {
+	display: block;
+	color: #FFFFFF;
+	-webkit-border-radius: 5px ;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	padding: 5px;
+	font-weight: bold;
+	background: #3465a4 url('friendika-16.png') no-repeat 95% center;
+}
+#wallmessage-link {
+	display: block;
+	color: #FFFFFF;
+	-webkit-border-radius: 5px ;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	padding: 5px;
+	font-weight: bold;
+	background-color: #3465a4;
+}
+
+/* section */
+div.section-wrapper {
+/*	width: 100%;*/
+	width: 320px;
+
+	margin-left: auto;
+	margin-right: auto;
+
+	/*padding-right:2em;*/
+
+	display: block;
+
+	background-color: #ffffff;
+	background-image: url(border.jpg);
+	background-position: top right;
+	background-repeat: no-repeat;
+}
+
+section {
+	margin: 0px 0px 0px 0px;
+
+	padding-left: 5px;
+	padding-right: 5px;
+	padding-top: 1em;
+	padding-bottom: 3em;
+
+	background-image: url(border.jpg);
+	background-position: top left;
+	background-repeat: no-repeat;
+
+	min-height: 112px;
+	border-top: 1px solid #babdb6;	
+}
+
+.tabs {
+	/*background-image: url(head.jpg);
+	background-repeat: repeat-x;	
+	background-position: 0px -20px;*/
+	border-bottom: 1px solid #babdb6;
+	padding:0px;
+}
+.tabs li { margin: 0px 0px 20px 0px; padding-left: 1em; list-style: none; }
+.tabs a {
+	padding: 0.4em 2em;
+	border: 1px solid #aaa;
+	border-radius: 8px;
+	-moz-border-radius: 8px;
+	-webkit-border-radius: 8px;
+}
+.tab {
+	/*display:block;*/
+	/*float:left;*/
+	padding-left: 1em;
+	padding-right: 0.4em;
+	padding-top: 0.4em;
+	padding-bottom: 0.4em;
+	/*margin-right: 1em;*/
+	margin-right: 3px ;
+}
+.tab.active {
+	font-weight: bold;
+	
+}
+#events-tab {
+	display: none;
+}
+
+
+/* footer */
+footer {
+    display: none;
+
+}
+
+.birthday-today, .event-today {
+	font-weight: bold;
+}
+
+.preview {
+	background: #FFFFC8;
+}
+
+#theme-preview {
+	margin: 15px 0 15px 150px;
+}
+
+/* from default */
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#profile-upload-wrapper,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+}
+
+#jot-perms-icon {
+	float: left;
+}
+
+#jot-title, #jot-category {
+	border: 0px;
+	margin: 0px;
+	height: 20px;
+	width: 270px;
+	margin-bottom: 5px;
+	font-weight: bold;
+	border: 1px solid #ffffff;
+}
+
+#jot-title::-webkit-input-placeholder{font-weight: normal;}
+#jot-category::-webkit-input-placeholder{font-weight: normal;}
+#jot-title:-moz-placeholder{font-weight: normal;}
+#jot-category:-moz-placeholder{font-weight: normal;}
+		
+	
+#jot-title:hover,
+#jot-title:focus,
+#jot-category:hover,
+#jot-category:focus {
+	border: 1px solid #cccccc; 
+}
+
+.jothidden { display:none; }
+
+
+.fakelink, .fakelink:visited, .fakelink:link {
+	color: #3465a4;
+	text-decoration: none;
+	cursor: pointer;
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+.lockview {
+	cursor: pointer;
+}
+
+#group-sidebar {
+	margin-bottom: 10px;
+}
+
+.group-selected, .nets-selected, .fileas-selected, .categories-selected {
+	padding: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;	
+	border: 1px solid #CCCCCC;
+	background: #F8F8F8;
+	font-weight: bold;
+}
+
+.settings-widget .selected {
+	padding: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;	
+	border: 1px solid #CCCCCC;
+	background: #F8F8F8;
+	font-weight: bold;
+}
+
+.fakelink:hover {
+	color: #3465a4;
+	text-decoration: underline;
+	cursor: pointer;
+}
+.smalltext {
+	font-size: 0.7em;
+}
+#sysmsg {
+	/*width: 600px;*/
+	margin-bottom: 10px;
+}
+
+#register-fill-ext {
+	margin-bottom: 25px;
+}
+
+#label-register-name, #label-register-email, #label-register-nickname, #label-register-openid {
+	float: left;
+	width: 350px;
+	margin-top: 10px;
+}
+
+#register-name, #register-email, #register-nickname {
+	float: left;
+	margin-top: 10px;
+	width: 150px;
+}
+
+#register-openid {
+	float: left;
+	margin-top: 10px;
+	width: 130px;
+}
+
+#register-name-end, #register-email-end, #register-nickname-end, #register-submit-end, #register-openid-end {
+	clear: both;
+}
+
+#register-nickname-desc {
+	margin-top: 30px;
+	width: 650px;
+}
+#register-sitename {
+	float: left;
+	margin-top: 10px;
+}
+
+#register-submit-button {
+	margin-top: 10px;
+}
+
+
+#login_standard {
+	width: 210px;
+	float: left;
+}
+#login_openid {
+	width: 210px;
+	margin-left: 250px;
+}
+
+#login_standard input,
+#login_openid input {
+	width: 180px;
+}
+
+#login-extra-links {
+	clear: both;
+}
+
+#register-link, #lost-password-link {
+	float: left;
+	font-size: 80%;
+	margin-right: 15px;
+}
+
+#login-name-end, #login-password-end, #login-extra-end, #login-submit-end {
+	height: 50px;
+}
+
+#login-submit-button {
+/*	margin-top: 10px; */
+	margin-left: 200px;
+}
+
+
+input#dfrn-url {
+	float: left;
+	background: url(friendika-16.png) no-repeat;
+	background-position: 2px center;
+	font-size: 17px;
+	padding-left: 21px;
+	height: 21px;
+	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;
+}
+
+
+
+#cropimage-wrapper, #cropimage-preview-wrapper {
+	float: left;
+	padding: 10px;
+}
+.imgCrop {
+	max-width: 280px;
+}
+#crop-image-form {
+	margin-top: 30px;
+	clear: both;
+}
+
+.intro-wrapper {
+	margin-top: 20px;
+}
+
+.intro-fullname {
+	font-size: 1.1em;
+	font-weight: bold;
+
+}
+.intro-desc {
+	margin-bottom: 20px;
+	font-weight: bold;
+}
+
+.intro-note {
+	padding: 10px;
+}
+
+.intro-end {
+	padding: 30px;
+}
+
+.intro-form {
+	float: left;
+}
+.intro-approve-form {
+	clear: both;
+}
+.intro-approve-as-friend-end {
+	clear: both;
+}
+.intro-submit-approve, .intro-submit-ignore {
+	margin-right: 20px;
+}
+.intro-submit-approve {
+	margin-top: 15px;
+}
+
+.intro-approve-as-friend-label, .intro-approve-as-fan-label {
+	float: left;
+	width: 100px;
+	margin-left: 20px;
+}
+.intro-approve-as-friend, .intro-approve-as-fan {
+	float: left;
+}
+.intro-form-end {
+	clear: both;
+}
+.intro-approve-as-friend-desc {
+	margin-top: 15px;
+}
+.intro-approve-as-end {
+	clear: both;
+	margin-bottom: 10px;
+}
+
+.intro-end {
+	clear: both;
+	margin-bottom: 30px;
+}
+.aprofile dt {
+	font-weight: bold;
+}
+#page-profile .title {
+	font-weight: bold;
+}
+#profile-vcard-break {
+	clear: both;
+}
+#profile-extra-links {
+	clear: both;
+	margin-top: 10px;
+}
+
+#profile-extra-links ul {
+	list-style-type: none;
+	padding: 0px;
+}
+
+
+#profile-extra-links li {
+	margin-top: 5px;
+}
+
+#profile-edit-links ul {
+	list-style-type: none;
+}
+
+#profile-edit-links li {
+	margin-top: 10px;
+}
+.profile-edit-side-div {
+	float: right;
+}
+.profile-edit-side-link {
+	opacity: 0.3;
+	filter:alpha(opacity=30);
+}
+.profile-edit-side-link:hover {
+	opacity: 1.0;
+	filter:alpha(opacity=100);
+}
+
+.view-contact-wrapper {
+	margin-top: 20px;
+	float: left;
+	margin-left: 20px;
+	width: 180px;
+}
+
+.contact-wrapper {
+	float: left;
+	width: 150px;
+	height: 150px;
+	overflow: auto;
+}
+
+#view-contact-end {
+	clear: both;
+}
+
+
+#viewcontacts {
+	margin-top: 15px;
+}
+#profile-edit-default-desc {
+	color: #FF0000;
+	border: 1px solid #FF8888;
+	background-color: #FFEEEE;
+	padding: 7px;
+}
+
+#profile-edit-clone-link-wrapper {
+	float: left;
+	margin-left: 50px;
+	margin-bottom: 20px;
+	width: 300px;
+}
+
+
+#profile-edit-links-end {
+	clear: both;
+	margin-bottom: 15px;
+}
+
+.profile-listing-photo {
+	border: none;
+}
+
+.profile-edit-submit-wrapper {
+	margin-top: 20px;
+	margin-bottom: 20px;
+}
+
+#profile-photo-link-select-wrapper {
+	margin-top: 2em;
+}
+
+#profile-photo-submit-wrapper {
+	margin-top: 10px;
+}
+
+#profile-photo-wrapper img {
+	width:175px;
+	height:175px;
+	padding: 12px;
+}
+
+#profile-edit-profile-name-label,
+#profile-edit-name-label,
+#profile-edit-pdesc-label,
+#profile-edit-gender-label,
+#profile-edit-dob-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-sexual-label,
+#profile-edit-politic-label,
+#profile-edit-religion-label,
+#profile-edit-pubkeywords-label,
+#profile-edit-prvkeywords-label,
+#profile-edit-homepage-label,
+#profile-edit-hometown-label {
+	font-weight: 700;
+	float: left;
+	width: 175px;
+}
+
+#profile-edit-profile-name,
+#profile-edit-name,
+#profile-edit-pdesc,
+#gender-select,
+#profile-edit-dob,
+#profile-edit-address,
+#profile-edit-locality,
+#profile-edit-region,
+#profile-edit-postal-code,
+#profile-edit-country-name,
+#marital-select,
+#sexual-select,
+#profile-edit-politic,
+#profile-edit-religion,
+#profile-edit-pubkeywords,
+#profile-edit-prvkeywords,
+#profile-in-dir-yes,
+#profile-in-dir-no,
+#profile-in-netdir-yes,
+#profile-in-netdir-no,
+#hide-wall-yes,
+#hide-wall-no,
+#hide-friends-yes,
+#hide-friends-no {
+	float: left;
+	margin-bottom: 20px;
+	margin-left: 20px;
+}
+#profile-edit-country-name {
+	max-width: 260px;
+}
+#profile-edit-pubkeywords,
+#profile-edit-prvkeywords {
+	margin-bottom: 5px;
+}
+#settings-normal,
+#settings-soapbox,
+#settings-freelove,
+#settings-community {
+	float: left;
+}
+#settings-notifications label {
+	margin-left: 20px;
+}
+#settings-notify-desc, #settings-activity-desc {
+	font-weight: bold;
+	margin-bottom: 15px;
+}
+#settings-pagetype-desc {
+	color: #666666;
+	margin-bottom: 15px;
+}
+
+#profile-in-dir-yes-label,
+#profile-in-dir-no-label,
+#profile-in-netdir-yes-label,
+#profile-in-netdir-no-label,
+#hide-wall-yes-label,
+#hide-wall-no-label,
+#hide-friends-yes-label,
+#hide-friends-no-label {
+	margin-left: 125px;
+	float: left;
+	width: 50px;
+}
+
+
+#profile-edit-howlong-label,
+#profile-edit-with-label {
+	display: block;
+	font-style: italic;
+	width: 175px;
+	margin-left: 0px;
+}
+#profile-edit-howlong,
+#profile-edit-with {
+	margin-left: 20px;
+	margin-bottom: 20px;
+}
+
+#profile-publish-yes-reg,
+#profile-publish-no-reg {
+	float: left;
+	margin-bottom: 10px;
+}
+
+#profile-publish-yes-label-reg,
+#profile-publish-no-label-reg {
+	margin-left: 350px;
+	float: left;
+	width: 50px;
+}
+
+#profile-publish-break-reg,
+#profile-publish-end-reg {
+	clear: both;
+}
+
+
+#profile-edit-pdesc-desc,
+#profile-edit-pubkeywords-desc,
+#profile-edit-prvkeywords-desc  {
+	float: left;
+	color: #777;
+	margin-left: 20px;
+	margin-bottom: 20px;
+}
+#profile-edit-prvkeywords-desc {
+	margin-bottom: 0px;
+}
+
+#profile-edit-homepage, #profile-edit-hometown {
+	float: left;
+	margin-bottom: 25px;
+	margin-left: 20px;
+}
+#profile-edit-hometown {
+	margin-bottom: 5px;
+}
+#settings-normal-label,
+#settings-soapbox-label,
+#settings-community-label,
+#settings-freelove-label {
+	float: left;
+	width: 200px;
+}
+#settings-normal-desc,
+#settings-soapbox-desc,
+#settings-community-desc,
+#settings-freelove-desc {
+	/*float: left;
+	margin-left: 75px;*/
+    clear: left;
+    color: #666666;
+    display: block;
+    margin-bottom: 20px	
+}
+
+#profile-edit-profile-name-end,
+#profile-edit-name-end,
+#profile-edit-pdesc-end,
+#profile-edit-gender-end,
+#profile-edit-dob-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-sexual-end,
+#profile-edit-politic-end,
+#profile-edit-religion-end,
+#profile-edit-pubkeywords-end,
+#profile-edit-prvkeywords-end,
+#profile-edit-homepage-end,
+#profile-edit-hometown-end,
+#profile-in-dir-break,
+#profile-in-dir-end,
+#profile-in-netdir-break,
+#profile-in-netdir-end,
+#hide-wall-break,
+#hide-wall-end,
+#hide-friends-break,
+#hide-friends-end,
+#settings-normal-break,
+#settings-soapbox-break,
+#settings-community-break,
+#settings-freelove-break {
+	clear: both;
+}
+#profile-edit-marital-wrapper, #profile-edit-address-wrapper {
+	margin-top: 50px;
+}
+#profile-edit-marital-end {
+	margin-bottom: 20px;
+}
+
+.settings-widget ul {
+	list-style-type: none;
+	padding: 0px;
+}
+
+.settings-widget li {
+	margin-left: 24px;
+	margin-bottom: 8px;
+}
+
+
+#gender-select, #marital-select, #sexual-select {
+	width: 220px;
+}
+
+#profile-edit-profile-name-wrapper .required {
+	color: #FF0000;
+	float: left;
+}
+
+#contacts-display-wrapper {
+	padding-left: 35px;
+}
+
+#contacts-main {
+	margin-top: 20px;
+	margin-bottom: 20px;
+}
+
+.contact-entry-wrapper {
+	float: left;
+/*	width: 120px;
+	height: 120px;*/
+	padding-left: 15px;
+	padding-right: 15px; 
+	width: 95px;
+	height: 170px;
+}
+#contacts-search-end {
+	margin-bottom: 10px;
+}
+
+.contact-entry-direction-icon {
+	margin-top: 24px;
+	margin-right: 2px;
+}
+
+.contact-entry-photo img {
+	border: none;
+}
+.contact-entry-photo-end {
+	clear: both;
+}
+.contact-entry-name {
+	float: left;
+	margin-left: 0px;
+	margin-right: 10px;
+	padding-bottom: 5px;
+	width: 120px;
+	font-weight: 600;
+	overflow: hidden;
+}
+.contact-entry-details {
+	font-style: italic;
+	font-size: 10px;
+	font-weight: 500;
+}
+.contact-entry-network {
+	font-size: 10px;
+	font-weight: 500;
+}
+.contact-entry-edit-links {
+	margin-top: 6px;
+	margin-left: 10px;
+	width: 16px;
+}
+.contact-entry-nav-wrapper {
+	float: left;
+	margin-left: 10px;
+}
+
+.contact-entry-edit-links img {
+	border: none;
+	margin-right: 15px;
+}
+.contact-entry-photo {
+	float: left;
+	position: relative;
+}
+.contact-entry-end {
+	clear: both;
+}
+
+#fsuggest-desc, #fsuggest-submit-wrapper {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+#network-star-link{
+	margin-top: 10px;
+}
+.network-star {
+	float: left;
+	margin-right: 5px;
+}
+#network-bmark-link {
+	margin-top: 10px;
+}
+
+.wall-item-content-wrapper {
+	margin-top: 60px;
+	padding-top: 30px;
+	border-top: 2px solid #AAAAAA;
+	position: relative;
+
+}
+
+.wall-item-content-wrapper.comment {
+	margin-top: 30px;
+	padding-top: 0px;
+	margin-left: 5px;
+	margin-right: 5px;
+	border: 2px solid #AAAAAA;
+	border-radius: 10px;
+	-webkit-border-radius: 10px;
+	-moz-border-radius: 10px;
+/*	background: #EEEEEE;*/
+}
+
+.wall-item-like, .wall-item-dislike {
+	font-style: italic;
+	margin-left: 0px;
+	opacity: 0.6;
+}
+
+.wall-item-like.comment, .wall-item-dislike.comment {
+	margin-left: 5px;
+}
+
+.wall-item-info {
+	display: block;
+	float: left;
+	width:110px;
+	margin-right:10px;
+}
+.comment .wall-item-info {
+	width: 70px;
+}
+
+.wall-item-photo-wrapper {
+	margin-bottom: 10px;
+	width: 100px;
+}
+.wall-item-photo-menu-button {
+	display: block;
+	position: absolute;
+	background-image: url("photo-menu.jpg");
+	background-position: top left; 
+	background-repeat: no-repeat;
+	margin: 0px; padding: 0px;
+	width: 16px;
+	height: 16px;
+	top: 94px; left:0px;
+	overflow: hidden;
+	text-indent: 40px;
+	display: none;
+	
+}
+.wall-item-photo-menu {
+	width: auto;
+	border: 2px solid #444444;
+	background: #FFFFFF;
+	position: absolute;
+	left: 0px; top:110px;
+	display: none;
+	z-index: 10000;
+}
+.wall-item-photo-menu { margin:0px; padding: 0px; list-style: none }
+.wall-item-photo-menu li a { display: block; padding: 2px; }
+.wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
+
+
+.comment .wall-item-photo-menu-button {	top: 64px;}
+.comment .wall-item-photo-menu { top: 80px; }
+
+.wallwall .wwto {
+    left: 50px;
+    margin: 0;
+    position: absolute;
+    top: 80px;
+    width: 30px
+}
+.wallwall .wwto img {
+	width: 30px !important;
+	height: 30px !important;
+}
+
+.wallwall /*.wall-item-photo-end*/ {
+	clear: both;
+}
+
+.wall-item-arrowphoto-wrapper {
+    position: absolute;
+    left: 75px;
+    top: 80px;
+    z-index: 100;
+}
+.wall-item-wrapper {
+	margin-left:10px;
+}
+.wall-item-lock {
+	margin-top: 30px;
+	left: 105px;
+	position: absolute;
+	top: 1px;	
+}
+.comment .wall-item-lock {
+	margin-top: 0px;
+	left: 65px;
+}
+
+.wall-item-ago {
+	color: #888888;
+	font-size: 0.8em;
+}
+
+.wall-item-location {
+	overflow: hidden;
+	/* add ellipsis on text overflow               */
+	/* this work on safari, opera, ie, chrome.     */
+	/* firefox users have to wait support or we    */
+	/* can use a jquery plugin http://bit.ly/zJskg */
+	text-overflow: ellipsis;
+	-o-text-overflow: ellipsis;
+	width: 100%;
+}
+
+.wall-item-like-buttons {
+	float: left;
+	margin-right: 3px;
+}
+
+.like-rotator {
+	margin-left: 5px;
+}
+
+.wall-item-like-buttons > a,
+.wall-item-like-buttons > img {
+	float: left;
+}
+
+.wall-item-like-buttons img {
+	cursor: pointer;
+}
+
+.wall-item-share-buttons {
+	margin-left: 10px;
+	margin-right: 10px;
+}
+
+.editpost {
+	margin-left: 10px;
+	float: left;
+}
+.star-item {
+	margin-left: 10px;
+	float: left;	
+}
+.tag-item {
+	margin-left: 10px;
+	float: left;	
+}
+
+.filer-item {
+	margin-left: 10px;
+	float: left;
+}
+
+.wall-item-links-wrapper {
+	float: left;
+}
+
+.wall-item-delete-wrapper {
+	float: right;
+}
+
+/*.wall-item-delete-end {
+	clear: both;
+}*/
+
+.wall-item-delete-icon {
+	border: none;
+}
+
+
+/*.wall-item-wrapper-end {
+	clear: both;
+}*/
+.wall-item-name-link {
+	font-weight: bold;
+	text-decoration: none;
+	color: #3172BD;
+}
+.wall-item-photo {
+	border: none;
+}
+.comment .wall-item-photo {
+	width: 50px !important; 
+	height: 50px !important;
+	border-top-left-radius: 10px;
+}
+.wall-item-content {
+	float: left;
+	margin-left: 3px;
+/*	padding-right: 1em;
+	max-height: 500px;
+	overflow: auto;*/
+}
+
+.wall-item-content img {
+	max-width: 300px;
+	border-radius: 7px;
+	-moz-border-radius: 7px;
+	-webkit-border-radius: 7px;
+}
+
+
+
+.wall-item-title {
+	float: left;
+	font-weight: bold;
+	font-size: 1.6em; 
+	/*width: 450px;*/
+}
+
+/*.wall-item-title-end {
+	clear: both;
+}*/
+
+.wall-item-body {
+	text-align: justify;
+	float: left;
+	width: 300px;
+	overflow: hidden;
+	margin-top: 10px;
+	line-height: 23px;
+}
+
+.wall-item-body code {
+	overflow: hidden;
+}
+
+.comment .wall-item-body {
+	margin-left: 5px;
+	width: 280px;
+}
+
+.wall-item-tools {
+	clear: both;
+/*	background-image: url("head.jpg");
+	background-position: 0 -20px;
+	background-repeat: repeat-x;*/
+   	padding: 5px 5px 0px;
+	height: 32px;
+}
+.wall-item-author {
+/*	margin-top: 10px;*/
+	margin-top: 0px;
+}
+
+.comment .wall-item-tools {
+/*	background:none;*/
+/*	background-image: url("head.jpg");
+	background-position: 0 -20px;
+	background-repeat: repeat-x;*/
+	border-bottom-left-radius: 10px;
+	border-bottom-right-radius: 10px;
+} 
+
+.comment-edit-wrapper {
+	margin-top: 15px;
+	background: #f3f3f3;
+	margin-left: 50px;
+}
+
+.comment-wwedit-wrapper {
+	display: block;
+	margin-top: 15px;
+	background: #f3f3f3;
+	margin-left: 10px;
+	margin-right: 10px;
+}
+
+.comment-edit-photo {
+	margin-top: 15px;
+	margin-left: 10px;
+	margin-bottom: 10px;
+	width: 25px;
+	float: left;
+}
+.comment-edit-photo img {
+	width: 25px;
+}
+.comment-edit-text-empty, .comment-edit-text-full {
+/*	float: left;*/
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;	
+	border: 1px solid #cccccc;
+	padding: 3px 1px 1px 3px;
+}
+
+.comment-edit-text-empty {
+	color: gray;
+	height: 30px;
+	width: 175px;
+/*	overflow: auto;*/
+	margin-top: 40px;
+	margin-bottom: 10px;
+	margin-left: 20px;
+}
+
+.comment-edit-text-full {
+	color: black;
+	height: 150px;
+/*	width: 350px;
+	overflow: auto;*/
+	width: 190px;
+	margin-top: 15px;
+	margin-left: 20px;
+}
+
+.comment-edit-text-end {
+	clear: both;
+}
+
+.comment-edit-submit {
+	font-size: 18px;
+	padding: 5px 10px;
+	margin: 10px 0px 10px 110px;
+}
+
+#profile-jot-wrapper {
+	padding-left: 10px;
+}
+
+#profile-jot-plugin-wrapper,
+#profile-jot-submit-wrapper {
+	margin-top: 15px;
+}
+
+#profile-jot-submit {
+	float: left;
+	font-size: 18px;
+	padding: 5px 8px;
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-left: 30px;
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+}
+#jot-preview-link {
+	display: none;
+	float: left;
+	margin-left: 45px;
+	margin-top: 0px !important;
+}
+
+
+#profile-nolocation-wrapper {
+	float: left;
+	margin-left: 15px;
+}
+#profile-title-wrapper {
+	float: left;
+	margin-left: 15px;
+}
+
+#profile-jot-perms {
+	float: left;
+	margin-left: 40px;
+	font-weight: bold;
+	font-size: 1.2em;
+}
+
+
+#profile-jot-perms-end {
+	/*clear: left;*/
+	height: 30px;
+}
+
+#profile-jot-plugin-end{
+  clear: both;
+}
+.profile-jot-net {
+	float: left;
+	margin-right: 10px;
+	margin-top: 5px;
+	margin-bottom: 5px;
+}
+
+#profile-jot-networks-end {
+	clear: both;
+}
+
+.profile-jot-box {
+	margin-top: 50px;
+}
+.profile-edit-textarea {
+	margin-left: 20px;
+}
+
+#profile-jot-end {
+	/*clear: both;*/
+	margin-bottom: 30px;
+}
+#about-jot-submit-wrapper {
+	margin-top: 15px;
+}
+#about-jot-end {
+	margin-bottom: 30px;
+}
+#contacts-main {
+	margin-bottom: 30px;
+}
+
+#profile-listing-desc {
+	margin-left: 30px;
+}
+
+#profile-listing-new-link-wrapper {
+	margin-left: 30px;
+	margin-bottom: 30px;
+}
+.profile-listing-photo-wrapper {
+	float: left;
+}
+
+.profile-listing-edit-buttons-wrapper {
+	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 {
+	float: left;
+	margin-left: 30px;
+	margin-top: 25px;
+}
+.profile-listing-visible {
+	margin-left: 100px;
+}
+.profile-listing-name {
+	float: left;
+	margin-left: 12px;
+	margin-top: 10px;
+	color: #3172BD;
+	font-weight: bold;
+	width: 200px;
+
+}
+.fortune {
+	margin-top: 50px;
+	color: #4444FF;
+	font-weight: bold;
+	margin-bottom: 20px;
+}
+
+
+.directory-end {
+	clear: both;
+}
+.directory-name {
+	text-align: center;
+}
+.directory-photo {
+	margin-left: 15px;
+}
+.directory-details {
+	font-size: 0.7em;
+	text-align: center;
+	margin-left: 5px;
+	margin-right: 5px;
+}
+.directory-item {
+	float: left;
+/*	width: 225px;
+	height: 260px;*/
+	padding-left: 15px;
+	width: 130px;
+	height: 235px;
+	overflow: auto;
+}
+
+#directory-search-wrapper {
+	margin-top: 20px;
+	margin-right: 20px;
+	margin-bottom: 50px;
+}
+
+#directory-search-end {
+}
+
+.directory-photo-img {
+	width: 125px;
+	border: none;
+}
+
+
+.pager {
+  margin-top: 30px;
+  margin-right: auto;
+  margin-left: auto;
+
+  padding-top: 10px;
+  padding-bottom: 10px;
+  padding-left: 10px;
+  text-align: center;
+/*  line-height: 2.75em;*/
+}
+
+.pager a {
+	font-size: 1.5em;
+	padding: 0.2em 1em;
+	border: 1px solid #aaa;
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+}
+
+
+.pager_first,
+.pager_last,
+.pager_prev,
+.pager_next,
+.pager_n {
+/*	float: left;
+	border: 1px solid black;
+	border-radius: 7px;
+	background: #EEE;
+	text-align: center;
+	width: 50px;
+	margin-right: 5px;
+	margin-bottom: 10px;*/
+/*	float: left;*/
+	margin-right: 15px;
+	margin-left: 15px;
+}
+
+.pager_first,
+.pager_last,
+.pager_n {
+	display: none;
+}
+
+.pager_first a,
+.pager_last a,
+.pager_prev a,
+.pager_next a {
+/*	padding-top: 2px;
+	padding-bottom: 2px;
+	padding-left: 4px;
+	padding-right: 8px;*/
+	padding-top: 5px;
+	padding-bottom: 5px;
+	padding-left: 25px;
+	padding-right: 30px;
+
+	border: 2px solid #AAAAAA;
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+    font-size: 1.25em;
+	text-align: center;
+	text-decoration: none;
+}
+.pager_n a {
+	padding-top: 2px;
+	padding-bottom: 2px;
+	padding-left: 9px;
+	padding-right: 18px;
+	text-decoration: none;
+}
+
+.pager_current {
+	display: none;
+	float: left;
+	border: 1px solid black;
+	border-radius: 7px;
+	-moz-border-radius: 7px;
+	-webkit-border-radius: 7px;
+	background: #FFCCCC;
+	font-size: 1.25em;
+	text-align: center;
+	width: 50px;
+	margin-right: 5px;
+	margin-bottom: 10px;
+}
+
+
+#advanced-profile-name-wrapper,
+#advanced-profile-gender-wrapper,
+#advanced-profile-dob-wrapper,
+#advanced-profile-age-wrapper,
+#advanced-profile-marital-wrapper,
+#advanced-profile-sexual-wrapper,
+#advanced-profile-homepage-wrapper,
+#advanced-profile-politic-wrapper,
+#advanced-profile-religion-wrapper,
+#advanced-profile-about-wrapper,
+#advanced-profile-interest-wrapper,
+#advanced-profile-contact-wrapper,
+#advanced-profile-music-wrapper,
+#advanced-profile-book-wrapper,
+#advanced-profile-tv-wrapper,
+#advanced-profile-film-wrapper,
+#advanced-profile-romance-wrapper,
+#advanced-profile-work-wrapper,
+#advanced-profile-education-wrapper {
+	margin-top: 20px;
+}
+
+#advanced-profile-name-text,
+#advanced-profile-gender-text,
+#advanced-profile-dob-text,
+#advanced-profile-age-text,
+#advanced-profile-marital-text,
+#advanced-profile-sexual-text,
+#advanced-profile-homepage-text,
+#advanced-profile-politic-text,
+#advanced-profile-religion-text,
+#advanced-profile-about-text,
+#advanced-profile-interest-text,
+#advanced-profile-contact-text,
+#advanced-profile-music-text,
+#advanced-profile-book-text,
+#advanced-profile-tv-text,
+#advanced-profile-film-text,
+#advanced-profile-romance-text,
+#advanced-profile-work-text,
+#advanced-profile-education-text {
+	width: 300px;
+	float: left;
+}
+
+#advanced-profile-name-end,
+#advanced-profile-gender-end,
+#advanced-profile-dob-end,
+#advanced-profile-age-end,
+#advanced-profile-marital-end,
+#advanced-profile-sexual-end,
+#advanced-profile-homepage-end,
+#advanced-profile-politic-end,
+#advanced-profile-religion-end {
+	height: 10px;
+}
+
+#advanced-profile-about-end,
+#advanced-profile-interest-end,
+#advanced-profile-contact-end,
+#advanced-profile-music-end,
+#advanced-profile-book-end,
+#advanced-profile-tv-end,
+#advanced-profile-film-end,
+#advanced-profile-romance-end,
+#advanced-profile-work-end,
+#advanced-profile-education-end {
+
+
+}
+
+#advanced-profile-name,
+#advanced-profile-gender,
+#advanced-profile-dob,
+#advanced-profile-age,
+#advanced-profile-marital,
+#advanced-profile-sexual,
+#advanced-profile-homepage,
+#advanced-profile-politic,
+#advanced-profile-religion {
+	float: left;
+
+}
+
+
+#advanced-profile-about,
+#advanced-profile-interest,
+#advanced-profile-contact,
+#advanced-profile-music,
+#advanced-profile-book,
+#advanced-profile-tv,
+#advanced-profile-film,
+#advanced-profile-romance,
+#advanced-profile-work,
+#advanced-profile-education {
+	margin-top: 10px;
+	margin-left: 50px;
+	margin-right: 20px;
+	padding: 10px;
+	border: 1px solid #CCCCCC;
+}
+
+#advanced-profile-with {
+	float: left;
+	margin-left: 15px;
+}
+
+#contact-edit-wrapper {
+	margin-top: 10px;
+}
+
+#contact-edit-banner-name {
+	font-size: 1.4em;
+	font-weight: bold;
+}
+
+#contact-edit-poll-wrapper {
+	margin-top: 15px;
+}
+
+#contact-edit-last-update-text {
+	float: left;
+	clear: left;
+	margin-top: 30px;
+}
+
+#contact-edit-poll-text {
+	float: left;
+	clear: left;
+	margin-top: 15px;
+	margin-bottom: 0px;
+}
+
+#contact-edit-update-now {
+	margin-top: 15px;
+}
+
+#contact-edit-links{
+	clear: both;
+}
+
+#contact-edit-links ul {
+	list-style: none;
+	list-style-type: none;
+	margin-left: 0px;
+	padding-left: 0px;
+}
+
+#contact-edit-links li {
+	margin-top: 5px;
+}
+
+#contact-edit-drop-link {
+	float: right;
+	margin-right: 10px;
+}
+
+#contact-edit-nav-end {
+	clear: both;
+}
+
+#contact-edit-wrapper {
+	width: 100%;
+}
+
+#update_now_link {
+	float: left;
+	clear: left;
+	margin-bottom: 20px;
+}
+
+#label_id_hidden, #id_hidden {
+	margin-top: 30px;
+}
+#help_id_hidden {
+	margin-top: 30px;
+}
+
+#contact-edit-end {
+	clear: both;
+	margin-top: 15px;
+}
+
+#contact-profile-selector {
+	width: 175px;
+	margin-left: 0px;
+}
+
+.contact-edit-submit {
+	margin-top: 20px;
+	padding: 0.2em 0.5em;
+	font-size: 18px;
+}
+
+
+.contact-photo-menu-button {
+/*	position: absolute;
+	background-image: url("photo-menu.jpg");
+	background-position: top left; 
+	background-repeat: no-repeat;
+	margin: 0px; padding: 0px;
+	width: 16px;
+	height: 16px;
+	top: 64px; left:0px;
+	overflow: hidden;
+	text-indent: 40px;
+	display: none;*/
+	
+}
+.contact-photo-menu {
+	width: 130px;
+	border: 1px solid #AAA;
+	background: #FFFFFF;
+	position: absolute;
+	left: -30px; top: 80px;
+	display: none;
+	z-index: 10000;
+	-moz-box-shadow: 3px 3px 5px #555;
+	-webkit-box-shadow: 3px 3px 5px #555;
+	box-shadow: 3px 3px 5px #555;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a { display: block; padding: 2px; }
+.contact-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
+
+
+#block-message, #ignore-message, #archive-message, #lost-contact-message {
+	color: #FF0000;
+}
+
+#profile-edit-insecure {
+	margin-top: 20px;
+	color: #FF0000;
+	font-size: 1.1em;
+	border: 1px solid #FF8888;
+	background-color: #FFEEEE;
+	padding-left: 5px;
+	/*: 3px 3px 3px 5px; */
+	width: 587px;
+}
+
+#profile-jot-desc {
+	/*float: left;*/
+	width: 100%;
+	color: #FF0000;
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+
+#profile-jot-text {
+	width: 90%;
+	height: 20px;
+	color:#cccccc;
+	border: 1px solid #cccccc;
+	padding: 3px 0px 0px 5px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;	
+}
+
+
+/** acl **/
+#photo-edit-perms-select,
+#photos-upload-permissions-wrapper,
+#profile-jot-acl-wrapper{
+	display:block!important;
+}
+
+#photos-usage-message {
+	margin-bottom: 15px;
+}
+
+#profile-jot-acl-wrapper{
+	width:270px;
+	padding-left:10px;
+	height:auto;
+	overflow:visible;
+}
+
+#acl-wrapper {
+	width: 270px;
+	float:left;
+}
+#acl-search {
+	display: none;
+	float:right;
+	background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+	padding-right:20px;
+}
+#acl-showall {
+	float: left;
+	display: block;
+	width: auto;
+	height: 18px;
+	background-color: #cccccc;
+	background-image: url("../../../images/show_all_off.png");
+	background-position: 7px 7px;
+	background-repeat: no-repeat;
+	padding: 7px 5px 0px 30px;
+	-webkit-border-radius: 5px ;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	color: #999999;
+}
+#acl-showall.selected {
+	color: #000000;
+	background-color: #ff9900;
+	background-image: url("../../../images/show_all_on.png");
+}
+
+#acl-list {
+/*	height: 210px;*/
+	border: 1px solid #cccccc;
+	clear: both;
+	margin-top: 30px;
+	overflow: visible;
+}
+#acl-list-content {
+	
+}
+.acl-list-item {
+	display: block;
+	width: 120px;
+	height: 30px;
+	border: 1px solid #cccccc;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+	margin-top: 5px;
+	margin-bottom: 5px;
+	margin-right: 2px;
+	margin-left: 2px;
+	padding-left: 5px;
+	float: left;
+}
+.acl-list-item img{
+	display: none;
+	width:22px;
+	height: 22px;
+	float: left;
+	margin: 4px;
+}
+.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
+.acl-list-item a { 
+	font-size: 8px;
+	display: block;
+	width: 40px;
+	height: 10px;
+	float: left;
+	color: #999999;
+	background-color: #cccccc;
+	background-position: 3px 3px;
+	background-repeat: no-repeat;
+	margin-right: 5px;
+	-webkit-border-radius: 2px ;
+	-moz-border-radius: 2px;
+	border-radius: 2px;
+	padding-left: 15px;
+}
+#acl-wrapper a:hover {
+	text-decoration: none;
+	color:#000000;
+}
+.acl-button-show { background-image: url("../../../images/show_off.png"); }
+.acl-button-hide { background-image: url("../../../images/hide_off.png"); }
+
+.acl-button-show.selected {
+	color: #000000;
+	background-color: #9ade00;
+	background-image: url("../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+	color: #000000;
+	background-color: #ff4141;
+	background-image: url("../../../images/hide_on.png");
+}
+.acl-list-item.groupshow { border-color: #9ade00; }
+.acl-list-item.grouphide { border-color: #ff4141; }
+/** /acl **/
+
+
+#group-new-submit-wrapper {
+	margin-top: 30px;
+}
+
+#group-edit-name-label {
+	float: left;
+	width: 175px;
+	margin-top: 20px;
+	margin-bottom: 20px;
+}
+
+#group-edit-name {
+	float: left;
+	width: 225px;
+	margin-top: 20px;
+	margin-bottom: 20px;
+}
+
+#group-edit-name-wrapper {
+
+
+}
+
+
+#group_members_select_label {
+	display: block;
+	float: left;
+	width: 175px;
+}
+
+.group_members_select {
+	float: left;
+	width: 230px;
+	overflow: auto;
+}
+
+#group_members_select_end {
+	clear: both;
+}
+#group-edit-name-end {
+	clear: both;
+}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: left;
+	font-size: 18px;
+	padding: 0.25em 0.5em;
+	margin-top: 10px;
+	margin-right: 30px;
+}
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	margin-bottom: 10px;
+	width: 270px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 5px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+.message-links ul {
+	list-style-type: none;
+	padding: 0px;
+}
+
+.message-links li {
+	margin-top: 10px;
+	float: left;
+}
+.message-links a {
+	padding: 3px 5px;
+}
+
+.message-links-end {
+	clear: both;
+}
+
+#sidebar-group-list ul {
+	list-style-type: none;
+}
+
+#sidebar-group-list .icon, #sidebar-group-list .iconspacer {
+	display: inline-block;
+	height: 12px;
+	width: 12px;
+}
+
+#sidebar-group-list li {
+	margin-top: 10px;
+}
+
+.nets-ul, .fileas-ul, .categories-ul {
+	list-style-type: none;
+}
+
+.nets-ul li, .fileas-ul li, .categories-ul li {
+	margin-top: 10px;
+}
+
+.nets-link {
+	margin-left: 24px;
+}
+.nets-all {
+	margin-left: 42px;
+}
+
+.fileas-link, .categories-link {
+	margin-left: 24px;
+}
+
+.fileas-all, .categories-all {
+	margin-left: 0px;
+}
+
+#search-save {
+	margin-left: 5px;
+}
+.groupsideedit {
+	margin-right: 10px;
+}
+#saved-search-ul {
+	list-style-type: none;
+}
+.savedsearchdrop, .savedsearchterm {
+	float: left;
+	margin-top: 10px;
+}
+.savedsearchterm {
+	margin-left: 10px;
+}
+
+
+#side-follow-wrapper {
+	margin-top: 20px;
+}
+#side-follow-url, #side-peoplefind-url {
+	margin-top: 5px;
+}
+#side-follow-submit, #side-peoplefind-submit {
+	margin-top: 15px;
+}
+
+#side-match-link {
+	margin-top: 10px;
+}
+
+aside input[type='text'] {
+ width: 174px;
+}
+
+.widget {
+	border: 1px solid #DDDDDD;
+	padding: 8px;
+	margin-top: 5px;
+	-moz-border-radius:5px;
+	-webkit-border-radius:5px;
+	border-radius:5px;
+
+}
+
+
+/*.photos {
+	height: auto;
+	overflow: auto;
+}*/
+
+.photos-end {
+	clear: both;
+	margin-bottom: 25px;
+}
+
+.photo-album-image-wrapper {
+	float: left;
+	margin-top: 15px;
+	margin-right: 15px;
+	margin-left: 15px;
+/*	width: 200px; height: 200px; 
+	overflow: hidden; 
+	position: relative; */
+}
+.photo-album-image-wrapper .caption {
+	display: none; 
+ 	width: 100%;
+/* 	position: absolute; */
+ 	bottom: 0px; 
+ 	padding: 0.5em 0.5em 0px 0.5em;
+ 	background-color: rgba(245, 245, 255, 0.8);
+ 	border-bottom: 2px solid #CCC;
+ 	margin: 0px;
+}
+.photo-album-image-wrapper a:hover .caption {
+	display:block;
+}
+
+#photo-album-end {
+	clear: both;
+	margin-bottom: 25px;
+}
+
+.photo-top-image-wrapper {
+/*	position: relative; */
+	float: left;
+	margin-top: 15px;
+	margin-right: 15px;
+	margin-left: 15px;
+	margin-bottom: 15px;
+/*	width: 200px; height: 200px; 
+	overflow: hidden; */
+}
+.photo-top-image-wrapper img {
+	max-width: 290px;
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+}
+.photo-top-album-name {
+ 	width: 100%;
+ 	min-height: 2em;
+/* 	position: absolute;  */
+ 	bottom: 0px; 
+ 	padding: 0px 3px;
+ 	padding-top: 0.5em;
+ 	background-color: rgb(255, 255, 255);
+}
+#photo-top-end {
+	clear: both;
+}
+
+#photo-top-links {
+	margin-bottom: 30px;
+	margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+	float: left;
+	width: 175px;
+}
+
+#photos-upload-noshare {
+	margin-bottom: 10px;
+}
+#photos-upload-existing-album-text {
+	float: left;
+	width: 175px;
+}
+#photos-upload-newalbum {
+	float: left;
+}
+#photos-upload-album-select {
+	float: left;
+}
+
+#photos-upload-spacer {
+	margin-top: 25px;
+}
+#photos-upload-new-end, #photos-upload-exist-end {
+	clear: both;
+}
+#photos-upload-exist-end {
+	margin-bottom: 15px;
+}
+#photos-upload-submit {
+	margin-top: 15px;
+}
+
+#photos_upload_applet_wrapper {
+	margin-bottom: 15px;
+}
+
+#photos-upload-no-java-message {
+	margin-bottom: 15px;
+}
+
+#character-counter {
+	float: right;
+	font-size: 120%;
+}
+
+#character-counter.grey {
+	color: #888888;
+}
+
+#character-counter.orange {
+	color: orange;
+}
+#character-counter.red {
+	color: red;
+}
+
+#profile-jot-banner-end {
+	/* clear: both; */ 
+}
+
+#photos-upload-select-files-text {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+#photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link {
+	color: #8888FF;
+	text-decoration: none;
+	cursor: pointer;
+}
+
+#photos-upload-perms-menu {
+	margin-left: 15px;
+}
+
+#photos-upload-perms-menu:hover {
+	color: #0000FF;
+	text-decoration: underline;
+	cursor: pointer;
+}
+#settings-default-perms-menu {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, .photo-edit-rotate-label {
+	float: left;
+	width: 150px;
+}
+
+#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label {
+	font-weight: 700;
+}
+
+#photos-upload-noshare-div {
+	margin-top: 140px;
+	margin-bottom: 15px;
+}
+
+#photos-upload-noshare-label {
+	margin-left: 25px;
+}
+
+#photos-upload-noshare {
+	float: left;
+}
+
+.photo-perms-icon {
+	float: left;
+}
+
+#photo-edit-perms-menu, #photos-upload-perms-menu, #settings-default-perms-menu {
+	text-decoration: none;
+}
+
+.photo-jot-perms-text {
+	padding-top: 5px;
+	padding-left: 40px;
+}
+
+#photo-edit-perms, #photos-upload-perms, #settings-default-perms {
+	margin-top: 30px;
+}
+#photos-upload-perms {
+	margin-top: 15px;
+	margin-left: 5px;
+}
+
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #settings-jot-acl-wrapper {
+	margin-top: 30px;
+	margin-left: 20px;
+}
+
+#advanced-expire-popup {
+	padding-left: 1em;
+	margin-top: 15px;
+	border: 1px solid #aaa;
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+}
+
+#photo-edit-perms-end {
+	margin-bottom: 15px;
+}
+
+#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
+	float: left;
+	margin-bottom: 25px;
+}
+
+.photo-edit-rotate {
+	float: left;
+	margin-left: 20px;
+}
+#photo-edit-link-wrap {
+	margin-bottom: 15px;
+}
+#photo-like-div {
+	margin-left: 15px;
+	margin-bottom: 65px;
+}
+
+#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end {
+	clear: both;
+}
+
+#photo-edit-rotate-end {
+	margin-bottom: 15px;
+}
+
+#photo-edit-submit-button, #photo-edit-delete-button, #photos-upload-submit {
+	margin-top: 30px;
+	padding: 0.25em 0.5em;
+	font-size: 18px;
+}
+#photo-edit-submit-button {
+	margin-left: 10px;
+}
+#photo-edit-delete-button {
+	margin-left: 45px;
+}
+#photos-upload-choose {
+	position: absolute;
+	top: 460px;
+	left: 5px;
+}
+#photos-upload-submit {
+	margin-top: 30px;
+	margin-left: 100px;
+	margin-bottom: 20px;
+}
+.settings-submit, .profile-edit-submit-button {
+	padding: 0.25em 0.5em;
+	margin-bottom: 10px;
+	font-size: 18px;
+}
+#photo-edit-end {
+	margin-bottom: 35px;
+}
+#photo-caption {
+	font-size: 110%;
+	font-weight: bold;
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+#in-this-photo-text {
+	color: #0000FF;
+	margin-left: 30px;
+}
+
+#in-this-photo {
+	margin-left: 60px;
+	margin-top: 10px;
+	margin-bottom: 20px;
+}
+
+#photo-album-edit-submit, #photo-album-edit-drop {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+#photo-album-edit-drop {
+	margin-left: 200px;
+}
+
+.group-delete-wrapper {
+	float: right;
+	margin-right: 50px;
+}
+
+#install-dbhost-label,
+#install-dbuser-label,
+#install-dbpass-label,
+#install-dbdata-label,
+#install-tz-desc {
+       float: left;
+       width: 250px;
+       margin-top: 10px;
+       margin-bottom: 10px;
+
+}
+
+#install-dbhost,
+#install-dbuser,
+#install-dbpass,
+#install-dbdata {
+       float: left;
+       width: 200px;
+       margin-left: 20px;
+}
+
+#install-dbhost-end,
+#install-dbuser-end,
+#install-dbpass-end,
+#install-dbdata-end,
+#install-tz-end {
+       clear: both;
+}
+
+#install-form select#timezone_select {
+       float: left;
+       margin-top: 18px;
+       margin-left: 20px;
+}
+
+#dfrn-request-networks {
+	margin-bottom: 30px;
+}
+
+#pause {
+  position: fixed;
+  bottom: 5px;
+  right: 5px;
+}
+
+.sparkle {
+	cursor: url('lock.cur'), pointer;
+/*	cursor: pointer !important; */
+}
+
+.contact-block-div {
+	float: left;
+	width: 52px;
+	height: 52px;
+}
+.contact-block-textdiv {
+	float: left;
+	width: 150px;
+	height: 34px;
+}
+
+#contact-block-end {
+	clear: both;
+}
+.contact-block-link {
+	float: left;
+}
+.contact-block-img {
+	width:48px;
+	height:48px;
+}
+
+#tag-remove {
+	margin-bottom: 15px;
+}
+
+#tagrm li {
+	margin-bottom: 10px;
+}
+
+#tagrm-submit, #tagrm-cancel {
+	margin-top: 25px;
+}
+
+#tagrm-cancel {
+	margin-left: 15px;
+}
+
+.wall-item-conv {
+	margin-top: 5px;
+	margin-bottom: 25px;
+}
+
+#search-submit {
+	margin-left: 15px;
+}
+
+#search-box {
+	margin-bottom: 25px;
+}
+
+.location-label, .gender-label, .marital-label, .homepage-label {
+	float: left;
+	text-align: right;
+	display: block;
+	width: 65px;
+}
+
+.adr, .x-gender, .marital-text, .homepage-url {
+	float: left;
+	display: block;
+	margin-left: 8px;
+}
+
+.profile-clear {
+	clear: both;
+}
+
+
+.clear {
+	clear: both;
+}
+
+.cc-license {
+	margin-top: 50px;
+	font-size: 70%;
+}
+
+
+#plugin-settings-link, #account-settings-link {
+	margin-bottom: 10px;
+}
+
+#uexport-link {
+	margin-bottom: 20px;
+}
+
+/* end from default */
+	
+
+.fn {
+	padding: 0px 0px 5px 12px;
+	font-size: 120%;
+	font-weight: bold;
+}
+
+.vcard .title {
+	margin-bottom: 5px;
+	margin-left: 12px;
+}
+
+.vcard dl {
+	clear: both;
+}
+
+#birthday-title {
+	float: left;
+	font-weight: bold;	
+}
+
+#birthday-adjust {
+	float: left;
+	font-size: 75%;
+	margin-left: 10px;
+}
+
+#birthday-title-end {
+	clear: both;
+}
+
+.birthday-list {
+	margin-left: 15px;
+}
+
+#birthday-wrapper {
+	margin-bottom: 20px;
+}
+
+#network-new-link {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+
+.tool-wrapper {
+  float: left;
+  margin-left: 15px;
+}
+
+.tool-link {
+  cursor: pointer;
+}
+
+.eventcal {
+	float: left;
+	font-size: 20px;
+}
+
+#event-summary-text {
+	margin-top: 15px;
+}
+
+#event-share-checkbox {
+	float: left;
+	margin-top: 10px;
+}
+
+#event-share-text {
+	float: left;
+	margin-top: 10px;
+	margin-left: 5px;
+}
+
+#event-share-break {
+	clear: both;
+	margin-bottom: 10px;
+}
+
+#event-summary {
+	width: 400px;
+}
+
+.vevent {
+	border: 1px solid #CCCCCC;
+}
+
+.vevent .event-summary {
+	margin-left: 10px;
+	margin-right: 10px;
+	font-weight: bold;
+}
+
+.vevent .event-description, .vevent .event-location {
+	margin-left: 10px;
+	margin-right: 10px;
+}
+.vevent .event-start {
+	margin-left: 10px;
+	margin-right: 10px;
+}
+
+#new-event-link {
+	margin-bottom: 10px;
+}
+
+.edit-event-link, .plink-event-link {
+	float: left;
+	margin-top: 4px;
+	margin-right: 4px;
+	margin-bottom: 15px;
+}
+
+.event-description:before {
+	content: url('../../../images/calendar.png');
+	margin-right: 15px;
+}
+
+.event-start, .event-end {
+	margin-left: 10px;
+	width: 330px;
+	clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+	float: right;
+}
+
+.event-list-date {
+	margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+	float: left;
+	margin-left: 32px;
+	margin-right: 32px;
+	margin-top: 64px;
+}
+.event-calendar-end {
+	clear: both;
+}
+
+ 
+.calendar {
+	font-family: Courier, monospace;
+}
+.today {
+	font-weight: bold;
+	color: #FF0000;
+}
+
+.settings-block {
+	border: 1px solid #AAA;
+	margin: 10px;
+	padding: 10px;
+}
+
+.app-title {
+	margin: 10px;
+}
+
+#identity-manage-desc {
+	margin-top:15px;
+	margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+	margin-bottom: 15px;
+}
+
+#identity-submit {
+	margin-top: 20px;
+}
+
+#photo-nav {
+	position: relative;
+	height: 55px;
+}
+
+#photo-prev-link {
+	position: absolute;
+	left: 5px;
+}
+#photo-next-link {
+	position: absolute;
+	right: 5px;
+}
+#photo-prev-link, #photo-next-link {
+	padding: 10px;
+/*	float: left;*/
+}
+
+/*#photo-photo {
+	float: left;
+}*/
+
+#photo-photo img {
+	max-width: 310px;
+}
+
+#photo-photo-end {
+	clear: both;
+}
+
+.profile-match-photo {
+	float: left;
+	text-align: center;
+	width: 120px;
+}
+
+.profile-match-name {
+	float: left;
+	text-align: center;
+	width: 120px;
+	overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+	clear: both;
+}
+
+.profile-match-connect {
+	text-align: center;
+	font-weight: bold;
+}
+
+.profile-match-wrapper {
+	float: left;
+	padding: 10px;
+	width: 120px;
+	height: 120px;
+	scroll: auto;
+}
+#profile-match-wrapper-end {
+	clear: both;
+}
+.side-link {
+	margin-bottom: 15px;
+}
+
+#language-selector {
+	position: absolute;
+	top: 0px;
+	left: 16px;
+}
+
+#group-members {
+	margin-top: 20px;
+	padding: 10px;
+	height: 250px;
+	overflow: auto;
+	border: 1px solid #ddd;
+}
+
+#group-members-end {
+	clear: both;
+}
+
+#group-separator {
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+
+#group-all-contacts {
+	padding: 10px;
+	height: 450px;
+	overflow: auto;
+	border: 1px solid #ddd;
+}
+
+#group-all-contacts-end {
+	clear: both;
+	margin-bottom: 10px;
+}
+
+#group-edit-desc {
+	margin-top: 15px;
+}
+
+
+#prof-members {
+	margin-top: 20px;
+	padding: 10px;
+	height: 250px;
+	overflow: auto;
+	border: 1px solid #ddd;
+}
+
+#prof-members-end {
+	clear: both;
+}
+
+#prof-separator {
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+
+#prof-all-contacts {
+	padding: 10px;
+	height: 450px;
+	overflow: auto;
+	border: 1px solid #ddd;
+}
+
+#prof-all-contacts-end {
+	clear: both;
+	margin-bottom: 10px;
+}
+
+#prof-edit-desc {
+	margin-top: 15px;
+}
+
+#crepair-name-label,
+#crepair-nick-label,
+#crepair-attag-label,
+#crepair-url-label,
+#crepair-request-label,
+#crepair-confirm-label,
+#crepair-notify-label,
+#crepair-photo-label,
+#crepair-poll-label {
+	float: left;
+	width: 200px;
+	margin-bottom: 15px;
+}
+
+#crepair-name,
+#crepair-nick,
+#crepair-attag,
+#crepair-url,
+#crepair-request,
+#crepair-confirm,
+#crepair-notify,
+#crepair-photo,
+#crepair-poll {
+	float: left;
+	width: 300px;
+}
+
+
+#netsearch-box {
+	margin-top: 20px;	
+}
+
+#netsearch-box #search-submit {
+	margin: 5px 0px 0px 0px;
+}
+
+.required {
+	color: #FF0000;
+}
+
+#event-start-text, #event-finish-text {
+	margin-top: 10px;
+	margin-bottom: 5px;
+}
+
+#event-nofinish-checkbox, #event-nofinish-text, #event-adjust-checkbox, #event-adjust-text {
+	float: left;
+}
+#event-datetime-break {
+	margin-bottom: 10px;
+}
+
+#event-nofinish-break, #event-adjust-break {
+	clear: both;
+}
+
+#event-desc-text, #event-location-text {
+	margin-top: 10px;
+	margin-bottom: 5px;
+}
+#event-submit {
+	margin-top: 10px;
+}
+
+.body-tag, .filesavetags, .categorytags {
+	opacity: 0.5;
+	filter:alpha(opacity=50);
+}
+
+.body-tag:hover, .filesavetags:hover, .categorytags:hover {
+	opacity: 1.0 !important;
+	filter:alpha(opacity=100) !important;
+}
+
+.item-select {
+	display: none;
+	opacity: 0.1;
+	filter:alpha(opacity=10);
+	float: right;
+	margin-right: 10px;
+
+}
+.item-select:hover, .checkeditem {
+	opacity: 1;
+	filter:alpha(opacity=100);
+}
+
+
+#item-delete-selected {
+	margin-top: 30px;
+}
+
+#item-delete-selected-end {
+	clear: both;
+}
+#item-delete-selected-icon, #item-delete-selected-desc {
+	float: left;
+	margin-right: 5px;
+}
+#item-delete-selected-desc:hover {
+	text-decoration: underline;
+}
+
+#lang-select-icon {
+	cursor: pointer;
+	position: fixed;
+	left: 0px;
+	top: 0px;
+	opacity: 0.2;
+	filter:alpha(opacity=20);
+}
+
+#lang-select-icon:hover {
+	opacity: 1;
+	filter:alpha(opacity=100);
+}
+
+.notif-image {
+	height: 80px;
+	width: 80px;
+	margin-right: 15px;
+}
+.notification-listing-end {
+	clear: both;
+	margin-bottom: 15px;
+}
+
+
+
+/**
+ * Plugins settings
+ */
+
+.settings-block > h3,
+.settings-heading {
+	border-bottom: 1px solid #babdb6;
+}
+ 
+
+/**
+ * Form fields
+ */
+.field {
+	margin-bottom: 10px;
+	padding-bottom: 10px;
+	overflow: auto;
+	width: 100%
+}
+
+.field label {
+	font-weight: 700;
+	float: left;
+	width: 200px;
+}
+
+.field input,
+.field textarea {
+	width: 270px;
+	margin-left: 20px;
+}
+.field textarea { height: 100px; }
+.field_help {
+	display: block;
+	margin-left: 20px;
+	color: #666666;
+	
+}
+
+
+.field .onoff {
+	float: left;
+	width: 80px;
+}
+.field .onoff a {
+	display: block;
+	border:1px solid #666666;
+	background-image:url("../../../images/onoff.jpg");
+	background-repeat: no-repeat;
+	padding: 4px 2px 2px 2px;
+	height: 16px;
+	text-decoration: none;
+}
+.field .onoff .off {
+	border-color:#666666;
+	padding-left: 40px;
+	background-position: left center;
+	background-color: #cccccc;
+	color: #666666;
+	text-align: right;
+}
+.field .onoff .on {
+	border-color:#204A87;
+	padding-right: 40px;
+	background-position: right center;
+	background-color: #D7E3F1;
+	color: #204A87;
+	text-align: left;
+}
+.hidden { display: none!important; }
+
+.field.radio .field_help { clear: left; margin-left: 20px; }
+
+/**
+ * ADMIN
+ */
+#pending-update {
+	float:right;
+	color: #ffffff;
+	font-weight: bold;
+	background-color: #FF0000;
+	padding: 0em 0.3em;
+	
+}
+#adminpage dl {
+	clear: left;
+	min-height: 40px;
+	margin-bottom: 2px;
+	padding-bottom: 2px;
+	border-bottom: 1px solid black;
+}
+#adminpage dt {
+	width: 180px;
+	float: left;
+	font-weight: bold;
+}
+#adminpage dd {
+	margin-left: 180px;
+}
+
+#adminpage h3 {
+	border-bottom: 1px solid #cccccc;
+}
+#adminpage .field label {
+	font-weight: bold;
+}
+#adminpage .submit {
+	clear:left;
+	text-align: right;
+}
+
+#adminpage #pluginslist {
+	margin: 0px; padding: 0px;
+}
+#adminpage .plugin {
+	list-style: none;
+	display: block;
+	border: 1px solid #888888;
+	padding: 1em;
+	margin-bottom: 5px;
+	clear: left;
+}
+#adminpage .plugin .desc { margin-left: 2.5em;}
+#adminpage .toggleplugin {
+	float:left;
+	margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1px solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #bbc7d7; }
+#adminpage .selectall { text-align: right; }
+
+#cnftheme {
+	display: none;
+}
+
+/*
+ * UPDATE
+ */
+.popup { 	
+	width: 100%; height: 100%;
+	top:0px; left:0px;
+	position: absolute;
+	display: none;
+}
+
+.popup .background {
+	background-color: rgba(0,0,0,128);
+	opacity: 0.5;
+	width: 100%; height: 100%;
+	position: absolute;
+	top:0px; left:0px;
+}
+.popup .panel {
+	top:25%;left:25%;width:50%;height:50%;
+	padding: 1em;
+	position: absolute;
+	border: 4px solid #000000;
+	background-color: #FFFFFF;
+}
+.popup .panel .panel_text { display: block; overflow: auto; height: 80%; } 
+.popup .panel .panel_in { width: 100%; height: 100%;	position: relative; }
+.popup .panel .panel_actions {  width: 100%; bottom: 4px; left: 0px; position: absolute; }
+.panel_text .progress { width: 50%; overflow: hidden; height: auto; border: 1px solid #cccccc; margin-bottom: 5px}
+.panel_text .progress span {float: right; display: block; width: 25%; background-color: #eeeeee; text-align: right;}
+
+/**
+ * OAuth
+ */
+.oauthapp {
+	height: auto; overflow: auto;
+	border-bottom: 2px solid #cccccc;
+	padding-bottom: 1em;
+	margin-bottom: 1em;	
+}
+.oauthapp img {
+	float: left;
+	width: 48px; height: 48px;
+	margin: 10px;
+}
+.oauthapp img.noicon {
+	background-image: url("../../../images/icons/48/plugin.png");
+	background-position: center center;
+	background-repeat: no-repeat;
+}
+.oauthapp a {
+	float: left;
+}
+
+/**
+ * ICONS
+ */
+.iconspacer {
+	display: block; width: 16px; height: 16px;
+}
+
+.icon {
+	display: block; width: 16px; height: 16px;
+	background-image: url('../../../images/icons.png');
+}
+.article { background-position: 0px 0px;}
+.icon.audio { display: none; background-position: -16px 0px;}
+.block { background-position: -32px 0px;}
+/*.drop { background-position: -48px 0px;}
+.drophide { background-position: -64px 0px;}*/
+.icon.drop {
+	display: block; width: 28px; height: 28px;
+	background-size: 100% 100%;
+	background-image: url('images/drop-darkred.png');
+	background-repeat: no-repeat;
+}
+.icon.drophide {
+	display: block; width: 28px; height: 28px;
+	background-size: 100% 100%;
+	background-image: url('images/drop-darkred.png');
+	background-repeat: no-repeat;
+}
+.edit { background-position: -80px 0px;}
+/*.camera { background-position: -96px 0px;}*/
+.icon.camera {
+	display: block; width: 28px; height: 21px;
+	margin-top: 4px;
+	background-size: 100% 100%;
+	background-image: url('images/camera.png');
+	background-repeat: no-repeat;
+}
+/*.dislike { background-position: -112px 0px;}*/
+.icon.dislike {
+	display: block;
+	width: 26px; height: 28px;/*31 33*/
+	background-size: 100% 100%;
+	background-image: url('images/disapprove.png');
+	background-repeat: no-repeat;
+	opacity: 0.5;
+}
+/*.like { background-position: -128px 0px;}*/
+.icon.like {
+	display: block; width: 26px; height: 28px;/*31 33*/
+	margin-right: 7px;
+	background-size: 100% 100%;
+	background-image: url('images/approve.png');
+	background-repeat: no-repeat;
+	opacity: 0.5;
+}
+.link { display: none; background-position: -144px 0px;}
+
+/*.globe { background-position: 0px -16px;}*/
+.icon.globe {
+	display: block; width: 28px; height: 28px;
+	background-size: 100% 100%;
+	background-image: url('images/globe.png');
+	background-repeat: no-repeat;
+}
+.noglobe { background-position: -16px -16px;}
+.no { background-position: -32px -16px;}
+.pause { background-position: -48px -16px;}
+.play { background-position: -64px -16px;}
+/*.pencil { background-position: -80px -16px;}
+.small-pencil { background-position: -96px -16px;}*/
+.icon.pencil {
+	display: block; width: 28px; height: 28px;
+	background-size: 100% 100%;
+	background-image: url('images/pencil.png');
+	background-repeat: no-repeat;
+	opacity: 0.5;
+}
+.icon.small-pencil {
+	display: block; width: 28px; height: 28px;
+	background-size: 100% 100%;
+	background-image: url('images/pencil.png');
+	background-repeat: no-repeat;
+	opacity: 0.5;
+}
+/*.recycle { background-position: -112px -16px;}*/
+.icon.recycle {
+	display: block;
+	width: 28px; height: 27px;/*33 32*/
+	background-size: 100% 100%;
+	background-image: url('images/recycle.png');
+	background-repeat: no-repeat;
+	opacity: 0.5;
+}
+/*.remote-link { background-position: -128px -16px;}*/
+.icon.remote-link {
+/*	display: block;*/
+	display: none;
+	width: 28px; height: 28px;
+	background-size: 100% 100%;
+	background-image: url('images/remote-link.png');
+	background-repeat: no-repeat;
+	opacity: 0.5;
+}
+.share { background-position: -144px -16px;}
+
+.tools { background-position: 0px -32px;}
+/*.lock { background-position: -16px -32px;}*/
+.icon.lock {
+	display: block; width: 17px; height: 25px;
+	margin-top: 1px;
+	background-size: 100% 100%;
+	background-image: url('images/lock.png');
+	background-repeat: no-repeat;
+}
+/*.unlock { background-position: -32px -32px;}*/
+.icon.unlock {
+	display: block; width: 17px; height: 28px;
+	margin-top: -2px;
+	background-size: 100% 100%;
+	background-image: url('images/unlock.png');
+	background-repeat: no-repeat;
+}
+.icon.video { display: none; background-position: -48px -32px;}
+.oembed.video a { display: block; }
+.youtube { background-position: -64px -32px;}
+/*.attach { background-position: -80px -32px; }*/
+.icon.attach {
+	display: block; width: 28px; height: 28px;
+	background-size: 100% 100%;
+	background-image: url('images/paperclip.png');
+	background-repeat: no-repeat;
+}
+.language { background-position: -96px -32px; }
+.prev { background-position: -112px -32px; }
+.next { background-position: -128px -32px; }
+.on { background-position: -144px -32px; }
+
+.off { background-position: 0px -48px; }
+/*.starred { background-position: -16px -48px; }*/
+.icon.starred {
+	display: block; width: 28px; height: 28px;
+	background-size: 100% 100%;
+	background-image: url('images/star-yellow.png');
+	background-repeat: no-repeat;
+}
+/*.unstarred { background-position: -32px -48px; }*/
+.icon.unstarred {
+	display: block; width: 28px; height: 28px;
+	background-size: 100% 100%;
+	background-image: url('images/star.png');
+	background-repeat: no-repeat;
+	opacity: 0.5;
+}
+/*.tagged { background-position: -48px -48px; }*/
+.icon.tagged {
+	display: block; width: 28px; height: 28px;
+	background-size: 100% 100%;
+	background-image: url('images/tag.png');
+	background-repeat: no-repeat;
+	opacity: 0.5;
+}
+.yellow { background-position: -64px -48px; }
+
+
+.filer-icon {
+	display: block; width: 24px; height: 24px;
+	background-size: 100% 100%;
+	background-image: url('images/folder.png');
+	background-repeat: no-repeat;
+	opacity: 0.5;
+}
+
+.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
+
+[class^="comment-edit-bb"] {
+	list-style: none;
+	display: none;
+	margin: 0px 0 -5px 20px;
+	width: 75%;
+}
+[class^="comment-edit-bb"] > li {
+	display: inline-block;
+	margin: 20px 10px 0 0;
+	visibility: none;
+}
+/*[class^="comment-edit-bb-end"] {
+	clear: both;
+}*/
+.editicon {
+    display: inline-block;
+	background-size: 100% 100%;
+	background-repeat: no-repeat;
+	background-color: #f3f3f3;
+    text-decoration: none;
+}
+/*.editicon:hover {
+	background-color: #ccc;
+}*/
+.boldbb {
+/*	background-position: 0px 0px;*/
+	width: 26px; height: 28px;
+	background-image: url('images/boldB-serif.png');
+}
+/*.boldbb:hover {
+	background-position: 0px -16px;
+}*/
+.italicbb {
+/*	background-position: -16px 0px;*/
+	width: 16px; height: 28px;
+	background-image: url('images/italicI-serif.png');
+}
+/*.italicbb:hover {
+	background-position: -16px -16px;
+}*/
+.underlinebb {
+/*	background-position: -32px 0px;*/
+	width: 25px; height: 28px;
+	background-image: url('images/underlineU-serif.png');
+}
+/*.underlinebb:hover {
+	background-position: -32px -16px;
+}*/
+.quotebb {
+/*	background-position: -48px 0px;*/
+	width: 28px; height: 28px;
+	background-image: url('images/quote.png');
+}
+/*.quotebb:hover {
+	background-position: -48px -16px;
+}*/
+.codebb {
+/*	background-position: -64px 0px;*/
+	width: 28px; height: 28px;
+	background-image: url('images/code.png');
+}
+/*.codebb:hover {
+	background-position: -64px -16px;
+}*/
+.imagebb {
+	background-position: -80px 0px;
+}
+.imagebb:hover {
+	background-position: -80px -16px;
+}
+.urlbb {
+	background-position: -96px 0px;
+}
+.urlbb:hover {
+	background-position: -96px -16px;
+}
+.videobb {
+	background-position: -112px 0px;
+}
+.videobb:hover {
+	background-position: -112px -16px;
+}
+
+.attachtype {
+	display: block; width: 20px; height: 23px;
+	float: left;
+	background-image: url('../../../images/content-types.png');
+}
+
+.body-attach {
+	margin-top: 10px;
+}
+
+.type-video { background-position: 0px 0px; }
+.type-image { background-position: -20px 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+
+/* autocomplete popup */
+.acpopup {
+	max-height:150px;
+	background-color:#ffffff;
+	overflow:auto;
+	z-index:100000;
+	border:1px solid #cccccc;
+}
+.acpopupitem {
+	background-color:#ffffff; padding: 4px;
+	clear:left;
+}
+.acpopupitem img {
+	float: left;
+	margin-right: 4px;
+}
+
+.acpopupitem.selected {
+	color: #FFFFFF; background: #3465A4;
+}
+
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+#jGrowl.top-right {
+	top: 15px;
+	right: 15px;
+}
+.qcomment {
+	border: 1px solid #EEE;
+	padding: 3px;
+	margin-top: 15px;
+	margin-left: 25px;
+	width: 125px;
+	overflow-y: auto;
+}
+
+
+.qcomment option {
+	width: 125px;
+	overflow-x: hidden;
+}
+
+.qcomment {
+	opacity: 0.3;
+	filter:alpha(opacity=30);
+}
+.qcomment:hover {
+	opacity: 1.0;
+	filter:alpha(opacity=100);
+}
+
+/* notifications popup menu */
+.nav-notify {
+	display: none;
+	position: absolute;
+	font-size: 10px;
+	padding: 1px 3px;
+	top: 0px;
+	right: -10px;
+	min-width: 15px;
+	text-align: right;
+}
+.nav-notify.show {
+	display: block;
+}
+ul.notifications-menu-popup {
+	position: absolute;
+	display: none;
+	width: 10em;
+	margin: 0px;
+	padding: 0px;
+	list-style: none;
+	z-index: 100000;
+	right: -55px;
+}
+#nav-notifications-menu {
+	width: 300px;
+/*	max-height: 400px;*/
+	height: auto;
+	overflow-y: scroll;overflow-style:scrollbar;
+	background-color:#FFFFFF;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius:5px;
+	border: 1px solid #AAA;
+	-moz-box-shadow: 3px 3px 5px #555;
+	-webkit-box-shadow: 3px 3px 5px #555;
+	box-shadow: 3px 3px 5px #555;
+}
+#nav-notifications-menu .contactname { font-weight: bold; font-size: 0.9em; }
+#nav-notifications-menu img { float: left; margin-right: 5px; }
+#nav-notifications-menu .notif-when { font-size: 0.8em; display: block; }
+#nav-notifications-menu li {
+	padding: 7px 0px 7px 10px;
+	word-wrap:normal;
+	border-bottom: 1px solid #000;
+}
+
+#nav-notifications-menu li:hover {
+
+}
+
+#nav-notifications-menu a:hover {
+	text-decoration: underline;
+}
+
+.notif-item a {
+	color: #000000;
+}
+
+.notif-item a:hover {
+	text-decoration: underline;
+}
+
+.notif-image {
+	width: 32px;
+	height: 32px;
+	padding: 7px 7px 0px 0px;
+}
+
+.notify-seen {
+	background: #DDDDDD;
+}
+
+#id_term_label {
+	width:75px;
+}
+#id_term {
+	width:100px;
+}
+
+#recip {
+	
+}
+.autocomplete-w1 { background: #ffffff; no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; }
+.autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px;  _margin:0; _overflow-x:hidden; }
+.autocomplete .selected { background:#F0F0F0; }
+.autocomplete div { padding:2px 5px; white-space:nowrap; overflow:hidden; }
+
+#datebrowse-sidebar select {
+	margin-left: 40px;
+	width: 130px;
+}

view/theme/frost-mobile/theme.php

@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * Name: Frost--mobile version
+ * Description: Like frosted glass
+ * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
+ * Version: Version 0.2.1
+ * Author: Zach P <windforest@f.shmuz.in>
+ * Maintainer: Zach P <windforest@f.shmuz.in>
+ */
+
+$a->theme_info = array();
+
+function frost_mobile_init(&$a) {
+
+	// I could do this in style.php, but by having the CSS in a file the browser will cache it,
+	// making pages load faster
+	if( $a->module === 'home' || $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
+		$a->page['htmlhead'] = str_replace('$stylesheet', $a->get_baseurl() . '/view/theme/frost-mobile/login-style.css', $a->page['htmlhead']);
+
+	}
+	if( $a->module === 'login' )
+		$a->page['end'] .= '<script type="text/javascript"> $j(document).ready(function() { $j("#id_" + window.loginName).focus();} );</script>';
+
+}

view/theme/frost-mobile/wall_item.tpl

@@ -0,0 +1,82 @@
+<a name="$item.id" ></a>
+<!--<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >-->
+	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+		<div class="wall-item-info" id="wall-item-info-$item.id">
+<!--			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
+				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">-->
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
+				</a>
+				<!--<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+					<ul>
+						$item.item_photo_menu
+					</ul>
+				</div>-->
+			</div>
+			<!--<div class="wall-item-photo-end"></div>-->
+			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
+				{{ if $item.lock }}<!--<div class="wall-item-lock">--><img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /><!--</div>-->
+				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
+				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>				
+			</div>
+		</div>
+		<!--<div class="wall-item-author">-->
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
+				
+		<!--</div>-->
+		<br />
+
+		<div class="wall-item-content" id="wall-item-content-$item.id" >
+			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
+			<!--<div class="wall-item-title-end"></div>-->
+			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
+					<!--<div class="body-tag">-->
+						{{ for $item.tags as $tag }}
+							<span class='body-tag tag'>$tag</span>
+						{{ endfor }}
+					<!--</div>-->
+			</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			{{ if $item.vote }}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+				{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+			</div>
+			{{ endif }}
+			{{ if $item.plink }}
+				<!--<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="wall-item-links-wrapper icon remote-link$item.sparkle"></a></div>-->
+			{{ endif }}
+			{{ if $item.edpost }}
+				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+			{{ endif }}
+			 
+			{{ if $item.star }}
+			<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+			{{ endif }}
+			{{ if $item.filer }}
+			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
+			{{ endif }}			
+			<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" id="wall-item-delete-wrapper-$item.id" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			<!--</div>-->
+				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+			<!--<div class="wall-item-delete-end"></div>-->
+		</div>
+	</div>
+	<!--<div class="wall-item-wrapper-end"></div>-->
+	<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
+	<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
+	<!--<div class="wall-item-comment-wrapper" >-->
+	$item.comment
+	<!--</div>-->
+
+<!--<div class="wall-item-outside-wrapper-end$item.indent" ></div>-->
+<!--</div>-->

view/theme/frost-mobile/wallmsg-end.tpl

@@ -0,0 +1,5 @@
+
+<script language="javascript" type="text/javascript">
+wallInitEditor();
+</script>
+

view/theme/frost-mobile/wallmsg-header.tpl

@@ -0,0 +1,6 @@
+
+<script language="javascript" type="text/javascript">
+window.editSelect = "none";
+window.ajaxType = "wallmsg-header";
+</script>
+

view/theme/frost-mobile/wallwall_item.tpl

@@ -0,0 +1,87 @@
+<a name="$item.id" ></a>
+<!--<div class="wall-item-outside-wrapper$item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >-->
+	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+		<div class="wall-item-info wallwall" id="wall-item-info-$item.id">
+			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
+				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
+<!--			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
+				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
+                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">-->
+			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+				<!--<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+                    <ul class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+                        $item.item_photo_menu
+                    </ul>
+<!--                </div>-->
+
+			</div>
+			<!--<div class="wall-item-photo-end"></div>-->
+			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
+				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
+				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
+			</div>
+		</div>
+		<!--<div class="wall-item-author">-->
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall<br />
+				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>				
+		<!--</div>-->
+		<div class="wall-item-content" id="wall-item-content-$item.id" >
+			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
+			<!--<div class="wall-item-title-end"></div>-->
+			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
+					<!--<div class="body-tag">-->
+						{{ for $item.tags as $tag }}
+							<span class='body-tag tag'>$tag</span>
+						{{ endfor }}
+					<!--</div>-->
+			</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			{{ if $item.vote }}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+				{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+			</div>
+			{{ endif }}
+			{{ if $item.plink }}
+				<!--<div class="wall-item-links-wrapper">--><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="wall-item-links-wrapper icon remote-link$item.sparkle"></a><!--</div>-->
+			{{ endif }}
+			{{ if $item.edpost }}
+				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+			{{ endif }}
+			 
+			{{ if $item.star }}
+			<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+			{{ endif }}
+			{{ if $item.filer }}
+			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
+			{{ endif }}			
+			
+			<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			<!--</div>-->
+				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+			<!--<div class="wall-item-delete-end"></div>-->
+		</div>
+	</div>	
+	<!--<div class="wall-item-wrapper-end"></div>-->
+	<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
+	<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
+	<div class="wall-item-comment-separator"></div>
+	<!--<div class="wall-item-comment-wrapper">-->
+	$item.comment
+	<!--</div>-->
+
+<!--<div class="wall-item-outside-wrapper-end$item.indent" ></div>-->
+<!--</div>-->
+

view/theme/frost/TODO

@@ -0,0 +1,9 @@
+Home page edit pencil
+Preview spacing
+Photo album display
+
+Check TinyMCE optimization
+"Profiles" page is wonky
+Settings, admin, photos upload don't look beautiful
+
+

view/theme/frost/acl_selector.tpl

@@ -0,0 +1,22 @@
+<div id="acl-wrapper">
+	<input id="acl-search">
+	<a href="#" id="acl-showall">$showall</a>
+	<div id="acl-list">
+		<div id="acl-list-content">
+		</div>
+	</div>
+	<span id="acl-fields"></span>
+</div>
+
+<div class="acl-list-item" rel="acl-template" style="display:none">
+	<img src="{0}"><p>{1}</p>
+	<a href="#" class='acl-button-show'>$show</a>
+	<a href="#" class='acl-button-hide'>$hide</a>
+</div>
+
+<script>
+	window.allowCID = $allowcid;
+	window.allowGID = $allowgid;
+	window.denyCID = $denycid;
+	window.denyGID = $denygid;
+</script>

view/theme/frost/admin_aside.tpl

@@ -0,0 +1,31 @@
+
+<h4><a href="$admurl">$admtxt</a></h4>
+<ul class='admin linklist'>
+	<li class='admin button $admin.site.2'><a href='$admin.site.0'>$admin.site.1</a></li>
+	<li class='admin button $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li>
+	<li class='admin button $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li>
+	<li class='admin button $admin.themes.2'><a href='$admin.themes.0'>$admin.themes.1</a></li>
+	<li class='admin button $admin.dbsync.2'><a href='$admin.dbsync.0'>$admin.dbsync.1</a></li>
+</ul>
+
+{{ if $admin.update }}
+<ul class='admin linklist'>
+	<li class='admin button $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
+	<li class='admin button $admin.update.2'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
+</ul>
+{{ endif }}
+
+
+{{ if $admin.plugins_admin }}<h4>$plugadmtxt</h4>{{ endif }}
+<ul class='admin linklist'>
+	{{ for $admin.plugins_admin as $l }}
+	<li class='admin button $l.2'><a href='$l.0'>$l.1</a></li>
+	{{ endfor }}
+</ul>
+	
+	
+<h4>$logtxt</h4>
+<ul class='admin linklist'>
+	<li class='admin button $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li>
+</ul>
+

view/theme/frost/admin_site.tpl

@@ -0,0 +1,56 @@
+
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+	
+	<form action="$baseurl/admin/site" method="post">
+    <input type='hidden' name='form_security_token' value='$form_security_token'>
+
+	{{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
+	{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$language }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$theme }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
+	
+	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+	
+	<h3>$registration</h3>
+	{{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
+	
+	{{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
+	
+	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+
+	<h3>$upload</h3>
+	{{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
+	
+	<h3>$corporate</h3>
+	{{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
+	
+	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+	
+	<h3>$advanced</h3>
+	{{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
+	
+	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+	
+	</form>
+</div>

view/theme/frost/comment_item.tpl

@@ -0,0 +1,74 @@
+<!--		<script>
+		$(document).ready( function () {
+			$(document).mouseup(function(e) {
+				var container = $("#comment-edit-wrapper-$id");
+				if( container.has(e.target).length === 0) {
+					commentClose(document.getElementById('comment-edit-text-$id'),$id);
+					cmtBbClose($id);
+				}
+			});
+		});
+		</script>-->
+
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+				<input type="hidden" name="type" value="$type" />
+				<input type="hidden" name="profile_uid" value="$profile_uid" />
+				<input type="hidden" name="parent" value="$parent" />
+				<input type="hidden" name="return" value="$return_path" />
+				<input type="hidden" name="jsreload" value="$jsreload" />
+				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+<!--				<div class="comment-edit-photo" id="comment-edit-photo-$id" >-->
+					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-$id" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+<!--				</div>-->
+				<!--<div class="comment-edit-photo-end"></div>-->
+				<ul class="comment-edit-bb-$id">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="$edbold"
+						onclick="insertFormatting('$comment','b', $id);"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="$editalic"
+						onclick="insertFormatting('$comment','i', $id);"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="$eduline"
+						onclick="insertFormatting('$comment','u', $id);"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="$edquote"
+						onclick="insertFormatting('$comment','quote', $id);"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="$edcode"
+						onclick="insertFormatting('$comment','code', $id);"></a></li>
+					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="$edimg"
+						onclick="insertFormatting('$comment','img', $id);"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="$edurl"
+						onclick="insertFormatting('$comment','url', $id);"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="$edvideo"
+						onclick="insertFormatting('$comment','video', $id);"></a></li>
+				</ul>	
+<!--				<div class="comment-edit-bb-end"></div>-->
+<!--				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);cmtBbClose($id);" >$comment</textarea>-->
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" >$comment</textarea>
+				{{ if $qcomment }}
+					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+					<option value=""></option>
+				{{ for $qcomment as $qc }}
+					<option value="$qc">$qc</option>				
+				{{ endfor }}
+					</select>
+				{{ endif }}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<!--<div class="comment-edit-end"></div>-->
+			</form>
+
+		</div>

view/theme/frost/contact_end.tpl

@@ -0,0 +1,6 @@
+
+<script language="javascript" type="text/javascript">
+window.editSelect = "$editselect";
+contactInitEditor();
+</script>
+

view/theme/frost/contact_template.tpl

@@ -0,0 +1,27 @@
+
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
+	<div class="contact-entry-photo-wrapper" >
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
+		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
+		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
+
+			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
+
+			{{ if $contact.photo_menu }}
+			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
+                    <ul>
+                        $contact.photo_menu
+                    </ul>
+                </div>
+			{{ endif }}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div><br />
+{{ if $contact.alt_text }}<div class="contact-entry-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
+	<div class="contact-entry-network" id="contact-entry-network-$contact.id" >$contact.network</div>
+
+	<div class="contact-entry-end" ></div>
+</div>

view/theme/frost/contacts-end.tpl

@@ -0,0 +1,4 @@
+
+<script src="$baseurl/library/jquery_ac/friendica.complete.min.js" ></script>
+
+

view/theme/frost/contacts-head.tpl

@@ -0,0 +1,5 @@
+
+<script>
+	window.autocompleteType = 'contacts-head';
+</script>
+

view/theme/frost/contacts-template.tpl

@@ -0,0 +1,28 @@
+<h1>$header{{ if $total }} ($total){{ endif }}</h1>
+
+{{ if $finding }}<h4>$finding</h4>{{ endif }}
+
+<div id="contacts-search-wrapper">
+<form id="contacts-search-form" action="$cmd" method="get" >
+<span class="contacts-search-desc">$desc</span>
+<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="$search" />
+<input type="submit" name="submit" id="contacts-search-submit" value="$submit" />
+</form>
+</div>
+<div id="contacts-search-end"></div>
+
+$tabs
+
+
+<div id="contacts-display-wrapper">
+{{ for $contacts as $contact }}
+	{{ inc contact_template.tpl }}{{ endinc }}
+{{ endfor }}
+</div>
+<div id="contact-edit-end"></div>
+
+$paginate
+
+
+
+

view/theme/frost/conversation.tpl

@@ -0,0 +1,27 @@
+{{ for $threads as $thread }}
+<div id="tread-wrapper-$thread.id" class="tread-wrapper">
+	{{ for $thread.items as $item }}
+		{{if $item.comment_firstcollapsed}}
+			<div class="hide-comments-outer">
+			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
+			</div>
+			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
+		{{endif}}
+		{{if $item.comment_lastcollapsed}}</div>{{endif}}
+		
+		{{ inc $item.template }}{{ endinc }}
+		
+		
+	{{ endfor }}
+</div>
+{{ endfor }}
+
+<div id="conversation-end"></div>
+
+{{ if $dropping }}
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
+  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+  <div id="item-delete-selected-desc" >$dropping</div>
+</div>
+<div id="item-delete-selected-end"></div>
+{{ endif }}

view/theme/frost/cropbody.tpl

@@ -0,0 +1,27 @@
+<h1>$title</h1>
+<p id="cropimage-desc">
+$desc
+</p>
+<div id="cropimage-wrapper">
+<img src="$image_url" id="croppa" class="imgCrop" alt="$title" />
+</div>
+<div id="cropimage-preview-wrapper" >
+<div id="previewWrap" ></div>
+</div>
+
+<form action="profile_photo/$resource" id="crop-image-form" method="post" />
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
+<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" />
+</div>
+
+</form>

view/theme/frost/cropend.tpl

@@ -0,0 +1,4 @@
+      <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
+      <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
+      <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
+      <script type="text/javascript" language="javascript">initCrop();</script>

view/theme/frost/crophead.tpl

@@ -0,0 +1 @@
+      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />

view/theme/frost/default.php

@@ -0,0 +1,43 @@
+<!DOCTYPE html >
+<html>
+<head>
+  <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
+</head>
+<body>
+	<?php if( $a->module === 'home' ) { ?>
+	<center>
+	<div class="login-button">
+	<a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendika-1600.png" title="Click to log in"></a>
+	</div>
+	</center>
+	<?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
+	?>
+
+	<div class='section-wrapper'>
+	<section><?php if(x($page,'content')) echo $page['content']; ?>
+	</section>
+	</div>
+
+	<?php } else {
+
+	if(x($page,'nav')) echo $page['nav']; ?>
+	<div class='main-container'>
+		<!--<div class='main-content-loading'><img src="/view/theme/frost/images/ajax-loader.gif" alt="Please wait..."></div>-->
+		<div class='main-content-container'>
+		<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
+		<div class='section-wrapper'>
+		<section><?php if(x($page,'content')) echo $page['content']; ?>
+			<div id="page-footer"></div>
+		</section>
+		</div>
+		<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
+		<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
+		</div>
+	</div>
+	<?php } ?>
+	<?php if(x($page,'end')) echo $page['end']; ?>
+</body>
+</html>
+