aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/en/cmnt_received_eml.tpl18
-rw-r--r--view/en/cmnt_received_html_body_eml.tpl25
-rw-r--r--view/en/cmnt_received_text_body_eml.tpl14
-rw-r--r--view/en/mail_received_html_body_eml.tpl26
-rw-r--r--view/en/mail_received_text_body_eml.tpl10
-rw-r--r--view/en/wall_received_eml.tpl18
-rw-r--r--view/en/wall_received_html_body_eml.tpl24
-rw-r--r--view/en/wall_received_text_body_eml.tpl18
-rw-r--r--view/jot-header.tpl1
-rw-r--r--view/jot.tpl4
10 files changed, 4 insertions, 154 deletions
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 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
-<html>
-<head>
- <title>Friendica Message</title>
- <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<table style="border:1px solid #ccc">
- <tbody>
- <tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr>
-
- <tr><td style="padding-top:22px;" colspan="2">$from commented on an item/conversation which you have been following.</td></tr>
-
-
- <tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
- <td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
- <tr><td style="padding-bottom:5px;"></td></tr>
- <tr><td style="padding-right:22px;">$body</td></tr>
- <tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Please login to <a href="$display">view the complete conversation</a>.</td></tr>
- <tr><td></td><td>Thank You,</td></tr>
- <tr><td></td><td>$sitename Administrator</td></tr>
- </tbody>
-</table>
-</body>
-</html>
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 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
-<html>
-<head>
- <title>Friendica Message</title>
- <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<table style="border:1px solid #ccc">
- <tbody>
- <tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr>
-
-
- <tr><td style="padding-top:22px;" colspan="2">$from sent you a new private message at $siteName.</td></tr>
-
-
- <tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
- <td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
- <tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
- <tr><td style="padding-right:22px;">$htmlversion</td></tr>
- <tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Please login at <a href="$siteurl/message">$siteurl/message</a> to read and reply to your private messages.</td></tr>
- <tr><td></td><td>Thank You,</td></tr>
- <tr><td></td><td>$siteName Administrator</td></tr>
- </tbody>
-</table>
-</body>
-</html>
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 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
-<html>
-<head>
- <title>Friendica Message</title>
- <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<table style="border:1px solid #ccc">
- <tbody>
- <tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr>
-
- <tr><td style="padding-top:22px;" colspan="2">$from posted something to your profile wall.</td></tr>
-
-
- <tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
- <td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
- <tr><td style="padding-right:22px;">$body</td></tr>
- <tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Please login at <a href="$siteurl">$siteurl</a> to <a href="$display">view or delete the post</a>.</td></tr>
- <tr><td></td><td>Thank You,</td></tr>
- <tr><td></td><td>$sitename Administrator</td></tr>
- </tbody>
-</table>
-</body>
-</html>
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
-
-
-
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 @@
<input type="hidden" name="return" value="$return_path" />
<input type="hidden" name="location" id="jot-location" value="$defloc" />
<input type="hidden" name="coord" id="jot-coord" value="" />
- <input type="hidden" name="title" id="jot-title" value="" />
<input type="hidden" name="post_id" value="$post_id" />
+ <div id="jot-title-wrapper">
+ <input type="text" name="title" id="jot-title" value="" style="display: none;" />
+ </div>
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>