aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/dispy-dark
diff options
context:
space:
mode:
Diffstat (limited to 'view/theme/dispy-dark')
-rw-r--r--view/theme/dispy-dark/communityhome.tpl4
-rw-r--r--view/theme/dispy-dark/experimental0
-rw-r--r--view/theme/dispy-dark/fpostit/README8
-rwxr-xr-xview/theme/dispy-dark/fpostit/fpostit.js14
-rw-r--r--view/theme/dispy-dark/fpostit/fpostit.php134
-rw-r--r--view/theme/dispy-dark/fpostit/friendica-32.pngbin0 -> 1593 bytes
-rw-r--r--view/theme/dispy-dark/fpostit/friendika-32.pngbin0 -> 1593 bytes
-rw-r--r--view/theme/dispy-dark/icons.pngbin29024 -> 30271 bytes
-rw-r--r--view/theme/dispy-dark/icons.svg69
-rw-r--r--view/theme/dispy-dark/nav.tpl16
-rw-r--r--view/theme/dispy-dark/style.css163
-rw-r--r--view/theme/dispy-dark/theme.php30
-rw-r--r--view/theme/dispy-dark/wall_item.tpl9
-rw-r--r--view/theme/dispy-dark/wallwall_item.tpl5
14 files changed, 398 insertions, 54 deletions
diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl
new file mode 100644
index 000000000..0838fc757
--- /dev/null
+++ b/view/theme/dispy-dark/communityhome.tpl
@@ -0,0 +1,4 @@
+{{ if $page }}
+<h3>PostIt to Friendica</h3>
+<div style="padding-left: 8px;"><span >Post to Friendica from anywhere by bookmarking this <a href="$fostitJS" title="PostIt">Link</a>.</span></div>
+{{ endif }}
diff --git a/view/theme/dispy-dark/experimental b/view/theme/dispy-dark/experimental
deleted file mode 100644
index e69de29bb..000000000
--- a/view/theme/dispy-dark/experimental
+++ /dev/null
diff --git a/view/theme/dispy-dark/fpostit/README b/view/theme/dispy-dark/fpostit/README
new file mode 100644
index 000000000..39b7c5761
--- /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 000000000..eb593d838
--- /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 000000000..d00182946
--- /dev/null
+++ b/view/theme/dispy-dark/fpostit/fpostit.php
@@ -0,0 +1,134 @@
+<?php
+if (!isset($_POST["friendica_acct_name"])) $_POST["friendica_acct_name"] = '';
+if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
+if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
+if (!isset($hostname)) $hostname = '';
+if (!isset($username)) $username = '';
+
+
+if (($_POST["friendica_acct_name"] != '') && ($_POST["friendica_password"] != '')) {
+ setcookie("username", $_POST["friendica_acct_name"], time()+60*60*24*300);
+ setcookie("password", $_POST["friendica_password"], time()+60*60*24*300);
+}
+
+?>
+<html>
+<head>
+ <style>
+ body {
+ font-family: sans-serif;
+ margin: 0px;
+ }
+ .wrap1 {
+ padding: 2px 5px;
+ background-color: #000;
+ margin-bottom: 10px;
+ }
+ .wrap2 {
+ margin-left: 10px;
+ font-size: 12px;
+ }
+ .logo {
+ margin-left: 3px;
+ margin-right: 5px;
+ float: left;
+ }
+ h2 {
+ color: #ffffff;
+ }
+ .error {
+ background-color: #FFFF66;
+ font-size: 12px;
+ margin-left: 10px;
+ }
+ </style>
+</head>
+
+<body>
+<?php
+
+if (isset($_GET['title'])) {
+ $title = $_GET['title'];
+}
+if (isset($_GET['text'])) {
+ $text = $_GET['text'];
+}
+if (isset($_GET['url'])) {
+ $url = $_GET['url'];
+}
+
+if ((isset($title)) && (isset($text)) && (isset($url))) {
+ $content = "$title\nsource:$url\n\n$text";
+} else {
+ $content = $_POST['content'];
+}
+
+if (isset($_POST['submit'])) {
+
+ if (($_POST["friendica_acct_name"] != '') && ($_POST["friendica_password"] != '')) {
+ $acctname = $_POST["friendica_acct_name"];
+ $tmp_account_array = explode("@", $acctname);
+ if (isset($tmp_account_array[1])) {
+ $username = $tmp_account_array[0];
+ $hostname = $tmp_account_array[1];
+ }
+ $password = $_POST["friendica_password"];
+ $content = $_POST["content"];
+
+ $url = "http://" . $hostname . '/api/statuses/update';
+ $data = array('status' => $content);
+
+ // echo "posting to: $url<br/>";
+
+ $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 '<script language="javascript" type="text/javascript">window.close();</script>';
+ }
+
+ } 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 <<<EOF
+ <div class="wrap1">
+ <h2><img class="logo" src="friendica-32.png" align="middle" />Friendica Bookmarklet</h2>
+ </div>
+
+ <div class="wrap2">
+ <form method="post" action="{$_SERVER['PHP_SELF']}">
+ Enter the email address of the Friendica Account that you want to cross-post to: (example: user@friendica.org)<br /><br />
+ Account ID: <input type="text" name="friendica_acct_name" value="{$username_cookie}" size="50" /><br />
+ Password: <input type="password" name="friendica_password" value="{$password_cookie}" size="50" /><br />
+ <textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
+ <input type="submit" value="PostIt!" name="submit" />&#160;&#160;<span class="error">$error</span>
+ </form>
+ <p></p>
+ </div>
+EOF;
+
+}
+?>
+
+</body>
+</html>
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 000000000..61764bf20
--- /dev/null
+++ b/view/theme/dispy-dark/fpostit/friendica-32.png
Binary files 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 000000000..61764bf20
--- /dev/null
+++ b/view/theme/dispy-dark/fpostit/friendika-32.png
Binary files differ
diff --git a/view/theme/dispy-dark/icons.png b/view/theme/dispy-dark/icons.png
index 648811373..203568135 100644
--- a/view/theme/dispy-dark/icons.png
+++ b/view/theme/dispy-dark/icons.png
Binary files differ
diff --git a/view/theme/dispy-dark/icons.svg b/view/theme/dispy-dark/icons.svg
index 10f8cc667..2c4b3abd3 100644
--- a/view/theme/dispy-dark/icons.svg
+++ b/view/theme/dispy-dark/icons.svg
@@ -51,9 +51,9 @@
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="1.3859292"
- inkscape:cx="105.02551"
- inkscape:cy="107.90767"
+ inkscape:zoom="1.9403009"
+ inkscape:cx="95.950174"
+ inkscape:cy="115.58345"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
@@ -63,7 +63,7 @@
inkscape:window-width="1065"
inkscape:window-height="742"
inkscape:window-x="40"
- inkscape:window-y="61"
+ inkscape:window-y="50"
inkscape:window-maximized="0"
width="0px"
height="0px"
@@ -330,7 +330,7 @@
sodipodi:cy="33.612183"
sodipodi:rx="7.3214288"
sodipodi:ry="7.3214288"
- d="m 492.49999,33.612183 a 7.3214288,7.3214288 0 1 1 -14.64286,0 7.3214288,7.3214288 0 1 1 14.64286,0 z"
+ d="m 492.49999,33.612183 c 0,4.043513 -3.27792,7.321428 -7.32143,7.321428 -4.04352,0 -7.32143,-3.277915 -7.32143,-7.321428 0,-4.043514 3.27791,-7.321429 7.32143,-7.321429 4.04351,0 7.32143,3.277915 7.32143,7.321429 z"
transform="matrix(0.43114968,0,0,0.43114968,-201.51175,889.48158)" />
<rect
style="fill:#2e2f2e;fill-opacity:1;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
@@ -380,7 +380,7 @@
transform="matrix(0.43114968,0,0,0.43114968,-179.41936,889.63556)" />
<path
transform="matrix(0.43114968,0,0,0.43114968,-179.51175,889.48158)"
- d="m 492.49999,33.612183 a 7.3214288,7.3214288 0 1 1 -14.64286,0 7.3214288,7.3214288 0 1 1 14.64286,0 z"
+ d="m 492.49999,33.612183 c 0,4.043513 -3.27792,7.321428 -7.32143,7.321428 -4.04352,0 -7.32143,-3.277915 -7.32143,-7.321428 0,-4.043514 3.27791,-7.321429 7.32143,-7.321429 4.04351,0 7.32143,3.277915 7.32143,7.321429 z"
sodipodi:ry="7.3214288"
sodipodi:rx="7.3214288"
sodipodi:cy="33.612183"
@@ -450,7 +450,7 @@
id="path4110" />
<path
transform="matrix(1.2829201,1.9081591,-1.9081591,1.2829201,-436.65386,-211.76762)"
- d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+ d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
sodipodi:ry="0.88388348"
sodipodi:rx="0.88388348"
sodipodi:cy="21.754047"
@@ -466,11 +466,11 @@
sodipodi:cy="21.754047"
sodipodi:rx="0.88388348"
sodipodi:ry="0.88388348"
- d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+ d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
transform="matrix(0.96219008,1.4311194,-1.4311194,0.96219008,-261.29289,65.614849)" />
<path
transform="matrix(1.0080086,1.4992679,-1.4992679,1.0080086,-291.03317,15.446827)"
- d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+ d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
sodipodi:ry="0.88388348"
sodipodi:rx="0.88388348"
sodipodi:cy="21.754047"
@@ -492,7 +492,7 @@
sodipodi:cy="21.754047"
sodipodi:rx="0.88388348"
sodipodi:ry="0.88388348"
- d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+ d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
transform="matrix(1.0996458,1.635565,-1.635565,1.0996458,-346.37171,-55.312424)" />
<path
inkscape:connector-curvature="0"
@@ -510,7 +510,7 @@
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<rect
- style="fill:#999999;stroke:#ececec;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+ style="fill:#666666;stroke:#ececec;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
id="rect4387-8"
width="14.5"
height="9"
@@ -523,7 +523,7 @@
inkscape:export-ydpi="90" />
<path
sodipodi:type="arc"
- style="fill:#333333;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+ style="fill:#1a1a1a;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
id="path4391-3"
sodipodi:cx="408.8125"
sodipodi:cy="220.26843"
@@ -1006,7 +1006,7 @@
ry="0.42804927"
transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,294.0656)" />
<rect
- style="fill:#333333;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ style="fill:#1a1a1a;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
id="rect4290"
width="3.5355339"
height="1.8561553"
@@ -1047,7 +1047,7 @@
sodipodi:cy="220.62782"
sodipodi:rx="7.4246211"
sodipodi:ry="7.4246211"
- d="m 292.21188,220.62782 a 7.4246211,7.4246211 0 1 1 -14.84924,0 7.4246211,7.4246211 0 1 1 14.84924,0 z"
+ d="m 292.21188,220.62782 c 0,4.10051 -3.32411,7.42462 -7.42462,7.42462 -4.1005,0 -7.42462,-3.32411 -7.42462,-7.42462 0,-4.1005 3.32412,-7.42462 7.42462,-7.42462 4.10051,0 7.42462,3.32412 7.42462,7.42462 z"
transform="translate(-204.73743,661.76269)" />
<path
inkscape:export-ydpi="90"
@@ -1559,7 +1559,7 @@
sodipodi:cy="143.46553"
sodipodi:rx="5.5219707"
sodipodi:ry="5.2590199"
- d="m 51.275442,143.46553 a 5.5219707,5.2590199 0 0 1 11.043942,0 l -5.521971,0 z"
+ d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
transform="matrix(1.2380952,0,0,1.675,-15.523193,759.33575)"
sodipodi:start="3.1415927"
sodipodi:end="6.2831853" />
@@ -1567,7 +1567,7 @@
sodipodi:end="6.2831853"
sodipodi:start="3.1415927"
transform="matrix(0.4523809,0,0,0.775,29.234821,888.45473)"
- d="m 51.275442,143.46553 a 5.5219707,5.2590199 0 0 1 11.043942,0 l -5.521971,0 z"
+ d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
sodipodi:ry="5.2590199"
sodipodi:rx="5.5219707"
sodipodi:cy="143.46553"
@@ -1579,7 +1579,7 @@
sodipodi:end="6.2831853"
sodipodi:start="3.1415927"
transform="matrix(1.2380952,0,0,1.675,6.476807,759.33575)"
- d="m 51.275442,143.46553 a 5.5219707,5.2590199 0 0 1 11.043942,0 l -5.521971,0 z"
+ d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
sodipodi:ry="5.2590199"
sodipodi:rx="5.5219707"
sodipodi:cy="143.46553"
@@ -1595,7 +1595,7 @@
sodipodi:cy="143.46553"
sodipodi:rx="5.5219707"
sodipodi:ry="5.2590199"
- d="m 51.275442,143.46553 a 5.5219707,5.2590199 0 0 1 11.043942,0 l -5.521971,0 z"
+ d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
transform="matrix(0.4523809,0,0,0.775,51.234821,888.45473)"
sodipodi:start="3.1415927"
sodipodi:end="6.2831853" />
@@ -1655,7 +1655,7 @@
sodipodi:cy="194.45924"
sodipodi:rx="2.0660436"
sodipodi:ry="1.5964882"
- d="m 7.3250635,194.45924 a 2.0660436,1.5964882 0 1 1 -4.1320873,0 2.0660436,1.5964882 0 1 1 4.1320873,0 z"
+ d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
transform="matrix(0.93050058,0,0,0.90640134,0.75846434,870.02825)" />
<use
x="0"
@@ -1675,7 +1675,7 @@
height="200" />
<path
transform="matrix(0.93050058,0,0,0.90640134,6.0478791,864.58985)"
- d="m 7.3250635,194.45924 a 2.0660436,1.5964882 0 1 1 -4.1320873,0 2.0660436,1.5964882 0 1 1 4.1320873,0 z"
+ d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
sodipodi:ry="1.5964882"
sodipodi:rx="2.0660436"
sodipodi:cy="194.45924"
@@ -1727,7 +1727,7 @@
sodipodi:nodetypes="cc" />
<path
transform="matrix(0.93050058,0,0,0.90640134,22.758464,870.02825)"
- d="m 7.3250635,194.45924 a 2.0660436,1.5964882 0 1 1 -4.1320873,0 2.0660436,1.5964882 0 1 1 4.1320873,0 z"
+ d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
sodipodi:ry="1.5964882"
sodipodi:rx="2.0660436"
sodipodi:cy="194.45924"
@@ -1761,7 +1761,7 @@
sodipodi:cy="194.45924"
sodipodi:rx="2.0660436"
sodipodi:ry="1.5964882"
- d="m 7.3250635,194.45924 a 2.0660436,1.5964882 0 1 1 -4.1320873,0 2.0660436,1.5964882 0 1 1 4.1320873,0 z"
+ d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
transform="matrix(0.93050058,0,0,0.90640134,28.047879,864.58985)" />
<path
transform="matrix(0.93050058,0,0,0.90640134,22.758464,870.02825)"
@@ -1992,11 +1992,11 @@
sodipodi:cy="21.754047"
sodipodi:rx="0.88388348"
sodipodi:ry="0.88388348"
- d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+ d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
transform="matrix(1.2829201,1.9081591,-1.9081591,1.2829201,-621.38007,-53.76762)" />
<path
transform="matrix(0.96219008,1.4311194,-1.4311194,0.96219008,-446.0191,223.61485)"
- d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+ d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
sodipodi:ry="0.88388348"
sodipodi:rx="0.88388348"
sodipodi:cy="21.754047"
@@ -2012,7 +2012,7 @@
sodipodi:cy="21.754047"
sodipodi:rx="0.88388348"
sodipodi:ry="0.88388348"
- d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+ d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
transform="matrix(1.0080086,1.4992679,-1.4992679,1.0080086,-475.75938,173.44683)" />
<path
style="fill:none;stroke:#e6e6e6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -2022,7 +2022,7 @@
transform="matrix(0.45818575,0.68148541,-0.68148541,0.45818575,-187.51596,643.71067)" />
<path
transform="matrix(1.0996458,1.635565,-1.635565,1.0996458,-531.09792,102.68758)"
- d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+ d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
sodipodi:ry="0.88388348"
sodipodi:rx="0.88388348"
sodipodi:cy="21.754047"
@@ -2092,5 +2092,22 @@
inkscape:connector-curvature="0"
transform="matrix(0.45818575,0.68148541,-0.68148541,0.45818575,-132.78975,635.71067)" />
</g>
+ <g
+ id="g4823">
+ <path
+ style="fill:#e6e6e6"
+ d="m 12,16 -12.00914477,0 0,-13.6988082 2.83893857,-2.12898488 11.8211932,0 0,14.04031008 z"
+ id="path4821"
+ inkscape:connector-curvature="0"
+ transform="translate(232.52235,913.88168)"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ sodipodi:nodetypes="cccccccccccccszscc"
+ transform="translate(232.52235,913.88168)"
+ inkscape:connector-curvature="0"
+ id="path4819"
+ d="m -0.00914477,2.3011918 2.83893857,-2.12898488 11.8211932,0 0,14.04031008 L 13.73679,14.984131 13.640962,1.0093271 3.4856425,0.91349949 1.1272469,2.7572384 12,2.7572384 12,16 -0.00914477,16 z M 8.2958276,12.045759 c -1.8631354,-1.086398 0.045759,-2.6807932 0.045759,-3.6707932 0,-0.99 -0.6423808,-2.2112618 -2.2457592,-2.1833105 C 4.4924492,6.2196066 3.8500685,7.0875 3.8500685,8.4166667 c 0,1.3291666 2.1768916,1.6857063 -0.1958961,3.6876733 z"
+ style="fill:#1a1a1a" />
+ </g>
</g>
</svg>
diff --git a/view/theme/dispy-dark/nav.tpl b/view/theme/dispy-dark/nav.tpl
index 11469dc66..589d68352 100644
--- a/view/theme/dispy-dark/nav.tpl
+++ b/view/theme/dispy-dark/nav.tpl
@@ -5,7 +5,7 @@
<!-- yes, they're going the other way. seems that's how the template renderer
works -->
- <div id="nav-floater">
+<div id="nav-floater">
<div id="nav-buttons">
{{ if $nav.help }}
<a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a>
@@ -33,17 +33,23 @@ works -->
{{ endif }}
{{ if $nav.network }}
<a id="nav-network-link" class="nav-link $nav.network.2"
- href="$nav.network.0" title="$nav.network.1">$nav.network.1</a>
+ href="$nav.network.0" title="$nav.network.1">$nav.network.1</a>
{{ endif }}
{{ if $nav.home }}
<a id="nav-home-link" class="nav-link $nav.home.2"
- href="$nav.home.0" title="$nav.home.1">$nav.home.1</a>
+ href="$nav.home.0" title="$nav.home.1">$nav.home.1</a>
{{ endif }}
{{ if $nav.login }}
<a id="nav-login-link" class="nav-login-link $nav.login.2"
- href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
+ href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
{{ endif }}
- </div>
+ </div>
+
+ <div class="search-box">
+ <form method="get" action="$nav.search.0">
+ <input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
+ </form>
+ </div>
<div id="user-menu">
<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index eaaa0acbd..5dba6b94c 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;
@@ -153,9 +156,9 @@ a:hover {
color: #729fcf;
}
input[type=submit] {
- font-weight: bold;
background-color: #eee;
color: #2e302e;
+ font-weight: bold;
margin-top: 10px;
height: 22px;
-webkit-border-radius: 5px;
@@ -200,6 +203,10 @@ input[type=submit] {
.action {
margin: 5px 0;
}
+.tool {
+ margin: 5px 0;
+ list-style: none;
+}
/**
@@ -214,7 +221,7 @@ input[type=submit] {
* nav
*/
nav {
- height: 60px;
+ height: 80px;
display: block;
background-color: #1d1f1d;
color: #eeeeec;
@@ -483,6 +490,20 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
margin: 0px;
background: transparent url(icons.png) -190px -60px no-repeat;
}
+.search-box {
+ display: inline-block;
+ height: 40px;
+ margin: 12px 0 0 -3px;
+ position: relative;
+ right: -12px;
+ top: 17px;
+ width: 0;
+}
+#search-text {
+ border: 1px #eec solid;
+ background: #2e2f2e;
+ color: #eec;
+}
.nav-ajax-update, .nav-ajax-left {
width: 30px;
height: 19px;
@@ -688,12 +709,17 @@ aside #viewcontacts {
padding:.2em .5em;
}
#netsearch-box {
- margin: 30px 0px;
+ margin: 20px 0px 30px;
+ width: 150px;
+}
+#netsearch-box #search-submit {
+ margin: 5px 5px 0px 0px;
}
.ttright {
margin: 0px 0px 0px 0px;
}
+
/**
* contacts block
*/
@@ -947,7 +973,7 @@ aside #viewcontacts {
background-color: #3e3f3e;
color: #eec;
border: 1px #eec solid;
- border-radius: 3px;
+ border-radius: 5px;
padding: 3px 3px 6px 10px;
}
#jot-preview-content .wall-item-outside-wrapper {
@@ -1020,6 +1046,9 @@ section {
.shiny {
background: #2e3436;
}
+.wall-outside-wrapper .shiny {
+ border-radius: 5px;
+}
.heart {
color: red;
}
@@ -1819,10 +1848,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 +1893,7 @@ div[id$="wrapper"] br {
display: none;
}
+
/**
* profile
*/
@@ -1872,6 +1904,71 @@ div[id$="wrapper"] br {
clear:both;
}
+
+/**
+ * intros
+ */
+.intro-wrapper {
+ margin-top: 20px;
+}
+
+.intro-fullname {
+ font-size: 1.1em;
+ font-weight: bold;
+
+}
+.intro-desc {
+ margin-bottom: 20px;
+ font-weight: bold;
+}
+
+.intro-note {
+ padding: 10px;
+}
+
+.intro-end {
+ padding: 30px;
+}
+
+.intro-form {
+ float: left;
+}
+.intro-approve-form {
+ clear: both;
+}
+.intro-approve-as-friend-end {
+ clear: both;
+}
+.intro-submit-approve, .intro-submit-ignore {
+ margin-right: 20px;
+}
+.intro-submit-approve {
+ margin-top: 15px;
+}
+
+.intro-approve-as-friend-label, .intro-approve-as-fan-label {
+ float: left;
+}
+.intro-approve-as-friend, .intro-approve-as-fan {
+ float: left;
+}
+.intro-form-end {
+ clear: both;
+ margin-bottom: 10px;
+}
+.intro-approve-as-friend-desc {
+ margin-top: 10px;
+}
+.intro-approve-as-end {
+ clear: both;
+ margin-bottom: 10px;
+}
+
+.intro-end {
+ clear: both;
+}
+
+
/**
* events
**/
@@ -1968,6 +2065,16 @@ div[id$="wrapper"] br {
opacity: 1.0 !important;
filter:alpha(opacity=100) !important;
}
+.filesavetags {
+ margin: 20px 0;
+ opacity: 0.5;
+ filter:alpha(opacity=50);
+}
+.filesavetags:hover {
+ margin: 20px 0;
+ opacity: 1.0 !important;
+ filter:alpha(opacity=100) !important;
+}
.item-select {
opacity: 0.1;
filter:alpha(opacity=10);
@@ -2021,13 +2128,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 {
@@ -2097,13 +2204,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
@@ -2419,6 +2520,9 @@ div[id$="wrapper"] br {
.dislike {
background-position: -190px 0;
}
+.file-as {
+ background-position: -230px -60px;
+}
.like {
background-position: -211px 0;
}
@@ -2505,9 +2609,9 @@ div[id$="wrapper"] br {
}
.border, .border:hover {
border: 1px solid #babdb6;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
}
.attachtype {
display: block;
@@ -2716,6 +2820,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 700136173..4c938997b 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 <http://simon.kisikew.org/>
* Maintainer: Simon <http://simon.kisikew.org/>
+ * Screenshot: <a href="screenshot.png">screenshot</a>
*/
@@ -126,3 +127,30 @@ $(document).ready(function() {
</script>
EOT;
+function dispydark_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['aside'] = replace_macros($tpl, $aside);
+}
+
diff --git a/view/theme/dispy-dark/wall_item.tpl b/view/theme/dispy-dark/wall_item.tpl
index c67a88635..c9ac20c89 100644
--- a/view/theme/dispy-dark/wall_item.tpl
+++ b/view/theme/dispy-dark/wall_item.tpl
@@ -4,9 +4,7 @@
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id"
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
- <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
- <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
- </a>
+ <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"><img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
<ul>
@@ -37,6 +35,11 @@
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div>
{{ endif }}
+
+ {{ if $item.filer }}
+ <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
+ {{ endif }}
+
{{ if $item.plink }}
<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
{{ endif }}
diff --git a/view/theme/dispy-dark/wallwall_item.tpl b/view/theme/dispy-dark/wallwall_item.tpl
index f251d7352..b25d13409 100644
--- a/view/theme/dispy-dark/wallwall_item.tpl
+++ b/view/theme/dispy-dark/wallwall_item.tpl
@@ -38,11 +38,14 @@
<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
{{ if $item.vote.share }}
- <a href="#" id="share-$item.id"
+ <a href="#" id="share-$item.id"
class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div>
{{ endif }}
+ {{ if $item.filer }}
+ <div class="wall-item-filer-wrapper"><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></div>
+ {{ endif }}
{{ if $item.plink }}
<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
{{ endif }}