diff options
| author | friendica <info@friendica.com> | 2011-11-21 19:01:05 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2011-11-21 19:01:05 -0800 |
| commit | c568493f572bdc88cae288d5c43e9fb55361ce07 (patch) | |
| tree | 9c1555486780021e7ac5a4c9c4b0812841369551 /view | |
| parent | ea04263f52dc30ca21e2bfb61ff41cf4428f69f2 (diff) | |
| download | volse-hubzilla-c568493f572bdc88cae288d5c43e9fb55361ce07.tar.gz volse-hubzilla-c568493f572bdc88cae288d5c43e9fb55361ce07.tar.bz2 volse-hubzilla-c568493f572bdc88cae288d5c43e9fb55361ce07.zip | |
add expire_starred option, fix "delete selected" on some themes, new project name in email templates
Diffstat (limited to 'view')
| -rw-r--r-- | view/en/cmnt_received_html_body_eml.tpl | 4 | ||||
| -rw-r--r-- | view/en/mail_received_html_body_eml.tpl | 6 | ||||
| -rw-r--r-- | view/en/wall_received_html_body_eml.tpl | 6 | ||||
| -rw-r--r-- | view/settings.tpl | 3 | ||||
| -rw-r--r-- | view/theme/duepuntozero/conversation.tpl | 13 | ||||
| -rw-r--r-- | view/theme/loozah/conversation.tpl | 13 | ||||
| -rw-r--r-- | view/theme/testbubble/conversation.tpl | 13 |
7 files changed, 49 insertions, 9 deletions
diff --git a/view/en/cmnt_received_html_body_eml.tpl b/view/en/cmnt_received_html_body_eml.tpl index 5fdc5513f..95f56a4d5 100644 --- a/view/en/cmnt_received_html_body_eml.tpl +++ b/view/en/cmnt_received_html_body_eml.tpl @@ -1,13 +1,13 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> - <title>Friendika Message</title> + <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/friendika-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendika</div><div style="clear: both;"></div></td></tr> + <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> diff --git a/view/en/mail_received_html_body_eml.tpl b/view/en/mail_received_html_body_eml.tpl index 622baf6c8..23d9ac4c2 100644 --- a/view/en/mail_received_html_body_eml.tpl +++ b/view/en/mail_received_html_body_eml.tpl @@ -1,13 +1,13 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> - <title>Friendika Message</title> + <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/friendika-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendika</div><div style="clear: both;"></div></td></tr> + <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> @@ -23,4 +23,4 @@ </tbody> </table> </body> -</html>
\ No newline at end of file +</html> diff --git a/view/en/wall_received_html_body_eml.tpl b/view/en/wall_received_html_body_eml.tpl index c955a88a6..91ef61e29 100644 --- a/view/en/wall_received_html_body_eml.tpl +++ b/view/en/wall_received_html_body_eml.tpl @@ -1,13 +1,13 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> - <title>Friendika Message</title> + <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/friendika-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendika</div><div style="clear: both;"></div></td></tr> + <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> @@ -21,4 +21,4 @@ </tbody> </table> </body> -</html>
\ No newline at end of file +</html> diff --git a/view/settings.tpl b/view/settings.tpl index cd9d53963..1a8d73828 100644 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -57,12 +57,13 @@ $blocktags {{inc field_input.tpl with $field=$expire.days }}{{endinc}} <div class="field input"> - <span class="field_help"><a href="#advaced-expire-popup" id="advenced-expire" class='popupbox' title="$expire.advanced">Advanced</a></span> + <span class="field_help"><a href="#advaced-expire-popup" id="advenced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span> <div style="display: none;"> <div id="advaced-expire-popup" style="width:auto;height:auto;overflow:auto;"> <h3>$expire.advanced</h3> {{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}} {{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}} + {{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}} </div> </div> diff --git a/view/theme/duepuntozero/conversation.tpl b/view/theme/duepuntozero/conversation.tpl new file mode 100644 index 000000000..1a0fb33a8 --- /dev/null +++ b/view/theme/duepuntozero/conversation.tpl @@ -0,0 +1,13 @@ +{{ for $threads as $thread }} +<div class="tread-wrapper"> + $thread +</div> +{{ endfor }} + +{{ if $dropping }} +<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();"> + <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div> + <div id="item-delete-selected-desc" >$dropping</div> +</div> +<div id="item-delete-selected-end"></div> +{{ endif }} diff --git a/view/theme/loozah/conversation.tpl b/view/theme/loozah/conversation.tpl new file mode 100644 index 000000000..1a0fb33a8 --- /dev/null +++ b/view/theme/loozah/conversation.tpl @@ -0,0 +1,13 @@ +{{ for $threads as $thread }} +<div class="tread-wrapper"> + $thread +</div> +{{ endfor }} + +{{ if $dropping }} +<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();"> + <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div> + <div id="item-delete-selected-desc" >$dropping</div> +</div> +<div id="item-delete-selected-end"></div> +{{ endif }} diff --git a/view/theme/testbubble/conversation.tpl b/view/theme/testbubble/conversation.tpl new file mode 100644 index 000000000..1a0fb33a8 --- /dev/null +++ b/view/theme/testbubble/conversation.tpl @@ -0,0 +1,13 @@ +{{ for $threads as $thread }} +<div class="tread-wrapper"> + $thread +</div> +{{ endfor }} + +{{ if $dropping }} +<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();"> + <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div> + <div id="item-delete-selected-desc" >$dropping</div> +</div> +<div id="item-delete-selected-end"></div> +{{ endif }} |