From 7a33bf88cf546d55b5fac50f1168853c8dd83b39 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Tue, 19 Jun 2012 03:38:43 -0400 Subject: [PATCH 01/47] nav: add $baseurl to nav template context --- include/nav.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/nav.php b/include/nav.php index d760cc8ae5..6759c31f65 100644 --- a/include/nav.php +++ b/include/nav.php @@ -162,6 +162,7 @@ function nav(&$a) { $tpl = get_markup_template('nav.tpl'); $a->page['nav'] .= replace_macros($tpl, array( + '$baseurl' => $a->get_baseurl(), '$langselector' => lang_selector(), '$sitelocation' => $sitelocation, '$nav' => $nav, From 77d0f4f2b8c147cd13c33af867b49e362629bb54 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Tue, 19 Jun 2012 03:40:36 -0400 Subject: [PATCH 02/47] blog theme: first commit --- view/theme/blog/conversation.tpl | 28 +++ view/theme/blog/default.php | 26 +++ view/theme/blog/headers/willow.jpg | Bin 0 -> 68450 bytes view/theme/blog/images/search.png | Bin 0 -> 441 bytes view/theme/blog/nav.tpl | 22 ++ view/theme/blog/style.css | 346 +++++++++++++++++++++++++++++ view/theme/blog/theme.php | 11 + 7 files changed, 433 insertions(+) create mode 100644 view/theme/blog/conversation.tpl create mode 100644 view/theme/blog/default.php create mode 100644 view/theme/blog/headers/willow.jpg create mode 100644 view/theme/blog/images/search.png create mode 100644 view/theme/blog/nav.tpl create mode 100644 view/theme/blog/style.css create mode 100644 view/theme/blog/theme.php diff --git a/view/theme/blog/conversation.tpl b/view/theme/blog/conversation.tpl new file mode 100644 index 0000000000..980fb173cf --- /dev/null +++ b/view/theme/blog/conversation.tpl @@ -0,0 +1,28 @@ +{{ for $threads as $thread }} +
+ {{if $mode == display}} + {{ for $thread.items as $item }} + {{ if $item.type == tag }} + {{ inc wall_item_tag.tpl }}{{ endinc }} + {{ else }} + {{ inc $item.template }}{{ endinc }} + {{ endif }} + {{ endfor }} + {{ else}} + + + {{ inc $thread.items.0.template with $item=$thread.items.0 }}{{ endinc }} + Commenti: {{if $thread.num_comments}}$thread.num_comments{{ else }}0{{ endif }} +
+ {{ endif }} +
+{{ endfor }} + +
+ +{{ if $dropping }} + + $dropping + +{{ endif }} + diff --git a/view/theme/blog/default.php b/view/theme/blog/default.php new file mode 100644 index 0000000000..867207c625 --- /dev/null +++ b/view/theme/blog/default.php @@ -0,0 +1,26 @@ + + + + <?php if(x($page,'title')) echo $page['title'] ?> + + + + +
+ get_baseurl()."/view/theme/blog/headers/willow.jpg"; + echo str_replace("~blog.header.image~", $img, $page['nav']); + } + ?> + +
+
+
+ +
+
+ + + diff --git a/view/theme/blog/headers/willow.jpg b/view/theme/blog/headers/willow.jpg new file mode 100644 index 0000000000000000000000000000000000000000..61bd538b1ac75f388d3ae22e8cddbda590cacd45 GIT binary patch literal 68450 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 literal 0 HcmV?d00001 diff --git a/view/theme/blog/images/search.png b/view/theme/blog/images/search.png new file mode 100644 index 0000000000000000000000000000000000000000..1f9d8288bcd369aec1561e625cf2d87caca62f39 GIT binary patch literal 441 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQaivoN?T>t<74`fmZ*x1O2n0B|IY0nNA|Y;GZnrtPszB4tN`m}?85o(E zSy1Xuw)0nBClsVDat??u3A~haPBCK7;!RKFnhtAg8Mg^ko!Rx{MnQMf z5m~RpJ!V;D2PeN?6Wo@uf>YaFwpUa#Ht!&dZrZss4Js +
+

Friendica

+

Previewing Another WordPress Blog

+
+ +
$sitelocation
+ + + + + +
+ + + +
+ + + diff --git a/view/theme/blog/style.css b/view/theme/blog/style.css new file mode 100644 index 0000000000..82694e2e26 --- /dev/null +++ b/view/theme/blog/style.css @@ -0,0 +1,346 @@ +/* 'inspired' by http://wp-themes.com/twentyeleven/ */ + +html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td { + border: 0 none; + font-family: inherit; + font-size: 100%; + font-style: inherit; + font-weight: inherit; + margin: 0; + outline: 0 none; + padding: 0; + vertical-align: baseline; +} +:focus { + outline: 0 none; +} + +ol, ul { + list-style: none outside none; +} +table { + border-collapse: separate; + border-spacing: 0; +} +caption, th, td { + font-weight: normal; + text-align: left; +} +blockquote:before, blockquote:after, q:before, q:after { + content: ""; +} +blockquote, q { + quotes: "" ""; +} +a img { + border: 0 none; +} +article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section { + display: block; +} +body, input, textarea { + color: #373737; + font: 300 15px/1.625 "Helvetica Neue",Helvetica,Arial,sans-serif; +} +body { + padding: 0 2em; + line-height: 1; + background: none repeat scroll 0 0 #E2E2E2; +} +#page { + margin: 2em auto; + max-width: 1000px; + background: none repeat scroll 0 0 #FFFFFF; +} + +h1, h2, h3, h4, h5, h6 { + clear: both; +} +hr { + background-color: #CCCCCC; + border: 0 none; + height: 1px; + margin-bottom: 1.625em; +} +p { + margin-bottom: 1.625em; +} +ul, ol { + margin: 0 0 1.625em 2.5em; +} +ul { + list-style: square outside none; +} +ol { + list-style-type: decimal; +} +ol ol { + list-style: upper-alpha outside none; +} +ol ol ol { + list-style: lower-roman outside none; +} +ol ol ol ol { + list-style: lower-alpha outside none; +} +ul ul, ol ol, ul ol, ol ul { + margin-bottom: 0; +} +dl { + margin: 0 1.625em; +} +dt { + font-weight: bold; +} +dd { + margin-bottom: 1.625em; +} +strong { + font-weight: bold; +} +cite, em, i { + font-style: italic; +} +blockquote { + font-family: Georgia,"Bitstream Charter",serif; + font-style: italic; + font-weight: normal; + margin: 0 3em; +} +blockquote em, blockquote i, blockquote cite { + font-style: normal; +} +blockquote cite { + color: #666666; + font: 300 12px "Helvetica Neue",Helvetica,Arial,sans-serif; + letter-spacing: 0.05em; + text-transform: uppercase; +} +pre { + background: none repeat scroll 0 0 #F4F4F4; + font: 13px/1.5 "Courier 10 Pitch",Courier,monospace; + margin-bottom: 1.625em; + overflow: auto; + padding: 0.75em 1.625em; +} +code, kbd, samp, var { + font: 13px Monaco,Consolas,"Andale Mono","DejaVu Sans Mono",monospace; +} +abbr, acronym, dfn { + border-bottom: 1px dotted #666666; + cursor: help; +} +address { + display: block; + margin: 0 0 1.625em; +} +ins { + background: none repeat scroll 0 0 #FFF9C0; + text-decoration: none; +} +sup, sub { + font-size: 10px; + height: 0; + line-height: 1; + position: relative; + vertical-align: baseline; +} +sup { + bottom: 1ex; +} +sub { + top: 0.5ex; +} +input[type="text"], input[type="password"], textarea { + background: none repeat scroll 0 0 #FAFAFA; + border: 1px solid #DDDDDD; + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1) inset; + color: #888888; +} +input[type="text"]:focus, textarea:focus { + color: #373737; +} +textarea { + padding-left: 3px; + width: 98%; +} +input[type="text"] { + padding: 3px; +} +input#search { + background: url("images/search.png") no-repeat scroll 5px 6px transparent; + border-radius: 2px 2px 2px 2px; + font-size: 14px; + height: 22px; + line-height: 1.2em; + padding: 4px 10px 4px 28px; +} +input#searchsubmit { + display: none; +} +a { + color: #1982D1; + text-decoration: none; +} +a:focus, a:active, a:hover { + text-decoration: underline; +} + +.assistive-text { + clip: rect(1px, 1px, 1px, 1px); + position: absolute !important; +} + +/* header */ +#branding hgroup { + margin: 0 7.6%; +} +#branding { + border-top: 2px solid #BBBBBB; + padding-bottom: 10px; + position: relative; + z-index: 9999; +} +#site-title { + margin-right: 270px; + padding: 3.65625em 0 0; +} +#site-title a { + color: #111111; + font-size: 30px; + font-weight: bold; + line-height: 36px; + text-decoration: none; +} +#site-title a:hover, #site-title a:focus, #site-title a:active { + color: #1982D1; +} +#site-description { + color: #7A7A7A; + font-size: 14px; + margin: 0 270px 3.65625em 0; +} +#branding img { + height: auto; + margin-bottom: -7px; + width: 100%; +} +#access { + background: -moz-linear-gradient(#252525, #0A0A0A) repeat scroll 0 0 transparent; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); + clear: both; + display: block; + float: left; + margin: 0 auto 6px; + width: 100%; +} +#access ul { + font-size: 13px; + list-style: none outside none; + margin: 0 0 0 -0.8125em; + padding-left: 0; +} +#access li { + float: left; + position: relative; +} +#access a { + color: #EEEEEE; + display: block; + line-height: 3.333em; + padding: 0 1.2125em; + text-decoration: none; +} +#access ul ul { + box-shadow: 0 3px 3px rgba(0, 0, 0, 0.2); + display: none; + float: left; + left: 0; + margin: 0; + position: absolute; + top: 3.333em; + width: 188px; + z-index: 99999; +} +#access ul ul ul { + left: 100%; + top: 0; +} +#access ul ul a { + background: none repeat scroll 0 0 #F9F9F9; + border-bottom: 1px dotted #DDDDDD; + color: #444444; + font-size: 13px; + font-weight: normal; + height: auto; + line-height: 1.4em; + padding: 10px; + width: 168px; +} +#access li:hover > a, #access ul ul *:hover > a, #access a:focus { + background: none repeat scroll 0 0 #EFEFEF; +} +#access li:hover > a, #access a:focus { + background: -moz-linear-gradient(#F9F9F9, #E5E5E5) repeat scroll 0 0 transparent; + color: #373737; +} +#access ul li:hover > ul { + display: block; +} +#access .current-menu-item > a, #access .current-menu-ancestor > a, #access .current_page_item > a, #access .current_page_ancestor > a { + font-weight: bold; +} +#branding #searchform { + position: absolute; + right: 7.6%; + text-align: right; + top: 3.8em; +} +#branding #searchform div { + margin: 0; +} +#branding #search { + -moz-transition-duration: 400ms; + -moz-transition-property: width, background; + -moz-transition-timing-function: ease; + float: right; + width: 72px; +} +#branding #search:focus { + background-color: #F9F9F9; + width: 196px; +} +#branding #searchsubmit { + display: none; +} +#branding .only-search #searchform { + top: 5px; + z-index: 1; +} +#branding .only-search #search { + background-color: #666666; + border-color: #000000; + color: #222222; +} +#branding .only-search #s, #branding .only-search #s:focus { + width: 85%; +} +#branding .only-search #s:focus { + background-color: #BBBBBB; +} +#branding .with-image #searchform { + bottom: -27px; + max-width: 195px; + top: auto; +} +#branding .only-search + #access div { + padding-right: 205px; +} +#branding #site-location { + font-size: 0.7em; + color: #666666; + position: absolute; + right: 7.6%; + text-align: right; + top: -1.4em; +} diff --git a/view/theme/blog/theme.php b/view/theme/blog/theme.php new file mode 100644 index 0000000000..77c44d2c36 --- /dev/null +++ b/view/theme/blog/theme.php @@ -0,0 +1,11 @@ + +**/ +$a->theme_info = array( +); + +function blog_init(&$a) { + +} \ No newline at end of file From 34f01ece9ff836d12d99fb796e190991e79d45d4 Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Thu, 21 Jun 2012 15:37:03 +0200 Subject: [PATCH 03/47] blog theme: more on header/nav --- view/theme/blog/nav.tpl | 89 ++++++++++++++++++++++++++++++++++++++- view/theme/blog/style.css | 86 +++++++++++++++++++++++++++++++++++-- 2 files changed, 170 insertions(+), 5 deletions(-) diff --git a/view/theme/blog/nav.tpl b/view/theme/blog/nav.tpl index 06cfee7760..483886d073 100644 --- a/view/theme/blog/nav.tpl +++ b/view/theme/blog/nav.tpl @@ -10,13 +10,98 @@ -
+
+ {{ if $nav.logout }} + + {{ endif }} + + diff --git a/view/theme/blog/style.css b/view/theme/blog/style.css index 82694e2e26..b3b84fe7ab 100644 --- a/view/theme/blog/style.css +++ b/view/theme/blog/style.css @@ -234,6 +234,9 @@ a:focus, a:active, a:hover { margin: 0 auto 6px; width: 100%; } +#access div { + margin: 0 7.6%; +} #access ul { font-size: 13px; list-style: none outside none; @@ -287,7 +290,7 @@ a:focus, a:active, a:hover { #access ul li:hover > ul { display: block; } -#access .current-menu-item > a, #access .current-menu-ancestor > a, #access .current_page_item > a, #access .current_page_ancestor > a { +.selected > a, #access .current-menu-item > a, #access .current-menu-ancestor > a, #access .current_page_item > a, #access .current_page_ancestor > a { font-weight: bold; } #branding #searchform { @@ -338,9 +341,86 @@ a:focus, a:active, a:hover { } #branding #site-location { font-size: 0.7em; - color: #666666; + color: #BBBBBB; position: absolute; right: 7.6%; text-align: right; - top: -1.4em; + top: 13.5em; } + +/* user bar */ +#tools { + background: -moz-linear-gradient(#444444, #222222) repeat scroll 0 0 transparent; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); + clear: both; + display: block; + position: fixed; + top: 0px; + left: auto; + margin: 0 auto 6px; + width: 1000px; +} +#tools div { + margin: 0 7.6%; +} +#tools ul { + font-size: 10px; + list-style: none outside none; + margin: 0 0 0 -0.8125em; + padding-left: 0; +} +#tools li { + float: left; + position: relative; +} +#tools a { + color: #EEEEEE; + display: block; + line-height: 3.333em; + padding: 0 1.2125em; + text-decoration: none; +} +#tools ul ul { + box-shadow: 0 3px 3px rgba(0, 0, 0, 0.2); + display: none; + float: left; + left: 0; + margin: 0; + position: absolute; + top: 3.333em; + width: 188px; + z-index: 99999; +} +#tools ul ul .sep { + border-top: 1px dotted #DDDDDD; +} +#tools ul ul ul { + left: 100%; + top: 0; +} +#tools ul ul a { + background: none repeat scroll 0 0 #F9F9F9; + border-bottom: 1px dotted #DDDDDD; + color: #444444; + font-size: 13px; + font-weight: normal; + height: auto; + line-height: 1.4em; + padding: 10px; + width: 168px; +} +#tools li:hover > a, #access ul ul *:hover > a, #access a:focus { + background: none repeat scroll 0 0 #EFEFEF; +} +#tools li:hover > a, #access a:focus { + background: -moz-linear-gradient(#F9F9F9, #E5E5E5) repeat scroll 0 0 transparent; + color: #373737; +} +#tools ul li:hover > ul { + display: block; +} +#tools img { + width: 16px; + margin-bottom: -5px; + margin-right: 5px; +} \ No newline at end of file From b400ddd22d9d9490db9e1e5d9e0de3691077828d Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Wed, 19 Sep 2012 11:38:32 -0400 Subject: [PATCH 04/47] conversation: new 'categories' and 'folder' elements to $item remove static "Filed under" e "Category" text from message body both are lists of array whith 'name' : category/folder name 'remove': url to remove 'first': bool first in array 'last' : bool last in array --- include/conversation.php | 74 ++++++++++++++++++++++++++++++++++++++++ include/text.php | 27 --------------- 2 files changed, 74 insertions(+), 27 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 1d927d2016..a06dbd7bd3 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -350,6 +350,70 @@ function visible_activity($item) { return true; } + +/** + * returns + * [ + * //categories [ + * { + * 'name': 'category name', + * 'removeurl': 'url to remove this category', + * 'first': 'is the first in this array? true/false', + * 'last': 'is the last in this array? true/false', + * } , + * .... + * ], + * // folders [ + * 'name': 'folder name', + * 'removeurl': 'url to remove this folder', + * 'first': 'is the first in this array? true/false', + * 'last': 'is the last in this array? true/false', + * } , + * .... + * ] + * ] + */ +function get_cats_and_terms($item) { + $categories = array(); + $folders = array(); + + $matches = false; $first = true; + $cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + $categories[] = array( + 'name' => xmlify(file_tag_decode($mtch[1])), + 'removeurl' => $a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&cat=' . xmlify(file_tag_decode($mtch[1])), + 'first' => $first, + 'last' => false + ); + $first = false; + } + } + if (count($categories)) $categories[count($categories)-1]['last'] = true; + + + + $matches = false; $first = true; + $cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + $folders[] = array( + 'name' => xmlify(file_tag_decode($mtch[1])), + 'removeurl' => $a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&term=' . xmlify(file_tag_decode($mtch[1])), + 'first' => $first, + 'last' => false + ); + $first = false; + } + } + + if (count($folders)) $folders[count($folders)-1]['last'] = true; + + return array($categories, $folders); +} + + /** * Recursively prepare a thread for HTML */ @@ -629,6 +693,10 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr $body = prepare_body($item,true); + list($categories, $folders) = get_cats_and_terms($item); + + + $tmp_item = array( // collapse comments in template. I don't like this much... 'comment_firstcollapsed' => $firstcollapsed, @@ -640,6 +708,8 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr 'tags' => template_escape($tags), 'hashtags' => template_escape($hashtags), 'mentions' => template_escape($mentions), + 'categories' => $categories, + 'folders' => $folders, 'body' => template_escape($body), 'text' => strip_tags(template_escape($body)), 'id' => $item['item_id'], @@ -890,6 +960,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $body = prepare_body($item,true); + list($categories, $folders) = get_cats_and_terms($item); //$tmp_item = replace_macros($tpl,array( $tmp_item = array( 'template' => $tpl, @@ -906,6 +977,8 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { 'tags' => template_escape($tags), 'hashtags' => template_escape($hashtags), 'mentions' => template_escape($mentions), + 'categories' => $categories, + 'folders' => $folders, 'text' => strip_tags(template_escape($body)), 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'), 'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])), @@ -983,6 +1056,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $o = replace_macros($page_template, array( '$baseurl' => $a->get_baseurl($ssl_state), + '$remove' => t('remove'), '$mode' => $mode, '$user' => $a->user, '$threads' => $threads, diff --git a/include/text.php b/include/text.php index c1e01343a8..878ce80e9b 100644 --- a/include/text.php +++ b/include/text.php @@ -1016,35 +1016,8 @@ function prepare_body($item,$attach = false) { } $s .= '
'; } - $matches = false; - $cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER); - if($cnt) { -// logger('prepare_text: categories: ' . print_r($matches,true), LOGGER_DEBUG); - foreach($matches as $mtch) { - if(strlen($x)) - $x .= ','; - $x .= xmlify(file_tag_decode($mtch[1])) - . ((local_user() == $item['uid']) ? ' ' . t('[remove]') . '' : ''); - } - if(strlen($x)) - $s .= '
' . t('Categories:') . ' ' . $x . '
'; - } - $matches = false; - $x = ''; - $cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER); - if($cnt) { -// logger('prepare_text: filed_under: ' . print_r($matches,true), LOGGER_DEBUG); - foreach($matches as $mtch) { - if(strlen($x)) - $x .= '   '; - $x .= xmlify(file_tag_decode($mtch[1])) . ' ' . t('[remove]') . ''; - } - if(strlen($x) && (local_user() == $item['uid'])) - $s .= '
' . t('Filed under:') . ' ' . $x . '
'; - } - // Look for spoiler $spoilersearch = '
'; From 4758dc187c9bb74fc49f9bfcde5f6aa5fa709d3f Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Thu, 20 Sep 2012 02:42:54 -0400 Subject: [PATCH 05/47] remove blog theme --- view/theme/blog/conversation.tpl | 28 -- view/theme/blog/default.php | 26 -- view/theme/blog/headers/willow.jpg | Bin 68450 -> 0 bytes view/theme/blog/images/search.png | Bin 441 -> 0 bytes view/theme/blog/nav.tpl | 107 -------- view/theme/blog/style.css | 426 ----------------------------- view/theme/blog/theme.php | 11 - 7 files changed, 598 deletions(-) delete mode 100644 view/theme/blog/conversation.tpl delete mode 100644 view/theme/blog/default.php delete mode 100644 view/theme/blog/headers/willow.jpg delete mode 100644 view/theme/blog/images/search.png delete mode 100644 view/theme/blog/nav.tpl delete mode 100644 view/theme/blog/style.css delete mode 100644 view/theme/blog/theme.php diff --git a/view/theme/blog/conversation.tpl b/view/theme/blog/conversation.tpl deleted file mode 100644 index 980fb173cf..0000000000 --- a/view/theme/blog/conversation.tpl +++ /dev/null @@ -1,28 +0,0 @@ -{{ for $threads as $thread }} -
- {{if $mode == display}} - {{ for $thread.items as $item }} - {{ if $item.type == tag }} - {{ inc wall_item_tag.tpl }}{{ endinc }} - {{ else }} - {{ inc $item.template }}{{ endinc }} - {{ endif }} - {{ endfor }} - {{ else}} - - - {{ inc $thread.items.0.template with $item=$thread.items.0 }}{{ endinc }} - Commenti: {{if $thread.num_comments}}$thread.num_comments{{ else }}0{{ endif }} -
- {{ endif }} -
-{{ endfor }} - -
- -{{ if $dropping }} - - $dropping - -{{ endif }} - diff --git a/view/theme/blog/default.php b/view/theme/blog/default.php deleted file mode 100644 index 867207c625..0000000000 --- a/view/theme/blog/default.php +++ /dev/null @@ -1,26 +0,0 @@ - - - - <?php if(x($page,'title')) echo $page['title'] ?> - - - - -
- get_baseurl()."/view/theme/blog/headers/willow.jpg"; - echo str_replace("~blog.header.image~", $img, $page['nav']); - } - ?> - -
-
-
- -
-
- - - diff --git a/view/theme/blog/headers/willow.jpg b/view/theme/blog/headers/willow.jpg deleted file mode 100644 index 61bd538b1ac75f388d3ae22e8cddbda590cacd45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68450 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 diff --git a/view/theme/blog/images/search.png b/view/theme/blog/images/search.png deleted file mode 100644 index 1f9d8288bcd369aec1561e625cf2d87caca62f39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 441 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQaivoN?T>t<74`fmZ*x1O2n0B|IY0nNA|Y;GZnrtPszB4tN`m}?85o(E zSy1Xuw)0nBClsVDat??u3A~haPBCK7;!RKFnhtAg8Mg^ko!Rx{MnQMf z5m~RpJ!V;D2PeN?6Wo@uf>YaFwpUa#Ht!&dZrZss4Js -
-

Friendica

-

Previewing Another WordPress Blog

-
- -
$sitelocation
- - - - - - - - - {{ if $nav.logout }} - - {{ endif }} - - - diff --git a/view/theme/blog/style.css b/view/theme/blog/style.css deleted file mode 100644 index b3b84fe7ab..0000000000 --- a/view/theme/blog/style.css +++ /dev/null @@ -1,426 +0,0 @@ -/* 'inspired' by http://wp-themes.com/twentyeleven/ */ - -html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td { - border: 0 none; - font-family: inherit; - font-size: 100%; - font-style: inherit; - font-weight: inherit; - margin: 0; - outline: 0 none; - padding: 0; - vertical-align: baseline; -} -:focus { - outline: 0 none; -} - -ol, ul { - list-style: none outside none; -} -table { - border-collapse: separate; - border-spacing: 0; -} -caption, th, td { - font-weight: normal; - text-align: left; -} -blockquote:before, blockquote:after, q:before, q:after { - content: ""; -} -blockquote, q { - quotes: "" ""; -} -a img { - border: 0 none; -} -article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section { - display: block; -} -body, input, textarea { - color: #373737; - font: 300 15px/1.625 "Helvetica Neue",Helvetica,Arial,sans-serif; -} -body { - padding: 0 2em; - line-height: 1; - background: none repeat scroll 0 0 #E2E2E2; -} -#page { - margin: 2em auto; - max-width: 1000px; - background: none repeat scroll 0 0 #FFFFFF; -} - -h1, h2, h3, h4, h5, h6 { - clear: both; -} -hr { - background-color: #CCCCCC; - border: 0 none; - height: 1px; - margin-bottom: 1.625em; -} -p { - margin-bottom: 1.625em; -} -ul, ol { - margin: 0 0 1.625em 2.5em; -} -ul { - list-style: square outside none; -} -ol { - list-style-type: decimal; -} -ol ol { - list-style: upper-alpha outside none; -} -ol ol ol { - list-style: lower-roman outside none; -} -ol ol ol ol { - list-style: lower-alpha outside none; -} -ul ul, ol ol, ul ol, ol ul { - margin-bottom: 0; -} -dl { - margin: 0 1.625em; -} -dt { - font-weight: bold; -} -dd { - margin-bottom: 1.625em; -} -strong { - font-weight: bold; -} -cite, em, i { - font-style: italic; -} -blockquote { - font-family: Georgia,"Bitstream Charter",serif; - font-style: italic; - font-weight: normal; - margin: 0 3em; -} -blockquote em, blockquote i, blockquote cite { - font-style: normal; -} -blockquote cite { - color: #666666; - font: 300 12px "Helvetica Neue",Helvetica,Arial,sans-serif; - letter-spacing: 0.05em; - text-transform: uppercase; -} -pre { - background: none repeat scroll 0 0 #F4F4F4; - font: 13px/1.5 "Courier 10 Pitch",Courier,monospace; - margin-bottom: 1.625em; - overflow: auto; - padding: 0.75em 1.625em; -} -code, kbd, samp, var { - font: 13px Monaco,Consolas,"Andale Mono","DejaVu Sans Mono",monospace; -} -abbr, acronym, dfn { - border-bottom: 1px dotted #666666; - cursor: help; -} -address { - display: block; - margin: 0 0 1.625em; -} -ins { - background: none repeat scroll 0 0 #FFF9C0; - text-decoration: none; -} -sup, sub { - font-size: 10px; - height: 0; - line-height: 1; - position: relative; - vertical-align: baseline; -} -sup { - bottom: 1ex; -} -sub { - top: 0.5ex; -} -input[type="text"], input[type="password"], textarea { - background: none repeat scroll 0 0 #FAFAFA; - border: 1px solid #DDDDDD; - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1) inset; - color: #888888; -} -input[type="text"]:focus, textarea:focus { - color: #373737; -} -textarea { - padding-left: 3px; - width: 98%; -} -input[type="text"] { - padding: 3px; -} -input#search { - background: url("images/search.png") no-repeat scroll 5px 6px transparent; - border-radius: 2px 2px 2px 2px; - font-size: 14px; - height: 22px; - line-height: 1.2em; - padding: 4px 10px 4px 28px; -} -input#searchsubmit { - display: none; -} -a { - color: #1982D1; - text-decoration: none; -} -a:focus, a:active, a:hover { - text-decoration: underline; -} - -.assistive-text { - clip: rect(1px, 1px, 1px, 1px); - position: absolute !important; -} - -/* header */ -#branding hgroup { - margin: 0 7.6%; -} -#branding { - border-top: 2px solid #BBBBBB; - padding-bottom: 10px; - position: relative; - z-index: 9999; -} -#site-title { - margin-right: 270px; - padding: 3.65625em 0 0; -} -#site-title a { - color: #111111; - font-size: 30px; - font-weight: bold; - line-height: 36px; - text-decoration: none; -} -#site-title a:hover, #site-title a:focus, #site-title a:active { - color: #1982D1; -} -#site-description { - color: #7A7A7A; - font-size: 14px; - margin: 0 270px 3.65625em 0; -} -#branding img { - height: auto; - margin-bottom: -7px; - width: 100%; -} -#access { - background: -moz-linear-gradient(#252525, #0A0A0A) repeat scroll 0 0 transparent; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); - clear: both; - display: block; - float: left; - margin: 0 auto 6px; - width: 100%; -} -#access div { - margin: 0 7.6%; -} -#access ul { - font-size: 13px; - list-style: none outside none; - margin: 0 0 0 -0.8125em; - padding-left: 0; -} -#access li { - float: left; - position: relative; -} -#access a { - color: #EEEEEE; - display: block; - line-height: 3.333em; - padding: 0 1.2125em; - text-decoration: none; -} -#access ul ul { - box-shadow: 0 3px 3px rgba(0, 0, 0, 0.2); - display: none; - float: left; - left: 0; - margin: 0; - position: absolute; - top: 3.333em; - width: 188px; - z-index: 99999; -} -#access ul ul ul { - left: 100%; - top: 0; -} -#access ul ul a { - background: none repeat scroll 0 0 #F9F9F9; - border-bottom: 1px dotted #DDDDDD; - color: #444444; - font-size: 13px; - font-weight: normal; - height: auto; - line-height: 1.4em; - padding: 10px; - width: 168px; -} -#access li:hover > a, #access ul ul *:hover > a, #access a:focus { - background: none repeat scroll 0 0 #EFEFEF; -} -#access li:hover > a, #access a:focus { - background: -moz-linear-gradient(#F9F9F9, #E5E5E5) repeat scroll 0 0 transparent; - color: #373737; -} -#access ul li:hover > ul { - display: block; -} -.selected > a, #access .current-menu-item > a, #access .current-menu-ancestor > a, #access .current_page_item > a, #access .current_page_ancestor > a { - font-weight: bold; -} -#branding #searchform { - position: absolute; - right: 7.6%; - text-align: right; - top: 3.8em; -} -#branding #searchform div { - margin: 0; -} -#branding #search { - -moz-transition-duration: 400ms; - -moz-transition-property: width, background; - -moz-transition-timing-function: ease; - float: right; - width: 72px; -} -#branding #search:focus { - background-color: #F9F9F9; - width: 196px; -} -#branding #searchsubmit { - display: none; -} -#branding .only-search #searchform { - top: 5px; - z-index: 1; -} -#branding .only-search #search { - background-color: #666666; - border-color: #000000; - color: #222222; -} -#branding .only-search #s, #branding .only-search #s:focus { - width: 85%; -} -#branding .only-search #s:focus { - background-color: #BBBBBB; -} -#branding .with-image #searchform { - bottom: -27px; - max-width: 195px; - top: auto; -} -#branding .only-search + #access div { - padding-right: 205px; -} -#branding #site-location { - font-size: 0.7em; - color: #BBBBBB; - position: absolute; - right: 7.6%; - text-align: right; - top: 13.5em; -} - -/* user bar */ -#tools { - background: -moz-linear-gradient(#444444, #222222) repeat scroll 0 0 transparent; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); - clear: both; - display: block; - position: fixed; - top: 0px; - left: auto; - margin: 0 auto 6px; - width: 1000px; -} -#tools div { - margin: 0 7.6%; -} -#tools ul { - font-size: 10px; - list-style: none outside none; - margin: 0 0 0 -0.8125em; - padding-left: 0; -} -#tools li { - float: left; - position: relative; -} -#tools a { - color: #EEEEEE; - display: block; - line-height: 3.333em; - padding: 0 1.2125em; - text-decoration: none; -} -#tools ul ul { - box-shadow: 0 3px 3px rgba(0, 0, 0, 0.2); - display: none; - float: left; - left: 0; - margin: 0; - position: absolute; - top: 3.333em; - width: 188px; - z-index: 99999; -} -#tools ul ul .sep { - border-top: 1px dotted #DDDDDD; -} -#tools ul ul ul { - left: 100%; - top: 0; -} -#tools ul ul a { - background: none repeat scroll 0 0 #F9F9F9; - border-bottom: 1px dotted #DDDDDD; - color: #444444; - font-size: 13px; - font-weight: normal; - height: auto; - line-height: 1.4em; - padding: 10px; - width: 168px; -} -#tools li:hover > a, #access ul ul *:hover > a, #access a:focus { - background: none repeat scroll 0 0 #EFEFEF; -} -#tools li:hover > a, #access a:focus { - background: -moz-linear-gradient(#F9F9F9, #E5E5E5) repeat scroll 0 0 transparent; - color: #373737; -} -#tools ul li:hover > ul { - display: block; -} -#tools img { - width: 16px; - margin-bottom: -5px; - margin-right: 5px; -} \ No newline at end of file diff --git a/view/theme/blog/theme.php b/view/theme/blog/theme.php deleted file mode 100644 index 77c44d2c36..0000000000 --- a/view/theme/blog/theme.php +++ /dev/null @@ -1,11 +0,0 @@ - -**/ -$a->theme_info = array( -); - -function blog_init(&$a) { - -} \ No newline at end of file From 49098ed11d9c51610088758ac7a78530d4b52676 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Thu, 20 Sep 2012 09:25:53 +0200 Subject: [PATCH 06/47] deleted: view/theme/smoothly/match.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php --- view/theme/smoothly/match.tpl | 13 ------------- view/theme/smoothly/style.css | 4 ++-- view/theme/smoothly/theme.php | 2 +- 3 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 view/theme/smoothly/match.tpl diff --git a/view/theme/smoothly/match.tpl b/view/theme/smoothly/match.tpl deleted file mode 100644 index 244b243ece..0000000000 --- a/view/theme/smoothly/match.tpl +++ /dev/null @@ -1,13 +0,0 @@ -
-
- - $name - -
- $name$inttxt
$tags -
- {{ if $connlnk }} -
$conntxt
- {{ endif }} -
-
\ No newline at end of file diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 90de5a4f28..e1be59bebe 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -3,7 +3,7 @@ Smoothly Created by Anne Walk and Devlon Duthie on 2011-09-24 - Modified by alex@friendica.pixelbits.de on 2012-09-17 + Modified by alex@friendica.pixelbits.de on 2012-09-20 ** Colors ** @@ -3795,7 +3795,7 @@ ul.menu-popup { } .qcomment { - opacity: 0; + opacity: 0.8; filter: alpha(opacity=0); } diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php index 14c40a2ea2..51031624de 100644 --- a/view/theme/smoothly/theme.php +++ b/view/theme/smoothly/theme.php @@ -3,7 +3,7 @@ /* * Name: Smoothly * Description: Like coffee with milk. Theme works fine with iPad[2]. - * Version: Version 0.9.19-4 + * Version: Version 0.9.20-1 * Author: Alex * Maintainer: Alex * Screenshot: Screenshot From eda96a82d77725e4cb577968540899016600327d Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Thu, 20 Sep 2012 09:32:42 +0200 Subject: [PATCH 07/47] Update util/typo.php to check in to 'object' folder --- util/typo.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/util/typo.php b/util/typo.php index bb2fc67c9f..a8055c8418 100644 --- a/util/typo.php +++ b/util/typo.php @@ -25,6 +25,13 @@ echo $file . "\n"; include_once($file); } + + echo "Directory: object\n"; + $files = glob('object/*.php'); + foreach($files as $file) { + echo $file . "\n"; + include_once($file); + } echo "Directory: addon\n"; $dirs = glob('addon/*'); From dd25c7db7ed29d21045ec300d61ec31739ca887a Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Thu, 20 Sep 2012 09:46:49 +0200 Subject: [PATCH 08/47] more $item data - add $item.categories and $item.folders to object/Item.php - add $item.hastags and $item.mentions to object/Item.php - add $item.total_comments_num and $item.total_comments_text to object/Item.php (those are set for top_level item also with no comments) - move get_cats_and_terms() to include/text.php --- include/conversation.php | 63 -------------------------------------- include/text.php | 66 ++++++++++++++++++++++++++++++++++++++++ object/Item.php | 25 +++++++++++++-- 3 files changed, 89 insertions(+), 65 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 664f81f3bc..fc4b85e794 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -351,69 +351,6 @@ function visible_activity($item) { } -/** - * returns - * [ - * //categories [ - * { - * 'name': 'category name', - * 'removeurl': 'url to remove this category', - * 'first': 'is the first in this array? true/false', - * 'last': 'is the last in this array? true/false', - * } , - * .... - * ], - * // folders [ - * 'name': 'folder name', - * 'removeurl': 'url to remove this folder', - * 'first': 'is the first in this array? true/false', - * 'last': 'is the last in this array? true/false', - * } , - * .... - * ] - * ] - */ -function get_cats_and_terms($item) { - $categories = array(); - $folders = array(); - - $matches = false; $first = true; - $cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER); - if($cnt) { - foreach($matches as $mtch) { - $categories[] = array( - 'name' => xmlify(file_tag_decode($mtch[1])), - 'removeurl' => $a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&cat=' . xmlify(file_tag_decode($mtch[1])), - 'first' => $first, - 'last' => false - ); - $first = false; - } - } - if (count($categories)) $categories[count($categories)-1]['last'] = true; - - - - $matches = false; $first = true; - $cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER); - if($cnt) { - foreach($matches as $mtch) { - $folders[] = array( - 'name' => xmlify(file_tag_decode($mtch[1])), - 'removeurl' => $a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&term=' . xmlify(file_tag_decode($mtch[1])), - 'first' => $first, - 'last' => false - ); - $first = false; - } - } - - if (count($folders)) $folders[count($folders)-1]['last'] = true; - - return array($categories, $folders); -} - - /** * Recursively prepare a thread for HTML */ diff --git a/include/text.php b/include/text.php index 878ce80e9b..9b55078cbe 100644 --- a/include/text.php +++ b/include/text.php @@ -1071,6 +1071,72 @@ function prepare_text($text) { }} +/** + * returns + * [ + * //categories [ + * { + * 'name': 'category name', + * 'removeurl': 'url to remove this category', + * 'first': 'is the first in this array? true/false', + * 'last': 'is the last in this array? true/false', + * } , + * .... + * ], + * // folders [ + * 'name': 'folder name', + * 'removeurl': 'url to remove this folder', + * 'first': 'is the first in this array? true/false', + * 'last': 'is the last in this array? true/false', + * } , + * .... + * ] + * ] + */ +function get_cats_and_terms($item) { + $a = get_app(); + $categories = array(); + $folders = array(); + + $matches = false; $first = true; + $cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + $categories[] = array( + 'name' => xmlify(file_tag_decode($mtch[1])), + 'url' => "#", + 'removeurl' => ((local_user() == $item['uid'])?$a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&cat=' . xmlify(file_tag_decode($mtch[1])):""), + 'first' => $first, + 'last' => false + ); + $first = false; + } + } + if (count($categories)) $categories[count($categories)-1]['last'] = true; + + + + $matches = false; $first = true; + $cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + $folders[] = array( + 'name' => xmlify(file_tag_decode($mtch[1])), + 'url' => "#", + 'removeurl' => ((local_user() == $item['uid'])?$a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&term=' . xmlify(file_tag_decode($mtch[1])):""), + 'first' => $first, + 'last' => false + ); + $first = false; + } + } + + if (count($folders)) $folders[count($folders)-1]['last'] = true; + + return array($categories, $folders); +} + + /** * return atom link elements for all of our hubs */ diff --git a/object/Item.php b/object/Item.php index d40a384f56..04d52a896e 100644 --- a/object/Item.php +++ b/object/Item.php @@ -143,10 +143,20 @@ class Item extends BaseObject { $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate)); $tags=array(); + $hashtags = array(); + $mentions = array(); foreach(explode(',',$item['tag']) as $tag){ $tag = trim($tag); - if ($tag!="") $tags[] = bbcode($tag); - } + if ($tag!="") { + $t = bbcode($tag); + $tags[] = $t; + if($t[0] == '#') + $hashtags[] = $t; + elseif($t[0] == '@') + $mentions[] = $t; + } + + } $like = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : ''); $dislike = ((x($dlike,$item['uri'])) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : ''); @@ -195,11 +205,17 @@ class Item extends BaseObject { $body = prepare_body($item,true); + list($categories, $folders) = get_cats_and_terms($item); + $tmp_item = array( 'template' => $this->get_template(), 'type' => implode("",array_slice(explode("/",$item['verb']),-1)), 'tags' => $tags, + 'hashtags' => $hashtags, + 'mentions' => $mentions, + 'categories' => $categories, + 'folders' => $folders, 'body' => template_escape($body), 'text' => strip_tags(template_escape($body)), 'id' => $this->get_id(), @@ -266,6 +282,11 @@ class Item extends BaseObject { } } + if ($this->is_toplevel()) { + $result['total_comments_num'] = $total_children; + $result['total_comments_text'] = tt('comment', 'comments', $total_children); + } + $result['private'] = $item['private']; $result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : ''); From 12f7c32f9b31a182596659d62a96c3c4c367576d Mon Sep 17 00:00:00 2001 From: pixelroot Date: Thu, 20 Sep 2012 11:32:55 +0200 Subject: [PATCH 09/47] modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php --- view/theme/smoothly/style.css | 16 +++++++++++----- view/theme/smoothly/theme.php | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index e1be59bebe..6dc379b0e2 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -1445,7 +1445,7 @@ profile-jot-banner-wrapper { overflow: auto; margin-top: 20px; float: right; - width: 230px; + width: 250px; } /* ============ */ @@ -1457,9 +1457,14 @@ profile-jot-banner-wrapper { color: #898989; margin-left: 60px; } - + +.tread-wrapper { +} + +.collapsed-comments, +.hide-comments-outer, .wall-item-outside-wrapper.comment { - margin-left: 70px; + margin-left: 30px; } .wall-item-outside-wrapper.comment .wall-item-photo { @@ -1504,7 +1509,7 @@ profile-jot-banner-wrapper { .comment-wwedit-wrapper, .comment-edit-wrapper { - margin: 0px 0px 0px 80px; + margin: 0px 0px 5px 0px; } .comment-wwedit-wrapper img, @@ -1516,7 +1521,7 @@ profile-jot-banner-wrapper { .comment-edit-photo-link { float: left; - width: 40px; + width: 30px; } .comment-edit-text-empty { @@ -3485,6 +3490,7 @@ footer { clear: both; } +#profile-jot-text-loading, #profile-jot-text { height: 20px; color: #cccccc; diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php index 51031624de..9439eee9d3 100644 --- a/view/theme/smoothly/theme.php +++ b/view/theme/smoothly/theme.php @@ -3,7 +3,7 @@ /* * Name: Smoothly * Description: Like coffee with milk. Theme works fine with iPad[2]. - * Version: Version 0.9.20-1 + * Version: Version 0.9.20-2 * Author: Alex * Maintainer: Alex * Screenshot: Screenshot From 85c0260f33fbca4b61efd21faa2f34a41bfca148 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Thu, 20 Sep 2012 13:15:01 +0200 Subject: [PATCH 10/47] modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php --- view/theme/smoothly/style.css | 12 ++++++++---- view/theme/smoothly/theme.php | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 6dc379b0e2..b502dd5b09 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -20,7 +20,6 @@ Orange - #fec01d body { margin: 0 auto; padding-bottom: 3em; - /*position: relative;*/ width: 960px; font-family: "Lucida Grande","Lucida Sans Unicode",Arial,Verdana,sans-serif; font-size: 15px; @@ -1122,7 +1121,7 @@ profile-jot-banner-wrapper { .wall-item-outside-wrapper { max-width: 100%; border-bottom: 1px solid #dedede; - margin-top: 20px; + /*margin-top: 20px;*/ margin-bottom: 20px; padding-right: 10px; padding-left: 12px; @@ -1458,13 +1457,18 @@ profile-jot-banner-wrapper { margin-left: 60px; } -.tread-wrapper { +.tread-wrapper { + border: 0px solid #CDCDCD; + border-radius: 5px 5px 5px 5px; + margin-bottom: 20px; + background-color: #E2E2E2; } .collapsed-comments, .hide-comments-outer, .wall-item-outside-wrapper.comment { - margin-left: 30px; + margin-left: 30px; + margin-bottom: 20px; } .wall-item-outside-wrapper.comment .wall-item-photo { diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php index 9439eee9d3..7b39ec53a4 100644 --- a/view/theme/smoothly/theme.php +++ b/view/theme/smoothly/theme.php @@ -3,7 +3,7 @@ /* * Name: Smoothly * Description: Like coffee with milk. Theme works fine with iPad[2]. - * Version: Version 0.9.20-2 + * Version: Version 0.9.20-3 * Author: Alex * Maintainer: Alex * Screenshot: Screenshot From 8a8fe725af5fceeb64c6dcc4b420a76c0dfede6e Mon Sep 17 00:00:00 2001 From: pixelroot Date: Thu, 20 Sep 2012 13:25:12 +0200 Subject: [PATCH 11/47] modified: view/theme/smoothly/style.css --- view/theme/smoothly/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index b502dd5b09..600e1fbfd7 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -1128,7 +1128,7 @@ profile-jot-banner-wrapper { background: none repeat scroll 0 0 #FFFFFF; border: 1px solid #CDCDCD; border-radius: 5px 5px 5px 5px; - box-shadow: 0 0 8px #BDBDBD; + box-shadow: 0 0 8px #7c7d7b; } .wall-item-outside-wrapper-end { From fa2156a9c16dc64112eaba6143daadba0af5e777 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Thu, 20 Sep 2012 13:26:53 +0200 Subject: [PATCH 12/47] modified: view/theme/smoothly/style.css --- view/theme/smoothly/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 600e1fbfd7..b502dd5b09 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -1128,7 +1128,7 @@ profile-jot-banner-wrapper { background: none repeat scroll 0 0 #FFFFFF; border: 1px solid #CDCDCD; border-radius: 5px 5px 5px 5px; - box-shadow: 0 0 8px #7c7d7b; + box-shadow: 0 0 8px #BDBDBD; } .wall-item-outside-wrapper-end { From 57849ff95901194aee32d661e2e3791032ae2e5f Mon Sep 17 00:00:00 2001 From: pixelroot Date: Fri, 21 Sep 2012 08:57:22 +0200 Subject: [PATCH 13/47] modified: view/theme/smoothly/style.css --- view/theme/smoothly/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index b502dd5b09..08c7d49ffe 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -112,7 +112,7 @@ input[type=text] { border: 1px solid #b0b0b0; padding: 2px; width: 575px; - margin-top: 10px; + /*margin-top: 10px;*/ border-radius: 3px 3px 3px 3px; -webkit-border-radius: 3px 3px 3px 3px; -moz-border-radius: 3px 3px 3px 3px; @@ -190,7 +190,7 @@ section { } .mframe { - padding: 2px; + padding: 3px; background: none repeat scroll 0 0 #FFFFFF; border: 1px solid #C5C5C5; border-radius: 3px 3px 3px 3px; From c2af97ef61e691c54a62b815698c26b3ab5fc18b Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 21 Sep 2012 18:04:09 -0700 Subject: [PATCH 14/47] rev update --- boot.php | 2 +- mod/register.php | 2 ++ util/messages.po | 22 +++++++++++----------- view/en/friend_complete_eml.tpl | 14 +++++++------- view/en/intro_complete_eml.tpl | 16 ++++++++-------- 5 files changed, 29 insertions(+), 27 deletions(-) diff --git a/boot.php b/boot.php index 93c7a3b9c1..b235497901 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1471' ); +define ( 'FRIENDICA_VERSION', '3.0.1473' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1156 ); diff --git a/mod/register.php b/mod/register.php index 6bf287d424..a8fa100c8f 100644 --- a/mod/register.php +++ b/mod/register.php @@ -247,6 +247,8 @@ function register_content(&$a) { call_hooks('register_form',$arr); + $o = $arr['template']; + $o = replace_macros($o, array( '$oidhtml' => $oidhtml, '$invitations' => get_config('system','invitation_only'), diff --git a/util/messages.po b/util/messages.po index 30703dfe85..cfe795cf0b 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1471\n" +"Project-Id-Version: 3.0.1473\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-19 10:00-0700\n" +"POT-Creation-Date: 2012-09-21 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3048,38 +3048,38 @@ msgstr "" msgid "Include your profile in member directory?" msgstr "" -#: ../../mod/register.php:253 +#: ../../mod/register.php:255 msgid "Membership on this site is by invitation only." msgstr "" -#: ../../mod/register.php:254 +#: ../../mod/register.php:256 msgid "Your invitation ID: " msgstr "" -#: ../../mod/register.php:257 ../../mod/admin.php:444 +#: ../../mod/register.php:259 ../../mod/admin.php:444 msgid "Registration" msgstr "" -#: ../../mod/register.php:265 +#: ../../mod/register.php:267 msgid "Your Full Name (e.g. Joe Smith): " msgstr "" -#: ../../mod/register.php:266 +#: ../../mod/register.php:268 msgid "Your Email Address: " msgstr "" -#: ../../mod/register.php:267 +#: ../../mod/register.php:269 msgid "" "Choose a profile nickname. This must begin with a text character. Your " "profile address on this site will then be 'nickname@$sitename'." msgstr "" -#: ../../mod/register.php:268 +#: ../../mod/register.php:270 msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:271 ../../include/nav.php:81 ../../boot.php:887 +#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:887 msgid "Register" msgstr "" @@ -7852,7 +7852,7 @@ msgstr "" msgid "Sharing notification from Diaspora network" msgstr "" -#: ../../include/diaspora.php:2202 +#: ../../include/diaspora.php:2211 msgid "Attachments:" msgstr "" diff --git a/view/en/friend_complete_eml.tpl b/view/en/friend_complete_eml.tpl index 89f5783881..ab12fcb6b7 100644 --- a/view/en/friend_complete_eml.tpl +++ b/view/en/friend_complete_eml.tpl @@ -1,22 +1,22 @@ -Dear $[username], +Dear $username, - Great news... '$[fn]' at '$[dfrn_url]' has accepted -your connection request at '$[sitename]'. + Great news... '$fn' at '$dfrn_url' has accepted +your connection request at '$sitename'. You are now mutual friends and may exchange status updates, photos, and email without restriction. -Please visit your 'Contacts' page at $[sitename] if you wish to make +Please visit your 'Contacts' page at $sitename if you wish to make any changes to this relationship. -$[siteurl] +$siteurl [For instance, you may create a separate profile with information that is not -available to the general public - and assign viewing rights to '$[fn]']. +available to the general public - and assign viewing rights to '$fn']. Sincerely, - $[sitename] Administrator + $sitename Administrator diff --git a/view/en/intro_complete_eml.tpl b/view/en/intro_complete_eml.tpl index cd78b2a150..a60745ec55 100644 --- a/view/en/intro_complete_eml.tpl +++ b/view/en/intro_complete_eml.tpl @@ -1,22 +1,22 @@ -Dear $[username], +Dear $username, - '$[fn]' at '$[dfrn_url]' has accepted -your connection request at '$[sitename]'. + '$fn' at '$dfrn_url' has accepted +your connection request at '$sitename'. - '$[fn]' has chosen to accept you a "fan", which restricts + '$fn' has chosen to accept you a "fan", which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically. - '$[fn]' may choose to extend this into a two-way or more permissive + '$fn' may choose to extend this into a two-way or more permissive relationship in the future. - You will start receiving public status updates from '$[fn]', + You will start receiving public status updates from '$fn', which will appear on your 'Network' page at -$[siteurl] +$siteurl Sincerely, - $[sitename] Administrator + $sitename Administrator From 5fd124eabeacbf9e9bd5ecbcd01649f2d0b45c52 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 21 Sep 2012 18:09:55 -0700 Subject: [PATCH 15/47] undo revert of template changes --- view/en/friend_complete_eml.tpl | 14 +++++++------- view/en/intro_complete_eml.tpl | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/view/en/friend_complete_eml.tpl b/view/en/friend_complete_eml.tpl index ab12fcb6b7..89f5783881 100644 --- a/view/en/friend_complete_eml.tpl +++ b/view/en/friend_complete_eml.tpl @@ -1,22 +1,22 @@ -Dear $username, +Dear $[username], - Great news... '$fn' at '$dfrn_url' has accepted -your connection request at '$sitename'. + Great news... '$[fn]' at '$[dfrn_url]' has accepted +your connection request at '$[sitename]'. You are now mutual friends and may exchange status updates, photos, and email without restriction. -Please visit your 'Contacts' page at $sitename if you wish to make +Please visit your 'Contacts' page at $[sitename] if you wish to make any changes to this relationship. -$siteurl +$[siteurl] [For instance, you may create a separate profile with information that is not -available to the general public - and assign viewing rights to '$fn']. +available to the general public - and assign viewing rights to '$[fn]']. Sincerely, - $sitename Administrator + $[sitename] Administrator diff --git a/view/en/intro_complete_eml.tpl b/view/en/intro_complete_eml.tpl index a60745ec55..cd78b2a150 100644 --- a/view/en/intro_complete_eml.tpl +++ b/view/en/intro_complete_eml.tpl @@ -1,22 +1,22 @@ -Dear $username, +Dear $[username], - '$fn' at '$dfrn_url' has accepted -your connection request at '$sitename'. + '$[fn]' at '$[dfrn_url]' has accepted +your connection request at '$[sitename]'. - '$fn' has chosen to accept you a "fan", which restricts + '$[fn]' has chosen to accept you a "fan", which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically. - '$fn' may choose to extend this into a two-way or more permissive + '$[fn]' may choose to extend this into a two-way or more permissive relationship in the future. - You will start receiving public status updates from '$fn', + You will start receiving public status updates from '$[fn]', which will appear on your 'Network' page at -$siteurl +$[siteurl] Sincerely, - $sitename Administrator + $[sitename] Administrator From 930169a8aaf66441d71b22738ad99bd5151eb887 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 22 Sep 2012 08:42:07 +0200 Subject: [PATCH 16/47] DE: update to the strings --- view/de/messages.po | 409 ++++++++++++++++++++++---------------------- view/de/strings.php | 1 + 2 files changed, 208 insertions(+), 202 deletions(-) diff --git a/view/de/messages.po b/view/de/messages.po index 0eeb50ab88..08456186d8 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-09-15 10:00-0700\n" -"PO-Revision-Date: 2012-09-16 08:41+0000\n" +"POT-Creation-Date: 2012-09-19 10:00-0700\n" +"PO-Revision-Date: 2012-09-22 06:02+0000\n" "Last-Translator: bavatar \n" "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" @@ -104,7 +104,7 @@ msgid "Return to contact editor" msgstr "Zurück zum Kontakteditor" #: ../../mod/crepair.php:148 ../../mod/settings.php:545 -#: ../../mod/settings.php:571 ../../mod/admin.php:690 ../../mod/admin.php:699 +#: ../../mod/settings.php:571 ../../mod/admin.php:692 ../../mod/admin.php:702 msgid "Name" msgstr "Name" @@ -141,7 +141,7 @@ msgid "New photo from this URL" msgstr "Neues Foto von dieser URL" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 -#: ../../mod/events.php:439 ../../mod/photos.php:1005 +#: ../../mod/events.php:455 ../../mod/photos.php:1005 #: ../../mod/photos.php:1081 ../../mod/photos.php:1338 #: ../../mod/photos.php:1378 ../../mod/photos.php:1419 #: ../../mod/photos.php:1451 ../../mod/install.php:246 @@ -150,14 +150,14 @@ msgstr "Neues Foto von dieser URL" #: ../../mod/settings.php:543 ../../mod/settings.php:697 #: ../../mod/settings.php:769 ../../mod/settings.php:976 #: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294 -#: ../../mod/message.php:480 ../../mod/admin.php:443 ../../mod/admin.php:687 -#: ../../mod/admin.php:823 ../../mod/admin.php:1022 ../../mod/admin.php:1109 +#: ../../mod/message.php:480 ../../mod/admin.php:443 ../../mod/admin.php:689 +#: ../../mod/admin.php:826 ../../mod/admin.php:1025 ../../mod/admin.php:1112 #: ../../mod/profiles.php:583 ../../mod/invite.php:119 #: ../../addon/fromgplus/fromgplus.php:40 #: ../../addon/facebook/facebook.php:619 #: ../../addon/snautofollow/snautofollow.php:64 ../../addon/bg/bg.php:90 #: ../../addon/fbpost/fbpost.php:226 ../../addon/yourls/yourls.php:76 -#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57 +#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:88 #: ../../addon/page/page.php:210 ../../addon/planets/planets.php:158 #: ../../addon/uhremotestorage/uhremotestorage.php:89 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93 @@ -190,8 +190,8 @@ msgstr "Neues Foto von dieser URL" #: ../../view/theme/cleanzero/config.php:80 #: ../../view/theme/diabook/theme.php:757 #: ../../view/theme/diabook/config.php:190 -#: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70 -#: ../../include/conversation.php:601 ../../object/Item.php:532 +#: ../../view/theme/quattro/config.php:53 ../../view/theme/dispy/config.php:70 +#: ../../include/conversation.php:608 ../../object/Item.php:532 msgid "Submit" msgstr "Senden" @@ -238,90 +238,91 @@ msgstr "Schlage %s einen Kontakt vor" msgid "Event title and start time are required." msgstr "Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden." -#: ../../mod/events.php:263 +#: ../../mod/events.php:279 msgid "l, F j" msgstr "l, F j" -#: ../../mod/events.php:285 +#: ../../mod/events.php:301 msgid "Edit event" msgstr "Veranstaltung bearbeiten" -#: ../../mod/events.php:307 ../../include/text.php:1147 +#: ../../mod/events.php:323 ../../include/text.php:1147 msgid "link to source" msgstr "Link zum Originalbeitrag" -#: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131 +#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:131 #: ../../include/nav.php:52 ../../boot.php:1689 msgid "Events" msgstr "Veranstaltungen" -#: ../../mod/events.php:332 +#: ../../mod/events.php:348 msgid "Create New Event" msgstr "Neue Veranstaltung erstellen" -#: ../../mod/events.php:333 ../../addon/dav/friendica/layout.fnk.php:263 +#: ../../mod/events.php:349 ../../addon/dav/friendica/layout.fnk.php:263 msgid "Previous" msgstr "Vorherige" -#: ../../mod/events.php:334 ../../mod/install.php:205 +#: ../../mod/events.php:350 ../../mod/install.php:205 #: ../../addon/dav/friendica/layout.fnk.php:266 msgid "Next" msgstr "Nächste" -#: ../../mod/events.php:407 +#: ../../mod/events.php:423 msgid "hour:minute" msgstr "Stunde:Minute" -#: ../../mod/events.php:417 +#: ../../mod/events.php:433 msgid "Event details" msgstr "Veranstaltungsdetails" -#: ../../mod/events.php:418 +#: ../../mod/events.php:434 #, php-format msgid "Format is %s %s. Starting date and Title are required." msgstr "Das Format ist %s %s. Beginnzeitpunkt und Titel werden benötigt." -#: ../../mod/events.php:420 +#: ../../mod/events.php:436 msgid "Event Starts:" msgstr "Veranstaltungsbeginn:" -#: ../../mod/events.php:420 ../../mod/events.php:434 +#: ../../mod/events.php:436 ../../mod/events.php:450 msgid "Required" msgstr "Benötigt" -#: ../../mod/events.php:423 +#: ../../mod/events.php:439 msgid "Finish date/time is not known or not relevant" msgstr "Enddatum/-zeit ist nicht bekannt oder nicht relevant" -#: ../../mod/events.php:425 +#: ../../mod/events.php:441 msgid "Event Finishes:" msgstr "Veranstaltungsende:" -#: ../../mod/events.php:428 +#: ../../mod/events.php:444 msgid "Adjust for viewer timezone" msgstr "An Zeitzone des Betrachters anpassen" -#: ../../mod/events.php:430 +#: ../../mod/events.php:446 msgid "Description:" msgstr "Beschreibung" -#: ../../mod/events.php:432 ../../mod/directory.php:134 +#: ../../mod/events.php:448 ../../mod/directory.php:134 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412 #: ../../boot.php:1226 msgid "Location:" msgstr "Ort:" -#: ../../mod/events.php:434 +#: ../../mod/events.php:450 msgid "Title:" msgstr "Titel:" -#: ../../mod/events.php:436 +#: ../../mod/events.php:452 msgid "Share this event" msgstr "Veranstaltung teilen" -#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 +#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:136 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 +#: ../../include/conversation.php:1290 msgid "Cancel" msgstr "Abbrechen" @@ -444,7 +445,7 @@ msgstr "wurde getaggt in einem" #: ../../addon/communityhome/communityhome.php:163 #: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1399 #: ../../include/diaspora.php:1824 ../../include/conversation.php:125 -#: ../../include/conversation.php:255 +#: ../../include/conversation.php:253 msgid "photo" msgstr "Foto" @@ -551,7 +552,7 @@ msgid "Use as profile photo" msgstr "Als Profilbild verwenden" #: ../../mod/photos.php:1224 ../../mod/content.php:601 -#: ../../include/conversation.php:428 ../../object/Item.php:103 +#: ../../include/conversation.php:435 ../../object/Item.php:103 msgid "Private Message" msgstr "Private Nachricht" @@ -593,51 +594,51 @@ msgid "" msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" #: ../../mod/photos.php:1356 ../../mod/content.php:665 -#: ../../include/conversation.php:575 ../../object/Item.php:185 +#: ../../include/conversation.php:582 ../../object/Item.php:185 msgid "I like this (toggle)" msgstr "Ich mag das (toggle)" #: ../../mod/photos.php:1357 ../../mod/content.php:666 -#: ../../include/conversation.php:576 ../../object/Item.php:186 +#: ../../include/conversation.php:583 ../../object/Item.php:186 msgid "I don't like this (toggle)" msgstr "Ich mag das nicht (toggle)" -#: ../../mod/photos.php:1358 ../../include/conversation.php:1244 +#: ../../mod/photos.php:1358 ../../include/conversation.php:1251 msgid "Share" msgstr "Teilen" #: ../../mod/photos.php:1359 ../../mod/editpost.php:112 #: ../../mod/content.php:482 ../../mod/content.php:843 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:481 ../../include/conversation.php:671 -#: ../../include/conversation.php:921 ../../include/conversation.php:1263 +#: ../../mod/message.php:481 ../../include/conversation.php:678 +#: ../../include/conversation.php:928 ../../include/conversation.php:1270 #: ../../object/Item.php:237 msgid "Please wait" msgstr "Bitte warten" #: ../../mod/photos.php:1375 ../../mod/photos.php:1416 #: ../../mod/photos.php:1448 ../../mod/content.php:688 -#: ../../include/conversation.php:598 ../../object/Item.php:529 +#: ../../include/conversation.php:605 ../../object/Item.php:529 msgid "This is you" msgstr "Das bist du" #: ../../mod/photos.php:1377 ../../mod/photos.php:1418 #: ../../mod/photos.php:1450 ../../mod/content.php:690 -#: ../../include/conversation.php:600 ../../boot.php:574 +#: ../../include/conversation.php:607 ../../boot.php:574 #: ../../object/Item.php:531 msgid "Comment" msgstr "Kommentar" #: ../../mod/photos.php:1379 ../../mod/editpost.php:133 -#: ../../mod/content.php:700 ../../include/conversation.php:610 -#: ../../include/conversation.php:1281 ../../object/Item.php:541 +#: ../../mod/content.php:700 ../../include/conversation.php:617 +#: ../../include/conversation.php:1288 ../../object/Item.php:541 msgid "Preview" msgstr "Vorschau" #: ../../mod/photos.php:1479 ../../mod/content.php:439 #: ../../mod/content.php:721 ../../mod/settings.php:606 -#: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:694 -#: ../../include/conversation.php:440 ../../include/conversation.php:874 +#: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:696 +#: ../../include/conversation.php:447 ../../include/conversation.php:881 #: ../../object/Item.php:116 msgid "Delete" msgstr "Löschen" @@ -704,29 +705,29 @@ msgstr "Beitrag nicht gefunden" msgid "Edit post" msgstr "Beitrag bearbeiten" -#: ../../mod/editpost.php:88 ../../include/conversation.php:1230 +#: ../../mod/editpost.php:88 ../../include/conversation.php:1237 msgid "Post to Email" msgstr "An E-Mail senden" #: ../../mod/editpost.php:103 ../../mod/content.php:708 -#: ../../mod/settings.php:605 ../../include/conversation.php:433 +#: ../../mod/settings.php:605 ../../include/conversation.php:440 #: ../../object/Item.php:107 msgid "Edit" msgstr "Bearbeiten" #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/message.php:291 ../../mod/message.php:478 -#: ../../include/conversation.php:1245 +#: ../../include/conversation.php:1252 msgid "Upload photo" msgstr "Foto hochladen" -#: ../../mod/editpost.php:105 ../../include/conversation.php:1247 +#: ../../mod/editpost.php:105 ../../include/conversation.php:1254 msgid "Attach file" msgstr "Datei anhängen" #: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151 #: ../../mod/message.php:292 ../../mod/message.php:479 -#: ../../include/conversation.php:1249 +#: ../../include/conversation.php:1256 msgid "Insert web link" msgstr "einen Link einfügen" @@ -742,35 +743,35 @@ msgstr "Vorbis [.ogg] Video einfügen" msgid "Insert Vorbis [.ogg] audio" msgstr "Vorbis [.ogg] Audio einfügen" -#: ../../mod/editpost.php:110 ../../include/conversation.php:1255 +#: ../../mod/editpost.php:110 ../../include/conversation.php:1262 msgid "Set your location" msgstr "Deinen Standort festlegen" -#: ../../mod/editpost.php:111 ../../include/conversation.php:1257 +#: ../../mod/editpost.php:111 ../../include/conversation.php:1264 msgid "Clear browser location" msgstr "Browser-Standort leeren" -#: ../../mod/editpost.php:113 ../../include/conversation.php:1264 +#: ../../mod/editpost.php:113 ../../include/conversation.php:1271 msgid "Permission settings" msgstr "Berechtigungseinstellungen" -#: ../../mod/editpost.php:121 ../../include/conversation.php:1273 +#: ../../mod/editpost.php:121 ../../include/conversation.php:1280 msgid "CC: email addresses" msgstr "Cc:-E-Mail-Addressen" -#: ../../mod/editpost.php:122 ../../include/conversation.php:1274 +#: ../../mod/editpost.php:122 ../../include/conversation.php:1281 msgid "Public post" msgstr "Öffentlicher Beitrag" -#: ../../mod/editpost.php:125 ../../include/conversation.php:1260 +#: ../../mod/editpost.php:125 ../../include/conversation.php:1267 msgid "Set title" msgstr "Titel setzen" -#: ../../mod/editpost.php:127 ../../include/conversation.php:1262 +#: ../../mod/editpost.php:127 ../../include/conversation.php:1269 msgid "Categories (comma-separated list)" msgstr "Kategorien (kommasepariert)" -#: ../../mod/editpost.php:128 ../../include/conversation.php:1276 +#: ../../mod/editpost.php:128 ../../include/conversation.php:1283 msgid "Example: bob@example.com, mary@example.com" msgstr "Z.B.: bob@example.com, mary@example.com" @@ -1313,31 +1314,31 @@ msgid "Group: " msgstr "Gruppe: " #: ../../mod/content.php:438 ../../mod/content.php:720 -#: ../../include/conversation.php:439 ../../include/conversation.php:873 +#: ../../include/conversation.php:446 ../../include/conversation.php:880 #: ../../object/Item.php:115 msgid "Select" msgstr "Auswählen" #: ../../mod/content.php:455 ../../mod/content.php:813 -#: ../../mod/content.php:814 ../../include/conversation.php:639 -#: ../../include/conversation.php:640 ../../include/conversation.php:890 +#: ../../mod/content.php:814 ../../include/conversation.php:646 +#: ../../include/conversation.php:647 ../../include/conversation.php:897 #: ../../object/Item.php:206 ../../object/Item.php:207 #, php-format msgid "View %s's profile @ %s" msgstr "Das Profil von %s auf %s betrachten." #: ../../mod/content.php:465 ../../mod/content.php:825 -#: ../../include/conversation.php:653 ../../include/conversation.php:904 +#: ../../include/conversation.php:660 ../../include/conversation.php:911 #: ../../object/Item.php:219 #, php-format msgid "%s from %s" msgstr "%s von %s" -#: ../../mod/content.php:480 ../../include/conversation.php:919 +#: ../../mod/content.php:480 ../../include/conversation.php:926 msgid "View in context" msgstr "Im Zusammenhang betrachten" -#: ../../mod/content.php:586 ../../include/conversation.php:680 +#: ../../mod/content.php:586 ../../include/conversation.php:687 #: ../../object/Item.php:256 #, php-format msgid "%d comment" @@ -1347,112 +1348,112 @@ msgstr[1] "%d Kommentare" #: ../../mod/content.php:587 ../../addon/page/page.php:76 #: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119 -#: ../../include/contact_widgets.php:195 ../../include/conversation.php:681 +#: ../../include/contact_widgets.php:195 ../../include/conversation.php:688 #: ../../boot.php:575 ../../object/Item.php:257 msgid "show more" msgstr "mehr anzeigen" -#: ../../mod/content.php:665 ../../include/conversation.php:575 +#: ../../mod/content.php:665 ../../include/conversation.php:582 #: ../../object/Item.php:185 msgid "like" msgstr "mag ich" -#: ../../mod/content.php:666 ../../include/conversation.php:576 +#: ../../mod/content.php:666 ../../include/conversation.php:583 #: ../../object/Item.php:186 msgid "dislike" msgstr "mag ich nicht" -#: ../../mod/content.php:668 ../../include/conversation.php:578 +#: ../../mod/content.php:668 ../../include/conversation.php:585 #: ../../object/Item.php:188 msgid "Share this" msgstr "Weitersagen" -#: ../../mod/content.php:668 ../../include/conversation.php:578 +#: ../../mod/content.php:668 ../../include/conversation.php:585 #: ../../object/Item.php:188 msgid "share" msgstr "Teilen" -#: ../../mod/content.php:692 ../../include/conversation.php:602 +#: ../../mod/content.php:692 ../../include/conversation.php:609 #: ../../object/Item.php:533 msgid "Bold" msgstr "Fett" -#: ../../mod/content.php:693 ../../include/conversation.php:603 +#: ../../mod/content.php:693 ../../include/conversation.php:610 #: ../../object/Item.php:534 msgid "Italic" msgstr "Kursiv" -#: ../../mod/content.php:694 ../../include/conversation.php:604 +#: ../../mod/content.php:694 ../../include/conversation.php:611 #: ../../object/Item.php:535 msgid "Underline" msgstr "Unterstrichen" -#: ../../mod/content.php:695 ../../include/conversation.php:605 +#: ../../mod/content.php:695 ../../include/conversation.php:612 #: ../../object/Item.php:536 msgid "Quote" msgstr "Zitat" -#: ../../mod/content.php:696 ../../include/conversation.php:606 +#: ../../mod/content.php:696 ../../include/conversation.php:613 #: ../../object/Item.php:537 msgid "Code" msgstr "Code" -#: ../../mod/content.php:697 ../../include/conversation.php:607 +#: ../../mod/content.php:697 ../../include/conversation.php:614 #: ../../object/Item.php:538 msgid "Image" msgstr "Bild" -#: ../../mod/content.php:698 ../../include/conversation.php:608 +#: ../../mod/content.php:698 ../../include/conversation.php:615 #: ../../object/Item.php:539 msgid "Link" msgstr "Verweis" -#: ../../mod/content.php:699 ../../include/conversation.php:609 +#: ../../mod/content.php:699 ../../include/conversation.php:616 #: ../../object/Item.php:540 msgid "Video" msgstr "Video" -#: ../../mod/content.php:733 ../../include/conversation.php:539 +#: ../../mod/content.php:733 ../../include/conversation.php:546 #: ../../object/Item.php:169 msgid "add star" msgstr "markieren" -#: ../../mod/content.php:734 ../../include/conversation.php:540 +#: ../../mod/content.php:734 ../../include/conversation.php:547 #: ../../object/Item.php:170 msgid "remove star" msgstr "Markierung entfernen" -#: ../../mod/content.php:735 ../../include/conversation.php:541 +#: ../../mod/content.php:735 ../../include/conversation.php:548 #: ../../object/Item.php:171 msgid "toggle star status" msgstr "Markierung umschalten" -#: ../../mod/content.php:738 ../../include/conversation.php:544 +#: ../../mod/content.php:738 ../../include/conversation.php:551 #: ../../object/Item.php:174 msgid "starred" msgstr "markiert" -#: ../../mod/content.php:739 ../../include/conversation.php:545 +#: ../../mod/content.php:739 ../../include/conversation.php:552 #: ../../object/Item.php:175 msgid "add tag" msgstr "Tag hinzufügen" -#: ../../mod/content.php:743 ../../include/conversation.php:443 +#: ../../mod/content.php:743 ../../include/conversation.php:450 #: ../../object/Item.php:119 msgid "save to folder" msgstr "In Ordner speichern" -#: ../../mod/content.php:815 ../../include/conversation.php:641 +#: ../../mod/content.php:815 ../../include/conversation.php:648 #: ../../object/Item.php:208 msgid "to" msgstr "zu" -#: ../../mod/content.php:816 ../../include/conversation.php:642 +#: ../../mod/content.php:816 ../../include/conversation.php:649 #: ../../object/Item.php:209 msgid "Wall-to-Wall" msgstr "Wall-to-Wall" -#: ../../mod/content.php:817 ../../include/conversation.php:643 +#: ../../mod/content.php:817 ../../include/conversation.php:650 #: ../../object/Item.php:210 msgid "via Wall-To-Wall:" msgstr "via Wall-To-Wall:" @@ -1538,7 +1539,7 @@ msgid "if applicable" msgstr "falls anwendbar" #: ../../mod/notifications.php:157 ../../mod/notifications.php:204 -#: ../../mod/admin.php:692 +#: ../../mod/admin.php:694 msgid "Approve" msgstr "Genehmigen" @@ -1739,12 +1740,12 @@ msgid "View all contacts" msgstr "Alle Kontakte anzeigen" #: ../../mod/contacts.php:315 ../../mod/contacts.php:374 -#: ../../mod/admin.php:696 +#: ../../mod/admin.php:698 msgid "Unblock" msgstr "Entsperren" #: ../../mod/contacts.php:315 ../../mod/contacts.php:374 -#: ../../mod/admin.php:695 +#: ../../mod/admin.php:697 msgid "Block" msgstr "Sperren" @@ -1841,7 +1842,7 @@ msgstr "letzte Aktualisierung:" msgid "Update public posts" msgstr "Öffentliche Beiträge aktualisieren" -#: ../../mod/contacts.php:371 ../../mod/admin.php:1167 +#: ../../mod/contacts.php:371 ../../mod/admin.php:1170 msgid "Update now" msgstr "Jetzt aktualisieren" @@ -2055,7 +2056,7 @@ msgid "Remove account" msgstr "Konto löschen" #: ../../mod/settings.php:69 ../../mod/newmember.php:22 -#: ../../mod/admin.php:782 ../../mod/admin.php:987 +#: ../../mod/admin.php:785 ../../mod/admin.php:990 #: ../../addon/dav/friendica/layout.fnk.php:225 #: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:643 #: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137 @@ -2704,7 +2705,7 @@ msgstr "Kein Empfänger." #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:1181 ../../include/conversation.php:1198 +#: ../../include/conversation.php:1188 ../../include/conversation.php:1205 msgid "Please enter a link URL:" msgstr "Bitte gib die URL des Links ein:" @@ -3105,31 +3106,31 @@ msgid "People Search" msgstr "Personensuche" #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/tagger.php:62 -#: ../../addon/facebook/facebook.php:1594 +#: ../../addon/facebook/facebook.php:1598 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 #: ../../view/theme/diabook/theme.php:565 #: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1824 #: ../../include/conversation.php:120 ../../include/conversation.php:129 -#: ../../include/conversation.php:250 ../../include/conversation.php:259 +#: ../../include/conversation.php:248 ../../include/conversation.php:257 msgid "status" msgstr "Status" -#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1598 +#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 #: ../../addon/communityhome/communityhome.php:172 #: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1840 -#: ../../include/conversation.php:137 +#: ../../include/conversation.php:136 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "%1$s mag %2$ss %3$s" -#: ../../mod/like.php:164 ../../include/conversation.php:140 +#: ../../mod/like.php:164 ../../include/conversation.php:139 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "%1$s mag %2$ss %3$s nicht" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 -#: ../../mod/admin.php:731 ../../mod/admin.php:930 ../../mod/display.php:29 +#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29 #: ../../mod/display.php:145 ../../include/items.php:3774 msgid "Item not found." msgstr "Beitrag nicht gefunden." @@ -3201,7 +3202,7 @@ msgstr "Falls du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den msgid "%s posted an update." msgstr "%s hat ein Update veröffentlicht." -#: ../../mod/mood.php:62 ../../include/conversation.php:228 +#: ../../mod/mood.php:62 ../../include/conversation.php:226 #, php-format msgid "%1$s is currently %2$s" msgstr "%1$s ist momentan %2$s" @@ -3379,15 +3380,15 @@ msgstr "Themeneinstellungen aktualisiert." msgid "Site" msgstr "Seite" -#: ../../mod/admin.php:97 ../../mod/admin.php:686 ../../mod/admin.php:698 +#: ../../mod/admin.php:97 ../../mod/admin.php:688 ../../mod/admin.php:701 msgid "Users" msgstr "Nutzer" -#: ../../mod/admin.php:98 ../../mod/admin.php:780 ../../mod/admin.php:822 +#: ../../mod/admin.php:98 ../../mod/admin.php:783 ../../mod/admin.php:825 msgid "Plugins" msgstr "Plugins" -#: ../../mod/admin.php:99 ../../mod/admin.php:985 ../../mod/admin.php:1021 +#: ../../mod/admin.php:99 ../../mod/admin.php:988 ../../mod/admin.php:1024 msgid "Themes" msgstr "Themen" @@ -3395,7 +3396,7 @@ msgstr "Themen" msgid "DB updates" msgstr "DB Updates" -#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1108 +#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1111 msgid "Logs" msgstr "Protokolle" @@ -3411,19 +3412,19 @@ msgstr "Plugin Features" msgid "User registrations waiting for confirmation" msgstr "Nutzeranmeldungen die auf Bestätigung warten" -#: ../../mod/admin.php:183 ../../mod/admin.php:668 +#: ../../mod/admin.php:183 ../../mod/admin.php:669 msgid "Normal Account" msgstr "Normales Konto" -#: ../../mod/admin.php:184 ../../mod/admin.php:669 +#: ../../mod/admin.php:184 ../../mod/admin.php:670 msgid "Soapbox Account" msgstr "Marktschreier-Konto" -#: ../../mod/admin.php:185 ../../mod/admin.php:670 +#: ../../mod/admin.php:185 ../../mod/admin.php:671 msgid "Community/Celebrity Account" msgstr "Forum/Promi-Konto" -#: ../../mod/admin.php:186 ../../mod/admin.php:671 +#: ../../mod/admin.php:186 ../../mod/admin.php:672 msgid "Automatic Friend Account" msgstr "Automatisches Freundekonto" @@ -3439,9 +3440,9 @@ msgstr "Privates Forum" msgid "Message queues" msgstr "Nachrichten-Warteschlangen" -#: ../../mod/admin.php:212 ../../mod/admin.php:441 ../../mod/admin.php:685 -#: ../../mod/admin.php:779 ../../mod/admin.php:821 ../../mod/admin.php:984 -#: ../../mod/admin.php:1020 ../../mod/admin.php:1107 +#: ../../mod/admin.php:212 ../../mod/admin.php:441 ../../mod/admin.php:687 +#: ../../mod/admin.php:782 ../../mod/admin.php:824 ../../mod/admin.php:987 +#: ../../mod/admin.php:1023 ../../mod/admin.php:1110 msgid "Administration" msgstr "Administration" @@ -3866,148 +3867,152 @@ msgstr "Nutzer '%s' entsperrt" msgid "User '%s' blocked" msgstr "Nutzer '%s' gesperrt" -#: ../../mod/admin.php:688 +#: ../../mod/admin.php:690 msgid "select all" msgstr "Alle auswählen" -#: ../../mod/admin.php:689 +#: ../../mod/admin.php:691 msgid "User registrations waiting for confirm" msgstr "Neuanmeldungen, die auf deine Bestätigung warten" -#: ../../mod/admin.php:690 +#: ../../mod/admin.php:692 msgid "Request date" msgstr "Anfragedatum" -#: ../../mod/admin.php:690 ../../mod/admin.php:699 +#: ../../mod/admin.php:692 ../../mod/admin.php:702 #: ../../include/contact_selectors.php:79 msgid "Email" msgstr "E-Mail" -#: ../../mod/admin.php:691 +#: ../../mod/admin.php:693 msgid "No registrations." msgstr "Keine Neuanmeldungen." -#: ../../mod/admin.php:693 +#: ../../mod/admin.php:695 msgid "Deny" msgstr "Verwehren" #: ../../mod/admin.php:699 +msgid "Site admin" +msgstr "Seitenadministrator" + +#: ../../mod/admin.php:702 msgid "Register date" msgstr "Anmeldedatum" -#: ../../mod/admin.php:699 +#: ../../mod/admin.php:702 msgid "Last login" msgstr "Letzte Anmeldung" -#: ../../mod/admin.php:699 +#: ../../mod/admin.php:702 msgid "Last item" msgstr "Letzter Beitrag" -#: ../../mod/admin.php:699 +#: ../../mod/admin.php:702 msgid "Account" msgstr "Nutzerkonto" -#: ../../mod/admin.php:701 +#: ../../mod/admin.php:704 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\\n\\nBist du sicher?" -#: ../../mod/admin.php:702 +#: ../../mod/admin.php:705 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "Der Nutzer {0} wird gelöscht!\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist du sicher?" -#: ../../mod/admin.php:743 +#: ../../mod/admin.php:746 #, php-format msgid "Plugin %s disabled." msgstr "Plugin %s deaktiviert." -#: ../../mod/admin.php:747 +#: ../../mod/admin.php:750 #, php-format msgid "Plugin %s enabled." msgstr "Plugin %s aktiviert." -#: ../../mod/admin.php:757 ../../mod/admin.php:955 +#: ../../mod/admin.php:760 ../../mod/admin.php:958 msgid "Disable" msgstr "Ausschalten" -#: ../../mod/admin.php:759 ../../mod/admin.php:957 +#: ../../mod/admin.php:762 ../../mod/admin.php:960 msgid "Enable" msgstr "Einschalten" -#: ../../mod/admin.php:781 ../../mod/admin.php:986 +#: ../../mod/admin.php:784 ../../mod/admin.php:989 msgid "Toggle" msgstr "Umschalten" -#: ../../mod/admin.php:789 ../../mod/admin.php:996 +#: ../../mod/admin.php:792 ../../mod/admin.php:999 msgid "Author: " msgstr "Autor:" -#: ../../mod/admin.php:790 ../../mod/admin.php:997 +#: ../../mod/admin.php:793 ../../mod/admin.php:1000 msgid "Maintainer: " msgstr "Betreuer:" -#: ../../mod/admin.php:919 +#: ../../mod/admin.php:922 msgid "No themes found." msgstr "Keine Themen gefunden." -#: ../../mod/admin.php:978 +#: ../../mod/admin.php:981 msgid "Screenshot" msgstr "Bildschirmfoto" -#: ../../mod/admin.php:1026 +#: ../../mod/admin.php:1029 msgid "[Experimental]" msgstr "[Experimentell]" -#: ../../mod/admin.php:1027 +#: ../../mod/admin.php:1030 msgid "[Unsupported]" msgstr "[Nicht unterstützt]" -#: ../../mod/admin.php:1054 +#: ../../mod/admin.php:1057 msgid "Log settings updated." msgstr "Protokolleinstellungen aktualisiert." -#: ../../mod/admin.php:1110 +#: ../../mod/admin.php:1113 msgid "Clear" msgstr "löschen" -#: ../../mod/admin.php:1116 +#: ../../mod/admin.php:1119 msgid "Debugging" msgstr "Protokoll führen" -#: ../../mod/admin.php:1117 +#: ../../mod/admin.php:1120 msgid "Log file" msgstr "Protokolldatei" -#: ../../mod/admin.php:1117 +#: ../../mod/admin.php:1120 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis." -#: ../../mod/admin.php:1118 +#: ../../mod/admin.php:1121 msgid "Log level" msgstr "Protokoll-Level" -#: ../../mod/admin.php:1168 +#: ../../mod/admin.php:1171 msgid "Close" msgstr "Schließen" -#: ../../mod/admin.php:1174 +#: ../../mod/admin.php:1177 msgid "FTP Host" msgstr "FTP Host" -#: ../../mod/admin.php:1175 +#: ../../mod/admin.php:1178 msgid "FTP Path" msgstr "FTP Pfad" -#: ../../mod/admin.php:1176 +#: ../../mod/admin.php:1179 msgid "FTP User" msgstr "FTP Nutzername" -#: ../../mod/admin.php:1177 +#: ../../mod/admin.php:1180 msgid "FTP Password" msgstr "FTP Passwort" @@ -4023,48 +4028,48 @@ msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt." msgid "Tips for New Members" msgstr "Tipps für neue Nutzer" -#: ../../mod/ping.php:185 +#: ../../mod/ping.php:235 msgid "{0} wants to be your friend" msgstr "{0} möchte mit dir in Kontakt treten" -#: ../../mod/ping.php:190 +#: ../../mod/ping.php:240 msgid "{0} sent you a message" msgstr "{0} hat dir eine Nachricht geschickt" -#: ../../mod/ping.php:195 +#: ../../mod/ping.php:245 msgid "{0} requested registration" msgstr "{0} möchte sich registrieren" -#: ../../mod/ping.php:201 +#: ../../mod/ping.php:251 #, php-format msgid "{0} commented %s's post" msgstr "{0} kommentierte einen Beitrag von %s" -#: ../../mod/ping.php:206 +#: ../../mod/ping.php:256 #, php-format msgid "{0} liked %s's post" msgstr "{0} mag %ss Beitrag" -#: ../../mod/ping.php:211 +#: ../../mod/ping.php:261 #, php-format msgid "{0} disliked %s's post" msgstr "{0} mag %ss Beitrag nicht" -#: ../../mod/ping.php:216 +#: ../../mod/ping.php:266 #, php-format msgid "{0} is now friends with %s" msgstr "{0} ist jetzt mit %s befreundet" -#: ../../mod/ping.php:221 +#: ../../mod/ping.php:271 msgid "{0} posted" msgstr "{0} hat etwas veröffentlicht" -#: ../../mod/ping.php:226 +#: ../../mod/ping.php:276 #, php-format msgid "{0} tagged %s's post with #%s" msgstr "{0} hat %ss Beitrag mit dem Schlagwort #%s versehen" -#: ../../mod/ping.php:232 +#: ../../mod/ping.php:282 msgid "{0} mentioned you in a post" msgstr "{0} hat dich in einem Beitrag erwähnt" @@ -4426,8 +4431,8 @@ msgstr "sichtbar für jeden" msgid "Edit visibility" msgstr "Sichtbarkeit bearbeiten" -#: ../../mod/filer.php:29 ../../include/conversation.php:1185 -#: ../../include/conversation.php:1202 +#: ../../mod/filer.php:29 ../../include/conversation.php:1192 +#: ../../include/conversation.php:1209 msgid "Save to Folder:" msgstr "In diesen Ordner verschieben:" @@ -4435,7 +4440,7 @@ msgstr "In diesen Ordner verschieben:" msgid "- select -" msgstr "- auswählen -" -#: ../../mod/tagger.php:95 ../../include/conversation.php:267 +#: ../../mod/tagger.php:95 ../../include/conversation.php:265 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "%1$s hat %2$ss %3$s mit %4$s getaggt" @@ -4693,7 +4698,7 @@ msgid "Unable to set contact photo." msgstr "Konnte das Bild des Kontakts nicht speichern." #: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:608 -#: ../../include/conversation.php:173 +#: ../../include/conversation.php:171 #, php-format msgid "%1$s is now friends with %2$s" msgstr "%1$s ist nun mit %2$s befreundet" @@ -5254,11 +5259,11 @@ msgstr "LiveJournal Passwort" msgid "Post to LiveJournal by default" msgstr "Standardmäßig bei LiveJournal veröffentlichen" -#: ../../addon/nsfw/nsfw.php:47 +#: ../../addon/nsfw/nsfw.php:78 msgid "Not Safe For Work (General Purpose Content Filter) settings" msgstr "Not Safe for Work (allg. Filter für ungewollte Inhalte) Einstellungen:" -#: ../../addon/nsfw/nsfw.php:49 +#: ../../addon/nsfw/nsfw.php:80 msgid "" "This plugin looks in posts for the words/text you specify below, and " "collapses any content containing those keywords so it is not displayed at " @@ -5268,23 +5273,23 @@ msgid "" " can thereby be used as a general purpose content filter." msgstr "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Du kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden." -#: ../../addon/nsfw/nsfw.php:50 +#: ../../addon/nsfw/nsfw.php:81 msgid "Enable Content filter" msgstr "Aktiviere den Inhaltsfilter" -#: ../../addon/nsfw/nsfw.php:53 +#: ../../addon/nsfw/nsfw.php:84 msgid "Comma separated list of keywords to hide" msgstr "Durch Komma getrennte Liste von Schlüsselwörtern die verborgen werden sollen" -#: ../../addon/nsfw/nsfw.php:58 +#: ../../addon/nsfw/nsfw.php:89 msgid "Use /expression/ to provide regular expressions" msgstr "Verwende /expression/ um reguläre Ausdrücke zu verwenden" -#: ../../addon/nsfw/nsfw.php:74 +#: ../../addon/nsfw/nsfw.php:105 msgid "NSFW Settings saved." msgstr "NSFW-Einstellungen gespeichert" -#: ../../addon/nsfw/nsfw.php:121 +#: ../../addon/nsfw/nsfw.php:157 #, php-format msgid "%s - Click to open/close" msgstr "%s – Zum Öffnen/Schließen klicken" @@ -5359,7 +5364,7 @@ msgstr "Neueste Favoriten" #: ../../addon/communityhome/communityhome.php:155 #: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1397 -#: ../../include/conversation.php:117 ../../include/conversation.php:247 +#: ../../include/conversation.php:117 ../../include/conversation.php:245 msgid "event" msgstr "Veranstaltung" @@ -7014,7 +7019,7 @@ msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous" #: ../../view/theme/cleanzero/config.php:82 #: ../../view/theme/diabook/config.php:192 -#: ../../view/theme/quattro/config.php:54 ../../view/theme/dispy/config.php:72 +#: ../../view/theme/quattro/config.php:55 ../../view/theme/dispy/config.php:72 msgid "Theme settings" msgstr "Themeneinstellungen" @@ -7033,7 +7038,7 @@ msgid "Set theme width" msgstr "Theme Breite festlegen" #: ../../view/theme/cleanzero/config.php:86 -#: ../../view/theme/quattro/config.php:56 +#: ../../view/theme/quattro/config.php:57 msgid "Color scheme" msgstr "Farbschema" @@ -7208,15 +7213,15 @@ msgstr "Zoomfaktor der Earth Layer" msgid "Last tweets" msgstr "Neueste Tweets" -#: ../../view/theme/quattro/config.php:55 +#: ../../view/theme/quattro/config.php:56 msgid "Alignment" msgstr "Ausrichtung" -#: ../../view/theme/quattro/config.php:55 +#: ../../view/theme/quattro/config.php:56 msgid "Left" msgstr "Links" -#: ../../view/theme/quattro/config.php:55 +#: ../../view/theme/quattro/config.php:56 msgid "Center" msgstr "Mitte" @@ -7637,7 +7642,7 @@ msgstr[1] "%d Kontakte" msgid "poke" msgstr "anstupsen" -#: ../../include/text.php:719 ../../include/conversation.php:212 +#: ../../include/text.php:719 ../../include/conversation.php:210 msgid "poked" msgstr "stupste" @@ -8528,151 +8533,151 @@ msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das msgid "stopped following" msgstr "wird nicht mehr gefolgt" -#: ../../include/Contact.php:220 ../../include/conversation.php:1082 +#: ../../include/Contact.php:220 ../../include/conversation.php:1089 msgid "Poke" msgstr "Anstupsen" -#: ../../include/Contact.php:221 ../../include/conversation.php:1076 +#: ../../include/Contact.php:221 ../../include/conversation.php:1083 msgid "View Status" msgstr "Pinnwand anschauen" -#: ../../include/Contact.php:222 ../../include/conversation.php:1077 +#: ../../include/Contact.php:222 ../../include/conversation.php:1084 msgid "View Profile" msgstr "Profil anschauen" -#: ../../include/Contact.php:223 ../../include/conversation.php:1078 +#: ../../include/Contact.php:223 ../../include/conversation.php:1085 msgid "View Photos" msgstr "Bilder anschauen" #: ../../include/Contact.php:224 ../../include/Contact.php:237 -#: ../../include/conversation.php:1079 +#: ../../include/conversation.php:1086 msgid "Network Posts" msgstr "Netzwerkbeiträge" #: ../../include/Contact.php:225 ../../include/Contact.php:237 -#: ../../include/conversation.php:1080 +#: ../../include/conversation.php:1087 msgid "Edit Contact" msgstr "Kontakt bearbeiten" #: ../../include/Contact.php:226 ../../include/Contact.php:237 -#: ../../include/conversation.php:1081 +#: ../../include/conversation.php:1088 msgid "Send PM" msgstr "Private Nachricht senden" -#: ../../include/conversation.php:208 +#: ../../include/conversation.php:206 #, php-format msgid "%1$s poked %2$s" msgstr "%1$s hat %2$s angestupst" -#: ../../include/conversation.php:292 +#: ../../include/conversation.php:290 msgid "post/item" msgstr "Nachricht/Beitrag" -#: ../../include/conversation.php:293 +#: ../../include/conversation.php:291 #, php-format msgid "%1$s marked %2$s's %3$s as favorite" msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert" -#: ../../include/conversation.php:982 +#: ../../include/conversation.php:989 msgid "Delete Selected Items" msgstr "Lösche die markierten Beiträge" -#: ../../include/conversation.php:1140 +#: ../../include/conversation.php:1147 #, php-format msgid "%s likes this." msgstr "%s mag das." -#: ../../include/conversation.php:1140 +#: ../../include/conversation.php:1147 #, php-format msgid "%s doesn't like this." msgstr "%s mag das nicht." -#: ../../include/conversation.php:1144 +#: ../../include/conversation.php:1151 #, php-format msgid "%2$d people like this." msgstr "%2$d Leute mögen das." -#: ../../include/conversation.php:1146 +#: ../../include/conversation.php:1153 #, php-format msgid "%2$d people don't like this." msgstr "%2$d Leute mögen das nicht." -#: ../../include/conversation.php:1152 +#: ../../include/conversation.php:1159 msgid "and" msgstr "und" -#: ../../include/conversation.php:1155 +#: ../../include/conversation.php:1162 #, php-format msgid ", and %d other people" msgstr " und %d andere" -#: ../../include/conversation.php:1156 +#: ../../include/conversation.php:1163 #, php-format msgid "%s like this." msgstr "%s mögen das." -#: ../../include/conversation.php:1156 +#: ../../include/conversation.php:1163 #, php-format msgid "%s don't like this." msgstr "%s mögen das nicht." -#: ../../include/conversation.php:1180 ../../include/conversation.php:1197 +#: ../../include/conversation.php:1187 ../../include/conversation.php:1204 msgid "Visible to everybody" msgstr "Für jedermann sichtbar" -#: ../../include/conversation.php:1182 ../../include/conversation.php:1199 +#: ../../include/conversation.php:1189 ../../include/conversation.php:1206 msgid "Please enter a video link/URL:" msgstr "Bitte Link/URL zum Video einfügen:" -#: ../../include/conversation.php:1183 ../../include/conversation.php:1200 +#: ../../include/conversation.php:1190 ../../include/conversation.php:1207 msgid "Please enter an audio link/URL:" msgstr "Bitte Link/URL zum Audio einfügen:" -#: ../../include/conversation.php:1184 ../../include/conversation.php:1201 +#: ../../include/conversation.php:1191 ../../include/conversation.php:1208 msgid "Tag term:" msgstr "Tag:" -#: ../../include/conversation.php:1186 ../../include/conversation.php:1203 +#: ../../include/conversation.php:1193 ../../include/conversation.php:1210 msgid "Where are you right now?" msgstr "Wo hältst du dich jetzt gerade auf?" -#: ../../include/conversation.php:1246 +#: ../../include/conversation.php:1253 msgid "upload photo" msgstr "Bild hochladen" -#: ../../include/conversation.php:1248 +#: ../../include/conversation.php:1255 msgid "attach file" msgstr "Datei anhängen" -#: ../../include/conversation.php:1250 +#: ../../include/conversation.php:1257 msgid "web link" msgstr "Weblink" -#: ../../include/conversation.php:1251 +#: ../../include/conversation.php:1258 msgid "Insert video link" msgstr "Video-Adresse einfügen" -#: ../../include/conversation.php:1252 +#: ../../include/conversation.php:1259 msgid "video link" msgstr "Video-Link" -#: ../../include/conversation.php:1253 +#: ../../include/conversation.php:1260 msgid "Insert audio link" msgstr "Audio-Adresse einfügen" -#: ../../include/conversation.php:1254 +#: ../../include/conversation.php:1261 msgid "audio link" msgstr "Audio-Link" -#: ../../include/conversation.php:1256 +#: ../../include/conversation.php:1263 msgid "set location" msgstr "Ort setzen" -#: ../../include/conversation.php:1258 +#: ../../include/conversation.php:1265 msgid "clear location" msgstr "Ort löschen" -#: ../../include/conversation.php:1265 +#: ../../include/conversation.php:1272 msgid "permissions" msgstr "Zugriffsrechte" diff --git a/view/de/strings.php b/view/de/strings.php index 330b26ce2b..dc90ed08a3 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -860,6 +860,7 @@ $a->strings["Request date"] = "Anfragedatum"; $a->strings["Email"] = "E-Mail"; $a->strings["No registrations."] = "Keine Neuanmeldungen."; $a->strings["Deny"] = "Verwehren"; +$a->strings["Site admin"] = "Seitenadministrator"; $a->strings["Register date"] = "Anmeldedatum"; $a->strings["Last login"] = "Letzte Anmeldung"; $a->strings["Last item"] = "Letzter Beitrag"; From fbd120f1ce45e831124c11099c3fcae6b10f7924 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 23 Sep 2012 17:16:01 -0700 Subject: [PATCH 17/47] rev update --- boot.php | 2 +- util/messages.po | 308 +++++++++++++++++++++++------------------------ 2 files changed, 151 insertions(+), 159 deletions(-) diff --git a/boot.php b/boot.php index b235497901..9690bad1bf 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1473' ); +define ( 'FRIENDICA_VERSION', '3.0.1475' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1156 ); diff --git a/util/messages.po b/util/messages.po index cfe795cf0b..8d30bbaf92 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1473\n" +"Project-Id-Version: 3.0.1475\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-21 10:00-0700\n" +"POT-Creation-Date: 2012-09-23 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -131,7 +131,7 @@ msgstr "" #: ../../mod/photos.php:1378 ../../mod/photos.php:1419 #: ../../mod/photos.php:1451 ../../mod/install.php:246 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199 -#: ../../mod/content.php:691 ../../mod/contacts.php:348 +#: ../../mod/content.php:693 ../../mod/contacts.php:348 #: ../../mod/settings.php:543 ../../mod/settings.php:697 #: ../../mod/settings.php:769 ../../mod/settings.php:976 #: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294 @@ -176,7 +176,7 @@ msgstr "" #: ../../view/theme/diabook/theme.php:757 #: ../../view/theme/diabook/config.php:190 #: ../../view/theme/quattro/config.php:53 ../../view/theme/dispy/config.php:70 -#: ../../include/conversation.php:608 ../../object/Item.php:532 +#: ../../include/conversation.php:609 ../../object/Item.php:555 msgid "Submit" msgstr "" @@ -231,7 +231,7 @@ msgstr "" msgid "Edit event" msgstr "" -#: ../../mod/events.php:323 ../../include/text.php:1147 +#: ../../mod/events.php:323 ../../include/text.php:1186 msgid "link to source" msgstr "" @@ -307,7 +307,7 @@ msgstr "" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:136 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 -#: ../../include/conversation.php:1290 +#: ../../include/conversation.php:1303 msgid "Cancel" msgstr "" @@ -428,7 +428,7 @@ msgstr "" #: ../../mod/photos.php:584 ../../mod/like.php:145 ../../mod/tagger.php:62 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1399 +#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1438 #: ../../include/diaspora.php:1824 ../../include/conversation.php:125 #: ../../include/conversation.php:253 msgid "photo" @@ -536,8 +536,8 @@ msgstr "" msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:1224 ../../mod/content.php:601 -#: ../../include/conversation.php:435 ../../object/Item.php:103 +#: ../../mod/photos.php:1224 ../../mod/content.php:603 +#: ../../include/conversation.php:436 ../../object/Item.php:103 msgid "Private Message" msgstr "" @@ -577,52 +577,52 @@ msgstr "" msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1356 ../../mod/content.php:665 -#: ../../include/conversation.php:582 ../../object/Item.php:185 +#: ../../mod/photos.php:1356 ../../mod/content.php:667 +#: ../../include/conversation.php:583 ../../object/Item.php:195 msgid "I like this (toggle)" msgstr "" -#: ../../mod/photos.php:1357 ../../mod/content.php:666 -#: ../../include/conversation.php:583 ../../object/Item.php:186 +#: ../../mod/photos.php:1357 ../../mod/content.php:668 +#: ../../include/conversation.php:584 ../../object/Item.php:196 msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1358 ../../include/conversation.php:1251 +#: ../../mod/photos.php:1358 ../../include/conversation.php:1264 msgid "Share" msgstr "" #: ../../mod/photos.php:1359 ../../mod/editpost.php:112 -#: ../../mod/content.php:482 ../../mod/content.php:843 +#: ../../mod/content.php:482 ../../mod/content.php:845 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:481 ../../include/conversation.php:678 -#: ../../include/conversation.php:928 ../../include/conversation.php:1270 -#: ../../object/Item.php:237 +#: ../../mod/message.php:481 ../../include/conversation.php:685 +#: ../../include/conversation.php:940 ../../include/conversation.php:1283 +#: ../../object/Item.php:253 msgid "Please wait" msgstr "" #: ../../mod/photos.php:1375 ../../mod/photos.php:1416 -#: ../../mod/photos.php:1448 ../../mod/content.php:688 -#: ../../include/conversation.php:605 ../../object/Item.php:529 +#: ../../mod/photos.php:1448 ../../mod/content.php:690 +#: ../../include/conversation.php:606 ../../object/Item.php:552 msgid "This is you" msgstr "" #: ../../mod/photos.php:1377 ../../mod/photos.php:1418 -#: ../../mod/photos.php:1450 ../../mod/content.php:690 -#: ../../include/conversation.php:607 ../../boot.php:574 -#: ../../object/Item.php:531 +#: ../../mod/photos.php:1450 ../../mod/content.php:692 +#: ../../include/conversation.php:608 ../../boot.php:574 +#: ../../object/Item.php:554 msgid "Comment" msgstr "" #: ../../mod/photos.php:1379 ../../mod/editpost.php:133 -#: ../../mod/content.php:700 ../../include/conversation.php:617 -#: ../../include/conversation.php:1288 ../../object/Item.php:541 +#: ../../mod/content.php:702 ../../include/conversation.php:618 +#: ../../include/conversation.php:1301 ../../object/Item.php:564 msgid "Preview" msgstr "" #: ../../mod/photos.php:1479 ../../mod/content.php:439 -#: ../../mod/content.php:721 ../../mod/settings.php:606 +#: ../../mod/content.php:723 ../../mod/settings.php:606 #: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:696 -#: ../../include/conversation.php:447 ../../include/conversation.php:881 +#: ../../include/conversation.php:448 ../../include/conversation.php:890 #: ../../object/Item.php:116 msgid "Delete" msgstr "" @@ -689,29 +689,29 @@ msgstr "" msgid "Edit post" msgstr "" -#: ../../mod/editpost.php:88 ../../include/conversation.php:1237 +#: ../../mod/editpost.php:88 ../../include/conversation.php:1250 msgid "Post to Email" msgstr "" -#: ../../mod/editpost.php:103 ../../mod/content.php:708 -#: ../../mod/settings.php:605 ../../include/conversation.php:440 +#: ../../mod/editpost.php:103 ../../mod/content.php:710 +#: ../../mod/settings.php:605 ../../include/conversation.php:441 #: ../../object/Item.php:107 msgid "Edit" msgstr "" #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/message.php:291 ../../mod/message.php:478 -#: ../../include/conversation.php:1252 +#: ../../include/conversation.php:1265 msgid "Upload photo" msgstr "" -#: ../../mod/editpost.php:105 ../../include/conversation.php:1254 +#: ../../mod/editpost.php:105 ../../include/conversation.php:1267 msgid "Attach file" msgstr "" #: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151 #: ../../mod/message.php:292 ../../mod/message.php:479 -#: ../../include/conversation.php:1256 +#: ../../include/conversation.php:1269 msgid "Insert web link" msgstr "" @@ -727,35 +727,35 @@ msgstr "" msgid "Insert Vorbis [.ogg] audio" msgstr "" -#: ../../mod/editpost.php:110 ../../include/conversation.php:1262 +#: ../../mod/editpost.php:110 ../../include/conversation.php:1275 msgid "Set your location" msgstr "" -#: ../../mod/editpost.php:111 ../../include/conversation.php:1264 +#: ../../mod/editpost.php:111 ../../include/conversation.php:1277 msgid "Clear browser location" msgstr "" -#: ../../mod/editpost.php:113 ../../include/conversation.php:1271 +#: ../../mod/editpost.php:113 ../../include/conversation.php:1284 msgid "Permission settings" msgstr "" -#: ../../mod/editpost.php:121 ../../include/conversation.php:1280 +#: ../../mod/editpost.php:121 ../../include/conversation.php:1293 msgid "CC: email addresses" msgstr "" -#: ../../mod/editpost.php:122 ../../include/conversation.php:1281 +#: ../../mod/editpost.php:122 ../../include/conversation.php:1294 msgid "Public post" msgstr "" -#: ../../mod/editpost.php:125 ../../include/conversation.php:1267 +#: ../../mod/editpost.php:125 ../../include/conversation.php:1280 msgid "Set title" msgstr "" -#: ../../mod/editpost.php:127 ../../include/conversation.php:1269 +#: ../../mod/editpost.php:127 ../../include/conversation.php:1282 msgid "Categories (comma-separated list)" msgstr "" -#: ../../mod/editpost.php:128 ../../include/conversation.php:1283 +#: ../../mod/editpost.php:128 ../../include/conversation.php:1296 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -1296,148 +1296,156 @@ msgstr "" msgid "Group: " msgstr "" -#: ../../mod/content.php:438 ../../mod/content.php:720 -#: ../../include/conversation.php:446 ../../include/conversation.php:880 +#: ../../mod/content.php:438 ../../mod/content.php:722 +#: ../../include/conversation.php:447 ../../include/conversation.php:889 #: ../../object/Item.php:115 msgid "Select" msgstr "" -#: ../../mod/content.php:455 ../../mod/content.php:813 -#: ../../mod/content.php:814 ../../include/conversation.php:646 -#: ../../include/conversation.php:647 ../../include/conversation.php:897 -#: ../../object/Item.php:206 ../../object/Item.php:207 +#: ../../mod/content.php:455 ../../mod/content.php:815 +#: ../../mod/content.php:816 ../../include/conversation.php:653 +#: ../../include/conversation.php:654 ../../include/conversation.php:907 +#: ../../object/Item.php:222 ../../object/Item.php:223 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../mod/content.php:465 ../../mod/content.php:825 -#: ../../include/conversation.php:660 ../../include/conversation.php:911 -#: ../../object/Item.php:219 +#: ../../mod/content.php:465 ../../mod/content.php:827 +#: ../../include/conversation.php:667 ../../include/conversation.php:923 +#: ../../object/Item.php:235 #, php-format msgid "%s from %s" msgstr "" -#: ../../mod/content.php:480 ../../include/conversation.php:926 +#: ../../mod/content.php:480 ../../include/conversation.php:938 msgid "View in context" msgstr "" -#: ../../mod/content.php:586 ../../include/conversation.php:687 -#: ../../object/Item.php:256 +#: ../../mod/content.php:586 ../../include/conversation.php:694 +#: ../../object/Item.php:272 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../mod/content.php:587 ../../addon/page/page.php:76 +#: ../../mod/content.php:588 ../../include/text.php:1442 +#: ../../include/conversation.php:696 ../../object/Item.php:274 +#: ../../object/Item.php:287 +msgid "comment" +msgid_plural "comments" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/content.php:589 ../../addon/page/page.php:76 #: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119 -#: ../../include/contact_widgets.php:195 ../../include/conversation.php:688 -#: ../../boot.php:575 ../../object/Item.php:257 +#: ../../include/contact_widgets.php:195 ../../include/conversation.php:697 +#: ../../boot.php:575 ../../object/Item.php:275 msgid "show more" msgstr "" -#: ../../mod/content.php:665 ../../include/conversation.php:582 -#: ../../object/Item.php:185 +#: ../../mod/content.php:667 ../../include/conversation.php:583 +#: ../../object/Item.php:195 msgid "like" msgstr "" -#: ../../mod/content.php:666 ../../include/conversation.php:583 -#: ../../object/Item.php:186 +#: ../../mod/content.php:668 ../../include/conversation.php:584 +#: ../../object/Item.php:196 msgid "dislike" msgstr "" -#: ../../mod/content.php:668 ../../include/conversation.php:585 -#: ../../object/Item.php:188 +#: ../../mod/content.php:670 ../../include/conversation.php:586 +#: ../../object/Item.php:198 msgid "Share this" msgstr "" -#: ../../mod/content.php:668 ../../include/conversation.php:585 -#: ../../object/Item.php:188 +#: ../../mod/content.php:670 ../../include/conversation.php:586 +#: ../../object/Item.php:198 msgid "share" msgstr "" -#: ../../mod/content.php:692 ../../include/conversation.php:609 -#: ../../object/Item.php:533 +#: ../../mod/content.php:694 ../../include/conversation.php:610 +#: ../../object/Item.php:556 msgid "Bold" msgstr "" -#: ../../mod/content.php:693 ../../include/conversation.php:610 -#: ../../object/Item.php:534 +#: ../../mod/content.php:695 ../../include/conversation.php:611 +#: ../../object/Item.php:557 msgid "Italic" msgstr "" -#: ../../mod/content.php:694 ../../include/conversation.php:611 -#: ../../object/Item.php:535 +#: ../../mod/content.php:696 ../../include/conversation.php:612 +#: ../../object/Item.php:558 msgid "Underline" msgstr "" -#: ../../mod/content.php:695 ../../include/conversation.php:612 -#: ../../object/Item.php:536 +#: ../../mod/content.php:697 ../../include/conversation.php:613 +#: ../../object/Item.php:559 msgid "Quote" msgstr "" -#: ../../mod/content.php:696 ../../include/conversation.php:613 -#: ../../object/Item.php:537 +#: ../../mod/content.php:698 ../../include/conversation.php:614 +#: ../../object/Item.php:560 msgid "Code" msgstr "" -#: ../../mod/content.php:697 ../../include/conversation.php:614 -#: ../../object/Item.php:538 +#: ../../mod/content.php:699 ../../include/conversation.php:615 +#: ../../object/Item.php:561 msgid "Image" msgstr "" -#: ../../mod/content.php:698 ../../include/conversation.php:615 -#: ../../object/Item.php:539 +#: ../../mod/content.php:700 ../../include/conversation.php:616 +#: ../../object/Item.php:562 msgid "Link" msgstr "" -#: ../../mod/content.php:699 ../../include/conversation.php:616 -#: ../../object/Item.php:540 +#: ../../mod/content.php:701 ../../include/conversation.php:617 +#: ../../object/Item.php:563 msgid "Video" msgstr "" -#: ../../mod/content.php:733 ../../include/conversation.php:546 -#: ../../object/Item.php:169 +#: ../../mod/content.php:735 ../../include/conversation.php:547 +#: ../../object/Item.php:179 msgid "add star" msgstr "" -#: ../../mod/content.php:734 ../../include/conversation.php:547 -#: ../../object/Item.php:170 +#: ../../mod/content.php:736 ../../include/conversation.php:548 +#: ../../object/Item.php:180 msgid "remove star" msgstr "" -#: ../../mod/content.php:735 ../../include/conversation.php:548 -#: ../../object/Item.php:171 +#: ../../mod/content.php:737 ../../include/conversation.php:549 +#: ../../object/Item.php:181 msgid "toggle star status" msgstr "" -#: ../../mod/content.php:738 ../../include/conversation.php:551 -#: ../../object/Item.php:174 +#: ../../mod/content.php:740 ../../include/conversation.php:552 +#: ../../object/Item.php:184 msgid "starred" msgstr "" -#: ../../mod/content.php:739 ../../include/conversation.php:552 -#: ../../object/Item.php:175 +#: ../../mod/content.php:741 ../../include/conversation.php:553 +#: ../../object/Item.php:185 msgid "add tag" msgstr "" -#: ../../mod/content.php:743 ../../include/conversation.php:450 +#: ../../mod/content.php:745 ../../include/conversation.php:451 #: ../../object/Item.php:119 msgid "save to folder" msgstr "" -#: ../../mod/content.php:815 ../../include/conversation.php:648 -#: ../../object/Item.php:208 +#: ../../mod/content.php:817 ../../include/conversation.php:655 +#: ../../object/Item.php:224 msgid "to" msgstr "" -#: ../../mod/content.php:816 ../../include/conversation.php:649 -#: ../../object/Item.php:209 +#: ../../mod/content.php:818 ../../include/conversation.php:656 +#: ../../object/Item.php:225 msgid "Wall-to-Wall" msgstr "" -#: ../../mod/content.php:817 ../../include/conversation.php:650 -#: ../../object/Item.php:210 +#: ../../mod/content.php:819 ../../include/conversation.php:657 +#: ../../object/Item.php:226 msgid "via Wall-To-Wall:" msgstr "" @@ -2687,7 +2695,7 @@ msgstr "" #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:1188 ../../include/conversation.php:1205 +#: ../../include/conversation.php:1201 ../../include/conversation.php:1218 msgid "Please enter a link URL:" msgstr "" @@ -4412,8 +4420,8 @@ msgstr "" msgid "Edit visibility" msgstr "" -#: ../../mod/filer.php:29 ../../include/conversation.php:1192 -#: ../../include/conversation.php:1209 +#: ../../mod/filer.php:29 ../../include/conversation.php:1205 +#: ../../include/conversation.php:1222 msgid "Save to Folder:" msgstr "" @@ -5345,7 +5353,7 @@ msgid "Latest likes" msgstr "" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1397 +#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1436 #: ../../include/conversation.php:117 ../../include/conversation.php:245 msgid "event" msgstr "" @@ -7804,47 +7812,27 @@ msgstr "" msgid "bytes" msgstr "" -#: ../../include/text.php:1027 ../../include/text.php:1042 -msgid "remove" -msgstr "" - -#: ../../include/text.php:1027 ../../include/text.php:1042 -msgid "[remove]" -msgstr "" - -#: ../../include/text.php:1030 -msgid "Categories:" -msgstr "" - -#: ../../include/text.php:1045 -msgid "Filed under:" -msgstr "" - -#: ../../include/text.php:1061 ../../include/text.php:1073 +#: ../../include/text.php:1034 ../../include/text.php:1046 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1179 ../../include/user.php:236 +#: ../../include/text.php:1218 ../../include/user.php:236 msgid "default" msgstr "" -#: ../../include/text.php:1191 +#: ../../include/text.php:1230 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1401 +#: ../../include/text.php:1440 msgid "activity" msgstr "" -#: ../../include/text.php:1403 -msgid "comment" -msgstr "" - -#: ../../include/text.php:1404 +#: ../../include/text.php:1443 msgid "post" msgstr "" -#: ../../include/text.php:1559 +#: ../../include/text.php:1598 msgid "Item filed" msgstr "" @@ -8518,34 +8506,34 @@ msgstr "" msgid "stopped following" msgstr "" -#: ../../include/Contact.php:220 ../../include/conversation.php:1089 +#: ../../include/Contact.php:220 ../../include/conversation.php:1102 msgid "Poke" msgstr "" -#: ../../include/Contact.php:221 ../../include/conversation.php:1083 +#: ../../include/Contact.php:221 ../../include/conversation.php:1096 msgid "View Status" msgstr "" -#: ../../include/Contact.php:222 ../../include/conversation.php:1084 +#: ../../include/Contact.php:222 ../../include/conversation.php:1097 msgid "View Profile" msgstr "" -#: ../../include/Contact.php:223 ../../include/conversation.php:1085 +#: ../../include/Contact.php:223 ../../include/conversation.php:1098 msgid "View Photos" msgstr "" #: ../../include/Contact.php:224 ../../include/Contact.php:237 -#: ../../include/conversation.php:1086 +#: ../../include/conversation.php:1099 msgid "Network Posts" msgstr "" #: ../../include/Contact.php:225 ../../include/Contact.php:237 -#: ../../include/conversation.php:1087 +#: ../../include/conversation.php:1100 msgid "Edit Contact" msgstr "" #: ../../include/Contact.php:226 ../../include/Contact.php:237 -#: ../../include/conversation.php:1088 +#: ../../include/conversation.php:1101 msgid "Send PM" msgstr "" @@ -8563,106 +8551,110 @@ msgstr "" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: ../../include/conversation.php:989 +#: ../../include/conversation.php:998 +msgid "remove" +msgstr "" + +#: ../../include/conversation.php:1002 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:1147 +#: ../../include/conversation.php:1160 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1147 +#: ../../include/conversation.php:1160 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1151 +#: ../../include/conversation.php:1164 #, php-format msgid "%2$d people like this." msgstr "" -#: ../../include/conversation.php:1153 +#: ../../include/conversation.php:1166 #, php-format msgid "%2$d people don't like this." msgstr "" -#: ../../include/conversation.php:1159 +#: ../../include/conversation.php:1172 msgid "and" msgstr "" -#: ../../include/conversation.php:1162 +#: ../../include/conversation.php:1175 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:1163 +#: ../../include/conversation.php:1176 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1163 +#: ../../include/conversation.php:1176 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1187 ../../include/conversation.php:1204 +#: ../../include/conversation.php:1200 ../../include/conversation.php:1217 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:1189 ../../include/conversation.php:1206 +#: ../../include/conversation.php:1202 ../../include/conversation.php:1219 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:1190 ../../include/conversation.php:1207 +#: ../../include/conversation.php:1203 ../../include/conversation.php:1220 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:1191 ../../include/conversation.php:1208 +#: ../../include/conversation.php:1204 ../../include/conversation.php:1221 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1193 ../../include/conversation.php:1210 +#: ../../include/conversation.php:1206 ../../include/conversation.php:1223 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1253 +#: ../../include/conversation.php:1266 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1255 +#: ../../include/conversation.php:1268 msgid "attach file" msgstr "" -#: ../../include/conversation.php:1257 +#: ../../include/conversation.php:1270 msgid "web link" msgstr "" -#: ../../include/conversation.php:1258 +#: ../../include/conversation.php:1271 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:1259 +#: ../../include/conversation.php:1272 msgid "video link" msgstr "" -#: ../../include/conversation.php:1260 +#: ../../include/conversation.php:1273 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:1261 +#: ../../include/conversation.php:1274 msgid "audio link" msgstr "" -#: ../../include/conversation.php:1263 +#: ../../include/conversation.php:1276 msgid "set location" msgstr "" -#: ../../include/conversation.php:1265 +#: ../../include/conversation.php:1278 msgid "clear location" msgstr "" -#: ../../include/conversation.php:1272 +#: ../../include/conversation.php:1285 msgid "permissions" msgstr "" From c3b4f9f0d308a1642a9986e73f04f36bb7e2fb62 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 23 Sep 2012 17:16:37 -0700 Subject: [PATCH 18/47] support for bringing back cats/folders --- include/conversation.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/conversation.php b/include/conversation.php index fc4b85e794..b8546ce014 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -645,6 +645,10 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr 'tags' => template_escape($tags), 'hashtags' => template_escape($hashtags), 'mentions' => template_escape($mentions), + 'txt_cats' => t('Categories:'), + 'txt_folders' => t('Filed under:'), + 'has_cats' => ((count($categories)) ? 'true' : ''), + 'has_folders' => ((count($folders)) ? 'true' : ''), 'categories' => $categories, 'folders' => $folders, 'body' => template_escape($body), @@ -916,6 +920,10 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { 'tags' => template_escape($tags), 'hashtags' => template_escape($hashtags), 'mentions' => template_escape($mentions), + 'txt_cats' => t('Categories:'), + 'txt_folders' => t('Filed under:'), + 'has_cats' => ((count($categories)) ? 'true' : ''), + 'has_folders' => ((count($folders)) ? 'true' : ''), 'categories' => $categories, 'folders' => $folders, 'text' => strip_tags(template_escape($body)), From 054f8edb59b85d8cdadfce007d51226291c73efa Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 23 Sep 2012 19:22:48 -0700 Subject: [PATCH 19/47] zeros - theming for new categories/folder display --- include/conversation.php | 6 +++--- include/text.php | 29 +++++++++++++++-------------- object/Item.php | 4 ++++ view/search_item.tpl | 9 +++++++++ view/wall_item.tpl | 9 +++++++++ view/wall_thread.tpl | 9 +++++++++ view/wallwall_item.tpl | 9 +++++++++ view/wallwall_thread.tpl | 9 +++++++++ 8 files changed, 67 insertions(+), 17 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index b8546ce014..1bdde5e9ff 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -626,13 +626,12 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0) $indent .= ' shiny'; + localize_item($item); $body = prepare_body($item,true); - list($categories, $folders) = get_cats_and_terms($item); - - + list($categories,$folders) = get_cats_and_terms($item); $tmp_item = array( // collapse comments in template. I don't like this much... @@ -903,6 +902,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $body = prepare_body($item,true); + list($categories, $folders) = get_cats_and_terms($item); //$tmp_item = replace_macros($tpl,array( $tmp_item = array( diff --git a/include/text.php b/include/text.php index 9b55078cbe..23e3e50611 100644 --- a/include/text.php +++ b/include/text.php @@ -1115,24 +1115,25 @@ function get_cats_and_terms($item) { if (count($categories)) $categories[count($categories)-1]['last'] = true; - - $matches = false; $first = true; - $cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER); - if($cnt) { - foreach($matches as $mtch) { - $folders[] = array( - 'name' => xmlify(file_tag_decode($mtch[1])), - 'url' => "#", - 'removeurl' => ((local_user() == $item['uid'])?$a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&term=' . xmlify(file_tag_decode($mtch[1])):""), - 'first' => $first, - 'last' => false - ); - $first = false; + if(local_user() == $item['uid']) { + $matches = false; $first = true; + $cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + $folders[] = array( + 'name' => xmlify(file_tag_decode($mtch[1])), + 'url' => "#", + 'removeurl' => ((local_user() == $item['uid'])?$a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&term=' . xmlify(file_tag_decode($mtch[1])):""), + 'first' => $first, + 'last' => false + ); + $first = false; + } } } if (count($folders)) $folders[count($folders)-1]['last'] = true; - + return array($categories, $folders); } diff --git a/object/Item.php b/object/Item.php index 04d52a896e..ed439e4d29 100644 --- a/object/Item.php +++ b/object/Item.php @@ -214,6 +214,10 @@ class Item extends BaseObject { 'tags' => $tags, 'hashtags' => $hashtags, 'mentions' => $mentions, + 'txt_cats' => t('Categories:'), + 'txt_folders' => t('Filed under:'), + 'has_cats' => ((count($categories)) ? 'true' : ''), + 'has_folders' => ((count($folders)) ? 'true' : ''), 'categories' => $categories, 'folders' => $folders, 'body' => template_escape($body), diff --git a/view/search_item.tpl b/view/search_item.tpl index 8d8a0dbd4d..de3c58839c 100644 --- a/view/search_item.tpl +++ b/view/search_item.tpl @@ -30,6 +30,15 @@
$item.title
$item.body
+ {{ if $item.has_cats }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + + {{ if $item.has_folders }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }}
diff --git a/view/wall_item.tpl b/view/wall_item.tpl index e4eabb9e5c..7fe8794d81 100644 --- a/view/wall_item.tpl +++ b/view/wall_item.tpl @@ -36,6 +36,15 @@ $tag {{ endfor }}
+ {{ if $item.has_cats }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + + {{ if $item.has_folders }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }}
diff --git a/view/wall_thread.tpl b/view/wall_thread.tpl index e3f0436a3b..86a937fef5 100644 --- a/view/wall_thread.tpl +++ b/view/wall_thread.tpl @@ -47,6 +47,15 @@ $tag {{ endfor }}
+ {{ if $item.has_cats }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + + {{ if $item.has_folders }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }}
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl index e8044532a3..ff2bc00e47 100644 --- a/view/wallwall_item.tpl +++ b/view/wallwall_item.tpl @@ -40,6 +40,15 @@ $tag {{ endfor }}
+ {{ if $item.has_cats }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + + {{ if $item.has_folders }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }}
diff --git a/view/wallwall_thread.tpl b/view/wallwall_thread.tpl index 68bb3bc9d5..211f951328 100644 --- a/view/wallwall_thread.tpl +++ b/view/wallwall_thread.tpl @@ -47,6 +47,15 @@ $tag {{ endfor }}
+ {{ if $item.has_cats }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + + {{ if $item.has_folders }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }}
From 316014e4ea74f54cc665e1fea3a45e3b1313feeb Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 24 Sep 2012 00:35:19 -0700 Subject: [PATCH 20/47] restore category/file display on dispy/diabook --- view/theme/diabook/search_item.tpl | 9 +++++++++ view/theme/diabook/wall_item.tpl | 9 +++++++++ view/theme/diabook/wall_thread.tpl | 10 ++++++++++ view/theme/diabook/wallwall_item.tpl | 9 +++++++++ view/theme/diabook/wallwall_thread.tpl | 9 +++++++++ view/theme/dispy/search_item.tpl | 10 ++++++++++ view/theme/dispy/wall_item.tpl | 10 ++++++++++ view/theme/dispy/wall_thread.tpl | 11 +++++++++++ view/theme/dispy/wallwall_item.tpl | 10 ++++++++++ view/theme/dispy/wallwall_thread.tpl | 10 ++++++++++ 10 files changed, 97 insertions(+) diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl index 1238340647..c953228104 100644 --- a/view/theme/diabook/search_item.tpl +++ b/view/theme/diabook/search_item.tpl @@ -29,6 +29,15 @@
{{ if $item.title }}

$item.title

{{ endif }} $item.body + {{ if $item.has_cats }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + + {{ if $item.has_folders }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }}
diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl index 5b9de29689..8acc91193d 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -29,6 +29,15 @@
{{ if $item.title }}

$item.title

{{ endif }} $item.body + {{ if $item.has_cats }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + + {{ if $item.has_folders }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }}
diff --git a/view/theme/diabook/wall_thread.tpl b/view/theme/diabook/wall_thread.tpl index c53f8b017c..cea2705976 100644 --- a/view/theme/diabook/wall_thread.tpl +++ b/view/theme/diabook/wall_thread.tpl @@ -36,6 +36,16 @@
{{ if $item.title }}

$item.title

{{ endif }} $item.body + + {{ if $item.has_cats }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + + {{ if $item.has_folders }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }}
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl index b2c980c78d..0a183f0766 100644 --- a/view/theme/diabook/wallwall_item.tpl +++ b/view/theme/diabook/wallwall_item.tpl @@ -35,6 +35,15 @@
{{ if $item.title }}

$item.title

{{ endif }} $item.body + {{ if $item.has_cats }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + + {{ if $item.has_folders }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }}
diff --git a/view/theme/diabook/wallwall_thread.tpl b/view/theme/diabook/wallwall_thread.tpl index c53f8b017c..4846841761 100644 --- a/view/theme/diabook/wallwall_thread.tpl +++ b/view/theme/diabook/wallwall_thread.tpl @@ -36,6 +36,15 @@
{{ if $item.title }}

$item.title

{{ endif }} $item.body + {{ if $item.has_cats }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + + {{ if $item.has_folders }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }}
diff --git a/view/theme/dispy/search_item.tpl b/view/theme/dispy/search_item.tpl index 35572caa04..3e997ad7a3 100644 --- a/view/theme/dispy/search_item.tpl +++ b/view/theme/dispy/search_item.tpl @@ -29,6 +29,16 @@
$item.title
$item.body
+ {{ if $item.has_cats }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + + {{ if $item.has_folders }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} +
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index d5cc7f16c8..0b869e144f 100644 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -73,6 +73,16 @@ {{ for $item.tags as $tag }} $tag {{ endfor }} + {{ if $item.has_cats }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + + {{ if $item.has_folders }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} +
diff --git a/view/theme/dispy/wall_thread.tpl b/view/theme/dispy/wall_thread.tpl index 5f434d4cb6..19b32bfaa1 100644 --- a/view/theme/dispy/wall_thread.tpl +++ b/view/theme/dispy/wall_thread.tpl @@ -83,6 +83,17 @@ $tag {{ endfor }} + {{ if $item.has_cats }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + + {{ if $item.has_folders }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + + diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl index 63c8a2e96b..edfbdf27e0 100644 --- a/view/theme/dispy/wallwall_item.tpl +++ b/view/theme/dispy/wallwall_item.tpl @@ -82,6 +82,16 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick $tag {{ endfor }} + {{ if $item.has_cats }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + + {{ if $item.has_folders }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + diff --git a/view/theme/dispy/wallwall_thread.tpl b/view/theme/dispy/wallwall_thread.tpl index cab97cafad..b150e1fd02 100644 --- a/view/theme/dispy/wallwall_thread.tpl +++ b/view/theme/dispy/wallwall_thread.tpl @@ -89,6 +89,16 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick $tag {{ endfor }} + {{ if $item.has_cats }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + + {{ if $item.has_folders }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + From 94f3aef1eaea946680278096c512869ebac256d4 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 24 Sep 2012 00:46:00 -0700 Subject: [PATCH 21/47] allow a bit more height --- view/theme/duepuntozero/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 030ecdbe1f..376caefa45 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1138,7 +1138,7 @@ input#dfrn-url { margin-left: 10px; /*margin-bottom: 20px;*/ /*padding: 20px;*/ - max-height: 400px; + max-height: 700px; overflow: auto; } From 05223cc32592e4ed92385112fb08ad771a7e3234 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Mon, 24 Sep 2012 10:15:31 +0200 Subject: [PATCH 22/47] modified: view/theme/smoothly/search_item.tpl modified: view/theme/smoothly/theme.php modified: view/theme/smoothly/wall_item.tpl modified: view/theme/smoothly/wall_thread.tpl modified: view/theme/smoothly/wallwall_item.tpl modified: view/theme/smoothly/wallwall_thread.tpl --- view/theme/smoothly/search_item.tpl | 3 ++- view/theme/smoothly/theme.php | 13 ++++++++---- view/theme/smoothly/wall_item.tpl | 20 ++++++++++++++++-- view/theme/smoothly/wall_thread.tpl | 27 +++++++++++++++++++------ view/theme/smoothly/wallwall_item.tpl | 16 ++++++++++++++- view/theme/smoothly/wallwall_thread.tpl | 27 +++++++++++++++++++------ 6 files changed, 86 insertions(+), 20 deletions(-) diff --git a/view/theme/smoothly/search_item.tpl b/view/theme/smoothly/search_item.tpl index 4b70ab98d1..8cf08df8b2 100644 --- a/view/theme/smoothly/search_item.tpl +++ b/view/theme/smoothly/search_item.tpl @@ -1,3 +1,4 @@ +
@@ -34,7 +35,7 @@
$item.name -
$item.ago
+
$item.ago
diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php index 7b39ec53a4..dbf50a9ea0 100644 --- a/view/theme/smoothly/theme.php +++ b/view/theme/smoothly/theme.php @@ -3,15 +3,19 @@ /* * Name: Smoothly * Description: Like coffee with milk. Theme works fine with iPad[2]. - * Version: Version 0.9.20-3 + * Version: Version 0.9.24-1 * Author: Alex * Maintainer: Alex * Screenshot: Screenshot */ +$a = get_app(); $a->theme_info = array(); function smoothly_init(&$a) { + $cssFile = null; + $ssl_state = null; + $baseurl = $a->get_baseurl($ssl_state); $a->page['htmlhead'] .= <<< EOT EOT; - // custom css - if (!is_null($cssFile)) { + /** custom css **/ + if (!is_null($cssFile)) { $a->page['htmlhead'] .= sprintf('', $cssFile); - } + } _js_in_foot(); @@ -109,6 +113,7 @@ if(! function_exists('_js_in_foot')) { /** @purpose insert stuff in bottom of page */ $a = get_app(); + $ssl_state = null; $baseurl = $a->get_baseurl($ssl_state); $bottom['$baseurl'] = $baseurl; $tpl = file_get_contents(dirname(__file__) . '/bottom.tpl'); diff --git a/view/theme/smoothly/wall_item.tpl b/view/theme/smoothly/wall_item.tpl index a8f4bc908c..38a097f756 100644 --- a/view/theme/smoothly/wall_item.tpl +++ b/view/theme/smoothly/wall_item.tpl @@ -39,6 +39,20 @@ $tag {{ endfor }}
+ + {{ if $item.has_cats }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name + [$remove] + {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + + {{ if $item.has_folders }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name + [$remove] + {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }}
- $item.name -
$item.ago
+ + $item.name + +
$item.ago
diff --git a/view/theme/smoothly/wall_thread.tpl b/view/theme/smoothly/wall_thread.tpl index 60b1d30dcc..0c513ec794 100644 --- a/view/theme/smoothly/wall_thread.tpl +++ b/view/theme/smoothly/wall_thread.tpl @@ -46,7 +46,8 @@ $item.name -
• $item.ago
+
•
+
$item.ago
@@ -56,11 +57,25 @@
$item.title
$item.body -
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
+
+ {{ for $item.tags as $tag }} + $tag + {{ endfor }} +
+ + {{ if $item.has_cats }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name + [$remove] + {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + + {{ if $item.has_folders }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name + [$remove] + {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }}
- -


{{ for $hiddens as $k=>$v }} diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 08c7d49ffe..9b23d1780b 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -2,9 +2,7 @@ style.css Smoothly - Created by Anne Walk and Devlon Duthie on 2011-09-24 - Modified by alex@friendica.pixelbits.de on 2012-09-20 - + Created by alex@friendica.pixelbits.de on 2012-09-24 ** Colors ** Blue links - #1873a2 @@ -14,7 +12,6 @@ Grey/body text - #626262 Grey Gradients (buttons and other gradients) - #bdbdbd and #a2a2a2 Dark Grey Gradients - #7c7d7b and #555753 Orange - #fec01d - */ body { @@ -89,7 +86,7 @@ li.widget-list { color: #1873a2; } -.fakelink { +.fakelink, .fakelink:visited, .fakelink:link { color: #1873a2; cursor: pointer; margin-bottom: 10px; @@ -97,10 +94,14 @@ li.widget-list { /*background: url("down.png") no-repeat scroll left center transparent;*/ } -.fakelink :hover { +.fakelink:hover { color: #6da6c4; } +.lockview { + cursor: pointer; +} + .heart { color: #FF0000; font-size: 100%; @@ -249,12 +250,13 @@ section { #login-password-wrapper { vertical-align: middle; - margin: auto; + margin: auto; } #login-extra-links { width: 90px; margin-top: 20px; + clear: both; } #login-extra-links a { @@ -269,6 +271,40 @@ section { display: none; } +#login_standard { + width: 210px; + float: left; +} +#login_openid { + width: 210px; + margin-left: 150px; +} + +#login_standard input, +#login_openid input { + width: 210px; +} + +#register-link, +#lost-password-link { + /*float: left;*/ + font-size: 80%; + width: 210px; + margin-left: 5px; +} + +#login-name-end, +#login-password-end, +#login-extra-end, +#login-submit-end { + height: 50px; +} + +#login-submit-button { + margin-top: 20px; + margin-left: 0px; +} + /* ========= */ /* = Panel = */ /* ========= */ @@ -352,6 +388,12 @@ nav a:hover { border: 0px; } +nav #site-location { + color: #888a85; + font-size: 0.8em; + position: absolute; +} + nav #banner { display: block; position: absolute; @@ -402,6 +444,57 @@ nav #user-menu-label { text-align: center; } +.nav-ajax-left { + font-size: 0.8em; + float: left; + margin-top: 62px; +} + +nav #nav-link-wrapper .nav-link { + border-right: 1px solid #babdb6; +} +/* menu problems +.nav-commlink, .nav-login-link { + display: block; + height: 15px; + margin-top: 67px; + margin-right: 2px; + padding: 6px 3px; + float: left; + bottom: 140px; + border: 1px solid #babdb6; + border-bottom: 0px; + background-color: #aec0d3; + color: #565854; + border-radius: 3px 3px 0px 0px; + -moz-border-radius: 3px 3px 0px 0px; +} + +.nav-commlink.selected { + background-color: #ffffff; + border-bottom: 1px solid #ffffff; + color: #000000 !important; + margin-top: 64px; + padding-top: 6px; + padding-bottom: 8px; +} +*/ +.error-message { + color: #FF0000; + font-size: 1.1em; + border: 1px solid #FF8888; + background-color: #FFEEEE; + padding: 10px; +} + +.info-message { + color: #204a87; + font-size: 1.1em; + border: 1px solid #3465a4; + background-color: #d7e3f1; + padding: 10px; +} + ul#user-menu-popup { display: none; position: absolute; @@ -626,6 +719,17 @@ aside h4 { text-shadow: 1px 1px 0px #b36f6f; } +#wallmessage-link { + display: block; + color: #FFFFFF; + -webkit-border-radius: 5px ; + -moz-border-radius: 5px; + border-radius: 5px; + padding: 5px; + font-weight: bold; + background-color: #3465a4; +} + #dfrn-request-link:hover { background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) ); background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% ); @@ -680,10 +784,25 @@ h3#search:before { margin-right: 30px; } -#sidebar-group-list > a{ +#sidebar-group-list a { padding-bottom: 10px; } +/*#sidebar-group-list ul { + list-style-type: none; +} + +#sidebar-group-list li { + margin-top: 10px; +}*/ + +#sidebar-group-list .icon, +#sidebar-group-list .iconspacer { + display: inline-block; + height: 12px; + width: 12px; +} + .widget { margin-top: 20px; box-shadow: 1px 2px 6px 0px #959494; @@ -733,7 +852,7 @@ h3#search:before { top: 1px; } -.group-selected, .nets-selected { +.group-selected, .nets-selected, .fileas-selected, .categories-selected { padding-bottom: 0px; padding-left: 2px; padding-right: 2px; @@ -752,6 +871,10 @@ h3#search:before { text-decoration: none; } +.settings-widget .selected { + font-weight: bold; +} + #sidebar-new-group a { color: #efefef; font-size: 14px; @@ -880,7 +1003,7 @@ ul .sidebar-group-li .icon { margin-top: 30px; } -#jot-title { +#jot-title, #jot-category { margin: 0px; height: 20px; width: 575px; @@ -888,23 +1011,37 @@ ul .sidebar-group-li .icon { border: 1px solid #cccccc; } -#jot-title::-webkit-input-placeholder { +#jot-perms-icon { + float: left; +} + +#jot-title::-webkit-input-placeholder, +#jot-category::-webkit-input-placeholder { font-weight: normal; } -#jot-title:-moz-placeholder { +#jot-title:-moz-placeholder, +#jot-category:-moz-placeholder { font-weight: normal; } #jot-title:hover, -#jot-title:focus { +#jot-title:focus, +#jot-category:hover, +#jot-category:focus { border: 1px solid #cccccc; } +.jothidden { display:none; } + .preview { background: #FFFFC8; } +#theme-preview { + margin: 15px 0 15px 150px; +} + #profile-jot-perms, #profile-jot-submit { width: 60px; font-size: 12px; @@ -1447,6 +1584,24 @@ profile-jot-banner-wrapper { width: 250px; } +code { + font-family: Courier, monospace; + white-space: pre; + display: block; + overflow: auto; + border: 1px solid #444; + background: #EEE; + color: #444; + padding: 10px; + margin-top: 20px; +} + +blockquote { + background-color: #F4F8F9; + border-left: 4px solid #DAE4EE; + padding: 0.4em; +} + /* ============ */ /* = Comments = */ /* ============ */ @@ -1465,6 +1620,7 @@ profile-jot-banner-wrapper { } .collapsed-comments, +.hide-comments, .hide-comments-outer, .wall-item-outside-wrapper.comment { margin-left: 30px; @@ -1678,6 +1834,11 @@ div[id$="wrapper"] br { background-color: #1873a2; } +#profile-edit-links-end { + clear: both; + margin-bottom: 15px; +} + .profile-edit-side-div { margin-top: 10px; margin-right: 0px; @@ -1943,7 +2104,7 @@ select[size], select[multiple], select[size][multiple] { -webkit-appearance: listbox; - margin: 5px 0px 10px 30px; + margin: 5px 0px 10px 0px; } select { @@ -1953,10 +2114,6 @@ select { cursor: default; } -keygen, select { - /*-webkit-border-radius: ;*/ -} - textarea, keygen { margin-top: 3px; font-size: 0.9em; @@ -2318,6 +2475,13 @@ margin-left: 0px; margin-bottom: 10px; } +.contact-wrapper { + float: left; + width: 150px; + height: 150px; + overflow: auto; +} + .view-contact-wrapper, .contact-entry-wrapper { float: left; @@ -2328,6 +2492,14 @@ margin-left: 0px; position: relative; } +#view-contact-end { + clear: both; +} + +#viewcontacts { + margin-top: 15px; +} + .contact-entry-direction-wrapper { position: absolute; top: 20px; @@ -2683,13 +2855,16 @@ margin-left: 0px; /* = Register, Settings, Profile Forms = */ /* ===================================== */ -.openid input{ +#id_openid_url, .openid input{ background: url(login-bg.gif) no-repeat; background-position: 0 50%; padding-left: 18px; width: 220px!important; } +.openid:hover { +} + #profile-tabs-wrapper { padding-top: 10px; } @@ -2808,8 +2983,9 @@ margin-left: 0px; #register-form label, #profile-edit-form label { - width: 300px; - float: left; + width: 575px; + float: right; + margin-right: 155px; } /* #register-form span, @@ -2831,17 +3007,47 @@ margin-left: 0px; margin: 20px 20px 0px 0px; } -#profile-edit-links ul { - margin: 20px 0px; - padding: 0px; - list-style: none; -} #register-sitename { display: inline; font-weight: bold; } - + +#register-submit-button { + margin-top: 10px; +} + +#label-register-name, #label-register-email, #label-register-nickname, #label-register-openid { + float: left; + width: 350px; + margin-top: 10px; +} + +#register-name, #register-email, #register-nickname { + float: left; + margin-top: 10px; + width: 150px; +} + +#register-openid { + float: left; + margin-top: 10px; + width: 130px; +} + +#register-fill-ext { + margin-bottom: 25px; +} + +#register-name-end, #register-email-end, #register-nickname-end, #register-submit-end, #register-openid-end { + clear: both; +} + +#register-nickname-desc { + margin-top: 30px; + width: 650px; +} + /* ===================== */ /* = Contacts Selector = */ /* ===================== */ @@ -3319,7 +3525,6 @@ tr { .field { /*margin-bottom: 10px; margin-top: 10px;*/ - padding-bottom: 0px; width: 90%; } @@ -3334,10 +3539,16 @@ tr { border: 1px solid #CDCDCD; border-radius: 5px 5px 5px 5px; } + .field textarea { height: 100px; } +.field password { + height: 100px; + margin-left: 150px; +} + .field_help { display: block; margin-left: 100px; @@ -3820,13 +4031,45 @@ ul.menu-popup { /* Pages profile widget ----------------------------------------------------------- */ -#page-profile div#profile-page-list{ +#page-profile +#profile-page-list { margin-left: 45px; } -hr.line-dots { - background: url("dot.png") repeat-x scroll left center transparent; - border: medium none; +#page-profile .title { + font-weight: bold; +} + +#profile-vcard-break { + clear: both; +} + +#profile-extra-links { + clear: both; + margin-top: 10px; +} + +#profile-extra-links ul { + list-style-type: none; + padding: 0px; +} + + +#profile-extra-links li { + margin-top: 5px; +} + +.profile-edit-side-div { + float: right; +} + +.profile-edit-side-link { + opacity: 0.3; + filter:alpha(opacity=30); +} +.profile-edit-side-link:hover { + opacity: 1.0; + filter:alpha(opacity=100); } /* SCROLL TO TOP @@ -3853,3 +4096,26 @@ div.wall-item-content-wrapper.shiny { background-image: url("shiny.png"); background-repeat: repeat-x; } + +/* from default */ +#jot-perms-icon, +#profile-location, +#profile-nolocation, +#profile-youtube, +#profile-video, +#profile-audio, +#profile-link, +#profile-title, +#wall-image-upload, +#wall-file-upload, +#profile-upload-wrapper, +#wall-image-upload-div, +#wall-file-upload-div, +.hover, .focus { + cursor: pointer; +} + +hr.line-dots { + background: url("dot.png") repeat-x scroll left center transparent; + border: medium none; +} diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php index dbf50a9ea0..f72d6a8add 100644 --- a/view/theme/smoothly/theme.php +++ b/view/theme/smoothly/theme.php @@ -3,7 +3,7 @@ /* * Name: Smoothly * Description: Like coffee with milk. Theme works fine with iPad[2]. - * Version: Version 0.9.24-1 + * Version: Version 0.9.24-2 * Author: Alex * Maintainer: Alex * Screenshot: Screenshot From 98064fc62714640a21f193c5f35b911bbce3b7f4 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 24 Sep 2012 20:54:20 -0700 Subject: [PATCH 25/47] rev update --- boot.php | 2 +- util/messages.po | 223 ++++++++++++++++++++++++++--------------------- 2 files changed, 124 insertions(+), 101 deletions(-) diff --git a/boot.php b/boot.php index 9690bad1bf..be7491c273 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1475' ); +define ( 'FRIENDICA_VERSION', '3.0.1476' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1156 ); diff --git a/util/messages.po b/util/messages.po index 8d30bbaf92..21a52cb0bf 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1475\n" +"Project-Id-Version: 3.0.1476\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-23 10:00-0700\n" +"POT-Creation-Date: 2012-09-24 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -170,13 +170,13 @@ msgstr "" #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:394 -#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 -#: ../../addon/posterous/posterous.php:103 +#: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:65 +#: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103 #: ../../view/theme/cleanzero/config.php:80 #: ../../view/theme/diabook/theme.php:757 #: ../../view/theme/diabook/config.php:190 #: ../../view/theme/quattro/config.php:53 ../../view/theme/dispy/config.php:70 -#: ../../include/conversation.php:609 ../../object/Item.php:555 +#: ../../include/conversation.php:609 ../../object/Item.php:559 msgid "Submit" msgstr "" @@ -231,7 +231,7 @@ msgstr "" msgid "Edit event" msgstr "" -#: ../../mod/events.php:323 ../../include/text.php:1186 +#: ../../mod/events.php:323 ../../include/text.php:1187 msgid "link to source" msgstr "" @@ -307,7 +307,7 @@ msgstr "" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:136 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 -#: ../../include/conversation.php:1303 +#: ../../include/conversation.php:1311 msgid "Cancel" msgstr "" @@ -428,7 +428,7 @@ msgstr "" #: ../../mod/photos.php:584 ../../mod/like.php:145 ../../mod/tagger.php:62 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1438 +#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1439 #: ../../include/diaspora.php:1824 ../../include/conversation.php:125 #: ../../include/conversation.php:253 msgid "photo" @@ -587,42 +587,42 @@ msgstr "" msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1358 ../../include/conversation.php:1264 +#: ../../mod/photos.php:1358 ../../include/conversation.php:1272 msgid "Share" msgstr "" #: ../../mod/photos.php:1359 ../../mod/editpost.php:112 #: ../../mod/content.php:482 ../../mod/content.php:845 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:481 ../../include/conversation.php:685 -#: ../../include/conversation.php:940 ../../include/conversation.php:1283 -#: ../../object/Item.php:253 +#: ../../mod/message.php:481 ../../include/conversation.php:688 +#: ../../include/conversation.php:948 ../../include/conversation.php:1291 +#: ../../object/Item.php:257 msgid "Please wait" msgstr "" #: ../../mod/photos.php:1375 ../../mod/photos.php:1416 #: ../../mod/photos.php:1448 ../../mod/content.php:690 -#: ../../include/conversation.php:606 ../../object/Item.php:552 +#: ../../include/conversation.php:606 ../../object/Item.php:556 msgid "This is you" msgstr "" #: ../../mod/photos.php:1377 ../../mod/photos.php:1418 #: ../../mod/photos.php:1450 ../../mod/content.php:692 #: ../../include/conversation.php:608 ../../boot.php:574 -#: ../../object/Item.php:554 +#: ../../object/Item.php:558 msgid "Comment" msgstr "" #: ../../mod/photos.php:1379 ../../mod/editpost.php:133 #: ../../mod/content.php:702 ../../include/conversation.php:618 -#: ../../include/conversation.php:1301 ../../object/Item.php:564 +#: ../../include/conversation.php:1309 ../../object/Item.php:568 msgid "Preview" msgstr "" #: ../../mod/photos.php:1479 ../../mod/content.php:439 #: ../../mod/content.php:723 ../../mod/settings.php:606 #: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:696 -#: ../../include/conversation.php:448 ../../include/conversation.php:890 +#: ../../include/conversation.php:448 ../../include/conversation.php:893 #: ../../object/Item.php:116 msgid "Delete" msgstr "" @@ -689,7 +689,7 @@ msgstr "" msgid "Edit post" msgstr "" -#: ../../mod/editpost.php:88 ../../include/conversation.php:1250 +#: ../../mod/editpost.php:88 ../../include/conversation.php:1258 msgid "Post to Email" msgstr "" @@ -701,17 +701,17 @@ msgstr "" #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/message.php:291 ../../mod/message.php:478 -#: ../../include/conversation.php:1265 +#: ../../include/conversation.php:1273 msgid "Upload photo" msgstr "" -#: ../../mod/editpost.php:105 ../../include/conversation.php:1267 +#: ../../mod/editpost.php:105 ../../include/conversation.php:1275 msgid "Attach file" msgstr "" #: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151 #: ../../mod/message.php:292 ../../mod/message.php:479 -#: ../../include/conversation.php:1269 +#: ../../include/conversation.php:1277 msgid "Insert web link" msgstr "" @@ -727,35 +727,35 @@ msgstr "" msgid "Insert Vorbis [.ogg] audio" msgstr "" -#: ../../mod/editpost.php:110 ../../include/conversation.php:1275 +#: ../../mod/editpost.php:110 ../../include/conversation.php:1283 msgid "Set your location" msgstr "" -#: ../../mod/editpost.php:111 ../../include/conversation.php:1277 +#: ../../mod/editpost.php:111 ../../include/conversation.php:1285 msgid "Clear browser location" msgstr "" -#: ../../mod/editpost.php:113 ../../include/conversation.php:1284 +#: ../../mod/editpost.php:113 ../../include/conversation.php:1292 msgid "Permission settings" msgstr "" -#: ../../mod/editpost.php:121 ../../include/conversation.php:1293 +#: ../../mod/editpost.php:121 ../../include/conversation.php:1301 msgid "CC: email addresses" msgstr "" -#: ../../mod/editpost.php:122 ../../include/conversation.php:1294 +#: ../../mod/editpost.php:122 ../../include/conversation.php:1302 msgid "Public post" msgstr "" -#: ../../mod/editpost.php:125 ../../include/conversation.php:1280 +#: ../../mod/editpost.php:125 ../../include/conversation.php:1288 msgid "Set title" msgstr "" -#: ../../mod/editpost.php:127 ../../include/conversation.php:1282 +#: ../../mod/editpost.php:127 ../../include/conversation.php:1290 msgid "Categories (comma-separated list)" msgstr "" -#: ../../mod/editpost.php:128 ../../include/conversation.php:1296 +#: ../../mod/editpost.php:128 ../../include/conversation.php:1304 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -1297,41 +1297,41 @@ msgid "Group: " msgstr "" #: ../../mod/content.php:438 ../../mod/content.php:722 -#: ../../include/conversation.php:447 ../../include/conversation.php:889 +#: ../../include/conversation.php:447 ../../include/conversation.php:892 #: ../../object/Item.php:115 msgid "Select" msgstr "" #: ../../mod/content.php:455 ../../mod/content.php:815 -#: ../../mod/content.php:816 ../../include/conversation.php:653 -#: ../../include/conversation.php:654 ../../include/conversation.php:907 -#: ../../object/Item.php:222 ../../object/Item.php:223 +#: ../../mod/content.php:816 ../../include/conversation.php:656 +#: ../../include/conversation.php:657 ../../include/conversation.php:911 +#: ../../object/Item.php:226 ../../object/Item.php:227 #, php-format msgid "View %s's profile @ %s" msgstr "" #: ../../mod/content.php:465 ../../mod/content.php:827 -#: ../../include/conversation.php:667 ../../include/conversation.php:923 -#: ../../object/Item.php:235 +#: ../../include/conversation.php:670 ../../include/conversation.php:931 +#: ../../object/Item.php:239 #, php-format msgid "%s from %s" msgstr "" -#: ../../mod/content.php:480 ../../include/conversation.php:938 +#: ../../mod/content.php:480 ../../include/conversation.php:946 msgid "View in context" msgstr "" -#: ../../mod/content.php:586 ../../include/conversation.php:694 -#: ../../object/Item.php:272 +#: ../../mod/content.php:586 ../../include/conversation.php:697 +#: ../../object/Item.php:276 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../mod/content.php:588 ../../include/text.php:1442 -#: ../../include/conversation.php:696 ../../object/Item.php:274 -#: ../../object/Item.php:287 +#: ../../mod/content.php:588 ../../include/text.php:1443 +#: ../../include/conversation.php:699 ../../object/Item.php:278 +#: ../../object/Item.php:291 msgid "comment" msgid_plural "comments" msgstr[0] "" @@ -1339,8 +1339,8 @@ msgstr[1] "" #: ../../mod/content.php:589 ../../addon/page/page.php:76 #: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119 -#: ../../include/contact_widgets.php:195 ../../include/conversation.php:697 -#: ../../boot.php:575 ../../object/Item.php:275 +#: ../../include/contact_widgets.php:195 ../../include/conversation.php:700 +#: ../../boot.php:575 ../../object/Item.php:279 msgid "show more" msgstr "" @@ -1365,42 +1365,42 @@ msgid "share" msgstr "" #: ../../mod/content.php:694 ../../include/conversation.php:610 -#: ../../object/Item.php:556 +#: ../../object/Item.php:560 msgid "Bold" msgstr "" #: ../../mod/content.php:695 ../../include/conversation.php:611 -#: ../../object/Item.php:557 +#: ../../object/Item.php:561 msgid "Italic" msgstr "" #: ../../mod/content.php:696 ../../include/conversation.php:612 -#: ../../object/Item.php:558 +#: ../../object/Item.php:562 msgid "Underline" msgstr "" #: ../../mod/content.php:697 ../../include/conversation.php:613 -#: ../../object/Item.php:559 +#: ../../object/Item.php:563 msgid "Quote" msgstr "" #: ../../mod/content.php:698 ../../include/conversation.php:614 -#: ../../object/Item.php:560 +#: ../../object/Item.php:564 msgid "Code" msgstr "" #: ../../mod/content.php:699 ../../include/conversation.php:615 -#: ../../object/Item.php:561 +#: ../../object/Item.php:565 msgid "Image" msgstr "" #: ../../mod/content.php:700 ../../include/conversation.php:616 -#: ../../object/Item.php:562 +#: ../../object/Item.php:566 msgid "Link" msgstr "" #: ../../mod/content.php:701 ../../include/conversation.php:617 -#: ../../object/Item.php:563 +#: ../../object/Item.php:567 msgid "Video" msgstr "" @@ -1434,18 +1434,18 @@ msgstr "" msgid "save to folder" msgstr "" -#: ../../mod/content.php:817 ../../include/conversation.php:655 -#: ../../object/Item.php:224 +#: ../../mod/content.php:817 ../../include/conversation.php:658 +#: ../../object/Item.php:228 msgid "to" msgstr "" -#: ../../mod/content.php:818 ../../include/conversation.php:656 -#: ../../object/Item.php:225 +#: ../../mod/content.php:818 ../../include/conversation.php:659 +#: ../../object/Item.php:229 msgid "Wall-to-Wall" msgstr "" -#: ../../mod/content.php:819 ../../include/conversation.php:657 -#: ../../object/Item.php:226 +#: ../../mod/content.php:819 ../../include/conversation.php:660 +#: ../../object/Item.php:230 msgid "via Wall-To-Wall:" msgstr "" @@ -2695,7 +2695,7 @@ msgstr "" #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:1201 ../../include/conversation.php:1218 +#: ../../include/conversation.php:1209 ../../include/conversation.php:1226 msgid "Please enter a link URL:" msgstr "" @@ -4420,8 +4420,8 @@ msgstr "" msgid "Edit visibility" msgstr "" -#: ../../mod/filer.php:29 ../../include/conversation.php:1205 -#: ../../include/conversation.php:1222 +#: ../../mod/filer.php:29 ../../include/conversation.php:1213 +#: ../../include/conversation.php:1230 msgid "Save to Folder:" msgstr "" @@ -5353,7 +5353,7 @@ msgid "Latest likes" msgstr "" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1436 +#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1437 #: ../../include/conversation.php:117 ../../include/conversation.php:245 msgid "event" msgstr "" @@ -6951,6 +6951,19 @@ msgstr "" msgid "Popular Channels" msgstr "" +#: ../../addon/fromapp/fromapp.php:36 +msgid "Fromapp settings updated." +msgstr "" + +#: ../../addon/fromapp/fromapp.php:57 +msgid "FromApp Settings" +msgstr "" + +#: ../../addon/fromapp/fromapp.php:59 +msgid "" +"The application name you would like to show your posts originating from." +msgstr "" + #: ../../addon/blogger/blogger.php:42 msgid "Post to blogger" msgstr "" @@ -7816,23 +7829,23 @@ msgstr "" msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1218 ../../include/user.php:236 +#: ../../include/text.php:1219 ../../include/user.php:236 msgid "default" msgstr "" -#: ../../include/text.php:1230 +#: ../../include/text.php:1231 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1440 +#: ../../include/text.php:1441 msgid "activity" msgstr "" -#: ../../include/text.php:1443 +#: ../../include/text.php:1444 msgid "post" msgstr "" -#: ../../include/text.php:1598 +#: ../../include/text.php:1599 msgid "Item filed" msgstr "" @@ -8506,34 +8519,34 @@ msgstr "" msgid "stopped following" msgstr "" -#: ../../include/Contact.php:220 ../../include/conversation.php:1102 +#: ../../include/Contact.php:220 ../../include/conversation.php:1110 msgid "Poke" msgstr "" -#: ../../include/Contact.php:221 ../../include/conversation.php:1096 +#: ../../include/Contact.php:221 ../../include/conversation.php:1104 msgid "View Status" msgstr "" -#: ../../include/Contact.php:222 ../../include/conversation.php:1097 +#: ../../include/Contact.php:222 ../../include/conversation.php:1105 msgid "View Profile" msgstr "" -#: ../../include/Contact.php:223 ../../include/conversation.php:1098 +#: ../../include/Contact.php:223 ../../include/conversation.php:1106 msgid "View Photos" msgstr "" #: ../../include/Contact.php:224 ../../include/Contact.php:237 -#: ../../include/conversation.php:1099 +#: ../../include/conversation.php:1107 msgid "Network Posts" msgstr "" #: ../../include/Contact.php:225 ../../include/Contact.php:237 -#: ../../include/conversation.php:1100 +#: ../../include/conversation.php:1108 msgid "Edit Contact" msgstr "" #: ../../include/Contact.php:226 ../../include/Contact.php:237 -#: ../../include/conversation.php:1101 +#: ../../include/conversation.php:1109 msgid "Send PM" msgstr "" @@ -8551,122 +8564,132 @@ msgstr "" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: ../../include/conversation.php:998 +#: ../../include/conversation.php:647 ../../include/conversation.php:923 +#: ../../object/Item.php:217 +msgid "Categories:" +msgstr "" + +#: ../../include/conversation.php:648 ../../include/conversation.php:924 +#: ../../object/Item.php:218 +msgid "Filed under:" +msgstr "" + +#: ../../include/conversation.php:1006 msgid "remove" msgstr "" -#: ../../include/conversation.php:1002 +#: ../../include/conversation.php:1010 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:1160 +#: ../../include/conversation.php:1168 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1160 +#: ../../include/conversation.php:1168 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1164 +#: ../../include/conversation.php:1172 #, php-format msgid "%2$d people like this." msgstr "" -#: ../../include/conversation.php:1166 +#: ../../include/conversation.php:1174 #, php-format msgid "%2$d people don't like this." msgstr "" -#: ../../include/conversation.php:1172 +#: ../../include/conversation.php:1180 msgid "and" msgstr "" -#: ../../include/conversation.php:1175 +#: ../../include/conversation.php:1183 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:1176 +#: ../../include/conversation.php:1184 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1176 +#: ../../include/conversation.php:1184 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1200 ../../include/conversation.php:1217 +#: ../../include/conversation.php:1208 ../../include/conversation.php:1225 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:1202 ../../include/conversation.php:1219 +#: ../../include/conversation.php:1210 ../../include/conversation.php:1227 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:1203 ../../include/conversation.php:1220 +#: ../../include/conversation.php:1211 ../../include/conversation.php:1228 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:1204 ../../include/conversation.php:1221 +#: ../../include/conversation.php:1212 ../../include/conversation.php:1229 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1206 ../../include/conversation.php:1223 +#: ../../include/conversation.php:1214 ../../include/conversation.php:1231 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1266 +#: ../../include/conversation.php:1274 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1268 +#: ../../include/conversation.php:1276 msgid "attach file" msgstr "" -#: ../../include/conversation.php:1270 +#: ../../include/conversation.php:1278 msgid "web link" msgstr "" -#: ../../include/conversation.php:1271 +#: ../../include/conversation.php:1279 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:1272 +#: ../../include/conversation.php:1280 msgid "video link" msgstr "" -#: ../../include/conversation.php:1273 +#: ../../include/conversation.php:1281 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:1274 +#: ../../include/conversation.php:1282 msgid "audio link" msgstr "" -#: ../../include/conversation.php:1276 +#: ../../include/conversation.php:1284 msgid "set location" msgstr "" -#: ../../include/conversation.php:1278 +#: ../../include/conversation.php:1286 msgid "clear location" msgstr "" -#: ../../include/conversation.php:1285 +#: ../../include/conversation.php:1293 msgid "permissions" msgstr "" -#: ../../include/plugin.php:400 ../../include/plugin.php:402 +#: ../../include/plugin.php:389 ../../include/plugin.php:391 msgid "Click here to upgrade." msgstr "" -#: ../../include/plugin.php:408 +#: ../../include/plugin.php:397 msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: ../../include/plugin.php:413 +#: ../../include/plugin.php:402 msgid "This action is not available under your subscription plan." msgstr "" From a798ef1a5677b0669ce9262bcc868769e985df00 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 24 Sep 2012 21:43:03 -0700 Subject: [PATCH 26/47] one template to rule them all --- view/wall_thread.tpl | 51 ++++++++++++++++++++-------------------- view/wallwall_thread.tpl | 10 ++++---- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/view/wall_thread.tpl b/view/wall_thread.tpl index 86a937fef5..ef7236bafa 100644 --- a/view/wall_thread.tpl +++ b/view/wall_thread.tpl @@ -6,38 +6,40 @@ {{endif}}
-{{ if $item.threaded }} -
-{{ else }} -
-{{ endif }} +
-
-
+
+ {{ if $item.owner_url }} +
+ + $item.owner_name +
+
$item.wall
+ {{ endif }} +
- $item.name - + $item.name menu -
-
    - $item.item_photo_menu -
-
+
+
    + $item.item_photo_menu +
+
+
{{ if $item.lock }}
$item.lock
{{ else }}
{{ endif }} -
$item.location
+
$item.location
- $item.name -
$item.ago
- -
+ $item.name{{ if $item.owner_url }} $item.to $item.owner_name $item.vwall{{ endif }}
+
$item.ago
+
$item.title
@@ -80,14 +82,15 @@ {{ endif }} {{ if $item.filer }} - {{ endif }} + {{ endif }} +
{{ if $item.drop.dropping }}{{ endif }}
{{ if $item.drop.dropping }}{{ endif }}
-
+
$item.dislike
@@ -106,12 +109,10 @@ {{ inc $item.template }}{{ endinc }} {{ endfor }} -{{ if $item.comment }} {{ if $item.flatten }}
$item.comment
{{ endif }} -{{ endif }}
{{if $item.comment_lastcollapsed}}
{{endif}} diff --git a/view/wallwall_thread.tpl b/view/wallwall_thread.tpl index 211f951328..ef7236bafa 100644 --- a/view/wallwall_thread.tpl +++ b/view/wallwall_thread.tpl @@ -6,15 +6,17 @@ {{endif}}
-
+
-
+
+ {{ if $item.owner_url }}
$item.wall
-
- $item.name $item.to $item.owner_name $item.vwall
+ $item.name{{ if $item.owner_url }} $item.to $item.owner_name $item.vwall{{ endif }}
$item.ago
From 245d9f0aca069e84066a20b0a2a545c67f48ac11 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 25 Sep 2012 01:31:48 -0700 Subject: [PATCH 27/47] one template to rule them all --- include/conversation.php | 8 +- object/Item.php | 2 - view/theme/comix-plain/wall_item.tpl | 78 ---------- view/theme/comix-plain/wallwall_item.tpl | 85 ----------- view/theme/comix/wall_item.tpl | 78 ---------- view/theme/comix/wallwall_item.tpl | 85 ----------- view/theme/diabook/wall_item.tpl | 109 -------------- view/theme/diabook/wall_thread.tpl | 1 - view/theme/diabook/wallwall_item.tpl | 115 --------------- view/theme/diabook/wallwall_thread.tpl | 134 ----------------- view/theme/dispy/wall_item.tpl | 98 ------------- view/theme/dispy/wall_thread.tpl | 65 ++++---- view/theme/dispy/wallwall_item.tpl | 108 -------------- view/theme/dispy/wallwall_thread.tpl | 131 ----------------- view/theme/facepark/wall_item.tpl | 77 ---------- view/theme/facepark/wallwall_item.tpl | 82 ----------- view/theme/frost-mobile/wall_item.tpl | 82 ----------- view/theme/frost-mobile/wall_thread.tpl | 55 +++---- view/theme/frost-mobile/wallwall_item.tpl | 87 ----------- view/theme/frost-mobile/wallwall_thread.tpl | 109 -------------- view/theme/frost/wall_item.tpl | 79 ---------- view/theme/frost/wall_thread.tpl | 56 +++---- view/theme/frost/wallwall_item.tpl | 86 ----------- view/theme/frost/wallwall_thread.tpl | 108 -------------- view/theme/quattro/wall_item.tpl | 94 ------------ view/theme/quattro/wall_thread.tpl | 31 ++-- view/theme/quattro/wallwall_item.tpl | 96 ------------ view/theme/quattro/wallwall_thread.tpl | 155 -------------------- view/theme/smoothly/wall_item.tpl | 114 -------------- view/theme/smoothly/wall_thread.tpl | 71 +++++---- view/theme/smoothly/wallwall_item.tpl | 121 --------------- view/theme/smoothly/wallwall_thread.tpl | 145 ------------------ view/theme/testbubble/wall_item.tpl | 78 ---------- view/theme/testbubble/wall_thread.tpl | 41 +++--- view/theme/testbubble/wallwall_item.tpl | 81 ---------- view/theme/testbubble/wallwall_thread.tpl | 103 ------------- view/theme/vier/wall_item.tpl | 92 ------------ view/theme/vier/wall_thread.tpl | 25 +++- view/theme/vier/wallwall_item.tpl | 99 ------------- view/theme/vier/wallwall_thread.tpl | 151 ------------------- view/wall_item.tpl | 88 ----------- view/wall_thread.tpl | 2 +- view/wallwall_item.tpl | 95 ------------ view/wallwall_thread.tpl | 118 --------------- 44 files changed, 195 insertions(+), 3523 deletions(-) delete mode 100644 view/theme/comix-plain/wall_item.tpl delete mode 100644 view/theme/comix-plain/wallwall_item.tpl delete mode 100644 view/theme/comix/wall_item.tpl delete mode 100644 view/theme/comix/wallwall_item.tpl delete mode 100644 view/theme/diabook/wall_item.tpl delete mode 100644 view/theme/diabook/wallwall_item.tpl delete mode 100644 view/theme/diabook/wallwall_thread.tpl delete mode 100644 view/theme/dispy/wall_item.tpl delete mode 100644 view/theme/dispy/wallwall_item.tpl delete mode 100644 view/theme/dispy/wallwall_thread.tpl delete mode 100644 view/theme/facepark/wall_item.tpl delete mode 100644 view/theme/facepark/wallwall_item.tpl delete mode 100644 view/theme/frost-mobile/wall_item.tpl delete mode 100644 view/theme/frost-mobile/wallwall_item.tpl delete mode 100644 view/theme/frost-mobile/wallwall_thread.tpl delete mode 100644 view/theme/frost/wall_item.tpl delete mode 100644 view/theme/frost/wallwall_item.tpl delete mode 100644 view/theme/frost/wallwall_thread.tpl delete mode 100644 view/theme/quattro/wall_item.tpl delete mode 100644 view/theme/quattro/wallwall_item.tpl delete mode 100644 view/theme/quattro/wallwall_thread.tpl delete mode 100644 view/theme/smoothly/wall_item.tpl delete mode 100644 view/theme/smoothly/wallwall_item.tpl delete mode 100644 view/theme/smoothly/wallwall_thread.tpl delete mode 100644 view/theme/testbubble/wall_item.tpl delete mode 100644 view/theme/testbubble/wallwall_item.tpl delete mode 100644 view/theme/testbubble/wallwall_thread.tpl delete mode 100644 view/theme/vier/wall_item.tpl delete mode 100644 view/theme/vier/wallwall_item.tpl delete mode 100644 view/theme/vier/wallwall_thread.tpl delete mode 100644 view/wall_item.tpl delete mode 100644 view/wallwall_item.tpl delete mode 100644 view/wallwall_thread.tpl diff --git a/include/conversation.php b/include/conversation.php index 1bdde5e9ff..4026923d85 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -359,7 +359,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr $result = array(); $wall_template = 'wall_thread.tpl'; - $wallwall_template = 'wallwall_thread.tpl'; +// $wallwall_template = 'wallwall_thread.tpl'; $items_seen = 0; $nb_items = count($items); @@ -504,7 +504,6 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr $owner_url = zrl($a->page_contact['url']); $owner_photo = $a->page_contact['thumb']; $owner_name = $a->page_contact['name']; - $template = $wallwall_template; $commentww = 'ww'; } else if($item['owner-link']) { @@ -527,7 +526,6 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr $owner_url = $item['owner-link']; $owner_photo = $item['owner-avatar']; $owner_name = $item['owner-name']; - $template = $wallwall_template; $commentww = 'ww'; // If it is our contact, use a friendly redirect link if((link_compare($item['owner-link'],$item['url'])) @@ -793,8 +791,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $items = $cb['items']; $cmnt_tpl = get_markup_template('comment_item.tpl'); - $tpl = 'wall_item.tpl'; - $wallwall = 'wallwall_item.tpl'; $hide_comments_tpl = get_markup_template('hide_comments.tpl'); $alike = array(); @@ -814,7 +810,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { // "New Item View" on network page or search page results // - just loop through the items and format them minimally for display - //$tpl = get_markup_template('search_item.tpl'); +// $tpl = get_markup_template('search_item.tpl'); $tpl = 'search_item.tpl'; foreach($items as $item) { diff --git a/object/Item.php b/object/Item.php index ed439e4d29..e039968bd7 100644 --- a/object/Item.php +++ b/object/Item.php @@ -598,7 +598,6 @@ class Item extends BaseObject { $this->owner_url = zrl($a->page_contact['url']); $this->owner_photo = $a->page_contact['thumb']; $this->owner_name = $a->page_contact['name']; - $this->set_template('wall2wall'); $this->wall_to_wall = true; } else if($this->get_data_value('owner-link')) { @@ -620,7 +619,6 @@ class Item extends BaseObject { $this->owner_photo = $this->get_data_value('owner-avatar'); $this->owner_name = $this->get_data_value('owner-name'); - $this->set_template('wall2wall'); $this->wall_to_wall = true; // If it is our contact, use a friendly redirect link if((link_compare($this->get_data_value('owner-link'),$this->get_data_value('url'))) diff --git a/view/theme/comix-plain/wall_item.tpl b/view/theme/comix-plain/wall_item.tpl deleted file mode 100644 index 0ef70cf8b9..0000000000 --- a/view/theme/comix-plain/wall_item.tpl +++ /dev/null @@ -1,78 +0,0 @@ -
-
-
-
- - $item.name - - menu -
-
    - $item.item_photo_menu -
-
-
-
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
$item.location
-
-
-
- $item.name -
$item.ago
- -
-
-
$item.title
-
-
$item.body -
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- {{ if $item.vote }} - - {{ endif }} - {{ if $item.plink }} -
- {{ endif }} - {{ if $item.edpost }} - - {{ endif }} - - {{ if $item.star }} - - - {{ endif }} - {{ if $item.filer }} - - {{ endif }} -
- {{ if $item.drop.dropping }}{{ endif }} -
- {{ if $item.drop.dropping }}{{ endif }} -
-
-
-
- -
$item.dislike
-
- $item.comment -
- -
-
diff --git a/view/theme/comix-plain/wallwall_item.tpl b/view/theme/comix-plain/wallwall_item.tpl deleted file mode 100644 index 4c5b120873..0000000000 --- a/view/theme/comix-plain/wallwall_item.tpl +++ /dev/null @@ -1,85 +0,0 @@ -
-
-
-
- - $item.owner_name -
-
$item.wall
-
- - $item.name - menu -
-
    - $item.item_photo_menu -
-
- -
-
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
$item.location
-
-
-
- $item.name $item.to $item.owner_name $item.vwall
-
$item.ago
-
-
-
$item.title
-
-
$item.body -
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- {{ if $item.vote }} - - {{ endif }} - {{ if $item.plink }} -
- {{ endif }} - {{ if $item.edpost }} - - {{ endif }} - - {{ if $item.star }} - - - {{ endif }} - {{ if $item.filer }} - - {{ endif }} - -
- {{ if $item.drop.dropping }}{{ endif }} -
- {{ if $item.drop.dropping }}{{ endif }} -
-
-
-
- -
$item.dislike
-
-
- $item.comment -
- -
-
- diff --git a/view/theme/comix/wall_item.tpl b/view/theme/comix/wall_item.tpl deleted file mode 100644 index 0ef70cf8b9..0000000000 --- a/view/theme/comix/wall_item.tpl +++ /dev/null @@ -1,78 +0,0 @@ -
-
-
-
- - $item.name - - menu -
-
    - $item.item_photo_menu -
-
-
-
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
$item.location
-
-
-
- $item.name -
$item.ago
- -
-
-
$item.title
-
-
$item.body -
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- {{ if $item.vote }} - - {{ endif }} - {{ if $item.plink }} -
- {{ endif }} - {{ if $item.edpost }} - - {{ endif }} - - {{ if $item.star }} - - - {{ endif }} - {{ if $item.filer }} - - {{ endif }} -
- {{ if $item.drop.dropping }}{{ endif }} -
- {{ if $item.drop.dropping }}{{ endif }} -
-
-
-
- -
$item.dislike
-
- $item.comment -
- -
-
diff --git a/view/theme/comix/wallwall_item.tpl b/view/theme/comix/wallwall_item.tpl deleted file mode 100644 index 4c5b120873..0000000000 --- a/view/theme/comix/wallwall_item.tpl +++ /dev/null @@ -1,85 +0,0 @@ -
-
-
-
- - $item.owner_name -
-
$item.wall
-
- - $item.name - menu -
-
    - $item.item_photo_menu -
-
- -
-
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
$item.location
-
-
-
- $item.name $item.to $item.owner_name $item.vwall
-
$item.ago
-
-
-
$item.title
-
-
$item.body -
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- {{ if $item.vote }} - - {{ endif }} - {{ if $item.plink }} -
- {{ endif }} - {{ if $item.edpost }} - - {{ endif }} - - {{ if $item.star }} - - - {{ endif }} - {{ if $item.filer }} - - {{ endif }} - -
- {{ if $item.drop.dropping }}{{ endif }} -
- {{ if $item.drop.dropping }}{{ endif }} -
-
-
-
- -
$item.dislike
-
-
- $item.comment -
- -
-
- diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl deleted file mode 100644 index 8acc91193d..0000000000 --- a/view/theme/diabook/wall_item.tpl +++ /dev/null @@ -1,109 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.name - - menu - - -
-
-
- $item.name - - - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body - {{ if $item.has_cats }} -
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} - - {{ if $item.has_folders }} -
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/wall_thread.tpl b/view/theme/diabook/wall_thread.tpl index cea2705976..4846841761 100644 --- a/view/theme/diabook/wall_thread.tpl +++ b/view/theme/diabook/wall_thread.tpl @@ -36,7 +36,6 @@
{{ if $item.title }}

$item.title

{{ endif }} $item.body - {{ if $item.has_cats }}
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl deleted file mode 100644 index 0a183f0766..0000000000 --- a/view/theme/diabook/wallwall_item.tpl +++ /dev/null @@ -1,115 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.owner_name - -
-
- - $item.name - - menu - - -
-
-
- $item.name - $item.to $item.owner_name - $item.vwall -   - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body - {{ if $item.has_cats }} -
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} - - {{ if $item.has_folders }} -
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
\ No newline at end of file diff --git a/view/theme/diabook/wallwall_thread.tpl b/view/theme/diabook/wallwall_thread.tpl deleted file mode 100644 index 4846841761..0000000000 --- a/view/theme/diabook/wallwall_thread.tpl +++ /dev/null @@ -1,134 +0,0 @@ -{{if $item.comment_firstcollapsed}} -
- $item.num_comments $item.hide_text -
- {{endif}} diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl deleted file mode 100644 index 0b869e144f..0000000000 --- a/view/theme/dispy/wall_item.tpl +++ /dev/null @@ -1,98 +0,0 @@ - -
-
-
-
- $item.name - menu -
-
    - $item.item_photo_menu -
-
-
-
-
- {{ if $item.location }}$item.location {{ endif }} -
-
- $item.name -
-
- $item.ago -
-
-
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
-
    - {{ if $item.star }} -
  • - - -
    • - {{ endif }} - {{ if $item.vote }} - - {{ endif }} -

-
    - {{ if $item.filer }} -
    • - {{ endif }} - {{ if $item.plink }} -
    • - {{ endif }} - {{ if $item.edpost }} -
    • - {{ endif }} -
  • - {{ if $item.drop.dropping }}
    {{ endif }} - {{ if $item.drop.dropping }}
    {{ endif }} -
    • -
-
-
-
-
$item.title
-
-
- $item.body -
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} - {{ if $item.has_cats }} -
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} - - {{ if $item.has_folders }} -
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} - -
-
-
-
-
- -
$item.dislike
-
- $item.comment -
- -
-
diff --git a/view/theme/dispy/wall_thread.tpl b/view/theme/dispy/wall_thread.tpl index 19b32bfaa1..3f06e539b6 100644 --- a/view/theme/dispy/wall_thread.tpl +++ b/view/theme/dispy/wall_thread.tpl @@ -6,21 +6,28 @@ {{endif}}
-
+
-
-
+
+ {{ if $item.owner_url }} +
+ + $item.owner_name +
+
$item.wall
+ {{ endif }} +
- $item.name - + $item.name menu -
-
    - $item.item_photo_menu -
-
+
+
    + $item.item_photo_menu +
+
+
@@ -50,26 +57,27 @@ {{ if $item.vote.share }} - {{ endif }} + {{ endif }} {{ endif }}
    - {{ if $item.filer }} -
    • - {{ endif }} - {{ if $item.plink }} + {{ if $item.filer }} +
    • + {{ endif }} + {{ if $item.plink }}
    • - {{ endif }} - {{ if $item.edpost }} + {{ endif }} + {{ if $item.edpost }}
    • - {{ endif }} -
  • - {{ if $item.drop.dropping }}
    {{ endif }} - {{ if $item.drop.dropping }}
    {{ endif }} -
    • + {{ endif }} + +
  • + {{ if $item.drop.dropping }}{{ endif }} + {{ if $item.drop.dropping }}{{ endif }} +
@@ -80,9 +88,9 @@ $item.body
{{ for $item.tags as $tag }} - $tag + $tag {{ endfor }} -
+
{{ if $item.has_cats }}
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
@@ -93,10 +101,9 @@
{{ endif }} -
-
+
$item.dislike
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl deleted file mode 100644 index edfbdf27e0..0000000000 --- a/view/theme/dispy/wallwall_item.tpl +++ /dev/null @@ -1,108 +0,0 @@ - -
-
-
-
- - $item.owner_name -
-
$item.wall
-
- - $item.name - menu -
-
    - $item.item_photo_menu -
-
- -
-
-
- {{ if $item.location }}$item.location {{ endif }} -
-
- $item.name -
-
- $item.ago -
-
-
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
-
    - {{ if $item.star }} -
  • - - -
    • - {{ endif }} - {{ if $item.vote }} - - {{ endif }} -

-
    - {{ if $item.filer }} -
    • - {{ endif }} - {{ if $item.plink }} -
    • - {{ endif }} - {{ if $item.edpost }} -
    • - {{ endif }} - -
  • - {{ if $item.drop.dropping }}{{ endif }} - {{ if $item.drop.dropping }}{{ endif }} -
    • -
-
-
-
-
$item.title
-
-
- $item.body -
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
- {{ if $item.has_cats }} -
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} - - {{ if $item.has_folders }} -
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} - -
-
-
-
- -
$item.dislike
-
-
- $item.comment -
- -
-
- diff --git a/view/theme/dispy/wallwall_thread.tpl b/view/theme/dispy/wallwall_thread.tpl deleted file mode 100644 index b150e1fd02..0000000000 --- a/view/theme/dispy/wallwall_thread.tpl +++ /dev/null @@ -1,131 +0,0 @@ -{{if $item.comment_firstcollapsed}} -
- $item.num_comments $item.hide_text -
- {{endif}} diff --git a/view/theme/facepark/wall_item.tpl b/view/theme/facepark/wall_item.tpl deleted file mode 100644 index dda4bc4a90..0000000000 --- a/view/theme/facepark/wall_item.tpl +++ /dev/null @@ -1,77 +0,0 @@ -
-
-
-
- - $item.name - - menu -
-
    - $item.item_photo_menu -
-
-
-
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
$item.location
-
-
-
- $item.name -
$item.ago
- -
-
-
$item.title
-
-
$item.body -
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- {{ if $item.vote }} - - {{ endif }} - {{ if $item.plink }} -
- {{ endif }} - {{ if $item.edpost }} - - {{ endif }} - - {{ if $item.star }} - - - - {{ endif }} - -
- {{ if $item.drop.dropping }}{{ endif }} -
- {{ if $item.drop.dropping }}{{ endif }} -
-
-
-
- -
$item.dislike
-
- $item.comment -
- -
-
diff --git a/view/theme/facepark/wallwall_item.tpl b/view/theme/facepark/wallwall_item.tpl deleted file mode 100644 index ba6131857f..0000000000 --- a/view/theme/facepark/wallwall_item.tpl +++ /dev/null @@ -1,82 +0,0 @@ -
-
-
-
- - $item.owner_name -
-
$item.wall
-
- - $item.name - menu -
-
    - $item.item_photo_menu -
-
- -
-
-
- {{ if $item.lock }}
$item.lock
- {{ else }}
{{ endif }} -
$item.location
-
-
-
- $item.name $item.to $item.owner_name $item.vwall
-
$item.ago
-
-
-
$item.title
-
-
$item.body -
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- {{ if $item.vote }} - - {{ endif }} - {{ if $item.plink }} -
- {{ endif }} - {{ if $item.edpost }} - - {{ endif }} - - {{ if $item.star }} - - - {{ endif }} - -
- {{ if $item.drop.dropping }}{{ endif }} -
- {{ if $item.drop.dropping }}{{ endif }} -
-
-
-
- -
$item.dislike
-
-
- $item.comment -
- -
-
- diff --git a/view/theme/frost-mobile/wall_item.tpl b/view/theme/frost-mobile/wall_item.tpl deleted file mode 100644 index f75059d9c7..0000000000 --- a/view/theme/frost-mobile/wall_item.tpl +++ /dev/null @@ -1,82 +0,0 @@ - - -
-
- -
- - $item.name - - -
- -
- {{ if $item.lock }}$item.lock - {{ else }}
{{ endif }} -
$item.location
-
-
- - $item.name -
$item.ago
- - -
- -
-
$item.title
- -
$item.body - - {{ for $item.tags as $tag }} - $tag - {{ endfor }} - -
-
-
- {{ if $item.vote }} - - {{ endif }} - {{ if $item.plink }} - - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} - - {{ if $item.star }} - - - {{ endif }} - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.drop.dropping }}{{ endif }} - - {{ if $item.drop.dropping }}{{ endif }} - -
-
- - -
$item.dislike
- - $item.comment - - - - diff --git a/view/theme/frost-mobile/wall_thread.tpl b/view/theme/frost-mobile/wall_thread.tpl index d6fb677c5f..3af6aaa111 100644 --- a/view/theme/frost-mobile/wall_thread.tpl +++ b/view/theme/frost-mobile/wall_thread.tpl @@ -6,46 +6,48 @@ {{endif}}
- +
-
- -
+
+
+ + $item.owner_name +
+
$item.wall
+ +
- $item.name - + $item.name +
+
    + $item.item_photo_menu +
+
--> +
{{ if $item.lock }}$item.lock {{ else }}
{{ endif }} -
$item.location
+
$item.location
- $item.name -
$item.ago
- + $item.name $item.to $item.owner_name $item.vwall
+
$item.ago
-
-
$item.title
$item.body - + {{ for $item.tags as $tag }} $tag {{ endfor }} - +
@@ -58,7 +60,7 @@
{{ endif }} {{ if $item.plink }} - + {{ endif }} {{ if $item.edpost }} @@ -70,14 +72,15 @@ {{ endif }} {{ if $item.filer }} - {{ endif }} - + {{ endif }} + + {{ if $item.drop.dropping }}{{ endif }} - + {{ if $item.drop.dropping }}{{ endif }}
-
+
$item.dislike
diff --git a/view/theme/frost-mobile/wallwall_item.tpl b/view/theme/frost-mobile/wallwall_item.tpl deleted file mode 100644 index 9affbcebae..0000000000 --- a/view/theme/frost-mobile/wallwall_item.tpl +++ /dev/null @@ -1,87 +0,0 @@ - - -
-
-
- - $item.owner_name -
-
$item.wall
- -
- - $item.name - - -
- -
- {{ if $item.lock }}$item.lock - {{ else }}
{{ endif }} -
$item.location
-
-
- - $item.name $item.to $item.owner_name $item.vwall
-
$item.ago
- -
-
$item.title
- -
$item.body - - {{ for $item.tags as $tag }} - $tag - {{ endfor }} - -
-
-
- {{ if $item.vote }} - - {{ endif }} - {{ if $item.plink }} - - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} - - {{ if $item.star }} - - - {{ endif }} - {{ if $item.filer }} - - {{ endif }} - - - {{ if $item.drop.dropping }}{{ endif }} - - {{ if $item.drop.dropping }}{{ endif }} - -
-
- - -
$item.dislike
-
- - $item.comment - - - - - diff --git a/view/theme/frost-mobile/wallwall_thread.tpl b/view/theme/frost-mobile/wallwall_thread.tpl deleted file mode 100644 index 3af6aaa111..0000000000 --- a/view/theme/frost-mobile/wallwall_thread.tpl +++ /dev/null @@ -1,109 +0,0 @@ -{{if $item.comment_firstcollapsed}} -
- $item.num_comments $item.hide_text -
- {{endif}} - diff --git a/view/theme/frost/wall_item.tpl b/view/theme/frost/wall_item.tpl deleted file mode 100644 index e2cb60dbe0..0000000000 --- a/view/theme/frost/wall_item.tpl +++ /dev/null @@ -1,79 +0,0 @@ - - -
-
-
- - $item.name - - menu - -
    - $item.item_photo_menu -
- -
- -
- {{ if $item.lock }}$item.lock - {{ else }}
{{ endif }} -
$item.location
-
-
- - $item.name -
$item.ago
- - -
-
$item.title
- -
$item.body - - {{ for $item.tags as $tag }} - $tag - {{ endfor }} - -
-
-
- {{ if $item.vote }} - - {{ endif }} - {{ if $item.plink }} - - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} - - {{ if $item.star }} - - - {{ endif }} - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.drop.dropping }}{{ endif }} - - {{ if $item.drop.dropping }}{{ endif }} - -
-
- - -
$item.dislike
- - $item.comment - - - - diff --git a/view/theme/frost/wall_thread.tpl b/view/theme/frost/wall_thread.tpl index 008ec89dbf..a60c926fa1 100644 --- a/view/theme/frost/wall_thread.tpl +++ b/view/theme/frost/wall_thread.tpl @@ -6,46 +6,51 @@ {{endif}}
- -
-
-
+ +
+
+ {{ if $item.owner_url }} +
+ + $item.owner_name +
+
$item.wall
+ {{ endif }} +
- $item.name - + $item.name menu - -
    - $item.item_photo_menu -
- + +
    + $item.item_photo_menu +
+ +
{{ if $item.lock }}$item.lock {{ else }}
{{ endif }} -
$item.location
+
$item.location
- $item.name -
$item.ago
- + $item.name{{ if $item.owner_url }} $item.to $item.owner_name $item.vwall{{ endif }}
+
$item.ago
$item.title
$item.body - + {{ for $item.tags as $tag }} $tag {{ endfor }} - +
-
{{ if $item.vote }} -
+
$item.dislike
@@ -102,3 +107,4 @@ {{ endif }}
{{if $item.comment_lastcollapsed}}
{{endif}} + diff --git a/view/theme/frost/wallwall_item.tpl b/view/theme/frost/wallwall_item.tpl deleted file mode 100644 index 6d7a3ec323..0000000000 --- a/view/theme/frost/wallwall_item.tpl +++ /dev/null @@ -1,86 +0,0 @@ - - -
-
-
- - $item.owner_name -
-
$item.wall
-
- - $item.name - menu - -
    - $item.item_photo_menu -
- - -
- -
- {{ if $item.lock }}$item.lock - {{ else }}
{{ endif }} -
$item.location
-
-
- - $item.name $item.to $item.owner_name $item.vwall
-
$item.ago
- -
-
$item.title
- -
$item.body - - {{ for $item.tags as $tag }} - $tag - {{ endfor }} - -
-
-
- {{ if $item.vote }} - - {{ endif }} - {{ if $item.plink }} - - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} - - {{ if $item.star }} - - - {{ endif }} - {{ if $item.filer }} - - {{ endif }} - - - {{ if $item.drop.dropping }}{{ endif }} - - {{ if $item.drop.dropping }}{{ endif }} - -
-
- - -
$item.dislike
-
- - $item.comment - - - - - diff --git a/view/theme/frost/wallwall_thread.tpl b/view/theme/frost/wallwall_thread.tpl deleted file mode 100644 index f23cf00ab3..0000000000 --- a/view/theme/frost/wallwall_thread.tpl +++ /dev/null @@ -1,108 +0,0 @@ -{{if $item.comment_firstcollapsed}} -
- $item.num_comments $item.hide_text -
- {{endif}} - diff --git a/view/theme/quattro/wall_item.tpl b/view/theme/quattro/wall_item.tpl deleted file mode 100644 index 731c2d2bfc..0000000000 --- a/view/theme/quattro/wall_item.tpl +++ /dev/null @@ -1,94 +0,0 @@ - -
- $item.star.starred - {{ if $item.lock }}$item.lock{{ endif }} - -
- -
-
-
-
- - $item.name - - menu - - -
-
$item.location
-
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- {{ if $item.plink }}$item.plink.title{{ endif }} -
-
-
- $item.name - $item.ago -
- -
- {{ if $item.star }} - $item.star.do - $item.star.undo - $item.star.tagger - {{ endif }} - {{ if $item.filer }} - $item.filer - {{ endif }} - - {{ if $item.vote }} - $item.vote.like.1 - $item.vote.dislike.1 - {{ endif }} - - {{ if $item.vote.share }} - $item.vote.share.1 - {{ endif }} -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
- -
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/quattro/wall_thread.tpl b/view/theme/quattro/wall_thread.tpl index 757f175468..2500fbccee 100644 --- a/view/theme/quattro/wall_thread.tpl +++ b/view/theme/quattro/wall_thread.tpl @@ -30,18 +30,25 @@
-
- $item.name + $item.name menu +
+ {{ if $item.owner_url }} + + {{ endif }}
$item.location
@@ -57,14 +64,20 @@ $tag {{ endfor }}
-
+
-
+
{{ if $item.plink }}$item.plink.title{{ endif }}
- $item.name $item.ago + $item.name + $item.ago + {{ if $item.owner_url }}
$item.to $item.owner_name $item.vwall + {{ endif }}
@@ -72,6 +85,7 @@ $item.star.do $item.star.undo $item.star.tagger + {{ endif }} {{ if $item.filer }} $item.filer @@ -105,19 +119,18 @@
$item.dislike
- {{ if $item.threaded }}{{ if $item.comment }}{{ if $item.thread_level!=1 }} + + {{ if $item.threaded }}{{ if $item.comment }}{{ if $item.indent==comment }}
- $item.comment + $item.comment
{{ endif }}{{ endif }}{{ endif }} -
- {{ for $item.children as $child }} {{ if $item.type == tag }} {{ inc wall_item_tag.tpl with $item=$child }}{{ endinc }} diff --git a/view/theme/quattro/wallwall_item.tpl b/view/theme/quattro/wallwall_item.tpl deleted file mode 100644 index e26b186360..0000000000 --- a/view/theme/quattro/wallwall_item.tpl +++ /dev/null @@ -1,96 +0,0 @@ -
- $item.star.starred - {{ if $item.lock }}$item.lock{{ endif }} - -
- -
-
-
-
- - $item.name - - menu - - -
-
- - $item.owner_name - -
-
$item.location
-
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- {{ if $item.plink }}$item.plink.title{{ endif }} -
-
-
- $item.name $item.ago -
$item.to $item.owner_name $item.vwall - -
- -
- {{ if $item.star }} - $item.star.do - $item.star.undo - $item.star.tagger - - {{ endif }} - {{ if $item.filer }} - $item.filer - {{ endif }} - - {{ if $item.vote }} - $item.vote.like.1 - $item.vote.dislike.1 - {{ endif }} - - {{ if $item.vote.share }} - $item.vote.share.1 - {{ endif }} -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
- -
-
-
-
- -
$item.dislike
-
-
-
- $item.comment -
diff --git a/view/theme/quattro/wallwall_thread.tpl b/view/theme/quattro/wallwall_thread.tpl deleted file mode 100644 index 4589390089..0000000000 --- a/view/theme/quattro/wallwall_thread.tpl +++ /dev/null @@ -1,155 +0,0 @@ -{{if $mode == display}} -{{ else }} -{{if $item.comment_firstcollapsed}} -
- $item.num_comments - $item.hide_text - {{ if $item.thread_level==3 }} - - expand / - collapse thread{{ endif }} -
- {{endif}} -{{ endif }} - -{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} -
$item.comment
-{{ endif }}{{ endif }}{{ endif }} - - -{{ if $item.flatten }} -
$item.comment
-{{ endif }} diff --git a/view/theme/smoothly/wall_item.tpl b/view/theme/smoothly/wall_item.tpl deleted file mode 100644 index 38a097f756..0000000000 --- a/view/theme/smoothly/wall_item.tpl +++ /dev/null @@ -1,114 +0,0 @@ -
-
-
-
- - $item.name - - menu -
-
    - $item.item_photo_menu -
-
-
-
-
- {{ if $item.location }} - $item.location - {{ endif }} -
-
-
- {{ if $item.lock }} -
- $item.lock -
- {{ else }} -
- {{ endif }} -
-
-
$item.title
-
-
$item.body -
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
- - {{ if $item.has_cats }} -
$item.txt_cats {{ for $item.categories as $cat }}$cat.name - [$remove] - {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} - - {{ if $item.has_folders }} -
$item.txt_folders {{ for $item.folders as $cat }}$cat.name - [$remove] - {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} -
- {{ endif }} -
-
- - -
- {{ if $item.edpost }} - - {{ endif }} - -
- {{ if $item.drop.dropping }} - - {{ endif }} -
- - {{ if $item.drop.dropping }} - {{ endif }} - -
-
- -
- - $item.name - -
$item.ago
- -
-
-
- -
$item.dislike
-
$item.comment
-
- -
- diff --git a/view/theme/smoothly/wall_thread.tpl b/view/theme/smoothly/wall_thread.tpl index 0c513ec794..09799e881f 100644 --- a/view/theme/smoothly/wall_thread.tpl +++ b/view/theme/smoothly/wall_thread.tpl @@ -1,47 +1,48 @@ {{if $item.comment_firstcollapsed}}
- $item.num_comments - $item.hide_text + $item.num_comments + $item.hide_text