From 706b6e8c84be332ff8310fffe13c83e784e46904 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 12 Jul 2011 05:09:07 -0700 Subject: email notifications not working - unable to change notification settings --- view/field_intcheckbox.tpl | 6 ++++++ view/settings.tpl | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 view/field_intcheckbox.tpl (limited to 'view') diff --git a/view/field_intcheckbox.tpl b/view/field_intcheckbox.tpl new file mode 100644 index 000000000..47a513a55 --- /dev/null +++ b/view/field_intcheckbox.tpl @@ -0,0 +1,6 @@ + +
+ + + $field.4 +
diff --git a/view/settings.tpl b/view/settings.tpl index 5e8b90769..fb35c8e45 100644 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -82,11 +82,11 @@ $hide_wall
$lbl_not
-{{inc field_checkbox.tpl with $field=$notify1 }}{{endinc}} -{{inc field_checkbox.tpl with $field=$notify2 }}{{endinc}} -{{inc field_checkbox.tpl with $field=$notify3 }}{{endinc}} -{{inc field_checkbox.tpl with $field=$notify4 }}{{endinc}} -{{inc field_checkbox.tpl with $field=$notify5 }}{{endinc}} +{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}} +{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}} +{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}} +{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}} +{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
-- cgit v1.2.3 From 74a608e1c77ab1d378ed6f09c8d70df3ea61cbca Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 12 Jul 2011 23:14:38 -0700 Subject: openid settings appearing when disabled, don't tag numbers, install admin not getting set --- view/install_db.tpl | 2 +- view/settings.tpl | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/install_db.tpl b/view/install_db.tpl index 6a4d1e2a2..ff4e11ab1 100644 --- a/view/install_db.tpl +++ b/view/install_db.tpl @@ -27,7 +27,7 @@ $lbl_03 $lbl_04 $lbl_05
- +
diff --git a/view/settings.tpl b/view/settings.tpl index fb35c8e45..b79fbfe43 100644 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -15,8 +15,9 @@ $nickname_block {{inc field_password.tpl with $field=$password1 }}{{endinc}} {{inc field_password.tpl with $field=$password2 }}{{endinc}} +{{ if $oid_enable }} {{inc field_input.tpl with $field=$openid }}{{endinc}} - +{{ endif }}
-- cgit v1.2.3 From 7534b8873b7d0e857dbfe4c8085957f8a826ec03 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 14 Jul 2011 03:05:54 -0700 Subject: link tips on nav bar --- view/nav.tpl | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'view') diff --git a/view/nav.tpl b/view/nav.tpl index 008278dc4..09a25ac83 100644 --- a/view/nav.tpl +++ b/view/nav.tpl @@ -2,48 +2,48 @@ $langselector
$sitelocation
-{{ if $nav.logout }}$nav.logout.1 {{ endif }} -{{ if $nav.login }} {{ endif }} +{{ if $nav.logout }}$nav.logout.1 {{ endif }} +{{ if $nav.login }} {{ endif }} -{{ if $nav.register }}$nav.register.1{{ endif }} +{{ if $nav.register }}$nav.register.1{{ endif }} -$nav.help.1 +$nav.help.1 -{{ if $nav.apps }}$nav.apps.1{{ endif }} +{{ if $nav.apps }}$nav.apps.1{{ endif }} -$nav.search.1 -$nav.directory.1 +$nav.search.1 +$nav.directory.1 -{{ if $nav.admin }}$nav.admin.1{{ endif }} +{{ if $nav.admin }}$nav.admin.1{{ endif }} {{ if $nav.network }} -$nav.network.1 +$nav.network.1 {{ endif }} {{ if $nav.home }} -$nav.home.1 +$nav.home.1 {{ endif }} {{ if $nav.community }} -$nav.community.1 +$nav.community.1 {{ endif }} {{ if $nav.notifications }} -$nav.notifications.1 +$nav.notifications.1 {{ endif }} {{ if $nav.messages }} -$nav.messages.1 +$nav.messages.1 {{ endif }} -{{ if $nav.manage }}$nav.manage.1{{ endif }} +{{ if $nav.manage }}$nav.manage.1{{ endif }} -{{ if $nav.settings }}$nav.settings.1{{ endif }} -{{ if $nav.profiles }}$nav.profiles.1{{ endif }} +{{ if $nav.settings }}$nav.settings.1{{ endif }} +{{ if $nav.profiles }}$nav.profiles.1{{ endif }} -{{ if $nav.contacts }}$nav.contacts.1{{ endif }} +{{ if $nav.contacts }}$nav.contacts.1{{ endif }} -- cgit v1.2.3 From ed940288946801cabc6ed715444f23652e3023b1 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 14 Jul 2011 03:38:25 -0700 Subject: template for statusnet api config.xml --- view/apiconfig.tpl | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 view/apiconfig.tpl (limited to 'view') diff --git a/view/apiconfig.tpl b/view/apiconfig.tpl new file mode 100644 index 000000000..71ab241ce --- /dev/null +++ b/view/apiconfig.tpl @@ -0,0 +1,67 @@ + + + + $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 1fa2231c20db99c78f0c8681ebae04b6eecf0954 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 17 Jul 2011 21:12:31 -0700 Subject: invite system --- view/register.tpl | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'view') diff --git a/view/register.tpl b/view/register.tpl index ac8388de4..16e8ba767 100644 --- a/view/register.tpl +++ b/view/register.tpl @@ -16,6 +16,17 @@
+{{ if $invitations }} + +

$invite_desc

+
+ + +
+
+ +{{ endif }} +
-- cgit v1.2.3 From 25b4aacf3b53d4f82f7dc817bb1e022b2a61c1a3 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 18 Jul 2011 16:42:39 -0700 Subject: green icons for greenzero --- view/theme/greenzero/greenicons.png | Bin 0 -> 11888 bytes view/theme/greenzero/style.css | 7 +++++++ 2 files changed, 7 insertions(+) create mode 100644 view/theme/greenzero/greenicons.png (limited to 'view') diff --git a/view/theme/greenzero/greenicons.png b/view/theme/greenzero/greenicons.png new file mode 100644 index 000000000..b20ac5c0d Binary files /dev/null and b/view/theme/greenzero/greenicons.png differ diff --git a/view/theme/greenzero/style.css b/view/theme/greenzero/style.css index 51fcc09ae..ab309930c 100644 --- a/view/theme/greenzero/style.css +++ b/view/theme/greenzero/style.css @@ -12,6 +12,13 @@ a:hover {text-decoration: underline; } color: #ffffff; } +.icon { + display: block; width: 16px; height: 16px; + background-image: url('greenicons.png'); +} + + + body { background-image: url(head.jpg); } aside( background-image: url(border.jpg); } section { background-image: url(border.jpg); } -- cgit v1.2.3 From c0b8e63a3fe600326e0f18c03207ba9fd30c8126 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 18 Jul 2011 18:13:46 -0700 Subject: basic diaspora discovery --- view/xrd_diaspora.tpl | 3 +++ view/xrd_person.tpl | 1 + 2 files changed, 4 insertions(+) create mode 100644 view/xrd_diaspora.tpl (limited to 'view') diff --git a/view/xrd_diaspora.tpl b/view/xrd_diaspora.tpl new file mode 100644 index 000000000..25cda533c --- /dev/null +++ b/view/xrd_diaspora.tpl @@ -0,0 +1,3 @@ + + + diff --git a/view/xrd_person.tpl b/view/xrd_person.tpl index b99f7c1fc..0dabaa5a3 100644 --- a/view/xrd_person.tpl +++ b/view/xrd_person.tpl @@ -19,6 +19,7 @@ + $dspr Date: Mon, 18 Jul 2011 19:17:16 -0700 Subject: improved code blocks --- view/theme/duepuntozero/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 78a0bff5b..5ee3761ef 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -45,8 +45,8 @@ code { border: 1px solid #444; background: #EEE; color: #444; - padding: 10px; - margin-top: 20px; + padding: 0px 10px 10px 10px; + margin-top: 20px; } /*blockquote:before { content: '>> '; -- cgit v1.2.3 From 07a77a4d272582e0d0eea96390201e080a3b549c Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 18 Jul 2011 21:25:49 -0700 Subject: resize editor --- view/jot-header.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/jot-header.tpl b/view/jot-header.tpl index d7a429512..b03c1b4f5 100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -9,7 +9,7 @@ tinyMCE.init({ theme : "advanced", mode : "specific_textareas", editor_selector: /(profile-jot-text|prvmail-text)/, - plugins : "bbcode,paste", + plugins : "bbcode,paste,autoresize", theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code", theme_advanced_buttons2 : "", theme_advanced_buttons3 : "", -- cgit v1.2.3 From 9048ecd85c908715c3e2980ca7f8a3e9fecf8dcb Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 19 Jul 2011 22:58:38 -0700 Subject: diaspora encryption xml template --- view/diasp_dec_hdr.tpl | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 view/diasp_dec_hdr.tpl (limited to 'view') diff --git a/view/diasp_dec_hdr.tpl b/view/diasp_dec_hdr.tpl new file mode 100644 index 000000000..e87c61888 --- /dev/null +++ b/view/diasp_dec_hdr.tpl @@ -0,0 +1,8 @@ + + $inner_iv + $inner_key + + $author_name + $author_uri + + -- cgit v1.2.3