From 06802dd8feefc5778b73c2e910be3e13e28c59bc Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 25 Jul 2011 20:10:21 -0700 Subject: auto focus jot editor --- view/jot-header.tpl | 1 + 1 file changed, 1 insertion(+) (limited to 'view') diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 795267ee3..6195c5bbc 100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -11,6 +11,7 @@ function initEditor(cb){ theme : "advanced", mode : "specific_textareas", editor_selector: /(profile-jot-text|prvmail-text)/, + auto_focus: "profile-jot-text", plugins : "bbcode,paste,autoresize", theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code", theme_advanced_buttons2 : "", -- cgit v1.2.3 From 04675e3ec3cd5951d651998489a1d04247f1026b Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 28 Jul 2011 16:49:43 -0700 Subject: revup --- view/theme/duepuntozero/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index e2b1a57dc..28c1ce9a1 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -45,7 +45,7 @@ code { border: 1px solid #444; background: #EEE; color: #444; - padding: 0px 10px 10px 10px; + padding: 10px; margin-top: 20px; } /*blockquote:before { -- cgit v1.2.3 From 41c7d71e3b8cc73a8c1e7e79e63753eb99ea6b24 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 28 Jul 2011 20:44:35 -0700 Subject: make profile-jot-desc track lock state changes --- view/theme/duepuntozero/style.css | 1 + 1 file changed, 1 insertion(+) (limited to 'view') diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 28c1ce9a1..3edc603f4 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1487,6 +1487,7 @@ input#dfrn-url { height: 20px; color:#cccccc; border: 1px solid #cccccc; + padding: 3px 0px 0px 5px; } -- cgit v1.2.3 From f47d582736ddf24528dd514850d4bed76783f589 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 28 Jul 2011 21:56:56 -0700 Subject: api/statusnet/config.xml --- view/api_config_xml.tpl | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ view/apiconfig.tpl | 67 ------------------------------------------------- 2 files changed, 66 insertions(+), 67 deletions(-) create mode 100644 view/api_config_xml.tpl delete mode 100644 view/apiconfig.tpl (limited to 'view') diff --git a/view/api_config_xml.tpl b/view/api_config_xml.tpl new file mode 100644 index 000000000..3281e59dd --- /dev/null +++ b/view/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/apiconfig.tpl b/view/apiconfig.tpl deleted file mode 100644 index 71ab241ce..000000000 --- a/view/apiconfig.tpl +++ /dev/null @@ -1,67 +0,0 @@ - - - - $sitedesc - $sitename - default - - $sitelogo - - true - en - $adminemail - - - UTC - $siteclosed - - false - $siteprivate - $textlimit - $has_ssl - $ssl_server - 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 - - -- cgit v1.2.3 From 0c9f033505be5dbc2303d8758894e57c616c6534 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 31 Jul 2011 16:35:53 -0700 Subject: some api enhancements --- view/api_timeline_atom.tpl | 47 ++++++---------------------------------------- 1 file changed, 6 insertions(+), 41 deletions(-) (limited to 'view') diff --git a/view/api_timeline_atom.tpl b/view/api_timeline_atom.tpl index bd674f330..dcabba465 100644 --- a/view/api_timeline_atom.tpl +++ b/view/api_timeline_atom.tpl @@ -1,10 +1,10 @@ StatusNet - tag:friendika:PublicTimeline - Network on Friendika - Your network updates on Friendika + $rss.self + Friendika + Friendika API feed $rss.logo - $rss.updated + $rss.atom_updated @@ -61,20 +61,9 @@ $status.published $status.updated - - + @@ -82,10 +71,8 @@ $status.user.url $status.user.name - - - + $status.user.screen_name $status.user.name @@ -95,29 +82,7 @@ $status.user.url true - - - - http://activitystrea.ms/schema/1.0/person - $status.user.contact_url - $status.user.name - - - - - - - $status.user.screen_name - $status.user.name - - - homepage - $status.user.url - true - - - -- cgit v1.2.3 From 326a873082cd9f31f70bfb703ad2c3e7fde19bb8 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 1 Aug 2011 05:13:59 -0700 Subject: merge diaspora/friendika vcard formats - not yet complete --- view/profile_vcard.tpl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view') diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl index 3cd96eabf..86655951d 100644 --- a/view/profile_vcard.tpl +++ b/view/profile_vcard.tpl @@ -24,3 +24,5 @@ $marital $homepage +$diaspora + -- cgit v1.2.3 From 2637831d9056862f7c3db718702116ef4652629a Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 1 Aug 2011 21:02:25 -0700 Subject: some more zot changes migrating back to f9a mainline --- view/xrd_host.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/xrd_host.tpl b/view/xrd_host.tpl index c6184e306..f1d9707d5 100644 --- a/view/xrd_host.tpl +++ b/view/xrd_host.tpl @@ -2,7 +2,7 @@ - $domain + $zroot -- cgit v1.2.3 From 1aaded10b405b3ba00fdd2e5cf809bdab01bf132 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 2 Aug 2011 20:02:07 -0700 Subject: api compatibility fixes --- view/api_timeline_atom.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/api_timeline_atom.tpl b/view/api_timeline_atom.tpl index dcabba465..aef1f9310 100644 --- a/view/api_timeline_atom.tpl +++ b/view/api_timeline_atom.tpl @@ -53,7 +53,7 @@ {{ for $statuses as $status }} $status.objecttype - $status.id + $status.message_id $status.text $status.html -- cgit v1.2.3 From 639204c2ec29ccd74fbc2cb1eb597cca86e84f27 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 3 Aug 2011 22:05:20 -0700 Subject: diaspora structures --- view/diaspora_comment.tpl | 11 +++++++++++ view/diaspora_comment_relay.tpl | 12 ++++++++++++ view/diaspora_like.tpl | 12 ++++++++++++ view/diaspora_like_relay.tpl | 13 +++++++++++++ view/diaspora_post.tpl | 11 +++++++++++ view/diaspora_retract.tpl | 9 +++++++++ view/diaspora_share.tpl | 8 ++++++++ 7 files changed, 76 insertions(+) create mode 100644 view/diaspora_comment.tpl create mode 100644 view/diaspora_comment_relay.tpl create mode 100644 view/diaspora_like.tpl create mode 100644 view/diaspora_like_relay.tpl create mode 100644 view/diaspora_post.tpl create mode 100644 view/diaspora_retract.tpl create mode 100644 view/diaspora_share.tpl (limited to 'view') diff --git a/view/diaspora_comment.tpl b/view/diaspora_comment.tpl new file mode 100644 index 000000000..6ef4ab664 --- /dev/null +++ b/view/diaspora_comment.tpl @@ -0,0 +1,11 @@ + + + + $guid + $parent_guid + $authorsig + $body + $handle + + + \ No newline at end of file diff --git a/view/diaspora_comment_relay.tpl b/view/diaspora_comment_relay.tpl new file mode 100644 index 000000000..e82de1171 --- /dev/null +++ b/view/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/diaspora_like.tpl b/view/diaspora_like.tpl new file mode 100644 index 000000000..76356eb29 --- /dev/null +++ b/view/diaspora_like.tpl @@ -0,0 +1,12 @@ + + + + $type + $guid + $parent_guid + $authorsig + $positive + $handle + + + diff --git a/view/diaspora_like_relay.tpl b/view/diaspora_like_relay.tpl new file mode 100644 index 000000000..6feba96ad --- /dev/null +++ b/view/diaspora_like_relay.tpl @@ -0,0 +1,13 @@ + + + + $guid + $type + $parent_guid + $parentsig + $authrosig + $positive + $handle + + + \ No newline at end of file diff --git a/view/diaspora_post.tpl b/view/diaspora_post.tpl new file mode 100644 index 000000000..1ba3ebb1f --- /dev/null +++ b/view/diaspora_post.tpl @@ -0,0 +1,11 @@ + + + + $body + $guid + $handle + $public + $created + + + \ No newline at end of file diff --git a/view/diaspora_retract.tpl b/view/diaspora_retract.tpl new file mode 100644 index 000000000..6d5b6e22b --- /dev/null +++ b/view/diaspora_retract.tpl @@ -0,0 +1,9 @@ + + + + $guid + $type + $handle + + + \ No newline at end of file diff --git a/view/diaspora_share.tpl b/view/diaspora_share.tpl new file mode 100644 index 000000000..c16341b1e --- /dev/null +++ b/view/diaspora_share.tpl @@ -0,0 +1,8 @@ + + + + $sender + $recipient + + + \ No newline at end of file -- cgit v1.2.3 From 2abcf76ec17a9a7754c399cdde9a4449308a4b02 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 4 Aug 2011 22:37:45 -0700 Subject: salmon protocol changes magicsig draft-experimental, fixes to hostxrd --- view/magicsig.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/magicsig.tpl b/view/magicsig.tpl index 622e7c5a2..75f9bc475 100644 --- a/view/magicsig.tpl +++ b/view/magicsig.tpl @@ -5,5 +5,5 @@ $data $encoding $algorithm -$signature +$signature -- cgit v1.2.3 From 112fc59e3190d29d95139fda3e861818f828b0d0 Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 5 Aug 2011 05:17:18 -0700 Subject: more api tweaks --- view/api_user_xml.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'view') diff --git a/view/api_user_xml.tpl b/view/api_user_xml.tpl index 15517fc42..78cc1f530 100644 --- a/view/api_user_xml.tpl +++ b/view/api_user_xml.tpl @@ -7,7 +7,7 @@ $user.profile_image_url $user.url $user.protected - $user.followers + $user.followers_count $user.profile_background_color $user.profile_text_color $user.profile_link_color @@ -21,10 +21,10 @@ $user.profile_background_image_url $user.profile_background_tile $user.profile_use_background_image - + $user.notifications $user.geo_enabled $user.verified - + $user.following $user.statuses_count $user.lang $user.contributors_enabled -- cgit v1.2.3 From 1d659bd8543c630ff1eda245ab7e9afeec6eebe1 Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 5 Aug 2011 06:42:27 -0700 Subject: move public profile warning to top of page --- view/profile_edit.tpl | 3 ++- view/theme/duepuntozero/style.css | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'view') diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl index 053e19594..8dab72649 100644 --- a/view/profile_edit.tpl +++ b/view/profile_edit.tpl @@ -1,3 +1,5 @@ +$default +

$banner