Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge develop into 1206-events-template

Browse source 
Conflicts:
	view/theme/frio/css/style.css
This commit is contained in:
rabuzarus 2016-06-17 14:33:08 +02:00
parent 4313982e02 76abade4d8
commit 7dc5fc8b9f
59 changed files with 2369 additions and 602 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.gitignore vendored
View file

@ -42,3 +42,16 @@ nbproject
#ignore local folder #ignore local folder
/local/ /local/
#other stuff
.directory
.gitignore
/view/theme/Friendiboot
/view/theme/Viereinhalb
/view/theme/blog
/view/theme/boheme
/view/theme/clean
/view/theme/suckerberg
/addon/frio_hovercard

29
include/Contact.php
View file

@ -207,35 +207,34 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
if ($uid == -1) if ($uid == -1)
$uid = local_user(); $uid = local_user();
// Fetch contact data from the contact table for the user and given network // Fetch contact data from the contact table for the given user
$r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, $r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`,
`keywords`, `gender`, `photo`, `thumb`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `bd` AS `birthday`, `self` `keywords`, `gender`, `photo`, `thumb`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `bd` AS `birthday`, `self`
FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `network` IN ('%s', '')", FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d",
dbesc(normalise_link($url)), intval($uid), dbesc($profile["network"])); dbesc(normalise_link($url)), intval($uid));
// Is the contact present for the user in a different network? (Can happen with OStatus and the "Statusnet" addon)
if (!$r)
$r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`,
`keywords`, `gender`, `photo`, `thumb`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `bd` AS `birthday`, `self`
FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d",
dbesc(normalise_link($url)), intval($uid));
// Fetch the data from the contact table with "uid=0" (which is filled automatically) // Fetch the data from the contact table with "uid=0" (which is filled automatically)
if (!$r) if (!$r)
$r = q("SELECT `id`, 0 AS `cid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, $r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`,
`keywords`, `gender`, `photo`, `thumb`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `bd` AS `birthday`, 0 AS `self` `keywords`, `gender`, `photo`, `thumb`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `bd` AS `birthday`, 0 AS `self`
FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0", FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0",
dbesc(normalise_link($url))); dbesc(normalise_link($url)));
// Fetch the data from the gcontact table // Fetch the data from the gcontact table
if (!$r) if (!$r)
$r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, $r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`,
`keywords`, `gender`, `photo`, `photo` AS `thumb`, `community` AS `forum`, 0 AS `prv`, `community`, `birthday`, 0 AS `self` `keywords`, `gender`, `photo`, `photo` AS `thumb`, `community` AS `forum`, 0 AS `prv`, `community`, `birthday`, 0 AS `self`
FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", FROM `gcontact` WHERE `nurl` = '%s'",
dbesc(normalise_link($url))); dbesc(normalise_link($url)));
if ($r) { if ($r) {
$profile = $r[0]; // If there is more than one entry we filter out the connector networks
if (count($r) > 1)
foreach ($r AS $id => $result)
if ($result["network"] == NETWORK_STATUSNET)
unset($r[$id]);
$profile = array_shift($r);
// "bd" always contains the upcoming birthday of a contact. // "bd" always contains the upcoming birthday of a contact.
// "birthday" might contain the birthday including the year of birth. // "birthday" might contain the birthday including the year of birth.

2
include/Core/Config.php
View file

@ -172,7 +172,7 @@ class Config {
// manage array value // manage array value
$dbvalue = (is_array($value)?serialize($value):$value); $dbvalue = (is_array($value)?serialize($value):$value);
$dbvalue = (is_bool($dbvalue) ? intval($dbvalue) : $dbvalue); $dbvalue = (is_bool($dbvalue) ? intval($dbvalue) : $dbvalue);
if(self::get($family,$key,true) === false) { if(is_null(self::get($family,$key,null,true))) {
$a->config[$family][$key] = $value; $a->config[$family][$key] = $value;
$ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ", $ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ",
dbesc($family), dbesc($family),

2
include/Core/PConfig.php
View file

@ -161,7 +161,7 @@ class PConfig {
// manage array value // manage array value
$dbvalue = (is_array($value)?serialize($value):$value); $dbvalue = (is_array($value)?serialize($value):$value);
if(self::get($uid,$family,$key,true) === false) { if(is_null(self::get($uid,$family,$key,null, true))) {
$a->config[$uid][$family][$key] = $value; $a->config[$uid][$family][$key] = $value;
$ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ", $ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ",
intval($uid), intval($uid),

16
include/api.php
View file

@ -1309,7 +1309,7 @@
$r = q("SELECT STRAIGHT_JOIN `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, $r = q("SELECT STRAIGHT_JOIN `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` `contact`.`id` AS `cid`
FROM `item`, `contact` FROM `item`, `contact`
WHERE `item`.`uid` = %d AND `verb` = '%s' WHERE `item`.`uid` = %d AND `verb` = '%s'
AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0 AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
@ -1388,7 +1388,7 @@
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`, `contact`.`id` AS `cid`,
`user`.`nickname`, `user`.`hidewall` `user`.`nickname`, `user`.`hidewall`
FROM `item` STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` FROM `item` STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid` STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
@ -1457,7 +1457,7 @@
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` `contact`.`id` AS `cid`
FROM `item`, `contact` FROM `item`, `contact`
WHERE `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0 WHERE `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
AND `contact`.`id` = `item`.`contact-id` AND `item`.`uid` = %d AND `item`.`verb` = '%s' AND `contact`.`id` = `item`.`contact-id` AND `item`.`uid` = %d AND `item`.`verb` = '%s'
@ -1534,7 +1534,7 @@
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` `contact`.`id` AS `cid`
FROM `item` FROM `item`
INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`parent` = %d AND `item`.`visible` WHERE `item`.`parent` = %d AND `item`.`visible`
@ -1586,7 +1586,7 @@
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`nick` as `reply_author`, $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`nick` as `reply_author`,
`contact`.`name`, `contact`.`photo` as `reply_photo`, `contact`.`url` as `reply_url`, `contact`.`rel`, `contact`.`name`, `contact`.`photo` as `reply_photo`, `contact`.`url` as `reply_url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` `contact`.`id` AS `cid`
FROM `item`, `contact` FROM `item`, `contact`
WHERE `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0 WHERE `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
AND `contact`.`id` = `item`.`contact-id` AND `contact`.`id` = `item`.`contact-id`
@ -1699,7 +1699,7 @@
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` `contact`.`id` AS `cid`
FROM `item` FORCE INDEX (`uid_id`), `contact` FROM `item` FORCE INDEX (`uid_id`), `contact`
WHERE `item`.`uid` = %d AND `verb` = '%s' WHERE `item`.`uid` = %d AND `verb` = '%s'
AND NOT (`item`.`author-link` IN ('https://%s', 'http://%s')) AND NOT (`item`.`author-link` IN ('https://%s', 'http://%s'))
@ -1776,7 +1776,7 @@
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` `contact`.`id` AS `cid`
FROM `item`, `contact` FROM `item`, `contact`
WHERE `item`.`uid` = %d AND `verb` = '%s' WHERE `item`.`uid` = %d AND `verb` = '%s'
AND `item`.`contact-id` = %d AND `item`.`contact-id` = %d
@ -1904,7 +1904,7 @@
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` `contact`.`id` AS `cid`
FROM `item`, `contact` FROM `item`, `contact`
WHERE `item`.`uid` = %d WHERE `item`.`uid` = %d
AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0 AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0

80
include/conversation.php
View file

@ -373,6 +373,86 @@ function visible_activity($item) {
return true; return true;
} }
/**
* @brief List of all contact fields that are needed for the conversation function
*/
function contact_fieldlist() {
$fieldlist = "`contact`.`network`, `contact`.`url`, `contact`.`name`, `contact`.`writable`,
`contact`.`self`, `contact`.`id` AS `cid`, `contact`.`alias`";
return $fieldlist;
}
/**
* @brief SQL condition for contacts
*/
function contact_condition() {
$condition = "NOT `contact`.`blocked` AND NOT `contact`.`pending`";
return $condition;
}
/**
* @brief List of all item fields that are needed for the conversation function
*/
function item_fieldlist() {
/*
These Fields are not added below (yet). They are here to for bug search.
`item`.`type`,
`item`.`extid`,
`item`.`received`,
`item`.`changed`,
`item`.`author-avatar`,
`item`.`object`,
`item`.`target-type`,
`item`.`target`,
`item`.`resource-id`,
`item`.`tag`,
`item`.`attach`,
`item`.`inform`,
`item`.`pubmail`,
`item`.`moderated`,
`item`.`visible`,
`item`.`spam`,
`item`.`starred`,
`item`.`bookmark`,
`item`.`unseen`,
`item`.`deleted`,
`item`.`origin`,
`item`.`forum_mode`,
`item`.`last-child`,
`item`.`mention`,
`item`.`global`,
`item`.`gcontact-id`,
`item`.`shadow`,
*/
$fieldlist = "`item`.`author-link`, `item`.`verb`, `item`.`id`, `item`.`parent`, `item`.`file`,
`item`.`uid`, `item`.`author-name`, `item`.`location`, `item`.`coord`,
`item`.`title`, `item`.`uri`, `item`.`created`, `item`.`app`, `item`.`guid`,
`item`.`contact-id`, `item`.`thr-parent`, `item`.`parent-uri`, `item`.`rendered-hash`,
`item`.`body`, `item`.`rendered-html`, `item`.`private`, `item`.`edited`,
`item`.`allow_cid`, `item`.`allow_gid`, `item`.`deny_cid`, `item`.`deny_gid`,
`item`.`event-id`, `item`.`object-type`, `item`.`starred`, `item`.`created`,
`item`.`postopts`, `item`.`owner-link`, `item`.`owner-name`, `item`.`owner-avatar`,
`item`.`plink`, `item`.`wall`, `item`.`commented`,
`item`.`id` AS `item_id`, `item`.`network` AS `item_network`";
return $fieldlist;
}
/**
* @brief SQL condition for items
*/
function item_condition() {
$condition = "`item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`";
return $condition;
}
/** /**
* "Render" a conversation or list of items for HTML display. * "Render" a conversation or list of items for HTML display.

15
include/datetime.php
View file

@ -162,7 +162,7 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
* @brief Wrapper for date selector, tailored for use in birthday fields. * @brief Wrapper for date selector, tailored for use in birthday fields.
* *
* @param string $dob Date of Birth * @param string $dob Date of Birth
* @return string * @return string Formatted html
*/ */
function dob($dob) { function dob($dob) {
list($year,$month,$day) = sscanf($dob,'%4d-%2d-%2d'); list($year,$month,$day) = sscanf($dob,'%4d-%2d-%2d');
@ -175,7 +175,18 @@ function dob($dob) {
else else
$value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d')); $value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d'));
$o = '<input type="text" name="dob" value="' . $value . '" placeholder="' . t('YYYY-MM-DD or MM-DD') . '" />'; $age = ((intval($value)) ? age($value, $a->user["timezone"], $a->user["timezone"]) : "");
$o = replace_macros(get_markup_template("field_input.tpl"), array(
'$field' => array(
'dob',
t('Birthday:'),
$value,
(((intval($age)) > 0 ) ? t('Age: ') . $age : ""),
'',
'placeholder="' . t('YYYY-MM-DD or MM-DD') . '"'
)
));
// if ($dob && $dob != '0000-00-00') // if ($dob && $dob != '0000-00-00')
// $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year),'dob'); // $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year),'dob');

38
include/dfrn.php
View file

@ -197,7 +197,6 @@ class dfrn {
`contact`.`name`, `contact`.`network`, `contact`.`photo`, `contact`.`url`, `contact`.`name`, `contact`.`network`, `contact`.`photo`, `contact`.`url`,
`contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`, `contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`,
`contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`contact`.`id` AS `contact-id`, `contact`.`uid` AS `contact-uid`,
`sign`.`signed_text`, `sign`.`signature`, `sign`.`signer` `sign`.`signed_text`, `sign`.`signature`, `sign`.`signer`
FROM `item` $sql_post_table FROM `item` $sql_post_table
INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
@ -369,6 +368,7 @@ class dfrn {
xml::add_element($doc, $relocate, "dfrn:url", $owner['url']); xml::add_element($doc, $relocate, "dfrn:url", $owner['url']);
xml::add_element($doc, $relocate, "dfrn:name", $owner['name']); xml::add_element($doc, $relocate, "dfrn:name", $owner['name']);
xml::add_element($doc, $relocate, "dfrn:addr", $owner['addr']);
xml::add_element($doc, $relocate, "dfrn:photo", $photos[4]); xml::add_element($doc, $relocate, "dfrn:photo", $photos[4]);
xml::add_element($doc, $relocate, "dfrn:thumb", $photos[5]); xml::add_element($doc, $relocate, "dfrn:thumb", $photos[5]);
xml::add_element($doc, $relocate, "dfrn:micro", $photos[6]); xml::add_element($doc, $relocate, "dfrn:micro", $photos[6]);
@ -1546,6 +1546,7 @@ class dfrn {
$relocate["uid"] = $importer["importer_uid"]; $relocate["uid"] = $importer["importer_uid"];
$relocate["cid"] = $importer["id"]; $relocate["cid"] = $importer["id"];
$relocate["url"] = $xpath->query("dfrn:url/text()", $relocation)->item(0)->nodeValue; $relocate["url"] = $xpath->query("dfrn:url/text()", $relocation)->item(0)->nodeValue;
$relocate["addr"] = $xpath->query("dfrn:addr/text()", $relocation)->item(0)->nodeValue;
$relocate["name"] = $xpath->query("dfrn:name/text()", $relocation)->item(0)->nodeValue; $relocate["name"] = $xpath->query("dfrn:name/text()", $relocation)->item(0)->nodeValue;
$relocate["photo"] = $xpath->query("dfrn:photo/text()", $relocation)->item(0)->nodeValue; $relocate["photo"] = $xpath->query("dfrn:photo/text()", $relocation)->item(0)->nodeValue;
$relocate["thumb"] = $xpath->query("dfrn:thumb/text()", $relocation)->item(0)->nodeValue; $relocate["thumb"] = $xpath->query("dfrn:thumb/text()", $relocation)->item(0)->nodeValue;
@ -1556,6 +1557,9 @@ class dfrn {
$relocate["poll"] = $xpath->query("dfrn:poll/text()", $relocation)->item(0)->nodeValue; $relocate["poll"] = $xpath->query("dfrn:poll/text()", $relocation)->item(0)->nodeValue;
$relocate["sitepubkey"] = $xpath->query("dfrn:sitepubkey/text()", $relocation)->item(0)->nodeValue; $relocate["sitepubkey"] = $xpath->query("dfrn:sitepubkey/text()", $relocation)->item(0)->nodeValue;
if ($relocate["addr"] == "")
$relocate["addr"] = preg_replace("=(https?://)(.*)/profile/(.*)=ism", "$3@$2", $relocate["url"]);
// update contact // update contact
$r = q("SELECT `photo`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d;", $r = q("SELECT `photo`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d;",
intval($importer["id"]), intval($importer["id"]),
@ -1565,6 +1569,30 @@ class dfrn {
$old = $r[0]; $old = $r[0];
// Update the gcontact entry
$relocate["server_url"] = preg_replace("=(https?://)(.*)/profile/(.*)=ism", "$1$2", $relocate["url"]);
$x = q("UPDATE `gcontact` SET
`name` = '%s',
`photo` = '%s',
`url` = '%s',
`nurl` = '%s',
`addr` = '%s',
`connect` = '%s',
`notify` = '%s',
`server_url` = '%s'
WHERE `nurl` = '%s';",
dbesc($relocate["name"]),
dbesc($relocate["photo"]),
dbesc($relocate["url"]),
dbesc(normalise_link($relocate["url"])),
dbesc($relocate["addr"]),
dbesc($relocate["addr"]),
dbesc($relocate["notify"]),
dbesc($relocate["server_url"]),
dbesc(normalise_link($old["url"])));
// Update the contact table. We try to find every entry.
$x = q("UPDATE `contact` SET $x = q("UPDATE `contact` SET
`name` = '%s', `name` = '%s',
`photo` = '%s', `photo` = '%s',
@ -1572,30 +1600,34 @@ class dfrn {
`micro` = '%s', `micro` = '%s',
`url` = '%s', `url` = '%s',
`nurl` = '%s', `nurl` = '%s',
`addr` = '%s',
`request` = '%s', `request` = '%s',
`confirm` = '%s', `confirm` = '%s',
`notify` = '%s', `notify` = '%s',
`poll` = '%s', `poll` = '%s',
`site-pubkey` = '%s' `site-pubkey` = '%s'
WHERE `id` = %d AND `uid` = %d;", WHERE (`id` = %d AND `uid` = %d) OR (`nurl` = '%s');",
dbesc($relocate["name"]), dbesc($relocate["name"]),
dbesc($relocate["photo"]), dbesc($relocate["photo"]),
dbesc($relocate["thumb"]), dbesc($relocate["thumb"]),
dbesc($relocate["micro"]), dbesc($relocate["micro"]),
dbesc($relocate["url"]), dbesc($relocate["url"]),
dbesc(normalise_link($relocate["url"])), dbesc(normalise_link($relocate["url"])),
dbesc($relocate["addr"]),
dbesc($relocate["request"]), dbesc($relocate["request"]),
dbesc($relocate["confirm"]), dbesc($relocate["confirm"]),
dbesc($relocate["notify"]), dbesc($relocate["notify"]),
dbesc($relocate["poll"]), dbesc($relocate["poll"]),
dbesc($relocate["sitepubkey"]), dbesc($relocate["sitepubkey"]),
intval($importer["id"]), intval($importer["id"]),
intval($importer["importer_uid"])); intval($importer["importer_uid"]),
dbesc(normalise_link($old["url"])));
if ($x === false) if ($x === false)
return false; return false;
// update items // update items
/// @todo This is an extreme performance killer
$fields = array( $fields = array(
'owner-link' => array($old["url"], $relocate["url"]), 'owner-link' => array($old["url"], $relocate["url"]),
'author-link' => array($old["url"], $relocate["url"]), 'author-link' => array($old["url"], $relocate["url"]),

7
include/items.php
View file

@ -507,6 +507,13 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
$arr['inform'] = ((x($arr,'inform')) ? trim($arr['inform']) : ''); $arr['inform'] = ((x($arr,'inform')) ? trim($arr['inform']) : '');
$arr['file'] = ((x($arr,'file')) ? trim($arr['file']) : ''); $arr['file'] = ((x($arr,'file')) ? trim($arr['file']) : '');
// Items cannot be stored before they happen ...
if ($arr['created'] > datetime_convert())
$arr['created'] = datetime_convert();
// We haven't invented time travel by now.
if ($arr['edited'] > datetime_convert())
$arr['edited'] = datetime_convert();
if (($arr['author-link'] == "") AND ($arr['owner-link'] == "")) if (($arr['author-link'] == "") AND ($arr['owner-link'] == ""))
logger("Both author-link and owner-link are empty. Called by: ".App::callstack(), LOGGER_DEBUG); logger("Both author-link and owner-link are empty. Called by: ".App::callstack(), LOGGER_DEBUG);

2
index.php
View file

@ -114,7 +114,9 @@ load_translation_table($lang);
* *
*/ */
$stamp1 = microtime(true);
session_start(); session_start();
$a->save_timestamp($stamp1, "parser");
/** /**
* Language was set earlier, but we can over-ride it in the session. * Language was set earlier, but we can over-ride it in the session.

2
mod/admin.php
View file

@ -289,7 +289,7 @@ function admin_page_federation(&$a) {
// what versions for that platform do we know at all? // what versions for that platform do we know at all?
// again only the active nodes // again only the active nodes
$v = q('SELECT COUNT(*) AS `total, version` FROM `gserver` $v = q('SELECT COUNT(*) AS `total`, `version` FROM `gserver`
WHERE `last_contact` > `last_failure` AND `platform` LIKE "%s" AND `version` != "" WHERE `last_contact` > `last_failure` AND `platform` LIKE "%s" AND `version` != ""
GROUP BY `version` GROUP BY `version`
ORDER BY `version`;', $p); ORDER BY `version`;', $p);

27
mod/community.php
View file

@ -120,23 +120,20 @@ function community_getitems($start, $itemspage) {
if (get_config('system','community_page_style') == CP_GLOBAL_COMMUNITY) if (get_config('system','community_page_style') == CP_GLOBAL_COMMUNITY)
return(community_getpublicitems($start, $itemspage)); return(community_getpublicitems($start, $itemspage));
$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`, $r = q("SELECT %s, %s, `user`.`nickname`
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
`user`.`nickname`, `user`.`hidewall`
FROM `thread` FORCE INDEX (`wall_private_received`) FROM `thread` FORCE INDEX (`wall_private_received`)
INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND `user`.`hidewall` = 0 INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
INNER JOIN `item` ON `item`.`id` = `thread`.`iid` INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
INNER JOIN `contact` ON `contact`.`id` = `thread`.`contact-id` INNER JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` AND %s AND `contact`.`self`
WHERE `thread`.`visible` = 1 AND `thread`.`deleted` = 0 and `thread`.`moderated` = 0 WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
AND `thread`.`private` = 0 AND `thread`.`wall` = 1 AND NOT `thread`.`private` AND `thread`.`wall`
ORDER BY `thread`.`received` DESC LIMIT %d, %d ", ORDER BY `thread`.`received` DESC LIMIT %d, %d",
intval($start), item_fieldlist(), contact_fieldlist(),
intval($itemspage) contact_condition(),
intval($start), intval($itemspage)
); );
return($r); return($r);
@ -144,14 +141,14 @@ function community_getitems($start, $itemspage) {
} }
function community_getpublicitems($start, $itemspage) { function community_getpublicitems($start, $itemspage) {
$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
`author-name` AS `name`, `owner-avatar` AS `photo`, $r = q("SELECT %s, `author-name` AS `name`, `owner-avatar` AS `photo`,
`owner-link` AS `url`, `owner-avatar` AS `thumb` `owner-link` AS `url`, `owner-avatar` AS `thumb`
FROM `thread` FROM `thread`
INNER JOIN `item` ON `item`.`id` = `thread`.`iid` INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
WHERE `thread`.`uid` = 0 WHERE `thread`.`uid` = 0
ORDER BY `thread`.`created` DESC LIMIT %d, %d", ORDER BY `thread`.`created` DESC LIMIT %d, %d",
intval($start), item_fieldlist(), intval($start),
intval($itemspage) intval($itemspage)
); );

4
mod/content.php
View file

@ -217,7 +217,7 @@ function content_content(&$a, $update = 0) {
$items = q("SELECT `item`.*, `item`.`id` AS `item_id`, $items = q("SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`,
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` `contact`.`id` AS `cid`
FROM $sql_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` FROM $sql_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 WHERE `item`.`uid` = %d AND `item`.`visible` = 1
AND `item`.`deleted` = 0 and `item`.`moderated` = 0 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
@ -268,7 +268,7 @@ function content_content(&$a, $update = 0) {
$items = q("SELECT `item`.*, `item`.`id` AS `item_id`, $items = q("SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`, `contact`.`writable`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`, `contact`.`writable`,
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` `contact`.`id` AS `cid`
FROM $sql_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` FROM $sql_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
AND `item`.`moderated` = 0 AND `item`.`moderated` = 0

15
mod/dirfind.php
View file

@ -66,16 +66,15 @@ function dirfind_content(&$a, $prefix = "") {
$objresult->tags = ""; $objresult->tags = "";
$objresult->network = $user_data["network"]; $objresult->network = $user_data["network"];
$contact = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1", $contact = get_contact_details_by_url($user_data["url"], local_user());
dbesc(normalise_link($user_data["url"])), intval(local_user())); $objresult->cid = $contact["cid"];
if ($contact)
$objresult->cid = $contact[0]["id"];
$j->results[] = $objresult; $j->results[] = $objresult;
poco_check($user_data["url"], $user_data["name"], $user_data["network"], $user_data["photo"], // Add the contact to the global contacts if it isn't already in our system
"", "", "", "", "", datetime_convert(), 0); if (($contact["cid"] == 0) AND ($contact["zid"] == 0) AND ($contact["gid"] == 0))
poco_check($user_data["url"], $user_data["name"], $user_data["network"], $user_data["photo"],
"", "", "", "", "", datetime_convert(), 0);
} elseif ($local) { } elseif ($local) {
if ($community) if ($community)
@ -100,6 +99,7 @@ function dirfind_content(&$a, $prefix = "") {
$count = q("SELECT count(*) AS `total` FROM `gcontact` $count = q("SELECT count(*) AS `total` FROM `gcontact`
LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl` LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl`
AND `contact`.`network` = `gcontact`.`network`
AND `contact`.`uid` = %d AND NOT `contact`.`blocked` AND `contact`.`uid` = %d AND NOT `contact`.`blocked`
AND NOT `contact`.`pending` AND `contact`.`rel` IN ('%s', '%s') AND NOT `contact`.`pending` AND `contact`.`rel` IN ('%s', '%s')
WHERE (`contact`.`id` > 0 OR (NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND WHERE (`contact`.`id` > 0 OR (NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND
@ -114,6 +114,7 @@ function dirfind_content(&$a, $prefix = "") {
$results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`photo`, `gcontact`.`network`, `gcontact`.`keywords`, `gcontact`.`addr` $results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`photo`, `gcontact`.`network`, `gcontact`.`keywords`, `gcontact`.`addr`
FROM `gcontact` FROM `gcontact`
LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl` LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl`
AND `contact`.`network` = `gcontact`.`network`
AND `contact`.`uid` = %d AND NOT `contact`.`blocked` AND `contact`.`uid` = %d AND NOT `contact`.`blocked`
AND NOT `contact`.`pending` AND `contact`.`rel` IN ('%s', '%s') AND NOT `contact`.`pending` AND `contact`.`rel` IN ('%s', '%s')
WHERE (`contact`.`id` > 0 OR (NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND WHERE (`contact`.`id` > 0 OR (NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND

26
mod/display.php
View file

@ -362,17 +362,14 @@ function display_content(&$a, $update = 0) {
return ''; return '';
} }
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, $r = q("SELECT %s, %s FROM `item`
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND %s
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, WHERE %s AND `item`.`uid` = %d
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted`
AND NOT `item`.`moderated`
AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = %d) AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = %d)
$sql_extra $sql_extra
ORDER BY `parent` DESC, `gravity` ASC, `id` ASC", ORDER BY `parent` DESC, `gravity` ASC, `id` ASC",
item_fieldlist(), contact_fieldlist(),
contact_condition(), item_condition(),
intval($a->profile['uid']), intval($a->profile['uid']),
intval($item_id) intval($item_id)
); );
@ -388,16 +385,13 @@ function display_content(&$a, $update = 0) {
if($r) { if($r) {
$item_uri = $r[0]['uri']; $item_uri = $r[0]['uri'];
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, $r = q("SELECT %s, %s FROM `item`
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND %s
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, WHERE %s AND `item`.`uid` = %d
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted`
AND NOT `item`.`moderated`
AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `uri` = '%s' AND uid = %d) AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `uri` = '%s' AND uid = %d)
ORDER BY `parent` DESC, `gravity` ASC, `id` ASC ", ORDER BY `parent` DESC, `gravity` ASC, `id` ASC ",
item_fieldlist(), contact_fieldlist(),
contact_condition(), item_condition(),
intval(local_user()), intval(local_user()),
dbesc($item_uri), dbesc($item_uri),
intval(local_user()) intval(local_user())

26
mod/network.php
View file

@ -720,17 +720,14 @@ function network_content(&$a, $update = 0) {
$sql_order = "`item`.`received`"; $sql_order = "`item`.`received`";
// "New Item View" - show all items unthreaded in reverse created date order // "New Item View" - show all items unthreaded in reverse created date order
$items = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, $items = q("SELECT %s, %s FROM $sql_table $sql_post_table
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`, INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND %s
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, WHERE %s AND `item`.`uid` = %d
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
WHERE `item`.`uid` = %d AND `item`.`visible` = 1
AND `item`.`deleted` = 0 AND `item`.`moderated` = 0
$simple_update $simple_update
$sql_extra $sql_nets $sql_extra $sql_nets
ORDER BY $sql_order DESC $pager_sql ", ORDER BY $sql_order DESC $pager_sql ",
item_fieldlist(), contact_fieldlist(),
contact_condition(), item_condition(),
intval($_SESSION['uid']) intval($_SESSION['uid'])
); );
@ -810,16 +807,13 @@ function network_content(&$a, $update = 0) {
foreach ($parents_arr AS $parents) { foreach ($parents_arr AS $parents) {
// $sql_extra ORDER BY `item`.`commented` DESC LIMIT %d", // $sql_extra ORDER BY `item`.`commented` DESC LIMIT %d",
$thread_items = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, $thread_items = q("SELECT %s, %s FROM `item`
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`, `contact`.`writable`, INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND %s
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, WHERE %s AND `item`.`uid` = %d
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
AND `item`.`moderated` = 0
AND `item`.`parent` = %d AND `item`.`parent` = %d
ORDER BY `item`.`commented` DESC LIMIT %d", ORDER BY `item`.`commented` DESC LIMIT %d",
item_fieldlist(), contact_fieldlist(),
contact_condition(), item_condition(),
intval(local_user()), intval(local_user()),
intval($parents), intval($parents),
intval($max_comments + 1) intval($max_comments + 1)

37
mod/notes.php
View file

@ -69,16 +69,15 @@ function notes_content(&$a,$update = false) {
// Construct permissions // Construct permissions
// default permissions - anonymous user // default permissions - anonymous user
$sql_extra = " AND `allow_cid` = '<" . $a->contact['id'] . ">' "; $sql_extra = " AND `allow_cid` = '<" . $a->contact['id'] . ">' ";
$r = q("SELECT COUNT(*) AS `total` $r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND %s
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0 WHERE %s AND `item`.`uid` = %d AND `item`.`type` = 'note'
AND `item`.`deleted` = 0 AND `item`.`type` = 'note' AND `contact`.`self` AND `item`.`id` = `item`.`parent` AND NOT `item`.`wall`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
$sql_extra ", $sql_extra ",
contact_condition(), item_condition(),
intval(local_user()) intval(local_user())
); );
@ -88,14 +87,13 @@ function notes_content(&$a,$update = false) {
$a->set_pager_itemspage(40); $a->set_pager_itemspage(40);
} }
$r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact-uid` $r = q("SELECT `item`.`id` AS `item_id` FROM `item`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND %s AND `contact`.`self`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 WHERE %s AND `item`.`uid` = %d AND `item`.`type` = 'note'
and `item`.`moderated` = 0 AND `item`.`type` = 'note' AND `item`.`id` = `item`.`parent` AND NOT `item`.`wall`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
$sql_extra $sql_extra
ORDER BY `item`.`created` DESC LIMIT %d ,%d ", ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
contact_condition(), item_condition(),
intval(local_user()), intval(local_user()),
intval($a->pager['start']), intval($a->pager['start']),
intval($a->pager['itemspage']) intval($a->pager['itemspage'])
@ -109,17 +107,14 @@ function notes_content(&$a,$update = false) {
foreach($r as $rr) foreach($r as $rr)
$parents_arr[] = $rr['item_id']; $parents_arr[] = $rr['item_id'];
$parents_str = implode(', ', $parents_arr); $parents_str = implode(', ', $parents_arr);
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, $r = q("SELECT %s, %s FROM `item`
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`network`, `contact`.`rel`, LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND %s
`contact`.`thumb`, `contact`.`self`, `contact`.`writable`, WHERE %s AND `item`.`uid` = %d AND `item`.`parent` IN (%s)
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND `item`.`parent` IN ( %s )
$sql_extra $sql_extra
ORDER BY `parent` DESC, `gravity` ASC, `item`.`id` ASC ", ORDER BY `parent` DESC, `gravity` ASC, `item`.`id` ASC ",
item_fieldlist(), contact_fieldlist(),
contact_condition(), item_condition(),
intval(local_user()), intval(local_user()),
dbesc($parents_str) dbesc($parents_str)
); );

22
mod/profile.php
View file

@ -216,8 +216,7 @@ function profile_content(&$a, $update = 0) {
if($update) { if($update) {
$r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network`, $r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network`
`contact`.`uid` AS `contact-uid`
FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND
@ -282,8 +281,7 @@ function profile_content(&$a, $update = 0) {
$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
$r = q("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`, $r = q("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`
`thread`.`uid` AS `contact-uid`
FROM `thread` FORCE INDEX (`uid_created`) INNER JOIN `item` ON `item`.`id` = `thread`.`iid` FROM `thread` FORCE INDEX (`uid_created`) INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
$sql_post_table INNER JOIN `contact` ON `contact`.`id` = `thread`.`contact-id` $sql_post_table INNER JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
@ -305,17 +303,13 @@ function profile_content(&$a, $update = 0) {
$parents_arr[] = $rr['item_id']; $parents_arr[] = $rr['item_id'];
$parents_str = implode(', ', $parents_arr); $parents_str = implode(', ', $parents_arr);
$items = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, $items = q("SELECT %s, %s FROM `item`
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`network`, `contact`.`rel`, INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND %s
`contact`.`thumb`, `contact`.`self`, `contact`.`writable`, WHERE %s AND `item`.`uid` = %d
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` AND `item`.`parent` IN (%s)
FROM `item`, `contact`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
and `item`.`moderated` = 0
AND `contact`.`id` = `item`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND `item`.`parent` IN ( %s )
$sql_extra ", $sql_extra ",
item_fieldlist(), contact_fieldlist(),
contact_condition(), item_condition(),
intval($a->profile['profile_uid']), intval($a->profile['profile_uid']),
dbesc($parents_str) dbesc($parents_str)
); );

161
mod/profiles.php
View file

@ -255,7 +255,7 @@ function profiles_post(&$a) {
if(count($links)) { if(count($links)) {
foreach($links as $link) { foreach($links as $link) {
if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') { if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') {
$prf = $link['@attributes']['href']; $prf = $link['@attributes']['href'];
} }
} }
} }
@ -304,8 +304,8 @@ function profiles_post(&$a) {
$sexual = notags(trim($_POST['sexual'])); $sexual = notags(trim($_POST['sexual']));
$homepage = notags(trim($_POST['homepage'])); $homepage = notags(trim($_POST['homepage']));
if ((strpos($homepage, 'http') !== 0) && (strlen($homepage))) { if ((strpos($homepage, 'http') !== 0) && (strlen($homepage))) {
// neither http nor https in URL, add them // neither http nor https in URL, add them
$homepage = 'http://'.$homepage; $homepage = 'http://'.$homepage;
} }
$hometown = notags(trim($_POST['hometown'])); $hometown = notags(trim($_POST['hometown']));
$politic = notags(trim($_POST['politic'])); $politic = notags(trim($_POST['politic']));
@ -663,25 +663,29 @@ function profiles_content(&$a) {
'$detailled_profile' => $detailled_profile, '$detailled_profile' => $detailled_profile,
'$details' => array( '$details' => array(
'detailled_profile', //Name 'detailled_profile', //Name
t('Show more profile fields:'), //Label t('Show more profile fields:'), //Label
$detailled_profile, //Value $detailled_profile, //Value
'', //Help string '', //Help string
array(t('No'),t('Yes')) //Off - On strings array(t('No'),t('Yes')) //Off - On strings
), ),
'$multi_profiles' => feature_enabled(local_user(),'multi_profiles'),
'$form_security_token' => get_form_security_token("profile_edit"),
'$form_security_token_photo' => get_form_security_token("profile_photo"),
'$profile_clone_link' => ((feature_enabled(local_user(),'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone") : ""),
'$profile_drop_link' => 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"),
'$profile_action' => t('Profile Actions'),
'$banner' => t('Edit Profile Details'),
'$submit' => t('Submit'),
'$profpic' => t('Change Profile Photo'),
'$viewprof' => t('View this profile'),
'$editvis' => t('Edit visibility'),
'$cr_prof' => t('Create a new profile using these settings'),
'$cl_prof' => t('Clone this profile'),
'$del_prof' => t('Delete this profile'),
'$multi_profiles' => feature_enabled(local_user(),'multi_profiles'),
'$form_security_token' => get_form_security_token("profile_edit"),
'$form_security_token_photo' => get_form_security_token("profile_photo"),
'$profile_clone_link' => 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone"),
'$profile_drop_link' => 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"),
'$banner' => t('Edit Profile Details'),
'$submit' => t('Submit'),
'$profpic' => t('Change Profile Photo'),
'$viewprof' => t('View this profile'),
'$cr_prof' => t('Create a new profile using these settings'),
'$cl_prof' => t('Clone this profile'),
'$del_prof' => t('Delete this profile'),
'$lbl_basic_section' => t('Basic information'), '$lbl_basic_section' => t('Basic information'),
'$lbl_picture_section' => t('Profile picture'), '$lbl_picture_section' => t('Profile picture'),
'$lbl_location_section' => t('Location'), '$lbl_location_section' => t('Location'),
@ -689,81 +693,55 @@ function profiles_content(&$a) {
'$lbl_status_section' => t('Status information'), '$lbl_status_section' => t('Status information'),
'$lbl_about_section' => t('Additional information'), '$lbl_about_section' => t('Additional information'),
'$lbl_interests_section' => t('Interests'), '$lbl_interests_section' => t('Interests'),
'$lbl_personal_section' => t('Personal'),
'$lbl_relation_section' => t('Relation'),
'$lbl_miscellaneous_section' => t('Miscellaneous'),
'$lbl_profile_photo' => t('Upload Profile Photo'), '$lbl_profile_photo' => t('Upload Profile Photo'),
'$lbl_profname' => t('Profile Name:'),
'$lbl_fullname' => t('Your Full Name:'),
'$lbl_title' => t('Title/Description:'),
'$lbl_gender' => t('Your Gender:'), '$lbl_gender' => t('Your Gender:'),
'$lbl_bd' => t("Birthday :"),
'$lbl_address' => t('Street Address:'),
'$lbl_city' => t('Locality/City:'),
'$lbl_zip' => t('Postal/Zip Code:'),
'$lbl_country' => t('Country:'),
'$lbl_region' => t('Region/State:'),
'$lbl_marital' => t('<span class="heart">&hearts;</span> Marital Status:'), '$lbl_marital' => t('<span class="heart">&hearts;</span> Marital Status:'),
'$lbl_with' => t("Who: \x28if applicable\x29"),
'$lbl_ex1' => t('Examples: cathy123, Cathy Williams, cathy@example.com'),
'$lbl_howlong' => t('Since [date]:'),
'$lbl_sexual' => t('Sexual Preference:'), '$lbl_sexual' => t('Sexual Preference:'),
'$lbl_homepage' => t('Homepage URL:'),
'$lbl_hometown' => t('Hometown:'),
'$lbl_politic' => t('Political Views:'),
'$lbl_religion' => t('Religious Views:'),
'$lbl_pubkey' => t('Public Keywords:'),
'$lbl_prvkey' => t('Private Keywords:'),
'$lbl_likes' => t('Likes:'),
'$lbl_dislikes' => t('Dislikes:'),
'$lbl_ex2' => t('Example: fishing photography software'), '$lbl_ex2' => t('Example: fishing photography software'),
'$lbl_pubdsc' => t("\x28Used for suggesting potential friends, can be seen by others\x29"),
'$lbl_prvdsc' => t("\x28Used for searching profiles, never shown to others\x29"),
'$lbl_about' => t('Tell us about yourself...'),
'$lbl_hobbies' => t('Hobbies/Interests'),
'$lbl_social' => t('Contact information and Social Networks'),
'$lbl_music' => t('Musical interests'),
'$lbl_book' => t('Books, literature'),
'$lbl_tv' => t('Television'),
'$lbl_film' => t('Film/dance/culture/entertainment'),
'$lbl_love' => t('Love/romance'),
'$lbl_work' => t('Work/employment'),
'$lbl_school' => t('School/education'),
'$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''), '$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''),
'$baseurl' => $a->get_baseurl(true), '$baseurl' => $a->get_baseurl(true),
'$profile_id' => $r[0]['id'], '$profile_id' => $r[0]['id'],
'$profile_name' => $r[0]['profile-name'], '$profile_name' => array('profile_name', t('Profile Name:'), $r[0]['profile-name'], t('Required'), '*'),
'$is_default' => $is_default,
'$default' => (($is_default) ? '<p id="profile-edit-default-desc">' . t('This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.') . '</p>' : ""), '$default' => (($is_default) ? '<p id="profile-edit-default-desc">' . t('This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.') . '</p>' : ""),
'$name' => $r[0]['name'], '$name' => array('name', t('Your Full Name:'), $r[0]['name']),
'$pdesc' => $r[0]['pdesc'], '$pdesc' => array('pdesc', t('Title/Description:'), $r[0]['pdesc']),
'$dob' => dob($r[0]['dob']), '$dob' => dob($r[0]['dob']),
'$hide_friends' => $hide_friends, '$hide_friends' => $hide_friends,
'$address' => $r[0]['address'], '$address' => array('address', t('Street Address:'), $r[0]['address']),
'$locality' => $r[0]['locality'], '$locality' => array('locality', t('Locality/City:'), $r[0]['locality']),
'$region' => $r[0]['region'], '$region' => array('region', t('Region/State:'), $r[0]['region']),
'$postal_code' => $r[0]['postal-code'], '$postal_code' => array('postal_code', t('Postal/Zip Code:'), $r[0]['postal-code']),
'$country_name' => $r[0]['country-name'], '$country_name' => array('country_name', t('Country:'), $r[0]['country-name']),
'$age' => ((intval($r[0]['dob'])) ? '(' . t('Age: ') . age($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''), '$age' => ((intval($r[0]['dob'])) ? '(' . t('Age: ') . age($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''),
'$gender' => gender_selector($r[0]['gender']), '$gender' => gender_selector($r[0]['gender']),
'$marital' => marital_selector($r[0]['marital']), '$marital' => marital_selector($r[0]['marital']),
'$with' => strip_tags($r[0]['with']), '$with' => array('with', t("Who: \x28if applicable\x29"), strip_tags($r[0]['with']), t('Examples: cathy123, Cathy Williams, cathy@example.com')),
'$howlong' => ($r[0]['howlong'] === '0000-00-00 00:00:00' ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong'])), '$howlong' => array('howlong', t('Since [date]:'), ($r[0]['howlong'] === '0000-00-00 00:00:00' ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong']))),
'$sexual' => sexpref_selector($r[0]['sexual']), '$sexual' => sexpref_selector($r[0]['sexual']),
'$about' => $r[0]['about'], '$about' => array('about', t('Tell us about yourself...'), $r[0]['about']),
'$homepage' => $r[0]['homepage'], '$homepage' => array('homepage', t('Homepage URL:'), $r[0]['homepage']),
'$hometown' => $r[0]['hometown'], '$hometown' => array('hometown', t('Hometown:'), $r[0]['hometown']),
'$politic' => $r[0]['politic'], '$politic' => array('politic', t('Political Views:'), $r[0]['politic']),
'$religion' => $r[0]['religion'], '$religion' => array('religion', t('Religious Views:'), $r[0]['religion']),
'$pub_keywords' => $r[0]['pub_keywords'], '$pub_keywords' => array('pub_keywords', t('Public Keywords:'), $r[0]['pub_keywords'], t("\x28Used for suggesting potential friends, can be seen by others\x29")),
'$prv_keywords' => $r[0]['prv_keywords'], '$prv_keywords' => array('prv_keywords', t('Private Keywords:'), $r[0]['prv_keywords'], t("\x28Used for searching profiles, never shown to others\x29")),
'$likes' => $r[0]['likes'], '$likes' => array('likes', t('Likes:'), $r[0]['likes']),
'$dislikes' => $r[0]['dislikes'], '$dislikes' => array('dislikes', t('Dislikes:'), $r[0]['dislikes']),
'$music' => $r[0]['music'], '$music' => array('music', t('Musical interests'), $r[0]['music']),
'$book' => $r[0]['book'], '$book' => array('book', t('Books, literature'), $r[0]['book']),
'$tv' => $r[0]['tv'], '$tv' => array('tv', t('Television'), $r[0]['tv']),
'$film' => $r[0]['film'], '$film' => array('film', t('Film/dance/culture/entertainment'), $r[0]['film']),
'$interest' => $r[0]['interest'], '$interest' => array('interest', t('Hobbies/Interests'), $r[0]['interest']),
'$romance' => $r[0]['romance'], '$romance' => array('romance',t('Love/romance'), $r[0]['romance']),
'$work' => $r[0]['work'], '$work' => array('work', t('Work/employment'), $r[0]['work']),
'$education' => $r[0]['education'], '$education' => array('education', t('School/education'), $r[0]['education']),
'$contact' => $r[0]['contact'] '$contact' => array('contact', t('Contact information and Social Networks'), $r[0]['contact']),
)); ));
$arr = array('profile' => $r[0], 'entry' => $o); $arr = array('profile' => $r[0], 'entry' => $o);
@ -791,19 +769,9 @@ function profiles_content(&$a) {
local_user()); local_user());
if(count($r)) { if(count($r)) {
$tpl_header = get_markup_template('profile_listing_header.tpl');
$o .= replace_macros($tpl_header,array(
'$header' => t('Edit/Manage Profiles'),
'$chg_photo' => t('Change profile photo'),
'$cr_new' => t('Create New Profile'),
'$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new")
));
$tpl = get_markup_template('profile_entry.tpl'); $tpl = get_markup_template('profile_entry.tpl');
foreach($r as $rr) { foreach($r as $rr) {
$o .= replace_macros($tpl, array( $profiles .= replace_macros($tpl, array(
'$photo' => $a->remove_baseurl($rr['thumb']), '$photo' => $a->remove_baseurl($rr['thumb']),
'$id' => $rr['id'], '$id' => $rr['id'],
'$alt' => t('Profile Image'), '$alt' => t('Profile Image'),
@ -812,6 +780,15 @@ function profiles_content(&$a) {
: '<a href="'.'profperm/'.$rr['id'].'" />' . t('Edit visibility') . '</a>') : '<a href="'.'profperm/'.$rr['id'].'" />' . t('Edit visibility') . '</a>')
)); ));
} }
$tpl_header = get_markup_template('profile_listing_header.tpl');
$o .= replace_macros($tpl_header,array(
'$header' => t('Edit/Manage Profiles'),
'$chg_photo' => t('Change profile photo'),
'$cr_new' => t('Create New Profile'),
'$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new"),
'$profiles' => $profiles
));
} }
return $o; return $o;
} }

32
mod/search.php
View file

@ -191,17 +191,16 @@ function search_content(&$a) {
if($tag) { if($tag) {
logger("Start tag search for '".$search."'", LOGGER_DEBUG); logger("Start tag search for '".$search."'", LOGGER_DEBUG);
$r = q("SELECT STRAIGHT_JOIN `item`.`uri`, `item`.*, `item`.`id` AS `item_id`, $r = q("SELECT STRAIGHT_JOIN %s, %s
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
FROM `term` FROM `term`
INNER JOIN `item` ON `item`.`id`=`term`.`oid` INNER JOIN `item` ON `item`.`id`=`term`.`oid`
INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND NOT `contact`.`blocked` AND NOT `contact`.`pending` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND %s
WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` WHERE %s AND (`term`.`uid` = 0 OR (`term`.`uid` = %d AND NOT `term`.`global`)) AND `term`.`otype` = %d AND `term`.`type` = %d AND `term`.`term` = '%s'
AND (`term`.`uid` = 0 OR (`term`.`uid` = %d AND NOT `term`.`global`)) AND `term`.`otype` = %d AND `term`.`type` = %d AND `term`.`term` = '%s'
ORDER BY term.created DESC LIMIT %d , %d ", ORDER BY term.created DESC LIMIT %d , %d ",
intval(local_user()), intval(TERM_OBJ_POST), intval(TERM_HASHTAG), dbesc(protect_sprintf($search)), item_fieldlist(), contact_fieldlist(),
contact_condition(), item_condition(),
intval(local_user()),
intval(TERM_OBJ_POST), intval(TERM_HASHTAG), dbesc(protect_sprintf($search)),
intval($a->pager['start']), intval($a->pager['itemspage'])); intval($a->pager['start']), intval($a->pager['itemspage']));
} else { } else {
logger("Start fulltext search for '".$search."'", LOGGER_DEBUG); logger("Start fulltext search for '".$search."'", LOGGER_DEBUG);
@ -212,17 +211,16 @@ function search_content(&$a) {
$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
} }
$r = q("SELECT STRAIGHT_JOIN `item`.`uri`, `item`.*, `item`.`id` AS `item_id`, $r = q("SELECT STRAIGHT_JOIN %s, %s
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
FROM `item` FROM `item`
INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND NOT `contact`.`blocked` AND NOT `contact`.`pending` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND %s
WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` WHERE %s AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND NOT `item`.`global`))
AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND NOT `item`.`global`))
$sql_extra $sql_extra
GROUP BY `item`.`uri` ORDER BY `item`.`id` DESC LIMIT %d , %d ", GROUP BY `item`.`uri` ORDER BY `item`.`id` DESC LIMIT %d , %d",
intval(local_user()), intval($a->pager['start']), intval($a->pager['itemspage'])); item_fieldlist(), contact_fieldlist(),
contact_condition(), item_condition(),
intval(local_user()),
intval($a->pager['start']), intval($a->pager['itemspage']));
} }
if(! count($r)) { if(! count($r)) {

3
mod/settings.php
View file

@ -989,6 +989,9 @@ function settings_content(&$a) {
'$infinite_scroll' => array('infinite_scroll', t("Infinite scroll"), $infinite_scroll, ''), '$infinite_scroll' => array('infinite_scroll', t("Infinite scroll"), $infinite_scroll, ''),
'$no_auto_update' => array('no_auto_update', t("Automatic updates only at the top of the network page"), $no_auto_update, 'When disabled, the network page is updated all the time, which could be confusing while reading.'), '$no_auto_update' => array('no_auto_update', t("Automatic updates only at the top of the network page"), $no_auto_update, 'When disabled, the network page is updated all the time, which could be confusing while reading.'),
'$d_tset' => t('General Theme Settings'),
'$d_ctset' => t('Custom Theme Settings'),
'$d_cset' => t('Content Settings'),
'stitle' => t('Theme settings'), 'stitle' => t('Theme settings'),
'$theme_config' => $theme_config, '$theme_config' => $theme_config,
)); ));

2
view/templates/field_input.tpl
View file

@ -1,6 +1,6 @@
<div class='field input' id='wrapper_{{$field.0}}'> <div class='field input' id='wrapper_{{$field.0}}'>
<label for='id_{{$field.0}}'>{{$field.1}}</label> <label for='id_{{$field.0}}'>{{$field.1}}</label>
<input{{if $field.6 eq 'email'}} type='email'{{elseif $field.6 eq 'url'}} type='url'{{/if}} name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2|escape:'html'}}"{{if $field.4 eq 'required'}} required{{/if}}{{if $field.5 eq 'autofocus'}} autofocus{{/if}} aria-describedby='{{$field.0}}_tip'> <input{{if $field.6 eq 'email'}} type='email'{{elseif $field.6 eq 'url'}} type='url'{{else}} type="text"{{/if}} name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2|escape:'html'}}"{{if $field.4 eq 'required'}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby='{{$field.0}}_tip'>
<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span> <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
</div> </div>

214
view/templates/profile_edit.tpl
View file

@ -24,20 +24,20 @@
{{if $detailled_profile}} {{if $detailled_profile}}
{{include file="field_yesno.tpl" field=$details}} {{include file="field_yesno.tpl" field=$details}}
<div id="profile-edit-profile-name-wrapper" > <div id="profile-edit-profile-name-wrapper" >
<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$lbl_profname}} </label> <label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$profile_name.1}} </label>
<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name|escape:'html'}}" /><div class="required">*</div> <input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name.2|escape:'html'}}" /><div class="required">*</div>
</div> </div>
<div id="profile-edit-profile-name-end"></div> <div id="profile-edit-profile-name-end"></div>
<div id="profile-edit-name-wrapper" > <div id="profile-edit-name-wrapper" >
<label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label> <label id="profile-edit-name-label" for="profile-edit-name" >{{$name.1}} </label>
<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name|escape:'html'}}" /> <input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2|escape:'html'}}" />
</div> </div>
<div id="profile-edit-name-end"></div> <div id="profile-edit-name-end"></div>
<div id="profile-edit-pdesc-wrapper" > <div id="profile-edit-pdesc-wrapper" >
<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label> <label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$pdesc.1}} </label>
<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc|escape:'html'}}" /> <input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc.1|escape:'html'}}" />
</div> </div>
<div id="profile-edit-pdesc-end"></div> <div id="profile-edit-pdesc-end"></div>
@ -49,10 +49,7 @@
<div id="profile-edit-gender-end"></div> <div id="profile-edit-gender-end"></div>
<div id="profile-edit-dob-wrapper" > <div id="profile-edit-dob-wrapper" >
<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label> {{$dob}}
<div id="profile-edit-dob" >
{{$dob}} {{$age}}
</div>
</div> </div>
<div id="profile-edit-dob-end"></div> <div id="profile-edit-dob-end"></div>
@ -65,45 +62,45 @@
<div id="profile-edit-address-wrapper" > <div id="profile-edit-address-wrapper" >
<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label> <label id="profile-edit-address-label" for="profile-edit-address" >{{$address.1}} </label>
<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address|escape:'html'}}" /> <input type="text" size="32" name="address" id="profile-edit-address" value="{{$address.2|escape:'html'}}" />
</div> </div>
<div id="profile-edit-address-end"></div> <div id="profile-edit-address-end"></div>
<div id="profile-edit-locality-wrapper" > <div id="profile-edit-locality-wrapper" >
<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label> <label id="profile-edit-locality-label" for="profile-edit-locality" >{{$locality.1}} </label>
<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality|escape:'html'}}" /> <input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality.2|escape:'html'}}" />
</div> </div>
<div id="profile-edit-locality-end"></div> <div id="profile-edit-locality-end"></div>
<div id="profile-edit-postal-code-wrapper" > <div id="profile-edit-postal-code-wrapper" >
<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label> <label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$postal_code.1}} </label>
<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code|escape:'html'}}" /> <input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2|escape:'html'}}" />
</div> </div>
<div id="profile-edit-postal-code-end"></div> <div id="profile-edit-postal-code-end"></div>
<div id="profile-edit-country-name-wrapper" > <div id="profile-edit-country-name-wrapper" >
<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label> <label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$country_name.1}} </label>
<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region}}');"> <select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region.2}}');">
<option selected="selected" >{{$country_name}}</option> <option selected="selected" >{{$country_name.2}}</option>
<option>temp</option> <option>temp</option>
</select> </select>
</div> </div>
<div id="profile-edit-country-name-end"></div> <div id="profile-edit-country-name-end"></div>
<div id="profile-edit-region-wrapper" > <div id="profile-edit-region-wrapper" >
<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label> <label id="profile-edit-region-label" for="profile-edit-region" >{{$region.1}} </label>
<select name="region" id="profile-edit-region" onChange="Update_Globals();" > <select name="region" id="profile-edit-region" onChange="Update_Globals();" >
<option selected="selected" >{{$region}}</option> <option selected="selected" >{{$region.2}}</option>
<option>temp</option> <option>temp</option>
</select> </select>
</div> </div>
<div id="profile-edit-region-end"></div> <div id="profile-edit-region-end"></div>
<div id="profile-edit-hometown-wrapper" > <div id="profile-edit-hometown-wrapper" >
<label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label> <label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$hometown.1}} </label>
<input type="text" size="32" name="hometown" id="profile-edit-hometown" value="{{$hometown|escape:'html'}}" /> <input type="text" size="32" name="hometown" id="profile-edit-hometown" value="{{$hometown.2|escape:'html'}}" />
</div> </div>
<div id="profile-edit-hometown-end"></div> <div id="profile-edit-hometown-end"></div>
@ -116,10 +113,10 @@
<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label> <label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
{{$marital}} {{$marital}}
</div> </div>
<label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label> <label id="profile-edit-with-label" for="profile-edit-with" > {{$with.1}} </label>
<input type="text" size="32" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" /> <input type="text" size="32" name="with" id="profile-edit-with" title="{{$with.3}}" value="{{$with.2}}" />
<label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label> <label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$howlong.1}} </label>
<input type="text" size="32" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong|escape:'html'}}" /> <input type="text" size="32" name="howlong" id="profile-edit-howlong" title="{{$howlong.1}}" value="{{$howlong.1|escape:'html'}}" />
<div id="profile-edit-marital-end"></div> <div id="profile-edit-marital-end"></div>
@ -132,33 +129,33 @@
<div id="profile-edit-homepage-wrapper" > <div id="profile-edit-homepage-wrapper" >
<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label> <label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$homepage.1}} </label>
<input type="url" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage|escape:'html'}}" /> <input type="url" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage.2|escape:'html'}}" />
</div> </div>
<div id="profile-edit-homepage-end"></div> <div id="profile-edit-homepage-end"></div>
<div id="profile-edit-politic-wrapper" > <div id="profile-edit-politic-wrapper" >
<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label> <label id="profile-edit-politic-label" for="profile-edit-politic" >{{$politic.1}} </label>
<input type="text" size="32" name="politic" id="profile-edit-politic" value="{{$politic|escape:'html'}}" /> <input type="text" size="32" name="politic" id="profile-edit-politic" value="{{$politic.2|escape:'html'}}" />
</div> </div>
<div id="profile-edit-politic-end"></div> <div id="profile-edit-politic-end"></div>
<div id="profile-edit-religion-wrapper" > <div id="profile-edit-religion-wrapper" >
<label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label> <label id="profile-edit-religion-label" for="profile-edit-religion" >{{$religion.1}} </label>
<input type="text" size="32" name="religion" id="profile-edit-religion" value="{{$religion|escape:'html'}}" /> <input type="text" size="32" name="religion" id="profile-edit-religion" value="{{$religion.2|escape:'html'}}" />
</div> </div>
<div id="profile-edit-religion-end"></div> <div id="profile-edit-religion-end"></div>
<div id="profile-edit-pubkeywords-wrapper" > <div id="profile-edit-pubkeywords-wrapper" >
<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label> <label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$pub_keywords.1}} </label>
<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords|escape:'html'}}" /> <input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2|escape:'html'}}" />
</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div> </div><div id="profile-edit-pubkeywords-desc">{{$pub_keywords.3}}</div>
<div id="profile-edit-pubkeywords-end"></div> <div id="profile-edit-pubkeywords-end"></div>
<div id="profile-edit-prvkeywords-wrapper" > <div id="profile-edit-prvkeywords-wrapper" >
<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$lbl_prvkey}} </label> <label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$prv_keywords.1}} </label>
<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords|escape:'html'}}" /> <input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2|escape:'html'}}" />
</div><div id="profile-edit-prvkeywords-desc">{{$lbl_prvdsc}}</div> </div><div id="profile-edit-prvkeywords-desc">{{$prv_keywords.3}}</div>
<div id="profile-edit-prvkeywords-end"></div> <div id="profile-edit-prvkeywords-end"></div>
@ -169,10 +166,10 @@
<div id="about-jot-wrapper" > <div id="about-jot-wrapper" >
<p id="about-jot-desc" > <p id="about-jot-desc" >
{{$lbl_about}} {{$about.1}}
</p> </p>
<textarea rows="10" cols="72" id="profile-about-text" name="about" >{{$about}}</textarea> <textarea rows="10" cols="72" id="profile-about-text" name="about" >{{$about.2}}</textarea>
</div> </div>
<div id="about-jot-end"></div> <div id="about-jot-end"></div>
@ -180,10 +177,10 @@
<div id="interest-jot-wrapper" > <div id="interest-jot-wrapper" >
<p id="interest-jot-desc" > <p id="interest-jot-desc" >
{{$lbl_hobbies}} {{$interest.1}}
</p> </p>
<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >{{$interest}}</textarea> <textarea rows="10" cols="72" id="interest-jot-text" name="interest" >{{$interest.2}}</textarea>
</div> </div>
<div id="interest-jot-end"></div> <div id="interest-jot-end"></div>
@ -191,10 +188,10 @@
<div id="likes-jot-wrapper" > <div id="likes-jot-wrapper" >
<p id="likes-jot-desc" > <p id="likes-jot-desc" >
{{$lbl_likes}} {{$likes.1}}
</p> </p>
<textarea rows="10" cols="72" id="likes-jot-text" name="likes" >{{$likes}}</textarea> <textarea rows="10" cols="72" id="likes-jot-text" name="likes" >{{$likes.2}}</textarea>
</div> </div>
<div id="likes-jot-end"></div> <div id="likes-jot-end"></div>
@ -202,10 +199,10 @@
<div id="dislikes-jot-wrapper" > <div id="dislikes-jot-wrapper" >
<p id="dislikes-jot-desc" > <p id="dislikes-jot-desc" >
{{$lbl_dislikes}} {{$dislikes.1}}
</p> </p>
<textarea rows="10" cols="72" id="dislikes-jot-text" name="dislikes" >{{$dislikes}}</textarea> <textarea rows="10" cols="72" id="dislikes-jot-text" name="dislikes" >{{$dislikes.2}}</textarea>
</div> </div>
<div id="dislikes-jot-end"></div> <div id="dislikes-jot-end"></div>
@ -213,10 +210,10 @@
<div id="contact-jot-wrapper" > <div id="contact-jot-wrapper" >
<p id="contact-jot-desc" > <p id="contact-jot-desc" >
{{$lbl_social}} {{$contact.1}}
</p> </p>
<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >{{$contact}}</textarea> <textarea rows="10" cols="72" id="contact-jot-text" name="contact" >{{$contact.2}}</textarea>
</div> </div>
<div id="contact-jot-end"></div> <div id="contact-jot-end"></div>
@ -230,20 +227,20 @@
<div id="music-jot-wrapper" > <div id="music-jot-wrapper" >
<p id="music-jot-desc" > <p id="music-jot-desc" >
{{$lbl_music}} {{$music.1}}
</p> </p>
<textarea rows="10" cols="72" id="music-jot-text" name="music" >{{$music}}</textarea> <textarea rows="10" cols="72" id="music-jot-text" name="music" >{{$music.2}}</textarea>
</div> </div>
<div id="music-jot-end"></div> <div id="music-jot-end"></div>
<div id="book-jot-wrapper" > <div id="book-jot-wrapper" >
<p id="book-jot-desc" > <p id="book-jot-desc" >
{{$lbl_book}} {{$book.1}}
</p> </p>
<textarea rows="10" cols="72" id="book-jot-text" name="book" >{{$book}}</textarea> <textarea rows="10" cols="72" id="book-jot-text" name="book" >{{$book.2}}</textarea>
</div> </div>
<div id="book-jot-end"></div> <div id="book-jot-end"></div>
@ -252,10 +249,10 @@
<div id="tv-jot-wrapper" > <div id="tv-jot-wrapper" >
<p id="tv-jot-desc" > <p id="tv-jot-desc" >
{{$lbl_tv}} {{$tv.1}}
</p> </p>
<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >{{$tv}}</textarea> <textarea rows="10" cols="72" id="tv-jot-text" name="tv" >{{$tv.2}}</textarea>
</div> </div>
<div id="tv-jot-end"></div> <div id="tv-jot-end"></div>
@ -264,10 +261,10 @@
<div id="film-jot-wrapper" > <div id="film-jot-wrapper" >
<p id="film-jot-desc" > <p id="film-jot-desc" >
{{$lbl_film}} {{$film.1}}
</p> </p>
<textarea rows="10" cols="72" id="film-jot-text" name="film" >{{$film}}</textarea> <textarea rows="10" cols="72" id="film-jot-text" name="film" >{{$film.2}}</textarea>
</div> </div>
<div id="film-jot-end"></div> <div id="film-jot-end"></div>
@ -281,10 +278,10 @@
<div id="romance-jot-wrapper" > <div id="romance-jot-wrapper" >
<p id="romance-jot-desc" > <p id="romance-jot-desc" >
{{$lbl_love}} {{$romance.1}}
</p> </p>
<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >{{$romance}}</textarea> <textarea rows="10" cols="72" id="romance-jot-text" name="romance" >{{$romance.2}}</textarea>
</div> </div>
<div id="romance-jot-end"></div> <div id="romance-jot-end"></div>
@ -293,10 +290,10 @@
<div id="work-jot-wrapper" > <div id="work-jot-wrapper" >
<p id="work-jot-desc" > <p id="work-jot-desc" >
{{$lbl_work}} {{$work.1}}
</p> </p>
<textarea rows="10" cols="72" id="work-jot-text" name="work" >{{$work}}</textarea> <textarea rows="10" cols="72" id="work-jot-text" name="work" >{{$work.2}}</textarea>
</div> </div>
<div id="work-jot-end"></div> <div id="work-jot-end"></div>
@ -305,10 +302,10 @@
<div id="education-jot-wrapper" > <div id="education-jot-wrapper" >
<p id="education-jot-desc" > <p id="education-jot-desc" >
{{$lbl_school}} {{$education.1}}
</p> </p>
<textarea rows="10" cols="72" id="education-jot-text" name="education" >{{$education}}</textarea> <textarea rows="10" cols="72" id="education-jot-text" name="education" >{{$education.2}}</textarea>
</div> </div>
<div id="education-jot-end"></div> <div id="education-jot-end"></div>
@ -325,14 +322,14 @@
{{include file="field_yesno.tpl" field=$details}} {{include file="field_yesno.tpl" field=$details}}
{{/if}} {{/if}}
<div id="profile-edit-profile-name-wrapper" > <div id="profile-edit-profile-name-wrapper" >
<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$lbl_profname}} </label> <label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$profile_name.1}} </label>
<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name|escape:'html'}}" /><div class="required">*</div> <input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name.2|escape:'html'}}" /><div class="required">*</div>
</div> </div>
<div id="profile-edit-profile-name-end"></div> <div id="profile-edit-profile-name-end"></div>
<div id="profile-edit-name-wrapper" > <div id="profile-edit-name-wrapper" >
<label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label> <label id="profile-edit-name-label" for="profile-edit-name" >{{$name.1}} </label>
<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name|escape:'html'}}" /> <input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2|escape:'html'}}" />
</div> </div>
<div id="profile-edit-name-end"></div> <div id="profile-edit-name-end"></div>
@ -344,77 +341,74 @@
<div id="profile-edit-gender-end"></div> <div id="profile-edit-gender-end"></div>
<div id="profile-edit-dob-wrapper" > <div id="profile-edit-dob-wrapper" >
<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label> {{$dob}}
<div id="profile-edit-dob" >
{{$dob}} {{$age}}
</div>
</div> </div>
<div id="profile-edit-dob-end"></div> <div id="profile-edit-dob-end"></div>
{{/if}} {{/if}}
<div id="profile-edit-homepage-wrapper" > <div id="profile-edit-homepage-wrapper" >
<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label> <label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$homepage.1}} </label>
<input type="url" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage|escape:'html'}}" /> <input type="url" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage.2|escape:'html'}}" />
</div> </div>
<div id="profile-edit-homepage-end"></div> <div id="profile-edit-homepage-end"></div>
{{$hide_friends}} {{$hide_friends}}
<div id="profile-edit-address-wrapper" > <div id="profile-edit-address-wrapper" >
<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label> <label id="profile-edit-address-label" for="profile-edit-address" >{{$address.1}} </label>
<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address|escape:'html'}}" /> <input type="text" size="32" name="address" id="profile-edit-address" value="{{$address.2|escape:'html'}}" />
</div> </div>
<div id="profile-edit-address-end"></div> <div id="profile-edit-address-end"></div>
<div id="profile-edit-locality-wrapper" > <div id="profile-edit-locality-wrapper" >
<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label> <label id="profile-edit-locality-label" for="profile-edit-locality" >{{$locality.1}} </label>
<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality|escape:'html'}}" /> <input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality.2|escape:'html'}}" />
</div> </div>
<div id="profile-edit-locality-end"></div> <div id="profile-edit-locality-end"></div>
<div id="profile-edit-postal-code-wrapper" > <div id="profile-edit-postal-code-wrapper" >
<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label> <label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$postal_code.1}} </label>
<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code|escape:'html'}}" /> <input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2|escape:'html'}}" />
</div> </div>
<div id="profile-edit-postal-code-end"></div> <div id="profile-edit-postal-code-end"></div>
<div id="profile-edit-country-name-wrapper" > <div id="profile-edit-country-name-wrapper" >
<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label> <label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$country_name.1}} </label>
<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region}}');"> <select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region.2}}');">
<option selected="selected" >{{$country_name}}</option> <option selected="selected" >{{$country_name.1}}</option>
<option>temp</option> <option>temp</option>
</select> </select>
</div> </div>
<div id="profile-edit-country-name-end"></div> <div id="profile-edit-country-name-end"></div>
<div id="profile-edit-region-wrapper" > <div id="profile-edit-region-wrapper" >
<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label> <label id="profile-edit-region-label" for="profile-edit-region" >{{$region.1}} </label>
<select name="region" id="profile-edit-region" onChange="Update_Globals();" > <select name="region" id="profile-edit-region" onChange="Update_Globals();" >
<option selected="selected" >{{$region}}</option> <option selected="selected" >{{$region.2}}</option>
<option>temp</option> <option>temp</option>
</select> </select>
</div> </div>
<div id="profile-edit-region-end"></div> <div id="profile-edit-region-end"></div>
<div id="profile-edit-pubkeywords-wrapper" > <div id="profile-edit-pubkeywords-wrapper" >
<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label> <label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$pub_keywords.1}} </label>
<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords|escape:'html'}}" /> <input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2|escape:'html'}}" />
</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div> </div><div id="profile-edit-pubkeywords-desc">{{$pub_keywords.3}}</div>
<div id="profile-edit-pubkeywords-end"></div> <div id="profile-edit-pubkeywords-end"></div>
<div id="profile-edit-prvkeywords-wrapper" > <div id="profile-edit-prvkeywords-wrapper" >
<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$lbl_prvkey}} </label> <label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$prv_keywords.1}} </label>
<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords|escape:'html'}}" /> <input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2|escape:'html'}}" />
</div><div id="profile-edit-prvkeywords-desc">{{$lbl_prvdsc}}</div> </div><div id="profile-edit-prvkeywords-desc">{{$prv_keywords.3}}</div>
<div id="profile-edit-prvkeywords-end"></div> <div id="profile-edit-prvkeywords-end"></div>
<div id="about-jot-wrapper" > <div id="about-jot-wrapper" >
<p id="about-jot-desc" > <p id="about-jot-desc" >
{{$lbl_about}} {{$about.1}}
</p> </p>
<textarea rows="10" cols="72" id="profile-about-text" name="about" >{{$about}}</textarea> <textarea rows="10" cols="72" id="profile-about-text" name="about" >{{$about.2}}</textarea>
</div> </div>
<div id="about-jot-end"></div> <div id="about-jot-end"></div>
@ -424,25 +418,25 @@
</div> </div>
<div class="profile-edit-submit-end"></div> <div class="profile-edit-submit-end"></div>
<input type="hidden" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" /> <input type="hidden" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc.2}}" />
<input type="hidden" id="contact-jot-text" name="contact" value="{{$contact}}" /> <input type="hidden" id="contact-jot-text" name="contact" value="{{$contact.2}}" />
<input type="hidden" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" /> <input type="hidden" name="hometown" id="profile-edit-hometown" value="{{$hometown.2}}" />
<input type="hidden" name="politic" id="profile-edit-politic" value="{{$politic}}" /> <input type="hidden" name="politic" id="profile-edit-politic" value="{{$politic.2}}" />
<input type="hidden" name="religion" id="profile-edit-religion" value="{{$religion}}" /> <input type="hidden" name="religion" id="profile-edit-religion" value="{{$religion.2}}" />
<input type="hidden" id="likes-jot-text" name="likes" value="{{$likes}}" /> <input type="hidden" id="likes-jot-text" name="likes" value="{{$likes.2}}" />
<input type="hidden" id="dislikes-jot-text" name="dislikes" value="{{$dislikes}}" /> <input type="hidden" id="dislikes-jot-text" name="dislikes" value="{{$dislikes.2}}" />
<input type="hidden" name="with" id="profile-edit-with" value="{{$with}}" /> <input type="hidden" name="with" id="profile-edit-with" value="{{$with.2}}" />
<input type="hidden" name="howlong" id="profile-edit-howlong" value="{{$howlong}}" /> <input type="hidden" name="howlong" id="profile-edit-howlong" value="{{$howlong.2}}" />
<input type="hidden" id="romance-jot-text" name="romance" value="{{$romance}}" /> <input type="hidden" id="romance-jot-text" name="romance" value="{{$romance.2}}" />
<input type="hidden" id="work-jot-text" name="work" value="{{$work}}" /> <input type="hidden" id="work-jot-text" name="work" value="{{$work.2}}" />
<input type="hidden" id="education-jot-text" name="education" value="{{$education}}" /> <input type="hidden" id="education-jot-text" name="education" value="{{$education.2}}" />
<input type="hidden" id="interest-jot-text" name="interest" value="{{$interest}}" /> <input type="hidden" id="interest-jot-text" name="interest" value="{{$interest.2}}" />
<input type="hidden" id="music-jot-text" name="music" value="{{$music}}" /> <input type="hidden" id="music-jot-text" name="music" value="{{$music.2}}" />
<input type="hidden" id="book-jot-text" name="book" value="{{$book}}" /> <input type="hidden" id="book-jot-text" name="book" value="{{$book.2}}" />
<input type="hidden" id="tv-jot-text" name="tv" value="{{$tv}}" /> <input type="hidden" id="tv-jot-text" name="tv" value="{{$tv.2}}" />
<input type="hidden" id="film-jot-text" name="film" value="{{$film}}" /> <input type="hidden" id="film-jot-text" name="film" value="{{$film.2}}" />
{{/if}} {{/if}}
</form> </form>
</div> </div>
<script type="text/javascript">Fill_Country('{{$country_name}}');Fill_States('{{$region}}');</script> <script type="text/javascript">Fill_Country('{{$country_name.2}}');Fill_States('{{$region.2}}');</script>

16
view/templates/profile_entry.tpl
View file

@ -1,12 +1,12 @@
<div class="profile-listing" > <div class="profile-listing" >
<div class="profile-listing-photo-wrapper" > <div class="profile-listing-photo-wrapper" >
<a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a> <a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a>
</div> </div>
<div class="profile-listing-photo-end"></div> <div class="profile-listing-photo-end"></div>
<div class="profile-listing-name" id="profile-listing-name-{{$id}}"><a href="profiles/{{$id}}" class="profile-listing-edit-link" >{{$profile_name}}</a></div> <div class="profile-listing-name" id="profile-listing-name-{{$id}}">
<div class="profile-listing-visible">{{$visible}}</div> <a href="profiles/{{$id}}" class="profile-listing-edit-link" >{{$profile_name}}</a>
</div>
<div class="profile-listing-visible">{{$visible}}</div>
</div> </div>
<div class="profile-listing-end"></div> <div class="profile-listing-end"></div>

9
view/templates/profile_listing_header.tpl
View file

@ -1,9 +1,14 @@
<h1>{{$header}}</h1> <h1>{{$header}}</h1>
<p id="profile-listing-desc" class="button" > <p id="profile-listing-desc" class="button" >
<a href="profile_photo" >{{$chg_photo}}</a> <a href="profile_photo" >{{$chg_photo}}</a>
</p> </p>
<div id="profile-listing-new-link-wrapper" class="button" > <div id="profile-listing-new-link-wrapper" class="button" >
<a href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" >{{$cr_new}}</a> <a href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" >{{$cr_new}}</a>
</div> </div>
<div id="profile-listing-profiles">
{{$profiles}}
</div>

116
view/theme/frio/css/style.css
View file

@ -953,6 +953,55 @@ aside .vcard #dfrn-request-link,
aside .vcard #wallmessage-link { aside .vcard #wallmessage-link {
width: 100%; width: 100%;
} }
/* vcard-short-info */
#vcard-short-info,
#nav-short-info .contact-wrapper {
margin-top: 2px;
height: 40px;
white-space: nowrap;
overflow: hidden;
padding-right: 20px;
margin-left: -14px;
}
#vcard-short-photo-wrapper img,
#nav-short-info .contact-wrapper img {
height: 34px;
width: 34px;
border-radius: 3px;
}
#vcard-short-desc,
#nav-short-info .contact-wrapper .media-body {
display: block;
height: 34px;
width: 100%;
text-overflow: ellipsis;
}
#vcard-short-desc > .media-heading,
#vcard-short-desc > .vcard-short-addr,
#nav-short-info .contact-wrapper .media-heading,
#nav-short-info .contact-wrapper #contact-entry-url-network {
text-overflow: ellipsis;
overflow: hidden;
}
#vcard-short-desc > .media-heading,
#nav-short-info .contact-wrapper .media-heading {
margin-bottom: 1px;
font-weight: bold;
}
#nav-short-info .contact-wrapper .media-heading a {
color: #555;
font-size: 14px !important;
}
#vcard-short-desc > .vcard-short-addr,
#nav-short-info .contact-wrapper #contact-entry-url-network {
color: #777;
font-size: 12px;
}
.network-content-wrapper > #viewcontact_wrapper-network,
#nav-short-info .contact-wrapper .contact-photo-overlay,
#nav-short-info .contact-wrapper .contact-actions{
display: none
}
aside #peoplefind-sidebar input, aside #peoplefind-sidebar input,
aside #follow-sidebar input { aside #follow-sidebar input {
@ -978,6 +1027,15 @@ aside #group-sidebar .sidebar-group-li .group-edit-tool:hover,
aside #saved-search-list .saved-search-li .savedsearchdrop:hover { aside #saved-search-list .saved-search-li .savedsearchdrop:hover {
opacity: 1; opacity: 1;
} }
aside #group-sidebar li .group-checkbox {
margin: 0;
}
aside #group-sidebar li .group-edit-tool {
padding-right: 10px;
}
aside #group-sidebar li .group-edit-tool:first-child {
padding-right: 0px;
}
/* contact block widget */ /* contact block widget */
#contact-block .contact-block-content { #contact-block .contact-block-content {
@ -1707,7 +1765,7 @@ ul.dropdown-menu li:hover {
/* PAGES */ /* PAGES */
/* Profile-page */ /* Profile-page */
#profile-page, .photos-content-wrapper, .settings-content-wrapper, .generic-page-wrapper ,#profile-page, .profile_photo-content-wrapper, .photos-content-wrapper,
.contacts-content-wrapper, .suggest-content-wrapper, .common-content-wrapper, .contacts-content-wrapper, .suggest-content-wrapper, .common-content-wrapper,
.allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper, .allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper,
.directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper, .directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper,
@ -1982,6 +2040,62 @@ td.fc-day {
} }
#event-edit-form-wrapper #event-edit-time { #event-edit-form-wrapper #event-edit-time {
padding: 10px 0; padding: 10px 0;
/* Profiles Page */
.profile-listing-table {
display: table;
width: 100%;
}
.profile-listing-row {
display: table-row;
}
.profile-listing-cell {
display: table-cell;
}
.profile-listing-photo {
width: 48px;
height: 48px;
margin: 10px 0px;
}
#profile-listing-new-link-wrapper {
margin-bottom: 20px;
}
.panel-group-settings {
margin-left: -15px;
margin-right: -15px;
}
.panel-group-settings > .panel {
padding-left: 15px;
padding-right: 15px;
}
.profiles-content-wrapper #profile-photo-upload-section {
display: none;
margin-left: -15px;
margin-right: -15px;
margin-top: 15px;
padding: 15px;
}
#profile-photo-upload-close {
font-size: 14px;
}
/* Settings */
.section-subtitle-wrapper {
padding: 1px 10px;
}
.panel .section-subtitle-wrapper a.accordion-toggle:before {
font-family: FontAwesome;
content: "\f0d7";
padding-right: 5px;
}
.panel .section-subtitle-wrapper a.accordion-toggle.collapsed:before {
font-family: FontAwesome;
content: "\f0da";
}
#settings-nick-wrapper {
margin-bottom: 20px;
}
.group {
margin-left: 20px;
} }
/* /*
* Overwriting for transparency and other colors * Overwriting for transparency and other colors

183
view/theme/frio/frameworks/jquery-scrollspy/README.md Normal file
View file

@ -0,0 +1,183 @@
# NOTE: This is the latest version of ScrollSpy, which includes a ton of bug fixes and efficiency improvements. It's recommended that you use this version for now instead of the official (which hasn't been updated in a while).
# jQuery-ScrollSpy
An adaptation of the Mootools Scrollspy (http://davidwalsh.name/mootools-scrollspy) plugin for jQuery
(c) 2011 Samuel Alexander (https://github.com/sxalexander/jquery-scrollspy)
(c) 2015 SoftwareSpot
Released under The MIT License.
## Description:
ScrollSpy is a simple jQuery plugin for firing events based on where the user has scrolled to in a page.
## Homepage:
https://github.com/softwarespot/jquery-scrollspy
## Source:
Hosted at GitHub; browse at:
https://github.com/softwarespot/jquery-scrollspy/tree/master
Or clone from:
git://github.com/softwarespot/jquery-scrollspy.git
## Usage:
1. Insert the necessary elements in to your document's `<head>` section, e.g.:
```html
<script src="jquery.min.js"></script>
<script src="jquery.scrollspy.min.js"></script>
```
2. Initialise ScrollSpy once the DOM has been loaded:
```javascript
<script>
$(function() {
var $nav = $('#nav');
$('#sticky-navigation').scrollspy({
min: $nav.offset().top,
onEnter: function(element, position) {
$nav.addClass('fixed');
},
onLeave: function(element, position) {
$nav.removeClass('fixed');
}
});
});
</script>
```
Check out the /examples for more info !
## Documentation:
ScrollSpy function signature:
```javascript
$('container').scrollspy(options, action)
```
Default options for ScrollSpy:
```javascript
// default options for ScrollSpy
var defaults = {
// the offset to be applied to the left and top positions of the container
buffer: 0,
// the element to apply the 'scrolling' event to (default window)
container: window,
// the maximum value of the X or Y coordinate, depending on mode the selected
max: 0,
// the maximum value of the X or Y coordinate, depending on mode the selected
min: 0,
// whether to listen to the X (horizontal) or Y (vertical) scrolling
mode: 'vertical',
// namespace to append to the 'scroll' event
namespace: 'scrollspy',
// call the following callback function every time the user enters the min / max zone
onEnter: null,
// call the following callback function every time the user leaves the min / max zone
onLeave: null,
// call the following callback function every time the user leaves the top zone
onLeaveTop: null,
// call the following callback function every time the user leaves the bottom zone
onLeaveBottom: null,
// call the following callback function on each scroll event within the min and max parameters
onTick: null,
// call the following callback function on each scroll event when the element is inside the viewable view port
onView: null
};
```
Events are triggered by ScrollSpy are:
scrollTick: Fires on each scroll event within the min and max parameters:
position: an object with the current X and Y position.
inside: a Boolean value for whether or not the user is within the min and max parameters
enters: the number of times the min / max has been entered.
leaves: the number of times the min / max has been left.
scrollEnter: Fires every time the user enters the min / max zone:
position: an object with the current X and Y position.
enters: the number of times the min / max has been entered.
scrollLeave: Fires every time the user leaves the min / max zone:
position: an object with the current X and Y position.
leaves: the number of times the min / max has been left.
scrollLeaveTop: Fires every time the user leaves the top zone:
position: an object with the current X and Y position.
leaves: the number of times the min / max has been left.
scrollLeaveBottom: Fires every time the user leaves the bottom zone:
position: an object with the current X and Y position.
leaves: the number of times the min / max has been left.
scrollView: Fires every time the element is inside the viewable view port:
position: an object with the current X and Y position.
leaves: the number of times the min / max has been left.
### Tidy up
To destroy ScrollSpy for a particular container, simple pass 'destroy' as the action parameter. The only options that will be honoured are `container` and `namespace`.
## A note about forking:
By forking this project you hereby grant permission for any commits to your fork to be
merged back into this repository and, with attribution, be released under the terms of
the MIT License.
## Contribute
To contribute to the project, you will first need to install [node](https://nodejs.org) globally on your system. Once installation has completed, change the working directory to the plugin's location and run the following command:
```shell
npm install
```
After installation of the local modules, you're ready to start contributing to the project. Before you submit your PR, please don't forget to call `gulp`, which will run against [JSHint](http://jshint.com) for any errors, but will also minify the plugin.
##### Watch
Call the following command to start 'watching' for any changes to the main JavaScript file(s). This will automatically invoke JSHint and Uglify.
```shell
gulp watch
```
##### JSHint
Call the following command to invoke JSHint and check that the changes meet the requirements set in .jshintrc.
```shell
gulp jshint
```
##### Uglify
Call the following command to invoke Uglify, which will minify the main JavaScript file(s) and output to a .min.js file respectively.
```shell
gulp uglify
```
##### Build
Call the following command to invoke both JSHint and Uglify.
```shell
gulp
```

18
view/theme/frio/frameworks/jquery-scrollspy/bower.json Normal file
View file

@ -0,0 +1,18 @@
{
"name": "jquery-scrollspy",
"homepage": "https://github.com/sxalexander/jquery-scrollspy/",
"description": "scrollspy is a simple jQuery plugin for firing events based on where the user has scrolled to in a page.",
"main": "jquery-scrollspy.min.js",
"keywords": [
"scrolling",
"scroll"
],
"license": "MIT",
"ignore": [
],
"dependencies": {
"jquery": ">=1.7.0"
},
"devDependencies": {
}
}

65
view/theme/frio/frameworks/jquery-scrollspy/gulpfile.js vendored Normal file
View file

@ -0,0 +1,65 @@
/* global require */
var gulp = require('gulp');
var eslint = require('gulp-eslint');
var gulpIf = require('gulp-if');
var rename = require('gulp-rename');
var uglify = require('gulp-uglify');
// Assets for the project
var Assets = {
main: './jquery-scrollspy.js',
minified: './jquery-scrollspy.min.js',
package: './package.json',
readme: './README.md',
source: './',
};
// See the uglify documentation for more details
var _uglifySettings = {
compress: {
comparisons: true,
conditionals: true,
/* jscs: disable */
dead_code: true,
drop_console: true,
/* jscs: enable */
unsafe: true,
unused: true,
},
};
// Check the main js file(s) meets the following standards outlined in .eslintrc
gulp.task('eslint', function esLintTask() {
// Has ESLint fixed the file contents?
function isFixed(file) {
return file.eslint !== undefined && file.eslint !== null && file.eslint.fixed;
}
return gulp.src(Assets.main)
.pipe(eslint({
fix: true,
useEslintrc: '.eslintrc',
}))
.pipe(eslint.format())
.pipe(gulpIf(isFixed, gulp.dest(Assets.source)));
});
// Uglify aka minify the main file
gulp.task('uglify', function uglifyTask() {
return gulp.src(Assets.main)
.pipe(uglify(_uglifySettings))
.pipe(rename(Assets.minified))
.pipe(gulp.dest(Assets.source));
});
// Watch for changes to the main file
gulp.task('watch', function watchTask() {
gulp.watch(Assets.main, ['eslint', 'uglify']);
});
// Register the default task
gulp.task('default', ['eslint', 'uglify']);
// 'gulp eslint' to check the syntax of the main js file(s)
// 'gulp uglify' to uglify the main file

267
view/theme/frio/frameworks/jquery-scrollspy/jquery-scrollspy.js vendored Normal file
View file

@ -0,0 +1,267 @@
/*
* jQuery ScrollSpy Plugin
* Author: @sxalexander, softwarespot
* Licensed under the MIT license
*/
(function jQueryScrollspy(window, $) {
// Plugin Logic
$.fn.extend({
scrollspy: function scrollspy(options, action) {
// If the options parameter is a string, then assume it's an 'action', therefore swap the parameters around
if (_isString(options)) {
var tempOptions = action;
// Set the action as the option parameter
action = options;
// Set to be the reference action pointed to
options = tempOptions;
}
// override the default options with those passed to the plugin
options = $.extend({}, _defaults, options);
// sanitize the following option with the default value if the predicate fails
_sanitizeOption(options, _defaults, 'container', _isObject);
// cache the jQuery object
var $container = $(options.container);
// check if it's a valid jQuery selector
if ($container.length === 0) {
return this;
}
// sanitize the following option with the default value if the predicate fails
_sanitizeOption(options, _defaults, 'namespace', _isString);
// check if the action is set to DESTROY/destroy
if (_isString(action) && action.toUpperCase() === 'DESTROY') {
$container.off('scroll.' + options.namespace);
return this;
}
// sanitize the following options with the default values if the predicates fails
_sanitizeOption(options, _defaults, 'buffer', $.isNumeric);
_sanitizeOption(options, _defaults, 'max', $.isNumeric);
_sanitizeOption(options, _defaults, 'min', $.isNumeric);
// callbacks
_sanitizeOption(options, _defaults, 'onEnter', $.isFunction);
_sanitizeOption(options, _defaults, 'onLeave', $.isFunction);
_sanitizeOption(options, _defaults, 'onLeaveTop', $.isFunction);
_sanitizeOption(options, _defaults, 'onLeaveBottom', $.isFunction);
_sanitizeOption(options, _defaults, 'onTick', $.isFunction);
if ($.isFunction(options.max)) {
options.max = options.max();
}
if ($.isFunction(options.min)) {
options.min = options.min();
}
// check if the mode is set to VERTICAL/vertical
var isVertical = window.String(options.mode).toUpperCase() === 'VERTICAL';
return this.each(function each() {
// cache this
var _this = this;
// cache the jQuery object
var $element = $(_this);
// count the number of times a container is entered
var enters = 0;
// determine if the scroll is with inside the container
var inside = false;
// count the number of times a container is left
var leaves = 0;
// create a scroll listener for the container
$container.on('scroll.' + options.namespace, function onScroll() {
// cache the jQuery object
var $this = $(this);
// create a position object literal
var position = {
top: $this.scrollTop(),
left: $this.scrollLeft(),
};
var containerHeight = $container.height();
var max = options.max;
var min = options.min;
var xAndY = isVertical ? position.top + options.buffer : position.left + options.buffer;
if (max === 0) {
// get the maximum value based on either the height or the outer width
max = isVertical ? containerHeight : $container.outerWidth() + $element.outerWidth();
}
// if we have reached the minimum bound, though are below the max
if (xAndY >= min && xAndY <= max) {
// trigger the 'scrollEnter' event
if (!inside) {
inside = true;
enters++;
// trigger the 'scrollEnter' event
$element.trigger('scrollEnter', {
position: position,
});
// call the 'onEnter' function
if (options.onEnter !== null) {
options.onEnter(_this, position);
}
}
// trigger the 'scrollTick' event
$element.trigger('scrollTick', {
position: position,
inside: inside,
enters: enters,
leaves: leaves,
});
// call the 'onTick' function
if (options.onTick !== null) {
options.onTick(_this, position, inside, enters, leaves);
}
} else {
if (inside) {
inside = false;
leaves++;
// trigger the 'scrollLeave' event
$element.trigger('scrollLeave', {
position: position,
leaves: leaves,
});
// call the 'onLeave' function
if (options.onLeave !== null) {
options.onLeave(_this, position);
}
if (xAndY <= min) {
// trigger the 'scrollLeaveTop' event
$element.trigger('scrollLeaveTop', {
position: position,
leaves: leaves,
});
// call the 'onLeaveTop' function
if (options.onLeaveTop !== null) {
options.onLeaveTop(_this, position);
}
} else if (xAndY >= max) {
// trigger the 'scrollLeaveBottom' event
$element.trigger('scrollLeaveBottom', {
position: position,
leaves: leaves,
});
// call the 'onLeaveBottom' function
if (options.onLeaveBottom !== null) {
options.onLeaveBottom(_this, position);
}
}
} else {
// Idea taken from: http://stackoverflow.com/questions/5353934/check-if-element-is-visible-on-screen
var containerScrollTop = $container.scrollTop();
// Get the element height
var elementHeight = $element.height();
// Get the element offset
var elementOffsetTop = $element.offset().top;
if ((elementOffsetTop < (containerHeight + containerScrollTop)) && (elementOffsetTop > (containerScrollTop - elementHeight))) {
// trigger the 'scrollView' event
$element.trigger('scrollView', {
position: position,
});
// call the 'onView' function
if (options.onView !== null) {
options.onView(_this, position);
}
}
}
}
});
});
},
});
// Fields (Private)
// Defaults
// default options
var _defaults = {
// the offset to be applied to the left and top positions of the container
buffer: 0,
// the element to apply the 'scrolling' event to (default window)
container: window,
// the maximum value of the X or Y coordinate, depending on mode the selected
max: 0,
// the maximum value of the X or Y coordinate, depending on mode the selected
min: 0,
// whether to listen to the X (horizontal) or Y (vertical) scrolling
mode: 'vertical',
// namespace to append to the 'scroll' event
namespace: 'scrollspy',
// call the following callback function every time the user enters the min / max zone
onEnter: null,
// call the following callback function every time the user leaves the min / max zone
onLeave: null,
// call the following callback function every time the user leaves the top zone
onLeaveTop: null,
// call the following callback function every time the user leaves the bottom zone
onLeaveBottom: null,
// call the following callback function on each scroll event within the min and max parameters
onTick: null,
// call the following callback function on each scroll event when the element is inside the viewable view port
onView: null,
};
// Methods (Private)
// check if a value is an object datatype
function _isObject(value) {
return $.type(value) === 'object';
}
// check if a value is a string datatype with a length greater than zero when whitespace is stripped
function _isString(value) {
return $.type(value) === 'string' && $.trim(value).length > 0;
}
// check if an option is correctly formatted using a predicate; otherwise, return the default value
function _sanitizeOption(options, defaults, property, predicate) {
// set the property to the default value if the predicate returned false
if (!predicate(options[property])) {
options[property] = defaults[property];
}
}
}(window, window.jQuery));

1
view/theme/frio/frameworks/jquery-scrollspy/jquery-scrollspy.min.js vendored Normal file
View file

@ -0,0 +1 @@
!function(e,n){function o(e){return"object"===n.type(e)}function i(e){return"string"===n.type(e)&&n.trim(e).length>0}function t(e,n,o,i){i(e[o])||(e[o]=n[o])}n.fn.extend({scrollspy:function(l,s){if(i(l)){var a=s;s=l,l=a}l=n.extend({},r,l),t(l,r,"container",o);var c=n(l.container);if(0===c.length)return this;if(t(l,r,"namespace",i),i(s)&&"DESTROY"===s.toUpperCase())return c.off("scroll."+l.namespace),this;t(l,r,"buffer",n.isNumeric),t(l,r,"max",n.isNumeric),t(l,r,"min",n.isNumeric),t(l,r,"onEnter",n.isFunction),t(l,r,"onLeave",n.isFunction),t(l,r,"onLeaveTop",n.isFunction),t(l,r,"onLeaveBottom",n.isFunction),t(l,r,"onTick",n.isFunction),n.isFunction(l.max)&&(l.max=l.max()),n.isFunction(l.min)&&(l.min=l.min());var u="VERTICAL"===e.String(l.mode).toUpperCase();return this.each(function(){var e=this,o=n(e),i=0,t=!1,r=0;c.on("scroll."+l.namespace,function(){var s=n(this),a={top:s.scrollTop(),left:s.scrollLeft()},f=c.height(),p=l.max,m=l.min,v=u?a.top+l.buffer:a.left+l.buffer;if(0===p&&(p=u?f:c.outerWidth()+o.outerWidth()),v>=m&&p>=v)t||(t=!0,i++,o.trigger("scrollEnter",{position:a}),null!==l.onEnter&&l.onEnter(e,a)),o.trigger("scrollTick",{position:a,inside:t,enters:i,leaves:r}),null!==l.onTick&&l.onTick(e,a,t,i,r);else if(t)t=!1,r++,o.trigger("scrollLeave",{position:a,leaves:r}),null!==l.onLeave&&l.onLeave(e,a),m>=v?(o.trigger("scrollLeaveTop",{position:a,leaves:r}),null!==l.onLeaveTop&&l.onLeaveTop(e,a)):v>=p&&(o.trigger("scrollLeaveBottom",{position:a,leaves:r}),null!==l.onLeaveBottom&&l.onLeaveBottom(e,a));else{var g=c.scrollTop(),L=o.height(),h=o.offset().top;f+g>h&&h>g-L&&(o.trigger("scrollView",{position:a}),null!==l.onView&&l.onView(e,a))}})})}});var r={buffer:0,container:e,max:0,min:0,mode:"vertical",namespace:"scrollspy",onEnter:null,onLeave:null,onLeaveTop:null,onLeaveBottom:null,onTick:null,onView:null}}(window,window.jQuery);

21
view/theme/frio/frameworks/jquery-scrollspy/package.json Normal file
View file

@ -0,0 +1,21 @@
{
"name": "jquery-scrollspy",
"version": "1.0.0",
"license": "MIT",
"repository": {
"type": "git",
"url": "https://github.com/softwarespot/jquery-scrollspy.git"
},
"devDependencies": {
"del": "^2.1.0",
"eslint": "^2.5.1",
"eslint-config-airbnb": "^6.2.0",
"gulp": "^3.9.1",
"gulp-eslint": "^2.0.0",
"gulp-if": "^2.0.0",
"gulp-rename": "~1.2.2",
"gulp-replace": "^0.5.4",
"gulp-uglify": "^1.5.3",
"merge2": "^1.0.1"
}
}

5
view/theme/frio/js/modal.js
View file

@ -62,6 +62,11 @@ $(document).ready(function(){
toggleJotNav(this); toggleJotNav(this);
}); });
// bookmarklet page needs an jot modal which appears automatically
if(window.location.pathname.indexOf("/bookmarklet") >=0 && $("#jot-modal").length){
jotShow();
}
// Open filebrowser for elements with the class "image-select" // Open filebrowser for elements with the class "image-select"
// The following part handles the filebrowser for field_fileinput.tpl // The following part handles the filebrowser for field_fileinput.tpl
$("body").on("click", ".image-select", function(){ $("body").on("click", ".image-select", function(){

26
view/theme/frio/js/theme.js
View file

@ -149,12 +149,36 @@ $(document).ready(function(){
if( typeof searchValue !== "undefined") { if( typeof searchValue !== "undefined") {
$("#nav-search-input-field").val(searchValue); $("#nav-search-input-field").val(searchValue);
} }
} }
// move the "Save the search" button to the second navbar // move the "Save the search" button to the second navbar
$(".search-content-wrapper #search-save-form ").appendTo("#topbar-second > .container > #navbar-button"); $(".search-content-wrapper #search-save-form ").appendTo("#topbar-second > .container > #navbar-button");
// append the vcard-short-info to the second nav after passing the element
// with .fn (vcard username). Use scrollspy to get the scroll position.
if( $("aside .vcard .fn").length) {
$(".vcard .fn").scrollspy({
min: $(".vcard .fn").position().top - 50,
onLeaveTop: function onLeave(element) {
$("#vcard-short-info").fadeOut(500, function () {
$("#vcard-short-info").appendTo("#vcard-short-info-wrapper");
});
},
onEnter: function(element) {
$("#vcard-short-info").appendTo("#nav-short-info");
$("#vcard-short-info").fadeIn(500);
},
});
}
// move the forum contact information of the network page into the second navbar
if( $(".network-content-wrapper > #viewcontact_wrapper-network").length) {
// get the contact-wrapper element and append it to the second nav bar
// Note: We need the first() element with this class since at the present time we
// store also the js template information in the html code and thats why
// there are two elements with this class but we don't want the js template
$(".network-content-wrapper > #viewcontact_wrapper-network .contact-wrapper").first().appendTo("#nav-short-info");
}
}); });
//function commentOpenUI(obj, id) { //function commentOpenUI(obj, id) {
// $(document).unbind( "click.commentOpen", handler ); // $(document).unbind( "click.commentOpen", handler );

2
view/theme/frio/templates/field_input.tpl
View file

@ -1,7 +1,7 @@
<div id="id_{{$field.0}}_wrapper" class="form-group field input"> <div id="id_{{$field.0}}_wrapper" class="form-group field input">
<label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label> <label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
<input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.6 eq "email"}} type="email"{{elseif $field.6 eq "url"}} type="url"{{else}}type="text"{{/if}} value="{{$field.2|escape:'html'}}" {{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{/if}} aria-describedby="{{$field.0}}_tip"> <input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.6 eq "email"}} type="email"{{elseif $field.6 eq "url"}} type="url"{{else}} type="text"{{/if}} value="{{$field.2|escape:'html'}}" {{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby="{{$field.0}}_tip">
<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span> <span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
<div class="clear"></div> <div class="clear"></div>
</div> </div>

7
view/theme/frio/templates/field_intcheckbox.tpl Normal file
View file

@ -0,0 +1,7 @@
<div class="form-group field checkbox">
<input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.3|escape:'html'}}" {{if $field.2}}checked="checked"{{/if}} aria-describedby='{{$field.0}}_tip'>
<label for="id_{{$field.0}}">{{$field.1}}</label>
<span class="help-block" role="tooltip">{{$field.4}}</span>
</div>
<div class="clear"></div>

7
view/theme/frio/templates/field_openid.tpl Normal file
View file

@ -0,0 +1,7 @@
<div id="id_{{$field.0}}_wrapper" class="form-group field input openid">
<label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}</label>
<input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="text" value="{{$field.2|escape:'html'}}" aria-describedby="{{$field.0}}_tip">
<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
<div class="clear"></div>
</div>

7
view/theme/frio/templates/field_password.tpl
View file

@ -1,6 +1,7 @@
<div id="wrapper_{{$field.0}}" class="form-group field password"> <div id="id_{{$field.0}}_wrapper" class="form-group field input password">
<label for="id_{{$field.0}}">{{$field.1}}</label> <label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
<input class="form-control" type="password" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.2|escape:'html'}}"{{if $field.5}} {{$field.5}}{{/if}}>{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} <input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="password" value="{{$field.2|escape:'html'}}" {{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby="{{$field.0}}_tip">
<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span> <span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
<div class="clear"></div>
</div> </div>

7
view/theme/frio/templates/field_textarea.tpl Normal file
View file

@ -0,0 +1,7 @@
<div class="form-group field textarea">
<label for="id_{{$field.0}}">{{$field.1}}</label>
<textarea class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.4}}{{$field.4}}{{/if}} aria-describedby="{{$field.0}}_tip">{{$field.2}}</textarea>
<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
<div class="clear"></div>
</div>

1
view/theme/frio/templates/head.tpl
View file

@ -73,6 +73,7 @@
<script type="text/javascript" src="view/theme/frio/frameworks/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js"></script> <script type="text/javascript" src="view/theme/frio/frameworks/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js"></script>
<script type="text/javascript" src="view/theme/frio/frameworks/flexMenu/flexmenu.custom.js"></script> <script type="text/javascript" src="view/theme/frio/frameworks/flexMenu/flexmenu.custom.js"></script>
<script type="text/javascript" src="view/theme/frio/frameworks/jsmart/jsmart.custom.js"></script> <script type="text/javascript" src="view/theme/frio/frameworks/jsmart/jsmart.custom.js"></script>
<script type="text/javascript" src="view/theme/frio/frameworks/jquery-scrollspy/jquery-scrollspy.js"></script>
{{* own js files *}} {{* own js files *}}
<script type="text/javascript" src="view/theme/frio/js/theme.js"></script> <script type="text/javascript" src="view/theme/frio/js/theme.js"></script>

40
view/theme/frio/templates/login.tpl Normal file
View file

@ -0,0 +1,40 @@
<form id="login-form" action="{{$dest_url}}" role="form" method="post" >
<div id="login-group" role="group" aria-labelledby="login-head">
<input type="hidden" name="auth-params" value="login" />
<div id="login-head" class="sr-only">{{$login}}</div>
<div id="login_standard">
{{include file="field_input.tpl" field=$lname}}
{{include file="field_password.tpl" field=$lpassword}}
</div>
{{if $openid}}
<div id="login_openid">
{{include file="field_openid.tpl" field=$lopenid}}
</div>
{{/if}}
{{include file="field_checkbox.tpl" field=$lremember}}
<div id="login-extra-links" class="list-unstyled">
{{if $register}}<a href="register" title="{{$register.title|escape:'html'}}" id="register-link">{{$register.desc}}</a>{{/if}}
<a href="lostpass" title="{{$lostpass|escape:'html'}}" id="lost-password-link" class="pull-right">{{$lostlink}}</a>
</div>
<div id="login-submit-wrapper" class="pull-right" >
<button type="submit" name="submit" id="login-submit-button" class="btn btn-primary" value="{{$login|escape:'html'}}">{{$login|escape:'html'}}</button>
</div>
<div class="clear"></div>
{{foreach $hiddens as $k=>$v}}
<input type="hidden" name="{{$k}}" value="{{$v|escape:'html'}}" />
{{/foreach}}
</div>
</form>
<script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script>

2
view/theme/frio/templates/nav.tpl
View file

@ -267,7 +267,7 @@
{{* The second navbar which contains nav points of the actual page - (nav points are actual handled by this theme throug js *}} {{* The second navbar which contains nav points of the actual page - (nav points are actual handled by this theme throug js *}}
<div id="topbar-second" class="topbar"> <div id="topbar-second" class="topbar">
<div class="container"> <div class="container">
<div class="col-lg-3 col-md-3 hidden-sm hidden-xs"></div> <div class="col-lg-3 col-md-3 hidden-sm hidden-xs" id="nav-short-info"></div>
<div class="col-lg-7 col-md-7 col-sm-11 col-xs-10" id="tabmenu"></div> <div class="col-lg-7 col-md-7 col-sm-11 col-xs-10" id="tabmenu"></div>
<div class="col-lg-2 col-md-2 col-sm-1 col-xs-2" id="navbar-button"></div> <div class="col-lg-2 col-md-2 col-sm-1 col-xs-2" id="navbar-button"></div>
</div> </div>

331
view/theme/frio/templates/profile_edit.tpl Normal file
View file

@ -0,0 +1,331 @@
<div class="generic-page-wrapper">
{{include file="section_title.tpl" title=$banner}}
{{* The actions dropdown which can performed to the current profile *}}
<div id="profile-edit-links">
<ul class="nav nav-pills preferences">
<li class="dropdown pull-right">
<a class="btn btn-link btn-sm dropdown-toggle" type="button" id="profile-edit-links-dropdown" data-toggle="dropdown" aria-expanded="true">
<i class="fa fa-angle-down" aria-hidden="true"></i>&nbsp;{{$profile_action}}
</a>
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="profile-edit-links-dropdown">
<li role="menuitem"><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic|escape:'html'}}"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$profpic}}</a></li>
<li role="menuitem"><a id="profile-photo_upload-link" title="{{$profpic|escape:'html'}}" onclick="openClose('profile-photo-upload-section');"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$profpic}}</a></li>
{{if ! $is_default}}
<li class="nav-item"><a href="profperm/{{$profile_id}}" id="profile-edit-visibility-link" title="{{$editvis}}"><i class="fa fa-pencil" aria-hidden="true"></i>&nbsp;{{$editvis}}</a>
</li>
{{/if}}
<li role="separator" class="divider"></li>
<li role="menuitem"><a href="profile/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof|escape:'html'}}">{{$viewprof}}</a></li>
{{if $profile_clone_link}}
<li role="separator"class="divider"></li>
<li role="menuitem"><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof|escape:'html'}}">{{$cl_prof}}</a></li>
{{/if}}
{{if !$is_default}}
<li role="separator" class="divider"></li>
<li role="menuitem"><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof|escape:'html'}}"><i class="fa fa-trash" aria-hidden="true"></i>&nbsp;{{$del_prof}}</a></li>
{{/if}}
</ul>
</li>
</ul>
</div>
<div id="profile-edit-links-end"></div>
<form enctype="multipart/form-data" action="profile_photo" method="post">
<input type='hidden' name='form_security_token' value='{{$form_security_token_photo}}'>
<input type="hidden" name="profile" value="{{$profile_name.2}}" />
<div id="profile-photo-upload-section" class="panel">
<a id="profile-photo-upload-close" class="close pull-right" onclick="openClose('profile-photo-upload-section');"><i class="fa fa-times" aria-hidden="true"></i></a>
<div id="profile-photo-upload-wrapper">
<label id="profile-photo-upload-label" for="profile-photo-upload">{{$lbl_profile_photo}}:</label>
<input name="userfile" type="file" id="profile-photo-upload" size="48" />
</div>
<div class="profile-edit-submit-wrapper pull-right" >
<button type="submit" name="submit" class="profile-edit-submit-butto btn btn-primary" value="{{$submit}}">{{$submit}}</button>
</div>
<div class="clear"></div>
</div>
</form>
{{* Most of the Variables used below are arrays in the following style
0 => Some kind of identifier (e.g. for the ID)
1 => The label description
2 => The input values
3 => The additional help text (if available)
*}}
<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" method="post" >
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
{{* Some hints to characteristics of the current profile (if available) *}}
{{if $is_default}}
<div class="section-content-info-wrapper">{{$default}}</div>
{{/if}}
{{* friendica differs in $detailled_profile (all fields available and a short Version if this is variable false *}}
{{if $detailled_profile}}
<div class="panel-group panel-group-settings" id="profile-edit-wrapper" role="tablist" aria-multiselectable="true">
{{* The personal settings *}}
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="personal">
<h4>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#personal-collapse" aria-expanded="true" aria-controls="personal-collapse">
{{$lbl_personal_section}}
</a>
</h4>
</div>
{{* for the $detailled_profile we use bootstraps collapsable panel-groups to have expandable groups *}}
<div id="personal-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="personal">
<div class="section-content-tools-wrapper">
{{include file="field_yesno.tpl" field=$details}}
{{include file="field_input.tpl" field=$profile_name}}
{{include file="field_input.tpl" field=$name}}
{{include file="field_input.tpl" field=$pdesc}}
<div id="profile-edit-gender-wrapper" class="form-group field select">
<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
{{$gender}}
</div>
<div class="clear"></div>
{{$dob}}
{{$hide_friends}}
<div class="form-group pull-right" >
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
</div>
<div class="clear"></div>
</div>
</div>
</div>
{{* The location settings *}}
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="location">
<h4>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#location-collapse" aria-expanded="true" aria-controls="location-collapse">
{{$lbl_location_section}}
</a>
</h4>
</div>
<div id="location-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="location">
<div class="section-content-tools-wrapper">
{{include file="field_input.tpl" field=$address}}
{{include file="field_input.tpl" field=$locality}}
{{include file="field_input.tpl" field=$postal_code}}
<div id="profile-edit-country-name-wrapper" class="form-group field select">
<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$country_name.1}} </label>
<select name="country_name" id="profile-edit-country-name" class="form-control" onChange="Fill_States('{{$region.2}}');">
<option selected="selected" >{{$country_name.2}}</option>
<option>temp</option>
</select>
</div>
<div class="clear"></div>
<div id="profile-edit-region-wrapper" class="form-group field select">
<label id="profile-edit-region-label" for="profile-edit-region" >{{$region.1}} </label>
<select name="region" id="profile-edit-region" class="form-control" onChange="Update_Globals();" >
<option selected="selected" >{{$region.2}}</option>
<option>temp</option>
</select>
</div>
<div class="clear"></div>
{{include file="field_input.tpl" field=$hometown}}
<div class="form-group pull-right" >
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
</div>
<div class="clear"></div>
</div>
</div>
</div>
{{* The settings for relations *}}
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="relation">
<h4>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#relation-collapse" aria-expanded="true" aria-controls="relation-collapse">
{{$lbl_relation_section}}
</a>
</h4>
</div>
<div id="relation-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="relation">
<div class="section-content-tools-wrapper">
<div id="profile-edit-marital-wrapper" class="form-group field select" >
<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}}</label>
{{$marital}}
</div>
<div class="clear"></div>
{{include file="field_input.tpl" field=$with}}
{{include file="field_input.tpl" field=$howlong}}
<div id="profile-edit-sexual-wrapper" class="form-group field select" >
<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}}</label>
{{$sexual}}
</div>
<div class="clear"></div>
<div class="form-group pull-right" >
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
</div>
<div class="clear"></div>
</div>
</div>
</div>
{{* The miscellanous other settings *}}
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="miscellaneous">
<h4>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#miscellaneous-collapse" aria-expanded="true" aria-controls="miscellaneous-collapse">
{{$lbl_miscellaneous_section}}
</a>
</h4>
</div>
<div id="miscellaneous-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous">
<div class="section-content-tools-wrapper">
{{include file="field_input.tpl" field=$homepage}}
{{include file="field_input.tpl" field=$pub_keywords}}
{{include file="field_input.tpl" field=$prv_keywords}}
{{include file="field_input.tpl" field=$politic}}
{{include file="field_input.tpl" field=$religion}}
{{include file="field_textarea.tpl" field=$about}}
{{include file="field_textarea.tpl" field=$contact}}
{{include file="field_textarea.tpl" field=$interest}}
{{include file="field_textarea.tpl" field=$likes}}
{{include file="field_textarea.tpl" field=$dislikes}}
{{include file="field_textarea.tpl" field=$music}}
{{include file="field_textarea.tpl" field=$book}}
{{include file="field_textarea.tpl" field=$tv}}
{{include file="field_textarea.tpl" field=$film}}
{{include file="field_textarea.tpl" field=$romance}}
{{include file="field_textarea.tpl" field=$work}}
{{include file="field_textarea.tpl" field=$education}}
<div class="form-group pull-right" >
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
</div>
<div class="clear"></div>
</div>
</div>
</div>
</div>
{{else}}
{{* if $detailled_profile not available a short version of the setting page is displayed *}}
{{if $personal_account}}
{{include file="field_yesno.tpl" field=$details}}
{{/if}}
{{include file="field_input.tpl" field=$profile_name}}
{{include file="field_input.tpl" field=$name}}
{{if $personal_account}}
<div id="profile-edit-gender-wrapper" class="form-group field select">
<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
{{$gender}}
</div>
<div class="clear"></div>
{{$dob}}
{{/if}}
{{include file="field_input.tpl" field=$homepage}}
{{$hide_friends}}
{{include file="field_input.tpl" field=$address}}
{{include file="field_input.tpl" field=$locality}}
{{include file="field_input.tpl" field=$postal_code}}
<div id="profile-edit-country-name-wrapper" class="form-group field select">
<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$country_name.1}} </label>
<select name="country_name" id="profile-edit-country-name" class="form-control" onChange="Fill_States('{{$region.2}}');">
<option selected="selected" >{{$country_name.2}}</option>
<option>temp</option>
</select>
</div>
<div class="clear"></div>
<div id="profile-edit-region-wrapper" class="form-group field select">
<label id="profile-edit-region-label" for="profile-edit-region" >{{$region.1}} </label>
<select name="region" id="profile-edit-region" class="form-control" onChange="Update_Globals();" >
<option selected="selected" >{{$region.2}}</option>
<option>temp</option>
</select>
</div>
<div class="clear"></div>
{{include file="field_input.tpl" field=$pub_keywords}}
{{include file="field_input.tpl" field=$prv_keywords}}
{{include file="field_textarea.tpl" field=$about}}
<div class="form-group pull-right" >
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
</div>
<div class="clear"></div>
<input type="hidden" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc.2}}" />
<input type="hidden" id="contact-jot-text" name="contact" value="{{$contact.2}}" />
<input type="hidden" name="hometown" id="profile-edit-hometown" value="{{$hometown.2}}" />
<input type="hidden" name="politic" id="profile-edit-politic" value="{{$politic.2}}" />
<input type="hidden" name="religion" id="profile-edit-religion" value="{{$religion.2}}" />
<input type="hidden" id="likes-jot-text" name="likes" value="{{$likes.2}}" />
<input type="hidden" id="dislikes-jot-text" name="dislikes" value="{{$dislikes.2}}" />
<input type="hidden" name="with" id="profile-edit-with" value="{{$with.2}}" />
<input type="hidden" name="howlong" id="profile-edit-howlong" value="{{$howlong.2}}" />
<input type="hidden" id="romance-jot-text" name="romance" value="{{$romance.2}}" />
<input type="hidden" id="work-jot-text" name="work" value="{{$work.2}}" />
<input type="hidden" id="education-jot-text" name="education" value="{{$education.2}}" />
<input type="hidden" id="interest-jot-text" name="interest" value="{{$interest.2}}" />
<input type="hidden" id="music-jot-text" name="music" value="{{$music.2}}" />
<input type="hidden" id="book-jot-text" name="book" value="{{$book.2}}" />
<input type="hidden" id="tv-jot-text" name="tv" value="{{$tv.2}}" />
<input type="hidden" id="film-jot-text" name="film" value="{{$film.2}}" />
{{/if}}
</form>
</div>
<script type="text/javascript">Fill_Country('{{$country_name.2}}');Fill_States('{{$region.2}}');</script>

15
view/theme/frio/templates/profile_entry.tpl Normal file
View file

@ -0,0 +1,15 @@
<div class="profile-listing-row" >
<div class="profile-listing-cell" >
<a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a>
</div>
<div class="profile-listing-photo-end"></div>
<div class="profile-listing-cell" id="profile-listing-name-{{$id}}">
<a href="profiles/{{$id}}" class="profile-listing-edit-link" >{{$profile_name}}</a>
</div>
<div class="profile-listing-cell">
{{$visible}}
</div>
</div>
<div class="profile-listing-end"></div>

15
view/theme/frio/templates/profile_listing_header.tpl Normal file
View file

@ -0,0 +1,15 @@
<div class="generic-page-wrapper">
<div class="section-title-wrapper">
<h2>{{$header}}</h2>
</div>
<div class="section-content-wrapper">
<div id="profile-listing-new-link-wrapper" class="button" >
<a href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" >{{$cr_new}}</a>
</div>
<div id="profile-listing-profiles" class="profile-listing-table">
{{$profiles}}
</div>
</div>
</div>

12
view/theme/frio/templates/profile_vcard.tpl
View file

@ -20,7 +20,19 @@
</div> </div>
{{* The short information which will appended to the second navbar by scrollspy *}}
<div id="vcard-short-info-wrapper" style="display: none;">
<div id="vcard-short-info" class="media" style="display: none">
<div id="vcard-short-photo-wrapper" class="pull-left">
<img class="media-object" src="{{$profile.photo}}" alt="{{$profile.name}}" />
</div>
<div id="vcard-short-desc" class="media-body">
<h4 class="media-heading">{{$profile.name}}</h4>
{{if $profile.addr}}<div class="vcard-short-addr">{{$profile.addr}}</div>{{/if}}
</div>
</div>
</div>
<div class="panel-body"> <div class="panel-body">
<div class="profile-header"> <div class="profile-header">

24
view/theme/frio/templates/removeme.tpl Normal file
View file

@ -0,0 +1,24 @@
<div class="generic-page-wrapper">
{{* include the title template for the settings title *}}
{{include file="section_title.tpl" title=$title }}
<div id="remove-account-wrapper">
<div id="remove-account-desc">{{$desc}}</div>
<form action="{{$basedir}}/removeme" autocomplete="off" method="post" >
<input type="hidden" name="verify" value="{{$hash}}" />
<div id="remove-account-pass-wrapper" class="form-group">
<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label>
<input type="password" id="remove-account-pass" class="form-control" name="qxz_password" />
</div>
<div id="remove-account-pass-end"></div>
<div class="form-group pull-right settings-submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}"><i class="fa fa-trash fa-fw"></i>&nbsp;{{$submit}}</button>
</div>
<div class="clear"></div>
</form>
</div>
</div>

2
view/theme/frio/templates/searchbox.tpl
View file

@ -1,6 +1,6 @@
{{* important notes: The frio theme hides under certain conditions some parts of the templates through css. {{* important notes: The frio theme hides under certain conditions some parts of the templates through css.
Some parts of this template will be moved by js to other places (see theme.js) - E.g. the save-search button}} Some parts of this template will be moved by js to other places (see theme.js) - E.g. the save-search button *}}
<div id="{{$id}}" {{* class="input-group" *}}> <div id="{{$id}}" {{* class="input-group" *}}>
<div id="search-wrapper"> <div id="search-wrapper">

309
view/theme/frio/templates/settings.tpl Normal file
View file

@ -0,0 +1,309 @@
<div class="generic-page-wrapper">
{{* include the title template for the settings title *}}
{{include file="section_title.tpl" title=$ptitle }}
{{$nickname_block}}
<form action="settings" id="settings-form" method="post" autocomplete="off" >
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
{{* We organize the settings in collapsable panel-groups *}}
<div class="panel-group panel-group-settings" id="settings" role="tablist" aria-multiselectable="true">
{{* The password setting section *}}
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="password-settings">
<h4>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#password-settings-collapse" aria-expanded="true" aria-controls="basic-settings-collapse">
{{$h_pass}}
</a>
</h4>
</div>
<div id="password-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="password-settings">
<div class="section-content-tools-wrapper">
{{include file="field_password.tpl" field=$password1}}
{{include file="field_password.tpl" field=$password2}}
{{include file="field_password.tpl" field=$password3}}
{{if $oid_enable}}
{{include file="field_input.tpl" field=$openid}}
{{/if}}
<div class="form-group pull-right settings-submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
</div>
<div class="clear"></div>
</div>
</div>
</div>
{{* The basic setting section *}}
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="basic-settings">
<h4>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#basic-settings-collapse" aria-expanded="true" aria-controls="basic-settings-collapse">
{{$h_basic}}
</a>
</h4>
</div>
<div id="basic-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="basic-settings">
<div class="section-content-tools-wrapper">
{{include file="field_input.tpl" field=$username}}
{{include file="field_input.tpl" field=$email}}
{{include file="field_password.tpl" field=$password4}}
{{include file="field_custom.tpl" field=$timezone}}
{{include file="field_select.tpl" field=$language}}
{{include file="field_input.tpl" field=$defloc}}
{{include file="field_checkbox.tpl" field=$allowloc}}
<div class="form-group pull-right settings-submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
</div>
<div class="clear"></div>
</div>
</div>
</div>
{{* The privacity setting section *}}
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="privacy-settings">
<h4>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#privacy-settings-collapse" aria-expanded="true" aria-controls="privacy-settings-collapse">
{{$h_prv}}
</a>
</h4>
</div>
<div id="privacy-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="privacy-settings">
<div class="section-content-tools-wrapper">
<input type="hidden" name="visibility" value="{{$visibility}}" />
{{include file="field_input.tpl" field=$maxreq}}
{{$profile_in_dir}}
{{$profile_in_net_dir}}
{{$hide_friends}}
{{$hide_wall}}
{{$blockwall}}
{{$blocktags}}
{{$suggestme}}
{{$unkmail}}
{{include file="field_input.tpl" field=$cntunkmail}}
{{include file="field_input.tpl" field=$expire.days}}
<div id="settings-advanced-expire">
<a id="advanced-expire-menu" title="{{$expire.advanced}}" data-toggle="modal" data-target="#aeModal">{{$expire.label}}</a>
{{* The modal for advanced-expire *}}
<div class="modal" id="aeModal">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">{{$expire.advanced}}</h4>
</div>
<div class="modal-body">
{{include file="field_yesno.tpl" field=$expire.items}}
{{include file="field_yesno.tpl" field=$expire.notes}}
{{include file="field_yesno.tpl" field=$expire.starred}}
{{include file="field_yesno.tpl" field=$expire.network_only}}
</div>
</div>
</div>
</div>
</div>
{{* Block for setting default permissions *}}
<div id="settings-default-perms" class="settings-default-perms">
<a id="settings-default-perms-menu" class="settings-default-perms" data-toggle="modal" data-target="#aclModal">{{$permissions}} {{$permdesc}}</a>
<div id="settings-default-perms-menu-end"></div>
{{* We include the aclModal directly into the template since we cant use frio's default modal *}}
<div class="modal" id="aclModal">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">{{$permissions}}</h4>
</div>
<div class="modal-body">
{{$aclselect}}
</div>
</div>
</div>
</div>
</div>
<br/>
<div class="clear"></div>
{{$group_select}}
<div class="form-group pull-right settings-submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
</div>
<div class="clear"></div>
</div>
</div>
</div>
{{* The notification setting section *}}
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="notification-settings">
<h4>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#notification-settings-collapse" aria-expanded="true" aria-controls="notification-settings-collapse">
{{$h_not}}
</a>
</h4>
</div>
<div id="notification-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="notification-settings">
<div class="section-content-tools-wrapper">
<div id="settings-notifications">
<div id="settings-activity-desc"><h4>{{$activity_options}}</h4></div>
<div class="group">
{{include file="field_checkbox.tpl" field=$post_newfriend}}
{{include file="field_checkbox.tpl" field=$post_joingroup}}
{{include file="field_checkbox.tpl" field=$post_profilechange}}
</div>
<div id="settings-notify-desc"><h4>{{$lbl_not}}</h4></div>
<div class="group">
{{include file="field_intcheckbox.tpl" field=$notify1}}
{{include file="field_intcheckbox.tpl" field=$notify2}}
{{include file="field_intcheckbox.tpl" field=$notify3}}
{{include file="field_intcheckbox.tpl" field=$notify4}}
{{include file="field_intcheckbox.tpl" field=$notify5}}
{{include file="field_intcheckbox.tpl" field=$notify6}}
{{include file="field_intcheckbox.tpl" field=$notify7}}
{{include file="field_intcheckbox.tpl" field=$notify8}}
</div>
{{include file="field_checkbox.tpl" field=$email_textonly}}
{{* commented out because it was commented out in the original template
<div class="field">
<button onclick="javascript:Notification.requestPermission(function(perm){if(perm === 'granted')alert('{{$desktop_notifications_success_message}}');});return false;">{{$desktop_notifications}}</button>
<span class="field_help">{{$desktop_notifications_note}}</span>
</div>
*}}
{{include file="field_yesno.tpl" field=$desktop_notifications}}
<script>
(function(){
var elm = $("#id_{{$desktop_notifications.0}}_onoff");
var ckbox = $("#id_{{$desktop_notifications.0}}");
if (getNotificationPermission() === 'granted') {
ckbox.val(1);
elm.find(".off").addClass("hidden");
elm.find(".on").removeClass("hidden");
}
if (getNotificationPermission() === null) {
elm.parent(".field.yesno").hide();
}
$("#id_{{$desktop_notifications.0}}_onoff").on("click", function(e){
if (Notification.permission === 'granted') {
localStorage.setItem('notification-permissions', ckbox.val()==1 ? 'granted' : 'denied');
} else if (Notification.permission === 'denied') {
localStorage.setItem('notification-permissions', 'denied');
ckbox.val(0);
elm.find(".on").addClass("hidden");
elm.find(".off").removeClass("hidden");
} else if (Notification.permission === 'default') {
Notification.requestPermission(function(choice) {
if (choice === 'granted') {
localStorage.setItem('notification-permissions', ckbox.val()==1 ? 'granted' : 'denied');
} else {
localStorage.setItem('notification-permissions', 'denied');
ckbox.val(0);
elm.find(".on").addClass("hidden");
elm.find(".off").removeClass("hidden");
}
});
}
//console.log(getNotificationPermission());
})
})();
</script>
</div>
<div class="form-group pull-right settings-submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
</div>
<div class="clear"></div>
</div>
</div>
</div>
{{* The additional account setting section *}}
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="additional-account-settings">
<h4>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#additional-account-settings-collapse" aria-expanded="true" aria-controls="additional-account-settings-collapse">
{{$h_advn}}
</a>
</h4>
</div>
<div id="additional-account-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="additional-account-settings">
<div class="section-content-tools-wrapper">
<div id="settings-pagetype-desc">{{$h_descadvn}}</div>
{{$pagetype}}
<div class="form-group pull-right settings-submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
</div>
<div class="clear"></div>
</div>
</div>
</div>
{{* The relocate setting section *}}
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="relocate-settings">
<h4>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#relocate-settings-collapse" aria-expanded="true" aria-controls="relocate-settings-collapse">
{{$relocate}}
</a>
</h4>
</div>
<div id="relocate-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="relocate-settings">
<div class="section-content-tools-wrapper">
<div id="settings-pagetype-desc">{{$relocate_text}}</div>
<br/>
<div class="form-group pull-right settings-submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary" value="{{$relocate_button|escape:'html'}}">{{$relocate_button|escape:'html'}}</button>
</div>
<div class="clear"></div>
</div>
</div>
</div>
</div>
</form>
</div>

104
view/theme/frio/templates/settings_display.tpl Normal file
View file

@ -0,0 +1,104 @@
<div class="generic-page-wrapper">
{{* include the title template for the settings title *}}
{{include file="section_title.tpl" title=$ptitle }}
<form action="settings/display" id="settings-form" method="post" autocomplete="off" >
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
<div class="panel-group panel-group-settings" id="settings" role="tablist" aria-multiselectable="true">
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="theme-settings-title">
<h4>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#theme-settings-content" aria-expanded="true" aria-controls="theme-settings-content">
{{$d_tset}}
</a>
</h4>
</div>
<div id="theme-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="theme-settings">
<div class="section-content-tools-wrapper">
{{include file="field_themeselect.tpl" field=$theme}}
{{include file="field_themeselect.tpl" field=$mobile_theme}}
<div class="form-group pull-right settings-submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
</div>
<div class="clear"></div>
</div>
</div>
</div>
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="custom-settings-title">
<h4>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#custom-settings-content" aria-expanded="true" aria-controls="custom-settings-content">
{{$d_ctset}}
</a>
</h4>
</div>
<div id="custom-settings-content" class="panel-collapse collapse{{if !$theme && !$mobile_theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings">
<div class="section-content-tools-wrapper">
{{if $theme_config}}
{{$theme_config}}
{{/if}}
</div>
</div>
</div>
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="content-settings-title">
<h4>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#content-settings-content" aria-expanded="true" aria-controls="content-settings-content">
{{$d_cset}}
</a>
</h4>
</div>
<div id="content-settings-content" class="panel-collapse collapse{{if !$theme && !$mobile_theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings">
<div class="section-content-wrapper">
{{include file="field_input.tpl" field=$itemspage_network}}
{{include file="field_input.tpl" field=$itemspage_mobile_network}}
{{include file="field_input.tpl" field=$ajaxint}}
{{include file="field_checkbox.tpl" field=$no_auto_update}}
{{include file="field_checkbox.tpl" field=$nosmile}}
{{include file="field_checkbox.tpl" field=$noinfo}}
{{include file="field_checkbox.tpl" field=$infinite_scroll}}
<div class="form-group pull-right settings-submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
</div>
<div class="clear"></div>
</div>
</div>
</div>
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="calendar-settings-title">
<h4>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#calendar-settings-content" aria-expanded="true" aria-controls="calendar-settings-content">
{{$calendar_title}}
</a>
</h4>
</div>
<div id="calendar-settings-content" class="panel-collapse collapse{{if !$theme && !$mobile_theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="calendar-settings">
<div class="section-content-wrapper">
{{include file="field_select.tpl" field=$first_day_of_week}}
<div class="form-group pull-right settings-submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
</div>
<div class="clear"></div>
</div>
</div>
</div>
</div>
</form>
</div>

36
view/theme/frio/templates/settings_features.tpl Normal file
View file

@ -0,0 +1,36 @@
<div class="generic-page-wrapper">
{{* include the title template for the settings title *}}
{{include file="section_title.tpl" title=$title }}
<form action="settings/features" method="post" autocomplete="off">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
{{* We organize the settings in collapsable panel-groups *}}
<div class="panel-group panel-group-settings" id="settings" role="tablist" aria-multiselectable="true">
{{foreach $features as $g => $f}}
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="{{$g}}-settings-title">
<h4>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#{{$g}}-settings-content" aria-expanded="true" aria-controls="{{$g}}-settings-collapse">
{{$f.0}}
</a>
</h4>
</div>
<div id="{{$g}}-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="{{$g}}-settings-title">
<div class="section-content-tools-wrapper">
{{foreach $f.1 as $fcat}}
{{include file="field_yesno.tpl" field=$fcat}}
{{/foreach}}
<div class="form-group pull-right settings-submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
</div>
<div class="clear"></div>
</div>
</div>
</div>
{{/foreach}}
</div>
</form>
</div>

44
view/theme/frio/templates/settings_oauth.tpl Normal file
View file

@ -0,0 +1,44 @@
<div class="generic-page-wrapper">
{{* include the title template for the settings title *}}
{{include file="section_title.tpl" title=$title }}
<form action="settings/oauth" method="post" autocomplete="off">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
<div id="profile-edit-links">
<ul>
{{*
I commented this out. Initially I wanted to to load the oauth/add into a modal dialog but settings.php
does need $a->argv[2] === 'add' to work and argv[2] isn't available if you load a modal
I leave it at this place as reminder that we need an other solution in settings.php
<li role="menuitem">
<a id="profile-edit-view-link" onclick="addToModal('{{$baseurl}}/settings/oauth/add')">{{$add}}</a>
</li>
*}}
<li role="menuitem">
<a id="profile-edit-view-link" href="{{$baseurl}}/settings/oauth/add">{{$add}}</a>
</li>
</ul>
</div>
{{foreach $apps as $app}}
<div class='oauthapp'>
<img src='{{$app.icon}}' class="{{if $app.icon}} {{else}}noicon{{/if}}">
{{if $app.name}}<h4>{{$app.name}}</h4>{{else}}<h4>{{$noname}}</h4>{{/if}}
{{if $app.my}}
{{if $app.oauth_token}}
<div class="settings-submit-wrapper" ><button class="settings-submit" type="submit" name="remove" value="{{$app.oauth_token}}">{{$remove}}</button></div>
{{/if}}
{{/if}}
{{if $app.my}}
<a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" class="btn" title="{{$edit|escape:'html'}}"><i class="fa fa-pencil-square-o" aria-hidden="true"></i>&nbsp;</a>
<a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" class="btn" title="{{$delete|escape:'html'}}"><i class="fa fa-trash" aria-hidden="true"></i></a>
{{/if}}
</div>
{{/foreach}}
</form>
</div>

18
view/theme/frio/templates/settings_oauth_edit.tpl Normal file
View file

@ -0,0 +1,18 @@
<h2 class="heading">{{$title}}</h2>
<form method="POST">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
{{include file="field_input.tpl" field=$name}}
{{include file="field_input.tpl" field=$key}}
{{include file="field_input.tpl" field=$secret}}
{{include file="field_input.tpl" field=$redirect}}
{{include file="field_input.tpl" field=$icon}}
<div class="form-group pull-right settings-submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
</div>
<div class="clear"></div>
</form>

4
view/theme/frio/templates/theme_settings.tpl
View file

@ -63,8 +63,8 @@
}); });
</script> </script>
<div class="settings-submit-wrapper pull-right"> <div class="settings-submit-wrapper form-group pull-right">
<button type="submit" value="{{$submit}}" class="settings-submit btn btn-primary" name="frio-settings-submit"><i class="fa fa-slideshare"></i>&nbsp;{{$submit}}</button> <button type="submit" value="{{$submit}}" class="settings-submit btn btn-primary" name="frio-settings-submit">{{$submit}}</button>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>

14
view/theme/frio/templates/vcard-widget.tpl
View file

@ -6,6 +6,20 @@
<div id="profile-photo-wrapper" class="thumbnail"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></div> <div id="profile-photo-wrapper" class="thumbnail"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></div>
{{/if}} {{/if}}
{{* The short information which will appended to the second navbar by scrollspy *}}
<div id="vcard-short-info-wrapper" style="display: none;">
<div id="vcard-short-info" class="media" style="display: none">
<div id="vcard-short-photo-wrapper" class="pull-left">
<img class="media-object" src="{{$photo}}" alt="{{$name}}" />
</div>
<div id="vcard-short-desc" class="media-body">
<h4 class="media-heading">{{$name}}</h4>
{{if $addr}}<div class="vcard-short-addr">{{$addr}}</div>{{/if}}
</div>
</div>
</div>
<div class="panel-body"> <div class="panel-body">
<div class="fn">{{$name}}</div> <div class="fn">{{$name}}</div>
{{if $addr}}<div class="p-addr">{{$addr}}</div>{{/if}} {{if $addr}}<div class="p-addr">{{$addr}}</div>{{/if}}

4
view/theme/frio/theme.php
View file

@ -1,8 +1,8 @@
<?php <?php
/* /*
* Name: frio * Name: frio
* Description: Bootstrap V3 theme. The theme is currently under construction, so it is far from finished. For further information have a look at the <a href="https://github.com/rabuzarus/frio/blob/master/README.md">ReadMe</a> and <a href="https://github.com/rabuzarus/frio">GitHub</a>. * Description: Bootstrap V3 theme. The theme is currently under construction, so it is far from finished. For further information have a look at the <a href="https://github.com/friendica/friendica/tree/develop/view/theme/frio/README.md">ReadMe</a>.
* Version: V.0.1 Alpha * Version: V.0.2 Alpha
* Author: Rabuzarus <https://friendica.kommune4.de/profile/rabuzarus> * Author: Rabuzarus <https://friendica.kommune4.de/profile/rabuzarus>
* *
*/ */

123
view/theme/frost-mobile/templates/profile_edit.tpl
View file

@ -21,20 +21,20 @@
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
<div id="profile-edit-profile-name-wrapper" > <div id="profile-edit-profile-name-wrapper" >
<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$lbl_profname}} </label> <label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$profile_name.1}} </label>
<input type="text" size="28" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" /><div class="required">*</div> <input type="text" size="28" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name.2}}" /><div class="required">*</div>
</div> </div>
<div id="profile-edit-profile-name-end"></div> <div id="profile-edit-profile-name-end"></div>
<div id="profile-edit-name-wrapper" > <div id="profile-edit-name-wrapper" >
<label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label> <label id="profile-edit-name-label" for="profile-edit-name" >{{$name.1}} </label>
<input type="text" size="28" name="name" id="profile-edit-name" value="{{$name}}" /> <input type="text" size="28" name="name" id="profile-edit-name" value="{{$name.2}}" />
</div> </div>
<div id="profile-edit-name-end"></div> <div id="profile-edit-name-end"></div>
<div id="profile-edit-pdesc-wrapper" > <div id="profile-edit-pdesc-wrapper" >
<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label> <label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$pdesc.1}} </label>
<input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" /> <input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc.2}}" />
</div> </div>
<div id="profile-edit-pdesc-end"></div> <div id="profile-edit-pdesc-end"></div>
@ -46,10 +46,7 @@
<div id="profile-edit-gender-end"></div> <div id="profile-edit-gender-end"></div>
<div id="profile-edit-dob-wrapper" > <div id="profile-edit-dob-wrapper" >
<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label> {{$dob}}
<div id="profile-edit-dob" >
{{$dob}} {{$age}}
</div>
</div> </div>
<div id="profile-edit-dob-end"></div> <div id="profile-edit-dob-end"></div>
@ -62,45 +59,45 @@
<div id="profile-edit-address-wrapper" > <div id="profile-edit-address-wrapper" >
<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label> <label id="profile-edit-address-label" for="profile-edit-address" >{{$address.1}} </label>
<input type="text" size="28" name="address" id="profile-edit-address" value="{{$address}}" /> <input type="text" size="28" name="address" id="profile-edit-address" value="{{$address.2}}" />
</div> </div>
<div id="profile-edit-address-end"></div> <div id="profile-edit-address-end"></div>
<div id="profile-edit-locality-wrapper" > <div id="profile-edit-locality-wrapper" >
<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label> <label id="profile-edit-locality-label" for="profile-edit-locality" >{{$locality.1}} </label>
<input type="text" size="28" name="locality" id="profile-edit-locality" value="{{$locality}}" /> <input type="text" size="28" name="locality" id="profile-edit-locality" value="{{$locality.2}}" />
</div> </div>
<div id="profile-edit-locality-end"></div> <div id="profile-edit-locality-end"></div>
<div id="profile-edit-postal-code-wrapper" > <div id="profile-edit-postal-code-wrapper" >
<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label> <label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$postal_code.1}} </label>
<input type="text" size="28" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" /> <input type="text" size="28" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2}}" />
</div> </div>
<div id="profile-edit-postal-code-end"></div> <div id="profile-edit-postal-code-end"></div>
<div id="profile-edit-country-name-wrapper" > <div id="profile-edit-country-name-wrapper" >
<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label> <label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$country_name.1}} </label>
<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region}}');"> <select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region.2}}');">
<option selected="selected" >{{$country_name}}</option> <option selected="selected" >{{$country_name.2}}</option>
<option>temp</option> <option>temp</option>
</select> </select>
</div> </div>
<div id="profile-edit-country-name-end"></div> <div id="profile-edit-country-name-end"></div>
<div id="profile-edit-region-wrapper" > <div id="profile-edit-region-wrapper" >
<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label> <label id="profile-edit-region-label" for="profile-edit-region" >{{$region.1}} </label>
<select name="region" id="profile-edit-region" onChange="Update_Globals();" > <select name="region" id="profile-edit-region" onChange="Update_Globals();" >
<option selected="selected" >{{$region}}</option> <option selected="selected" >{{$region.2}}</option>
<option>temp</option> <option>temp</option>
</select> </select>
</div> </div>
<div id="profile-edit-region-end"></div> <div id="profile-edit-region-end"></div>
<div id="profile-edit-hometown-wrapper" > <div id="profile-edit-hometown-wrapper" >
<label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label> <label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$hometown.1}} </label>
<input type="text" size="28" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" /> <input type="text" size="28" name="hometown" id="profile-edit-hometown" value="{{$hometown.2}}" />
</div> </div>
<div id="profile-edit-hometown-end"></div> <div id="profile-edit-hometown-end"></div>
@ -113,10 +110,10 @@
<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label> <label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
{{$marital}} {{$marital}}
</div> </div>
<label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label> <label id="profile-edit-with-label" for="profile-edit-with" > {{$with.1}} </label>
<input type="text" size="28" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" /> <input type="text" size="28" name="with" id="profile-edit-with" title="{{$with.3}}" value="{{$with.2}}" />
<label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label> <label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$howlong.1}} </label>
<input type="text" size="28" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" /> <input type="text" size="28" name="howlong" id="profile-edit-howlong" title="{{$howlong.1}}" value="{{$howlong.2}}" />
<div id="profile-edit-marital-end"></div> <div id="profile-edit-marital-end"></div>
@ -129,33 +126,33 @@
<div id="profile-edit-homepage-wrapper" > <div id="profile-edit-homepage-wrapper" >
<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label> <label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$homepage.1}} </label>
<input type="text" size="28" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" /> <input type="text" size="28" name="homepage" id="profile-edit-homepage" value="{{$homepage.2}}" />
</div> </div>
<div id="profile-edit-homepage-end"></div> <div id="profile-edit-homepage-end"></div>
<div id="profile-edit-politic-wrapper" > <div id="profile-edit-politic-wrapper" >
<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label> <label id="profile-edit-politic-label" for="profile-edit-politic" >{{$politic.1}} </label>
<input type="text" size="28" name="politic" id="profile-edit-politic" value="{{$politic}}" /> <input type="text" size="28" name="politic" id="profile-edit-politic" value="{{$politic.2}}" />
</div> </div>
<div id="profile-edit-politic-end"></div> <div id="profile-edit-politic-end"></div>
<div id="profile-edit-religion-wrapper" > <div id="profile-edit-religion-wrapper" >
<label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label> <label id="profile-edit-religion-label" for="profile-edit-religion" >{{$religion.1}} </label>
<input type="text" size="28" name="religion" id="profile-edit-religion" value="{{$religion}}" /> <input type="text" size="28" name="religion" id="profile-edit-religion" value="{{$religion.2}}" />
</div> </div>
<div id="profile-edit-religion-end"></div> <div id="profile-edit-religion-end"></div>
<div id="profile-edit-pubkeywords-wrapper" > <div id="profile-edit-pubkeywords-wrapper" >
<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label> <label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$pub_keywords.1}} </label>
<input type="text" size="28" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords}}" /> <input type="text" size="28" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2}}" />
</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div> </div><div id="profile-edit-pubkeywords-desc">{{$pub_keywords.3}}</div>
<div id="profile-edit-pubkeywords-end"></div> <div id="profile-edit-pubkeywords-end"></div>
<div id="profile-edit-prvkeywords-wrapper" > <div id="profile-edit-prvkeywords-wrapper" >
<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$lbl_prvkey}} </label> <label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$prv_keywords.1}} </label>
<input type="text" size="28" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords}}" /> <input type="text" size="28" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2}}" />
</div><div id="profile-edit-prvkeywords-desc">{{$lbl_prvdsc}}</div> </div><div id="profile-edit-prvkeywords-desc">{{$prv_keywords.3}}</div>
<div id="profile-edit-prvkeywords-end"></div> <div id="profile-edit-prvkeywords-end"></div>
@ -166,10 +163,10 @@
<div id="about-jot-wrapper" class="profile-jot-box"> <div id="about-jot-wrapper" class="profile-jot-box">
<p id="about-jot-desc" > <p id="about-jot-desc" >
{{$lbl_about}} {{$about.1}}
</p> </p>
<textarea rows="10" cols="30" id="profile-about-text" class="profile-edit-textarea" name="about" >{{$about}}</textarea> <textarea rows="10" cols="30" id="profile-about-text" class="profile-edit-textarea" name="about" >{{$about.2}}</textarea>
</div> </div>
<div id="about-jot-end"></div> <div id="about-jot-end"></div>
@ -177,10 +174,10 @@
<div id="interest-jot-wrapper" class="profile-jot-box" > <div id="interest-jot-wrapper" class="profile-jot-box" >
<p id="interest-jot-desc" > <p id="interest-jot-desc" >
{{$lbl_hobbies}} {{$interest.1}}
</p> </p>
<textarea rows="10" cols="30" id="interest-jot-text" class="profile-edit-textarea" name="interest" >{{$interest}}</textarea> <textarea rows="10" cols="30" id="interest-jot-text" class="profile-edit-textarea" name="interest" >{{$interest.2}}</textarea>
</div> </div>
<div id="interest-jot-end"></div> <div id="interest-jot-end"></div>
@ -188,10 +185,10 @@
<div id="likes-jot-wrapper" class="profile-jot-box" > <div id="likes-jot-wrapper" class="profile-jot-box" >
<p id="likes-jot-desc" > <p id="likes-jot-desc" >
{{$lbl_likes}} {{$likes.1}}
</p> </p>
<textarea rows="10" cols="30" id="likes-jot-text" class="profile-edit-textarea" name="likes" >{{$likes}}</textarea> <textarea rows="10" cols="30" id="likes-jot-text" class="profile-edit-textarea" name="likes" >{{$likes.2}}</textarea>
</div> </div>
<div id="likes-jot-end"></div> <div id="likes-jot-end"></div>
@ -199,10 +196,10 @@
<div id="dislikes-jot-wrapper" class="profile-jot-box" > <div id="dislikes-jot-wrapper" class="profile-jot-box" >
<p id="dislikes-jot-desc" > <p id="dislikes-jot-desc" >
{{$lbl_dislikes}} {{$dislikes.1}}
</p> </p>
<textarea rows="10" cols="30" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >{{$dislikes}}</textarea> <textarea rows="10" cols="30" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >{{$dislikes.2}}</textarea>
</div> </div>
<div id="dislikes-jot-end"></div> <div id="dislikes-jot-end"></div>
@ -210,10 +207,10 @@
<div id="contact-jot-wrapper" class="profile-jot-box" > <div id="contact-jot-wrapper" class="profile-jot-box" >
<p id="contact-jot-desc" > <p id="contact-jot-desc" >
{{$lbl_social}} {{$contact.1}}
</p> </p>
<textarea rows="10" cols="30" id="contact-jot-text" class="profile-edit-textarea" name="contact" >{{$contact}}</textarea> <textarea rows="10" cols="30" id="contact-jot-text" class="profile-edit-textarea" name="contact" >{{$contact.2}}</textarea>
</div> </div>
<div id="contact-jot-end"></div> <div id="contact-jot-end"></div>
@ -227,20 +224,20 @@
<div id="music-jot-wrapper" class="profile-jot-box" > <div id="music-jot-wrapper" class="profile-jot-box" >
<p id="music-jot-desc" > <p id="music-jot-desc" >
{{$lbl_music}} {{$music.1}}
</p> </p>
<textarea rows="10" cols="30" id="music-jot-text" class="profile-edit-textarea" name="music" >{{$music}}</textarea> <textarea rows="10" cols="30" id="music-jot-text" class="profile-edit-textarea" name="music" >{{$music.2}}</textarea>
</div> </div>
<div id="music-jot-end"></div> <div id="music-jot-end"></div>
<div id="book-jot-wrapper" class="profile-jot-box" > <div id="book-jot-wrapper" class="profile-jot-box" >
<p id="book-jot-desc" > <p id="book-jot-desc" >
{{$lbl_book}} {{$book.1}}
</p> </p>
<textarea rows="10" cols="30" id="book-jot-text" class="profile-edit-textarea" name="book" >{{$book}}</textarea> <textarea rows="10" cols="30" id="book-jot-text" class="profile-edit-textarea" name="book" >{{$book.2}}</textarea>
</div> </div>
<div id="book-jot-end"></div> <div id="book-jot-end"></div>
@ -249,10 +246,10 @@
<div id="tv-jot-wrapper" class="profile-jot-box" > <div id="tv-jot-wrapper" class="profile-jot-box" >
<p id="tv-jot-desc" > <p id="tv-jot-desc" >
{{$lbl_tv}} {{$tv.1}}
</p> </p>
<textarea rows="10" cols="30" id="tv-jot-text" class="profile-edit-textarea" name="tv" >{{$tv}}</textarea> <textarea rows="10" cols="30" id="tv-jot-text" class="profile-edit-textarea" name="tv" >{{$tv.2}}</textarea>
</div> </div>
<div id="tv-jot-end"></div> <div id="tv-jot-end"></div>
@ -261,10 +258,10 @@
<div id="film-jot-wrapper" class="profile-jot-box" > <div id="film-jot-wrapper" class="profile-jot-box" >
<p id="film-jot-desc" > <p id="film-jot-desc" >
{{$lbl_film}} {{$film.1}}
</p> </p>
<textarea rows="10" cols="30" id="film-jot-text" class="profile-edit-textarea" name="film" >{{$film}}</textarea> <textarea rows="10" cols="30" id="film-jot-text" class="profile-edit-textarea" name="film" >{{$film.2}}</textarea>
</div> </div>
<div id="film-jot-end"></div> <div id="film-jot-end"></div>
@ -278,10 +275,10 @@
<div id="romance-jot-wrapper" class="profile-jot-box" > <div id="romance-jot-wrapper" class="profile-jot-box" >
<p id="romance-jot-desc" > <p id="romance-jot-desc" >
{{$lbl_love}} {{$romance.1}}
</p> </p>
<textarea rows="10" cols="30" id="romance-jot-text" class="profile-edit-textarea" name="romance" >{{$romance}}</textarea> <textarea rows="10" cols="30" id="romance-jot-text" class="profile-edit-textarea" name="romance" >{{$romance.2}}</textarea>
</div> </div>
<div id="romance-jot-end"></div> <div id="romance-jot-end"></div>
@ -290,10 +287,10 @@
<div id="work-jot-wrapper" class="profile-jot-box" > <div id="work-jot-wrapper" class="profile-jot-box" >
<p id="work-jot-desc" > <p id="work-jot-desc" >
{{$lbl_work}} {{$work.1}}
</p> </p>
<textarea rows="10" cols="30" id="work-jot-text" class="profile-edit-textarea" name="work" >{{$work}}</textarea> <textarea rows="10" cols="30" id="work-jot-text" class="profile-edit-textarea" name="work" >{{$work.2}}</textarea>
</div> </div>
<div id="work-jot-end"></div> <div id="work-jot-end"></div>
@ -302,10 +299,10 @@
<div id="education-jot-wrapper" class="profile-jot-box" > <div id="education-jot-wrapper" class="profile-jot-box" >
<p id="education-jot-desc" > <p id="education-jot-desc" >
{{$lbl_school}} {{$education.1}}
</p> </p>
<textarea rows="10" cols="30" id="education-jot-text" class="profile-edit-textarea" name="education" >{{$education}}</textarea> <textarea rows="10" cols="30" id="education-jot-text" class="profile-edit-textarea" name="education" >{{$education.2}}</textarea>
</div> </div>
<div id="education-jot-end"></div> <div id="education-jot-end"></div>

123
view/theme/frost/templates/profile_edit.tpl
View file

@ -21,20 +21,20 @@
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
<div id="profile-edit-profile-name-wrapper" > <div id="profile-edit-profile-name-wrapper" >
<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$lbl_profname}} </label> <label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$profile_name.1}} </label>
<input type="text" size="28" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" /><div class="required">*</div> <input type="text" size="28" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name.2}}" /><div class="required">*</div>
</div> </div>
<div id="profile-edit-profile-name-end"></div> <div id="profile-edit-profile-name-end"></div>
<div id="profile-edit-name-wrapper" > <div id="profile-edit-name-wrapper" >
<label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label> <label id="profile-edit-name-label" for="profile-edit-name" >{{$name.1}} </label>
<input type="text" size="28" name="name" id="profile-edit-name" value="{{$name}}" /> <input type="text" size="28" name="name" id="profile-edit-name" value="{{$name.2}}" />
</div> </div>
<div id="profile-edit-name-end"></div> <div id="profile-edit-name-end"></div>
<div id="profile-edit-pdesc-wrapper" > <div id="profile-edit-pdesc-wrapper" >
<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label> <label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$pdesc.1}} </label>
<input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" /> <input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc.2}}" />
</div> </div>
<div id="profile-edit-pdesc-end"></div> <div id="profile-edit-pdesc-end"></div>
@ -46,10 +46,7 @@
<div id="profile-edit-gender-end"></div> <div id="profile-edit-gender-end"></div>
<div id="profile-edit-dob-wrapper" > <div id="profile-edit-dob-wrapper" >
<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label> {{$dob}}
<div id="profile-edit-dob" >
{{$dob}} {{$age}}
</div>
</div> </div>
<div id="profile-edit-dob-end"></div> <div id="profile-edit-dob-end"></div>
@ -62,45 +59,45 @@
<div id="profile-edit-address-wrapper" > <div id="profile-edit-address-wrapper" >
<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label> <label id="profile-edit-address-label" for="profile-edit-address" >{{$address.1}} </label>
<input type="text" size="28" name="address" id="profile-edit-address" value="{{$address}}" /> <input type="text" size="28" name="address" id="profile-edit-address" value="{{$address.2}}" />
</div> </div>
<div id="profile-edit-address-end"></div> <div id="profile-edit-address-end"></div>
<div id="profile-edit-locality-wrapper" > <div id="profile-edit-locality-wrapper" >
<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label> <label id="profile-edit-locality-label" for="profile-edit-locality" >{{$locality.1}} </label>
<input type="text" size="28" name="locality" id="profile-edit-locality" value="{{$locality}}" /> <input type="text" size="28" name="locality" id="profile-edit-locality" value="{{$locality.2}}" />
</div> </div>
<div id="profile-edit-locality-end"></div> <div id="profile-edit-locality-end"></div>
<div id="profile-edit-postal-code-wrapper" > <div id="profile-edit-postal-code-wrapper" >
<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label> <label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$postal_code.1}} </label>
<input type="text" size="28" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" /> <input type="text" size="28" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2}}" />
</div> </div>
<div id="profile-edit-postal-code-end"></div> <div id="profile-edit-postal-code-end"></div>
<div id="profile-edit-country-name-wrapper" > <div id="profile-edit-country-name-wrapper" >
<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label> <label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$country_name.1}} </label>
<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region}}');"> <select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region.2}}');">
<option selected="selected" >{{$country_name}}</option> <option selected="selected" >{{$country_name.2}}</option>
<option>temp</option> <option>temp</option>
</select> </select>
</div> </div>
<div id="profile-edit-country-name-end"></div> <div id="profile-edit-country-name-end"></div>
<div id="profile-edit-region-wrapper" > <div id="profile-edit-region-wrapper" >
<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label> <label id="profile-edit-region-label" for="profile-edit-region" >{{$region.1}} </label>
<select name="region" id="profile-edit-region" onChange="Update_Globals();" > <select name="region" id="profile-edit-region" onChange="Update_Globals();" >
<option selected="selected" >{{$region}}</option> <option selected="selected" >{{$region.2}}</option>
<option>temp</option> <option>temp</option>
</select> </select>
</div> </div>
<div id="profile-edit-region-end"></div> <div id="profile-edit-region-end"></div>
<div id="profile-edit-hometown-wrapper" > <div id="profile-edit-hometown-wrapper" >
<label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label> <label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$hometown.1}} </label>
<input type="text" size="28" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" /> <input type="text" size="28" name="hometown" id="profile-edit-hometown" value="{{$hometown.2}}" />
</div> </div>
<div id="profile-edit-hometown-end"></div> <div id="profile-edit-hometown-end"></div>
@ -113,10 +110,10 @@
<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label> <label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
{{$marital}} {{$marital}}
</div> </div>
<label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label> <label id="profile-edit-with-label" for="profile-edit-with" > {{$with.1}} </label>
<input type="text" size="28" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" /> <input type="text" size="28" name="with" id="profile-edit-with" title="{{$with.3}}" value="{{$with.2}}" />
<label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label> <label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$howlong.1}} </label>
<input type="text" size="28" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" /> <input type="text" size="28" name="howlong" id="profile-edit-howlong" title="{{$howlong.1}}" value="{{$howlong.2}}" />
<div id="profile-edit-marital-end"></div> <div id="profile-edit-marital-end"></div>
@ -129,33 +126,33 @@
<div id="profile-edit-homepage-wrapper" > <div id="profile-edit-homepage-wrapper" >
<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label> <label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$homepage.1}} </label>
<input type="text" size="28" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" /> <input type="text" size="28" name="homepage" id="profile-edit-homepage" value="{{$homepage.2}}" />
</div> </div>
<div id="profile-edit-homepage-end"></div> <div id="profile-edit-homepage-end"></div>
<div id="profile-edit-politic-wrapper" > <div id="profile-edit-politic-wrapper" >
<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label> <label id="profile-edit-politic-label" for="profile-edit-politic" >{{$politic.1}} </label>
<input type="text" size="28" name="politic" id="profile-edit-politic" value="{{$politic}}" /> <input type="text" size="28" name="politic" id="profile-edit-politic" value="{{$politic.2}}" />
</div> </div>
<div id="profile-edit-politic-end"></div> <div id="profile-edit-politic-end"></div>
<div id="profile-edit-religion-wrapper" > <div id="profile-edit-religion-wrapper" >
<label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label> <label id="profile-edit-religion-label" for="profile-edit-religion" >{{$religion.1}} </label>
<input type="text" size="28" name="religion" id="profile-edit-religion" value="{{$religion}}" /> <input type="text" size="28" name="religion" id="profile-edit-religion" value="{{$religion.2}}" />
</div> </div>
<div id="profile-edit-religion-end"></div> <div id="profile-edit-religion-end"></div>
<div id="profile-edit-pubkeywords-wrapper" > <div id="profile-edit-pubkeywords-wrapper" >
<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label> <label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$pub_keywords.1}} </label>
<input type="text" size="28" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords}}" /> <input type="text" size="28" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2}}" />
</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div> </div><div id="profile-edit-pubkeywords-desc">{{$pub_keywords.3}}</div>
<div id="profile-edit-pubkeywords-end"></div> <div id="profile-edit-pubkeywords-end"></div>
<div id="profile-edit-prvkeywords-wrapper" > <div id="profile-edit-prvkeywords-wrapper" >
<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$lbl_prvkey}} </label> <label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$prv_keywords.1}} </label>
<input type="text" size="28" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords}}" /> <input type="text" size="28" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2}}" />
</div><div id="profile-edit-prvkeywords-desc">{{$lbl_prvdsc}}</div> </div><div id="profile-edit-prvkeywords-desc">{{$prv_keywords.3}}</div>
<div id="profile-edit-prvkeywords-end"></div> <div id="profile-edit-prvkeywords-end"></div>
@ -166,10 +163,10 @@
<div id="about-jot-wrapper" class="profile-jot-box"> <div id="about-jot-wrapper" class="profile-jot-box">
<p id="about-jot-desc" > <p id="about-jot-desc" >
{{$lbl_about}} {{$about.1}}
</p> </p>
<textarea rows="10" cols="70" id="profile-about-text" class="profile-edit-textarea" name="about" >{{$about}}</textarea> <textarea rows="10" cols="70" id="profile-about-text" class="profile-edit-textarea" name="about" >{{$about.2}}</textarea>
</div> </div>
<div id="about-jot-end"></div> <div id="about-jot-end"></div>
@ -177,10 +174,10 @@
<div id="interest-jot-wrapper" class="profile-jot-box" > <div id="interest-jot-wrapper" class="profile-jot-box" >
<p id="interest-jot-desc" > <p id="interest-jot-desc" >
{{$lbl_hobbies}} {{$interest.1}}
</p> </p>
<textarea rows="10" cols="70" id="interest-jot-text" class="profile-edit-textarea" name="interest" >{{$interest}}</textarea> <textarea rows="10" cols="70" id="interest-jot-text" class="profile-edit-textarea" name="interest" >{{$interest.2}}</textarea>
</div> </div>
<div id="interest-jot-end"></div> <div id="interest-jot-end"></div>
@ -188,10 +185,10 @@
<div id="likes-jot-wrapper" class="profile-jot-box" > <div id="likes-jot-wrapper" class="profile-jot-box" >
<p id="likes-jot-desc" > <p id="likes-jot-desc" >
{{$lbl_likes}} {{$likes.1}}
</p> </p>
<textarea rows="10" cols="70" id="likes-jot-text" class="profile-edit-textarea" name="likes" >{{$likes}}</textarea> <textarea rows="10" cols="70" id="likes-jot-text" class="profile-edit-textarea" name="likes" >{{$likes.2}}</textarea>
</div> </div>
<div id="likes-jot-end"></div> <div id="likes-jot-end"></div>
@ -199,10 +196,10 @@
<div id="dislikes-jot-wrapper" class="profile-jot-box" > <div id="dislikes-jot-wrapper" class="profile-jot-box" >
<p id="dislikes-jot-desc" > <p id="dislikes-jot-desc" >
{{$lbl_dislikes}} {{$dislikes.1}}
</p> </p>
<textarea rows="10" cols="70" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >{{$dislikes}}</textarea> <textarea rows="10" cols="70" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >{{$dislikes.2}}</textarea>
</div> </div>
<div id="dislikes-jot-end"></div> <div id="dislikes-jot-end"></div>
@ -210,10 +207,10 @@
<div id="contact-jot-wrapper" class="profile-jot-box" > <div id="contact-jot-wrapper" class="profile-jot-box" >
<p id="contact-jot-desc" > <p id="contact-jot-desc" >
{{$lbl_social}} {{$contact.1}}
</p> </p>
<textarea rows="10" cols="70" id="contact-jot-text" class="profile-edit-textarea" name="contact" >{{$contact}}</textarea> <textarea rows="10" cols="70" id="contact-jot-text" class="profile-edit-textarea" name="contact" >{{$contact.2}}</textarea>
</div> </div>
<div id="contact-jot-end"></div> <div id="contact-jot-end"></div>
@ -227,20 +224,20 @@
<div id="music-jot-wrapper" class="profile-jot-box" > <div id="music-jot-wrapper" class="profile-jot-box" >
<p id="music-jot-desc" > <p id="music-jot-desc" >
{{$lbl_music}} {{$music.1}}
</p> </p>
<textarea rows="10" cols="70" id="music-jot-text" class="profile-edit-textarea" name="music" >{{$music}}</textarea> <textarea rows="10" cols="70" id="music-jot-text" class="profile-edit-textarea" name="music" >{{$music.2}}</textarea>
</div> </div>
<div id="music-jot-end"></div> <div id="music-jot-end"></div>
<div id="book-jot-wrapper" class="profile-jot-box" > <div id="book-jot-wrapper" class="profile-jot-box" >
<p id="book-jot-desc" > <p id="book-jot-desc" >
{{$lbl_book}} {{$book.1}}
</p> </p>
<textarea rows="10" cols="70" id="book-jot-text" class="profile-edit-textarea" name="book" >{{$book}}</textarea> <textarea rows="10" cols="70" id="book-jot-text" class="profile-edit-textarea" name="book" >{{$book.2}}</textarea>
</div> </div>
<div id="book-jot-end"></div> <div id="book-jot-end"></div>
@ -249,10 +246,10 @@
<div id="tv-jot-wrapper" class="profile-jot-box" > <div id="tv-jot-wrapper" class="profile-jot-box" >
<p id="tv-jot-desc" > <p id="tv-jot-desc" >
{{$lbl_tv}} {{$tv.1}}
</p> </p>
<textarea rows="10" cols="70" id="tv-jot-text" class="profile-edit-textarea" name="tv" >{{$tv}}</textarea> <textarea rows="10" cols="70" id="tv-jot-text" class="profile-edit-textarea" name="tv" >{{$tv.2}}</textarea>
</div> </div>
<div id="tv-jot-end"></div> <div id="tv-jot-end"></div>
@ -261,10 +258,10 @@
<div id="film-jot-wrapper" class="profile-jot-box" > <div id="film-jot-wrapper" class="profile-jot-box" >
<p id="film-jot-desc" > <p id="film-jot-desc" >
{{$lbl_film}} {{$film.1}}
</p> </p>
<textarea rows="10" cols="70" id="film-jot-text" class="profile-edit-textarea" name="film" >{{$film}}</textarea> <textarea rows="10" cols="70" id="film-jot-text" class="profile-edit-textarea" name="film" >{{$film.2}}</textarea>
</div> </div>
<div id="film-jot-end"></div> <div id="film-jot-end"></div>
@ -278,10 +275,10 @@
<div id="romance-jot-wrapper" class="profile-jot-box" > <div id="romance-jot-wrapper" class="profile-jot-box" >
<p id="romance-jot-desc" > <p id="romance-jot-desc" >
{{$lbl_love}} {{$romance.1}}
</p> </p>
<textarea rows="10" cols="70" id="romance-jot-text" class="profile-edit-textarea" name="romance" >{{$romance}}</textarea> <textarea rows="10" cols="70" id="romance-jot-text" class="profile-edit-textarea" name="romance" >{{$romance.2}}</textarea>
</div> </div>
<div id="romance-jot-end"></div> <div id="romance-jot-end"></div>
@ -290,10 +287,10 @@
<div id="work-jot-wrapper" class="profile-jot-box" > <div id="work-jot-wrapper" class="profile-jot-box" >
<p id="work-jot-desc" > <p id="work-jot-desc" >
{{$lbl_work}} {{$work.1}}
</p> </p>
<textarea rows="10" cols="70" id="work-jot-text" class="profile-edit-textarea" name="work" >{{$work}}</textarea> <textarea rows="10" cols="70" id="work-jot-text" class="profile-edit-textarea" name="work" >{{$work.2}}</textarea>
</div> </div>
<div id="work-jot-end"></div> <div id="work-jot-end"></div>
@ -302,10 +299,10 @@
<div id="education-jot-wrapper" class="profile-jot-box" > <div id="education-jot-wrapper" class="profile-jot-box" >
<p id="education-jot-desc" > <p id="education-jot-desc" >
{{$lbl_school}} {{$education.1}}
</p> </p>
<textarea rows="10" cols="70" id="education-jot-text" class="profile-edit-textarea" name="education" >{{$education}}</textarea> <textarea rows="10" cols="70" id="education-jot-text" class="profile-edit-textarea" name="education" >{{$education.2}}</textarea>
</div> </div>
<div id="education-jot-end"></div> <div id="education-jot-end"></div>

218
view/theme/vier/templates/profile_edit.tpl
View file

@ -29,7 +29,7 @@
<form enctype="multipart/form-data" action="profile_photo" method="post"> <form enctype="multipart/form-data" action="profile_photo" method="post">
<input type='hidden' name='form_security_token' value='{{$form_security_token_photo}}'> <input type='hidden' name='form_security_token' value='{{$form_security_token_photo}}'>
<input type="hidden" name="profile" value="{{$profile_name}}" /> <input type="hidden" name="profile" value="{{$profile_name.2}}" />
<!-- Profile picture --> <!-- Profile picture -->
{{if $detailled_profile}} {{if $detailled_profile}}
@ -67,17 +67,17 @@
{{if $multi_profiles}} {{if $multi_profiles}}
<div id="profile-edit-profile-name-wrapper" > <div id="profile-edit-profile-name-wrapper" >
<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$lbl_profname}} </label> <label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$profile_name.1}} </label>
<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" /><div class="required">*</div> <input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name.2}}" /><div class="required">*</div>
</div> </div>
<div id="profile-edit-profile-name-end"></div> <div id="profile-edit-profile-name-end"></div>
{{else}} {{else}}
<input type="hidden" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" /> <input type="hidden" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name.2}}" />
{{/if}} {{/if}}
<div id="profile-edit-name-wrapper" > <div id="profile-edit-name-wrapper" >
<label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label> <label id="profile-edit-name-label" for="profile-edit-name" >{{$name.1}} </label>
<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name}}" /> <input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2}}" />
</div> </div>
<div id="profile-edit-name-end"></div> <div id="profile-edit-name-end"></div>
@ -88,51 +88,48 @@
<div id="profile-edit-gender-end"></div> <div id="profile-edit-gender-end"></div>
<div id="profile-edit-pdesc-wrapper" > <div id="profile-edit-pdesc-wrapper" >
<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label> <label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$pdesc.1}} </label>
<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" /> <input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc.2}}" />
</div> </div>
<div id="profile-edit-pdesc-end"></div> <div id="profile-edit-pdesc-end"></div>
<div id="profile-edit-homepage-wrapper" > <div id="profile-edit-homepage-wrapper" >
<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label> <label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$homepage.1}} </label>
<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" /> <input type="text" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage.2}}" />
</div> </div>
<div id="profile-edit-homepage-end"></div> <div id="profile-edit-homepage-end"></div>
<div id="profile-edit-dob-wrapper" > <div id="profile-edit-dob-wrapper" >
<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}}</label> {{$dob}}
<div id="profile-edit-dob" >
{{$dob}} {{$age}}
</div>
</div> </div>
<div id="profile-edit-dob-end"></div> <div id="profile-edit-dob-end"></div>
{{$hide_friends}} {{$hide_friends}}
<div id="about-jot-wrapper"> <div id="about-jot-wrapper">
<div id="about-jot-desc">{{$lbl_about}}</div> <div id="about-jot-desc">{{$about.1}}</div>
<textarea rows="10" cols="72" id="profile-about-text" name="about" style="width:599px;">{{$about}}</textarea> <textarea rows="10" cols="72" id="profile-about-text" name="about" style="width:599px;">{{$about.2}}</textarea>
</div> </div>
<div id="about-jot-end"></div> <div id="about-jot-end"></div>
<div id="contact-jot-wrapper" > <div id="contact-jot-wrapper" >
<div id="contact-jot-desc">{{$lbl_social}}</div> <div id="contact-jot-desc">{{$contact.1}}</div>
<textarea rows="10" cols="72" id="contact-jot-text" name="contact" style="width:599px;">{{$contact}}</textarea> <textarea rows="10" cols="72" id="contact-jot-text" name="contact" style="width:599px;">{{$contact.2}}</textarea>
</div> </div>
<div id="contact-jot-end"></div> <div id="contact-jot-end"></div>
<div id="profile-edit-pubkeywords-wrapper" > <div id="profile-edit-pubkeywords-wrapper" >
<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label> <label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$pub_keywords.1}} </label>
<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords}}" /> <input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2}}" />
</div> </div>
<div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div> <div id="profile-edit-pubkeywords-desc">{{$pub_keywords.3}}</div>
<div id="profile-edit-pubkeywords-end"></div> <div id="profile-edit-pubkeywords-end"></div>
<div id="profile-edit-prvkeywords-wrapper" > <div id="profile-edit-prvkeywords-wrapper" >
<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$lbl_prvkey}} </label> <label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$prv_keywords.1}} </label>
<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords}}" /> <input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2}}" />
</div> </div>
<div id="profile-edit-prvkeywords-desc">{{$lbl_prvdsc}}</div> <div id="profile-edit-prvkeywords-desc">{{$prv_keywords.3}}</div>
<div id="profile-edit-prvkeywords-end"></div> <div id="profile-edit-prvkeywords-end"></div>
<div class="profile-edit-submit-wrapper" > <div class="profile-edit-submit-wrapper" >
@ -151,42 +148,42 @@
<div><b>{{$lbl_location_section}}</b></div> <div><b>{{$lbl_location_section}}</b></div>
<div id="profile-edit-address-wrapper" > <div id="profile-edit-address-wrapper" >
<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label> <label id="profile-edit-address-label" for="profile-edit-address" >{{$address.1}} </label>
<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address}}" /> <input type="text" size="32" name="address" id="profile-edit-address" value="{{$address.2}}" />
</div> </div>
<div id="profile-edit-address-end"></div> <div id="profile-edit-address-end"></div>
<div id="profile-edit-locality-wrapper" > <div id="profile-edit-locality-wrapper" >
<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label> <label id="profile-edit-locality-label" for="profile-edit-locality" >{{$locality.1}} </label>
<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality}}" /> <input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality.2}}" />
</div> </div>
<div id="profile-edit-locality-end"></div> <div id="profile-edit-locality-end"></div>
<div id="profile-edit-postal-code-wrapper" > <div id="profile-edit-postal-code-wrapper" >
<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label> <label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$postal_code.1}} </label>
<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" /> <input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2}}" />
</div> </div>
<div id="profile-edit-postal-code-end"></div> <div id="profile-edit-postal-code-end"></div>
<div id="profile-edit-country-name-wrapper" > <div id="profile-edit-country-name-wrapper" >
<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label> <label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$country_name.1}} </label>
<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region}}');"> <select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region.2}}');">
<option selected="selected" >{{$country_name}}</option> <option selected="selected" >{{$country_name.2}}</option>
</select> </select>
</div> </div>
<div id="profile-edit-country-name-end"></div> <div id="profile-edit-country-name-end"></div>
<div id="profile-edit-region-wrapper" > <div id="profile-edit-region-wrapper" >
<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label> <label id="profile-edit-region-label" for="profile-edit-region" >{{$region.2}} </label>
<select name="region" id="profile-edit-region" onChange="Update_Globals();" > <select name="region" id="profile-edit-region" onChange="Update_Globals();" >
<option selected="selected" >{{$region}}</option> <option selected="selected" >{{$region.2}}</option>
</select> </select>
</div> </div>
<div id="profile-edit-region-end"></div> <div id="profile-edit-region-end"></div>
<div id="profile-edit-hometown-wrapper" > <div id="profile-edit-hometown-wrapper" >
<label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label> <label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$hometown.1}} </label>
<input type="text" size="32" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" /> <input type="text" size="32" name="hometown" id="profile-edit-hometown" value="{{$hometown.2}}" />
</div> </div>
<div id="profile-edit-hometown-end"></div> <div id="profile-edit-hometown-end"></div>
@ -201,26 +198,26 @@
<div id="profile-edit-sexual-end"></div> <div id="profile-edit-sexual-end"></div>
<div id="profile-edit-politic-wrapper" > <div id="profile-edit-politic-wrapper" >
<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label> <label id="profile-edit-politic-label" for="profile-edit-politic" >{{$politic.1}} </label>
<input type="text" size="32" name="politic" id="profile-edit-politic" value="{{$politic}}" /> <input type="text" size="32" name="politic" id="profile-edit-politic" value="{{$politic.2}}" />
</div> </div>
<div id="profile-edit-politic-end"></div> <div id="profile-edit-politic-end"></div>
<div id="profile-edit-religion-wrapper" > <div id="profile-edit-religion-wrapper" >
<label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label> <label id="profile-edit-religion-label" for="profile-edit-religion" >{{$religion.1}} </label>
<input type="text" size="32" name="religion" id="profile-edit-religion" value="{{$religion}}" /> <input type="text" size="32" name="religion" id="profile-edit-religion" value="{{$religion.2}}" />
</div> </div>
<div id="profile-edit-religion-end"></div> <div id="profile-edit-religion-end"></div>
<div id="likes-jot-wrapper"> <div id="likes-jot-wrapper">
<div id="likes-jot-desc">{{$lbl_likes}}</div> <div id="likes-jot-desc">{{$likes.1}}</div>
<textarea rows="10" cols="72" id="likes-jot-text" name="likes" style="width:599px;">{{$likes}}</textarea> <textarea rows="10" cols="72" id="likes-jot-text" name="likes" style="width:599px;">{{$likes.2}}</textarea>
</div> </div>
<div id="likes-jot-end"></div> <div id="likes-jot-end"></div>
<div id="dislikes-jot-wrapper"> <div id="dislikes-jot-wrapper">
<div id="dislikes-jot-desc">{{$lbl_dislikes}}</div> <div id="dislikes-jot-desc">{{$dislikes.1}}</div>
<textarea rows="10" cols="72" id="dislikes-jot-text" name="dislikes" style="width:599px;">{{$dislikes}}</textarea> <textarea rows="10" cols="72" id="dislikes-jot-text" name="dislikes" style="width:599px;">{{$dislikes.2}}</textarea>
</div> </div>
<div id="dislikes-jot-end"></div> <div id="dislikes-jot-end"></div>
@ -241,27 +238,27 @@
<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label> <label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
{{$marital}} {{$marital}}
</div> </div>
<label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label> <label id="profile-edit-with-label" for="profile-edit-with" > {{$with.1}} </label>
<input type="text" size="32" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" /> <input type="text" size="32" name="with" id="profile-edit-with" title="{{$with.3}}" value="{{$with.2}}" />
<label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label> <label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$howlong.1}} </label>
<input type="text" size="32" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" /> <input type="text" size="32" name="howlong" id="profile-edit-howlong" title="{{$howlong.1}}" value="{{$howlong.2}}" />
<div id="profile-edit-marital-end"></div> <div id="profile-edit-marital-end"></div>
<div id="romance-jot-wrapper" > <div id="romance-jot-wrapper" >
<div id="romance-jot-desc">{{$lbl_love}}</div> <div id="romance-jot-desc">{{$romance.1}}</div>
<textarea rows="10" cols="72" id="romance-jot-text" name="romance" style="width:599px;">{{$romance}}</textarea> <textarea rows="10" cols="72" id="romance-jot-text" name="romance" style="width:599px;">{{$romance.2}}</textarea>
</div> </div>
<div id="romance-jot-end"></div> <div id="romance-jot-end"></div>
<div id="work-jot-wrapper"> <div id="work-jot-wrapper">
<div id="work-jot-desc">{{$lbl_work}}</div> <div id="work-jot-desc">{{$work.1}}</div>
<textarea rows="10" cols="72" id="work-jot-text" name="work" style="width:599px;">{{$work}}</textarea> <textarea rows="10" cols="72" id="work-jot-text" name="work" style="width:599px;">{{$work.2}}</textarea>
</div> </div>
<div id="work-jot-end"></div> <div id="work-jot-end"></div>
<div id="education-jot-wrapper" > <div id="education-jot-wrapper" >
<div id="education-jot-desc">{{$lbl_school}}</div> <div id="education-jot-desc">{{$education.1}}</div>
<textarea rows="10" cols="72" id="education-jot-text" name="education" style="width:599px;">{{$education}}</textarea> <textarea rows="10" cols="72" id="education-jot-text" name="education" style="width:599px;">{{$education.2}}</textarea>
</div> </div>
<div id="education-jot-end"></div> <div id="education-jot-end"></div>
@ -279,32 +276,32 @@
<div class="js-section toggle-section-content hidden"> <div class="js-section toggle-section-content hidden">
<div id="interest-jot-wrapper"> <div id="interest-jot-wrapper">
<div id="interest-jot-desc">{{$lbl_hobbies}}</div> <div id="interest-jot-desc">{{$interest.1}}</div>
<textarea rows="10" cols="72" id="interest-jot-text" name="interest" style="width:599px;">{{$interest}}</textarea> <textarea rows="10" cols="72" id="interest-jot-text" name="interest" style="width:599px;">{{$interest.2}}</textarea>
</div> </div>
<div id="interest-jot-end"></div> <div id="interest-jot-end"></div>
<div id="music-jot-wrapper"> <div id="music-jot-wrapper">
<div id="music-jot-desc">{{$lbl_music}}</div> <div id="music-jot-desc">{{$music.1}}</div>
<textarea rows="10" cols="72" id="music-jot-text" name="music" style="width:599px;">{{$music}}</textarea> <textarea rows="10" cols="72" id="music-jot-text" name="music" style="width:599px;">{{$music.2}}</textarea>
</div> </div>
<div id="music-jot-end"></div> <div id="music-jot-end"></div>
<div id="book-jot-wrapper"> <div id="book-jot-wrapper">
<div id="book-jot-desc">{{$lbl_book}}</div> <div id="book-jot-desc">{{$book.1}}</div>
<textarea rows="10" cols="72" id="book-jot-text" name="book" style="width:599px;">{{$book}}</textarea> <textarea rows="10" cols="72" id="book-jot-text" name="book" style="width:599px;">{{$book.2}}</textarea>
</div> </div>
<div id="book-jot-end"></div> <div id="book-jot-end"></div>
<div id="tv-jot-wrapper"> <div id="tv-jot-wrapper">
<div id="tv-jot-desc">{{$lbl_tv}}</div> <div id="tv-jot-desc">{{$tv.1}}</div>
<textarea rows="10" cols="72" id="tv-jot-text" name="tv" style="width:599px;">{{$tv}}</textarea> <textarea rows="10" cols="72" id="tv-jot-text" name="tv" style="width:599px;">{{$tv.2}}</textarea>
</div> </div>
<div id="tv-jot-end"></div> <div id="tv-jot-end"></div>
<div id="film-jot-wrapper"> <div id="film-jot-wrapper">
<div id="film-jot-desc">{{$lbl_film}}</div> <div id="film-jot-desc">{{$film.1}}</div>
<textarea rows="10" cols="72" id="film-jot-text" name="film" style="width:599px;">{{$film}}</textarea> <textarea rows="10" cols="72" id="film-jot-text" name="film" style="width:599px;">{{$film.2}}</textarea>
</div> </div>
<div id="film-jot-end"></div> <div id="film-jot-end"></div>
@ -321,14 +318,14 @@
{{include file="field_yesno.tpl" field=$details}} {{include file="field_yesno.tpl" field=$details}}
{{/if}} {{/if}}
<div id="profile-edit-profile-name-wrapper" > <div id="profile-edit-profile-name-wrapper" >
<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$lbl_profname}} </label> <label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$profile_name.1}} </label>
<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name|escape:'html'}}" /><div class="required">*</div> <input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name.2|escape:'html'}}" /><div class="required">*</div>
</div> </div>
<div id="profile-edit-profile-name-end"></div> <div id="profile-edit-profile-name-end"></div>
<div id="profile-edit-name-wrapper" > <div id="profile-edit-name-wrapper" >
<label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label> <label id="profile-edit-name-label" for="profile-edit-name" >{{$name.1}} </label>
<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name|escape:'html'}}" /> <input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2|escape:'html'}}" />
</div> </div>
<div id="profile-edit-name-end"></div> <div id="profile-edit-name-end"></div>
@ -340,76 +337,73 @@
<div id="profile-edit-gender-end"></div> <div id="profile-edit-gender-end"></div>
<div id="profile-edit-dob-wrapper" > <div id="profile-edit-dob-wrapper" >
<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label> {{$dob}}
<div id="profile-edit-dob" >
{{$dob}} {{$age}}
</div>
</div> </div>
<div id="profile-edit-dob-end"></div> <div id="profile-edit-dob-end"></div>
{{/if}} {{/if}}
<div id="profile-edit-homepage-wrapper" > <div id="profile-edit-homepage-wrapper" >
<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label> <label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$homepage.1}} </label>
<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" /> <input type="text" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage.2}}" />
</div> </div>
<div id="profile-edit-homepage-end"></div> <div id="profile-edit-homepage-end"></div>
{{$hide_friends}} {{$hide_friends}}
<div id="profile-edit-address-wrapper" > <div id="profile-edit-address-wrapper" >
<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label> <label id="profile-edit-address-label" for="profile-edit-address" >{{$address.1}} </label>
<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address|escape:'html'}}" /> <input type="text" size="32" name="address" id="profile-edit-address" value="{{$address.2|escape:'html'}}" />
</div> </div>
<div id="profile-edit-address-end"></div> <div id="profile-edit-address-end"></div>
<div id="profile-edit-locality-wrapper" > <div id="profile-edit-locality-wrapper" >
<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label> <label id="profile-edit-locality-label" for="profile-edit-locality" >{{$locality.1}} </label>
<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality|escape:'html'}}" /> <input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality.2|escape:'html'}}" />
</div> </div>
<div id="profile-edit-locality-end"></div> <div id="profile-edit-locality-end"></div>
<div id="profile-edit-postal-code-wrapper" > <div id="profile-edit-postal-code-wrapper" >
<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label> <label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$postal_code.1}} </label>
<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code|escape:'html'}}" /> <input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2|escape:'html'}}" />
</div> </div>
<div id="profile-edit-postal-code-end"></div> <div id="profile-edit-postal-code-end"></div>
<div id="profile-edit-country-name-wrapper" > <div id="profile-edit-country-name-wrapper" >
<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label> <label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$country_name.1}} </label>
<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region}}');"> <select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region.2}}');">
<option selected="selected" >{{$country_name}}</option> <option selected="selected" >{{$country_name.2}}</option>
<option>temp</option> <option>temp</option>
</select> </select>
</div> </div>
<div id="profile-edit-country-name-end"></div> <div id="profile-edit-country-name-end"></div>
<div id="profile-edit-region-wrapper" > <div id="profile-edit-region-wrapper" >
<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label> <label id="profile-edit-region-label" for="profile-edit-region" >{{$region.1}} </label>
<select name="region" id="profile-edit-region" onChange="Update_Globals();" > <select name="region" id="profile-edit-region" onChange="Update_Globals();" >
<option selected="selected" >{{$region}}</option> <option selected="selected" >{{$region.2}}</option>
<option>temp</option> <option>temp</option>
</select> </select>
</div> </div>
<div id="profile-edit-region-end"></div> <div id="profile-edit-region-end"></div>
<div id="profile-edit-pubkeywords-wrapper" > <div id="profile-edit-pubkeywords-wrapper" >
<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label> <label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$pub_keywords.1}} </label>
<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords|escape:'html'}}" /> <input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2|escape:'html'}}" />
</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div> </div><div id="profile-edit-pubkeywords-desc">{{$pub_keywords.3}}</div>
<div id="profile-edit-pubkeywords-end"></div> <div id="profile-edit-pubkeywords-end"></div>
<div id="profile-edit-prvkeywords-wrapper" > <div id="profile-edit-prvkeywords-wrapper" >
<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$lbl_prvkey}} </label> <label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$prv_keywords.1}} </label>
<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords|escape:'html'}}" /> <input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2|escape:'html'}}" />
</div><div id="profile-edit-prvkeywords-desc">{{$lbl_prvdsc}}</div> </div><div id="profile-edit-prvkeywords-desc">{{$prv_keywords.3}}</div>
<div id="profile-edit-prvkeywords-end"></div> <div id="profile-edit-prvkeywords-end"></div>
<div id="about-jot-wrapper" > <div id="about-jot-wrapper" >
<p id="about-jot-desc" > <p id="about-jot-desc" >
{{$lbl_about}} {{$about.1}}
</p> </p>
<textarea rows="10" cols="72" id="profile-about-text" name="about" >{{$about}}</textarea> <textarea rows="10" cols="72" id="profile-about-text" name="about" >{{$about.2}}</textarea>
</div> </div>
<div id="about-jot-end"></div> <div id="about-jot-end"></div>
@ -419,26 +413,26 @@
</div> </div>
<div class="profile-edit-submit-end"></div> <div class="profile-edit-submit-end"></div>
<input type="hidden" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" /> <input type="hidden" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc.2}}" />
<input type="hidden" id="contact-jot-text" name="contact" value="{{$contact}}" /> <input type="hidden" id="contact-jot-text" name="contact" value="{{$contact.2}}" />
<input type="hidden" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" /> <input type="hidden" name="hometown" id="profile-edit-hometown" value="{{$hometown.2}}" />
<input type="hidden" name="politic" id="profile-edit-politic" value="{{$politic}}" /> <input type="hidden" name="politic" id="profile-edit-politic" value="{{$politic.2}}" />
<input type="hidden" name="religion" id="profile-edit-religion" value="{{$religion}}" /> <input type="hidden" name="religion" id="profile-edit-religion" value="{{$religion.2}}" />
<input type="hidden" id="likes-jot-text" name="likes" value="{{$likes}}" /> <input type="hidden" id="likes-jot-text" name="likes" value="{{$likes.2}}" />
<input type="hidden" id="dislikes-jot-text" name="dislikes" value="{{$dislikes}}" /> <input type="hidden" id="dislikes-jot-text" name="dislikes" value="{{$dislikes.2}}" />
<input type="hidden" name="with" id="profile-edit-with" value="{{$with}}" /> <input type="hidden" name="with" id="profile-edit-with" value="{{$with.2}}" />
<input type="hidden" name="howlong" id="profile-edit-howlong" value="{{$howlong}}" /> <input type="hidden" name="howlong" id="profile-edit-howlong" value="{{$howlong.2}}" />
<input type="hidden" id="romance-jot-text" name="romance" value="{{$romance}}" /> <input type="hidden" id="romance-jot-text" name="romance" value="{{$romance.2}}" />
<input type="hidden" id="work-jot-text" name="work" value="{{$work}}" /> <input type="hidden" id="work-jot-text" name="work" value="{{$work.2}}" />
<input type="hidden" id="education-jot-text" name="education" value="{{$education}}" /> <input type="hidden" id="education-jot-text" name="education" value="{{$education.2}}" />
<input type="hidden" id="interest-jot-text" name="interest" value="{{$interest}}" /> <input type="hidden" id="interest-jot-text" name="interest" value="{{$interest.2}}" />
<input type="hidden" id="music-jot-text" name="music" value="{{$music}}" /> <input type="hidden" id="music-jot-text" name="music" value="{{$music.2}}" />
<input type="hidden" id="book-jot-text" name="book" value="{{$book}}" /> <input type="hidden" id="book-jot-text" name="book" value="{{$book.2}}" />
<input type="hidden" id="tv-jot-text" name="tv" value="{{$tv}}" /> <input type="hidden" id="tv-jot-text" name="tv" value="{{$tv.2}}" />
<input type="hidden" id="film-jot-text" name="film" value="{{$film}}" /> <input type="hidden" id="film-jot-text" name="film" value="{{$film.2}}" />
{{/if}} {{/if}}
</form> </form>
</div> </div>
<script type="text/javascript">Fill_Country('{{$country_name}}');Fill_States('{{$region}}');</script> <script type="text/javascript">Fill_Country('{{$country_name.2}}');Fill_States('{{$region.2}}');</script>