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
+
+
+
+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 0000000000..61764bf20a
Binary files /dev/null and b/view/theme/dispy-dark/fpostit/friendica-32.png differ
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 0000000000..61764bf20a
Binary files /dev/null and b/view/theme/dispy-dark/fpostit/friendika-32.png differ
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 7001361739..cded68c489 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
*/
@@ -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-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
+
+
+
+EOF;
+
+}
+?>
+
+
+
diff --git a/view/theme/dispy/fpostit/friendica-32.png b/view/theme/dispy/fpostit/friendica-32.png
new file mode 100644
index 0000000000..61764bf20a
Binary files /dev/null and b/view/theme/dispy/fpostit/friendica-32.png differ
diff --git a/view/theme/dispy/fpostit/friendika-32.png b/view/theme/dispy/fpostit/friendika-32.png
new file mode 100644
index 0000000000..61764bf20a
Binary files /dev/null and b/view/theme/dispy/fpostit/friendika-32.png differ
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 26e07b1f76..e898346ef5 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -3,9 +3,10 @@
/*
* Name: Dispy
* Description: Dispy, Friendica theme
- * Version: 0.9
+ * 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 }}