From 9f92bbb04cefc1051e0c7803f88e7b4cb8826d37 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 23 Feb 2012 07:53:45 +0100 Subject: [PATCH 1/3] Removed the export of markdown articles. That was for testing purposes only. --- include/bb2diaspora.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 70d4bec9af..bcef86616b 100755 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -14,8 +14,8 @@ require_once('include/html2bbcode.php'); function diaspora2bb($s) { // for testing purposes: Collect raw markdown articles - $file = tempnam("/tmp/friendica/", "markdown"); - file_put_contents($file, $s); + // $file = tempnam("/tmp/friendica/", "markdown"); + // file_put_contents($file, $s); $s = html_entity_decode($s,ENT_COMPAT,'UTF-8'); From e1ecf48b8b1ba98e998253b1b57de33dbdabd485 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 23 Feb 2012 07:55:56 +0100 Subject: [PATCH 2/3] README file shortened because this was for my branch only. --- README | 3 --- 1 file changed, 3 deletions(-) diff --git a/README b/README index e75d6319b2..e69de29bb2 100644 --- a/README +++ b/README @@ -1,3 +0,0 @@ -This is my personal fork of https://github.com/friendica/friendica - -If you want to have a stable version of friendica please look there. From 56f3c00eec645db3a5f67afb916602cebb0325af Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 23 Feb 2012 09:02:40 +0100 Subject: [PATCH 3/3] quattro: added styling to pivate message view --- view/theme/quattro-green/style.css | 89 ++++++++++++++++++++++++++++++ view/theme/quattro/quattro.less | 35 ++++++++++++ view/theme/quattro/style.css | 29 ++++++++++ 3 files changed, 153 insertions(+) diff --git a/view/theme/quattro-green/style.css b/view/theme/quattro-green/style.css index 8dad509711..ab1083e75c 100755 --- a/view/theme/quattro-green/style.css +++ b/view/theme/quattro-green/style.css @@ -48,6 +48,21 @@ .icon.s10.unlock { background-image: url("../../../images/icons/10/unlock.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.text { padding: 2px 0px 0px 15px; } @@ -85,6 +100,21 @@ .icon.s16.unlock { background-image: url("../../../images/icons/16/unlock.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.text { padding: 4px 0px 0px 20px; } @@ -122,6 +152,21 @@ .icon.s22.unlock { background-image: url("../../../images/icons/22/unlock.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.text { padding: 10px 0px 0px 25px; } @@ -159,6 +204,21 @@ .icon.s48.unlock { background-image: url("../../../images/icons/48/unlock.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"); +} /* global */ body { font-family: Liberation Sans, helvetica, arial, clean, sans-serif; @@ -564,6 +624,35 @@ aside #profiles-menu { widht: 48px; height: 58px; } +/* 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; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index ac84e0eff7..f834f2e777 100755 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -317,6 +317,41 @@ aside { img { widht: 48px; height: 58px; } } } +/* 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, diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index 4c24ade8ea..ed2baee7ad 100755 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -624,6 +624,35 @@ aside #profiles-menu { widht: 48px; height: 58px; } +/* 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;