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/comment_item.tpl13
-rw-r--r--view/theme/dispy-dark/communityhome.tpl46
-rw-r--r--view/theme/dispy-dark/default.php20
-rw-r--r--view/theme/dispy-dark/experimental0
-rw-r--r--view/theme/dispy-dark/fpostit/README8
-rw-r--r--view/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/head.tpl24
-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/jot-header.tpl41
-rw-r--r--view/theme/dispy-dark/jot.tpl2
-rw-r--r--view/theme/dispy-dark/nav.tpl18
-rw-r--r--view/theme/dispy-dark/nets.tpl2
-rw-r--r--view/theme/dispy-dark/profile_vcard.tpl4
-rw-r--r--view/theme/dispy-dark/saved_searches_aside.tpl6
-rw-r--r--view/theme/dispy-dark/screenshot.jpgbin0 -> 39101 bytes
-rw-r--r--view/theme/dispy-dark/search_item.tpl43
-rw-r--r--view/theme/dispy-dark/style.css358
-rw-r--r--view/theme/dispy-dark/theme.php60
-rw-r--r--view/theme/dispy-dark/wall_item.tpl71
-rw-r--r--view/theme/dispy-dark/wallwall_item.tpl51
24 files changed, 744 insertions, 240 deletions
diff --git a/view/theme/dispy-dark/comment_item.tpl b/view/theme/dispy-dark/comment_item.tpl
index 85176732b..adf2772af 100644
--- a/view/theme/dispy-dark/comment_item.tpl
+++ b/view/theme/dispy-dark/comment_item.tpl
@@ -12,14 +12,15 @@
</div>
<div class="comment-edit-photo-end"></div>
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
-
{{ if $qcomment }}
- <ul class="qcomment-wrapper">
- {{ for $qcomment as $qc }}
- <li class="fakelink qcomment"
- onclick="commentInsert(this,$id); return false;">$qc</li>
+ <div class="qcomment-wrapper">
+ <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);">
+ <option value=""></option>
+ {{ for $qcomment as $qc }}
+ <option value="$qc">$qc</option>
{{ endfor }}
- </ul>
+ </select>
+ </div>
{{ endif }}
<div class="comment-edit-text-end"></div>
diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl
new file mode 100644
index 000000000..340b7216c
--- /dev/null
+++ b/view/theme/dispy-dark/communityhome.tpl
@@ -0,0 +1,46 @@
+{{ if $page }}
+<div>$page</div>
+{{ endif }}
+
+{{ if $lastusers_title }}
+<h3 id="extra-help-header">Help or '@NewHere'?</h3>
+<div id="extra-help">
+<a href="https://helpers.pyxis.uberspace.de/profile/helpers"
+ title="Friendica Support" target="_blank">Friendica Support</a><br />
+<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk"
+ title="Let's talk" target="_blank">Let's talk</a><br />
+<a href="http://newzot.hydra.uberspace.de/profile/newzot"
+ title="Local Friendica" target="_blank">Local Friendica</a><br />
+<a href="http://kakste.com/profile/newhere" title="@NewHere" target="_blank">NewHere</a>
+</div>
+{{ endif }}
+
+{{ if $lastusers_title }}
+<h3 id="connect-services-header">Connectable Services</h3>
+<div id="connect-services">
+<a href="$url/facebook"><img alt="Facebook"
+ src="view/theme/dispy/icons/facebook.png" title="Facebook" /></a>
+<a href="$url/settings/connectors"><img
+ alt="StatusNet" src="view/theme/dispy/icons/StatusNet.png?" title="StatusNet" /></a>
+<a href="$url/settings/connectors"><img
+ alt="LiveJournal" src="view/theme/dispy/icons/livejournal.png?" title="LiveJournal" /></a>
+<a href="$url/settings/connectors"><img
+ alt="Posterous" src="view/theme/dispy/icons/posterous.png?" title="Posterous" /></a><br />
+<a href="$url/settings/connectors"><img
+ alt="Tumblr" src="view/theme/dispy/icons/tumblr.png?" title="Tumblr" /></a>
+<a href="$url/settings/connectors"><img
+ alt="Twitter" src="view/theme/dispy/icons/twitter.png?" title="Twitter" /></a>
+<a href="$url/settings/connectors"><img
+ alt="WordPress" src="view/theme/dispy/icons/wordpress.png?" title="WordPress" /></a>
+<a href="$url/settings/connectors"><img
+ alt="E-Mail" src="view/theme/dispy/icons/email.png?" title="E-Mail" /></a>
+</div>
+{{ endif }}
+
+{{ if $lastusers_title }}
+<h3 id="postit-header">PostIt to Friendica</h3>
+<div id="postit">
+<a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
+</div>
+{{ endif }}
+
diff --git a/view/theme/dispy-dark/default.php b/view/theme/dispy-dark/default.php
new file mode 100644
index 000000000..e74ec1a4f
--- /dev/null
+++ b/view/theme/dispy-dark/default.php
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+ <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+ <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
+</head>
+<body>
+ <?php if(x($page,'nav')) echo $page['nav']; ?>
+ <aside>
+ <?php if(x($page,'aside')) echo $page['aside']; ?>
+ <?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?>
+ </aside>
+ <section><?php if(x($page,'content')) echo $page['content']; ?>
+ <div id="page-footer"></div>
+ </section>
+ <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
+</body>
+</html>
+
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 100644
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/head.tpl b/view/theme/dispy-dark/head.tpl
index f606f2f7e..cd6f5ca97 100644
--- a/view/theme/dispy-dark/head.tpl
+++ b/view/theme/dispy-dark/head.tpl
@@ -7,7 +7,7 @@
<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
+<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
<link rel="search"
href="$baseurl/opensearch"
type="application/opensearchdescription+xml"
@@ -34,14 +34,16 @@
function commentOpen(obj,id) {
if(obj.value == '$comment') {
obj.value = '';
- obj.className = "comment-edit-text-full";
+ $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+ $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
}
}
function commentClose(obj,id) {
if(obj.value == '') {
obj.value = '$comment';
- obj.className="comment-edit-text-empty";
+ $("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
+ $("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
closeMenu("comment-edit-submit-wrapper-" + id);
}
}
@@ -63,6 +65,22 @@
$("#comment-edit-text-" + id).val(tmpStr + ins);
}
+ function qCommentInsert(obj,id) {
+ var tmpStr = $("#comment-edit-text-" + id).val();
+ if(tmpStr == '$comment') {
+ tmpStr = '';
+ $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+ $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+ openMenu("comment-edit-submit-wrapper-" + id);
+ }
+ var ins = $(obj).val();
+ ins = ins.replace('&lt;','<');
+ ins = ins.replace('&gt;','>');
+ ins = ins.replace('&amp;','&');
+ ins = ins.replace('&quot;','"');
+ $("#comment-edit-text-" + id).val(tmpStr + ins);
+ }
+
function showHideComments(id) {
if( $('#collapsed-comments-' + id).is(':visible')) {
$('#collapsed-comments-' + id).hide();
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/jot-header.tpl b/view/theme/dispy-dark/jot-header.tpl
index 4c8f59d79..5838729cc 100644
--- a/view/theme/dispy-dark/jot-header.tpl
+++ b/view/theme/dispy-dark/jot-header.tpl
@@ -9,6 +9,7 @@ function initEditor(cb) {
if(plaintext == 'none') {
$("#profile-jot-text-loading").hide();
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+ $("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
editor = true;
$("a#jot-perms-icon").fancybox({
'transitionIn' : 'elastic',
@@ -30,6 +31,7 @@ function initEditor(cb) {
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "center",
theme_advanced_blockformats : "blockquote,code",
+ gecko_spellcheck : true,
paste_text_sticky : true,
entity_encoding : "raw",
add_unload_trigger : false,
@@ -264,15 +266,36 @@ function enableOnUser(){
}
function itemFiler(id) {
- reply = prompt("$fileas");
- if(reply && reply.length) {
- commentBusy = true;
- $('body').css('cursor', 'wait');
- $.get('filer/' + id + '?term=' + reply);
- if(timer) clearTimeout(timer);
- timer = setTimeout(NavUpdate,3000);
- liking = 1;
- }
+
+ var bordercolor = $("input").css("border-color");
+
+ $.get('filer/', function(data){
+ $.fancybox(data);
+ $("#id_term").keypress(function(){
+ $(this).css("border-color",bordercolor);
+ })
+ $("#select_term").change(function(){
+ $("#id_term").css("border-color",bordercolor);
+ })
+
+ $("#filer_save").click(function(e){
+ e.preventDefault();
+ reply = $("#id_term").val();
+ if(reply && reply.length) {
+ commentBusy = true;
+ $('body').css('cursor', 'wait');
+ $.get('filer/' + id + '?term=' + reply);
+ if(timer) clearTimeout(timer);
+ timer = setTimeout(NavUpdate,3000);
+ liking = 1;
+ $.fancybox.close();
+ } else {
+ $("#id_term").css("border-color","#FF0000");
+ }
+ return false;
+ });
+ });
+
}
function jotClearLocation() {
diff --git a/view/theme/dispy-dark/jot.tpl b/view/theme/dispy-dark/jot.tpl
index 94c31da23..688ac1451 100644
--- a/view/theme/dispy-dark/jot.tpl
+++ b/view/theme/dispy-dark/jot.tpl
@@ -11,7 +11,7 @@
<input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="post_id" value="$post_id" />
<input type="hidden" name="preview" id="jot-preview" value="0" />
-
+ <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }}
</textarea>
diff --git a/view/theme/dispy-dark/nav.tpl b/view/theme/dispy-dark/nav.tpl
index 11469dc66..e38b2bbe2 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,19 +33,19 @@ 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 id="user-menu">
+ <div id="user-menu">
<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
<ul id="user-menu-popup"
onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
@@ -119,6 +119,12 @@ works -->
$langselector
</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>
+
<ul id="nav-notifications-template" style="display:none;" rel="template">
<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
</ul>
diff --git a/view/theme/dispy-dark/nets.tpl b/view/theme/dispy-dark/nets.tpl
index b322717ad..b0cb8890c 100644
--- a/view/theme/dispy-dark/nets.tpl
+++ b/view/theme/dispy-dark/nets.tpl
@@ -4,7 +4,7 @@
<a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
<ul class="nets-ul">
{{ for $nets as $net }}
- <li><a href="$base?f=&nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+ <li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
{{ endfor }}
</ul>
</div>
diff --git a/view/theme/dispy-dark/profile_vcard.tpl b/view/theme/dispy-dark/profile_vcard.tpl
index 350a6ce4a..f14ea7915 100644
--- a/view/theme/dispy-dark/profile_vcard.tpl
+++ b/view/theme/dispy-dark/profile_vcard.tpl
@@ -10,9 +10,8 @@
<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
</li>
{{ endfor }}
- <li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
+ <li><a href="profile_photo">$profile.menu.chg_photo</a></li>
<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-
</ul>
</div>
{{ endif }}
@@ -81,4 +80,3 @@
$contact_block
-
diff --git a/view/theme/dispy-dark/saved_searches_aside.tpl b/view/theme/dispy-dark/saved_searches_aside.tpl
index 63a85dda5..fb822fe5d 100644
--- a/view/theme/dispy-dark/saved_searches_aside.tpl
+++ b/view/theme/dispy-dark/saved_searches_aside.tpl
@@ -1,12 +1,12 @@
-<div id="saved-search-list" class="widget">
+<div class="widget" id="saved-search-list">
<h3 id="search">$title</h3>
$searchbox
<ul id="saved-search-ul">
{{ for $saved as $search }}
<li class="saved-search-li clear">
- <a onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
- <a class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
+ <a title="$search.delete" onclick="return confirmDelete();" onmouseout="imgdull(this);" onmouseover="imgbright(this);" id="drop-saved-search-term-$search.id" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
+ <a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
</li>
{{ endfor }}
</ul>
diff --git a/view/theme/dispy-dark/screenshot.jpg b/view/theme/dispy-dark/screenshot.jpg
new file mode 100644
index 000000000..ada60ca61
--- /dev/null
+++ b/view/theme/dispy-dark/screenshot.jpg
Binary files differ
diff --git a/view/theme/dispy-dark/search_item.tpl b/view/theme/dispy-dark/search_item.tpl
index 54c3e389c..bfad1b7b7 100644
--- a/view/theme/dispy-dark/search_item.tpl
+++ b/view/theme/dispy-dark/search_item.tpl
@@ -1,10 +1,10 @@
-<div class="wall-item-outside-wrapper$item.indent" id="wall-item-outside-wrapper-$item.id" >
+<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info" id="wall-item-info-$item.id">
<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">
+ <a href="$item.profile_url" target="redir" 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">
@@ -14,11 +14,21 @@
</div>
</div>
<div class="wall-item-photo-end"></div>
- <div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
+ <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
+ {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+ {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+ <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
+ </div>
</div>
- <div class="wall-item-lock-wrapper">
- {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
- {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+ <div class="wall-item-author">
+ <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
+ <div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div>
+
+ </div>
+ <div class="wall-item-content" id="wall-item-content-$item.id" >
+ <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
+ <div class="wall-item-title-end"></div>
+ <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$item.id">
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
@@ -27,25 +37,18 @@
{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
<div class="wall-item-delete-end"></div>
</div>
- <div class="wall-item-content" id="wall-item-content-$item.id" >
- <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
- <div class="wall-item-title-end"></div>
- <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
- </div>
- <div class="wall-item-author">
- <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
- <div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div>
-
- </div>
-
</div>
<div class="wall-item-wrapper-end"></div>
-</div>
-<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+
<div class="wall-item-conv" id="wall-item-conv-$item.id" >
{{ if $item.conv }}
- <a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
+ <a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
{{ endif }}
</div>
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+
+</div>
+
+
diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 9883b2fd7..30d5cb8a9 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -48,17 +48,23 @@ body {
body, button, input, select, textarea {
font-family: sans-serif;
color: #eec;
- /*background-color: #2e3436;*/
- background-color: #2e2f2e;
+ background-color: #2e2f2e;
}
select {
border: 1px #555 dotted;
padding: 3px;
margin: 2px;
+ color: #eec;
+ background: #2e2f2e;
}
option {
padding: 3px;
vertical-align: middle;
+ color: #eec;
+ background: #2e2f2e;
+}
+li {
+ padding: 0 0 0 2px;
}
/* remember to define focus styles! */
:focus {
@@ -200,14 +206,61 @@ input[type=submit] {
.action {
margin: 5px 0;
}
+.tool {
+ margin: 5px 0;
+ list-style: none;
+}
/**
* login
*/
+aside .field {
+ overflow: hidden;
+ width: 200px;
+}
+#login-extra-links {
+ overflow: auto !important;
+ padding-top: 60px !important;
+ width: 100% !important;
+}
#login-extra-links a {
margin-right: 20px;
}
+#login_standard {
+ display: block !important;
+ float: none !important;
+ height: 100% !important;
+ position: relative !important;
+ width: 100% !important;
+}
+#login_standard .field label {
+ width: 200px !important;
+}
+#login_standard input, #login_standard input[type="text"] {
+ margin: 0 0 8px !important;
+ width: 210px !important;
+}
+#login-submit-wrapper {
+ margin: 0 !important;
+}
+#login-submit-button {
+ margin-left: 0px !important;
+}
+aside #login_openid {
+ position: relative !important;
+ float: none !important;
+ margin-left: 0px !important;
+ height: auto !important;
+ width: 200px !important;
+}
+#login_openid #id_openid_url {
+ width: 180px !important;
+ overflow: hidden !important;
+}
+#login_openid label {
+ width: 180px !important;
+}
/**
@@ -244,25 +297,6 @@ nav #banner #logo-text a {
font-weight: bold;
margin-left: 3px;
}
-nav #user-menu {
- display: block;
- width: auto;
- float: right;
- margin: 3px 68px 0 0;
- position: relative;
- background-color: #555753;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
- background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
- clear: both;
-}
-nav #user-menu-label {
- float: left;
- font-size: 12px;
- padding: 3px 20px 9px 5px;
- height: 10px;
-}
ul#user-menu-popup {
display: none;
position: absolute;
@@ -291,14 +325,6 @@ ul#user-menu-popup li a:hover {
ul#user-menu-popup li a.nav-sep {
border-top: 1px solid #eeeeec;
}
-#nav-buttons {
- clear: both;
- list-style: none;
- padding: 0px;
-}
-#nav-buttons li {
- padding: 0;
-}
nav .nav-link {
float: right;
display: block;
@@ -406,13 +432,6 @@ nav .nav-link {
.icon, .hover, .focus, .pointer {
cursor: pointer;
}
-#notifications {
- height: 20px;
- width: 100%;
- position: absolute;
- top: -19px;
- left: 0;
-}
/* popup notifications */
div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
@@ -425,10 +444,10 @@ div.jGrowl div.info {
padding-left: 58px;
}
#nav-notifications-menu {
- margin: 30px 0 0 -45px;
- width: 300px;
- max-height: 400px;
- overflow: auto;
+ margin: 30px 0 0 -20px;
+ width: 275px;
+ max-height: 300px;
+ overflow-y: auto;
font-size: 9pt;
}
#nav-notifications-menu .contactname {
@@ -461,6 +480,13 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
.show {
display: block;
}
+#notifications {
+ height: 20px;
+ width: 170px;
+ position: absolute;
+ top: -19px;
+ left: 7px;
+}
#nav-floater {
position: fixed;
top: 20px;
@@ -470,12 +496,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
color: transparent;
border-radius: 5px;
z-index: 100;
+ width: 300px;
+ height: 60px;
+}
+#nav-buttons {
+ clear: both;
+ list-style: none;
+ padding: 0px;
+ margin: 0 7px 0 0;
+ height: 25px;
+}
+#nav-buttons li {
+ padding: 0;
}
.floaterflip {
display: block;
position: fixed;
z-index: 110;
- top: 53px;
+ top: 56px;
right: 19px;
width: 22px;
height: 22px;
@@ -483,6 +521,49 @@ 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;
+ margin: 5px;
+ position: fixed;
+ right: 0px;
+ bottom: 0px;
+ z-index: 100;
+ background: #1d1f1d;
+ border-radius: 5px;
+}
+#search-text {
+ border: 1px #eec solid;
+ background: #2e2f2e;
+ color: #eec;
+}
+.search-box #search-text {
+ margin: 8px;
+ width: 10em;
+ color: #eec;
+}
+#user-menu {
+ display: block;
+ width: 75%;
+ margin: 3px 0 0 0;
+ position: relative;
+ background-color: #555753;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
+ clear: both;
+ top: 4px;
+ left: 10px;
+ padding: 2px;
+}
+#user-menu > a {
+ vertical-align: top;
+}
+#user-menu-label {
+ font-size: 12px;
+ padding: 3px 20px 9px 5px;
+ height: 10px;
+}
.nav-ajax-update, .nav-ajax-left {
width: 30px;
height: 19px;
@@ -587,6 +668,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
background: #ddd;
}
+
/** sysmsg **/
#sysmsg_info {
position: fixed;
@@ -680,20 +762,33 @@ aside #viewcontacts {
list-style: none;
}
#dfrn-request-link {
- background:#3465A4 url(connect.png) no-repeat 95% center;
- border-radius:5px 5px 5px 5px;
- color:#fff;
- display:block;
- font-size:1.2em;
- padding:.2em .5em;
+ background: #3465A4 url(connect.png) no-repeat 95% center;
+ border-radius: 5px 5px 5px 5px;
+ color: #eec;
+ display: block;
+ font-size: 1.2em;
+ padding: 0.2em 0.5em;
+}
+#wallmessage-link {
+ /*background: #3465A4 url(connect.png) no-repeat 95% center;*/
+ /*border-radius: 5px 5px 5px 5px;*/
+ color: #eee;
+ display: block;
+ font-size: 1.2em;
+ padding: 0.2em 0.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
*/
@@ -761,6 +856,16 @@ aside #viewcontacts {
border-radius: 5px;
vertical-align: middle;
}
+#jot-category {
+ margin: 5px 0;
+ border-radius: 5px;
+ border: 1px #999 solid;
+ color: #aaa;
+ font-size: smaller;
+}
+#jot-category:focus {
+ color: #eee;
+}
#jot #character-counter {
width: 6%;
float: right;
@@ -947,7 +1052,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 {
@@ -960,10 +1065,11 @@ aside #viewcontacts {
* section
*/
section {
- margin: 20px 8% 0 4%;
+ margin: 20px 9% 0 4%;
font-size: 0.8em;
padding-right: 230px;
min-width: 475px;
+ width: 65%;
}
/** tabs **/
@@ -974,12 +1080,14 @@ section {
}
.tabs li {
display: inline;
+ font-size: smaller;
+ font-weight: bold;
}
.tab {
border: 1px solid #729fcf;
padding: 4px;
}
-.tab:hover {
+.tab:hover, .tab.active:hover {
background: #88a9d2;
color: #2e2f2e;
}
@@ -991,11 +1099,15 @@ section {
background: #88a9d2;
color: #2e2f2e;
}
+.tab.active a {
+ color: #2e2f2e;
+}
.tab a {
border: 0;
text-decoration: none;
}
+
/**
* items
*/
@@ -1019,12 +1131,17 @@ section {
}
.shiny {
background: #2e3436;
+ border-radius: 5px;
+}
+.wall-outside-wrapper .shiny {
+ border-radius: 5px;
}
.heart {
color: red;
}
.wall-item-content {
overflow-x: auto;
+ margin: 0px 15px 0px 5px;
}
/* removing it from here, vs. putting it in .wall-item-content
* might break things for people. we shall see ;) */
@@ -1065,7 +1182,7 @@ section {
border-radius: 5px;
}
[class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * {
- margin: 0 0 5px 0;
+ /*margin: 0 0 5px 0;*/
}
.wall-item-tools {
float: right;
@@ -1086,17 +1203,36 @@ section {
-ms-transition: all 1s ease-in-out;
transition: all 1s ease-in-out;
}
+.wall-item-subtools1 {
+ height: 30px;
+ list-style: none outside none;
+ margin: 20px 0 30px -20px;
+ padding: 0;
+ width: 30px;
+}
+.wall-item-subtools2 {
+ height: 25px;
+ list-style: none outside none;
+ margin: -75px 0 0 5px;
+ padding: 0;
+ width: 25px;
+}
.wall-item-title {
font-size: 1.2em;
font-weight: bold;
margin-bottom: 1em;
}
.wall-item-body {
- margin: 10px 10px 10px 0px;
+ margin: 20px 20px 10px 0px;
text-align: left;
+ overflow-x: auto;
}
.wall-item-lock-wrapper {
float: right;
+ height: 22px;
+ margin: 0 -5px 0 0;
+ width: 22px;
+ opacity: 1;
}
.wall-item-dislike,
.wall-item-like {
@@ -1196,6 +1332,24 @@ section {
overflow: auto;
width: 100%;
}
+#connect-services-header {
+
+}
+#connect-services {
+ margin: 5px 0 0 0;
+}
+#extra-help-header {
+
+}
+#extra-help {
+ margin: 5px 0 0 0;
+}
+#postit-header {
+
+}
+#postit {
+ margin: 5px 0 0 0;
+}
/**
@@ -1713,8 +1867,10 @@ div[id$="wrapper"] br {
/**
* register, settings & profile forms
*/
-#id_openid_url,
.openid {
+
+}
+#id_openid_url {
background:url(login-bg.gif) no-repeat;
background-position:0 50%;
padding-left:18px;
@@ -1756,16 +1912,7 @@ div[id$="wrapper"] br {
margin: 30px 0px;
}
.profile-edit-side-div {
- /*background: #111;
- border-radius: 5px 5px 0px 0px;
- margin: 0px 0px 0px 0px;
- width: 100px;
- height: 25px;
- position: absolute;*/
display: none;
- /*left: 35%;
- top: 41%;
- cursor: pointer;*/
}
/*.profile-edit-side-div:hover {
display: block;
@@ -1819,10 +1966,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 +2011,7 @@ div[id$="wrapper"] br {
display: none;
}
+
/**
* profile
*/
@@ -1945,6 +2095,9 @@ div[id$="wrapper"] br {
float:left;
font-size:20px;
}
+.event {
+ background: #2e2f2e;
+}
.vevent {
border:1px solid #ccc;
}
@@ -1956,15 +2109,14 @@ div[id$="wrapper"] br {
margin-left: 10px;
margin-right: 10px;
}
-
#new-event-link {
margin-bottom: 10px;
}
.edit-event-link, .plink-event-link {
- float: left;
- margin-top: 4px;
- margin-right: 4px;
- margin-bottom: 15px;
+ /*float: left; */
+ /*margin-top: 4px; */
+ /*margin-right: 4px;*/
+ /*margin-bottom: 15px;*/
}
.event-description:before {
content: url('../../../images/calendar.png');
@@ -1973,6 +2125,7 @@ div[id$="wrapper"] br {
.event-start, .event-end {
margin-left: 10px;
width: 330px;
+ font-size: smaller;
}
.event-start .dtstart, .event-end .dtend {
float: right;
@@ -2033,12 +2186,21 @@ div[id$="wrapper"] br {
opacity: 1.0 !important;
filter:alpha(opacity=100) !important;
}
+.filesavetags, .categorytags {
+ margin: 20px 0;
+ opacity: 0.5;
+ filter:alpha(opacity=50);
+}
+.filesavetags:hover, .categorytags:hover {
+ margin: 20px 0;
+ opacity: 1.0 !important;
+ filter:alpha(opacity=100) !important;
+}
.item-select {
opacity: 0.1;
filter:alpha(opacity=10);
float: right;
- margin-right: 10px;
-
+ margin-right: 5px;
}
.item-select:hover, .checkeditem {
opacity: 1;
@@ -2064,6 +2226,10 @@ div[id$="wrapper"] br {
#item-delete-selected-desc:hover {
text-decoration: underline;
}
+.fc-state-highlight {
+ background: #eec;
+ color: #2e2f2e;
+}
/**
@@ -2086,13 +2252,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 {
@@ -2170,6 +2336,7 @@ div[id$="wrapper"] br {
margin: 5px 0px 0px 0px;
}
+
/**
* ADMIN
*/
@@ -2257,7 +2424,7 @@ div[id$="wrapper"] br {
.field {
/*margin-bottom: 10px;*/
/*padding-bottom: 10px;*/
- overflow: auto;
+ overflow: auto;
width: 100%;
}
.field label, label {
@@ -2265,7 +2432,6 @@ div[id$="wrapper"] br {
width: 275px;
display: block;
font-size: 1.077em;
- /*font-weight: bold;*/
margin: 0 10px 0.5em 0;
border: 1px #2e2f2e solid;
padding: 5px;
@@ -2484,6 +2650,9 @@ div[id$="wrapper"] br {
.dislike {
background-position: -190px 0;
}
+.file-as {
+ background-position: -230px -60px;
+}
.like {
background-position: -211px 0;
}
@@ -2570,9 +2739,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;
@@ -2755,13 +2924,7 @@ footer {
}
.qcomment-wrapper {
padding: 0px;
- margin: 2px;
- list-style-type: none;
-}
-.qcomment, .qcomment:hover {
- display: inline;
- padding: 5px;
- margin: 5px;
+ margin: 5px 5px 5px 81%;
}
.qcomment {
opacity: 0.5;
@@ -2781,6 +2944,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..17d31feda 100644
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -3,16 +3,12 @@
/*
* 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.jpg">Screenshot</a>
*/
-
-$a->theme_info = array(
- 'extends' => 'dispy-dark'
-);
-
$a->page['htmlhead'] .= <<< EOT
<script>
$(document).ready(function() {
@@ -90,11 +86,13 @@ $(document).ready(function() {
$('.floaterflip').css({
backgroundPosition: '-210px -60px'
});
+ $('.search-box').slideUp('fast');
} else {
$('#nav-floater').slideDown('fast');
$('.floaterflip').css({
backgroundPosition: '-190px -60px'
});
+ $('.search-box').slideDown('fast');
}
};
// our trigger for the toolbar button
@@ -108,21 +106,43 @@ $(document).ready(function() {
$(this).css({color: '#eec'});
});
-/* $('#profile-photo-wrapper').mouseover(function() {
- $('.profile-edit-side-div').css({display: 'block'});
- }).mouseout(function() {
- $('.profile-edit-side-div').css({display: 'none'});
- return false;
- });
-
- $('img.photo').mouseover(function() {
- $('.profile-edit-side-div').css({display: 'block'});
- }).mouseout(function() {
- $('.profile-edit-side-div').css({display: 'none'});
- return false;
- });*/
-
});
</script>
EOT;
+function dispydark_community_info() {
+ $a = get_app();
+
+ $aside['$lastusers_title'] = t('Last users');
+ $aside['$lastusers_items'] = array();
+ $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
+
+ $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_bottom'] = replace_macros($tpl, $aside);
+}
+
+// aside on profile page
+//if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
+ dispydark_community_info();
+//}
+
diff --git a/view/theme/dispy-dark/wall_item.tpl b/view/theme/dispy-dark/wall_item.tpl
index c67a88635..8acaeaf02 100644
--- a/view/theme/dispy-dark/wall_item.tpl
+++ b/view/theme/dispy-dark/wall_item.tpl
@@ -1,10 +1,10 @@
-<div class="wall-item-outside-wrapper$item.indent" id="wall-item-outside-wrapper-$item.id" >
+<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info" id="wall-item-info-$item.id">
<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">
+ <a href="$item.profile_url" target="redir" 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>
@@ -17,39 +17,45 @@
<div class="wall-item-photo-end"></div>
<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
</div>
- <div class="wall-item-lock-wrapper">
- {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
- {{ else }}<div class="wall-item-lock"></div>{{ endif }}
- </div>
<div class="wall-item-tools" id="wall-item-tools-$item.id">
- {{ if $item.star }}
- <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
- <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
- {{ endif }}
-
- {{ if $item.vote }}
- <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
- <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
- <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"
- 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.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 }}
- {{ if $item.edpost }}
- <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
- {{ endif }}
-
- <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
- {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+ <div class="wall-item-lock-wrapper">
+ {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+ {{ else }}<div class="wall-item-lock"></div>{{ endif }}
</div>
- {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+ <ul class="wall-item-subtools1">
+ {{ if $item.star }}
+ <li>
+ <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+ <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+ </li>
+ {{ endif }}
+ {{ if $item.vote }}
+ <li class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+ <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+ <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"
+ 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;" />
+ </li>
+ {{ endif }}
+ </ul><br style="clear:left;" />
+ <ul class="wall-item-subtools2">
+ {{ if $item.filer }}
+ <li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
+ {{ endif }}
+ {{ if $item.plink }}
+ <li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>
+ {{ endif }}
+ {{ if $item.edpost }}
+ <li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>
+ {{ endif }}
+ <li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id">
+ {{ if $item.drop.dropping }}<div><a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div>{{ endif }}
+ {{ if $item.drop.dropping }}<div><input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" /></div>{{ endif }}
+ </li>
+ </ul>
<div class="wall-item-delete-end"></div>
-
</div>
<div class="wall-item-content" id="wall-item-content-$item.id" >
<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
@@ -65,7 +71,6 @@
<div class="wall-item-author">
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
<div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div>
-
</div>
</div>
<div class="wall-item-wrapper-end"></div>
diff --git a/view/theme/dispy-dark/wallwall_item.tpl b/view/theme/dispy-dark/wallwall_item.tpl
index f251d7352..421cddadf 100644
--- a/view/theme/dispy-dark/wallwall_item.tpl
+++ b/view/theme/dispy-dark/wallwall_item.tpl
@@ -22,40 +22,46 @@
<div class="wall-item-photo-end"></div>
<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
</div>
- <div class="wall-item-lock-wrapper">
+ <div class="wall-item-tools" id="wall-item-tools-$item.id">
+ <div class="wall-item-lock-wrapper">
{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
{{ else }}<div class="wall-item-lock"></div>{{ endif }}
- </div>
- <div class="wall-item-tools" id="wall-item-tools-$item.id">
- {{ if $item.star }}
- <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
- <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
- {{ endif }}
-
- {{ if $item.vote }}
- <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
- <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
- <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"
-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>
+ <ul class="wall-item-subtools1">
+ {{ if $item.star }}
+ <li>
+ <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+ <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+ </li>
+ {{ endif }}
+ {{ if $item.vote }}
+ <li class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+ <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+ <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"
+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;" />
+ </li>
+ {{ endif }}
+ </ul><br style="clear:left;" />
+ <ul class="wall-item-subtools2">
+ {{ if $item.filer }}
+ <li 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></li>
{{ 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>
+ <li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>
{{ endif }}
{{ if $item.edpost }}
- <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+ <li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>
{{ endif }}
- <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+ <li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
- </div>
{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+ </li>
+ </ul>
<div class="wall-item-delete-end"></div>
-
</div>
<div class="wall-item-content" id="wall-item-content-$item.id" >
<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
@@ -67,7 +73,6 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick
{{ endfor }}
</div>
</div>
-
</div>
<div class="wall-item-author">
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>