From 0f2a34c23b2da277af88bbd36c1871f3c58e6420 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 28 Mar 2012 13:37:04 +0200 Subject: quattro: tpl for "file as" --- view/theme/quattro/fileas_widget.tpl | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 view/theme/quattro/fileas_widget.tpl (limited to 'view') diff --git a/view/theme/quattro/fileas_widget.tpl b/view/theme/quattro/fileas_widget.tpl new file mode 100644 index 000000000..1e5a76044 --- /dev/null +++ b/view/theme/quattro/fileas_widget.tpl @@ -0,0 +1,12 @@ +
+

$title

+
$desc
+ + + +
-- cgit v1.2.3 From 50711040cbf3686f427e5ad8d0582674ef45a12b Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 28 Mar 2012 15:31:58 +0200 Subject: message: remove tabs, move new message link to aside, all message with gmail-style --- view/mail_conv.tpl | 12 ++++++------ view/mail_display.tpl | 6 ++++++ view/message_side.tpl | 10 ++++++++++ 3 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 view/mail_display.tpl create mode 100644 view/message_side.tpl (limited to 'view') diff --git a/view/mail_conv.tpl b/view/mail_conv.tpl index ed36a7bb2..75a4506f6 100755 --- a/view/mail_conv.tpl +++ b/view/mail_conv.tpl @@ -1,13 +1,13 @@
- $from_name + $mail.from_name
-
$from_name
-
$date
-
$subject
-
$body
-
+
$mail.from_name
+
$mail.date
+
$mail.subject
+
$mail.body
+
diff --git a/view/mail_display.tpl b/view/mail_display.tpl new file mode 100644 index 000000000..69c7e0722 --- /dev/null +++ b/view/mail_display.tpl @@ -0,0 +1,6 @@ + +{{ for $mails as $mail }} + {{ inc mail_conv.tpl }}{{endinc}} +{{ endfor }} + +{{ inc prv_message.tpl }}{{ endinc }} diff --git a/view/message_side.tpl b/view/message_side.tpl new file mode 100644 index 000000000..fce771bd5 --- /dev/null +++ b/view/message_side.tpl @@ -0,0 +1,10 @@ +
+ + +
    + {{ for $tabs as $t }} +
  • $t.label
    • + {{ endfor }} +
+ +
-- cgit v1.2.3 From 011a96d960e8d8c9624e17c37afa49c97d55c0c6 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 28 Mar 2012 15:34:02 +0200 Subject: quattro: style pm pages --- view/theme/quattro/colors.less | 9 +++ view/theme/quattro/mail_conv.tpl | 60 +++++++++++++++ view/theme/quattro/mail_display.tpl | 12 +++ view/theme/quattro/mail_list.tpl | 8 ++ view/theme/quattro/message_side.tpl | 10 +++ view/theme/quattro/msg-header.tpl | 97 +++++++++++++++++++++++ view/theme/quattro/quattro.less | 124 +++++++++++++++++++++--------- view/theme/quattro/style.css | 149 +++++++++++++++++++++++++++++------- 8 files changed, 405 insertions(+), 64 deletions(-) create mode 100755 view/theme/quattro/mail_conv.tpl create mode 100644 view/theme/quattro/mail_display.tpl create mode 100644 view/theme/quattro/mail_list.tpl create mode 100644 view/theme/quattro/message_side.tpl create mode 100755 view/theme/quattro/msg-header.tpl (limited to 'view') diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less index 9183b2e77..b6d487f92 100755 --- a/view/theme/quattro/colors.less +++ b/view/theme/quattro/colors.less @@ -96,3 +96,12 @@ @JotPermissionLockBackgroundColor: @Grey4; @JotLoadingBackgroundColor: @Grey1; @JotPreviewBackgroundColor: @Yellow1; + +@MessageNewBackgroundColor: @Blue1; +@MessageNewBorderColor: @Blue3; +@MessageNewColor: @Grey1; + +@MailListBackgroundColor: #f6f7f8; + +@MailDisplaySubjectColor: @Grey5; +@MailDisplaySubjectBackgroundColor: #f6f7f8; diff --git a/view/theme/quattro/mail_conv.tpl b/view/theme/quattro/mail_conv.tpl new file mode 100755 index 000000000..989f17878 --- /dev/null +++ b/view/theme/quattro/mail_conv.tpl @@ -0,0 +1,60 @@ +
+
+
+ +
+
+ $mail.body +
+
+
+
+
+
+
+
+
+
+
+
+
+ $mail.from_name $mail.date +
+ +
+
+ +
+ $mail.delete +
+ +
+
+
+
+
+ + +{# + + +
+
+ $mail.from_name +
+
+
$mail.from_name
+
$mail.date
+
$mail.subject
+
$mail.body
+
+
+
+
+
+ +#} diff --git a/view/theme/quattro/mail_display.tpl b/view/theme/quattro/mail_display.tpl new file mode 100644 index 000000000..8b82e95c6 --- /dev/null +++ b/view/theme/quattro/mail_display.tpl @@ -0,0 +1,12 @@ +
+ $thread_subject + +
+ +{{ for $mails as $mail }} +
+ {{ inc mail_conv.tpl }}{{endinc}} +
+{{ endfor }} + +{{ inc prv_message.tpl }}{{ endinc }} diff --git a/view/theme/quattro/mail_list.tpl b/view/theme/quattro/mail_list.tpl new file mode 100644 index 000000000..6bc6c84f6 --- /dev/null +++ b/view/theme/quattro/mail_list.tpl @@ -0,0 +1,8 @@ +
+ $subject + $from_name + $date + $count + + +
diff --git a/view/theme/quattro/message_side.tpl b/view/theme/quattro/message_side.tpl new file mode 100644 index 000000000..9f1587096 --- /dev/null +++ b/view/theme/quattro/message_side.tpl @@ -0,0 +1,10 @@ +
+ + +
    + {{ for $tabs as $t }} +
  • $t.label
    • + {{ endfor }} +
+ +
diff --git a/view/theme/quattro/msg-header.tpl b/view/theme/quattro/msg-header.tpl new file mode 100755 index 000000000..2d1ea7a61 --- /dev/null +++ b/view/theme/quattro/msg-header.tpl @@ -0,0 +1,97 @@ + + + + + + diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index fca65c907..c6352cfe9 100755 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -319,41 +319,6 @@ aside { img { width: 48px; height: 48px; } } } -/* mail view */ -.mail-conv-sender, -.mail-conv-detail { - float: left; -} -.mail-conv-detail { - margin-left: 20px; - width: 500px; -} - -.mail-conv-subject { - font-size: 1.4em; - margin: 10px 0; -} - -.mail-conv-outside-wrapper-end { - clear: both; -} - -.mail-conv-outside-wrapper { - margin-top: 30px; -} - -.mail-conv-delete-wrapper { - float: right; - margin-right: 30px; - margin-top: 15px; -} -.mail-conv-break { - clear: both; -} - -.mail-conv-delete-icon { - border: none; -} /* group member */ #contact-edit-drop-link, @@ -938,6 +903,10 @@ ul.tabs { textarea { width: 400px; } + input[type="checkbox"], input[type="radio"]{ + width: auto; + } + textarea { height: 100px; } .field_help { display: block; @@ -981,6 +950,7 @@ ul.tabs { &.radio .field_help { margin-left: 0px; } } + #profile-edit-links li { list-style: none; margin-top: 10px; @@ -1085,6 +1055,90 @@ ul.tabs { } } +/* messages */ +#message-new { + background: @MessageNewBackgroundColor; + border: 1px solid @MessageNewBorderColor; + width: 150px; + a { + color: @MessageNewColor; + text-align: center; + display: block; + font-weight: bold; + padding: 1em 0px; + } +} + +.mail-list-wrapper { + background-color: @MailListBackgroundColor; + margin-bottom: 5px; + width: 100%; height: auto; overflow: hidden; + + span { display: block; float: left; width: 20%; overflow: hidden;} + + .mail-subject { + width: 30%; + padding:4px 0px 0px 4px; + a { display: block; } + &.unseen a { font-weight: bold; } + } + .mail-date { padding: 4px 4px 0px 4px; } + .mail-from { padding: 4px 4px 0px 4px; } + .mail-count { padding: 4px 4px 0px 4px; text-align: right;} + + .mail-delete { float: right; } +} + +#mail-display-subject { + background-color: @MailDisplaySubjectBackgroundColor; + color: @MailDisplaySubjectColor; + margin-bottom: 10px; + width: 100%; height: auto; overflow: hidden; + span { float: left; overflow: hidden; padding: 4px 0px 0px 10px;} + .mail-delete { float: right; .opaque(0.5);} + &:hover .mail-delete { .opaque(1); } + +} + +/* mail view */ +/* +.mail-conv-sender, +.mail-conv-detail { + float: left; +} +.mail-conv-detail { + margin-left: 20px; + width: 500px; +} + +.mail-conv-subject { + font-size: 1.4em; + margin: 10px 0; +} + +.mail-conv-outside-wrapper-end { + clear: both; +} + +.mail-conv-outside-wrapper { + margin-top: 30px; +} + +.mail-conv-delete-wrapper { + float: right; + margin-right: 30px; + margin-top: 15px; +} +.mail-conv-break { + clear: both; +} + +.mail-conv-delete-icon { + border: none; +} + +*/ + /* page footer */ footer { height: 100px; display: table-row; } diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index 8f0abe86d..7d7444e48 100755 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -626,35 +626,6 @@ aside #profiles-menu { width: 48px; height: 48px; } -/* mail view */ -.mail-conv-sender, .mail-conv-detail { - float: left; -} -.mail-conv-detail { - margin-left: 20px; - width: 500px; -} -.mail-conv-subject { - font-size: 1.4em; - margin: 10px 0; -} -.mail-conv-outside-wrapper-end { - clear: both; -} -.mail-conv-outside-wrapper { - margin-top: 30px; -} -.mail-conv-delete-wrapper { - float: right; - margin-right: 30px; - margin-top: 15px; -} -.mail-conv-break { - clear: both; -} -.mail-conv-delete-icon { - border: none; -} /* group member */ #contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper { float: right; @@ -1355,6 +1326,9 @@ ul.tabs li .active { .field input, .field textarea { width: 400px; } +.field input[type="checkbox"], .field input[type="radio"] { + width: auto; +} .field textarea { height: 100px; } @@ -1503,6 +1477,123 @@ ul.tabs li .active { 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; +} +/* mail view */ +/* +.mail-conv-sender, +.mail-conv-detail { + float: left; +} +.mail-conv-detail { + margin-left: 20px; + width: 500px; +} + +.mail-conv-subject { + font-size: 1.4em; + margin: 10px 0; +} + +.mail-conv-outside-wrapper-end { + clear: both; +} + +.mail-conv-outside-wrapper { + margin-top: 30px; +} + +.mail-conv-delete-wrapper { + float: right; + margin-right: 30px; + margin-top: 15px; +} +.mail-conv-break { + clear: both; +} + +.mail-conv-delete-icon { + border: none; +} + +*/ /* page footer */ footer { height: 100px; -- cgit v1.2.3 From 339c8a4b56f3f9d9b1557fbb393821602f62cc54 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Thu, 29 Mar 2012 11:02:59 +0200 Subject: css fixes in diabook-derivates --- view/theme/diabook-blue/communityhome.tpl | 7 +++--- view/theme/diabook-blue/icons/srch_bg.gif | Bin 0 -> 65 bytes view/theme/diabook-blue/icons/srch_l.gif | Bin 0 -> 303 bytes view/theme/diabook-blue/icons/srch_r.gif | Bin 0 -> 227 bytes view/theme/diabook-blue/icons/srch_r_f2.gif | Bin 0 -> 278 bytes view/theme/diabook-blue/nav.tpl | 18 +++++++-------- view/theme/diabook-blue/style-network.css | 34 ++++++++++++++++++++++++++++ view/theme/diabook-blue/style-profile.css | 34 ++++++++++++++++++++++++++++ view/theme/diabook-blue/style.css | 8 +++++++ view/theme/diabook-blue/theme.php | 19 ++++++++++++++++ view/theme/diabook/communityhome.tpl | 4 ++-- view/theme/diabook/nav.tpl | 12 ++++------ view/theme/diabook/style-network.css | 8 +++++++ view/theme/diabook/style-profile.css | 8 +++++++ view/theme/diabook/style.css | 4 ++++ view/theme/diabook/theme.php | 3 +-- 16 files changed, 136 insertions(+), 23 deletions(-) create mode 100644 view/theme/diabook-blue/icons/srch_bg.gif create mode 100644 view/theme/diabook-blue/icons/srch_l.gif create mode 100644 view/theme/diabook-blue/icons/srch_r.gif create mode 100644 view/theme/diabook-blue/icons/srch_r_f2.gif (limited to 'view') diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl index fa8197dd4..00a59eec0 100755 --- a/view/theme/diabook-blue/communityhome.tpl +++ b/view/theme/diabook-blue/communityhome.tpl @@ -7,10 +7,10 @@
{{ if $lastusers_title }}

Help or @NewHere ?

+NewHere
Friendica Support
Let's talk
Local Friendica -NewHere {{ endif }}
@@ -30,13 +30,14 @@ {{ endif }} -
+
{{ if $nv }}

Find Friends

$nv.directory.1
$nv.match.1
-$nv.suggest.1 +$nv.suggest.1
$nv.invite.1 +$nv.search {{ endif }}
diff --git a/view/theme/diabook-blue/icons/srch_bg.gif b/view/theme/diabook-blue/icons/srch_bg.gif new file mode 100644 index 000000000..6a523ba8f Binary files /dev/null and b/view/theme/diabook-blue/icons/srch_bg.gif differ diff --git a/view/theme/diabook-blue/icons/srch_l.gif b/view/theme/diabook-blue/icons/srch_l.gif new file mode 100644 index 000000000..6d95bf35d Binary files /dev/null and b/view/theme/diabook-blue/icons/srch_l.gif differ diff --git a/view/theme/diabook-blue/icons/srch_r.gif b/view/theme/diabook-blue/icons/srch_r.gif new file mode 100644 index 000000000..89833a316 Binary files /dev/null and b/view/theme/diabook-blue/icons/srch_r.gif differ diff --git a/view/theme/diabook-blue/icons/srch_r_f2.gif b/view/theme/diabook-blue/icons/srch_r_f2.gif new file mode 100644 index 000000000..6df457bed Binary files /dev/null and b/view/theme/diabook-blue/icons/srch_r_f2.gif differ diff --git a/view/theme/diabook-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl index 651b9647d..d73dd047a 100644 --- a/view/theme/diabook-blue/nav.tpl +++ b/view/theme/diabook-blue/nav.tpl @@ -65,15 +65,11 @@ - + {{ if $nav.directory }} + + {{ endif }} {{ if $nav.apps }} @@ -98,7 +98,7 @@ {{ endif }} - {{ if $nav.home }} + {{ if $nav.settings }}