aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/dispy
diff options
context:
space:
mode:
Diffstat (limited to 'view/theme/dispy')
-rw-r--r--view/theme/dispy/bottom.tpl1
-rw-r--r--view/theme/dispy/communityhome.tpl6
-rw-r--r--view/theme/dispy/default.php39
-rw-r--r--view/theme/dispy/head.tpl33
-rw-r--r--view/theme/dispy/header.tpl0
-rw-r--r--view/theme/dispy/icons/scroll_top.pngbin0 -> 539 bytes
-rw-r--r--view/theme/dispy/js/jquery.autogrow.textarea.js46
-rw-r--r--view/theme/dispy/lang_selector.tpl10
-rw-r--r--view/theme/dispy/nav.tpl11
-rw-r--r--view/theme/dispy/style.css111
-rw-r--r--view/theme/dispy/theme.php266
-rw-r--r--view/theme/dispy/wall_item.tpl19
-rw-r--r--view/theme/dispy/wallwall_item.tpl21
13 files changed, 351 insertions, 212 deletions
diff --git a/view/theme/dispy/bottom.tpl b/view/theme/dispy/bottom.tpl
new file mode 100644
index 000000000..1b7dda8f8
--- /dev/null
+++ b/view/theme/dispy/bottom.tpl
@@ -0,0 +1 @@
+<script type="text/javascript" src="$baseurl/view/theme/dispy/js/jquery.autogrow.textarea.js"></script>
diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl
index 340b7216c..df8bbad7c 100644
--- a/view/theme/dispy/communityhome.tpl
+++ b/view/theme/dispy/communityhome.tpl
@@ -37,10 +37,8 @@
</div>
{{ endif }}
-{{ if $lastusers_title }}
-<h3 id="postit-header">PostIt to Friendica</h3>
+<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.
+<a href="$fpostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
</div>
-{{ endif }}
diff --git a/view/theme/dispy/default.php b/view/theme/dispy/default.php
index e74ec1a4f..729f9be2a 100644
--- a/view/theme/dispy/default.php
+++ b/view/theme/dispy/default.php
@@ -1,20 +1,37 @@
<!DOCTYPE html>
<html>
<head>
- <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+ <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'] ?>
+ <?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>
+ <header>
+ <?php if(x($page, 'header')) echo $page['header']; ?>
+ </header>
+ <article id="articlemain">
+ <?php if(x($page,'nav')) echo $page['nav']; ?>
+ <aside id="asideleft">
+ <?php if(x($page,'aside_left')) echo $page['aside_left']; ?>
+ <?php if(x($page,'aside_left_bottom')) echo $page['aside_left_bottom']; ?>
+ </aside>
+ <section id="sectionmain">
+ <?php if(x($page,'content')) echo $page['content']; ?>
+ <footer id="section-footer"></footer>
+ </section>
+ <aside id="asidemain">
+ <?php if(x($page,'aside')) echo $page['aside']; ?>
+ <?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?>
+ </aside>
+ <aside id="asideright">
+ <?php if(x($page,'aside_right')) echo $page['aside_right']; ?>
+ <?php if(x($page,'aside_right_bottom')) echo $page['aside_right_bottom']; ?>
+ </aside>
+ </article>
+ <footer id="footer">
+ <?php if(x($page, 'footer')) echo $page['footer']; ?>
+ </footer>
+ <?php if (x($page, 'bottom')) echo $page['bottom']; ?>
</body>
</html>
diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl
index cd6f5ca97..d42b19aef 100644
--- a/view/theme/dispy/head.tpl
+++ b/view/theme/dispy/head.tpl
@@ -1,33 +1,29 @@
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta charset="UTF-8" />
<base href="$baseurl/" />
<meta name="generator" content="$generator" />
+<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
+<link rel="search" href="$baseurl/opensearch"
+ type="application/opensearchdescription+xml" title="Search in Friendica" />
<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />
<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
-
<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-
-<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
-<link rel="search"
- href="$baseurl/opensearch"
- type="application/opensearchdescription+xml"
- title="Search in Friendica" />
-
<!--[if IE]>
<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
-<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
-<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
-<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js" ></script>
+<script type="text/javascript" src="$baseurl/js/jquery.js"></script>
+<script type="text/javascript" src="$baseurl/js/acl.js"></script>
+<script type="text/javascript" src="$baseurl/js/main.js"></script>
+<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js"></script>
+<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js"></script>
<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>
<script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
-<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
-<script type="text/javascript" src="$baseurl/js/acl.js" ></script>
-<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js" ></script>
-<script type="text/javascript" src="$baseurl/js/main.js" ></script>
+<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js"></script>
+<!-- in dispy-dark -->
<script>
-
var updateInterval = $update_interval;
function confirmDelete() { return confirm("$delitem"); }
@@ -48,7 +44,6 @@
}
}
-
function commentInsert(obj,id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == '$comment') {
@@ -91,8 +86,4 @@
$('#hide-comments-' + id).html('$showfewer');
}
}
-
-
</script>
-
-
diff --git a/view/theme/dispy/header.tpl b/view/theme/dispy/header.tpl
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/view/theme/dispy/header.tpl
diff --git a/view/theme/dispy/icons/scroll_top.png b/view/theme/dispy/icons/scroll_top.png
new file mode 100644
index 000000000..fa6736086
--- /dev/null
+++ b/view/theme/dispy/icons/scroll_top.png
Binary files differ
diff --git a/view/theme/dispy/js/jquery.autogrow.textarea.js b/view/theme/dispy/js/jquery.autogrow.textarea.js
new file mode 100644
index 000000000..806e34f51
--- /dev/null
+++ b/view/theme/dispy/js/jquery.autogrow.textarea.js
@@ -0,0 +1,46 @@
+(function($) {
+
+ /*
+ * Auto-growing textareas; technique ripped from Facebook
+ */
+ $.fn.autogrow = function(options) {
+
+ this.filter('textarea').each(function() {
+
+ var $this = $(this),
+ minHeight = $this.height(),
+ lineHeight = $this.css('lineHeight');
+
+ var shadow = $('<div></div>').css({
+ position: 'absolute',
+ top: -10000,
+ left: -10000,
+ width: $(this).width(),
+ fontSize: $this.css('fontSize'),
+ fontFamily: $this.css('fontFamily'),
+ lineHeight: $this.css('lineHeight'),
+ resize: 'none'
+ }).appendTo(document.body);
+
+ var update = function() {
+
+ var val = this.value.replace(/</g, '&lt;')
+ .replace(/>/g, '&gt;')
+ .replace(/&/g, '&amp;')
+ .replace(/\n/g, '<br/>');
+
+ shadow.html(val);
+ $(this).css('height', Math.max(shadow.height() + 20, minHeight));
+ }
+
+ $(this).change(update).keyup(update).keydown(update);
+
+ update.apply(this);
+
+ });
+
+ return this;
+
+ }
+
+})(jQuery); \ No newline at end of file
diff --git a/view/theme/dispy/lang_selector.tpl b/view/theme/dispy/lang_selector.tpl
new file mode 100644
index 000000000..e777a0a86
--- /dev/null
+++ b/view/theme/dispy/lang_selector.tpl
@@ -0,0 +1,10 @@
+<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" ></div>
+<div id="language-selector" style="display: none;" >
+ <form action="#" method="post" >
+ <select name="system_language" onchange="this.form.submit();" >
+ {{ for $langs.0 as $v=>$l }}
+ <option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option>
+ {{ endfor }}
+ </select>
+ </form>
+</div>
diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl
index e38b2bbe2..b58ae7e3a 100644
--- a/view/theme/dispy/nav.tpl
+++ b/view/theme/dispy/nav.tpl
@@ -4,7 +4,7 @@
<!-- yes, they're going the other way. seems that's how the template renderer
works -->
-
+<a name="top" id="top"></a>
<div id="nav-floater">
<div id="nav-buttons">
{{ if $nav.help }}
@@ -56,7 +56,6 @@ works -->
<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.1"></a>
</li>
{{ endif }}
-
{{ if $nav.contacts }}
<li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.1">$nav.contacts.1</a></li>
{{ endif }}
@@ -75,11 +74,9 @@ works -->
{{ if $nav.admin }}
<li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0" title="$nav.admin.1">$nav.admin.1</a></li>
{{ endif }}
-
{{ if $nav.login }}
<li><a id="nav-login-link" class="nav-commlink $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li>
{{ endif }}
-
{{ if $nav.logout }}
<li><a id="nav-logout-link" class="nav-commlink $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>
{{ endif }}
@@ -119,6 +116,12 @@ works -->
$langselector
</div>
+<div id="scrollup">
+<a href="#top"><img
+ src="view/theme/dispy/icons/scroll_top.png"
+ alt="back to top" title="Back to top" /></a>
+</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" />
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 622cf5734..9d10d2409 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -1,7 +1,8 @@
/*
* dispy
*
- * modernised, sort of, by simon <http://simon.kisikew.org/>
+ * maintainer: simon <http://simon.kisikew.org/>
+ * author: unknown
*
*/
@@ -210,12 +211,17 @@ input[type=submit] {
margin: 5px 0;
list-style: none;
}
+#articlemain {
+ width: 100%;
+ height: 100%;
+ margin: 0 auto;
+}
/**
* login
*/
-aside .field {
+#asidemain .field {
overflow: hidden;
width: 200px;
}
@@ -247,7 +253,7 @@ aside .field {
#login-submit-button {
margin-left: 0px !important;
}
-aside #login_openid {
+#asidemain #login_openid {
position: relative !important;
float: none !important;
margin-left: 0px !important;
@@ -268,13 +274,10 @@ aside #login_openid {
*/
nav {
height: 60px;
- display: block;
background-color: #2e3436;
color: #eeeeec;
position: relative;
padding: 20px 20px 10px 95px;
- margin-left: auto;
- margin-right: auto;
}
nav a {
text-decoration: none;
@@ -309,6 +312,7 @@ ul#user-menu-popup {
-webkit-border-radius: 0 0 5px 5px;
-moz-border-radius: 0 0 5px 5px;
border-radius: 0 0 5px 5px;
+ box-shadow: 5px 10px 10px 0 #111;
z-index: 10000;
}
ul#user-menu-popup li {
@@ -541,7 +545,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
width: 10em;
color: #eec;
}
+#scrollup {
+ position: fixed;
+ right: 5px;
+ bottom: 40px;
+ z-index: 100;
+}
+#scrollup a:hover {
+ text-decoration: none;
+ border: 0;
+}
#user-menu {
+ box-shadow: 5px 0 10px 0 #111;
display: block;
width: 75%;
margin: 3px 0 0 0;
@@ -707,12 +722,16 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
/**
* aside
**/
-aside {
- position: absolute;
- right: 15px;
- width: 245px;
- padding-top: 15px;
+#asidemain {
+ float: left;
font-size: smaller;
+ margin: 20px 0 20px 35px;
+ width: 25%;
+ display: inline;
+}
+/* for now, disappear these */
+#asideright, #asideleft {
+ display: none;
}
.vcard .fn {
font-size: 1.7em;
@@ -742,15 +761,15 @@ aside {
.vcard #profile-photo-wrapper img {
box-shadow: 3px 3px 10px 0 #000;
}
-aside h4 {
+#asidemain h4 {
font-size: 1.2em;
}
-aside #viewcontacts {
+#asidemain #viewcontacts {
text-align: right;
}
.aprofile dt {
- color: #666666;
background: transparent;
+ color: #666666;
font-weight: bold;
box-shadow: 1px 1px 5px 0 #000;
margin: 15px 0 5px;
@@ -874,12 +893,24 @@ aside #viewcontacts {
line-height: 20px;
padding: 2px 20px 5px 0;
}
+#profile-jot-text_parent {
+ /*border-radius: 10px;*/
+ box-shadow: 5px 0 10px 0 #111;
+}
#profile-jot-text_tbl {
margin-bottom: 10px;
+ /*border-radius: 10px;*/
+ background: #888;
}
#profile-jot-text_ifr {
width:99.900002% !important;
}
+#profile-jot-text_toolbargroup {
+ background: #888;
+}
+.mceCenter table tr {
+ background: #888;
+}
[id$="jot-text_ifr"] {
width: 99.900002% !important;
color: #2e2f2e;
@@ -889,6 +920,15 @@ aside #viewcontacts {
color: #2e2f2e;
background: #eec;
}
+.mceFirst tr {
+ background: #888;
+}
+.mceFirst td {
+ /*border-radius: 10px 10px 0px 0px;*/
+}
+.mceLast td {
+ /*border-radius: 0 0 10px 10px;*/
+}
#profile-attach-wrapper,
#profile-audio-wrapper,
#profile-link-wrapper,
@@ -1064,12 +1104,13 @@ aside #viewcontacts {
/**
* section
*/
-section {
- margin: 20px 9% 0 4%;
+#sectionmain {
+ margin: 20px;
font-size: 0.8em;
- padding-right: 230px;
min-width: 475px;
- width: 65%;
+ width: 67%;
+ float: left;
+ display: inline;
}
/** tabs **/
@@ -1114,6 +1155,7 @@ section {
.wall-item-outside-wrapper {
border: 1px solid #aaa;
border-radius: 5px;
+ box-shadow: 5px 0 10px 0 #999;
}
.wall-item-outside-wrapper.comment {
margin-top: 5px;
@@ -1333,19 +1375,19 @@ section {
width: 100%;
}
#connect-services-header {
-
+ margin: 5px 0 0 0;
}
#connect-services {
margin: 5px 0 0 0;
}
#extra-help-header {
-
+ margin: 5px 0 0 0;
}
#extra-help {
margin: 5px 0 0 0;
}
#postit-header {
-
+ margin: 5px 0 0 0;
}
#postit {
margin: 5px 0 0 0;
@@ -1938,8 +1980,8 @@ div[id$="wrapper"] br {
margin: 0 0 -18px;
position: absolute;
text-decoration: none;
- top: 18px;
- right: 226px;
+ top: 113px;
+ right: 260px;
}
#profile-edit-links ul {
margin: 20px 0;
@@ -2353,6 +2395,12 @@ div[id$="wrapper"] br {
.admin.link {
list-style-position: inside;
}
+#adminpage {
+ color: #111;
+ background: transparent;
+ margin: 5px;
+ padding: 10px;
+}
#adminpage dl {
clear:left;
margin-bottom: 2px;
@@ -2374,7 +2422,6 @@ div[id$="wrapper"] br {
#adminpage .submit {
clear:left;
}
-
#adminpage #pluginslist {
margin: 0;
padding: 0;
@@ -2391,7 +2438,6 @@ div[id$="wrapper"] br {
float:left;
margin-right: 1em;
}
-
#adminpage table {
width: 100%;
border-bottom: 1px solid #000;
@@ -2417,6 +2463,10 @@ div[id$="wrapper"] br {
/* color: #;*/
text-decoration: underline;
}
+#users .name {
+ color: #eec;
+}
+
/**
* Form fields
@@ -2603,8 +2653,8 @@ div[id$="wrapper"] br {
}
.icon.drop,
.icon.drophide, .icon.delete {
- float: right;
- margin: 5px;
+ float: left;
+ margin: 0 2px;
}
.icon.s22.delete {
display: block;
@@ -2735,8 +2785,8 @@ div[id$="wrapper"] br {
}
#pause {
position: fixed;
- bottom: 5px;
- right: 5px;
+ bottom: 40px;
+ right: 30px;
}
.border, .border:hover {
border: 1px solid #babdb6;
@@ -2776,7 +2826,7 @@ div[id$="wrapper"] br {
}
footer {
display: block;
- margin: 50px 20%;
+ /*margin: 50px 20%;*/
clear: both;
}
#profile-jot-text {
@@ -2805,6 +2855,7 @@ footer {
background: #fff url("../../../images/search_18.png") no-repeat right center;
padding-right: 20px;
margin: 6px;
+ color: #111;
}
#acl-showall {
float: left;
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index d0f6797cb..125910593 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -3,145 +3,169 @@
/*
* Name: Dispy
* Description: Dispy, Friendica theme
- * Version: 1.0
+ * Version: 1.1
* Author: unknown
* Maintainer: Simon <http://simon.kisikew.org/>
* Screenshot: <a href="screenshot.jpg">Screenshot</a>
*/
+$a = get_app();
$a->theme_info = array(
- 'extends' => 'dispy',
+ 'name' => 'dispy',
+ 'version' => '1.1'
);
-$a->page['htmlhead'] .= <<< EOT
-<script>
-$(document).ready(function() {
- $('.group-edit-icon').hover(
- function() {
- $(this).addClass('icon');
- $(this).removeClass('iconspacer'); },
-
- function() {
- $(this).removeClass('icon');
- $(this).addClass('iconspacer'); }
- );
-
- $('.sidebar-group-element').hover(
- function() {
- id = $(this).attr('id');
- $('#edit-' + id).addClass('icon');
- $('#edit-' + id).removeClass('iconspacer'); },
-
- function() {
- id = $(this).attr('id');
- $('#edit-' + id).removeClass('icon');
- $('#edit-' + id).addClass('iconspacer'); }
- );
-
- $('.savedsearchdrop').hover(
- function() {
- $(this).addClass('drop');
- $(this).addClass('icon');
- $(this).removeClass('iconspacer'); },
-
- function() {
- $(this).removeClass('drop');
- $(this).removeClass('icon');
- $(this).addClass('iconspacer'); }
- );
-
- $('.savedsearchterm').hover(
- function() {
- id = $(this).attr('id');
- $('#drop-' + id).addClass('icon');
- $('#drop-' + id).addClass('drophide');
- $('#drop-' + id).removeClass('iconspacer'); },
-
- function() {
- id = $(this).attr('id');
- $('#drop-' + id).removeClass('icon');
- $('#drop-' + id).removeClass('drophide');
- $('#drop-' + id).addClass('iconspacer'); }
- );
-
- // click outside notifications menu closes it
- $('html').click(function() {
- $('#nav-notifications-linkmenu').removeClass('selected');
- document.getElementById("nav-notifications-menu").style.display = "none";
- });
-
- $('#nav-notifications-linkmenu').click(function(event) {
- event.stopPropagation();
- });
- // click outside profiles menu closes it
- $('html').click(function() {
- $('#profiles-menu-trigger').removeClass('selected');
- document.getElementById("profiles-menu").style.display = "none";
- });
+function dispy_init(&$a) {
+
+ // aside on profile page
+ if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
+ dispy_community_info();
+ }
+
+ $a->page['htmlhead'] .= <<<EOT
+ <script type="text/javascript">
+ $(document).ready(function() {
+ $('.group-edit-icon').hover(
+ function() {
+ $(this).addClass('icon');
+ $(this).removeClass('iconspacer'); },
+
+ function() {
+ $(this).removeClass('icon');
+ $(this).addClass('iconspacer'); }
+ );
+
+ $('.sidebar-group-element').hover(
+ function() {
+ id = $(this).attr('id');
+ $('#edit-' + id).addClass('icon');
+ $('#edit-' + id).removeClass('iconspacer'); },
+
+ function() {
+ id = $(this).attr('id');
+ $('#edit-' + id).removeClass('icon');
+ $('#edit-' + id).addClass('iconspacer'); }
+ );
+
+ $('.savedsearchdrop').hover(
+ function() {
+ $(this).addClass('drop');
+ $(this).addClass('icon');
+ $(this).removeClass('iconspacer'); },
+
+ function() {
+ $(this).removeClass('drop');
+ $(this).removeClass('icon');
+ $(this).addClass('iconspacer'); }
+ );
+
+ $('.savedsearchterm').hover(
+ function() {
+ id = $(this).attr('id');
+ $('#drop-' + id).addClass('icon');
+ $('#drop-' + id).addClass('drophide');
+ $('#drop-' + id).removeClass('iconspacer'); },
+
+ function() {
+ id = $(this).attr('id');
+ $('#drop-' + id).removeClass('icon');
+ $('#drop-' + id).removeClass('drophide');
+ $('#drop-' + id).addClass('iconspacer'); }
+ );
+
+ // click outside notifications menu closes it
+ $('html').click(function() {
+ $('#nav-notifications-linkmenu').removeClass('selected');
+ $('#nav-notifications-menu').css({display: 'none'});
+ });
+
+ $('#nav-notifications-linkmenu').click(function(event) {
+ event.stopPropagation();
+ });
+ // click outside profiles menu closes it
+ $('html').click(function() {
+ $('#profiles-menu-trigger').removeClass('selected');
+ $('#profiles-menu').css({display: 'none'});
+ });
+
+ $('#profiles-menu').click(function(event) {
+ event.stopPropagation();
+ });
+
+ // main function in toolbar functioning
+ function toggleToolbar() {
+ if ( $('#nav-floater').is(':visible') ) {
+ $('#nav-floater').slideUp('fast');
+ $('.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
+ $('.floaterflip').click(function() {
+ toggleToolbar();
+ return false;
+ });
+
+ // (attempt to) change the text colour in a top post
+ $('#profile-jot-text').focusin(function() {
+ $(this).css({color: '#eec'});
+ });
+
+ $('a[href=#top]').click(function() {
+ $('html, body').animate({scrollTop:0}, 'slow');
+ return false;
+ });
- $('#profiles-menu').click(function(event) {
- event.stopPropagation();
});
-
- // main function in toolbar functioning
- function toggleToolbar() {
- if ( $('#nav-floater').is(':visible') ) {
- $('#nav-floater').slideUp('fast');
- $('.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
- $('.floaterflip').click(function() {
- toggleToolbar();
- return false;
- });
-
- // (attempt) to change the text colour in a top post
- $('#profile-jot-text').focusin(function() {
- $(this).css({color: '#eec'});
+ // shadowing effect for floating toolbars
+ $(document).scroll(function(e) {
+ var pageTop = $('html').scrollTop();
+ if (pageTop) {
+ $('#nav-floater').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'});
+ $('.search-box').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'});
+ } else {
+ $('#nav-floater').css({boxShadow: '0 0 0 0'});
+ $('.search-box').css({boxShadow: '0 0 0 0'});
+ }
});
-
-});
-</script>
+ </script>
EOT;
+ js_in_foot();
+}
+
function dispy_community_info() {
$a = get_app();
-
- $fostitJS = "javascript: (function() {
- the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' +
- encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' +
- encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ?
- document.getSelection() : document.selection.createRange().text));
- a_funct = function() {
- if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) {
- location.href = the_url;
- }
- if (/Firefox/.test(navigator.userAgent)) {
- setTimeout(a_funct, 0)
- } else {
- a_funct();
- }
- })();";
-
- $aside['$fostitJS'] = $fostitJS;
$url = $a->get_baseurl($ssl_state);
$aside['$url'] = $url;
- $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
- $a->page['aside_bottom'] = replace_macros($tpl, $aside);
+ $fpostitJS = "javascript:(function() {"
+ . "the_url = '" . $url . "/view/theme/".$a->theme_info['name']."/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['$fpostitJS'] = $fpostitJS;
+ $tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl');
+ return $a->page['aside_bottom'] = replace_macros($tpl, $aside);
}
-// aside on profile page
-if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
- dispy_community_info();
+function js_in_foot() {
+ /** @purpose insert stuff in bottom of page
+ */
+ $a = get_app();
+ $baseurl = $a->get_baseurl($ssl_state);
+ $bottom['$baseurl'] = $baseurl;
+ $tpl = file_get_contents(dirname(__file__) . '/bottom.tpl');
+
+ return $a->page['bottom'] = replace_macros($tpl, $bottom);
}
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index 8acaeaf02..52af07532 100644
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/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" 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>
+ <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">
<ul>
@@ -57,15 +55,16 @@
</ul>
<div class="wall-item-delete-end"></div>
</div>
- <div class="wall-item-content" id="wall-item-content-$item.id" >
+ <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 class="body-tag">
- {{ for $item.tags as $tag }}
- <span class='tag'>$tag</span>
- {{ endfor }}
- </div>
+ <div class="wall-item-body" id="wall-item-body-$item.id">
+ $item.body
+ <div class="body-tag">
+ {{ for $item.tags as $tag }}
+ <span class='tag'>$tag</span>
+ {{ endfor }}
+ </div>
</div>
</div>
<div class="wall-item-author">
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl
index 421cddadf..e8cbc2cd4 100644
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/wallwall_item.tpl
@@ -2,15 +2,13 @@
<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info wallwall" id="wall-item-info-$item.id">
<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
- <a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
- <img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
+ <a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id"><img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
</div>
<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
<div class="wall-item-photo-wrapper wwfrom" 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>
@@ -63,15 +61,16 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick
</ul>
<div class="wall-item-delete-end"></div>
</div>
- <div class="wall-item-content" id="wall-item-content-$item.id" >
+ <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 class="body-tag">
- {{ for $item.tags as $tag }}
- <span class="tag">$tag</span>
- {{ endfor }}
- </div>
+ <div class="wall-item-body" id="wall-item-body-$item.id">
+ $item.body
+ <div class="body-tag">
+ {{ for $item.tags as $tag }}
+ <span class="tag">$tag</span>
+ {{ endfor }}
+ </div>
</div>
</div>
<div class="wall-item-author">
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 16:07:18 +0000