From c583d1620955b8d170b8cbf7a106cefeecad56c8 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 3 Jan 2012 14:27:00 -0800 Subject: fix reference variable effects on sorting --- view/atom_feed.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/atom_feed.tpl b/view/atom_feed.tpl index c7cc08297..72cf8e4fd 100644 --- a/view/atom_feed.tpl +++ b/view/atom_feed.tpl @@ -12,7 +12,7 @@ $feed_id $feed_title - Friendika + Friendica $hub $salmon -- cgit v1.2.3 From 969cd145ce0e717399dbfff6cbc1a45342206e1a Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 3 Jan 2012 17:29:07 -0800 Subject: suggestion notifications --- view/settings.tpl | 1 + 1 file changed, 1 insertion(+) (limited to 'view') diff --git a/view/settings.tpl b/view/settings.tpl index e15976581..6310ff47e 100644 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -107,6 +107,7 @@ $suggestme {{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}} {{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}} {{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}} +{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}} -- cgit v1.2.3 From 8e6c02cda383b7655ef7c045a1c9cb2c63541b60 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 3 Jan 2012 18:12:58 -0800 Subject: remove some old email templates --- view/en/cmnt_received_eml.tpl | 18 ------------------ view/en/cmnt_received_html_body_eml.tpl | 25 ------------------------- view/en/cmnt_received_text_body_eml.tpl | 14 -------------- view/en/mail_received_html_body_eml.tpl | 26 -------------------------- view/en/mail_received_text_body_eml.tpl | 10 ---------- view/en/wall_received_eml.tpl | 18 ------------------ view/en/wall_received_html_body_eml.tpl | 24 ------------------------ view/en/wall_received_text_body_eml.tpl | 18 ------------------ 8 files changed, 153 deletions(-) delete mode 100644 view/en/cmnt_received_eml.tpl delete mode 100644 view/en/cmnt_received_html_body_eml.tpl delete mode 100644 view/en/cmnt_received_text_body_eml.tpl delete mode 100644 view/en/mail_received_html_body_eml.tpl delete mode 100644 view/en/mail_received_text_body_eml.tpl delete mode 100644 view/en/wall_received_eml.tpl delete mode 100644 view/en/wall_received_html_body_eml.tpl delete mode 100644 view/en/wall_received_text_body_eml.tpl (limited to 'view') diff --git a/view/en/cmnt_received_eml.tpl b/view/en/cmnt_received_eml.tpl deleted file mode 100644 index d60fcd375..000000000 --- a/view/en/cmnt_received_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -Dear $username, - - '$from' commented on an item/conversation which you have been following. - ------ -$body ------ - -Please login at $siteurl to view the complete conversation: - -$display - -Thank you, - $sitename administrator - - - diff --git a/view/en/cmnt_received_html_body_eml.tpl b/view/en/cmnt_received_html_body_eml.tpl deleted file mode 100644 index 95f56a4d5..000000000 --- a/view/en/cmnt_received_html_body_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - - - - Friendica Message - - - - - - - - - - - - - - - - - - -
Friendica
$from commented on an item/conversation which you have been following.
$from
$body
Please login to view the complete conversation.
Thank You,
$sitename Administrator
- - diff --git a/view/en/cmnt_received_text_body_eml.tpl b/view/en/cmnt_received_text_body_eml.tpl deleted file mode 100644 index 7dcedeb0c..000000000 --- a/view/en/cmnt_received_text_body_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ -Dear $username, - - '$from' commented on an item/conversation which you have been following. - ------ -$body ------ - -Please login at $siteurl to view the complete conversation: - -$display - -Thank you, - $sitename administrator \ No newline at end of file diff --git a/view/en/mail_received_html_body_eml.tpl b/view/en/mail_received_html_body_eml.tpl deleted file mode 100644 index bd105a61b..000000000 --- a/view/en/mail_received_html_body_eml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - - - Friendica Message - - - - - - - - - - - - - - - - - - - -
Friendica
$from sent you a new private message at $siteName.
$from
$title
$htmlversion
Please login at $siteurl/message to read and reply to your private messages.
Thank You,
$siteName Administrator
- - diff --git a/view/en/mail_received_text_body_eml.tpl b/view/en/mail_received_text_body_eml.tpl deleted file mode 100644 index 023867304..000000000 --- a/view/en/mail_received_text_body_eml.tpl +++ /dev/null @@ -1,10 +0,0 @@ -$from sent you a new private message at $siteName. - -$title - -$textversion - -Please login at $siteurl to read and reply to your private messages. - -Thank you, -$siteName administrator diff --git a/view/en/wall_received_eml.tpl b/view/en/wall_received_eml.tpl deleted file mode 100644 index c296de785..000000000 --- a/view/en/wall_received_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -Dear $username, - - '$from' posted something to your profile wall. - ------ -$body ------ - -Please login at $siteurl to view or delete the item: - -$display - -Thank you, - $sitename administrator - - - diff --git a/view/en/wall_received_html_body_eml.tpl b/view/en/wall_received_html_body_eml.tpl deleted file mode 100644 index 91ef61e29..000000000 --- a/view/en/wall_received_html_body_eml.tpl +++ /dev/null @@ -1,24 +0,0 @@ - - - - Friendica Message - - - - - - - - - - - - - - - - - -
Friendica
$from posted something to your profile wall.
$from
$body
Please login at $siteurl to view or delete the post.
Thank You,
$sitename Administrator
- - diff --git a/view/en/wall_received_text_body_eml.tpl b/view/en/wall_received_text_body_eml.tpl deleted file mode 100644 index c296de785..000000000 --- a/view/en/wall_received_text_body_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -Dear $username, - - '$from' posted something to your profile wall. - ------ -$body ------ - -Please login at $siteurl to view or delete the item: - -$display - -Thank you, - $sitename administrator - - - -- cgit v1.2.3 From 0077997eb69ecda0567f73e8dbf5835ce03d9250 Mon Sep 17 00:00:00 2001 From: 23n <23n@zenzor.de> Date: Wed, 4 Jan 2012 07:05:44 +0100 Subject: Update view/de/strings.php --- view/de/strings.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'view') diff --git a/view/de/strings.php b/view/de/strings.php index b752ef2ea..7c110c093 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -239,11 +239,11 @@ $a->strings["Automatically expire posts after days:"] = "Einträge verfallen aut $a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Wenn leer verfallen Einträge nie automatisch. Verfallene Einträge werden gelöscht."; $a->strings["Notification Settings"] = "Benachrichtigungseinstellungen"; $a->strings["Send a notification email when:"] = "Benachrichtigungs-Email senden wenn:"; -$a->strings["You receive an introduction"] = "Du eine Vorstellung erhälst"; +$a->strings["You receive an introduction"] = "Du eine Vorstellung erhältst"; $a->strings["Your introductions are confirmed"] = "Eine deiner Vorstellungen angenommen wurde"; $a->strings["Someone writes on your profile wall"] = "Jemand etwas auf deiner Pinnwand postet"; $a->strings["Someone writes a followup comment"] = "Jemand auch einen Kommentar verfasst"; -$a->strings["You receive a private message"] = "Du eine private Nachricht erhälst"; +$a->strings["You receive a private message"] = "Du eine private Nachricht erhältst"; $a->strings["Advanced Page Settings"] = "Erweiterte Seiten Einstellungen"; $a->strings["Saved Searches"] = "Gespeicherte Suchen"; $a->strings["Remove term"] = "Begriff entfernen"; @@ -822,7 +822,7 @@ $a->strings["Post to Twitter"] = "Nach Twitter senden"; $a->strings["Twitter settings updated."] = "Twitter Einstellungen aktualisiert."; $a->strings["Twitter Posting Settings"] = "Twitter Posting Einstellungen"; $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Kein Consumer Schlüsselpaar für Twitter gefunden. Bitte wende dich an den Administrator der Seite."; -$a->strings["At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Auf dieser Friendika Instanz wurde das Twitter Plugin aktiviert dein Account ist allerdings noch nicht mit einem Twitter Account verbunden. Um deinen Account mit Twitter zu verbinden, klick auf den Button weiter unten und gib die PIN die du auf Twitter erhälst hier ein. Es werden ausschließlich deine öffentlichen Nachrichten auf Twitter veröffentlicht."; +$a->strings["At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Auf dieser Friendika Instanz wurde das Twitter Plugin aktiviert dein Account ist allerdings noch nicht mit einem Twitter Account verbunden. Um deinen Account mit Twitter zu verbinden, klick auf den Button weiter unten und gib die PIN die du auf Twitter erhältst hier ein. Es werden ausschließlich deine öffentlichen Nachrichten auf Twitter veröffentlicht."; $a->strings["Log in with Twitter"] = "bei Twitter anmelden"; $a->strings["Copy the PIN from Twitter here"] = "Kopiere die Twitter PIN hier her"; $a->strings["Currently connected to: "] = "Momentan verbunden mit: "; -- cgit v1.2.3 From 48a5a2484e762a9804237ae28c24dafe5db7f953 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 4 Jan 2012 00:04:19 -0800 Subject: new smiley --- view/jot-header.tpl | 1 + view/jot.tpl | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/jot-header.tpl b/view/jot-header.tpl index ecfed6c42..941a8f3e2 100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -7,6 +7,7 @@ var textlen = 0; function initEditor(cb){ if (editor==false){ $("#profile-jot-text-loading").show(); +// $("#jot-title").show(); tinyMCE.init({ theme : "advanced", mode : "specific_textareas", diff --git a/view/jot.tpl b/view/jot.tpl index 71b92986d..83af1ae37 100644 --- a/view/jot.tpl +++ b/view/jot.tpl @@ -12,8 +12,10 @@ - +
+ +
-- cgit v1.2.3 From 47edaf9ad79b59d96f908b4501d564e5e63cc210 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 4 Jan 2012 18:03:09 -0800 Subject: dynamic title input box - via fabrixxm --- view/jot-header.tpl | 8 ++++++-- view/jot.tpl | 4 +--- view/theme/dispy/jot-header.tpl | 7 +++++++ view/theme/dispy/jot.tpl | 8 ++++---- view/theme/dispy/style.css | 13 +++++++++++++ view/theme/duepuntozero/style.css | 13 +++++++++++++ view/theme/loozah/style.css | 14 ++++++++++++++ view/theme/quattro/jot.tpl | 8 ++++---- view/theme/quattro/quattro.less | 2 ++ view/theme/testbubble/jot-header.tpl | 8 ++++++++ view/theme/testbubble/jot.tpl | 9 +++++---- view/theme/testbubble/style.css | 14 ++++++++++++++ 12 files changed, 91 insertions(+), 17 deletions(-) (limited to 'view') diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 941a8f3e2..f35cbee17 100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -7,7 +7,7 @@ var textlen = 0; function initEditor(cb){ if (editor==false){ $("#profile-jot-text-loading").show(); -// $("#jot-title").show(); + $("#jot-title-desc").show(); tinyMCE.init({ theme : "advanced", mode : "specific_textareas", @@ -111,7 +111,11 @@ function initEditor(cb){ $(this).val(""); initEditor(); }); - + + $("#jot-title-desc").click(function() { + $("#jot-title-desc").hide(); + $("#jot-title").show(); + }); var uploader = new window.AjaxUpload( 'wall-image-upload', diff --git a/view/jot.tpl b/view/jot.tpl index 83af1ae37..cb4eb64d4 100644 --- a/view/jot.tpl +++ b/view/jot.tpl @@ -14,6 +14,7 @@
+
@@ -46,9 +47,6 @@ -
- -
$jotplugins diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl index 7a1012230..a3464f3f7 100644 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/jot-header.tpl @@ -8,6 +8,7 @@ var textlen = 0; function initEditor(cb) { if (editor==false) { $("#profile-jot-text-loading").show(); + $("#jot-title-desc").show(); tinyMCE.init({ theme : "advanced", mode : "specific_textareas", @@ -100,6 +101,12 @@ function initEditor(cb) { $(this).val(""); initEditor(); }); + + $("#jot-title-desc").click(function() { + $("#jot-title-desc").hide(); + $("#jot-title").show(); + }); + var uploader = new window.AjaxUpload( 'wall-image-upload', { action: 'wall_upload/$nickname', diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl index a2c883e4b..b340b532b 100644 --- a/view/theme/dispy/jot.tpl +++ b/view/theme/dispy/jot.tpl @@ -14,8 +14,11 @@ - +
+ + +
@@ -49,9 +52,6 @@ -