From 1d56224b08fe9781a050143f14c45fd518c5ca93 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 25 Mar 2012 01:12:28 -0400 Subject: [PATCH 1/2] increase version to 1.0 for dispys \o/ Signed-off-by: Simon L'nu --- view/theme/dispy-dark/theme.php | 3 ++- view/theme/dispy/theme.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index 7001361739..ad7780013a 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -3,9 +3,10 @@ /* * Name: Dispy Dark * Description: Dispy Dark, Friendica theme - * Version: 0.9 + * Version: 1.0 * Author: Simon * Maintainer: Simon + * Screenshot: screenshot */ diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index 26e07b1f76..e3f8f5b457 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -3,7 +3,7 @@ /* * Name: Dispy * Description: Dispy, Friendica theme - * Version: 0.9 + * Version: 1.0 * Author: unknown * Maintainer: Simon */ From 2c4312012995aa3411cf5e5dbd0eb934a0801797 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 25 Mar 2012 03:22:16 -0400 Subject: [PATCH 2/2] dispy-dark not experimental. start implementing fpostit Signed-off-by: Simon L'nu --- view/theme/dispy-dark/communityhome.tpl | 4 + view/theme/dispy-dark/experimental | 0 view/theme/dispy-dark/fpostit/README | 8 ++ view/theme/dispy-dark/fpostit/fpostit.js | 14 ++ view/theme/dispy-dark/fpostit/fpostit.php | 134 ++++++++++++++++++ .../theme/dispy-dark/fpostit/friendica-32.png | Bin 0 -> 1593 bytes .../theme/dispy-dark/fpostit/friendika-32.png | Bin 0 -> 1593 bytes view/theme/dispy-dark/style.css | 56 ++++++-- view/theme/dispy-dark/theme.php | 27 ++++ view/theme/dispy-dark/wallwall_item.tpl | 5 +- view/theme/dispy/communityhome.tpl | 4 + view/theme/dispy/fpostit/README | 8 ++ view/theme/dispy/fpostit/fpostit.js | 14 ++ view/theme/dispy/fpostit/fpostit.php | 134 ++++++++++++++++++ view/theme/dispy/fpostit/friendica-32.png | Bin 0 -> 1593 bytes view/theme/dispy/fpostit/friendika-32.png | Bin 0 -> 1593 bytes view/theme/dispy/style.css | 27 +++- view/theme/dispy/theme.php | 28 ++++ view/theme/dispy/wallwall_item.tpl | 5 +- 19 files changed, 452 insertions(+), 16 deletions(-) create mode 100644 view/theme/dispy-dark/communityhome.tpl delete mode 100644 view/theme/dispy-dark/experimental create mode 100644 view/theme/dispy-dark/fpostit/README create mode 100755 view/theme/dispy-dark/fpostit/fpostit.js create mode 100644 view/theme/dispy-dark/fpostit/fpostit.php create mode 100644 view/theme/dispy-dark/fpostit/friendica-32.png create mode 100644 view/theme/dispy-dark/fpostit/friendika-32.png create mode 100644 view/theme/dispy/communityhome.tpl create mode 100644 view/theme/dispy/fpostit/README create mode 100755 view/theme/dispy/fpostit/fpostit.js create mode 100644 view/theme/dispy/fpostit/fpostit.php create mode 100644 view/theme/dispy/fpostit/friendica-32.png create mode 100644 view/theme/dispy/fpostit/friendika-32.png diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl new file mode 100644 index 0000000000..0659ebe206 --- /dev/null +++ b/view/theme/dispy-dark/communityhome.tpl @@ -0,0 +1,4 @@ +{{ if $lastusers_title }} +

PostIt to Friendica

+
Post to Friendica from anywhere by bookmarking this Link.
+{{ endif }} diff --git a/view/theme/dispy-dark/experimental b/view/theme/dispy-dark/experimental deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/theme/dispy-dark/fpostit/README b/view/theme/dispy-dark/fpostit/README new file mode 100644 index 0000000000..39b7c57613 --- /dev/null +++ b/view/theme/dispy-dark/fpostit/README @@ -0,0 +1,8 @@ +fpostit + +original author: Devlon Duthied + +see his blog posting: +http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/ + +original published at github https://github.com/duthied/Friendika-Bookmarklet diff --git a/view/theme/dispy-dark/fpostit/fpostit.js b/view/theme/dispy-dark/fpostit/fpostit.js new file mode 100755 index 0000000000..eb593d838e --- /dev/null +++ b/view/theme/dispy-dark/fpostit/fpostit.js @@ -0,0 +1,14 @@ +javascript: (function() { + the_url = 'view/theme/dispy-dark/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? + document.getSelection() : document.selection.createRange().text)); + a_funct = function() { + if (!window.open(the_url, 'fpostit','location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) { + location.href = the_url + }; + if (/Firefox/.test(navigator.userAgent)) { + setTimeout(a_funct, 0) + } else { + a_funct(); + } + })();" diff --git a/view/theme/dispy-dark/fpostit/fpostit.php b/view/theme/dispy-dark/fpostit/fpostit.php new file mode 100644 index 0000000000..d00182946c --- /dev/null +++ b/view/theme/dispy-dark/fpostit/fpostit.php @@ -0,0 +1,134 @@ + + + + + + + + $content); + + // echo "posting to: $url
"; + + $c = curl_init(); + curl_setopt($c, CURLOPT_URL, $url); + curl_setopt($c, CURLOPT_USERPWD, "$username:$password"); + curl_setopt($c, CURLOPT_POSTFIELDS, $data); + curl_setopt($c, CURLOPT_RETURNTRANSFER, true); + curl_setopt($c, CURLOPT_FOLLOWLOCATION, true); + $c_result = curl_exec($c); + if(curl_errno($c)){ + $error = curl_error($c); + showForm($error, $content); + } + + curl_close($c); + if (!isset($error)) { + echo ''; + } + + } else { + $error = "Missing account name and/or password. Please try again."; + showForm($error, $content); + } + +} else { + showForm(null, $content); +} + +function showForm($error, $content) { + $username_cookie = $_COOKIE['username']; + $password_cookie = $_COOKIE['password']; + + echo << +

Friendica Bookmarklet

+ + +
+
+ Enter the email address of the Friendica Account that you want to cross-post to: (example: user@friendica.org)

+ Account ID:
+ Password:
+
+   $error +
+

+
+EOF; + +} +?> + + + diff --git a/view/theme/dispy-dark/fpostit/friendica-32.png b/view/theme/dispy-dark/fpostit/friendica-32.png new file mode 100644 index 0000000000000000000000000000000000000000..61764bf20a35fb21995b667e9a5e25436685a8a7 GIT binary patch literal 1593 zcmV-92FCe`P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L03itg03ithOzq;@000HdNkli(P8=f+Y^Mqc1WDr}2vQk{QV2|+A}XxHfQrbj zRH(85xk;}eX_zVqV1$KI$q_6^imXtyL@uc%ce#(b_xvgD%Ji=M&inl5|IcfT zk+rnW~cVMU8ZZk781Awt_EiW&B7^A=0&%>nLiE=zTF-F`Y z?jnYe_L%k%19FkaK*b=2KJJkieXtuAdLjSn+z01=1918BWloebmi#Ot+6 zd};o$s8PJixiZ(PPAQm8s^ZmeF?Cdnz=xsAO(@FBVaF<-N=#qcy`!ug#n_pR3xd8mK3UKSz ze-_?6Il*+Li$cWY2shJyLy_ci0i--vac-j3Y_i#FQ=jYM?zlvBSqVZ}McY#^X#4s< zPrZ8T)J*laOG{I$YhS_Wkj&ZH*u~ zg0LtdDzsyb^#^N5deLU8S3bR>qYE$d)9;;xa7ct;qgt!*(277b#xPPckcsy828~XO z&Tf|&97!b$DHg11?OtGGYg+=U?e;FW|9wMW-EKqoxLKS?X(0y*BOpOH1|D_`U<2JX z0>Y_Jik*j>GN#EOR>D9xAf0TBc#I-GEMjkO5htwFbpvR{@;Ctz7((s+?@NK{Z7L&Gx6%|Jz&slFc^QS+?n-4e$MGa9s z@)DT|VVGq|!YpH4>8tMZq1g3}E2WE5-+6=B`0s%%2t$Q@gDYkQ2pf7d9>A#28t&yA8iJ_tc2^D0F%dsYBRj$WQp zbG7>-v^y!}_aha|%vLyTO)2D=B?j!700?0+-hHjc-#=O4=)(Ji5XT~&teehX+0-9f zzp_KGypG1fd|Ch|LnaPSWxVrUz}F7;X%Y_mmXUV`Vf@T7AWIAk6QlA7vSdy+jQl46 zkUc&El5rLO=peuJ|E1028PG@xrObbgPZm8P?~eyilu?aTv6^6^`ec*hx_BnWmC&u29haG4LlI rGxj`Ruw!GZjr6p}i@z8)_TTs)qHGuE{mw-x00000NkvXXu0mjfEd=xj literal 0 HcmV?d00001 diff --git a/view/theme/dispy-dark/fpostit/friendika-32.png b/view/theme/dispy-dark/fpostit/friendika-32.png new file mode 100644 index 0000000000000000000000000000000000000000..61764bf20a35fb21995b667e9a5e25436685a8a7 GIT binary patch literal 1593 zcmV-92FCe`P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L03itg03ithOzq;@000HdNkli(P8=f+Y^Mqc1WDr}2vQk{QV2|+A}XxHfQrbj zRH(85xk;}eX_zVqV1$KI$q_6^imXtyL@uc%ce#(b_xvgD%Ji=M&inl5|IcfT zk+rnW~cVMU8ZZk781Awt_EiW&B7^A=0&%>nLiE=zTF-F`Y z?jnYe_L%k%19FkaK*b=2KJJkieXtuAdLjSn+z01=1918BWloebmi#Ot+6 zd};o$s8PJixiZ(PPAQm8s^ZmeF?Cdnz=xsAO(@FBVaF<-N=#qcy`!ug#n_pR3xd8mK3UKSz ze-_?6Il*+Li$cWY2shJyLy_ci0i--vac-j3Y_i#FQ=jYM?zlvBSqVZ}McY#^X#4s< zPrZ8T)J*laOG{I$YhS_Wkj&ZH*u~ zg0LtdDzsyb^#^N5deLU8S3bR>qYE$d)9;;xa7ct;qgt!*(277b#xPPckcsy828~XO z&Tf|&97!b$DHg11?OtGGYg+=U?e;FW|9wMW-EKqoxLKS?X(0y*BOpOH1|D_`U<2JX z0>Y_Jik*j>GN#EOR>D9xAf0TBc#I-GEMjkO5htwFbpvR{@;Ctz7((s+?@NK{Z7L&Gx6%|Jz&slFc^QS+?n-4e$MGa9s z@)DT|VVGq|!YpH4>8tMZq1g3}E2WE5-+6=B`0s%%2t$Q@gDYkQ2pf7d9>A#28t&yA8iJ_tc2^D0F%dsYBRj$WQp zbG7>-v^y!}_aha|%vLyTO)2D=B?j!700?0+-hHjc-#=O4=)(Ji5XT~&teehX+0-9f zzp_KGypG1fd|Ch|LnaPSWxVrUz}F7;X%Y_mmXUV`Vf@T7AWIAk6QlA7vSdy+jQl46 zkUc&El5rLO=peuJ|E1028PG@xrObbgPZm8P?~eyilu?aTv6^6^`ec*hx_BnWmC&u29haG4LlI rGxj`Ruw!GZjr6p}i@z8)_TTs)qHGuE{mw-x00000NkvXXu0mjfEd=xj literal 0 HcmV?d00001 diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index ba0270ac92..ba8cda3c61 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -60,6 +60,9 @@ option { padding: 3px; vertical-align: middle; } +li { + padding: 0 0 0 2px; +} /* remember to define focus styles! */ :focus { outline: 0; @@ -200,6 +203,10 @@ input[type=submit] { .action { margin: 5px 0; } +.tool { + margin: 5px 0; + list-style: none; +} /** @@ -688,12 +695,17 @@ aside #viewcontacts { padding:.2em .5em; } #netsearch-box { - margin: 30px 0px; + margin: 20px 0px 30px; + width: 150px; +} +#netsearch-box #search-submit { + margin: 5px 0px 0px 0px; } .ttright { margin: 0px 0px 0px 0px; } + /** * contacts block */ @@ -1819,10 +1831,12 @@ div[id$="wrapper"] br { * contacts selector */ .group-delete-wrapper { - margin: -31px 122px 0 0; + margin: -31px 50px 0 0; float: right; } - +/*.group-delete-icon { + margin: 0 0 0 10px; +}*/ #group-edit-submit-wrapper { margin: 0 0 10px 0; display: inline; @@ -1862,6 +1876,7 @@ div[id$="wrapper"] br { display: none; } + /** * profile */ @@ -2096,13 +2111,13 @@ div[id$="wrapper"] br { #group-sidebar { margin-bottom: 10px; } -.group-selected, .nets-selected { +.group-selected, .nets-selected, .fileas-selected { padding: 3px; color: #2e2f2e; background: #88a9d2; font-weight: bold; } -.group-selected:hover, .nets-selected:hover { +.group-selected:hover, .nets-selected:hover, .fileas-selected:hover { color: #2e2f2e; } .groupsideedit { @@ -2172,13 +2187,7 @@ div[id$="wrapper"] br { .nets-all { margin-left: 0px; } -#netsearch-box { - margin-top: 20px; - width: 150px; -} -#netsearch-box #search-submit { - margin: 5px 0px 0px 0px; -} + /** * ADMIN @@ -2794,6 +2803,29 @@ footer { .network-star.icon.starred { display: inline-block; } +#fileas-sidebar { + +} +.fileas-ul { + padding: 0; +} + + + +/* + * ADDONS THEMING + */ + +#sidebar-page-list { + +} +#sidebar-page-list ul { + padding: 0; + margin: 5px 0; +} +#sidebar-page-list li { + list-style: none; +} @media handheld { diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index ad7780013a..cded68c489 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -127,3 +127,30 @@ $(document).ready(function() { EOT; +function dispy_community_info() { + $a = get_app(); + + $fostitJS = "javascript: (function() { + the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' + + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? + document.getSelection() : document.selection.createRange().text)); + a_funct = function() { + if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) { + location.href = the_url; + } + if (/Firefox/.test(navigator.userAgent)) { + setTimeout(a_funct, 0) + } else { + a_funct(); + } + })();" ; + + $aside['$fostitJS'] = $fostitJS; + $url = $a->get_baseurl($ssl_state); + $aside['$url'] = $url; + + $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); + $a->page['right_aside'] = replace_macros($tpl, $aside); +} + diff --git a/view/theme/dispy-dark/wallwall_item.tpl b/view/theme/dispy-dark/wallwall_item.tpl index f251d7352b..b25d13409b 100644 --- a/view/theme/dispy-dark/wallwall_item.tpl +++ b/view/theme/dispy-dark/wallwall_item.tpl @@ -38,11 +38,14 @@ {{ if $item.vote.share }} - {{ endif }} {{ endif }} + {{ if $item.filer }} +
+ {{ endif }} {{ if $item.plink }}
{{ endif }} diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl new file mode 100644 index 0000000000..0659ebe206 --- /dev/null +++ b/view/theme/dispy/communityhome.tpl @@ -0,0 +1,4 @@ +{{ if $lastusers_title }} +

PostIt to Friendica

+
Post to Friendica from anywhere by bookmarking this Link.
+{{ endif }} diff --git a/view/theme/dispy/fpostit/README b/view/theme/dispy/fpostit/README new file mode 100644 index 0000000000..39b7c57613 --- /dev/null +++ b/view/theme/dispy/fpostit/README @@ -0,0 +1,8 @@ +fpostit + +original author: Devlon Duthied + +see his blog posting: +http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/ + +original published at github https://github.com/duthied/Friendika-Bookmarklet diff --git a/view/theme/dispy/fpostit/fpostit.js b/view/theme/dispy/fpostit/fpostit.js new file mode 100755 index 0000000000..d18f5d3451 --- /dev/null +++ b/view/theme/dispy/fpostit/fpostit.js @@ -0,0 +1,14 @@ +javascript: (function() { + the_url = 'view/theme/dispy/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? + document.getSelection() : document.selection.createRange().text)); + a_funct = function() { + if (!window.open(the_url, 'fpostit','location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) { + location.href = the_url + }; + if (/Firefox/.test(navigator.userAgent)) { + setTimeout(a_funct, 0) + } else { + a_funct(); + } + })();" diff --git a/view/theme/dispy/fpostit/fpostit.php b/view/theme/dispy/fpostit/fpostit.php new file mode 100644 index 0000000000..d00182946c --- /dev/null +++ b/view/theme/dispy/fpostit/fpostit.php @@ -0,0 +1,134 @@ + + + + + + + + $content); + + // echo "posting to: $url
"; + + $c = curl_init(); + curl_setopt($c, CURLOPT_URL, $url); + curl_setopt($c, CURLOPT_USERPWD, "$username:$password"); + curl_setopt($c, CURLOPT_POSTFIELDS, $data); + curl_setopt($c, CURLOPT_RETURNTRANSFER, true); + curl_setopt($c, CURLOPT_FOLLOWLOCATION, true); + $c_result = curl_exec($c); + if(curl_errno($c)){ + $error = curl_error($c); + showForm($error, $content); + } + + curl_close($c); + if (!isset($error)) { + echo ''; + } + + } else { + $error = "Missing account name and/or password. Please try again."; + showForm($error, $content); + } + +} else { + showForm(null, $content); +} + +function showForm($error, $content) { + $username_cookie = $_COOKIE['username']; + $password_cookie = $_COOKIE['password']; + + echo << +

Friendica Bookmarklet

+ + +
+
+ Enter the email address of the Friendica Account that you want to cross-post to: (example: user@friendica.org)

+ Account ID:
+ Password:
+
+   $error +
+

+
+EOF; + +} +?> + + + diff --git a/view/theme/dispy/fpostit/friendica-32.png b/view/theme/dispy/fpostit/friendica-32.png new file mode 100644 index 0000000000000000000000000000000000000000..61764bf20a35fb21995b667e9a5e25436685a8a7 GIT binary patch literal 1593 zcmV-92FCe`P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L03itg03ithOzq;@000HdNkli(P8=f+Y^Mqc1WDr}2vQk{QV2|+A}XxHfQrbj zRH(85xk;}eX_zVqV1$KI$q_6^imXtyL@uc%ce#(b_xvgD%Ji=M&inl5|IcfT zk+rnW~cVMU8ZZk781Awt_EiW&B7^A=0&%>nLiE=zTF-F`Y z?jnYe_L%k%19FkaK*b=2KJJkieXtuAdLjSn+z01=1918BWloebmi#Ot+6 zd};o$s8PJixiZ(PPAQm8s^ZmeF?Cdnz=xsAO(@FBVaF<-N=#qcy`!ug#n_pR3xd8mK3UKSz ze-_?6Il*+Li$cWY2shJyLy_ci0i--vac-j3Y_i#FQ=jYM?zlvBSqVZ}McY#^X#4s< zPrZ8T)J*laOG{I$YhS_Wkj&ZH*u~ zg0LtdDzsyb^#^N5deLU8S3bR>qYE$d)9;;xa7ct;qgt!*(277b#xPPckcsy828~XO z&Tf|&97!b$DHg11?OtGGYg+=U?e;FW|9wMW-EKqoxLKS?X(0y*BOpOH1|D_`U<2JX z0>Y_Jik*j>GN#EOR>D9xAf0TBc#I-GEMjkO5htwFbpvR{@;Ctz7((s+?@NK{Z7L&Gx6%|Jz&slFc^QS+?n-4e$MGa9s z@)DT|VVGq|!YpH4>8tMZq1g3}E2WE5-+6=B`0s%%2t$Q@gDYkQ2pf7d9>A#28t&yA8iJ_tc2^D0F%dsYBRj$WQp zbG7>-v^y!}_aha|%vLyTO)2D=B?j!700?0+-hHjc-#=O4=)(Ji5XT~&teehX+0-9f zzp_KGypG1fd|Ch|LnaPSWxVrUz}F7;X%Y_mmXUV`Vf@T7AWIAk6QlA7vSdy+jQl46 zkUc&El5rLO=peuJ|E1028PG@xrObbgPZm8P?~eyilu?aTv6^6^`ec*hx_BnWmC&u29haG4LlI rGxj`Ruw!GZjr6p}i@z8)_TTs)qHGuE{mw-x00000NkvXXu0mjfEd=xj literal 0 HcmV?d00001 diff --git a/view/theme/dispy/fpostit/friendika-32.png b/view/theme/dispy/fpostit/friendika-32.png new file mode 100644 index 0000000000000000000000000000000000000000..61764bf20a35fb21995b667e9a5e25436685a8a7 GIT binary patch literal 1593 zcmV-92FCe`P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L03itg03ithOzq;@000HdNkli(P8=f+Y^Mqc1WDr}2vQk{QV2|+A}XxHfQrbj zRH(85xk;}eX_zVqV1$KI$q_6^imXtyL@uc%ce#(b_xvgD%Ji=M&inl5|IcfT zk+rnW~cVMU8ZZk781Awt_EiW&B7^A=0&%>nLiE=zTF-F`Y z?jnYe_L%k%19FkaK*b=2KJJkieXtuAdLjSn+z01=1918BWloebmi#Ot+6 zd};o$s8PJixiZ(PPAQm8s^ZmeF?Cdnz=xsAO(@FBVaF<-N=#qcy`!ug#n_pR3xd8mK3UKSz ze-_?6Il*+Li$cWY2shJyLy_ci0i--vac-j3Y_i#FQ=jYM?zlvBSqVZ}McY#^X#4s< zPrZ8T)J*laOG{I$YhS_Wkj&ZH*u~ zg0LtdDzsyb^#^N5deLU8S3bR>qYE$d)9;;xa7ct;qgt!*(277b#xPPckcsy828~XO z&Tf|&97!b$DHg11?OtGGYg+=U?e;FW|9wMW-EKqoxLKS?X(0y*BOpOH1|D_`U<2JX z0>Y_Jik*j>GN#EOR>D9xAf0TBc#I-GEMjkO5htwFbpvR{@;Ctz7((s+?@NK{Z7L&Gx6%|Jz&slFc^QS+?n-4e$MGa9s z@)DT|VVGq|!YpH4>8tMZq1g3}E2WE5-+6=B`0s%%2t$Q@gDYkQ2pf7d9>A#28t&yA8iJ_tc2^D0F%dsYBRj$WQp zbG7>-v^y!}_aha|%vLyTO)2D=B?j!700?0+-hHjc-#=O4=)(Ji5XT~&teehX+0-9f zzp_KGypG1fd|Ch|LnaPSWxVrUz}F7;X%Y_mmXUV`Vf@T7AWIAk6QlA7vSdy+jQl46 zkUc&El5rLO=peuJ|E1028PG@xrObbgPZm8P?~eyilu?aTv6^6^`ec*hx_BnWmC&u29haG4LlI rGxj`Ruw!GZjr6p}i@z8)_TTs)qHGuE{mw-x00000NkvXXu0mjfEd=xj literal 0 HcmV?d00001 diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 9b480385d9..935ca507ec 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -2086,13 +2086,13 @@ div[id$="wrapper"] br { #group-sidebar { margin-bottom: 10px; } -.group-selected, .nets-selected { +.group-selected, .nets-selected, .fileas-selected { padding: 3px; color: #111; background: #f8f8f8; font-weight: bold; } -.group-selected:hover, .nets-selected:hover { +.group-selected:hover, .nets-selected:hover, .fileas-selected:hover { color: #111; } .groupsideedit { @@ -2784,6 +2784,29 @@ footer { .network-star.icon.starred { display: inline-block; } +#fileas-sidebar { + +} +.fileas-ul { + padding: 0; +} + + + +/* + * ADDONS THEMING + */ + +#sidebar-page-list { + +} +#sidebar-page-list ul { + padding: 0; + margin: 5px 0; +} +#sidebar-page-list li { + list-style: none; +} @media handheld { diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index e3f8f5b457..e898346ef5 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -6,6 +6,7 @@ * Version: 1.0 * Author: unknown * Maintainer: Simon + * Screenshot: Screenshot */ @@ -126,3 +127,30 @@ $(document).ready(function() { EOT; +function dispy_community_info() { + $a = get_app(); + + $fostitJS = "javascript: (function() { + the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' + + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? + document.getSelection() : document.selection.createRange().text)); + a_funct = function() { + if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) { + location.href = the_url; + } + if (/Firefox/.test(navigator.userAgent)) { + setTimeout(a_funct, 0) + } else { + a_funct(); + } + })();" ; + + $aside['$fostitJS'] = $fostitJS; + $url = $a->get_baseurl($ssl_state); + $aside['$url'] = $url; + + $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); + $a->page['right_aside'] = replace_macros($tpl, $aside); +} + diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl index f251d7352b..b25d13409b 100644 --- a/view/theme/dispy/wallwall_item.tpl +++ b/view/theme/dispy/wallwall_item.tpl @@ -38,11 +38,14 @@ {{ if $item.vote.share }} - {{ endif }} {{ endif }} + {{ if $item.filer }} +
+ {{ endif }} {{ if $item.plink }}
{{ endif }}