From 7a33bf88cf546d55b5fac50f1168853c8dd83b39 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Tue, 19 Jun 2012 03:38:43 -0400 Subject: [PATCH 001/124] 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 d760cc8ae..6759c31f6 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 002/124] 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 000000000..980fb173c --- /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 000000000..867207c62 --- /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 000000000..82694e2e2 --- /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 000000000..77c44d2c3 --- /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 003/124] 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 06cfee776..483886d07 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 82694e2e2..b3b84fe7a 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 a3add1d851bdf6739cd1468967b88eab514ead20 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Wed, 12 Sep 2012 16:20:44 +0200 Subject: [PATCH 004/124] modified: view/theme/smoothly/profile_vcard.tpl modified: view/theme/smoothly/style.css --- view/theme/smoothly/profile_vcard.tpl | 2 +- view/theme/smoothly/style.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/view/theme/smoothly/profile_vcard.tpl b/view/theme/smoothly/profile_vcard.tpl index f798c58ea..6d5fb10b7 100644 --- a/view/theme/smoothly/profile_vcard.tpl +++ b/view/theme/smoothly/profile_vcard.tpl @@ -3,7 +3,7 @@ {{ if $pdesc }}
$profile.pdesc
{{ endif }} -
$profile.name
+
$profile.name
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index a34cc0e18..a19f13372 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -504,8 +504,8 @@ aside a{ .vcard #profile-photo-wrapper { margin: 10px 0px; - padding: 12px; - width: 175px; + padding: 6px; + width: auto; background: none repeat scroll 0 0 #FFFFFF; /*background-color: #f3f3f3;*/ border: 1px solid #C5C5C5; /*1px solid #dddddd;*/ From e3d20b51c8e075157b8e3aae2d6ac6d25c8654ad Mon Sep 17 00:00:00 2001 From: pixelroot Date: Wed, 12 Sep 2012 16:27:31 +0200 Subject: [PATCH 005/124] modified: view/theme/smoothly/style.css --- view/theme/smoothly/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index a19f13372..acb7c435a 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -328,6 +328,7 @@ nav #banner #logo-text a { font-size: 40px; font-weight: bold; margin-left: 3px; + text-shadow: #7C7D7B 3px 3px 5px; } nav #user-menu { display: block; From 864e2c03d9b5f7868f2286b0c34034af592847ab Mon Sep 17 00:00:00 2001 From: pixelroot Date: Wed, 12 Sep 2012 17:25:44 +0200 Subject: [PATCH 006/124] modified: view/theme/smoothly/style.css --- view/theme/smoothly/style.css | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index acb7c435a..361199525 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -263,13 +263,13 @@ section { border-radius: 5px; border: 1px solid #494948; background-color: #2e3436; - opacity:50%; + opacity: 50%; color: #eeeeec; padding:1em; z-index: 200; - -moz-box-shadow: 7px 7px 12px #434343; - -webkit-box-shadow: 7px75px 12px #434343; box-shadow: 7px 7px 10px #434343; + -moz-box-shadow: 7px 7px 12px #434343; + -webkit-box-shadow: 7px75px 12px #434343; } /* ========= */ @@ -307,7 +307,9 @@ nav { color: #efefef; margin-bottom: 16px; font-size: 15px; + background-color: #BDBDBD; background: -moz-linear-gradient(center top , #BDBDBD 5%, #A2A2A2 100%) repeat scroll 0 0 #BDBDBD; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); border: 1px solid #7C7D7B; box-shadow: 0 0 8px #BDBDBD; -moz-box-shadow: 3px 3px 4px #959494; @@ -335,7 +337,7 @@ nav #user-menu { width: 190px; float: right; margin-right: 5px; - margin-top: 3px; + margin-top: 4px; padding: 5px; position: relative; vertical-align: middle; From 4ba7ce03083412f9743484df638394c32df3d2cc Mon Sep 17 00:00:00 2001 From: pixelroot Date: Thu, 13 Sep 2012 09:34:50 +0200 Subject: [PATCH 007/124] modified: view/theme/smoothly/peoplefind.tpl modified: view/theme/smoothly/style.css --- view/theme/smoothly/peoplefind.tpl | 6 +-- view/theme/smoothly/style.css | 87 ++++++++++++------------------ 2 files changed, 37 insertions(+), 56 deletions(-) diff --git a/view/theme/smoothly/peoplefind.tpl b/view/theme/smoothly/peoplefind.tpl index 106abdb1e..00b7174b0 100644 --- a/view/theme/smoothly/peoplefind.tpl +++ b/view/theme/smoothly/peoplefind.tpl @@ -4,9 +4,9 @@
- - - + + + {{ if $inv }} {{ endif }} diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 361199525..5fda70698 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-12 + Modified by alex@friendica.pixelbits.de on 2012-09-13 ** Colors ** @@ -106,30 +106,27 @@ input[type=text-sidebar] { input[type=submit] { margin: 10px; - border: none; font-size: 0.9em; padding: 5px; - -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - box-shadow:inset 0px 1px 0px 0px #cfcfcf; background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); background-color:#bdbdbd; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; color:#efefef; text-align: center; + border: 1px solid #7C7D7B; + border-radius: 5px 5px 5px 5px; } input[type=submit]:hover { - border: none; 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% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); background-color:#1873a2; color: #efefef; + border: 1px solid #7C7D7B; + box-shadow: 0 0 8px #BDBDBD; + border-radius: 5px 5px 5px 5px; } input[type=submit]:active { position:relative; @@ -143,7 +140,7 @@ input[type=submit]:active { section { float: left; - padding-top: 40px; /*60*/ + padding-top: 45px; /*60*/ width: 730px; font-size: 0.9em; line-height: 1.2em; @@ -164,11 +161,6 @@ section { border: 1px solid #C5C5C5; border-radius: 3px 3px 3px 3px; box-shadow: 0 0 8px #BDBDBD; - /*background-color: #efefef; - border: 1px solid #dddddd; - -moz-box-shadow: 3px 3px 4px #959494; - -webkit-box-shadow: 3px 3px 4px #959494; - box-shadow: 3px 3px 4px #959494;*/ } #wall-item-lock { @@ -177,14 +169,8 @@ section { .button { border: 1px solid #7C7D7B; - box-shadow: 0 0 8px #BDBDBD; - -moz-box-shadow: 3px 3px 4px #959494; - -webkit-box-shadow: 3px 3px 4px #959494; border-radius: 5px 5px 5px 5px; font-size: 1em; - box-shadow: inset 0px 0px 0px 0px #cfcfcf; - -moz-box-shadow:inset 0px 0px 0px 0px #cfcfcf; - -webkit-box-shadow:inset 0px 0px 0px 0px #cfcfcf; background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); @@ -196,8 +182,8 @@ section { .button:hover { border: 1px solid #7C7D7B; box-shadow: 0 0 8px #BDBDBD; - -moz-box-shadow: 3px 3px 4px #959494; - -webkit-box-shadow: 3px 3px 4px #959494; + /* -moz-box-shadow: 3px 3px 4px #959494; + -webkit-box-shadow: 3px 3px 4px #959494;*/ border-radius: 5px 5px 5px 5px; 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% ); @@ -312,8 +298,8 @@ nav { background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); border: 1px solid #7C7D7B; box-shadow: 0 0 8px #BDBDBD; - -moz-box-shadow: 3px 3px 4px #959494; - -webkit-box-shadow: 3px 3px 4px #959494; + /* -moz-box-shadow: 3px 3px 4px #959494; + -webkit-box-shadow: 3px 3px 4px #959494;*/ border-radius: 5px 5px 5px 5px; } nav a { text-decoration: none; color: #eeeeec; border:0px;} @@ -628,7 +614,6 @@ h3#search:before { -webkit-border-radius:5px; border-radius:5px; color:#7c7d7b; - /*text-shadow:-1px 0px 0px #bdbdbd;*/ border: 1px solid #cdcdcd; } @@ -637,20 +622,16 @@ h3#search:before { width: 165px; margin: auto; margin-left: 10px; /*40*/ - -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - box-shadow:inset 0px 1px 0px 0px #cfcfcf; background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); background-color:#bdbdbd; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; display:inline-block; color:#efefef; text-decoration:none; text-align: center; + border: 1px solid #7C7D7B; + border-radius: 5px 5px 5px 5px; } @@ -659,6 +640,9 @@ h3#search:before { background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); background-color:#1873a2; + border: 1px solid #7C7D7B; + box-shadow: 0 0 8px #BDBDBD; + border-radius: 5px 5px 5px 5px; } #sidebar-new-group:active { @@ -1103,7 +1087,7 @@ profile-jot-banner-wrapper { .wall-item-location .icon { float: left; } .wall-item-location > a { margin-left: 0px; /*25*/ - margin-right: 2px; + margin-right: 3px; font-size: 0.9em; display: block; font-variant:small-caps; @@ -2073,20 +2057,16 @@ margin-left: 0px; width: 158px; padding: 10px; margin: auto 10px 20px; - -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - box-shadow:inset 0px 1px 0px 0px #cfcfcf; background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); background-color:#bdbdbd; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; padding: 5px 10px 5px 10px; color: #efefef; font-size: 1.1em; text-align: center; + border: 1px solid #7C7D7B; + border-radius: 5px 5px 5px 5px; } #side-match-link:hover { @@ -2095,6 +2075,9 @@ margin-left: 0px; background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); background-color:#1873a2; + border: 1px solid #7C7D7B; + box-shadow: 0 0 8px #BDBDBD; + border-radius: 5px 5px 5px 5px; } #side-match-link:active { @@ -2112,20 +2095,16 @@ margin-left: 0px; padding: 10px; margin: auto; margin-bottom: 20px; - -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - box-shadow:inset 0px 1px 0px 0px #cfcfcf; background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); background-color:#bdbdbd; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; padding: 5px 10px 5px 10px; color: #efefef; font-size: 1.1em; - text-align: center; + text-align: center; + border: 1px solid #7C7D7B; + border-radius: 5px 5px 5px 5px; } #side-invite-link:hover { @@ -2134,6 +2113,9 @@ margin-left: 0px; background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); background-color:#1873a2; + border: 1px solid #7C7D7B; + box-shadow: 0 0 8px #BDBDBD; + border-radius: 5px 5px 5px 5px; } @@ -2152,20 +2134,16 @@ margin-left: 0px; padding: 10px; margin: auto; margin-bottom: 20px; - -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - box-shadow:inset 0px 1px 0px 0px #cfcfcf; background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); background-color:#bdbdbd; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; padding: 5px 10px 5px 10px; color: #efefef; font-size: 1.1em; - text-align: center; + text-align: center; + border: 1px solid #7C7D7B; + border-radius: 5px 5px 5px 5px; } #side-suggest-link:hover { @@ -2174,6 +2152,9 @@ margin-left: 0px; background:-moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); background-color:#1873a2; + border: 1px solid #7C7D7B; + box-shadow: 0 0 8px #BDBDBD; + border-radius: 5px 5px 5px 5px; } #side-suggest-link:active { From 16e35d17874a86f4dea13c76952ca057b4236181 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Thu, 13 Sep 2012 09:35:12 +0200 Subject: [PATCH 008/124] new file: view/theme/smoothly/message_side.tpl --- view/theme/smoothly/message_side.tpl | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 view/theme/smoothly/message_side.tpl diff --git a/view/theme/smoothly/message_side.tpl b/view/theme/smoothly/message_side.tpl new file mode 100644 index 000000000..a35c74ed9 --- /dev/null +++ b/view/theme/smoothly/message_side.tpl @@ -0,0 +1,13 @@ +
+
+ + +
    + {{ for $tabs as $t }} +
  • + $t.label +
    • + {{ endfor }} +
+ +
From 931e1c6c66d5aff01f63fa59b611bf08ec13954e Mon Sep 17 00:00:00 2001 From: pixelroot Date: Thu, 13 Sep 2012 09:48:02 +0200 Subject: [PATCH 009/124] modified: view/theme/smoothly/style.css --- view/theme/smoothly/style.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 5fda70698..59e4c2d5f 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-13 + Modified by alex@friendica.pixelbits.de on 2012-09-12 ** Colors ** @@ -3324,3 +3324,7 @@ hr.line-dots { } #scrollup a:hover{text-decoration:none;border:0;} +.shiny { +background: #2e3436; +border-radius: 5px; +} \ No newline at end of file From 2b9c2b2d1d2f2be1f38f0dc7715d6c3b97597339 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Thu, 13 Sep 2012 09:54:27 +0200 Subject: [PATCH 010/124] 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 59e4c2d5f..c5430ba69 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -3325,6 +3325,6 @@ hr.line-dots { #scrollup a:hover{text-decoration:none;border:0;} .shiny { -background: #2e3436; +background: #fbfde9; border-radius: 5px; } \ No newline at end of file From a1ed9c72c213a7e2ed8a138e06c4237f21ae3aa4 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Thu, 13 Sep 2012 11:41:14 +0200 Subject: [PATCH 011/124] modified: view/theme/smoothly/star.png modified: view/theme/smoothly/theme.php --- view/theme/smoothly/star.png | Bin 2129 -> 684 bytes view/theme/smoothly/theme.php | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/smoothly/star.png b/view/theme/smoothly/star.png index a327ba14e462a494523d9d5be1195989b08b36ad..f03948faf2514b010c4ba132fbc530463cab8024 100644 GIT binary patch delta 661 zcmV;G0&4xy5Ud4|BYyxHbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU! zPDw;TRCwBAG&VM7AOHk_SRcy12*e+dCC{8WgQA#;fiRE&;&>>QAf%WW1BHP&0E&eP zDP|$UKv4&spMoI9fh+8ylo|+fk-EItUl?Bv7usQyHE;< z&2{Ad!1(4+F}wzv0I?|$O9JsfB)M-u>^wQ`gNOh(L>R=*oh6V2WXc0E7f8&+1f-pT z5s04x@d-v?IxGP)O42>PivRzQFzv@LMg~*WUkn!NzffFo;wBrz>Dz1!9Bc^1Ak${< z;-Y@`JfNaUPpNtIlRieLv%)3DR9uz6dfH($- zr&^bb{rHef%NAPoFdKoGv3{@jQOip13VwLUn zZ`fFw|1&&%#mvyVfrnw@W*&y8Ze#%CZXro(`k^X>~4hNxa4P=VS8jmbGc+y%7Y z=Ck+AFrS2?XGQe9ECj@sK>Ry-vfx!9-3!D^kmRQT@z1Cpp&}ry04*$p2o(;XjQawJ vt3a`cCI>3VW`j}y5KjYQR&-wi1Q-C_lBqm|TMkIY00000NkvXXu0mjf2-qR% literal 2129 zcmZ8h3pf+%8=p&!&6Eg9TEpnJ86(!LT*9)MTji2z7S4x@eU49cNQa*7D)vFxC)8h!x261T1zje1vR6om@o}h zTzF|>zLN?Ck3*;!`AQN z#MCp|d*RNzSM}8KJ_u&j4ca3)QpRxQQgAQ-f||yRKD0TRk%0|8wzB2Alzq>ZEt)Y0pLsFkGC9KoruRjq@DJ_l~-En(7Z#}&dtm3hhGG6OK zramT}^yrVanmF&3`#l=mWu7B7KC;F~P58$Q`OB6_5Ghedl-u(BVdv{AjgI)k+i;bI zUgGxm#@&SO>5#^jlzIDh-G%cg2fu=5BVvAv&8HXcV3U`-m@d+p-xIrOrrDwy7udi^qLdFc_k>Irqx`1t^kfQ)YLDh*44KGm(fEHnJ&I;006AH zED8XAzAgZu5JL0z;rI{rBgW+D3=}?#l~=LVLuQU zxxVa1!k|AOoCsT(578a!z+h3KXapKz2E&1%P$-ra5{mJ3bov=Cw`^hI91atMM8?F# zAYv>K3|1HtWn*K5G&4t(1dq_TrqG$x0}h=MNXr35je zIkqs^a-m=6XPAmpRDBkkX#BAi9(nme`S^jV&xn$4lF8#!(e$c7?C);lFhgZ%T2a-qrJ3$<1{rFLJ`MRRv9qqiWH41VD zBQ!m<+PmJ<%1~uA0pVgFqFt+A+b^{wI#C$^Ed`0YmehRB!*0dpIlQ}8JuV4mx&)R6 z`LB3Zj?+r?8!F?MJk<*x8VEJl?80l}J)D^%69&=+DRS6$veRrZQu~}ip4duf7Q!Qv zV3}V+OD5B@a%LA|5&5$5Xr04W%5}WaK$G-0?=QWyH{AI5KG)LuTR52NWtSASpCSOM+Xu;B`>#O_UlyZi`jIxnl%)@mt~Rtl~|HL4FpBfBkK* znI5VimD^F8t-GT;N3>Pol+!8`^#(l+J&IXWzR}5klIMG*Ea)RQ-#Uz>C2N!8Ri+43zD5Z;!92h*!7kK|i(J@cbOe>-y&K00YH_A~pXB z9|V(hc~@ZzwDAgPhtS!{$yz(WY?~7HteJAKAhGbRm z3Y+d6vtqm$5YNeEDWMjX%&djC4>FEBOJ6l1k3>f+jetYU@dE*{@!xg5*l`5n_{$q) z0cbVaH^8eWVY0EzbZ`FV=fDQj#Z$*6nGa_YR(%*gYq0C6B4fC@!>_7O5#daXa}CYC zg|>+3uXm_vUZPSvG<)cc+(be-;>JK*K_;BAi|cQ9I{ zQrzbVFWeUikro-5pGPn{0DV$TTX&uSpZT^pGS9Qia(vG`Ba9%y*KBq9MmmJny8wr` zM??o`0)c01-0Z9mZ&7<7a;C&V0XNT3SK~EP+d{YLc%(+CaBHb|^;|zDv9Q`*34Z<# zneT)zI<8EKs$cC)KZZ?Vy*UcxHl>`)*M2#xh?IpS*nmwt>are{#O#4xcJ0i!g%HI= z+f;3&5HA)%@}Va82nKMB@a z_1_OdwfoiIkZNaB;rZ&$4 * Maintainer: Alex * Screenshot: Screenshot From 664680cdd86e1831a5e64cc196611370b2657630 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Thu, 13 Sep 2012 16:30:12 +0200 Subject: [PATCH 012/124] modified: view/theme/smoothly/style.css --- view/theme/smoothly/style.css | 1932 ++++++++++++++++++++------------- 1 file changed, 1188 insertions(+), 744 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index c5430ba69..8fc103994 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-12 + Modified by alex@friendica.pixelbits.de on 2012-09-13 ** Colors ** @@ -15,8 +15,6 @@ Grey Gradients (buttons and other gradients) - #bdbdbd and #a2a2a2 Dark Grey Gradients - #7c7d7b and #555753 Orange - #fec01d -You can switch out the colors of the header, buttons and links by using a find and replace in your text editor. - */ body { @@ -36,10 +34,21 @@ body { color: #333333; } -img {border: 0 none; max-width: 550px; } +img { + border: 0 none; + max-width: 550px; +} -a { color: #1873a2; text-decoration: none; margin-bottom:1px;} -a:hover { color: #6da6c4; padding-bottom: 0px;} +a { + color: #1873a2; + text-decoration: none; + margin-bottom: 1px; +} + +a:hover { + color: #6da6c4; + padding-bottom: 0px; +} h3 > a, h4 > a { font-size: 18px; @@ -58,7 +67,6 @@ h2 { } p { - max-width: 600px; } @@ -69,18 +77,32 @@ label { li { list-style: none outside none; } + li.widget-list { list-style: none outside none; background: url("arrow.png") no-repeat scroll left center transparent; - /*border-bottom: 1px dotted #D3D3D3;*/ display: block; - padding: 3px 24px; + padding: 3px 24px; } -.required { display: inline; color: #1873a2; } -.fakelink { color: #1873a2; cursor: pointer; } -.fakelink :hover { color: #6da6c4; } -.heart { color: #FF0000; font-size: 100%; } +.required { + display: inline; + color: #1873a2; +} + +.fakelink { + color: #1873a2; + cursor: pointer; +} + +.fakelink :hover { + color: #6da6c4; +} + +.heart { + color: #FF0000; + font-size: 100%; +} input[type=text] { @@ -88,9 +110,9 @@ input[type=text] { padding: 2px; width: 466px; margin-left: 0px; - -webkit-border-radius: 3px 3px 3px 3px; - -moz-border-radius: 3px 3px 3px 3px; - border-radius: 3px 3px 3px 3px; + border-radius: 3px 3px 3px 3px; + -webkit-border-radius: 3px 3px 3px 3px; + -moz-border-radius: 3px 3px 3px 3px; } input[type=text-sidebar] { @@ -99,44 +121,53 @@ input[type=text-sidebar] { width: 172px; margin-left: 10px; margin-top: 10px; - -webkit-border-radius: 3px 3px 3px 3px; - -moz-border-radius: 3px 3px 3px 3px; - border-radius: 3px 3px 3px 3px; + border-radius: 3px 3px 3px 3px; + -webkit-border-radius: 3px 3px 3px 3px; + -moz-border-radius: 3px 3px 3px 3px; } input[type=submit] { margin: 10px; font-size: 0.9em; padding: 5px; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); - background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); - background-color:#bdbdbd; - color:#efefef; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); + background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); + background-color: #bdbdbd; + color: #efefef; text-align: center; border: 1px solid #7C7D7B; border-radius: 5px 5px 5px 5px; } input[type=submit]: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% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color:#1873a2; + 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% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); + background-color: #1873a2; color: #efefef; border: 1px solid #7C7D7B; box-shadow: 0 0 8px #BDBDBD; border-radius: 5px 5px 5px 5px; } input[type=submit]:active { - position:relative; - top:1px; + position: relative; + top: 1px; } -.smalltext { font-size: 0.7em } +.smalltext { + font-size: 0.7em +} -::selection { background:#fdf795; color: #000; /* Safari and Opera */ } -::-moz-selection { background:#fdf795; color: #000; /* Firefox */ } +::selection { + background: #fdf795; + color: #000; /* Safari and Opera */ +} + +::-moz-selection { + background: #fdf795; + color: #000; /* Firefox */ +} section { float: left; @@ -148,9 +179,9 @@ section { .lframe { border: 1px solid #dddddd; - -moz-box-shadow: 3px 3px 6px #959494; - -webkit-box-shadow: 3px 3px 6px #959494; box-shadow: 3px 3px 6px #959494; + -moz-box-shadow: 3px 3px 6px #959494; + -webkit-box-shadow: 3px 3px 6px #959494; background-color: #efefef; padding: 10px; } @@ -243,10 +274,10 @@ section { #panel { position: absolute; - font-size:0.8em; - -webkit-border-radius: 5px ; - -moz-border-radius: 5px; + font-size: 0.8em; border-radius: 5px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; border: 1px solid #494948; background-color: #2e3436; opacity: 50%; @@ -264,7 +295,7 @@ section { .pager { padding-top: 30px; - display:block; + display: block; clear: both; text-align: center; } @@ -273,8 +304,15 @@ section { color: #626262; } -.pager span { padding: 4px; margin:4px; } -.pager_current { background-color: #1873a2; color: #ffffff; } +.pager span { + padding: 4px; + margin: 4px; +} + +.pager_current { + background-color: #1873a2; + color: #ffffff; +} /* ======= */ /* = Nav = */ @@ -302,15 +340,27 @@ nav { -webkit-box-shadow: 3px 3px 4px #959494;*/ border-radius: 5px 5px 5px 5px; } -nav a { text-decoration: none; color: #eeeeec; border:0px;} -nav a:hover { text-decoration: none; color: #eeeeec; border:0px;} + +nav a { + text-decoration: none; + color: #eeeeec; + border: 0px; +} + +nav a:hover { + text-decoration: none; + color: #eeeeec; + border: 0px; +} + nav #banner { display: block; position: absolute; - margin-left: 3px; /*10*/ - margin-top: 3px; /*5*/ - padding-bottom:5px; + margin-left: 3px; + margin-top: 3px; + padding-bottom: 5px; } + nav #banner #logo-text a { display: hidden; font-size: 40px; @@ -318,6 +368,7 @@ nav #banner #logo-text a { margin-left: 3px; text-shadow: #7C7D7B 3px 3px 5px; } + nav #user-menu { display: block; width: 190px; @@ -327,35 +378,37 @@ nav #user-menu { padding: 5px; position: relative; vertical-align: middle; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #797979), color-stop(1, #898988) ); - background:-moz-linear-gradient( center top, #797979 5%, #898988 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#797979', endColorstr='#898988'); - background-color:#a2a2a2; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #797979), color-stop(1, #898988) ); + background: -moz-linear-gradient( center top, #797979 5%, #898988 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#797979', endColorstr='#898988'); + background-color: #a2a2a2; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; border: 1px solid #7C7D8B; - color:#efefef; - text-decoration:none; + color: #efefef; + text-decoration: none; text-align: center; } nav #user-menu-label::after { content: url("menu-user-pin.png") no-repeat; padding-left: 15px; } + nav #user-menu-label { vertical-align: middle; font-size: 12px; padding: 5px; text-align: center; } + ul#user-menu-popup { display: none; position: absolute; - background:-webk/* margin-right:10px;*/it-gradient( linear, left top, left bottom, color-stop(0.05, #797979), color-stop(1, #898988) ); - background:-moz-linear-gradient( center top, #a2a2a2 5%, #898988 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#797979', endColorstr='#898988'); - background-color:#898988; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #797979), color-stop(1, #898988) ); + background: -moz-linear-gradient( center top, #a2a2a2 5%, #898988 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#797979', endColorstr='#898988'); + background-color: #898988; width: 100%; padding: 10px 0px; margin: 0px; @@ -372,16 +425,28 @@ ul#user-menu-popup { box-shadow: 5px 5px 10px #242424; z-index: 10000; } -ul#user-menu-popup li { display: block; } -ul#user-menu-popup li a { display: block; padding: 5px; } + +ul#user-menu-popup li { + display: block; +} + +ul#user-menu-popup li a { + display: block; + padding: 5px; +} + ul#user-menu-popup li a:hover { color: #efefef; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #6da6c4), color-stop(1, #1873a2) ); - background:-moz-linear-gradient( center top, #6da6c4 5%, #1873a2 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#6da6c4', endColorstr='#1873a2'); - background-color:#6da6c4; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #6da6c4), color-stop(1, #1873a2) ); + background: -moz-linear-gradient( center top, #6da6c4 5%, #1873a2 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#6da6c4', endColorstr='#1873a2'); + background-color: #6da6c4; +} + +ul#user-menu-popup li a.nav-sep { + border-top: 1px solid #989898; + border-style:inset; } -ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:inset; } /* ============= */ /* = Notifiers = */ @@ -390,8 +455,10 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in #notifications { height: 32px; position: absolute; - top:3px; left: 35%; + top: 3px; + left: 35%; } + .nav-ajax-update { width: 44px; height: 32px; @@ -403,11 +470,26 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in float: left; padding-left: 11px; } -#notify-update { background-position: 0px -168px; } -#net-update { background-position: 0px -126px; } -#mail-update { background-position: 0px -40px; } -#intro-update { background-position: 0px -84px; } -#home-update { background-position: 0px 0px; } + +#notify-update { + background-position: 0px -168px; +} + +#net-update { + background-position: 0px -126px; +} + +#mail-update { + background-position: 0px -40px; +} + +#intro-update { + background-position: 0px -84px; +} + +#home-update { + background-position: 0px 0px; +} #lang-select-icon { bottom: 6px; @@ -417,10 +499,10 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in z-index: 10; } #language-selector { - position:fixed; - bottom:2px; - left:52px; - z-index:10; + position: fixed; + bottom: 2px; + left: 52px; + z-index: 10; } /* =================== */ @@ -428,26 +510,27 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in /* =================== */ #sysmsg_info, #sysmsg { - position:fixed; + position: fixed; bottom: 0px; right:20%; - -moz-box-shadow: 7px 7px 12px #434343; - -webkit-box-shadow: 7px75px 12px #434343; box-shadow: 7px 7px 10px #434343; + -moz-box-shadow: 7px 7px 12px #434343; + -webkit-box-shadow: 7px75px 12px #434343; padding: 10px; - 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% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color:#1873a2; - -webkit-border-radius: 5px 5px 0px 0px; - -moz-border-radius: 5px 5px 0px 0px; + 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% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); + background-color: #1873a2; border-radius: 5px 5px 0px 0px; + -webkit-border-radius: 5px 5px 0px 0px; + -moz-border-radius: 5px 5px 0px 0px; border: 1px solid #da2c2c; - border-bottom:0px; + border-bottom: 0px; padding-bottom: 50px; z-index: 1000; color: #efefef; font-style: bold; } + #sysmsg_info br, #sysmsg br { display:block; @@ -461,17 +544,14 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in aside { float: right; - /*margin-right: 5px;/ - /*width: 21%;*/ - width: 205px; /*250*/ - margin-top: 40px; /*50*/ + width: 205px; + margin-top: 40px; font-size: 0.9em; font-style: bold; } aside a{ padding-bottom: 5px; - } .vcard { @@ -496,15 +576,16 @@ aside a{ padding: 6px; width: auto; background: none repeat scroll 0 0 #FFFFFF; - /*background-color: #f3f3f3;*/ - border: 1px solid #C5C5C5; /*1px solid #dddddd;*/ - -moz-box-shadow: 3px 3px 4px #959494; - -webkit-box-shadow: 3px 3px 4px #959494; - box-shadow: 0 0 8px #BDBDBD; /*3px 3px 4px #959494;*/ + border: 1px solid #C5C5C5; + box-shadow: 0 0 8px #BDBDBD; + -moz-box-shadow: 3px 3px 4px #959494; + -webkit-box-shadow: 3px 3px 4px #959494; border-radius: 5px 5px 5px 5px; } -aside h4 { font-size: 1.3em; } +aside h4 { + font-size: 1.3em; +} .allcontact-link { color: #626262; @@ -516,42 +597,46 @@ aside h4 { font-size: 1.3em; } padding-bottom: 10px; } -#profile-extra-links ul { margin-left: 0px; padding-left: 0px; list-style: none; } +#profile-extra-links ul { + margin-left: 0px; + padding-left: 0px; + list-style: none; +} #dfrn-request-link { - -moz-box-shadow:inset 0px 1px 0px 0px #a65151; - -webkit-box-shadow:inset 0px 1px 0px 0px #a65151; - box-shadow:inset 0px 1px 0px 0px #a65151; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #6da6c4), color-stop(1, #1873a2) ); - background:-moz-linear-gradient( center top, #6da6c4 5%, #1873a2 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#6da6c4', endColorstr='#1873a2'); - background-color:#6da6c4; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; - border:1px solid #fc5656; - display:inline-block; - color:#f0e7e7; - font-family:Trebuchet MS; - font-size:19px; - font-weight:bold; + box-shadow: inset 0px 1px 0px 0px #a65151; + -moz-box-shadow: inset 0px 1px 0px 0px #a65151; + -webkit-box-shadow: inset 0px 1px 0px 0px #a65151; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #6da6c4), color-stop(1, #1873a2) ); + background: -moz-linear-gradient( center top, #6da6c4 5%, #1873a2 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#6da6c4', endColorstr='#1873a2'); + background-color: #6da6c4; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border: 1px solid #fc5656; + display: inline-block; + color: #f0e7e7; + font-family: Trebuchet MS; + font-size: 19px; + font-weight: bold; text-align: center; - padding:10px; + padding: 10px; width: 185px; - text-decoration:none; - text-shadow:1px 1px 0px #b36f6f; + text-decoration: none; + text-shadow: 1px 1px 0px #b36f6f; } #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% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color:#1873a2; + 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% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); + background-color: #1873a2; } #dfrn-request-link:active { - position:relative; - top:1px; + position: relative; + top: 1px; } #dfrn-request-intro { @@ -567,7 +652,6 @@ aside h4 { font-size: 1.3em; } } #netsearch-box input[type="submit"] { width: auto; - /*margin-top: 5px;*/ } h3#search:before { @@ -580,9 +664,9 @@ h3#search:before { background-color: #f3f3f3; border: 1px solid #cdcdcd; margin-bottom: 10px; - -webkit-border-radius: 5px 5px 5px 5px; - -moz-border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + -moz-border-radius: 5px 5px 5px 5px; } #group-sidebar { @@ -603,32 +687,32 @@ h3#search:before { .widget { margin-top: 20px; - -moz-box-shadow: 1px 2px 6px 0px #959494; - -webkit-box-shadow: 1px 2px 6px 0px #959494; box-shadow: 1px 2px 6px 0px #959494; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #f8f8f8), color-stop(1, #f6f6f6) ); - background:-moz-linear-gradient( center top, #f8f8f8 5%, #f6f6f6 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f8f8f8', endColorstr='#f6f6f6'); - background-color:#f8f8f8; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; - color:#7c7d7b; + -moz-box-shadow: 1px 2px 6px 0px #959494; + -webkit-box-shadow: 1px 2px 6px 0px #959494; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #f8f8f8), color-stop(1, #f6f6f6) ); + background: -moz-linear-gradient( center top, #f8f8f8 5%, #f6f6f6 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f8f8f8', endColorstr='#f6f6f6'); + background-color: #f8f8f8; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + color: #7c7d7b; border: 1px solid #cdcdcd; } #sidebar-new-group { - padding:7px; + padding: 7px; width: 165px; margin: auto; - margin-left: 10px; /*40*/ - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); - background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); - background-color:#bdbdbd; - display:inline-block; - color:#efefef; - text-decoration:none; + margin-left: 10px; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); + background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); + background-color: #bdbdbd; + display: inline-block; + color: #efefef; + text-decoration: none; text-align: center; border: 1px solid #7C7D7B; border-radius: 5px 5px 5px 5px; @@ -636,37 +720,37 @@ h3#search:before { #sidebar-new-group: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% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color:#1873a2; + 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% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); + background-color: #1873a2; border: 1px solid #7C7D7B; box-shadow: 0 0 8px #BDBDBD; border-radius: 5px 5px 5px 5px; } #sidebar-new-group:active { - position:relative; - top:1px; + position: relative; + top: 1px; } .group-selected, .nets-selected { padding-bottom: 0px; padding-left: 2px; padding-right: 2px; - -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - box-shadow:inset 0px 1px 0px 0px #cfcfcf; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); - background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); - background-color:#bdbdbd; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; - display:inline-block; - color:#efefef; - text-decoration:none; + box-shadow: inset 0px 1px 0px 0px #cfcfcf; + -moz-box-shadow: inset 0px 1px 0px 0px #cfcfcf; + -webkit-box-shadow: inset 0px 1px 0px 0px #cfcfcf; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); + background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); + background-color: #bdbdbd; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + display: inline-block; + color: #efefef; + text-decoration: none; } #sidebar-new-group a { @@ -676,19 +760,18 @@ h3#search:before { margin: auto; } -ul .sidebar-group-li{ +ul .sidebar-group-li { list-style: none; font-size: 1.0em; padding-bottom: 5px; } -ul .sidebar-group-li .icon{ +ul .sidebar-group-li .icon { display: inline-block; height: 12px; width: 12px; } - .nets-ul { list-style-type: none; } @@ -704,31 +787,30 @@ ul .sidebar-group-li .icon{ margin-left: 42px; } - -.widget h3{ - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #f0edf0), color-stop(1, #e2e2e2) ); - background:-moz-linear-gradient( center top, #f0edf0 5%, #e2e2e2 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f0edf0', endColorstr='#e2e2e2'); - background-color:#f0edf0; - -moz-border-radius:5px 5px 0px 0px; - -webkit-border-radius:5px 5px 0px 0px; - border-radius:5px 5px 0px 0px; - border:1px solid #e2e2e2; +.widget h3 { + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #f0edf0), color-stop(1, #e2e2e2) ); + background: -moz-linear-gradient( center top, #f0edf0 5%, #e2e2e2 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f0edf0', endColorstr='#e2e2e2'); + background-color: #f0edf0; + border-radius: 5px 5px 0px 0px; + -moz-border-radius: 5px 5px 0px 0px; + -webkit-border-radius: 5px 5px 0px 0px; + border: 1px solid #e2e2e2; border-bottom: 1px solid #cdcdcd; - padding-top:5px; + padding-top: 5px; padding-bottom: 5px; vertical-align: baseline; text-align: center; - text-shadow:-1px 0px 0px #bdbdbd; + text-shadow: -1px 0px 0px #bdbdbd; } -#group-sidebar h3:before{ +#group-sidebar h3:before { content: url("groups.png"); padding-right: 10px; vertical-align: middle; } -#saved-search-list{ +#saved-search-list { margin-top: 15px; padding-bottom: 20px; } @@ -772,15 +854,28 @@ ul .sidebar-group-li .icon{ float: left; } -.contact-block-textdiv { width: 150px; height: 34px; float: left; } -#contact-block-end { clear: both; } +.contact-block-textdiv { + width: 150px; + height: 34px; + float: left; +} + +#contact-block-end { + clear: both; +} /* ======= */ /* = Jot = */ /* ======= */ -#profile-jot-text_tbl { margin-bottom: 10px; } -#profile-jot-text_ifr { width: 99.9%!important } +#profile-jot-text_tbl { + margin-bottom: 10px; +} + +#profile-jot-text_ifr { + width: 99.9%!important +} + #profile-jot-submit-wrapper { } @@ -792,12 +887,17 @@ ul .sidebar-group-li .icon{ border: 1px solid #cccccc; } -#jot-title::-webkit-input-placeholder{font-weight: normal;} -#jot-title:-moz-placeholder{font-weight: normal;} - +#jot-title::-webkit-input-placeholder { + font-weight: normal; +} + +#jot-title:-moz-placeholder { + font-weight: normal; +} + #jot-title:hover, #jot-title:focus { - border: 1px solid #cccccc + border: 1px solid #cccccc; } .preview { @@ -807,19 +907,19 @@ ul .sidebar-group-li .icon{ #profile-jot-perms, #profile-jot-submit, #jot-preview-link { width: 60px; font-size: 12px; - -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - box-shadow:inset 0px 1px 0px 0px #cfcfcf; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); - background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); - background-color:#bdbdbd; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; - display:inline-block; - color:#efefef; - text-decoration:none; + box-shadow: inset 0px 1px 0px 0px #cfcfcf; + -moz-box-shadow: inset 0px 1px 0px 0px #cfcfcf; + -webkit-box-shadow: inset 0px 1px 0px 0px #cfcfcf; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); + background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); + background-color: #bdbdbd; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + display: inline-block; + color: #efefef; + text-decoration: none; text-align: center; } @@ -836,25 +936,32 @@ ul .sidebar-group-li .icon{ #profile-jot-submit { float: left; - margin-right:5px; + margin-right: 5px; border: 0px; margin-top: 0px; margin-left: -30px; } -#profile-jot-perms:hover, #profile-jot-submit:hover, #jot-preview-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% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color:#1873a2; +#profile-jot-perms:hover, +#profile-jot-submit:hover, +#jot-preview-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% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); + background-color: #1873a2; } -#profile-jot-perms:active, #profile-jot-submit:active, #jot-preview-link:active { - position:relative; - top:1px; + +#profile-jot-perms:active, +#profile-jot-submit:active, +#jot-preview-link:active { + position: relative; + top: 1px; } #character-counter { - position: absolute: right: 100px; top:100px; + position: absolute: + right: 100px; + top:100px; } #profile-rotator-wrapper { float: right; @@ -864,16 +971,28 @@ ul .sidebar-group-li .icon{ float: left; margin-right: 5px; } + #profile-jot-tools-end, -#profile-jot-banner-end { clear: both; } +#profile-jot-banner-end { + clear: both; +} #profile-jot-email-wrapper { margin: 10px 10% 0px 10%; border: 1px solid #eeeeee; border-bottom: 0px; } -#profile-jot-email-label { background-color: #555753; color: #ccccce; padding: 5px;} -#profile-jot-email { margin: 5px; width: 95%; } + +#profile-jot-email-label { + background-color: #555753; + color: #ccccce; + padding: 5px; +} + +#profile-jot-email { + margin: 5px; + width: 95%; +} #profile-jot-networks { margin: 0px 10%; @@ -886,22 +1005,48 @@ ul .sidebar-group-li .icon{ margin: 0px 10px; border: 1px solid #eeeeee; border-top: 0px; - display:block!important; + display:block!important; } + #group_allow_wrapper, #group_deny_wrapper, -#acl-permit-outer-wrapper { width: 47%; float: left; } +#acl-permit-outer-wrapper { + width: 47%; + float: left; +} #contact_allow_wrapper, #contact_deny_wrapper, -#acl-deny-outer-wrapper { width: 47%; float: right; } +#acl-deny-outer-wrapper { + width: 47%; + float: right; +} -#acl-permit-text {background-color: #555753; color: #ccccce; padding: 5px; float: left;} -#jot-public {background-color: #555753; color: #ff0000; padding: 5px; float: left;} -#acl-deny-text {background-color: #555753; color: #ccccce; padding: 5px; float: left;} +#acl-permit-text { + background-color: #555753; + color: #ccccce; + padding: 5px; float: left; +} + +#jot-public { + background-color: #555753; + color: #ff0000; + padding: 5px; + float: left; +} + +#acl-deny-text { + background-color: #555753; + color: #ccccce; + padding: 5px; + float: left; +} #acl-permit-text-end, -#acl-deny-text-end { clear: both; } +#acl-deny-text-end { + clear: both; +} + #profile-jot-wrapper { margin-top: 0px; padding-top: 0px; @@ -926,7 +1071,10 @@ profile-jot-banner-wrapper { padding: 20px 0px 0px; font-size: 0.9em; } -.tabs li { display: inline;} + +.tabs li { + display: inline; +} .tab { padding: 5px 10px 5px 10px; @@ -952,43 +1100,57 @@ profile-jot-banner-wrapper { padding-right: 10px; padding-left: 12px; background: none repeat scroll 0 0 #FFFFFF; - /*background: -moz-linear-gradient(center top , #F8F8F8 5%, #F6F6F6 100%) repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CDCDCD; border-radius: 5px 5px 5px 5px; - box-shadow: 0 0 8px #BDBDBD; /*3px 3px 4px 0 #959494;*/ - margin-top: 20px; + box-shadow: 0 0 8px #BDBDBD; +} + +.wall-item-outside-wrapper-end { + clear: both; +} + +.wall-item-content-wrapper { + position: relative; + max-width: 100%; + padding-top: 10px; +} + +.wall-item-photo-menu { + display: none; } -.wall-item-outside-wrapper-end { clear: both;} -.wall-item-content-wrapper { position: relative; max-width: 100%; padding-top: 10px; } -.wall-item-photo-menu { display: none;} .wall-item-photo-menu-button { - display:none; + display: none; text-indent: -99999px; background: #eeeeee url("menu-user-pin.png") no-repeat 75px center; position: absolute; overflow: hidden; - height: 20px; width: 90px; - top: 85px; left: -1px; - -webkit-border-radius: 0px 0px 5px 5px; - -moz-border-radius: 0px 0px 5px 5px; + height: 20px; + width: 90px; + top: 85px; + left: -1px; border-radius: 0px 0px 5px 5px; + -webkit-border-radius: 0px 0px 5px 5px; + -moz-border-radius: 0px 0px 5px 5px; +} + +.wall-item-info { + float: left; + width: 100px; } -.wall-item-info { float: left; width: 100px; } /*140*/ .wall-item-photo-wrapper { - width: 80px; height: 80px; + width: 80px; + height: 80px; position: relative; } .wall-item-tools { filter: alpha(opacity=60); opacity: 0.7; - -webkit-transition: all 0.25s ease-in-out; - -moz-transition: all 0.25s ease-in-out; - -o-transition: all 0.25s ease-in-out; - -ms-transition: all 0.25s ease-in-out; - transition: all 0.25s ease-in-out; + transition: all 0.25s ease-in-out; + -webkit-transition: all 0.25s ease-in-out; + -moz-transition: all 0.25s ease-in-out; margin-top: 10px; padding-bottom: 5px; float: right; @@ -997,11 +1159,9 @@ profile-jot-banner-wrapper { .wall-item-tools:hover { filter: alpha(opacity=100); opacity: 1; - -webkit-transition: all 0.25s ease-in-out; - -moz-transition: all 0.25s ease-in-out; - -o-transition: all 0.25s ease-in-out; - -ms-transition: all 0.25s ease-in-out; transition: all 0.25s ease-in-out; + -webkit-transition: all 0.25s ease-in-out; + -moz-transition: all 0.25s ease-in-out; margin-left: 140px; } @@ -1014,24 +1174,29 @@ profile-jot-banner-wrapper { float: left; padding-left: 10px; } + .wall-item-like-buttons a.icon { float: left; margin-right: 5px; display: inline; } + .wall-item-links-wrapper { - width: 30px; /*20*/ + width: 30px; float: left; } + .wall-item-delete-wrapper { float: left; margin-right: 5px; } + .wall-item-links-wrapper a.icon { float: left; margin-right: 5px; display: inline; } + .pencil { float: left; } @@ -1039,31 +1204,46 @@ profile-jot-banner-wrapper { .star-item { float: left; } + .tag-item { float: left; } -.wall-item-title { font-size: 1.2em; font-weight: bold; padding-top: 5px; margin-left: 100px;} -.wall-item-body { - margin-left: 100px; /*140*/ - padding-right: 10px; - padding-top: 5px; - max-width: 100%; /*85*/ + +.wall-item-title { + font-size: 1.2em; + font-weight: bold; + padding-top: 5px; + margin-left: 100px; } -.wall-item-body img { max-width: 100%; height: auto; } +.wall-item-body { + margin-left: 100px; + padding-right: 10px; + padding-top: 5px; + max-width: 100%; +} + +.wall-item-body img { + max-width: 100%; + height: auto; +} .wall-item-body p { font-size: 0.8em; } -.wall-item-lock-wrapper { float: right; } + +.wall-item-lock-wrapper { + float: right; +} + .wall-item-dislike, .wall-item-like { clear: left; font-size: 0.9em; margin: 0px 0px 10px 450px; padding-left: 0px; - } + .wall-item-author { font-size: 0.9em; margin: 0px 0px 0px 100px; @@ -1074,28 +1254,47 @@ profile-jot-banner-wrapper { color: #898989; } -.wall-item-ago { display: inline; padding-left: 0px; color: #898989;} /*10*/ -.wall-item-wrapper-end { clear:both; } -.wall-item-location { - margin-top:5px; - width: 100px; - overflow: hidden; - text-overflow: ellipsis; - -o-text-overflow: ellipsis; -} - -.wall-item-location .icon { float: left; } -.wall-item-location > a { - margin-left: 0px; /*25*/ - margin-right: 3px; - font-size: 0.9em; - display: block; - font-variant:small-caps; +.wall-item-ago { + display: inline; + padding-left: 0px; color: #898989; } -.wall-item-location .smalltext { margin-left: 25px; font-size: 0.9em; display: block;} -.wall-item-location > br { display: none; } +.wall-item-wrapper-end { + clear:both; +} + +.wall-item-location { + margin-top: 5px; + width: 100px; + overflow: hidden; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; +} + +.wall-item-location .icon { + float: left; +} + +.wall-item-location > a { + margin-left: 0px; + margin-right: 3px; + font-size: 0.9em; + display: block; + font-variant: small-caps; + color: #898989; +} + +.wall-item-location .smalltext { + margin-left: 25px; + font-size: 0.9em; + display: block; +} + +.wall-item-location > br { + display: none; +} + .wall-item-conv a{ font-size: 0.9em; color: #898989; @@ -1112,8 +1311,15 @@ profile-jot-banner-wrapper { height: 30px; } -.wallwall .wwto img { width: 30px!important; height: 30px!important;} -.wallwall .wall-item-photo-end { clear: both; } +.wallwall .wwto img { + width: 30px!important; + height: 30px!important; +} + +.wallwall .wall-item-photo-end { + clear: both; +} + .wall-item-arrowphoto-wrapper { position: absolute; left: 20px; @@ -1130,50 +1336,68 @@ profile-jot-banner-wrapper { border-left: 1px solid #dddddd; border-bottom: 1px solid #dddddd; position: absolute; - left: -2px; top: 101px; + left: -2px; + top: 101px; display: none; z-index: 10000; - -webkit-border-radius: 0px 5px 5px 5px; - -moz-border-radius: 0px 5px 5px 5px; border-radius: 0px 5px 5px 5px; - -moz-box-shadow: 3px 3px 4px #959494; - -webkit-box-shadow: 3px 3px 4px #959494; + -webkit-border-radius: 0px 5px 5px 5px; + -moz-border-radius: 0px 5px 5px 5px; box-shadow: 3px 3px 4px #959494; + -moz-box-shadow: 3px 3px 4px #959494; + -webkit-box-shadow: 3px 3px 4px #959494; + } .wall-item-photo-menu-button { border-right: 1px solid #dddddd; border-left: 1px solid #dddddd; border-bottom: 1px solid #dddddd; - -moz-box-shadow: 3px 3px 4px #959494; - -webkit-box-shadow: 3px 3px 4px #959494; box-shadow: 3px 3px 4px #959494; + -moz-box-shadow: 3px 3px 4px #959494; + -webkit-box-shadow: 3px 3px 4px #959494; } .fakelink wall-item-photo-menu-button { -webkit-border-radius: 0px 5px 5px 5px; -moz-border-radius: 0px 5px 5px 5px; border-radius: 0px 5px 5px 5px; - -moz-box-shadow: 3px 3px 4px #959494; - -webkit-box-shadow: 3px 3px 4px #959494; box-shadow: 3px 3px 4px #959494; + -moz-box-shadow: 3px 3px 4px #959494; + -webkit-box-shadow: 3px 3px 4px #959494; +} + +.wall-item-photo-menu ul { + margin: 0px; + padding: 0px; + list-style: none; +} + +.wall-item-photo-menu li a { + white-space: nowrap; + display: block; + padding: 5px 2px; + color: #2e3436; } -.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none } -.wall-item-photo-menu li a { white-space: nowrap; display: block; padding: 5px 2px; color: #2e3436; } .wall-item-photo-menu li a:hover { color: #efefef; - 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% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color:#1873a2; - order-bottom: none; + 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% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); + background-color: #1873a2; + /*order-bottom: none;*/ } .icon.drop, -.icon.drophide { float: right;} -#item-delete-selected { overflow: auto; width: 100%;} +.icon.drophide { + float: right; +} +#item-delete-selected { + overflow: auto; + width: 100%; +} /* ============ */ /* = Comments = */ @@ -1183,30 +1407,42 @@ profile-jot-banner-wrapper { font-size: 0.9em; color: #898989; margin-left: 60px; - /*font-variant:small-caps;*/ } -.wall-item-outside-wrapper.comment { margin-left: 70px; } +.wall-item-outside-wrapper.comment { + margin-left: 70px; +} + .wall-item-outside-wrapper.comment .wall-item-photo { width: 40px!important; height: 40px!important; } -.wall-item-outside-wrapper.comment .wall-item-photo-wrapper {width: 40px; height: 40px; } +.wall-item-outside-wrapper.comment .wall-item-photo-wrapper { + width: 40px; + height: 40px; +} + .wall-item-outside-wrapper.comment .wall-item-photo-menu-button { width: 50px; top: 45px; background-position: 35px center; } -.wall-item-outside-wrapper.comment .wall-item-info { width: 60px; } + +.wall-item-outside-wrapper.comment .wall-item-info { + width: 60px; +} + .wall-item-outside-wrapper.comment .wall-item-body { - margin-left: 60px;/*70*/ + margin-left: 60px; max-width: 100%; padding-right: 10px; padding-left: 0px; } -.wall-item-outside-wrapper.comment .wall-item-author { margin-left: 60px; } /*10*/ +.wall-item-outside-wrapper.comment .wall-item-author { + margin-left: 60px; +} .wall-item-outside-wrapper.comment .wall-item-photo-menu { min-width: 50px; @@ -1218,37 +1454,55 @@ profile-jot-banner-wrapper { } .comment-wwedit-wrapper, -.comment-edit-wrapper { margin: 30px 0px 0px 80px;} +.comment-edit-wrapper { + margin: 30px 0px 0px 80px; +} + .comment-wwedit-wrapper img, -.comment-edit-wrapper img { width: 20px; height: 20px; } -.comment-edit-photo-link { float: left; width: 40px;} +.comment-edit-wrapper img { + width: 20px; + height: 20px; +} + +.comment-edit-photo-link { + float: left; + width: 40px; +} + .comment-edit-text-empty { width: 80%; height: 20px; - /*border: 0px;*/ color: #babdb6; - -webkit-transition: all 0.5s ease-in-out; - -moz-transition: all 0.5s ease-in-out; - -o-transition: all 0.5s ease-in-out; - -ms-transition: all 0.5s ease-in-out; transition: all 0.5s ease-in-out; + -webkit-transition: all 0.5s ease-in-out; + -moz-transition: all 0.5s ease-in-out; } -.comment-edit-text-empty:hover { color: #999999;} -.comment-edit-text-full { width: 80%; height: 6em; - -webkit-transition: all 0.5s ease-in-out; - -moz-transition: all 0.5s ease-in-out; - -o-transition: all 0.5s ease-in-out; - -ms-transition: all 0.5s ease-in-out; + +.comment-edit-text-empty:hover { + color: #999999; +} + +.comment-edit-text-full { + width: 80%; + height: 6em; transition: all 0.5s ease-in-out; + -webkit-transition: all 0.5s ease-in-out; + -moz-transition: all 0.5s ease-in-out; } -.comment-edit-submit-wrapper { width: 80%; margin-left: 40px; text-align: right; } + +.comment-edit-submit-wrapper { + width: 80%; + margin-left: 40px; + text-align: right; +} + .comment-edit-submit { height: 22px; background-color: #a2a2a2; color: #eeeeec; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; border-radius: 5px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; border: 0px; } @@ -1292,21 +1546,28 @@ profile-jot-banner-wrapper { margin-bottom: 0px; padding-bottom: 5px; font-size: 18px; - /*font-variant:small-caps;*/ } -div[id$="wrapper"] { height: 100%;} -div[id$="wrapper"] br { clear: left; } -#advanced-profile-with { margin-left: 20px;} +div[id$="wrapper"] { + height: 100%; +} + +div[id$="wrapper"] br { + clear: left; +} + +#advanced-profile-with { + margin-left: 20px; +} #profile-listing-desc { float: left; display: inline; padding: 5px 10px 5px 10px; width: 150px; - margin-bottom:20px; + margin-bottom: 20px; margin-top: 20px; - display:inline-block; + display: inline-block; font-style: bold; text-align: center; } @@ -1315,7 +1576,7 @@ div[id$="wrapper"] br { clear: left; } float: left; display: inline; width: auto; - margin-left:5px; + margin-left: 5px; margin-top: 20px; padding: 5px 10px 5px 10px; font-style: bold; @@ -1332,16 +1593,16 @@ div[id$="wrapper"] br { clear: left; } #profile-edit-links li { display: inline; width: 150px; - margin-bottom:20px; + margin-bottom: 20px; margin-top: 20px; background-color: #a2a2a2; color: #eeeeec; padding: 5px 10px 5px 10px; margin-right: 5px; font-style: bold; - -webkit-border-radius: 5px 5px 5px 5px; - -moz-border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + -moz-border-radius: 5px 5px 5px 5px; } #profile-edit-links li a { @@ -1364,8 +1625,13 @@ div[id$="wrapper"] br { clear: left; } position: absolute; } -#cropimage-wrapper { float:left; } -#crop-image-form { clear:both; } +#cropimage-wrapper { + float:left; +} + +#crop-image-form { + clear:both; +} .profile-match-name a{ color: #999; @@ -1379,13 +1645,13 @@ div[id$="wrapper"] br { clear: left; } .profile-match-wrapper { width: 82%; padding: 5px; - margin-bottom:10px; + margin-bottom: 10px; margin-left: 20px; background-color: #f6f6f6; border: 1px solid #dddddd; - -moz-box-shadow: 3px 3px 4px #959494; - -webkit-box-shadow: 3px 3px 4px #959494; box-shadow: 3px 3px 4px #959494; + -moz-box-shadow: 3px 3px 4px #959494; + -webkit-box-shadow: 3px 3px 4px #959494; clear: both; } @@ -1423,17 +1689,18 @@ div[id$="wrapper"] br { clear: left; } #photo-top-links { width: 130px; - margin-bottom:20px; + margin-bottom: 20px; margin-top: 20px; background-color: #a2a2a2; color: #eeeeec; padding: 5px 10px 5px 10px; margin-right: 5px; font-style: bold; - -webkit-border-radius: 5px 5px 5px 5px; - -moz-border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + -moz-border-radius: 5px 5px 5px 5px; } + #photo-top-links a { color: #efefef; } @@ -1450,7 +1717,7 @@ div[id$="wrapper"] br { clear: left; } float: left; margin: 0px 10px 10px 0px; padding-bottom: 30px; - position:relative; + position: relative; } .photo-top-image-wrapper { @@ -1459,7 +1726,7 @@ div[id$="wrapper"] br { clear: left; } height: 180px; margin: 0px 10px 10px 0px; padding-bottom: 30px; - position:relative; + position: relative; } #photo-album-wrapper-inner { @@ -1470,8 +1737,14 @@ div[id$="wrapper"] br { clear: left; } overflow: hidden; } -#photo-photo { max-width: 85%; height: auto; } -#photo-photo img { max-width: 100% } +#photo-photo { + max-width: 85%; + height: auto; +} + +#photo-photo img { + max-width: 100% +} .photo-top-image-wrapper a:hover, #photo-photo a:hover, @@ -1487,10 +1760,10 @@ div[id$="wrapper"] br { clear: left; } bottom: 0px; padding: 0px 5px; font-weight: bold; - font-stretch:semi-expanded; + font-stretch: semi-expanded; } -.photo-top-album-name a{ +.photo-top-album-name a { text-align: center; color: #6e6e6e; } @@ -1503,9 +1776,9 @@ div[id$="wrapper"] br { clear: left; } font-size: 0.9em; } -#photo-photo{ +#photo-photo { position: relative; - float:left; + float: left; } #photo-caption { @@ -1514,28 +1787,41 @@ div[id$="wrapper"] br { clear: left; } font-size: 1.1em; } -#photo-photo-end { clear: both; } +#photo-photo-end { + clear: both; +} + #photo-prev-link, -#photo-next-link{ +#photo-next-link { position: absolute; - width:10%; + width: 10%; height: 100%; background-color: rgba(255,255,255,0.2); opacity: 0; - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; background-position: center center; background-repeat: no-repeat; } -#photo-prev-link { left:0px; top:0px; background-image: url('prev.png'); } -#photo-next-link { right:0px; top:0px; background-image: url('next.png');} +#photo-prev-link { + left: 0px; + top: 0px; + background-image: url('prev.png'); +} + +#photo-next-link { + right: 0px; + top: 0px; + background-image: url('next.png'); +} + #photo-prev-link a, -#photo-next-link a{ - display: block; width: 100%; height: 100%; +#photo-next-link a { + display: block; + width: 100%; + height: 100%; overflow: hidden; text-indent: -900000px; } @@ -1543,19 +1829,22 @@ div[id$="wrapper"] br { clear: left; } #photo-prev-link:hover, #photo-next-link:hover { opacity: 1; - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; } #photo-next-link .icon, -#photo-prev-link .icon { display: none } +#photo-prev-link .icon { + display: none; +} #photos-upload-spacer, #photos-upload-new-wrapper, -#photos-upload-exist-wrapper { margin-bottom: 1em; } +#photos-upload-exist-wrapper { + margin-bottom: 1em; +} + #photos-upload-existing-album-text, #photos-upload-newalbum-div { background-color: #fff; @@ -1567,7 +1856,9 @@ div[id$="wrapper"] br { clear: left; } } #photos-upload-album-select, -#photos-upload-newalbum { width: 400px; } +#photos-upload-newalbum { + width: 400px; +} #photos-upload-perms-menu { width: 180px; @@ -1582,12 +1873,14 @@ select, input { margin-top: 0px; border: 1px solid #b0b0b0; padding: 2px; - -webkit-border-radius: 3px 3px 3px 3px; - -moz-border-radius: 3px 3px 3px 3px; - border-radius: 3px 3px 3px 3px; + border-radius: 3px 3px 3px 3px; + -webkit-border-radius: 3px 3px 3px 3px; + -moz-border-radius: 3px 3px 3px 3px; } -select[size], select[multiple], select[size][multiple] { +select[size], +select[multiple], +select[size][multiple] { -webkit-appearance: listbox; } @@ -1599,7 +1892,7 @@ select { } keygen, select { - -webkit-border-radius: ; + /*-webkit-border-radius: ;*/ } input, textarea, keygen { @@ -1615,23 +1908,23 @@ input, textarea, keygen { } .qq-upload-button { - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; } #album-edit-link { width: 70px; - margin-bottom:20px; + margin-bottom: 20px; margin-top: 20px; background-color: #a2a2a2; color: #eeeeec; padding: 5px 10px 5px 10px; margin-right: 5px; font-style: bold; - -webkit-border-radius: 5px 5px 5px 5px; - -moz-border-radius: 5px 5px 5px 5px; - border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + -moz-border-radius: 5px 5px 5px 5px; } #album-edit-link a { @@ -1648,7 +1941,7 @@ input, textarea, keygen { #photo_edit_form { width: 500px; - margin-top:20px; + margin-top: 20px; text-align: left; } @@ -1684,7 +1977,9 @@ input#photo_edit_form { /* = Messages = */ /* ============ */ -#prvmail-wrapper, .mail-conv-detail, .mail-list-detail { +#prvmail-wrapper, +.mail-conv-detail, +.mail-list-detail { position: relative; width: 500px; padding: 50px; @@ -1695,7 +1990,12 @@ input#photo_edit_form { box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); } -#prvmail-wrapper:before, #prvmail-wrapper:after, .mail-conv-detail:before, .mail-conv-detail:after, .mail-list-detail:before, .mail-list-detail:after { +#prvmail-wrapper:before, +#prvmail-wrapper:after, +.mail-conv-detail:before, +.mail-conv-detail:after, +.mail-list-detail:before, +.mail-list-detail:after { position: absolute; width: 40%; height: 10px; @@ -1703,25 +2003,27 @@ input#photo_edit_form { left: 12px; bottom: 12px; background: transparent; - -webkit-transform: skew(-5deg) rotate(-5deg); - -moz-transform: skew(-5deg) rotate(-5deg); - -ms-transform: skew(-5deg) rotate(-5deg); - -o-transform: skew(-5deg) rotate(-5deg); transform: skew(-5deg) rotate(-5deg); - -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3); + -webkit-transform: skew(-5deg) rotate(-5deg); + -moz-transform: skew(-5deg) rotate(-5deg); + -ms-transform: skew(-5deg) rotate(-5deg); + -o-transform: skew(-5deg) rotate(-5deg); box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3); + -moz-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3); z-index: -1; } -#prvmail-wrapper:after, .mail-conv-detail:after, .mail-list-detail:after { +#prvmail-wrapper:after, +.mail-conv-detail:after, +.mail-list-detail:after { left: auto; right: 12px; - -webkit-transform: skew(5deg) rotate(5deg); - -moz-transform: skew(5deg) rotate(5deg); - -ms-transform: skew(5deg) rotate(5deg); - -o-transform: skew(5deg) rotate(5deg); transform: skew(5deg) rotate(5deg); + -webkit-transform: skew(5deg) rotate(5deg); + -moz-transform: skew(5deg) rotate(5deg); + -ms-transform: skew(5deg) rotate(5deg); + -o-transform: skew(5deg) rotate(5deg); } .prvmail-text { @@ -1730,27 +2032,33 @@ input#photo_edit_form { #prvmail-form input -#prvmail-subject { width: 490px;; padding-left: 10px; font-size: 1.1em; font-style: bold;} -#prvmail-subject .input{ - border: none !important ; +#prvmail-subject { + width: 490px; + padding-left: 10px; + font-size: 1.1em; + font-style: bold; } -#prvmail-subject-label { -/* font-variant:small-caps; */ +#prvmail-subject .input { + border: none !important; } +#prvmail-subject-label {} + #prvmail-to { padding-left: 10px; } -#prvmail-to-label { -/* font-variant:small-caps; */ -} + +#prvmail-to-label {} #prvmail-message-label { font-size: 1em; } -#prvmail-submit-wrapper { margin-top: 10px; } +#prvmail-submit-wrapper { + margin-top: 10px; +} + #prvmail-submit { float: right; margin-top: 0px; @@ -1786,9 +2094,9 @@ margin-left: 0px; width: 600px; min-height: 70px; padding: 20px; - padding-top:10px; + padding-top: 10px; border: 1px solid #dddddd; - } +} .mail-list-sender-name { font-size: 1.1em; @@ -1801,7 +2109,7 @@ margin-left: 0px; display: inline; font-size: 0.9em; padding-left: 10px; - font-stretch:ultra-condensed; + font-stretch: ultra-condensed; } .mail-list-subject { @@ -1815,7 +2123,10 @@ margin-left: 0px; color: #626262; } -.mail-list-delete-wrapper { float: right;} +.mail-list-delete-wrapper { + float: right; +} + .mail-list-outside-wrapper-end { clear: both; } @@ -1825,15 +2136,31 @@ margin-left: 0px; margin-top: 30px; } -.mail-conv-sender {float: left; margin: 0px 5px 5px 0px; } +.mail-conv-sender { + float: left; + margin: 0px 5px 5px 0px; +} + .mail-conv-sender-photo { width: 64px; height: 64px; } -.mail-conv-sender-name { float: left; font-style: bold; } -.mail-conv-date { float: right; } -.mail-conv-subject { clear: right; font-weight: bold; font-size: 1.2em } +.mail-conv-sender-name { + float: left; + font-style: bold; +} + +.mail-conv-date { + float: right; +} + +.mail-conv-subject { + clear: right; + font-weight: bold; + font-size: 1.2em; +} + .mail-conv-body { clear: both; } @@ -1848,8 +2175,16 @@ margin-left: 0px; margin: auto; border: 1px solid #dddddd; } -.mail-conv-break { display: none; border: none;} -.mail-conv-delete-wrapper { padding-top: 10px; width: 510px; text-align: right; } +.mail-conv-break { + display: none; + border: none; +} + +.mail-conv-delete-wrapper { + padding-top: 10px; + width: 510px; + text-align: right; +} #prvmail-subject { font-weight: bold; @@ -1862,16 +2197,16 @@ margin-left: 0px; #notification-show-hide-wrapper { width: 160px; - -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - box-shadow:inset 0px 1px 0px 0px #cfcfcf; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); - background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); - background-color:#bdbdbd; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; + box-shadow: inset 0px 1px 0px 0px #cfcfcf; + -moz-box-shadow: inset 0px 1px 0px 0px #cfcfcf; + -webkit-box-shadow: inset 0px 1px 0px 0px #cfcfcf; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); + background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); + background-color: #bdbdbd; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; padding: 5px 10px 5px 10px; margin-right: 5px; margin-top: 10px; @@ -1882,16 +2217,16 @@ margin-left: 0px; #notification-show-hide-wrapper:hover { color: #efefef; - 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% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color:#1873a2; + 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% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); + background-color: #1873a2; } #notification-show-hide-wrapper:active { background-color: #1873a2; - position:relative; - top:1px; + position: relative; + top: 1px; } #notification-show-hide-wrapper a { @@ -1916,18 +2251,30 @@ margin-left: 0px; position: relative; } -.contact-entry-direction-wrapper {position: absolute; top: 20px;} -.contact-entry-edit-links { position: absolute; top: 60px; } -#contacts-show-hide-link { margin-bottom: 20px; margin-top: 10px; font-weight: bold;} +.contact-entry-direction-wrapper { + position: absolute; + top: 20px; +} + +.contact-entry-edit-links { + position: absolute; + top: 60px; +} + +#contacts-show-hide-link { + margin-bottom: 20px; + margin-top: 10px; + font-weight: bold; +} .contact-entry-name { width: 100px; overflow: hidden; font: #999; font-size: 12px; - text-align:center; + text-align: center; font-weight: bold; - margin-top:5px; + margin-top: 5px; } .contact-entry-photo { @@ -1936,45 +2283,48 @@ margin-left: 0px; .contact-entry-edit-links .icon { border: 1px solid #babdb6; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + border-radius: 3px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; background-color: #ffffff; } -#contact-edit-banner-name { font-size: 1.5em; margin-left: 30px; } +#contact-edit-banner-name { + font-size: 1.5em; + margin-left: 30px; +} #contact-edit-update-now { - padding:7px; + padding: 7px; width: 165px; margin: auto; margin-left: 40px; - -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - box-shadow:inset 0px 1px 0px 0px #cfcfcf; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); - background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); - background-color:#bdbdbd; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; - display:inline-block; - color:#efefef; - text-decoration:none; + box-shadow: inset 0px 1px 0px 0px #cfcfcf; + -moz-box-shadow: inset 0px 1px 0px 0px #cfcfcf; + -webkit-box-shadow: inset 0px 1px 0px 0px #cfcfcf; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); + background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); + background-color: #bdbdbd; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + display: inline-block; + color: #efefef; + text-decoration: none; text-align: center; } #contact-edit-update-now: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% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color:#1873a2; + 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% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); + background-color: #1873a2; } #contact-edit-update-now:active { - position:relative; - top:1px; + position: relative; + top: 1px; } #contact-edit-update-now a { @@ -2006,30 +2356,39 @@ margin-left: 0px; left: 0px; top: 90px; display: none; z-index: 10000; - -moz-box-shadow: 3px 3px 5px #888; - -webkit-box-shadow: 3px 3px 5px #888; box-shadow: 3px 3px 5px #888; + -moz-box-shadow: 3px 3px 5px #888; + -webkit-box-shadow: 3px 3px 5px #888; +} + +.contact-photo-menu ul { + margin: 0px; + padding: 0px; + list-style: none; +} + +.contact-photo-menu li a { + display: block; + padding: 3px; + color: #626262; + font-size: 1em; } -.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none } -.contact-photo-menu li a { display: block; padding: 3px; color: #626262; font-size: 1em; } .contact-photo-menu li a:hover { color: #FFFFFF; - 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% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color:#1873a2; + 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% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); + background-color: #1873a2; text-decoration: none; } -.view-contact-name { -/* font-variant: small-caps; */ -} +.view-contact-name {} #div.side-link { background-color: #efefef; padding: 10px; - margin-top:20px; + margin-top: 20px; } #follow-sidebar { @@ -2057,10 +2416,10 @@ margin-left: 0px; width: 158px; padding: 10px; margin: auto 10px 20px; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); - background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); - background-color:#bdbdbd; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); + background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); + background-color: #bdbdbd; padding: 5px 10px 5px 10px; color: #efefef; font-size: 1.1em; @@ -2071,10 +2430,10 @@ margin-left: 0px; #side-match-link:hover { color: #efefef; - 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% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color:#1873a2; + 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% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); + background-color: #1873a2; border: 1px solid #7C7D7B; box-shadow: 0 0 8px #BDBDBD; border-radius: 5px 5px 5px 5px; @@ -2082,8 +2441,8 @@ margin-left: 0px; #side-match-link:active { background-color: #1873a2; - position:relative; - top:1px; + position: relative; + top: 1px; } #side-match-link a { @@ -2095,10 +2454,10 @@ margin-left: 0px; padding: 10px; margin: auto; margin-bottom: 20px; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); - background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); - background-color:#bdbdbd; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); + background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); + background-color: #bdbdbd; padding: 5px 10px 5px 10px; color: #efefef; font-size: 1.1em; @@ -2109,10 +2468,10 @@ margin-left: 0px; #side-invite-link:hover { color: #efefef; - 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% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color:#1873a2; + 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% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); + background-color: #1873a2; border: 1px solid #7C7D7B; box-shadow: 0 0 8px #BDBDBD; border-radius: 5px 5px 5px 5px; @@ -2121,8 +2480,8 @@ margin-left: 0px; #side-invite-link:active { background-color: #1873a2; - position:relative; - top:1px; + position: relative; + top: 1px; } #side-invite-link a { @@ -2134,10 +2493,10 @@ margin-left: 0px; padding: 10px; margin: auto; margin-bottom: 20px; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); - background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); - background-color:#bdbdbd; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); + background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); + background-color: #bdbdbd; padding: 5px 10px 5px 10px; color: #efefef; font-size: 1.1em; @@ -2148,10 +2507,10 @@ margin-left: 0px; #side-suggest-link:hover { color: #efefef; - 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% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color:#1873a2; + 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% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); + background-color: #1873a2; border: 1px solid #7C7D7B; box-shadow: 0 0 8px #BDBDBD; border-radius: 5px 5px 5px 5px; @@ -2159,29 +2518,31 @@ margin-left: 0px; #side-suggest-link:active { background-color: #1873a2; - position:relative; - top:1px; + position: relative; + top: 1px; } #side-suggest-link a { color: #efefef; } -#invite-message, #invite-recipients, #invite-recipient-text { +#invite-message, +#invite-recipients, +#invite-recipient-text { padding: 10px; } #side-follow-wrapper { font-size: 1em; font-weight: bold; - font-stretch:semi-expanded; + font-stretch: semi-expanded; background-color: #f3f3f3; border: 1px solid #cdcdcd; padding: 10px; margin-top: 20px; - -webkit-border-radius: 5px 5px 5px 5px; - -moz-border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + -moz-border-radius: 5px 5px 5px 5px; } #side-follow-wrapper label{ @@ -2195,16 +2556,16 @@ margin-left: 0px; width: 120px; padding: 10px; margin-bottom: 20px; - -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - box-shadow:inset 0px 1px 0px 0px #cfcfcf; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); - background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); - background-color:#bdbdbd; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; + box-shadow: inset 0px 1px 0px 0px #cfcfcf; + -moz-box-shadow: inset 0px 1px 0px 0px #cfcfcf; + -webkit-box-shadow: inset 0px 1px 0px 0px #cfcfcf; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); + background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); + background-color: #bdbdbd; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; padding: 5px 10px 5px 10px; color: #efefef; font-size: 1.2em; @@ -2213,16 +2574,16 @@ margin-left: 0px; #contact-suggest:hover { color: #efefef; - 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% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color:#1873a2; + 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% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); + background-color: #1873a2; } #contact-suggest:active { background-color: #1873a2; - position:relative; - top:1px; + position: relative; + top: 1px; } #contact-suggest a { @@ -2273,52 +2634,52 @@ margin-left: 0px; #uexport-link { width: 140px; - -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - box-shadow:inset 0px 1px 0px 0px #cfcfcf; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #7c7d7b), color-stop(1, #555753) ); - background:-moz-linear-gradient( center top, #7c7d7b 5%, #555753 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#7c7d7b', endColorstr='#555753'); - background-color:#7c7d7b; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; + box-shadow: inset 0px 1px 0px 0px #cfcfcf; + -moz-box-shadow: inset 0px 1px 0px 0px #cfcfcf; + -webkit-box-shadow: inset 0px 1px 0px 0px #cfcfcf; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #7c7d7b), color-stop(1, #555753) ); + background: -moz-linear-gradient( center top, #7c7d7b 5%, #555753 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7c7d7b', endColorstr='#555753'); + background-color: #7c7d7b; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; padding: 5px 10px 5px 10px; margin-bottom: 10px; } #uexport-link:hover { color: #efefef; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #555753), color-stop(1, #7c7d7b) ); - background:-moz-linear-gradient( center top, #555753 5%, #7c7d7b 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#555753', endColorstr='#7c7d7b'); - background-color:#555753; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #555753), color-stop(1, #7c7d7b) ); + background: -moz-linear-gradient( center top, #555753 5%, #7c7d7b 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555753', endColorstr='#7c7d7b'); + background-color: #555753; } #uexport-link:active { color: #efefef; - 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% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color:#1873a2; - position:relative; - top:1px; + 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% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); + background-color: #1873a2; + position: relative; + top: 1px; } #settings-default-perms { width: 260px; text-align: center; - -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - box-shadow:inset 0px 1px 0px 0px #cfcfcf; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #7c7d7b), color-stop(1, #555753) ); + box-shadow: inset 0px 1px 0px 0px #cfcfcf; + -moz-box-shadow: inset 0px 1px 0px 0px #cfcfcf; + -webkit-box-shadow: inset 0px 1px 0px 0px #cfcfcf; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #7c7d7b), color-stop(1, #555753) ); background: -moz-linear-gradient(center top , #BDBDBD 5%, #A2A2A2 100%) repeat scroll 0 0 #BDBDBD; - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#7c7d7b', endColorstr='#555753'); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7c7d7b', endColorstr='#555753'); color: #EFEFEF; - background-color:#7c7d7b; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; + background-color: #7c7d7b; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; padding: 5px 10px 5px 10px; margin-bottom: 10px; } @@ -2329,29 +2690,29 @@ margin-left: 0px; #settings-default-perms:hover { color: #efefef; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #555753), color-stop(1, #7c7d7b) ); - background:-moz-linear-gradient( center top, #555753 5%, #7c7d7b 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#555753', endColorstr='#7c7d7b'); - background-color:#555753; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #555753), color-stop(1, #7c7d7b) ); + background: -moz-linear-gradient( center top, #555753 5%, #7c7d7b 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555753', endColorstr='#7c7d7b'); + background-color: #555753; } #settings-default-perms:active { color: #efefef; - 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% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color:#1873a2; - position:relative; - top:1px; + 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% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); + background-color: #1873a2; + position: relative; + top: 1px; } #settings-nickname-desc { width: 80%; background-color: #efefef; margin-bottom: 10px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; border-radius: 5px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; padding: 5px; } @@ -2370,25 +2731,39 @@ margin-left: 0px; #register-form label, #profile-edit-form label { - width: 300px; float: left; + width: 300px; + float: left; } /* #register-form span, #profile-edit-form span { */ #register-form span { color: #555753; - display:block; + display: block; margin-bottom: 20px; } .settings-submit-wrapper, -.profile-edit-submit-wrapper { margin: 30px 0px;} -.profile-listing { float: left; clear: both; margin: 20px 20px 0px 0px} +.profile-edit-submit-wrapper { + margin: 30px 0px; +} -#profile-edit-links ul { margin: 20px 0px; padding: 0px; list-style: none; } +.profile-listing { + float: left; + clear: both; + 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-sitename { + display: inline; + font-weight: bold; +} /* ===================== */ /* = Contacts Selector = */ @@ -2414,30 +2789,30 @@ margin-left: 0px; display: inline; padding: 5px; margin-bottom: 10px; - -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - box-shadow:inset 0px 1px 0px 0px #cfcfcf; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); - background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); - background-color:#bdbdbd; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; + box-shadow: inset 0px 1px 0px 0px #cfcfcf; + -moz-box-shadow: inset 0px 1px 0px 0px #cfcfcf; + -webkit-box-shadow: inset 0px 1px 0px 0px #cfcfcf; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); + background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); + background-color: #bdbdbd; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; } .group-delete-wrapper: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% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color:#1873a2; + 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% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); + background-color: #1873a2; } .group-delete-wrapper:active { - 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% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color:#1873a2; + 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% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); + background-color: #1873a2; } .group-delete-wrapper a { @@ -2445,8 +2820,14 @@ margin-left: 0px; font-size: 0.9em; } -#group-edit-desc { margin: 10px 0xp; } -#group-new-text {font-size: 1.1em;} +#group-edit-desc { + margin: 10px 0xp; +} + +#group-new-text { + font-size: 1.1em; +} + #group-members, #prof-members { width: 83%; @@ -2480,13 +2861,19 @@ margin-left: 0px; } #group-separator, -#prof-separator { display: none;} +#prof-separator { + display: none; +} /* ========== */ /* = Events = */ /* ========== */ -.clear { clear: both; } +.clear { + clear: both; + margin-top: 10px; +} + .eventcal { float: left; font-size: 20px; @@ -2501,12 +2888,13 @@ margin-left: 0px; margin: 0 0px; margin-bottom: 10px; background-color: #fff; - -webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); + -webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); } -.vevent:before, .vevent:after { +.vevent:before, +.vevent:after { position: absolute; width: 40%; height: 10px; @@ -2514,45 +2902,45 @@ margin-left: 0px; left: 12px; bottom: 12px; background: transparent; - -webkit-transform: skew(-5deg) rotate(-5deg); - -moz-transform: skew(-5deg) rotate(-5deg); - -ms-transform: skew(-5deg) rotate(-5deg); - -o-transform: skew(-5deg) rotate(-5deg); transform: skew(-5deg) rotate(-5deg); - -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3); + -webkit-transform: skew(-5deg) rotate(-5deg); + -moz-transform: skew(-5deg) rotate(-5deg); + -ms-transform: skew(-5deg) rotate(-5deg); + -o-transform: skew(-5deg) rotate(-5deg); box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3); + -moz-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3); z-index: -1; } .vevent:after { left: auto; right: 12px; - -webkit-transform: skew(5deg) rotate(5deg); - -moz-transform: skew(5deg) rotate(5deg); - -ms-transform: skew(5deg) rotate(5deg); - -o-transform: skew(5deg) rotate(5deg); transform: skew(5deg) rotate(5deg); + -webkit-transform: skew(5deg) rotate(5deg); + -moz-transform: skew(5deg) rotate(5deg); + -ms-transform: skew(5deg) rotate(5deg); + -o-transform: skew(5deg) rotate(5deg); } .vevent .event-description { margin-left: 10px; margin-right: 10px; - text-align:center; + text-align: center; font-size: 1.2em; - font-weight:bolder; + font-weight: bolder; } - .vevent .event-location{ + .vevent .event-location { margin-left: 10px; margin-right: 10px; font-size: 1em; font-style: oblique; text-align: center; - } -.vevent .event-start, .vevent .event-end { +.vevent .event-start, +.vevent .event-end { margin-left: 20px; margin-right: 20px; margin-bottom: 2px; @@ -2561,36 +2949,36 @@ margin-left: 0px; text-align: left; } -#new-event-link{ +#new-event-link { width: 130px; padding: 7px; margin-bottom: 10px; - margin-left: 170px; ; - -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - box-shadow:inset 0px 1px 0px 0px #cfcfcf; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); - background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); - background-color:#bdbdbd; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; + margin-left: 170px; + box-shadow: inset 0px 1px 0px 0px #cfcfcf; + -moz-box-shadow: inset 0px 1px 0px 0px #cfcfcf; + -webkit-box-shadow: inset 0px 1px 0px 0px #cfcfcf; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); + background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); + background-color: #bdbdbd; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; color: #efefef; } #new-event-link:hover { color: #efefef; - 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% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color:#1873a2; + 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% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); + background-color: #1873a2; } #new-event-link:active { background-color: #1873a2; - position:relative; - top:1px; + position: relative; + top: 1px; } #new-event-link a { @@ -2611,22 +2999,25 @@ margin-left: 0px; vertical-align: middle; } -.event-start, .event-end { +.event-start, +.event-end { margin-left: 10px; width: 330px; } -.event-start .dtstart, .event-end .dtend { +.event-start .dtstart, +.event-end .dtend { float: right; } .event-list-date { color: #626262; margin-bottom: 10px; - font-stretch:condensed; + font-stretch: condensed; } -.prevcal, .nextcal { +.prevcal, +.nextcal { float: left; margin-left: 32px; margin-right: 32px; @@ -2643,24 +3034,24 @@ margin-left: 0px; background-color: #f1f1f1; border: 1px solid #dedede; margin-bottom: 10px; - -moz-box-shadow: 5px 5px 8px #959494; - -webkit-box-shadow: 5px 5px 8px #959494; - box-shadow: 5px 5px 8px #959494; + box-shadow: 5px 5px 8px #959494; + -moz-box-shadow: 5px 5px 8px #959494; + -webkit-box-shadow: 5px 5px 8px #959494; } -.calendar caption{ - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #6da6c4), color-stop(1, #1873a2) ); - background:-moz-linear-gradient( center top, #6da6c4 5%, #1873a2 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#6da6c4', endColorstr='#1873a2'); +.calendar caption { + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #6da6c4), color-stop(1, #1873a2) ); + background: -moz-linear-gradient( center top, #6da6c4 5%, #1873a2 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#6da6c4', endColorstr='#1873a2'); background-color: #1873a2; padding: 10px 0px 10px 0px; width: 300px; color: #ffffff; font-weight: bold; - text-align:center; - -moz-box-shadow: 5px 2px 8px #959494; - -webkit-box-shadow: 5px 2px 8px #959494; + text-align: center; box-shadow: 5px 2px 8px #959494; + -moz-box-shadow: 5px 2px 8px #959494; + -webkit-box-shadow: 5px 2px 8px #959494; } tr { @@ -2676,7 +3067,7 @@ tr { .calendar td > a { background-color: #cdcdcd; padding: 2px; - color: #000; + color: #000000; } .calendar th { @@ -2687,7 +3078,7 @@ tr { font-weight: bold; text-align: center; background-color: #1873a2; - color: #fff; + color: #ffffff; } #event-start-text, @@ -2797,8 +3188,10 @@ tr { clear:left; } -#adminpage #pluginslist { - margin: 0px; padding: 0px; +#adminpage +#pluginslist { + margin: 0px; + padding: 0px; } #adminpage .plugin { @@ -2811,16 +3204,36 @@ tr { } #adminpage .toggleplugin { - float:left; + float: left; margin-right: 1em; } -#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;} -#adminpage table th { text-align: left;} -#adminpage td .icon { float: left;} -#adminpage table#users img { width: 16px; height: 16px; } -#adminpage table tr:hover { background-color: #eeeeee; } -#adminpage .selectall { text-align: right; } +#adminpage table { + width: 100%; + border-bottom: 1p solid #000000; + margin: 5px 0px; +} + +#adminpage table th { + text-align: left; +} + +#adminpage td .icon { + float: left; +} + +#adminpage table#users img { + width: 16px; + height: 16px; +} + +#adminpage table tr:hover { + background-color: #eeeeee; +} + +#adminpage .selectall { + text-align: right; +} /* =============== */ /* = Form Fields = */ @@ -2830,13 +3243,12 @@ tr { margin-bottom: 10px; margin-top: 10px; padding-bottom: 0px; - /*overflow: auto;*/ width: 90%; } .field label { float: left; - width: 480px; /*550*/ + width: 480px; } .field input, @@ -2844,9 +3256,11 @@ tr { width: 220px; border: 1px solid #CDCDCD; border-radius: 5px 5px 5px 5px; - /*box-shadow: 3px 3px 4px 0 #959494;*/ } -.field textarea { height: 100px; } +.field textarea { + height: 100px; +} + .field_help { display: block; margin-left: 100px; @@ -2859,15 +3273,15 @@ tr { } .field .onoff a { display: block; - border:1px solid #c1c1c1; - background-image:url("../../../images/onoff.jpg"); + border: 1px solid #c1c1c1; + background-image: url("../../../images/onoff.jpg"); background-repeat: no-repeat; padding: 4px 2px 2px 2px; height: 16px; text-decoration: none; } .field .onoff .off { - border-color:#c1c1c1; + border-color: #c1c1c1; padding-left: 40px; background-position: left center; background-color: #cccccc; @@ -2876,7 +3290,7 @@ tr { } .field .onoff .on { - border-color:#c1c1c1; + border-color: #c1c1c1; padding-right: 40px; background-position: right center; background-color: #1873a2; @@ -2884,9 +3298,13 @@ tr { text-align: left; } -.hidden { display: none!important; } +.hidden { + display: none!important; +} -.field.radio .field_help { margin-left: 0px; } +.field.radio .field_help { + margin-left: 0px; +} /* ========= */ /* = Icons = */ @@ -2899,11 +3317,13 @@ tr { .icon { margin-left: 5px; margin-right: 5px; - display: block; width: 20px; height: 20px; + display: block; + width: 20px; + height: 20px; background-image: url("icons.png"); } .starred { - background-image: url("star.png"); + background-image: url("star.png"); repeat: no-repeat; } .unstarred { @@ -2912,15 +3332,15 @@ tr { } .notify { - background-image: url("notifications.png");} + background-image: url("notifications.png"); repeat: no-repeat; } .border { border: 1px solid #c1c1c1; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; border-radius: 3px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; } .article { background-position: -50px 0px;} @@ -2929,16 +3349,16 @@ tr { .drop { background-position: -110px 0px;} .drophide { background-position: -130px 0px;} .edit { background-position: -150px 0px;} -.camera { background-position: -170px 0px;} +.camera { background-position: -170px 0px;} .dislike { background-position: -190px 0px;} .like { background-position: -210px 0px;} .link { background-position: -230px 0px;} .globe { background-position: -50px -20px;} .noglobe { background-position: -70px -20px;} -.no { background-position: -90px -20px;} +.no { background-position: -90px -20px;} .pause { background-position: -110px -20px;} .play { background-position: -130px -20px;} -.pencil { background-position: -150px -20px;} +.pencil { background-position: -150px -20px;} .small-pencil { background-position: -170px -20px;} .recycle { background-position: -190px -20px;} .remote-link { background-position: -210px -20px;} @@ -2962,18 +3382,14 @@ tr { .video { background-position: -110px -40px;} .youtube { background-position: -130px -40px;} - -.attach { background-position: -190px -40px;} +.attach { background-position: -190px -40px;} .language { background-position: -210px -40px;} - - -.on { background-position: -50px -60px;} +.on { background-position: -50px -60px;} .off { background-position: -70px -60px;} .prev { background-position: -90px -60px;} .next { background-position: -110px -60px;} -.tagged { background-position: -130px -60px;} - -.icon.dim { opacity: 0.3;filter:alpha(opacity=30); } +.tagged { background-position: -130px -60px;} +.icon.dim { opacity: 0.3;filter:alpha(opacity=30);} .attachtype { display: block; width: 20px; height: 23px; @@ -2989,14 +3405,21 @@ tr { /* ========== */ /* = Footer = */ /* ========== */ - -.cc-license { margin-top: 100px; font-size: 0.7em; } -footer { display: block; margin: 50px 20%; clear: both; } - + +.cc-license { + margin-top: 100px; + font-size: 0.7em; +} + +footer { + display: block; + margin: 50px 20%; + clear: both; +} + #profile-jot-text { height: 20px; - color:#cccccc; - /*border: 1px solid #cccccc;*/ + color: #cccccc; } /* ======= */ @@ -3006,7 +3429,7 @@ footer { display: block; margin: 50px 20%; clear: both; } #photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper{ - display:block!important; + display: block!important; } #acl-wrapper { @@ -3016,8 +3439,9 @@ footer { display: block; margin: 50px 20%; clear: both; } #acl-search { float:right; background: #ffffff url("../../../images/search_18.png") no-repeat right center; - padding-right:20px; + padding-right: 20px; } + #acl-showall { float: left; display: block; @@ -3030,13 +3454,14 @@ footer { display: block; margin: 50px 20%; clear: both; } background-position: 7px 7px; background-repeat: no-repeat; padding: 5px; - -webkit-border-radius: 5px ; - -moz-border-radius: 5px; border-radius: 5px; + -webkit-border-radius: 5px ; + -moz-border-radius: 5px; color: #999999; } + #acl-showall.selected { - color: #fff; + color: #ffffff; background-color: #1873a2; } @@ -3061,19 +3486,19 @@ footer { display: block; margin: 50px 20%; clear: both; } background-color: #fff; margin: 5px; float: left; - -moz-box-shadow: 2px 2px 3px #c1c1c1; - -webkit-box-shadow: 2px 2px 3px #c1c1c1; box-shadow: 2px 2px 3px #c1c1c1; + -moz-box-shadow: 2px 2px 3px #c1c1c1; + -webkit-box-shadow: 2px 2px 3px #c1c1c1; } .acl-list-item img{ - width:30px; + width: 30px; height: 30px; float: left; margin: 5px; } .acl-list-item p { - color: #999; + color: #999999; height: 12px; font-size: 0.7em; margin: 0px; @@ -3090,9 +3515,9 @@ footer { display: block; margin: 50px 20%; clear: both; } background-position: 3px 3px; background-repeat: no-repeat; margin: 10px 0 0 5px; - -webkit-border-radius: 2px ; - -moz-border-radius: 2px; border-radius: 2px; + -webkit-border-radius: 2px ; + -moz-border-radius: 2px; padding: 3px; } @@ -3123,32 +3548,32 @@ footer { display: block; margin: 50px 20%; clear: both; } padding: 7px; margin-bottom: 10px; margin-left: 0px; - -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - box-shadow:inset 0px 1px 0px 0px #cfcfcf; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); - background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); - background-color:#bdbdbd; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; + box-shadow: inset 0px 1px 0px 0px #cfcfcf; + -moz-box-shadow: inset 0px 1px 0px 0px #cfcfcf; + -webkit-box-shadow: inset 0px 1px 0px 0px #cfcfcf; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); + background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); + background-color: #bdbdbd; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; color: #efefef; text-align: center; } #global-directory-link:hover { color: #efefef; - 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% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color:#1873a2; + 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% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); + background-color: #1873a2; } #global-directory-link:active { background-color: #1873a2; - position:relative; - top:1px; + position: relative; + top: 1px; } #global-directory-link a { @@ -3160,11 +3585,11 @@ footer { display: block; margin: 50px 20%; clear: both; } } a.active { - 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% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color:#1873a2; - color:#fec01d; + 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% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); + background-color: #1873a2; + color: #fec01d; padding: 5px 10px 5px 10px; margin-right: 5px; } @@ -3196,35 +3621,48 @@ ul.menu-popup { #nav-notifications-menu { width: 320px; max-height: 400px; - overflow-y: scroll;overflow-style:scrollbar; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #797979), color-stop(1, #898988) ); - background:-moz-linear-gradient( center top, #797979 5%, #898988 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#797979', endColorstr='#898988'); - background-color:#a2a2a2; - -moz-border-radius:0px 0px 5px 5px; - -webkit-border-radius:0px 0px 5px 5px; - border-radius:0px 0px 5px 5px; + overflow-y: scroll; + overflow-style: scrollbar; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #797979), color-stop(1, #898988) ); + background: -moz-linear-gradient( center top, #797979 5%, #898988 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#797979', endColorstr='#898988'); + background-color: #a2a2a2; + border-radius: 0px 0px 5px 5px; + -moz-border-radius: 0px 0px 5px 5px; + -webkit-border-radius: 0px 0px 5px 5px; border: 1px solid #9A9A9A; border-top: none; - -moz-box-shadow: 5px 5px 10px #242424; - -webkit-box-shadow: 5px 5px 10px #242424; box-shadow: 5px 5px 10px #242424; + -moz-box-shadow: 5px 5px 10px #242424; + -webkit-box-shadow: 5px 5px 10px #242424; } -#nav-notifications-menu .contactname { font-weight: bold; font-size: 0.9em; } -#nav-notifications-menu img { float: left; margin-right: 5px; } -#nav-notifications-menu .notif-when { font-size: 0.8em; display: block; } +#nav-notifications-menu .contactname { + font-weight: bold; + font-size: 0.9em; +} + +#nav-notifications-menu img { + float: left; + margin-right: 5px; +} + +#nav-notifications-menu .notif-when { + font-size: 0.8em; + display: block; +} + #nav-notifications-menu li { padding: 7px 0px 7px 10px; - word-wrap:normal; + word-wrap: normal; border-bottom: 1px solid #626262; } #nav-notifications-menu li: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% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color:#1873a2; + 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% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); + background-color: #1873a2; } #nav-notifications-menu a:hover { @@ -3253,25 +3691,26 @@ ul.menu-popup { /* autocomplete popup */ .acpopup { - max-height:150px; - overflow:auto; - z-index:100000; + max-height: 150px; + overflow: auto; + z-index: 100000; color: #2e3436; border-top: 0px; background: #eeeeee; border-right: 1px solid #dddddd; border-left: 1px solid #dddddd; border-bottom: 1px solid #dddddd; - -webkit-border-radius: 0px 5px 5px 5px; - -moz-border-radius: 0px 5px 5px 5px; border-radius: 0px 5px 5px 5px; - -moz-box-shadow: 3px 3px 4px #959494; - -webkit-box-shadow: 3px 3px 4px #959494; + -webkit-border-radius: 0px 5px 5px 5px; + -moz-border-radius: 0px 5px 5px 5px; box-shadow: 3px 3px 4px #959494; + -moz-box-shadow: 3px 3px 4px #959494; + -webkit-box-shadow: 3px 3px 4px #959494; } .acpopupitem { - color: #2e3436; padding: 4px; + color: #2e3436; + padding: 4px; clear:left; } .acpopupitem img { @@ -3281,25 +3720,25 @@ ul.menu-popup { .acpopupitem.selected { color: #efefef; - 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% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color:#1873a2; + 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% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); + background-color: #1873a2; order-bottom: none; } .qcomment { opacity: 0; - filter:alpha(opacity=0); + filter: alpha(opacity=0); } .qcomment:hover { opacity: 1.0; - filter:alpha(opacity=100); + filter: alpha(opacity=100); } .notify-seen { - background: #000; + background: #000000; } /* Pages profile widget @@ -3311,7 +3750,6 @@ ul.menu-popup { hr.line-dots { background: url("dot.png") repeat-x scroll left center transparent; border: medium none; - /*padding: 0.5em 0;*/ } /* SCROLL TO TOP @@ -3322,9 +3760,15 @@ hr.line-dots { bottom:5px; z-index:100; } -#scrollup a:hover{text-decoration:none;border:0;} +#scrollup a:hover{ + text-decoration: none; + border: 0; +} + +/* New posts and comments => background color +----------------------------------------------------------- */ .shiny { -background: #fbfde9; -border-radius: 5px; + background: #fbfde9; + border-radius: 5px; } \ No newline at end of file From 0cc661dd9c4c6a3d282ca07230b59411ecf97ff0 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Thu, 13 Sep 2012 16:50:55 +0200 Subject: [PATCH 013/124] modified: view/theme/smoothly/style.css --- view/theme/smoothly/style.css | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 8fc103994..8c6dd2290 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -3755,10 +3755,10 @@ hr.line-dots { /* SCROLL TO TOP ----------------------------------------------------------- */ #scrollup { - position:fixed; - right:5px; - bottom:5px; - z-index:100; + position: fixed; + right: 5px; + bottom: 5px; + z-index: 100; } #scrollup a:hover{ @@ -3771,4 +3771,9 @@ hr.line-dots { .shiny { background: #fbfde9; border-radius: 5px; -} \ No newline at end of file +} + +/*div.wall-item-content-wrapper.shiny { + background-image: url("star.png"); + background-repeat: no-repeat; +}*/ \ No newline at end of file From 4b8f3a4194b8fbec19e8a085fcd16e9369fbfcd2 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Thu, 13 Sep 2012 20:51:34 +0100 Subject: [PATCH 014/124] Friendicaland --- js/country.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/country.js b/js/country.js index 1494dad2e..96165409a 100644 --- a/js/country.js +++ b/js/country.js @@ -275,7 +275,7 @@ aStates[249]="|'Adan|'Ataq|Abyan|Al Bayda'|Al Hudaydah|Al Jawf|Al Mahrah|Al Mahw aStates[250]="|Kosovo|Montenegro|Serbia|Vojvodina"; aStates[251]="|Central|Copperbelt|Eastern|Luapula|Lusaka|North-Western|Northern|Southern|Western"; aStates[252]="|Bulawayo|Harare|ManicalandMashonaland Central|Mashonaland East|Mashonaland West|Masvingo|Matabeleland North|Matabeleland South|Midlands"; -aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|DFRN|Distributed Friend Network|ErrLock|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hikado|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Optimistisch|Recolutionari.es|SilverLips|Sparkling Network|SPRACI|Styliztique|Sysfu Social Club|Trevena|theshi.re|Tumpambae|Uzmiac|Other"; +aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|DFRN|Distributed Friend Network|ErrLock|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hikado|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Optimistisch|Pplsnet|Recolutionari.es|SilverLips|Sparkling Network|SPRACI|Styliztique|Sysfu Social Club|Trevena|theshi.re|Tumpambae|Uzmiac|Other"; /* * gArCountryInfo * (0) Country name From aa37b0cb0f07656e65510225ebe216458108cc63 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 13 Sep 2012 16:58:06 -0700 Subject: [PATCH 015/124] rev update --- boot.php | 2 +- util/messages.po | 238 ++++++++++++++++++++++++++++++----------------- 2 files changed, 155 insertions(+), 85 deletions(-) diff --git a/boot.php b/boot.php index c0a7a0e29..01b99abd8 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.1464' ); +define ( 'FRIENDICA_VERSION', '3.0.1465' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1155 ); diff --git a/util/messages.po b/util/messages.po index 694414f4a..e88044c5b 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1464\n" +"Project-Id-Version: 3.0.1465\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-12 10:00-0700\n" +"POT-Creation-Date: 2012-09-13 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -56,8 +56,9 @@ msgstr "" #: ../../mod/profiles.php:413 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 -#: ../../addon/facebook/facebook.php:516 -#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3844 +#: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 +#: ../../addon/fbpost/fbpost.php:165 +#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3908 #: ../../index.php:317 msgid "Permission denied." msgstr "" @@ -140,15 +141,15 @@ msgstr "" #: ../../addon/fromgplus/fromgplus.php:40 #: ../../addon/facebook/facebook.php:619 #: ../../addon/snautofollow/snautofollow.php:64 ../../addon/bg/bg.php:90 -#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93 -#: ../../addon/nsfw/nsfw.php:57 ../../addon/page/page.php:210 -#: ../../addon/planets/planets.php:158 +#: ../../addon/fbpost/fbpost.php:226 ../../addon/yourls/yourls.php:76 +#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57 +#: ../../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 #: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92 #: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41 #: ../../addon/forumlist/forumlist.php:169 -#: ../../addon/impressum/impressum.php:82 +#: ../../addon/impressum/impressum.php:83 #: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57 #: ../../addon/qcomment/qcomment.php:61 #: ../../addon/openstreetmap/openstreetmap.php:70 @@ -158,7 +159,7 @@ msgstr "" #: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84 #: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:95 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93 -#: ../../addon/jappixmini/jappixmini.php:302 +#: ../../addon/jappixmini/jappixmini.php:307 #: ../../addon/statusnet/statusnet.php:278 #: ../../addon/statusnet/statusnet.php:292 #: ../../addon/statusnet/statusnet.php:318 @@ -874,7 +875,7 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:3223 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:3287 msgid "[Name Withheld]" msgstr "" @@ -1951,9 +1952,9 @@ msgstr "" #: ../../mod/register.php:90 ../../mod/register.php:144 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752 #: ../../addon/facebook/facebook.php:702 -#: ../../addon/facebook/facebook.php:1200 +#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3232 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3296 #: ../../boot.php:788 msgid "Administrator" msgstr "" @@ -2101,7 +2102,7 @@ msgid "Private forum has no privacy permissions and no default privacy group." msgstr "" #: ../../mod/settings.php:471 ../../addon/facebook/facebook.php:495 -#: ../../addon/impressum/impressum.php:77 +#: ../../addon/fbpost/fbpost.php:144 ../../addon/impressum/impressum.php:78 #: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 #: ../../addon/twitter/twitter.php:389 @@ -2648,6 +2649,7 @@ msgstr "" #: ../../mod/notes.php:63 ../../mod/filer.php:30 #: ../../addon/facebook/facebook.php:770 #: ../../addon/privacy_image_cache/privacy_image_cache.php:263 +#: ../../addon/fbpost/fbpost.php:267 #: ../../addon/dav/friendica/layout.fnk.php:441 #: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:681 msgid "Save" @@ -2809,7 +2811,7 @@ msgid "Connecting" msgstr "" #: ../../mod/newmember.php:49 ../../mod/newmember.php:51 -#: ../../addon/facebook/facebook.php:728 +#: ../../addon/facebook/facebook.php:728 ../../addon/fbpost/fbpost.php:239 #: ../../include/contact_selectors.php:81 msgid "Facebook" msgstr "" @@ -3110,7 +3112,7 @@ msgstr "" #: ../../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/display.php:145 ../../include/items.php:3710 +#: ../../mod/display.php:145 ../../include/items.php:3774 msgid "Item not found." msgstr "" @@ -4747,7 +4749,7 @@ msgstr "" msgid "Updating contacts" msgstr "" -#: ../../addon/facebook/facebook.php:551 +#: ../../addon/facebook/facebook.php:551 ../../addon/fbpost/fbpost.php:192 msgid "Facebook API key is missing." msgstr "" @@ -4763,13 +4765,13 @@ msgstr "" msgid "Remove Facebook connector" msgstr "" -#: ../../addon/facebook/facebook.php:576 +#: ../../addon/facebook/facebook.php:576 ../../addon/fbpost/fbpost.php:217 msgid "" "Re-authenticate [This is necessary whenever your Facebook password is " "changed.]" msgstr "" -#: ../../addon/facebook/facebook.php:583 +#: ../../addon/facebook/facebook.php:583 ../../addon/fbpost/fbpost.php:224 msgid "Post to Facebook by default" msgstr "" @@ -4835,11 +4837,11 @@ msgstr "" msgid "Facebook Connector Settings" msgstr "" -#: ../../addon/facebook/facebook.php:744 +#: ../../addon/facebook/facebook.php:744 ../../addon/fbpost/fbpost.php:255 msgid "Facebook API Key" msgstr "" -#: ../../addon/facebook/facebook.php:754 +#: ../../addon/facebook/facebook.php:754 ../../addon/fbpost/fbpost.php:262 msgid "" "Error: it appears that you have specified the App-ID and -Secret in your ." "htconfig.php file. As long as they are specified there, they cannot be set " @@ -4862,11 +4864,11 @@ msgid "" "going on." msgstr "" -#: ../../addon/facebook/facebook.php:766 +#: ../../addon/facebook/facebook.php:766 ../../addon/fbpost/fbpost.php:264 msgid "App-ID / API-Key" msgstr "" -#: ../../addon/facebook/facebook.php:767 +#: ../../addon/facebook/facebook.php:767 ../../addon/fbpost/fbpost.php:265 msgid "Application secret" msgstr "" @@ -4901,38 +4903,38 @@ msgstr "" msgid "Activate Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:799 +#: ../../addon/facebook/facebook.php:799 ../../addon/fbpost/fbpost.php:282 #: ../../addon/dav/friendica/layout.fnk.php:361 msgid "The new values have been saved." msgstr "" -#: ../../addon/facebook/facebook.php:823 +#: ../../addon/facebook/facebook.php:823 ../../addon/fbpost/fbpost.php:301 msgid "Post to Facebook" msgstr "" -#: ../../addon/facebook/facebook.php:921 +#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:399 msgid "" "Post to Facebook cancelled because of multi-network access permission " "conflict." msgstr "" -#: ../../addon/facebook/facebook.php:1149 +#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:610 msgid "View on Friendica" msgstr "" -#: ../../addon/facebook/facebook.php:1182 +#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:643 msgid "Facebook post failed. Queued for retry." msgstr "" -#: ../../addon/facebook/facebook.php:1222 +#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:683 msgid "Your Facebook connection became invalid. Please Re-authenticate." msgstr "" -#: ../../addon/facebook/facebook.php:1223 +#: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:684 msgid "Facebook connection became invalid" msgstr "" -#: ../../addon/facebook/facebook.php:1224 +#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:685 #, php-format msgid "" "Hi %1$s,\n" @@ -4986,6 +4988,26 @@ msgstr "" msgid "Delete the whole cache" msgstr "" +#: ../../addon/fbpost/fbpost.php:172 +msgid "Facebook Post disabled" +msgstr "" + +#: ../../addon/fbpost/fbpost.php:199 +msgid "Facebook Post" +msgstr "" + +#: ../../addon/fbpost/fbpost.php:205 +msgid "Install Facebook Post connector for this account." +msgstr "" + +#: ../../addon/fbpost/fbpost.php:212 +msgid "Remove Facebook Post connector" +msgstr "" + +#: ../../addon/fbpost/fbpost.php:240 +msgid "Facebook Post Settings" +msgstr "" + #: ../../addon/widgets/widget_like.php:58 #, php-format msgid "%d person likes this" @@ -5045,11 +5067,11 @@ msgid "did something obscenely biological to" msgstr "" #: ../../addon/morepokes/morepokes.php:22 -msgid "point out the new poke feature to" +msgid "point out the poke feature to" msgstr "" #: ../../addon/morepokes/morepokes.php:22 -msgid "pointed out the new poke feature to" +msgid "pointed out the poke feature to" msgstr "" #: ../../addon/morepokes/morepokes.php:23 @@ -5061,112 +5083,108 @@ msgid "declared undying love for" msgstr "" #: ../../addon/morepokes/morepokes.php:24 -msgid "set fire to" -msgstr "" - -#: ../../addon/morepokes/morepokes.php:25 msgid "patent" msgstr "" -#: ../../addon/morepokes/morepokes.php:25 +#: ../../addon/morepokes/morepokes.php:24 msgid "patented" msgstr "" -#: ../../addon/morepokes/morepokes.php:26 +#: ../../addon/morepokes/morepokes.php:25 msgid "stroke beard" msgstr "" -#: ../../addon/morepokes/morepokes.php:26 +#: ../../addon/morepokes/morepokes.php:25 msgid "stroked their beard at" msgstr "" -#: ../../addon/morepokes/morepokes.php:27 +#: ../../addon/morepokes/morepokes.php:26 msgid "" "bemoan the declining standards of modern secondary and tertiary education to" msgstr "" -#: ../../addon/morepokes/morepokes.php:27 +#: ../../addon/morepokes/morepokes.php:26 msgid "" "bemoans the declining standards of modern secondary and tertiary education to" msgstr "" -#: ../../addon/morepokes/morepokes.php:28 +#: ../../addon/morepokes/morepokes.php:27 msgid "hug" msgstr "" -#: ../../addon/morepokes/morepokes.php:28 +#: ../../addon/morepokes/morepokes.php:27 msgid "hugged" msgstr "" -#: ../../addon/morepokes/morepokes.php:29 +#: ../../addon/morepokes/morepokes.php:28 msgid "kiss" msgstr "" -#: ../../addon/morepokes/morepokes.php:29 +#: ../../addon/morepokes/morepokes.php:28 msgid "kissed" msgstr "" -#: ../../addon/morepokes/morepokes.php:30 +#: ../../addon/morepokes/morepokes.php:29 msgid "raise eyebrows at" msgstr "" -#: ../../addon/morepokes/morepokes.php:30 +#: ../../addon/morepokes/morepokes.php:29 msgid "raised their eyebrows at" msgstr "" -#: ../../addon/morepokes/morepokes.php:31 +#: ../../addon/morepokes/morepokes.php:30 msgid "insult" msgstr "" -#: ../../addon/morepokes/morepokes.php:31 +#: ../../addon/morepokes/morepokes.php:30 msgid "insulted" msgstr "" -#: ../../addon/morepokes/morepokes.php:32 +#: ../../addon/morepokes/morepokes.php:31 msgid "praise" msgstr "" -#: ../../addon/morepokes/morepokes.php:32 +#: ../../addon/morepokes/morepokes.php:31 msgid "praised" msgstr "" -#: ../../addon/morepokes/morepokes.php:33 +#: ../../addon/morepokes/morepokes.php:32 msgid "be dubious of" msgstr "" -#: ../../addon/morepokes/morepokes.php:33 +#: ../../addon/morepokes/morepokes.php:32 msgid "was dubious of" msgstr "" -#: ../../addon/morepokes/morepokes.php:34 +#: ../../addon/morepokes/morepokes.php:33 msgid "eat" msgstr "" -#: ../../addon/morepokes/morepokes.php:34 +#: ../../addon/morepokes/morepokes.php:33 msgid "ate" msgstr "" -#: ../../addon/morepokes/morepokes.php:35 +#: ../../addon/morepokes/morepokes.php:34 msgid "giggle and fawn at" msgstr "" -#: ../../addon/morepokes/morepokes.php:35 +#: ../../addon/morepokes/morepokes.php:34 msgid "giggled and fawned at" msgstr "" -#: ../../addon/morepokes/morepokes.php:36 +#: ../../addon/morepokes/morepokes.php:35 msgid "doubt" msgstr "" -#: ../../addon/morepokes/morepokes.php:36 +#: ../../addon/morepokes/morepokes.php:35 msgid "doubted" msgstr "" -#: ../../addon/morepokes/morepokes.php:37 +#: ../../addon/morepokes/morepokes.php:36 msgid "glare" msgstr "" -#: ../../addon/morepokes/morepokes.php:37 +#: ../../addon/morepokes/morepokes.php:36 msgid "glared at" msgstr "" @@ -6127,68 +6145,68 @@ msgstr "" msgid "Show forumlists/forums on profile forumlist" msgstr "" -#: ../../addon/impressum/impressum.php:36 +#: ../../addon/impressum/impressum.php:37 msgid "Impressum" msgstr "" -#: ../../addon/impressum/impressum.php:49 -#: ../../addon/impressum/impressum.php:51 -#: ../../addon/impressum/impressum.php:83 +#: ../../addon/impressum/impressum.php:50 +#: ../../addon/impressum/impressum.php:52 +#: ../../addon/impressum/impressum.php:84 msgid "Site Owner" msgstr "" -#: ../../addon/impressum/impressum.php:49 -#: ../../addon/impressum/impressum.php:87 +#: ../../addon/impressum/impressum.php:50 +#: ../../addon/impressum/impressum.php:88 msgid "Email Address" msgstr "" -#: ../../addon/impressum/impressum.php:54 -#: ../../addon/impressum/impressum.php:85 +#: ../../addon/impressum/impressum.php:55 +#: ../../addon/impressum/impressum.php:86 msgid "Postal Address" msgstr "" -#: ../../addon/impressum/impressum.php:60 +#: ../../addon/impressum/impressum.php:61 msgid "" "The impressum addon needs to be configured!
Please add at least the " "owner variable to your config file. For other variables please " "refer to the README file of the addon." msgstr "" -#: ../../addon/impressum/impressum.php:83 +#: ../../addon/impressum/impressum.php:84 msgid "The page operators name." msgstr "" -#: ../../addon/impressum/impressum.php:84 +#: ../../addon/impressum/impressum.php:85 msgid "Site Owners Profile" msgstr "" -#: ../../addon/impressum/impressum.php:84 +#: ../../addon/impressum/impressum.php:85 msgid "Profile address of the operator." msgstr "" -#: ../../addon/impressum/impressum.php:85 +#: ../../addon/impressum/impressum.php:86 msgid "How to contact the operator via snail mail. You can use BBCode here." msgstr "" -#: ../../addon/impressum/impressum.php:86 +#: ../../addon/impressum/impressum.php:87 msgid "Notes" msgstr "" -#: ../../addon/impressum/impressum.php:86 +#: ../../addon/impressum/impressum.php:87 msgid "" "Additional notes that are displayed beneath the contact information. You can " "use BBCode here." msgstr "" -#: ../../addon/impressum/impressum.php:87 +#: ../../addon/impressum/impressum.php:88 msgid "How to contact the operator via email. (will be displayed obfuscated)" msgstr "" -#: ../../addon/impressum/impressum.php:88 +#: ../../addon/impressum/impressum.php:89 msgid "Footer note" msgstr "" -#: ../../addon/impressum/impressum.php:88 +#: ../../addon/impressum/impressum.php:89 msgid "Text for the footer. You can use BBCode here." msgstr "" @@ -6498,6 +6516,58 @@ msgstr "" msgid "Post to InsaneJournal by default" msgstr "" +#: ../../addon/jappixmini/jappixmini.php:266 +msgid "Jappix Mini addon settings" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:268 +msgid "Activate addon" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:271 +msgid "Do not insert the Jappixmini Chat-Widget into the webinterface" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:274 +msgid "Jabber username" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:277 +msgid "Jabber server" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:281 +msgid "Jabber BOSH host" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:285 +msgid "Jabber password" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:290 +msgid "Encrypt Jabber password with Friendica password (recommended)" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:293 +msgid "Friendica password" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:296 +msgid "Approve subscription requests from Friendica contacts automatically" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:299 +msgid "Subscribe to Friendica contacts automatically" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:302 +msgid "Purge internal list of jabber addresses of contacts" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:308 +msgid "Add contact" +msgstr "" + #: ../../addon/viewsrc/viewsrc.php:37 msgid "View Source" msgstr "" @@ -8062,12 +8132,12 @@ msgstr "" msgid "%1$d %2$s ago" msgstr "" -#: ../../include/datetime.php:472 ../../include/items.php:1621 +#: ../../include/datetime.php:472 ../../include/items.php:1683 #, php-format msgid "%s's birthday" msgstr "" -#: ../../include/datetime.php:473 ../../include/items.php:1622 +#: ../../include/datetime.php:473 ../../include/items.php:1684 #, php-format msgid "Happy Birthday %s" msgstr "" @@ -8341,15 +8411,15 @@ msgstr "" msgid "following" msgstr "" -#: ../../include/items.php:3230 +#: ../../include/items.php:3294 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:3230 +#: ../../include/items.php:3294 msgid "You have a new follower at " msgstr "" -#: ../../include/items.php:3911 +#: ../../include/items.php:3975 msgid "Archives" msgstr "" From d19a3b832455dc33eeda4f028cb191170d833c21 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 13 Sep 2012 16:59:25 -0700 Subject: [PATCH 016/124] provide separate hashtag and mentions for themes in addition to composite tags --- include/conversation.php | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 30ac3533d..91310277f 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -467,9 +467,19 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr $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']) : ''); @@ -620,7 +630,9 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr 'template' => $template, 'type' => implode("",array_slice(explode("/",$item['verb']),-1)), - 'tags' => $tags, + 'tags' => template_escape($tags), + 'hashtags' => template_escape($hashtags), + 'mentions' => template_escape($mentions), 'body' => template_escape($body), 'text' => strip_tags(template_escape($body)), 'id' => $item['item_id'], @@ -814,6 +826,21 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { + $tags=array(); + $hashtags = array(); + $mentions = array(); + foreach(explode(',',$item['tag']) as $tag){ + $tag = trim($tag); + if ($tag!="") { + $t = bbcode($tag); + $tags[] = $t; + if($t[0] == '#') + $hashtags[] = $t; + elseif($t[0] == '@') + $mentions[] = $t; + } + } + $sp = false; $profile_link = best_link_url($item,$sp); if($profile_link === 'mailbox') @@ -869,6 +896,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { 'thumb' => $profile_avatar, 'title' => template_escape($item['title']), 'body' => template_escape($body), + 'tags' => template_escape($tags), + 'hashtags' => template_escape($hashtags), + 'mentions' => template_escape($mentions), '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'])), From 32d4a359f1bc713b37f47d1d2a5e1f47d8ca6501 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 13 Sep 2012 19:11:07 -0700 Subject: [PATCH 017/124] reverse the default newuser privacy setting to public. Sites can over-ride. --- include/user.php | 28 ++++++++++++++++---------- mod/admin.php | 6 +++--- mod/newmember.php | 2 +- view/admin_site.tpl | 2 +- view/theme/frost-mobile/admin_site.tpl | 2 +- view/theme/frost/admin_site.tpl | 2 +- 6 files changed, 24 insertions(+), 18 deletions(-) diff --git a/include/user.php b/include/user.php index 2d06ef374..282bbdbba 100644 --- a/include/user.php +++ b/include/user.php @@ -277,18 +277,24 @@ function create_user($arr) { require_once('include/group.php'); group_add($newuid, t('Friends')); - if(! get_config('system', 'newuser_public')) { - $r = q("SELECT id FROM `group` WHERE uid = %d AND name = '%s'", - intval($newuid), - dbesc(t('Friends')) + $r = q("SELECT id FROM `group` WHERE uid = %d AND name = '%s'", + intval($newuid), + dbesc(t('Friends')) + ); + if($r && count($r)) { + $def_gid = $r[0]['id']; + + q("UPDATE user SET def_gid = %d WHERE uid = %d", + intval($r[0]['id']), + intval($newuid) + ); + } + + if(get_config('system', 'newuser_private') && $def_gid) { + q("UPDATE user SET allow_gid = '%s' WHERE uid = %d", + dbesc("<" . $def_gid . ">"), + intval($newuid) ); - if($r) { - q("UPDATE user SET def_gid = %d, allow_gid = '%s' WHERE uid = %d", - intval($r[0]['id']), - dbesc("<" . $r[0]['id'] . ">"), - intval($newuid) - ); - } } } diff --git a/mod/admin.php b/mod/admin.php index db4d4cff2..2d1d21bb4 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -254,7 +254,7 @@ function admin_page_site_post(&$a){ $force_publish = ((x($_POST,'publish_all')) ? True : False); $global_directory = ((x($_POST,'directory_submit_url')) ? notags(trim($_POST['directory_submit_url'])) : ''); $thread_allow = ((x($_POST,'thread_allow')) ? True : False); - $newuser_public = ((x($_POST,'newuser_public')) ? True : False); + $newuser_private = ((x($_POST,'newuser_private')) ? True : False); $no_multi_reg = ((x($_POST,'no_multi_reg')) ? True : False); $no_openid = !((x($_POST,'no_openid')) ? True : False); $no_regfullname = !((x($_POST,'no_regfullname')) ? True : False); @@ -355,7 +355,7 @@ function admin_page_site_post(&$a){ set_config('system','directory_submit_url', $global_directory); } set_config('system','thread_allow', $thread_allow); - set_config('system','newuser_public', $newuser_public); + set_config('system','newuser_private', $newuser_private; set_config('system','block_extended_register', $no_multi_reg); set_config('system','no_openid', $no_openid); @@ -467,7 +467,7 @@ function admin_page_site(&$a) { '$force_publish' => array('publish_all', t("Force publish"), get_config('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")), '$global_directory' => array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), t("URL to update the global directory. If this is not set, the global directory is completely unavailable to the application.")), '$thread_allow' => array('thread_allow', t("Allow threaded items"), get_config('system','thread_allow'), t("Allow infinite level threading for items on this site.")), - '$newuser_public' => array('newuser_public', t("No default permissions for new users"), get_config('system','newuser_public'), t("New users will have no private permissions set for their posts by default, making their posts public until they change it.")), + '$newuser_private' => array('newuser_private', t("Private posts by default for new users"), get_config('system','newuser_private'), t("Set default post permissions for all new members to the default privacy group rather than public.")), '$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")), '$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")), diff --git a/mod/newmember.php b/mod/newmember.php index e17a0db03..8028e7e08 100644 --- a/mod/newmember.php +++ b/mod/newmember.php @@ -69,7 +69,7 @@ function newmember_content(&$a) { $o .= '
  • ' . '' . t('Group Your Contacts') . '
    ' . t('Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page.') . '
    • ' . EOL; - if(! get_config('system', 'newuser_public')) { + if(get_config('system', 'newuser_private')) { $o .= '
  • ' . '' . t("Why Aren't My Posts Public?") . '
    ' . t("Friendica respects your privacy. By default, your posts will only show up to people you've added as friends. For more information, see the help section from the link above.") . '
    • ' . EOL; } diff --git a/view/admin_site.tpl b/view/admin_site.tpl index 6564565f7..ceba97d3f 100644 --- a/view/admin_site.tpl +++ b/view/admin_site.tpl @@ -76,7 +76,7 @@ {{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }} {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }} - {{ inc field_checkbox.tpl with $field=$newuser_public }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
    diff --git a/view/theme/frost-mobile/admin_site.tpl b/view/theme/frost-mobile/admin_site.tpl index 91aeda035..087de4f7d 100644 --- a/view/theme/frost-mobile/admin_site.tpl +++ b/view/theme/frost-mobile/admin_site.tpl @@ -40,7 +40,7 @@ {{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }} {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }} - {{ inc field_checkbox.tpl with $field=$newuser_public }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
    diff --git a/view/theme/frost/admin_site.tpl b/view/theme/frost/admin_site.tpl index 91aeda035..087de4f7d 100644 --- a/view/theme/frost/admin_site.tpl +++ b/view/theme/frost/admin_site.tpl @@ -40,7 +40,7 @@ {{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }} {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }} - {{ inc field_checkbox.tpl with $field=$newuser_public }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
    From f9a9b7012397ec4c4a18f49352d919266816dbd7 Mon Sep 17 00:00:00 2001 From: Domovoy Date: Fri, 14 Sep 2012 05:30:21 +0200 Subject: [PATCH 018/124] Detect the namespace uri from token name --- library/HTML5/TreeBuilder.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/library/HTML5/TreeBuilder.php b/library/HTML5/TreeBuilder.php index 578e73682..26cd410bf 100644 --- a/library/HTML5/TreeBuilder.php +++ b/library/HTML5/TreeBuilder.php @@ -3037,8 +3037,22 @@ class HTML5_TreeBuilder { } private function insertElement($token, $append = true) { - $el = $this->dom->createElementNS(self::NS_HTML, $token['name']); - + $sep_pos = strpos($token['name'],':'); + $ns_uri = self::NS_HTML; + if($sep_pos !== FALSE) { + // This tag has a namespace + $ns = substr($token['name'], 0, $sep_pos); + switch($ns) { + case 'g': + $ns_uri = 'http://base.google.com/ns/1.0'; + break; + default: + logger("HTML5/TreeBuilder.php: Unknown namespace '". $ns ."', tag = ". $token['name'], LOGGER_DEBUG); + break; + } + } + $el = $this->dom->createElementNS($ns_uri, $token['name']); + if (!empty($token['attr'])) { foreach($token['attr'] as $attr) { From 09413a0f0a04ad84c9869fc8e9f8fbd75317d35e Mon Sep 17 00:00:00 2001 From: Domovoy Date: Fri, 14 Sep 2012 05:50:35 +0200 Subject: [PATCH 019/124] Better integration with the existing code --- library/HTML5/TreeBuilder.php | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/library/HTML5/TreeBuilder.php b/library/HTML5/TreeBuilder.php index 26cd410bf..257e73c3e 100644 --- a/library/HTML5/TreeBuilder.php +++ b/library/HTML5/TreeBuilder.php @@ -127,6 +127,7 @@ class HTML5_TreeBuilder { const NS_XLINK = 'http://www.w3.org/1999/xlink'; const NS_XML = 'http://www.w3.org/XML/1998/namespace'; const NS_XMLNS = 'http://www.w3.org/2000/xmlns/'; + const NS_GOOGLE = 'http://base.google.com/ns/1.0'; public function __construct() { $this->mode = self::INITIAL; @@ -1430,6 +1431,14 @@ class HTML5_TreeBuilder { // parse error break; + /* Google */ + case 'g:plusone': + /* Reconstruct the active formatting elements, if any. */ + $this->reconstructActiveFormattingElements(); + + $this->insertForeignElement($token, self::NS_GOOGLE); + break; + /* A start tag token not covered by the previous entries */ default: /* Reconstruct the active formatting elements, if any. */ @@ -3037,21 +3046,7 @@ class HTML5_TreeBuilder { } private function insertElement($token, $append = true) { - $sep_pos = strpos($token['name'],':'); - $ns_uri = self::NS_HTML; - if($sep_pos !== FALSE) { - // This tag has a namespace - $ns = substr($token['name'], 0, $sep_pos); - switch($ns) { - case 'g': - $ns_uri = 'http://base.google.com/ns/1.0'; - break; - default: - logger("HTML5/TreeBuilder.php: Unknown namespace '". $ns ."', tag = ". $token['name'], LOGGER_DEBUG); - break; - } - } - $el = $this->dom->createElementNS($ns_uri, $token['name']); + $el = $this->dom->createElementNS(self::NS_HTML, $token['name']); if (!empty($token['attr'])) { foreach($token['attr'] as $attr) { From a31c779a15e0457054b8a2d02569dda5ab8fe9b4 Mon Sep 17 00:00:00 2001 From: Domovoy Date: Fri, 14 Sep 2012 07:59:54 +0200 Subject: [PATCH 020/124] Transform prefixed elements to classic ones --- library/HTML5/TreeBuilder.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/library/HTML5/TreeBuilder.php b/library/HTML5/TreeBuilder.php index 257e73c3e..2a789f4df 100644 --- a/library/HTML5/TreeBuilder.php +++ b/library/HTML5/TreeBuilder.php @@ -127,7 +127,6 @@ class HTML5_TreeBuilder { const NS_XLINK = 'http://www.w3.org/1999/xlink'; const NS_XML = 'http://www.w3.org/XML/1998/namespace'; const NS_XMLNS = 'http://www.w3.org/2000/xmlns/'; - const NS_GOOGLE = 'http://base.google.com/ns/1.0'; public function __construct() { $this->mode = self::INITIAL; @@ -159,6 +158,8 @@ class HTML5_TreeBuilder { if ($this->ignore_lf_token) $this->ignore_lf_token--; $this->ignored = false; + + $token['name'] = str_replace(':', '-', $token['name']); // indenting is a little wonky, this can be changed later on switch ($mode) { @@ -1430,15 +1431,7 @@ class HTML5_TreeBuilder { case 'tbody': case 'td': case 'tfoot': case 'th': case 'thead': case 'tr': // parse error break; - - /* Google */ - case 'g:plusone': - /* Reconstruct the active formatting elements, if any. */ - $this->reconstructActiveFormattingElements(); - - $this->insertForeignElement($token, self::NS_GOOGLE); - break; - + /* A start tag token not covered by the previous entries */ default: /* Reconstruct the active formatting elements, if any. */ From 20938d07cd7d5833e06b4efaeadc041030e5b6b2 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 13 Sep 2012 23:01:10 -0700 Subject: [PATCH 021/124] typo on previous checkin - set max number of images for an inserted link, default 2. --- mod/admin.php | 2 +- mod/parse_url.php | 26 ++++++++++++++++++-------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 2d1d21bb4..318858275 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -355,7 +355,7 @@ function admin_page_site_post(&$a){ set_config('system','directory_submit_url', $global_directory); } set_config('system','thread_allow', $thread_allow); - set_config('system','newuser_private', $newuser_private; + set_config('system','newuser_private', $newuser_private); set_config('system','block_extended_register', $no_multi_reg); set_config('system','no_openid', $no_openid); diff --git a/mod/parse_url.php b/mod/parse_url.php index 083a39b55..9adee8f65 100644 --- a/mod/parse_url.php +++ b/mod/parse_url.php @@ -307,16 +307,26 @@ function parse_url_content(&$a) { $image = ""; - if(sizeof($siteinfo["images"]) > 0){ - /* - Execute below code only if image is present in siteinfo - */ - foreach ($siteinfo["images"] as $imagedata) - if($textmode) - $image .= '[img='.$imagedata["width"].'x'.$imagedata["height"].']'.$imagedata["src"].'[/img]'; + if(sizeof($siteinfo["images"]) > 0){ + /* Execute below code only if image is present in siteinfo */ + + $total_images = 0; + $max_images = get_config('system','max_bookmark_images'); + if($max_images === false) + $max_images = 2; else - $image .= 'photo'; + $max_images = intval($max_images); + + foreach ($siteinfo["images"] as $imagedata) { + if($textmode) + $image .= '[img='.$imagedata["width"].'x'.$imagedata["height"].']'.$imagedata["src"].'[/img]' . "\n"; + else + $image .= 'photo
    '; + $total_images ++; + if($max_images && $max_images >= $total_images) + break; } + } if(strlen($text)) { if($textmode) From bff9c3d46073961372abd9d95fa0ac20916d37c1 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Fri, 14 Sep 2012 08:50:10 +0200 Subject: [PATCH 022/124] modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php --- view/theme/smoothly/style.css | 5 +++-- view/theme/smoothly/theme.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 8c6dd2290..cd88fb622 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-13 + Modified by alex@friendica.pixelbits.de on 2012-09-14 ** Colors ** @@ -371,7 +371,8 @@ nav #banner #logo-text a { nav #user-menu { display: block; - width: 190px; + width: auto; + min-width: 190px; float: right; margin-right: 5px; margin-top: 4px; diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php index d66fd4ca4..edc549f99 100644 --- a/view/theme/smoothly/theme.php +++ b/view/theme/smoothly/theme.php @@ -2,7 +2,7 @@ /* * Name: Smoothly - * Description: Theme optimized for iPad[2] + * Description: Like coffee with milk. Theme works fine with iPad[2]. * Version: 0.7 * Author: Alex * Maintainer: Alex From d1984c4c643390664a4e32c8c9f518e1ef6ad45c Mon Sep 17 00:00:00 2001 From: pixelroot Date: Fri, 14 Sep 2012 09:33:21 +0200 Subject: [PATCH 023/124] modified: view/theme/smoothly/nav.tpl modified: view/theme/smoothly/style.css --- view/theme/smoothly/nav.tpl | 5 ----- view/theme/smoothly/style.css | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/view/theme/smoothly/nav.tpl b/view/theme/smoothly/nav.tpl index b010442a9..50546a864 100644 --- a/view/theme/smoothly/nav.tpl +++ b/view/theme/smoothly/nav.tpl @@ -58,11 +58,6 @@ - - diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index cd88fb622..6d9e9b3fa 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -3757,8 +3757,8 @@ hr.line-dots { ----------------------------------------------------------- */ #scrollup { position: fixed; - right: 5px; - bottom: 5px; + right: 1px; + bottom: 30px; z-index: 100; } From 1c4bea295fd639f4f8c218020b38d28f7b0d4470 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Fri, 14 Sep 2012 09:33:47 +0200 Subject: [PATCH 024/124] new file: view/theme/smoothly/default.php --- view/theme/smoothly/default.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 view/theme/smoothly/default.php diff --git a/view/theme/smoothly/default.php b/view/theme/smoothly/default.php new file mode 100644 index 000000000..c63975044 --- /dev/null +++ b/view/theme/smoothly/default.php @@ -0,0 +1,20 @@ + + + + <?php if(x($page,'title')) echo $page['title'] ?> + + + + + + +
    +
    +

    back to top
    +
    +
    + +
    + + + From d00257354309451f1df97bc5f2c23d1ad06bc2f7 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Fri, 14 Sep 2012 09:55:54 +0200 Subject: [PATCH 025/124] deleted: view/theme/smoothly/default.php modified: view/theme/smoothly/nav.tpl --- view/theme/smoothly/default.php | 20 -------------------- view/theme/smoothly/nav.tpl | 4 ++++ 2 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 view/theme/smoothly/default.php diff --git a/view/theme/smoothly/default.php b/view/theme/smoothly/default.php deleted file mode 100644 index c63975044..000000000 --- a/view/theme/smoothly/default.php +++ /dev/null @@ -1,20 +0,0 @@ - - - - <?php if(x($page,'title')) echo $page['title'] ?> - - - - - - -
    -
    -

    back to top
    -
    -
    - -
    - - - diff --git a/view/theme/smoothly/nav.tpl b/view/theme/smoothly/nav.tpl index 50546a864..210b89a06 100644 --- a/view/theme/smoothly/nav.tpl +++ b/view/theme/smoothly/nav.tpl @@ -58,6 +58,10 @@ + + From bdc5a3ab2969d3d8a16042604ddadbbe6b2299ef Mon Sep 17 00:00:00 2001 From: pixelroot Date: Fri, 14 Sep 2012 10:16:35 +0200 Subject: [PATCH 026/124] deleted: view/theme/smoothly/group_edit.tpl --- view/theme/smoothly/group_edit.tpl | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 view/theme/smoothly/group_edit.tpl diff --git a/view/theme/smoothly/group_edit.tpl b/view/theme/smoothly/group_edit.tpl deleted file mode 100644 index a8b3f92a0..000000000 --- a/view/theme/smoothly/group_edit.tpl +++ /dev/null @@ -1,16 +0,0 @@ -

    $title

    - - -
    -
    -
    - - - - $drop -
    -
    -
    $desc
    -
    -
    -
    From e78b86f534d2f9b84a76920afbc8c8eb9148e99d Mon Sep 17 00:00:00 2001 From: pixelroot Date: Fri, 14 Sep 2012 11:57:13 +0200 Subject: [PATCH 027/124] modified: view/theme/smoothly/style.css --- view/theme/smoothly/style.css | 81 +++++++++++++++++++++++------------ 1 file changed, 54 insertions(+), 27 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 6d9e9b3fa..a0dc79df2 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -213,8 +213,6 @@ section { .button:hover { border: 1px solid #7C7D7B; box-shadow: 0 0 8px #BDBDBD; - /* -moz-box-shadow: 3px 3px 4px #959494; - -webkit-box-shadow: 3px 3px 4px #959494;*/ border-radius: 5px 5px 5px 5px; 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% ); @@ -905,30 +903,51 @@ ul .sidebar-group-li .icon { background: #FFFFC8; } -#profile-jot-perms, #profile-jot-submit, #jot-preview-link { +#profile-jot-perms, #profile-jot-submit { width: 60px; font-size: 12px; - box-shadow: inset 0px 1px 0px 0px #cfcfcf; - -moz-box-shadow: inset 0px 1px 0px 0px #cfcfcf; - -webkit-box-shadow: inset 0px 1px 0px 0px #cfcfcf; background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); background-color: #bdbdbd; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; display: inline-block; color: #efefef; text-decoration: none; text-align: center; + border: 1px solid #7C7D7B; + border-radius: 5px 5px 5px 5px; +} + +#jot-preview-link { + float: right; + width: 60px; + /*height: 10px;*/ + margin-right: 180px; + /*margin-top: 0px; + margin-left: 10px;*/ + font-size: 12px; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); + background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); + background-color: #bdbdbd; + display: inline-block; + color: #efefef; + text-decoration: none; + text-align: center; + padding: 5px 5px; + border: 1px solid #7C7D7B; + border-radius: 5px 5px 5px 5px; } #profile-jot-perms { - width: 30px; + width: 25px; + float: right; overflow: hidden; - border: 0px; - margin-left:5px; + margin-left: 10px; + margin-right: 80px; + margin-top: -28px; + border: 1px solid #7C7D7B; + border-radius: 5px 5px 5px 5px; } #jot-perms-perms .icon { @@ -936,11 +955,13 @@ ul .sidebar-group-li .icon { } #profile-jot-submit { - float: left; - margin-right: 5px; - border: 0px; - margin-top: 0px; - margin-left: -30px; + width: 80px; + float: right; + margin-right: 90px; + margin-top: -28px; + margin-left: 10px; + border: 1px solid #7C7D7B; + border-radius: 5px 5px 5px 5px; } #profile-jot-perms:hover, @@ -950,6 +971,9 @@ ul .sidebar-group-li .icon { background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% ); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); background-color: #1873a2; + border: 1px solid #7C7D7B; + box-shadow: 0 0 8px #BDBDBD; + border-radius: 5px 5px 5px 5px; } #profile-jot-perms:active, @@ -960,9 +984,9 @@ ul .sidebar-group-li .icon { } #character-counter { - position: absolute: - right: 100px; - top:100px; + position: absolute; + right: 100px; + top: 100px; } #profile-rotator-wrapper { float: right; @@ -1396,7 +1420,8 @@ profile-jot-banner-wrapper { } #item-delete-selected { - overflow: auto; + overflow: auto; + margin-top: 20px; width: 100%; } @@ -1494,21 +1519,23 @@ profile-jot-banner-wrapper { .comment-edit-submit-wrapper { width: 80%; margin-left: 40px; - text-align: right; + text-align: left; } .comment-edit-submit { height: 22px; + padding: 5px 5px; background-color: #a2a2a2; color: #eeeeec; - border-radius: 5px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border: 0px; + border: 1px solid #CDCDCD; + border-radius: 5px 5px 5px 5px; } .comment-edit-submit:hover { background-color: #1873a2; + border: 1px solid #CDCDCD; + border-radius: 5px 5px 5px 5px; + box-shadow: 0 0 8px #BDBDBD; } .comment-edit-submit:active { @@ -1517,7 +1544,7 @@ profile-jot-banner-wrapper { #item-delete-selected-desc { color: #898989; - float: left; + float: right; } .wall-item-body code { From 252e112ad5f659725a76d6730498a83ecbd2f456 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Fri, 14 Sep 2012 12:46:32 +0200 Subject: [PATCH 028/124] modified: view/theme/smoothly/style.css --- view/theme/smoothly/style.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index a0dc79df2..fd45e205a 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -984,9 +984,10 @@ ul .sidebar-group-li .icon { } #character-counter { - position: absolute; - right: 100px; - top: 100px; + position: relative; + float: left; + right: 0px; + top: 0px; } #profile-rotator-wrapper { float: right; @@ -3804,4 +3805,4 @@ hr.line-dots { /*div.wall-item-content-wrapper.shiny { background-image: url("star.png"); background-repeat: no-repeat; -}*/ \ No newline at end of file +}*/ From 39b296a87dde17c074f94348400f0c304f7a9e16 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 14 Sep 2012 06:04:25 -0700 Subject: [PATCH 029/124] ostatus disabled typo --- mod/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/admin.php b/mod/admin.php index 318858275..5edb92755 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -474,7 +474,7 @@ function admin_page_site(&$a) { '$no_regfullname' => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")), '$no_utf' => array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','no_utf'), t("Use PHP UTF8 regular expressions")), '$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), t("Display a Community page showing all recent public postings on this site.")), - '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disable'), t("Provide built-in OStatus \x28identi.ca, status.net, etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")), + '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disabled'), t("Provide built-in OStatus \x28identi.ca, status.net, etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")), '$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")), '$dfrn_only' => array('dfrn_only', t('Only allow Friendica contacts'), get_config('system','dfrn_only'), t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")), '$verifyssl' => array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), t("If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites.")), From 882f437149f882d21f3743b56e374308f03abbe6 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 14 Sep 2012 15:35:40 +0200 Subject: [PATCH 030/124] quattro: mail link to profile page --- view/theme/quattro/dark/style.css | 19 +++++++++++++++++++ view/theme/quattro/green/style.css | 19 +++++++++++++++++++ view/theme/quattro/profile_vcard.tpl | 3 +++ view/theme/quattro/quattro.less | 12 ++++++++++++ 4 files changed, 53 insertions(+) diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 0bb2cd10e..533d15176 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -735,6 +735,22 @@ aside #profile-extra-links li { margin: 0px; list-style: none; } +aside #wallmessage-link { + display: block; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + color: #ffffff; + background: #005c94 url('../../../images/connect-bg.png') no-repeat left center; + font-weight: bold; + text-transform: uppercase; + padding: 4px 2px 2px 35px; + margin-top: 3px; +} +aside #wallmessage-link:hover { + text-decoration: none; + background-color: #19aeff; +} aside #dfrn-request-link { display: block; -moz-border-radius: 5px 5px 5px 5px; @@ -1140,6 +1156,9 @@ section { opacity: 0.5; } .wwto { + position: absolute !important; + width: 25px; + height: 25px; background: #FFFFFF; border: 2px solid #364e59; height: 25px; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index 4897471ea..429da809d 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -735,6 +735,22 @@ aside #profile-extra-links li { margin: 0px; list-style: none; } +aside #wallmessage-link { + display: block; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + color: #ffffff; + background: #009100 url('../../../images/connect-bg.png') no-repeat left center; + font-weight: bold; + text-transform: uppercase; + padding: 4px 2px 2px 35px; + margin-top: 3px; +} +aside #wallmessage-link:hover { + text-decoration: none; + background-color: #ccff42; +} aside #dfrn-request-link { display: block; -moz-border-radius: 5px 5px 5px 5px; @@ -1140,6 +1156,9 @@ section { opacity: 0.5; } .wwto { + position: absolute !important; + width: 25px; + height: 25px; background: #FFFFFF; border: 2px solid #364e59; height: 25px; diff --git a/view/theme/quattro/profile_vcard.tpl b/view/theme/quattro/profile_vcard.tpl index cbb7dcc74..e7264cfec 100644 --- a/view/theme/quattro/profile_vcard.tpl +++ b/view/theme/quattro/profile_vcard.tpl @@ -56,6 +56,9 @@ {{ if $connect }}
  • $connect
    • {{ endif }} + {{ if $wallmessage }} +
  • $wallmessage
    • + {{ endif }} diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 84aa13ac0..51fdfcf7c 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -314,6 +314,18 @@ aside { li { padding: 0px; margin: 0px; list-style: none; } } + #wallmessage-link { + display: block; + .rounded(); + color: @AsideConnect; + background: @AsideConnectBg url('../../../images/connect-bg.png') no-repeat left center; + font-weight: bold; + text-transform:uppercase; + padding: 4px 2px 2px 35px; + margin-top: 3px; + + &:hover { text-decoration: none; background-color: @AsideConnectHoverBg; } + } #dfrn-request-link { display: block; .rounded(); From 6c44125fb5bd9d9ca22ac26f7eb801f896fe2950 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 14 Sep 2012 15:46:14 +0200 Subject: [PATCH 031/124] DE: update to the strings --- view/de/messages.po | 442 +++++++++++++++++++++++++++----------------- view/de/strings.php | 24 ++- 2 files changed, 294 insertions(+), 172 deletions(-) diff --git a/view/de/messages.po b/view/de/messages.po index c21bde395..a01bf6a83 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-09-09 10:00-0700\n" -"PO-Revision-Date: 2012-09-11 07:17+0000\n" +"POT-Creation-Date: 2012-09-13 10:00-0700\n" +"PO-Revision-Date: 2012-09-14 13:44+0000\n" "Last-Translator: bavatar \n" "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" @@ -61,8 +61,8 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22 #: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:126 #: ../../mod/item.php:142 ../../mod/mood.php:114 -#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:142 -#: ../../mod/profile_photo.php:153 ../../mod/profile_photo.php:166 +#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169 +#: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193 #: ../../mod/message.php:38 ../../mod/message.php:168 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25 #: ../../mod/wall_upload.php:64 ../../mod/follow.php:9 @@ -70,9 +70,10 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/profiles.php:413 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 -#: ../../addon/facebook/facebook.php:516 -#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3834 -#: ../../index.php:315 +#: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 +#: ../../addon/fbpost/fbpost.php:165 +#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3908 +#: ../../index.php:317 msgid "Permission denied." msgstr "Zugriff verweigert." @@ -154,15 +155,15 @@ msgstr "Neues Foto von dieser URL" #: ../../addon/fromgplus/fromgplus.php:40 #: ../../addon/facebook/facebook.php:619 #: ../../addon/snautofollow/snautofollow.php:64 ../../addon/bg/bg.php:90 -#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93 -#: ../../addon/nsfw/nsfw.php:57 ../../addon/page/page.php:210 -#: ../../addon/planets/planets.php:158 +#: ../../addon/fbpost/fbpost.php:226 ../../addon/yourls/yourls.php:76 +#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57 +#: ../../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 #: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92 #: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41 #: ../../addon/forumlist/forumlist.php:169 -#: ../../addon/impressum/impressum.php:82 +#: ../../addon/impressum/impressum.php:83 #: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57 #: ../../addon/qcomment/qcomment.php:61 #: ../../addon/openstreetmap/openstreetmap.php:70 @@ -172,7 +173,7 @@ msgstr "Neues Foto von dieser URL" #: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84 #: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:95 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93 -#: ../../addon/jappixmini/jappixmini.php:302 +#: ../../addon/jappixmini/jappixmini.php:307 #: ../../addon/statusnet/statusnet.php:278 #: ../../addon/statusnet/statusnet.php:292 #: ../../addon/statusnet/statusnet.php:318 @@ -189,7 +190,7 @@ msgstr "Neues Foto von dieser URL" #: ../../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:591 +#: ../../include/conversation.php:591 ../../object/Item.php:532 msgid "Submit" msgstr "Senden" @@ -202,11 +203,11 @@ msgstr "Hilfe:" msgid "Help" msgstr "Hilfe" -#: ../../mod/help.php:38 ../../index.php:224 +#: ../../mod/help.php:38 ../../index.php:226 msgid "Not Found" msgstr "Nicht gefunden" -#: ../../mod/help.php:41 ../../index.php:227 +#: ../../mod/help.php:41 ../../index.php:229 msgid "Page not found." msgstr "Seite nicht gefunden." @@ -412,10 +413,10 @@ msgid "Contact information unavailable" msgstr "Kontaktinformationen nicht verfügbar" #: ../../mod/photos.php:149 ../../mod/photos.php:653 ../../mod/photos.php:1073 -#: ../../mod/photos.php:1088 ../../mod/profile_photo.php:60 -#: ../../mod/profile_photo.php:67 ../../mod/profile_photo.php:74 -#: ../../mod/profile_photo.php:177 ../../mod/profile_photo.php:261 -#: ../../mod/profile_photo.php:270 +#: ../../mod/photos.php:1088 ../../mod/profile_photo.php:74 +#: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88 +#: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 +#: ../../mod/profile_photo.php:305 #: ../../addon/communityhome/communityhome.php:111 #: ../../view/theme/diabook/theme.php:599 ../../include/user.php:318 #: ../../include/user.php:325 ../../include/user.php:332 @@ -458,12 +459,12 @@ msgstr "Die Bildgröße übersteigt das Limit von " msgid "Image file is empty." msgstr "Bilddatei ist leer." -#: ../../mod/photos.php:729 ../../mod/profile_photo.php:126 +#: ../../mod/photos.php:729 ../../mod/profile_photo.php:153 #: ../../mod/wall_upload.php:110 msgid "Unable to process image." msgstr "Konnte das Bild nicht bearbeiten." -#: ../../mod/photos.php:756 ../../mod/profile_photo.php:266 +#: ../../mod/photos.php:756 ../../mod/profile_photo.php:301 #: ../../mod/wall_upload.php:136 msgid "Image upload failed." msgstr "Hochladen des Bildes gescheitert." @@ -549,7 +550,7 @@ msgid "Use as profile photo" msgstr "Als Profilbild verwenden" #: ../../mod/photos.php:1224 ../../mod/content.php:601 -#: ../../include/conversation.php:428 +#: ../../include/conversation.php:428 ../../object/Item.php:103 msgid "Private Message" msgstr "Private Nachricht" @@ -591,16 +592,16 @@ msgid "" msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" #: ../../mod/photos.php:1356 ../../mod/content.php:665 -#: ../../include/conversation.php:565 +#: ../../include/conversation.php:565 ../../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:566 +#: ../../include/conversation.php:566 ../../object/Item.php:186 msgid "I don't like this (toggle)" msgstr "Ich mag das nicht (toggle)" -#: ../../mod/photos.php:1358 ../../include/conversation.php:1195 +#: ../../mod/photos.php:1358 ../../include/conversation.php:1214 msgid "Share" msgstr "Teilen" @@ -608,25 +609,27 @@ msgstr "Teilen" #: ../../mod/content.php:482 ../../mod/content.php:843 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293 #: ../../mod/message.php:481 ../../include/conversation.php:659 -#: ../../include/conversation.php:891 ../../include/conversation.php:1214 +#: ../../include/conversation.php:891 ../../include/conversation.php:1233 +#: ../../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:588 +#: ../../include/conversation.php:588 ../../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:590 ../../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:600 -#: ../../include/conversation.php:1232 +#: ../../include/conversation.php:1251 ../../object/Item.php:541 msgid "Preview" msgstr "Vorschau" @@ -634,6 +637,7 @@ msgstr "Vorschau" #: ../../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:847 +#: ../../object/Item.php:116 msgid "Delete" msgstr "Löschen" @@ -699,28 +703,29 @@ msgstr "Beitrag nicht gefunden" msgid "Edit post" msgstr "Beitrag bearbeiten" -#: ../../mod/editpost.php:88 ../../include/conversation.php:1181 +#: ../../mod/editpost.php:88 ../../include/conversation.php:1200 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 +#: ../../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:1196 +#: ../../include/conversation.php:1215 msgid "Upload photo" msgstr "Foto hochladen" -#: ../../mod/editpost.php:105 ../../include/conversation.php:1198 +#: ../../mod/editpost.php:105 ../../include/conversation.php:1217 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:1200 +#: ../../include/conversation.php:1219 msgid "Insert web link" msgstr "einen Link einfügen" @@ -736,35 +741,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:1206 +#: ../../mod/editpost.php:110 ../../include/conversation.php:1225 msgid "Set your location" msgstr "Deinen Standort festlegen" -#: ../../mod/editpost.php:111 ../../include/conversation.php:1208 +#: ../../mod/editpost.php:111 ../../include/conversation.php:1227 msgid "Clear browser location" msgstr "Browser-Standort leeren" -#: ../../mod/editpost.php:113 ../../include/conversation.php:1215 +#: ../../mod/editpost.php:113 ../../include/conversation.php:1234 msgid "Permission settings" msgstr "Berechtigungseinstellungen" -#: ../../mod/editpost.php:121 ../../include/conversation.php:1224 +#: ../../mod/editpost.php:121 ../../include/conversation.php:1243 msgid "CC: email addresses" msgstr "Cc:-E-Mail-Addressen" -#: ../../mod/editpost.php:122 ../../include/conversation.php:1225 +#: ../../mod/editpost.php:122 ../../include/conversation.php:1244 msgid "Public post" msgstr "Öffentlicher Beitrag" -#: ../../mod/editpost.php:125 ../../include/conversation.php:1211 +#: ../../mod/editpost.php:125 ../../include/conversation.php:1230 msgid "Set title" msgstr "Titel setzen" -#: ../../mod/editpost.php:127 ../../include/conversation.php:1213 +#: ../../mod/editpost.php:127 ../../include/conversation.php:1232 msgid "Categories (comma-separated list)" msgstr "Kategorien (kommasepariert)" -#: ../../mod/editpost.php:128 ../../include/conversation.php:1227 +#: ../../mod/editpost.php:128 ../../include/conversation.php:1246 msgid "Example: bob@example.com, mary@example.com" msgstr "Z.B.: bob@example.com, mary@example.com" @@ -885,7 +890,7 @@ msgstr "Bitte bestätige deine Kontaktanfrage bei %s." msgid "Confirm" msgstr "Bestätigen" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:3213 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:3287 msgid "[Name Withheld]" msgstr "[Name unterdrückt]" @@ -1308,18 +1313,21 @@ msgstr "Gruppe: " #: ../../mod/content.php:438 ../../mod/content.php:720 #: ../../include/conversation.php:439 ../../include/conversation.php:846 +#: ../../object/Item.php:115 msgid "Select" msgstr "Auswählen" #: ../../mod/content.php:455 ../../mod/content.php:813 #: ../../mod/content.php:814 ../../include/conversation.php:627 #: ../../include/conversation.php:628 ../../include/conversation.php:863 +#: ../../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:641 ../../include/conversation.php:874 +#: ../../object/Item.php:219 #, php-format msgid "%s from %s" msgstr "%s von %s" @@ -1329,6 +1337,7 @@ msgid "View in context" msgstr "Im Zusammenhang betrachten" #: ../../mod/content.php:586 ../../include/conversation.php:668 +#: ../../object/Item.php:256 #, php-format msgid "%d comment" msgid_plural "%d comments" @@ -1338,91 +1347,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:669 -#: ../../boot.php:575 +#: ../../boot.php:575 ../../object/Item.php:257 msgid "show more" msgstr "mehr anzeigen" #: ../../mod/content.php:665 ../../include/conversation.php:565 +#: ../../object/Item.php:185 msgid "like" msgstr "mag ich" #: ../../mod/content.php:666 ../../include/conversation.php:566 +#: ../../object/Item.php:186 msgid "dislike" msgstr "mag ich nicht" #: ../../mod/content.php:668 ../../include/conversation.php:568 +#: ../../object/Item.php:188 msgid "Share this" msgstr "Weitersagen" #: ../../mod/content.php:668 ../../include/conversation.php:568 +#: ../../object/Item.php:188 msgid "share" msgstr "Teilen" #: ../../mod/content.php:692 ../../include/conversation.php:592 +#: ../../object/Item.php:533 msgid "Bold" msgstr "Fett" #: ../../mod/content.php:693 ../../include/conversation.php:593 +#: ../../object/Item.php:534 msgid "Italic" msgstr "Kursiv" #: ../../mod/content.php:694 ../../include/conversation.php:594 +#: ../../object/Item.php:535 msgid "Underline" msgstr "Unterstrichen" #: ../../mod/content.php:695 ../../include/conversation.php:595 +#: ../../object/Item.php:536 msgid "Quote" msgstr "Zitat" #: ../../mod/content.php:696 ../../include/conversation.php:596 +#: ../../object/Item.php:537 msgid "Code" msgstr "Code" #: ../../mod/content.php:697 ../../include/conversation.php:597 +#: ../../object/Item.php:538 msgid "Image" msgstr "Bild" #: ../../mod/content.php:698 ../../include/conversation.php:598 +#: ../../object/Item.php:539 msgid "Link" msgstr "Verweis" #: ../../mod/content.php:699 ../../include/conversation.php:599 +#: ../../object/Item.php:540 msgid "Video" msgstr "Video" #: ../../mod/content.php:733 ../../include/conversation.php:529 +#: ../../object/Item.php:169 msgid "add star" msgstr "markieren" #: ../../mod/content.php:734 ../../include/conversation.php:530 +#: ../../object/Item.php:170 msgid "remove star" msgstr "Markierung entfernen" #: ../../mod/content.php:735 ../../include/conversation.php:531 +#: ../../object/Item.php:171 msgid "toggle star status" msgstr "Markierung umschalten" #: ../../mod/content.php:738 ../../include/conversation.php:534 +#: ../../object/Item.php:174 msgid "starred" msgstr "markiert" #: ../../mod/content.php:739 ../../include/conversation.php:535 +#: ../../object/Item.php:175 msgid "add tag" msgstr "Tag hinzufügen" #: ../../mod/content.php:743 ../../include/conversation.php:443 +#: ../../object/Item.php:119 msgid "save to folder" msgstr "In Ordner speichern" #: ../../mod/content.php:815 ../../include/conversation.php:629 +#: ../../object/Item.php:208 msgid "to" msgstr "zu" #: ../../mod/content.php:816 ../../include/conversation.php:630 +#: ../../object/Item.php:209 msgid "Wall-to-Wall" msgstr "Wall-to-Wall" #: ../../mod/content.php:817 ../../include/conversation.php:631 +#: ../../object/Item.php:210 msgid "via Wall-To-Wall:" msgstr "via Wall-To-Wall:" @@ -1938,9 +1968,9 @@ msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten" #: ../../mod/register.php:90 ../../mod/register.php:144 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752 #: ../../addon/facebook/facebook.php:702 -#: ../../addon/facebook/facebook.php:1200 +#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3222 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3296 #: ../../boot.php:788 msgid "Administrator" msgstr "Administrator" @@ -2088,7 +2118,7 @@ msgid "Private forum has no privacy permissions and no default privacy group." msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte." #: ../../mod/settings.php:471 ../../addon/facebook/facebook.php:495 -#: ../../addon/impressum/impressum.php:77 +#: ../../addon/fbpost/fbpost.php:144 ../../addon/impressum/impressum.php:78 #: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 #: ../../addon/twitter/twitter.php:389 @@ -2355,7 +2385,7 @@ msgstr "Dürfen dir Unbekannte private Nachrichten schicken?" msgid "Profile is not published." msgstr "Profil ist nicht veröffentlicht." -#: ../../mod/settings.php:944 ../../mod/profile_photo.php:214 +#: ../../mod/settings.php:944 ../../mod/profile_photo.php:248 msgid "or" msgstr "oder" @@ -2636,6 +2666,7 @@ msgstr "Persönliche Notizen" #: ../../mod/notes.php:63 ../../mod/filer.php:30 #: ../../addon/facebook/facebook.php:770 #: ../../addon/privacy_image_cache/privacy_image_cache.php:263 +#: ../../addon/fbpost/fbpost.php:267 #: ../../addon/dav/friendica/layout.fnk.php:441 #: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:681 msgid "Save" @@ -2672,7 +2703,7 @@ msgstr "Kein Empfänger." #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:1132 ../../include/conversation.php:1149 +#: ../../include/conversation.php:1151 ../../include/conversation.php:1168 msgid "Please enter a link URL:" msgstr "Bitte gib die URL des Links ein:" @@ -2759,7 +2790,7 @@ msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen msgid "Profile" msgstr "Profil" -#: ../../mod/newmember.php:36 ../../mod/profile_photo.php:211 +#: ../../mod/newmember.php:36 ../../mod/profile_photo.php:244 msgid "Upload Profile Photo" msgstr "Profilbild hochladen" @@ -2797,7 +2828,7 @@ msgid "Connecting" msgstr "Verbindungen knüpfen" #: ../../mod/newmember.php:49 ../../mod/newmember.php:51 -#: ../../addon/facebook/facebook.php:728 +#: ../../addon/facebook/facebook.php:728 ../../addon/fbpost/fbpost.php:239 #: ../../include/contact_selectors.php:81 msgid "Facebook" msgstr "Facebook" @@ -2924,7 +2955,7 @@ msgstr "Gruppe nicht gefunden." msgid "Group name changed." msgstr "Gruppenname geändert." -#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:314 +#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:316 msgid "Permission denied" msgstr "Zugriff verweigert" @@ -3098,7 +3129,7 @@ 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/display.php:145 ../../include/items.php:3700 +#: ../../mod/display.php:145 ../../include/items.php:3774 msgid "Item not found." msgstr "Beitrag nicht gefunden." @@ -3182,61 +3213,65 @@ msgstr "Stimmung" msgid "Set your current mood and tell your friends" msgstr "Wähle deine aktuelle Stimmung und erzähle sie deinen Freunden" -#: ../../mod/profile_photo.php:30 +#: ../../mod/profile_photo.php:44 msgid "Image uploaded but image cropping failed." msgstr "Bilder hochgeladen, aber das Zuschneiden ist fehlgeschlagen." -#: ../../mod/profile_photo.php:63 ../../mod/profile_photo.php:70 -#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:273 +#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:84 +#: ../../mod/profile_photo.php:91 ../../mod/profile_photo.php:308 #, php-format msgid "Image size reduction [%s] failed." msgstr "Verkleinern der Bildgröße von [%s] ist gescheitert." -#: ../../mod/profile_photo.php:91 +#: ../../mod/profile_photo.php:118 msgid "" "Shift-reload the page or clear browser cache if the new photo does not " "display immediately." msgstr "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird." -#: ../../mod/profile_photo.php:101 +#: ../../mod/profile_photo.php:128 msgid "Unable to process image" msgstr "Bild konnte nicht verarbeitet werden" -#: ../../mod/profile_photo.php:117 ../../mod/wall_upload.php:88 +#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:88 #, php-format msgid "Image exceeds size limit of %d" msgstr "Bildgröße überschreitet das Limit von %d" -#: ../../mod/profile_photo.php:210 +#: ../../mod/profile_photo.php:242 msgid "Upload File:" msgstr "Datei hochladen:" -#: ../../mod/profile_photo.php:212 +#: ../../mod/profile_photo.php:243 +msgid "Select a profile:" +msgstr "Profil auswählen" + +#: ../../mod/profile_photo.php:245 #: ../../addon/dav/friendica/layout.fnk.php:152 msgid "Upload" msgstr "Hochladen" -#: ../../mod/profile_photo.php:214 +#: ../../mod/profile_photo.php:248 msgid "skip this step" msgstr "diesen Schritt überspringen" -#: ../../mod/profile_photo.php:214 +#: ../../mod/profile_photo.php:248 msgid "select a photo from your photo albums" msgstr "wähle ein Foto von deinen Fotoalben" -#: ../../mod/profile_photo.php:227 +#: ../../mod/profile_photo.php:262 msgid "Crop Image" msgstr "Bild zurechtschneiden" -#: ../../mod/profile_photo.php:228 +#: ../../mod/profile_photo.php:263 msgid "Please adjust the image cropping for optimum viewing." msgstr "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann." -#: ../../mod/profile_photo.php:230 +#: ../../mod/profile_photo.php:265 msgid "Done Editing" msgstr "Bearbeitung abgeschlossen" -#: ../../mod/profile_photo.php:264 +#: ../../mod/profile_photo.php:299 msgid "Image uploaded successfully." msgstr "Bild erfolgreich auf den Server geladen." @@ -4390,8 +4425,8 @@ msgstr "sichtbar für jeden" msgid "Edit visibility" msgstr "Sichtbarkeit bearbeiten" -#: ../../mod/filer.php:29 ../../include/conversation.php:1136 -#: ../../include/conversation.php:1153 +#: ../../mod/filer.php:29 ../../include/conversation.php:1155 +#: ../../include/conversation.php:1172 msgid "Save to Folder:" msgstr "In diesen Ordner verschieben:" @@ -4732,7 +4767,7 @@ msgstr "Facebook deaktiviert" msgid "Updating contacts" msgstr "Aktualisiere Kontakte" -#: ../../addon/facebook/facebook.php:551 +#: ../../addon/facebook/facebook.php:551 ../../addon/fbpost/fbpost.php:192 msgid "Facebook API key is missing." msgstr "Facebook-API-Schlüssel nicht gefunden" @@ -4748,13 +4783,13 @@ msgstr "Facebook-Connector für dieses Konto installieren." msgid "Remove Facebook connector" msgstr "Facebook-Connector entfernen" -#: ../../addon/facebook/facebook.php:576 +#: ../../addon/facebook/facebook.php:576 ../../addon/fbpost/fbpost.php:217 msgid "" "Re-authenticate [This is necessary whenever your Facebook password is " "changed.]" msgstr "Neu authentifizieren [Das ist immer dann nötig, wenn du dein Facebook-Passwort geändert hast.]" -#: ../../addon/facebook/facebook.php:583 +#: ../../addon/facebook/facebook.php:583 ../../addon/fbpost/fbpost.php:224 msgid "Post to Facebook by default" msgstr "Veröffentliche standardmäßig bei Facebook" @@ -4820,11 +4855,11 @@ msgstr "Probleme mit Facebook Echtzeit-Updates" msgid "Facebook Connector Settings" msgstr "Facebook-Verbindungseinstellungen" -#: ../../addon/facebook/facebook.php:744 +#: ../../addon/facebook/facebook.php:744 ../../addon/fbpost/fbpost.php:255 msgid "Facebook API Key" msgstr "Facebook API Schlüssel" -#: ../../addon/facebook/facebook.php:754 +#: ../../addon/facebook/facebook.php:754 ../../addon/fbpost/fbpost.php:262 msgid "" "Error: it appears that you have specified the App-ID and -Secret in your " ".htconfig.php file. As long as they are specified there, they cannot be set " @@ -4847,11 +4882,11 @@ msgid "" "going on." msgstr "Die Richtigkeit des API Schlüssels konnte nicht gefunden werden. Irgendwas stimmt nicht." -#: ../../addon/facebook/facebook.php:766 +#: ../../addon/facebook/facebook.php:766 ../../addon/fbpost/fbpost.php:264 msgid "App-ID / API-Key" msgstr "App-ID / API-Key" -#: ../../addon/facebook/facebook.php:767 +#: ../../addon/facebook/facebook.php:767 ../../addon/fbpost/fbpost.php:265 msgid "Application secret" msgstr "Anwendungs-Geheimnis" @@ -4886,38 +4921,38 @@ msgstr "Echtzeit-Updates nicht aktiviert." msgid "Activate Real-Time Updates" msgstr "Echtzeit-Updates aktivieren" -#: ../../addon/facebook/facebook.php:799 +#: ../../addon/facebook/facebook.php:799 ../../addon/fbpost/fbpost.php:282 #: ../../addon/dav/friendica/layout.fnk.php:361 msgid "The new values have been saved." msgstr "Die neuen Einstellungen wurden gespeichert." -#: ../../addon/facebook/facebook.php:823 +#: ../../addon/facebook/facebook.php:823 ../../addon/fbpost/fbpost.php:301 msgid "Post to Facebook" msgstr "Bei Facebook veröffentlichen" -#: ../../addon/facebook/facebook.php:921 +#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:399 msgid "" "Post to Facebook cancelled because of multi-network access permission " "conflict." msgstr "Beitrag wurde nicht bei Facebook veröffentlicht, da Konflikte bei den Multi-Netzwerk-Zugriffsrechten vorliegen." -#: ../../addon/facebook/facebook.php:1149 +#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:610 msgid "View on Friendica" msgstr "In Friendica betrachten" -#: ../../addon/facebook/facebook.php:1182 +#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:643 msgid "Facebook post failed. Queued for retry." msgstr "Veröffentlichung bei Facebook gescheitert. Wir versuchen es später erneut." -#: ../../addon/facebook/facebook.php:1222 +#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:683 msgid "Your Facebook connection became invalid. Please Re-authenticate." msgstr "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich." -#: ../../addon/facebook/facebook.php:1223 +#: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:684 msgid "Facebook connection became invalid" msgstr "Facebook Anmeldedaten sind ungültig geworden" -#: ../../addon/facebook/facebook.php:1224 +#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:685 #, php-format msgid "" "Hi %1$s,\n" @@ -4969,6 +5004,26 @@ msgstr "Größe des Caches" msgid "Delete the whole cache" msgstr "Cache leeren" +#: ../../addon/fbpost/fbpost.php:172 +msgid "Facebook Post disabled" +msgstr "" + +#: ../../addon/fbpost/fbpost.php:199 +msgid "Facebook Post" +msgstr "" + +#: ../../addon/fbpost/fbpost.php:205 +msgid "Install Facebook Post connector for this account." +msgstr "" + +#: ../../addon/fbpost/fbpost.php:212 +msgid "Remove Facebook Post connector" +msgstr "" + +#: ../../addon/fbpost/fbpost.php:240 +msgid "Facebook Post Settings" +msgstr "" + #: ../../addon/widgets/widget_like.php:58 #, php-format msgid "%d person likes this" @@ -5028,12 +5083,12 @@ msgid "did something obscenely biological to" msgstr "machte etwas obszönes Körperliches mit" #: ../../addon/morepokes/morepokes.php:22 -msgid "point out the new poke feature to" -msgstr "die neue Anstups-Funktion zeigen" +msgid "point out the poke feature to" +msgstr "" #: ../../addon/morepokes/morepokes.php:22 -msgid "pointed out the new poke feature to" -msgstr "zeigte die neue Anstups-Funktion" +msgid "pointed out the poke feature to" +msgstr "" #: ../../addon/morepokes/morepokes.php:23 msgid "declare undying love for" @@ -5044,113 +5099,109 @@ msgid "declared undying love for" msgstr "verkündete unsterbliche Liebe für" #: ../../addon/morepokes/morepokes.php:24 -msgid "set fire to" -msgstr "entflammt" - -#: ../../addon/morepokes/morepokes.php:25 msgid "patent" msgstr "patentieren" -#: ../../addon/morepokes/morepokes.php:25 +#: ../../addon/morepokes/morepokes.php:24 msgid "patented" msgstr "patentierte" -#: ../../addon/morepokes/morepokes.php:26 +#: ../../addon/morepokes/morepokes.php:25 msgid "stroke beard" msgstr "sich den Bart kratzen" -#: ../../addon/morepokes/morepokes.php:26 +#: ../../addon/morepokes/morepokes.php:25 msgid "stroked their beard at" msgstr "kratzte sich den Bart in Richtung" -#: ../../addon/morepokes/morepokes.php:27 +#: ../../addon/morepokes/morepokes.php:26 msgid "" "bemoan the declining standards of modern secondary and tertiary education to" msgstr "sich über die sinkenden Standards der Schul- und Hochschulbildung beklagen" -#: ../../addon/morepokes/morepokes.php:27 +#: ../../addon/morepokes/morepokes.php:26 msgid "" "bemoans the declining standards of modern secondary and tertiary education " "to" msgstr "beklagte sich über die sinkenden Standards der Schul- und Hochschulbildung bei" -#: ../../addon/morepokes/morepokes.php:28 +#: ../../addon/morepokes/morepokes.php:27 msgid "hug" msgstr "umarmen" -#: ../../addon/morepokes/morepokes.php:28 +#: ../../addon/morepokes/morepokes.php:27 msgid "hugged" msgstr "umarmte" -#: ../../addon/morepokes/morepokes.php:29 +#: ../../addon/morepokes/morepokes.php:28 msgid "kiss" msgstr "küssen" -#: ../../addon/morepokes/morepokes.php:29 +#: ../../addon/morepokes/morepokes.php:28 msgid "kissed" msgstr "küsste" -#: ../../addon/morepokes/morepokes.php:30 +#: ../../addon/morepokes/morepokes.php:29 msgid "raise eyebrows at" msgstr "Augenbrauen hochziehen" -#: ../../addon/morepokes/morepokes.php:30 +#: ../../addon/morepokes/morepokes.php:29 msgid "raised their eyebrows at" msgstr "zog die Augenbrauen hoch in Richtung" -#: ../../addon/morepokes/morepokes.php:31 +#: ../../addon/morepokes/morepokes.php:30 msgid "insult" msgstr "beleidigen" -#: ../../addon/morepokes/morepokes.php:31 +#: ../../addon/morepokes/morepokes.php:30 msgid "insulted" msgstr "beleidigte" -#: ../../addon/morepokes/morepokes.php:32 +#: ../../addon/morepokes/morepokes.php:31 msgid "praise" msgstr "preisen" -#: ../../addon/morepokes/morepokes.php:32 +#: ../../addon/morepokes/morepokes.php:31 msgid "praised" msgstr "pries" -#: ../../addon/morepokes/morepokes.php:33 +#: ../../addon/morepokes/morepokes.php:32 msgid "be dubious of" msgstr "ungewiss sein" -#: ../../addon/morepokes/morepokes.php:33 +#: ../../addon/morepokes/morepokes.php:32 msgid "was dubious of" msgstr "war ungewiss über" -#: ../../addon/morepokes/morepokes.php:34 +#: ../../addon/morepokes/morepokes.php:33 msgid "eat" msgstr "essen" -#: ../../addon/morepokes/morepokes.php:34 +#: ../../addon/morepokes/morepokes.php:33 msgid "ate" msgstr "aß" -#: ../../addon/morepokes/morepokes.php:35 +#: ../../addon/morepokes/morepokes.php:34 msgid "giggle and fawn at" msgstr "kichern und einschleimen" -#: ../../addon/morepokes/morepokes.php:35 +#: ../../addon/morepokes/morepokes.php:34 msgid "giggled and fawned at" msgstr "kicherte und schleimte sich ein bei" -#: ../../addon/morepokes/morepokes.php:36 +#: ../../addon/morepokes/morepokes.php:35 msgid "doubt" msgstr "bezweifeln" -#: ../../addon/morepokes/morepokes.php:36 +#: ../../addon/morepokes/morepokes.php:35 msgid "doubted" msgstr "bezweifelte" -#: ../../addon/morepokes/morepokes.php:37 +#: ../../addon/morepokes/morepokes.php:36 msgid "glare" msgstr "zornig anstarren" -#: ../../addon/morepokes/morepokes.php:37 +#: ../../addon/morepokes/morepokes.php:36 msgid "glared at" msgstr "starrte zornig auf" @@ -6111,68 +6162,68 @@ msgstr "Zufällige Zusammenstellung der Foren-Liste" msgid "Show forumlists/forums on profile forumlist" msgstr "Liste der Foren deren Abonnement du bist in deinem Profil anzeigen:" -#: ../../addon/impressum/impressum.php:36 +#: ../../addon/impressum/impressum.php:37 msgid "Impressum" msgstr "Impressum" -#: ../../addon/impressum/impressum.php:49 -#: ../../addon/impressum/impressum.php:51 -#: ../../addon/impressum/impressum.php:83 +#: ../../addon/impressum/impressum.php:50 +#: ../../addon/impressum/impressum.php:52 +#: ../../addon/impressum/impressum.php:84 msgid "Site Owner" msgstr "Betreiber der Seite" -#: ../../addon/impressum/impressum.php:49 -#: ../../addon/impressum/impressum.php:87 +#: ../../addon/impressum/impressum.php:50 +#: ../../addon/impressum/impressum.php:88 msgid "Email Address" msgstr "Email Adresse" -#: ../../addon/impressum/impressum.php:54 -#: ../../addon/impressum/impressum.php:85 +#: ../../addon/impressum/impressum.php:55 +#: ../../addon/impressum/impressum.php:86 msgid "Postal Address" msgstr "Postalische Anschrift" -#: ../../addon/impressum/impressum.php:60 +#: ../../addon/impressum/impressum.php:61 msgid "" "The impressum addon needs to be configured!
    Please add at least the " "owner variable to your config file. For other variables please " "refer to the README file of the addon." msgstr "Das Impressums-Plugin muss noch konfiguriert werden.
    Bitte gebe mindestens den Betreiber in der Konfiguration an. Alle weiteren Parameter werden in der README-Datei des Addons erläutert." -#: ../../addon/impressum/impressum.php:83 +#: ../../addon/impressum/impressum.php:84 msgid "The page operators name." msgstr "Name des Serveradministrators" -#: ../../addon/impressum/impressum.php:84 +#: ../../addon/impressum/impressum.php:85 msgid "Site Owners Profile" msgstr "Profil des Seitenbetreibers" -#: ../../addon/impressum/impressum.php:84 +#: ../../addon/impressum/impressum.php:85 msgid "Profile address of the operator." msgstr "Profil-Adresse des Serveradministrators" -#: ../../addon/impressum/impressum.php:85 +#: ../../addon/impressum/impressum.php:86 msgid "How to contact the operator via snail mail. You can use BBCode here." msgstr "Kontaktmöglichkeiten zum Administrator via Schneckenpost. Du kannst BBCode verwenden." -#: ../../addon/impressum/impressum.php:86 +#: ../../addon/impressum/impressum.php:87 msgid "Notes" msgstr "Hinweise" -#: ../../addon/impressum/impressum.php:86 +#: ../../addon/impressum/impressum.php:87 msgid "" "Additional notes that are displayed beneath the contact information. You can" " use BBCode here." msgstr "Zusätzliche Informationen die neben den Kontaktmöglichkeiten angezeigt werden. Du kannst BBCode verwenden." -#: ../../addon/impressum/impressum.php:87 +#: ../../addon/impressum/impressum.php:88 msgid "How to contact the operator via email. (will be displayed obfuscated)" msgstr "Wie man den Betreiber per Email erreicht. (Adresse wird verschleiert dargestellt)" -#: ../../addon/impressum/impressum.php:88 +#: ../../addon/impressum/impressum.php:89 msgid "Footer note" msgstr "Fußnote" -#: ../../addon/impressum/impressum.php:88 +#: ../../addon/impressum/impressum.php:89 msgid "Text for the footer. You can use BBCode here." msgstr "Text für die Fußzeile. Du kannst BBCode verwenden." @@ -6477,6 +6528,59 @@ msgstr "InsaneJournal Passwort" msgid "Post to InsaneJournal by default" msgstr "Standardmäßig auf InsaneJournal posten." +#: ../../addon/jappixmini/jappixmini.php:266 +msgid "Jappix Mini addon settings" +msgstr "Jappix Mini Addon Einstellungen" + +#: ../../addon/jappixmini/jappixmini.php:268 +msgid "Activate addon" +msgstr "Addon aktivieren" + +#: ../../addon/jappixmini/jappixmini.php:271 +msgid "" +"Do not insert the Jappixmini Chat-Widget into the webinterface" +msgstr "Füge das Jappix Mini Chat Widget nicht zum Webinterface hinzu" + +#: ../../addon/jappixmini/jappixmini.php:274 +msgid "Jabber username" +msgstr "Jabber Nutzername" + +#: ../../addon/jappixmini/jappixmini.php:277 +msgid "Jabber server" +msgstr "Jabber Server" + +#: ../../addon/jappixmini/jappixmini.php:281 +msgid "Jabber BOSH host" +msgstr "Jabber BOSH Host" + +#: ../../addon/jappixmini/jappixmini.php:285 +msgid "Jabber password" +msgstr "Japper Passwort" + +#: ../../addon/jappixmini/jappixmini.php:290 +msgid "Encrypt Jabber password with Friendica password (recommended)" +msgstr "Verschlüssele das Jabber Passwort mit dem Friendica Passwort (empfohlen)" + +#: ../../addon/jappixmini/jappixmini.php:293 +msgid "Friendica password" +msgstr "Friendica Passwort" + +#: ../../addon/jappixmini/jappixmini.php:296 +msgid "Approve subscription requests from Friendica contacts automatically" +msgstr "Kontaktanfragen von Friendica Kontakten automatisch akzeptieren" + +#: ../../addon/jappixmini/jappixmini.php:299 +msgid "Subscribe to Friendica contacts automatically" +msgstr "Automatisch Friendica Kontakten bei Jabber folgen" + +#: ../../addon/jappixmini/jappixmini.php:302 +msgid "Purge internal list of jabber addresses of contacts" +msgstr "Lösche die interne Liste der Jabber Adressen der Kontakte" + +#: ../../addon/jappixmini/jappixmini.php:308 +msgid "Add contact" +msgstr "Kontakt hinzufügen" + #: ../../addon/viewsrc/viewsrc.php:37 msgid "View Source" msgstr "Quelle ansehen" @@ -8041,12 +8145,12 @@ msgstr "Sekunden" msgid "%1$d %2$s ago" msgstr "%1$d %2$s her" -#: ../../include/datetime.php:472 ../../include/items.php:1621 +#: ../../include/datetime.php:472 ../../include/items.php:1683 #, php-format msgid "%s's birthday" msgstr "%ss Geburtstag" -#: ../../include/datetime.php:473 ../../include/items.php:1622 +#: ../../include/datetime.php:473 ../../include/items.php:1684 #, php-format msgid "Happy Birthday %s" msgstr "Herzlichen Glückwunsch %s" @@ -8321,15 +8425,15 @@ msgstr "Konnte die Kontaktinformationen nicht empfangen." msgid "following" msgstr "folgen" -#: ../../include/items.php:3220 +#: ../../include/items.php:3294 msgid "A new person is sharing with you at " msgstr "Eine neue Person teilt mit dir auf " -#: ../../include/items.php:3220 +#: ../../include/items.php:3294 msgid "You have a new follower at " msgstr "Du hast einen neuen Kontakt auf " -#: ../../include/items.php:3901 +#: ../../include/items.php:3975 msgid "Archives" msgstr "Archiv" @@ -8423,34 +8527,34 @@ 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:1033 +#: ../../include/Contact.php:220 ../../include/conversation.php:1052 msgid "Poke" msgstr "Anstupsen" -#: ../../include/Contact.php:221 ../../include/conversation.php:1027 +#: ../../include/Contact.php:221 ../../include/conversation.php:1046 msgid "View Status" msgstr "Pinnwand anschauen" -#: ../../include/Contact.php:222 ../../include/conversation.php:1028 +#: ../../include/Contact.php:222 ../../include/conversation.php:1047 msgid "View Profile" msgstr "Profil anschauen" -#: ../../include/Contact.php:223 ../../include/conversation.php:1029 +#: ../../include/Contact.php:223 ../../include/conversation.php:1048 msgid "View Photos" msgstr "Bilder anschauen" #: ../../include/Contact.php:224 ../../include/Contact.php:237 -#: ../../include/conversation.php:1030 +#: ../../include/conversation.php:1049 msgid "Network Posts" msgstr "Netzwerkbeiträge" #: ../../include/Contact.php:225 ../../include/Contact.php:237 -#: ../../include/conversation.php:1031 +#: ../../include/conversation.php:1050 msgid "Edit Contact" msgstr "Kontakt bearbeiten" #: ../../include/Contact.php:226 ../../include/Contact.php:237 -#: ../../include/conversation.php:1032 +#: ../../include/conversation.php:1051 msgid "Send PM" msgstr "Private Nachricht senden" @@ -8468,106 +8572,106 @@ msgstr "Nachricht/Beitrag" 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:933 +#: ../../include/conversation.php:952 msgid "Delete Selected Items" msgstr "Lösche die markierten Beiträge" -#: ../../include/conversation.php:1091 +#: ../../include/conversation.php:1110 #, php-format msgid "%s likes this." msgstr "%s mag das." -#: ../../include/conversation.php:1091 +#: ../../include/conversation.php:1110 #, php-format msgid "%s doesn't like this." msgstr "%s mag das nicht." -#: ../../include/conversation.php:1095 +#: ../../include/conversation.php:1114 #, php-format msgid "%2$d people like this." msgstr "%2$d Leute mögen das." -#: ../../include/conversation.php:1097 +#: ../../include/conversation.php:1116 #, php-format msgid "%2$d people don't like this." msgstr "%2$d Leute mögen das nicht." -#: ../../include/conversation.php:1103 +#: ../../include/conversation.php:1122 msgid "and" msgstr "und" -#: ../../include/conversation.php:1106 +#: ../../include/conversation.php:1125 #, php-format msgid ", and %d other people" msgstr " und %d andere" -#: ../../include/conversation.php:1107 +#: ../../include/conversation.php:1126 #, php-format msgid "%s like this." msgstr "%s mögen das." -#: ../../include/conversation.php:1107 +#: ../../include/conversation.php:1126 #, php-format msgid "%s don't like this." msgstr "%s mögen das nicht." -#: ../../include/conversation.php:1131 ../../include/conversation.php:1148 +#: ../../include/conversation.php:1150 ../../include/conversation.php:1167 msgid "Visible to everybody" msgstr "Für jedermann sichtbar" -#: ../../include/conversation.php:1133 ../../include/conversation.php:1150 +#: ../../include/conversation.php:1152 ../../include/conversation.php:1169 msgid "Please enter a video link/URL:" msgstr "Bitte Link/URL zum Video einfügen:" -#: ../../include/conversation.php:1134 ../../include/conversation.php:1151 +#: ../../include/conversation.php:1153 ../../include/conversation.php:1170 msgid "Please enter an audio link/URL:" msgstr "Bitte Link/URL zum Audio einfügen:" -#: ../../include/conversation.php:1135 ../../include/conversation.php:1152 +#: ../../include/conversation.php:1154 ../../include/conversation.php:1171 msgid "Tag term:" msgstr "Tag:" -#: ../../include/conversation.php:1137 ../../include/conversation.php:1154 +#: ../../include/conversation.php:1156 ../../include/conversation.php:1173 msgid "Where are you right now?" msgstr "Wo hältst du dich jetzt gerade auf?" -#: ../../include/conversation.php:1197 +#: ../../include/conversation.php:1216 msgid "upload photo" msgstr "Bild hochladen" -#: ../../include/conversation.php:1199 +#: ../../include/conversation.php:1218 msgid "attach file" msgstr "Datei anhängen" -#: ../../include/conversation.php:1201 +#: ../../include/conversation.php:1220 msgid "web link" msgstr "Weblink" -#: ../../include/conversation.php:1202 +#: ../../include/conversation.php:1221 msgid "Insert video link" msgstr "Video-Adresse einfügen" -#: ../../include/conversation.php:1203 +#: ../../include/conversation.php:1222 msgid "video link" msgstr "Video-Link" -#: ../../include/conversation.php:1204 +#: ../../include/conversation.php:1223 msgid "Insert audio link" msgstr "Audio-Adresse einfügen" -#: ../../include/conversation.php:1205 +#: ../../include/conversation.php:1224 msgid "audio link" msgstr "Audio-Link" -#: ../../include/conversation.php:1207 +#: ../../include/conversation.php:1226 msgid "set location" msgstr "Ort setzen" -#: ../../include/conversation.php:1209 +#: ../../include/conversation.php:1228 msgid "clear location" msgstr "Ort löschen" -#: ../../include/conversation.php:1216 +#: ../../include/conversation.php:1235 msgid "permissions" msgstr "Zugriffsrechte" diff --git a/view/de/strings.php b/view/de/strings.php index 55129ae0d..f59f898c9 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -706,6 +706,7 @@ $a->strings["Shift-reload the page or clear browser cache if the new photo does $a->strings["Unable to process image"] = "Bild konnte nicht verarbeitet werden"; $a->strings["Image exceeds size limit of %d"] = "Bildgröße überschreitet das Limit von %d"; $a->strings["Upload File:"] = "Datei hochladen:"; +$a->strings["Select a profile:"] = "Profil auswählen"; $a->strings["Upload"] = "Hochladen"; $a->strings["skip this step"] = "diesen Schritt überspringen"; $a->strings["select a photo from your photo albums"] = "wähle ein Foto von deinen Fotoalben"; @@ -1115,6 +1116,11 @@ $a->strings["Cache Statistics"] = "Cache Statistik"; $a->strings["Number of items"] = "Anzahl der Einträge"; $a->strings["Size of the cache"] = "Größe des Caches"; $a->strings["Delete the whole cache"] = "Cache leeren"; +$a->strings["Facebook Post disabled"] = ""; +$a->strings["Facebook Post"] = ""; +$a->strings["Install Facebook Post connector for this account."] = ""; +$a->strings["Remove Facebook Post connector"] = ""; +$a->strings["Facebook Post Settings"] = ""; $a->strings["%d person likes this"] = array( 0 => "%d Person mag das", 1 => "%d Leute mögen das", @@ -1134,11 +1140,10 @@ $a->strings["shag"] = "poppen"; $a->strings["shagged"] = "poppte"; $a->strings["do something obscenely biological to"] = "mit ihm/ihr etwas obszönes Körperliches machen"; $a->strings["did something obscenely biological to"] = "machte etwas obszönes Körperliches mit"; -$a->strings["point out the new poke feature to"] = "die neue Anstups-Funktion zeigen"; -$a->strings["pointed out the new poke feature to"] = "zeigte die neue Anstups-Funktion"; +$a->strings["point out the poke feature to"] = ""; +$a->strings["pointed out the poke feature to"] = ""; $a->strings["declare undying love for"] = "unterbliche Liebe verkünden"; $a->strings["declared undying love for"] = "verkündete unsterbliche Liebe für"; -$a->strings["set fire to"] = "entflammt"; $a->strings["patent"] = "patentieren"; $a->strings["patented"] = "patentierte"; $a->strings["stroke beard"] = "sich den Bart kratzen"; @@ -1465,6 +1470,19 @@ $a->strings["Enable InsaneJournal Post Plugin"] = "InsaneJournal Plugin aktivier $a->strings["InsaneJournal username"] = "InsaneJournal Benutzername"; $a->strings["InsaneJournal password"] = "InsaneJournal Passwort"; $a->strings["Post to InsaneJournal by default"] = "Standardmäßig auf InsaneJournal posten."; +$a->strings["Jappix Mini addon settings"] = "Jappix Mini Addon Einstellungen"; +$a->strings["Activate addon"] = "Addon aktivieren"; +$a->strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = "Füge das Jappix Mini Chat Widget nicht zum Webinterface hinzu"; +$a->strings["Jabber username"] = "Jabber Nutzername"; +$a->strings["Jabber server"] = "Jabber Server"; +$a->strings["Jabber BOSH host"] = "Jabber BOSH Host"; +$a->strings["Jabber password"] = "Japper Passwort"; +$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Verschlüssele das Jabber Passwort mit dem Friendica Passwort (empfohlen)"; +$a->strings["Friendica password"] = "Friendica Passwort"; +$a->strings["Approve subscription requests from Friendica contacts automatically"] = "Kontaktanfragen von Friendica Kontakten automatisch akzeptieren"; +$a->strings["Subscribe to Friendica contacts automatically"] = "Automatisch Friendica Kontakten bei Jabber folgen"; +$a->strings["Purge internal list of jabber addresses of contacts"] = "Lösche die interne Liste der Jabber Adressen der Kontakte"; +$a->strings["Add contact"] = "Kontakt hinzufügen"; $a->strings["View Source"] = "Quelle ansehen"; $a->strings["Post to StatusNet"] = "Bei StatusNet veröffentlichen"; $a->strings["Please contact your site administrator.
    The provided API URL is not valid."] = "Bitte kontaktiere den Administrator des Servers.
    Die angegebene API-URL ist nicht gültig."; From cb1c9de0690d171005ef50e60aef474114ab0fa0 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 14 Sep 2012 17:01:26 +0200 Subject: [PATCH 032/124] quattro: lilac color schema --- view/theme/quattro/config.php | 1 + view/theme/quattro/lilac/Makefile | 4 + view/theme/quattro/lilac/colors.less | 117 ++ view/theme/quattro/lilac/style.css | 2149 ++++++++++++++++++++++++++ view/theme/quattro/lilac/style.less | 14 + 5 files changed, 2285 insertions(+) create mode 100644 view/theme/quattro/lilac/Makefile create mode 100644 view/theme/quattro/lilac/colors.less create mode 100644 view/theme/quattro/lilac/style.css create mode 100644 view/theme/quattro/lilac/style.less diff --git a/view/theme/quattro/config.php b/view/theme/quattro/config.php index c261a78ec..e3d5b7810 100644 --- a/view/theme/quattro/config.php +++ b/view/theme/quattro/config.php @@ -44,6 +44,7 @@ function theme_admin_post(&$a){ function quattro_form(&$a, $align, $color){ $colors = array( "dark"=>"Quattro", + "lilac"=>"Lilac", "green"=>"Green" ); diff --git a/view/theme/quattro/lilac/Makefile b/view/theme/quattro/lilac/Makefile new file mode 100644 index 000000000..989da60c7 --- /dev/null +++ b/view/theme/quattro/lilac/Makefile @@ -0,0 +1,4 @@ +## + +style.css : style.less colors.less ../icons.less ../quattro.less + lessc style.less > style.css diff --git a/view/theme/quattro/lilac/colors.less b/view/theme/quattro/lilac/colors.less new file mode 100644 index 000000000..2df0e41f1 --- /dev/null +++ b/view/theme/quattro/lilac/colors.less @@ -0,0 +1,117 @@ +// Quattro Theme LESS file + +// "Echo" palette from Inkscape +@Yellow1 : #fce94f; +@Blue1:rgb(25,174,255); +@Blue2:rgb(0,132,200); +@Blue3:rgb(0,92,148); +@Red1:rgb(255,65,65); +@Red2:rgb(220,0,0); +@Red3:rgb(181,0,0); +@Orange1:rgb(255,255,62); +@Orange2:rgb(255,153,0); +@Orange3:rgb(255,102,0); +@Brown1:rgb(255,192,34); +@Brown2:rgb(184,129,0); +@Brown3:rgb(128,77,0); +@Green1:rgb(204,255,66); +@Green2:rgb(154,222,0); +@Green3:rgb(0,145,0); +@Green4:rgb(221,255,221); +@Purple1:rgb(241,202,255); +@Purple2:rgb(215,108,255); +@Purple3:rgb(186,0,255); +@Metalic1:rgb(189,205,212); +@Metalic2:rgb(158,171,176); +@Metalic3:rgb(54,78,89); +@Metalic4:rgb(14,35,46); +@Grey1:rgb(255,255,255); +@Grey2:rgb(204,204,204); +@Grey3:rgb(153,153,153); +@Grey4:rgb(102,102,102); +@Grey5:rgb(45,45,45); +@lilac: #86608e; +@lilacComp: #cbd38d; +@lilacDark: #521f5c; +@lilacBright:#c0a3c7; +@lilacVBright:#F6ECF9; + + +// Theme colors +@BodyBackground: @lilacVBright; +@BodyColor: @Grey5; + +@Link: @lilacDark; +@LinkHover: @lilac; +@LinkVisited: @lilac; + + +@ButtonColor: @Grey1; +@ButtonBackgroundColor: @Grey5; + +@Banner: @Grey1; + +@NavbarBackground:@lilacDark; +@NavbarSelectedBg:@lilacComp; +@NavbarSelectedBorder: @Metalic2; +@NavbarNotifBg: @lilac; + +@Menu: @Grey5; +@MenuBg: @Grey1; +@MenuBorder: @Metalic3; +@MenuItem: @Grey5; +@MenuItemHoverBg: @lilacBright; +@MenuItemSeparator: @Metalic2; +@MenuEmpty: @Metalic2; +@MenuItemDetail: @Metalic2; + +@AsideBorder: @Metalic1; +@AsideConnect: @Grey1; +@AsideConnectBg: @lilacDark; +@AsideConnectHoverBg: @lilac; +@VCardLabelColor: @Grey3; + +@InfoColor: @Grey1; +@InfoBackgroundColor: @Metalic3; + +@NoticeColor: @Grey1; +@NoticeBackgroundColor: #511919; + +@FieldHelpColor: @Grey3; + +@ThreadBackgroundColor: #eff0f1; +@ThreadBottomBorderColor: @Grey2; +@ShinyBorderColor: @lilacBright; + +@BlockquoteBackgroundColor: #FFFFFF; +@BlockquoteBorderColor: #e6e6e6; + +@CommentBoxEmptyColor: @Grey3; +@CommentBoxEmptyBorderColor: @Grey3; +@CommentBoxFullColor: @Grey5; +@CommentBoxFullBorderColor: @Grey5; + +@TagColor: @Grey1; + +@JotToolsBackgroundColor: @lilacDark; +@JotToolsBorderColor: @Metalic2; +@JotToolsOverBackgroundColor: @lilac; +@JotToolsOverBorderColor: @Metalic1; +@JotToolsText: @Grey2; +@JotSubmitBackgroundColor: @Grey2; +@JotSubmitText: @Grey4; +@JotSubmitOverBackgroundColor: @lilacDark; +@JotSubmitOverText: @Grey4; +@JotPermissionUnlockBackgroundColor: @Grey2; +@JotPermissionLockBackgroundColor: @Grey4; +@JotLoadingBackgroundColor: @Grey1; +@JotPreviewBackgroundColor: @lilacBright; + +@MessageNewBackgroundColor: @Blue1; +@MessageNewBorderColor: @Blue3; +@MessageNewColor: @Grey1; + +@MailListBackgroundColor: #f6f7f8; + +@MailDisplaySubjectColor: @Grey5; +@MailDisplaySubjectBackgroundColor: #f6f7f8; diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css new file mode 100644 index 000000000..c6229e885 --- /dev/null +++ b/view/theme/quattro/lilac/style.css @@ -0,0 +1,2149 @@ +/** + * Fabio Comuni + **/ +/* icons */ +.icon { + background-color: transparent ; + background-repeat: no-repeat; + background-position: left center; + display: block; + overflow: hidden; + text-indent: -9999px; + padding: 1px; + min-width: 22px; + height: 22px; +} +.icon.text { + text-indent: 0px; +} +.icon.notify { + background-image: url("../../../images/icons/22/notify_off.png"); +} +.icon.gear { + background-image: url("../../../images/icons/22/gear.png"); +} +.icon.like { + background-image: url("icons/like.png"); +} +.icon.dislike { + background-image: url("icons/dislike.png"); +} +.icon.add { + background-image: url("../../../images/icons/22/add.png"); +} +.icon.delete { + background-image: url("../../../images/icons/22/delete.png"); +} +.icon.edit { + background-image: url("../../../images/icons/22/edit.png"); +} +.icon.star { + background-image: url("../../../images/icons/22/star.png"); +} +.icon.menu { + background-image: url("../../../images/icons/22/menu.png"); +} +.icon.link { + background-image: url("../../../images/icons/22/link.png"); +} +.icon.lock { + background-image: url("../../../images/icons/22/lock.png"); +} +.icon.unlock { + background-image: url("../../../images/icons/22/unlock.png"); +} +.icon.plugin { + background-image: url("../../../images/icons/22/plugin.png"); +} +.icon.type-unkn { + background-image: url("../../../images/icons/22/zip.png"); +} +.icon.type-audio { + background-image: url("../../../images/icons/22/audio.png"); +} +.icon.type-video { + background-image: url("../../../images/icons/22/video.png"); +} +.icon.type-image { + background-image: url("../../../images/icons/22/image.png"); +} +.icon.type-text { + background-image: url("../../../images/icons/22/text.png"); +} +.icon.language { + background-image: url("icons/language.png"); +} +.icon.text { + padding: 10px 0px 0px 25px; +} +.icon.s10 { + min-width: 10px; + height: 10px; +} +.icon.s10.notify { + background-image: url("../../../images/icons/10/notify_off.png"); +} +.icon.s10.gear { + background-image: url("../../../images/icons/10/gear.png"); +} +.icon.s10.like { + background-image: url("icons/like.png"); +} +.icon.s10.dislike { + background-image: url("icons/dislike.png"); +} +.icon.s10.add { + background-image: url("../../../images/icons/10/add.png"); +} +.icon.s10.delete { + background-image: url("../../../images/icons/10/delete.png"); +} +.icon.s10.edit { + background-image: url("../../../images/icons/10/edit.png"); +} +.icon.s10.star { + background-image: url("../../../images/icons/10/star.png"); +} +.icon.s10.menu { + background-image: url("../../../images/icons/10/menu.png"); +} +.icon.s10.link { + background-image: url("../../../images/icons/10/link.png"); +} +.icon.s10.lock { + background-image: url("../../../images/icons/10/lock.png"); +} +.icon.s10.unlock { + background-image: url("../../../images/icons/10/unlock.png"); +} +.icon.s10.plugin { + background-image: url("../../../images/icons/10/plugin.png"); +} +.icon.s10.type-unkn { + background-image: url("../../../images/icons/10/zip.png"); +} +.icon.s10.type-audio { + background-image: url("../../../images/icons/10/audio.png"); +} +.icon.s10.type-video { + background-image: url("../../../images/icons/10/video.png"); +} +.icon.s10.type-image { + background-image: url("../../../images/icons/10/image.png"); +} +.icon.s10.type-text { + background-image: url("../../../images/icons/10/text.png"); +} +.icon.s10.language { + background-image: url("icons/language.png"); +} +.icon.s10.text { + padding: 2px 0px 0px 15px; +} +.icon.s16 { + min-width: 16px; + height: 16px; +} +.icon.s16.notify { + background-image: url("../../../images/icons/16/notify_off.png"); +} +.icon.s16.gear { + background-image: url("../../../images/icons/16/gear.png"); +} +.icon.s16.like { + background-image: url("icons/like.png"); +} +.icon.s16.dislike { + background-image: url("icons/dislike.png"); +} +.icon.s16.add { + background-image: url("../../../images/icons/16/add.png"); +} +.icon.s16.delete { + background-image: url("../../../images/icons/16/delete.png"); +} +.icon.s16.edit { + background-image: url("../../../images/icons/16/edit.png"); +} +.icon.s16.star { + background-image: url("../../../images/icons/16/star.png"); +} +.icon.s16.menu { + background-image: url("../../../images/icons/16/menu.png"); +} +.icon.s16.link { + background-image: url("../../../images/icons/16/link.png"); +} +.icon.s16.lock { + background-image: url("../../../images/icons/16/lock.png"); +} +.icon.s16.unlock { + background-image: url("../../../images/icons/16/unlock.png"); +} +.icon.s16.plugin { + background-image: url("../../../images/icons/16/plugin.png"); +} +.icon.s16.type-unkn { + background-image: url("../../../images/icons/16/zip.png"); +} +.icon.s16.type-audio { + background-image: url("../../../images/icons/16/audio.png"); +} +.icon.s16.type-video { + background-image: url("../../../images/icons/16/video.png"); +} +.icon.s16.type-image { + background-image: url("../../../images/icons/16/image.png"); +} +.icon.s16.type-text { + background-image: url("../../../images/icons/16/text.png"); +} +.icon.s16.language { + background-image: url("icons/language.png"); +} +.icon.s16.text { + padding: 4px 0px 0px 20px; +} +.icon.s22 { + min-width: 22px; + height: 22px; +} +.icon.s22.notify { + background-image: url("../../../images/icons/22/notify_off.png"); +} +.icon.s22.gear { + background-image: url("../../../images/icons/22/gear.png"); +} +.icon.s22.like { + background-image: url("icons/like.png"); +} +.icon.s22.dislike { + background-image: url("icons/dislike.png"); +} +.icon.s22.add { + background-image: url("../../../images/icons/22/add.png"); +} +.icon.s22.delete { + background-image: url("../../../images/icons/22/delete.png"); +} +.icon.s22.edit { + background-image: url("../../../images/icons/22/edit.png"); +} +.icon.s22.star { + background-image: url("../../../images/icons/22/star.png"); +} +.icon.s22.menu { + background-image: url("../../../images/icons/22/menu.png"); +} +.icon.s22.link { + background-image: url("../../../images/icons/22/link.png"); +} +.icon.s22.lock { + background-image: url("../../../images/icons/22/lock.png"); +} +.icon.s22.unlock { + background-image: url("../../../images/icons/22/unlock.png"); +} +.icon.s22.plugin { + background-image: url("../../../images/icons/22/plugin.png"); +} +.icon.s22.type-unkn { + background-image: url("../../../images/icons/22/zip.png"); +} +.icon.s22.type-audio { + background-image: url("../../../images/icons/22/audio.png"); +} +.icon.s22.type-video { + background-image: url("../../../images/icons/22/video.png"); +} +.icon.s22.type-image { + background-image: url("../../../images/icons/22/image.png"); +} +.icon.s22.type-text { + background-image: url("../../../images/icons/22/text.png"); +} +.icon.s22.language { + background-image: url("icons/language.png"); +} +.icon.s22.text { + padding: 10px 0px 0px 25px; +} +.icon.s48 { + width: 48px; + height: 48px; +} +.icon.s48.notify { + background-image: url("../../../images/icons/48/notify_off.png"); +} +.icon.s48.gear { + background-image: url("../../../images/icons/48/gear.png"); +} +.icon.s48.like { + background-image: url("icons/like.png"); +} +.icon.s48.dislike { + background-image: url("icons/dislike.png"); +} +.icon.s48.add { + background-image: url("../../../images/icons/48/add.png"); +} +.icon.s48.delete { + background-image: url("../../../images/icons/48/delete.png"); +} +.icon.s48.edit { + background-image: url("../../../images/icons/48/edit.png"); +} +.icon.s48.star { + background-image: url("../../../images/icons/48/star.png"); +} +.icon.s48.menu { + background-image: url("../../../images/icons/48/menu.png"); +} +.icon.s48.link { + background-image: url("../../../images/icons/48/link.png"); +} +.icon.s48.lock { + background-image: url("../../../images/icons/48/lock.png"); +} +.icon.s48.unlock { + background-image: url("../../../images/icons/48/unlock.png"); +} +.icon.s48.plugin { + background-image: url("../../../images/icons/48/plugin.png"); +} +.icon.s48.type-unkn { + background-image: url("../../../images/icons/48/zip.png"); +} +.icon.s48.type-audio { + background-image: url("../../../images/icons/48/audio.png"); +} +.icon.s48.type-video { + background-image: url("../../../images/icons/48/video.png"); +} +.icon.s48.type-image { + background-image: url("../../../images/icons/48/image.png"); +} +.icon.s48.type-text { + background-image: url("../../../images/icons/48/text.png"); +} +.icon.s48.language { + background-image: url("icons/language.png"); +} +.icon.on { + background-image: url("icons/addon_on.png"); + min-width: 16px; + height: 16px; + background-position: 0px 0px; +} +.icon.off { + background-image: url("icons/addon_off.png"); + width: 16px; + height: 16px; + background-position: 0px 0px; +} +/* global */ +body { + font-family: Liberation Sans, helvetica, arial, clean, sans-serif; + font-size: 11px; + background-color: #f6ecf9; + color: #2d2d2d; + margin: 50px 0px 0px 0px; + display: table; +} +h4 { + font-size: 1.1em; +} +a, +a:link { + color: #521f5c; + text-decoration: none; +} +a:visited { + color: #86608e; + text-decoration: none; +} +a:hover { + color: #86608e; + text-decoration: underline; +} +.left { + float: left; +} +.right { + float: right; +} +.hidden { + display: none; +} +.clear { + clear: both; +} +.fakelink { + color: #521f5c; + text-decoration: none; + cursor: pointer; +} +.fakelink:hover { + color: #86608e; + text-decoration: underline; +} +blockquote { + background: #ffffff; + padding: 1em; + margin-left: 1em; + border-left: 1em solid #e6e6e6; +} +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; +} +textarea { + font-size: 20px; +} +#panel { + position: absolute; + width: 10em; + background: #ffffff; + color: #2d2d2d; + margin: 0px; + padding: 1em; + list-style: none; + border: 3px solid #364e59; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +/* tool */ +.tool { + height: auto; + overflow: auto; +} +.tool .label { + float: left; +} +.tool .action { + float: right; +} +.tool > img { + float: left; +} +/* popup notifications */ +#jGrowl.top-right { + top: 30px; + right: 15px; +} +div.jGrowl div.notice { + background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +div.jGrowl div.info { + background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +/* header */ +header { + position: fixed; + left: 43%; + right: 43%; + top: 0px; + margin: 0px; + padding: 0px; + /*width: 100%; height: 12px; */ + + z-index: 110; + color: #ffffff; +} +header #site-location { + display: none; +} +header #banner { + overflow: hidden; + text-align: center; + width: 100%; +} +header #banner a, +header #banner a:active, +header #banner a:visited, +header #banner a:link, +header #banner a:hover { + color: #ffffff; + text-decoration: none; + outline: none; + vertical-align: bottom; +} +header #banner #logo-img { + height: 22px; + margin-top: 5px; +} +header #banner #logo-text { + font-size: 22px; +} +/* nav */ +nav { + width: 100%; + height: 32px; + position: fixed; + left: 0px; + top: 0px; + padding: 0px; + background-color: #521f5c; + color: #ffffff; + z-index: 100; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); +} +nav a, +nav a:active, +nav a:visited, +nav a:link, +nav a:hover { + color: #ffffff; + text-decoration: none; + outline: none; +} +nav ul { + margin: 0px; + padding: 0px 20px; +} +nav ul li { + list-style: none; + margin: 0px; + padding: 0px; + float: left; +} +nav ul li .menu-popup { + left: 0px; + right: auto; +} +nav .nav-menu-icon { + position: relative; + height: 22px; + padding: 5px; + margin: 0px 10px; + -moz-border-radius: 5px 5px 0 0; + -webkit-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} +nav .nav-menu-icon.selected { + background-color: #cbd38d; +} +nav .nav-menu-icon img { + width: 22px; + height: 22px; +} +nav .nav-menu-icon .nav-notify { + top: 3px; +} +nav .nav-menu { + position: relative; + height: 16px; + padding: 5px; + margin: 3px 15px 0px; + font-size: 14px; + border-bottom: 3px solid #521f5c; +} +nav .nav-menu.selected { + border-bottom: 3px solid #9eabb0; +} +nav .nav-notify { + display: none; + position: absolute; + background-color: #86608e; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + font-size: 10px; + padding: 1px 3px; + top: 0px; + right: -10px; + min-width: 15px; + text-align: right; +} +nav .nav-notify.show { + display: block; +} +nav #nav-help-link, +nav #nav-search-link, +nav #nav-directory-link, +nav #nav-apps-link, +nav #nav-site-linkmenu { + float: right; +} +nav #nav-help-link .menu-popup, +nav #nav-search-link .menu-popup, +nav #nav-directory-link .menu-popup, +nav #nav-apps-link .menu-popup, +nav #nav-site-linkmenu .menu-popup { + right: 0px; + left: auto; +} +nav #nav-notifications-linkmenu.on .icon.s22.notify, +nav #nav-notifications-linkmenu.selected .icon.s22.notify { + background-image: url("../../../images/icons/22/notify_on.png"); +} +nav #nav-apps-link.selected { + background-color: #cbd38d; +} +ul.menu-popup { + position: absolute; + display: none; + width: 10em; + background: #ffffff; + color: #2d2d2d; + margin: 0px; + padding: 0px; + list-style: none; + border: 3px solid #364e59; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +ul.menu-popup a { + display: block; + color: #2d2d2d; + padding: 5px 10px; + text-decoration: none; +} +ul.menu-popup a:hover { + background-color: #c0a3c7; +} +ul.menu-popup .menu-sep { + border-top: 1px solid #9eabb0; +} +ul.menu-popup li { + float: none; + overflow: auto; + height: auto; + display: block; +} +ul.menu-popup li img { + float: left; + width: 16px; + height: 16px; + padding-right: 5px; +} +ul.menu-popup .empty { + padding: 5px; + text-align: center; + color: #9eabb0; +} +ul.menu-popup .toolbar { + background-color: #9eabb0; + height: auto; + overflow: auto; +} +ul.menu-popup .toolbar a { + float: right; +} +ul.menu-popup .toolbar a:hover { + background-color: #ffffff; +} +/* autocomplete popup */ +.acpopup { + max-height: 150px; + background-color: #ffffff; + color: #2d2d2d; + border: 1px solid #MenuBorder; + overflow: auto; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +.acpopupitem { + color: #2d2d2d; + padding: 4px; + clear: left; +} +.acpopupitem img { + float: left; + margin-right: 4px; +} +.acpopupitem.selected { + background-color: #c0a3c7; +} +#nav-notifications-menu { + width: 400px; + max-height: 550px; + overflow: auto; +} +#nav-notifications-menu img { + float: left; + margin-right: 5px; +} +#nav-notifications-menu .contactname { + font-weight: bold; +} +#nav-notifications-menu .notif-when { + font-size: 10px; + color: #9eabb0; + display: block; +} +/* aside 230px*/ +aside { + display: table-cell; + vertical-align: top; + width: 200px; + padding: 0px 10px 0px 20px; + border-right: 1px solid #bdcdd4; +} +aside .profile-edit-side-div { + display: none; +} +aside .vcard .fn { + font-size: 16px; + font-weight: bold; + margin-bottom: 5px; +} +aside .vcard .title { + margin-bottom: 5px; +} +aside .vcard dl { + height: auto; + overflow: auto; +} +aside .vcard dt { + float: left; + margin-left: 0px; + width: 35%; + text-align: right; + color: #999999; +} +aside .vcard dd { + float: left; + margin-left: 4px; + width: 60%; +} +aside #profile-extra-links ul { + padding: 0px; + margin: 0px; +} +aside #profile-extra-links li { + padding: 0px; + margin: 0px; + list-style: none; +} +aside #wallmessage-link { + display: block; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + color: #ffffff; + background: #521f5c url('../../../images/connect-bg.png') no-repeat left center; + font-weight: bold; + text-transform: uppercase; + padding: 4px 2px 2px 35px; + margin-top: 3px; +} +aside #wallmessage-link:hover { + text-decoration: none; + background-color: #86608e; +} +aside #dfrn-request-link { + display: block; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + color: #ffffff; + background: #521f5c url('../../../images/connect-bg.png') no-repeat left center; + font-weight: bold; + text-transform: uppercase; + padding: 4px 2px 2px 35px; +} +aside #dfrn-request-link:hover { + text-decoration: none; + background-color: #86608e; +} +aside #profiles-menu { + width: 20em; +} +#contact-block { + overflow: auto; + height: auto; + /*.contact-block-div { width:60px; height: 60px; }*/ + +} +#contact-block .contact-block-h4 { + float: left; + margin: 5px 0px; +} +#contact-block .allcontact-link { + float: right; + margin: 5px 0px; +} +#contact-block .contact-block-content { + clear: both; + overflow: hidden; + height: auto; +} +#contact-block .contact-block-link { + float: left; + margin: 0px 2px 2px 0px; +} +#contact-block .contact-block-link img { + width: 48px; + height: 48px; +} +/* group member */ +#contact-edit-drop-link, +.mail-list-delete-wrapper, +.group-delete-wrapper { + float: right; + margin-right: 50px; +} +#contact-edit-drop-link .drophide, +.mail-list-delete-wrapper .drophide, +.group-delete-wrapper .drophide { + background-image: url('../../../images/icons/22/delete.png'); + display: block; + width: 22px; + height: 22px; + opacity: 0.3; + position: relative; + top: -50px; +} +#contact-edit-drop-link .drop, +.mail-list-delete-wrapper .drop, +.group-delete-wrapper .drop { + background-image: url('../../../images/icons/22/delete.png'); + display: block; + width: 22px; + height: 22px; + position: relative; + top: -50px; +} +/* +#group-members { + margin-top: 20px; + padding: 10px; + height: 250px; + overflow: auto; + border: 1px solid #ddd; +} +#group-members-end { + clear: both; +} +#group-all-contacts { + padding: 10px; + height: 450px; + overflow: auto; + border: 1px solid #ddd; +} +#group-all-contacts-end { + clear: both; + margin-bottom: 10px; +} +.contact-block-div { + float: left; + width: 60px; + height: 60px; +}*/ +/* widget */ +.widget { + margin-bottom: 2em; + /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} + .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ + +} +.widget h3 { + padding: 0px; + margin: 2px; +} +.widget .action { + opacity: 0.1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget input.action { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget:hover .title .action { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget .tool:hover .action { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget .tool:hover .action.ticked { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget ul { + padding: 0px; +} +.widget ul li { + padding-left: 16px; + min-height: 16px; + list-style: none; +} +.widget .tool.selected { + background: url('../../../images/selected.png') no-repeat left center; +} +/* widget: search */ +#add-search-popup { + width: 200px; + top: 18px; +} +/* section 800px */ +section { + display: table-cell; + vertical-align: top; + width: 770px; + padding: 0px 20px 0px 10px; +} +.sparkle { + cursor: url('icons/lock.cur'), pointer; +} +/* wall item */ +.tread-wrapper { + background-color: #eff0f1; + position: relative; + padding: 10px; + margin-bottom: 20px; + width: 750px; + border-bottom: 1px solid #cccccc; +} +.wall-item-decor { + position: absolute; + left: 97%; + top: -10px; + width: 16px; +} +.unstarred { + display: none; +} +.wall-item-container { + display: table; + width: 750px; +} +.wall-item-container .wall-item-item, +.wall-item-container .wall-item-bottom { + display: table-row; +} +.wall-item-container .wall-item-bottom { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container:hover .wall-item-bottom { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container .wall-item-info { + display: table-cell; + vertical-align: top; + text-align: left; + width: 60px; +} +.wall-item-container .wall-item-location { + word-wrap: break-word; + width: 50px; +} +.wall-item-container .wall-item-content { + display: table-cell; + font-size: 12px; + max-width: 720px; + word-wrap: break-word; +} +.wall-item-container .wall-item-content img { + max-width: 710px; +} +.wall-item-container .wall-item-links, +.wall-item-container .wall-item-actions { + display: table-cell; + vertical-align: middle; +} +.wall-item-container .wall-item-links .icon, +.wall-item-container .wall-item-actions .icon { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container .wall-item-links .icon:hover, +.wall-item-container .wall-item-actions .icon:hover { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container .wall-item-ago { + padding-right: 40px; +} +.wall-item-container .wall-item-name { + font-weight: bold; +} +.wall-item-container .wall-item-actions-author { + float: left; + width: 20em; + margin-top: 0.5em; +} +.wall-item-container .wall-item-actions-social { + float: left; + margin-top: 0.5em; +} +.wall-item-container .wall-item-actions-social a { + margin-right: 3em; +} +.wall-item-container .wall-item-actions-tools { + float: right; + width: 15%; +} +.wall-item-container .wall-item-actions-tools a { + float: right; +} +.wall-item-container .wall-item-actions-tools input { + float: right; +} +.wall-item-container.comment .contact-photo-wrapper { + margin-left: 16px; +} +.wall-item-container.comment .contact-photo { + width: 32px; + height: 32px; +} +.wall-item-container.comment .contact-photo-menu-button { + top: 15px !important; + left: 0px !important; +} +.wall-item-container.comment .wall-item-links { + padding-left: 12px; +} +/* 'tag' item type */ +.wall-item-container.item-tag .wall-item-content { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container.item-tag .contact-photo-wrapper { + margin-left: 32px; +} +.wall-item-container.item-tag .contact-photo { + width: 16px; + height: 16px; +} +.wall-item-container.item-tag .contact-photo-menu-button { + top: 15px !important; + left: 15px !important; +} +.wall-item-comment-wrapper { + margin: 1em 2em 1em 60px; +} +.wall-item-comment-wrapper .comment-edit-photo { + display: none; +} +.wall-item-comment-wrapper textarea { + height: 1em; + width: 100%; + font-size: 10px; + color: #999999; + border: 1px solid #999999; + padding: 0.3em; +} +.wall-item-comment-wrapper .comment-edit-text-full { + font-size: 20px; + height: 4em; + color: #2d2d2d; + border: 1px solid #2d2d2d; +} +.threaded .wall-item-comment-wrapper { + margin-left: 0px; +} +.comment-edit-preview { + width: 710px; + border: 1px solid #2d2d2d; + margin-top: 10px; + background-color: #c0a3c7; +} +.comment-edit-preview .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ + +} +.comment-edit-preview .contact-photo-menu-button { + top: 15px !important; + left: 15px !important; +} +.comment-edit-preview .wall-item-links { + padding-left: 12px; +} +.comment-edit-preview .wall-item-container { + width: 90%; +} +.comment-edit-preview .tread-wrapper { + width: 90%; + padding: 0; + margin: 10px 0; + background-color: #c0a3c7; + border-bottom: 0px; +} +.comment-edit-preview .wall-item-conv { + display: none; +} +.shiny { + border-right: 10px solid #c0a3c7; +} +#jot-preview-content .tread-wrapper { + background-color: #c0a3c7; +} +.hide-comments-outer { + margin-bottom: 0.8em; +} +.wall-item-tags { + padding-top: 5px; +} +.tag { + background: url("../../../images/tag_b.png") no-repeat center left; + color: #ffffff; + padding-left: 3px; +} +.tag a { + padding-right: 8px; + background: url("../../../images/tag.png") no-repeat center right; + color: #ffffff; +} +.filesavetags { + padding: 3px 0px 3px 0px; + opacity: 0.5; +} +.wwto { + position: absolute !important; + width: 25px; + height: 25px; + background: #FFFFFF; + border: 2px solid #364e59; + height: 25px; + width: 25px; + overflow: hidden; + padding: 1px; + position: absolute !important; + top: 40px; + left: 30px; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); +} +.wwto .contact-photo { + width: 25px; + height: 25px; +} +/* threaded comments */ +.children { + margin-top: 1em; +} +.children .hide-comments-outer { + margin-left: 60px; +} +.children .wwto { + display: none; +} +.children .comment-edit-preview { + width: 660px; +} +.children .comment-edit-preview .wall-item-container { + width: 610px; +} +.children .children { + margin-left: 40px; +} +.children .children .wall-item-container { + width: 710px; +} +.children .children .comment-edit-preview { + width: 620px; +} +.children .children .comment-edit-preview .wall-item-container { + width: 620px; +} +.children .children .children .wall-item-container { + width: 670px; +} +.children .children .children .comment-edit-preview { + width: 580px; +} +.children .children .children .comment-edit-preview .wall-item-container { + width: 580px; +} +.children .children .children .children .wall-item-container { + width: 630px; +} +.children .children .children .children .comment-edit-preview { + width: 540px; +} +.children .children .children .children .comment-edit-preview .wall-item-container { + width: 540px; +} +.children .children .children .children .children .wall-item-container { + width: 590px; +} +.children .children .children .children .children .comment-edit-preview { + width: 500px; +} +.children .children .children .children .children .comment-edit-preview .wall-item-container { + width: 500px; +} +.children .children .children .children .children .children { + margin-left: 0px; +} +.children .children .children .children .children .children .hide-comments-outer { + margin-left: 0px; +} +/*.threaded .hide-comments-outer { margin-left: 20px; }*/ +span[id^="showmore-teaser"] { + background: url("showmore-bg.jpg") no-repeat center bottom; +} +span[id^="showmore-wrap"] { + border-top: 1px solid #999999; + color: #999999; + display: block; + text-align: center; + background-color: #eff0f1; +} +#pause { + position: fixed; + bottom: 5px; + right: 5px; +} +.contact-photo-wrapper { + position: relative; +} +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-photo-menu-button { + display: none; + position: absolute; + left: -2px; + top: 31px; +} +.contact-wrapper { + float: left; + width: 300px; + height: 90px; + padding-right: 10px; + margin: 0 10px 10px 0px; +} +.contact-wrapper .contact-photo-wrapper { + float: left; + margin-right: 10px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo-menu-button { + left: 0px; + top: 63px; +} +.directory-item { + float: left; + width: 200px; + height: 200px; +} +.directory-item .contact-photo { + width: 175px; + height: 175px; +} +.directory-item .contact-photo img { + width: 175px; + height: 175px; +} +.contact-name { + font-weight: bold; + padding-top: 15px; +} +.contact-details { + color: #999999; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +/* editor */ +.jothidden { + display: none; +} +#jot { + width: 100%; + margin: 0px 2em 20px 0px; +} +#jot .profile-jot-text { + height: 1em; + width: 99%; + font-size: 10px; + color: #999999; + border: 1px solid #999999; + padding: 0.3em; +} +#jot .profile-jot-text:focus { + font-size: 20px; +} +#jot #jot-tools { + margin: 0px; + padding: 0px; + height: 40px; + overflow: none; + width: 770px; + background-color: #521f5c; + border-bottom: 2px solid #9eabb0; +} +#jot #jot-tools li { + list-style: none; + float: left; + width: 80px; + height: 40px; + border-bottom: 2px solid #9eabb0; +} +#jot #jot-tools li a { + display: block; + color: #cccccc; + width: 100%; + height: 40px; + text-align: center; + line-height: 40px; + overflow: hidden; +} +#jot #jot-tools li:hover { + background-color: #86608e; + border-bottom: 2px solid #bdcdd4; +} +#jot #jot-tools li.perms { + float: right; + width: 40px; +} +#jot #jot-tools li.perms a.unlock { + width: 30px; + border-left: 10px solid #cccccc; + background-color: #cccccc; +} +#jot #jot-tools li.perms a.lock { + width: 30px; + border-left: 10px solid #666666; + background-color: #666666; +} +#jot #jot-tools li.submit { + float: right; + background-color: #cccccc; + border-bottom: 2px solid #cccccc; + border-right: 1px solid #666666; + border-left: 1px solid #666666; +} +#jot #jot-tools li.submit input { + border: 0px; + margin: 0px; + padding: 0px; + background-color: #cccccc; + color: #666666; + width: 80px; + height: 40px; + line-height: 40px; +} +#jot #jot-tools li.submit input:hover { + background-color: #521f5c; + color: #666666; +} +#jot #jot-tools li.loading { + float: right; + background-color: #ffffff; + width: 20px; + vertical-align: center; + text-align: center; + border-top: 2px solid #9eabb0; + height: 38px; +} +#jot #jot-tools li.loading img { + margin-top: 10px; +} +#jot #jot-title { + border: 0px; + margin: 0px; + height: 20px; + width: 500px; + font-weight: bold; + border: 1px solid #f6ecf9; +} +#jot #jot-title:-webkit-input-placeholder { + font-weight: normal; +} +#jot #jot-title:-moz-placeholder { + font-weight: normal; +} +#jot #jot-title:hover { + border: 1px solid #999999; +} +#jot #jot-title:focus { + border: 1px solid #999999; +} +#jot #character-counter { + width: 40px; + float: right; + text-align: right; + height: 20px; + line-height: 20px; + padding-right: 20px; +} +#jot #jot-category { + border: 0px; + margin: 0px; + height: 20px; + width: 200px; + border: 1px solid #f6ecf9; +} +#jot #jot-category:hover { + border: 1px solid #999999; +} +#jot #jot-category:focus { + border: 1px solid #999999; +} +/** buttons **/ +/*input[type="submit"] { + border: 0px; + background-color: @ButtonBackgroundColor; + color: @ButtonColor; + padding: 0px 10px; + .rounded(5px); + height: 18px; +}*/ +/** acl **/ +#photo-edit-perms-select, +#photos-upload-permissions-wrapper, +#profile-jot-acl-wrapper { + display: block!important; +} +#acl-wrapper { + width: 690px; + float: left; +} +#acl-search { + float: right; + background: #ffffff url("../../../images/search_18.png") no-repeat right center; + padding-right: 20px; +} +#acl-showall { + float: left; + display: block; + width: auto; + height: 18px; + background-color: #cccccc; + background-image: url("../../../images/show_all_off.png"); + background-position: 7px 7px; + background-repeat: no-repeat; + padding: 7px 5px 0px 30px; + color: #999999; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; +} +#acl-showall.selected { + color: #000000; + background-color: #ff9900; + background-image: url("../../../images/show_all_on.png"); +} +#acl-list { + height: 210px; + border: 1px solid #cccccc; + clear: both; + margin-top: 30px; + overflow: auto; +} +.acl-list-item { + display: block; + width: 150px; + height: 30px; + border: 1px solid #cccccc; + margin: 5px; + float: left; +} +.acl-list-item img { + width: 22px; + height: 22px; + float: left; + margin: 4px; +} +.acl-list-item p { + height: 12px; + font-size: 10px; + margin: 0px; + padding: 2px 0px 1px; + overflow: hidden; +} +.acl-list-item a { + font-size: 8px; + display: block; + width: 40px; + height: 10px; + float: left; + color: #999999; + background-color: #cccccc; + background-position: 3px 3px; + background-repeat: no-repeat; + margin-right: 5px; + -webkit-border-radius: 2px ; + -moz-border-radius: 2px; + border-radius: 2px; + padding-left: 15px; +} +#acl-wrapper a:hover { + text-decoration: none; + color: #000000; +} +.acl-button-show { + background-image: url("../../../images/show_off.png"); +} +.acl-button-hide { + background-image: url("../../../images/hide_off.png"); +} +.acl-button-show.selected { + color: #000000; + background-color: #9ade00; + background-image: url("../../../images/show_on.png"); +} +.acl-button-hide.selected { + color: #000000; + background-color: #ff4141; + background-image: url("../../../images/hide_on.png"); +} +.acl-list-item.groupshow { + border-color: #9ade00; +} +.acl-list-item.grouphide { + border-color: #ff4141; +} +/** /acl **/ +/** tab buttons **/ +ul.tabs { + list-style-type: none; + padding-bottom: 10px; +} +ul.tabs li { + float: left; + margin-left: 20px; +} +ul.tabs li .active { + border-bottom: 1px solid #86608e; +} +/** group editor **/ +#group-edit-desc { + margin-top: 1em; + color: #999999; +} +#group-update-wrapper { + height: auto; + overflow: auto; +} +#group-update-wrapper #group { + width: 300px; + float: left; + margin-right: 20px; +} +#group-update-wrapper #contacts { + width: 300px; + float: left; +} +#group-update-wrapper #group-separator { + display: none; +} +#group-update-wrapper .contact_list { + height: 300px; + border: 1px solid #364e59; + overflow: auto; +} +#group-update-wrapper .contact_list .contact-block-div { + width: 50px; + height: 50px; + float: left; +} +/** + * Form fields + */ +.field { + margin-bottom: 10px; + padding-bottom: 10px; + overflow: auto; + width: 100%; +} +.field label { + float: left; + width: 200px; +} +.field input, +.field textarea { + width: 400px; +} +.field input[type="checkbox"], +.field input[type="radio"] { + width: auto; +} +.field textarea { + height: 100px; +} +.field .field_help { + display: block; + margin-left: 200px; + color: #999999; +} +.field .onoff { + float: left; + width: 80px; +} +.field .onoff a { + display: block; + border: 1px solid #666666; + background-image: url("../../../images/onoff.jpg"); + background-repeat: no-repeat; + padding: 4px 2px 2px 2px; + height: 16px; + text-decoration: none; +} +.field .onoff .off { + border-color: #666666; + padding-left: 40px; + background-position: left center; + background-color: #cccccc; + color: #666666; + text-align: right; +} +.field .onoff .on { + border-color: #204A87; + padding-right: 40px; + background-position: right center; + background-color: #D7E3F1; + color: #204A87; + text-align: left; +} +.field .hidden { + display: none!important; +} +.field.radio .field_help { + margin-left: 0px; +} +#profile-edit-links li { + list-style: none; + margin-top: 10px; +} +#profile-edit-default-desc { + color: #FF0000; + border: 1px solid #FF8888; + background-color: #FFEEEE; + padding: 7px; +} +#profile-edit-profile-name-label, +#profile-edit-name-label, +#profile-edit-pdesc-label, +#profile-edit-gender-label, +#profile-edit-dob-label, +#profile-edit-address-label, +#profile-edit-locality-label, +#profile-edit-region-label, +#profile-edit-postal-code-label, +#profile-edit-country-name-label, +#profile-edit-marital-label, +#profile-edit-with-label, +#profile-edit-sexual-label, +#profile-edit-politic-label, +#profile-edit-religion-label, +#profile-edit-pubkeywords-label, +#profile-edit-prvkeywords-label, +#profile-edit-gender-select, +#profile-edit-homepage-label { + float: left; + width: 175px; + padding-top: 7px; +} +#profile-edit-profile-name, +#profile-edit-name, +#gender-select, +#profile-edit-pdesc, +#profile-edit-gender, +#profile-edit-dob, +#profile-edit-address, +#profile-edit-locality, +#profile-edit-region, +#profile-edit-postal-code, +#profile-edit-country-name, +#profile-edit-marital, +#profile-edit-with, +#profile-edit-sexual, +#profile-edit-politic, +#profile-edit-religion, +#profile-edit-pubkeywords, +#profile-edit-prvkeywords, +#profile-edit-homepage { + margin-top: 5px; +} +/* oauth */ +.oauthapp { + height: auto; + overflow: auto; + border-bottom: 2px solid #cccccc; + padding-bottom: 1em; + margin-bottom: 1em; +} +.oauthapp img { + float: left; + width: 48px; + height: 48px; + margin: 10px; +} +.oauthapp img.noicon { + background-image: url("../../../images/icons/48/plugin.png"); + background-position: center center; + background-repeat: no-repeat; +} +.oauthapp a { + float: left; +} +/* contacts */ +.contact-entry-wrapper { + width: 50px; + float: left; +} +/* photo albums */ +#photo-edit-link-wrap { + margin-bottom: 10px; +} +#album-edit-link { + border-right: 1px solid #364e59; + float: left; + padding-right: 5px; + margin-right: 5px; +} +#photo-edit-link, +#album-edit-link a { + background: url("../../../images/icons/16/edit.png") no-repeat left center; + padding-left: 18px; +} +#photo-toprofile-link { + background: url("../../../images/icons/16/user.png") no-repeat left center; + padding-left: 18px; +} +.photos-upload-link a, +#photo-top-upload-link { + background: url("../../../images/icons/16/add.png") no-repeat left center; + padding-left: 18px; +} +.photo-top-image-wrapper, +.photo-album-image-wrapper { + float: left; + margin: 0px 10px 10px 0px; + width: 150px; + height: 150px; + position: relative; + overflow: hidden; +} +.photo-top-image-wrapper img, +.photo-album-image-wrapper img { + width: 150px; +} +.photo-top-image-wrapper .photo-top-album-name, +.photo-album-image-wrapper .photo-top-album-name, +.photo-top-image-wrapper .caption, +.photo-album-image-wrapper .caption { + position: absolute; + color: #2d2d2d; + background-color: #ffffff; + width: 100%; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -webkit-transition: all 0.5s ease-in-out; + -moz-transition: all 0.5s ease-in-out; + -o-transition: all 0.5s ease-in-out; + -ms-transition: all 0.5s ease-in-out; + transition: all 0.5s ease-in-out; + bottom: -150px; +} +.photo-top-image-wrapper:hover .photo-top-album-name, +.photo-album-image-wrapper:hover .photo-top-album-name, +.photo-top-image-wrapper:hover .caption, +.photo-album-image-wrapper:hover .caption { + bottom: 0px; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -webkit-transition: all 0.5s ease-in-out; + -moz-transition: all 0.5s ease-in-out; + -o-transition: all 0.5s ease-in-out; + -ms-transition: all 0.5s ease-in-out; + transition: all 0.5s ease-in-out; +} +#photo-photo { + display: block; + width: 660px; + padding: 50px; + margin-bottom: 0px; + text-align: center; + background-color: #999999; +} +#photo-photo img { + max-width: 560px; +} +#photo-album-title { + background: url("../../../images/icons/22/image.png") no-repeat top left; + padding-left: 23px; + min-height: 22px; +} +#photo-album-title a { + display: block; + padding-top: 5px; +} +#photo-caption { + display: block; + width: 660px; + min-height: 55px; + background-color: #cccccc; + padding: 0 50px 0 50px; +} +#photo-next-link > a > div { + background: url("icons/next.png") no-repeat center center; + float: right; + width: 50px; + height: 50px; +} +#photo-prev-link > a > div { + background: url("icons/prev.png") no-repeat center center; + float: left; + width: 50px; + height: 50px; +} +#photo-like-div { + display: block; + width: 660px; + height: 30px; + background-color: #cccccc; + padding: 0 50px 0 50px; +} +#photo-like-div .icon { + float: left; +} +#photo-like-div .like-rotator { + float: right; +} +/* profile match wrapper */ +.profile-match-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 20px; +} +.profile-match-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.profile-match-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.profile-match-wrapper .contact-photo-menu-button { + left: 0px; + top: 63px; +} +/* messages */ +#message-new { + background: #19aeff; + border: 1px solid #005c94; + width: 150px; +} +#message-new a { + color: #ffffff; + text-align: center; + display: block; + font-weight: bold; + padding: 1em 0px; +} +.mail-list-wrapper { + background-color: #f6f7f8; + margin-bottom: 5px; + width: 100%; + height: auto; + overflow: hidden; +} +.mail-list-wrapper span { + display: block; + float: left; + width: 20%; + overflow: hidden; +} +.mail-list-wrapper .mail-subject { + width: 30%; + padding: 4px 0px 0px 4px; +} +.mail-list-wrapper .mail-subject a { + display: block; +} +.mail-list-wrapper .mail-subject.unseen a { + font-weight: bold; +} +.mail-list-wrapper .mail-date { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-from { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-count { + padding: 4px 4px 0px 4px; + text-align: right; +} +.mail-list-wrapper .mail-delete { + float: right; +} +#mail-display-subject { + background-color: #f6f7f8; + color: #2d2d2d; + margin-bottom: 10px; + width: 100%; + height: auto; + overflow: hidden; +} +#mail-display-subject span { + float: left; + overflow: hidden; + padding: 4px 0px 0px 10px; +} +#mail-display-subject .mail-delete { + float: right; + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +#mail-display-subject:hover .mail-delete { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +/* theme screenshot */ +.screenshot, +#theme-preview { + position: absolute; + width: 202px; + left: 70%; + top: 50px; +} +.screenshot img, +#theme-preview img { + width: 200px; + height: 150px; +} +/* page footer */ +footer { + height: 100px; + display: table-row; +} +.pager { + margin-top: 25px; + clear: both; +} +/** + * ADMIN + */ +#pending-update { + float: right; + color: #ffffff; + font-weight: bold; + background-color: #FF0000; + padding: 0em 0.3em; +} +#adminpage dl { + clear: left; + margin-bottom: 2px; + padding-bottom: 2px; + border-bottom: 1px solid black; +} +#adminpage dt { + width: 200px; + float: left; + font-weight: bold; +} +#adminpage dd { + margin-left: 200px; +} +#adminpage h3 { + border-bottom: 1px solid #cccccc; +} +#adminpage .field label { + font-weight: bold; +} +#adminpage .submit { + clear: left; + text-align: right; +} +#adminpage #pluginslist { + margin: 0px; + padding: 0px; +} +#adminpage .plugin { + list-style: none; + display: block; + border: 1px solid #888888; + padding: 1em; + margin-bottom: 5px; + clear: left; +} +#adminpage .plugin desc { + margin-left: 2.5em; +} +#adminpage .toggleplugin { + float: left; + margin-right: 1em; +} +#adminpage table { + width: 100%; + border-bottom: 1px solid #000000; + margin: 5px 0px; +} +#adminpage table th { + text-align: left; +} +#adminpage table td .icon { + float: left; +} +#adminpage table tr:hover { + background-color: #bbc7d7; +} +#adminpage table#users img { + width: 16px; + height: 16px; +} +#adminpage .selectall { + text-align: right; +} +/* edit buttons for comments */ +.icon.dim { + opacity: 0.3; + filter: alpha(opacity=30); +} +.comment-edit-bb { + list-style: none; + display: none; + margin: 0px; + padding: 0px; + width: 75%; +} +.comment-edit-bb > li { + display: inline-block; + margin: 10px 10px 0 0; + visibility: none; +} +.editicon { + display: inline-block; + width: 16px; + height: 16px; + background-image: url(icons/bbedit.png); + text-decoration: none; +} +.editicon :hover { + background-color: #ccc; +} +.boldbb { + background-position: 0px 0px; +} +.boldbb:hover { + background-position: 0px -16px; +} +.italicbb { + background-position: -16px 0px; +} +.italicbb:hover { + background-position: -16px -16px; +} +.underlinebb { + background-position: -32px 0px; +} +.underlinebb:hover { + background-position: -32px -16px; +} +.quotebb { + background-position: -48px 0px; +} +.quotebb:hover { + background-position: -48px -16px; +} +.codebb { + background-position: -64px 0px; +} +.codebb:hover { + background-position: -64px -16px; +} +.imagebb { + background-position: -80px 0px; +} +.imagebb:hover { + background-position: -80px -16px; +} +.urlbb { + background-position: -96px 0px; +} +.urlbb:hover { + background-position: -96px -16px; +} +.videobb { + background-position: -112px 0px; +} +.videobb:hover { + background-position: -112px -16px; +} diff --git a/view/theme/quattro/lilac/style.less b/view/theme/quattro/lilac/style.less new file mode 100644 index 000000000..7d81e788a --- /dev/null +++ b/view/theme/quattro/lilac/style.less @@ -0,0 +1,14 @@ +/** + * Fabio Comuni + **/ +// Less file http://lesscss.org/ +// compile with lessc +// $ lessc style.less > style.css + +@import "colors"; +@import "../icons"; +@import "../quattro"; + + + + From a30097308403d8a9008b8ce8514ad2bf9957ae33 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Fri, 14 Sep 2012 17:55:17 +0200 Subject: [PATCH 033/124] modified: view/theme/smoothly/style.css --- view/theme/smoothly/style.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index fd45e205a..73636d1a9 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -93,6 +93,10 @@ li.widget-list { .fakelink { color: #1873a2; cursor: pointer; + padding-left: 20px; + margin-left: 40px; + margin-bottom: 10px; + background: url("down.png") no-repeat scroll left center transparent; } .fakelink :hover { @@ -334,8 +338,6 @@ nav { background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); border: 1px solid #7C7D7B; box-shadow: 0 0 8px #BDBDBD; - /* -moz-box-shadow: 3px 3px 4px #959494; - -webkit-box-shadow: 3px 3px 4px #959494;*/ border-radius: 5px 5px 5px 5px; } @@ -876,6 +878,7 @@ ul .sidebar-group-li .icon { } #profile-jot-submit-wrapper { + margin-top: 30px; } #jot-title { From 6537a94b1a907230bba5512bfef1c3e179530503 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Fri, 14 Sep 2012 17:55:27 +0200 Subject: [PATCH 034/124] new file: view/theme/smoothly/down.png --- view/theme/smoothly/down.png | Bin 0 -> 537 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 view/theme/smoothly/down.png diff --git a/view/theme/smoothly/down.png b/view/theme/smoothly/down.png new file mode 100644 index 0000000000000000000000000000000000000000..ab6f9fd49e9c7f10dfa75f0ef0ff255ff2871e6d GIT binary patch literal 537 zcmV+!0_OdRP)Px#x=>71MgRZ*|NsBb(9qP?)zQ+@&d<-&)YRA5*wE3@)z;S1)6>q*&eqr0)z#Jg z{r%Y4+1c9K?d|Q{+}zXE)#Bsh)z{bE-rnHh;r#sk@bK{9;NbW7_vh&7`T6<&{{GzE z-T3(U;^N}z>FLeR&e7A;>+9?8?(Wdi(&Oah)YjJ1)6?zl?)CNc&(YE8>gwU);pph- z+uYpbuz>?d|aK@z&PX+1c6M-QDu@^WWg$>gwwIR#$TX0004WQchC< zK<3zH00001VoOIv0Eh)0NB{r;32;bRa{vGf6951U69E94oEQKA00(qQO+^RX2@Vf1 zDbi1h6aWAK%Sl8*R2b7ukk?WJK@0>}anmK7jdK8Oa?bq!Z?Sg<+x^%zC5>cE1JsxU z(;w?r+TOw-S zx9_uF_wg)T$TAt>4Zz8V?EpM=@e~ZK*v0D&ulu{cPU;ZvD`XY!J`E`FjOvc}zi>tyM bb9m1$aqSE~)%pFD00000NkvXXu0mjfUF$A= literal 0 HcmV?d00001 From 3c846547f7457318e03077ed7661f9a9228cb3a9 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Fri, 14 Sep 2012 19:08:21 +0200 Subject: [PATCH 035/124] modified: view/theme/smoothly/style.css --- view/theme/smoothly/style.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 73636d1a9..f5a4140b9 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -94,7 +94,7 @@ li.widget-list { color: #1873a2; cursor: pointer; padding-left: 20px; - margin-left: 40px; + margin-left: 20px; margin-bottom: 10px; background: url("down.png") no-repeat scroll left center transparent; } @@ -1426,7 +1426,8 @@ profile-jot-banner-wrapper { #item-delete-selected { overflow: auto; margin-top: 20px; - width: 100%; + float: right; + width: 230px; } /* ============ */ From 816680ca85caf57174445cb578a1a57de97e6438 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Fri, 14 Sep 2012 19:08:39 +0200 Subject: [PATCH 036/124] new file: view/theme/smoothly/bottom.tpl new file: view/theme/smoothly/js/jquery.autogrow.textarea.js new file: view/theme/smoothly/js/modernizr.custom.2.5.3.js new file: view/theme/smoothly/js/modernizr.custom.2.5.3.min.js --- view/theme/smoothly/bottom.tpl | 59 ++ .../smoothly/js/jquery.autogrow.textarea.js | 46 + .../smoothly/js/modernizr.custom.2.5.3.js | 989 ++++++++++++++++++ .../smoothly/js/modernizr.custom.2.5.3.min.js | 4 + 4 files changed, 1098 insertions(+) create mode 100644 view/theme/smoothly/bottom.tpl create mode 100644 view/theme/smoothly/js/jquery.autogrow.textarea.js create mode 100644 view/theme/smoothly/js/modernizr.custom.2.5.3.js create mode 100644 view/theme/smoothly/js/modernizr.custom.2.5.3.min.js diff --git a/view/theme/smoothly/bottom.tpl b/view/theme/smoothly/bottom.tpl new file mode 100644 index 000000000..800dc6370 --- /dev/null +++ b/view/theme/smoothly/bottom.tpl @@ -0,0 +1,59 @@ + + diff --git a/view/theme/smoothly/js/jquery.autogrow.textarea.js b/view/theme/smoothly/js/jquery.autogrow.textarea.js new file mode 100644 index 000000000..806e34f51 --- /dev/null +++ b/view/theme/smoothly/js/jquery.autogrow.textarea.js @@ -0,0 +1,46 @@ +(function($) { + + /* + * Auto-growing textareas; technique ripped from Facebook + */ + $.fn.autogrow = function(options) { + + this.filter('textarea').each(function() { + + var $this = $(this), + minHeight = $this.height(), + lineHeight = $this.css('lineHeight'); + + var shadow = $('
    ').css({ + position: 'absolute', + top: -10000, + left: -10000, + width: $(this).width(), + fontSize: $this.css('fontSize'), + fontFamily: $this.css('fontFamily'), + lineHeight: $this.css('lineHeight'), + resize: 'none' + }).appendTo(document.body); + + var update = function() { + + var val = this.value.replace(//g, '>') + .replace(/&/g, '&') + .replace(/\n/g, '
    '); + + shadow.html(val); + $(this).css('height', Math.max(shadow.height() + 20, minHeight)); + } + + $(this).change(update).keyup(update).keydown(update); + + update.apply(this); + + }); + + return this; + + } + +})(jQuery); \ No newline at end of file diff --git a/view/theme/smoothly/js/modernizr.custom.2.5.3.js b/view/theme/smoothly/js/modernizr.custom.2.5.3.js new file mode 100644 index 000000000..2502348b1 --- /dev/null +++ b/view/theme/smoothly/js/modernizr.custom.2.5.3.js @@ -0,0 +1,989 @@ +/* Modernizr 2.5.3 (Custom Build) | MIT & BSD + * Build: http://www.modernizr.com/download/#-fontface-backgroundsize-borderimage-borderradius-boxshadow-flexbox-flexbox_legacy-hsla-multiplebgs-opacity-rgba-textshadow-cssanimations-csscolumns-generatedcontent-cssgradients-cssreflections-csstransforms-csstransforms3d-csstransitions-applicationcache-canvas-canvastext-draganddrop-hashchange-history-audio-video-indexeddb-input-inputtypes-localstorage-postmessage-sessionstorage-websockets-websqldatabase-webworkers-geolocation-inlinesvg-smil-svg-svgclippaths-touch-printshiv-mq-teststyles-testprop-testallprops-hasevent-prefixes-domprefixes-load + */ +; + + + +window.Modernizr = (function( window, document, undefined ) { + + var version = '2.5.3', + + Modernizr = {}, + + + docElement = document.documentElement, + + mod = 'modernizr', + modElem = document.createElement(mod), + mStyle = modElem.style, + + inputElem = document.createElement('input') , + + smile = ':)', + + toString = {}.toString, + + prefixes = ' -webkit- -moz- -o- -ms- '.split(' '), + + + + omPrefixes = 'Webkit Moz O ms', + + cssomPrefixes = omPrefixes.split(' '), + + domPrefixes = omPrefixes.toLowerCase().split(' '), + + ns = {'svg': 'http://www.w3.org/2000/svg'}, + + tests = {}, + inputs = {}, + attrs = {}, + + classes = [], + + slice = classes.slice, + + featureName, + + + injectElementWithStyles = function( rule, callback, nodes, testnames ) { + + var style, ret, node, + div = document.createElement('div'), + body = document.body, + fakeBody = body ? body : document.createElement('body'); + + if ( parseInt(nodes, 10) ) { + while ( nodes-- ) { + node = document.createElement('div'); + node.id = testnames ? testnames[nodes] : mod + (nodes + 1); + div.appendChild(node); + } + } + + style = ['­',''].join(''); + div.id = mod; + (body ? div : fakeBody).innerHTML += style; + fakeBody.appendChild(div); + if(!body){ + fakeBody.style.background = ""; + docElement.appendChild(fakeBody); + } + + ret = callback(div, rule); + !body ? fakeBody.parentNode.removeChild(fakeBody) : div.parentNode.removeChild(div); + + return !!ret; + + }, + + testMediaQuery = function( mq ) { + + var matchMedia = window.matchMedia || window.msMatchMedia; + if ( matchMedia ) { + return matchMedia(mq).matches; + } + + var bool; + + injectElementWithStyles('@media ' + mq + ' { #' + mod + ' { position: absolute; } }', function( node ) { + bool = (window.getComputedStyle ? + getComputedStyle(node, null) : + node.currentStyle)['position'] == 'absolute'; + }); + + return bool; + + }, + + + isEventSupported = (function() { + + var TAGNAMES = { + 'select': 'input', 'change': 'input', + 'submit': 'form', 'reset': 'form', + 'error': 'img', 'load': 'img', 'abort': 'img' + }; + + function isEventSupported( eventName, element ) { + + element = element || document.createElement(TAGNAMES[eventName] || 'div'); + eventName = 'on' + eventName; + + var isSupported = eventName in element; + + if ( !isSupported ) { + if ( !element.setAttribute ) { + element = document.createElement('div'); + } + if ( element.setAttribute && element.removeAttribute ) { + element.setAttribute(eventName, ''); + isSupported = is(element[eventName], 'function'); + + if ( !is(element[eventName], 'undefined') ) { + element[eventName] = undefined; + } + element.removeAttribute(eventName); + } + } + + element = null; + return isSupported; + } + return isEventSupported; + })(), + + + _hasOwnProperty = ({}).hasOwnProperty, hasOwnProperty; + + if ( !is(_hasOwnProperty, 'undefined') && !is(_hasOwnProperty.call, 'undefined') ) { + hasOwnProperty = function (object, property) { + return _hasOwnProperty.call(object, property); + }; + } + else { + hasOwnProperty = function (object, property) { + return ((property in object) && is(object.constructor.prototype[property], 'undefined')); + }; + } + + + if (!Function.prototype.bind) { + Function.prototype.bind = function bind(that) { + + var target = this; + + if (typeof target != "function") { + throw new TypeError(); + } + + var args = slice.call(arguments, 1), + bound = function () { + + if (this instanceof bound) { + + var F = function(){}; + F.prototype = target.prototype; + var self = new F; + + var result = target.apply( + self, + args.concat(slice.call(arguments)) + ); + if (Object(result) === result) { + return result; + } + return self; + + } else { + + return target.apply( + that, + args.concat(slice.call(arguments)) + ); + + } + + }; + + return bound; + }; + } + + function setCss( str ) { + mStyle.cssText = str; + } + + function setCssAll( str1, str2 ) { + return setCss(prefixes.join(str1 + ';') + ( str2 || '' )); + } + + function is( obj, type ) { + return typeof obj === type; + } + + function contains( str, substr ) { + return !!~('' + str).indexOf(substr); + } + + function testProps( props, prefixed ) { + for ( var i in props ) { + if ( mStyle[ props[i] ] !== undefined ) { + return prefixed == 'pfx' ? props[i] : true; + } + } + return false; + } + + function testDOMProps( props, obj, elem ) { + for ( var i in props ) { + var item = obj[props[i]]; + if ( item !== undefined) { + + if (elem === false) return props[i]; + + if (is(item, 'function')){ + return item.bind(elem || obj); + } + + return item; + } + } + return false; + } + + function testPropsAll( prop, prefixed, elem ) { + + var ucProp = prop.charAt(0).toUpperCase() + prop.substr(1), + props = (prop + ' ' + cssomPrefixes.join(ucProp + ' ') + ucProp).split(' '); + + if(is(prefixed, "string") || is(prefixed, "undefined")) { + return testProps(props, prefixed); + + } else { + props = (prop + ' ' + (domPrefixes).join(ucProp + ' ') + ucProp).split(' '); + return testDOMProps(props, prefixed, elem); + } + } + + var testBundle = (function( styles, tests ) { + var style = styles.join(''), + len = tests.length; + + injectElementWithStyles(style, function( node, rule ) { + var style = document.styleSheets[document.styleSheets.length - 1], + cssText = style ? (style.cssRules && style.cssRules[0] ? style.cssRules[0].cssText : style.cssText || '') : '', + children = node.childNodes, hash = {}; + + while ( len-- ) { + hash[children[len].id] = children[len]; + } + + Modernizr['touch'] = ('ontouchstart' in window) || window.DocumentTouch && document instanceof DocumentTouch || (hash['touch'] && hash['touch'].offsetTop) === 9; + Modernizr['csstransforms3d'] = (hash['csstransforms3d'] && hash['csstransforms3d'].offsetLeft) === 9 && hash['csstransforms3d'].offsetHeight === 3; Modernizr['generatedcontent'] = (hash['generatedcontent'] && hash['generatedcontent'].offsetHeight) >= 1; Modernizr['fontface'] = /src/i.test(cssText) && + cssText.indexOf(rule.split(' ')[0]) === 0; }, len, tests); + + })([ + '@font-face {font-family:"font";src:url("https://")}' ,['@media (',prefixes.join('touch-enabled),('),mod,')', + '{#touch{top:9px;position:absolute}}'].join('') ,['@media (',prefixes.join('transform-3d),('),mod,')', + '{#csstransforms3d{left:9px;position:absolute;height:3px;}}'].join('') + + ,['#generatedcontent:after{content:"',smile,'";visibility:hidden}'].join('') + ], + [ + 'fontface' ,'touch' ,'csstransforms3d' + ,'generatedcontent' + + ]); tests['flexbox'] = function() { + return testPropsAll('flexOrder'); + }; + + + tests['flexbox-legacy'] = function() { + return testPropsAll('boxDirection'); + }; + + + tests['canvas'] = function() { + var elem = document.createElement('canvas'); + return !!(elem.getContext && elem.getContext('2d')); + }; + + tests['canvastext'] = function() { + return !!(Modernizr['canvas'] && is(document.createElement('canvas').getContext('2d').fillText, 'function')); + }; tests['touch'] = function() { + return Modernizr['touch']; + }; + + tests['geolocation'] = function() { + return !!navigator.geolocation; + }; + + tests['postmessage'] = function() { + return !!window.postMessage; + }; + + + tests['websqldatabase'] = function() { + return !!window.openDatabase; + }; + + tests['indexedDB'] = function() { + return !!testPropsAll("indexedDB",window); + }; + + tests['hashchange'] = function() { + return isEventSupported('hashchange', window) && (document.documentMode === undefined || document.documentMode > 7); + }; + + tests['history'] = function() { + return !!(window.history && history.pushState); + }; + + tests['draganddrop'] = function() { + var div = document.createElement('div'); + return ('draggable' in div) || ('ondragstart' in div && 'ondrop' in div); + }; + + tests['websockets'] = function() { + for ( var i = -1, len = cssomPrefixes.length; ++i < len; ){ + if ( window[cssomPrefixes[i] + 'WebSocket'] ){ + return true; + } + } + return 'WebSocket' in window; + }; + + + tests['rgba'] = function() { + setCss('background-color:rgba(150,255,150,.5)'); + + return contains(mStyle.backgroundColor, 'rgba'); + }; + + tests['hsla'] = function() { + setCss('background-color:hsla(120,40%,100%,.5)'); + + return contains(mStyle.backgroundColor, 'rgba') || contains(mStyle.backgroundColor, 'hsla'); + }; + + tests['multiplebgs'] = function() { + setCss('background:url(https://),url(https://),red url(https://)'); + + return /(url\s*\(.*?){3}/.test(mStyle.background); + }; + tests['backgroundsize'] = function() { + return testPropsAll('backgroundSize'); + }; + + tests['borderimage'] = function() { + return testPropsAll('borderImage'); + }; + + + + tests['borderradius'] = function() { + return testPropsAll('borderRadius'); + }; + + tests['boxshadow'] = function() { + return testPropsAll('boxShadow'); + }; + + tests['textshadow'] = function() { + return document.createElement('div').style.textShadow === ''; + }; + + + tests['opacity'] = function() { + setCssAll('opacity:.55'); + + return /^0.55$/.test(mStyle.opacity); + }; + + + tests['cssanimations'] = function() { + return testPropsAll('animationName'); + }; + + + tests['csscolumns'] = function() { + return testPropsAll('columnCount'); + }; + + + tests['cssgradients'] = function() { + var str1 = 'background-image:', + str2 = 'gradient(linear,left top,right bottom,from(#9f9),to(white));', + str3 = 'linear-gradient(left top,#9f9, white);'; + + setCss( + (str1 + '-webkit- '.split(' ').join(str2 + str1) + + prefixes.join(str3 + str1)).slice(0, -str1.length) + ); + + return contains(mStyle.backgroundImage, 'gradient'); + }; + + + tests['cssreflections'] = function() { + return testPropsAll('boxReflect'); + }; + + + tests['csstransforms'] = function() { + return !!testPropsAll('transform'); + }; + + + tests['csstransforms3d'] = function() { + + var ret = !!testPropsAll('perspective'); + + if ( ret && 'webkitPerspective' in docElement.style ) { + + ret = Modernizr['csstransforms3d']; + } + return ret; + }; + + + tests['csstransitions'] = function() { + return testPropsAll('transition'); + }; + + + + tests['fontface'] = function() { + return Modernizr['fontface']; + }; + + tests['generatedcontent'] = function() { + return Modernizr['generatedcontent']; + }; + tests['video'] = function() { + var elem = document.createElement('video'), + bool = false; + + try { + if ( bool = !!elem.canPlayType ) { + bool = new Boolean(bool); + bool.ogg = elem.canPlayType('video/ogg; codecs="theora"') .replace(/^no$/,''); + + bool.h264 = elem.canPlayType('video/mp4; codecs="avc1.42E01E"') .replace(/^no$/,''); + + bool.webm = elem.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,''); + } + + } catch(e) { } + + return bool; + }; + + tests['audio'] = function() { + var elem = document.createElement('audio'), + bool = false; + + try { + if ( bool = !!elem.canPlayType ) { + bool = new Boolean(bool); + bool.ogg = elem.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,''); + bool.mp3 = elem.canPlayType('audio/mpeg;') .replace(/^no$/,''); + + bool.wav = elem.canPlayType('audio/wav; codecs="1"') .replace(/^no$/,''); + bool.m4a = ( elem.canPlayType('audio/x-m4a;') || + elem.canPlayType('audio/aac;')) .replace(/^no$/,''); + } + } catch(e) { } + + return bool; + }; + + + tests['localstorage'] = function() { + try { + localStorage.setItem(mod, mod); + localStorage.removeItem(mod); + return true; + } catch(e) { + return false; + } + }; + + tests['sessionstorage'] = function() { + try { + sessionStorage.setItem(mod, mod); + sessionStorage.removeItem(mod); + return true; + } catch(e) { + return false; + } + }; + + + tests['webworkers'] = function() { + return !!window.Worker; + }; + + + tests['applicationcache'] = function() { + return !!window.applicationCache; + }; + + + tests['svg'] = function() { + return !!document.createElementNS && !!document.createElementNS(ns.svg, 'svg').createSVGRect; + }; + + tests['inlinesvg'] = function() { + var div = document.createElement('div'); + div.innerHTML = ''; + return (div.firstChild && div.firstChild.namespaceURI) == ns.svg; + }; + + tests['smil'] = function() { + return !!document.createElementNS && /SVGAnimate/.test(toString.call(document.createElementNS(ns.svg, 'animate'))); + }; + + + tests['svgclippaths'] = function() { + return !!document.createElementNS && /SVGClipPath/.test(toString.call(document.createElementNS(ns.svg, 'clipPath'))); + }; + + function webforms() { + Modernizr['input'] = (function( props ) { + for ( var i = 0, len = props.length; i < len; i++ ) { + attrs[ props[i] ] = !!(props[i] in inputElem); + } + if (attrs.list){ + attrs.list = !!(document.createElement('datalist') && window.HTMLDataListElement); + } + return attrs; + })('autocomplete autofocus list placeholder max min multiple pattern required step'.split(' ')); + Modernizr['inputtypes'] = (function(props) { + + for ( var i = 0, bool, inputElemType, defaultView, len = props.length; i < len; i++ ) { + + inputElem.setAttribute('type', inputElemType = props[i]); + bool = inputElem.type !== 'text'; + + if ( bool ) { + + inputElem.value = smile; + inputElem.style.cssText = 'position:absolute;visibility:hidden;'; + + if ( /^range$/.test(inputElemType) && inputElem.style.WebkitAppearance !== undefined ) { + + docElement.appendChild(inputElem); + defaultView = document.defaultView; + + bool = defaultView.getComputedStyle && + defaultView.getComputedStyle(inputElem, null).WebkitAppearance !== 'textfield' && + (inputElem.offsetHeight !== 0); + + docElement.removeChild(inputElem); + + } else if ( /^(search|tel)$/.test(inputElemType) ){ + } else if ( /^(url|email)$/.test(inputElemType) ) { + bool = inputElem.checkValidity && inputElem.checkValidity() === false; + + } else if ( /^color$/.test(inputElemType) ) { + docElement.appendChild(inputElem); + docElement.offsetWidth; + bool = inputElem.value != smile; + docElement.removeChild(inputElem); + + } else { + bool = inputElem.value != smile; + } + } + + inputs[ props[i] ] = !!bool; + } + return inputs; + })('search tel url email datetime date month week time datetime-local number range color'.split(' ')); + } + for ( var feature in tests ) { + if ( hasOwnProperty(tests, feature) ) { + featureName = feature.toLowerCase(); + Modernizr[featureName] = tests[feature](); + + classes.push((Modernizr[featureName] ? '' : 'no-') + featureName); + } + } + + Modernizr.input || webforms(); setCss(''); + modElem = inputElem = null; + + + Modernizr._version = version; + + Modernizr._prefixes = prefixes; + Modernizr._domPrefixes = domPrefixes; + Modernizr._cssomPrefixes = cssomPrefixes; + + Modernizr.mq = testMediaQuery; + + Modernizr.hasEvent = isEventSupported; + + Modernizr.testProp = function(prop){ + return testProps([prop]); + }; + + Modernizr.testAllProps = testPropsAll; + + + Modernizr.testStyles = injectElementWithStyles; + return Modernizr; + +})(this, this.document); +/*! HTML5 Shiv v3.4 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed */ +;(function(window, document) { + + /** Preset options */ + var options = window.html5 || {}; + + /** Used to skip problem elements */ + var reSkip = /^<|^(?:button|form|map|select|textarea)$/i; + + /** Detect whether the browser supports default html5 styles */ + var supportsHtml5Styles; + + /** Detect whether the browser supports unknown elements */ + var supportsUnknownElements; + + (function() { + var a = document.createElement('a'); + + a.innerHTML = ''; + + //if the hidden property is implemented we can assume, that the browser supports HTML5 Styles + supportsHtml5Styles = ('hidden' in a); + supportsUnknownElements = a.childNodes.length == 1 || (function() { + // assign a false positive if unable to shiv + try { + (document.createElement)('a'); + } catch(e) { + return true; + } + var frag = document.createDocumentFragment(); + return ( + typeof frag.cloneNode == 'undefined' || + typeof frag.createDocumentFragment == 'undefined' || + typeof frag.createElement == 'undefined' + ); + }()); + + }()); + + /*--------------------------------------------------------------------------*/ + + /** + * Creates a style sheet with the given CSS text and adds it to the document. + * @private + * @param {Document} ownerDocument The document. + * @param {String} cssText The CSS text. + * @returns {StyleSheet} The style element. + */ + function addStyleSheet(ownerDocument, cssText) { + var p = ownerDocument.createElement('p'), + parent = ownerDocument.getElementsByTagName('head')[0] || ownerDocument.documentElement; + + p.innerHTML = 'x'; + return parent.insertBefore(p.lastChild, parent.firstChild); + } + + /** + * Returns the value of `html5.elements` as an array. + * @private + * @returns {Array} An array of shived element node names. + */ + function getElements() { + var elements = html5.elements; + return typeof elements == 'string' ? elements.split(' ') : elements; + } + + /** + * Shivs the `createElement` and `createDocumentFragment` methods of the document. + * @private + * @param {Document|DocumentFragment} ownerDocument The document. + */ + function shivMethods(ownerDocument) { + var cache = {}, + docCreateElement = ownerDocument.createElement, + docCreateFragment = ownerDocument.createDocumentFragment, + frag = docCreateFragment(); + + ownerDocument.createElement = function(nodeName) { + // Avoid adding some elements to fragments in IE < 9 because + // * Attributes like `name` or `type` cannot be set/changed once an element + // is inserted into a document/fragment + // * Link elements with `src` attributes that are inaccessible, as with + // a 403 response, will cause the tab/window to crash + // * Script elements appended to fragments will execute when their `src` + // or `text` property is set + var node = (cache[nodeName] || (cache[nodeName] = docCreateElement(nodeName))).cloneNode(); + return html5.shivMethods && node.canHaveChildren && !reSkip.test(nodeName) ? frag.appendChild(node) : node; + }; + + ownerDocument.createDocumentFragment = Function('h,f', 'return function(){' + + 'var n=f.cloneNode(),c=n.createElement;' + + 'h.shivMethods&&(' + + // unroll the `createElement` calls + getElements().join().replace(/\w+/g, function(nodeName) { + cache[nodeName] = docCreateElement(nodeName); + frag.createElement(nodeName); + return 'c("' + nodeName + '")'; + }) + + ');return n}' + )(html5, frag); + } + + /*--------------------------------------------------------------------------*/ + + /** + * Shivs the given document. + * @memberOf html5 + * @param {Document} ownerDocument The document to shiv. + * @returns {Document} The shived document. + */ + function shivDocument(ownerDocument) { + var shived; + if (ownerDocument.documentShived) { + return ownerDocument; + } + if (html5.shivCSS && !supportsHtml5Styles) { + shived = !!addStyleSheet(ownerDocument, + // corrects block display not defined in IE6/7/8/9 + 'article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}' + + // corrects audio display not defined in IE6/7/8/9 + 'audio{display:none}' + + // corrects canvas and video display not defined in IE6/7/8/9 + 'canvas,video{display:inline-block;*display:inline;*zoom:1}' + + // corrects 'hidden' attribute and audio[controls] display not present in IE7/8/9 + '[hidden]{display:none}audio[controls]{display:inline-block;*display:inline;*zoom:1}' + + // adds styling not present in IE6/7/8/9 + 'mark{background:#FF0;color:#000}' + ); + } + if (!supportsUnknownElements) { + shived = !shivMethods(ownerDocument); + } + if (shived) { + ownerDocument.documentShived = shived; + } + return ownerDocument; + } + + /*--------------------------------------------------------------------------*/ + + /** + * The `html5` object is exposed so that more elements can be shived and + * existing shiving can be detected on iframes. + * @type Object + * @example + * + * // options can be changed before the script is included + * html5 = { 'elements': 'mark section', 'shivCSS': false, 'shivMethods': false }; + */ + var html5 = { + + /** + * An array or space separated string of node names of the elements to shiv. + * @memberOf html5 + * @type Array|String + */ + 'elements': options.elements || 'abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video', + + /** + * A flag to indicate that the HTML5 style sheet should be inserted. + * @memberOf html5 + * @type Boolean + */ + 'shivCSS': !(options.shivCSS === false), + + /** + * A flag to indicate that the document's `createElement` and `createDocumentFragment` + * methods should be overwritten. + * @memberOf html5 + * @type Boolean + */ + 'shivMethods': !(options.shivMethods === false), + + /** + * A string to describe the type of `html5` object ("default" or "default print"). + * @memberOf html5 + * @type String + */ + 'type': 'default', + + // shivs the document according to the specified `html5` object options + 'shivDocument': shivDocument + }; + + /*--------------------------------------------------------------------------*/ + + // expose html5 + window.html5 = html5; + + // shiv the document + shivDocument(document); + + /*------------------------------- Print Shiv -------------------------------*/ + + /** Used to filter media types */ + var reMedia = /^$|\b(?:all|print)\b/; + + /** Used to namespace printable elements */ + var shivNamespace = 'html5shiv'; + + /** Detect whether the browser supports shivable style sheets */ + var supportsShivableSheets = !supportsUnknownElements && (function() { + // assign a false negative if unable to shiv + var docEl = document.documentElement; + return !( + typeof document.namespaces == 'undefined' || + typeof document.parentWindow == 'undefined' || + typeof docEl.applyElement == 'undefined' || + typeof docEl.removeNode == 'undefined' || + typeof window.attachEvent == 'undefined' + ); + }()); + + /*--------------------------------------------------------------------------*/ + + /** + * Wraps all HTML5 elements in the given document with printable elements. + * (eg. the "header" element is wrapped with the "html5shiv:header" element) + * @private + * @param {Document} ownerDocument The document. + * @returns {Array} An array wrappers added. + */ + function addWrappers(ownerDocument) { + var node, + nodes = ownerDocument.getElementsByTagName('*'), + index = nodes.length, + reElements = RegExp('^(?:' + getElements().join('|') + ')$', 'i'), + result = []; + + while (index--) { + node = nodes[index]; + if (reElements.test(node.nodeName)) { + result.push(node.applyElement(createWrapper(node))); + } + } + return result; + } + + /** + * Creates a printable wrapper for the given element. + * @private + * @param {Element} element The element. + * @returns {Element} The wrapper. + */ + function createWrapper(element) { + var node, + nodes = element.attributes, + index = nodes.length, + wrapper = element.ownerDocument.createElement(shivNamespace + ':' + element.nodeName); + + // copy element attributes to the wrapper + while (index--) { + node = nodes[index]; + node.specified && wrapper.setAttribute(node.nodeName, node.nodeValue); + } + // copy element styles to the wrapper + wrapper.style.cssText = element.style.cssText; + return wrapper; + } + + /** + * Shivs the given CSS text. + * (eg. header{} becomes html5shiv\:header{}) + * @private + * @param {String} cssText The CSS text to shiv. + * @returns {String} The shived CSS text. + */ + function shivCssText(cssText) { + var pair, + parts = cssText.split('{'), + index = parts.length, + reElements = RegExp('(^|[\\s,>+~])(' + getElements().join('|') + ')(?=[[\\s,>+~#.:]|$)', 'gi'), + replacement = '$1' + shivNamespace + '\\:$2'; + + while (index--) { + pair = parts[index] = parts[index].split('}'); + pair[pair.length - 1] = pair[pair.length - 1].replace(reElements, replacement); + parts[index] = pair.join('}'); + } + return parts.join('{'); + } + + /** + * Removes the given wrappers, leaving the original elements. + * @private + * @params {Array} wrappers An array of printable wrappers. + */ + function removeWrappers(wrappers) { + var index = wrappers.length; + while (index--) { + wrappers[index].removeNode(); + } + } + + /*--------------------------------------------------------------------------*/ + + /** + * Shivs the given document for print. + * @memberOf html5 + * @param {Document} ownerDocument The document to shiv. + * @returns {Document} The shived document. + */ + function shivPrint(ownerDocument) { + var shivedSheet, + wrappers, + namespaces = ownerDocument.namespaces, + ownerWindow = ownerDocument.parentWindow; + + if (!supportsShivableSheets || ownerDocument.printShived) { + return ownerDocument; + } + if (typeof namespaces[shivNamespace] == 'undefined') { + namespaces.add(shivNamespace); + } + + ownerWindow.attachEvent('onbeforeprint', function() { + var imports, + length, + sheet, + collection = ownerDocument.styleSheets, + cssText = [], + index = collection.length, + sheets = Array(index); + + // convert styleSheets collection to an array + while (index--) { + sheets[index] = collection[index]; + } + // concat all style sheet CSS text + while ((sheet = sheets.pop())) { + // IE does not enforce a same origin policy for external style sheets + if (!sheet.disabled && reMedia.test(sheet.media)) { + for (imports = sheet.imports, index = 0, length = imports.length; index < length; index++) { + sheets.push(imports[index]); + } + try { + cssText.push(sheet.cssText); + } catch(er){} + } + } + // wrap all HTML5 elements with printable elements and add the shived style sheet + cssText = shivCssText(cssText.reverse().join('')); + wrappers = addWrappers(ownerDocument); + shivedSheet = addStyleSheet(ownerDocument, cssText); + }); + + ownerWindow.attachEvent('onafterprint', function() { + // remove wrappers, leaving the original elements, and remove the shived style sheet + removeWrappers(wrappers); + shivedSheet.removeNode(true); + }); + + ownerDocument.printShived = true; + return ownerDocument; + } + + /*--------------------------------------------------------------------------*/ + + // expose API + html5.type += ' print'; + html5.shivPrint = shivPrint; + + // shiv for print + shivPrint(document); + +}(this, document));/*yepnope1.5.3|WTFPL*/ +(function(a,b,c){function d(a){return o.call(a)=="[object Function]"}function e(a){return typeof a=="string"}function f(){}function g(a){return!a||a=="loaded"||a=="complete"||a=="uninitialized"}function h(){var a=p.shift();q=1,a?a.t?m(function(){(a.t=="c"?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){a!="img"&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l={},o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};y[c]===1&&(r=1,y[c]=[],l=b.createElement(a)),a=="object"?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),a!="img"&&(r||y[c]===2?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i(b=="c"?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),p.length==1&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&o.call(a.opera)=="[object Opera]",l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return o.call(a)=="[object Array]"},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f",a,""].join(""),k.id=g,(l?k:m).innerHTML+=h,m.appendChild(k),l||(m.style.background="",f.appendChild(m)),i=c(k,a),l?k.parentNode.removeChild(k):m.parentNode.removeChild(m),!!i},y=function(b){var c=a.matchMedia||a.msMatchMedia;if(c)return c(b).matches;var d;return x("@media "+b+" { #"+g+" { position: absolute; } }",function(b){d=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle)["position"]=="absolute"}),d},z=function(){function d(d,e){e=e||b.createElement(a[d]||"div"),d="on"+d;var f=d in e;return f||(e.setAttribute||(e=b.createElement("div")),e.setAttribute&&e.removeAttribute&&(e.setAttribute(d,""),f=E(e[d],"function"),E(e[d],"undefined")||(e[d]=c),e.removeAttribute(d))),e=null,f}var a={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};return d}(),A={}.hasOwnProperty,B;!E(A,"undefined")&&!E(A.call,"undefined")?B=function(a,b){return A.call(a,b)}:B=function(a,b){return b in a&&E(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=v.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(v.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(v.call(arguments)))};return e});var J=function(c,d){var f=c.join(""),g=d.length;x(f,function(c,d){var f=b.styleSheets[b.styleSheets.length-1],h=f?f.cssRules&&f.cssRules[0]?f.cssRules[0].cssText:f.cssText||"":"",i=c.childNodes,j={};while(g--)j[i[g].id]=i[g];e.touch="ontouchstart"in a||a.DocumentTouch&&b instanceof DocumentTouch||(j.touch&&j.touch.offsetTop)===9,e.csstransforms3d=(j.csstransforms3d&&j.csstransforms3d.offsetLeft)===9&&j.csstransforms3d.offsetHeight===3,e.generatedcontent=(j.generatedcontent&&j.generatedcontent.offsetHeight)>=1,e.fontface=/src/i.test(h)&&h.indexOf(d.split(" ")[0])===0},g,d)}(['@font-face {font-family:"font";src:url("https://")}',["@media (",m.join("touch-enabled),("),g,")","{#touch{top:9px;position:absolute}}"].join(""),["@media (",m.join("transform-3d),("),g,")","{#csstransforms3d{left:9px;position:absolute;height:3px;}}"].join(""),['#generatedcontent:after{content:"',k,'";visibility:hidden}'].join("")],["fontface","touch","csstransforms3d","generatedcontent"]);r.flexbox=function(){return I("flexOrder")},r["flexbox-legacy"]=function(){return I("boxDirection")},r.canvas=function(){var a=b.createElement("canvas");return!!a.getContext&&!!a.getContext("2d")},r.canvastext=function(){return!!e.canvas&&!!E(b.createElement("canvas").getContext("2d").fillText,"function")},r.touch=function(){return e.touch},r.geolocation=function(){return!!navigator.geolocation},r.postmessage=function(){return!!a.postMessage},r.websqldatabase=function(){return!!a.openDatabase},r.indexedDB=function(){return!!I("indexedDB",a)},r.hashchange=function(){return z("hashchange",a)&&(b.documentMode===c||b.documentMode>7)},r.history=function(){return!!a.history&&!!history.pushState},r.draganddrop=function(){var a=b.createElement("div");return"draggable"in a||"ondragstart"in a&&"ondrop"in a},r.websockets=function(){for(var b=-1,c=o.length;++b",d.insertBefore(c.lastChild,d.firstChild)}function h(){var a=k.elements;return typeof a=="string"?a.split(" "):a}function i(a){var b={},c=a.createElement,e=a.createDocumentFragment,f=e();a.createElement=function(a){var e=(b[a]||(b[a]=c(a))).cloneNode();return k.shivMethods&&e.canHaveChildren&&!d.test(a)?f.appendChild(e):e},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+h().join().replace(/\w+/g,function(a){return b[a]=c(a),f.createElement(a),'c("'+a+'")'})+");return n}")(k,f)}function j(a){var b;return a.documentShived?a:(k.shivCSS&&!e&&(b=!!g(a,"article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio{display:none}canvas,video{display:inline-block;*display:inline;*zoom:1}[hidden]{display:none}audio[controls]{display:inline-block;*display:inline;*zoom:1}mark{background:#FF0;color:#000}")),f||(b=!i(a)),b&&(a.documentShived=b),a)}function o(a){var b,c=a.getElementsByTagName("*"),d=c.length,e=RegExp("^(?:"+h().join("|")+")$","i"),f=[];while(d--)b=c[d],e.test(b.nodeName)&&f.push(b.applyElement(p(b)));return f}function p(a){var b,c=a.attributes,d=c.length,e=a.ownerDocument.createElement(m+":"+a.nodeName);while(d--)b=c[d],b.specified&&e.setAttribute(b.nodeName,b.nodeValue);return e.style.cssText=a.style.cssText,e}function q(a){var b,c=a.split("{"),d=c.length,e=RegExp("(^|[\\s,>+~])("+h().join("|")+")(?=[[\\s,>+~#.:]|$)","gi"),f="$1"+m+"\\:$2";while(d--)b=c[d]=c[d].split("}"),b[b.length-1]=b[b.length-1].replace(e,f),c[d]=b.join("}");return c.join("{")}function r(a){var b=a.length;while(b--)a[b].removeNode()}function s(a){var b,c,d=a.namespaces,e=a.parentWindow;return!n||a.printShived?a:(typeof d[m]=="undefined"&&d.add(m),e.attachEvent("onbeforeprint",function(){var d,e,f,h=a.styleSheets,i=[],j=h.length,k=Array(j);while(j--)k[j]=h[j];while(f=k.pop())if(!f.disabled&&l.test(f.media)){for(d=f.imports,j=0,e=d.length;j",e="hidden"in a,f=a.childNodes.length==1||function(){try{b.createElement("a")}catch(a){return!0}var c=b.createDocumentFragment();return typeof c.cloneNode=="undefined"||typeof c.createDocumentFragment=="undefined"||typeof c.createElement=="undefined"}()})();var k={elements:c.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:c.shivCSS!==!1,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:j};a.html5=k,j(b);var l=/^$|\b(?:all|print)\b/,m="html5shiv",n=!f&&function(){var c=b.documentElement;return typeof b.namespaces!="undefined"&&typeof b.parentWindow!="undefined"&&typeof c.applyElement!="undefined"&&typeof c.removeNode!="undefined"&&typeof a.attachEvent!="undefined"}();k.type+=" print",k.shivPrint=s,s(b)}(this,document),function(a,b,c){function d(a){return o.call(a)=="[object Function]"}function e(a){return typeof a=="string"}function f(){}function g(a){return!a||a=="loaded"||a=="complete"||a=="uninitialized"}function h(){var a=p.shift();q=1,a?a.t?m(function(){(a.t=="c"?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){a!="img"&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l={},o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};y[c]===1&&(r=1,y[c]=[],l=b.createElement(a)),a=="object"?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),a!="img"&&(r||y[c]===2?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i(b=="c"?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),p.length==1&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&o.call(a.opera)=="[object Opera]",l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return o.call(a)=="[object Array]"},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f Date: Fri, 14 Sep 2012 18:22:56 -0600 Subject: [PATCH 037/124] fix permissions for uploaded images with size specified --- mod/item.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/item.php b/mod/item.php index 52ea9d58c..8fe1c05c1 100644 --- a/mod/item.php +++ b/mod/item.php @@ -373,8 +373,8 @@ function item_post(&$a) { $match = null; - if((! $preview) && preg_match_all("/\[img\](.*?)\[\/img\]/",$body,$match)) { - $images = $match[1]; + if((! $preview) && preg_match_all("/\[img([\=0-9x]*)\](.*?)\[\/img\]/",$body,$match)) { + $images = $match[2]; if(count($images)) { foreach($images as $image) { if(! stristr($image,$a->get_baseurl() . '/photo/')) From 8a4dcc28c1e3a0bdb5b8b4fa971ff48cf3e0fb75 Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Fri, 14 Sep 2012 18:33:07 -0600 Subject: [PATCH 038/124] make size search less greedy --- mod/item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/item.php b/mod/item.php index 8fe1c05c1..7d36d7f70 100644 --- a/mod/item.php +++ b/mod/item.php @@ -373,7 +373,7 @@ function item_post(&$a) { $match = null; - if((! $preview) && preg_match_all("/\[img([\=0-9x]*)\](.*?)\[\/img\]/",$body,$match)) { + if((! $preview) && preg_match_all("/\[img([\=0-9x]*?)\](.*?)\[\/img\]/",$body,$match)) { $images = $match[2]; if(count($images)) { foreach($images as $image) { From 21d685b21cccb5055b867271fdc9faaedf9e6685 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 15 Sep 2012 10:38:08 +0200 Subject: [PATCH 039/124] DE: update to the strings --- view/de/messages.po | 15 ++++++++------- view/de/strings.php | 12 ++++++------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/view/de/messages.po b/view/de/messages.po index a01bf6a83..5e3963cff 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -13,6 +13,7 @@ # , 2012. # , 2012. # Martin Schmitt , 2012. +# , 2012. # Oliver , 2012. # , 2011-2012. # , 2011-2012. @@ -22,7 +23,7 @@ msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" "POT-Creation-Date: 2012-09-13 10:00-0700\n" -"PO-Revision-Date: 2012-09-14 13:44+0000\n" +"PO-Revision-Date: 2012-09-15 08:34+0000\n" "Last-Translator: bavatar \n" "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" @@ -5010,19 +5011,19 @@ msgstr "" #: ../../addon/fbpost/fbpost.php:199 msgid "Facebook Post" -msgstr "" +msgstr "Beitrag auf Facebook" #: ../../addon/fbpost/fbpost.php:205 msgid "Install Facebook Post connector for this account." -msgstr "" +msgstr "Facebook-Connector für dieses Konto installieren." #: ../../addon/fbpost/fbpost.php:212 msgid "Remove Facebook Post connector" -msgstr "" +msgstr "Facebook-Connector entfernen" #: ../../addon/fbpost/fbpost.php:240 msgid "Facebook Post Settings" -msgstr "" +msgstr "Facebook-Beitragseinstellungen" #: ../../addon/widgets/widget_like.php:58 #, php-format @@ -5084,11 +5085,11 @@ msgstr "machte etwas obszönes Körperliches mit" #: ../../addon/morepokes/morepokes.php:22 msgid "point out the poke feature to" -msgstr "" +msgstr "zeigte die neue Anstups-Funktion" #: ../../addon/morepokes/morepokes.php:22 msgid "pointed out the poke feature to" -msgstr "" +msgstr "zeigte die neue Anstups-Funktion" #: ../../addon/morepokes/morepokes.php:23 msgid "declare undying love for" diff --git a/view/de/strings.php b/view/de/strings.php index f59f898c9..38e25f565 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -1117,10 +1117,10 @@ $a->strings["Number of items"] = "Anzahl der Einträge"; $a->strings["Size of the cache"] = "Größe des Caches"; $a->strings["Delete the whole cache"] = "Cache leeren"; $a->strings["Facebook Post disabled"] = ""; -$a->strings["Facebook Post"] = ""; -$a->strings["Install Facebook Post connector for this account."] = ""; -$a->strings["Remove Facebook Post connector"] = ""; -$a->strings["Facebook Post Settings"] = ""; +$a->strings["Facebook Post"] = "Beitrag auf Facebook"; +$a->strings["Install Facebook Post connector for this account."] = "Facebook-Connector für dieses Konto installieren."; +$a->strings["Remove Facebook Post connector"] = "Facebook-Connector entfernen"; +$a->strings["Facebook Post Settings"] = "Facebook-Beitragseinstellungen"; $a->strings["%d person likes this"] = array( 0 => "%d Person mag das", 1 => "%d Leute mögen das", @@ -1140,8 +1140,8 @@ $a->strings["shag"] = "poppen"; $a->strings["shagged"] = "poppte"; $a->strings["do something obscenely biological to"] = "mit ihm/ihr etwas obszönes Körperliches machen"; $a->strings["did something obscenely biological to"] = "machte etwas obszönes Körperliches mit"; -$a->strings["point out the poke feature to"] = ""; -$a->strings["pointed out the poke feature to"] = ""; +$a->strings["point out the poke feature to"] = "zeigte die neue Anstups-Funktion"; +$a->strings["pointed out the poke feature to"] = "zeigte die neue Anstups-Funktion"; $a->strings["declare undying love for"] = "unterbliche Liebe verkünden"; $a->strings["declared undying love for"] = "verkündete unsterbliche Liebe für"; $a->strings["patent"] = "patentieren"; From 669d2b890ead6d5bc268c038a469e8ce65dee715 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 15 Sep 2012 15:23:15 -0700 Subject: [PATCH 040/124] rev update - add cancel markup to editor --- boot.php | 2 +- include/conversation.php | 1 + mod/editpost.php | 1 + util/messages.po | 204 +++++++++++++++++++-------------------- 4 files changed, 105 insertions(+), 103 deletions(-) diff --git a/boot.php b/boot.php index 66aeb28ec..713e8e2aa 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.1465' ); +define ( 'FRIENDICA_VERSION', '3.0.1467' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1155 ); diff --git a/include/conversation.php b/include/conversation.php index 91310277f..cb225127d 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1280,6 +1280,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$profile_uid' => $x['profile_uid'], '$preview' => t('Preview'), '$sourceapp' => t($a->sourcename), + '$cancel' => t('Cancel') )); diff --git a/mod/editpost.php b/mod/editpost.php index b44afe245..03d5263a1 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -133,6 +133,7 @@ function editpost_content(&$a) { '$preview' => t('Preview'), '$jotplugins' => $jotplugins, '$sourceapp' => t($a->sourcename), + '$cancel' => t('Cancel') )); return $o; diff --git a/util/messages.po b/util/messages.po index e88044c5b..23f3c724d 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1465\n" +"Project-Id-Version: 3.0.1467\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-13 10:00-0700\n" +"POT-Creation-Date: 2012-09-15 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -176,7 +176,7 @@ msgstr "" #: ../../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:591 ../../object/Item.php:532 +#: ../../include/conversation.php:601 ../../object/Item.php:532 msgid "Submit" msgstr "" @@ -236,7 +236,7 @@ msgid "link to source" msgstr "" #: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131 -#: ../../include/nav.php:52 ../../boot.php:1683 +#: ../../include/nav.php:52 ../../boot.php:1689 msgid "Events" msgstr "" @@ -374,7 +374,7 @@ msgstr "" msgid "No" msgstr "" -#: ../../mod/photos.php:46 ../../boot.php:1676 +#: ../../mod/photos.php:46 ../../boot.php:1682 msgid "Photo Albums" msgstr "" @@ -404,8 +404,8 @@ msgstr "" #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 #: ../../mod/profile_photo.php:305 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:318 -#: ../../include/user.php:325 ../../include/user.php:332 +#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:324 +#: ../../include/user.php:331 ../../include/user.php:338 msgid "Profile Photos" msgstr "" @@ -577,51 +577,51 @@ msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" #: ../../mod/photos.php:1356 ../../mod/content.php:665 -#: ../../include/conversation.php:565 ../../object/Item.php:185 +#: ../../include/conversation.php:575 ../../object/Item.php:185 msgid "I like this (toggle)" msgstr "" #: ../../mod/photos.php:1357 ../../mod/content.php:666 -#: ../../include/conversation.php:566 ../../object/Item.php:186 +#: ../../include/conversation.php:576 ../../object/Item.php:186 msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1358 ../../include/conversation.php:1214 +#: ../../mod/photos.php:1358 ../../include/conversation.php:1244 msgid "Share" msgstr "" #: ../../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:659 -#: ../../include/conversation.php:891 ../../include/conversation.php:1233 +#: ../../mod/message.php:481 ../../include/conversation.php:671 +#: ../../include/conversation.php:921 ../../include/conversation.php:1263 #: ../../object/Item.php:237 msgid "Please wait" msgstr "" #: ../../mod/photos.php:1375 ../../mod/photos.php:1416 #: ../../mod/photos.php:1448 ../../mod/content.php:688 -#: ../../include/conversation.php:588 ../../object/Item.php:529 +#: ../../include/conversation.php:598 ../../object/Item.php:529 msgid "This is you" msgstr "" #: ../../mod/photos.php:1377 ../../mod/photos.php:1418 #: ../../mod/photos.php:1450 ../../mod/content.php:690 -#: ../../include/conversation.php:590 ../../boot.php:574 +#: ../../include/conversation.php:600 ../../boot.php:574 #: ../../object/Item.php:531 msgid "Comment" msgstr "" #: ../../mod/photos.php:1379 ../../mod/editpost.php:133 -#: ../../mod/content.php:700 ../../include/conversation.php:600 -#: ../../include/conversation.php:1251 ../../object/Item.php:541 +#: ../../mod/content.php:700 ../../include/conversation.php:610 +#: ../../include/conversation.php:1281 ../../object/Item.php:541 msgid "Preview" msgstr "" #: ../../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:847 +#: ../../include/conversation.php:440 ../../include/conversation.php:874 #: ../../object/Item.php:116 msgid "Delete" msgstr "" @@ -688,7 +688,7 @@ msgstr "" msgid "Edit post" msgstr "" -#: ../../mod/editpost.php:88 ../../include/conversation.php:1200 +#: ../../mod/editpost.php:88 ../../include/conversation.php:1230 msgid "Post to Email" msgstr "" @@ -700,17 +700,17 @@ msgstr "" #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/message.php:291 ../../mod/message.php:478 -#: ../../include/conversation.php:1215 +#: ../../include/conversation.php:1245 msgid "Upload photo" msgstr "" -#: ../../mod/editpost.php:105 ../../include/conversation.php:1217 +#: ../../mod/editpost.php:105 ../../include/conversation.php:1247 msgid "Attach file" msgstr "" #: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151 #: ../../mod/message.php:292 ../../mod/message.php:479 -#: ../../include/conversation.php:1219 +#: ../../include/conversation.php:1249 msgid "Insert web link" msgstr "" @@ -726,35 +726,35 @@ msgstr "" msgid "Insert Vorbis [.ogg] audio" msgstr "" -#: ../../mod/editpost.php:110 ../../include/conversation.php:1225 +#: ../../mod/editpost.php:110 ../../include/conversation.php:1255 msgid "Set your location" msgstr "" -#: ../../mod/editpost.php:111 ../../include/conversation.php:1227 +#: ../../mod/editpost.php:111 ../../include/conversation.php:1257 msgid "Clear browser location" msgstr "" -#: ../../mod/editpost.php:113 ../../include/conversation.php:1234 +#: ../../mod/editpost.php:113 ../../include/conversation.php:1264 msgid "Permission settings" msgstr "" -#: ../../mod/editpost.php:121 ../../include/conversation.php:1243 +#: ../../mod/editpost.php:121 ../../include/conversation.php:1273 msgid "CC: email addresses" msgstr "" -#: ../../mod/editpost.php:122 ../../include/conversation.php:1244 +#: ../../mod/editpost.php:122 ../../include/conversation.php:1274 msgid "Public post" msgstr "" -#: ../../mod/editpost.php:125 ../../include/conversation.php:1230 +#: ../../mod/editpost.php:125 ../../include/conversation.php:1260 msgid "Set title" msgstr "" -#: ../../mod/editpost.php:127 ../../include/conversation.php:1232 +#: ../../mod/editpost.php:127 ../../include/conversation.php:1262 msgid "Categories (comma-separated list)" msgstr "" -#: ../../mod/editpost.php:128 ../../include/conversation.php:1246 +#: ../../mod/editpost.php:128 ../../include/conversation.php:1276 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -1296,31 +1296,31 @@ msgid "Group: " msgstr "" #: ../../mod/content.php:438 ../../mod/content.php:720 -#: ../../include/conversation.php:439 ../../include/conversation.php:846 +#: ../../include/conversation.php:439 ../../include/conversation.php:873 #: ../../object/Item.php:115 msgid "Select" msgstr "" #: ../../mod/content.php:455 ../../mod/content.php:813 -#: ../../mod/content.php:814 ../../include/conversation.php:627 -#: ../../include/conversation.php:628 ../../include/conversation.php:863 +#: ../../mod/content.php:814 ../../include/conversation.php:639 +#: ../../include/conversation.php:640 ../../include/conversation.php:890 #: ../../object/Item.php:206 ../../object/Item.php:207 #, php-format msgid "View %s's profile @ %s" msgstr "" #: ../../mod/content.php:465 ../../mod/content.php:825 -#: ../../include/conversation.php:641 ../../include/conversation.php:874 +#: ../../include/conversation.php:653 ../../include/conversation.php:904 #: ../../object/Item.php:219 #, php-format msgid "%s from %s" msgstr "" -#: ../../mod/content.php:480 ../../include/conversation.php:889 +#: ../../mod/content.php:480 ../../include/conversation.php:919 msgid "View in context" msgstr "" -#: ../../mod/content.php:586 ../../include/conversation.php:668 +#: ../../mod/content.php:586 ../../include/conversation.php:680 #: ../../object/Item.php:256 #, php-format msgid "%d comment" @@ -1330,92 +1330,92 @@ msgstr[1] "" #: ../../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:669 +#: ../../include/contact_widgets.php:195 ../../include/conversation.php:681 #: ../../boot.php:575 ../../object/Item.php:257 msgid "show more" msgstr "" -#: ../../mod/content.php:665 ../../include/conversation.php:565 +#: ../../mod/content.php:665 ../../include/conversation.php:575 #: ../../object/Item.php:185 msgid "like" msgstr "" -#: ../../mod/content.php:666 ../../include/conversation.php:566 +#: ../../mod/content.php:666 ../../include/conversation.php:576 #: ../../object/Item.php:186 msgid "dislike" msgstr "" -#: ../../mod/content.php:668 ../../include/conversation.php:568 +#: ../../mod/content.php:668 ../../include/conversation.php:578 #: ../../object/Item.php:188 msgid "Share this" msgstr "" -#: ../../mod/content.php:668 ../../include/conversation.php:568 +#: ../../mod/content.php:668 ../../include/conversation.php:578 #: ../../object/Item.php:188 msgid "share" msgstr "" -#: ../../mod/content.php:692 ../../include/conversation.php:592 +#: ../../mod/content.php:692 ../../include/conversation.php:602 #: ../../object/Item.php:533 msgid "Bold" msgstr "" -#: ../../mod/content.php:693 ../../include/conversation.php:593 +#: ../../mod/content.php:693 ../../include/conversation.php:603 #: ../../object/Item.php:534 msgid "Italic" msgstr "" -#: ../../mod/content.php:694 ../../include/conversation.php:594 +#: ../../mod/content.php:694 ../../include/conversation.php:604 #: ../../object/Item.php:535 msgid "Underline" msgstr "" -#: ../../mod/content.php:695 ../../include/conversation.php:595 +#: ../../mod/content.php:695 ../../include/conversation.php:605 #: ../../object/Item.php:536 msgid "Quote" msgstr "" -#: ../../mod/content.php:696 ../../include/conversation.php:596 +#: ../../mod/content.php:696 ../../include/conversation.php:606 #: ../../object/Item.php:537 msgid "Code" msgstr "" -#: ../../mod/content.php:697 ../../include/conversation.php:597 +#: ../../mod/content.php:697 ../../include/conversation.php:607 #: ../../object/Item.php:538 msgid "Image" msgstr "" -#: ../../mod/content.php:698 ../../include/conversation.php:598 +#: ../../mod/content.php:698 ../../include/conversation.php:608 #: ../../object/Item.php:539 msgid "Link" msgstr "" -#: ../../mod/content.php:699 ../../include/conversation.php:599 +#: ../../mod/content.php:699 ../../include/conversation.php:609 #: ../../object/Item.php:540 msgid "Video" msgstr "" -#: ../../mod/content.php:733 ../../include/conversation.php:529 +#: ../../mod/content.php:733 ../../include/conversation.php:539 #: ../../object/Item.php:169 msgid "add star" msgstr "" -#: ../../mod/content.php:734 ../../include/conversation.php:530 +#: ../../mod/content.php:734 ../../include/conversation.php:540 #: ../../object/Item.php:170 msgid "remove star" msgstr "" -#: ../../mod/content.php:735 ../../include/conversation.php:531 +#: ../../mod/content.php:735 ../../include/conversation.php:541 #: ../../object/Item.php:171 msgid "toggle star status" msgstr "" -#: ../../mod/content.php:738 ../../include/conversation.php:534 +#: ../../mod/content.php:738 ../../include/conversation.php:544 #: ../../object/Item.php:174 msgid "starred" msgstr "" -#: ../../mod/content.php:739 ../../include/conversation.php:535 +#: ../../mod/content.php:739 ../../include/conversation.php:545 #: ../../object/Item.php:175 msgid "add tag" msgstr "" @@ -1425,17 +1425,17 @@ msgstr "" msgid "save to folder" msgstr "" -#: ../../mod/content.php:815 ../../include/conversation.php:629 +#: ../../mod/content.php:815 ../../include/conversation.php:641 #: ../../object/Item.php:208 msgid "to" msgstr "" -#: ../../mod/content.php:816 ../../include/conversation.php:630 +#: ../../mod/content.php:816 ../../include/conversation.php:642 #: ../../object/Item.php:209 msgid "Wall-to-Wall" msgstr "" -#: ../../mod/content.php:817 ../../include/conversation.php:631 +#: ../../mod/content.php:817 ../../include/conversation.php:643 #: ../../object/Item.php:210 msgid "via Wall-To-Wall:" msgstr "" @@ -2642,7 +2642,7 @@ msgstr "" msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1690 +#: ../../mod/notes.php:44 ../../boot.php:1696 msgid "Personal Notes" msgstr "" @@ -2686,7 +2686,7 @@ msgstr "" #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:1151 ../../include/conversation.php:1168 +#: ../../include/conversation.php:1181 ../../include/conversation.php:1198 msgid "Please enter a link URL:" msgstr "" @@ -2769,7 +2769,7 @@ msgstr "" #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 #: ../../view/theme/diabook/theme.php:128 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 -#: ../../boot.php:1666 +#: ../../boot.php:1672 msgid "Profile" msgstr "" @@ -3121,7 +3121,7 @@ msgid "Access denied." msgstr "" #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130 -#: ../../include/nav.php:51 ../../boot.php:1673 +#: ../../include/nav.php:51 ../../boot.php:1679 msgid "Photos" msgstr "" @@ -3635,13 +3635,13 @@ msgid "Allow infinite level threading for items on this site." msgstr "" #: ../../mod/admin.php:470 -msgid "No default permissions for new users" +msgid "Private posts by default for new users" msgstr "" #: ../../mod/admin.php:470 msgid "" -"New users will have no private permissions set for their posts by default, " -"making their posts public until they change it." +"Set default post permissions for all new members to the default privacy " +"group rather than public." msgstr "" #: ../../mod/admin.php:472 @@ -4407,8 +4407,8 @@ msgstr "" msgid "Edit visibility" msgstr "" -#: ../../mod/filer.php:29 ../../include/conversation.php:1155 -#: ../../include/conversation.php:1172 +#: ../../mod/filer.php:29 ../../include/conversation.php:1185 +#: ../../include/conversation.php:1202 msgid "Save to Folder:" msgstr "" @@ -7480,7 +7480,7 @@ msgid "Sex Addict" msgstr "" #: ../../include/profile_selectors.php:42 ../../include/user.php:278 -#: ../../include/user.php:283 +#: ../../include/user.php:282 msgid "Friends" msgstr "" @@ -7902,7 +7902,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1659 +#: ../../include/nav.php:49 ../../boot.php:1665 msgid "Status" msgstr "" @@ -8513,34 +8513,34 @@ msgstr "" msgid "stopped following" msgstr "" -#: ../../include/Contact.php:220 ../../include/conversation.php:1052 +#: ../../include/Contact.php:220 ../../include/conversation.php:1082 msgid "Poke" msgstr "" -#: ../../include/Contact.php:221 ../../include/conversation.php:1046 +#: ../../include/Contact.php:221 ../../include/conversation.php:1076 msgid "View Status" msgstr "" -#: ../../include/Contact.php:222 ../../include/conversation.php:1047 +#: ../../include/Contact.php:222 ../../include/conversation.php:1077 msgid "View Profile" msgstr "" -#: ../../include/Contact.php:223 ../../include/conversation.php:1048 +#: ../../include/Contact.php:223 ../../include/conversation.php:1078 msgid "View Photos" msgstr "" #: ../../include/Contact.php:224 ../../include/Contact.php:237 -#: ../../include/conversation.php:1049 +#: ../../include/conversation.php:1079 msgid "Network Posts" msgstr "" #: ../../include/Contact.php:225 ../../include/Contact.php:237 -#: ../../include/conversation.php:1050 +#: ../../include/conversation.php:1080 msgid "Edit Contact" msgstr "" #: ../../include/Contact.php:226 ../../include/Contact.php:237 -#: ../../include/conversation.php:1051 +#: ../../include/conversation.php:1081 msgid "Send PM" msgstr "" @@ -8558,106 +8558,106 @@ msgstr "" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: ../../include/conversation.php:952 +#: ../../include/conversation.php:982 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:1110 +#: ../../include/conversation.php:1140 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1110 +#: ../../include/conversation.php:1140 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1114 +#: ../../include/conversation.php:1144 #, php-format msgid "%2$d people like this." msgstr "" -#: ../../include/conversation.php:1116 +#: ../../include/conversation.php:1146 #, php-format msgid "%2$d people don't like this." msgstr "" -#: ../../include/conversation.php:1122 +#: ../../include/conversation.php:1152 msgid "and" msgstr "" -#: ../../include/conversation.php:1125 +#: ../../include/conversation.php:1155 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:1126 +#: ../../include/conversation.php:1156 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1126 +#: ../../include/conversation.php:1156 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1150 ../../include/conversation.php:1167 +#: ../../include/conversation.php:1180 ../../include/conversation.php:1197 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:1152 ../../include/conversation.php:1169 +#: ../../include/conversation.php:1182 ../../include/conversation.php:1199 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:1153 ../../include/conversation.php:1170 +#: ../../include/conversation.php:1183 ../../include/conversation.php:1200 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:1154 ../../include/conversation.php:1171 +#: ../../include/conversation.php:1184 ../../include/conversation.php:1201 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1156 ../../include/conversation.php:1173 +#: ../../include/conversation.php:1186 ../../include/conversation.php:1203 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1216 +#: ../../include/conversation.php:1246 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1218 +#: ../../include/conversation.php:1248 msgid "attach file" msgstr "" -#: ../../include/conversation.php:1220 +#: ../../include/conversation.php:1250 msgid "web link" msgstr "" -#: ../../include/conversation.php:1221 +#: ../../include/conversation.php:1251 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:1222 +#: ../../include/conversation.php:1252 msgid "video link" msgstr "" -#: ../../include/conversation.php:1223 +#: ../../include/conversation.php:1253 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:1224 +#: ../../include/conversation.php:1254 msgid "audio link" msgstr "" -#: ../../include/conversation.php:1226 +#: ../../include/conversation.php:1256 msgid "set location" msgstr "" -#: ../../include/conversation.php:1228 +#: ../../include/conversation.php:1258 msgid "clear location" msgstr "" -#: ../../include/conversation.php:1235 +#: ../../include/conversation.php:1265 msgid "permissions" msgstr "" @@ -8755,18 +8755,18 @@ msgstr "" msgid "Events this week:" msgstr "" -#: ../../boot.php:1662 +#: ../../boot.php:1668 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:1669 +#: ../../boot.php:1675 msgid "Profile Details" msgstr "" -#: ../../boot.php:1686 +#: ../../boot.php:1692 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:1693 +#: ../../boot.php:1699 msgid "Only You Can See This" msgstr "" From 2abbd1dc19680fcfc00c841b6a73a97a297055b9 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 15 Sep 2012 20:21:17 -0700 Subject: [PATCH 041/124] permissions selector showing up for guests, testbubble and smoothly --- include/Photo.php | 2 +- view/theme/smoothly/jot.tpl | 2 +- view/theme/testbubble/jot.tpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/Photo.php b/include/Photo.php index 8e4eb84bd..00c424c64 100644 --- a/include/Photo.php +++ b/include/Photo.php @@ -663,7 +663,7 @@ function import_profile_photo($photo,$uid,$cid) { intval($uid), intval($cid) ); - if(count($r)) { + if(count($r) && strlen($r[0]['resource-id'])) { $hash = $r[0]['resource-id']; } else { diff --git a/view/theme/smoothly/jot.tpl b/view/theme/smoothly/jot.tpl index 5f711cf24..2f52643f0 100644 --- a/view/theme/smoothly/jot.tpl +++ b/view/theme/smoothly/jot.tpl @@ -47,7 +47,7 @@ +
    - {{ if $item.lock }}
    $item.lock
    - {{ else }}
    {{ endif }} + {{ if $item.lock }} +
    + $item.lock +
    + {{ else }} +
    + {{ endif }}
    +
    $item.title
    $item.body -
    - {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
    +
    + {{ for $item.tags as $tag }} + $tag + {{ endfor }} +
    -
    + + + +
    + {{ if $item.edpost }} + + {{ endif }} +
    - {{ if $item.drop.dropping }}{{ endif }} + {{ if $item.drop.dropping }} + + {{ endif }}
    - {{ if $item.drop.dropping }}{{ endif }} + + {{ if $item.drop.dropping }} + {{ endif }} +
    +
    - $item.name + + $item.name +
    $item.ago
    $item.dislike
    -
    - $item.comment -
    +
    $item.comment
    - diff --git a/view/theme/smoothly/wallwall_thread.tpl b/view/theme/smoothly/wallwall_thread.tpl index a660aacfd..06822d013 100644 --- a/view/theme/smoothly/wallwall_thread.tpl +++ b/view/theme/smoothly/wallwall_thread.tpl @@ -1,9 +1,11 @@ {{if $item.comment_firstcollapsed}}
    - $item.num_comments $item.hide_text + $item.num_comments + $item.hide_text
    diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl index e8044532a..ff2bc00e4 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 68bb3bc9d..211f95132 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 097/124] 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 123834064..c95322810 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 5b9de2968..8acc91193 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 c53f8b017..cea270597 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 b2c980c78..0a183f076 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 c53f8b017..484684176 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 35572caa0..3e997ad7a 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 d5cc7f16c..0b869e144 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 5f434d4cb..19b32bfaa 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 63c8a2e96..edfbdf27e 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 cab97cafa..b150e1fd0 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 098/124] 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 030ecdbe1..376caefa4 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 099/124] 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 4b70ab98d..8cf08df8b 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 7b39ec53a..dbf50a9ea 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 a8f4bc908..38a097f75 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 60b1d30dc..0c513ec79 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 08c7d49ff..9b23d1780 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 dbf50a9ea..f72d6a8ad 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 102/124] 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 9690bad1b..be7491c27 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 8d30bbaf9..21a52cb0b 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 103/124] 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 86a937fef..ef7236baf 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 211f95132..ef7236baf 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 104/124] 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 1bdde5e9f..4026923d8 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 ed439e4d2..e039968bd 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 0ef70cf8b..000000000 --- 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 4c5b12087..000000000 --- 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 0ef70cf8b..000000000 --- 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 4c5b12087..000000000 --- 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 8acc91193..000000000 --- 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 cea270597..484684176 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 0a183f076..000000000 --- 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 484684176..000000000 --- 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 0b869e144..000000000 --- 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 19b32bfaa..3f06e539b 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 edfbdf27e..000000000 --- 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 b150e1fd0..000000000 --- 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 dda4bc4a9..000000000 --- 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 ba6131857..000000000 --- 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 f75059d9c..000000000 --- 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 d6fb677c5..3af6aaa11 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 9affbceba..000000000 --- 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 3af6aaa11..000000000 --- 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 e2cb60dbe..000000000 --- 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 008ec89db..a60c926fa 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 6d7a3ec32..000000000 --- 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 f23cf00ab..000000000 --- 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 731c2d2bf..000000000 --- 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 757f17546..2500fbcce 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 e26b18636..000000000 --- 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 458939008..000000000 --- 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 38a097f75..000000000 --- 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 0c513ec79..09799e881 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