fixed head.tpl before the last pull. hadn't pushed and merged with upstream yet.

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-07-25 22:28:16 -04:00 · 2012-07-25 22:28:16 -04:00 · c5603cf756
parent 794ae669ce 2e5c970cb1
commit c5603cf756
182 changed files with 17803 additions and 148 deletions
--- a/boot.php
+++ b/boot.php
@ -11,7 +11,7 @@ require_once('include/cache.php');
 require_once('library/Mobile_Detect/Mobile_Detect.php');

 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1413' );
+define ( 'FRIENDICA_VERSION',      '3.0.1415' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1154      );

@ -1451,11 +1451,11 @@ if(! function_exists('current_theme')) {
 			$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);
 		}
-		else {
+		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') ||
 						file_exists('view/theme/' . $theme_name . '/style.php')))
--- a/include/diaspora.php
+++ b/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;
--- a/util/messages.po
+++ b/util/messages.po
@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1413\n"
+"Project-Id-Version: 3.0.1415\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-23 10:00-0700\n"
+"POT-Creation-Date: 2012-07-25 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"
@ -56,7 +56,7 @@ msgstr ""
 #: ../../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
-#: ../../include/items.php:3701 ../../index.php:309
+#: ../../include/items.php:3813 ../../index.php:309
 msgid "Permission denied."
 msgstr ""

@ -86,7 +86,7 @@ msgid "Return to contact editor"
 msgstr ""

 #: ../../mod/crepair.php:148 ../../mod/settings.php:559
-#: ../../mod/settings.php:585 ../../mod/admin.php:661 ../../mod/admin.php:670
+#: ../../mod/settings.php:585 ../../mod/admin.php:664 ../../mod/admin.php:673
 msgid "Name"
 msgstr ""

@ -131,8 +131,8 @@ msgstr ""
 #: ../../mod/contacts.php:343 ../../mod/settings.php:557
 #: ../../mod/settings.php:711 ../../mod/settings.php:772
 #: ../../mod/settings.php:973 ../../mod/group.php:85 ../../mod/message.php:294
-#: ../../mod/message.php:473 ../../mod/admin.php:422 ../../mod/admin.php:658
-#: ../../mod/admin.php:794 ../../mod/admin.php:993 ../../mod/admin.php:1080
+#: ../../mod/message.php:473 ../../mod/admin.php:422 ../../mod/admin.php:661
+#: ../../mod/admin.php:797 ../../mod/admin.php:996 ../../mod/admin.php:1083
 #: ../../mod/profiles.php:577 ../../mod/invite.php:119
 #: ../../addon/fromgplus/fromgplus.php:40
 #: ../../addon/facebook/facebook.php:619
@ -231,7 +231,7 @@ msgid "link to source"
 msgstr ""

 #: ../../mod/events.php:328 ../../view/theme/diabook/theme.php:131
-#: ../../include/nav.php:52 ../../boot.php:1599
+#: ../../include/nav.php:52 ../../boot.php:1614
 msgid "Events"
 msgstr ""

@ -287,7 +287,7 @@ msgstr ""

 #: ../../mod/events.php:429 ../../mod/directory.php:132
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:447
-#: ../../boot.php:1176
+#: ../../boot.php:1179
 msgid "Location:"
 msgstr ""

@ -368,7 +368,7 @@ msgstr ""
 msgid "No"
 msgstr ""

-#: ../../mod/photos.php:46 ../../boot.php:1593
+#: ../../mod/photos.php:46 ../../boot.php:1607
 msgid "Photo Albums"
 msgstr ""

@ -592,7 +592,7 @@ msgstr ""

 #: ../../mod/photos.php:1348 ../../mod/photos.php:1388
 #: ../../mod/photos.php:1419 ../../mod/content.php:690
-#: ../../include/conversation.php:695 ../../boot.php:568
+#: ../../include/conversation.php:695 ../../boot.php:569
 msgid "Comment"
 msgstr ""

@ -604,7 +604,7 @@ msgstr ""

 #: ../../mod/photos.php:1447 ../../mod/content.php:439
 #: ../../mod/content.php:720 ../../mod/settings.php:620
-#: ../../mod/settings.php:709 ../../mod/group.php:168 ../../mod/admin.php:665
+#: ../../mod/settings.php:709 ../../mod/group.php:168 ../../mod/admin.php:668
 #: ../../include/conversation.php:444 ../../include/conversation.php:725
 msgid "Delete"
 msgstr ""
@ -857,7 +857,7 @@ msgstr ""
 msgid "Confirm"
 msgstr ""

-#: ../../mod/dfrn_request.php:715 ../../include/items.php:3092
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:3204
 msgid "[Name Withheld]"
 msgstr ""

@ -1249,7 +1249,7 @@ msgid "is interested in:"
 msgstr ""

 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1120
+#: ../../include/contact_widgets.php:9 ../../boot.php:1123
 msgid "Connect"
 msgstr ""

@ -1307,9 +1307,9 @@ 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:114
 #: ../../include/contact_widgets.php:188 ../../include/conversation.php:592
-#: ../../boot.php:569
+#: ../../boot.php:570
 msgid "show more"
 msgstr ""

@ -1478,7 +1478,7 @@ msgid "if applicable"
 msgstr ""

 #: ../../mod/notifications.php:157 ../../mod/notifications.php:204
-#: ../../mod/admin.php:663
+#: ../../mod/admin.php:666
 msgid "Approve"
 msgstr ""

@ -1679,12 +1679,12 @@ msgid "View all contacts"
 msgstr ""

 #: ../../mod/contacts.php:310 ../../mod/contacts.php:369
-#: ../../mod/admin.php:667
+#: ../../mod/admin.php:670
 msgid "Unblock"
 msgstr ""

 #: ../../mod/contacts.php:310 ../../mod/contacts.php:369
-#: ../../mod/admin.php:666
+#: ../../mod/admin.php:669
 msgid "Block"
 msgstr ""

@ -1781,7 +1781,7 @@ msgstr ""
 msgid "Update public posts"
 msgstr ""

-#: ../../mod/contacts.php:366 ../../mod/admin.php:1138
+#: ../../mod/contacts.php:366 ../../mod/admin.php:1141
 msgid "Update now"
 msgstr ""

@ -1911,8 +1911,8 @@ msgstr ""
 #: ../../addon/facebook/facebook.php:702
 #: ../../addon/facebook/facebook.php:1200
 #: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3101
-#: ../../boot.php:770
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3213
+#: ../../boot.php:772
 msgid "Administrator"
 msgstr ""

@ -1922,7 +1922,7 @@ msgid ""
 "Password reset failed."
 msgstr ""

-#: ../../mod/lostpass.php:83 ../../boot.php:902
+#: ../../mod/lostpass.php:83 ../../boot.php:905
 msgid "Password Reset"
 msgstr ""

@ -1994,7 +1994,7 @@ msgstr ""
 msgid "Remove account"
 msgstr ""

-#: ../../mod/settings.php:89 ../../mod/admin.php:753 ../../mod/admin.php:958
+#: ../../mod/settings.php:89 ../../mod/admin.php:756 ../../mod/admin.php:961
 #: ../../addon/dav/layout.fnk.php:116 ../../addon/mathjax/mathjax.php:36
 #: ../../view/theme/diabook/theme.php:643
 #: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137
@ -2589,7 +2589,7 @@ msgstr ""
 msgid "Invalid contact."
 msgstr ""

-#: ../../mod/notes.php:44 ../../boot.php:1605
+#: ../../mod/notes.php:44 ../../boot.php:1621
 msgid "Personal Notes"
 msgstr ""

@ -2840,7 +2840,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:1584
+#: ../../include/nav.php:50 ../../boot.php:1597
 msgid "Profile"
 msgstr ""

@ -2944,7 +2944,7 @@ msgstr ""
 msgid "Choose a nickname: "
 msgstr ""

-#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:868
+#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:871
 msgid "Register"
 msgstr ""

@ -2977,8 +2977,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/display.php:142 ../../include/items.php:3580
+#: ../../mod/admin.php:705 ../../mod/admin.php:904 ../../mod/display.php:37
+#: ../../mod/display.php:142 ../../include/items.php:3692
 msgid "Item not found."
 msgstr ""

@ -2987,7 +2987,7 @@ msgid "Access denied."
 msgstr ""

 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
-#: ../../include/nav.php:51 ../../boot.php:1590
+#: ../../include/nav.php:51 ../../boot.php:1604
 msgid "Photos"
 msgstr ""

@ -3212,15 +3212,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 ""

@ -3228,7 +3228,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 ""

@ -3244,19 +3244,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 ""

@ -3272,9 +3272,9 @@ msgstr ""
 msgid "Message queues"
 msgstr ""

-#: ../../mod/admin.php:212 ../../mod/admin.php:420 ../../mod/admin.php:656
-#: ../../mod/admin.php:750 ../../mod/admin.php:792 ../../mod/admin.php:955
-#: ../../mod/admin.php:991 ../../mod/admin.php:1078
+#: ../../mod/admin.php:212 ../../mod/admin.php:420 ../../mod/admin.php:659
+#: ../../mod/admin.php:753 ../../mod/admin.php:795 ../../mod/admin.php:958
+#: ../../mod/admin.php:994 ../../mod/admin.php:1081
 msgid "Administration"
 msgstr ""

@ -3579,226 +3579,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:1033
+#: ../../mod/profile.php:21 ../../boot.php:1036
 msgid "Requested profile is not available."
 msgstr ""

@ -4193,23 +4193,23 @@ msgstr ""
 msgid "Edit/Manage Profiles"
 msgstr ""

-#: ../../mod/profiles.php:672 ../../boot.php:1142
+#: ../../mod/profiles.php:672 ../../boot.php:1145
 msgid "Change profile photo"
 msgstr ""

-#: ../../mod/profiles.php:673 ../../boot.php:1143
+#: ../../mod/profiles.php:673 ../../boot.php:1146
 msgid "Create New Profile"
 msgstr ""

-#: ../../mod/profiles.php:684 ../../boot.php:1153
+#: ../../mod/profiles.php:684 ../../boot.php:1156
 msgid "Profile Image"
 msgstr ""

-#: ../../mod/profiles.php:686 ../../boot.php:1156
+#: ../../mod/profiles.php:686 ../../boot.php:1159
 msgid "visible to everybody"
 msgstr ""

-#: ../../mod/profiles.php:687 ../../boot.php:1157
+#: ../../mod/profiles.php:687 ../../boot.php:1160
 msgid "Edit visibility"
 msgstr ""

@ -4337,17 +4337,17 @@ msgid "Gender: "
 msgstr ""

 #: ../../mod/directory.php:134 ../../include/profile_advanced.php:17
-#: ../../boot.php:1178
+#: ../../boot.php:1181
 msgid "Gender:"
 msgstr ""

 #: ../../mod/directory.php:136 ../../include/profile_advanced.php:37
-#: ../../boot.php:1181
+#: ../../boot.php:1184
 msgid "Status:"
 msgstr ""

 #: ../../mod/directory.php:138 ../../include/profile_advanced.php:48
-#: ../../boot.php:1183
+#: ../../boot.php:1186
 msgid "Homepage:"
 msgstr ""

@ -4955,7 +4955,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:889
+#: ../../include/nav.php:64 ../../boot.php:892
 msgid "Login"
 msgstr ""

@ -7064,7 +7064,7 @@ msgstr ""
 msgid "Sharing notification from Diaspora network"
 msgstr ""

-#: ../../include/diaspora.php:2174
+#: ../../include/diaspora.php:2177
 msgid "Attachments:"
 msgstr ""

@ -7115,7 +7115,7 @@ msgstr ""
 msgid "Contacts not in any group"
 msgstr ""

-#: ../../include/nav.php:46 ../../boot.php:888
+#: ../../include/nav.php:46 ../../boot.php:891
 msgid "Logout"
 msgstr ""

@ -7123,7 +7123,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""

-#: ../../include/nav.php:49 ../../boot.php:1578
+#: ../../include/nav.php:49 ../../boot.php:1590
 msgid "Status"
 msgstr ""

@ -7203,11 +7203,11 @@ msgstr ""
 msgid "Manage other pages"
 msgstr ""

-#: ../../include/nav.php:138 ../../boot.php:1136
+#: ../../include/nav.php:138 ../../boot.php:1139
 msgid "Profiles"
 msgstr ""

-#: ../../include/nav.php:138 ../../boot.php:1136
+#: ../../include/nav.php:138 ../../boot.php:1139
 msgid "Manage/edit profiles"
 msgstr ""

@ -7644,15 +7644,15 @@ msgstr ""
 msgid "following"
 msgstr ""

-#: ../../include/items.php:3099
+#: ../../include/items.php:3211
 msgid "A new person is sharing with you at "
 msgstr ""

-#: ../../include/items.php:3099
+#: ../../include/items.php:3211
 msgid "You have a new follower at "
 msgstr ""

-#: ../../include/items.php:3768
+#: ../../include/items.php:3880
 msgid "Archives"
 msgstr ""

@ -7894,108 +7894,108 @@ msgstr ""
 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:567
+#: ../../boot.php:568
 msgid "Delete this item?"
 msgstr ""

-#: ../../boot.php:570
+#: ../../boot.php:571
 msgid "show fewer"
 msgstr ""

-#: ../../boot.php:765
-#, php-format
-msgid "Update %s failed. See error logs."
-msgstr ""
-
 #: ../../boot.php:767
 #, php-format
+msgid "Update %s failed. See error logs."
+msgstr ""
+
+#: ../../boot.php:769
+#, php-format
 msgid "Update Error at %s"
 msgstr ""

-#: ../../boot.php:867
+#: ../../boot.php:870
 msgid "Create a New Account"
 msgstr ""

-#: ../../boot.php:891
+#: ../../boot.php:894
 msgid "Nickname or Email address: "
 msgstr ""

-#: ../../boot.php:892
+#: ../../boot.php:895
 msgid "Password: "
 msgstr ""

-#: ../../boot.php:895
+#: ../../boot.php:898
 msgid "Or login using OpenID: "
 msgstr ""

-#: ../../boot.php:901
+#: ../../boot.php:904
 msgid "Forgot your password?"
 msgstr ""

-#: ../../boot.php:1068
+#: ../../boot.php:1071
 msgid "Edit profile"
 msgstr ""

-#: ../../boot.php:1128
+#: ../../boot.php:1131
 msgid "Message"
 msgstr ""

-#: ../../boot.php:1244 ../../boot.php:1323
+#: ../../boot.php:1247 ../../boot.php:1326
 msgid "g A l F d"
 msgstr ""

-#: ../../boot.php:1245 ../../boot.php:1324
+#: ../../boot.php:1248 ../../boot.php:1327
 msgid "F d"
 msgstr ""

-#: ../../boot.php:1290 ../../boot.php:1364
+#: ../../boot.php:1293 ../../boot.php:1367
 msgid "[today]"
 msgstr ""

-#: ../../boot.php:1302
+#: ../../boot.php:1305
 msgid "Birthday Reminders"
 msgstr ""

-#: ../../boot.php:1303
+#: ../../boot.php:1306
 msgid "Birthdays this week:"
 msgstr ""

-#: ../../boot.php:1357
+#: ../../boot.php:1360
 msgid "[No description]"
 msgstr ""

-#: ../../boot.php:1375
+#: ../../boot.php:1378
 msgid "Event Reminders"
 msgstr ""

-#: ../../boot.php:1376
+#: ../../boot.php:1379
 msgid "Events this week:"
 msgstr ""

-#: ../../boot.php:1581
+#: ../../boot.php:1593
 msgid "Status Messages and Posts"
 msgstr ""

-#: ../../boot.php:1587
+#: ../../boot.php:1600
 msgid "Profile Details"
 msgstr ""

-#: ../../boot.php:1602
+#: ../../boot.php:1617
 msgid "Events and Calendar"
 msgstr ""

-#: ../../boot.php:1608
+#: ../../boot.php:1624
 msgid "Only You Can See This"
 msgstr ""
--- a/view/theme/frost-mobile/TODO
+++ b/view/theme/frost-mobile/TODO
@ -0,0 +1,16 @@
+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?
+
--- a/view/theme/frost-mobile/admin_aside.tpl
+++ b/view/theme/frost-mobile/admin_aside.tpl
@ -0,0 +1,42 @@
+<script>
+	// update pending count //
+	$(function(){
+
+		$("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(); }
+			elm.html(register);
+		});
+	});
+</script>
+<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>
+
--- a/view/theme/frost-mobile/admin_site.tpl
+++ b/view/theme/frost-mobile/admin_site.tpl
@ -0,0 +1,91 @@
+<!--<script>
+	$(function(){
+		
+		$("#cnftheme").fancybox({
+			width: 800,
+			autoDimensions: false,
+			onStart: function(){
+				var theme = $("#id_theme :selected").val();
+				$("#cnftheme").attr('href',"$baseurl/admin/themes/"+theme);
+			}, 
+			onComplete: function(){
+				$("div#fancybox-content form").submit(function(e){
+					var url = $(this).attr('action');
+					// can't get .serialize() to work...
+					var data={};
+					$(this).find("input").each(function(){
+						data[$(this).attr('name')] = $(this).val();
+					});
+					$(this).find("select").each(function(){
+						data[$(this).attr('name')] = $(this).children(":selected").val();
+					});
+					console.log(":)", url, data);
+					
+					$.post(url, data, function(data) {
+						if(timer) clearTimeout(timer);
+						NavUpdate();
+						$.fancybox.close();
+					})
+					
+					return false;
+				});
+				
+			}
+		});
+	});
+</script>-->
+<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>
--- a/view/theme/frost-mobile/border.jpg
+++ b/view/theme/frost-mobile/border.jpg
--- a/view/theme/frost-mobile/comment_item.tpl
+++ b/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-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>
+				<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>
--- a/view/theme/frost-mobile/contact_head.tpl
+++ b/view/theme/frost-mobile/contact_head.tpl
@ -0,0 +1,30 @@
+<!--<script language="javascript" type="text/javascript"
+          src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+          <script language="javascript" type="text/javascript">
+
+tinyMCE.init({
+	theme : "advanced",
+	mode : "$editselect",
+	elements: "contact-edit-info",
+	plugins : "bbcode",
+	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
+	theme_advanced_buttons2 : "",
+	theme_advanced_buttons3 : "",
+	theme_advanced_toolbar_location : "top",
+	theme_advanced_toolbar_align : "center",
+	theme_advanced_styles : "blockquote,code",
+	gecko_spellcheck : true,
+	entity_encoding : "raw",
+	add_unload_trigger : false,
+	remove_linebreaks : false,
+	force_p_newlines : false,
+	force_br_newlines : true,
+	forced_root_block : '',
+	content_css: "$baseurl/view/custom_tinymce.css"
+
+
+});
+
+
+</script>
+-->
--- a/view/theme/frost-mobile/contact_template.tpl
+++ b/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>
--- a/view/theme/frost-mobile/contacts-template.tpl
+++ b/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
+
+
+
+
--- a/view/theme/frost-mobile/conversation.tpl
+++ b/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 }}
--- a/view/theme/frost-mobile/default.php
+++ b/view/theme/frost-mobile/default.php
@ -0,0 +1,41 @@
+<!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 } ?>
+</body>
+</html>
+
--- a/view/theme/frost-mobile/editicons.png
+++ b/view/theme/frost-mobile/editicons.png
--- a/view/theme/frost-mobile/event_head.tpl
+++ b/view/theme/frost-mobile/event_head.tpl
@ -0,0 +1,139 @@
+<link rel='stylesheet' type='text/css' href='$baseurl/library/fullcalendar/fullcalendar.css' />
+<script language="javascript" type="text/javascript"
+          src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script>
+
+<script>
+	function showEvent(eventid) {
+/*		$.get(
+			'$baseurl/events/?id='+eventid,
+			function(data){
+				$.fancybox(data);
+			}
+		);			*/
+	}
+	
+	$(document).ready(function() {
+		$('#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) {
+			$("#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]);
+		
+	});
+</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">
+
+/*
+	tinyMCE.init({
+		theme : "advanced",
+		mode : "textareas",
+		plugins : "bbcode,paste",
+		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 : '',
+		content_css: "$baseurl/view/custom_tinymce.css",
+		theme_advanced_path : false,
+		setup : function(ed) {
+			ed.onInit.add(function(ed) {
+				ed.pasteAsPlainText = true;
+			});
+		}
+
+	});
+*/
+
+	$(document).ready(function() { 
+
+		$('#event-share-checkbox').change(function() {
+
+			if ($('#event-share-checkbox').is(':checked')) { 
+				$('#acl-wrapper').show();
+			}
+			else {
+				$('#acl-wrapper').hide();
+			}
+		}).trigger('change');
+
+
+		$('#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-public').hide();
+			});
+			if(selstr == null) {
+				$('#jot-public').show();
+			}
+
+		}).trigger('change');
+
+	});
+
+</script>
+
--- a/view/theme/frost-mobile/experimental
+++ b/view/theme/frost-mobile/experimental
--- a/view/theme/frost-mobile/field_input.tpl
+++ b/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>
--- a/view/theme/frost-mobile/field_openid.tpl
+++ b/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>
--- a/view/theme/frost-mobile/field_password.tpl
+++ b/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>
--- a/view/theme/frost-mobile/file.gif
+++ b/view/theme/frost-mobile/file.gif
--- a/view/theme/frost-mobile/friendika-16.png
+++ b/view/theme/frost-mobile/friendika-16.png
--- a/view/theme/frost-mobile/head.jpg
+++ b/view/theme/frost-mobile/head.jpg
--- a/view/theme/frost-mobile/head.tpl
+++ b/view/theme/frost-mobile/head.tpl
@ -0,0 +1,105 @@
+<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" />
+
+<!--[if IE]>
+<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
+<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
+<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
+<script type="text/javascript" src="$baseurl/js/fk.autocomplete.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/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>-->
+<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/acl.js" ></script>
+<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js" ></script>
+<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/main.js" ></script>
+<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/theme.js"></script>
+<script>
+
+	var updateInterval = $update_interval;
+	var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
+
+	function confirmDelete() { return confirm("$delitem"); }
+	function commentOpen(obj,id) {
+		if(obj.value == '$comment') {
+			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);
+		}
+	}
+	function commentClose(obj,id) {
+		if(obj.value == '') {
+			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);
+		}
+	}
+
+
+	function commentInsert(obj,id) {
+		var tmpStr = $("#comment-edit-text-" + id).val();
+		if(tmpStr == '$comment') {
+			tmpStr = '';
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+		}
+		var ins = $(obj).html();
+		ins = ins.replace('&lt;','<');
+		ins = ins.replace('&gt;','>');
+		ins = ins.replace('&amp;','&');
+		ins = ins.replace('&quot;','"');
+		$("#comment-edit-text-" + id).val(tmpStr + ins);
+	}
+
+	function qCommentInsert(obj,id) {
+		var tmpStr = $("#comment-edit-text-" + id).val();
+		if(tmpStr == '$comment') {
+			tmpStr = '';
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+		}
+		var ins = $(obj).val();
+		ins = ins.replace('&lt;','<');
+		ins = ins.replace('&gt;','>');
+		ins = ins.replace('&amp;','&');
+		ins = ins.replace('&quot;','"');
+		$("#comment-edit-text-" + id).val(tmpStr + ins);
+		$(obj).val('');
+	}
+
+	function showHideComments(id) {
+		if( $('#collapsed-comments-' + id).is(':visible')) {
+			$('#collapsed-comments-' + id).hide();
+			$('#hide-comments-' + id).html('$showmore');
+		}
+		else {
+			$('#collapsed-comments-' + id).show();
+			$('#hide-comments-' + id).html('$showfewer');
+		}
+	}
+
+
+</script>
+
--- a/view/theme/frost-mobile/images/approve-blue.png
+++ b/view/theme/frost-mobile/images/approve-blue.png
--- a/view/theme/frost-mobile/images/approve.png
+++ b/view/theme/frost-mobile/images/approve.png
--- a/view/theme/frost-mobile/images/arrow-left.png
+++ b/view/theme/frost-mobile/images/arrow-left.png
--- a/view/theme/frost-mobile/images/arrow-right.png
+++ b/view/theme/frost-mobile/images/arrow-right.png
--- a/view/theme/frost-mobile/images/boldB-serif.png
+++ b/view/theme/frost-mobile/images/boldB-serif.png
--- a/view/theme/frost-mobile/images/camera.png
+++ b/view/theme/frost-mobile/images/camera.png
--- a/view/theme/frost-mobile/images/code.png
+++ b/view/theme/frost-mobile/images/code.png
--- a/view/theme/frost-mobile/images/contacts.png
+++ b/view/theme/frost-mobile/images/contacts.png
--- a/view/theme/frost-mobile/images/disapprove-blue.png
+++ b/view/theme/frost-mobile/images/disapprove-blue.png
--- a/view/theme/frost-mobile/images/disapprove.png
+++ b/view/theme/frost-mobile/images/disapprove.png
--- a/view/theme/frost-mobile/images/drop-blue.png
+++ b/view/theme/frost-mobile/images/drop-blue.png
--- a/view/theme/frost-mobile/images/drop-darkred.png
+++ b/view/theme/frost-mobile/images/drop-darkred.png
--- a/view/theme/frost-mobile/images/drop-red.png
+++ b/view/theme/frost-mobile/images/drop-red.png
--- a/view/theme/frost-mobile/images/drop.png
+++ b/view/theme/frost-mobile/images/drop.png
--- a/view/theme/frost-mobile/images/folder-blue.png
+++ b/view/theme/frost-mobile/images/folder-blue.png
--- a/view/theme/frost-mobile/images/folder.png
+++ b/view/theme/frost-mobile/images/folder.png
--- a/view/theme/frost-mobile/images/globe.png
+++ b/view/theme/frost-mobile/images/globe.png
--- a/view/theme/frost-mobile/images/italicI-serif.png
+++ b/view/theme/frost-mobile/images/italicI-serif.png
--- a/view/theme/frost-mobile/images/lock.png
+++ b/view/theme/frost-mobile/images/lock.png
--- a/view/theme/frost-mobile/images/menu.png
+++ b/view/theme/frost-mobile/images/menu.png
--- a/view/theme/frost-mobile/images/message.png
+++ b/view/theme/frost-mobile/images/message.png
--- a/view/theme/frost-mobile/images/network.png
+++ b/view/theme/frost-mobile/images/network.png
--- a/view/theme/frost-mobile/images/notifications.png
+++ b/view/theme/frost-mobile/images/notifications.png
--- a/view/theme/frost-mobile/images/paperclip.png
+++ b/view/theme/frost-mobile/images/paperclip.png
--- a/view/theme/frost-mobile/images/pencil-blue.png
+++ b/view/theme/frost-mobile/images/pencil-blue.png
--- a/view/theme/frost-mobile/images/pencil.png
+++ b/view/theme/frost-mobile/images/pencil.png
--- a/view/theme/frost-mobile/images/quote.png
+++ b/view/theme/frost-mobile/images/quote.png
--- a/view/theme/frost-mobile/images/recycle-blue.png
+++ b/view/theme/frost-mobile/images/recycle-blue.png
--- a/view/theme/frost-mobile/images/recycle.png
+++ b/view/theme/frost-mobile/images/recycle.png
--- a/view/theme/frost-mobile/images/remote-link-blue.png
+++ b/view/theme/frost-mobile/images/remote-link-blue.png
--- a/view/theme/frost-mobile/images/remote-link.png
+++ b/view/theme/frost-mobile/images/remote-link.png
--- a/view/theme/frost-mobile/images/star-blue.png
+++ b/view/theme/frost-mobile/images/star-blue.png
--- a/view/theme/frost-mobile/images/star-yellow.png
+++ b/view/theme/frost-mobile/images/star-yellow.png
--- a/view/theme/frost-mobile/images/star.png
+++ b/view/theme/frost-mobile/images/star.png
--- a/view/theme/frost-mobile/images/tag-blue.png
+++ b/view/theme/frost-mobile/images/tag-blue.png
--- a/view/theme/frost-mobile/images/tag.png
+++ b/view/theme/frost-mobile/images/tag.png
--- a/view/theme/frost-mobile/images/underlineU-serif.png
+++ b/view/theme/frost-mobile/images/underlineU-serif.png
--- a/view/theme/frost-mobile/images/unlock.png
+++ b/view/theme/frost-mobile/images/unlock.png
--- a/view/theme/frost-mobile/jot-header.tpl
+++ b/view/theme/frost-mobile/jot-header.tpl
@ -0,0 +1,212 @@
+
+<script type="text/javascript" src="$baseurl/js/ajaxupload.js" ></script>
+
+<script>
+	var ispublic = '$ispublic';
+
+	$(document).ready(function() {
+		
+		/* enable tinymce on focus and click */
+		$("#profile-jot-text").focus(enableOnUser);
+		$("#profile-jot-text").click(enableOnUser);
+
+		var uploader = new window.AjaxUpload(
+			'wall-image-upload',
+			{ action: 'wall_upload/$nickname',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+		var file_uploader = new window.AjaxUpload(
+			'wall-file-upload',
+			{ action: 'wall_attach/$nickname',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+
+
+	});
+
+/*	function deleteCheckedItems() {
+		var checkedstr = '';
+
+		$('.item-select').each( function() {
+			if($(this).is(':checked')) {
+				if(checkedstr.length != 0) {
+					checkedstr = checkedstr + ',' + $(this).val();
+				}
+				else {
+					checkedstr = $(this).val();
+				}
+			}	
+		});
+		$.post('item', { dropitems: checkedstr }, function(data) {
+			window.location.reload();
+		});
+	}*/
+
+	function jotGetLink() {
+		reply = prompt("$linkurl");
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				addeditortext(data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function jotVideoURL() {
+		reply = prompt("$vidurl");
+		if(reply && reply.length) {
+			addeditortext('[video]' + reply + '[/video]');
+		}
+	}
+
+	function jotAudioURL() {
+		reply = prompt("$audurl");
+		if(reply && reply.length) {
+			addeditortext('[audio]' + reply + '[/audio]');
+		}
+	}
+
+
+	function jotGetLocation() {
+		reply = prompt("$whereareu", $('#jot-location').val());
+		if(reply && reply.length) {
+			$('#jot-location').val(reply);
+		}
+	}
+
+	function jotShare(id) {
+		if ($('#jot-popup').length != 0) $('#jot-popup').show();
+
+		$('#like-rotator-' + id).show();
+		$.get('share/' + id, function(data) {
+			if (!editor) $("#profile-jot-text").val("");
+			initEditor(function(){
+				addeditortext(data);
+				$('#like-rotator-' + id).hide();
+				$(window).scrollTop(0);
+			});
+
+		});
+	}
+
+/*	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				if (!editor) $("#profile-jot-text").val("");
+				initEditor(function(){
+					addeditortext(data);
+					$('#profile-rotator').hide();
+				});
+			});
+		}
+	}*/
+
+	function itemTag(id) {
+		reply = prompt("$term");
+		if(reply && reply.length) {
+			reply = reply.replace('#','');
+			if(reply.length) {
+
+				commentBusy = true;
+				$('body').css('cursor', 'wait');
+
+				$.get('tagger/' + id + '?term=' + reply);
+				if(timer) clearTimeout(timer);
+				timer = setTimeout(NavUpdate,3000);
+				liking = 1;
+			}
+		}
+	}
+
+	function itemFiler(id) {
+		
+		$.get('filer/', function(data){
+
+			var promptText = $('#id_term_label', data).text();
+
+			reply = prompt(promptText);
+			if(reply && reply.length) {
+				commentBusy = true;
+				$('body').css('cursor', 'wait');
+				$.get('filer/' + id + '?term=' + reply, NavUpdate);
+/*				if(timer) clearTimeout(timer);
+				timer = setTimeout(NavUpdate,3000);*/
+				liking = 1;
+/*				$.fancybox.close();*/
+			}
+		});
+
+/*		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.fancybox(data);
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
+				if(reply && reply.length) {
+					commentBusy = true;
+					$('body').css('cursor', 'wait');
+					$.get('filer/' + id + '?term=' + reply);
+					if(timer) clearTimeout(timer);
+					timer = setTimeout(NavUpdate,3000);
+					liking = 1;
+					$.fancybox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
+				}
+				return false;
+			});
+		});
+*/		
+	}
+
+	function jotClearLocation() {
+		$('#jot-coord').val('');
+		$('#profile-nolocation-wrapper').hide();
+	}
+
+	function addeditortext(data) {
+		if(plaintext == 'none') {
+			var currentText = $("#profile-jot-text").val();
+			$("#profile-jot-text").val(currentText + data);
+		}
+/*		else
+			tinyMCE.execCommand('mceInsertRawHTML',false,data);*/
+	}	
+
+	$geotag
+
+</script>
+
--- a/view/theme/frost-mobile/jot.tpl
+++ b/view/theme/frost-mobile/jot.tpl
@ -0,0 +1,85 @@
+
+<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="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>initEditor();</script>{{ endif }}
--- a/view/theme/frost-mobile/js/acl.js
+++ b/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 = $("#acl-list-content");
+	that.item_tpl = unescape($(".acl-list-item[rel=acl-template]").html());
+	that.showall = $("#acl-showall");
+
+	if (preset.length==0) that.showall.addClass("selected");
+	
+	/*events*/
+	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);
+	
+	/* startup! */
+	that.get(0,100);
+}
+
+ACL.prototype.on_submit = function(){
+	aclfileds = $("#acl-fields").html("");
+	$(that.allow_gid).each(function(i,v){
+		aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>");
+	});
+	$(that.allow_cid).each(function(i,v){
+		aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>");
+	});
+	$(that.deny_gid).each(function(i,v){
+		aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>");
+	});
+	$(that.deny_cid).each(function(i,v){
+		aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>");
+	});	
+}
+
+ACL.prototype.search = function(){
+	var srcstr = $("#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");
+	$(this).siblings(".acl-button-hide").removeClass("selected");
+	$(this).toggleClass("selected");*/
+
+	that.set_allow($(this).parent().attr('id'));
+
+	return false;
+}
+ACL.prototype.on_button_hide = function(event){
+	event.preventDefault()
+	event.stopImmediatePropagation()
+	event.stopPropagation();
+
+	/*that.showall.removeClass("selected");
+	$(this).siblings(".acl-button-show").removeClass("selected");
+	$(this).toggleClass("selected");*/
+
+	that.set_deny($(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 */
+				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$('#jot-public').show();
+				$('.profile-jot-net input').attr('disabled', false);			
+				if(typeof editor != 'undefined' && editor != false) {
+					$('#profile-jot-desc').html(ispublic);
+				}
+			
+	} else {
+			that.showall.removeClass("selected");
+			/* jot acl */
+				$('#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 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";
+				}
+				
+				$(that.group_uids[id]).each(function(i,v) {
+					if(uclass == "grouphide")
+						$("#c"+v).removeClass("groupshow");
+					if(uclass != "") {
+						var cls = $("#c"+v).attr('class');
+						if( cls == undefined)
+							return true;
+						var hiding = cls.indexOf('grouphide');
+						if(hiding == -1)
+							$("#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,
+	}
+	
+	$.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);*/
+	$(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();
+}
+
--- a/view/theme/frost-mobile/js/main.js
+++ b/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;
+
+	$(function() {
+		$.ajaxSetup({cache: false});
+
+		msie = $.browser.msie ;
+		
+		/* setup tooltips *//*
+		$("a,.tt").each(function(){
+			var e = $(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 */
+		$(".onoff input").each(function(){
+			val = $(this).val();
+			id = $(this).attr("id");
+			$("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
+			
+		});
+		$(".onoff > a").click(function(event){
+			event.preventDefault();	
+			var input = $(this).siblings("input");
+			var val = 1-input.val();
+			var id = input.attr("id");
+			$("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
+			$("#"+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') !== $(e.target).attr('rel')) {
+		 			last_popup_menu.hide();
+					if (last_popup_menu.attr('id') == "nav-notifications-menu" ) $('section').show();
+		 			last_popup_button.removeClass("selected");
+		 			last_popup_menu = null;
+		 			last_popup_button = null;
+				}
+			}
+		}
+		$('img[rel^=#]').click(function(e){
+
+			close_last_popup_menu(e);
+			menu = $( $(this).attr('rel') );
+			e.preventDefault();
+			e.stopPropagation();
+
+			if (menu.attr('popup')=="false") return false;
+
+//			$(this).parent().toggleClass("selected");
+//			menu.toggle();
+
+			if (menu.css("display") == "none") {
+				$(this).parent().addClass("selected");
+				menu.show();
+				if (menu.attr('id') == "nav-notifications-menu" ) $('section').hide();
+				last_popup_menu = menu;
+				last_popup_button = $(this).parent();
+			} else {
+				$(this).parent().removeClass("selected");
+				menu.hide();
+				if (menu.attr('id') == "nav-notifications-menu" ) $('section').show();
+				last_popup_menu = null;
+				last_popup_button = null;
+			}
+			return false;
+		});
+		$('html').click(function(e) {
+			close_last_popup_menu(e);
+		});
+		
+		// fancyboxes
+		/*$("a.popupbox").fancybox({
+			'transitionIn' : 'elastic',
+			'transitionOut' : 'elastic'
+		});*/
+		
+
+		/* notifications template */
+		var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
+		var notifications_all = unescape($('<div>').append( $("#nav-notifications-see-all").clone() ).html()); //outerHtml hack
+		var notifications_mark = unescape($('<div>').append( $("#nav-notifications-mark-all").clone() ).html()); //outerHtml hack
+		var notifications_empty = unescape($("#nav-notifications-menu").html());
+		
+		/* nav update event  */
+		$('nav').bind('nav-update', function(e,data){;
+			var invalid = $(data).find('invalid').text();
+			if(invalid == 1) { window.location.href=window.location.href }
+
+			var net = $(data).find('net').text();
+			if(net == 0) { net = ''; $('#net-update').removeClass('show') } else { $('#net-update').addClass('show') }
+			$('#net-update').html(net);
+
+			var home = $(data).find('home').text();
+			if(home == 0) { home = '';  $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') }
+			$('#home-update').html(home);
+			
+			var intro = $(data).find('intro').text();
+			if(intro == 0) { intro = '';  $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') }
+			$('#intro-update').html(intro);
+
+			var mail = $(data).find('mail').text();
+			if(mail == 0) { mail = '';  $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') }
+			$('#mail-update').html(mail);
+			
+			var intro = $(data).find('intro').text();
+			if(intro == 0) { intro = '';  $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') }
+			$('#intro-update-li').html(intro);
+
+			var mail = $(data).find('mail').text();
+			if(mail == 0) { mail = '';  $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') }
+			$('#mail-update-li').html(mail);
+
+			var eNotif = $(data).find('notif')
+			
+			if (eNotif.children("note").length==0){
+				$("#nav-notifications-menu").html(notifications_empty);
+			} else {
+				nnm = $("#nav-notifications-menu");
+				nnm.html(notifications_all + notifications_mark);
+				//nnm.attr('popup','true');
+				eNotif.children("note").each(function(){
+					e = $(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){
+				$("#nav-notifications-linkmenu").addClass("on");
+			} else {
+				$("#nav-notifications-linkmenu").removeClass("on");
+			}
+			if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
+			$('#notify-update').html(notif);
+			
+			var eSysmsg = $(data).find('sysmsgs');
+			eSysmsg.children("notice").each(function(){
+				text = $(this).text();
+				$.jGrowl(text, { sticky: true, theme: 'notice', life: 1000 });
+			});
+			eSysmsg.children("info").each(function(){
+				text = $(this).text();
+				$.jGrowl(text, { sticky: false, theme: 'info', life: 1000 });
+			});
+			
+		});
+		
+		
+ 		NavUpdate(); 
+		// Allow folks to stop the ajax page updates with the pause/break key
+/*		$(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;
+					}
+					$('#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 : '');
+			$.get(pingCmd,function(data) {
+				$(data).find('result').each(function() {
+					// send nav-update event
+					$('nav').trigger('nav-update', this);
+					
+					
+					// start live update
+
+					
+
+					if($('#live-network').length)   { src = 'network'; liveUpdate(); }
+					if($('#live-profile').length)   { src = 'profile'; liveUpdate(); }
+					if($('#live-community').length) { src = 'community'; liveUpdate(); }
+					if($('#live-notes').length)     { src = 'notes'; liveUpdate(); }
+					if($('#live-display').length) {
+						if(liking) {
+							liking = 0;
+							window.location.href=window.location.href 
+						}
+					}
+					if($('#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)) { $('.like-rotator').hide(); return; }
+		if(($('.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);
+
+		$.get(update_url,function(data) {
+			in_progress = false;
+			//			$('.collapsed-comments',data).each(function() {
+			//	var ident = $(this).attr('id');
+			//	var is_hidden = $('#' + ident).is(':hidden');
+			//	if($('#' + ident).length) {
+			//		$('#' + ident).replaceWith($(this));
+			//		if(is_hidden)
+			//			$('#' + ident).hide();
+			//	}
+			//});
+
+			// add a new thread
+
+			$('.tread-wrapper',data).each(function() {
+				var ident = $(this).attr('id');
+
+				if($('#' + ident).length == 0 && profile_page == 1) {
+					$('img',this).each(function() {
+						$(this).attr('src',$(this).attr('dst'));
+					});
+					$('#' + prev).after($(this));
+				}
+				else {
+					$('img',this).each(function() {
+						$(this).attr('src',$(this).attr('dst'));
+					});
+					$('#' + ident).replaceWith($(this));
+				}
+				prev = ident;
+			});
+
+			// reset vars for inserting individual items
+
+			/*prev = 'live-' + src;
+
+			$('.wall-item-outside-wrapper',data).each(function() {
+				var ident = $(this).attr('id');
+
+				if($('#' + ident).length == 0 && prev != 'live-' + src) {
+						$('img',this).each(function() {
+							$(this).attr('src',$(this).attr('dst'));
+						});
+						$('#' + prev).after($(this));
+				}
+				else { 
+					$('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago')); 
+					if($('#' + ident + ' ' + '.comment-edit-text-empty').length)
+						$('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
+					$('#' + ident + ' ' + '.hide-comments-total').replaceWith($(this).find('.hide-comments-total'));
+					$('#' + ident + ' ' + '.wall-item-like').replaceWith($(this).find('.wall-item-like'));
+					$('#' + ident + ' ' + '.wall-item-dislike').replaceWith($(this).find('.wall-item-dislike'));
+					$('#' + ident + ' ' + '.my-comment-photo').each(function() {
+						$(this).attr('src',$(this).attr('dst'));
+					});
+				}
+				prev = ident; 
+			});*/
+			
+			$('.like-rotator').hide();
+			if(commentBusy) {
+				commentBusy = false;
+				$('body').css('cursor', 'auto');
+			}
+			/* autocomplete @nicknames */
+			$(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
+		});
+	}
+
+	function imgbright(node) {
+		$(node).removeClass("drophide").addClass("drop");
+	}
+
+	function imgdull(node) {
+		$(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();
+		$('#like-rotator-' + ident.toString()).show();
+		$.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
+//		if(timer) clearTimeout(timer);
+//		timer = setTimeout(NavUpdate,3000);
+		liking = 1;
+	}
+
+	function dostar(ident) {
+		ident = ident.toString();
+		//$('#like-rotator-' + ident).show();
+		$.get('starred/' + ident, function(data) {
+			if(data.match(/1/)) {
+				$('#starred-' + ident).addClass('starred');
+				$('#starred-' + ident).removeClass('unstarred');
+				$('#star-' + ident).addClass('hidden');
+				$('#unstar-' + ident).removeClass('hidden');
+			}
+			else {			
+				$('#starred-' + ident).addClass('unstarred');
+				$('#starred-' + ident).removeClass('starred');
+				$('#star-' + ident).removeClass('hidden');
+				$('#unstar-' + ident).addClass('hidden');
+			}
+			//$('#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;
+			$.get('lockview/' + id, function(data) {
+				$('#panel').html(data);
+				$('#panel').css({ 'left': cursor.x + 5 , 'top': cursor.y + 5});
+				$('#panel').show();
+			});
+		}
+	}
+
+	function lockviewhide() {
+		lockvisible = false;
+		$('#panel').hide();
+	}
+
+	function post_comment(id) {
+		unpause();
+		commentBusy = true;
+		$('body').css('cursor', 'wait');
+		$("#comment-preview-inp-" + id).val("0");
+		$.post(  
+             "item",  
+             $("#comment-edit-form-" + id).serialize(),
+			function(data) {
+				if(data.success) {
+					$("#comment-edit-wrapper-" + id).hide();
+					$("#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) {
+		$("#comment-preview-inp-" + id).val("1");
+		$("#comment-edit-preview-" + id).show();
+		$.post(  
+             "item",  
+             $("#comment-edit-form-" + id).serialize(),
+			function(data) {
+				if(data.preview) {
+						
+					$("#comment-edit-preview-" + id).html(data.preview);
+					$("#comment-edit-preview-" + id + " a").click(function() { return false; });
+				}
+			},
+			"json"  
+         );  
+         return true;  
+	}
+
+
+
+	function preview_post() {
+		$("#jot-preview").val("1");
+		$("#jot-preview-content").show();
+		tinyMCE.triggerSave();
+		$.post(  
+			"item",  
+			$("#profile-jot-form").serialize(),
+			function(data) {
+				if(data.preview) {			
+					$("#jot-preview-content").html(data.preview);
+					$("#jot-preview-content" + " a").click(function() { return false; });
+				}
+			},
+			"json"  
+		);  
+		$("#jot-preview").val("0");
+		return true;  
+	}
+
+
+	function unpause() {
+		// unpause auto reloads if they are currently stopped
+		totStopped = false;
+		stopped = false;
+	    $('#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) {
+		$('body .fakelink').css('cursor', 'wait');
+		$.get('group/' + gid + '/' + cid + "?t=" + sec_token, function(data) {
+				$('#group-update-wrapper').html(data);
+				$('body .fakelink').css('cursor', 'auto');				
+		});
+	}
+
+	function profChangeMember(gid,cid) {
+		$('body .fakelink').css('cursor', 'wait');
+		$.get('profperm/' + gid + '/' + cid, function(data) {
+				$('#prof-update-wrapper').html(data);
+				$('body .fakelink').css('cursor', 'auto');				
+		});
+	}
+
+	function contactgroupChangeMember(gid,cid) {
+		$('body').css('cursor', 'wait');
+		$.get('contactgroup/' + gid + '/' + cid, function(data) {
+				$('body').css('cursor', 'auto');
+		});
+	}
+
+
+function checkboxhighlight(box) {
+  if($(box).is(':checked')) {
+	$(box).addClass('checkeditem');
+  }
+  else {
+	$(box).removeClass('checkeditem');
+  }
+}
+
+function notifyMarkAll() {
+	$.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 = $(elm).val();
+	$.getJSON('pretheme?f=&theme=' + theme,function(data) {
+			$('#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>');
+	});
+
+}
--- a/view/theme/frost-mobile/js/theme.js
+++ b/view/theme/frost-mobile/js/theme.js
@ -0,0 +1,224 @@
+$(document).ready(function() {
+
+/*$('html').click(function() { $("#nav-notifications-menu" ).hide(); });*/
+
+	$('.group-edit-icon').hover(
+		function() {
+			$(this).addClass('icon'); $(this).removeClass('iconspacer');},
+		function() {
+			$(this).removeClass('icon'); $(this).addClass('iconspacer');}
+	);
+
+	$('.sidebar-group-element').hover(
+		function() {
+			id = $(this).attr('id');
+			$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
+
+		function() {
+			id = $(this).attr('id');
+			$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
+	);
+
+
+	$('.savedsearchdrop').hover(
+		function() {
+			$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+		function() {
+			$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+	);
+
+	$('.savedsearchterm').hover(
+		function() {
+			id = $(this).attr('id');
+			$('#drop-' + id).addClass('icon'); 	$('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
+
+		function() {
+			id = $(this).attr('id');
+			$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
+	);
+
+	$(".popupbox").click(function () {
+		var parent = $( $(this).attr('href') ).parent();
+		if (parent.css('display') == 'none') {
+			parent.show();
+		} else {
+			parent.hide();
+		}
+		return false;
+	});
+
+});
+
+
+function insertFormatting(comment,BBcode,id) {
+	
+		var tmpStr = $("#comment-edit-text-" + id).val();
+		if(tmpStr == comment) {
+			tmpStr = "";
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+			$("#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) {
+	$(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+	$(".comment-edit-bb-" + id).hide();
+}
+
+
+
+
+// TinyMCE stuff
+// Needs to be in "jot-header.tpl" if the "$editselect" variable is used
+
+var editor=false;
+var textlen = 0;
+var plaintext = 'none';//'$editselect';
+
+function initEditor(cb){
+	if (editor==false){
+//		$("#profile-jot-text-loading").show();
+		if(plaintext == 'none') {
+//			$("#profile-jot-text-loading").hide();
+			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+			editor = true;
+/*			$("a#jot-perms-icon").fancybox({
+				'transitionIn' : 'none',
+				'transitionOut' : 'none'
+			});*/
+			$("a#jot-perms-icon, a#settings-default-perms-menu").click(function () {
+				var parent = $("#profile-jot-acl-wrapper").parent();
+				if (parent.css('display') == 'none') {
+					parent.show();
+				} else {
+					parent.hide();
+				}
+//				$("#profile-jot-acl-wrapper").parent().toggle();
+				return false;
+			});
+			$(".jothidden").show();
+			if (typeof cb!="undefined") cb();
+			return;
+		}	
+/*		tinyMCE.init({
+			theme : "advanced",
+			mode : "specific_textareas",
+			editor_selector: $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 && $('#jot-perms-icon').is('.unlock')) {
+						$('#profile-jot-desc').html(ispublic);
+					}
+					else {
+						$('#profile-jot-desc').html('&nbsp;');
+					}	 
+
+				 //Character count
+
+					if(textlen <= 140) {
+						$('#character-counter').removeClass('red');
+						$('#character-counter').removeClass('orange');
+						$('#character-counter').addClass('grey');
+					}
+					if((textlen > 140) && (textlen <= 420)) {
+						$('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('red');
+						$('#character-counter').addClass('orange');
+					}
+					if(textlen > 420) {
+						$('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('orange');
+						$('#character-counter').addClass('red');
+					}
+					$('#character-counter').text(textlen);
+				});
+
+				ed.onInit.add(function(ed) {
+					ed.pasteAsPlainText = true;
+					$("#profile-jot-text-loading").hide();
+					$(".jothidden").show();
+					if (typeof cb!="undefined") cb();
+				});
+
+			}
+		});
+		editor = true;
+		// setup acl popup
+		$("a#jot-perms-icon").fancybox({
+			'transitionIn' : 'elastic',
+			'transitionOut' : 'elastic'
+		}); */
+	} else {
+		if (typeof cb!="undefined") cb();
+	}
+}
+
+function enableOnUser(){
+	if (editor) return;
+	$(this).val("");
+	initEditor();
+}
+
--- a/view/theme/frost-mobile/js/theme.js.old
+++ b/view/theme/frost-mobile/js/theme.js.old
@ -0,0 +1,121 @@
+$(document).ready(function() {
+
+    $.ajaxSetup({ 
+        cache: false 
+    });
+
+
+	$('.system-menu-link').click(function() {
+		handleNavMenu('#system-menu-list');
+		return false;
+	});
+
+	$('.contacts-menu-link').click(function() {
+		handleNavMenu('#contacts-menu-list');
+		return false;
+	});
+
+	$('.network-menu-link').click(function() {
+		handleNavMenu('#network-menu-list');
+		return false;
+	});
+
+/*	$('.nav-load-page-link').click(function() {
+		getPageContent( $(this).attr('href') );
+		hideNavMenu( '#' + $(this).closest('ul').attr('id') );
+		return false;
+	});*/
+
+/*	$('#nav-network-link').click(function() {
+		getPageContent('/network', '#network-menu-list');
+		return false;
+	});
+
+	$('#nav-home-link').click(function() {
+
+		var username = $('#site-location').text();
+		username = username.substring(0, username.indexOf('@'));
+
+		getPageContent('/profile/' + username, '#network-menu-list');
+
+		return false;
+	});
+
+	$('#nav-community-link').click(function() {
+		getPageContent('/community', '#network-menu-list');
+		return false;
+	});
+
+	$('#nav-messages-link').click(function() {
+		getPageContent('/message');
+		return false;
+	});
+
+	$('#nav-contacts-link').click(function() {
+		getPageContent('/contacts', '#contacts-menu-list');
+		return false;
+	});*/
+
+});
+
+$(document).mouseup(function (clickPos) {
+
+	var sysMenu = $("#system-menu-list");
+	var sysMenuLink = $(".system-menu-link");
+	var contactsMenu = $("#contacts-menu-list");
+	var contactsMenuLink = $(".contacts-menu-link");
+	var networkMenu = $("#network-menu-list");
+	var networkMenuLink = $(".network-menu-link");
+
+	if( !sysMenu.is(clickPos.target) && !sysMenuLink.is(clickPos.target) && sysMenu.has(clickPos.target).length === 0) {
+		hideNavMenu("#system-menu-list");
+	}
+	if( !contactsMenu.is(clickPos.target) && !contactsMenuLink.is(clickPos.target) && contactsMenu.has(clickPos.target).length === 0) {
+		hideNavMenu("#contacts-menu-list");
+	}
+	if( !networkMenu.is(clickPos.target) && !networkMenuLink.is(clickPos.target) && networkMenu.has(clickPos.target).length === 0) {
+		hideNavMenu("#network-menu-list");
+	}
+});
+
+
+function getPageContent(url) {
+
+	var pos = $('.main-container').position();
+
+	$('.main-container').css('margin-left', pos.left);	
+	$('.main-content-container').hide(0, function () {
+		$('.main-content-loading').show(0);
+	});
+
+	$.get(url, function(html) {
+		console.log($('.main-content-container').html());
+		$('.main-content-container').html( $('.main-content-container', html).html() );
+		console.log($('.main-content-container').html());
+		$('.main-content-loading').hide(function() {
+			$('.main-content-container').fadeIn(800,function() {
+				$('.main-container').css('margin-left', 'auto'); // This sucks -- if the CSS specification changes, this will be wrong
+			});
+		});
+	});
+}
+
+function handleNavMenu(menuID) {
+	if( $(menuID).hasClass('menu-visible') ) {
+		hideNavMenu(menuID);
+	}
+	else {
+		showNavMenu(menuID);
+	}
+}
+
+function showNavMenu(menuID) {
+	$(menuID).show();
+	$(menuID).addClass('menu-visible');
+}
+
+function hideNavMenu(menuID) {
+	$(menuID).hide();
+	$(menuID).removeClass('menu-visible');
+}
+
--- a/view/theme/frost-mobile/lang_selector.tpl
+++ b/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>
--- a/view/theme/frost-mobile/lock.cur
+++ b/view/theme/frost-mobile/lock.cur
--- a/view/theme/frost-mobile/login-bg.gif
+++ b/view/theme/frost-mobile/login-bg.gif
--- a/view/theme/frost-mobile/login-style.css
+++ b/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;
+}
--- a/view/theme/frost-mobile/login.tpl
+++ b/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"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>
--- a/view/theme/frost-mobile/lostpass.tpl
+++ b/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>
--- a/view/theme/frost-mobile/moderated_comment.tpl
+++ b/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>
--- a/view/theme/frost-mobile/msg-header.tpl
+++ b/view/theme/frost-mobile/msg-header.tpl
@ -0,0 +1,97 @@
+
+<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript">
+/*
+var plaintext = '$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 = $('#'+editorId);
+				if (typeof(textarea.attr('tabindex')) != "undefined") {
+					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
+					textarea.attr('tabindex', null);
+				}
+			});
+		}
+	});
+}
+else*/
+	$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
+
+
+</script>
+<script type="text/javascript" src="js/ajaxupload.js" ></script>
+<script>
+	$(document).ready(function() {
+		var uploader = new window.AjaxUpload(
+			'prvmail-upload',
+			{ action: 'wall_upload/$nickname',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					tinyMCE.execCommand('mceInsertRawHTML',false,response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+
+	});
+
+	function jotGetLink() {
+		reply = prompt("$linkurl");
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+</script>
+
--- a/view/theme/frost-mobile/nav.tpl
+++ b/view/theme/frost-mobile/nav.tpl
@ -0,0 +1,131 @@
+<nav>
+<!--	$langselector -->
+
+<!--	<div id="site-location">$sitelocation</div> -->
+
+	{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
+
+	<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.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>
+
+	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
+		
+	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
+	</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>
--- a/view/theme/frost-mobile/photo_edit.tpl
+++ b/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>
+
+
--- a/view/theme/frost-mobile/photo_view.tpl
+++ b/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 }}
+
--- a/view/theme/frost-mobile/photos_upload.tpl
+++ b/view/theme/frost-mobile/photos_upload.tpl
@ -0,0 +1,50 @@
+<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>
+		$albumselect
+	</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 />
+		<div id="photos-upload-noshare-label">
+		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >$nosharetext</label>
+		</div>
+	</div>
+
+	<div id="photos-upload-perms" class="photos-upload-perms" >
+		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="popupbox button" />
+		<span id="jot-perms-icon" class="icon $lockstate  photo-perms-icon" ></span><div class="photo-jot-perms-text">$permissions</div>
+		</a>
+	<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>
+
+<script>
+	$("#photos-upload-album-select").removeAttr('size');
+</script>
--- a/view/theme/frost-mobile/profed_head.tpl
+++ b/view/theme/frost-mobile/profed_head.tpl
@ -0,0 +1,36 @@
+<!--<script language="javascript" type="text/javascript"
+          src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+          <script language="javascript" type="text/javascript">
+
+
+tinyMCE.init({
+	theme : "advanced",
+	mode : "$editselect",
+	plugins : "bbcode,paste",
+	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 : '',
+	content_css: "$baseurl/view/custom_tinymce.css",
+	theme_advanced_path : false,
+	setup : function(ed) {
+		ed.onInit.add(function(ed) {
+            ed.pasteAsPlainText = true;
+        });
+    }
+
+});
+
+
+</script>
+-->
--- a/view/theme/frost-mobile/profile_edit.tpl
+++ b/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>
+<script type="text/javascript">Fill_Country('$country_name');Fill_States('$region');</script>
--- a/view/theme/frost-mobile/profile_vcard.tpl
+++ b/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
+
+
--- a/view/theme/frost-mobile/prv_message.tpl
+++ b/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>
--- a/view/theme/frost-mobile/register.tpl
+++ b/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>
--- a/view/theme/frost-mobile/screenshot.jpg
+++ b/view/theme/frost-mobile/screenshot.jpg
--- a/view/theme/frost-mobile/settings.tpl
+++ b/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>
+
+
--- a/view/theme/frost-mobile/style.css
+++ b/view/theme/frost-mobile/style.css
--- a/view/theme/frost-mobile/theme.php
+++ b/view/theme/frost-mobile/theme.php
@ -0,0 +1,23 @@
+<?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.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']);
+
+	}
+
+}
--- a/view/theme/frost-mobile/wall_item.tpl
+++ b/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="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='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="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="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-wrapper" >
+	$item.comment
+	</div>
+
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+</div>
--- a/view/theme/frost-mobile/wallmsg-header.tpl
+++ b/view/theme/frost-mobile/wallmsg-header.tpl
@ -0,0 +1,82 @@
+<!--
+<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript">
+
+var plaintext = '$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 = $('#'+editorId);
+				if (typeof(textarea.attr('tabindex')) != "undefined") {
+					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
+					textarea.attr('tabindex', null);
+				}
+			});
+		}
+	});
+}
+else
+	$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
+
+
+</script>
+<script>
+
+	function jotGetLink() {
+		reply = prompt("$linkurl");
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+</script>
+-->
--- a/view/theme/frost/TODO
+++ b/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
+
+
--- a/view/theme/frost/admin_aside.tpl
+++ b/view/theme/frost/admin_aside.tpl
@ -0,0 +1,42 @@
+<script>
+	// update pending count //
+	$(function(){
+
+		$("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(); }
+			elm.html(register);
+		});
+	});
+</script>
+<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>
+
--- a/view/theme/frost/border.jpg
+++ b/view/theme/frost/border.jpg
--- a/view/theme/frost/comment_item.tpl
+++ b/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-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>
+				<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>
--- a/view/theme/frost/contact_template.tpl
+++ b/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>
--- a/view/theme/frost/contacts-template.tpl
+++ b/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
+
+
+
+
--- a/view/theme/frost/conversation.tpl
+++ b/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 }}-->
--- a/view/theme/frost/default.php
+++ b/view/theme/frost/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-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 } ?>
+</body>
+</html>
+
--- a/view/theme/frost/editicons.png
+++ b/view/theme/frost/editicons.png
--- a/view/theme/frost/experimental
+++ b/view/theme/frost/experimental
--- a/Show more
+++ b/Show more