From 59d9070d13949d596d24524acaef9d35e8feba8c Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 25 Jun 2011 19:10:38 -0700 Subject: suggestion template --- view/atom_suggest.tpl | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 view/atom_suggest.tpl (limited to 'view') diff --git a/view/atom_suggest.tpl b/view/atom_suggest.tpl new file mode 100644 index 000000000..8df011bfd --- /dev/null +++ b/view/atom_suggest.tpl @@ -0,0 +1,10 @@ + + + + $url + $name + $photo + $note + + + -- cgit v1.2.3 From 3fe1e197254f62e5377c28a24e4d5a75014e931b Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 26 Jun 2011 19:30:57 -0700 Subject: pass notify endpoint with friend suggestions --- view/atom_suggest.tpl | 1 + 1 file changed, 1 insertion(+) (limited to 'view') diff --git a/view/atom_suggest.tpl b/view/atom_suggest.tpl index 8df011bfd..66c61f9b6 100644 --- a/view/atom_suggest.tpl +++ b/view/atom_suggest.tpl @@ -4,6 +4,7 @@ $url $name $photo + $request $note -- cgit v1.2.3 From 23f00aaab42a39905c74d06a3864719214122a1f Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 26 Jun 2011 21:55:24 -0700 Subject: recipient ui, friend suggestions --- view/intros.tpl | 2 +- view/suggestions.tpl | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 view/suggestions.tpl (limited to 'view') diff --git a/view/intros.tpl b/view/intros.tpl index 4534f2191..d52c3a7aa 100644 --- a/view/intros.tpl +++ b/view/intros.tpl @@ -3,7 +3,7 @@

$str_notifytype $notify_type

$fullname
-fullname +$fullname
$knowyou
$note
diff --git a/view/suggestions.tpl b/view/suggestions.tpl new file mode 100644 index 000000000..46c927754 --- /dev/null +++ b/view/suggestions.tpl @@ -0,0 +1,20 @@ + +
+ +

$str_notifytype $notify_type

+
$madeby
+
$fullname
+$fullname +
$note
+
+
+ + +
+
+ +
+ +
+
+
-- cgit v1.2.3 From c410c9013c062a9a4fce1f887572a1b1c951afbe Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 26 Jun 2011 22:57:08 -0700 Subject: friend suggestions --- view/contact_edit.tpl | 1 + 1 file changed, 1 insertion(+) (limited to 'view') diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl index 3246e4470..66479210f 100644 --- a/view/contact_edit.tpl +++ b/view/contact_edit.tpl @@ -45,6 +45,7 @@ $ignored $grps +$lblsuggest

$lbl_info1

-- cgit v1.2.3 From 1947b74e5bd92f11a3e8af2223826e649233a883 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 27 Jun 2011 16:18:06 -0700 Subject: some basic margins for friend suggestion screen --- view/theme/duepuntozero/style.css | 5 +++++ view/theme/loozah/style.css | 7 +++++++ 2 files changed, 12 insertions(+) (limited to 'view') diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index c6ce8ea2c..6e771634a 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -881,6 +881,11 @@ input#dfrn-url { clear: both; } +#fsuggest-desc, #fsuggest-submit-wrapper { + margin-top: 15px; + margin-bottom: 15px; +} + .wall-item-content-wrapper { margin-top: 10px; border: 1px solid #CCC; diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index 98ab96d2b..c68e38b68 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -997,6 +997,13 @@ input#dfrn-url { clear: both; } + +#fsuggest-desc, #fsuggest-submit-wrapper { + margin-top: 15px; + margin-bottom: 15px; +} + + .wall-item-content-wrapper { margin-top: 10px; border: 1px solid #CCC; -- cgit v1.2.3 From 399c5aed1e3eb66565b1f821bec9e4889b386ee1 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 28 Jun 2011 13:03:19 +0200 Subject: added deleteCheckedItems to jot-header.tpl --- view/theme/dispy/jot-header.tpl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'view') diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl index aa9e0bfaf..3c70473ba 100644 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/jot-header.tpl @@ -110,6 +110,24 @@ tinyMCE.init({ }); + function deleteCheckedItems() { + var checkedstr = ''; + + $('.item-select').each( function() { + if($(this).is(':checked')) { + if(checkedstr.length != 0) { + checkedstr = checkedstr + ',' + $(this).val(); + } + else { + checkedstr = $(this).val(); + } + } + }); + $.post('item', { dropitems: checkedstr }, function(data) { + window.location.reload(); + }); + } + function jotGetLink() { reply = prompt("$linkurl"); if(reply && reply.length) { -- cgit v1.2.3 From 60caa0349416dad1a3a891e3c0e00d33d25d7a91 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 28 Jun 2011 19:08:13 -0700 Subject: darkzero textareas hard to read --- view/theme/darkzero/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css index c92529f26..3459e7409 100644 --- a/view/theme/darkzero/style.css +++ b/view/theme/darkzero/style.css @@ -7,7 +7,7 @@ a:hover {text-decoration: underline; } input, select, textarea { background-color: #222222; - color: #FFFFFF; + color: #FFFFFF !important; border: 1px solid #444444; } .openid { background-color: #222222;} -- cgit v1.2.3 From 0b221e8945ae785dc706d8ea9a9e8e25532c0096 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 28 Jun 2011 21:11:52 -0700 Subject: bug #96 move libraries to library - better alignment of like rotator --- view/contact_head.tpl | 2 +- view/crophead.tpl | 10 ++++------ view/event_head.tpl | 2 +- view/jot-header.tpl | 2 +- view/msg-header.tpl | 2 +- view/profed_head.tpl | 2 +- view/theme/duepuntozero/style.css | 9 +++++++-- 7 files changed, 16 insertions(+), 13 deletions(-) (limited to 'view') diff --git a/view/contact_head.tpl b/view/contact_head.tpl index 6a80c2122..c7de390af 100644 --- a/view/contact_head.tpl +++ b/view/contact_head.tpl @@ -1,5 +1,5 @@ + src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"> - - - - - + + + + diff --git a/view/event_head.tpl b/view/event_head.tpl index 4e5063131..fe0b8fe2a 100644 --- a/view/event_head.tpl +++ b/view/event_head.tpl @@ -1,5 +1,5 @@ + src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"> + + + src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"> + diff --git a/view/field_richtext.tpl b/view/field_richtext.tpl new file mode 100644 index 000000000..a5a453d32 --- /dev/null +++ b/view/field_richtext.tpl @@ -0,0 +1,44 @@ + +
+ + + $field.3 + + +
-- cgit v1.2.3 From 779292077c99c7693da78be4a53e25f039bedd8b Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Thu, 30 Jun 2011 16:43:04 +0200 Subject: style template field outside admin pages --- view/theme/duepuntozero/style.css | 53 +++++++++++++++++++++------------------ view/theme/loozah/style.css | 51 +++++++++++++++++++------------------ 2 files changed, 56 insertions(+), 48 deletions(-) (limited to 'view') diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 0c4b710c0..dc54398dc 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2541,6 +2541,35 @@ a.mail-list-link { filter:alpha(opacity=100); } + +/** + * Form fields + */ +.field { + clear: left; + margin-bottom: 5px; + padding-bottom: 5px; +} + +.field label { + float: left; + width: 200px; + font-weight: bold; +} + +.field input, +.field textarea { + width: 400px; +} +.field textarea { height: 100px; } +.field_help { + display: block; + margin-left: 200px; + color: #666666; + +} + + /** * ADMIN */ @@ -2567,30 +2596,6 @@ a.mail-list-link { margin-left: 200px; } -#adminpage .field { - clear: left; - margin-bottom: 5px; - padding-bottom: 5px; -} - -#adminpage .field label { - float: left; - width: 200px; - font-weight: bold; -} - -#adminpage .field input, -#adminpage .field textarea { - width: 400px; -} -#adminpage .field textarea { height: 100px; } -#adminpage .field_help { - display: block; - margin-left: 200px; - color: #666666; - -} - #adminpage h3 { border-bottom: 1px solid #cccccc; } diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index c68e38b68..7802d176d 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -2559,6 +2559,33 @@ a.mail-list-link { left: 0px; top: 0px; } +/** + * Form fields + */ +.field { + clear: left; + margin-bottom: 5px; + padding-bottom: 5px; +} + +.field label { + float: left; + width: 200px; + font-weight: bold; +} + +.field input, +.field textarea { + width: 400px; +} +.field textarea { height: 100px; } +.field_help { + display: block; + margin-left: 200px; + color: #666666; + +} + /** * ADMIN @@ -2586,30 +2613,6 @@ a.mail-list-link { margin-left: 200px; } -#adminpage .field { - clear: left; - margin-bottom: 5px; - padding-bottom: 5px; -} - -#adminpage .field label { - float: left; - width: 200px; - font-weight: bold; -} - -#adminpage .field input, -#adminpage .field textarea { - width: 400px; -} -#adminpage .field textarea { height: 100px; } -#adminpage .field_help { - display: block; - margin-left: 200px; - color: #666666; - -} - #adminpage h3 { border-bottom: 1px solid #cccccc; } -- cgit v1.2.3 From 762bb8de795f8bb455da969d287397b2fa6a2f82 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Thu, 30 Jun 2011 17:00:26 +0200 Subject: update oembed and widgets plugins settings form --- view/theme/duepuntozero/style.css | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index dc54398dc..67a1546ee 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2541,6 +2541,15 @@ a.mail-list-link { filter:alpha(opacity=100); } +/** + * Plugins settings + */ + +.settings-block > h3, +.settings-heading { + border-bottom: 1px solid #babdb6 +} + /** * Form fields @@ -2554,7 +2563,6 @@ a.mail-list-link { .field label { float: left; width: 200px; - font-weight: bold; } .field input, @@ -2599,7 +2607,9 @@ a.mail-list-link { #adminpage h3 { border-bottom: 1px solid #cccccc; } - +#adminpage .field label { + font-weight: bold; +} #adminpage .submit { clear:left; text-align: right; -- cgit v1.2.3 From 53653f6a4d6b4c9d348d7e9d8eb1648469b031af Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 30 Jun 2011 17:35:35 -0700 Subject: consolidate perrmisions sql, minor duepuntozero validation fixes --- view/theme/duepuntozero/style.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'view') diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 67a1546ee..a99d7530f 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2547,7 +2547,7 @@ a.mail-list-link { .settings-block > h3, .settings-heading { - border-bottom: 1px solid #babdb6 + border-bottom: 1px solid #babdb6; } @@ -2632,7 +2632,7 @@ a.mail-list-link { margin-right: 1em; } -#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;} +#adminpage table {width:100%; border-bottom: 1px solid #000000; margin: 5px 0px;} #adminpage table th { text-align: left;} #adminpage td .icon { float: left;} #adminpage table#users img { width: 16px; height: 16px; } @@ -2692,9 +2692,9 @@ a.mail-list-link { margin-top: 10px; } -.type-video { background-position: 0px; 0px; } -.type-image { background-position: -20px; 0px; } -.type-audio { background-position: -40px; 0px; } -.type-text { background-position: -60px; 0px; } -.type-unkn { background-position: -80px; 0px; } +.type-video { background-position: 0px 0px; } +.type-image { background-position: -20px 0px; } +.type-audio { background-position: -40px 0px; } +.type-text { background-position: -60px 0px; } +.type-unkn { background-position: -80px 0px; } -- cgit v1.2.3 From b1aa77584f972b8c62fd099fa7fe08c36201b631 Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 1 Jul 2011 06:14:15 -0700 Subject: indicate currently selected group in group picker --- view/theme/duepuntozero/style.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'view') diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index a99d7530f..d07538b87 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -249,6 +249,12 @@ div.wall-item-content-wrapper.shiny { cursor: pointer; } +.group-selected { + padding: 3px; + border: 2px solid #CCCCCC; + font-weight: bold; +} + .fakelink:hover { color: #3465a4; text-decoration: underline; -- cgit v1.2.3 From 2d4f2f86cb9675983cc6976ddc434cc7636ec5fe Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 2 Jul 2011 02:34:19 -0700 Subject: improved group-selected highlighting --- view/theme/duepuntozero/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index d07538b87..2b0ee93e6 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -251,7 +251,8 @@ div.wall-item-content-wrapper.shiny { .group-selected { padding: 3px; - border: 2px solid #CCCCCC; + border: 1px solid #CCCCCC; + background: #F8F8F8; font-weight: bold; } -- cgit v1.2.3 From 24836f2966842b413ae29f325fbb61b30186a5f7 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 2 Jul 2011 02:47:01 -0700 Subject: improvied group highlighting, move new group link down --- view/theme/duepuntozero/style.css | 4 ++++ view/theme/loozah/style.css | 12 ++++++++++++ 2 files changed, 16 insertions(+) (limited to 'view') diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 2b0ee93e6..5595045b8 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -249,6 +249,10 @@ div.wall-item-content-wrapper.shiny { cursor: pointer; } +#group-sidebar { + margin-bottom: 10px; +} + .group-selected { padding: 3px; border: 1px solid #CCCCCC; diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index 7802d176d..d2b6441ac 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -137,6 +137,18 @@ blockquote:before { cursor: pointer; } + +#group-sidebar { + margin-bottom: 10px; +} + +.group-selected { + padding: 3px; + border: 1px solid #CCCCCC; + background: #F8F8F8; + font-weight: bold; +} + .fakelink:hover { color: #0CBEFE; text-decoration: none; -- cgit v1.2.3 From ab7f209fe3986ad751bd3a8ec2e155fcf1f9f130 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 2 Jul 2011 20:51:27 -0700 Subject: add starred, unstarred icons to duepuntozero, loozah --- view/theme/duepuntozero/style.css | 3 +++ view/theme/loozah/style.css | 2 ++ 2 files changed, 5 insertions(+) (limited to 'view') diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 5595045b8..e18cc3236 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2690,6 +2690,9 @@ a.mail-list-link { .on { background-position: -144px -32px; } .off { background-position: 0px -48px; } +.starred { background-position: -16px -48px; } +.unstarred { background-position: -32px -48px; } + .icon.dim { opacity: 0.3;filter:alpha(opacity=30); } diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index d2b6441ac..8f64e4cf8 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -2696,6 +2696,8 @@ a.mail-list-link { .on { background-position: -144px -32px; } .off { background-position: 0px -48px; } +.starred { background-position: -16px -48px; } +.unstarred { background-position: -32px -48px; } .icon.dim { opacity: 0.3;filter:alpha(opacity=30); } -- cgit v1.2.3 From 5ceeb6752d645036b832077d88b71a8825952322 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 3 Jul 2011 19:41:04 -0700 Subject: starred items --- view/theme/duepuntozero/style.css | 15 ++++++++++++++- view/theme/loozah/style.css | 17 ++++++++++++++++- view/wall_item.tpl | 1 + view/wallwall_item.tpl | 1 + 4 files changed, 32 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index e18cc3236..3a6c94a30 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -897,6 +897,14 @@ input#dfrn-url { margin-bottom: 15px; } +#network-star-link{ + margin-top: 10px; +} +.network-star { + float: left; + margin-right: 5px; +} + .wall-item-content-wrapper { margin-top: 10px; border: 1px solid #CCC; @@ -1037,7 +1045,12 @@ input#dfrn-url { } .editpost { - margin-left: 15px; + margin-left: 10px; + float: left; +} +.star-item { + margin-left: 10px; + float: left; } .wall-item-links-wrapper { diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index 8f64e4cf8..04a680017 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -1096,8 +1096,23 @@ input#dfrn-url { } .editpost { - margin-left: 15px; + margin-left: 10px; + float: left; } +.star-item { + margin-left: 10px; + float: left; +} + + +#network-star-link{ + margin-top: 10px; +} +.network-star { + float: left; + margin-right: 5px; +} + .wall-item-info.wallwall { width: 285px; diff --git a/view/wall_item.tpl b/view/wall_item.tpl index a95097be1..1c5e82b17 100644 --- a/view/wall_item.tpl +++ b/view/wall_item.tpl @@ -34,6 +34,7 @@ $vote $plink $edpost + $star $drop
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl index 39c14cf4f..fd686f0f4 100644 --- a/view/wallwall_item.tpl +++ b/view/wallwall_item.tpl @@ -38,6 +38,7 @@ $vote $plink $edpost + $star $drop -- cgit v1.2.3 From 9871cc8c0e07c112446b292548292301dbfd159f Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 3 Jul 2011 22:53:11 -0700 Subject: profile match layout issues --- view/theme/duepuntozero/style.css | 3 +++ view/theme/loozah/style.css | 4 ++++ 2 files changed, 7 insertions(+) (limited to 'view') diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 3a6c94a30..4df36b4a9 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2380,6 +2380,9 @@ a.mail-list-link { .profile-match-wrapper { float: left; padding: 10px; + width: 120px; + height: 120px; + scroll: auto; } #profile-match-wrapper-end { clear: both; diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index 04a680017..df14a29db 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -2341,6 +2341,10 @@ a.mail-list-link { .profile-match-wrapper { float: left; padding: 10px; + width: 120px; + height: 120px; + scroll: auto; + } #profile-match-wrapper-end { clear: both; -- cgit v1.2.3 From 2359783b9f6c0ec754c641453026712cf22e7cb6 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 4 Jul 2011 11:30:53 +0200 Subject: dispy: style private mails --- view/theme/dispy/style.css | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'view') diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index ac70ff679..0cb95f693 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -689,6 +689,15 @@ div[id$="wrapper"] br { clear: left; } .mail-list-delete-wrapper { float: right; } .mail-list-outside-wrapper-end { clear: both;} +.mail-conv-sender {float: left; margin: 0px 5px 5px 0px } +.mail-conv-sender-photo { width: 32px; height: 32px } +.mail-conv-sender-name { float: left } +.mail-conv-date { float: right } +.mail-conv-subject { clear: right; font-weight: bold; font-size: 1.2em } +.mail-conv-body { clear: both; } +.mail-conv-delete-wrapper { margin-top: 5px; } + + /** * contacts */ -- cgit v1.2.3