From c22f65bafa08ea348d55fb1f3c05774b0f320c99 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Wed, 19 Dec 2012 12:18:52 +0100 Subject: [PATCH 01/11] repeated items from ostatus and diaspora are now using the share-element. Some design changes to repeated items in "vier". --- include/bbcode.php | 5 +++-- include/delivery.php | 19 ++++++++++++++----- include/diaspora.php | 7 ++++++- include/items.php | 14 ++++++++++---- include/notifier.php | 17 +++++++++++++---- include/onepoll.php | 5 +++-- include/text.php | 3 +++ view/de/strings.php | 2 ++ view/theme/vier/style.css | 4 ++-- 9 files changed, 56 insertions(+), 20 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index b3f6aa826b..e09b1ed342 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -251,11 +251,11 @@ function bb_ShareAttributes($match) { if ($avatar != "") $headline .= ''; - $headline .= sprintf(t('%s wrote the following post:'), $profile, $author, $link); + $headline .= sprintf(t('%s wrote the following post:'), $profile, $author, $link); $headline .= ""; - $text = "
".$headline.'
'.trim($match[2])."
"; + $text = $headline.'
'.trim($match[2])."
"; return($text); } @@ -314,6 +314,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { // We'll emulate it. + $Text = trim($Text); $Text = str_replace("\r\n","\n", $Text); $Text = str_replace(array("\r","\n"), array('
','
'), $Text); diff --git a/include/delivery.php b/include/delivery.php index c56d7d2884..e8bf338a8f 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -439,14 +439,14 @@ function delivery_run(&$argv, &$argc){ } if(! $it) break; - + $local_user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid) ); if(! count($local_user)) break; - + $reply_to = ''; $r1 = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1", intval($uid) @@ -482,12 +482,21 @@ function delivery_run(&$argv, &$argc){ if($it['uri'] !== $it['parent-uri']) { $headers .= 'References: <' . iri2msgid($it['parent-uri']) . '>' . "\n"; - if(!strlen($it['title'])) { - $r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' LIMIT 1", - dbesc($it['parent-uri'])); + if(!$it['title']) { + $r = q("SELECT `title` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + dbesc($it['parent-uri']), + intval($uid)); if(count($r) AND ($r[0]['title'] != '')) $subject = $r[0]['title']; + else { + $r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d LIMIT 1", + dbesc($it['parent-uri']), + intval($uid)); + + if(count($r) AND ($r[0]['title'] != '')) + $subject = $r[0]['title']; + } } if(strncasecmp($subject,'RE:',3)) $subject = 'Re: '.$subject; diff --git a/include/diaspora.php b/include/diaspora.php index c2b2fbcf4e..b14402b5a2 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -923,6 +923,7 @@ function diaspora_reshare($importer,$xml,$msg) { $orig_guid = notags(unxmlify($xml->root_guid)); $source_url = 'https://' . substr($orig_author,strpos($orig_author,'@')+1) . '/p/' . $orig_guid . '.xml'; + $orig_url = 'https://'.substr($orig_author,strpos($orig_author,'@')+1).'/posts/'.$orig_guid; $x = fetch_url($source_url); if(! $x) $x = fetch_url(str_replace('https://','http://',$source_url)); @@ -1032,10 +1033,14 @@ function diaspora_reshare($importer,$xml,$msg) { $datarray['author-avatar'] = ((x($person,'thumb')) ? $person['thumb'] : $person['photo']); $datarray['body'] = $body; } else { + $prefix = "[share author='".$person['name']. + "' profile='".$person['url']. + "' avatar='".((x($person,'thumb')) ? $person['thumb'] : $person['photo']). + "' link='".$orig_url."']"; $datarray['author-name'] = $contact['name']; $datarray['author-link'] = $contact['url']; $datarray['author-avatar'] = $contact['thumb']; - $datarray['body'] = $prefix . $body; + $datarray['body'] = $prefix.$body."[/share]"; } $datarray['tag'] = $str_tags; diff --git a/include/items.php b/include/items.php index fb7a7e25d1..5bd4423cfa 100755 --- a/include/items.php +++ b/include/items.php @@ -798,6 +798,7 @@ function get_atom_elements($feed,$item) { logger('get_atom_elements: Looking for status.net repeated message'); $message = $child["http://activitystrea.ms/spec/1.0/"]["object"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["content"][0]["data"]; + $orig_uri = $child["http://activitystrea.ms/spec/1.0/"]["object"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["id"][0]["data"]; $author = $child[SIMPLEPIE_NAMESPACE_ATOM_10]["author"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]; $uri = $author["uri"][0]["data"]; $name = $author["name"][0]["data"]; @@ -805,17 +806,22 @@ function get_atom_elements($feed,$item) { $avatar = $avatar["href"]; if (($name != "") and ($uri != "") and ($avatar != "") and ($message != "")) { - logger('get_atom_elements: fixing sender of repeated message'); + logger('get_atom_elements: fixing sender of repeated message. '.print_r($child, true)); - $res["owner-name"] = $res["author-name"]; + /*$res["owner-name"] = $res["author-name"]; $res["owner-link"] = $res["author-link"]; $res["owner-avatar"] = $res["author-avatar"]; $res["author-name"] = $name; $res["author-link"] = $uri; - $res["author-avatar"] = $avatar; + $res["author-avatar"] = $avatar;*/ - $res["body"] = html2bbcode($message); + $prefix = "[share author='".$name. + "' profile='".$uri. + "' avatar='".$avatar. + "' link='".$orig_uri."']"; + + $res["body"] = $prefix.html2bbcode($message)."[/share]"; } } diff --git a/include/notifier.php b/include/notifier.php index b685e1b998..c522bcb6bc 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -791,12 +791,21 @@ function notifier_run(&$argv, &$argc){ if($it['uri'] !== $it['parent-uri']) { $headers .= 'References: <' . iri2msgid($it['parent-uri']) . '>' . "\n"; - if(!strlen($it['title'])) { - $r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' LIMIT 1", - dbesc($it['parent-uri'])); + if(!$it['title']) { + $r = q("SELECT `title` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + dbesc($it['parent-uri']), + intval($uid)); - if(count($r) AND ($r[0]['title'] != '')) + if(count($r) AND ($r[0]['title'] != '')) $subject = $r[0]['title']; + else { + $r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d LIMIT 1", + dbesc($it['parent-uri']), + intval($uid)); + + if(count($r) AND ($r[0]['title'] != '')) + $subject = $r[0]['title']; + } } if(strncasecmp($subject,'RE:',3)) $subject = 'Re: '.$subject; diff --git a/include/onepoll.php b/include/onepoll.php index 1e11f2ca1e..7b2eba70d1 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -405,8 +405,9 @@ function onepoll_run(&$argv, &$argc){ // If it seems to be a reply but a header couldn't be found take the last message with matching subject if(!x($datarray,'parent-uri') and $reply) { - $r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE MATCH (`title`) AGAINST ('".'"%s"'."' IN BOOLEAN MODE) ORDER BY `created` DESC LIMIT 1", - dbesc(protect_sprintf($datarray['title']))); + $r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE MATCH (`title`) AGAINST ('".'"%s"'."' IN BOOLEAN MODE) AND `uid` = %d ORDER BY `created` DESC LIMIT 1", + dbesc(protect_sprintf($datarray['title'])), + intval($importer_uid)); if(count($r)) $datarray['parent-uri'] = $r[0]['parent-uri']; } diff --git a/include/text.php b/include/text.php index 7d26d35508..4212e23ca4 100644 --- a/include/text.php +++ b/include/text.php @@ -982,6 +982,9 @@ function prepare_body($item,$attach = false) { $s = $prep_arr['html']; if(! $attach) { + // Replace the blockquotes with quotes that are used in mails + $mailquote = '
'; + $s = str_replace(array('
', '
', '
'), array($mailquote, $mailquote, $mailquote), $s); return $s; } diff --git a/view/de/strings.php b/view/de/strings.php index 7bded94a41..30e2d740f6 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -2081,3 +2081,5 @@ $a->strings["Post to Drupal by default"] = "Veröffentliche öffentliche Beiträ $a->strings["OEmbed settings updated"] = "OEmbed Einstellungen aktualisiert."; $a->strings["Use OEmbed for YouTube videos"] = "OEmbed für Youtube Videos verwenden"; $a->strings["URL to embed:"] = "URL zum Einbetten:"; +$a->strings['%s wrote the following post:'] = + '%s hat diesen Beitrag ursprünglich gepostet:'; diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index d6acade692..91680f41cb 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -356,8 +356,8 @@ div.pager, .birthday-notice { height: 32px; color: #999; border-top: 1px solid #D2D2D2; - padding-top: 16px; - margin-top: 16px; + padding-top: 5px; + margin-top: 5px; } .shared_header img { From a86baa372a2de75d08ac6c08d2df973404392ef9 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Wed, 19 Dec 2012 15:58:38 +0100 Subject: [PATCH 02/11] Mailimport is now realized like a wall-to-wall-post --- include/items.php | 2 +- include/onepoll.php | 27 +++++++++++++++++++++++---- view/theme/vier/style.css | 4 ++++ 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/include/items.php b/include/items.php index 5bd4423cfa..b5e6062b23 100755 --- a/include/items.php +++ b/include/items.php @@ -806,7 +806,7 @@ function get_atom_elements($feed,$item) { $avatar = $avatar["href"]; if (($name != "") and ($uri != "") and ($avatar != "") and ($message != "")) { - logger('get_atom_elements: fixing sender of repeated message. '.print_r($child, true)); + logger('get_atom_elements: fixing sender of repeated message.'); /*$res["owner-name"] = $res["author-name"]; $res["owner-link"] = $res["author-link"]; diff --git a/include/onepoll.php b/include/onepoll.php index 7b2eba70d1..2abd41b789 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -437,7 +437,29 @@ function onepoll_run(&$argv, &$argc){ else $fromdecoded .= $frompart->text; - $datarray['body'] = "[b]".t('From: ') . escape_tags($fromdecoded) . "[/b]\n\n" . $datarray['body']; + $fromarr = imap_rfc822_parse_adrlist($fromdecoded, $a->get_hostname()); + + $frommail = $fromarr[0]->mailbox."@".$fromarr[0]->host; + + if (isset($fromarr[0]->personal)) + $fromname = $fromarr[0]->personal; + else + $fromname = $frommail; + + //$datarray['body'] = "[b]".t('From: ') . escape_tags($fromdecoded) . "[/b]\n\n" . $datarray['body']; + + $datarray['author-name'] = $fromname; + $datarray['author-link'] = "mailto:".$frommail; + $datarray['author-avatar'] = $contact['photo']; + + $datarray['owner-name'] = $contact['name']; + $datarray['owner-link'] = "mailto:".$contact['addr']; + $datarray['owner-avatar'] = $contact['photo']; + + } else { + $datarray['author-name'] = $contact['name']; + $datarray['author-link'] = 'mailbox'; + $datarray['author-avatar'] = $contact['photo']; } $datarray['uid'] = $importer_uid; @@ -448,9 +470,6 @@ function onepoll_run(&$argv, &$argc){ $datarray['private'] = 1; $datarray['allow_cid'] = '<' . $contact['id'] . '>'; } - $datarray['author-name'] = $contact['name']; - $datarray['author-link'] = 'mailbox'; - $datarray['author-avatar'] = $contact['photo']; $stored_item = item_store($datarray); q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d", diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 91680f41cb..b6aaae51d5 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -313,6 +313,10 @@ cursor: url('lock.cur'), pointer; } +#birthday-title, #event-title { + font-weight: bold; + margin-bottom: 5px; +} div.pager, .birthday-notice { text-align: center; From 0a29927e6d15fe77786b9f6e9dbb4b8ac8b83ab2 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Wed, 19 Dec 2012 16:31:06 +0100 Subject: [PATCH 03/11] Mail: real threading now works with outgoing mails. --- include/delivery.php | 8 +++++++- include/notifier.php | 8 +++++++- include/onepoll.php | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/include/delivery.php b/include/delivery.php index e8bf338a8f..fcb0ee47b9 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -481,7 +481,13 @@ function delivery_run(&$argv, &$argc){ //logger("Mail: Data: ".print_r($it, true), LOGGER_DATA); if($it['uri'] !== $it['parent-uri']) { - $headers .= 'References: <' . iri2msgid($it['parent-uri']) . '>' . "\n"; + $headers .= "References: <".iri2msgid($it["parent-uri"]).">"; + + // If Threading is enabled, write down the correct parent + if (($it["thr-parent"] != "") and ($it["thr-parent"] != $it["parent-uri"])) + $headers .= " <".iri2msgid($it["thr-parent"]).">"; + $headers .= "\n"; + if(!$it['title']) { $r = q("SELECT `title` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($it['parent-uri']), diff --git a/include/notifier.php b/include/notifier.php index c522bcb6bc..b5a92ff252 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -790,7 +790,13 @@ function notifier_run(&$argv, &$argc){ $headers .= 'Message-Id: <' . iri2msgid($it['uri']) . '>' . "\n"; if($it['uri'] !== $it['parent-uri']) { - $headers .= 'References: <' . iri2msgid($it['parent-uri']) . '>' . "\n"; + $headers .= "References: <".iri2msgid($it["parent-uri"]).">"; + + // If Threading is enabled, write down the correct parent + if (($it["thr-parent"] != "") and ($it["thr-parent"] != $it["parent-uri"])) + $headers .= " <".iri2msgid($it["thr-parent"]).">"; + $headers .= "\n"; + if(!$it['title']) { $r = q("SELECT `title` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($it['parent-uri']), diff --git a/include/onepoll.php b/include/onepoll.php index 2abd41b789..c493aff762 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -335,7 +335,7 @@ function onepoll_run(&$argv, &$argc){ intval($r[0]['id']) ); } - /*switch ($mailconf[0]['action']) { + switch ($mailconf[0]['action']) { case 0: logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'].". Doing nothing.", LOGGER_DEBUG); break; @@ -353,7 +353,7 @@ function onepoll_run(&$argv, &$argc){ if ($mailconf[0]['movetofolder'] != "") imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID); break; - }*/ + } continue; } From 98c5b6e73bd5aa3ecc0869c18a0b5013eb473d8c Mon Sep 17 00:00:00 2001 From: Olaf Conradi Date: Wed, 19 Dec 2012 18:27:50 +0100 Subject: [PATCH 04/11] Text box alignment in Smoothly theme Make sure comment text boxes stay within their surrounding box. --- view/theme/smoothly/style.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 80e42dd617..847b5ced58 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -1780,7 +1780,8 @@ code { } .comment-edit-text-empty { - width: 672px; /*80%*/ + width: 98%; + max-width: 672px; height: 20px; color: #babdb6; transition: all 0.5s ease-in-out; @@ -1793,7 +1794,8 @@ code { } .comment-edit-text-full { - width: 670px; + width: 98%; + max-width: 672px; height: 6em; transition: all 0.5s ease-in-out; -webkit-transition: all 0.5s ease-in-out; @@ -1801,7 +1803,8 @@ code { } .comment-edit-submit-wrapper { - width: 670px; + width: 98%; + max-width: 672px; margin-left: 20px; text-align: left; } From ee5d2acd4299ed4980f26c9d3af339a3cb5055fa Mon Sep 17 00:00:00 2001 From: Olaf Conradi Date: Wed, 19 Dec 2012 19:04:18 +0100 Subject: [PATCH 05/11] Fix alignment of location --- view/theme/smoothly/style.css | 1 - 1 file changed, 1 deletion(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 847b5ced58..84597da606 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -1543,7 +1543,6 @@ ul .sidebar-group-li .icon { .wall-item-location { margin-top: 5px; - width: 100px; overflow: hidden; text-overflow: ellipsis; -o-text-overflow: ellipsis; From d9d7eb89edfdc48094b98eed41d4c58087c52f9b Mon Sep 17 00:00:00 2001 From: Olaf Conradi Date: Wed, 19 Dec 2012 19:15:39 +0100 Subject: [PATCH 06/11] Fix alignment of photo menu Remove duplicate definitions Align menu button to be exactly the same width as the photo --- view/theme/smoothly/style.css | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 84597da606..aa62d59949 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -1378,9 +1378,15 @@ ul .sidebar-group-li .icon { position: absolute; overflow: hidden; height: 20px; - width: 90px; + width: 100%; top: 85px; left: -1px; + border-right: 1px solid #dddddd; + border-left: 1px solid #dddddd; + border-bottom: 1px solid #dddddd; + box-shadow: 3px 3px 4px #959494; + -moz-box-shadow: 3px 3px 4px #959494; + -webkit-box-shadow: 3px 3px 4px #959494; border-radius: 0px 0px 5px 5px; -webkit-border-radius: 0px 0px 5px 5px; -moz-border-radius: 0px 0px 5px 5px; @@ -1605,7 +1611,7 @@ ul .sidebar-group-li .icon { .wall-item-photo-menu { display: none; - min-width: 92px; + min-width: 88px; color: #2e3436; border-top: 1px; background: #eeeeee; @@ -1626,15 +1632,6 @@ ul .sidebar-group-li .icon { } -.wall-item-photo-menu-button { - border-right: 1px solid #dddddd; - border-left: 1px solid #dddddd; - border-bottom: 1px solid #dddddd; - box-shadow: 3px 3px 4px #959494; - -moz-box-shadow: 3px 3px 4px #959494; - -webkit-box-shadow: 3px 3px 4px #959494; -} - .fakelink wall-item-photo-menu-button { -webkit-border-radius: 0px 5px 5px 5px; -moz-border-radius: 0px 5px 5px 5px; @@ -1732,7 +1729,6 @@ code { } .wall-item-outside-wrapper.comment .wall-item-photo-menu-button { - width: 50px; top: 45px; background-position: 35px center; } From 330960f8f719052763cb54804681bdcdb7fc5fc5 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 20 Dec 2012 03:33:36 +0100 Subject: [PATCH 07/11] Vier: Now there are buttons for inserting bbcode elements in the comments --- view/de/strings.php | 3 +- view/theme/vier/comment_item.tpl | 50 ++++++++++++++++++++++++++++++++ view/theme/vier/style.css | 45 ++++++++++++++++++++++++++-- view/theme/vier/theme.php | 8 +++-- 4 files changed, 99 insertions(+), 7 deletions(-) create mode 100644 view/theme/vier/comment_item.tpl diff --git a/view/de/strings.php b/view/de/strings.php index e97ae297fd..297e7fac3c 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -1024,6 +1024,7 @@ $a->strings["Delegate Page Management"] = "Delegiere das Management für die Sei $a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für deinen privaten Account, dem du nicht absolut vertraust!"; $a->strings["Existing Page Managers"] = "Vorhandene Seiten Manager"; $a->strings["Existing Page Delegates"] = "Vorhandene Bevollmächtigte für die Seite"; +$a->strings["Delegations"] = "Bevollmächtigungen"; $a->strings["Potential Delegates"] = "Potentielle Bevollmächtigte"; $a->strings["Add"] = "Hinzufügen"; $a->strings["No entries."] = "Keine Einträge"; @@ -2076,7 +2077,7 @@ $a->strings["Birthday Reminders"] = "Geburtstagserinnerungen"; $a->strings["Birthdays this week:"] = "Geburtstage diese Woche:"; $a->strings["[No description]"] = "[keine Beschreibung]"; $a->strings["Event Reminders"] = "Veranstaltungserinnerungen"; -$a->strings["Events this week:"] = "Veranstaltungen diese Woche"; +$a->strings["Events this week:"] = "Veranstaltungen diese Woche:"; $a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge"; $a->strings["Profile Details"] = "Profildetails"; $a->strings["Events and Calendar"] = "Ereignisse und Kalender"; diff --git a/view/theme/vier/comment_item.tpl b/view/theme/vier/comment_item.tpl new file mode 100644 index 0000000000..ac7073d710 --- /dev/null +++ b/view/theme/vier/comment_item.tpl @@ -0,0 +1,50 @@ + {{ if $threaded }} +
+ {{ else }} +
+ {{ endif }} +
+ + + + + + + + +
+ $mytitle +
+
+ + {{ if $qcomment }} + + {{ endif }} + +
+ + +
+
+ +
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index b6aaae51d5..b278cbf8c5 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -86,6 +86,34 @@ #adminpage .selectall { text-align: right; } /* icons */ +.icon.bb-url{ + background-image: url("../../../view/theme/diabook/icons/bb-url.png"); + float: right; + margin-top: 2px;} +.icon.quote{ + background-image: url("../../../view/theme/diabook/icons/quote.png"); + float: right; + margin-top: 2px;} +.icon.bold{ + background-image: url("../../../view/theme/diabook/icons/bold.png"); + float: right; + margin-top: 2px;} +.icon.underline{ + background-image: url("../../../view/theme/diabook/icons/underline.png"); + float: right; + margin-top: 2px;} +.icon.italic{ + background-image: url("../../../view/theme/diabook/icons/italic.png"); + float: right; + margin-top: 2px;} +.icon.bb-image{ + background-image: url("../../../view/theme/diabook/icons/bb-image.png"); + float: right; + margin-top: 2px;} +.icon.bb-video{ + background-image: url("../../../view/theme/diabook/icons/bb-video.png"); + float: right; + margin-top: 2px;} .article { background-position: -50px 0px;} .audio { background-position: -70px 0px;} @@ -1243,7 +1271,7 @@ border-bottom: 1px solid #D2D2D2; } .comment-edit-preview { - width: 710px; + width: 660px; border: 1px solid #2d2d2d; margin-top: 10px; } @@ -1307,6 +1335,10 @@ border-bottom: 1px solid #D2D2D2; height: 100px; } +#jot-preview-content { + padding-top: 25px; +} + #jot-preview-content .tread-wrapper { background-color: #fce94f; } @@ -1698,10 +1730,15 @@ ul.tabs li { /*ul.tabs li .active { border-bottom: 1px solid #005c94; }*/ + ul.tabs a { display: block; float: left; - padding: 0px 10px 1px 10px; +} + +ul.tabs a, #jot-preview-link, .comment-edit-submit-wrapper .fakelink { + /* padding: 0px 10px 1px 10px; */ + padding: 0px 5px 1px 5px; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -1719,7 +1756,9 @@ ul.tabs a { filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ececf2',GradientType=0 ); background: linear-gradient(top, #ffffff 0%,#ececf2 100%); } -ul.tabs li .active, ul.tabs a:hover { + +ul.tabs li .active, ul.tabs a:hover, #jot-preview-link:hover, .comment-edit-submit-wrapper .fakelink:hover { + color: #fff; text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); border: 1px solid #ececf2; diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index 5e483c5adc..db74385c8b 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -12,7 +12,7 @@ $a->theme_info = array(); function vier_init(&$a) { $a->page['htmlhead'] .= <<< EOT diff --git a/view/smarty3/admin_aside.tpl b/view/smarty3/admin_aside.tpl new file mode 100644 index 0000000000..a9d26a89f0 --- /dev/null +++ b/view/smarty3/admin_aside.tpl @@ -0,0 +1,42 @@ + +

{{$admtxt}}

+ + +{{if $admin.update}} + +{{/if}} + + +{{if $admin.plugins_admin}}

{{$plugadmtxt}}

{{/if}} +
    + {{foreach $admin.plugins_admin as $l}} +
  • {{$l.1}}
    • + {{/foreach}} +
+ + +

{{$logtxt}}

+ + diff --git a/view/smarty3/admin_logs.tpl b/view/smarty3/admin_logs.tpl new file mode 100644 index 0000000000..4f79515ad2 --- /dev/null +++ b/view/smarty3/admin_logs.tpl @@ -0,0 +1,19 @@ +
+

{{$title}} - {{$page}}

+ +
+ + + {{include file="file:{{$field_checkbox}}" field=$debugging}} + {{include file="file:{{$field_input}}" field=$logfile}} + {{include file="file:{{$field_select}}" field=$loglevel}} + +
+ +
+ +

{{$logname}}

+ 
{{$data}}
+ + +
diff --git a/view/smarty3/admin_plugins.tpl b/view/smarty3/admin_plugins.tpl new file mode 100644 index 0000000000..01c178c3eb --- /dev/null +++ b/view/smarty3/admin_plugins.tpl @@ -0,0 +1,15 @@ +
+

{{$title}} - {{$page}}

+ +
    + {{foreach $plugins as $p}} +
  • + + {{$p.2.name}} - {{$p.2.version}} + {{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}} + +
    {{$p.2.description}}
    +
    • + {{/foreach}} +
+
diff --git a/view/smarty3/admin_plugins_details.tpl b/view/smarty3/admin_plugins_details.tpl new file mode 100644 index 0000000000..47c33bec3c --- /dev/null +++ b/view/smarty3/admin_plugins_details.tpl @@ -0,0 +1,36 @@ +
+

{{$title}} - {{$page}}

+ +

{{$info.name}} - {{$info.version}} : {{$action}}

+

{{$info.description}}

+ +

{{$str_author}} + {{foreach $info.author as $a}} + {{if $a.link}}{{$a.name}}{{else}}{{$a.name}}{{/if}}, + {{/foreach}} +

+ +

{{$str_maintainer}} + {{foreach $info.maintainer as $a}} + {{if $a.link}}{{$a.name}}{{else}}{{$a.name}}{{/if}}, + {{/foreach}} +

+ + {{if $screenshot}} + {{$screenshot.1}} + {{/if}} + + {{if $admin_form}} +

{{$settings}}

+
+ {{$admin_form}} +
+ {{/if}} + + {{if $readme}} +

Readme

+
+ {{$readme}} +
+ {{/if}} +
diff --git a/view/smarty3/admin_remoteupdate.tpl b/view/smarty3/admin_remoteupdate.tpl new file mode 100644 index 0000000000..2e52e99a69 --- /dev/null +++ b/view/smarty3/admin_remoteupdate.tpl @@ -0,0 +1,98 @@ + + + +
+
Your version:
{{$localversion}}
+{{if $needupdate}} +
New version:
{{$remoteversion}}
+ +
+ + + {{if $canwrite}} +
+ {{else}} +

Your friendica installation is not writable by web server.

+ {{if $canftp}} +

You can try to update via FTP

+ {{include file="file:{{$field_input}}" field=$ftphost}} + {{include file="file:{{$field_input}}" field=$ftppath}} + {{include file="file:{{$field_input}}" field=$ftpuser}} + {{include file="file:{{$field_password}}" field=$ftppwd}} +
+ {{/if}} + {{/if}} +
+{{else}} +

No updates

+{{/if}} +
diff --git a/view/smarty3/admin_site.tpl b/view/smarty3/admin_site.tpl new file mode 100644 index 0000000000..60959eb414 --- /dev/null +++ b/view/smarty3/admin_site.tpl @@ -0,0 +1,97 @@ + +
+

{{$title}} - {{$page}}

+ +
+ + + {{include file="file:{{$field_input}}" field=$sitename}} + {{include file="file:{{$field_textarea}}" field=$banner}} + {{include file="file:{{$field_select}}" field=$language}} + {{include file="file:{{$field_select}}" field=$theme}} + {{include file="file:{{$field_select}}" field=$theme_mobile}} + {{include file="file:{{$field_select}}" field=$ssl_policy}} + +
+ +

{{$registration}}

+ {{include file="file:{{$field_input}}" field=$register_text}} + {{include file="file:{{$field_select}}" field=$register_policy}} + {{include file="file:{{$field_input}}" field=$daily_registrations}} + {{include file="file:{{$field_checkbox}}" field=$no_multi_reg}} + {{include file="file:{{$field_checkbox}}" field=$no_openid}} + {{include file="file:{{$field_checkbox}}" field=$no_regfullname}} + +
+ +

{{$upload}}

+ {{include file="file:{{$field_input}}" field=$maximagesize}} + {{include file="file:{{$field_input}}" field=$maximagelength}} + {{include file="file:{{$field_input}}" field=$jpegimagequality}} + +

{{$corporate}}

+ {{include file="file:{{$field_input}}" field=$allowed_sites}} + {{include file="file:{{$field_input}}" field=$allowed_email}} + {{include file="file:{{$field_checkbox}}" field=$block_public}} + {{include file="file:{{$field_checkbox}}" field=$force_publish}} + {{include file="file:{{$field_checkbox}}" field=$no_community_page}} + {{include file="file:{{$field_checkbox}}" field=$ostatus_disabled}} + {{include file="file:{{$field_checkbox}}" field=$diaspora_enabled}} + {{include file="file:{{$field_checkbox}}" field=$dfrn_only}} + {{include file="file:{{$field_input}}" field=$global_directory}} + {{include file="file:{{$field_checkbox}}" field=$thread_allow}} + {{include file="file:{{$field_checkbox}}" field=$newuser_private}} + +
+ +

{{$advanced}}

+ {{include file="file:{{$field_checkbox}}" field=$no_utf}} + {{include file="file:{{$field_checkbox}}" field=$verifyssl}} + {{include file="file:{{$field_input}}" field=$proxy}} + {{include file="file:{{$field_input}}" field=$proxyuser}} + {{include file="file:{{$field_input}}" field=$timeout}} + {{include file="file:{{$field_input}}" field=$delivery_interval}} + {{include file="file:{{$field_input}}" field=$poll_interval}} + {{include file="file:{{$field_input}}" field=$maxloadavg}} + {{include file="file:{{$field_input}}" field=$abandon_days}} + +
+ +
+
diff --git a/view/smarty3/admin_summary.tpl b/view/smarty3/admin_summary.tpl new file mode 100644 index 0000000000..339dbddb63 --- /dev/null +++ b/view/smarty3/admin_summary.tpl @@ -0,0 +1,40 @@ +
+

{{$title}} - {{$page}}

+ +
+
{{$queues.label}}
+
{{$queues.deliverq}} - {{$queues.queue}}
+
+
+
{{$pending.0}}
+
{{$pending.1}} +
+ +
+
{{$users.0}}
+
{{$users.1}}
+
+ {{foreach $accounts as $p}} +
+
{{$p.0}}
+
{{if $p.1}}{{$p.1}}{{else}}0{{/if}}
+
+ {{/foreach}} + + +
+
{{$plugins.0}}
+ + {{foreach $plugins.1 as $p}} +
{{$p}}
+ {{/foreach}} + +
+ +
+
{{$version.0}}
+
{{$version.1}} - {{$build}} +
+ + +
diff --git a/view/smarty3/admin_users.tpl b/view/smarty3/admin_users.tpl new file mode 100644 index 0000000000..987ab4bccf --- /dev/null +++ b/view/smarty3/admin_users.tpl @@ -0,0 +1,98 @@ + +
+

{{$title}} - {{$page}}

+ +
+ + +

{{$h_pending}}

+ {{if $pending}} + + + + {{foreach $th_pending as $th}}{{/foreach}} + + + + + + {{foreach $pending as $u}} + + + + + + + + {{/foreach}} + +
{{$th}}
{{$u.created}}{{$u.name}} + + +
+
{{$select_all}}
+
+ {{else}} +

{{$no_pending}}

+ {{/if}} + + + + +

{{$h_users}}

+ {{if $users}} + + + + + {{foreach $th_users as $th}}{{/foreach}} + + + + + + {{foreach $users as $u}} + + + + + + + + + + {{/if}} + + + {{/foreach}} + +
{{$th}}
{{$u.nickname}}{{$u.name}}{{$u.register_date}}{{$u.lastitem_date}} + {{if $u.is_admin}} +   + {{else}} + + {{if $u.is_admin}} +   + {{else}} + + + {{/if}} +
+
{{$select_all}}
+
+ {{else}} + NO USERS?!? + {{/if}} +
+
diff --git a/view/smarty3/album_edit.tpl b/view/smarty3/album_edit.tpl new file mode 100644 index 0000000000..61653c47cd --- /dev/null +++ b/view/smarty3/album_edit.tpl @@ -0,0 +1,15 @@ +
+
+ + + + + +
+ + + + +
+
+
diff --git a/view/smarty3/api_config_xml.tpl b/view/smarty3/api_config_xml.tpl new file mode 100644 index 0000000000..8c0766c739 --- /dev/null +++ b/view/smarty3/api_config_xml.tpl @@ -0,0 +1,66 @@ + + + {{$config.site.name}} + {{$config.site.server}} + default + + {{$config.site.logo}} + + true + en + {{$config.site.email}} + + + UTC + {{$config.site.closed}} + + false + {{$config.site.private}} + {{$config.site.textlimit}} + {{$config.site.ssl}} + {{$config.site.sslserver}} + 30 + + + + cc + + http://creativecommons.org/licenses/by/3.0/ + Creative Commons Attribution 3.0 + http://i.creativecommons.org/l/by/3.0/80x15.png + + + + + + + + + + + + + + + + + false + 20 + 600 + + + + false + INVALID SERVER + 5222 + update + + + StatusNet + + + + false + 0 + + diff --git a/view/smarty3/api_friends_xml.tpl b/view/smarty3/api_friends_xml.tpl new file mode 100644 index 0000000000..fe92eea6d3 --- /dev/null +++ b/view/smarty3/api_friends_xml.tpl @@ -0,0 +1,7 @@ + + + + {{foreach $users as $u}} + {{include file="file:{{$api_user_xml}}" user=$u}} + {{/foreach}} + diff --git a/view/smarty3/api_ratelimit_xml.tpl b/view/smarty3/api_ratelimit_xml.tpl new file mode 100644 index 0000000000..e4b470a255 --- /dev/null +++ b/view/smarty3/api_ratelimit_xml.tpl @@ -0,0 +1,6 @@ + + {{$hash.remaining_hits}} + {{$hash.hourly_limit}} + {{$hash.reset_time}} + {{$hash.resettime_in_seconds}} + diff --git a/view/smarty3/api_status_xml.tpl b/view/smarty3/api_status_xml.tpl new file mode 100644 index 0000000000..cbb736e22e --- /dev/null +++ b/view/smarty3/api_status_xml.tpl @@ -0,0 +1,46 @@ +{{if $status}} + {{$status.created_at}} + {{$status.id}} + {{$status.text}} + {{$status.source}} + {{$status.truncated}} + {{$status.in_reply_to_status_id}} + {{$status.in_reply_to_user_id}} + {{$status.favorited}} + {{$status.in_reply_to_screen_name}} + {{$status.geo}} + {{$status.coordinates}} + {{$status.place}} + {{$status.contributors}} + + {{$status.user.id}} + {{$status.user.name}} + {{$status.user.screen_name}} + {{$status.user.location}} + {{$status.user.description}} + {{$status.user.profile_image_url}} + {{$status.user.url}} + {{$status.user.protected}} + {{$status.user.followers}} + {{$status.user.profile_background_color}} + {{$status.user.profile_text_color}} + {{$status.user.profile_link_color}} + {{$status.user.profile_sidebar_fill_color}} + {{$status.user.profile_sidebar_border_color}} + {{$status.user.friends_count}} + {{$status.user.created_at}} + {{$status.user.favourites_count}} + {{$status.user.utc_offset}} + {{$status.user.time_zone}} + {{$status.user.profile_background_image_url}} + {{$status.user.profile_background_tile}} + {{$status.user.profile_use_background_image}} + + {{$status.user.geo_enabled}} + {{$status.user.verified}} + + {{$status.user.statuses_count}} + {{$status.user.lang}} + {{$status.user.contributors_enabled}} + +{{/if}} diff --git a/view/smarty3/api_test_xml.tpl b/view/smarty3/api_test_xml.tpl new file mode 100644 index 0000000000..80a541c39c --- /dev/null +++ b/view/smarty3/api_test_xml.tpl @@ -0,0 +1 @@ +{{$ok}} diff --git a/view/smarty3/api_timeline_atom.tpl b/view/smarty3/api_timeline_atom.tpl new file mode 100644 index 0000000000..4baed16045 --- /dev/null +++ b/view/smarty3/api_timeline_atom.tpl @@ -0,0 +1,90 @@ + + StatusNet + {{$rss.self}} + Friendica + Friendica API feed + {{$rss.logo}} + {{$rss.atom_updated}} + + + + + + http://activitystrea.ms/schema/1.0/person + {{$user.url}} + {{$user.name}} + + + + + + + {{$user.screen_name}} + {{$user.name}} + + homepage + {{$user.url}} + true + + + + + + + http://activitystrea.ms/schema/1.0/person + {{$user.contact_url}} + {{$user.name}} + + + + + + {{$user.screen_name}} + {{$user.name}} + + homepage + {{$user.url}} + true + + + + + + {{foreach $statuses as $status}} + + {{$status.objecttype}} + {{$status.message_id}} + {{$status.text}} + {{$status.statusnet_html}} + + {{$status.verb}} + {{$status.published}} + {{$status.updated}} + + + + + + + + http://activitystrea.ms/schema/1.0/person + {{$status.user.url}} + {{$status.user.name}} + + + + + {{$status.user.screen_name}} + {{$status.user.name}} + + + homepage + {{$status.user.url}} + true + + + + + + {{/foreach}} + diff --git a/view/smarty3/api_timeline_rss.tpl b/view/smarty3/api_timeline_rss.tpl new file mode 100644 index 0000000000..075cc83483 --- /dev/null +++ b/view/smarty3/api_timeline_rss.tpl @@ -0,0 +1,26 @@ + + + Friendica + {{$rss.alternate}} + + Friendica timeline + {{$rss.language}} + 40 + + {{$user.link}} + {{$user.name}}'s items + {{$user.profile_image_url}} + + +{{foreach $statuses as $status}} + + {{$status.user.name}}: {{$status.text}} + {{$status.text}} + {{$status.created_at}} + {{$status.url}} + {{$status.url}} + {{$status.source}} + +{{/foreach}} + + diff --git a/view/smarty3/api_timeline_xml.tpl b/view/smarty3/api_timeline_xml.tpl new file mode 100644 index 0000000000..48e9328662 --- /dev/null +++ b/view/smarty3/api_timeline_xml.tpl @@ -0,0 +1,20 @@ + +{{foreach $statuses as $status}} + {{$status.text}} + {{$status.truncated}} + {{$status.created_at}} + {{$status.in_reply_to_status_id}} + {{$status.source}} + {{$status.id}} + {{$status.in_reply_to_user_id}} + {{$status.in_reply_to_screen_name}} + {{$status.geo}} + {{$status.favorited}} +{{include file="file:{{$api_user_xml}}" user=$status.user}} {{$status.statusnet_html}} + {{$status.statusnet_conversation_id}} + {{$status.url}} + {{$status.coordinates}} + {{$status.place}} + {{$status.contributors}} + +{{/foreach}} diff --git a/view/smarty3/api_user_xml.tpl b/view/smarty3/api_user_xml.tpl new file mode 100644 index 0000000000..3b51992f60 --- /dev/null +++ b/view/smarty3/api_user_xml.tpl @@ -0,0 +1,46 @@ + + {{$user.id}} + {{$user.name}} + {{$user.screen_name}} + {{$user.location}} + {{$user.description}} + {{$user.profile_image_url}} + {{$user.url}} + {{$user.protected}} + {{$user.followers_count}} + {{$user.friends_count}} + {{$user.created_at}} + {{$user.favourites_count}} + {{$user.utc_offset}} + {{$user.time_zone}} + {{$user.statuses_count}} + {{$user.following}} + {{$user.profile_background_color}} + {{$user.profile_text_color}} + {{$user.profile_link_color}} + {{$user.profile_sidebar_fill_color}} + {{$user.profile_sidebar_border_color}} + {{$user.profile_background_image_url}} + {{$user.profile_background_tile}} + {{$user.profile_use_background_image}} + {{$user.notifications}} + {{$user.geo_enabled}} + {{$user.verified}} + {{$user.lang}} + {{$user.contributors_enabled}} + {{if $user.status}} + {{$user.status.created_at}} + {{$user.status.id}} + {{$user.status.text}} + {{$user.status.source}} + {{$user.status.truncated}} + {{$user.status.in_reply_to_status_id}} + {{$user.status.in_reply_to_user_id}} + {{$user.status.favorited}} + {{$user.status.in_reply_to_screen_name}} + {{$user.status.geo}} + {{$user.status.coordinates}} + {{$user.status.place}} + {{$user.status.contributors}} + {{/if}} + diff --git a/view/smarty3/apps.tpl b/view/smarty3/apps.tpl new file mode 100644 index 0000000000..335e0ca977 --- /dev/null +++ b/view/smarty3/apps.tpl @@ -0,0 +1,7 @@ +

{{$title}}

+ +
    + {{foreach $apps as $ap}} +
  • {{$ap}}
    • + {{/foreach}} +
diff --git a/view/smarty3/atom_feed.tpl b/view/smarty3/atom_feed.tpl new file mode 100644 index 0000000000..ccb85a48a5 --- /dev/null +++ b/view/smarty3/atom_feed.tpl @@ -0,0 +1,29 @@ + + + + {{$feed_id}} + {{$feed_title}} + Friendica + + {{$hub}} + {{$salmon}} + {{$community}} + + {{$feed_updated}} + + + {{$name}} + {{$profile_page}} + + + {{$birthday}} + diff --git a/view/smarty3/atom_feed_dfrn.tpl b/view/smarty3/atom_feed_dfrn.tpl new file mode 100644 index 0000000000..307001fbef --- /dev/null +++ b/view/smarty3/atom_feed_dfrn.tpl @@ -0,0 +1,29 @@ + + + + {{$feed_id}} + {{$feed_title}} + Friendica + + {{$hub}} + {{$salmon}} + {{$community}} + + {{$feed_updated}} + + + {{$name}} + {{$profile_page}} + + + {{$birthday}} + diff --git a/view/smarty3/atom_mail.tpl b/view/smarty3/atom_mail.tpl new file mode 100644 index 0000000000..9b843f5851 --- /dev/null +++ b/view/smarty3/atom_mail.tpl @@ -0,0 +1,17 @@ + + + + + {{$name}} + {{$profile_page}} + {{$thumb}} + + + {{$item_id}} + {{$parent_id}} + {{$created}} + {{$subject}} + {{$content}} + + + diff --git a/view/smarty3/atom_relocate.tpl b/view/smarty3/atom_relocate.tpl new file mode 100644 index 0000000000..78fdd7fadb --- /dev/null +++ b/view/smarty3/atom_relocate.tpl @@ -0,0 +1,17 @@ + + + + {{$url}} + {{$name}} + {{$photo}} + {{$thumb}} + {{$micro}} + {{$request}} + {{$confirm}} + {{$notify}} + {{$poll}} + {{$sitepubkey}} + + + + diff --git a/view/smarty3/atom_suggest.tpl b/view/smarty3/atom_suggest.tpl new file mode 100644 index 0000000000..972b9bc0b3 --- /dev/null +++ b/view/smarty3/atom_suggest.tpl @@ -0,0 +1,11 @@ + + + + {{$url}} + {{$name}} + {{$photo}} + {{$request}} + {{$note}} + + + diff --git a/view/smarty3/auto_request.tpl b/view/smarty3/auto_request.tpl new file mode 100644 index 0000000000..dfc5a4c80c --- /dev/null +++ b/view/smarty3/auto_request.tpl @@ -0,0 +1,37 @@ + +

{{$header}}

+ +

+{{$page_desc}}
+

+

+

+{{$invite_desc}} +

+

+{{$desc}} +

+ +
+ +
+ + +
+
+ + +
+ +
+ +
+ + +
+
diff --git a/view/smarty3/birthdays_reminder.tpl b/view/smarty3/birthdays_reminder.tpl new file mode 100644 index 0000000000..672e77aec2 --- /dev/null +++ b/view/smarty3/birthdays_reminder.tpl @@ -0,0 +1,10 @@ +{{if $count}} + + +{{/if}} + diff --git a/view/smarty3/categories_widget.tpl b/view/smarty3/categories_widget.tpl new file mode 100644 index 0000000000..10d4d2f83b --- /dev/null +++ b/view/smarty3/categories_widget.tpl @@ -0,0 +1,12 @@ +
+

{{$title}}

+
{{$desc}}
+ + + +
diff --git a/view/smarty3/comment_item.tpl b/view/smarty3/comment_item.tpl new file mode 100644 index 0000000000..8e5c0ef4cf --- /dev/null +++ b/view/smarty3/comment_item.tpl @@ -0,0 +1,39 @@ + {{if $threaded}} +
+ {{else}} +
+ {{/if}} +
+ + + + + + + + +
+ {{$mytitle}} +
+
+ + {{if $qcomment}} + + {{/if}} + +
+ + +
+
+ +
diff --git a/view/smarty3/common_friends.tpl b/view/smarty3/common_friends.tpl new file mode 100644 index 0000000000..9adb30b714 --- /dev/null +++ b/view/smarty3/common_friends.tpl @@ -0,0 +1,12 @@ +
+
+ + {{$name}} + +
+
+
+ {{$name}} +
+
+
\ No newline at end of file diff --git a/view/smarty3/common_tabs.tpl b/view/smarty3/common_tabs.tpl new file mode 100644 index 0000000000..be36459665 --- /dev/null +++ b/view/smarty3/common_tabs.tpl @@ -0,0 +1,5 @@ + diff --git a/view/smarty3/contact_block.tpl b/view/smarty3/contact_block.tpl new file mode 100644 index 0000000000..e688af287a --- /dev/null +++ b/view/smarty3/contact_block.tpl @@ -0,0 +1,12 @@ +
+

{{$contacts}}

+{{if $micropro}} + {{$viewcontacts}} +
+ {{foreach $micropro as $m}} + {{$m}} + {{/foreach}} +
+{{/if}} +
+
diff --git a/view/smarty3/contact_edit.tpl b/view/smarty3/contact_edit.tpl new file mode 100644 index 0000000000..d12fdd44fb --- /dev/null +++ b/view/smarty3/contact_edit.tpl @@ -0,0 +1,88 @@ + +

{{$header}}

+ +
+ + {{$tab_str}} + + + + + + +
+ +
+
+ + +
+ + + {{if $poll_enabled}} +
+
{{$lastupdtext}} {{$last_update}}
+ {{$updpub}} {{$poll_interval}} {{$udnow}} +
+ {{/if}} +
+ + {{include file="file:{{$field_checkbox}}" field=$hidden}} + +
+

{{$lbl_info1}}

+ + +
+
+ + +
+

{{$lbl_vis1}}

+

{{$lbl_vis2}}

+
+{{$profile_select}} +
+ + + +
+
diff --git a/view/smarty3/contact_end.tpl b/view/smarty3/contact_end.tpl new file mode 100644 index 0000000000..e69de29bb2 diff --git a/view/smarty3/contact_head.tpl b/view/smarty3/contact_head.tpl new file mode 100644 index 0000000000..72e7edbfb9 --- /dev/null +++ b/view/smarty3/contact_head.tpl @@ -0,0 +1,30 @@ + + + diff --git a/view/smarty3/contact_template.tpl b/view/smarty3/contact_template.tpl new file mode 100644 index 0000000000..790431a9f3 --- /dev/null +++ b/view/smarty3/contact_template.tpl @@ -0,0 +1,25 @@ + +
+
+
+ + {{$contact.name}} + + {{if $contact.photo_menu}} + menu +
+
    + {{$contact.photo_menu}} +
+
+ {{/if}} +
+ +
+
+
{{$contact.name}}
+ +
+
diff --git a/view/smarty3/contacts-end.tpl b/view/smarty3/contacts-end.tpl new file mode 100644 index 0000000000..e69de29bb2 diff --git a/view/smarty3/contacts-head.tpl b/view/smarty3/contacts-head.tpl new file mode 100644 index 0000000000..41f8ebddb6 --- /dev/null +++ b/view/smarty3/contacts-head.tpl @@ -0,0 +1,17 @@ + + + + + diff --git a/view/smarty3/contacts-template.tpl b/view/smarty3/contacts-template.tpl new file mode 100644 index 0000000000..3c998f792a --- /dev/null +++ b/view/smarty3/contacts-template.tpl @@ -0,0 +1,26 @@ +

{{$header}}{{if $total}} ({{$total}}){{/if}}

+ +{{if $finding}}

{{$finding}}

{{/if}} + +
+
+{{$desc}} + + +
+
+
+ +{{$tabs}} + + +{{foreach $contacts as $c}} + {{include file="file:{{$contact_template}}" contact=$c}} +{{/foreach}} +
+ +{{$paginate}} + + + + diff --git a/view/smarty3/contacts-widget-sidebar.tpl b/view/smarty3/contacts-widget-sidebar.tpl new file mode 100644 index 0000000000..d7b9c4b5d5 --- /dev/null +++ b/view/smarty3/contacts-widget-sidebar.tpl @@ -0,0 +1,6 @@ +{{$vcard_widget}} +{{$follow_widget}} +{{$groups_widget}} +{{$findpeople_widget}} +{{$networks_widget}} + diff --git a/view/smarty3/content.tpl b/view/smarty3/content.tpl new file mode 100644 index 0000000000..466045d396 --- /dev/null +++ b/view/smarty3/content.tpl @@ -0,0 +1,2 @@ +
+
diff --git a/view/smarty3/conversation.tpl b/view/smarty3/conversation.tpl new file mode 100644 index 0000000000..ce5dc5a2f6 --- /dev/null +++ b/view/smarty3/conversation.tpl @@ -0,0 +1,29 @@ +{{$live_update}} + +{{foreach $threads as $thread}} +
+ {{foreach $thread.items as $item}} + {{if $item.comment_firstcollapsed}} +
+ {{$thread.num_comments}} {{$thread.hide_text}} +
+ {{/if}} + + {{include file="file:{{$item.template}}"}} + + + {{/foreach}} +
+{{/foreach}} + +
+ +{{if $dropping}} + +
+{{/if}} diff --git a/view/smarty3/crepair.tpl b/view/smarty3/crepair.tpl new file mode 100644 index 0000000000..2a05b96788 --- /dev/null +++ b/view/smarty3/crepair.tpl @@ -0,0 +1,46 @@ + +
+ +

{{$contact_name}}

+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + diff --git a/view/smarty3/cropbody.tpl b/view/smarty3/cropbody.tpl new file mode 100644 index 0000000000..da5b1e8593 --- /dev/null +++ b/view/smarty3/cropbody.tpl @@ -0,0 +1,58 @@ +

{{$title}}

+

+{{$desc}} +

+
+{{$title}} +
+
+
+
+ + + +
+ + + + + + + + + + + +
+ +
+ +
diff --git a/view/smarty3/cropend.tpl b/view/smarty3/cropend.tpl new file mode 100644 index 0000000000..e69de29bb2 diff --git a/view/smarty3/crophead.tpl b/view/smarty3/crophead.tpl new file mode 100644 index 0000000000..48f3754265 --- /dev/null +++ b/view/smarty3/crophead.tpl @@ -0,0 +1,4 @@ + + + + diff --git a/view/smarty3/delegate.tpl b/view/smarty3/delegate.tpl new file mode 100644 index 0000000000..cbaa8da860 --- /dev/null +++ b/view/smarty3/delegate.tpl @@ -0,0 +1,57 @@ +

{{$header}}

+ +
{{$desc}}
+ +{{if $managers}} +

{{$head_managers}}

+ +{{foreach $managers as $x}} + +
+ + + +
+ +{{/foreach}} +
+
+{{/if}} + + +

{{$head_delegates}}

+ +{{if $delegates}} +{{foreach $delegates as $x}} + +
+ + + +
+ +{{/foreach}} +
+{{else}} +{{$none}} +{{/if}} +
+ + +

{{$head_potentials}}

+{{if $potentials}} +{{foreach $potentials as $x}} + +
+ + + +
+ +{{/foreach}} +
+{{else}} +{{$none}} +{{/if}} +
+ diff --git a/view/smarty3/dfrn_req_confirm.tpl b/view/smarty3/dfrn_req_confirm.tpl new file mode 100644 index 0000000000..655af22d41 --- /dev/null +++ b/view/smarty3/dfrn_req_confirm.tpl @@ -0,0 +1,21 @@ + +

+{{$welcome}} +
+{{$please}} + +

+
+ + + +{{$aes_allow}} + + + + + +
+ +
+
\ No newline at end of file diff --git a/view/smarty3/dfrn_request.tpl b/view/smarty3/dfrn_request.tpl new file mode 100644 index 0000000000..aa5cbd6e46 --- /dev/null +++ b/view/smarty3/dfrn_request.tpl @@ -0,0 +1,65 @@ + +

{{$header}}

+ +

+{{$page_desc}}
+

+{{$invite_desc}} +

+

+{{$desc}} +

+ +
+ +
+ + +
+
+ +

+{{$pls_answer}} +

+ +
+ + +

+{{$does_know}} +

+ +
+ + + +
+
+
+ + + +
+
+ + +

+{{$add_note}} +

+
+ +
+ + +
+ +
+ + +
+
diff --git a/view/smarty3/diasp_dec_hdr.tpl b/view/smarty3/diasp_dec_hdr.tpl new file mode 100644 index 0000000000..636ff7bd0e --- /dev/null +++ b/view/smarty3/diasp_dec_hdr.tpl @@ -0,0 +1,8 @@ + + {{$inner_iv}} + {{$inner_key}} + + {{$author_name}} + {{$author_uri}} + + diff --git a/view/smarty3/diaspora_comment.tpl b/view/smarty3/diaspora_comment.tpl new file mode 100644 index 0000000000..27ec3dffce --- /dev/null +++ b/view/smarty3/diaspora_comment.tpl @@ -0,0 +1,11 @@ + + + + {{$guid}} + {{$parent_guid}} + {{$authorsig}} + {{$body}} + {{$handle}} + + + \ No newline at end of file diff --git a/view/smarty3/diaspora_comment_relay.tpl b/view/smarty3/diaspora_comment_relay.tpl new file mode 100644 index 0000000000..37a9e88b3a --- /dev/null +++ b/view/smarty3/diaspora_comment_relay.tpl @@ -0,0 +1,12 @@ + + + + {{$guid}} + {{$parent_guid}} + {{$parentsig}} + {{$authorsig}} + {{$body}} + {{$handle}} + + + \ No newline at end of file diff --git a/view/smarty3/diaspora_conversation.tpl b/view/smarty3/diaspora_conversation.tpl new file mode 100644 index 0000000000..dc4482e4b0 --- /dev/null +++ b/view/smarty3/diaspora_conversation.tpl @@ -0,0 +1,29 @@ + + + + {{$conv.guid}} + {{$conv.subject}} + {{$conv.created_at}} + + {{foreach $conv.messages as $msg}} + + + {{$msg.guid}} + {{$msg.parent_guid}} + {{if $msg.parent_author_signature}} + {{$msg.parent_author_signature}} + {{/if}} + {{$msg.author_signature}} + {{$msg.text}} + {{$msg.created_at}} + {{$msg.diaspora_handle}} + {{$msg.conversation_guid}} + + + {{/foreach}} + + {{$conv.diaspora_handle}} + {{$conv.participant_handles}} + + + diff --git a/view/smarty3/diaspora_like.tpl b/view/smarty3/diaspora_like.tpl new file mode 100644 index 0000000000..b03aef37a1 --- /dev/null +++ b/view/smarty3/diaspora_like.tpl @@ -0,0 +1,12 @@ + + + + {{$target_type}} + {{$guid}} + {{$parent_guid}} + {{$authorsig}} + {{$positive}} + {{$handle}} + + + diff --git a/view/smarty3/diaspora_like_relay.tpl b/view/smarty3/diaspora_like_relay.tpl new file mode 100644 index 0000000000..30df4cac67 --- /dev/null +++ b/view/smarty3/diaspora_like_relay.tpl @@ -0,0 +1,13 @@ + + + + {{$guid}} + {{$target_type}} + {{$parent_guid}} + {{$parentsig}} + {{$authorsig}} + {{$positive}} + {{$handle}} + + + diff --git a/view/smarty3/diaspora_message.tpl b/view/smarty3/diaspora_message.tpl new file mode 100644 index 0000000000..3413d79b00 --- /dev/null +++ b/view/smarty3/diaspora_message.tpl @@ -0,0 +1,13 @@ + + + + {{$msg.guid}} + {{$msg.parent_guid}} + {{$msg.author_signature}} + {{$msg.text}} + {{$msg.created_at}} + {{$msg.diaspora_handle}} + {{$msg.conversation_guid}} + + + diff --git a/view/smarty3/diaspora_photo.tpl b/view/smarty3/diaspora_photo.tpl new file mode 100644 index 0000000000..cd7ef58023 --- /dev/null +++ b/view/smarty3/diaspora_photo.tpl @@ -0,0 +1,13 @@ + + + + {{$path}} + {{$filename}} + {{$msg_guid}} + {{$guid}} + {{$handle}} + {{$public}} + {{$created_at}} + + + \ No newline at end of file diff --git a/view/smarty3/diaspora_post.tpl b/view/smarty3/diaspora_post.tpl new file mode 100644 index 0000000000..abbcc4c610 --- /dev/null +++ b/view/smarty3/diaspora_post.tpl @@ -0,0 +1,11 @@ + + + + {{$body}} + {{$guid}} + {{$handle}} + {{$public}} + {{$created}} + + + \ No newline at end of file diff --git a/view/smarty3/diaspora_profile.tpl b/view/smarty3/diaspora_profile.tpl new file mode 100644 index 0000000000..04f2e2948b --- /dev/null +++ b/view/smarty3/diaspora_profile.tpl @@ -0,0 +1,16 @@ + + + {{$handle}} + {{$first}} + {{$last}} + {{$large}} + {{$small}} + {{$medium}} + {{$dob}} + {{$gender}} + {{$about}} + {{$location}} + {{$searchable}} + {{$tags}} + + diff --git a/view/smarty3/diaspora_relay_retraction.tpl b/view/smarty3/diaspora_relay_retraction.tpl new file mode 100644 index 0000000000..5e7aed41f3 --- /dev/null +++ b/view/smarty3/diaspora_relay_retraction.tpl @@ -0,0 +1,10 @@ + + + + {{$type}} + {{$guid}} + {{$signature}} + {{$handle}} + + + diff --git a/view/smarty3/diaspora_relayable_retraction.tpl b/view/smarty3/diaspora_relayable_retraction.tpl new file mode 100644 index 0000000000..927e394f39 --- /dev/null +++ b/view/smarty3/diaspora_relayable_retraction.tpl @@ -0,0 +1,11 @@ + + + + {{$target_type}} + {{$guid}} + {{$parentsig}} + {{$authorsig}} + {{$handle}} + + + diff --git a/view/smarty3/diaspora_retract.tpl b/view/smarty3/diaspora_retract.tpl new file mode 100644 index 0000000000..26e2cb94e3 --- /dev/null +++ b/view/smarty3/diaspora_retract.tpl @@ -0,0 +1,9 @@ + + + + {{$guid}} + {{$type}} + {{$handle}} + + + \ No newline at end of file diff --git a/view/smarty3/diaspora_share.tpl b/view/smarty3/diaspora_share.tpl new file mode 100644 index 0000000000..59eb061242 --- /dev/null +++ b/view/smarty3/diaspora_share.tpl @@ -0,0 +1,8 @@ + + + + {{$sender}} + {{$recipient}} + + + \ No newline at end of file diff --git a/view/smarty3/diaspora_signed_retract.tpl b/view/smarty3/diaspora_signed_retract.tpl new file mode 100644 index 0000000000..f0f346da80 --- /dev/null +++ b/view/smarty3/diaspora_signed_retract.tpl @@ -0,0 +1,10 @@ + + + + {{$guid}} + {{$type}} + {{$handle}} + {{$signature}} + + + diff --git a/view/smarty3/diaspora_vcard.tpl b/view/smarty3/diaspora_vcard.tpl new file mode 100644 index 0000000000..9d234a3989 --- /dev/null +++ b/view/smarty3/diaspora_vcard.tpl @@ -0,0 +1,57 @@ +
+
+
Nickname
+
+ {{$diaspora.nickname}} +
+
+
+
Full name
+
+ {{$diaspora.fullname}} +
+
+ +
+
First name
+
+ {{$diaspora.firstname}} +
+
+
+
Family name
+
+ {{$diaspora.lastname}} +
+
+
+
URL
+
+ {{$diaspora.podloc}}/ +
+
+
+
Photo
+
+ +
+
+
+
Photo
+
+ +
+
+
+
Photo
+
+ +
+
+
+
Searchable
+
+ {{$diaspora.searchable}} +
+
+
diff --git a/view/smarty3/directory_header.tpl b/view/smarty3/directory_header.tpl new file mode 100644 index 0000000000..c2ca64682c --- /dev/null +++ b/view/smarty3/directory_header.tpl @@ -0,0 +1,16 @@ +

{{$sitedir}}

+ +{{$globaldir}} +{{$admin}} + +{{$finding}} + +
+
+{{$desc}} + + +
+
+
+ diff --git a/view/smarty3/directory_item.tpl b/view/smarty3/directory_item.tpl new file mode 100644 index 0000000000..f4bd66d771 --- /dev/null +++ b/view/smarty3/directory_item.tpl @@ -0,0 +1,11 @@ + +
+
+
+ {{$alt_text}} +
+
+ +
{{$name}}
+
{{$details}}
+
diff --git a/view/smarty3/display-head.tpl b/view/smarty3/display-head.tpl new file mode 100644 index 0000000000..3d4e7e96ad --- /dev/null +++ b/view/smarty3/display-head.tpl @@ -0,0 +1,8 @@ + + diff --git a/view/smarty3/email_notify_html.tpl b/view/smarty3/email_notify_html.tpl new file mode 100644 index 0000000000..38c933aacb --- /dev/null +++ b/view/smarty3/email_notify_html.tpl @@ -0,0 +1,27 @@ + + + + {{$banner}} + + + + + + + + + + + + + + + + + + + + +
{{$product}}
{{$preamble}}
{{$source_name}}
{{$title}}
{{$htmlversion}}
{{$hsitelink}}
{{$hitemlink}}
{{$thanks}}
{{$site_admin}}
+ + diff --git a/view/smarty3/email_notify_text.tpl b/view/smarty3/email_notify_text.tpl new file mode 100644 index 0000000000..3de006095d --- /dev/null +++ b/view/smarty3/email_notify_text.tpl @@ -0,0 +1,13 @@ + +{{$preamble}} + +{{$title}} + +{{$textversion}} + +{{$tsitelink}} +{{$titemlink}} + +{{$thanks}} +{{$site_admin}} + diff --git a/view/smarty3/end.tpl b/view/smarty3/end.tpl new file mode 100644 index 0000000000..e69de29bb2 diff --git a/view/smarty3/event.tpl b/view/smarty3/event.tpl new file mode 100644 index 0000000000..c8570cef29 --- /dev/null +++ b/view/smarty3/event.tpl @@ -0,0 +1,10 @@ +{{foreach $events as $event}} +
+ + {{if $event.item.author-name}}{{$event.item.author-name}}{{/if}} + {{$event.html}} + {{if $event.item.plink}}{{/if}} + {{if $event.edit}}{{/if}} +
+
+{{/foreach}} diff --git a/view/smarty3/event_end.tpl b/view/smarty3/event_end.tpl new file mode 100644 index 0000000000..e69de29bb2 diff --git a/view/smarty3/event_form.tpl b/view/smarty3/event_form.tpl new file mode 100644 index 0000000000..0091b59aaa --- /dev/null +++ b/view/smarty3/event_form.tpl @@ -0,0 +1,49 @@ +

{{$title}}

+ +

+{{$desc}} +

+ +
+ + + + + +
{{$s_text}}
+{{$s_dsel}} {{$s_tsel}} + +
{{$f_text}}
+{{$f_dsel}} {{$f_tsel}} + +
+ +
{{$n_text}}
+ +
+ +
{{$a_text}}
+ +
+ +
{{$t_text}}
+ + + +
{{$d_text}}
+ + + +
{{$l_text}}
+ + +
{{$sh_text}}
+
+ +{{$acl}} + +
+ +
+ + diff --git a/view/smarty3/event_head.tpl b/view/smarty3/event_head.tpl new file mode 100644 index 0000000000..2e2992e078 --- /dev/null +++ b/view/smarty3/event_head.tpl @@ -0,0 +1,139 @@ + + + + + + + + + diff --git a/view/smarty3/events-js.tpl b/view/smarty3/events-js.tpl new file mode 100644 index 0000000000..c87d205292 --- /dev/null +++ b/view/smarty3/events-js.tpl @@ -0,0 +1,6 @@ +{{$tabs}} +

{{$title}}

+ + + +
diff --git a/view/smarty3/events.tpl b/view/smarty3/events.tpl new file mode 100644 index 0000000000..0d20b0a72c --- /dev/null +++ b/view/smarty3/events.tpl @@ -0,0 +1,24 @@ +{{$tabs}} +

{{$title}}

+ + + +
+ + {{$calendar}} + +
+
+ + +{{foreach $events as $event}} +
+ {{if $event.is_first}}
{{$event.d}}
{{/if}} + {{if $event.item.author-name}}{{$event.item.author-name}}{{/if}} + {{$event.html}} + {{if $event.item.plink}}{{/if}} + {{if $event.edit}}{{/if}} +
+
+ +{{/foreach}} diff --git a/view/smarty3/events_reminder.tpl b/view/smarty3/events_reminder.tpl new file mode 100644 index 0000000000..bd070575fe --- /dev/null +++ b/view/smarty3/events_reminder.tpl @@ -0,0 +1,10 @@ +{{if $count}} + + +{{/if}} + diff --git a/view/smarty3/failed_updates.tpl b/view/smarty3/failed_updates.tpl new file mode 100644 index 0000000000..68c0bcdf2a --- /dev/null +++ b/view/smarty3/failed_updates.tpl @@ -0,0 +1,17 @@ +

{{$banner}}

+ +
{{$desc}}
+ +{{if $failed}} +{{foreach $failed as $f}} + +

{{$f}}

+ + +
+{{/foreach}} +{{/if}} + diff --git a/view/smarty3/fake_feed.tpl b/view/smarty3/fake_feed.tpl new file mode 100644 index 0000000000..c37071cf4a --- /dev/null +++ b/view/smarty3/fake_feed.tpl @@ -0,0 +1,13 @@ + + + + fake feed + fake title + + 1970-01-01T00:00:00Z + + + Fake Name + http://example.com + + diff --git a/view/smarty3/field.tpl b/view/smarty3/field.tpl new file mode 100644 index 0000000000..c364bd91e2 --- /dev/null +++ b/view/smarty3/field.tpl @@ -0,0 +1,4 @@ + + {{if $field.0==select}} + {{include file="file:{{$field_select}}"}} + {{/if}} diff --git a/view/smarty3/field_checkbox.tpl b/view/smarty3/field_checkbox.tpl new file mode 100644 index 0000000000..3771fc4a7f --- /dev/null +++ b/view/smarty3/field_checkbox.tpl @@ -0,0 +1,6 @@ + +
+ + + {{$field.3}} +
diff --git a/view/smarty3/field_combobox.tpl b/view/smarty3/field_combobox.tpl new file mode 100644 index 0000000000..3d69e2d272 --- /dev/null +++ b/view/smarty3/field_combobox.tpl @@ -0,0 +1,18 @@ + +
+ + {{* html5 don't work on Chrome, Safari and IE9 + + + {{foreach $field.4 as $opt=>$val}} *}} + + + + + {{$field.3}} +
+ diff --git a/view/smarty3/field_custom.tpl b/view/smarty3/field_custom.tpl new file mode 100644 index 0000000000..e1bf318dad --- /dev/null +++ b/view/smarty3/field_custom.tpl @@ -0,0 +1,6 @@ + +
+ + {{$field.2}} + {{$field.3}} +
diff --git a/view/smarty3/field_input.tpl b/view/smarty3/field_input.tpl new file mode 100644 index 0000000000..9f0103f84f --- /dev/null +++ b/view/smarty3/field_input.tpl @@ -0,0 +1,6 @@ + +
+ + + {{$field.3}} +
diff --git a/view/smarty3/field_intcheckbox.tpl b/view/smarty3/field_intcheckbox.tpl new file mode 100644 index 0000000000..a6ef7cc8fa --- /dev/null +++ b/view/smarty3/field_intcheckbox.tpl @@ -0,0 +1,6 @@ + +
+ + + {{$field.4}} +
diff --git a/view/smarty3/field_openid.tpl b/view/smarty3/field_openid.tpl new file mode 100644 index 0000000000..53dbfdde03 --- /dev/null +++ b/view/smarty3/field_openid.tpl @@ -0,0 +1,6 @@ + +
+ + + {{$field.3}} +
diff --git a/view/smarty3/field_password.tpl b/view/smarty3/field_password.tpl new file mode 100644 index 0000000000..e840a312d2 --- /dev/null +++ b/view/smarty3/field_password.tpl @@ -0,0 +1,6 @@ + +
+ + + {{$field.3}} +
diff --git a/view/smarty3/field_radio.tpl b/view/smarty3/field_radio.tpl new file mode 100644 index 0000000000..cff8881f50 --- /dev/null +++ b/view/smarty3/field_radio.tpl @@ -0,0 +1,6 @@ + +
+ + + {{$field.3}} +
diff --git a/view/smarty3/field_richtext.tpl b/view/smarty3/field_richtext.tpl new file mode 100644 index 0000000000..6414939898 --- /dev/null +++ b/view/smarty3/field_richtext.tpl @@ -0,0 +1,6 @@ + +
+ + + {{$field.3}} +
diff --git a/view/smarty3/field_select.tpl b/view/smarty3/field_select.tpl new file mode 100644 index 0000000000..18192e1d80 --- /dev/null +++ b/view/smarty3/field_select.tpl @@ -0,0 +1,8 @@ + +
+ + + {{$field.3}} +
diff --git a/view/smarty3/field_select_raw.tpl b/view/smarty3/field_select_raw.tpl new file mode 100644 index 0000000000..4e495dcf83 --- /dev/null +++ b/view/smarty3/field_select_raw.tpl @@ -0,0 +1,8 @@ + +
+ + + {{$field.3}} +
diff --git a/view/smarty3/field_textarea.tpl b/view/smarty3/field_textarea.tpl new file mode 100644 index 0000000000..8c311563f2 --- /dev/null +++ b/view/smarty3/field_textarea.tpl @@ -0,0 +1,6 @@ + +
+ + + {{$field.3}} +
diff --git a/view/smarty3/field_themeselect.tpl b/view/smarty3/field_themeselect.tpl new file mode 100644 index 0000000000..9b6ef23a51 --- /dev/null +++ b/view/smarty3/field_themeselect.tpl @@ -0,0 +1,9 @@ + +
+ + + {{$field.3}} +
+
diff --git a/view/smarty3/field_yesno.tpl b/view/smarty3/field_yesno.tpl new file mode 100644 index 0000000000..e36e775c7a --- /dev/null +++ b/view/smarty3/field_yesno.tpl @@ -0,0 +1,13 @@ +
+ + + {{$field.3}} +
diff --git a/view/smarty3/fileas_widget.tpl b/view/smarty3/fileas_widget.tpl new file mode 100644 index 0000000000..70d68c56e4 --- /dev/null +++ b/view/smarty3/fileas_widget.tpl @@ -0,0 +1,12 @@ +
+

{{$title}}

+
{{$desc}}
+ + + +
diff --git a/view/smarty3/filebrowser.tpl b/view/smarty3/filebrowser.tpl new file mode 100644 index 0000000000..c5171ae846 --- /dev/null +++ b/view/smarty3/filebrowser.tpl @@ -0,0 +1,84 @@ + + + + + + + + + +
+
    +
  • FileBrowser
    • +
+
+
+ +
+
+ {{foreach $path as $p}}{{$p.1}}{{/foreach}} +
+
+
    + {{foreach $folders as $f}}
  • {{$f.1}}
    • {{/foreach}} +
+
+
+
    + {{foreach $files as $f}} +
  • {{$f.1}}
    • + {{/foreach}} +
+
+
+
+
+ +
+ + + diff --git a/view/smarty3/filer_dialog.tpl b/view/smarty3/filer_dialog.tpl new file mode 100644 index 0000000000..5444d7f4d8 --- /dev/null +++ b/view/smarty3/filer_dialog.tpl @@ -0,0 +1,4 @@ +{{include file="file:{{$field_combobox}}"}} +
+ +
diff --git a/view/smarty3/follow.tpl b/view/smarty3/follow.tpl new file mode 100644 index 0000000000..e0326c51ac --- /dev/null +++ b/view/smarty3/follow.tpl @@ -0,0 +1,8 @@ +
+

{{$connect}}

+
{{$desc}}
+
+ +
+
+ diff --git a/view/smarty3/follow_slap.tpl b/view/smarty3/follow_slap.tpl new file mode 100644 index 0000000000..faa5f4be25 --- /dev/null +++ b/view/smarty3/follow_slap.tpl @@ -0,0 +1,25 @@ + + + {{$name}} + {{$profile_page}} + + + + + {{$item_id}} + {{$title}} + {{$published}} + {{$content}} + + + http://activitystrea.ms/schema/1.0/person + {{$profile_page}} + + + + {{$nick}} + {{$name}} + + {{$verb}} + {{$ostat_follow}} + diff --git a/view/smarty3/generic_links_widget.tpl b/view/smarty3/generic_links_widget.tpl new file mode 100644 index 0000000000..8b4c67b6f6 --- /dev/null +++ b/view/smarty3/generic_links_widget.tpl @@ -0,0 +1,11 @@ +
+ {{if $title}}

{{$title}}

{{/if}} + {{if $desc}}
{{$desc}}
{{/if}} + + + +
diff --git a/view/smarty3/group_drop.tpl b/view/smarty3/group_drop.tpl new file mode 100644 index 0000000000..670136db7c --- /dev/null +++ b/view/smarty3/group_drop.tpl @@ -0,0 +1,9 @@ +
+ +
+
diff --git a/view/smarty3/group_edit.tpl b/view/smarty3/group_edit.tpl new file mode 100644 index 0000000000..e381ff47b1 --- /dev/null +++ b/view/smarty3/group_edit.tpl @@ -0,0 +1,23 @@ +

{{$title}}

+ + +
+
+ + + {{include file="file:{{$field_input}}" field=$gname}} + {{if $drop}}{{$drop}}{{/if}} +
+ +
+
+
+
+ + +{{if $groupedit_info}} +
+ {{include file="file:{{$groupeditortpl}}" groupeditor=$groupedit_info}} +
+{{/if}} +{{if $desc}}
{{$desc}}
{{/if}} diff --git a/view/smarty3/group_selection.tpl b/view/smarty3/group_selection.tpl new file mode 100644 index 0000000000..2223125ea1 --- /dev/null +++ b/view/smarty3/group_selection.tpl @@ -0,0 +1,8 @@ +
+ + +
diff --git a/view/smarty3/group_side.tpl b/view/smarty3/group_side.tpl new file mode 100644 index 0000000000..ebc8205303 --- /dev/null +++ b/view/smarty3/group_side.tpl @@ -0,0 +1,33 @@ +
+

{{$title}}

+ + + + {{if $ungrouped}} + + {{/if}} +
+ + diff --git a/view/smarty3/groupeditor.tpl b/view/smarty3/groupeditor.tpl new file mode 100644 index 0000000000..c79bb0a2a7 --- /dev/null +++ b/view/smarty3/groupeditor.tpl @@ -0,0 +1,16 @@ +
+

{{$groupeditor.label_members}}

+
+{{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}} +
+
+
+
+ +
+

{{$groupeditor.label_contacts}}

+
+{{foreach $groupeditor.contacts as $m}} {{$m}} {{/foreach}} +
+
+
diff --git a/view/smarty3/head.tpl b/view/smarty3/head.tpl new file mode 100644 index 0000000000..9b7bc915bc --- /dev/null +++ b/view/smarty3/head.tpl @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/view/smarty3/hide_comments.tpl b/view/smarty3/hide_comments.tpl new file mode 100644 index 0000000000..f4ed9c5521 --- /dev/null +++ b/view/smarty3/hide_comments.tpl @@ -0,0 +1,4 @@ +
+{{$num_comments}} {{$hide_text}} +
+
diff --git a/view/smarty3/install.tpl b/view/smarty3/install.tpl new file mode 100644 index 0000000000..81475f587e --- /dev/null +++ b/view/smarty3/install.tpl @@ -0,0 +1,10 @@ + +

{{$title}}

+

{{$pass}}

+ + +{{if $status}} +

{{$status}}

+{{/if}} + +{{$text}} diff --git a/view/smarty3/install_checks.tpl b/view/smarty3/install_checks.tpl new file mode 100644 index 0000000000..2a47a6e0bc --- /dev/null +++ b/view/smarty3/install_checks.tpl @@ -0,0 +1,24 @@ +

{{$title}}

+

{{$pass}}

+
+ +{{foreach $checks as $check}} + + {{if $check.help}} + + {{/if}} +{{/foreach}} +
{{$check.title}} {{if $check.required}}(required){{/if}}
{{$check.help}}
+ +{{if $phpath}} + +{{/if}} + +{{if $passed}} + + +{{else}} + + +{{/if}} +
diff --git a/view/smarty3/install_db.tpl b/view/smarty3/install_db.tpl new file mode 100644 index 0000000000..3d9a107fe2 --- /dev/null +++ b/view/smarty3/install_db.tpl @@ -0,0 +1,30 @@ + +

{{$title}}

+

{{$pass}}

+ + +

+{{$info_01}}
+{{$info_02}}
+{{$info_03}} +

+ +{{if $status}} +

{{$status}}

+{{/if}} + +
+ + + + +{{include file="file:{{$field_input}}" field=$dbhost}} +{{include file="file:{{$field_input}}" field=$dbuser}} +{{include file="file:{{$field_password}}" field=$dbpass}} +{{include file="file:{{$field_input}}" field=$dbdata}} + + + + +
+ diff --git a/view/smarty3/install_settings.tpl b/view/smarty3/install_settings.tpl new file mode 100644 index 0000000000..83efa3d718 --- /dev/null +++ b/view/smarty3/install_settings.tpl @@ -0,0 +1,25 @@ + +

{{$title}}

+

{{$pass}}

+ + +{{if $status}} +

{{$status}}

+{{/if}} + +
+ + + + + + + + +{{include file="file:{{$field_input}}" field=$adminmail}} +{{$timezone}} + + + +
+ diff --git a/view/smarty3/intros.tpl b/view/smarty3/intros.tpl new file mode 100644 index 0000000000..abf198158e --- /dev/null +++ b/view/smarty3/intros.tpl @@ -0,0 +1,28 @@ + +
+ +

{{$str_notifytype}} {{$notify_type}}

+
{{$fullname}}
+{{$fullname}} +
{{$knowyou}}
+
{{$note}}
+
+
+ + +
+
+ +
+{{include file="file:{{$field_checkbox}}" field=$hidden}} +{{include file="file:{{$field_checkbox}}" field=$activity}} + + + + +{{$dfrn_text}} + + +
+
+
diff --git a/view/smarty3/invite.tpl b/view/smarty3/invite.tpl new file mode 100644 index 0000000000..117ee7cd62 --- /dev/null +++ b/view/smarty3/invite.tpl @@ -0,0 +1,27 @@ +
+
+ +

{{$invite}}

+ +
+{{$addr_text}} +
+ +
+ +
+ +
+{{$msg_text}} +
+ +
+ +
+ +
+ +
+ +
+
diff --git a/view/smarty3/jot-end.tpl b/view/smarty3/jot-end.tpl new file mode 100644 index 0000000000..e69de29bb2 diff --git a/view/smarty3/jot-header.tpl b/view/smarty3/jot-header.tpl new file mode 100644 index 0000000000..493752c7f7 --- /dev/null +++ b/view/smarty3/jot-header.tpl @@ -0,0 +1,322 @@ + + + + + diff --git a/view/smarty3/jot.tpl b/view/smarty3/jot.tpl new file mode 100644 index 0000000000..a25295884d --- /dev/null +++ b/view/smarty3/jot.tpl @@ -0,0 +1,88 @@ + +
+
+
 
+
+
+
+ +
+ + + + + + + + +
+ {{if $placeholdercategory}} +
+ {{/if}} +
+ + +
+ +
+ + +
+
+
+
+
+
+ + +
+ +
+
+ +
+
+ +
+ + +
+ {{$bang}} +
+ + {{$preview}} + +
+ + +
+ {{$jotplugins}} +
+ +
+ +
+ + + +
+
+ {{$acl}} +
+
{{$emailcc}}
+
+ {{$jotnets}} +
+
+ + +
+ +
+
+
+ {{if $content}}{{/if}} diff --git a/view/smarty3/jot_geotag.tpl b/view/smarty3/jot_geotag.tpl new file mode 100644 index 0000000000..b0f71e73bf --- /dev/null +++ b/view/smarty3/jot_geotag.tpl @@ -0,0 +1,8 @@ + + if(navigator.geolocation) { + navigator.geolocation.getCurrentPosition(function(position) { + $('#jot-coord').val(position.coords.latitude + ' ' + position.coords.longitude); + $('#profile-nolocation-wrapper').show(); + }); + } + diff --git a/view/smarty3/lang_selector.tpl b/view/smarty3/lang_selector.tpl new file mode 100644 index 0000000000..2d0e9cb740 --- /dev/null +++ b/view/smarty3/lang_selector.tpl @@ -0,0 +1,10 @@ +
lang
+ diff --git a/view/smarty3/like_noshare.tpl b/view/smarty3/like_noshare.tpl new file mode 100644 index 0000000000..b01064add7 --- /dev/null +++ b/view/smarty3/like_noshare.tpl @@ -0,0 +1,5 @@ + diff --git a/view/smarty3/login.tpl b/view/smarty3/login.tpl new file mode 100644 index 0000000000..6695495c07 --- /dev/null +++ b/view/smarty3/login.tpl @@ -0,0 +1,35 @@ + +
+ + +
+ {{include file="file:{{$field_input}}" field=$lname}} + {{include file="file:{{$field_password}}" field=$lpassword}} +
+ + {{if $openid}} +
+ {{include file="file:{{$field_openid}}" field=$lopenid}} +
+ {{/if}} + + {{include file="file:{{$field_checkbox}}" field=$lremember}} + + + +
+ +
+ + {{foreach $hiddens as $k=>$v}} + + {{/foreach}} + + +
+ + + diff --git a/view/smarty3/login_head.tpl b/view/smarty3/login_head.tpl new file mode 100644 index 0000000000..e69de29bb2 diff --git a/view/smarty3/logout.tpl b/view/smarty3/logout.tpl new file mode 100644 index 0000000000..7548ed1964 --- /dev/null +++ b/view/smarty3/logout.tpl @@ -0,0 +1,6 @@ +
+
+ + +
+
diff --git a/view/smarty3/lostpass.tpl b/view/smarty3/lostpass.tpl new file mode 100644 index 0000000000..f6fdb28d7f --- /dev/null +++ b/view/smarty3/lostpass.tpl @@ -0,0 +1,18 @@ +

{{$title}}

+ +

+{{$desc}} +

+ +
+
+ + +
+
+
+ +
+
+
+ diff --git a/view/smarty3/magicsig.tpl b/view/smarty3/magicsig.tpl new file mode 100644 index 0000000000..78d8bbbd39 --- /dev/null +++ b/view/smarty3/magicsig.tpl @@ -0,0 +1,9 @@ + + + +{{$data}} + +{{$encoding}} +{{$algorithm}} +{{$signature}} + diff --git a/view/smarty3/mail_conv.tpl b/view/smarty3/mail_conv.tpl new file mode 100644 index 0000000000..1bff551084 --- /dev/null +++ b/view/smarty3/mail_conv.tpl @@ -0,0 +1,14 @@ +
+
+ {{$mail.from_name}} +
+
+
{{$mail.from_name}}
+
{{$mail.date}}
+
{{$mail.subject}}
+
{{$mail.body}}
+
+
+
+
+
diff --git a/view/smarty3/mail_display.tpl b/view/smarty3/mail_display.tpl new file mode 100644 index 0000000000..0e6bd13d33 --- /dev/null +++ b/view/smarty3/mail_display.tpl @@ -0,0 +1,10 @@ + +{{foreach $mails as $mail_item}} + {{include file="file:{{$mail_conv}}" mail=$mail_item}} +{{/foreach}} + +{{if $canreply}} +{{include file="file:{{$prv_message}}" reply=$reply_info}} +{{else}} +{{$unknown_text}} +{{/if}} diff --git a/view/smarty3/mail_head.tpl b/view/smarty3/mail_head.tpl new file mode 100644 index 0000000000..1cd7145e7b --- /dev/null +++ b/view/smarty3/mail_head.tpl @@ -0,0 +1,3 @@ +

{{$messages}}

+ +{{$tab_content}} diff --git a/view/smarty3/mail_list.tpl b/view/smarty3/mail_list.tpl new file mode 100644 index 0000000000..b08c2ca7a9 --- /dev/null +++ b/view/smarty3/mail_list.tpl @@ -0,0 +1,16 @@ +
+
+ {{$from_name}} +
+
+
{{$from_name}}
+
{{$date}}
+
{{$subject}}
+
+ +
+
+
+
+ +
diff --git a/view/smarty3/match.tpl b/view/smarty3/match.tpl new file mode 100644 index 0000000000..0688ca26bd --- /dev/null +++ b/view/smarty3/match.tpl @@ -0,0 +1,16 @@ +
+
+ + {{$name}} + +
+
+
+ {{$name}} +
+
+ {{if $connlnk}} +
{{$conntxt}}
+ {{/if}} + +
diff --git a/view/smarty3/message-end.tpl b/view/smarty3/message-end.tpl new file mode 100644 index 0000000000..e69de29bb2 diff --git a/view/smarty3/message-head.tpl b/view/smarty3/message-head.tpl new file mode 100644 index 0000000000..84296c3f1e --- /dev/null +++ b/view/smarty3/message-head.tpl @@ -0,0 +1,17 @@ + + + + diff --git a/view/smarty3/message_side.tpl b/view/smarty3/message_side.tpl new file mode 100644 index 0000000000..ba7e282726 --- /dev/null +++ b/view/smarty3/message_side.tpl @@ -0,0 +1,10 @@ +
+ + + + +
diff --git a/view/smarty3/moderated_comment.tpl b/view/smarty3/moderated_comment.tpl new file mode 100644 index 0000000000..79ce8f99b9 --- /dev/null +++ b/view/smarty3/moderated_comment.tpl @@ -0,0 +1,34 @@ +
+
+ + + + + + + +
+ {{$mytitle}} +
+
+ + + +
+ + +
+
+ +
diff --git a/view/smarty3/mood_content.tpl b/view/smarty3/mood_content.tpl new file mode 100644 index 0000000000..63eaa2d8db --- /dev/null +++ b/view/smarty3/mood_content.tpl @@ -0,0 +1,20 @@ +

{{$title}}

+ +
{{$desc}}
+ +
+
+
+ + + + +
+
+ +
+ diff --git a/view/smarty3/msg-end.tpl b/view/smarty3/msg-end.tpl new file mode 100644 index 0000000000..e69de29bb2 diff --git a/view/smarty3/msg-header.tpl b/view/smarty3/msg-header.tpl new file mode 100644 index 0000000000..0d2ca72be8 --- /dev/null +++ b/view/smarty3/msg-header.tpl @@ -0,0 +1,97 @@ + + + + + + diff --git a/view/smarty3/nav.tpl b/view/smarty3/nav.tpl new file mode 100644 index 0000000000..832d9f123c --- /dev/null +++ b/view/smarty3/nav.tpl @@ -0,0 +1,68 @@ + + + diff --git a/view/smarty3/netfriend.tpl b/view/smarty3/netfriend.tpl new file mode 100644 index 0000000000..ec6b3b6cc2 --- /dev/null +++ b/view/smarty3/netfriend.tpl @@ -0,0 +1,14 @@ +
{{$approve_as}}
+ +
+ + +
+
+
+
+ + +
+
+
diff --git a/view/smarty3/nets.tpl b/view/smarty3/nets.tpl new file mode 100644 index 0000000000..f514626ac7 --- /dev/null +++ b/view/smarty3/nets.tpl @@ -0,0 +1,10 @@ +
+

{{$title}}

+
{{$desc}}
+ {{$all}} + +
diff --git a/view/smarty3/nogroup-template.tpl b/view/smarty3/nogroup-template.tpl new file mode 100644 index 0000000000..6daeba0cfe --- /dev/null +++ b/view/smarty3/nogroup-template.tpl @@ -0,0 +1,12 @@ +

{{$header}}

+ +{{foreach $contacts as $c}} + {{include file="file:{{$contact_template}}" contact=$c}} +{{/foreach}} +
+ +{{$paginate}} + + + + diff --git a/view/smarty3/notifications.tpl b/view/smarty3/notifications.tpl new file mode 100644 index 0000000000..82eb2f40a3 --- /dev/null +++ b/view/smarty3/notifications.tpl @@ -0,0 +1,8 @@ + +

{{$notif_header}}

+ +{{include file="file:{{$common_tabs}}" tabs=$tabs_data}} + +
+ {{$notif_content}} +
diff --git a/view/smarty3/notifications_comments_item.tpl b/view/smarty3/notifications_comments_item.tpl new file mode 100644 index 0000000000..9c454a3ed5 --- /dev/null +++ b/view/smarty3/notifications_comments_item.tpl @@ -0,0 +1,3 @@ +
+ {{$item_text}} {{$item_when}} +
\ No newline at end of file diff --git a/view/smarty3/notifications_dislikes_item.tpl b/view/smarty3/notifications_dislikes_item.tpl new file mode 100644 index 0000000000..9c454a3ed5 --- /dev/null +++ b/view/smarty3/notifications_dislikes_item.tpl @@ -0,0 +1,3 @@ +
+ {{$item_text}} {{$item_when}} +
\ No newline at end of file diff --git a/view/smarty3/notifications_friends_item.tpl b/view/smarty3/notifications_friends_item.tpl new file mode 100644 index 0000000000..9c454a3ed5 --- /dev/null +++ b/view/smarty3/notifications_friends_item.tpl @@ -0,0 +1,3 @@ +
+ {{$item_text}} {{$item_when}} +
\ No newline at end of file diff --git a/view/smarty3/notifications_likes_item.tpl b/view/smarty3/notifications_likes_item.tpl new file mode 100644 index 0000000000..ed020a2450 --- /dev/null +++ b/view/smarty3/notifications_likes_item.tpl @@ -0,0 +1,3 @@ +
+ {{$item_text}} {{$item_when}} +
\ No newline at end of file diff --git a/view/smarty3/notifications_network_item.tpl b/view/smarty3/notifications_network_item.tpl new file mode 100644 index 0000000000..14f37162d4 --- /dev/null +++ b/view/smarty3/notifications_network_item.tpl @@ -0,0 +1,3 @@ +
+ {{{$item_text}}} {{{$item_when}}} +
\ No newline at end of file diff --git a/view/smarty3/notifications_posts_item.tpl b/view/smarty3/notifications_posts_item.tpl new file mode 100644 index 0000000000..9c454a3ed5 --- /dev/null +++ b/view/smarty3/notifications_posts_item.tpl @@ -0,0 +1,3 @@ +
+ {{$item_text}} {{$item_when}} +
\ No newline at end of file diff --git a/view/smarty3/notify.tpl b/view/smarty3/notify.tpl new file mode 100644 index 0000000000..9c454a3ed5 --- /dev/null +++ b/view/smarty3/notify.tpl @@ -0,0 +1,3 @@ +
+ {{$item_text}} {{$item_when}} +
\ No newline at end of file diff --git a/view/smarty3/oauth_authorize.tpl b/view/smarty3/oauth_authorize.tpl new file mode 100644 index 0000000000..2b7afa80e1 --- /dev/null +++ b/view/smarty3/oauth_authorize.tpl @@ -0,0 +1,10 @@ +

{{$title}}

+ +
+ +

{{$app.name}}

+
+

{{$authorize}}

+
+
+
diff --git a/view/smarty3/oauth_authorize_done.tpl b/view/smarty3/oauth_authorize_done.tpl new file mode 100644 index 0000000000..2e91e01252 --- /dev/null +++ b/view/smarty3/oauth_authorize_done.tpl @@ -0,0 +1,4 @@ +

{{$title}}

+ +

{{$info}}

+{{$code}} diff --git a/view/smarty3/oembed_video.tpl b/view/smarty3/oembed_video.tpl new file mode 100644 index 0000000000..4ad75a82ea --- /dev/null +++ b/view/smarty3/oembed_video.tpl @@ -0,0 +1,4 @@ + + +
+ diff --git a/view/smarty3/oexchange_xrd.tpl b/view/smarty3/oexchange_xrd.tpl new file mode 100644 index 0000000000..d6bdde7f41 --- /dev/null +++ b/view/smarty3/oexchange_xrd.tpl @@ -0,0 +1,33 @@ + + + + {{$base}} + + Friendica + Friendica Social Network + Friendica + Send to Friendica + + + + + + + + diff --git a/view/smarty3/opensearch.tpl b/view/smarty3/opensearch.tpl new file mode 100644 index 0000000000..ad45cc9f8f --- /dev/null +++ b/view/smarty3/opensearch.tpl @@ -0,0 +1,13 @@ + + + Friendica@{{$nodename}} + Search in Friendica@{{$nodename}} + http://bugs.friendica.com/ + {{$baseurl}}/images/friendica-16.png + {{$baseurl}}/images/friendica-64.png + + + \ No newline at end of file diff --git a/view/smarty3/pagetypes.tpl b/view/smarty3/pagetypes.tpl new file mode 100644 index 0000000000..6c4c1cf939 --- /dev/null +++ b/view/smarty3/pagetypes.tpl @@ -0,0 +1,5 @@ + {{include file="file:{{$field_radio}}" field=$page_normal}} + {{include file="file:{{$field_radio}}" field=$page_community}} + {{include file="file:{{$field_radio}}" field=$page_prvgroup}} + {{include file="file:{{$field_radio}}" field=$page_soapbox}} + {{include file="file:{{$field_radio}}" field=$page_freelove}} diff --git a/view/smarty3/peoplefind.tpl b/view/smarty3/peoplefind.tpl new file mode 100644 index 0000000000..1492db1202 --- /dev/null +++ b/view/smarty3/peoplefind.tpl @@ -0,0 +1,14 @@ +
+

{{$findpeople}}

+
{{$desc}}
+
+ +
+ + + + {{if $inv}} + + {{/if}} +
+ diff --git a/view/smarty3/photo_album.tpl b/view/smarty3/photo_album.tpl new file mode 100644 index 0000000000..3308bf500a --- /dev/null +++ b/view/smarty3/photo_album.tpl @@ -0,0 +1,7 @@ + +
diff --git a/view/smarty3/photo_drop.tpl b/view/smarty3/photo_drop.tpl new file mode 100644 index 0000000000..94ef5a3ee2 --- /dev/null +++ b/view/smarty3/photo_drop.tpl @@ -0,0 +1,4 @@ +
+ +
+
diff --git a/view/smarty3/photo_edit.tpl b/view/smarty3/photo_edit.tpl new file mode 100644 index 0000000000..4c7eed833b --- /dev/null +++ b/view/smarty3/photo_edit.tpl @@ -0,0 +1,50 @@ + +
+ + + + + + +
+ + + + +
+ + + + +
+
+
+ {{$rotatecw}}
+ {{$rotateccw}} +
+
+ +
+
+ +
+ + {{$permissions}} + +
+ +
+
+ {{$aclselect}} +
+
+
+
+ + + + +
+
+ + diff --git a/view/smarty3/photo_edit_head.tpl b/view/smarty3/photo_edit_head.tpl new file mode 100644 index 0000000000..f72dd2ed0d --- /dev/null +++ b/view/smarty3/photo_edit_head.tpl @@ -0,0 +1,11 @@ + + diff --git a/view/smarty3/photo_item.tpl b/view/smarty3/photo_item.tpl new file mode 100644 index 0000000000..e7d25fd558 --- /dev/null +++ b/view/smarty3/photo_item.tpl @@ -0,0 +1,22 @@ +
+
+ + {{$name}} +
+ +
+ {{$name}} +
{{$ago}}
+
+
+
{{$title}}
+
{{$body}}
+
+ {{$drop}} +
+
+ {{$comment}} + +
+
+ diff --git a/view/smarty3/photo_top.tpl b/view/smarty3/photo_top.tpl new file mode 100644 index 0000000000..826266affe --- /dev/null +++ b/view/smarty3/photo_top.tpl @@ -0,0 +1,8 @@ + + + diff --git a/view/smarty3/photo_view.tpl b/view/smarty3/photo_view.tpl new file mode 100644 index 0000000000..5431301132 --- /dev/null +++ b/view/smarty3/photo_view.tpl @@ -0,0 +1,37 @@ +
+

{{$album.1}}

+ + + +{{if $prevlink}}{{/if}} +
+{{if $nextlink}}{{/if}} +
+
{{$desc}}
+{{if $tags}} +
{{$tags.0}}
+
{{$tags.1}}
+{{/if}} +{{if $tags.2}}{{/if}} + +{{if $edit}}{{$edit}}{{/if}} + +{{if $likebuttons}} +
+ {{$likebuttons}} + {{$like}} + {{$dislike}} +
+{{/if}} + +{{$comments}} + +{{$paginate}} + diff --git a/view/smarty3/photos_head.tpl b/view/smarty3/photos_head.tpl new file mode 100644 index 0000000000..eb04a0791d --- /dev/null +++ b/view/smarty3/photos_head.tpl @@ -0,0 +1,26 @@ + + + diff --git a/view/smarty3/photos_recent.tpl b/view/smarty3/photos_recent.tpl new file mode 100644 index 0000000000..b5faa2c4e6 --- /dev/null +++ b/view/smarty3/photos_recent.tpl @@ -0,0 +1,11 @@ +

{{$title}}

+{{if $can_post}} +{{$upload.0}} +{{/if}} + +
+{{foreach $photos as $ph}} + {{include file="file:{{$photo_top}}" photo=$ph}} +{{/foreach}} +
+
diff --git a/view/smarty3/photos_upload.tpl b/view/smarty3/photos_upload.tpl new file mode 100644 index 0000000000..5045a95899 --- /dev/null +++ b/view/smarty3/photos_upload.tpl @@ -0,0 +1,48 @@ +

{{$pagename}}

+ +
{{$usage}}
+ +
+
+
+ +
+ +
+
+
+
{{$existalbumtext}}
+ +
+
+ +
+ + +
+ + + +
+ +
+
+ {{$aclselect}} +
+
+ +
+ + {{$uploader}} + + {{$default}} + +
+
+ diff --git a/view/smarty3/poco_entry_xml.tpl b/view/smarty3/poco_entry_xml.tpl new file mode 100644 index 0000000000..8698948524 --- /dev/null +++ b/view/smarty3/poco_entry_xml.tpl @@ -0,0 +1,7 @@ + +{{if $entry.id}}{{$entry.id}}{{/if}} +{{if $entry.displayName}}{{$entry.displayName}}{{/if}} +{{if $entry.preferredUsername}}{{$entry.preferredUsername}}{{/if}} +{{if $entry.urls}}{{foreach $entry.urls as $url}}{{$url.value}}{{$url.type}}{{/foreach}}{{/if}} +{{if $entry.photos}}{{foreach $entry.photos as $photo}}{{$photo.value}}{{$photo.type}}{{/foreach}}{{/if}} + diff --git a/view/smarty3/poco_xml.tpl b/view/smarty3/poco_xml.tpl new file mode 100644 index 0000000000..67137c2536 --- /dev/null +++ b/view/smarty3/poco_xml.tpl @@ -0,0 +1,18 @@ + + +{{if $response.sorted}}{{$response.sorted}}{{/if}} +{{if $response.filtered}}{{$response.filtered}}{{/if}} +{{if $response.updatedSince}}{{$response.updatedSince}}{{/if}} +{{$response.startIndex}} +{{$response.itemsPerPage}} +{{$response.totalResults}} + + +{{if $response.totalResults}} +{{foreach $response.entry as $ent}} +{{include file="file:{{$poco_entry_xml}}" entry=$ent}} +{{/foreach}} +{{else}} + +{{/if}} + diff --git a/view/smarty3/poke_content.tpl b/view/smarty3/poke_content.tpl new file mode 100644 index 0000000000..22a0b291ff --- /dev/null +++ b/view/smarty3/poke_content.tpl @@ -0,0 +1,32 @@ +

{{$title}}

+ +
{{$desc}}
+ +
+
+
+ +
{{$clabel}}
+
+ + + +
+
+
{{$choice}}
+
+
+ +
+
+
{{$prv_desc}}
+ +
+
+ +
+ diff --git a/view/smarty3/posted_date_widget.tpl b/view/smarty3/posted_date_widget.tpl new file mode 100644 index 0000000000..009fa60a65 --- /dev/null +++ b/view/smarty3/posted_date_widget.tpl @@ -0,0 +1,9 @@ +
+

{{$title}}

+ + +
diff --git a/view/smarty3/profed_end.tpl b/view/smarty3/profed_end.tpl new file mode 100644 index 0000000000..e69de29bb2 diff --git a/view/smarty3/profed_head.tpl b/view/smarty3/profed_head.tpl new file mode 100644 index 0000000000..d2101c3242 --- /dev/null +++ b/view/smarty3/profed_head.tpl @@ -0,0 +1,38 @@ + + + + + diff --git a/view/smarty3/profile-hide-friends.tpl b/view/smarty3/profile-hide-friends.tpl new file mode 100644 index 0000000000..590730a7c8 --- /dev/null +++ b/view/smarty3/profile-hide-friends.tpl @@ -0,0 +1,16 @@ +

+{{$desc}} +

+ +
+ + + +
+
+
+ + + +
+
diff --git a/view/smarty3/profile-hide-wall.tpl b/view/smarty3/profile-hide-wall.tpl new file mode 100644 index 0000000000..6a118982ec --- /dev/null +++ b/view/smarty3/profile-hide-wall.tpl @@ -0,0 +1,16 @@ +

+{{$desc}} +

+ +
+ + + +
+
+
+ + + +
+
diff --git a/view/smarty3/profile-in-directory.tpl b/view/smarty3/profile-in-directory.tpl new file mode 100644 index 0000000000..b36739514f --- /dev/null +++ b/view/smarty3/profile-in-directory.tpl @@ -0,0 +1,16 @@ +

+{{$desc}} +

+ +
+ + + +
+
+
+ + + +
+
diff --git a/view/smarty3/profile-in-netdir.tpl b/view/smarty3/profile-in-netdir.tpl new file mode 100644 index 0000000000..23d4642ac8 --- /dev/null +++ b/view/smarty3/profile-in-netdir.tpl @@ -0,0 +1,16 @@ +

+{{$desc}} +

+ +
+ + + +
+
+
+ + + +
+
diff --git a/view/smarty3/profile_advanced.tpl b/view/smarty3/profile_advanced.tpl new file mode 100644 index 0000000000..812132f0c3 --- /dev/null +++ b/view/smarty3/profile_advanced.tpl @@ -0,0 +1,170 @@ +

{{$title}}

+ +
+
{{$profile.fullname.0}}
+
{{$profile.fullname.1}}
+
+ +{{if $profile.gender}} +
+
{{$profile.gender.0}}
+
{{$profile.gender.1}}
+
+{{/if}} + +{{if $profile.birthday}} +
+
{{$profile.birthday.0}}
+
{{$profile.birthday.1}}
+
+{{/if}} + +{{if $profile.age}} +
+
{{$profile.age.0}}
+
{{$profile.age.1}}
+
+{{/if}} + +{{if $profile.marital}} +
+
♥ {{$profile.marital.0}}
+
{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}
+
+{{/if}} + +{{if $profile.sexual}} +
+
{{$profile.sexual.0}}
+
{{$profile.sexual.1}}
+
+{{/if}} + +{{if $profile.pub_keywords}} +
+
{{$profile.pub_keywords.0}}
+
{{$profile.pub_keywords.1}}
+
+{{/if}} + +{{if $profile.homepage}} +
+
{{$profile.homepage.0}}
+
{{$profile.homepage.1}}
+
+{{/if}} + +{{if $profile.hometown}} +
+
{{$profile.hometown.0}}
+
{{$profile.hometown.1}}
+
+{{/if}} + +{{if $profile.politic}} +
+
{{$profile.politic.0}}
+
{{$profile.politic.1}}
+
+{{/if}} + +{{if $profile.religion}} +
+
{{$profile.religion.0}}
+
{{$profile.religion.1}}
+
+{{/if}} + +{{if $profile.about}} +
+
{{$profile.about.0}}
+
{{$profile.about.1}}
+
+{{/if}} + +{{if $profile.interest}} +
+
{{$profile.interest.0}}
+
{{$profile.interest.1}}
+
+{{/if}} + +{{if $profile.likes}} +
+
{{$profile.likes.0}}
+
{{$profile.likes.1}}
+
+{{/if}} + +{{if $profile.dislikes}} +
+
{{$profile.dislikes.0}}
+
{{$profile.dislikes.1}}
+
+{{/if}} + +{{if $profile.contact}} +
+
{{$profile.contact.0}}
+
{{$profile.contact.1}}
+
+{{/if}} + + +{{if $profile.music}} +
+
{{$profile.music.0}}
+
{{$profile.music.1}}
+
+{{/if}} + + +{{if $profile.book}} +
+
{{$profile.book.0}}
+
{{$profile.book.1}}
+
+{{/if}} + + +{{if $profile.tv}} +
+
{{$profile.tv.0}}
+
{{$profile.tv.1}}
+
+{{/if}} + + +{{if $profile.film}} +
+
{{$profile.film.0}}
+
{{$profile.film.1}}
+
+{{/if}} + + +{{if $profile.romance}} +
+
{{$profile.romance.0}}
+
{{$profile.romance.1}}
+
+{{/if}} + + +{{if $profile.work}} +
+
{{$profile.work.0}}
+
{{$profile.work.1}}
+
+{{/if}} + +{{if $profile.education}} +
+
{{$profile.education.0}}
+
{{$profile.education.1}}
+
+{{/if}} + + + + diff --git a/view/smarty3/profile_edit.tpl b/view/smarty3/profile_edit.tpl new file mode 100644 index 0000000000..c595e88540 --- /dev/null +++ b/view/smarty3/profile_edit.tpl @@ -0,0 +1,323 @@ +{{$default}} + +

{{$banner}}

+ + + + + + +
+
+ + +
+ +
*
+
+
+ +
+ + +
+
+ +
+ + +
+
+ + +
+ +{{$gender}} +
+
+ +
+ +
+{{$dob}} {{$age}} +
+
+
+ +{{$hide_friends}} + +
+ +
+
+ + +
+ + +
+
+ +
+ + +
+
+ + +
+ + +
+
+ +
+ + +
+
+ +
+ + +
+
+ +
+ + +
+
+ +
+ +
+
+ +
+ +{{$marital}} +
+ + + + + +
+ +
+ +{{$sexual}} +
+
+ + + +
+ + +
+
+ +
+ + +
+
+ +
+ + +
+
+ +
+ + +
{{$lbl_pubdsc}}
+
+ +
+ + +
{{$lbl_prvdsc}}
+
+ + +
+ +
+
+ +
+

+{{$lbl_about}} +

+ + + +
+
+ + +
+

+{{$lbl_hobbies}} +

+ + + +
+
+ + +
+

+{{$lbl_likes}} +

+ + + +
+
+ + +
+

+{{$lbl_dislikes}} +

+ + + +
+
+ + +
+

+{{$lbl_social}} +

+ + + +
+
+ + +
+ +
+
+ + +
+

+{{$lbl_music}} +

+ + + +
+
+ +
+

+{{$lbl_book}} +

+ + + +
+
+ + + +
+

+{{$lbl_tv}} +

+ + + +
+
+ + + +
+

+{{$lbl_film}} +

+ + + +
+
+ + +
+ +
+
+ + +
+

+{{$lbl_love}} +

+ + + +
+
+ + + +
+

+{{$lbl_work}} +

+ + + +
+
+ + + +
+

+{{$lbl_school}} +

+ + + +
+
+ + + +
+ +
+
+ + +
+
+ diff --git a/view/smarty3/profile_edlink.tpl b/view/smarty3/profile_edlink.tpl new file mode 100644 index 0000000000..2f4600a87e --- /dev/null +++ b/view/smarty3/profile_edlink.tpl @@ -0,0 +1,2 @@ +
+
\ No newline at end of file diff --git a/view/smarty3/profile_entry.tpl b/view/smarty3/profile_entry.tpl new file mode 100644 index 0000000000..e06307c8bb --- /dev/null +++ b/view/smarty3/profile_entry.tpl @@ -0,0 +1,11 @@ + +
+
+{{$alt}} +
+
+ +
{{$visible}}
+
+
+ diff --git a/view/smarty3/profile_listing_header.tpl b/view/smarty3/profile_listing_header.tpl new file mode 100644 index 0000000000..b771a1ea2a --- /dev/null +++ b/view/smarty3/profile_listing_header.tpl @@ -0,0 +1,8 @@ +

{{$header}}

+

+{{$chg_photo}} +

+ + diff --git a/view/smarty3/profile_photo.tpl b/view/smarty3/profile_photo.tpl new file mode 100644 index 0000000000..d73779e20a --- /dev/null +++ b/view/smarty3/profile_photo.tpl @@ -0,0 +1,26 @@ +

{{$title}}

+ +
+ + +
+ + +
+ + + + +
+ +
+ +
+ + \ No newline at end of file diff --git a/view/smarty3/profile_publish.tpl b/view/smarty3/profile_publish.tpl new file mode 100644 index 0000000000..265c0c63ca --- /dev/null +++ b/view/smarty3/profile_publish.tpl @@ -0,0 +1,16 @@ +

+{{$pubdesc}} +

+ +
+ + + +
+
+
+ + + +
+
diff --git a/view/smarty3/profile_vcard.tpl b/view/smarty3/profile_vcard.tpl new file mode 100644 index 0000000000..3b5f507a95 --- /dev/null +++ b/view/smarty3/profile_vcard.tpl @@ -0,0 +1,50 @@ +
+ +
{{$profile.name}}
+ + + + {{if $pdesc}}
{{$profile.pdesc}}
{{/if}} +
{{$profile.name}}
+ + + + {{if $location}} +
{{$location}}
+
+ {{if $profile.address}}
{{$profile.address}}
{{/if}} + + {{$profile.locality}}{{if $profile.locality}}, {{/if}} + {{$profile.region}} + {{$profile.postal-code}} + + {{if $profile.country-name}}{{$profile.country-name}}{{/if}} +
+
+ {{/if}} + + {{if $gender}}
{{$gender}}
{{$profile.gender}}
{{/if}} + + {{if $profile.pubkey}}{{/if}} + + {{if $marital}}
♥{{$marital}}
{{$profile.marital}}
{{/if}} + + {{if $homepage}}
{{$homepage}}
{{$profile.homepage}}
{{/if}} + + {{include file="file:{{$diaspora_vcard}}" diaspora=$diaspora_info}} + + +
+ +{{$contact_block}} + + diff --git a/view/smarty3/prv_message.tpl b/view/smarty3/prv_message.tpl new file mode 100644 index 0000000000..06f253bec5 --- /dev/null +++ b/view/smarty3/prv_message.tpl @@ -0,0 +1,33 @@ + +

{{$reply.header}}

+ +
+
+ +{{$reply.parent}} + +
{{$reply.to}}
+{{$reply.select}} + +
{{$reply.subject}}
+ + +
{{$reply.yourmessage}}
+ + + +
+ +
+
+
+ +
+ +
+
+
+
+
diff --git a/view/smarty3/pwdreset.tpl b/view/smarty3/pwdreset.tpl new file mode 100644 index 0000000000..3993dec64f --- /dev/null +++ b/view/smarty3/pwdreset.tpl @@ -0,0 +1,17 @@ +

{{$lbl1}}

+ +

+{{$lbl2}} +

+

+{{$lbl3}} +

+

+{{$newpass}} +

+

+{{$lbl4}} {{$lbl5}} +

+

+{{$lbl6}} +

diff --git a/view/smarty3/register.tpl b/view/smarty3/register.tpl new file mode 100644 index 0000000000..bdec2ffb4f --- /dev/null +++ b/view/smarty3/register.tpl @@ -0,0 +1,63 @@ +

{{$regtitle}}

+ +
+ + + + {{$registertext}} + +

{{$realpeople}}

+ +

{{$fillwith}}

+

{{$fillext}}

+ +
+ {{$oidhtml}} +
+
+ +{{if $invitations}} + +

{{$invite_desc}}

+
+ + +
+
+ +{{/if}} + + +
+ + +
+
+ + +
+ + +
+
+ +

{{$nickdesc}}

+ +
+ +
@{{$sitename}}
+
+
+ + {{$publish}} + +
+ +
+
+ +
+ +{{$license}} + + diff --git a/view/smarty3/remote_friends_common.tpl b/view/smarty3/remote_friends_common.tpl new file mode 100644 index 0000000000..b68e1c3470 --- /dev/null +++ b/view/smarty3/remote_friends_common.tpl @@ -0,0 +1,21 @@ +
+
{{$desc}}      {{if $linkmore}}{{$more}}{{/if}}
+ {{if $items}} + {{foreach $items as $item}} +
+
+ + {{$item.name}} + +
+
+
+ {{$item.name}} +
+
+
+ {{/foreach}} + {{/if}} +
+
+ diff --git a/view/smarty3/removeme.tpl b/view/smarty3/removeme.tpl new file mode 100644 index 0000000000..496f91ff50 --- /dev/null +++ b/view/smarty3/removeme.tpl @@ -0,0 +1,20 @@ +

{{$title}}

+ +
+ +
{{$desc}}
+ +
+ + +
+ + +
+
+ + + +
+
+ diff --git a/view/smarty3/saved_searches_aside.tpl b/view/smarty3/saved_searches_aside.tpl new file mode 100644 index 0000000000..023b974f6f --- /dev/null +++ b/view/smarty3/saved_searches_aside.tpl @@ -0,0 +1,14 @@ +
+ + {{$searchbox}} + + +
+
diff --git a/view/smarty3/search_item.tpl b/view/smarty3/search_item.tpl new file mode 100644 index 0000000000..8b19b11491 --- /dev/null +++ b/view/smarty3/search_item.tpl @@ -0,0 +1,64 @@ + +
+
+
+
+ + {{$item.name}} + menu +
+
    + {{$item.item_photo_menu}} +
+
+
+
+
+ {{if $item.lock}}
{{$item.lock}}
+ {{else}}
{{/if}} +
{{$item.location}}
+
+
+
+ {{$item.name}} +
{{$item.ago}}
+ +
+
+
{{$item.title}}
+
+
{{$item.body}}
+ {{if $item.has_cats}} +
{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} [{{$remove}}]{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}} +
+ {{/if}} + + {{if $item.has_folders}} +
{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}}{{if $cat.removeurl}} [{{$remove}}]{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}} +
+ {{/if}} +
+
+
+ {{if $item.drop.dropping}}{{/if}} +
+ {{if $item.drop.pagedrop}}{{/if}} +
+
+
+
+ + +
+ {{if $item.conv}} + {{$item.conv.title}} + {{/if}} +
+ +
+ +
+ + diff --git a/view/smarty3/settings-end.tpl b/view/smarty3/settings-end.tpl new file mode 100644 index 0000000000..e69de29bb2 diff --git a/view/smarty3/settings-head.tpl b/view/smarty3/settings-head.tpl new file mode 100644 index 0000000000..b40e36a1f8 --- /dev/null +++ b/view/smarty3/settings-head.tpl @@ -0,0 +1,25 @@ + + + diff --git a/view/smarty3/settings.tpl b/view/smarty3/settings.tpl new file mode 100644 index 0000000000..d4e8fb6ac6 --- /dev/null +++ b/view/smarty3/settings.tpl @@ -0,0 +1,145 @@ +

{{$ptitle}}

+ +{{$nickname_block}} + +
+ + +

{{$h_pass}}

+ +{{include file="file:{{$field_password}}" field=$password1}} +{{include file="file:{{$field_password}}" field=$password2}} + +{{if $oid_enable}} +{{include file="file:{{$field_input}}" field=$openid}} +{{/if}} + +
+ +
+ + +

{{$h_basic}}

+ +{{include file="file:{{$field_input}}" field=$username}} +{{include file="file:{{$field_input}}" field=$email}} +{{include file="file:{{$field_custom}}" field=$timezone}} +{{include file="file:{{$field_input}}" field=$defloc}} +{{include file="file:{{$field_checkbox}}" field=$allowloc}} + + +
+ +
+ + +

{{$h_prv}}

+ + + + +{{include file="file:{{$field_input}}" field=$maxreq}} + +{{$profile_in_dir}} + +{{$profile_in_net_dir}} + +{{$hide_friends}} + +{{$hide_wall}} + +{{$blockwall}} + +{{$blocktags}} + +{{$suggestme}} + +{{$unkmail}} + + +{{include file="file:{{$field_input}}" field=$cntunkmail}} + +{{include file="file:{{$field_input}}" field=$expire.days}} + + +
+ {{$expire.label}} +
+
+

{{$expire.advanced}}

+ {{include file="file:{{$field_yesno}}" field=$expire.items}} + {{include file="file:{{$field_yesno}}" field=$expire.notes}} + {{include file="file:{{$field_yesno}}" field=$expire.starred}} + {{include file="file:{{$field_yesno}}" field=$expire.network_only}} +
+
+ +
+ + +
+ {{$permissions}} {{$permdesc}} +
+ + +
+
+
+ +{{$group_select}} + + +
+ +
+ + + +

{{$h_not}}

+
+ +
{{$activity_options}}
+ +{{include file="file:{{$field_checkbox}}" field=$post_newfriend}} +{{include file="file:{{$field_checkbox}}" field=$post_joingroup}} +{{include file="file:{{$field_checkbox}}" field=$post_profilechange}} + + +
{{$lbl_not}}
+ +
+{{include file="file:{{$field_intcheckbox}}" field=$notify1}} +{{include file="file:{{$field_intcheckbox}}" field=$notify2}} +{{include file="file:{{$field_intcheckbox}}" field=$notify3}} +{{include file="file:{{$field_intcheckbox}}" field=$notify4}} +{{include file="file:{{$field_intcheckbox}}" field=$notify5}} +{{include file="file:{{$field_intcheckbox}}" field=$notify6}} +{{include file="file:{{$field_intcheckbox}}" field=$notify7}} +{{include file="file:{{$field_intcheckbox}}" field=$notify8}} +
+ +
+ +
+ +
+ + +

{{$h_advn}}

+
{{$h_descadvn}}
+ +{{$pagetype}} + +
+ +
+ + diff --git a/view/smarty3/settings_addons.tpl b/view/smarty3/settings_addons.tpl new file mode 100644 index 0000000000..afddafb36c --- /dev/null +++ b/view/smarty3/settings_addons.tpl @@ -0,0 +1,10 @@ +

{{$title}}

+ + + + + +{{$settings_addons}} + +
+ diff --git a/view/smarty3/settings_connectors.tpl b/view/smarty3/settings_connectors.tpl new file mode 100644 index 0000000000..3b025a63d9 --- /dev/null +++ b/view/smarty3/settings_connectors.tpl @@ -0,0 +1,35 @@ +

{{$title}}

+ +
{{$diasp_enabled}}
+
{{$ostat_enabled}}
+ +
+ + +{{$settings_connectors}} + +{{if $mail_disabled}} + +{{else}} +
+

{{$h_imap}}

+

{{$imap_desc}}

+ {{include file="file:{{$field_custom}}" field=$imap_lastcheck}} + {{include file="file:{{$field_input}}" field=$mail_server}} + {{include file="file:{{$field_input}}" field=$mail_port}} + {{include file="file:{{$field_select}}" field=$mail_ssl}} + {{include file="file:{{$field_input}}" field=$mail_user}} + {{include file="file:{{$field_password}}" field=$mail_pass}} + {{include file="file:{{$field_input}}" field=$mail_replyto}} + {{include file="file:{{$field_checkbox}}" field=$mail_pubmail}} + {{include file="file:{{$field_select}}" field=$mail_action}} + {{include file="file:{{$field_input}}" field=$mail_movetofolder}} + +
+ +
+
+{{/if}} + +
+ diff --git a/view/smarty3/settings_display.tpl b/view/smarty3/settings_display.tpl new file mode 100644 index 0000000000..030523939d --- /dev/null +++ b/view/smarty3/settings_display.tpl @@ -0,0 +1,22 @@ +

{{$ptitle}}

+ +
+ + +{{include file="file:{{$field_themeselect}}" field=$theme}} +{{include file="file:{{$field_themeselect}}" field=$mobile_theme}} +{{include file="file:{{$field_input}}" field=$ajaxint}} +{{include file="file:{{$field_input}}" field=$itemspage_network}} +{{include file="file:{{$field_checkbox}}" field=$nosmile}} + + +
+ +
+ +{{if $theme_config}} +

Theme settings

+{{$theme_config}} +{{/if}} + +
diff --git a/view/smarty3/settings_display_end.tpl b/view/smarty3/settings_display_end.tpl new file mode 100644 index 0000000000..e69de29bb2 diff --git a/view/smarty3/settings_features.tpl b/view/smarty3/settings_features.tpl new file mode 100644 index 0000000000..9db99b5ec8 --- /dev/null +++ b/view/smarty3/settings_features.tpl @@ -0,0 +1,20 @@ +

{{$title}}

+ + +
+ + +{{foreach $features as $f}} +

{{$f.0}}

+ +{{foreach $f.1 as $fcat}} + {{include file="file:{{$field_yesno}}" field=$fcat}} +{{/foreach}} +{{/foreach}} + +
+ +
+ +
+ diff --git a/view/smarty3/settings_nick_set.tpl b/view/smarty3/settings_nick_set.tpl new file mode 100644 index 0000000000..85956d97c0 --- /dev/null +++ b/view/smarty3/settings_nick_set.tpl @@ -0,0 +1,5 @@ + +
+
{{$desc}} '{{$nickname}}@{{$basepath}}'{{$subdir}}
+
+
diff --git a/view/smarty3/settings_nick_subdir.tpl b/view/smarty3/settings_nick_subdir.tpl new file mode 100644 index 0000000000..a271e0f052 --- /dev/null +++ b/view/smarty3/settings_nick_subdir.tpl @@ -0,0 +1,6 @@ +

+It appears that your website is located in a subdirectory of the
+{{$hostname}} website, so this setting may not work reliably.
+

+

If you have any issues, you may have better results using the profile
address '{{$baseurl}}/profile/{{$nickname}}'. +

\ No newline at end of file diff --git a/view/smarty3/settings_oauth.tpl b/view/smarty3/settings_oauth.tpl new file mode 100644 index 0000000000..11c61a43e0 --- /dev/null +++ b/view/smarty3/settings_oauth.tpl @@ -0,0 +1,31 @@ +

{{$title}}

+ + +
+ + + + + {{foreach $apps as $app}} +
+ + {{if $app.name}}

{{$app.name}}

{{else}}

{{$noname}}

{{/if}} + {{if $app.my}} + {{if $app.oauth_token}} +
+ {{/if}} + {{/if}} + {{if $app.my}} +   +   + {{/if}} +
+ {{/foreach}} + +
diff --git a/view/smarty3/settings_oauth_edit.tpl b/view/smarty3/settings_oauth_edit.tpl new file mode 100644 index 0000000000..c991f97ba7 --- /dev/null +++ b/view/smarty3/settings_oauth_edit.tpl @@ -0,0 +1,17 @@ +

{{$title}}

+ +
+ + +{{include file="file:{{$field_input}}" field=$name}} +{{include file="file:{{$field_input}}" field=$key}} +{{include file="file:{{$field_input}}" field=$secret}} +{{include file="file:{{$field_input}}" field=$redirect}} +{{include file="file:{{$field_input}}" field=$icon}} + +
+ + +
+ +
diff --git a/view/smarty3/suggest_friends.tpl b/view/smarty3/suggest_friends.tpl new file mode 100644 index 0000000000..c8b9dd28da --- /dev/null +++ b/view/smarty3/suggest_friends.tpl @@ -0,0 +1,16 @@ +
+ +
+ + {{$name}} + +
+
+
+ {{$name}} +
+
+ {{if $connlnk}} +
{{$conntxt}}
+ {{/if}} +
\ No newline at end of file diff --git a/view/smarty3/suggestions.tpl b/view/smarty3/suggestions.tpl new file mode 100644 index 0000000000..b4f6afc994 --- /dev/null +++ b/view/smarty3/suggestions.tpl @@ -0,0 +1,21 @@ + +
+ +

{{$str_notifytype}} {{$notify_type}}

+
{{$madeby}}
+
{{$fullname}}
+{{$fullname}} +
{{$note}}
+
+
+ + +
+
+ +
+{{include file="file:{{$field_checkbox}}" field=$hidden}} + +
+
+
diff --git a/view/smarty3/tag_slap.tpl b/view/smarty3/tag_slap.tpl new file mode 100644 index 0000000000..bb991e6b1c --- /dev/null +++ b/view/smarty3/tag_slap.tpl @@ -0,0 +1,30 @@ + + + {{$name}} + {{$profile_page}} + + + + + {{$item_id}} + {{$title}} + {{$published}} + {{$content}} + + + http://activitystrea.ms/schema/1.0/person + {{$profile_page}} + + + + {{$nick}} + {{$name}} + + {{$verb}} + + + + + + + diff --git a/view/smarty3/threaded_conversation.tpl b/view/smarty3/threaded_conversation.tpl new file mode 100644 index 0000000000..0830063c61 --- /dev/null +++ b/view/smarty3/threaded_conversation.tpl @@ -0,0 +1,16 @@ +{{$live_update}} + +{{foreach $threads as $thread}} +{{include file="file:{{$thread.template}}" item=$thread}} +{{/foreach}} + +
+ +{{if $dropping}} + + +
+{{/if}} diff --git a/view/smarty3/toggle_mobile_footer.tpl b/view/smarty3/toggle_mobile_footer.tpl new file mode 100644 index 0000000000..82c0197bae --- /dev/null +++ b/view/smarty3/toggle_mobile_footer.tpl @@ -0,0 +1,2 @@ +{{$toggle_text}} + diff --git a/view/smarty3/uexport.tpl b/view/smarty3/uexport.tpl new file mode 100644 index 0000000000..efdcd6d1c0 --- /dev/null +++ b/view/smarty3/uexport.tpl @@ -0,0 +1,9 @@ +

{{$title}}

+ + +{{foreach $options as $o}} +
+
{{$o.1}}
+
{{$o.2}}
+
+{{/foreach}} \ No newline at end of file diff --git a/view/smarty3/uimport.tpl b/view/smarty3/uimport.tpl new file mode 100644 index 0000000000..f9ec290ab9 --- /dev/null +++ b/view/smarty3/uimport.tpl @@ -0,0 +1,13 @@ +
+

{{$import.title}}

+

{{$import.intro}}

+

{{$import.instruct}}

+

{{$import.warn}}

+ {{include file="file:{{$field_custom}}" field=$import.field}} + + +
+ +
+
+
diff --git a/view/smarty3/vcard-widget.tpl b/view/smarty3/vcard-widget.tpl new file mode 100644 index 0000000000..1a4f90c4ea --- /dev/null +++ b/view/smarty3/vcard-widget.tpl @@ -0,0 +1,5 @@ +
+
{{$name}}
+
{{$name}}
+
+ diff --git a/view/smarty3/viewcontact_template.tpl b/view/smarty3/viewcontact_template.tpl new file mode 100644 index 0000000000..4a3b0efaf6 --- /dev/null +++ b/view/smarty3/viewcontact_template.tpl @@ -0,0 +1,9 @@ +

{{$title}}

+ +{{foreach $contacts as $c}} + {{include file="file:{{$contact_template}}" contact=$c}} +{{/foreach}} + +
+ +{{$paginate}} diff --git a/view/smarty3/voting_fakelink.tpl b/view/smarty3/voting_fakelink.tpl new file mode 100644 index 0000000000..ddba96b26a --- /dev/null +++ b/view/smarty3/voting_fakelink.tpl @@ -0,0 +1,2 @@ + {{$count}} {{$people}} {{$vote_mood}}
+ diff --git a/view/smarty3/wall_thread.tpl b/view/smarty3/wall_thread.tpl new file mode 100644 index 0000000000..86da6f516a --- /dev/null +++ b/view/smarty3/wall_thread.tpl @@ -0,0 +1,120 @@ +{{if $item.comment_firstcollapsed}} +
+ {{$item.num_comments}} {{$item.hide_text}} +
+ {{/if}} diff --git a/view/smarty3/wallmessage.tpl b/view/smarty3/wallmessage.tpl new file mode 100644 index 0000000000..bea386b95b --- /dev/null +++ b/view/smarty3/wallmessage.tpl @@ -0,0 +1,32 @@ + +

{{$header}}

+ +

{{$subheader}}

+ +
+
+ +{{$parent}} + +
{{$to}}
+{{$recipname}} + +
{{$subject}}
+ + +
{{$yourmessage}}
+ + + +
+ + +
+ +
+
+
+
+
diff --git a/view/smarty3/wallmsg-end.tpl b/view/smarty3/wallmsg-end.tpl new file mode 100644 index 0000000000..e69de29bb2 diff --git a/view/smarty3/wallmsg-header.tpl b/view/smarty3/wallmsg-header.tpl new file mode 100644 index 0000000000..09f5b30a7f --- /dev/null +++ b/view/smarty3/wallmsg-header.tpl @@ -0,0 +1,82 @@ + + + + + diff --git a/view/smarty3/xrd_diaspora.tpl b/view/smarty3/xrd_diaspora.tpl new file mode 100644 index 0000000000..aa0d8c740d --- /dev/null +++ b/view/smarty3/xrd_diaspora.tpl @@ -0,0 +1,3 @@ + + + diff --git a/view/smarty3/xrd_host.tpl b/view/smarty3/xrd_host.tpl new file mode 100644 index 0000000000..4bcc5bbdb4 --- /dev/null +++ b/view/smarty3/xrd_host.tpl @@ -0,0 +1,18 @@ + + + + {{$zhost}} + + + + + + + {{$bigkey}} + + + diff --git a/view/smarty3/xrd_person.tpl b/view/smarty3/xrd_person.tpl new file mode 100644 index 0000000000..a9d075a51f --- /dev/null +++ b/view/smarty3/xrd_person.tpl @@ -0,0 +1,38 @@ + + + + {{$accturi}} + {{$accturi}} + {{$profile_url}} + + + + + + + + {{$dspr}} + + + + + + {{$bigkey}} + + diff --git a/view/suggestions.tpl b/view/suggestions.tpl index 656336496c..cab2ba83ae 100644 --- a/view/suggestions.tpl +++ b/view/suggestions.tpl @@ -14,7 +14,7 @@
-{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}} +{{inc $field_checkbox with $field=$hidden }}{{endinc}}
diff --git a/view/sv/smarty3/cmnt_received_eml.tpl b/view/sv/smarty3/cmnt_received_eml.tpl new file mode 100644 index 0000000000..937a7d413c --- /dev/null +++ b/view/sv/smarty3/cmnt_received_eml.tpl @@ -0,0 +1,17 @@ + +{{$username}}, + +'{{$from}}' har kommenterat något som du följer. + +----- +{{$body}} +----- + +Logga in på {{$siteurl}} för att se hela konversationen: + +{{$display}} + +Hälsningar, +{{$sitename}} admin + + diff --git a/view/sv/smarty3/follow_notify_eml.tpl b/view/sv/smarty3/follow_notify_eml.tpl new file mode 100644 index 0000000000..1ef5334472 --- /dev/null +++ b/view/sv/smarty3/follow_notify_eml.tpl @@ -0,0 +1,12 @@ +{{$myname}}, + +'{{$requestor}}' på {{$sitename}} vill följa dina uppdateringar här på Friendica. + +Besök dennes profil på {{$url}}. + +Logga in för att godkänna eller avslå förfrågan. + +{{$siteurl}} + +Hälsningar, +{{$sitename}} admin diff --git a/view/sv/smarty3/friend_complete_eml.tpl b/view/sv/smarty3/friend_complete_eml.tpl new file mode 100644 index 0000000000..cc20902a47 --- /dev/null +++ b/view/sv/smarty3/friend_complete_eml.tpl @@ -0,0 +1,17 @@ +{{$username}}, + +Goda nyheter... '{{$fn}}' på '{{$dfrn_url}}' har accepterat din kontaktförfrågan på '{{$sitename}}'. + +Ni är nu ömsesidiga vänner och kan se varandras statusuppdateringar samt skicka foton och meddelanden +utan begränsningar. + +Gå in på din sida 'Kontakter' på {{$sitename}} om du vill göra några +ändringar när det gäller denna kontakt. + +{{$siteurl}} + +[Du kan exempelvis skapa en separat profil med information som inte +är tillgänglig för vem som helst, och ge visningsrättigheter till '{{$fn}}']. + +Hälsningar, +{{$sitename}} admin diff --git a/view/sv/smarty3/htconfig.tpl b/view/sv/smarty3/htconfig.tpl new file mode 100644 index 0000000000..75d6a77e89 --- /dev/null +++ b/view/sv/smarty3/htconfig.tpl @@ -0,0 +1,68 @@ +path to 'directory/subdirectory'. + +$a->path = '{{$urlpath}}'; + +// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". +// It can be changed later and only applies to timestamps for anonymous viewers. + +$default_timezone = '{{$timezone}}'; + +// What is your site name? + +$a->config['sitename'] = "My Friend Network"; + +// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. +// Be certain to create your own personal account before setting +// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// the registration page. REGISTER_APPROVE requires you set 'admin_email' +// to the email address of an already registered person who can authorise +// and/or approve/deny the request. + +$a->config['register_policy'] = REGISTER_OPEN; +$a->config['register_text'] = ''; +$a->config['admin_email'] = '{{$adminmail}}'; + +// Maximum size of an imported message, 0 is unlimited + +$a->config['max_import_size'] = 200000; + +// maximum size of uploaded photos + +$a->config['system']['maximagesize'] = 800000; + +// Location of PHP command line processor + +$a->config['php_path'] = '{{$phpath}}'; + +// Location of global directory submission page. + +$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; +$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; + +// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts + +$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com'; + +// Server-to-server private message encryption (RINO) is allowed by default. +// Encryption will only be provided if this setting is true and the +// PHP mcrypt extension is installed on both systems + +$a->config['system']['rino_encrypt'] = true; + +// default system theme + +$a->config['system']['theme'] = 'duepuntozero'; + diff --git a/view/sv/smarty3/intro_complete_eml.tpl b/view/sv/smarty3/intro_complete_eml.tpl new file mode 100644 index 0000000000..b9dac4fc0b --- /dev/null +++ b/view/sv/smarty3/intro_complete_eml.tpl @@ -0,0 +1,19 @@ +{{$username}}, + +'{{$fn}}' på '{{$dfrn_url}}' har accepterat din kontaktförfrågan på '{{$sitename}}'. + +'{{$fn}}' har valt att acceptera dig som ett "fan" vilket innebär vissa begränsningar +i kommunikationen mellan er - som till exempel personliga meddelanden och viss interaktion +mellan profiler. Om detta är en kändis eller en gemenskap så har dessa inställningar gjorts +per automatik. + +'{{$fn}}' kan välja att utöka detta till vanlig tvåvägskommunikation eller någon annan mer +tillåtande kommunikationsform i framtiden. + +Du kommer hädanefter att få statusuppdateringar från '{{$fn}}', +vilka kommer att synas på din Nätverk-sida på + +{{$siteurl}} + +Hälsningar, +{{$sitename}} admin diff --git a/view/sv/smarty3/lostpass_eml.tpl b/view/sv/smarty3/lostpass_eml.tpl new file mode 100644 index 0000000000..11f1bb2940 --- /dev/null +++ b/view/sv/smarty3/lostpass_eml.tpl @@ -0,0 +1,29 @@ +{{$username}}, + +En begäran om återställning av lösenord på {{$sitename}} har mottagits. +Gå till adressen nedan för att bekräfta denna begäran. Du kan också +klistra in länken i adressfältet i din webbläsare. + +Gå INTE till länken nedan om du INTE har begärt lösenordsåterställning. +Då kan du ignorera det här meddelandet. + +Ditt lösenord kommer inte att återställas om vi inte kan säkerställa att du +initierat detta. + +Med den här länken kan du bekräfta din identitet: + +{{$reset_link}} + +Sedan kommer du att få ett meddelande med ett nytt lösenord. + +Lösenordet kan sedan ändras i dina inställningar efter att du loggat in. + +Detaljerna ser ut så här: + +Webbplats: {{$siteurl}} +Inloggningsnamn: {{$email}} + +Hälsningar, +{{$sitename}} admin + + \ No newline at end of file diff --git a/view/sv/smarty3/mail_received_html_body_eml.tpl b/view/sv/smarty3/mail_received_html_body_eml.tpl new file mode 100644 index 0000000000..8914073c24 --- /dev/null +++ b/view/sv/smarty3/mail_received_html_body_eml.tpl @@ -0,0 +1,25 @@ + + + + Meddelande på Friendica + + + + + + + + + + + + + + + + + + +
Friendica
{{$from}} har skickat ett personligt meddelande till dig på {{$siteName}}.
{{$from}}
{{$title}}
{{$htmlversion}}
Logga in på {{$siteurl}} för att läsa och svara på personliga meddelanden.
Hälsningar,
{{$siteName}} admin
+ + \ No newline at end of file diff --git a/view/sv/smarty3/mail_received_text_body_eml.tpl b/view/sv/smarty3/mail_received_text_body_eml.tpl new file mode 100644 index 0000000000..b829e80216 --- /dev/null +++ b/view/sv/smarty3/mail_received_text_body_eml.tpl @@ -0,0 +1,10 @@ +{{$from}} har skickat ett personligt meddelande till dig på {{$siteName}}. + +{{$title}} + +{{$textversion}} + +Logga in på {{$siteurl}} för att läsa och svara på personliga meddelanden. + +Hälsningar, +{{$siteName}} admin diff --git a/view/sv/smarty3/passchanged_eml.tpl b/view/sv/smarty3/passchanged_eml.tpl new file mode 100644 index 0000000000..821344f2bb --- /dev/null +++ b/view/sv/smarty3/passchanged_eml.tpl @@ -0,0 +1,18 @@ + +{{$username}}, + +Lösenordet har ändrats enligt din begäran. Behåll den här +informationen om den skulle behövas i framtiden. (eller ändra lösenord +på en gång till något som du kommer ihåg). + + +Här är dina inloggningsuppgifter: + +Webbplats: {{$siteurl}} +Användarnamn: {{$email}} +Lösenord: {{$new_password}} + +När du loggat in kan du byta lösenord bland inställningarna. + +Hälsningar, +{{$sitename}} admin diff --git a/view/sv/smarty3/register_open_eml.tpl b/view/sv/smarty3/register_open_eml.tpl new file mode 100644 index 0000000000..101fe62739 --- /dev/null +++ b/view/sv/smarty3/register_open_eml.tpl @@ -0,0 +1,17 @@ +{{$username}}, +Tack för att du registrerat dig på {{$sitename}}. Kontot har skapats. +Här är dina inloggningsuppgifter: + +Webbplats: {{$siteurl}} +Användarnamn: {{$email}} +Lösenord: {{$password}} + +Lösenordet kan ändras på sidan Inställningar efter att du loggat in. + +Ägna en liten stund åt att gå igenom alla kontoinställningar där. + +Välkommen till {{$sitename}}. + +Hälsningar, +{{$sitename}} admin + diff --git a/view/sv/smarty3/register_verify_eml.tpl b/view/sv/smarty3/register_verify_eml.tpl new file mode 100644 index 0000000000..051c3887c2 --- /dev/null +++ b/view/sv/smarty3/register_verify_eml.tpl @@ -0,0 +1,17 @@ +En registreringsförfrågan som kräver svar har mottagits +på {{$sitename}} + + +Här är inloggningsuppgifterna: + +Fullständigt namn: {{$username}} +Webbplats: {{$siteurl}} +Användarnamn: {{$email}} + + +Gå till denna adress om du vill godkänna: +{{$siteurl}}/regmod/allow/{{$hash}} + +Gå till denna adress om du vill avslå förfrågan och ta bort kontot: +{{$siteurl}}/regmod/deny/{{$hash}} + diff --git a/view/sv/smarty3/request_notify_eml.tpl b/view/sv/smarty3/request_notify_eml.tpl new file mode 100644 index 0000000000..3caa620645 --- /dev/null +++ b/view/sv/smarty3/request_notify_eml.tpl @@ -0,0 +1,13 @@ +{{$myname}}, + +Du har just fått en kontaktförfrågan på {{$sitename}} från '{{$requestor}}' + +Profilen finns på {{$url}}. + +Logga in för att se hela förfrågan och godkänna eller +avslå den. + +{{$siteurl}} + +Hälsningar, +{{$sitename}} admin diff --git a/view/sv/smarty3/wall_received_eml.tpl b/view/sv/smarty3/wall_received_eml.tpl new file mode 100644 index 0000000000..d184b6b895 --- /dev/null +++ b/view/sv/smarty3/wall_received_eml.tpl @@ -0,0 +1,16 @@ +{{$username}}, + +'{{$from}}' har skrivit på din profilsida. + +----- +{{$body}} +----- + +Logga in på {{$siteurl}} för att kolla eller ta bort: + +{{$display}} + +Hälsningar, +{{$sitename}} admin + + diff --git a/view/theme/cleanzero/config.php b/view/theme/cleanzero/config.php index 312e9d3dd2..a81b05b8fe 100644 --- a/view/theme/cleanzero/config.php +++ b/view/theme/cleanzero/config.php @@ -75,8 +75,15 @@ function cleanzero_form(&$a, $color,$font_size,$resize,$theme_width){ "wide"=>"wide", ); - $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); - $o .= replace_macros($t, array( +// $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); + $t = get_markup_template("theme_settings.tpl" ); + + $includes = array( + '$field_select' => 'field_select.tpl', + ); + $includes = set_template_includes($a->theme['template_engine'], $includes); + + $o .= replace_macros($t, $includes + array( '$submit' => t('Submit'), '$baseurl' => $a->get_baseurl(), '$title' => t("Theme settings"), diff --git a/view/theme/cleanzero/smarty3/nav.tpl b/view/theme/cleanzero/smarty3/nav.tpl new file mode 100644 index 0000000000..ccc51151d4 --- /dev/null +++ b/view/theme/cleanzero/smarty3/nav.tpl @@ -0,0 +1,85 @@ + + + + diff --git a/view/theme/cleanzero/smarty3/theme_settings.tpl b/view/theme/cleanzero/smarty3/theme_settings.tpl new file mode 100644 index 0000000000..5df8e28bea --- /dev/null +++ b/view/theme/cleanzero/smarty3/theme_settings.tpl @@ -0,0 +1,10 @@ +{{include file="file:{{$field_select}}" field=$color}} +{{include file="file:{{$field_select}}" field=$font_size}} +{{include file="file:{{$field_select}}" field=$resize}} +{{include file="file:{{$field_select}}" field=$theme_width}} + + +
+ +
+ diff --git a/view/theme/cleanzero/theme.php b/view/theme/cleanzero/theme.php index f65890f3f1..c7c0b2d640 100644 --- a/view/theme/cleanzero/theme.php +++ b/view/theme/cleanzero/theme.php @@ -8,6 +8,8 @@ $a->theme_info = array( 'extends' => 'duepuntozero', ); +$a->theme['template_engine'] = 'smarty3'; + function cleanzero_init(&$a) { $a->page['htmlhead'] .= <<< EOT +
+

{{$title}} - {{$page}}

+ +
+ +

{{$h_pending}}

+ {{if $pending}} + + + + {{foreach $th_pending as $th}}{{/foreach}} + + + + + + {{foreach $pending as $u}} + + + + + + + + {{/foreach}} + +
{{$th}}
{{$u.created}}{{$u.name}} + + +
+
{{$select_all}}
+
+ {{else}} +

{{$no_pending}}

+ {{/if}} + + + + +

{{$h_users}}

+ {{if $users}} + + + + + {{foreach $th_users as $th}}{{/foreach}} + + + + + + {{foreach $users as $u}} + + + + + + + + + + + + {{/foreach}} + +
{{$th}}
{{$u.nickname}}{{$u.name}}{{$u.register_date}}{{$u.lastitem_date}} + + +
+
{{$select_all}}
+
+ {{else}} + NO USERS?!? + {{/if}} +
+
diff --git a/view/theme/diabook/smarty3/bottom.tpl b/view/theme/diabook/smarty3/bottom.tpl new file mode 100644 index 0000000000..65de108e84 --- /dev/null +++ b/view/theme/diabook/smarty3/bottom.tpl @@ -0,0 +1,155 @@ + + + diff --git a/view/theme/diabook/smarty3/ch_directory_item.tpl b/view/theme/diabook/smarty3/ch_directory_item.tpl new file mode 100644 index 0000000000..5fb119861a --- /dev/null +++ b/view/theme/diabook/smarty3/ch_directory_item.tpl @@ -0,0 +1,10 @@ + +
+
+
+ + {{$alt}}-text + +
+
+
diff --git a/view/theme/diabook/smarty3/comment_item.tpl b/view/theme/diabook/smarty3/comment_item.tpl new file mode 100644 index 0000000000..1dde07dc05 --- /dev/null +++ b/view/theme/diabook/smarty3/comment_item.tpl @@ -0,0 +1,43 @@ +
+
+ + + + + + + +
+ {{$mytitle}} +
+
+ + + {{if $qcomment}} + + {{/if}} + +
+ + +
+
+ +
diff --git a/view/theme/diabook/smarty3/communityhome.tpl b/view/theme/diabook/smarty3/communityhome.tpl new file mode 100644 index 0000000000..864dc55c40 --- /dev/null +++ b/view/theme/diabook/smarty3/communityhome.tpl @@ -0,0 +1,172 @@ + + + + + + + +
+
+ +
+ +
+{{if $page}} +
{{$page}}
+{{/if}} +
+ +
+{{if $comunity_profiles_title}} +

{{$comunity_profiles_title}}

+
+{{foreach $comunity_profiles_items as $i}} + {{$i}} +{{/foreach}} +
+{{/if}} +
+ +
+{{if $helpers}} +

{{$helpers.title.1}}

+How-To Guides
+NewHere
+Friendica Support
+Let's talk
+Local Friendica +{{/if}} +
+ +
+{{if $con_services}} +

{{$con_services.title.1}}

+
+Facebook +StatusNet +LiveJournal +Posterous +Tumblr +Twitter +WordPress +E-Mail +
+{{/if}} +
+ +
+{{if $nv}} +

{{$nv.title.1}}

+{{$nv.directory.1}}
+{{$nv.global_directory.1}}
+{{$nv.match.1}}
+{{$nv.suggest.1}}
+{{$nv.invite.1}} +{{$nv.search}} +{{/if}} +
+ +
+{{if $lastusers_title}} +

{{$lastusers_title}}

+
+{{foreach $lastusers_items as $i}} + {{$i}} +{{/foreach}} +
+{{/if}} +
+ +{{if $activeusers_title}} +

{{$activeusers_title}}

+
+{{foreach $activeusers_items as $i}} + {{$i}} +{{/foreach}} +
+{{/if}} + +
+{{if $photos_title}} +

{{$photos_title}}

+
+{{foreach $photos_items as $i}} + {{$i}} +{{/foreach}} +
+{{/if}} +
+ +
+{{if $like_title}} +

{{$like_title}}

+
    +{{foreach $like_items as $i}} +
  • {{$i}}
    • +{{/foreach}} +
+{{/if}} +
+ +
+

{{$twitter.title.1}}

+
+
+
+ +
+{{if $mapquery}} +

{{$mapquery.title.1}}

+
+
+
Data CC-By-SA by OpenStreetMap
+{{/if}} +
+
diff --git a/view/theme/diabook/smarty3/contact_template.tpl b/view/theme/diabook/smarty3/contact_template.tpl new file mode 100644 index 0000000000..790431a9f3 --- /dev/null +++ b/view/theme/diabook/smarty3/contact_template.tpl @@ -0,0 +1,25 @@ + +
+
+
+ + {{$contact.name}} + + {{if $contact.photo_menu}} + menu +
+
    + {{$contact.photo_menu}} +
+
+ {{/if}} +
+ +
+
+
{{$contact.name}}
+ +
+
diff --git a/view/theme/diabook/smarty3/directory_item.tpl b/view/theme/diabook/smarty3/directory_item.tpl new file mode 100644 index 0000000000..dd5f7f38fb --- /dev/null +++ b/view/theme/diabook/smarty3/directory_item.tpl @@ -0,0 +1,42 @@ + +
+
+
+ + {{$alt_text}} + +
+
+
+
{{$name}}
+
{{$page_type}}
+ {{if $pdesc}}
{{$profile.pdesc}}
{{/if}} +
+
+ {{if $location}} +
{{$location}}
+
+ {{if $profile.address}}
{{$profile.address}}
{{/if}} + + {{$profile.locality}}{{if $profile.locality}}, {{/if}} + {{$profile.region}} + {{$profile.postal-code}} + + {{if $profile.country-name}}{{$profile.country-name}}{{/if}} +
+
+ {{/if}} + + {{if $gender}}
{{$gender}}
{{$profile.gender}}
{{/if}} +
+
+ {{if $marital}}
♥{{$marital}}
{{$profile.marital}}
{{/if}} + + {{if $homepage}}
{{$homepage}}
{{$profile.homepage}}
{{/if}} +
+
+
+ {{if $about}}
{{$about}}
{{$profile.about}}
{{/if}} +
+
+
diff --git a/view/theme/diabook/smarty3/footer.tpl b/view/theme/diabook/smarty3/footer.tpl new file mode 100644 index 0000000000..25058a7ff7 --- /dev/null +++ b/view/theme/diabook/smarty3/footer.tpl @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/view/theme/diabook/smarty3/generic_links_widget.tpl b/view/theme/diabook/smarty3/generic_links_widget.tpl new file mode 100644 index 0000000000..b90c8fc8c6 --- /dev/null +++ b/view/theme/diabook/smarty3/generic_links_widget.tpl @@ -0,0 +1,11 @@ +
+ {{if $title}}

{{$title}}

{{/if}} + {{if $desc}}
{{$desc}}
{{/if}} + + + +
diff --git a/view/theme/diabook/smarty3/group_side.tpl b/view/theme/diabook/smarty3/group_side.tpl new file mode 100644 index 0000000000..f7ceb06419 --- /dev/null +++ b/view/theme/diabook/smarty3/group_side.tpl @@ -0,0 +1,34 @@ +
+
+

{{$title}}

+
+ + + {{if $ungrouped}} + + {{/if}} +
+ diff --git a/view/theme/diabook/smarty3/jot.tpl b/view/theme/diabook/smarty3/jot.tpl new file mode 100644 index 0000000000..87290d5e55 --- /dev/null +++ b/view/theme/diabook/smarty3/jot.tpl @@ -0,0 +1,87 @@ + +
+
+
 
+
+
+ +
+ + + + + + + + + {{if $placeholdercategory}} +
+ {{/if}} +
+ + + + +
+ +
+
+
+
+
+
+ + +
+ +
+
+ +
+
+ +
+
+ +
+ + + + {{$preview}} + +
+ {{$bang}} +
+ + +
+ {{$jotplugins}} +
+ +
+ +
+ +
+
+ + + +
+
+ {{$acl}} +
+
{{$emailcc}}
+
+ {{$jotnets}} +
+
+ + + + +
+
+ {{if $content}}{{/if}} diff --git a/view/theme/diabook/smarty3/login.tpl b/view/theme/diabook/smarty3/login.tpl new file mode 100644 index 0000000000..330e379ad9 --- /dev/null +++ b/view/theme/diabook/smarty3/login.tpl @@ -0,0 +1,33 @@ + +
+ + +
+ {{include file="file:{{$field_input}}" field=$lname}} + {{include file="file:{{$field_password}}" field=$lpassword}} +
+ + {{if $openid}} +
+ {{include file="file:{{$field_openid}}" field=$lopenid}} +
+ {{/if}} + +
+ +
+ + + + {{foreach $hiddens as $k=>$v}} + + {{/foreach}} + + +
+ + + diff --git a/view/theme/diabook/smarty3/mail_conv.tpl b/view/theme/diabook/smarty3/mail_conv.tpl new file mode 100644 index 0000000000..e7a313ed8f --- /dev/null +++ b/view/theme/diabook/smarty3/mail_conv.tpl @@ -0,0 +1,60 @@ +
+
+
+ +
+
+ {{$mail.body}} +
+
+
+
+
+
+
+
+
+
+
+
+
+ {{$mail.from_name}} {{$mail.date}} +
+ +
+
+ +
+ {{$mail.delete}} +
+ +
+
+
+
+
+ + +{{* + + +
+
+ {{$mail.from_name}} +
+
+
{{$mail.from_name}}
+
{{$mail.date}}
+
{{$mail.subject}}
+
{{$mail.body}}
+
+
+
+
+
+ +*}} diff --git a/view/theme/diabook/smarty3/mail_display.tpl b/view/theme/diabook/smarty3/mail_display.tpl new file mode 100644 index 0000000000..3400227923 --- /dev/null +++ b/view/theme/diabook/smarty3/mail_display.tpl @@ -0,0 +1,12 @@ +
+ {{$thread_subject}} + +
+ +{{foreach $mails as $mail_item}} +
+ {{include file="file:{{$mail_conv}}" mail=$mail_item}} +
+{{/foreach}} + +{{include file="file:{{$prv_message}}" reply=$reply_info}} diff --git a/view/theme/diabook/smarty3/mail_list.tpl b/view/theme/diabook/smarty3/mail_list.tpl new file mode 100644 index 0000000000..3342559184 --- /dev/null +++ b/view/theme/diabook/smarty3/mail_list.tpl @@ -0,0 +1,8 @@ +
+ {{$subject}} + {{$from_name}} + {{$date}} + {{$count}} + + +
diff --git a/view/theme/diabook/smarty3/message_side.tpl b/view/theme/diabook/smarty3/message_side.tpl new file mode 100644 index 0000000000..c8a372c744 --- /dev/null +++ b/view/theme/diabook/smarty3/message_side.tpl @@ -0,0 +1,10 @@ +
+ + + + +
diff --git a/view/theme/diabook/smarty3/nav.tpl b/view/theme/diabook/smarty3/nav.tpl new file mode 100644 index 0000000000..2e6198f14c --- /dev/null +++ b/view/theme/diabook/smarty3/nav.tpl @@ -0,0 +1,188 @@ +
+
{{$sitelocation}}
+ +
+ + + + +
{{$langselector}}
+
+ + + + + + + + +{{* + +{{if $nav.logout}}{{$nav.logout.1}} {{/if}} +{{if $nav.login}} {{/if}} + + + +{{if $nav.register}}{{$nav.register.1}}{{/if}} + +{{$nav.help.1}} + +{{if $nav.apps}}{{$nav.apps.1}}{{/if}} + +{{$nav.search.1}} +{{$nav.directory.1}} + +{{if $nav.admin}}{{$nav.admin.1}}{{/if}} + +{{if $nav.notifications}} +{{$nav.notifications.1}} + +{{/if}} +{{if $nav.messages}} +{{$nav.messages.1}} + +{{/if}} + +{{if $nav.manage}}{{$nav.manage.1}}{{/if}} + +{{if $nav.settings}}{{$nav.settings.1}}{{/if}} +{{if $nav.profiles}}{{$nav.profiles.1}}{{/if}} + + + + + +*}} diff --git a/view/theme/diabook/smarty3/nets.tpl b/view/theme/diabook/smarty3/nets.tpl new file mode 100644 index 0000000000..26e6b0106c --- /dev/null +++ b/view/theme/diabook/smarty3/nets.tpl @@ -0,0 +1,17 @@ +
+

{{$title}}

+
{{$desc}}
+ + +
diff --git a/view/theme/diabook/smarty3/oembed_video.tpl b/view/theme/diabook/smarty3/oembed_video.tpl new file mode 100644 index 0000000000..2d73f8d502 --- /dev/null +++ b/view/theme/diabook/smarty3/oembed_video.tpl @@ -0,0 +1,4 @@ + + +
+ diff --git a/view/theme/diabook/smarty3/photo_item.tpl b/view/theme/diabook/smarty3/photo_item.tpl new file mode 100644 index 0000000000..3eeb6bcd23 --- /dev/null +++ b/view/theme/diabook/smarty3/photo_item.tpl @@ -0,0 +1,65 @@ +{{if $indent}}{{else}} +
+ +
+{{/if}} + +
+
+
+
+ + {{$name}} + + menu + + +
+
+
+ {{$name}} + - + {{if $plink}}{{$ago}}{{else}} {{$ago}} {{/if}} + {{if $lock}} - {{$lock}} {{/if}} + +
+
+ {{if $title}}

{{$title}}

{{/if}} + {{$body}} +
+
+
+
+
+
+ {{foreach $tags as $tag}} + {{$tag}} + {{/foreach}} +
+
+ +
+
+
+
+ +
+ + {{if $drop.dropping}} + + {{$drop.delete}} + {{/if}} + {{if $edpost}} + + {{/if}} +
+ +
+
+
+ +
+
+ diff --git a/view/theme/diabook/smarty3/photo_view.tpl b/view/theme/diabook/smarty3/photo_view.tpl new file mode 100644 index 0000000000..f4c713afe9 --- /dev/null +++ b/view/theme/diabook/smarty3/photo_view.tpl @@ -0,0 +1,33 @@ +
+

{{$album.1}}

+ + + +{{if $prevlink}}{{/if}} +
+{{if $nextlink}}{{/if}} +
+
{{$desc}}
+{{if $tags}} +
{{$tags.0}}
+
{{$tags.1}}
+{{/if}} +{{if $tags.2}}{{/if}} + +{{if $edit}}{{$edit}}{{/if}} + +
+
+
+{{$comments}} +
+ +{{$paginate}} + diff --git a/view/theme/diabook/smarty3/profile_side.tpl b/view/theme/diabook/smarty3/profile_side.tpl new file mode 100644 index 0000000000..8d1ff976b7 --- /dev/null +++ b/view/theme/diabook/smarty3/profile_side.tpl @@ -0,0 +1,21 @@ + + + diff --git a/view/theme/diabook/smarty3/profile_vcard.tpl b/view/theme/diabook/smarty3/profile_vcard.tpl new file mode 100644 index 0000000000..a8b0eba374 --- /dev/null +++ b/view/theme/diabook/smarty3/profile_vcard.tpl @@ -0,0 +1,64 @@ +
+ +
+
{{$profile.name}}
+ {{if $profile.edit}} +
+ {{$profile.edit.1}} + +
+ {{/if}} +
+ + + +
{{$profile.name}}
+ {{if $pdesc}}
{{$profile.pdesc}}
{{/if}} + + + {{if $location}} +
{{$location}}

+
+ {{if $profile.address}}
{{$profile.address}}
{{/if}} + + {{$profile.locality}}{{if $profile.locality}}, {{/if}} + {{$profile.region}} + {{$profile.postal-code}} + + {{if $profile.country-name}}{{$profile.country-name}}{{/if}} +
+
+ {{/if}} + + {{if $gender}}
{{$gender}}
{{$profile.gender}}
{{/if}} + + {{if $profile.pubkey}}{{/if}} + + {{if $marital}}
♥{{$marital}}
{{$profile.marital}}
{{/if}} + + {{if $homepage}}
{{$homepage}}
{{$profile.homepage}}
{{/if}} + + {{include file="file:{{$diaspora_vcard}}" diaspora=$diaspora_info}} + + +
+ +{{$contact_block}} + + diff --git a/view/theme/diabook/smarty3/prv_message.tpl b/view/theme/diabook/smarty3/prv_message.tpl new file mode 100644 index 0000000000..8ac9a4abfe --- /dev/null +++ b/view/theme/diabook/smarty3/prv_message.tpl @@ -0,0 +1,40 @@ + +

{{$reply.header}}

+ +
+
+ +{{$reply.parent}} + +
{{$reply.to}}
+ +{{if $reply.showinputs}} + + +{{else}} +{{$reply.select}} +{{/if}} + +
{{$reply.subject}}
+ + +
{{$reply.yourmessage}}
+ + + +
+ +
+
+
+ +
+ +
+
+
+
+
diff --git a/view/theme/diabook/smarty3/right_aside.tpl b/view/theme/diabook/smarty3/right_aside.tpl new file mode 100644 index 0000000000..8b11356e8a --- /dev/null +++ b/view/theme/diabook/smarty3/right_aside.tpl @@ -0,0 +1,20 @@ + + + \ No newline at end of file diff --git a/view/theme/diabook/smarty3/search_item.tpl b/view/theme/diabook/smarty3/search_item.tpl new file mode 100644 index 0000000000..0544e5e08c --- /dev/null +++ b/view/theme/diabook/smarty3/search_item.tpl @@ -0,0 +1,111 @@ +{{if $item.indent}}{{else}} +
+ +
+{{/if}} +
+
+
+
+ + {{$item.name}} + + menu + + +
+
+
+ {{$item.name}} + - + {{if $item.plink}}{{$item.ago}}{{else}} {{$item.ago}} {{/if}} + {{if $item.lock}} - {{$item.lock}} {{/if}} + +
+
+ {{if $item.title}}

{{$item.title}}

{{/if}} + {{$item.body}} + {{if $item.has_cats}} +
{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} [{{$remove}}] {{if $cat.last}}{{else}}, {{/if}}{{/foreach}} +
+ {{/if}} + + {{if $item.has_folders}} +
{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} [{{$remove}}] {{if $cat.last}}{{else}}, {{/if}}{{/foreach}} +
+ {{/if}} +
+
+
+
+
+
+ {{foreach $item.tags as $tag}} + {{$tag}} + {{/foreach}} +
+
+
+
+ +
+
+ +
+ + + {{if $item.vote}} + + + {{/if}} + + {{if $item.vote.share}} + + {{/if}} + + + {{if $item.star}} + + {{$item.star.do}} + + {{/if}} + + {{if $item.filer}} + + {{/if}} + + {{if $item.plink}}{{$item.plink.title}}{{/if}} + + + +
+ +
+ + {{if $item.drop.pagedrop}} + + {{/if}} + {{if $item.drop.dropping}} + {{$item.drop.delete}} + {{/if}} + {{if $item.edpost}} + + {{/if}} +
+
{{$item.location}} 
+
+
+
+
+ +
{{$item.dislike}}
+
+
+ +
+ {{$item.comment}} +
diff --git a/view/theme/diabook/smarty3/theme_settings.tpl b/view/theme/diabook/smarty3/theme_settings.tpl new file mode 100644 index 0000000000..a9bc0422c3 --- /dev/null +++ b/view/theme/diabook/smarty3/theme_settings.tpl @@ -0,0 +1,41 @@ +{{include file="file:{{$field_select}}" field=$color}} + +{{include file="file:{{$field_select}}" field=$font_size}} + +{{include file="file:{{$field_select}}" field=$line_height}} + +{{include file="file:{{$field_select}}" field=$resolution}} + +
+ +
+
+

Show/hide boxes at right-hand column

+{{include file="file:{{$field_select}}" field=$close_pages}} +{{include file="file:{{$field_select}}" field=$close_profiles}} +{{include file="file:{{$field_select}}" field=$close_helpers}} +{{include file="file:{{$field_select}}" field=$close_services}} +{{include file="file:{{$field_select}}" field=$close_friends}} +{{include file="file:{{$field_select}}" field=$close_lastusers}} +{{include file="file:{{$field_select}}" field=$close_lastphotos}} +{{include file="file:{{$field_select}}" field=$close_lastlikes}} +{{include file="file:{{$field_select}}" field=$close_twitter}} +{{include file="file:{{$field_input}}" field=$TSearchTerm}} +{{include file="file:{{$field_select}}" field=$close_mapquery}} + +{{include file="file:{{$field_input}}" field=$ELPosX}} + +{{include file="file:{{$field_input}}" field=$ELPosY}} + +{{include file="file:{{$field_input}}" field=$ELZoom}} + +
+ +
+ +
+ +
+Restore boxorder at right-hand column +
+ diff --git a/view/theme/diabook/smarty3/wall_thread.tpl b/view/theme/diabook/smarty3/wall_thread.tpl new file mode 100644 index 0000000000..e721226572 --- /dev/null +++ b/view/theme/diabook/smarty3/wall_thread.tpl @@ -0,0 +1,141 @@ +{{if $item.comment_firstcollapsed}} +
+ {{$item.num_comments}} {{$item.hide_text}} +
+ {{/if}} diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index cf45441757..dbfe5a8e8c 100644 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -8,6 +8,7 @@ */ $a = get_app(); +$a->theme['template_engine'] = 'smarty3'; function get_diabook_config($key, $default = false) { if (local_user()) { @@ -385,7 +386,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $aside['$comunity_profiles_items'] = array(); $r = q("select gcontact.* from gcontact left join glink on glink.gcid = gcontact.id where glink.cid = 0 and glink.uid = 0 order by rand() limit 9"); - $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl'); + $tpl = get_markup_template('ch_directory_item.tpl'); if(count($r)) { $photo = 'photo'; foreach($r as $rr) { @@ -414,7 +415,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; 0, 9 ); - $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl'); + $tpl = get_markup_template('ch_directory_item.tpl'); if(count($r)) { $photo = 'thumb'; foreach($r as $rr) { @@ -493,7 +494,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; dbesc(t('Profile Photos')) ); if(count($r)) { - $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl'); + $tpl = get_markup_template('ch_directory_item.tpl'); foreach($r as $rr) { $photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id']; $photo_url = $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] .'.jpg'; @@ -661,8 +662,15 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $url = $a->get_baseurl($ssl_state); $aside['$url'] = $url; //print right_aside - $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); - $a->page['right_aside'] = replace_macros($tpl, $aside); + $tpl = get_markup_template('communityhome.tpl'); + + $includes = array( + '$field_select' => 'field_select.tpl', + '$field_input' => 'field_input.tpl', + ); + $includes = set_template_includes($a->theme['template_engine'], $includes); + + $a->page['right_aside'] = replace_macros($tpl, $includes + $aside); } @@ -672,7 +680,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $a = get_app(); $baseurl = $a->get_baseurl($ssl_state); $bottom['$baseurl'] = $baseurl; - $tpl = file_get_contents(dirname(__file__) . '/bottom.tpl'); + $tpl = get_markup_template('bottom.tpl'); $a->page['footer'] = $a->page['footer'].replace_macros($tpl, $bottom); } diff --git a/view/theme/diabook/theme_settings.tpl b/view/theme/diabook/theme_settings.tpl index ad024dfe99..4bf2abb9b1 100644 --- a/view/theme/diabook/theme_settings.tpl +++ b/view/theme/diabook/theme_settings.tpl @@ -1,33 +1,33 @@ -{{inc field_select.tpl with $field=$color}}{{endinc}} +{{inc $field_select with $field=$color}}{{endinc}} -{{inc field_select.tpl with $field=$font_size}}{{endinc}} +{{inc $field_select with $field=$font_size}}{{endinc}} -{{inc field_select.tpl with $field=$line_height}}{{endinc}} +{{inc $field_select with $field=$line_height}}{{endinc}} -{{inc field_select.tpl with $field=$resolution}}{{endinc}} +{{inc $field_select with $field=$resolution}}{{endinc}}

Show/hide boxes at right-hand column

-{{inc field_select.tpl with $field=$close_pages}}{{endinc}} -{{inc field_select.tpl with $field=$close_profiles}}{{endinc}} -{{inc field_select.tpl with $field=$close_helpers}}{{endinc}} -{{inc field_select.tpl with $field=$close_services}}{{endinc}} -{{inc field_select.tpl with $field=$close_friends}}{{endinc}} -{{inc field_select.tpl with $field=$close_lastusers}}{{endinc}} -{{inc field_select.tpl with $field=$close_lastphotos}}{{endinc}} -{{inc field_select.tpl with $field=$close_lastlikes}}{{endinc}} -{{inc field_select.tpl with $field=$close_twitter}}{{endinc}} -{{inc field_input.tpl with $field=$TSearchTerm}}{{endinc}} -{{inc field_select.tpl with $field=$close_mapquery}}{{endinc}} +{{inc $field_select with $field=$close_pages}}{{endinc}} +{{inc $field_select with $field=$close_profiles}}{{endinc}} +{{inc $field_select with $field=$close_helpers}}{{endinc}} +{{inc $field_select with $field=$close_services}}{{endinc}} +{{inc $field_select with $field=$close_friends}}{{endinc}} +{{inc $field_select with $field=$close_lastusers}}{{endinc}} +{{inc $field_select with $field=$close_lastphotos}}{{endinc}} +{{inc $field_select with $field=$close_lastlikes}}{{endinc}} +{{inc $field_select with $field=$close_twitter}}{{endinc}} +{{inc $field_input with $field=$TSearchTerm}}{{endinc}} +{{inc $field_select with $field=$close_mapquery}}{{endinc}} -{{inc field_input.tpl with $field=$ELPosX}}{{endinc}} +{{inc $field_input with $field=$ELPosX}}{{endinc}} -{{inc field_input.tpl with $field=$ELPosY}}{{endinc}} +{{inc $field_input with $field=$ELPosY}}{{endinc}} -{{inc field_input.tpl with $field=$ELZoom}}{{endinc}} +{{inc $field_input with $field=$ELZoom}}{{endinc}}
diff --git a/view/theme/diabook/wall_thread.tpl b/view/theme/diabook/wall_thread.tpl index 95d30602d5..c4c0ac35fe 100644 --- a/view/theme/diabook/wall_thread.tpl +++ b/view/theme/diabook/wall_thread.tpl @@ -67,7 +67,9 @@ {{ if $item.vote }} + {{ if $item.vote.dislike }} + {{ endif }} {{ endif }} {{ if $item.vote.share }} @@ -78,7 +80,10 @@ {{ if $item.star }} $item.star.do - + {{ endif }} + + {{ if $item.tagger }} + {{ endif }} {{ if $item.filer }} @@ -128,8 +133,8 @@ {{ endif }} -{{ for $item.children as $item }} - {{ inc $item.template }}{{ endinc }} +{{ for $item.children as $child_item }} + {{ inc $child_item.template with $item=$child_item }}{{ endinc }} {{ endfor }}
diff --git a/view/theme/dispy/config.php b/view/theme/dispy/config.php index 25663c10ba..f2fe11b3d2 100644 --- a/view/theme/dispy/config.php +++ b/view/theme/dispy/config.php @@ -65,8 +65,15 @@ function dispy_form(&$a, $font_size, $line_height, $colour) { 'dark' => 'dark', ); - $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); - $o .= replace_macros($t, array( + //$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); + $t = get_markup_template("theme_settings.tpl" ); + + $includes = array( + '$field_select' => 'field_select.tpl', + ); + $includes = set_template_includes($a->theme['template_engine'], $includes); + + $o .= replace_macros($t, $includes + array( '$submit' => t('Submit'), '$baseurl' => $a->get_baseurl(), '$title' => t("Theme settings"), diff --git a/view/theme/dispy/dark/theme.php b/view/theme/dispy/dark/theme.php index f73a127659..bae9db41ee 100644 --- a/view/theme/dispy/dark/theme.php +++ b/view/theme/dispy/dark/theme.php @@ -13,6 +13,7 @@ $a->theme_info = array( 'family' => 'dispy', 'name' => 'dark', ); +$a->theme['template_engine'] = 'smarty3'; function dispy_dark_init(&$a) { /** @purpose set some theme defaults diff --git a/view/theme/dispy/light/theme.php b/view/theme/dispy/light/theme.php index 94a699b703..806f30624d 100644 --- a/view/theme/dispy/light/theme.php +++ b/view/theme/dispy/light/theme.php @@ -13,6 +13,7 @@ $a->theme_info = array( 'family' => 'dispy', 'name' => 'light', ); +$a->theme['template_engine'] = 'smarty3'; function dispy_light_init(&$a) { diff --git a/view/theme/dispy/profile_vcard.tpl b/view/theme/dispy/profile_vcard.tpl index cf0054a675..ac19ad935b 100644 --- a/view/theme/dispy/profile_vcard.tpl +++ b/view/theme/dispy/profile_vcard.tpl @@ -67,7 +67,7 @@ target="external-link">$profile.homepage
{{ endif }} - {{ inc diaspora_vcard.tpl }}{{ endinc }} + {{ inc $diaspora_vcard with $diaspora=$diaspora_info }}{{ endinc }} + {{if $content}}{{/if}} diff --git a/view/theme/dispy/smarty3/lang_selector.tpl b/view/theme/dispy/smarty3/lang_selector.tpl new file mode 100644 index 0000000000..945cbf51e3 --- /dev/null +++ b/view/theme/dispy/smarty3/lang_selector.tpl @@ -0,0 +1,10 @@ +
+ diff --git a/view/theme/dispy/smarty3/mail_head.tpl b/view/theme/dispy/smarty3/mail_head.tpl new file mode 100644 index 0000000000..c362eb6ed6 --- /dev/null +++ b/view/theme/dispy/smarty3/mail_head.tpl @@ -0,0 +1,5 @@ +

{{$messages}}

+ +
+{{$tab_content}} +
diff --git a/view/theme/dispy/smarty3/nav.tpl b/view/theme/dispy/smarty3/nav.tpl new file mode 100644 index 0000000000..51c1fa3d66 --- /dev/null +++ b/view/theme/dispy/smarty3/nav.tpl @@ -0,0 +1,145 @@ + + +
+{{$langselector}} +
+ + + +
+
+ +
+
+ + + diff --git a/view/theme/dispy/smarty3/photo_edit.tpl b/view/theme/dispy/smarty3/photo_edit.tpl new file mode 100644 index 0000000000..16c9577eb4 --- /dev/null +++ b/view/theme/dispy/smarty3/photo_edit.tpl @@ -0,0 +1,53 @@ + +
+ + + + + + +
+ + + + +
+ + + + +
+
+
{{$rotate}}
+ +
+
+ +
+ {{$permissions}} +
+ +
+
+ {{$aclselect}} +
+
+
+
+ + + + +
+
+ + diff --git a/view/theme/dispy/smarty3/photo_view.tpl b/view/theme/dispy/smarty3/photo_view.tpl new file mode 100644 index 0000000000..913cbb732c --- /dev/null +++ b/view/theme/dispy/smarty3/photo_view.tpl @@ -0,0 +1,36 @@ +
+

{{$album.1}}

+ + + +{{if $prevlink}}{{/if}} +
+{{if $nextlink}}{{/if}} +
+
{{$desc}}
+{{if $tags}} +
{{$tags.0}}
+
{{$tags.1}}
+{{/if}} +{{if $tags.2}}{{/if}} + +{{if $edit}}{{$edit}}{{/if}} + +{{if $likebuttons}} +
+ {{$likebuttons}} {{$like}} {{$dislike}} +
+{{/if}} +
+{{$comments}} +
+ +{{$paginate}} + diff --git a/view/theme/dispy/smarty3/profile_vcard.tpl b/view/theme/dispy/smarty3/profile_vcard.tpl new file mode 100644 index 0000000000..1334183ab3 --- /dev/null +++ b/view/theme/dispy/smarty3/profile_vcard.tpl @@ -0,0 +1,82 @@ +
+ + {{if $profile.edit}} +
+ + {{$profile.edit.1}} + +
+ {{/if}} + +
{{$profile.name}}
+ + {{if $pdesc}} +
{{$profile.pdesc}}
+ {{/if}} +
+ {{$profile.name}} +
+ + {{if $location}} +
+ {{$location}} +
+ {{if $profile.address}} +
{{$profile.address}}
{{/if}} + + {{$profile.locality}}{{if $profile.locality}}, {{/if}} + {{$profile.region}} + {{$profile.postal-code}} + + {{if $profile.country-name}}{{$profile.country-name}}{{/if}} +
+
+ {{/if}} + + {{if $gender}} +
+ {{$gender}} + {{$profile.gender}} +
+ {{/if}} + + {{if $profile.pubkey}} + + {{/if}} + + {{if $marital}} +
+ + ♥{{$marital}} + {{$profile.marital}} +
+ {{/if}} + + {{if $homepage}} +
+ {{$homepage}} + {{$profile.homepage}} +
{{/if}} + + {{include file="file:{{$diaspora_vcard}}" diaspora=$diaspora_info}} + + +
+ +{{$contact_block}} + diff --git a/view/theme/dispy/smarty3/saved_searches_aside.tpl b/view/theme/dispy/smarty3/saved_searches_aside.tpl new file mode 100644 index 0000000000..5771d7925e --- /dev/null +++ b/view/theme/dispy/smarty3/saved_searches_aside.tpl @@ -0,0 +1,14 @@ +
+ + {{$searchbox}} + + +
+
diff --git a/view/theme/dispy/smarty3/search_item.tpl b/view/theme/dispy/smarty3/search_item.tpl new file mode 100644 index 0000000000..a78bbcf0d1 --- /dev/null +++ b/view/theme/dispy/smarty3/search_item.tpl @@ -0,0 +1,64 @@ +
+
+
+
+ + {{$item.name}} + menu +
+
    + {{$item.item_photo_menu}} +
+
+
+
+
+ {{if $item.lock}}
{{$item.lock}}
+ {{else}}
{{/if}} +
{{$item.location}}
+
+
+
+ {{$item.name}} +
{{$item.ago}}
+ +
+
+
{{$item.title}}
+
+
{{$item.body}}
+ {{if $item.has_cats}} +
{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} [{{$remove}}] {{if $cat.last}}{{else}}, {{/if}}{{/foreach}} +
+ {{/if}} + + {{if $item.has_folders}} +
{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} [{{$remove}}] {{if $cat.last}}{{else}}, {{/if}}{{/foreach}} +
+ {{/if}} + +
+
+
+ {{if $item.drop.dropping}}{{/if}} +
+ {{if $item.drop.pagedrop}}{{/if}} +
+
+
+
+ + +
+ {{if $item.conv}} + {{$item.conv.title}} + {{/if}} +
+ +
+ +
+ + diff --git a/view/theme/dispy/smarty3/theme_settings.tpl b/view/theme/dispy/smarty3/theme_settings.tpl new file mode 100644 index 0000000000..9fcf76b883 --- /dev/null +++ b/view/theme/dispy/smarty3/theme_settings.tpl @@ -0,0 +1,10 @@ +{{include file="field_select.tpl" field=$colour}} + +{{include file="field_select.tpl" field=$font_size}} + +{{include file="field_select.tpl" field=$line_height}} + +
+ +
+ diff --git a/view/theme/dispy/smarty3/threaded_conversation.tpl b/view/theme/dispy/smarty3/threaded_conversation.tpl new file mode 100644 index 0000000000..367698beeb --- /dev/null +++ b/view/theme/dispy/smarty3/threaded_conversation.tpl @@ -0,0 +1,15 @@ +{{$live_update}} + +{{foreach $threads as $thread}} +{{include file="file:{{$thread.template}}" item=$thread}} +{{/foreach}} + +
+ +{{if $dropping}} + +
+{{/if}} diff --git a/view/theme/dispy/smarty3/wall_thread.tpl b/view/theme/dispy/smarty3/wall_thread.tpl new file mode 100644 index 0000000000..9f418b6112 --- /dev/null +++ b/view/theme/dispy/smarty3/wall_thread.tpl @@ -0,0 +1,139 @@ +{{if $item.comment_firstcollapsed}} +
+ {{$item.num_comments}} {{$item.hide_text}} +
+ {{/if}} diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index 2d423a9280..71e4e62e19 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -22,6 +22,7 @@ $a->theme_info = array( 'family' => 'dispy', 'version' => '1.2.2' ); +$a->theme['template_engine'] = 'smarty3'; function dispy_init(&$a) { diff --git a/view/theme/dispy/threaded_conversation.tpl b/view/theme/dispy/threaded_conversation.tpl index 3afb02c6ad..3deb7b9477 100644 --- a/view/theme/dispy/threaded_conversation.tpl +++ b/view/theme/dispy/threaded_conversation.tpl @@ -1,7 +1,7 @@ $live_update -{{ for $threads as $item }} -{{ inc $item.template }}{{ endinc }} +{{ for $threads as $thread }} +{{ inc $thread.template with $item=$thread }}{{ endinc }} {{ endfor }}
diff --git a/view/theme/dispy/wall_thread.tpl b/view/theme/dispy/wall_thread.tpl index 3524c95684..128b287e7a 100644 --- a/view/theme/dispy/wall_thread.tpl +++ b/view/theme/dispy/wall_thread.tpl @@ -98,12 +98,12 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick {{ endfor }}
{{ if $item.has_cats }} -
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$item.remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
{{ endif }} {{ if $item.has_folders }} -
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$item.remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
{{ endif }} @@ -131,8 +131,8 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick
-{{ for $item.children as $item }} - {{ inc $item.template }}{{ endinc }} +{{ for $item.children as $child }} + {{ inc $child.template with $item=$child }}{{ endinc }} {{ endfor }}
diff --git a/view/theme/duepuntozero/profile_vcard.tpl b/view/theme/duepuntozero/profile_vcard.tpl index bcb5baeeb5..c36f0d54a8 100644 --- a/view/theme/duepuntozero/profile_vcard.tpl +++ b/view/theme/duepuntozero/profile_vcard.tpl @@ -31,7 +31,7 @@ {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} - {{ inc diaspora_vcard.tpl }}{{ endinc }} + {{ inc $diaspora_vcard with $diaspora=$diaspora_info }}{{ endinc }}